Skip to content

Commit bbcfa68

Browse files
SpicyGarlicAlbacoreRollSpicyGarlicAlbacoreRoll
authored
Merge pull request #35 from asfadmin/test
Swap from us-west-2 to us-east-1
2 parents 4feea97 + 87816f6 commit bbcfa68

7 files changed

Lines changed: 139 additions & 134 deletions

File tree

‎.github/workflows/deploy-prod-staging.yml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,59 +8,59 @@ on:
88

99
jobs:
1010
# Deploy Staging
11-
deploy-edc-prod-staging:
12-
runs-on: ubuntu-latest
13-
environment: edc-prod
14-
permissions:
15-
id-token: write
16-
contents: read
11+
# deploy-edc-prod-staging:
12+
# runs-on: ubuntu-latest
13+
# environment: edc-prod
14+
# permissions:
15+
# id-token: write
16+
# contents: read
1717

18-
steps:
19-
- name: Checkout
20-
uses: actions/checkout@v4
18+
# steps:
19+
# - name: Checkout
20+
# uses: actions/checkout@v4
2121

22-
- name: build
23-
uses: ./.github/workflows/search-api-composite
24-
with:
25-
aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
26-
vpc-id: ${{ secrets.VPC_ID }}
27-
subnet-ids: ${{ secrets.SUBNET_IDS }}
28-
security-group: ${{ secrets.SECURITY_GROUP }}
29-
staging: true
22+
# - name: build
23+
# uses: ./.github/workflows/search-api-composite
24+
# with:
25+
# aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
26+
# vpc-id: ${{ secrets.VPC_ID }}
27+
# subnet-ids: ${{ secrets.SUBNET_IDS }}
28+
# security-group: ${{ secrets.SECURITY_GROUP }}
29+
# staging: true
3030

31-
run-edc-prod-staging-integration-tests:
32-
needs: [deploy-edc-prod-staging]
33-
runs-on: ubuntu-latest
34-
environment: edc-prod
35-
permissions:
36-
id-token: write
37-
contents: read
38-
steps:
39-
- name: Checkout code
40-
uses: actions/checkout@v4
41-
- name: Configure AWS OIDC credentials
42-
uses: aws-actions/configure-aws-credentials@v3
43-
with:
44-
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/SearchAPIActionsOIDCRole
45-
aws-region: us-west-2
46-
- name: Set up Python
47-
uses: actions/setup-python@v4
48-
with:
49-
python-version: "3.11"
31+
# run-edc-prod-staging-integration-tests:
32+
# needs: [deploy-edc-prod-staging]
33+
# runs-on: ubuntu-latest
34+
# environment: edc-prod
35+
# permissions:
36+
# id-token: write
37+
# contents: read
38+
# steps:
39+
# - name: Checkout code
40+
# uses: actions/checkout@v4
41+
# - name: Configure AWS OIDC credentials
42+
# uses: aws-actions/configure-aws-credentials@v3
43+
# with:
44+
# role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/SearchAPIActionsOIDCRole
45+
# aws-region: us-east-1
46+
# - name: Set up Python
47+
# uses: actions/setup-python@v4
48+
# with:
49+
# python-version: "3.11"
5050

51-
- name: Install dependencies
52-
shell: bash
53-
run: |
54-
python -m pip install --upgrade pip
55-
python -m pip install -r requirements.txt
56-
python -m pip install -r tests/requirements.txt
57-
python -m pip install .
51+
# - name: Install dependencies
52+
# shell: bash
53+
# run: |
54+
# python -m pip install --upgrade pip
55+
# python -m pip install -r requirements.txt
56+
# python -m pip install -r tests/requirements.txt
57+
# python -m pip install .
5858

59-
- name: run tests
60-
shell: bash
61-
run: |
62-
pytest tests/integration/test_stack.py \
63-
--reruns 3 --reruns-delay 10
59+
# - name: run tests
60+
# shell: bash
61+
# run: |
62+
# pytest tests/integration/test_stack.py \
63+
# --reruns 3 --reruns-delay 10
6464

6565
deploy-prod-staging:
6666
runs-on: ubuntu-latest
@@ -93,7 +93,7 @@ jobs:
9393
uses: aws-actions/configure-aws-credentials@v3
9494
with:
9595
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/SearchAPIActionsOIDCRole
96-
aws-region: us-west-2
96+
aws-region: us-east-1
9797

