Apply consistent documentation and naming to existing singular datasources

Author: alexng-canuck

docs/core/instance_credentials.md

@@ -1,28 +1,31 @@
-# oci_core_instance_credential
+# oci_core_instance_credentials
+
+## InstanceCredential Singular DataSource
+
+### InstanceCredential Reference
+
+The following attributes are exported:
+
+* `password` - The password for the username.
+* `username` - The username.
 
-## InstanceCredential DataSource
 
-Gets a single instance_credential
 
 ### Get Operation
 Gets the generated credentials for the instance. Only works for Windows instances. The returned credentials
 are only valid for the initial login.
 
+
 The following arguments are supported:
 
 * `instance_id` - (Required) The OCID of the instance.
 
 
-The following attributes are exported:
-
-* `password` - The password for the username.
-* `username` - The username.
-
 ### Example Usage
 
 ```hcl
-data "oci_core_instance_credentials" "test_instance_credentials" {
+data "oci_core_instance_credentials" "test_instance_credential" {
 	#Required
 	instance_id = "${oci_core_instance.test_instance.id}"
 }
-```
+```

docs/core/ip_sec_connection_device_configs.md

@@ -1,17 +1,8 @@
 # oci_core_ipsec_config
 
-## IpSecConnectionDeviceConfig DataSource
-
-Gets a single ip_sec_connection_device_config
-
-### Get Operation
-Gets the configuration information for the specified IPSec connection. For each tunnel, the
-response includes the IP address of Oracle's VPN headend and the shared secret.
-
-The following arguments are supported:
-
-* `ipsec_id` - (Required) The OCID of the IPSec connection.
+## IpSecConnectionDeviceConfig Singular DataSource
 
+### IpSecConnectionDeviceConfig Reference
 
 The following attributes are exported:
 
@@ -21,14 +12,25 @@ The following attributes are exported:
 * `tunnels` - Two [TunnelConfig](https://docs.us-phoenix-1.oraclecloud.com/api/#/en/iaas/20160918/TunnelConfig/) objects.
 	* `ip_address` - The IP address of Oracle's VPN headend.  Example: `129.146.17.50` 
 	* `shared_secret` - The shared secret of the IPSec tunnel.  Example: `vFG2IF6TWq4UToUiLSRDoJEUs6j1c.p8G.dVQxiMfMO0yXMLi.lZTbYIWhGu4V8o` 
-	* `time_created` - The date and time the IPSec connection was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z`
+	* `time_created` - The date and time the IPSec connection was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
+
+
+
+### Get Operation
+Gets the configuration information for the specified IPSec connection. For each tunnel, the
+response includes the IP address of Oracle's VPN headend and the shared secret.
+
+
+The following arguments are supported:
+
+* `ipsec_id` - (Required) The OCID of the IPSec connection.
 
 
 ### Example Usage
 
 ```hcl
-data "oci_core_ipsec_config" "test_ip_sec_connection_device_configs" {
+data "oci_core_ipsec_config" "test_ip_sec_connection_device_config" {
 	#Required
 	ipsec_id = "${oci_core_ipsec.test_ipsec.id}"
 }
-```
+```

docs/core/ip_sec_connection_device_statuses.md

@@ -1,16 +1,8 @@
 # oci_core_ipsec_status
 
-## IpSecConnectionDeviceStatus DataSource
-
-Gets a list of ip_sec_connection_device_status.
-
-### Get Operation
-Gets the status of the specified IPSec connection (whether it's up or down).
-
-The following arguments are supported:
-
-* `ipsec_id` - (Required) The OCID of the IPSec connection.
+## IpSecConnectionDeviceStatus Singular DataSource
 
+### IpSecConnectionDeviceStatus Reference
 
 The following attributes are exported:
 
@@ -20,8 +12,18 @@ The following attributes are exported:
 * `tunnels` - Two [TunnelStatus](https://docs.us-phoenix-1.oraclecloud.com/api/#/en/iaas/20160918/TunnelStatus/) objects.
 	* `ip_address` - The IP address of Oracle's VPN headend.  Example: `129.146.17.50` 
 	* `state` - The tunnel's current state.
-	* `time_created` - The date and time the IPSec connection was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z`
-	* `time_state_modified` - When the state of the tunnel last changed, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z`
+	* `time_created` - The date and time the IPSec connection was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
+	* `time_state_modified` - When the state of the tunnel last changed, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
+
+
+
+### Get Operation
+Gets the status of the specified IPSec connection (whether it's up or down).
+
+
+The following arguments are supported:
+
+* `ipsec_id` - (Required) The OCID of the IPSec connection.
 
 
 ### Example Usage
@@ -31,4 +33,4 @@ data "oci_core_ipsec_status" "test_ip_sec_connection_device_status" {
 	#Required
 	ipsec_id = "${oci_core_ipsec.test_ipsec.id}"
 }
-```
+```

docs/core/vnics.md

@@ -1,19 +1,8 @@
 # oci_core_vnic
 
-## Vnic DataSource
-
-Gets a single VNIC
-
-### Get Operation
-Gets the information for the specified virtual network interface card (VNIC).
-You can get the VNIC OCID from the
-[ListVnicAttachments](https://docs.us-phoenix-1.oraclecloud.com/api/#/en/iaas/20160918/VnicAttachment/ListVnicAttachments)
-operation.
-
-The following arguments are supported:
-
-* `vnic_id` - (Required) The OCID of the VNIC.
+## Vnic Singular DataSource
 
+### Vnic Reference
 
 The following attributes are exported:
 
@@ -34,11 +23,24 @@ The following attributes are exported:
 * `time_created` - The date and time the VNIC was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
 
 
+
+### Get Operation
+Gets the information for the specified virtual network interface card (VNIC).
+You can get the VNIC OCID from the
+[ListVnicAttachments](https://docs.us-phoenix-1.oraclecloud.com/api/#/en/iaas/20160918/VnicAttachment/ListVnicAttachments)
+operation.
+
+
+The following arguments are supported:
+
+* `vnic_id` - (Required) The OCID of the VNIC.
+
+
 ### Example Usage
 
 ```hcl
 data "oci_core_vnic" "test_vnic" {
 	#Required
 	vnic_id = "${oci_core_vnic.test_vnic.id}"
 }
