Updating function-to-app converter to depend on the @google-cloud/functions-framework module published to npm. (GoogleCloudPlatform#11)

swalkowski · web-flow · commit 24e8dac98f0a · 2019-04-09T15:00:57.000+02:00
diff --git a/converter/Dockerfile b/converter/Dockerfile
@@ -1,32 +1,10 @@
-FROM gcr.io/gae-runtimes/nodejs10_app_builder:nodejs10_20190306_10_15_3_RC00 AS functions-framework
-
-COPY *.js *.json LICENSE /functions-framework/
-COPY src /functions-framework/src
-COPY test /functions-framework/test
-WORKDIR /functions-framework
-RUN npm install --only=dev && npm run compile
-
 FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
 
-# TODO: Once functions-framework npm module is published, do not include
-# functions-framework files in the image, just reference the published module in
-# package.json.
-COPY --from=functions-framework \
-    /functions-framework/package.json \
-    /functions-framework/LICENSE \
-    /functions-framework/
-COPY --from=functions-framework \
-    /functions-framework/build/src/*.js \
-    /functions-framework/build/src/*.d.ts \
-    /functions-framework/build/src/
-
-# TODO: Once functions-framework files from the parent directory are not needed,
-# run docker build and copy files from the current directory.
-COPY converter/convert converter/.npmrc /converter/
+COPY convert .npmrc /converter/
 
-COPY converter/without-package /converter/without-package
-COPY converter/with-package-without-framework /converter/with-package-without-framework
-COPY converter/with-package-with-framework /converter/with-package-with-framework
+COPY without-package /converter/without-package
+COPY with-package-without-framework /converter/with-package-without-framework
+COPY with-package-with-framework /converter/with-package-with-framework
 
 RUN apt-get update >/dev/null && \
     apt-get install -y jq >/dev/null
diff --git a/converter/convert b/converter/convert
@@ -12,8 +12,6 @@ mv * ${temp_dir}
 mkdir functions
 mv ${temp_dir}/* functions
 
-mv /functions-framework .
-
 if [[ ! -f functions/package.json ]]; then
   echo 'Handling functions without package.json'
   cp /converter/without-package/package.json .
diff --git a/converter/generate-package-lock b/converter/generate-package-lock
@@ -7,10 +7,7 @@
 set -e
 
 for dir in without-package with-package-without-framework with-package-with-framework; do
-  mkdir ${dir}/functions-framework
-  cp ../package.json ${dir}/functions-framework/
   rm ${dir}/package-lock.json
   npm --prefix ${dir} --package-lock-only install
-  rm -rf ${dir}/functions-framework
   rm -rf ${dir}/functions
 done
diff --git a/converter/with-package-without-framework/package-lock.json b/converter/with-package-without-framework/package-lock.json
diff --git a/converter/with-package-without-framework/package.json b/converter/with-package-without-framework/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@google-cloud/functions-framework": "file:functions-framework"
+    "@google-cloud/functions-framework": "^1.0.0"
   },
   "scripts": {
     "preinstall": "npm --prefix functions install",
diff --git a/converter/without-package/package-lock.json b/converter/without-package/package-lock.json
diff --git a/converter/without-package/package.json b/converter/without-package/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@google-cloud/functions-framework": "file:functions-framework"
+    "@google-cloud/functions-framework": "^1.0.0"
   },
   "scripts": {
     "start": "cd functions && functions-framework"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`		`- "@google-cloud/functions-framework": "file:functions-framework"`
	`3`	`+ "@google-cloud/functions-framework": "^1.0.0"`
`4`	`4`	`},`
`5`	`5`	`"scripts": {`
`6`	`6`	`"preinstall": "npm --prefix functions install",`