Skip to content
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4083614
adjust workflows & delete example
maastha Aug 2, 2025
e5df57a
min required
maastha Aug 2, 2025
9ede13c
fmt
maastha Aug 2, 2025
4ad099d
min
maastha Aug 2, 2025
bd5175c
min
maastha Aug 2, 2025
e9c14cb
syntax
maastha Aug 2, 2025
38a73d9
Update acceptance-tests-runner.yml
maastha Aug 4, 2025
a1132a9
Update preview_provider_v2.go
maastha Aug 5, 2025
cc84844
Update shared_resource.go
maastha Aug 5, 2025
9b70a87
fmt
maastha Aug 5, 2025
0bb3b8b
changelog
maastha Aug 5, 2025
208afb7
Merge branch 'CLOUDP-320243-dev-2.0.0' into CLOUDP-334497-disable_adv…
maastha Aug 5, 2025
ac71ea3
ClusterResourceHcl
maastha Aug 6, 2025
c277f93
cleanup
maastha Aug 6, 2025
8742e03
lint
maastha Aug 6, 2025
a793d94
nit
maastha Aug 6, 2025
73d4806
update cluster config
maastha Aug 6, 2025
4acb660
Apply suggestions from code review
maastha Aug 6, 2025
71454b0
add env var
maastha Aug 6, 2025
b96ee55
Merge branch 'CLOUDP-320243-dev-2.0.0' into CLOUDP-334497-disable_adv…
maastha Aug 7, 2025
6620cb9
chore: Update repository examples to use TPF configuration for advanc…
maastha Aug 8, 2025
df5313f
chore: Updates advanced_cluster migration tests to primarily use TPF …
maastha Aug 8, 2025
8b3cc92
test: Update `mongodbatlas_advanced_cluster` acceptance tests to prim…
maastha Aug 9, 2025
e83947a
Merge branch 'CLOUDP-320243-dev-2.0.0' into CLOUDP-334497-disable_adv…
maastha Aug 10, 2025
794f4fb
merge
maastha Aug 10, 2025
cd8b1e3
fmt
maastha Aug 10, 2025
a179588
test fix
maastha Aug 10, 2025
74b581e
mig test optional arg
maastha Aug 10, 2025
1bb9950
mig test optional arg
maastha Aug 10, 2025
a309331
mig test optional arg
maastha Aug 11, 2025
ea1dda9
fmt
maastha Aug 11, 2025
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
11 changes: 11 additions & 0 deletions .changelog/3547.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
```release-note:breaking-change
resource/mongodbatlas_advanced_cluster: Disables legacy SDKv2 implementation of this resource and removes MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER feature flag
```

```release-note:breaking-change
data-source/mongodbatlas_advanced_cluster: Disables legacy SDKv2 implementation of this datasource and removes MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER feature flag
```

```release-note:breaking-change
data-source/mongodbatlas_advanced_clusters: Disables legacy SDKv2 implementation of this datasource and removes MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER feature flag
```
30 changes: 3 additions & 27 deletions .github/workflows/acceptance-tests-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -380,34 +380,10 @@ jobs:
- 'internal/service/streamprocessor/*.go'
- 'internal/service/streamprivatelinkendpoint/*.go'

advanced_cluster:
needs: [ change-detection, get-provider-version ]
if: ${{ needs.change-detection.outputs.advanced_cluster == 'true' || inputs.test_group == 'advanced_cluster' }}
runs-on: ubuntu-latest
permissions: {}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
ref: ${{ inputs.ref || github.ref }}
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
with:
go-version-file: 'go.mod'
- uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd
with:
terraform_version: ${{ inputs.terraform_version }}
terraform_wrapper: false
- name: Acceptance Tests
env:
MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
ACCTEST_REGEX_RUN: ${{ inputs.reduced_tests && '^TestAccMockable' || env.ACCTEST_REGEX_RUN }}
ACCTEST_PACKAGES: ./internal/service/advancedcluster
run: make testacc

