removing deprecated fields that are not part of the APIs

rcohenma · rcohenma · commit 74ce957611d0 · 2019-07-12T16:09:51.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,7 +26,10 @@
         - identity_group
         - identity_policy
         - identity_user
-- Removing deprecated field `time_state_modifed` from data source `core_ip_sec_connection_device_status`.  `time_state_modified` should be used instead
+- Removing deprecated field `time_state_modifed` from data source `oci_core_ip_sec_connection_device_status`.  `time_state_modified` should be used instead
+- Removing deprecated fields `content-length` and `content-type` from data source `oci_objectstorage_object_head`. `content_length` and `content_type` should be used instead
+- Removing `compartment_id` from resource `oci_core_drg_attachment` as an Optional field as the service does not accept it. The compartment of the VCN is the one used by the service. Keeping it as a computed field. 
+- Removing deprecated field `db_data_size_in_mbs` from resource `oci_database_backup`. `database_size_in_gbs` should be used instead
 
 ## 3.33.0 (July 10, 2019)
 
diff --git a/examples/load_balancer/lb_full/lb_full.tf b/examples/load_balancer/lb_full/lb_full.tf
@@ -363,5 +363,5 @@ resource "oci_load_balancer_rule_set" "test_rule_set" {
 }
 
 output "lb_public_ip" {
-  value = ["${oci_load_balancer.lb1.ip_addresses}"]
+  value = ["${oci_load_balancer.lb1.ip_address_details}"]
 }
diff --git a/examples/load_balancer/lb_private/lb_private.tf b/examples/load_balancer/lb_private/lb_private.tf
@@ -113,5 +113,5 @@ resource "oci_core_network_security_group" "test_network_security_group" {
 }
 
 output "lb_private_ip" {
-  value = ["${oci_load_balancer.lb1.ip_addresses}"]
+  value = ["${oci_load_balancer.lb1.ip_address_details}"]
 }
diff --git a/examples/object_storage/object.tf b/examples/object_storage/object.tf
@@ -76,8 +76,8 @@ output object-head-data {
   value = <<EOF
 
   object = ${data.oci_objectstorage_object_head.object_head1.object}
-  content-length = ${data.oci_objectstorage_object_head.object_head1.content-length}
-  content-type = ${data.oci_objectstorage_object_head.object_head1.content-type}
+  content-length = ${data.oci_objectstorage_object_head.object_head1.content_length}
+  content-type = ${data.oci_objectstorage_object_head.object_head1.content_type}
 EOF
 }
 
