Skip to content

Commit 2432b37

Browse files
Kurmanadh Vallavarakali
authored andcommitted
Added -Support for OCI Cache -Lua Support on Redis 7.0.15
1 parent a0d319e commit 2432b37

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

examples/redis/redis_cluster/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ variable "redis_cluster_node_memory_in_gbs" {
2727
}
2828

2929
variable "redis_cluster_software_version" {
30-
default = "V7_0_5"
30+
default = "REDIS_7_0"
3131
}
3232

3333
variable "redis_cluster_state" {

internal/integrationtest/redis_redis_cluster_test.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ var (
5252
"display_name": acctest.Representation{RepType: acctest.Required, Create: `displayName`, Update: `displayName2`},
5353
"node_count": acctest.Representation{RepType: acctest.Required, Create: `3`, Update: `5`},
5454
"node_memory_in_gbs": acctest.Representation{RepType: acctest.Required, Create: `2`, Update: `3`},
55-
"software_version": acctest.Representation{RepType: acctest.Required, Create: `V7_0_5`},
55+
"software_version": acctest.Representation{RepType: acctest.Required, Create: `REDIS_7_0`},
5656
"subnet_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.test_subnet.id}`},
5757
"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")}`},
5858
"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
59-
"nsg_ids": acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}, Update: []string{}},
59+
"nsg_ids": acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}},
6060
"lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreRedisTagsChangesRepresentation},
6161
}
6262

@@ -108,7 +108,7 @@ func TestRedisRedisClusterResource_basic(t *testing.T) {
108108
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
109109
resource.TestCheckResourceAttr(resourceName, "node_count", "3"),
110110
resource.TestCheckResourceAttr(resourceName, "node_memory_in_gbs", "2"),
111-
resource.TestCheckResourceAttr(resourceName, "software_version", "V7_0_5"),
111+
resource.TestCheckResourceAttr(resourceName, "software_version", "REDIS_7_0"),
112112
resource.TestCheckResourceAttrSet(resourceName, "subnet_id"),
113113

114114
func(s *terraform.State) (err error) {
@@ -139,7 +139,7 @@ func TestRedisRedisClusterResource_basic(t *testing.T) {
139139
resource.TestCheckResourceAttrSet(resourceName, "primary_fqdn"),
140140
resource.TestCheckResourceAttrSet(resourceName, "replicas_endpoint_ip_address"),
141141
resource.TestCheckResourceAttrSet(resourceName, "replicas_fqdn"),
142-
resource.TestCheckResourceAttr(resourceName, "software_version", "V7_0_5"),
142+
resource.TestCheckResourceAttr(resourceName, "software_version", "REDIS_7_0"),
143143
resource.TestCheckResourceAttrSet(resourceName, "subnet_id"),
144144

145145
func(s *terraform.State) (err error) {
@@ -174,7 +174,7 @@ func TestRedisRedisClusterResource_basic(t *testing.T) {
174174
resource.TestCheckResourceAttrSet(resourceName, "primary_fqdn"),
175175
resource.TestCheckResourceAttrSet(resourceName, "replicas_endpoint_ip_address"),
176176
resource.TestCheckResourceAttrSet(resourceName, "replicas_fqdn"),
177-
resource.TestCheckResourceAttr(resourceName, "software_version", "V7_0_5"),
177+
resource.TestCheckResourceAttr(resourceName, "software_version", "REDIS_7_0"),
178178
resource.TestCheckResourceAttrSet(resourceName, "subnet_id"),
179179

180180
func(s *terraform.State) (err error) {
@@ -199,12 +199,12 @@ func TestRedisRedisClusterResource_basic(t *testing.T) {
199199
resource.TestCheckResourceAttr(resourceName, "node_collection.0.items.#", "5"),
200200
resource.TestCheckResourceAttr(resourceName, "node_count", "5"),
201201
resource.TestCheckResourceAttr(resourceName, "node_memory_in_gbs", "3"),
202-
resource.TestCheckResourceAttr(resourceName, "nsg_ids.#", "0"),
202+
resource.TestCheckResourceAttr(resourceName, "nsg_ids.#", "1"),
203203
resource.TestCheckResourceAttrSet(resourceName, "primary_endpoint_ip_address"),
204204
resource.TestCheckResourceAttrSet(resourceName, "primary_fqdn"),
205205
resource.TestCheckResourceAttrSet(resourceName, "replicas_endpoint_ip_address"),
206206
resource.TestCheckResourceAttrSet(resourceName, "replicas_fqdn"),
207-
resource.TestCheckResourceAttr(resourceName, "software_version", "V7_0_5"),
207+
resource.TestCheckResourceAttr(resourceName, "software_version", "REDIS_7_0"),
208208
resource.TestCheckResourceAttrSet(resourceName, "subnet_id"),
209209

210210
func(s *terraform.State) (err error) {
@@ -242,16 +242,15 @@ func TestRedisRedisClusterResource_basic(t *testing.T) {
242242
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
243243
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
244244
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
245-
resource.TestCheckResourceAttrSet(singularDatasourceName, "lifecycle_details"),
246245
resource.TestCheckResourceAttr(singularDatasourceName, "node_collection.0.items.#", "5"),
247246
resource.TestCheckResourceAttr(singularDatasourceName, "node_count", "5"),
248247
resource.TestCheckResourceAttr(singularDatasourceName, "node_memory_in_gbs", "3"),
249-
resource.TestCheckResourceAttr(singularDatasourceName, "nsg_ids.#", "0"),
248+
resource.TestCheckResourceAttr(singularDatasourceName, "nsg_ids.#", "1"),
250249
resource.TestCheckResourceAttrSet(singularDatasourceName, "primary_endpoint_ip_address"),
251250
resource.TestCheckResourceAttrSet(singularDatasourceName, "primary_fqdn"),
252251
resource.TestCheckResourceAttrSet(singularDatasourceName, "replicas_endpoint_ip_address"),
253252
resource.TestCheckResourceAttrSet(singularDatasourceName, "replicas_fqdn"),
254-
resource.TestCheckResourceAttr(singularDatasourceName, "software_version", "V7_0_5"),
253+
resource.TestCheckResourceAttr(singularDatasourceName, "software_version", "REDIS_7_0"),
255254
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
256255
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
257256
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_updated"),

website/docs/d/redis_redis_cluster.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The following attributes are exported:
4545
* `private_endpoint_ip_address` - The private IP address of the API endpoint to access a specific node.
4646
* `node_count` - The number of nodes in the Redis cluster.
4747
* `node_memory_in_gbs` - The amount of memory allocated to the Redis cluster's nodes, in gigabytes.
48-
* `nsg_ids` - OCIDs of the NSGs to control access in the customer network
48+
* `nsg_ids` - 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 Redis Clusters](https://docs.cloud.oracle.com/iaas/Content/redis/connecttorediscluster.htm#connecttorediscluster__networksecuritygroup).
4949
* `primary_endpoint_ip_address` - The private IP address of the API endpoint for the Redis cluster's primary node.
5050
* `primary_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for the Redis cluster's primary node.
5151
* `replicas_endpoint_ip_address` - The private IP address of the API endpoint for the Redis cluster's replica nodes.

