Merge branch 'node-18' of https://github.com/thiyaguk09/nodejs-storage-fork into node-18

Author: thiyaguk09

handwritten/storage/src/bucket.ts

@@ -2024,7 +2024,7 @@ class Bucket extends ServiceObject<Bucket, BucketMetadata> {
     const body = Object.assign({topic}, options);
 
     if (body.topic.indexOf('projects') !== 0) {
-      body.topic = 'projects/{{projectId}}/topics/' + body.topic;
+      body.topic = `projects/${this.storage.projectId}/topics/` + body.topic;
     }
 
     body.topic = `//pubsub.${this.storage.universeDomain}/` + body.topic;

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

@@ -506,14 +506,17 @@ class ServiceObject<T, K extends BaseMetadata> extends EventEmitter {
           responseType: 'json',
           url,
           ...methodConfig.reqOpts,
-          body: {
+          body: JSON.stringify({
             ...methodConfig.reqOpts?.body,
             ...metadata,
-          },
+          }),
           queryParameters: {
             ...methodConfig.reqOpts?.queryParameters,
             ...options,
           },
+          headers: {
+            'Content-Type': 'application/json',
+          },
         },
         (err, data, resp) => {
           this.metadata = data!;

handwritten/storage/test/bucket.ts

@@ -897,7 +897,7 @@ describe('Bucket', () => {
     const PUBSUB_SERVICE_PATH = '//pubsub.googleapis.com/';
     const TOPIC = 'my-topic';
     const FULL_TOPIC_NAME =
-      PUBSUB_SERVICE_PATH + 'projects/{{projectId}}/topics/' + TOPIC;
+      PUBSUB_SERVICE_PATH + `projects/${PROJECT_ID}/topics/` + TOPIC;
 
     it('should throw an error if a valid topic is not provided', () => {
       // eslint-disable-next-line @typescript-eslint/no-floating-promises

handwritten/storage/test/file.ts

@@ -373,12 +373,10 @@ describe('File', () => {
         STORAGE.storageTransport.makeRequest = sandbox
           .stub()
           .callsFake((reqOpts, callback) => {
+            const body = JSON.parse(reqOpts.body);
             assert.strictEqual(reqOpts.method, 'PATCH');
             assert.strictEqual(reqOpts.url, '/b/bucket-name//o/file-name.png');
-            assert.deepStrictEqual(
-              reqOpts.body.temporaryHold,
-              options.temporaryHold,
-            );
+            assert.deepStrictEqual(body.temporaryHold, options.temporaryHold);
             callback(null);
             return Promise.resolve();
           });

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

@@ -576,10 +576,11 @@ describe('ServiceObject', () => {
           reqOpts,
           callback,
         ) {
+          const body = JSON.parse(reqOpts.body);
           assert.strictEqual(this, serviceObject.storageTransport);
           assert.strictEqual(reqOpts.method, 'PATCH');
           assert.strictEqual(reqOpts.url, 'base-url/undefined');
-          assert.deepStrictEqual(reqOpts.body, metadata);
+          assert.deepStrictEqual(body, metadata);
           done();
           callback!(null);
           return Promise.resolve();