feat: CLOUDP-380506 Update stream connection resource (#1582)

Co-authored-by: Rakhul S Prakash <rakhul.s.prakash@peerislands.io>

Author: rakhul-mongo

cfn-resources/stream-connection/cmd/resource/mappings.go

@@ -21,27 +21,24 @@ import (
 )
 
 func GetStreamConnectionModel(streamsConn *admin.StreamsConnection, currentModel *Model) *Model {
-	var model *Model
+	model := new(Model)
 
 	if currentModel != nil {
-		model = currentModel
+		model.ProjectId = currentModel.ProjectId
+		model.Profile = currentModel.Profile
+		model.WorkspaceName = currentModel.WorkspaceName
+		model.InstanceName = currentModel.InstanceName
 		if model.WorkspaceName == nil && model.InstanceName != nil && *model.InstanceName != "" {
 			model.WorkspaceName = model.InstanceName
 		}
-	} else {
-		model = new(Model)
 	}
 
 	model.ConnectionName = streamsConn.Name
 	model.Type = streamsConn.Type
 	model.ClusterName = streamsConn.ClusterName
-	if streamsConn.ClusterGroupId != nil {
-		model.ClusterProjectId = streamsConn.ClusterGroupId
-	}
+	model.ClusterProjectId = streamsConn.ClusterGroupId
 	model.BootstrapServers = streamsConn.BootstrapServers
-	if streamsConn.Url != nil {
-		model.Url = streamsConn.Url
-	}
+	model.Url = streamsConn.Url
 
 	model.DbRoleToExecute = NewModelDBRoleToExecute(streamsConn.DbRoleToExecute)
 
@@ -62,6 +59,8 @@ func GetStreamConnectionModel(streamsConn *admin.StreamsConnection, currentModel
 			Access: &Access{
 				Type:         streamsConn.Networking.Access.Type,
 				ConnectionId: streamsConn.Networking.Access.ConnectionId,
+				Name:         streamsConn.Networking.Access.Name,
+				TgwRouteId:   streamsConn.Networking.Access.TgwRouteId,
 			},
 		}
 	}
@@ -72,6 +71,30 @@ func GetStreamConnectionModel(streamsConn *admin.StreamsConnection, currentModel
 		}
 	}
 
+	if streamsConn.Provider != nil {
+		model.Provider = streamsConn.Provider
+	} else if currentModel != nil {
+		model.Provider = currentModel.Provider
+	}
+
+	if streamsConn.SchemaRegistryAuthentication != nil {
+		model.SchemaRegistryAuthentication = &SchemaRegistryAuthentication{
+			Type:     &streamsConn.SchemaRegistryAuthentication.Type,
+			Username: streamsConn.SchemaRegistryAuthentication.Username,
+		}
+	} else if currentModel != nil && currentModel.SchemaRegistryAuthentication != nil {
+		model.SchemaRegistryAuthentication = &SchemaRegistryAuthentication{
+			Type:     currentModel.SchemaRegistryAuthentication.Type,
+			Username: currentModel.SchemaRegistryAuthentication.Username,
+		}
+	}
+
+	if streamsConn.SchemaRegistryUrls != nil {
+		model.SchemaRegistryUrls = *streamsConn.SchemaRegistryUrls
+	} else if currentModel != nil {
+		model.SchemaRegistryUrls = currentModel.SchemaRegistryUrls
+	}
+
 	return model
 }
 
@@ -145,6 +168,8 @@ func newStreamConnectionReq(model *Model) *admin.StreamsConnection {
 				Access: &admin.StreamsKafkaNetworkingAccess{
 					Type:         model.Networking.Access.Type,
 					ConnectionId: model.Networking.Access.ConnectionId,
+					Name:         model.Networking.Access.Name,
+					TgwRouteId:   model.Networking.Access.TgwRouteId,
 				},
 			}
 		}
