making volume group and Identity_provider conform to polymorphic template

Author: rcohenma

docs/core/volume_attachments.md

@@ -8,22 +8,21 @@ The following attributes are exported:
 
 * `attachment_type` - The type of volume attachment.
 * `availability_domain` - The Availability Domain of an instance.  Example: `Uocm:PHX-AD-1` 
+* `chap_secret` - The Challenge-Handshake-Authentication-Protocol (CHAP) secret valid for the associated CHAP user name. (Also called the "CHAP password".)  Example: `d6866c0d-298b-48ba-95af-309b4faux45e` 
+* `chap_username` - The volume's system-generated Challenge-Handshake-Authentication-Protocol (CHAP) user name.  Example: `ocid1.volume.oc1.phx.abyhqljrgvttnlx73nmrwfaux7kcvzfs3s66izvxf2h4lgvyndsdsnoiwr5q` 
 * `compartment_id` - The OCID of the compartment.
 * `display_name` - A user-friendly name. Does not have to be unique, and it cannot be changed. Avoid entering confidential information.  Example: `My volume attachment` 
 * `id` - The OCID of the volume attachment.
 * `instance_id` - The OCID of the instance the volume is attached to.
+* `ipv4` - The volume's iSCSI IP address.  Example: `169.254.0.2` 
+* `iqn` - The target volume's iSCSI Qualified Name in the format defined by RFC 3720.  Example: `iqn.2015-12.us.oracle.com:456b0391-17b8-4122-bbf1-f85fc0bb97d9` 
 * `is_read_only` - Whether the attachment was created in read-only mode.
+* `port` - The volume's iSCSI port.  Example: `3260` 
 * `state` - The current state of the volume attachment.
 * `time_created` - The date and time the volume was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
 * `volume_id` - The OCID of the volume.
 
-The following additional attributes are exported for the iSCSI volume attachment type:
-* `use_chap` - Whether to use CHAP authentication for the volume attachment.
-* `chap_username` - The volume's system-generated Challenge-Handshake-Authentication-Protocol (CHAP) user name.
-* `chap_secret` - The Challenge-Handshake-Authentication-Protocol (CHAP) secret valid for the associated CHAP user name. (Also called the "CHAP password".)
-* `ipv4` - The volume's iSCSI IP address.
-* `port` - The volume's iSCSI port.
-* `iqn` - The target volume's iSCSI Qualified Name in the format defined by RFC 3720.
+
 
 ### Create Operation
 Attaches the specified storage volume to the specified instance.

docs/identity/identity_providers.md

@@ -12,6 +12,7 @@ The following attributes are exported:
 * `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"}` 
 * `id` - The OCID of the `IdentityProvider`.
 * `inactive_state` - The detailed status of INACTIVE lifecycleState.
+* `metadata_url` - The URL for retrieving the identity provider's metadata, which contains information required for federating. 
 * `name` - The name you assign to the `IdentityProvider` during creation. The name must be unique across all `IdentityProvider` objects in the tenancy and cannot be changed. This is the name federated users see when choosing which identity provider to use when signing in to the Oracle Cloud Infrastructure Console. 
 * `product_type` - The identity provider service or product. Supported identity providers are Oracle Identity Cloud Service (IDCS) and Microsoft Active Directory Federation Services (ADFS).
 
@@ -21,6 +22,8 @@ The following attributes are exported:
 
 	Example: `IDCS` 
 * `protocol` - The protocol used for federation. Allowed value: `SAML2`.  Example: `SAML2` 
+* `redirect_url` - The URL to redirect federated users to for authentication with the identity provider. 
+* `signing_certificate` - The identity provider's signing certificate used by the IAM Service to validate the SAML2 token. 
 * `state` - The current state.
 * `time_created` - Date and time the `IdentityProvider` was created, in the format defined by RFC3339.  Example: `2016-08-25T21:10:29.600Z` 
 

oci/core_volume_attachment_resource.go

@@ -14,11 +14,6 @@ import (
 	oci_core "github.com/oracle/oci-go-sdk/core"
 )
 
