Merge branch 'develop' into main

grafana · Apr 19, 2022 · f3c5863 · f3c5863
2 parents 9671e60 + b965f44
commit f3c5863
Show file tree

Hide file tree

Showing 25 changed files with 2,110 additions and 505 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ import {
     // listBuckets,
     AWSConfig,
     S3Client,
-} from 'https://jslib.k6.io/aws/0.2.0/index.js'
+} from 'https://jslib.k6.io/aws/0.3.0/s3.js'
 
 const testFile = open('./bonjour.txt', 'r')
 
@@ -69,7 +69,7 @@ export default function () {
 ```javascript
 import exec from 'k6/execution'
 
-import { AWSConfig, SecretsManagerClient } from 'https://jslib.k6.io/aws/0.2.0/index.js'
+import { AWSConfig, SecretsManagerClient } from 'https://jslib.k6.io/aws/0.3.0/secrets-manager.js'
 
 const awsConfig = new AWSConfig(
     __ENV.AWS_REGION,

diff --git a/babel.config.json b/babel.config.json
@@ -1,8 +1,10 @@
 {
-  "presets": [
-    [
-      "@babel/preset-env"
-    ]
-  ],
-  "plugins": [ "@babel/plugin-transform-block-scoping"]
-}
+  "presets": ["@babel/env", "@babel/typescript"],
+  "plugins": [
+    "@babel/proposal-class-properties",
+
+    "@babel/proposal-object-rest-spread",
+
+    "@babel/plugin-transform-block-scoping"
+  ]
+}
diff --git a/build/aws.min.js b/build/aws.min.js
diff --git a/build/aws.min.js.map b/build/aws.min.js.map
diff --git a/build/s3.min.js b/build/s3.min.js
diff --git a/build/s3.min.js.map b/build/s3.min.js.map
diff --git a/build/secrets-manager.min.js b/build/secrets-manager.min.js
diff --git a/build/secrets-manager.min.js.map b/build/secrets-manager.min.js.map
diff --git a/examples/s3.js b/examples/s3.js
@@ -1,6 +1,6 @@
 import exec from 'k6/execution'
 
-import { AWSConfig, S3Client } from '../build/aws.min.js'
+import { AWSConfig, S3Client } from '../build/s3.min.js'
 
 const testFile = open('./bonjour.txt', 'r')
 

diff --git a/examples/secrets-manager.js b/examples/secrets-manager.js
@@ -1,6 +1,6 @@
 import exec from 'k6/execution'
 
-import { AWSConfig, SecretsManagerClient } from '../build/aws.min.js'
+import { AWSConfig, SecretsManagerClient } from '../build/secrets-manager.min.js'
 
 const awsConfig = new AWSConfig(
     __ENV.AWS_REGION,
@@ -29,11 +29,11 @@ export default function () {
 
     // Now that we know the secret exist, let's update its value
     const newTestSecretValue = 'new-test-value'
-    secretsManager.putSecretValue(testSecretName, newTestSecretValue)
+    const u = secretsManager.putSecretValue(testSecretName, newTestSecretValue)
 
     // Let's get its value and verify it was indeed updated
     const updatedSecret = secretsManager.getSecret(testSecretName)
-    if (updatedSecret.secretString !== newTestSecretValue) {
+    if (updatedSecret.secret !== newTestSecretValue) {
         exec.test.abort('unable to update test secret')
     }