advanced_cluster_tpf:
needs: [ change-detection, get-provider-version ]
if: ${{ needs.change-detection.outputs.advanced_cluster_tpf == 'true' || inputs.test_group == 'advanced_cluster_tpf' }}
env:
MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER: 'true'
runs-on: ubuntu-latest
permissions: {}
steps:
Expand Down Expand Up @@ -435,7 +411,6 @@ jobs:
needs: [ change-detection, get-provider-version ]
if: ${{ inputs.reduced_tests == false && (needs.change-detection.outputs.advanced_cluster_tpf == 'true' || inputs.test_group == 'advanced_cluster_tpf') }}
env:
MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER: 'true'
MONGODB_ATLAS_TEST_SDKV2_TO_TPF: 'true'
runs-on: ubuntu-latest
permissions: {}
Expand All @@ -452,9 +427,10 @@ jobs:
terraform_wrapper: false
- name: Acceptance Tests
env:
MONGODB_ATLAS_LAST_VERSION: ${{ needs.get-provider-version.outputs.provider_version }}
MONGODB_ATLAS_LAST_VERSION: "1.39.0" # last version that supports SDKv2 mongodbatlas_advanced_cluster
ACCTEST_REGEX_RUN: '^TestMig'
ACCTEST_PACKAGES: ./internal/service/advancedcluster
ACCTEST_PACKAGES: |
./internal/service/advancedcluster
run: make testacc

assume_role:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/code-health.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ jobs:
go-version-file: 'go.mod'
- name: Unit Test
run: make test
env:
MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER: "true"
lint:
runs-on: ubuntu-latest
permissions: {}
Expand Down
29 changes: 15 additions & 14 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,21 @@ env:
AWS_DEFAULT_REGION: us-west-2

jobs:
tf-validate:
runs-on: ubuntu-latest
permissions: {}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
with:
go-version-file: 'go.mod'
- uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd
with:
terraform_version: '1.12.x'
terraform_wrapper: false
- name: tf-validate
run: make tools tf-validate
# TODO: uncomment once advanced_cluster examples are updated
Copy link
Collaborator Author

@maastha maastha Aug 6, 2025

Choose a reason for hiding this comment

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

all pending items in this PR will be addressed in CLOUDP-336437

# tf-validate:
# runs-on: ubuntu-latest
# permissions: {}
# steps:
# - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
# - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
# with:
# go-version-file: 'go.mod'
# - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd
# with:
# terraform_version: '1.12.x'
# terraform_wrapper: false
# - name: tf-validate
# run: make tools tf-validate
tflint:
runs-on: ubuntu-latest
permissions: {}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/update-dev-branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ jobs:
- name: Project check
if: steps.merge-check.outputs.has-changes == 'true'
id: project-check
env:
MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER: "true"
run: |
if make tools build lint test; then
echo "slack-text=✅ Dev branch \`${{ matrix.branch }}\` merged and pushed with latest changes from master. ${{ secrets.SLACK_ONCALL_TAG }} <${{github.server_url}}/${{github.repository}}/actions/runs/${{github.run_id}}|View Action>" >> "${GITHUB_OUTPUT}"
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ testmact: ## Run MacT tests (mocked acc tests)
@$(eval export MONGODB_ATLAS_ORG_ID?=111111111111111111111111)
@$(eval export MONGODB_ATLAS_PROJECT_ID?=111111111111111111111111)
@$(eval export MONGODB_ATLAS_CLUSTER_NAME?=mocked-cluster)
@$(eval export MONGODB_ATLAS_PREVIEW_PROVIDER_V2_ADVANCED_CLUSTER?=true)
@if [ "$(ACCTEST_PACKAGES)" = "./..." ]; then \
echo "Error: ACCTEST_PACKAGES must be explicitly set for testmact target, './...' is not allowed"; \
exit 1; \
Expand Down Expand Up @@ -236,4 +235,4 @@ upload-sbom: ## Upload SBOM

.PHONY: augment-sbom
augment-sbom: ## Augment SBOM
./scripts/compliance/augment-sbom.sh
./scripts/compliance/augment-sbom.sh

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading