Merge pull request #393 from architect/param-creds

fix: Creds flattened for aws-lite

Author: ryanbethel

changelog.md

@@ -2,6 +2,15 @@
 
 ---
 
+## [5.0.9] 2025-08-29
+
+## Fixed
+
+- When Credentials are passed as an argument `credentials` they need to be flattened when passed to AWS-lite.
+- Some test mocks were updated because a patch version of @architect/inventory broke the tests.
+
+---
+
 ## [5.0.8] 2025-01-23
 
 ### Changed

index.js

@@ -52,7 +52,7 @@ function run (mod) {
         import('@aws-lite/ssm'),
       ]
       let params = { region, plugins }
-      if (options.credentials) params.credentials = options.credentials
+      if (options.credentials) params = { ...options.credentials, ...params }
       if (options.inventory.inv?.aws?.profile) params.profile = options.inventory.inv.aws.profile
       awsLite(params)
         .then(aws => {

test/mocks/app-with-extensions/src/plugins/one.js

@@ -1,6 +1,8 @@
 module.exports = {
-  package: function ({ cloudformation }) {
-    cloudformation.pluginOne = true
-    return cloudformation
+  deploy: {
+    start: function ({ cloudformation }) {
+      cloudformation.pluginOne = true
+      return cloudformation
+    }
   }
 }

test/mocks/app-with-extensions/src/plugins/two.js

@@ -1,6 +1,8 @@
 module.exports = {
-  package: function ({ cloudformation }) {
-    cloudformation.pluginTwo = true
-    return cloudformation
+  deploy: {
+    start: function ({ cloudformation }) {
+      cloudformation.pluginTwo = true
+      return cloudformation
+    }
   }
 }

test/unit/credentials-structure-test.js

@@ -0,0 +1,52 @@
+let test = require('tape')
+let proxyquire = require('proxyquire')
+let inventory = require('@architect/inventory')
+
+let awsLiteArgs = []
+let mockAwsLite = (args) => {
+  awsLiteArgs.push(args)
+  return Promise.resolve({
+    cloudformation: {
+      DescribeStacks: () => Promise.reject({ message: 'Stack does not exist', statusCode: 400 }),
+      DescribeStackResources: () => Promise.resolve({ StackResources: [] }),
+    },
+  })
+}
+
+// Mock the SAM module directly to prevent sam.json file creation
+let mockSam = proxyquire('../../src/sam', {
+  './00-before': (params, callback) => {
+    // Skip file writing, just call callback with dry-run result
+    callback(null, 'dry-run')
+  },
+})
+
+let deploy = proxyquire('../../', {
+  '@aws-lite/client': mockAwsLite,
+  './src/sam': mockSam,
+})
+
+test('deploy.sam credentials accepted', async t => {
+  t.plan(3)
+  let inv = await inventory({
+    rawArc: '@app\ntest-app\n@static',
+    deployStage: 'staging',
+    shouldHydrate: false,
+  })
+  await deploy.sam({
+    credentials: {
+      accessKeyId: 'ASIATEST123456789',
+      secretAccessKey: 'testSecretKey123456789',
+      sessionToken: 'testSessionToken123456789',
+    },
+    inventory: inv,
+    isDryRun: true,
+    region: 'us-west-2',
+    shouldHydrate: false, // Skip hydration to avoid inventory structure issues
+  })
+  t.ok(awsLiteArgs[0].accessKeyId, 'accessKeyId is present')
+  t.ok(awsLiteArgs[0].secretAccessKey, 'secretAccessKey is present')
+  t.ok(awsLiteArgs[0].sessionToken, 'sessionToken is present')
+
+})
+