Skip to content

Commit 4adafeb

Browse files
authored
Merge pull request #49 from trussworks/tf_upgrades
Making repo updates
2 parents fe7dbad + d49994e commit 4adafeb

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

.circleci/config.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
command: scripts/release $CIRCLE_PROJECT_USERNAME $CIRCLE_PROJECT_REPONAME << pipeline.git.tag >>
3232
validate:
3333
docker:
34-
- image: trussworks/circleci:56e6e6ef96436eff868243a7a0e42322c4df43c5
34+
- image: trussworks/circleci:efb1042e31538677779971798e0912390f699e72
3535
auth:
3636
password: $DOCKER_PASSWORD
3737
username: $DOCKER_USERNAME
@@ -68,19 +68,20 @@ jobs:
6868
- auth:
6969
password: $DOCKER_PASSWORD
7070
username: $DOCKER_USERNAME
71-
image: trussworks/circleci:29ab89fdada1f85c5d8fb685a2c71660f0c5f60c
71+
image: trussworks/circleci:efb1042e31538677779971798e0912390f699e72
7272
steps:
7373
- checkout
7474
- restore_cache:
7575
keys:
7676
- pre-commit-dot-cache-{{ checksum ".pre-commit-config.yaml" }}
7777
- go-mod-sources-v1-{{ checksum "go.sum" }}
7878
- run:
79-
command: "temp_role=$(aws sts assume-role \\\n --role-arn arn:aws:iam::313564602749:role/circleci\
80-
\ \\\n --role-session-name circleci)\nexport AWS_ACCESS_KEY_ID=$(echo\
81-
\ $temp_role | jq .Credentials.AccessKeyId | xargs)\nexport AWS_SECRET_ACCESS_KEY=$(echo\
82-
\ $temp_role | jq .Credentials.SecretAccessKey | xargs)\nexport AWS_SESSION_TOKEN=$(echo\
83-
\ $temp_role | jq .Credentials.SessionToken | xargs)\nmake test\n"
79+
command: |
80+
temp_role=$(aws sts assume-role --role-arn arn:aws:iam::313564602749:role/circleci --role-session-name circleci)
81+
export AWS_ACCESS_KEY_ID=$(echo $temp_role | jq .Credentials.AccessKeyId | xargs)
82+
export AWS_SECRET_ACCESS_KEY=$(echo $temp_role | jq .Credentials.SecretAccessKey | xargs)
83+
export AWS_SESSION_TOKEN=$(echo $temp_role | jq .Credentials.SessionToken | xargs)
84+
make test
8485
name: Assume role, run pre-commit and run terratest
8586
- save_cache:
8687
key: pre-commit-dot-cache-{{ checksum ".pre-commit-config.yaml" }}

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: git://github.com/pre-commit/pre-commit-hooks
3-
rev: v2.5.0
3+
rev: v3.4.0
44
hooks:
55
- id: check-json
66
- id: check-merge-conflict
@@ -12,6 +12,6 @@ repos:
1212
- id: trailing-whitespace
1313

1414
- repo: git://github.com/igorshubovych/markdownlint-cli
15-
rev: v0.22.0
15+
rev: v0.26.0
1616
hooks:
1717
- id: markdownlint

0 commit comments

Comments
 (0)