@@ -153,7 +178,8 @@ func newStreamConnectionReq(model *Model) *admin.StreamsConnection {
 	if typeStr == AWSLambdaType {
 		if model.Aws != nil {
 			streamConnReq.Aws = &admin.StreamsAWSConnectionConfig{
-				RoleArn: model.Aws.RoleArn,
+				RoleArn:    model.Aws.RoleArn,
+				TestBucket: model.Aws.TestBucket,
 			}
 		}
 	}
@@ -165,6 +191,20 @@ func newStreamConnectionReq(model *Model) *admin.StreamsConnection {
 		}
 	}
 
+	if typeStr == SchemaRegistryType {
+		streamConnReq.Provider = model.Provider
+		if model.SchemaRegistryAuthentication != nil {
+			streamConnReq.SchemaRegistryAuthentication = &admin.SchemaRegistryAuthentication{
+				Type:     util.SafeString(model.SchemaRegistryAuthentication.Type),
+				Username: model.SchemaRegistryAuthentication.Username,
+				Password: model.SchemaRegistryAuthentication.Password,
+			}
+		}
+		if len(model.SchemaRegistryUrls) > 0 {
+			streamConnReq.SchemaRegistryUrls = &model.SchemaRegistryUrls
+		}
+	}
+
 	return &streamConnReq
 }
 
@@ -205,5 +245,8 @@ func newStreamsKafkaAuthentication(authenticationModel *StreamsKafkaAuthenticati
 		ClientSecret:              authenticationModel.ClientSecret,
 		Scope:                     authenticationModel.Scope,
 		SaslOauthbearerExtensions: authenticationModel.SaslOauthbearerExtensions,
+		SslCertificate:            authenticationModel.SslCertificate,
+		SslKey:                    authenticationModel.SslKey,
+		SslKeyPassword:            authenticationModel.SslKeyPassword,
 	}
 }

cfn-resources/stream-connection/cmd/resource/model.go

@@ -35,6 +35,7 @@ const (
 	KafkaConnectionType   = "Kafka"
 	AWSLambdaType         = "AWSLambda"
 	HTTPSType             = "Https"
+	SchemaRegistryType    = "SchemaRegistry"
 )
 
 var CreateRequiredFields = []string{constants.ProjectID, constants.ConnectionName, constants.Type}

cfn-resources/stream-connection/cmd/resource/resource.go

@@ -28,7 +28,10 @@ To declare this entity in your AWS CloudFormation template, use the following sy
         "<a href="#networking" title="Networking">Networking</a>" : <i><a href="networking.md">Networking</a></i>,
         "<a href="#aws" title="Aws">Aws</a>" : <i><a href="aws.md">Aws</a></i>,
         "<a href="#url" title="Url">Url</a>" : <i>String</i>,
-        "<a href="#headers" title="Headers">Headers</a>" : <i><a href="headers.md">Headers</a></i>
+        "<a href="#headers" title="Headers">Headers</a>" : <i><a href="headers.md">Headers</a></i>,
+        "<a href="#provider" title="Provider">Provider</a>" : <i>String</i>,
+        "<a href="#schemaregistryauthentication" title="SchemaRegistryAuthentication">SchemaRegistryAuthentication</a>" : <i><a href="schemaregistryauthentication.md">SchemaRegistryAuthentication</a></i>,
+        "<a href="#schemaregistryurls" title="SchemaRegistryUrls">SchemaRegistryUrls</a>" : <i>[ String, ... ]</i>
     }
 }
 </pre>
@@ -55,6 +58,10 @@ Properties:
     <a href="#aws" title="Aws">Aws</a>: <i><a href="aws.md">Aws</a></i>
     <a href="#url" title="Url">Url</a>: <i>String</i>
     <a href="#headers" title="Headers">Headers</a>: <i><a href="headers.md">Headers</a></i>
+    <a href="#provider" title="Provider">Provider</a>: <i>String</i>
+    <a href="#schemaregistryauthentication" title="SchemaRegistryAuthentication">SchemaRegistryAuthentication</a>: <i><a href="schemaregistryauthentication.md">SchemaRegistryAuthentication</a></i>
+    <a href="#schemaregistryurls" title="SchemaRegistryUrls">SchemaRegistryUrls</a>: <i>
+      - String</i>
 </pre>
 
 ## Properties
