Do not require providerCredentialOpts Cluster parameter when using AW…

…S_PROFILE (#561) Co-authored-by: Paul Stack <public@paulstack.co.uk>
pulumi · May 9, 2022 · 973916f · 973916f
1 parent 76c0172
commit 973916f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,6 +52,11 @@
 - Upgrade Pulumi dependencies
   [#589](https://github.com/pulumi/pulumi-eks/pull/589)
 
+### Improvements
+
+ - Do not require providerCredentialOpts Cluster parameter when using AWS_PROFILE
+   [#561](https://github.com/pulumi/pulumi-eks/pull/561)
+
 ## 0.30.0 (Released April 19, 2021)
 
 - Upgrade Pulumi dependencies to 3.0 releases

diff --git a/nodejs/eks/cluster.ts b/nodejs/eks/cluster.ts
@@ -1392,12 +1392,16 @@ export class Cluster extends pulumi.ComponentResource {
             throw new Error("It looks like you're using an explicit AWS provider. Please specify this provider in providerCredentialOpts.");
         }
         if (process.env.AWS_PROFILE && !args.providerCredentialOpts) {
-            throw new Error("It looks like you're using AWS profiles. Please specify this profile in providerCredentialOpts.");
+            args.providerCredentialOpts = {
+                profileName: process.env.AWS_PROFILE,
+            };
         }
         const awsConfig = new pulumi.Config("aws");
         const awsProfile = awsConfig.get("profile");
         if (awsProfile && !args.providerCredentialOpts) {
-            throw new Error("It looks like you've set an AWS profile in your stack config. Please specify this profile in providerCredentialOpts.");
+            args.providerCredentialOpts = {
+                profileName: awsProfile,
+            };
         }
 
         // Create the core resources required by the cluster.