9898
- name: Set up Python
9999
uses: actions/setup-python@v4

‎.github/workflows/deploy-prod.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ on:
66
- prod
77

88
jobs:
9-
deploy-edc-prod:
10-
runs-on: ubuntu-latest
11-
environment: edc-prod
12-
permissions:
13-
id-token: write
14-
contents: read
15-
16-
steps:
17-
- name: Checkout
18-
uses: actions/checkout@v4
19-
20-
- name: build
21-
uses: ./.github/workflows/search-api-composite
22-
with:
23-
aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
24-
vpc-id: ${{ secrets.VPC_ID }}
25-
subnet-ids: ${{ secrets.SUBNET_IDS }}
26-
security-group: ${{ secrets.SECURITY_GROUP }}
9+
# deploy-edc-prod:
10+
# runs-on: ubuntu-latest
11+
# environment: edc-prod
12+
# permissions:
13+
# id-token: write
14+
# contents: read
15+
16+
# steps:
17+
# - name: Checkout
18+
# uses: actions/checkout@v4
19+
20+
# - name: build
21+
# uses: ./.github/workflows/search-api-composite
22+
# with:
23+
# aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
24+
# vpc-id: ${{ secrets.VPC_ID }}
25+
# subnet-ids: ${{ secrets.SUBNET_IDS }}
26+
# security-group: ${{ secrets.SECURITY_GROUP }}
2727

2828
deploy-prod:
2929
runs-on: ubuntu-latest

‎.github/workflows/deploy-test-staging.yml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,59 +8,59 @@ on:
88

99
jobs:
1010
# Deploy Staging
11-
deploy-edc-test-staging:
12-
runs-on: ubuntu-latest
13-
environment: edc-test
14-
permissions:
15-
id-token: write
16-
contents: read
11+
# deploy-edc-test-staging:
12+
# runs-on: ubuntu-latest
13+
# environment: edc-test
14+
# permissions:
15+
# id-token: write
16+
# contents: read
1717

18-
steps:
19-
- name: Checkout
20-
uses: actions/checkout@v4
18+
# steps:
19+
# - name: Checkout
20+
# uses: actions/checkout@v4
2121

22-
- name: build
23-
uses: ./.github/workflows/search-api-composite
24-
with:
25-
aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
26-
vpc-id: ${{ secrets.VPC_ID }}
27-
subnet-ids: ${{ secrets.SUBNET_IDS }}
28-
security-group: ${{ secrets.SECURITY_GROUP }}
29-
staging: true
22+
# - name: build
23+
# uses: ./.github/workflows/search-api-composite
24+
# with:
25+
# aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
26+
# vpc-id: ${{ secrets.VPC_ID }}
27+
# subnet-ids: ${{ secrets.SUBNET_IDS }}
28+
# security-group: ${{ secrets.SECURITY_GROUP }}
29+
# staging: true
3030

31-
run-edc-test-staging-integration-tests:
32-
needs: [deploy-edc-test-staging]
33-
runs-on: ubuntu-latest
34-
environment: edc-test
35-
permissions:
36-
id-token: write
37-
contents: read
38-
steps:
39-
- name: Checkout code
40-
uses: actions/checkout@v4
41-
- name: Configure AWS OIDC credentials
42-
uses: aws-actions/configure-aws-credentials@v3
43-
with:
44-
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/SearchAPIActionsOIDCRole
45-
aws-region: us-west-2
46-
- name: Set up Python
47-
uses: actions/setup-python@v4
48-
with:
49-
python-version: "3.11"
31+
# run-edc-test-staging-integration-tests:
32+
# needs: [deploy-edc-test-staging]
33+
# runs-on: ubuntu-latest
34+
# environment: edc-test
35+
# permissions:
36+
# id-token: write
37+
# contents: read
38+
# steps:
39+
# - name: Checkout code
40+
# uses: actions/checkout@v4
41+
# - name: Configure AWS OIDC credentials
42+
# uses: aws-actions/configure-aws-credentials@v3
43+
# with:
44+
# role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/SearchAPIActionsOIDCRole
45+
# aws-region: us-east-1
46+
# - name: Set up Python
47+
# uses: actions/setup-python@v4
48+
# with:
49+
# python-version: "3.11"
5050