website/docs/d/redis_redis_clusters.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The following attributes are exported:
5959
* `private_endpoint_ip_address` - The private IP address of the API endpoint to access a specific node.
6060
* `node_count` - The number of nodes in the Redis cluster.
6161
* `node_memory_in_gbs` - The amount of memory allocated to the Redis cluster's nodes, in gigabytes.
62-
* `nsg_ids` - OCIDs of the NSGs to control access in the customer network
62+
* `nsg_ids` - 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 Redis Clusters](https://docs.cloud.oracle.com/iaas/Content/redis/connecttorediscluster.htm#connecttorediscluster__networksecuritygroup).
6363
* `primary_endpoint_ip_address` - The private IP address of the API endpoint for the Redis cluster's primary node.
6464
* `primary_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for the Redis cluster's primary node.
6565
* `replicas_endpoint_ip_address` - The private IP address of the API endpoint for the Redis cluster's replica nodes.

website/docs/r/redis_redis_cluster.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The following arguments are supported:
4242
* `freeform_tags` - (Optional) (Updatable) Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}`
4343
* `node_count` - (Required) (Updatable) The number of nodes in the Redis cluster.
4444
* `node_memory_in_gbs` - (Required) (Updatable) The amount of memory allocated to the Redis cluster's nodes, in gigabytes.
45-
* `nsg_ids` - (Optional) (Updatable) OCIDs of the NSGs to control access in the customer network
45+
* `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 Redis Clusters](https://docs.cloud.oracle.com/iaas/Content/redis/connecttorediscluster.htm#connecttorediscluster__networksecuritygroup).
4646
* `software_version` - (Required) The Redis version that the cluster is running.
4747
* `subnet_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm#Oracle) of the Redis cluster's subnet.
4848

@@ -67,7 +67,7 @@ The following attributes are exported:
6767
* `private_endpoint_ip_address` - The private IP address of the API endpoint to access a specific node.
6868
* `node_count` - The number of nodes in the Redis cluster.
6969
* `node_memory_in_gbs` - The amount of memory allocated to the Redis cluster's nodes, in gigabytes.
70-
* `nsg_ids` - OCIDs of the NSGs to control access in the customer network
70+
* `nsg_ids` - 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 Redis Clusters](https://docs.cloud.oracle.com/iaas/Content/redis/connecttorediscluster.htm#connecttorediscluster__networksecuritygroup).
7171
* `primary_endpoint_ip_address` - The private IP address of the API endpoint for the Redis cluster's primary node.
7272
* `primary_fqdn` - The fully qualified domain name (FQDN) of the API endpoint for the Redis cluster's primary node.
7373
* `replicas_endpoint_ip_address` - The private IP address of the API endpoint for the Redis cluster's replica nodes.

0 commit comments

Comments
 (0)