test: what is even going on

aws · Oct 30, 2024 · 49fb620 · 49fb620
1 parent 7b6a9a3
commit 49fb620
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/tests/e2e/delete-stale-changesets.js b/tests/e2e/delete-stale-changesets.js
@@ -1,4 +1,4 @@
-const { ListChangeSetsCommand, DeleteChangeSetCommand } = require("../../clients/client-cloudformation");
+const { ListChangeSetsCommand, DeleteChangeSetCommand } = require("@aws-sdk/client-cloudformation");
 
 exports.deleteStaleChangesets = async (client, stackName) => {
   const changesets = await client.send(

diff --git a/tests/e2e/ensure-test-stack.js b/tests/e2e/ensure-test-stack.js
@@ -8,7 +8,7 @@ const {
   waitUntilStackCreateComplete,
   DescribeChangeSetCommand,
   DeleteChangeSetCommand,
-} = require("../../clients/client-cloudformation");
+} = require("@aws-sdk/client-cloudformation");
 
 /**
  * Deploy the integration test stack if it does not exist. Update the

diff --git a/tests/e2e/get-integ-test-resources.js b/tests/e2e/get-integ-test-resources.js
@@ -1,31 +1,33 @@
 const { readFileSync } = require("fs");
 const { join } = require("path");
-const { STSClient, GetCallerIdentityCommand } = require("../../clients/client-sts");
-const { CloudFormationClient, DescribeStackResourcesCommand } = require("../../clients/client-cloudformation");
-const { S3ControlClient, ListMultiRegionAccessPointsCommand } = require("../../clients/client-s3-control");
+const { STSClient, GetCallerIdentityCommand } = require("@aws-sdk/client-sts");
+const { CloudFormationClient, DescribeStackResourcesCommand } = require("@aws-sdk/client-cloudformation");
+const { S3ControlClient, ListMultiRegionAccessPointsCommand } = require("@aws-sdk/client-s3-control");
 const { ensureTestStack } = require("./ensure-test-stack");
 const { deleteStaleChangesets } = require("./delete-stale-changesets");
 const { loadSharedConfigFiles } = require("@smithy/shared-ini-file-loader");
-const { fromIni } = require("@aws-sdk/credential-providers");
+const { createCredentialChain, fromIni, fromHttp } = require("@aws-sdk/credential-providers");
 
 exports.getIntegTestResources = async () => {
   const ini = await loadSharedConfigFiles();
-  if (ini.configFile["sdk-integ-test"] || ini.credentialsFile["sdk-integ-test"]) {
+  const profileData = ini.configFile["sdk-integ-test"] ?? ini.credentialsFile["sdk-integ-test"];
+  if (profileData) {
     process.env.AWS_PROFILE = "sdk-integ-test";
     console.log("Setting AWS_PROFILE=sdk-integ-test");
   } else {
     console.log("AWS_PROFILE is", process.env.AWS_PROFILE);
   }
 
-  // TODO(debug)
-  console.log({
-    config: ini.configFile,
-    credentials: ini.credentialsFile,
+  const credentials = fromIni({
+    ...(profileData.role_arn ? { awsContainerCredentialsRelativeUri: `/role-arn/${profileData.role_arn}` } : {}),
+    profile: process.env.AWS_PROFILE ?? "default",
+    logger: console,
   });
 
   const region = "us-west-2";
   const cloudformation = new CloudFormationClient({
     region,
+    credentials,
   });
   const stackName = "SdkReleaseV3IntegTestResourcesStack";