bug: fix an issue where mime types are not preserved (#262)

Author: sethvargo

README.md

@@ -294,6 +294,14 @@ If `parent` is set to `false`, it wil be uploaded to `gs://bucket-name/folder2/f
     process_gcloudignore: true
     ```
 
+-   `project_id` - (Optional) Google Cloud project ID to use for billing and API
+    requests. By default, this is extracted from the credentials or the running
+    environment.
+
+    ```yaml
+    project_id: 'my-project'
+    ```
+
 - `credentials`:  (**Deprecated**) This input is deprecated. See [auth
   section](#via-google-github-actionsauth) for more details. [Google Service
   Account JSON][sa] credentials as JSON or base64 encoded string, typically

action.yml

@@ -9,6 +9,11 @@ inputs:
       formatted private key which can be exported from the Cloud Console. The
       value can be raw or base64-encoded.
     required: false
+  project_id:
+    description: |-
+      Project ID to use for making requests. By default, this is extracted from
+      the credentials or the running environment.
+    required: false
   path:
     description: |-
       The path to a file or folder inside the action's filesystem

package.json

@@ -5,7 +5,7 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "ncc build -m src/main.ts",
-    "lint": "eslint src/ tests/ --ext .ts,.tsx",
+    "lint": "eslint src/ tests/ --ext .ts,.tsx --max-warnings 0",
     "format": "eslint src/ tests/ --ext .ts,.tsx --fix",
     "test": "mocha -r ts-node/register -t 600s 'tests/**/*.test.ts'"
   },

src/client.ts

@@ -25,7 +25,7 @@ import {
 } from '@google-github-actions/actions-utils';
 
 import { Metadata } from './headers';
-import { parseBucketNameAndPrefix } from './util';
+import { deepClone, parseBucketNameAndPrefix } from './util';
 
 // Do not listen to the linter - this can NOT be rewritten as an ES6 import statement.
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -132,6 +132,7 @@ export class Client {
     if (opts?.credentials) {
       options.credentials = parseCredential(opts.credentials);
     }
+
     this.storage = new Storage(options);
   }
 
@@ -156,16 +157,20 @@ export class Client {
       const base = opts.includeParent ? path.basename(opts.root) : '';
       const destination = path.posix.join(prefix, base, file);
 
-      // Build options
+      // Build options.
       const abs = path.resolve(opts.root, toPlatformPath(file));
-      const uploadOpts = {
+
+      // Apparently the Cloud Storage SDK modifies this object, so we need to
+      // make our own deep copy before passing it to upload. See #258 for more
+      // information.
+      const uploadOpts = deepClone({
         destination: destination,
         metadata: opts.metadata || {},
         gzip: opts.gzip,
         predefinedAcl: opts.predefinedAcl,
         resumable: opts.resumable,
         configPath: randomFilepath(),
-      };
+      });
 
       // Execute callback if defined
       if (opts.onUploadObject) {

src/main.ts

@@ -63,6 +63,7 @@ export async function run(): Promise<void> {
     const processGcloudIgnore = core.getBooleanInput('process_gcloudignore');
     const metadata = headersInput === '' ? {} : parseHeadersInput(headersInput);
     const credentials = core.getInput('credentials');
+    const projectID = core.getInput('project_id');
 
     // Add warning if using credentials.
     if (credentials) {
@@ -88,7 +89,7 @@ export async function run(): Promise<void> {
     // - Format all files to be posix relative to input.path
     // - Filter out items that match
     if (processGcloudIgnore) {
-      core.debug(`processing gcloudignore`);
+      core.debug(`Processing gcloudignore`);
 
       const ignores = ignore();
 
@@ -98,8 +99,8 @@ export async function run(): Promise<void> {
         const ignoreList = await parseGcloudIgnore(gcloudIgnorePath);
 
         if (ignoreList.length) {
-          core.debug(`using .gcloudignore at: ${gcloudIgnorePath}`);
-          core.debug(`parsed ignore list: ${JSON.stringify(ignoreList)}`);
+          core.debug(`Using .gcloudignore at: ${gcloudIgnorePath}`);
+          core.debug(`Parsed ignore list: ${JSON.stringify(ignoreList)}`);
 
           ignores.add(ignoreList);
         }
@@ -108,27 +109,30 @@ export async function run(): Promise<void> {
           const name = files[i];
           try {
             if (ignores.ignores(name)) {
-              core.debug(`ignoring ${name} because of ignore file`);
+              core.debug(`Ignoring ${name} because of ignore file`);
               files.splice(i, 1);
               i--;
             }
           } catch (err) {
             const msg = errorMessage(err);
-            core.error(`failed to process ignore for ${name}, skipping: ${msg}`);
+            core.error(`Failed to process ignore for ${name}, skipping: ${msg}`);
           }
         }
       }
     }
 
-    core.debug(`uploading ${files.length} files: ${JSON.stringify(files)}`);
+    core.debug(`Uploading ${files.length} files: ${JSON.stringify(files)}`);
 
     // Emit a helpful warning in case people specify the wrong directory.
     if (files.length === 0) {
       core.warning(NO_FILES_WARNING);
     }
 
     // Create the client and upload files.
-    const client = new Client({ credentials: credentials });
+    const client = new Client({
+      credentials: credentials,
+      projectID: projectID,
+    });
     const uploadResponses = await client.upload({
       destination: destination,
       root: absoluteRoot,

src/util.ts

@@ -16,6 +16,7 @@
 
 import { promises as fs } from 'fs';
 import * as path from 'path';
+import * as v8 from 'v8';
 
 import globby from 'globby';
 import { toPlatformPath, toPosixPath } from '@google-github-actions/actions-utils';
@@ -106,3 +107,13 @@ export async function expandGlob(directoryPath: string, glob: string): Promise<s
 
   return filesList.sort();
 }
+
+/**
+ * deepClone makes a deep clone of the given object.
+ *
+ * @param obj T, object to clone
+ * @return T a copy of the object
+ */
+export function deepClone<T>(obj: T): T {
+  return v8.deserialize(v8.serialize(obj));
+}