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.

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

Update CircleCI AWS CLI Orb syntax #6086

Merged
merged 2 commits into from
Oct 19, 2023
Merged
Changes from all commits
Commits
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
53 changes: 32 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
version: 2.1

orbs:
aws-cli: circleci/[email protected]
aws-cli: circleci/[email protected]
aws-ecs: circleci/[email protected]
opsgenie: opsgenie/[email protected]


jobs:
frontend-code-test:
resource_class: large
Expand Down Expand Up @@ -68,7 +70,7 @@ jobs:
TM_ORG_CODE: "CICode"
TM_ORG_NAME: "CircleCI Test Organisation"

- image: cimg/postgres:14.2-postgis
- image: cimg/postgres:14.9-postgis
environment:
POSTGRES_USER: taskingmanager
POSTGRES_DB: test_tm
Expand All @@ -79,12 +81,6 @@ jobs:
- run: sudo apt-get update
- run: sudo apt-get -y install libgeos-dev # Required for shapely
- run: sudo apt-get -y install proj-bin libproj-dev
- run:
name: Configure Postgresql Test database
command: |
psql \
-d $SQLALCHEMY_DATABASE_URI \
-c "CREATE EXTENSION postgis;"
- run: pip install --upgrade pip pdm
- run: pdm config --global python.use_venv False
- run: pdm export --dev --without-hashes > requirements.txt
Expand Down Expand Up @@ -113,13 +109,13 @@ jobs:
description: "Cloudformation stack name"
type: string
docker:
- image: cimg/postgres:15.1-postgis
- image: cimg/postgres:15.4-postgis
steps:
- aws-cli/setup:
role-arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
profile-name: "OIDC-Profile"
role-session-name: "database-snapshot"
session-duration: "2700"
role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
profile_name: "OIDC-Profile"
role_session_name: "database-snapshot"
session_duration: "2700"
- run:
name: Find the instance ID of the database in the stack to backup
command: |
Expand Down Expand Up @@ -193,10 +189,10 @@ jobs:
steps:
- checkout
- aws-cli/setup:
role-arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
profile-name: "OIDC-Profile"
role-session-name: "backend-deploy"
session-duration: "2700"
role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
profile_name: "OIDC-Profile"
role_session_name: "backend-deploy"
session_duration: "2700"
- run: sudo apt-get update
- run: sudo apt-get -y install libgeos-dev jq
- run: sudo yarn global add @mapbox/cfn-config @mapbox/cloudfriend
Expand All @@ -222,6 +218,21 @@ jobs:
export JSON_CONFIG="$(< $CIRCLE_WORKING_DIRECTORY/cfn-config-<< parameters.stack_name >>.json)"
cfn-config update << parameters.stack_name >> $CIRCLE_WORKING_DIRECTORY/scripts/aws/cloudformation/tasking-manager.template.js -f -c hot-cfn-config -t hot-cfn-config -r $AWS_REGION -p "$JSON_CONFIG"

backend_deploy_containers:
working_directory: /home/circleci/tasking-manager
docker:
- image: cimg/python:3.10.7
steps:
- checkout
- aws-cli/setup:
role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
profile_name: "OIDC-Profile"
role_session_name: "backend-deploy-containers"
session_duration: "2700"
- run: sudo apt-get update
- run: sudo apt-get -y install curl
- run: echo "Run AWS Fargate"

frontend_deploy:
working_directory: /home/circleci/tasking-manager
resource_class: large
Expand All @@ -234,10 +245,10 @@ jobs:
steps:
- checkout
- aws-cli/setup:
role-arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
profile-name: "OIDC-Profile"
role-session-name: "frontend-deploy"
session-duration: "1800"
role_arn: "arn:aws:iam::$ORG_AWS_ACCOUNT_ID:role/CircleCI-OIDC-Connect"
profile_name: "OIDC-Profile"
role_session_name: "frontend-deploy"
session_duration: "1800"
- run:
name: Deploy Frontend to S3
command: |
Expand Down
Loading