refactor: removed 1.12.0 deprecated fields. (#1418)

* refactor: removed 1.12.0 deprecated fields. * refactor: updated documentation with removed fields * fix: test expectations
mongodb · Sep 1, 2023 · 22aeae9 · 22aeae9
1 parent cd37419
commit 22aeae9
Show file tree

Hide file tree

Showing 39 changed files with 72 additions and 450 deletions.
diff --git a/mongodbatlas/data_source_mongodbatlas_cloud_provider_access_setup_test.go b/mongodbatlas/data_source_mongodbatlas_cloud_provider_access_setup_test.go
@@ -54,7 +54,7 @@ func TestAccConfigDSCloudProviderAccessSetup_aws_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "created_date"),
 					resource.TestCheckResourceAttrSet(resourceName, "role_id"),
-					resource.TestCheckResourceAttrSet(dsName, "aws.atlas_assumed_role_external_id"),
+					resource.TestCheckResourceAttrSet(dsName, "aws_config.0.atlas_assumed_role_external_id"),
 				),
 			},
 		},

diff --git a/mongodbatlas/data_source_mongodbatlas_cluster.go b/mongodbatlas/data_source_mongodbatlas_cluster.go
@@ -39,14 +39,6 @@ func dataSourceMongoDBAtlasCluster() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
-			"bi_connector": {
-				Type:       schema.TypeMap,
-				Computed:   true,
-				Deprecated: "use bi_connector_config instead",
-				Elem: &schema.Schema{
-					Type: schema.TypeString,
-				},
-			},
 			"bi_connector_config": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -426,10 +418,6 @@ func dataSourceMongoDBAtlasClusterRead(ctx context.Context, d *schema.ResourceDa
 		return diag.FromErr(fmt.Errorf(errorClusterSetting, "state_name", clusterName, err))
 	}
 
-	if err := d.Set("bi_connector", flattenBiConnector(cluster.BiConnector)); err != nil {
-		return diag.FromErr(fmt.Errorf(errorClusterSetting, "bi_connector", clusterName, err))
-	}
-
 	if err := d.Set("bi_connector_config", flattenBiConnectorConfig(cluster.BiConnector)); err != nil {
 		return diag.FromErr(fmt.Errorf(errorClusterSetting, "bi_connector_config", clusterName, err))
 	}

diff --git a/mongodbatlas/data_source_mongodbatlas_clusters.go b/mongodbatlas/data_source_mongodbatlas_clusters.go
@@ -46,14 +46,6 @@ func dataSourceMongoDBAtlasClusters() *schema.Resource {
 							Type:     schema.TypeBool,
 							Computed: true,
 						},
