Skip to content

Commit

Permalink
Merge branch 'renovate/fastapi-0.x' of https://github.com/bcgov/nr-fo…
Browse files Browse the repository at this point in the history
…rests-access-management into renovate/fastapi-0.x
  • Loading branch information
ianliuwk1019 committed Aug 9, 2023
2 parents c20103d + dff1e12 commit 1125d67
Show file tree
Hide file tree
Showing 53 changed files with 1,628 additions and 133 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci_infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
dev_oidc_bcsc_idp_client_secret: "${{ secrets.DEV_OIDC_BCSC_IDP_CLIENT_SECRET }}"
test_oidc_bcsc_idp_client_secret: "${{ secrets.TEST_OIDC_BCSC_IDP_CLIENT_SECRET }}"
prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"


frontend-terraform-plan:
Expand Down Expand Up @@ -78,3 +79,4 @@ jobs:
dev_oidc_bcsc_idp_client_secret: "${{ secrets.DEV_OIDC_BCSC_IDP_CLIENT_SECRET }}"
test_oidc_bcsc_idp_client_secret: "${{ secrets.TEST_OIDC_BCSC_IDP_CLIENT_SECRET }}"
prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"
1 change: 1 addition & 0 deletions .github/workflows/dev_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
dev_oidc_bcsc_idp_client_secret: "${{ secrets.DEV_OIDC_BCSC_IDP_CLIENT_SECRET }}"
test_oidc_bcsc_idp_client_secret: "${{ secrets.TEST_OIDC_BCSC_IDP_CLIENT_SECRET }}"
prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"

aws-dev-deployment-frontend:
needs: aws-dev-deployment-server
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dev_destruction.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
dev_oidc_bcsc_idp_client_secret: "${{ secrets.DEV_OIDC_BCSC_IDP_CLIENT_SECRET }}"
test_oidc_bcsc_idp_client_secret: "${{ secrets.TEST_OIDC_BCSC_IDP_CLIENT_SECRET }}"
prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"

# Commenting out the destroy because we want cloudfront domain to be persistent
# for DNS configuration reasons
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/prod_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
dev_oidc_bcsc_idp_client_secret: "${{ secrets.DEV_OIDC_BCSC_IDP_CLIENT_SECRET }}"
test_oidc_bcsc_idp_client_secret: "${{ secrets.TEST_OIDC_BCSC_IDP_CLIENT_SECRET }}"
prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"

aws-prod-deployment-frontend:
needs: aws-prod-deployment-server
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/prod_destruction.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
dev_oidc_bcsc_idp_client_secret: "${{ secrets.DEV_OIDC_BCSC_IDP_CLIENT_SECRET }}"
test_oidc_bcsc_idp_client_secret: "${{ secrets.TEST_OIDC_BCSC_IDP_CLIENT_SECRET }}"
prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"

# Commenting out the destroy because we want cloudfront domain to be persistent
# for DNS configuration reasons
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/reusable_terraform_server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,15 @@ on:
prod_oidc_bceid_business_idp_client_secret:
required: true
forest_client_api_api_key:
required: true
dev_oidc_bcsc_idp_client_secret:
required: true
test_oidc_bcsc_idp_client_secret:
required: true
prod_oidc_bcsc_idp_client_secret:
required: true
idim_proxy_api_api_key:
required: true

env:
TF_VERSION: 1.2.2
Expand Down Expand Up @@ -145,6 +148,7 @@ jobs:
dev_oidc_bcsc_idp_client_secret = "${{ secrets.dev_oidc_bcsc_idp_client_secret }}"
test_oidc_bcsc_idp_client_secret = "${{ secrets.test_oidc_bcsc_idp_client_secret }}"
prod_oidc_bcsc_idp_client_secret = "${{ secrets.prod_oidc_bcsc_idp_client_secret }}"
idim_proxy_api_api_key = "${{ secrets.idim_proxy_api_api_key }}"
EOF
- name: Terragrunt ${{ inputs.tf_subcommand }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ jobs:
- name: Tests and coverage
env:
FC_API_TOKEN: ${{ secrets.FOREST_CLIENT_API_API_KEY }}
IDIM_PROXY_API_KEY: ${{ secrets.IDIM_PROXY_API_API_KEY }}
run: |
cd server/backend
pip install -r requirements.txt -r requirements-dev.txt
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
dev_oidc_bcsc_idp_client_secret: "${{ secrets.DEV_OIDC_BCSC_IDP_CLIENT_SECRET }}"
test_oidc_bcsc_idp_client_secret: "${{ secrets.TEST_OIDC_BCSC_IDP_CLIENT_SECRET }}"
prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"

aws-test-deployment-frontend:
needs: aws-test-deployment-server
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test_destruction.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
dev_oidc_bcsc_idp_client_secret: "${{ secrets.DEV_OIDC_BCSC_IDP_CLIENT_SECRET }}"
test_oidc_bcsc_idp_client_secret: "${{ secrets.TEST_OIDC_BCSC_IDP_CLIENT_SECRET }}"
prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"

# Commenting out the destroy because we want cloudfront domain to be persistent
# for DNS configuration reasons
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tools_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
dev_oidc_bcsc_idp_client_secret: "${{ secrets.DEV_OIDC_BCSC_IDP_CLIENT_SECRET }}"
test_oidc_bcsc_idp_client_secret: "${{ secrets.TEST_OIDC_BCSC_IDP_CLIENT_SECRET }}"
prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"

aws-tools-deployment-frontend:
needs: aws-tools-deployment-server
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tools_destruction.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
dev_oidc_bcsc_idp_client_secret: "${{ secrets.DEV_OIDC_BCSC_IDP_CLIENT_SECRET }}"
test_oidc_bcsc_idp_client_secret: "${{ secrets.TEST_OIDC_BCSC_IDP_CLIENT_SECRET }}"
prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"

# Commenting out the destroy because we want cloudfront domain to be persistent
# for DNS configuration reasons
Expand Down
4 changes: 4 additions & 0 deletions client-code-gen/gen/.openapi-generator/FILES
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
.npmignore
README.md
api.ts
api/bcscproxy-api.ts
api/famapplications-api.ts
api/famforest-clients-api.ts
api/famroles-api.ts
api/famuser-role-assignment-api.ts
api/famusers-api.ts
api/idirbce-idproxy-api.ts
api/smoke-test-api.ts
base.ts
common.ts
configuration.ts
Expand All @@ -31,6 +34,7 @@ model/fam-user-role-assignment-get.ts
model/fam-user-type.ts
model/fam-user.ts
model/httpvalidation-error.ts
model/idim-proxy-idir-info.ts
model/index.ts
model/location-inner.ts
model/user-type.ts
Expand Down
3 changes: 3 additions & 0 deletions client-code-gen/gen/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@



export * from './api/bcscproxy-api';
export * from './api/famapplications-api';
export * from './api/famforest-clients-api';
export * from './api/famroles-api';
export * from './api/famuser-role-assignment-api';
export * from './api/famusers-api';
export * from './api/idirbce-idproxy-api';
export * from './api/smoke-test-api';

Loading

0 comments on commit 1125d67

Please sign in to comment.