51-
- name: Install dependencies
52-
shell: bash
53-
run: |
54-
python -m pip install --upgrade pip
55-
python -m pip install -r requirements.txt
56-
python -m pip install -r tests/requirements.txt
57-
python -m pip install .
51+
# - name: Install dependencies
52+
# shell: bash
53+
# run: |
54+
# python -m pip install --upgrade pip
55+
# python -m pip install -r requirements.txt
56+
# python -m pip install -r tests/requirements.txt
57+
# python -m pip install .
5858

59-
- name: run tests
60-
shell: bash
61-
run: |
62-
pytest tests/integration/test_stack.py \
63-
--reruns 3 --reruns-delay 10
59+
# - name: run tests
60+
# shell: bash
61+
# run: |
62+
# pytest tests/integration/test_stack.py \
63+
# --reruns 3 --reruns-delay 10
6464

6565
deploy-test-staging:
6666
runs-on: ubuntu-latest
@@ -93,7 +93,7 @@ jobs:
9393
uses: aws-actions/configure-aws-credentials@v3
9494
with:
9595
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/SearchAPIActionsOIDCRole
96-
aws-region: us-west-2
96+
aws-region: us-east-1
9797

9898
- name: Set up Python
9999
uses: actions/setup-python@v4

‎.github/workflows/deploy-test.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ on:
66
- test
77

88
jobs:
9-
deploy-edc-test:
10-
runs-on: ubuntu-latest
11-
environment: edc-test
12-
permissions:
13-
id-token: write
14-
contents: read
9+
# deploy-edc-test:
10+
# runs-on: ubuntu-latest
11+
# environment: edc-test
12+
# permissions:
13+
# id-token: write
14+
# contents: read
1515

16-
steps:
17-
- name: Checkout
18-
uses: actions/checkout@v4
16+
# steps:
17+
# - name: Checkout
18+
# uses: actions/checkout@v4
1919

20-
- name: build
21-
uses: ./.github/workflows/search-api-composite
22-
with:
23-
aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
24-
vpc-id: ${{ secrets.VPC_ID }}
25-
subnet-ids: ${{ secrets.SUBNET_IDS }}
26-
security-group: ${{ secrets.SECURITY_GROUP }}
20+
# - name: build
21+
# uses: ./.github/workflows/search-api-composite
22+
# with:
23+
# aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
24+
# vpc-id: ${{ secrets.VPC_ID }}
25+
# subnet-ids: ${{ secrets.SUBNET_IDS }}
26+
# security-group: ${{ secrets.SECURITY_GROUP }}
2727

2828
deploy-test:
2929
runs-on: ubuntu-latest

‎.github/workflows/search-api-composite/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ runs:
2828
uses: aws-actions/configure-aws-credentials@v3
2929
with:
3030
role-to-assume: arn:aws:iam::${{ inputs.aws-account-id }}:role/SearchAPIActionsOIDCRole
31-
aws-region: us-west-2
31+
aws-region: us-east-1
3232

3333
- name: Set up Python
3434
uses: actions/setup-python@v4

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
2525
-
2626
2727
-->
28+
------
29+
## [1.0.3](https://github.com/asfadmin/Discovery-SearchAPI-v3/compare/v1.0.2...v1.0.3)
30+
### Changed
31+
- Swap deployment region from us-west-2 to us-east-1
32+
2833
------
2934
## [1.0.2](https://github.com/asfadmin/Discovery-SearchAPI-v3/compare/v1.0.1...v1.0.2)
3035

‎tests/integration/test_stack.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import asf_search as asf
44
import os
55

6-
cf_client = boto3.client('cloudformation', region_name=os.getenv('CDK_DEFAULT_REGION', 'us-west-2'))
6+
cf_client = boto3.client('cloudformation', region_name=os.getenv('CDK_DEFAULT_REGION', 'us-east-1'))
77
cf_response = cf_client.describe_stacks(StackName='SearchAPI-V3-Stack-Staging')
88
rest_api_url = cf_response['Stacks'][0]['Outputs'][0]['OutputValue']
99
session = asf.ASFSession()

0 commit comments

Comments
 (0)