Fix incorrect patrhing n bucketname

grafana · Apr 27, 2023 · 767eb77 · 767eb77
1 parent fb54949
commit 767eb77
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/build/aws.js b/build/aws.js
diff --git a/build/aws.js.map b/build/aws.js.map
diff --git a/build/index.js b/build/index.js
diff --git a/build/index.js.map b/build/index.js.map
diff --git a/build/s3.js b/build/s3.js
diff --git a/build/s3.js.map b/build/s3.js.map
diff --git a/src/internal/s3.ts b/src/internal/s3.ts
@@ -102,14 +102,14 @@ export class S3Client extends AWSClient {
     listObjects(bucketName: string, prefix?: string): Array<S3Object> {
         // Prepare request
         const method = 'GET'
-        const host = `${bucketName}.${this.host}`
+        const host = `${this.host}`
 
         const signedRequest: SignedHTTPRequest = this.signature.sign(
             {
                 method: 'GET',
                 protocol: this.scheme,
                 hostname: host,
-                path: '/',
+                path: `/${bucketName}/`,
                 query: {
                     'list-type': '2',
                     prefix: prefix || '',
@@ -171,14 +171,14 @@ export class S3Client extends AWSClient {
     getObject(bucketName: string, objectKey: string): S3Object {
         // Prepare request
         const method = 'GET'
-        const host = `${bucketName}.${this.host}`
+        const host = `${this.host}`
 
         const signedRequest = this.signature.sign(
             {
                 method: 'GET',
                 protocol: this.scheme,
                 hostname: host,
-                path: `/${objectKey}`,
+                path: `/${bucketName}/${objectKey}`,
                 headers: {},
             },
             {}
@@ -216,14 +216,14 @@ export class S3Client extends AWSClient {
     putObject(bucketName: string, objectKey: string, data: string | ArrayBuffer) {
         // Prepare request
         const method = 'PUT'
-        const host = `${bucketName}.${this.host}`
-
+        const host = `${this.host}`
+  
         const signedRequest = this.signature.sign(
             {
                 method: method,
                 protocol: this.scheme,
                 hostname: host,
-                path: `/${objectKey}`,
+                path: `/${bucketName}/${objectKey}`,
                 headers: {
                     'Host': host,
                 },
@@ -250,14 +250,14 @@ export class S3Client extends AWSClient {
     deleteObject(bucketName: string, objectKey: string): void {
         // Prepare request
         const method = 'DELETE'
-        const host = `${bucketName}.${this.host}`
+        const host = `${this.host}`
 
         const signedRequest = this.signature.sign(
             {
                 method: method,
                 protocol: this.scheme,
                 hostname: host,
-                path: `/${objectKey}`,
+                path: `/${bucketName}/${objectKey}`,
                 headers: {},
             },
             {}