File tree Expand file tree Collapse file tree 7 files changed +32
-0
lines changed
Expand file tree Collapse file tree 7 files changed +32
-0
lines changed Original file line number Diff line number Diff line change 6363 poetry install
6464
6565 - name : Configure AWS credentials
66+ <<<<<<< HEAD
6667 uses : aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 # v2
68+ =======
69+ uses : aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4
70+ >>>>>>> f9f668f9 (Bump aws-actions/configure-aws-credentials from 4.1.0 to 4.2.1 in /.github/workflows (#3324))
6771 with :
6872 aws-access-key-id : ${{ secrets.AWS_ACCESS_KEY_ID }}
6973 aws-secret-access-key : ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -137,7 +141,11 @@ jobs:
137141 echo "DIRECT_KEY_STACK_NAME=direct-key-stack-pr${{ github.event.number }}-$suffix" >> $GITHUB_ENV
138142
139143 - name : Configure AWS credentials
144+ <<<<<<< HEAD
140145 uses : aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4
146+ =======
147+ uses : aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4
148+ >>>>>>> f9f668f9 (Bump aws-actions/configure-aws-credentials from 4.1.0 to 4.2.1 in /.github/workflows (#3324))
141149 with :
142150 aws-access-key-id : ${{ secrets.AWS_ACCESS_KEY_ID_TEST_ACC }}
143151 aws-secret-access-key : ${{ secrets.AWS_SECRET_ACCESS_KEY_TEST_ACC }}
Original file line number Diff line number Diff line change 6464 echo "TF_VAR_ec_api_key=$ec_api_key" >> $GITHUB_ENV
6565
6666 - name : Configure AWS credentials
67+ <<<<<<< HEAD
6768 uses : aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 # v2
69+ =======
70+ uses : aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4
71+ >>>>>>> f9f668f9 (Bump aws-actions/configure-aws-credentials from 4.1.0 to 4.2.1 in /.github/workflows (#3324))
6872 with :
6973 aws-access-key-id : ${{ env.AWS_ACCESS_KEY_ID }}
7074 aws-secret-access-key : ${{ env.AWS_SECRET_ACCESS_KEY }}
Original file line number Diff line number Diff line change 2121 init-tools : ' true'
2222
2323 - name : Configure AWS credentials
24+ <<<<<<< HEAD
2425 uses : aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 # v2
26+ =======
27+ uses : aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4
28+ >>>>>>> f9f668f9 (Bump aws-actions/configure-aws-credentials from 4.1.0 to 4.2.1 in /.github/workflows (#3324))
2529 with :
2630 aws-access-key-id : ${{ secrets.AWS_ACCESS_KEY_ID }}
2731 aws-secret-access-key : ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Original file line number Diff line number Diff line change @@ -131,7 +131,11 @@ jobs:
131131 key : ${{ runner.os }}-dockers-cache-${{ env.CONTAINER_SUFFIX }}
132132
133133 - name : Configure AWS credentials
134+ <<<<<<< HEAD
134135 uses : aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 # v2
136+ =======
137+ uses : aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4
138+ >>>>>>> f9f668f9 (Bump aws-actions/configure-aws-credentials from 4.1.0 to 4.2.1 in /.github/workflows (#3324))
135139 with :
136140 aws-access-key-id : ${{ env.AWS_ACCESS_KEY_ID }}
137141 aws-secret-access-key : ${{ env.AWS_SECRET_ACCESS_KEY }}
Original file line number Diff line number Diff line change 2020 - uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2121
2222 - name : Configure AWS Credentials
23+ <<<<<<< HEAD
2324 uses : aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 # v2
25+ =======
26+ uses : aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4
27+ >>>>>>> f9f668f9 (Bump aws-actions/configure-aws-credentials from 4.1.0 to 4.2.1 in /.github/workflows (#3324))
2428 with :
2529 aws-access-key-id : ${{ secrets.CSPM_CFT_ACCESS_KEY_ID }}
2630 aws-secret-access-key : ${{ secrets.CSPM_CFT_SECRET_ACCESS_KEY }}
Original file line number Diff line number Diff line change @@ -275,7 +275,11 @@ jobs:
275275 poetry install
276276
277277 - name : Configure AWS credentials
278+ <<<<<<< HEAD
278279 uses : aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
280+ =======
281+ uses : aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
282+ >>>>>>> f9f668f9 (Bump aws-actions/configure-aws-credentials from 4.1.0 to 4.2.1 in /.github/workflows (#3324))
279283 with :
280284 aws-access-key-id : ${{ env.AWS_ACCESS_KEY_ID }}
281285 aws-secret-access-key : ${{ env.AWS_SECRET_ACCESS_KEY }}
Original file line number Diff line number Diff line change @@ -122,7 +122,11 @@ jobs:
122122 poetry install
123123
124124 - name : Configure AWS credentials
125+ <<<<<<< HEAD
125126 uses : aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4
127+ =======
128+ uses : aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4
129+ >>>>>>> f9f668f9 (Bump aws-actions/configure-aws-credentials from 4.1.0 to 4.2.1 in /.github/workflows (#3324))
126130 with :
127131 role-to-assume : arn:aws:iam::704479110758:role/Developer_eks
128132 role-session-name : github-ci
You can’t perform that action at this time.
0 commit comments