diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index f97e804a..a35c9061 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -412,7 +412,6 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: ${{matrix.dotnetverson}} - - run: dotnet nuget add source ${{ github.workspace }}/nuget - name: Download provider binary uses: actions/download-artifact@v2 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 005dcd72..dc3ac25f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## Unreleased -_(none)_ + +- Update wording for providerCredentialOpt errors + [#559](https://github.com/pulumi/pulumi-eks/pull/559) ## 0.23.0 (Released March 22, 2021) diff --git a/nodejs/eks/cluster.ts b/nodejs/eks/cluster.ts index 763ca5d4..340498f6 100644 --- a/nodejs/eks/cluster.ts +++ b/nodejs/eks/cluster.ts @@ -1379,15 +1379,15 @@ export class Cluster extends pulumi.ComponentResource { // Check that AWS provider credential options are set for the kubeconfig // to use with the given auth method. if (opts?.provider && !args.providerCredentialOpts) { - throw new Error("providerCredentialOpts and an AWS provider instance must be set together"); + 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("providerCredentialOpts and AWS_PROFILE must be set together"); + throw new Error("It looks like you're using AWS profiles. Please specify this profile in providerCredentialOpts."); } const awsConfig = new pulumi.Config("aws"); const awsProfile = awsConfig.get("profile"); if (awsProfile && !args.providerCredentialOpts) { - throw new Error("providerCredentialOpts and AWS config setting aws:profile must be set together"); + throw new Error("It looks like you've set an AWS profile in your stack config. Please specify this profile providerCredentialOpts."); } // Create the core resources required by the cluster.