Added - Support for OCI Cache Discovery Endpoint for Sharded Clusters

Author: Sagar Daswani

internal/integrationtest/redis_redis_cluster_test.go

@@ -248,6 +248,8 @@ func TestRedisRedisClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(shardedResourceName, "cluster_mode", "SHARDED"),
 				resource.TestCheckResourceAttr(shardedResourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(shardedResourceName, "display_name", "displayNameSharded"),
+				resource.TestCheckResourceAttrSet(shardedResourceName, "discovery_endpoint_ip_address"),
+				resource.TestCheckResourceAttrSet(shardedResourceName, "discovery_fqdn"),
 				resource.TestCheckResourceAttr(shardedResourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(shardedResourceName, "id"),
 				resource.TestCheckResourceAttr(shardedResourceName, "node_collection.0.items.#", "0"),
@@ -281,6 +283,8 @@ func TestRedisRedisClusterResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(shardedResourceName, "cluster_mode", "SHARDED"),
 				resource.TestCheckResourceAttr(shardedResourceName, "compartment_id", compartmentIdU),
 				resource.TestCheckResourceAttr(shardedResourceName, "display_name", "displayNameSharded"),
+				resource.TestCheckResourceAttrSet(shardedResourceName, "discovery_endpoint_ip_address"),
+				resource.TestCheckResourceAttrSet(shardedResourceName, "discovery_fqdn"),
 				resource.TestCheckResourceAttr(shardedResourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(shardedResourceName, "id"),
 				resource.TestCheckResourceAttr(shardedResourceName, "node_collection.0.items.#", "0"),
@@ -308,6 +312,8 @@ func TestRedisRedisClusterResource_basic(t *testing.T) {
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(shardedResourceName, "cluster_mode", "SHARDED"),
 				resource.TestCheckResourceAttr(shardedResourceName, "compartment_id", compartmentId),
+				resource.TestCheckResourceAttrSet(shardedResourceName, "discovery_endpoint_ip_address"),
+				resource.TestCheckResourceAttrSet(shardedResourceName, "discovery_fqdn"),
 				resource.TestCheckResourceAttr(shardedResourceName, "display_name", "displayNameSharded2"),
 				resource.TestCheckResourceAttr(shardedResourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(shardedResourceName, "id"),

internal/service/redis/redis_redis_cluster_data_source.go

@@ -76,6 +76,14 @@ func (s *RedisRedisClusterDataSourceCrud) SetData() error {
 		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
 	}
 
+	if s.Res.DiscoveryEndpointIpAddress != nil {
+		s.D.Set("discovery_endpoint_ip_address", *s.Res.DiscoveryEndpointIpAddress)
+	}
+
+	if s.Res.DiscoveryFqdn != nil {
+		s.D.Set("discovery_fqdn", *s.Res.DiscoveryFqdn)
+	}
+
 	if s.Res.DisplayName != nil {
 		s.D.Set("display_name", *s.Res.DisplayName)
 	}

internal/service/redis/redis_redis_cluster_resource.go

@@ -99,6 +99,14 @@ func RedisRedisClusterResource() *schema.Resource {
 			},
 
 			// Computed
+			"discovery_endpoint_ip_address": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"discovery_fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"lifecycle_details": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -644,6 +652,14 @@ func (s *RedisRedisClusterResourceCrud) SetData() error {
 		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
 	}
 
+	if s.Res.DiscoveryEndpointIpAddress != nil {
+		s.D.Set("discovery_endpoint_ip_address", *s.Res.DiscoveryEndpointIpAddress)
+	}
+
+	if s.Res.DiscoveryFqdn != nil {
+		s.D.Set("discovery_fqdn", *s.Res.DiscoveryFqdn)
+	}
+
 	if s.Res.DisplayName != nil {
 		s.D.Set("display_name", *s.Res.DisplayName)
 	}
@@ -764,6 +780,14 @@ func RedisClusterSummaryToMap(obj oci_redis.RedisClusterSummary, datasource bool
 		result["defined_tags"] = tfresource.DefinedTagsToMap(obj.DefinedTags)
 	}
 
+	if obj.DiscoveryEndpointIpAddress != nil {
+		result["discovery_endpoint_ip_address"] = string(*obj.DiscoveryEndpointIpAddress)
+	}
+
+	if obj.DiscoveryFqdn != nil {
+		result["discovery_fqdn"] = string(*obj.DiscoveryFqdn)
+	}
+
 	if obj.DisplayName != nil {
 		result["display_name"] = string(*obj.DisplayName)
 	}

website/docs/d/redis_redis_cluster.html.markdown

@@ -35,6 +35,8 @@ The following attributes are exported:
 * `cluster_mode` - Specifies whether the cluster is sharded or non-sharded.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm#Oracle) of the compartment that contains the cluster.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"foo-namespace.bar-key": "value"}` 
+* `discovery_endpoint_ip_address` - The private IP address of the API endpoint for sharded cluster discovery.
+* `discovery_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for sharded cluster discovery.
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
 * `freeform_tags` - Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}` 
 * `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm#Oracle) of the cluster.

website/docs/d/redis_redis_clusters.html.markdown

@@ -49,6 +49,8 @@ The following attributes are exported:
 * `cluster_mode` - Specifies whether the cluster is sharded or non-sharded.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm#Oracle) of the compartment that contains the cluster.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"foo-namespace.bar-key": "value"}` 
+* `discovery_endpoint_ip_address` - The private IP address of the API endpoint for sharded cluster discovery.
+* `discovery_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for sharded cluster discovery.
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
 * `freeform_tags` - Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}` 
 * `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm#Oracle) of the cluster.

website/docs/r/redis_redis_cluster.html.markdown

@@ -63,6 +63,8 @@ The following attributes are exported:
 * `cluster_mode` - Specifies whether the cluster is sharded or non-sharded.
 * `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm#Oracle) of the compartment that contains the cluster.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"foo-namespace.bar-key": "value"}` 
+* `discovery_endpoint_ip_address` - The private IP address of the API endpoint for sharded cluster discovery.
+* `discovery_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for sharded cluster discovery.
 * `display_name` - A user-friendly name. Does not have to be unique, and it's changeable. Avoid entering confidential information.
 * `freeform_tags` - Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}` 
 * `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm#Oracle) of the cluster.