Added - Support for [OCI Cache] - ZPR Security Attributes

Author: Shagufta Gurmukhdas

internal/integrationtest/redis_redis_cluster_test.go

@@ -57,6 +57,7 @@ var (
 		"defined_tags":            acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
 		"freeform_tags":           acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
 		"nsg_ids":                 acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}},
+		"security_attributes":     acctest.Representation{RepType: acctest.Optional, Create: map[string]map[string]map[string]string{"Oracle-ZPR": {"fleet-update": {"value": "42", "mode": "enforce"}}}},
 		"oci_cache_config_set_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_redis_oci_cache_config_set.test_oci_cache_config_set.id}`},
 		"lifecycle":               acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreRedisTagsChangesRepresentation},
 	}

internal/service/redis/redis_redis_cluster_data_source.go

@@ -130,6 +130,10 @@ func (s *RedisRedisClusterDataSourceCrud) SetData() error {
 		s.D.Set("replicas_fqdn", *s.Res.ReplicasFqdn)
 	}
 
+	if s.Res.SecurityAttributes != nil {
+		s.D.Set("security_attributes", s.Res.SecurityAttributes)
+	}
+
 	if s.Res.ShardCount != nil {
 		s.D.Set("shard_count", *s.Res.ShardCount)
 	}

internal/service/redis/redis_redis_cluster_resource.go

@@ -92,6 +92,12 @@ func RedisRedisClusterResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"security_attributes": {
+				Type:     schema.TypeMap,
+				Optional: true,
+				Computed: true,
+				Elem:     schema.TypeString,
+			},
 			"shard_count": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -315,6 +321,10 @@ func (s *RedisRedisClusterResourceCrud) Create() error {
 		request.OciCacheConfigSetId = &tmp
 	}
 
+	if securityAttributes, ok := s.D.GetOkExists("security_attributes"); ok {
+		request.SecurityAttributes = securityAttributes.(map[string]map[string]interface{})
+	}
+
 	if shardCount, ok := s.D.GetOkExists("shard_count"); ok {
 		tmp := shardCount.(int)
 		request.ShardCount = &tmp
@@ -710,6 +720,12 @@ func (s *RedisRedisClusterResourceCrud) SetData() error {
 		s.D.Set("replicas_fqdn", *s.Res.ReplicasFqdn)
 	}
 
+	if s.Res.SecurityAttributes != nil {
+		s.D.Set("security_attributes", s.Res.SecurityAttributes)
+	} else {
+		s.D.Set("security_attributes", map[string]interface{}{})
+	}
+
 	if s.Res.ShardCount != nil {
 		s.D.Set("shard_count", *s.Res.ShardCount)
 	}
@@ -840,6 +856,12 @@ func RedisClusterSummaryToMap(obj oci_redis.RedisClusterSummary, datasource bool
 		result["replicas_fqdn"] = string(*obj.ReplicasFqdn)
 	}
 
+	if obj.SecurityAttributes != nil {
+		result["security_attributes"] = obj.SecurityAttributes
+	} else {
+		result["security_attributes"] = map[string]interface{}{}
+	}
+
 	if obj.ShardCount != nil {
 		result["shard_count"] = int(*obj.ShardCount)
 	}

website/docs/d/redis_redis_cluster.html.markdown

@@ -54,6 +54,7 @@ The following attributes are exported:
 * `primary_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for the cluster's primary node.
 * `replicas_endpoint_ip_address` - The private IP address of the API endpoint for the cluster's replica nodes.
 * `replicas_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for the cluster's replica nodes.
+* `security_attributes` - Security attributes for redis cluster 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: `{"Oracle-ZPR": {"MaxEgressCount": {"value": "42", "mode": "enforce"}}}` 
 * `shard_count` - The number of shards in a sharded cluster. Only applicable when clusterMode is SHARDED.
 * `software_version` - The Oracle Cloud Infrastructure Cache engine version that the cluster is running.
 * `state` - The current state of the cluster.

website/docs/d/redis_redis_clusters.html.markdown

@@ -68,6 +68,7 @@ The following attributes are exported:
 * `primary_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for the cluster's primary node.
 * `replicas_endpoint_ip_address` - The private IP address of the API endpoint for the cluster's replica nodes.
 * `replicas_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for the cluster's replica nodes.
+* `security_attributes` - Security attributes for redis cluster 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: `{"Oracle-ZPR": {"MaxEgressCount": {"value": "42", "mode": "enforce"}}}` 
 * `shard_count` - The number of shards in a sharded cluster. Only applicable when clusterMode is SHARDED.
 * `software_version` - The Oracle Cloud Infrastructure Cache engine version that the cluster is running.
 * `state` - The current state of the cluster.

website/docs/r/redis_redis_cluster.html.markdown

@@ -31,6 +31,7 @@ resource "oci_redis_redis_cluster" "test_redis_cluster" {
 	freeform_tags = {"bar-key"= "value"}
 	nsg_ids = var.redis_cluster_nsg_ids
 	oci_cache_config_set_id = oci_redis_oci_cache_config_set.test_oci_cache_config_set.id
+	security_attributes = var.redis_cluster_security_attributes
 	shard_count = var.redis_cluster_shard_count
 }
 ```
@@ -48,6 +49,7 @@ The following arguments are supported:
 * `node_memory_in_gbs` - (Required) (Updatable) The amount of memory allocated to the cluster's nodes, in gigabytes.
 * `nsg_ids` - (Optional) (Updatable) A list of Network Security Group (NSG) [OCIDs](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) associated with this cluster. For more information, see [Using an NSG for Clusters](https://docs.cloud.oracle.com/iaas/Content/ocicache/connecttocluster.htm#connecttocluster__networksecuritygroup). 
 * `oci_cache_config_set_id` - (Optional) (Updatable) The ID of the corresponding Oracle Cloud Infrastructure Cache Config Set for the cluster.
+* `security_attributes` - (Optional) (Updatable) Security attributes for redis cluster 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: `{"Oracle-ZPR": {"MaxEgressCount": {"value": "42", "mode": "enforce"}}}` 
 * `shard_count` - (Optional) (Updatable) The number of shards in sharded cluster. Only applicable when clusterMode is SHARDED.
 * `software_version` - (Required) (Updatable) The Oracle Cloud Infrastructure Cache engine version that the cluster is running.
 * `subnet_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm#Oracle) of the cluster's subnet.
@@ -82,6 +84,7 @@ The following attributes are exported:
 * `primary_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for the cluster's primary node.
 * `replicas_endpoint_ip_address` - The private IP address of the API endpoint for the cluster's replica nodes.
 * `replicas_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for the cluster's replica nodes.
+* `security_attributes` - Security attributes for redis cluster 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: `{"Oracle-ZPR": {"MaxEgressCount": {"value": "42", "mode": "enforce"}}}` 
 * `shard_count` - The number of shards in a sharded cluster. Only applicable when clusterMode is SHARDED.
 * `software_version` - The Oracle Cloud Infrastructure Cache engine version that the cluster is running.
 * `state` - The current state of the cluster.