Added - Support for GGS Release 9 Connections

Author: Balint Papp

examples/goldengate/Connection/oracle-ai-data-platform/main.tf

@@ -0,0 +1,72 @@
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "compartment_id" {}
+variable "region" {}
+variable "subnet_id" {}
+
+variable "locks_type" {
+  default = "FULL"
+}
+
+variable "locks_message" {
+  default = "message"
+}
+
+variable "is_lock_override" {
+  default = true
+}
+
+variable "description" {
+  default = "Created as example for TERSI-4887 Connections R9"
+}
+variable "freeform_tags" {
+  default = { "bar-key" = "value" }
+}
+variable "connection_type" {
+  default = "ORACLE_AI_DATA_PLATFORM"
+}
+variable "display_name" {
+  default = "OracleAiDataPlatform_TerraformTest"
+}
+variable "technology_type" {
+  default = "ORACLE_AI_DATA_PLATFORM"
+}
+variable "connection_url" {
+  default = "jdbc:spark://gateway.datalake.us-phoenix-1.oci.oraclecloud.com/default"
+}
+variable "should_use_resource_principal" {
+  default = true
+}
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+resource "oci_golden_gate_connection" "test_connection"{
+  #Required
+  compartment_id = var.compartment_id
+  connection_type = var.connection_type
+  display_name = var.display_name
+
+  #Required for OracleAiDataPlatform connection_type
+  technology_type = var.technology_type
+  connection_url = var.connection_url
+
+  #Optional
+  description = var.description
+
+  #Optional for OracleAiDataPlatform connection_type
+  should_use_resource_principal = var.should_use_resource_principal
+  locks {
+    type = var.locks_type
+    message = var.locks_message
+  }
+  is_lock_override = var.is_lock_override
+  lifecycle {
+    ignore_changes = [defined_tags, locks, freeform_tags, is_lock_override]
+  }
+}

examples/goldengate/Connection/s3/main.tf

