Added - Support for OCI Caching Service with Redis

Author: Terraform Team Automation

examples/redis/redis_cluster/main.tf

@@ -0,0 +1,98 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "region" {
+  default = "us-ashburn-1"
+}
+
+variable "compartment_id" {
+  default = "ocid1.compartment.oc1..aaaaaaaarnj7d6pfp2c5op4oct6qfh7553xzxezc2afmxxboqdov23a7cp2a"
+}
+
+variable "redis_cluster_display_name" {
+  type = string
+  default = "test-tf-redis-example"
+}
+
+variable "redis_cluster_freeform_tags" {
+  default = { "bar-key" = "value" }
+}
+
+variable "redis_cluster_node_count" {
+  default = 5
+}
+
+variable "redis_cluster_node_memory_in_gbs" {
+  default = 2.0
+}
+
+variable "redis_cluster_software_version" {
+  default = "V7_0_5"
+}
+
+variable "redis_cluster_state" {
+  default = "ACTIVE"
+}
+
+
+
+provider "oci" {
+  auth = "SecurityToken"
+  config_file_profile = "DEFAULT"
+  region = var.region
+}
+
+resource "oci_core_vcn" "test_vcn" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = var.compartment_id
+}
+
+resource "oci_core_security_list" "test_security_list" {
+  compartment_id = var.compartment_id
+  vcn_id         = oci_core_vcn.test_vcn.id
+  display_name   = "redis-security-list"
+
+  // allow outbound udp traffic on a port range
+  egress_security_rules {
+    destination = "0.0.0.0/0"
+    protocol    = "17" // udp
+    stateless   = true
+  }
+
+  // allow inbound ssh traffic from a specific port
+  ingress_security_rules {
+    protocol  = "6" // tcp
+    source    = "0.0.0.0/0"
+    stateless = false
+  }
+}
+
+resource "oci_core_subnet" "test_subnet" {
+  cidr_block     = "10.0.0.0/24"
+  compartment_id = var.compartment_id
+  vcn_id         = oci_core_vcn.test_vcn.id
+  security_list_ids = [oci_core_security_list.test_security_list.id]
+}
+
+resource "oci_redis_redis_cluster" "test_redis_cluster" {
+  #Required
+  compartment_id     = var.compartment_id
+  display_name       = var.redis_cluster_display_name
+  node_count         = var.redis_cluster_node_count
+  node_memory_in_gbs = var.redis_cluster_node_memory_in_gbs
+  software_version   = var.redis_cluster_software_version
+  subnet_id          = oci_core_subnet.test_subnet.id
+
+  #Optional
+  //  defined_tags  = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.redis_cluster_defined_tags_value)
+  freeform_tags = var.redis_cluster_freeform_tags
+}
+
+data "oci_redis_redis_clusters" "test_redis_clusters" {
+
+  #Optional
+  compartment_id = var.compartment_id
+  display_name   = var.redis_cluster_display_name
+  id             = oci_redis_redis_cluster.test_redis_cluster.id
+  state          = var.redis_cluster_state
+}

internal/client/redis_clients.go

@@ -0,0 +1,34 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package client
+
+import (
+	oci_redis "github.com/oracle/oci-go-sdk/v65/redis"
+
+	oci_common "github.com/oracle/oci-go-sdk/v65/common"
+)
+
+func init() {
+	RegisterOracleClient("oci_redis.RedisClusterClient", &OracleClient{InitClientFn: initRedisRedisClusterClient})
+}
+
+func initRedisRedisClusterClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
+	client, err := oci_redis.NewRedisClusterClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+
+	if serviceClientOverrides.HostUrlOverride != "" {
+		client.Host = serviceClientOverrides.HostUrlOverride
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) RedisClusterClient() *oci_redis.RedisClusterClient {
+	return m.GetClient("oci_redis.RedisClusterClient").(*oci_redis.RedisClusterClient)
+}

internal/integrationtest/redis_redis_cluster_test.go

