format changes to match established standards

rcohenma · rcohenma · commit 802d2892e186 · 2019-06-14T16:25:53.000-07:00
diff --git a/oci/database_autonomous_data_warehouse_resource.go b/oci/database_autonomous_data_warehouse_resource.go
@@ -41,10 +41,9 @@ func DatabaseAutonomousDataWarehouseResource() *schema.Resource {
 				Required: true,
 			},
 			"db_name": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-				// TODO: Move the deprecation message to resource schema post Terraform v12 upgrade
+				Type:       schema.TypeString,
+				Required:   true,
+				ForceNew:   true,
 				Deprecated: ResourceDeprecatedForAnother("oci_database_autonomous_data_warehouse", "oci_database_autonomous_database"),
 			},
 
diff --git a/oci/database_data_guard_association_test.go b/oci/database_data_guard_association_test.go
@@ -275,7 +275,6 @@ func TestDatabaseDataGuardAssociationResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(singularDatasourceName, "transport_type", "ASYNC"),
 				),
 			},
-			// @CODEGEN We need to remove the import because the import step removed the dependency relationship between the DGA and the peer dbSystem and the delete will fail without it.
 		},
 	})
 }
diff --git a/oci/database_db_home_data_source.go b/oci/database_db_home_data_source.go
@@ -4,7 +4,6 @@ package provider
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/hashicorp/terraform/helper/schema"
 	oci_database "github.com/oracle/oci-go-sdk/database"
@@ -42,10 +41,6 @@ func (s *DatabaseDbHomeDataSourceCrud) Get() error {
 
 	if dbHomeId, ok := s.D.GetOkExists("db_home_id"); ok {
 		tmp := dbHomeId.(string)
-		if len(tmp) == 0 {
-			return fmt.Errorf("db_home_id must contain a valid ocid")
-		}
-
 		request.DbHomeId = &tmp
 	}
 
diff --git a/oci/database_db_home_resource.go b/oci/database_db_home_resource.go
@@ -184,15 +184,15 @@ func DatabaseDbHomeResource() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+
+			// Optional
 			"db_version": {
 				Type:             schema.TypeString,
 				Optional:         true,
 				Computed:         true,
-				ForceNew:         true,
+				ForceNew:         true, // @CODEGEN we don't currently support updates to dbVersion because the update operation takes a patchId instead of a new version
 				DiffSuppressFunc: NewIsPrefixOfOldDiffSuppress,
 			},
-
-			// Optional
 			"display_name": {
 				Type:     schema.TypeString,
 				Optional: true,
diff --git a/oci/database_db_homes_data_source.go b/oci/database_db_homes_data_source.go
@@ -152,5 +152,3 @@ func (s *DatabaseDbHomesDataSourceCrud) SetData() error {
 
 	return nil
 }
-
-// @CODEGEN 08/2018: Methods CreateDatabaseDetailsToMap, CreateDatabaseFromBackupDetailsToMap and DbBackupConfigToMap are available in database_db_system_resource.go
diff --git a/oci/database_db_nodes_data_source.go b/oci/database_db_nodes_data_source.go
@@ -143,7 +143,6 @@ func (s *DatabaseDbNodesDataSourceCrud) SetData() error {
 			dbNode["db_node_id"] = *r.Id // maintain legacy vanity id
 		}
 
-		// @CODEGEN not present in schema
 		if r.SoftwareStorageSizeInGB != nil {
 			dbNode["software_storage_size_in_gb"] = *r.SoftwareStorageSizeInGB
 		}
diff --git a/oci/dns_steering_policy_resource.go b/oci/dns_steering_policy_resource.go
@@ -1091,6 +1091,7 @@ func SteeringPolicyRuleToMap(obj oci_dns.SteeringPolicyRule) map[string]interfac
 		log.Printf("[WARN] Received 'rule_type' of unknown type %v", obj)
 		return nil
 	}
+
 	return result
 }
 
diff --git a/oci/dns_zone_resource.go b/oci/dns_zone_resource.go
@@ -335,6 +335,7 @@ func (s *DnsZoneResourceCrud) Delete() error {
 	request.ZoneNameOrId = &tmp
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "dns")
+
 	_, err := s.Client.DeleteZone(context.Background(), request)
 	return err
 }
@@ -376,16 +377,18 @@ func (s *DnsZoneResourceCrud) SetData() error {
 		s.D.Set("serial", *s.Res.Serial)
 	}
 