-						"bi_connector": {
-							Type:       schema.TypeMap,
-							Computed:   true,
-							Deprecated: "use bi_connector_config instead",
-							Elem: &schema.Schema{
-								Type: schema.TypeString,
-							},
-						},
 						"bi_connector_config": {
 							Type:     schema.TypeList,
 							Computed: true,
@@ -406,7 +398,6 @@ func flattenClusters(ctx context.Context, d *schema.ResourceData, conn *matlas.C
 			"provider_instance_size_name":                     clusters[i].ProviderSettings.InstanceSizeName,
 			"provider_name":                                   clusters[i].ProviderSettings.ProviderName,
 			"provider_region_name":                            clusters[i].ProviderSettings.RegionName,
-			"bi_connector":                                    flattenBiConnector(clusters[i].BiConnector),
 			"bi_connector_config":                             flattenBiConnectorConfig(clusters[i].BiConnector),
 			"replication_specs":                               flattenReplicationSpecs(clusters[i].ReplicationSpecs),
 			"labels":                                          flattenLabels(clusters[i].Labels),

diff --git a/mongodbatlas/data_source_mongodbatlas_global_cluster_config_test.go b/mongodbatlas/data_source_mongodbatlas_global_cluster_config_test.go
@@ -38,7 +38,7 @@ func testAccDSMongoDBAtlasGlobalClusterConfig(projectID, name string) string {
 		project_id              = "%s"
 		name                    = "%s"
 		disk_size_gb            = 80
-		provider_backup_enabled = false
+		cloud_backup            = false
 		cluster_type            = "GEOSHARDED"
 
 		// Provider Settings "block"

diff --git a/mongodbatlas/data_source_mongodbatlas_ldap_verify_test.go b/mongodbatlas/data_source_mongodbatlas_ldap_verify_test.go
@@ -61,7 +61,7 @@ func testAccMongoDBAtlasDataSourceLDAPVerifyConfig(projectName, orgID, clusterNa
 			provider_name               = "AWS"
 			provider_region_name        = "US_EAST_2"
 			provider_instance_size_name = "M10"
-			provider_backup_enabled     = true //enable cloud provider snapshots
+			cloud_backup                = true //enable cloud provider snapshots
 		}
 
 		resource "mongodbatlas_ldap_verify" "test" {

diff --git a/mongodbatlas/data_source_mongodbatlas_project_api_key.go b/mongodbatlas/data_source_mongodbatlas_project_api_key.go
@@ -33,14 +33,6 @@ func dataSourceMongoDBAtlasProjectAPIKey() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"role_names": {
-				Type:     schema.TypeSet,
-				Computed: true,
-				Elem: &schema.Schema{
-					Type: schema.TypeString,
-				},
-				Deprecated: fmt.Sprintf(DeprecationMessageParameterToResource, "v1.12.0", "project_assignment"),
-			},
 			"project_assignment": {
 				Type:     schema.TypeSet,
 				Computed: true,
@@ -97,10 +89,6 @@ func dataSourceMongoDBAtlasProjectAPIKeyRead(ctx context.Context, d *schema.Reso
 				return diag.Errorf(errorProjectSetting, `project_assignment`, projectID, err)
 			}
 		}
-
-		if err := d.Set("role_names", flattenProjectAPIKeyRoles(projectID, val.Roles)); err != nil {
-			return diag.FromErr(fmt.Errorf("error setting `roles`: %s", err))
-		}
 	}
 
 	d.SetId(id.UniqueId())

diff --git a/mongodbatlas/data_source_mongodbatlas_project_api_keys.go b/mongodbatlas/data_source_mongodbatlas_project_api_keys.go
@@ -48,14 +48,6 @@ func dataSourceMongoDBAtlasProjectAPIKeys() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
-						"role_names": {
-							Type:     schema.TypeSet,
-							Computed: true,
-							Elem: &schema.Schema{
-								Type: schema.TypeString,
-							},
-							Deprecated: fmt.Sprintf(DeprecationMessageParameterToResource, "v1.12.0", "project_assignment"),
-						},
 						"project_assignment": {
 							Type:     schema.TypeSet,
 							Optional: true,
@@ -125,7 +117,6 @@ func flattenProjectAPIKeys(ctx context.Context, conn *matlas.Client, projectID s
 			"description": apiKey.Desc,
 			"public_key":  apiKey.PublicKey,
 			"private_key": apiKey.PrivateKey,
-			"role_names":  flattenProjectAPIKeyRoles(projectID, apiKey.Roles),
 		}
 
 		projectAssignment, err := newProjectAssignment(ctx, conn, projectID, apiKey.ID)

diff --git a/mongodbatlas/fw_provider.go b/mongodbatlas/fw_provider.go
@@ -6,11 +6,9 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/terraform-plugin-framework-validators/int64validator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
-	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/provider"
 	"github.com/hashicorp/terraform-plugin-framework/provider/schema"
 	"github.com/hashicorp/terraform-plugin-framework/providerserver"
@@ -58,7 +56,6 @@ type tfAssumeRoleModel struct {
 	RoleARN           types.String `tfsdk:"role_arn"`
 	SessionName       types.String `tfsdk:"session_name"`
 	SourceIdentity    types.String `tfsdk:"source_identity"`
-	DurationSeconds   types.Int64  `tfsdk:"duration_seconds"`
 }
 
 func (p *MongodbtlasProvider) Metadata(ctx context.Context, req provider.MetadataRequest, resp *provider.MetadataResponse) {
@@ -130,20 +127,6 @@ var fwAssumeRoleSchema = schema.ListNestedBlock{
 				Description: "The duration, between 15 minutes and 12 hours, of the role session. Valid time units are ns, us (or µs), ms, s, h, or m.",
 				Validators: []validator.String{
 					cstmvalidator.ValidDurationBetween(15, 12*60),
-					stringvalidator.ConflictsWith(path.Expressions{
-						path.MatchRelative().AtParent().AtName("duration_seconds"),
-					}...),
-				},
-			},
-			"duration_seconds": schema.Int64Attribute{
-				Optional:           true,
-				DeprecationMessage: "Use assume_role.duration instead",
-				Description:        "The duration, in seconds, of the role session.",
-				Validators: []validator.Int64{
-					int64validator.Between(900, 43200),
-					int64validator.ConflictsWith(path.Expressions{
-						path.MatchRelative().AtParent().AtName("duration"),
-					}...),
 				},
 			},
 			"external_id": schema.StringAttribute{
@@ -261,8 +244,6 @@ func parseTfModel(ctx context.Context, tfAssumeRoleModel *tfAssumeRoleModel) *As
 	if !tfAssumeRoleModel.Duration.IsNull() {
 		duration, _ := time.ParseDuration(tfAssumeRoleModel.Duration.ValueString())
 		assumeRole.Duration = duration
-	} else if !tfAssumeRoleModel.DurationSeconds.IsNull() {
-		assumeRole.Duration = time.Duration(tfAssumeRoleModel.DurationSeconds.ValueInt64()) * time.Second
 	}
 
 	assumeRole.ExternalID = tfAssumeRoleModel.ExternalID.ValueString()

diff --git a/mongodbatlas/fw_resource_mongodbatlas_database_user_test.go b/mongodbatlas/fw_resource_mongodbatlas_database_user_test.go
@@ -863,7 +863,7 @@ func testAccMongoDBAtlasDatabaseUserWithScopes(username, password, projectName,
 			provider_name               = "AWS"
 			provider_region_name        = "US_EAST_2"
 			provider_instance_size_name = "M10"
-			provider_backup_enabled     = true //enable cloud provider snapshots
+			cloud_backup                = true //enable cloud provider snapshots
 		}
 
 		resource "mongodbatlas_database_user" "test" {

diff --git a/mongodbatlas/provider.go b/mongodbatlas/provider.go
@@ -39,13 +39,12 @@ var (
 )
 
 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"
-	MissingAuthAttrError                  = "either Atlas Programmatic API Keys or AWS Secrets Manager attributes must be set"
-	ProviderConfigError                   = "error in configuring the provider."
-	AWS                                   = "AWS"
-	AZURE                                 = "AZURE"
+	endPointSTSDefault   = "https://sts.amazonaws.com"
+	DeprecationMessage   = "this resource is deprecated and will be removed in %s, please transition to %s"
+	MissingAuthAttrError = "either Atlas Programmatic API Keys or AWS Secrets Manager attributes must be set"
+	ProviderConfigError  = "error in configuring the provider."
+	AWS                  = "AWS"
+	AZURE                = "AZURE"
 	GCP
 )
 
@@ -703,19 +702,10 @@ func assumeRoleSchema() *schema.Schema {
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
 				"duration": {
-					Type:          schema.TypeString,
-					Optional:      true,
-					Description:   "The duration, between 15 minutes and 12 hours, of the role session. Valid time units are ns, us (or µs), ms, s, h, or m.",
-					ValidateFunc:  validAssumeRoleDuration,
-					ConflictsWith: []string{"assume_role.0.duration_seconds"},
-				},
-				"duration_seconds": {
-					Type:          schema.TypeInt,
-					Optional:      true,
-					Deprecated:    fmt.Sprintf(DeprecationMessageParameterToResource, "v1.12.0", "assume_role.duration"),
-					Description:   "The duration, in seconds, of the role session.",
-					ValidateFunc:  validation.IntBetween(900, 43200),
-					ConflictsWith: []string{"assume_role.0.duration"},
+					Type:         schema.TypeString,
+					Optional:     true,
+					Description:  "The duration, between 15 minutes and 12 hours, of the role session. Valid time units are ns, us (or µs), ms, s, h, or m.",
+					ValidateFunc: validAssumeRoleDuration,
 				},
 				"external_id": {
 					Type:        schema.TypeString,
@@ -823,8 +813,6 @@ func expandAssumeRole(tfMap map[string]interface{}) *AssumeRole {
 	if v, ok := tfMap["duration"].(string); ok && v != "" {
 		duration, _ := time.ParseDuration(v)
 		assumeRole.Duration = duration
-	} else if v, ok := tfMap["duration_seconds"].(int); ok && v != 0 {
-		assumeRole.Duration = time.Duration(v) * time.Second
 	}
 
 	if v, ok := tfMap["external_id"].(string); ok && v != "" {

diff --git a/mongodbatlas/resource_mongodbatlas_advanced_cluster.go b/mongodbatlas/resource_mongodbatlas_advanced_cluster.go
@@ -74,34 +74,11 @@ func resourceMongoDBAtlasAdvancedCluster() *schema.Resource {
 				Optional:    true,
 				Description: "Flag that indicates whether to retain backup snapshots for the deleted dedicated cluster",
 			},
-			"bi_connector": {
-				Type:          schema.TypeList,
-				Optional:      true,
-				ConflictsWith: []string{"bi_connector_config"},
-				Deprecated:    fmt.Sprintf(DeprecationMessageParameterToResource, "v1.12.0", "bi_connector_config"),
-				Computed:      true,
-				MaxItems:      1,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"enabled": {
-							Type:     schema.TypeBool,
-							Optional: true,
-							Computed: true,
-						},
-						"read_preference": {
-							Type:     schema.TypeString,
-							Optional: true,
-							Computed: true,
-						},
-					},
-				},
-			},
 			"bi_connector_config": {
-				Type:          schema.TypeList,
-				Optional:      true,
-				ConflictsWith: []string{"bi_connector"},
-				Computed:      true,
-				MaxItems:      1,
+				Type:     schema.TypeList,
+				Optional: true,
+				Computed: true,
+				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"enabled": {
@@ -388,13 +365,6 @@ func resourceMongoDBAtlasAdvancedClusterCreate(ctx context.Context, d *schema.Re
 	if v, ok := d.GetOk("backup_enabled"); ok {
 		request.BackupEnabled = pointy.Bool(v.(bool))
 	}
-	if _, ok := d.GetOk("bi_connector"); ok {
-		biConnector, err := expandBiConnectorConfig(d)
-		if err != nil {
-			return diag.FromErr(fmt.Errorf(errorClusterAdvancedCreate, err))
-		}
-		request.BiConnector = biConnector
-	}
 	if _, ok := d.GetOk("bi_connector_config"); ok {
 		biConnector, err := expandBiConnectorConfig(d)
 		if err != nil {
@@ -523,10 +493,6 @@ func resourceMongoDBAtlasAdvancedClusterRead(ctx context.Context, d *schema.Reso
 		return diag.FromErr(fmt.Errorf(errorClusterAdvancedSetting, "backup_enabled", clusterName, err))
 	}
 
-	if err := d.Set("bi_connector", flattenBiConnectorConfig(cluster.BiConnector)); err != nil {
-		return diag.FromErr(fmt.Errorf(errorClusterAdvancedSetting, "bi_connector", clusterName, err))
-	}
-
 	if err := d.Set("bi_connector_config", flattenBiConnectorConfig(cluster.BiConnector)); err != nil {
 		return diag.FromErr(fmt.Errorf(errorClusterAdvancedSetting, "bi_connector_config", clusterName, err))
 	}
@@ -669,10 +635,6 @@ func resourceMongoDBAtlasAdvancedClusterUpdate(ctx context.Context, d *schema.Re
 		cluster.BiConnector, _ = expandBiConnectorConfig(d)
 	}
 
-	if d.HasChange("bi_connector") {
-		cluster.BiConnector, _ = expandBiConnectorConfig(d)
-	}
-
 	if d.HasChange("cluster_type") {
 		cluster.ClusterType = d.Get("cluster_type").(string)
 	}