Only when merging Yaml data when gae_variable is present

zxyle · Jan 30, 2020 · f21469c · f21469c
1 parent c12c686
commit f21469c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
           service_account_email: ${{ secrets.GCP_SA_EMAIL }}
           service_account_key: ${{ secrets.GCP_SA_KEY }}
           project_id: ${{ secrets.PROJECT_ID }}
-          gae_variables: ewogICJiZXRhX3NldHRpbmdzIjogewogICAgImNsb3VkX3NxbF9pbnN0YW5jZXMiOiAibXlfc3FsX2luc3RhbmNlIgogIH0sCiAgImVudl92YXJpYWJsZXMiOiB7CiAgICAiREJfQ09OTkVDVElPTiI6ICJteXNxbCIsCiAgICAiREJfSE9TVCI6ICIxMjcuMC4wLjEiLAogICAgIkRCX1BPUlQiOiAzMzA2LAogICAgIkRCX1VTRVIiOiAibXlkYnVzZXIiLAogICAgIkRCX0RBVEFCQVNFIjogIm15X2RhdGFiYXNlIiwKICAgICJEQl9QQVNTV09SRCI6ICJwYXNzd29yZCIsCiAgICAiREJfU09DS0VUIjogIi9jbG91ZHNxbC9teXNfc3FsX2luc3RhbmNlIgogIH0KfQo=
+          gae_variables: e30K
 
       - name: Print Google Cloud SDK version
         run: |

diff --git a/index.js b/index.js
@@ -14,13 +14,13 @@ try {
 
     // @todo Only run this if the user wants to
     const secrets = core.getInput('gae_variables');
-    const secrets_buffer = Buffer.from(secrets, 'base64');
+    if (secrets) {
+        const secrets_buffer = Buffer.from(secrets, 'base64');
+        data = deepmerge(data, JSON.parse(secrets_buffer.toString()));
+        let yamlStr = yaml.safeDump(data);
+        fs.writeFileSync('app.yaml', yamlStr, 'utf8');
+    }
 
-    data = deepmerge(data, JSON.parse(secrets_buffer.toString()));
-
-    let yamlStr = yaml.safeDump(data);
-
-    fs.writeFileSync('app.yaml', yamlStr, 'utf8');
 } catch (error) {
     core.setFailed(error.message);
 }