Skip to content

Commit 5517239

Browse files
authored
test: Updates all test workflows to use advanced_cluster TPF implementation (#3580)
1 parent 72e3932 commit 5517239

File tree

41 files changed

+3147
-287
lines changed

Some content is hidden

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

41 files changed

+3147
-287
lines changed

.github/workflows/acceptance-tests-runner.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ jobs:
242242
mustTrigger: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.test_group == '' ) }}
243243
outputs: # ensure resources are sorted alphabetically
244244
advanced_cluster: ${{ steps.filter.outputs.advanced_cluster == 'true' || env.mustTrigger == 'true' }}
245-
advanced_cluster_tpf: ${{ steps.filter.outputs.advanced_cluster_tpf == 'true' || env.mustTrigger == 'true' }}
246245
assume_role: ${{ steps.filter.outputs.assume_role == 'true' || env.mustTrigger == 'true' }}
247246
autogen: ${{ steps.filter.outputs.autogen == 'true' || env.mustTrigger == 'true' }}
248247
backup: ${{ steps.filter.outputs.backup == 'true' || env.mustTrigger == 'true' }}
@@ -275,11 +274,7 @@ jobs:
275274
with:
276275
filters: |
277276
advanced_cluster:
278-
- 'internal/service/advancedcluster/!(*_test).go' # matches any adv_cluster file change except test files
279-
- 'internal/service/advancedclustertpf/common*.go'
280-
advanced_cluster_tpf:
281277
- 'internal/service/advancedclustertpf/*.go'
282-
- 'internal/service/advancedcluster/*_test.go'
283278
assume_role:
284279
- 'internal/provider/*.go'
285280
autogen:
@@ -386,9 +381,9 @@ jobs:
386381
- 'internal/service/streamprivatelinkendpoint/*.go'
387382
388383
389-
advanced_cluster_tpf:
384+
advanced_cluster:
390385
needs: [ change-detection, get-provider-version ]
391-
if: ${{ needs.change-detection.outputs.advanced_cluster_tpf == 'true' || inputs.test_group == 'advanced_cluster_tpf' }}
386+
if: ${{ needs.change-detection.outputs.advanced_cluster == 'true' || inputs.test_group == 'advanced_cluster' }}
392387
runs-on: ubuntu-latest
393388
permissions: {}
394389
steps:
@@ -409,13 +404,12 @@ jobs:
409404
HTTP_MOCKER_CAPTURE: 'true'
410405
ACCTEST_REGEX_RUN: ${{ inputs.reduced_tests && '^TestAccMockable' || env.ACCTEST_REGEX_RUN }}
411406
ACCTEST_PACKAGES: |
412-
./internal/service/advancedcluster
413407
./internal/service/advancedclustertpf
414408
run: make testacc
415409

416410
advanced_cluster_tpf_mig_from_sdkv2:
417411
needs: [ change-detection, get-provider-version ]
418-
if: ${{ inputs.reduced_tests == false && (needs.change-detection.outputs.advanced_cluster_tpf == 'true' || inputs.test_group == 'advanced_cluster_tpf') }}
412+
if: ${{ inputs.reduced_tests == false && (needs.change-detection.outputs.advanced_cluster == 'true' || inputs.test_group == 'advanced_cluster') }}
419413
env:
420414
MONGODB_ATLAS_TEST_SDKV2_TO_TPF: 'true'
421415
runs-on: ubuntu-latest
@@ -437,7 +431,7 @@ jobs:
437431
MONGODB_ATLAS_LAST_1X_VERSION: ${{ inputs.mongodb_atlas_last_1x_version }}
438432
ACCTEST_REGEX_RUN: '^TestMig'
439433
ACCTEST_PACKAGES: |
440-
./internal/service/advancedcluster
434+
./internal/service/advancedclustertpf
441435
run: make testacc
442436

443437
assume_role:

.github/workflows/code-health.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ jobs:
9191
secrets: inherit
9292
uses: ./.github/workflows/acceptance-tests.yml
9393
with:
94-
reduced_tests: false
94+
reduced_tests: true

internal/config/preview_provider_v2.go

Lines changed: 0 additions & 6 deletions
This file was deleted.

internal/service/advancedcluster/move_state_test.go

Lines changed: 0 additions & 84 deletions
This file was deleted.

internal/service/advancedcluster/resource_advanced_cluster_state_upgrader_test.go

Lines changed: 0 additions & 138 deletions
This file was deleted.

internal/service/advancedclustertpf/plan_modifier_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/hashicorp/terraform-plugin-testing/knownvalue"
77
"github.com/hashicorp/terraform-plugin-testing/plancheck"
88
"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
9+
910
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/unit"
1011
)
1112

@@ -14,7 +15,6 @@ var (
1415
repSpec1 = tfjsonpath.New("replication_specs").AtSliceIndex(1)
1516
regionConfig0 = repSpec0.AtMapKey("region_configs").AtSliceIndex(0)
1617
regionConfig1 = repSpec1.AtMapKey("region_configs").AtSliceIndex(0)
17-
mockConfig = unit.MockConfigAdvancedClusterTPF
1818
)
1919

2020
func autoScalingKnownValue(computeEnabled, diskEnabled, scaleDown bool, minInstanceSize, maxInstanceSize string) knownvalue.Check {

internal/service/advancedcluster/resource_advanced_cluster_migration_test.go renamed to internal/service/advancedclustertpf/resource_migration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package advancedcluster_test
1+
package advancedclustertpf_test
22

33
import (
44
"os"

internal/service/advancedcluster/resource_advanced_cluster_test.go renamed to internal/service/advancedclustertpf/resource_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package advancedcluster_test
1+
package advancedclustertpf_test
22

33
import (
4+
"errors"
45
"fmt"
56
"net/http"
67
"os"
@@ -62,6 +63,7 @@ var (
6263
configServerManagementModeFixedToDedicated = "FIXED_TO_DEDICATED"
6364
configServerManagementModeAtlasManaged = "ATLAS_MANAGED"
6465
mockConfig = unit.MockConfigAdvancedClusterTPF
66+
errGeneric = errors.New("generic")
6567
)
6668

6769
func TestGetReplicationSpecAttributesFromOldAPI(t *testing.T) {

0 commit comments

Comments
 (0)