merge and fix conflicts

src/transfer-manager.ts

@@ -26,10 +26,10 @@ import AsyncRetry from 'async-retry';
 import {ApiError} from './nodejs-common/index.js';
 import {GaxiosResponse, Headers} from 'gaxios';
 import {createHash} from 'crypto';
-import {GCCL_GCS_CMD_KEY} from './nodejs-common/util';
-import {getRuntimeTrackingString} from './util';
+import {GCCL_GCS_CMD_KEY} from './nodejs-common/util.js';
+import {getPackageJSON, getRuntimeTrackingString} from './util.js';
 
-const packageJson = require('../../package.json');
+const packageJson = getPackageJSON();
 
 /**
  * Default number of concurrently executing promises to use when calling uploadManyFiles.
@@ -248,7 +248,11 @@ class XMLMultiPartUploadHelper implements MultiPartUploadHelper {
         if (res.data && res.data.error) {
           throw res.data.error;
         }
-        const parsedXML = this.xmlParser.parse(res.data);
+        const parsedXML = this.xmlParser.parse<{
+          InitiateMultipartUploadResult: {
+            UploadId: string;
+          };
+        }>(res.data);
         this.uploadId = parsedXML.InitiateMultipartUploadResult.UploadId;
       } catch (e) {
         this.#handleErrorResponse(e as Error, bail);

system-test/storage.ts

@@ -157,10 +157,7 @@ describe('storage', () => {
     beforeEach(() => {
       delete process.env.GOOGLE_APPLICATION_CREDENTIALS;
       delete process.env.GOOGLE_CLOUD_PROJECT;
-      delete require.cache[require.resolve('../src')];
 
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const {Storage} = require('../src');
       storageWithoutAuth = new Storage({
         retryOptions: {
           idempotencyStrategy: IdempotencyStrategy.RetryAlways,
@@ -1701,7 +1698,9 @@ describe('storage', () => {
 
               // Get the service account for the "second" account (the
               // one that will read the requester pays file).
-              const clientEmail = require(key2!).client_email;
+              const clientEmail = JSON.parse(
+                fs.readFileSync(key2!, 'utf-8')
+              ).client_email;
 
               policy.bindings.push({
                 role: 'roles/storage.admin',

test/nodejs-common/service.ts

@@ -535,7 +535,9 @@ describe('Service', () => {
       service.makeAuthenticatedRequest = (reqOpts: DecorateRequestOptions) => {
         const pkg = service.packageJson;
         const r = new RegExp(
-          `^gl-node/${process.versions.node} gccl/${pkg.version} gccl-invocation-id/(?<gcclInvocationId>[^W]+) gccl-gcs-cmd/${expected}$`
+          `^gl-node/${process.versions.node} gccl/${
+            pkg.version
+          }-${getModuleFormat()} gccl-invocation-id/(?<gcclInvocationId>[^W]+) gccl-gcs-cmd/${expected}$`
         );
         assert.ok(r.test(reqOpts.headers!['x-goog-api-client']));
         done();

test/nodejs-common/util.ts

@@ -38,6 +38,7 @@ import {
   Abortable,
   ApiError,
   DecorateRequestOptions,
+  Duplexify,
   GCCL_GCS_CMD_KEY,
   GoogleErrorBody,
   GoogleInnerError,

test/transfer-manager.ts

@@ -299,13 +299,13 @@ describe('Transfer Manager', () => {
     }
 
     before(async () => {
-      directory = await fsp.mkdtemp(
+      directory = await promises.mkdtemp(
         path.join(tmpdir(), 'tm-uploadFileInChunks-')
       );
 
       filePath = path.join(directory, 't.txt');
 
-      await fsp.writeFile(filePath, 'hello');
+      await promises.writeFile(filePath, 'hello');
     });
 
     beforeEach(async () => {
@@ -323,7 +323,7 @@ describe('Transfer Manager', () => {
     });
 
     after(async () => {
-      await fsp.rm(directory, {force: true, recursive: true});
+      await promises.rm(directory, {force: true, recursive: true});
     });
 
     it('should call initiateUpload, uploadPart, and completeUpload', async () => {