Skip to content

Commit cc94294

Browse files
committed
feat: Adds Description to MongoDB::Atlas::DatabaseUser
1 parent 31dc3b2 commit cc94294

File tree

4 files changed

+26
-6
lines changed

4 files changed

+26
-6
lines changed

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/mongodb/mongodbatlas-cloudformation-resources/util/logger"
2727
"github.com/mongodb/mongodbatlas-cloudformation-resources/util/progressevent"
2828
"github.com/mongodb/mongodbatlas-cloudformation-resources/util/validator"
29-
"go.mongodb.org/atlas-sdk/v20231115014/admin"
29+
"go.mongodb.org/atlas-sdk/v20250312002/admin"
3030
)
3131

3232
var CreateRequiredFields = []string{constants.DatabaseName, constants.ProjectID, constants.Roles, constants.Username}
@@ -68,7 +68,7 @@ func Create(req handler.Request, prevModel *Model, currentModel *Model) (handler
6868

6969
groupID := *currentModel.ProjectId
7070

71-
_, resp, err := client.Atlas20231115014.DatabaseUsersApi.CreateDatabaseUser(context.Background(), groupID, dbUser).Execute()
71+
_, resp, err := client.AtlasSDK.DatabaseUsersApi.CreateDatabaseUser(context.Background(), groupID, dbUser).Execute()
7272
if err != nil {
7373
return progressevent.GetFailedEventByResponse(err.Error(), resp), nil
7474
}
@@ -99,13 +99,14 @@ func Read(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
9999
groupID := *currentModel.ProjectId
100100
username := *currentModel.Username
101101
dbName := *currentModel.DatabaseName
102-
databaseUser, resp, err := client.Atlas20231115014.DatabaseUsersApi.GetDatabaseUser(context.Background(), groupID, dbName, username).Execute()
102+
databaseUser, resp, err := client.AtlasSDK.DatabaseUsersApi.GetDatabaseUser(context.Background(), groupID, dbName, username).Execute()
103103
if err != nil {
104104
return progressevent.GetFailedEventByResponse(err.Error(), resp), nil
105105
}
106106

107107
_, _ = logger.Debugf("databaseUser:%+v", databaseUser)
108108
currentModel.DatabaseName = &databaseUser.DatabaseName
109+
currentModel.Description = databaseUser.Description
109110
currentModel.LdapAuthType = databaseUser.LdapAuthType
110111
currentModel.AWSIAMType = databaseUser.AwsIAMType
111112
currentModel.X509Type = databaseUser.X509Type
@@ -176,7 +177,7 @@ func Update(req handler.Request, prevModel *Model, currentModel *Model) (handler
176177

177178
groupID := *currentModel.ProjectId
178179

179-
_, resp, err := client.Atlas20231115014.DatabaseUsersApi.UpdateDatabaseUser(context.Background(), groupID, *currentModel.DatabaseName, *currentModel.Username, dbUser).Execute()
180+
_, resp, err := client.AtlasSDK.DatabaseUsersApi.UpdateDatabaseUser(context.Background(), groupID, *currentModel.DatabaseName, *currentModel.Username, dbUser).Execute()
180181
if err != nil {
181182
return progressevent.GetFailedEventByResponse(err.Error(), resp), nil
182183
}
@@ -208,7 +209,7 @@ func Delete(req handler.Request, prevModel *Model, currentModel *Model) (handler
208209
groupID := *currentModel.ProjectId
209210
databaseName := *currentModel.DatabaseName
210211
username := *currentModel.Username
211-
_, resp, err := client.Atlas20231115014.DatabaseUsersApi.DeleteDatabaseUser(context.Background(), groupID, databaseName, username).Execute()
212+
resp, err := client.AtlasSDK.DatabaseUsersApi.DeleteDatabaseUser(context.Background(), groupID, databaseName, username).Execute()
212213
if err != nil {
213214
return progressevent.GetFailedEventByResponse(err.Error(), resp), nil
214215
}
@@ -239,7 +240,7 @@ func List(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
239240

240241
dbUserModels := make([]interface{}, 0)
241242

242-
databaseUsers, resp, err := client.Atlas20231115014.DatabaseUsersApi.ListDatabaseUsers(context.Background(), groupID).Execute()
243+
databaseUsers, resp, err := client.AtlasSDK.DatabaseUsersApi.ListDatabaseUsers(context.Background(), groupID).Execute()
243244
if err != nil {
244245
return progressevent.GetFailedEventByResponse(err.Error(), resp), nil
245246
}
@@ -249,6 +250,7 @@ func List(req handler.Request, prevModel *Model, currentModel *Model) (handler.P
249250
databaseUser := dbUserResults[i]
250251
var model = Model{
251252
DatabaseName: &databaseUser.DatabaseName,
253+
Description: databaseUser.Description,
252254
LdapAuthType: databaseUser.LdapAuthType,
253255
X509Type: databaseUser.X509Type,
254256
Username: &databaseUser.Username,
@@ -363,6 +365,7 @@ func setModel(currentModel *Model) (*admin.CloudDatabaseUser, error) {
363365
AwsIAMType: currentModel.AWSIAMType,
364366
X509Type: currentModel.X509Type,
365367
DeleteAfterDate: util.StringPtrToTimePtr(currentModel.DeleteAfterDate),
368+
Description: currentModel.Description,
366369
}
367370

368371
if util.IsStringPresent(currentModel.Password) {

cfn-resources/database-user/docs/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ To declare this entity in your AWS CloudFormation template, use the following sy
1515
"<a href="#deleteafterdate" title="DeleteAfterDate">DeleteAfterDate</a>" : <i>String</i>,
1616
"<a href="#awsiamtype" title="AWSIAMType">AWSIAMType</a>" : <i>String</i>,
1717
"<a href="#databasename" title="DatabaseName">DatabaseName</a>" : <i>String</i>,
18+
"<a href="#description" title="Description">Description</a>" : <i>String</i>,
1819
"<a href="#labels" title="Labels">Labels</a>" : <i>[ <a href="labeldefinition.md">labelDefinition</a>, ... ]</i>,
1920
"<a href="#ldapauthtype" title="LdapAuthType">LdapAuthType</a>" : <i>String</i>,
2021
"<a href="#x509type" title="X509Type">X509Type</a>" : <i>String</i>,
@@ -36,6 +37,7 @@ Properties:
3637
<a href="#deleteafterdate" title="DeleteAfterDate">DeleteAfterDate</a>: <i>String</i>
3738
<a href="#awsiamtype" title="AWSIAMType">AWSIAMType</a>: <i>String</i>
3839
<a href="#databasename" title="DatabaseName">DatabaseName</a>: <i>String</i>
40+
<a href="#description" title="Description">Description</a>: <i>String</i>
3941
<a href="#labels" title="Labels">Labels</a>: <i>
4042
- <a href="labeldefinition.md">labelDefinition</a></i>
4143
<a href="#ldapauthtype" title="LdapAuthType">LdapAuthType</a>: <i>String</i>
@@ -84,6 +86,16 @@ _Type_: String
8486

8587
_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
8688

89+
#### Description
90+
91+
Description of this database user.
92+
93+
_Required_: No
94+
95+
_Type_: String
96+
97+
_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
98+
8799
#### Labels
88100

89101
List that contains the key-value pairs for tagging and categorizing the MongoDB database user. The labels that you define do not appear in the console.

cfn-resources/database-user/mongodb-atlas-databaseuser.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@
8989
"description": "MongoDB database against which the MongoDB database user authenticates. MongoDB database users must provide both a username and authentication database to log into MongoDB. Default value is `admin`.",
9090
"type": "string"
9191
},
92+
"Description": {
93+
"description": "Description of this database user.",
94+
"type": "string"
95+
},
9296
"Labels": {
9397
"description": "List that contains the key-value pairs for tagging and categorizing the MongoDB database user. The labels that you define do not appear in the console.",
9498
"items": {

0 commit comments

Comments
 (0)