refactor: Migrate to new Atlas SDK - mongodbatlas_federated_database_instance resource (#1415)

maastha · web-flow · commit 13bccfdffd64 · 2023-09-04T09:01:41.000+01:00
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -25,6 +25,7 @@ jobs:
       generic: ${{ steps.filter.outputs.generic }}
       backup_online_archive: ${{ steps.filter.outputs.backup_online_archive }}
       backup_snapshots: ${{ steps.filter.outputs.backup_snapshots }}
+      federation: ${{ steps.filter.outputs.federation }}
       backup_schedule: ${{ steps.filter.outputs.backup_schedule }}
       project: ${{ steps.filter.outputs.project }}
       serverless: ${{ steps.filter.outputs.serverless }}
@@ -69,6 +70,8 @@ jobs:
             - 'mongodbatlas/**_network**.go'  
             - 'mongodbatlas/**_privatelink**.go' 
             - 'mongodbatlas/**_private_endpoint**.go'
+          federation:
+            - 'mongodbatlas/**_federated_database_instance**.go'
           config:
             - 'mongodbatlas/data_source_mongodbatlas_accesslist_api_key*.go'
             - 'mongodbatlas/data_source_mongodbatlas_alert_configuration*.go'
@@ -366,6 +369,33 @@ jobs:
           CI: true
           TEST_REGEX: "^TestAccNetwork"
         run: make testacc
+
+  federation:
+    needs: [ change-detection ]
+    if: ${{ needs.change-detection.outputs.federation == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || github.event.label.name == 'run-testacc' || github.event.label.name == 'run-testacc-federation' || inputs.parent-event-name == 'release' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: 'go.mod'
+      - name: Acceptance Tests
+        env:
+          MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.MONGODB_ATLAS_PUBLIC_KEY_CLOUD_DEV }}
+          MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.MONGODB_ATLAS_PRIVATE_KEY_CLOUD_DEV }}
+          MONGODB_ATLAS_ORG_ID: ${{ vars.MONGODB_ATLAS_ORG_ID_CLOUD_DEV }}
+          MONGODB_ATLAS_BASE_URL: ${{ vars.MONGODB_ATLAS_BASE_URL }}
+          SKIP_TEST_EXTERNAL_CREDENTIALS: ${{ vars.SKIP_TEST_EXTERNAL_CREDENTIALS }}
+          ACCTEST_TIMEOUT: ${{ vars.ACCTEST_TIMEOUT }}
+          TF_LOG: ${{ vars.LOG_LEVEL }}
+          CI: true
+          TF_ACC: 1
+          PARALLEL_GO_TEST: 20
+          TEST_REGEX: "^TestAccFederatedDatabaseInstance"
+        run: make testacc
+      
   config:
     needs: [ change-detection ]
     if: ${{ needs.change-detection.outputs.config == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' || github.event.label.name == 'run-testacc' || github.event.label.name == 'run-testacc-config' || inputs.parent-event-name == 'release' }}
diff --git a/go.mod b/go.mod
@@ -8,14 +8,15 @@ require (
 	github.com/gruntwork-io/terratest v0.43.13
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/hcl/v2 v2.17.0
+	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.28.0
 	github.com/hashicorp/terraform-plugin-testing v1.4.0
 	github.com/mongodb-forks/digest v1.0.5
 	github.com/mwielbut/pointy v1.1.0
 	github.com/spf13/cast v1.5.1
 	github.com/zclconf/go-cty v1.13.3
 	go.mongodb.org/atlas v0.33.0
-	go.mongodb.org/atlas-sdk/v20230201002 v20230201002.0.0
+	go.mongodb.org/atlas-sdk/v20230201006 v20230201006.0.0
 	go.mongodb.org/realm v0.1.0
 	golang.org/x/exp v0.0.0-20221208152030-732eee02a75a
 )
@@ -68,7 +69,6 @@ require (
 	github.com/hashicorp/terraform-exec v0.18.1 // indirect
 	github.com/hashicorp/terraform-json v0.17.1 // indirect
 	github.com/hashicorp/terraform-plugin-go v0.18.0 // indirect
-	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
 	github.com/hashicorp/terraform-registry-address v0.2.1 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
diff --git a/go.sum b/go.sum
@@ -602,8 +602,8 @@ github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRK
 go.mongodb.org/atlas v0.12.0/go.mod h1:wVCnHcm/7/IfTjEB6K8K35PLG70yGz8BdkRwX0oK9/M=
 go.mongodb.org/atlas v0.33.0 h1:qJhkEuJufh7sVDVHorTF/D7G7naQ1EJAzqf1aV29JWs=
 go.mongodb.org/atlas v0.33.0/go.mod h1:L4BKwVx/OeEhOVjCSdgo90KJm4469iv7ZLzQms/EPTg=
-go.mongodb.org/atlas-sdk/v20230201002 v20230201002.0.0 h1:ANYyIzbdxSdwwbragGKDuAg+3bmr940rbxCvZdIwnPk=
-go.mongodb.org/atlas-sdk/v20230201002 v20230201002.0.0/go.mod h1:SG7r2T7R595Z/+x/miXGR89ZsinqXG/P6k0p+CSNBPY=
+go.mongodb.org/atlas-sdk/v20230201006 v20230201006.0.0 h1:HaY0cmYAlqoC+7iRE0NTPEQyAr2nqdxE9gspMp8Pmyo=
+go.mongodb.org/atlas-sdk/v20230201006 v20230201006.0.0/go.mod h1:Lgqhl8h8m0iqTloSypmqt/Vi8ZIGvx3tXFuu07HPUyk=
 go.mongodb.org/realm v0.1.0 h1:zJiXyLaZrznQ+Pz947ziSrDKUep39DO4SfA0Fzx8M4M=
 go.mongodb.org/realm v0.1.0/go.mod h1:4Vj6iy+Puo1TDERcoh4XZ+pjtwbOzPpzqy3Cwe8ZmDM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
diff --git a/mongodbatlas/config.go b/mongodbatlas/config.go
@@ -6,15 +6,17 @@ import (
 	"fmt"
 	"net/http"
 
+	atlasSDK "go.mongodb.org/atlas-sdk/v20230201006/admin"
+	matlasClient "go.mongodb.org/atlas/mongodbatlas"
+	realmAuth "go.mongodb.org/realm/auth"
+	"go.mongodb.org/realm/realm"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
 	"github.com/mongodb-forks/digest"
-	"github.com/mongodb/terraform-provider-mongodbatlas/version"
 	"github.com/spf13/cast"
-	atlasSDK "go.mongodb.org/atlas-sdk/v20230201002/admin"
-	matlasClient "go.mongodb.org/atlas/mongodbatlas"
-	realmAuth "go.mongodb.org/realm/auth"
-	"go.mongodb.org/realm/realm"
+
+	"github.com/mongodb/terraform-provider-mongodbatlas/version"
 )
 
 const ToolName = "terraform-provider-mongodbatlas"
diff --git a/mongodbatlas/data_source_mongodbatlas_cloud_shared_tier_restore_jobs.go b/mongodbatlas/data_source_mongodbatlas_cloud_shared_tier_restore_jobs.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"fmt"
 
+	atlasSDK "go.mongodb.org/atlas-sdk/v20230201006/admin"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	atlasSDK "go.mongodb.org/atlas-sdk/v20230201002/admin"
 )
 
 // This datasource does not have a resource: we tested it manually
diff --git a/mongodbatlas/data_source_mongodbatlas_federated_database_instance.go b/mongodbatlas/data_source_mongodbatlas_federated_database_instance.go
@@ -223,9 +223,9 @@ func schemaFederatedDatabaseInstanceStoresDataSource() *schema.Schema {
 					Computed: true,
 				},
 				"cluster_id": {
-					Type:     schema.TypeString,
-					Computed: true,
-				},
+					Type:       schema.TypeString,
+					Computed:   true,
+					Deprecated: fmt.Sprintf(DeprecationByDateMessageParameter, "September 2024")},
 				"project_id": {
 					Type:     schema.TypeString,
 					Computed: true,
@@ -304,12 +304,12 @@ func schemaFederatedDatabaseInstanceStoresDataSource() *schema.Schema {
 }
 
 func dataSourceMongoDBAtlasFederatedDatabaseInstanceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	conn := meta.(*MongoDBClient).Atlas
+	connV2 := meta.(*MongoDBClient).AtlasV2
 
 	projectID := d.Get("project_id").(string)
 	name := d.Get("name").(string)
 
-	dataFederationInstance, _, err := conn.DataFederation.Get(ctx, projectID, name)
+	dataFederationInstance, _, err := connV2.DataFederationApi.GetFederatedDatabase(ctx, projectID, name).Execute()
 	if err != nil {
 		return diag.FromErr(fmt.Errorf("couldn't import data lake(%s) for project (%s), error: %s", name, projectID, err))
 	}
@@ -352,7 +352,7 @@ func dataSourceMongoDBAtlasFederatedDatabaseInstanceRead(ctx context.Context, d
 
 	d.SetId(encodeStateID(map[string]string{
 		"project_id": projectID,
-		"name":       dataFederationInstance.Name,
+		"name":       dataFederationInstance.GetName(),
 	}))
 
 	return nil
diff --git a/mongodbatlas/data_source_mongodbatlas_federated_database_instance_test.go b/mongodbatlas/data_source_mongodbatlas_federated_database_instance_test.go
@@ -7,14 +7,14 @@ import (
 	"os"
 	"testing"
 
+	matlas "go.mongodb.org/atlas/mongodbatlas"
+
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
-	matlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
 func TestAccDataSourceFederatedDatabaseInstance_basic(t *testing.T) {
-	SkipTestExtCred(t)
 	var (
 		resourceName      = "data.mongodbatlas_federated_database_instance.test"
 		orgID             = os.Getenv("MONGODB_ATLAS_ORG_ID")
@@ -24,7 +24,7 @@ func TestAccDataSourceFederatedDatabaseInstance_basic(t *testing.T) {
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckBasic(t) },
 		CheckDestroy: testAccCheckMongoDBAtlasFederatedDatabaseInstanceDestroy,
 		Steps: []resource.TestStep{
 			{
@@ -62,7 +62,7 @@ func TestAccDataSourceFederatedDatabaseInstance_S3Bucket(t *testing.T) {
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckBasic(t) },
 		CheckDestroy: testAccCheckMongoDBAtlasFederatedDatabaseInstanceDestroy,
 		Steps: []resource.TestStep{
 			{
diff --git a/mongodbatlas/data_source_mongodbatlas_federated_database_instances.go b/mongodbatlas/data_source_mongodbatlas_federated_database_instances.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"fmt"
 
+	"go.mongodb.org/atlas-sdk/v20230201006/admin"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	matlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
 func dataSourceMongoDBAtlasFederatedDatabaseInstances() *schema.Resource {
@@ -110,11 +111,11 @@ func dataSourceMongoDBAtlasFederatedDatabaseInstances() *schema.Resource {
 }
 
 func dataSourceMongoDBAtlasFederatedDatabaseInstancesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	conn := meta.(*MongoDBClient).Atlas
+	connV2 := meta.(*MongoDBClient).AtlasV2
 
 	projectID := d.Get("project_id").(string)
 
-	federatedDatabaseInstances, _, err := conn.DataFederation.List(ctx, projectID)
+	federatedDatabaseInstances, _, err := connV2.DataFederationApi.ListFederatedDatabases(ctx, projectID).Execute()
 	if err != nil {
 		return diag.FromErr(fmt.Errorf("error getting MongoDB Atlas Federated Database Instances information: %s", err))
 	}
@@ -130,7 +131,7 @@ func dataSourceMongoDBAtlasFederatedDatabaseInstancesRead(ctx context.Context, d
 	return nil
 }
 
-func flattenFederatedDatabaseInstances(d *schema.ResourceData, projectID string, federatedDatabaseInstances []*matlas.DataFederationInstance) []map[string]interface{} {
+func flattenFederatedDatabaseInstances(d *schema.ResourceData, projectID string, federatedDatabaseInstances []admin.DataLakeTenant) []map[string]interface{} {
 	var federatedDatabaseInstancesMap []map[string]interface{}
 
 	if len(federatedDatabaseInstances) > 0 {
@@ -139,9 +140,9 @@ func flattenFederatedDatabaseInstances(d *schema.ResourceData, projectID string,
 		for i := range federatedDatabaseInstances {
 			federatedDatabaseInstancesMap[i] = map[string]interface{}{
 				"project_id":            projectID,
-				"name":                  federatedDatabaseInstances[i].Name,
-				"state":                 federatedDatabaseInstances[i].State,
-				"hostnames":             federatedDatabaseInstances[i].Hostnames,
+				"name":                  federatedDatabaseInstances[i].GetName(),
+				"state":                 federatedDatabaseInstances[i].GetState(),
+				"hostnames":             federatedDatabaseInstances[i].GetHostnames(),
 				"cloud_provider_config": flattenCloudProviderConfig(d, federatedDatabaseInstances[i].CloudProviderConfig),
 				"data_process_region":   flattenDataProcessRegion(federatedDatabaseInstances[i].DataProcessRegion),
 				"storage_databases":     flattenDataFederationDatabase(federatedDatabaseInstances[i].Storage.Databases),
diff --git a/mongodbatlas/data_source_mongodbatlas_federated_database_instances_test.go b/mongodbatlas/data_source_mongodbatlas_federated_database_instances_test.go
@@ -24,7 +24,7 @@ func TestAccDataSourceFederatedDatabaseInstances_basic(t *testing.T) {
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckBasic(t) },
 		CheckDestroy: testAccCheckMongoDBAtlasFederatedDatabaseInstanceDestroy,
 		Steps: []resource.TestStep{
 			{
diff --git a/mongodbatlas/data_source_mongodbatlas_shared_tier_snapshots.go b/mongodbatlas/data_source_mongodbatlas_shared_tier_snapshots.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"fmt"
 
+	atlasSDK "go.mongodb.org/atlas-sdk/v20230201006/admin"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	atlasSDK "go.mongodb.org/atlas-sdk/v20230201002/admin"
 )
 
 // This datasource does not have a resource: we tested it manually
diff --git a/mongodbatlas/provider.go b/mongodbatlas/provider.go
@@ -15,6 +15,8 @@ import (
 	"strings"
 	"time"
 
+	matlas "go.mongodb.org/atlas/mongodbatlas"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials"
@@ -29,7 +31,6 @@ import (
 	"github.com/mwielbut/pointy"
 	"github.com/spf13/cast"
 	"github.com/zclconf/go-cty/cty"
-	matlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
 var (
@@ -41,6 +42,7 @@ const (
 	endPointSTSDefault                    = "https://sts.amazonaws.com"
 	DeprecationMessage                    = "this resource is deprecated and will be removed in %s, please transition to %s"
 	DeprecationMessageParameterToResource = "this parameter is deprecated and will be removed in %s, please transition to %s"
+	DeprecationByDateMessageParameter     = "this parameter is deprecated and will be removed by %s"
 	AWS                                   = "AWS"
 	AZURE                                 = "AZURE"
 	GCP                                   = "GCP"
@@ -799,3 +801,17 @@ func expandAssumeRole(tfMap map[string]interface{}) *AssumeRole {
 func pointer[T any](x T) *T {
 	return &x
 }
+
+func intPtr(v int) *int {
+	if v != 0 {
+		return &v
+	}
+	return nil
+}
+
+func stringPtr(v string) *string {
+	if v != "" {
+		return &v
+	}
+	return nil
+}
diff --git a/mongodbatlas/provider_test.go b/mongodbatlas/provider_test.go
@@ -5,9 +5,10 @@ import (
 	"strings"
 	"testing"
 
+	matlas "go.mongodb.org/atlas/mongodbatlas"
+
 	"github.com/go-test/deep"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	matlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
 const (
diff --git a/mongodbatlas/resource_mongodbatlas_federated_database_instance.go b/mongodbatlas/resource_mongodbatlas_federated_database_instance.go
diff --git a/mongodbatlas/resource_mongodbatlas_federated_database_instance_migration_test.go b/mongodbatlas/resource_mongodbatlas_federated_database_instance_migration_test.go
diff --git a/mongodbatlas/resource_mongodbatlas_federated_database_instance_test.go b/mongodbatlas/resource_mongodbatlas_federated_database_instance_test.go
diff --git a/mongodbatlas/resource_mongodbatlas_project.go b/mongodbatlas/resource_mongodbatlas_project.go
diff --git a/mongodbatlas/resource_mongodbatlas_project_api_key.go b/mongodbatlas/resource_mongodbatlas_project_api_key.go
diff --git a/mongodbatlas/testutils/plan_checks.go b/mongodbatlas/testutils/plan_checks.go

Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@ import (`
`7`	`7`	`"os"`
`8`	`8`	`"testing"`
`9`	`9`
	`10`	`+ matlas "go.mongodb.org/atlas/mongodbatlas"`
	`11`	`+`
`10`	`12`	`"github.com/hashicorp/terraform-plugin-testing/helper/acctest"`
`11`	`13`	`"github.com/hashicorp/terraform-plugin-testing/helper/resource"`
`12`	`14`	`"github.com/hashicorp/terraform-plugin-testing/terraform"`
`13`		`- matlas "go.mongodb.org/atlas/mongodbatlas"`
`14`	`15`	`)`
`15`	`16`
`16`	`17`	`func TestAccDataSourceFederatedDatabaseInstance_basic(t *testing.T) {`
`17`		`- SkipTestExtCred(t)`
`18`	`18`	`var (`
`19`	`19`	`resourceName = "data.mongodbatlas_federated_database_instance.test"`
`20`	`20`	`orgID = os.Getenv("MONGODB_ATLAS_ORG_ID")`
`@@ -24,7 +24,7 @@ func TestAccDataSourceFederatedDatabaseInstance_basic(t *testing.T) {`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`resource.ParallelTest(t, resource.TestCase{`
`27`		`- PreCheck: func() { testAccPreCheck(t) },`
	`27`	`+ PreCheck: func() { testAccPreCheckBasic(t) },`
`28`	`28`	`CheckDestroy: testAccCheckMongoDBAtlasFederatedDatabaseInstanceDestroy,`
`29`	`29`	`Steps: []resource.TestStep{`
`30`	`30`	`{`
`@@ -62,7 +62,7 @@ func TestAccDataSourceFederatedDatabaseInstance_S3Bucket(t *testing.T) {`
`62`	`62`	`)`
`63`	`63`
`64`	`64`	`resource.ParallelTest(t, resource.TestCase{`
`65`		`- PreCheck: func() { testAccPreCheck(t) },`
	`65`	`+ PreCheck: func() { testAccPreCheckBasic(t) },`
`66`	`66`	`CheckDestroy: testAccCheckMongoDBAtlasFederatedDatabaseInstanceDestroy,`
`67`	`67`	`Steps: []resource.TestStep{`
`68`	`68`	`{`