Skip to content

Commit 67b4013

Browse files
authored
Revert "Resolves issues with static credentials auth and add tests (#214)" (#216)
This reverts commit b59332d.
1 parent 8761b53 commit 67b4013

File tree

3 files changed

+5
-22
lines changed

3 files changed

+5
-22
lines changed

.circleci/test-deploy.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -195,17 +195,6 @@ jobs:
195195
cat ~/.aws/credentials
196196
- run: |
197197
aws sts get-caller-identity --profile integration-test-multiple-setups-env
198-
integration-test-static-credentials:
199-
parameters:
200-
executor:
201-
type: executor
202-
executor: <<parameters.executor>>
203-
steps:
204-
- aws-cli/setup:
205-
aws_access_key_id: $AWS_ACCESS_KEY_ID
206-
aws_secret_access_key: $AWS_SECRET_ACCESS_KEY
207-
- run: |
208-
aws sts get-caller-identity
209198
workflows:
210199
test-deploy:
211200
jobs:
@@ -371,12 +360,6 @@ workflows:
371360
post-steps:
372361
- check_aws_version:
373362
version: "2.15.57"
374-
- integration-test-static-credentials:
375-
context: [CPE_ORBS_AWS]
376-
matrix:
377-
alias: integration-test-static-credentials
378-
parameters:
379-
executor: ["linuxvm", "windows", "arm"]
380363
- integration-test-install:
381364
name: integration-test-skip-install-matched-version
382365
context: [CPE_ORBS_AWS]
@@ -418,7 +401,7 @@ workflows:
418401
pub_type: production
419402
enable_pr_comment: true
420403
context: orb-publisher
421-
requires: [orb-tools/pack, integration-test-static-credentials, test-install, test-install-version, test-install-override-version, integration-test-web-identity-with-profile, integration test web identity command with white spaces,integration-test-role-arn-config, test-install-override-version-with-latest, integration-test-skip-install-matched-version, integration-test-brew-install, integration-test-multiple-setups, integration-test-multiple-setups-reverse]
404+
requires: [orb-tools/pack, test-install, test-install-version, test-install-override-version, integration-test-web-identity-with-profile, integration test web identity command with white spaces,integration-test-role-arn-config, test-install-override-version-with-latest, integration-test-skip-install-matched-version, integration-test-brew-install, integration-test-multiple-setups, integration-test-multiple-setups-reverse]
422405
filters: *release-filters
423406
executors:
424407
terraform:

src/commands/setup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ parameters:
4444
AWS access key. By default this will be set to the $AWS_ACCESS_KEY_ID.
4545
If you don't have these variable in your context, update the value.
4646
type: string
47-
default: $AWS_ACCESS_KEY_ID
47+
default: AWS_ACCESS_KEY_ID
4848

4949
aws_secret_access_key:
5050
description: |
5151
AWS secret key. By default this will be set to the $AWS_SECRET_ACCESS_KEY.
5252
If you don't have these variable in your context, update the value.
5353
type: string
54-
default: $AWS_SECRET_ACCESS_KEY
54+
default: AWS_SECRET_ACCESS_KEY
5555

5656
region:
5757
description: |

src/scripts/configure.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
#shellcheck disable=SC1090
3-
AWS_CLI_STR_ACCESS_KEY_ID="$(echo "$AWS_CLI_STR_ACCESS_KEY_ID" | circleci env subst)"
4-
AWS_CLI_STR_SECRET_ACCESS_KEY="$(echo "$AWS_CLI_STR_SECRET_ACCESS_KEY" | circleci env subst)"
3+
AWS_CLI_STR_ACCESS_KEY_ID="$(echo "\$$AWS_CLI_STR_ACCESS_KEY_ID" | circleci env subst)"
4+
AWS_CLI_STR_SECRET_ACCESS_KEY="$(echo "\$$AWS_CLI_STR_SECRET_ACCESS_KEY" | circleci env subst)"
55
AWS_CLI_STR_SESSION_TOKEN="$(echo "$AWS_CLI_STR_SESSION_TOKEN" | circleci env subst)"
66
AWS_CLI_STR_REGION="$(echo "$AWS_CLI_STR_REGION" | circleci env subst)"
77
AWS_CLI_STR_PROFILE_NAME="$(echo "$AWS_CLI_STR_PROFILE_NAME" | circleci env subst)"

0 commit comments

Comments
 (0)