refactor(storage): gaxios migration system test fix

handwritten/storage/package.json

@@ -93,7 +93,7 @@
     "@types/mime": "3.0.0",
     "@types/mocha": "^10.0.10",
     "@types/mockery": "^1.4.33",
-    "@types/node": "^24.0.0",
+    "@types/node": "^24.13.3",
     "@types/node-fetch": "^2.6.12",
     "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.4",

handwritten/storage/src/file.ts

@@ -1761,6 +1761,7 @@ class File extends ServiceObject<File, FileMetadata> {
         queryParameters: query as unknown as StorageQueryParameters,
         responseType: 'stream',
         decompress: options.decompress,
+        compress: false,
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any;
 
@@ -4549,7 +4550,8 @@ class File extends ServiceObject<File, FileMetadata> {
     dup: Duplexify,
     options: CreateWriteStreamOptionsInternal = {},
   ): void {
-    options.metadata ??= {};
+    const opts = options as CreateWriteStreamOptionsInternal;
+    opts.metadata ??= {};
 
     const apiEndpoint = this.storage.apiEndpoint;
     const bucketName = this.bucket.name;
@@ -4561,7 +4563,7 @@ class File extends ServiceObject<File, FileMetadata> {
         uploadType: 'multipart',
       },
       url,
-      invocationId: options.invocationId,
+      invocationId: opts.invocationId,
       [GCCL_GCS_CMD_KEY]: options[GCCL_GCS_CMD_KEY],
       method: 'POST',
       responseType: 'json',
@@ -4605,12 +4607,12 @@ class File extends ServiceObject<File, FileMetadata> {
     reqOpts.multipart = [
       {
         headers: new Headers({'Content-Type': 'application/json'}),
-        content: JSON.stringify(options.metadata),
+        content: JSON.stringify(opts.metadata),
       },
       {
         headers: new Headers({
           'Content-Type':
-            options.metadata.contentType || 'application/octet-stream',
+            opts.metadata?.contentType || 'application/octet-stream',
         }),
         content: writeStream,
       },

handwritten/storage/src/iam.ts

@@ -350,8 +350,12 @@ class Iam {
       SetPolicyCallback
     >(optionsOrCallback, callback);
 
+    const policyToSet = {...policy};
+    delete (policyToSet as any).headers;
+    delete (policyToSet as any).status;
+
     let maxRetries;
-    if (policy.etag === undefined) {
+    if (policyToSet.etag === undefined) {
       maxRetries = 0;
     }
 
@@ -361,7 +365,7 @@ class Iam {
           method: 'PUT',
           url: `/storage/v1/b/${this.bucket.name}/iam`,
           maxRetries,
-          body: JSON.stringify(policy),
+          body: JSON.stringify(policyToSet),
           headers: {'Content-Type': 'application/json'},
           queryParameters: options as unknown as StorageQueryParameters,
         },

handwritten/storage/src/storage-transport.ts

@@ -184,6 +184,20 @@ export class StorageTransport {
       hasEtagInBody
     );
 
+    // Helper to enrich GaxiosError objects with legacy ApiError properties
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const decorateError = (err: any) => {
+      if (err && typeof err === 'object') {
+        err.code = err.response?.status || err.status || err.code;
+        if (err.response?.data?.error) {
+          const apiError = err.response.data.error;
+          if (apiError.message) err.message = apiError.message;
+          if (apiError.errors) err.errors = apiError.errors;
+        }
+      }
+      return err;
+    };
+
     try {
       const requestPromise = this.authClient.request<T>({
         adapter: async (opts: GaxiosOptions) => {
@@ -237,20 +251,25 @@ export class StorageTransport {
         return data;
       };
 
+      const enrichedPromise = requestPromise.catch(err => {
+        throw decorateError(err);
+      });
+
       if (callback) {
-        requestPromise
+        enrichedPromise
           .then(resp => callback(null, decorateMetadata(resp), resp))
           .catch(err => callback(err, null, err.response));
-        return requestPromise;
+        return enrichedPromise;
       }
 
-      return requestPromise;
+      return enrichedPromise;
     } catch (e) {
+      const err = decorateError(e);
       if (callback) {
-        callback(e as GaxiosError);
-        return Promise.reject(e);
+        callback(err as GaxiosError);
+        return Promise.reject(err);
       }
-      throw e;
+      throw err;
     }
   }
 

handwritten/storage/system-test/fixtures/index-cjs.js

@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// eslint-disable-next-line no-undef
+/* eslint-disable node/no-missing-require, no-unused-vars, no-undef */
 const {Storage} = require('@google-cloud/storage');
 
 function main() {
-  // eslint-disable-next-line no-unused-vars
   const storage = new Storage();
 }
 

handwritten/storage/system-test/fixtures/index-esm.js

@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// eslint-disable-next-line no-undef
-const {Storage} = require('@google-cloud/storage');
+/* eslint-disable node/no-missing-import, no-unused-vars */
+import {Storage} from '@google-cloud/storage';
 
 function main() {
-  // eslint-disable-next-line no-unused-vars
   const storage = new Storage();
 }
 

handwritten/storage/system-test/install.ts

@@ -21,7 +21,7 @@ describe('pack-n-play tests', () => {
     await packNTest({
       sample: {
         description: 'Should be able to import the storage library in ESM',
-        cjs: readFileSync('./system-test/fixtures/index-esm.js').toString(),
+        ts: readFileSync('./system-test/fixtures/index-esm.js').toString(),
       },
     });
   });

handwritten/storage/system-test/kitchen.ts

@@ -55,7 +55,10 @@ describe('resumable-upload', () => {
     retryableErrorFn: RETRYABLE_ERR_FN_DEFAULT,
   };
 
-  const bucket = new Storage({retryOptions}).bucket(bucketName);
+  const bucket = new Storage({
+    projectId: process.env.PROJECT_ID,
+    retryOptions: retryOptions,
+  }).bucket(bucketName);
   let filePath: string;
 
   before(async () => {
@@ -97,7 +100,7 @@ describe('resumable-upload', () => {
     // see: https://cloud.google.com/storage/docs/exponential-backoff:
     const ms = Math.pow(2, retries) * 1000 + Math.random() * 2000;
     console.info(`retrying "${title}" in ${ms}ms`);
-    setTimeout(done(), ms);
+    setTimeout(() => { done(); }, ms);
   }
 
   it('should work', done => {