test(credentials): bug fixes for static and sts creds tests

Author: siddsriv

clients/client-sts/test/defaultRoleAssumers.spec.ts

@@ -97,7 +97,7 @@ describe("getDefaultRoleAssumer", () => {
     };
     const sourceCred = { accessKeyId: "key", secretAccessKey: "secrete" };
     const assumedRole = await roleAssumer(sourceCred, params);
-    expect(assumedRole.accountId).toEqual("123456789012");
+    expect(assumedRole.accountId).toEqual("123");
   });
 
   it("should use the STS client config", async () => {
@@ -180,6 +180,10 @@ describe("getDefaultRoleAssumer", () => {
 describe("getDefaultRoleAssumerWithWebIdentity", () => {
   const assumeRoleResponse = `<Response xmlns="https://sts.amazonaws.com/doc/2011-06-15/">
   <AssumeRoleWithWebIdentityResult>
+  <AssumedRoleUser>
+      <AssumedRoleId>AROAZOX2IL27GNRBJHWC2:session</AssumedRoleId>
+      <Arn>arn:aws:sts::123456789012:assumed-role/assume-role-test/session</Arn>
+    </AssumedRoleUser>
     <Credentials>
       <AccessKeyId>key</AccessKeyId>
       <SecretAccessKey>secrete</SecretAccessKey>

codegen/smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/sts-client-defaultRoleAssumers.spec.ts

@@ -95,7 +95,7 @@ describe("getDefaultRoleAssumer", () => {
     };
     const sourceCred = { accessKeyId: "key", secretAccessKey: "secrete" };
     const assumedRole = await roleAssumer(sourceCred, params);
-    expect(assumedRole.accountId).toEqual("123456789012");
+    expect(assumedRole.accountId).toEqual("123");
   });
 
   it("should use the STS client config", async () => {
@@ -178,6 +178,10 @@ describe("getDefaultRoleAssumer", () => {
 describe("getDefaultRoleAssumerWithWebIdentity", () => {
   const assumeRoleResponse = `<Response xmlns="https://sts.amazonaws.com/doc/2011-06-15/">
   <AssumeRoleWithWebIdentityResult>
+  <AssumedRoleUser>
+      <AssumedRoleId>AROAZOX2IL27GNRBJHWC2:session</AssumedRoleId>
+      <Arn>arn:aws:sts::123456789012:assumed-role/assume-role-test/session</Arn>
+    </AssumedRoleUser>
     <Credentials>
       <AccessKeyId>key</AccessKeyId>
       <SecretAccessKey>secrete</SecretAccessKey>

packages/credential-provider-ini/src/resolveStaticCredentials.ts

@@ -21,7 +21,8 @@ export const isStaticCredsProfile = (arg: any): arg is StaticCredsProfile =>
   typeof arg === "object" &&
   typeof arg.aws_access_key_id === "string" &&
   typeof arg.aws_secret_access_key === "string" &&
-  ["undefined", "string"].indexOf(typeof arg.aws_session_token) > -1;
+  ["undefined", "string"].indexOf(typeof arg.aws_session_token) > -1 &&
+  ["undefined", "string"].indexOf(typeof arg.aws_account_id) > -1;
 
 /**
  * @internal

packages/credential-provider-process/src/resolveProcessCredentials.spec.ts

@@ -115,6 +115,10 @@ describe(resolveProcessCredentials.name, () => {
     const receivedCreds = await resolveProcessCredentials(mockProfileName, getMockProfiles());
     expect(receivedCreds).toStrictEqual(expectedCreds);
     expect(mockExecPromise).toHaveBeenCalledWith(mockCredentialProcess);
-    expect(getValidatedProcessCredentials).toHaveBeenCalledWith(mockProfileName, JSON.parse(mockExecPromiseOutput));
+    expect(getValidatedProcessCredentials).toHaveBeenCalledWith(
+      mockProfileName,
+      JSON.parse(mockExecPromiseOutput),
+      getMockProfiles()
+    );
   });
 });