diff --git a/oci/core_drg_attachment_resource.go b/oci/core_drg_attachment_resource.go
@@ -49,10 +49,6 @@ func CoreDrgAttachmentResource() *schema.Resource {
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Computed: true,
-				// Used to be required. Added back as optional to avoid showing errors (this field
-				// cannot be set).
-				Optional:   true,
-				Deprecated: "No longer required. The DRG attachment is automatically placed into the same compartment as the VCN.",
 			},
 			"state": {
 				Type:     schema.TypeString,
diff --git a/oci/core_drg_attachment_resource_test.go b/oci/core_drg_attachment_resource_test.go
@@ -49,7 +49,6 @@ func (s *ResourceCoreDrgAttachmentTestSuite) TestAccResourceCoreDrgAttachment_ba
 			{
 				Config: s.Config + `
 				resource "oci_core_drg_attachment" "t" {
-					compartment_id = "${var.compartment_id}"
 					drg_id = "${oci_core_drg.t.id}"
 					vcn_id = "${oci_core_virtual_network.t.id}"
 				}`,
@@ -70,7 +69,6 @@ func (s *ResourceCoreDrgAttachmentTestSuite) TestAccResourceCoreDrgAttachment_ba
 			{
 				Config: s.Config + `
 				resource "oci_core_drg_attachment" "t" {
-					compartment_id = "${var.compartment_id}"
 					drg_id = "${oci_core_drg.t.id}"
 					vcn_id = "${oci_core_virtual_network.t.id}"
 					display_name = "-tf-drg-attachment"
diff --git a/oci/core_drg_attachments_data_source_test.go b/oci/core_drg_attachments_data_source_test.go
@@ -34,7 +34,6 @@ func (s *DatasourceCoreDrgAttachmentTestSuite) SetupTest() {
 		display_name = "-tf-drg"
 	}
 	resource "oci_core_drg_attachment" "t" {
-		compartment_id = "${var.compartment_id}"
 		drg_id = "${oci_core_drg.t.id}"
 		vcn_id = "${oci_core_virtual_network.t.id}"
 		display_name = "-tf-drg-attachment"
diff --git a/oci/database_backup_resource.go b/oci/database_backup_resource.go
@@ -47,11 +47,6 @@ func DatabaseBackupResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"db_data_size_in_mbs": {
-				Type:       schema.TypeInt,
-				Computed:   true,
-				Deprecated: FieldDeprecatedForAnother("db_data_size_in_mbs", "database_size_in_gbs"),
-			},
 			"database_size_in_gbs": {
 				Type:     schema.TypeFloat,
 				Computed: true,
@@ -211,7 +206,6 @@ func (s *DatabaseBackupResourceCrud) SetData() error {
 
 	if s.Res.DatabaseSizeInGBs != nil {
 		s.D.Set("database_size_in_gbs", *s.Res.DatabaseSizeInGBs)
-		s.D.Set("db_data_size_in_mbs", (*s.Res.DatabaseSizeInGBs)*1024)
 	}
 
 	if s.Res.DisplayName != nil {
diff --git a/oci/database_backup_test.go b/oci/database_backup_test.go
@@ -99,7 +99,6 @@ func TestDatabaseBackupResource_basic(t *testing.T) {
 				ImportStateVerifyIgnore: []string{
 					// Need this workaround due to import behavior change introduced by https://github.com/hashicorp/terraform/issues/20985
 					"database_size_in_gbs",
-					"db_data_size_in_mbs",
 				},
 				ResourceName: resourceName,
 			},
diff --git a/oci/database_backups_data_source.go b/oci/database_backups_data_source.go
@@ -112,7 +112,6 @@ func (s *DatabaseBackupsDataSourceCrud) SetData() error {
 
 		if r.DatabaseSizeInGBs != nil {
 			backup["database_size_in_gbs"] = *r.DatabaseSizeInGBs
-			backup["db_data_size_in_mbs"] = (*r.DatabaseSizeInGBs) * 1024
 		}
 
 		if r.DisplayName != nil {
diff --git a/oci/load_balancer_load_balancer_resource_test.go b/oci/load_balancer_load_balancer_resource_test.go
@@ -84,7 +84,7 @@ func (s *ResourceLoadBalancerLBTestSuite) TestAccResourceLoadBalancerLB_basicPri
 					resource.TestCheckResourceAttr(s.ResourceName, "display_name", "-tf-lb"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "shape"),
 					resource.TestCheckResourceAttr(s.ResourceName, "subnet_ids.#", "1"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "ip_addresses.#"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "ip_address_details.#"),
 					resource.TestCheckResourceAttr(s.ResourceName, "is_private", "true"),
 					resource.TestCheckResourceAttr(s.ResourceName, "state", string(loadbalancer.LoadBalancerLifecycleStateActive)),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "time_created"),
@@ -107,7 +107,7 @@ func (s *ResourceLoadBalancerLBTestSuite) TestAccResourceLoadBalancerLB_basicPri
 					resource.TestCheckResourceAttr(s.ResourceName, "display_name", "-tf-lb-updated"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "shape"),
 					resource.TestCheckResourceAttr(s.ResourceName, "subnet_ids.#", "1"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "ip_addresses.#"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "ip_address_details.#"),
 					resource.TestCheckResourceAttr(s.ResourceName, "is_private", "true"),
 					resource.TestCheckResourceAttr(s.ResourceName, "state", string(loadbalancer.LoadBalancerLifecycleStateActive)),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "time_created"),
@@ -134,7 +134,7 @@ func (s *ResourceLoadBalancerLBTestSuite) TestAccResourceLoadBalancerLB_basicPri
 					resource.TestCheckResourceAttr(s.ResourceName, "display_name", "-tf-lb-updated"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "shape"),
 					resource.TestCheckResourceAttr(s.ResourceName, "subnet_ids.#", "2"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "ip_addresses.#"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "ip_address_details.#"),
 					resource.TestCheckResourceAttr(s.ResourceName, "is_private", "false"),
 					resource.TestCheckResourceAttr(s.ResourceName, "state", string(loadbalancer.LoadBalancerLifecycleStateActive)),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "time_created"),
@@ -169,7 +169,7 @@ func (s *ResourceLoadBalancerLBTestSuite) TestAccResourceLoadBalancerLB_basicPub
 					resource.TestCheckResourceAttrSet(s.ResourceName, "id"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "shape"),
 					resource.TestCheckResourceAttr(s.ResourceName, "subnet_ids.#", "2"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "ip_addresses.#"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "ip_address_details.#"),
 					resource.TestCheckResourceAttr(s.ResourceName, "is_private", "false"),
 					resource.TestCheckResourceAttr(s.ResourceName, "state", string(loadbalancer.LoadBalancerLifecycleStateActive)),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "time_created"),
diff --git a/oci/object_storage_object_head_data_source.go b/oci/object_storage_object_head_data_source.go
@@ -31,22 +31,10 @@ func ObjectStorageObjectHeadDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"content-length": {
-				Type:     schema.TypeInt,
-				Computed: true,
-				// This field is not a compliant Terraform field name because it has a hyphen
-				Deprecated: FieldDeprecatedForAnother("content-length", "content_length"),
-			},
 			"content_length": {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
-			"content-type": {
-				Type:     schema.TypeString,
-				Computed: true,
-				// This field is not a compliant Terraform field name because it has a hyphen
-				Deprecated: FieldDeprecatedForAnother("content-type", "content_type"),
-			},
 			"content_type": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -120,12 +108,10 @@ func (s *ObjectHeadDataSourceCrud) SetData() error {
 	}
 
 	if s.Res.ContentLength != nil {
-		s.D.Set("content-length", *s.Res.ContentLength)
 		s.D.Set("content_length", *s.Res.ContentLength)
 	}
 
 	if s.Res.ContentType != nil {
-		s.D.Set("content-type", *s.Res.ContentType)
 		s.D.Set("content_type", *s.Res.ContentType)
 	}
 
diff --git a/oci/object_storage_object_head_data_source_test.go b/oci/object_storage_object_head_data_source_test.go
@@ -67,9 +67,7 @@ func (s *DatasourceObjectstorageObjectHeadTestSuite) TestObjectstorageObjectHead
 					resource.TestCheckResourceAttr(s.ResourceName, "object", "-tf-object"),
 					resource.TestCheckResourceAttr(s.ResourceName, "metadata.%", "1"),
 					resource.TestCheckResourceAttr(s.ResourceName, "metadata.content-type", "text/plain"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "content-type"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "content_type"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "content-length"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "content_length"),
 				),
 			},
diff --git a/website/docs/r/database_backup.html.markdown b/website/docs/r/database_backup.html.markdown
@@ -41,7 +41,6 @@ The following attributes are exported:
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
 * `database_edition` - The Oracle Database edition of the DB system from which the database backup was taken. 
 * `database_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the database.
-* `db_data_size_in_mbs` (Deprecated) - Size of the database in megabytes (MB) at the time the backup was taken. Use `database_size_in_gbs` instead.
 * `database_size_in_gbs` - The size of the database in gigabytes at the time the backup was taken. 
 * `display_name` - The user-friendly name for the backup. The name does not have to be unique.
 * `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the backup.

Original file line number	Diff line number	Diff line change
`@@ -363,5 +363,5 @@ resource "oci_load_balancer_rule_set" "test_rule_set" {`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`output "lb_public_ip" {`
`366`		`- value = ["${oci_load_balancer.lb1.ip_addresses}"]`
	`366`	`+ value = ["${oci_load_balancer.lb1.ip_address_details}"]`
`367`	`367`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,5 @@ resource "oci_core_network_security_group" "test_network_security_group" {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`output "lb_private_ip" {`
`116`		`- value = ["${oci_load_balancer.lb1.ip_addresses}"]`
	`116`	`+ value = ["${oci_load_balancer.lb1.ip_address_details}"]`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ output object-head-data {`
`76`	`76`	`value = <<EOF`
`77`	`77`
`78`	`78`	`object = ${data.oci_objectstorage_object_head.object_head1.object}`
`79`		`- content-length = ${data.oci_objectstorage_object_head.object_head1.content-length}`
`80`		`- content-type = ${data.oci_objectstorage_object_head.object_head1.content-type}`
	`79`	`+ content-length = ${data.oci_objectstorage_object_head.object_head1.content_length}`
	`80`	`+ content-type = ${data.oci_objectstorage_object_head.object_head1.content_type}`
`81`	`81`	`EOF`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ func (s *DatasourceCoreDrgAttachmentTestSuite) SetupTest() {`
`34`	`34`	`display_name = "-tf-drg"`
`35`	`35`	`}`
`36`	`36`	`resource "oci_core_drg_attachment" "t" {`
`37`		`- compartment_id = "${var.compartment_id}"`
`38`	`37`	`drg_id = "${oci_core_drg.t.id}"`
`39`	`38`	`vcn_id = "${oci_core_virtual_network.t.id}"`
`40`	`39`	`display_name = "-tf-drg-attachment"`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,6 @@ func (s *DatabaseBackupsDataSourceCrud) SetData() error {`
`112`	`112`
`113`	`113`	`if r.DatabaseSizeInGBs != nil {`
`114`	`114`	`backup["database_size_in_gbs"] = *r.DatabaseSizeInGBs`
`115`		`- backup["db_data_size_in_mbs"] = (r.DatabaseSizeInGBs) 1024`
`116`	`115`	`}`
`117`	`116`
`118`	`117`	`if r.DisplayName != nil {`