test(storage): fix system tests after gaxios migration

handwritten/storage/src/bucket.ts

@@ -1603,7 +1603,7 @@ class Bucket extends ServiceObject<Bucket, BucketMetadata> {
         return;
       }
 
-      const currentLifecycleRules = Array.isArray(metadata.lifecycle?.rule)
+      const currentLifecycleRules = Array.isArray(metadata?.lifecycle?.rule)
         ? metadata.lifecycle?.rule
         : [];
 

handwritten/storage/src/nodejs-common/service-object.ts

@@ -492,7 +492,9 @@ class ServiceObject<T, K extends BaseMetadata> extends EventEmitter {
           },
         },
         (err, data, resp) => {
-          this.metadata = data!;
+          if (!err && data) {
+            this.metadata = data;
+          }
           callback(err, data!, resp);
         },
       )
@@ -532,11 +534,11 @@ class ServiceObject<T, K extends BaseMetadata> extends EventEmitter {
         this.methods.setMetadata) ||
       {};
 
-    let url = `${this.baseUrl}/${this.name}`;
+    let url = `${this.baseUrl}/${this.id}`;
     if (isBucket(this.parent)) {
       // TODO: remove any suppression during follow up PR to improve type safety.
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      url = `${this.parent.baseUrl}/${(this.parent as any).name}${url}`;
+      url = `${this.parent.baseUrl}/${(this.parent as any).id}${url}`;
     }
 
     const body = Object.assign({}, methodConfig.reqOpts?.body, metadata);
@@ -558,8 +560,14 @@ class ServiceObject<T, K extends BaseMetadata> extends EventEmitter {
           },
         },
         (err, data, resp) => {
-          this.metadata = data!;
-          callback(err, this.metadata, resp);
+          if (!err && data) {
+            this.metadata = data;
+          }
+          callback(
+            err,
+            (err ? undefined : this.metadata) as unknown as K,
+            resp,
+          );
         },
       )
       // eslint-disable-next-line promise/no-callback-in-promise

handwritten/storage/src/nodejs-common/util.ts

@@ -295,7 +295,21 @@ export function decorateHeaders(
   headers?: Headers,
   options?: DecorateHeadersOptions,
 ): DecorateHeadersResult {
-  const sanitizedHeaders: Headers = {...headers};
+  const sanitizedHeaders: Headers = {};
+  if (headers) {
+    if (
+      typeof (headers as Headers & {entries?: () => Iterable<[string, string]>})
+        .entries === 'function'
+    ) {
+      for (const [key, value] of (
+        headers as Headers & {entries: () => Iterable<[string, string]>}
+      ).entries()) {
+        sanitizedHeaders[key] = value;
+      }
+    } else {
+      Object.assign(sanitizedHeaders, headers);
+    }
+  }
   const userTokenKey = Object.keys(sanitizedHeaders).find(
     key => key.toLowerCase() === 'x-goog-gcs-idempotency-token',
   );

handwritten/storage/src/storage-transport.ts

@@ -178,6 +178,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) => {
@@ -231,11 +245,15 @@ export class StorageTransport {
         return data;
       };
 
+      const enrichedPromise = requestPromise.catch(err => {
+        throw decorateError(err);
+      });
+
       if (callback) {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         (async () => {
           try {
-            const resp = await requestPromise;
+            const resp = await enrichedPromise;
             callback(null, decorateMetadata(resp), resp);
           } catch (err: unknown) {
             callback(
@@ -245,16 +263,17 @@ export class StorageTransport {
             );
           }
         })();
-        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/src/storage.ts

@@ -1205,15 +1205,15 @@ export class Storage {
             'Content-Type': 'application/json',
           },
         },
-        (err, data, resp) => {
+        (err, data) => {
           if (err) {
             callback(err);
             return;
           }
           const bucket = this.bucket(name);
           bucket.metadata = data!;
 
-          callback(null, bucket, resp);
+          callback(null, bucket, data);
         },
       )
       .catch(err => callback!(err));
@@ -1331,7 +1331,7 @@ export class Storage {
           retry: false,
           responseType: 'json',
         },
-        (err, data, resp) => {
+        (err, data) => {
           if (err) {
             callback(err);
             return;
@@ -1347,7 +1347,7 @@ export class Storage {
             null,
             hmacKey,
             hmacKey.secret,
-            resp as unknown as HmacKeyResourceResponse,
+            data as HmacKeyResourceResponse,
           );
         },
       )

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(),
+        esm: 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 => {