auth fallback from sso

ljacobsson · Jul 19, 2023 · 629e195 · 629e195
1 parent eb42f21
commit 629e195
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "samp-cli",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "CLI tool for extended productivity with AWS Serverless Application Model (SAM)",
   "main": "index.js",
   "scripts": {

diff --git a/src/commands/local/lib/cleanup.js b/src/commands/local/lib/cleanup.js
@@ -27,9 +27,14 @@ if (!conf.envConfig) process.exit(0);
 const stackName = conf.envConfig.stack_name;
 const region = conf.envConfig.region;
 const profile = conf.envConfig.profile;
+let credentials;
+try {
+  credentials = await fromSSO({ profile, region })();
+} catch (e) {
+}
 
-const cfnClient = new CloudFormationClient({ region, credentials: fromSSO({ profile }) });
-const lambdaClient = new LambdaClient({ region, credentials: fromSSO({ profile }) });
+const cfnClient = new CloudFormationClient({ region, credentials });
+const lambdaClient = new LambdaClient({ region, credentials });
 const templateResponse = await cfnClient.send(new GetTemplateCommand({ StackName: stackName, TemplateStage: "Processed" }));
 const stack = await cfnClient.send(new ListStackResourcesCommand({ StackName: stackName }));
 

diff --git a/src/commands/local/lib/connect.js b/src/commands/local/lib/connect.js
@@ -32,9 +32,16 @@ if (fs.existsSync(`samconfig.toml`)) {
   }
 }
 console.log(`Using profile: ${envConfig.profile || 'default'}`);
-const stsClient = new STSClient({ region: envConfig.region, credentials: fromSSO({ profile: envConfig.profile || 'default' }) });
+
+let credentials;
+try {
+  credentials = await fromSSO({ profile: envConfig.profile || 'default' })();
+} catch (e) {
+}
+
+const stsClient = new STSClient({ region: envConfig.region, credentials });
 const accountId = (await stsClient.send(new GetCallerIdentityCommand({}))).Account;
-const iotClient = new IoTClient({ region: envConfig.region, credentials: fromSSO({ profile: envConfig.profile || 'default' }) });
+const iotClient = new IoTClient({ region: envConfig.region, credentials });
 const timer = new Date().getTime();
 let certData, endpoint, stack, functions, template;
 const policyName = "lambda-debug-policy";
@@ -128,9 +135,7 @@ if (!fs.existsSync(".lambda-debug")) {
   certData.ca = fs.readFileSync(path.join(__dirname, 'AmazonRootCA1.pem')).toString(); // Download this from Amazon's website   
   const cfnClient = new CloudFormationClient({
     region: envConfig.region,
-    credentials: fromSSO({
-      profile: envConfig.profile || 'default'
-    })
+    credentials: credentials
   });
 
   console.log(`Loading necessary resources...`);
@@ -154,9 +159,7 @@ if (!fs.existsSync(".lambda-debug")) {
   // replace function code with stub-local.js
   const lambdaClient = new LambdaClient({
     region: envConfig.region,
-    credentials: fromSSO({
-      profile: envConfig.profile || 'default',
-    })
+    credentials
   });
   if (!fs.existsSync(zipFilePath)) {
     console.log(`Creating Lambda artifact zip`);