Skip to content

Commit 706a61d

Browse files
authored
CLOUDP-59489: generate scram sha credentials using the go client (#312)
1 parent ab69511 commit 706a61d

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/spf13/viper v1.7.0
2020
github.com/stretchr/testify v1.6.1
2121
go.mongodb.org/atlas v0.3.1-0.20200728164135-cd2ad1fa2fa2
22-
go.mongodb.org/ops-manager v0.7.3-0.20200729135848-2a380f1448cb
22+
go.mongodb.org/ops-manager v0.8.0
2323
golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a // indirect
2424
golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect
2525
gopkg.in/ini.v1 v1.57.0 // indirect

go.sum

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,17 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
240240
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
241241
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
242242
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
243+
github.com/xdg-go/stringprep v1.0.0 h1:W/PJi55zhi8ClBDgGZK2sdhe6QxuHS6YiVwrGEOYjdE=
244+
github.com/xdg-go/stringprep v1.0.0/go.mod h1:1lAKNhwXFE4//YT4gqVxkhclqvPTWe2Kyd6L59AbR8w=
245+
github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
246+
github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
243247
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
244248
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
245249
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
246250
go.mongodb.org/atlas v0.3.1-0.20200728164135-cd2ad1fa2fa2 h1:+P5zCidi5y49pyxZUoATn/1tB53Mrd5m4XvAqkM74+A=
247251
go.mongodb.org/atlas v0.3.1-0.20200728164135-cd2ad1fa2fa2/go.mod h1:xa/V3muNuVoReSG0y2pigUUnfPOx1cHF0ZV2uCE+c7I=
248-
go.mongodb.org/ops-manager v0.7.3-0.20200729135848-2a380f1448cb h1:JUbeDGkUB4M0eBRekNlBxTDqGlbl9vjm86Ha8xjfris=
249-
go.mongodb.org/ops-manager v0.7.3-0.20200729135848-2a380f1448cb/go.mod h1:WJxzjbGEaL+NunKK9tyYl7LvMPihMlPRX0q2AVVPYAs=
252+
go.mongodb.org/ops-manager v0.8.0 h1:LDQOlZmuftgtVSS2HuxS/ooTPLf5Q+e8Ok9tXyS71eM=
253+
go.mongodb.org/ops-manager v0.8.0/go.mod h1:mLoq8OmugUyX0NVYtkTPPgaThmRykx1P+y79/xEucX4=
250254
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
251255
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
252256
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -328,6 +332,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
328332
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
329333
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
330334
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
335+
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
336+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
331337
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
332338
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
333339
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

internal/cli/opsmanager/dbusers/create.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,12 @@ func (opts *CreateOpts) Run() error {
5454
if err != nil {
5555
return err
5656
}
57+
dbuser := opts.newDBUser()
58+
if err := atmcfg.ConfigureScramCredentials(dbuser, opts.password); err != nil {
59+
return err
60+
}
5761

58-
atmcfg.AddUser(current, opts.newDBUser())
62+
atmcfg.AddUser(current, dbuser)
5963

6064
if err := opts.store.UpdateAutomationConfig(opts.ConfigProjectID(), current); err != nil {
6165
return err
@@ -70,7 +74,6 @@ func (opts *CreateOpts) newDBUser() *opsmngr.MongoDBUser {
7074
return &opsmngr.MongoDBUser{
7175
Database: opts.authDB,
7276
Username: opts.username,
73-
InitPassword: opts.password,
7477
Roles: convert.BuildOMRoles(opts.roles),
7578
AuthenticationRestrictions: []string{},
7679
Mechanisms: opts.mechanisms,

0 commit comments

Comments
 (0)