@@ -96,6 +96,7 @@ import (
 	tf_osub_usage "github.com/oracle/terraform-provider-oci/internal/service/osub_usage"
 	tf_queue "github.com/oracle/terraform-provider-oci/internal/service/queue"
 	tf_recovery "github.com/oracle/terraform-provider-oci/internal/service/recovery"
+	tf_redis "github.com/oracle/terraform-provider-oci/internal/service/redis"
 	tf_resourcemanager "github.com/oracle/terraform-provider-oci/internal/service/resourcemanager"
 	tf_sch "github.com/oracle/terraform-provider-oci/internal/service/sch"
 	tf_secrets "github.com/oracle/terraform-provider-oci/internal/service/secrets"
@@ -390,6 +391,9 @@ func init() {
 	if common.CheckForEnabledServices("recovery") {
 		tf_recovery.RegisterDatasource()
 	}
+	if common.CheckForEnabledServices("redis") {
+		tf_redis.RegisterDatasource()
+	}
 	if common.CheckForEnabledServices("resourcemanager") {
 		tf_resourcemanager.RegisterDatasource()
 	}

internal/provider/register_datasource.go

@@ -96,6 +96,7 @@ import (
 	tf_osub_usage "github.com/oracle/terraform-provider-oci/internal/service/osub_usage"
 	tf_queue "github.com/oracle/terraform-provider-oci/internal/service/queue"
 	tf_recovery "github.com/oracle/terraform-provider-oci/internal/service/recovery"
+	tf_redis "github.com/oracle/terraform-provider-oci/internal/service/redis"
 	tf_resourcemanager "github.com/oracle/terraform-provider-oci/internal/service/resourcemanager"
 	tf_sch "github.com/oracle/terraform-provider-oci/internal/service/sch"
 	tf_secrets "github.com/oracle/terraform-provider-oci/internal/service/secrets"
@@ -390,6 +391,9 @@ func init() {
 	if common.CheckForEnabledServices("recovery") {
 		tf_recovery.RegisterResource()
 	}
+	if common.CheckForEnabledServices("redis") {
+		tf_redis.RegisterResource()
+	}
 	if common.CheckForEnabledServices("resourcemanager") {
 		tf_resourcemanager.RegisterResource()
 	}

internal/provider/register_resource.go

@@ -0,0 +1,32 @@
+package redis
+
+import (
+	oci_redis "github.com/oracle/oci-go-sdk/v65/redis"
+
+	tf_export "github.com/oracle/terraform-provider-oci/internal/commonexport"
+)
+
+func init() {
+	tf_export.RegisterCompartmentGraphs("redis", redisResourceGraph)
+}
+
+// Custom overrides for generating composite IDs within the resource discovery framework
+
+// Hints for discovering and exporting this resource to configuration and state files
+var exportRedisRedisClusterHints = &tf_export.TerraformResourceHints{
+	ResourceClass:          "oci_redis_redis_cluster",
+	DatasourceClass:        "oci_redis_redis_clusters",
+	DatasourceItemsAttr:    "redis_cluster_collection",
+	IsDatasourceCollection: true,
+	ResourceAbbreviation:   "redis_cluster",
+	RequireResourceRefresh: true,
+	DiscoverableLifecycleStates: []string{
+		string(oci_redis.RedisClusterLifecycleStateActive),
+	},
+}
+
+var redisResourceGraph = tf_export.TerraformResourceGraph{
+	"oci_identity_compartment": {
+		{TerraformResourceHints: exportRedisRedisClusterHints},
+	},
+}

internal/service/redis/redis_export.go

@@ -0,0 +1,139 @@
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package redis
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	oci_redis "github.com/oracle/oci-go-sdk/v65/redis"
+
+	"github.com/oracle/terraform-provider-oci/internal/client"
+	"github.com/oracle/terraform-provider-oci/internal/tfresource"
+)
+
+func RedisRedisClusterDataSource() *schema.Resource {
+	fieldMap := make(map[string]*schema.Schema)
+	fieldMap["redis_cluster_id"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	return tfresource.GetSingularDataSourceItemSchema(RedisRedisClusterResource(), fieldMap, readSingularRedisRedisCluster)
+}
+
+func readSingularRedisRedisCluster(d *schema.ResourceData, m interface{}) error {
+	sync := &RedisRedisClusterDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*client.OracleClients).RedisClusterClient()
+
+	return tfresource.ReadResource(sync)
+}
+
+type RedisRedisClusterDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_redis.RedisClusterClient
+	Res    *oci_redis.GetRedisClusterResponse
+}
+
+func (s *RedisRedisClusterDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *RedisRedisClusterDataSourceCrud) Get() error {
+	request := oci_redis.GetRedisClusterRequest{}
+
+	if redisClusterId, ok := s.D.GetOkExists("redis_cluster_id"); ok {
+		tmp := redisClusterId.(string)
+		request.RedisClusterId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "redis")
+
+	response, err := s.Client.GetRedisCluster(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *RedisRedisClusterDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(*s.Res.Id)
+
+	if s.Res.CompartmentId != nil {
+		s.D.Set("compartment_id", *s.Res.CompartmentId)
+	}
+
+	if s.Res.DefinedTags != nil {
+		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
+	}
+
+	if s.Res.DisplayName != nil {
+		s.D.Set("display_name", *s.Res.DisplayName)
+	}
+
+	s.D.Set("freeform_tags", s.Res.FreeformTags)
+	s.D.Set("freeform_tags", s.Res.FreeformTags)
+
+	if s.Res.LifecycleDetails != nil {
+		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
+	}
+
+	if s.Res.NodeCollection != nil {
+		s.D.Set("node_collection", []interface{}{NodeCollectionToMap(s.Res.NodeCollection)})
+	} else {
+		s.D.Set("node_collection", nil)
+	}
+
+	if s.Res.NodeCount != nil {
+		s.D.Set("node_count", *s.Res.NodeCount)
+	}
+
+	if s.Res.NodeMemoryInGBs != nil {
+		s.D.Set("node_memory_in_gbs", *s.Res.NodeMemoryInGBs)
+	}
+
+	if s.Res.PrimaryEndpointIpAddress != nil {
+		s.D.Set("primary_endpoint_ip_address", *s.Res.PrimaryEndpointIpAddress)
+	}
+
+	if s.Res.PrimaryFqdn != nil {
+		s.D.Set("primary_fqdn", *s.Res.PrimaryFqdn)
+	}
+
+	if s.Res.ReplicasEndpointIpAddress != nil {
+		s.D.Set("replicas_endpoint_ip_address", *s.Res.ReplicasEndpointIpAddress)
+	}
+
+	if s.Res.ReplicasFqdn != nil {
+		s.D.Set("replicas_fqdn", *s.Res.ReplicasFqdn)
+	}
+
+	s.D.Set("software_version", s.Res.SoftwareVersion)
+
+	s.D.Set("state", s.Res.LifecycleState)
+
+	if s.Res.SubnetId != nil {
+		s.D.Set("subnet_id", *s.Res.SubnetId)
+	}
+
+	if s.Res.SystemTags != nil {
+		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
+	}
+
+	if s.Res.TimeCreated != nil {
+		s.D.Set("time_created", s.Res.TimeCreated.String())
+	}
+
+	if s.Res.TimeUpdated != nil {
+		s.D.Set("time_updated", s.Res.TimeUpdated.String())
+	}
+
+	return nil
+}