Skip to content

Commit 3de4c42

Browse files
EspenAlbertEspenAlbert
committed
Merge branch 'master' into CLOUDP-282800_trigger_nil_pointer
2 parents 28a7488 + d3d88a3 commit 3de4c42

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+5480
-5789
lines changed

‎.github/workflows/cleanup-test-env.yml‎

Lines changed: 65 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,77 @@ on:
66
- cron: "0 3 * * *" # workflow runs every day at 03:00 AM
77

88
jobs:
9-
clenup-test-env-general:
9+
cleanup-dev-cfn-test-github:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: Checkout
12+
- name: terraform-provider-mongodbatlas-checkout
1313
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1414
with:
15-
sparse-checkout: |
16-
scripts
17-
- uses: mongodb/atlas-github-action@15663d068c40a8582d881560961fce9d45e0df9a
15+
repository: mongodb/terraform-provider-mongodbatlas
1816
- name: Cleanup cloud-dev CFN Test GitHub
19-
shell: bash
17+
uses: ./.github/templates/clean-atlas-org
2018
env:
2119
MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.CLOUD_DEV_PUBLIC_KEY }}
2220
MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.CLOUD_DEV_PRIVATE_KEY }}
2321
MONGODB_ATLAS_ORG_ID: ${{ secrets.CLOUD_DEV_ORG_ID }}
24-
MONGODB_ATLAS_OPS_MANAGER_URL: ${{ vars.MONGODB_ATLAS_BASE_URL }}
25-
PROJECT_TO_NOT_DELETE: ${{ vars.CLOUD_DEV_PROJECT_ID }}
26-
run: ./scripts/cleanup-test-env.sh
22+
MONGODB_ATLAS_BASE_URL: ${{ vars.MONGODB_ATLAS_BASE_URL }}
23+
MONGODB_ATLAS_CLEAN_RETRY_ATTEMPTS: "1"
24+
cleanup-dev-cfntest:
25+
runs-on: ubuntu-latest
26+
steps:
27+
- name: terraform-provider-mongodbatlas-checkout
28+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
29+
with:
30+
repository: mongodb/terraform-provider-mongodbatlas
31+
- name: Cleanup cloud-dev CFN Test
32+
uses: ./.github/templates/clean-atlas-org
33+
env:
34+
MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.CLOUD_DEV_CFN_TEST_PUBLIC_KEY }}
35+
MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.CLOUD_DEV_CFN_TEST_PRIVATE_KEY }}
36+
MONGODB_ATLAS_ORG_ID: ${{ secrets.CLOUD_DEV_CFN_TEST_ORG_ID }}
37+
MONGODB_ATLAS_BASE_URL: ${{ vars.MONGODB_ATLAS_BASE_URL }}
38+
MONGODB_ATLAS_CLEAN_RETRY_ATTEMPTS: "1"
39+
cleanup-qa-env-rp:
40+
runs-on: ubuntu-latest
41+
steps:
42+
- name: terraform-provider-mongodbatlas-checkout
43+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
44+
with:
45+
repository: mongodb/terraform-provider-mongodbatlas
46+
- name: Cleanup cloud-dev CFN Test GitHub
47+
uses: ./.github/templates/clean-atlas-org
48+
env:
49+
MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.MONGODB_ATLAS_RP_PUBLIC_KEY_QA }}
50+
MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.MONGODB_ATLAS_RP_PRIVATE_KEY_QA }}
51+
MONGODB_ATLAS_ORG_ID: ${{ vars.MONGODB_ATLAS_RP_ORG_ID_QA }}
52+
MONGODB_ATLAS_BASE_URL: https://cloud-qa.mongodb.com/
53+
MONGODB_ATLAS_CLEAN_RETRY_ATTEMPTS: "1"
54+
cleanup-prod-env-general:
55+
runs-on: ubuntu-latest
56+
steps:
57+
- name: terraform-provider-mongodbatlas-checkout
58+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
59+
with:
60+
repository: mongodb/terraform-provider-mongodbatlas
61+
- name: Cleanup cloud-dev CFN Test GitHub
62+
uses: ./.github/templates/clean-atlas-org
63+
env:
64+
MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.ATLAS_PUBLIC_KEY_PUBLISHING }}
65+
MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.ATLAS_PRIVATE_KEY_PUBLISHING }}
66+
MONGODB_ATLAS_ORG_ID: ${{ secrets.ATLAS_ORG_ID_PUBLISHING }}
67+
MONGODB_ATLAS_CLEAN_RETRY_ATTEMPTS: "1"
68+
cleanup-prod-data-federation:
69+
runs-on: ubuntu-latest
70+
steps:
71+
- name: terraform-provider-mongodbatlas-checkout
72+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
73+
with:
74+
repository: mongodb/terraform-provider-mongodbatlas
75+
ref: 133ee57735e0c8f2b22e74bbd9f8c3fdd8da2f9c
76+
- name: Cleanup cloud-dev CFN Test GitHub
77+
uses: ./.github/templates/clean-atlas-org
78+
env:
79+
MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.ATLAS_PUBLIC_KEY_FOR_FEDERATION_PUBLISHING }}
80+
MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.ATLAS_PRIVATE_KEY_FOR_FEDERATION_PUBLISHING }}
81+
MONGODB_ATLAS_ORG_ID: ${{ vars.ATLAS_ORG_ID_FOR_FEDERATION_PUBLISHING }}
82+
MONGODB_ATLAS_CLEAN_RETRY_ATTEMPTS: "1"

‎.github/workflows/code-health.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1313
- name: Set up Go
14-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
14+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
1515
with:
1616
go-version-file: 'cfn-resources/go.mod'
1717
- name: Build
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2525
- name: Set up Go
26-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
26+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
2727
with:
2828
go-version-file: 'cfn-resources/go.mod'
2929
- name: Generate mocks
@@ -45,12 +45,12 @@ jobs:
4545
runs-on: ubuntu-latest
4646
steps:
4747
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
48-
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
48+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
4949
with:
5050
go-version-file: 'cfn-resources/go.mod'
5151
cache: false # see https://github.com/golangci/golangci-lint-action/issues/807
5252
- name: golangci-lint
53-
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8
53+
uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84
5454
with:
5555
version: v1.60.3 # Also update GOLANGCI_VERSION variable in Makefile when updating this version
5656
working-directory: cfn-resources
@@ -63,7 +63,7 @@ jobs:
6363
runs-on: ubuntu-latest
6464
steps:
6565
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
66-
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
66+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
6767
with:
6868
go-version-file: 'cfn-resources/go.mod'
6969
- name: install tools
@@ -78,7 +78,7 @@ jobs:
7878
- name: 'Checkout Repository'
7979
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
8080
- name: 'Dependency Review'
81-
uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a
81+
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019
8282
shellcheck:
8383
name: shellcheck
8484
runs-on: ubuntu-latest
@@ -92,7 +92,7 @@ jobs:
9292
- name: 'Checkout Repository'
9393
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
9494
- name: 'Setup cfn-lint'
95-
uses: scottbrenner/cfn-lint-action@ee477703112bdb0bf078bd06b361ee16aaeb24d9
95+
uses: scottbrenner/cfn-lint-action@2d3d07f3527aab48a973d3ee6e66009e87ea3491
9696
- name: 'Run cfn-lint'
9797
run: |
9898
shopt -s globstar # enable globbing
@@ -104,7 +104,7 @@ jobs:
104104
runs-on: ubuntu-latest
105105
steps:
106106
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
107-
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed
107+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
108108
with:
109109
go-version-file: 'cfn-resources/go.mod'
110110
- name: run-unit-test

0 commit comments

Comments
 (0)