+	s.D.Set("state", s.Res.LifecycleState)
+
+	if s.Res.TimeCreated != nil {
+		s.D.Set("time_created", s.Res.TimeCreated.String())
+	}
+
 	if s.Res.Version != nil {
 		s.D.Set("version", *s.Res.Version)
 	}
 
 	s.D.Set("zone_type", s.Res.ZoneType)
 
-	s.D.Set("state", s.Res.LifecycleState)
-
-	s.D.Set("time_created", s.Res.TimeCreated.String())
-
 	return nil
 }
 
diff --git a/oci/dns_zones_data_source.go b/oci/dns_zones_data_source.go
@@ -16,14 +16,10 @@ func DnsZonesDataSource() *schema.Resource {
 		Read: readDnsZones,
 		Schema: map[string]*schema.Schema{
 			"filter": dataSourceFiltersSchema(),
-
-			// Required
 			"compartment_id": {
 				Type:     schema.TypeString,
 				Required: true,
 			},
-
-			// Optional
 			"name": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -56,8 +52,6 @@ func DnsZonesDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
-
-			// Computed
 			"zones": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -195,7 +189,11 @@ func (s *DnsZonesDataSourceCrud) SetData() error {
 			zone["serial"] = *r.Serial
 		}
 
-		zone["time_created"] = r.TimeCreated.String()
+		zone["state"] = r.LifecycleState
+
+		if r.TimeCreated != nil {
+			zone["time_created"] = r.TimeCreated.String()
+		}
 
 		if r.Version != nil {
 			zone["version"] = *r.Version
diff --git a/oci/health_checks_http_monitor_resource.go b/oci/health_checks_http_monitor_resource.go
@@ -306,6 +306,9 @@ func (s *HealthChecksHttpMonitorResourceCrud) Update() error {
 		request.Method = oci_health_checks.UpdateHttpMonitorDetailsMethodEnum(method.(string))
 	}
 
+	tmp := s.D.Id()
+	request.MonitorId = &tmp
+
 	if path, ok := s.D.GetOkExists("path"); ok {
 		tmp := path.(string)
 		request.Path = &tmp
@@ -349,9 +352,6 @@ func (s *HealthChecksHttpMonitorResourceCrud) Update() error {
 		request.VantagePointNames = tmp
 	}
 
-	tmp := s.D.Id()
-	request.MonitorId = &tmp
-
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "health_checks")
 
 	response, err := s.Client.UpdateHttpMonitor(context.Background(), request)
diff --git a/oci/health_checks_http_monitor_test.go b/oci/health_checks_http_monitor_test.go
@@ -276,6 +276,8 @@ func sweepHealthChecksHttpMonitorResource(compartment string) error {
 		if ok := SweeperDefaultResourceId[httpMonitorId]; !ok {
 			deleteHttpMonitorRequest := oci_health_checks.DeleteHttpMonitorRequest{}
 
+			deleteHttpMonitorRequest.MonitorId = &httpMonitorId
+
 			deleteHttpMonitorRequest.RequestMetadata.RetryPolicy = getRetryPolicy(true, "health_checks")
 			_, error := healthChecksClient.DeleteHttpMonitor(context.Background(), deleteHttpMonitorRequest)
 			if error != nil {
diff --git a/oci/health_checks_ping_monitor_resource.go b/oci/health_checks_ping_monitor_resource.go
@@ -269,6 +269,9 @@ func (s *HealthChecksPingMonitorResourceCrud) Update() error {
 		request.IsEnabled = &tmp
 	}
 
+	tmp := s.D.Id()
+	request.MonitorId = &tmp
+
 	if port, ok := s.D.GetOkExists("port"); ok {
 		tmp := port.(int)
 		request.Port = &tmp
@@ -307,9 +310,6 @@ func (s *HealthChecksPingMonitorResourceCrud) Update() error {
 		request.VantagePointNames = tmp
 	}
 
-	tmp := s.D.Id()
-	request.MonitorId = &tmp
-
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "health_checks")
 
 	response, err := s.Client.UpdatePingMonitor(context.Background(), request)
diff --git a/oci/health_checks_ping_monitor_test.go b/oci/health_checks_ping_monitor_test.go
@@ -264,6 +264,8 @@ func sweepHealthChecksPingMonitorResource(compartment string) error {
 		if ok := SweeperDefaultResourceId[pingMonitorId]; !ok {
 			deletePingMonitorRequest := oci_health_checks.DeletePingMonitorRequest{}
 
+			deletePingMonitorRequest.MonitorId = &pingMonitorId
+
 			deletePingMonitorRequest.RequestMetadata.RetryPolicy = getRetryPolicy(true, "health_checks")
 			_, error := healthChecksClient.DeletePingMonitor(context.Background(), deletePingMonitorRequest)
 			if error != nil {
diff --git a/oci/identity_tenancy_data_source.go b/oci/identity_tenancy_data_source.go
@@ -102,10 +102,6 @@ func (s *IdentityTenancyDataSourceCrud) SetData() error {
 		s.D.Set("home_region_key", *s.Res.HomeRegionKey)
 	}
 
-	if s.Res.Id != nil {
-		s.D.Set("tenancy_id", *s.Res.Id)
-	}
-
 	if s.Res.Name != nil {
 		s.D.Set("name", *s.Res.Name)
 	}
diff --git a/oci/object_storage_bucket_resource.go b/oci/object_storage_bucket_resource.go
@@ -335,7 +335,6 @@ func (s *ObjectStorageBucketResourceCrud) Delete() error {
 
 func (s *ObjectStorageBucketResourceCrud) SetData() error {
 
-	// For ImportStateVerify to keep state consistent after import
 	bucket, namespace, err := parseBucketCompositeId(s.D.Id())
 	if err == nil {
 		s.D.Set("bucket", &bucket)
diff --git a/oci/object_storage_preauthenticated_request_resource.go b/oci/object_storage_preauthenticated_request_resource.go
@@ -168,7 +168,6 @@ func (s *ObjectStoragePreauthenticatedRequestResourceCrud) Create() error {
 		if err != nil {
 			return err
 		}
-
 		request.TimeExpires = &oci_common.SDKTime{Time: tmp}
 	}
 
diff --git a/website/docs/d/dns_records.html.markdown b/website/docs/d/dns_records.html.markdown
@@ -48,9 +48,9 @@ The following arguments are supported:
 
 The following attributes are exported:
 
-* `records` - A collection of DNS resource records.
+* `records` - The list of records.
 
-### DnsRecord Reference
+### Record Reference
 
 The following attributes are exported:
 
diff --git a/website/docs/d/dns_steering_policy.html.markdown b/website/docs/d/dns_steering_policy.html.markdown
@@ -33,7 +33,7 @@ The following arguments are supported:
 The following attributes are exported:
 
 * `answers` - The set of all answers that can potentially issue from the steering policy. 
-	* `is_disabled` - Set this property to `true` to indicate that the answer is administratively disabled, such as when the corresponding server is down for maintenance. An answer's `isDisabled` property can be referenced in `answerCondition` properties in rules using `answer.isDisabled`. 
+	* `is_disabled` - Set this property to `true` to indicate that the answer is administratively disabled, such as when the corresponding server is down for maintenance. An answer's `isDisabled` property can be referenced in `answerCondition` properties in rules using `answer.isDisabled`.
 	* `name` - A user-friendly name for the answer, unique within the steering policy. An answer's `name` property can be referenced in `answerCondition` properties of rules using `answer.name`.
 	* `pool` - The freeform name of a group of one or more records in which this record is included, such as "LAX data center". An answer's `pool` property can be referenced in `answerCondition` properties of rules using `answer.pool`.
 	* `rdata` - The record's data, as whitespace-delimited tokens in type-specific presentation format. All RDATA is normalized and the returned presentation of your RDATA may differ from its initial input. For more information about RDATA, see [Supported DNS Resource Record Types](https://docs.cloud.oracle.com/iaas/Content/DNS/Reference/supporteddnsresource.htm). 
diff --git a/website/docs/d/dns_zones.html.markdown b/website/docs/d/dns_zones.html.markdown
@@ -49,9 +49,9 @@ The following arguments are supported:
 
 The following attributes are exported:
 
-* `zones` - A list of DNS zones.
+* `zones` - The list of zones.
 
-### DnsZone Reference
+### Zone Reference
 
 The following attributes are exported:
 
diff --git a/website/docs/d/identity_regions.html.markdown b/website/docs/d/identity_regions.html.markdown
@@ -18,6 +18,12 @@ data "oci_identity_regions" "test_regions" {
 }
 ```
 
+## Argument Reference
+
+The following arguments are supported:
+
+
+
 ## Attributes Reference
 
 The following attributes are exported:
diff --git a/website/docs/d/object_storage_buckets.html.markdown b/website/docs/d/object_storage_buckets.html.markdown
@@ -39,18 +39,21 @@ The following arguments are supported:
 
 The following attributes are exported:
 
-* `bucket_summaries` - The list of buckets.
+* `bucket_summaries` - The list of bucket_summaries.
 
 ### Bucket Reference
 
 The following attributes are exported:
 
 * `access_type` - The type of public access enabled on this bucket. A bucket is set to `NoPublicAccess` by default, which only allows an authenticated caller to access the bucket and its contents. When `ObjectRead` is enabled on the bucket, public access is allowed for the `GetObject`, `HeadObject`, and `ListObjects` operations. When `ObjectReadWithoutList` is enabled on the bucket, public access is allowed for the `GetObject` and `HeadObject` operations. 
+* `approximate_count` - The approximate number of objects in the bucket. Count statistics are reported periodically. You will see a lag between what is displayed and the actual object count. 
+* `approximate_size` - The approximate total size in bytes of all objects in the bucket. Size statistics are reported periodically. You will see a lag between what is displayed and the actual size of the bucket. 
 * `compartment_id` - The compartment ID in which the bucket is authorized.
 * `created_by` - The OCID of the user who created the bucket.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` 
 * `etag` - The entity tag (ETag) for the bucket.
 * `freeform_tags` - Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}` 
+* `kms_key_id` - The OCID of a KMS key id used to call KMS to generate data key or decrypt the encrypted data key. 
 * `metadata` - Arbitrary string keys and values for user-defined metadata.
 * `name` - The name of the bucket. Avoid entering confidential information. Example: my-new-bucket1 
 * `namespace` - The Object Storage namespace in which the bucket lives.
diff --git a/website/docs/d/object_storage_object.html.markdown b/website/docs/d/object_storage_object.html.markdown
@@ -32,6 +32,7 @@ The following arguments are supported:
 * `object` - (Required) The name of the object. Avoid entering confidential information. Example: `test/object1.log` 
 * `content_length_limit` - (Optional) The limit of the content length of the object body to download from the object store. The default is 1Mb.
 
+
 ## Attributes Reference
 
 The following attributes are exported:
diff --git a/website/docs/r/audit_configuration.html.markdown b/website/docs/r/audit_configuration.html.markdown
@@ -39,3 +39,7 @@ The following attributes are exported:
 
 * `retention_period_days` - The retention period days
 
+## Import
+
+Import is not supported for this resource.
+
diff --git a/website/docs/r/budget_alert_rule.html.markdown b/website/docs/r/budget_alert_rule.html.markdown
@@ -71,3 +71,7 @@ The following attributes are exported:
 * `type` - ACTUAL means the alert will trigger based on actual usage. FORECAST means the alert will trigger based on predicted usage. 
 * `version` - Version of the alert rule. Starts from 1 and increments by 1.
 
+## Import
+
+Import is not supported for this resource.
+
diff --git a/website/docs/r/database_data_guard_association.html.markdown b/website/docs/r/database_data_guard_association.html.markdown
@@ -101,5 +101,5 @@ The following attributes are exported:
 
 ## Import
 
-DataGuardAssociations cannot be imported at this time.
+Import is not supported for this resource.
 
diff --git a/website/docs/r/database_db_system.html.markdown b/website/docs/r/database_db_system.html.markdown
@@ -16,10 +16,6 @@ An initial database is created on the DB system based on the request parameters
 options. For more information,
 see [Default Options for the Initial Database](https://docs.cloud.oracle.com/iaas/Content/Database/Tasks/launchingDB.htm#DefaultOptionsfortheInitialDatabase).
 
-The DB System will include a command line interface (CLI) that you can use to create additional databases and
-manage existing databases. For more information, see the
-[Oracle Database CLI Reference](https://docs.cloud.oracle.com/iaas/Content/Database/References/dbacli.htm).
-
 
 ## Example Usage
 
diff --git a/website/docs/r/dns_record.html.markdown b/website/docs/r/dns_record.html.markdown
@@ -61,3 +61,7 @@ The following attributes are exported:
 * `ttl` - The Time To Live for the record, in seconds.
 * `zone_name_or_id` - The name or OCID of the target zone.
 
+## Import
+
+Import is not supported for this resource.
+
diff --git a/website/docs/r/file_storage_export.html.markdown b/website/docs/r/file_storage_export.html.markdown
@@ -18,7 +18,7 @@ file system.
 ```hcl
 resource "oci_file_storage_export" "test_export" {
 	#Required
-	export_set_id = "${oci_file_storage_mount_target.test_mount_target.export_set_id}"
+	export_set_id = "${oci_file_storage_export_set.test_export_set.id}"
 	file_system_id = "${oci_file_storage_file_system.test_file_system.id}"
 	path = "${var.export_path}"
 
diff --git a/website/docs/r/identity_api_key.html.markdown b/website/docs/r/identity_api_key.html.markdown
@@ -22,6 +22,7 @@ management (e.g., `ListUsers`, `LaunchInstance`) and receive an "unauthorized" e
 check with an administrator to confirm which IAM Service group(s) you're in and what access
 you have. Also confirm you're working in the correct compartment.
 
+
 ## Example Usage
 
 ```hcl
@@ -55,3 +56,7 @@ The following attributes are exported:
 * `time_created` - Date and time the `ApiKey` object was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
 * `user_id` - The OCID of the user the key belongs to.
 
+## Import
+
+Import is not supported for this resource.
+
diff --git a/website/docs/r/identity_auth_token.html.markdown b/website/docs/r/identity_auth_token.html.markdown
@@ -55,3 +55,7 @@ The following attributes are exported:
 * `token` - The auth token. The value is available only in the response for `CreateAuthToken`, and not for `ListAuthTokens` or `UpdateAuthToken`. 
 * `user_id` - The OCID of the user the auth token belongs to.
 
+## Import
+
+Import is not supported for this resource.
+
diff --git a/website/docs/r/identity_compartment.html.markdown b/website/docs/r/identity_compartment.html.markdown
diff --git a/website/docs/r/identity_customer_secret_key.html.markdown b/website/docs/r/identity_customer_secret_key.html.markdown
diff --git a/website/docs/r/identity_idp_group_mapping.html.markdown b/website/docs/r/identity_idp_group_mapping.html.markdown
diff --git a/website/docs/r/identity_smtp_credential.html.markdown b/website/docs/r/identity_smtp_credential.html.markdown
diff --git a/website/docs/r/identity_swift_password.html.markdown b/website/docs/r/identity_swift_password.html.markdown
diff --git a/website/docs/r/identity_ui_password.html.markdown b/website/docs/r/identity_ui_password.html.markdown
diff --git a/website/docs/r/identity_user.html.markdown b/website/docs/r/identity_user.html.markdown
diff --git a/website/docs/r/kms_encrypted_data.html.markdown b/website/docs/r/kms_encrypted_data.html.markdown
diff --git a/website/docs/r/kms_generated_key.html.markdown b/website/docs/r/kms_generated_key.html.markdown
diff --git a/website/docs/r/load_balancer_certificate.html.markdown b/website/docs/r/load_balancer_certificate.html.markdown
diff --git a/website/docs/r/ons_notification_topic.html.markdown b/website/docs/r/ons_notification_topic.html.markdown
diff --git a/website/docs/r/ons_subscription.html.markdown b/website/docs/r/ons_subscription.html.markdown
diff --git a/website/docs/r/waas_certificate.html.markdown b/website/docs/r/waas_certificate.html.markdown

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,6 @@ func TestDatabaseDataGuardAssociationResource_basic(t *testing.T) {`
`275`	`275`	`resource.TestCheckResourceAttr(singularDatasourceName, "transport_type", "ASYNC"),`
`276`	`276`	`),`
`277`	`277`	`},`
`278`		`- // @CODEGEN We need to remove the import because the import step removed the dependency relationship between the DGA and the peer dbSystem and the delete will fail without it.`
`279`	`278`	`},`
`280`	`279`	`})`
`281`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,5 +152,3 @@ func (s *DatabaseDbHomesDataSourceCrud) SetData() error {`
`152`	`152`
`153`	`153`	`return nil`
`154`	`154`	`}`
`155`		`-`
`156`		`-// @CODEGEN 08/2018: Methods CreateDatabaseDetailsToMap, CreateDatabaseFromBackupDetailsToMap and DbBackupConfigToMap are available in database_db_system_resource.go`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,6 @@ func (s *DatabaseDbNodesDataSourceCrud) SetData() error {`
`143`	`143`	`dbNode["db_node_id"] = *r.Id // maintain legacy vanity id`
`144`	`144`	`}`
`145`	`145`
`146`		`- // @CODEGEN not present in schema`
`147`	`146`	`if r.SoftwareStorageSizeInGB != nil {`
`148`	`147`	`dbNode["software_storage_size_in_gb"] = *r.SoftwareStorageSizeInGB`
`149`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1091,6 +1091,7 @@ func SteeringPolicyRuleToMap(obj oci_dns.SteeringPolicyRule) map[string]interfac`
`1091`	`1091`	`log.Printf("[WARN] Received 'rule_type' of unknown type %v", obj)`
`1092`	`1092`	`return nil`
`1093`	`1093`	`}`
	`1094`	`+`
`1094`	`1095`	`return result`
`1095`	`1096`	`}`
`1096`	`1097`