Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 27, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
935fe28
chore: Add scopes handling to Read
EspenAlbert Dec 2, 2024
ad868ca
chore: Simplify assignment of LDAP, AWS IAM, and X.509 types in Read …
EspenAlbert Dec 2, 2024
15fb578
chore: Update database name in inputs_2_update.template.json to testd…
EspenAlbert Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions cfn-resources/database-user/cmd/resource/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions cfn-resources/database-user/test/inputs_2_update.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"Roles": [
{
"RoleName": "readWrite",
"DatabaseName": "testdb",
"DatabaseName": "testdb2",
"CollectionName": "col2"
}
],
"Scopes": [
{
"Type": "CLUSTER",
"Name": "testdb"
"Name": "testdb2"
}
]
}
Loading