Load GCP project ID from config file if it exists

Author: jeremydw

package-lock.json

@@ -37,6 +37,7 @@
     "@types/cli-progress": "^3.8.0",
     "@types/express": "^4.17.9",
     "@types/http-proxy": "^1.17.4",
+    "@types/js-yaml": "^3.12.5",
     "@types/mime-types": "^2.1.0",
     "@types/node": "^13.11.1",
     "ava": "^3.14.0",
@@ -59,6 +60,7 @@
     "google-auth-library": "^6.1.3",
     "http-proxy": "^1.18.1",
     "isomorphic-git": "^1.8.0",
+    "js-yaml": "^3.14.1",
     "mime-types": "^2.1.27"
   },
   "files": [

package.json

@@ -1,4 +1,7 @@
+import * as fs from 'fs';
+import * as fsPath from 'path';
 import * as upload from '../upload';
+import * as yaml from 'js-yaml';
 
 import {Manifest} from '../manifest';
 import {getGitData} from '../gitdata';
@@ -12,15 +15,48 @@ interface UploadOptions {
   ttl?: string;
 }
 
+function findConfig(path: string) {
+  let configPath = null;
+  const immediatePath = fsPath.join(path, 'fileset.yaml');
+  const ancestorPath = fsPath.join(fsPath.dirname(path), 'fileset.yaml');
+  if (fs.existsSync(immediatePath)) {
+    configPath = immediatePath;
+  } else if (fs.existsSync(ancestorPath)) {
+    configPath = ancestorPath;
+  } else {
+    return {};
+  }
+  // TODO: Validate config schema.
+  const config = yaml.safeLoad(fs.readFileSync(configPath, 'utf8')) as Record<
+    string,
+    string
+  >;
+  return config;
+}
+
 export class UploadCommand {
   constructor(private readonly options: UploadOptions) {
     this.options = options;
   }
 
   async run(path = './') {
     const gitData = await getGitData(path);
+    const config = findConfig(path);
+    const ttl = this.options.ttl ? new Date(this.options.ttl) : undefined;
+    let bucket = this.options.bucket;
+    if (!bucket && config.google_cloud_project) {
+      bucket = `${config.google_cloud_project}.appspot.com`;
+    } else if (!bucket && process.env.GOOGLE_CLOUD_PROJECT) {
+      bucket = `${process.env.GOOGLE_CLOUD_PROJECT}.appspot.com`;
+    }
+    if (!bucket) {
+      throw new Error(
+        'Unable to determine which Google Cloud Storage bucket to use. You must specify a `google_cloud_project` in `fileset.yaml` or specify a `GOOGLE_CLOUD_PROJECT` environment variable.'
+      );
+    }
+    const site = this.options.site || config.site;
     const manifest = new Manifest(
-      this.options.site,
+      site,
       this.options.ref || gitData.ref,
       this.options.branch || gitData.branch || ''
     );
@@ -29,12 +65,6 @@ export class UploadCommand {
       console.log(`No files found in -> ${path}`);
       return;
     }
-    const ttl = this.options.ttl ? new Date(this.options.ttl) : undefined;
-    upload.uploadManifest(
-      this.options.bucket,
-      manifest,
-      this.options.force,
-      ttl
-    );
+    upload.uploadManifest(bucket, manifest, this.options.force, ttl);
   }
 }

src/commands/upload.ts

@@ -1,13 +1,15 @@
 import _colors = require('colors');
+
+import * as cliProgress from 'cli-progress';
+
+import {Manifest, ManifestFile} from './manifest';
 import {asyncify, mapLimit} from 'async';
+
 import {Datastore} from '@google-cloud/datastore';
-import {entity} from '@google-cloud/datastore/build/src/entity';
-import {Manifest, ManifestFile} from './manifest';
 import {Storage} from '@google-cloud/storage';
-import * as cliProgress from 'cli-progress';
+import {entity} from '@google-cloud/datastore/build/src/entity';
 
 const datastore = new Datastore();
-const DEFAULT_BUCKET = `${process.env.GCLOUD_PROJECT}.appspot.com`;
 const NUM_CONCURRENT_UPLOADS = 64;
 
 function getBlobPath(siteId: string, hash: string) {
@@ -54,7 +56,6 @@ export async function uploadManifest(
   force?: boolean,
   ttl?: Date
 ) {
-  bucket = bucket || DEFAULT_BUCKET;
   console.log(`Using storage: ${bucket}/${getBlobPath(manifest.site, '')}`);
   const storageBucket = new Storage().bucket(bucket);
   const bar = createProgressBar();
@@ -180,6 +181,6 @@ async function finalize(manifest: Manifest, ttl?: Date) {
   );
   // TODO: Allow customizing the staging URL using `fileset.yaml` configuration.
   console.log(
-    `Staged: https://${manifest.site}-${manifest.shortSha}-dot-fileset2-dot-${process.env.GCLOUD_PROJECT}.appspot.com`
+    `Staged: https://${manifest.site}-${manifest.shortSha}-dot-fileset2-dot-${process.env.GOOGLE_CLOUD_PROJECT}.appspot.com`
   );
 }