@@ -99,7 +106,7 @@ _Update requires_: [Replacement](https://docs.aws.amazon.com/AWSCloudFormation/l
 
 #### InstanceName
 
-Human-readable label that identifies the stream instance. Deprecated: Use WorkspaceName instead.
+Human-readable label that identifies the stream instance. WARNING: This field is deprecated and will be removed in the next major release. Please use WorkspaceName instead.
 
 _Required_: No
 
@@ -207,7 +214,7 @@ _Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormati
 
 #### Networking
 
-Networking configuration for AWS PrivateLink connections.
+Networking configuration for connections.
 
 _Required_: No
 
@@ -245,3 +252,33 @@ _Type_: <a href="headers.md">Headers</a>
 
 _Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
 
+#### Provider
+
+The Schema Registry provider.
+
+_Required_: No
+
+_Type_: String
+
+_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
+
+#### SchemaRegistryAuthentication
+
+Authentication configuration for Schema Registry.
+
+_Required_: No
+
+_Type_: <a href="schemaregistryauthentication.md">SchemaRegistryAuthentication</a>
+
+_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
+
+#### SchemaRegistryUrls
+
+List of Schema Registry endpoint URLs. Each URL must use the http or https scheme and specify a valid host and optional port.
+
+_Required_: No
+
+_Type_: List of String
+
+_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
+

cfn-resources/stream-connection/docs/README.md

@@ -10,14 +10,16 @@ To declare this entity in your AWS CloudFormation template, use the following sy
 
 <pre>
 {
-    "<a href="#rolearn" title="RoleArn">RoleArn</a>" : <i>String</i>
+    "<a href="#rolearn" title="RoleArn">RoleArn</a>" : <i>String</i>,
+    "<a href="#testbucket" title="TestBucket">TestBucket</a>" : <i>String</i>
 }
 </pre>
 
 ### YAML
 
 <pre>
 <a href="#rolearn" title="RoleArn">RoleArn</a>: <i>String</i>
+<a href="#testbucket" title="TestBucket">TestBucket</a>: <i>String</i>
 </pre>
 
 ## Properties
@@ -32,3 +34,13 @@ _Type_: String
 
 _Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
 
+#### TestBucket
+
+The name of an S3 bucket used to check authorization of the passed-in IAM role ARN.
+
+_Required_: No
+
+_Type_: String
+
+_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
+

cfn-resources/stream-connection/docs/aws.md

@@ -1,6 +1,6 @@
 # MongoDB::Atlas::StreamConnection Networking
 
-Networking configuration for AWS PrivateLink connections.
+Networking configuration for connections.
 
 ## Syntax
 

cfn-resources/stream-connection/docs/networking.md

@@ -0,0 +1,58 @@
+# MongoDB::Atlas::StreamConnection SchemaRegistryAuthentication
+
+Authentication configuration for Schema Registry.
+
+## Syntax
+
+To declare this entity in your AWS CloudFormation template, use the following syntax:
+
+### JSON
+
+<pre>
+{
+    "<a href="#type" title="Type">Type</a>" : <i>String</i>,
+    "<a href="#username" title="Username">Username</a>" : <i>String</i>,
+    "<a href="#password" title="Password">Password</a>" : <i>String</i>
+}
+</pre>
+
+### YAML
+
+<pre>
+<a href="#type" title="Type">Type</a>: <i>String</i>
+<a href="#username" title="Username">Username</a>: <i>String</i>
+<a href="#password" title="Password">Password</a>: <i>String</i>
+</pre>
+
+## Properties
+
+#### Type
+
+Authentication type discriminator. Specifies the authentication mechanism for Schema Registry.
+
+_Required_: No
+
+_Type_: String
+
+_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
+
+#### Username
+
+Username or Public Key for authentication.
+
+_Required_: No
+
+_Type_: String
+
+_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
+
+#### Password
+
+Password or Private Key for authentication. Review [AWS security best practices for CloudFormation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/security-best-practices.html#creds) to manage credentials.
+
+_Required_: No
+
+_Type_: String
+
+_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
+