@@ -55,7 +55,6 @@ resource "oci_golden_gate_connection" "test_connection"{
   secret_access_key = var.secret_access_key
 
   description = var.description
-  freeform_tags = var.freeform_tags
 
   security_attributes = var.security_attributes
 

internal/integrationtest/golden_gate_connection_test.go

@@ -36,6 +36,10 @@ Following environment variables are required:
  - TF_VAR_new_password - new password used for update connection, due to sec central issues, we must use environment variables instead of hardcoded passwords
  - TF_VAR_password_secret_id - secret which stores the password used for create connection
  - TF_VAR_new_password_secret_id - secret which stores new password used for update connection
+ - TF_VAR_stream_pool_id - streampool id for oci streaming connection
+ - TF_VAR_streaming_username - full username including tenant and streampool id for oci streaming connection (e.g. tenant/username/streampoolid)
+ - TF_VAR_cluster_id - Kafka cluster ocid
+ - TF_VAR_user_ocid - user ocid
 
 Following environment variables are optional:
  - TF_VAR_create_security_attributes - by default the SAs are not created, set this to true if creation should happen
@@ -138,6 +142,7 @@ var (
 		oci_golden_gate.ConnectionTypeDatabricks,
 		oci_golden_gate.ConnectionTypeGooglePubsub,
 		oci_golden_gate.ConnectionTypeMicrosoftFabric,
+		oci_golden_gate.ConnectionTypeOracleAiDataPlatform,
 	}
 
 	CommonConnectionRepresentation = map[string]interface{}{
@@ -430,6 +435,30 @@ var (
 			excludedFieldsFromDataCheck: []string{"bootstrap_servers"},
 		},
 
+		// OCI Streaming
+		{connectionType: oci_golden_gate.ConnectionTypeKafka, technologyType: oci_golden_gate.TechnologyTypeOciStreaming,
+			representation: map[string]interface{}{
+				"security_protocol":             acctest.Representation{RepType: acctest.Required, Create: string(oci_golden_gate.KafkaConnectionSecurityProtocolSaslSsl)},
+				"stream_pool_id":                acctest.Representation{RepType: acctest.Optional, Create: `${var.stream_pool_id}`},
+				"should_use_resource_principal": acctest.Representation{RepType: acctest.Optional, Create: `true`},
+			},
+		},
+
+		// OCI Streaming with Apache Kafka
+		{connectionType: oci_golden_gate.ConnectionTypeKafka, technologyType: oci_golden_gate.TechnologyTypeOciStreamingWithApacheKafka,
+			representation: map[string]interface{}{
+				"security_protocol": acctest.Representation{RepType: acctest.Required, Create: string(oci_golden_gate.KafkaConnectionSecurityProtocolSaslSsl)},
+				"username":          acctest.Representation{RepType: acctest.Optional, Create: `username`, Update: `newUsername`},
+				"password":          acctest.Representation{RepType: acctest.Optional, Create: `${var.password}`, Update: `${var.new_password}`},
+				"bootstrap_servers": acctest.RepresentationGroup{RepType: acctest.Optional, Group: map[string]interface{}{
+					"host":       acctest.Representation{RepType: acctest.Required, Create: `whatever.fqdn.oraclecloud.com`},
+					"port":       acctest.Representation{RepType: acctest.Required, Create: `9092`},
+					"private_ip": acctest.Representation{RepType: acctest.Required, Create: `10.0.0.1`},
+				}},
+			},
+			excludedFieldsFromDataCheck: []string{"bootstrap_servers"},
+		},
+
 		// Kafka Schema Registry
 		{connectionType: oci_golden_gate.ConnectionTypeKafkaSchemaRegistry, technologyType: oci_golden_gate.TechnologyTypeConfluentSchemaRegistry,
 			representation: map[string]interface{}{
@@ -619,6 +648,21 @@ var (
 				}},
 			},
 		},
+
+		// OracleAiDataPlatform
+		{connectionType: oci_golden_gate.ConnectionTypeOracleAiDataPlatform, technologyType: oci_golden_gate.TechnologyTypeOracleAiDataPlatform,
+			representation: map[string]interface{}{
+				"connection_url": acctest.Representation{RepType: acctest.Required, Create: `jdbc:spark://gateway.datalake.us-phoenix-1.oci.oraclecloud.com/default`,
+					Update: `jdbc:spark://gateway.datalake.us-phoenix-1.oci.oraclecloud.com/default2`},
+				"user_id":                       acctest.Representation{RepType: acctest.Required, Update: `${var.user_ocid}`},
+				"private_key_file_secret_id":    acctest.Representation{RepType: acctest.Required, Update: `${var.new_password_secret_id}`},
+				"public_key_fingerprint":        acctest.Representation{RepType: acctest.Required, Update: `myfingerprint`},
+				"key_id":                        acctest.Representation{RepType: acctest.Required},
+				"vault_id":                      acctest.Representation{RepType: acctest.Required},
+				"should_use_resource_principal": acctest.Representation{RepType: acctest.Optional, Create: `true`, Update: `false`},
+				"does_use_secret_ids":           acctest.Representation{RepType: acctest.Required, Create: `true`},
+			},
+		},
 	}
 
 	ExcludedFields = []string{
@@ -671,7 +715,11 @@ func TestGoldenGateConnectionResource_basic(t *testing.T) {
 		NEW_PASSWORD_SECRET_ID     = "new_password_secret_id"
 		SUBSCRIPTION_ID            = "subscription_id"
 		CLUSTER_PLACEMENT_GROUP_ID = "cluster_placement_group_id"
-		SECURITY_ATTRIBUTES     = "security_attributes"
+		SECURITY_ATTRIBUTES        = "security_attributes"
+		STREAM_POOL_ID             = "stream_pool_id"
+		STREAMING_USERNAME         = "streaming_username"
+		CLUSTER_ID                 = "cluster_id"
+		USER_ID                    = "user_ocid"
 	)
 
 	config := acctest.ProviderTestConfig() +
@@ -686,7 +734,11 @@ func TestGoldenGateConnectionResource_basic(t *testing.T) {
 		makeVariableStr(PASSWORD_SECRET_ID, t) +
 		makeVariableStr(NEW_PASSWORD_SECRET_ID, t) +
 		makeVariableStr(SUBSCRIPTION_ID, t) +
-		makeVariableStr(CLUSTER_PLACEMENT_GROUP_ID, t)
+		makeVariableStr(CLUSTER_PLACEMENT_GROUP_ID, t) +
+		makeVariableStr(STREAM_POOL_ID, t) +
+		makeVariableStr(STREAMING_USERNAME, t) +
+		makeVariableStr(CLUSTER_ID, t) +
+		makeVariableStr(USER_ID, t)
 
 	var createResourcesConfig, dataSourceConfig, listDataSourceConfig, updateResourcesConfig string
 	// CREATE CHECK FUNCTION MAPS

internal/service/golden_gate/golden_gate_connection_data_source.go

@@ -1792,6 +1792,10 @@ func (s *GoldenGateConnectionDataSourceCrud) SetData() error {
 		}
 		s.D.Set("bootstrap_servers", bootstrapServers)
 
+		if v.ClusterId != nil {
+			s.D.Set("cluster_id", *v.ClusterId)
+		}
+
 		if v.ConsumerProperties != nil {
 			s.D.Set("consumer_properties", *v.ConsumerProperties)
 		}
@@ -1814,6 +1818,10 @@ func (s *GoldenGateConnectionDataSourceCrud) SetData() error {
 
 		s.D.Set("security_protocol", v.SecurityProtocol)
 
+		if v.ShouldUseResourcePrincipal != nil {
+			s.D.Set("should_use_resource_principal", *v.ShouldUseResourcePrincipal)
+		}
+
 		if v.SslKeyPasswordSecretId != nil {
 			s.D.Set("ssl_key_password_secret_id", *v.SslKeyPasswordSecretId)
 		}
@@ -2768,6 +2776,128 @@ func (s *GoldenGateConnectionDataSourceCrud) SetData() error {
 			s.D.Set("time_updated", v.TimeUpdated.String())
 		}
 
+		if v.VaultId != nil {
+			s.D.Set("vault_id", *v.VaultId)
+		}
+	case oci_golden_gate.OracleAiDataPlatformConnection:
+		s.D.Set("connection_type", "ORACLE_AI_DATA_PLATFORM")
+
+		if v.ConnectionUrl != nil {
+			s.D.Set("connection_url", *v.ConnectionUrl)
+		}
+
+		if v.PrivateKeyFileSecretId != nil {
+			s.D.Set("private_key_file_secret_id", *v.PrivateKeyFileSecretId)
+		}
+
+		if v.PrivateKeyPassphraseSecretId != nil {
+			s.D.Set("private_key_passphrase_secret_id", *v.PrivateKeyPassphraseSecretId)
+		}
+
+		if v.PublicKeyFingerprint != nil {
+			s.D.Set("public_key_fingerprint", *v.PublicKeyFingerprint)
+		}
+
+		if v.Region != nil {
+			s.D.Set("region", *v.Region)
+		}
+
+		if v.ShouldUseResourcePrincipal != nil {
+			s.D.Set("should_use_resource_principal", *v.ShouldUseResourcePrincipal)
+		}
+
+		s.D.Set("technology_type", v.TechnologyType)
+
+		if v.TenancyId != nil {
+			s.D.Set("tenancy_id", *v.TenancyId)
+		}
+
+		if v.UserId != nil {
+			s.D.Set("user_id", *v.UserId)
+		}
+
+		if v.ClusterPlacementGroupId != nil {
+			s.D.Set("cluster_placement_group_id", *v.ClusterPlacementGroupId)
+		}
+
+		if v.CompartmentId != nil {
+			s.D.Set("compartment_id", *v.CompartmentId)
+		}
+
+		if v.DefinedTags != nil {
+			s.D.Set("defined_tags", tfresource.DefinedTagsToMap(v.DefinedTags))
+		}
+
+		if v.Description != nil {
+			s.D.Set("description", *v.Description)
+		}
+
+		if v.DisplayName != nil {
+			s.D.Set("display_name", *v.DisplayName)
+		}
+
+		if v.DoesUseSecretIds != nil {
+			s.D.Set("does_use_secret_ids", *v.DoesUseSecretIds)
+		}
+
+		s.D.Set("freeform_tags", v.FreeformTags)
+
+		ingressIps := []interface{}{}
+		for _, item := range v.IngressIps {
+			ingressIps = append(ingressIps, IngressIpDetailsToMap(item))
+		}
+		s.D.Set("ingress_ips", ingressIps)
+
+		if v.KeyId != nil {
+			s.D.Set("key_id", *v.KeyId)
+		}
+
+		if v.LifecycleDetails != nil {
+			s.D.Set("lifecycle_details", *v.LifecycleDetails)
+		}
+
+		locks := []interface{}{}
+		for _, item := range v.Locks {
+			locks = append(locks, ResourceLockToMap(item))
+		}
+		s.D.Set("locks", locks)
+
+		nsgIds := []interface{}{}
+		for _, item := range v.NsgIds {
+			nsgIds = append(nsgIds, item)
+		}
+		s.D.Set("nsg_ids", nsgIds)
+
+		s.D.Set("routing_method", v.RoutingMethod)
+
+		if v.SecurityAttributes != nil {
+			s.D.Set("security_attributes", tfresource.SecurityAttributesToMap(v.SecurityAttributes))
+		}
+
+		s.D.Set("state", v.LifecycleState)
+
+		if v.SubnetId != nil {
+			s.D.Set("subnet_id", *v.SubnetId)
+		}
+
+		if v.SubscriptionId != nil {
+			s.D.Set("subscription_id", *v.SubscriptionId)
+		}
+
+		if v.SystemTags != nil {
+			s.D.Set("system_tags", tfresource.SystemTagsToMap(v.SystemTags))
+		}
+
+		s.D.Set("technology_type", v.TechnologyType)
+
+		if v.TimeCreated != nil {
+			s.D.Set("time_created", v.TimeCreated.String())
+		}
+
+		if v.TimeUpdated != nil {
+			s.D.Set("time_updated", v.TimeUpdated.String())
+		}
+
 		if v.VaultId != nil {
 			s.D.Set("vault_id", *v.VaultId)
 		}