Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop Workflows From Using Root Permissions in Cypress Container #1480

Merged
merged 14 commits into from
Feb 24, 2023
Merged

Stop Workflows From Using Root Permissions in Cypress Container #1480

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b3ecfa8
Create a11y testing workflow file.
olivereri Feb 21, 2023
f13391a
Remove root user option from cypress test container run.
olivereri Feb 21, 2023
5a0c6da
Remove build and upload portions of content-build. Download build art…
olivereri Feb 22, 2023
b106e35
change cypress container version. Matches vets-website e2e workflow
olivereri Feb 22, 2023
da2321e
fix typo
olivereri Feb 22, 2023
1bbea65
remove testing file. Remove root user from a11y workflows.
olivereri Feb 22, 2023
c4273bd
Remove root user from CI workflows.
olivereri Feb 23, 2023
fd6952f
Mount /etc/ssl/certs to containers respective folder. remove mv step.
olivereri Feb 23, 2023
67b10f5
Dont mount host cert directory. Copy VA certs to container cert direc…
olivereri Feb 23, 2023
c64af44
Run CI job on Content-Build ASG. Comment out on-demand runner
olivereri Feb 23, 2023
6fcceda
Fix typo
olivereri Feb 24, 2023
5e0787a
Remove On-demand Runner jobs
olivereri Feb 24, 2023
6779e6b
Remove cert mv step. No longer needed.
olivereri Feb 24, 2023
c84c2b7
Use verbose docker run options.
olivereri Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/a11y-heading-order.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
runs-on: [self-hosted, asg]
container:
image: public.ecr.aws/cypress-io/cypress/browsers:node16.13.2-chrome100-ff98
options: -u 1001:1001 -v /usr/local/share:/share --user root
options: -u 1001:1001 -v /usr/local/share:/share
strategy:
fail-fast: false
max-parallel: 32
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/a11y.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
runs-on: [self-hosted, asg]
container:
image: public.ecr.aws/cypress-io/cypress/browsers:node16.13.2-chrome100-ff98
options: -u 1001:1001 -v /usr/local/share:/share --user root
options: -u 1001:1001 -v /usr/local/share:/share
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might be nice to change the flags here to --user and --volume here, because we really should've noticed earlier that we were specifying the same argument twice

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/channeling inner Elijah

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

diff --git a/.github/workflows/a11y-heading-order.yml b/.github/workflows/a11y-heading-order.yml
index 5c0fda9ac..f058f2699 100644
--- a/.github/workflows/a11y-heading-order.yml
+++ b/.github/workflows/a11y-heading-order.yml
@@ -125,7 +125,7 @@ jobs:
     runs-on: [self-hosted, asg]
     container:
       image: public.ecr.aws/cypress-io/cypress/browsers:node16.13.2-chrome100-ff98
-      options: -u 1001:1001 -v /usr/local/share:/share
+      options: --user 1001:1001 --volume /usr/local/share:/share
     strategy:
       fail-fast: false
       max-parallel: 32
(1/1) Stage this hunk [y,n,q,a,d,e,?]? y

diff --git a/.github/workflows/a11y.yml b/.github/workflows/a11y.yml
index 4121b6b15..be9adeb0d 100644
--- a/.github/workflows/a11y.yml
+++ b/.github/workflows/a11y.yml
@@ -159,7 +159,7 @@ jobs:
     runs-on: [self-hosted, asg]
     container:
       image: public.ecr.aws/cypress-io/cypress/browsers:node16.13.2-chrome100-ff98
-      options: -u 1001:1001 -v /usr/local/share:/share
+      options: --user 1001:1001 --volume /usr/local/share:/share
     strategy:
       fail-fast: false
       max-parallel: 32
(1/1) Stage this hunk [y,n,q,a,d,e,?]? y

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 1591db5a6..819494cd6 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -358,7 +358,7 @@ jobs:
     timeout-minutes: 30
     container:
       image: public.ecr.aws/cypress-io/cypress/browsers:node16.13.2-chrome100-ff98
-      options: -u 1001:1001
+      options: --user 1001:1001
       volumes:
         - /usr/local/share:/share
         - /etc/ssl/certs:/etc/ssl/certs
(1/1) Stage this hunk [y,n,q,a,d,e,?]? y

image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gladiator-thumbsup

strategy:
fail-fast: false
max-parallel: 32
Expand Down
102 changes: 6 additions & 96 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,63 +243,6 @@ jobs:
payload: ${{ steps.get-broken-link-info.outputs.SLACK_BLOCKS }}
channel-id: ${{ env.BROKEN_LINKS_SLACK }}

start-runner:
runs-on: [self-hosted]
outputs:
label: ${{ steps.start-ec2-runner.outputs.label }}
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
timeout-minutes: 15

steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-gov-west-1

- name: Get bot token from Parameter Store
uses: marvinpinto/action-inject-ssm-secrets@v1.2.1
with:
ssm_parameter: /devops/VA_VSP_BOT_GITHUB_TOKEN
env_variable_name: VA_VSP_BOT_GITHUB_TOKEN

- name: Get latest GHA Runner AMI ID
run: |
echo "RUNNER_AMI_ID=$(aws ec2 describe-images \
--owners 008577686731 \
--filters "Name=state,Values=available" "Name=name,Values=platform-gha-runner-ubuntu*" \
--query 'sort_by(Images,&CreationDate)[-1].ImageId' \
--output text)" >> $GITHUB_ENV

- name: Get Subnet with the most free IPs # We will run these in the dsva-vagov-utility-2x subnet, so filter for those
run: |
echo "SUBNET_ID=$(aws ec2 describe-subnets \
--filters "Name=tag:Name,Values=dsva-vagov-utility-subnet-2*" \
--query 'sort_by(Subnets,&AvailableIpAddressCount)[-1].SubnetId' \
--output text)" >> $GITHUB_ENV

- name: Start EC2 Runner
id: start-ec2-runner
uses: department-of-veterans-affairs/ec2-github-runner@main
with:
mode: start
github-token: ${{ env.VA_VSP_BOT_GITHUB_TOKEN }}
ec2-image-id: ${{ env.RUNNER_AMI_ID }}
ec2-instance-type: ${{ env.INSTANCE_TYPE }}
subnet-id: ${{ env.SUBNET_ID }}
security-group-id: sg-0e23b56be3798e3a1
max_attempts: 3
aws-resource-tags: >
[
{"Key": "Name", "Value": "dsva-vagov-content-build-gha-runner"},
{"Key": "project", "Value": "vagov"},
{"Key": "office", "Value": "dsva"},
{"Key": "application", "Value": "gha-runner"},
{"Key": "VAECID", "Value": "AWG20180517003"},
{"Key": "environment", "Value": "utility"}
]

unit-tests:
name: Unit Tests
runs-on: ubuntu-latest
Expand Down Expand Up @@ -409,29 +352,28 @@ jobs:

cypress-tests:
name: Cypress E2E Tests
runs-on: ${{ needs.start-runner.outputs.label }}
runs-on: [self-hosted, asg]
needs:
- start-runner
- build
timeout-minutes: 30
container:
image: public.ecr.aws/cypress-io/cypress/browsers:node16.13.2-chrome100-ff98
options: -u 0
options: -u 1001:1001
volumes:
- /usr/local/share:/share
- /etc/ssl/certs
- /etc/ssl/certs:/etc/ssl/certs

env:
NODE_EXTRA_CA_CERTS: /etc/ssl/certs/VA-Internal-S2-RCA-combined.pem
NODE_EXTRA_CA_CERTS: /etc/ssl/certs/ca-certificates.crt
CHROMEDRIVER_FILEPATH: /share/chrome_driver/chromedriver

steps:
- name: Checkout content-build
uses: actions/checkout@v3

# Required for Docker
- name: Move VA cert to /etc/ssl/certs
run: mv certs/VA-Internal-S2-RCA-combined.pem /etc/ssl/certs/
#- name: Move VA cert to /etc/ssl/certs
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we don't need these, should we remove them?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, will do.

# run: mv certs/VA-Internal-S2-RCA-combined.pem /etc/ssl/certs/

- name: Download production build
run: curl -L "https://s3-us-gov-west-1.amazonaws.com/vetsgov-website-builds-s3-upload/content-build/${{ github.sha }}/vagovprod.tar.bz2" -o vagovprod.tar.bz2
Expand Down Expand Up @@ -785,35 +727,3 @@ jobs:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

stop-runner:
name: Stop on-demand-runner
needs:
- start-runner
- cypress-tests
runs-on: ubuntu-latest
if: ${{ always() }} # Even if an error happened, let's stop the runner
env:
INSTANCE_TYPE: c5.4xlarge
timeout-minutes: 15

steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-gov-west-1

- name: Get bot token from Parameter Store
uses: marvinpinto/action-inject-ssm-secrets@v1.2.1
with:
ssm_parameter: /devops/VA_VSP_BOT_GITHUB_TOKEN
env_variable_name: VA_VSP_BOT_GITHUB_TOKEN

- name: Stop Runner
uses: department-of-veterans-affairs/ec2-github-runner@main
with:
mode: stop
github-token: ${{ env.VA_VSP_BOT_GITHUB_TOKEN }}
label: ${{ needs.start-runner.outputs.label }}
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}