-```
+```

docs/identity/tenancies.md

@@ -1,42 +1,33 @@
+# oci_identity_tenancy
 
-# oci_identity_tenancies
-
-## Tenancy DataSource
-
-Gets a single tenancy
-
-### Get Operation
-Get the specified tenancy's information.
-The following arguments are supported:
-
-* `tenancy_id` - (Required) The OCID of the tenancy.
+## Tenancy Singular DataSource
 
+### Tenancy Reference
 
 The following attributes are exported:
 
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` 
 * `description` - The description of the tenancy.
 * `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.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}` 
 * `home_region_key` - The region key for the tenancy's home region. For more information about regions, see [Regions and Availability Domains](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/regions.htm).  Allowed values are: - `IAD` - `PHX` - `FRA` - `LHR` 
-* `tenancy_id` - The OCID of the tenancy.
+* `id` - The OCID of the tenancy.
 * `name` - The name of the tenancy.
 
 
+
+### Get Operation
+Get the specified tenancy's information.
+
+The following arguments are supported:
+
+* `tenancy_id` - (Required) The OCID of the tenancy.
+
+
 ### Example Usage
 
 ```hcl
-data "oci_identity_tenancies" "test_tenancies" {
+data "oci_identity_tenancy" "test_tenancy" {
 	#Required
 	tenancy_id = "${var.tenancy_ocid}"
 }
 ```
-### Tenancy Reference
-
-The following attributes are exported:
-
-* `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` 
-* `description` - The description of the tenancy.
-* `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.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}` 
-* `home_region_key` - The region key for the tenancy's home region. For more information about regions, see [Regions and Availability Domains](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/regions.htm).  Allowed values are: - `IAD` - `PHX` - `FRA` - `LHR` 
-* `tenancy_id` - The OCID of the tenancy.
-* `name` - The name of the tenancy.

docs/object_storage/namespaces.md

@@ -1,21 +1,24 @@
-
 # oci_objectstorage_namespace
 
-## Namespace DataSource
+## Namespace Singular DataSource
+
+### Namespace Reference
+
+The following attributes are exported:
+
+* `namespace` - (Computed) The name of the user's namespace. 
+
 
-Gets a namespace
 
 ### Get Operation
 Gets the name of the namespace for the user making the request. An account name must be unique, must start with a
 letter, and can have up to 15 lowercase letters and numbers. You cannot use spaces or special characters.
 
+
 The following arguments are supported:
 
 * No arguments are necessary
 
-The following attributes are exported:
-
-* `namespace` - (Computed) The name of the user's namespace. 
 
 ### Example Usage
 

provider/core_instance_credentials_data_source.go renamed to provider/core_instance_credential_data_source.go

@@ -11,42 +11,46 @@ import (
 	"github.com/oracle/terraform-provider-oci/crud"
 )
 
-func InstanceCredentialsDataSource() *schema.Resource {
+func InstanceCredentialDataSource() *schema.Resource {
 	return &schema.Resource{
-		Read: readInstanceCredentials,
+		Read: readSingularInstanceCredential,
 		Schema: map[string]*schema.Schema{
-			// InstanceCredentials is a single-value data source.
 			"instance_id": {
 				Type:     schema.TypeString,
 				Required: true,
 			},
-			"username": {
+			// Computed
+			"password": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"password": {
+			"username": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
 		},
 	}
 }
 
-func readInstanceCredentials(d *schema.ResourceData, m interface{}) error {
-	sync := &InstanceCredentialsDataSourceCrud{}
+func readSingularInstanceCredential(d *schema.ResourceData, m interface{}) error {
+	sync := &InstanceCredentialDataSourceCrud{}
 	sync.D = d
 	sync.Client = m.(*OracleClients).computeClient
 
 	return crud.ReadResource(sync)
 }
 
-type InstanceCredentialsDataSourceCrud struct {
-	crud.BaseCrud
+type InstanceCredentialDataSourceCrud struct {
+	D      *schema.ResourceData
 	Client *oci_core.ComputeClient
 	Res    *oci_core.GetWindowsInstanceInitialCredentialsResponse
 }
 
-func (s *InstanceCredentialsDataSourceCrud) Get() error {
+func (s *InstanceCredentialDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *InstanceCredentialDataSourceCrud) Get() error {
 	request := oci_core.GetWindowsInstanceInitialCredentialsRequest{}
 
 	if instanceId, ok := s.D.GetOkExists("instance_id"); ok {
@@ -65,7 +69,7 @@ func (s *InstanceCredentialsDataSourceCrud) Get() error {
 	return nil
 }
 
-func (s *InstanceCredentialsDataSourceCrud) SetData() {
+func (s *InstanceCredentialDataSourceCrud) SetData() {
 	if s.Res == nil {
 		return
 	}

provider/core_instance_credentials_data_source_test.go renamed to provider/core_instance_credential_data_source_test.go

@@ -28,14 +28,14 @@ func TestCoreInstanceCredentialResource_basic(t *testing.T) {
 	compartmentId := getRequiredEnvSetting("compartment_ocid")
 	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
 
-	datasourceName := "data.oci_core_instance_credentials.test_instance_credentials"
+	singularDatasourceName := "data.oci_core_instance_credentials.test_instance_credentials"
 
 	resource.Test(t, resource.TestCase{
 		Providers: map[string]terraform.ResourceProvider{
 			"oci": provider,
 		},
 		Steps: []resource.TestStep{
-			// verify datasource
+			// verify singular datasource
 			{
 				Config: config + `
 
@@ -45,12 +45,10 @@ data "oci_core_instance_credentials" "test_instance_credentials" {
 }
                 ` + compartmentIdVariableStr + InstanceCredentialResourceConfig,
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttrSet(datasourceName, "instance_id"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "instance_id"),
 
-					resource.TestCheckResourceAttrSet(datasourceName, "instance_credentials.#"),
-					resource.TestCheckResourceAttrSet(datasourceName, "instance_credentials.0.instance_id"),
-					resource.TestCheckResourceAttrSet(datasourceName, "instance_credentials.0.password"),
-					resource.TestCheckResourceAttrSet(datasourceName, "instance_credentials.0.username"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "password"),
+					resource.TestCheckResourceAttrSet(singularDatasourceName, "username"),
 				),
 			},
 		},