fix: Sets scopes in Read to support Scope updates (#1234)

Author: EspenAlbert

cfn-resources/database-user/cmd/resource/resource.go

@@ -104,19 +104,12 @@ func Read(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
 		return progressevent.GetFailedEventByResponse(err.Error(), resp), nil
 	}
 
+	_, _ = logger.Debugf("databaseUser:%+v", databaseUser)
 	currentModel.DatabaseName = &databaseUser.DatabaseName
-
-	if currentModel.LdapAuthType != nil {
-		currentModel.LdapAuthType = databaseUser.LdapAuthType
-	}
-	if currentModel.AWSIAMType != nil {
-		currentModel.AWSIAMType = databaseUser.AwsIAMType
-	}
-	if currentModel.X509Type != nil {
-		currentModel.X509Type = databaseUser.X509Type
-	}
+	currentModel.LdapAuthType = databaseUser.LdapAuthType
+	currentModel.AWSIAMType = databaseUser.AwsIAMType
+	currentModel.X509Type = databaseUser.X509Type
 	currentModel.Username = &databaseUser.Username
-	_, _ = logger.Debugf("databaseUser:%+v", databaseUser)
 	var roles []RoleDefinition
 
 	for _, r := range databaseUser.GetRoles() {
@@ -141,7 +134,15 @@ func Read(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
 		labels = append(labels, label)
 	}
 	currentModel.Labels = labels
-
+	var scopes []ScopeDefinition
+	for _, s := range databaseUser.GetScopes() {
+		scope := ScopeDefinition{
+			Name: &s.Name,
+			Type: &s.Type,
+		}
+		scopes = append(scopes, scope)
+	}
+	currentModel.Scopes = scopes
 	updateUserCFNIdentifier(currentModel)
 
 	return handler.ProgressEvent{

cfn-resources/database-user/test/inputs_2_update.template.json

@@ -7,14 +7,14 @@
   "Roles": [
     {
       "RoleName": "readWrite",
-      "DatabaseName": "testdb",
+      "DatabaseName": "testdb2",
       "CollectionName": "col2"
     }
   ],
   "Scopes": [
     {
       "Type": "CLUSTER",
-      "Name": "testdb"
+      "Name": "testdb2"
     }
   ]
 }