-const (
-	IScsiVolumeAttachmentDiscriminator           = "iscsi"
-	ParavirtualizedVolumeAttachmentDiscriminator = "paravirtualized"
-)
-
 func VolumeAttachmentResource() *schema.Resource {
 	return &schema.Resource{
 		Importer: &schema.ResourceImporter{
@@ -76,41 +71,39 @@ func VolumeAttachmentResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"compartment_id": {
+			"chap_secret": {
 				Type:     schema.TypeString,
 				Computed: true,
-				// The legacy provider required this, but the API no longer accepts it. Keep as optional
-				// to avoid a breaking change. The value will be ignored if defined in the config.
-				Optional: true,
 			},
-			"state": {
+			"chap_username": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"time_created": {
+			"compartment_id": {
 				Type:     schema.TypeString,
 				Computed: true,
+				// The legacy provider required this, but the API no longer accepts it. Keep as optional
+				// to avoid a breaking change. The value will be ignored if defined in the config.
+				Optional: true,
 			},
-
-			// VolumeAttachment is a polymorphic type itself. The following are only computed if attachment_type == "iscsi".
-			"chap_secret": {
+			"ipv4": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"chap_username": {
+			"iqn": { // iSCSI Qualified Name per RFC 3720
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"ipv4": {
-				Type:     schema.TypeString,
+			"port": {
+				Type:     schema.TypeInt,
 				Computed: true,
 			},
-			"iqn": { // iSCSI Qualified Name per RFC 3720
+			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"port": {
-				Type:     schema.TypeInt,
+			"time_created": {
+				Type:     schema.TypeString,
 				Computed: true,
 			},
 		},
@@ -226,43 +219,10 @@ func (s *VolumeAttachmentResourceCrud) Delete() error {
 }
 
 func (s *VolumeAttachmentResourceCrud) SetData() error {
-	volumeAttachment := *s.Res
-
-	if availabilityDomain := volumeAttachment.GetAvailabilityDomain(); availabilityDomain != nil {
-		s.D.Set("availability_domain", *availabilityDomain)
-	}
-
-	if compartmentId := volumeAttachment.GetCompartmentId(); compartmentId != nil {
-		s.D.Set("compartment_id", *compartmentId)
-	}
-
-	if displayName := volumeAttachment.GetDisplayName(); displayName != nil {
-		s.D.Set("display_name", *displayName)
-	}
-
-	if instanceId := volumeAttachment.GetInstanceId(); instanceId != nil {
-		s.D.Set("instance_id", *instanceId)
-	}
-
-	if isReadOnly := volumeAttachment.GetIsReadOnly(); isReadOnly != nil {
-		s.D.Set("is_read_only", *isReadOnly)
-	}
-
-	s.D.Set("state", volumeAttachment.GetLifecycleState())
-
-	if timeCreated := volumeAttachment.GetTimeCreated(); timeCreated != nil {
-		s.D.Set("time_created", timeCreated.String())
-	}
-
-	if volumeId := volumeAttachment.GetVolumeId(); volumeId != nil {
-		s.D.Set("volume_id", *volumeId)
-	}
-
-	switch v := volumeAttachment.(type) {
+	switch v := (*s.Res).(type) {
 	case oci_core.IScsiVolumeAttachment:
-		s.D.Set("attachment_type", IScsiVolumeAttachmentDiscriminator)
+		s.D.Set("attachment_type", "iscsi")
 
-		// IScsiVolumeAttachment-specific fields:
 		if v.ChapSecret != nil {
 			s.D.Set("chap_secret", *v.ChapSecret)
 		}
@@ -282,12 +242,80 @@ func (s *VolumeAttachmentResourceCrud) SetData() error {
 		if v.Port != nil {
 			s.D.Set("port", *v.Port)
 		}
+
+		if v.AvailabilityDomain != nil {
+			s.D.Set("availability_domain", *v.AvailabilityDomain)
+		}
+
+		if v.CompartmentId != nil {
+			s.D.Set("compartment_id", *v.CompartmentId)
+		}
+
+		if v.DisplayName != nil {
+			s.D.Set("display_name", *v.DisplayName)
+		}
+
+		if v.Id != nil {
+			s.D.Set("id", *v.Id)
+		}
+
+		if v.InstanceId != nil {
+			s.D.Set("instance_id", *v.InstanceId)
+		}
+
+		if v.IsReadOnly != nil {
+			s.D.Set("is_read_only", *v.IsReadOnly)
+		}
+
+		s.D.Set("state", v.LifecycleState)
+
+		if v.TimeCreated != nil {
+			s.D.Set("time_created", v.TimeCreated.String())
+		}
+
+		if v.VolumeId != nil {
+			s.D.Set("volume_id", *v.VolumeId)
+		}
 	case oci_core.ParavirtualizedVolumeAttachment:
-		s.D.Set("attachment_type", ParavirtualizedVolumeAttachmentDiscriminator)
+		s.D.Set("attachment_type", "paravirtualized")
+
+		if v.AvailabilityDomain != nil {
+			s.D.Set("availability_domain", *v.AvailabilityDomain)
+		}
+
+		if v.CompartmentId != nil {
+			s.D.Set("compartment_id", *v.CompartmentId)
+		}
+
+		if v.DisplayName != nil {
+			s.D.Set("display_name", *v.DisplayName)
+		}
+
+		if v.Id != nil {
+			s.D.Set("id", *v.Id)
+		}
+
+		if v.InstanceId != nil {
+			s.D.Set("instance_id", *v.InstanceId)
+		}
+
+		if v.IsReadOnly != nil {
+			s.D.Set("is_read_only", *v.IsReadOnly)
+		}
+
+		s.D.Set("state", v.LifecycleState)
+
+		if v.TimeCreated != nil {
+			s.D.Set("time_created", v.TimeCreated.String())
+		}
+
+		if v.VolumeId != nil {
+			s.D.Set("volume_id", *v.VolumeId)
+		}
 	default:
-		log.Printf("[WARN] Received volume attachment of unknown type")
+		log.Printf("[WARN] Received 'attachment_type' of unknown type %v", *s.Res)
+		return nil
 	}
-
 	return nil
 }