Skip to content

INTMDB-543: LDAP Config and LDAP Verify Resources Fix #1004

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 5 commits into from
Jan 19, 2023
Merged

INTMDB-543: LDAP Config and LDAP Verify Resources Fix #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e05220e
Update for breaking change in mongodb go library
martinstibbe Jan 12, 2023
d688114
Merge branch 'v1.8.0_staging' into INTMDB-543
martinstibbe Jan 12, 2023
f10d563
Merge branch 'v1.8.0_staging' into INTMDB-543
martinstibbe Jan 17, 2023
4fbfa36
go mod tidy
martinstibbe Jan 17, 2023
eeaf830
Update error logging and constant
martinstibbe Jan 18, 2023
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/mongodb/terraform-provider-mongodbatlas
go 1.18

require (
github.com/aws/aws-sdk-go v1.40.56
github.com/go-test/deep v1.1.0
github.com/gruntwork-io/terratest v0.41.7
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
Expand All @@ -11,7 +12,7 @@ require (
github.com/mwielbut/pointy v1.1.0
github.com/spf13/cast v1.5.0
github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210625132053-af2d5c0ad54f
go.mongodb.org/atlas v0.20.1-0.20221216175724-08be1f503b9a
go.mongodb.org/atlas v0.21.0
go.mongodb.org/realm v0.1.0
)

Expand All @@ -26,7 +27,6 @@ require (
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
github.com/apparentlymart/go-cidr v1.1.0 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/aws/aws-sdk-go v1.40.56 // indirect
github.com/beevik/etree v1.1.0 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
Expand Down
8 changes: 2 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,12 +919,8 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c/go.mod h1:xCI7ZzBfRuGgBXyXO6yfWfDmlWd35khcWpUa4L0xI/k=
go.mongodb.org/atlas v0.12.0/go.mod h1:wVCnHcm/7/IfTjEB6K8K35PLG70yGz8BdkRwX0oK9/M=
go.mongodb.org/atlas v0.19.1-0.20221216041907-cf0875bb4b4b h1:frOL6IVpql4z1ApvVPZ2DaqkPp//Ez6LLOjB4r868BE=
go.mongodb.org/atlas v0.19.1-0.20221216041907-cf0875bb4b4b/go.mod h1:XTjsxWgoOSwaZrQUvhTEuwjymxnF0r12RPibZuW1Uts=
go.mongodb.org/atlas v0.19.1-0.20221216044137-9eeca171e6ce h1:7/vO1GEEQkCFgfBm5fNXh7P0smTuIk6ebC7nlnFKVHI=
go.mongodb.org/atlas v0.19.1-0.20221216044137-9eeca171e6ce/go.mod h1:XTjsxWgoOSwaZrQUvhTEuwjymxnF0r12RPibZuW1Uts=
go.mongodb.org/atlas v0.20.1-0.20221216175724-08be1f503b9a h1:bM1g5SMFRebki6zPratsKPXmtPPUxYEZkPLFp3BD0cI=
go.mongodb.org/atlas v0.20.1-0.20221216175724-08be1f503b9a/go.mod h1:XTjsxWgoOSwaZrQUvhTEuwjymxnF0r12RPibZuW1Uts=
go.mongodb.org/atlas v0.21.0 h1:7Wi8Yy3hJGAyMvb8vZZjoYaQ89l58GCmIx5ppxtrrqc=
go.mongodb.org/atlas v0.21.0/go.mod h1:XTjsxWgoOSwaZrQUvhTEuwjymxnF0r12RPibZuW1Uts=
go.mongodb.org/realm v0.1.0 h1:zJiXyLaZrznQ+Pz947ziSrDKUep39DO4SfA0Fzx8M4M=
go.mongodb.org/realm v0.1.0/go.mod h1:4Vj6iy+Puo1TDERcoh4XZ+pjtwbOzPpzqy3Cwe8ZmDM=
go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403/go.mod h1:jHoPAGnDrCy6kaI2tAze5Prf0Nr0w/oNkROt2lw3n3o=
Expand Down
29 changes: 16 additions & 13 deletions mongodbatlas/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ var (
baseURL = ""
)

const (
endPointSTSDefault = "https://sts.amazonaws.com"
)

type SecretData struct {
PublicKey string `json:"public_key"`
PrivateKey string `json:"private_key"`
Expand Down Expand Up @@ -309,7 +313,7 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}
func configureCredentialsSTS(config *Config, secret, region, awsAccessKeyID, awsSecretAccessKey, awsSessionToken, endpoint string) (Config, error) {
ep, err := endpoints.GetSTSRegionalEndpoint("regional")
if err != nil {
fmt.Printf("GetSTSRegionalEndpoint error: %s", err)
log.Printf("GetSTSRegionalEndpoint error: %s", err)
return *config, err
}

Expand All @@ -318,7 +322,7 @@ func configureCredentialsSTS(config *Config, secret, region, awsAccessKeyID, aws
if service == endpoints.StsServiceID {
if endpoint == "" {
return endpoints.ResolvedEndpoint{
URL: "https://sts.amazonaws.com",
URL: endPointSTSDefault,
SigningRegion: region,
}, nil
}
Expand All @@ -344,17 +348,17 @@ func configureCredentialsSTS(config *Config, secret, region, awsAccessKeyID, aws

_, err = sess.Config.Credentials.Get()
if err != nil {
fmt.Printf("Session get credentials error: %s", err)
log.Printf("Session get credentials error: %s", err)
return *config, err
}
_, err = creds.Get()
if err != nil {
fmt.Printf("STS get credentials error: %s", err)
log.Printf("STS get credentials error: %s", err)
return *config, err
}
secretString, err := secretsManagerGetSecretValue(sess, &aws.Config{Credentials: creds, Region: aws.String(region)}, secret)
if err != nil {
fmt.Printf("Get Secrets error: %s", err)
log.Printf("Get Secrets error: %s", err)
return *config, err
}

Expand Down Expand Up @@ -388,25 +392,24 @@ func secretsManagerGetSecretValue(sess *session.Session, creds *aws.Config, secr
if aerr, ok := err.(awserr.Error); ok {
switch aerr.Code() {
case secretsmanager.ErrCodeResourceNotFoundException:
fmt.Println(secretsmanager.ErrCodeResourceNotFoundException, aerr.Error())
log.Println(secretsmanager.ErrCodeResourceNotFoundException, aerr.Error())
case secretsmanager.ErrCodeInvalidParameterException:
fmt.Println(secretsmanager.ErrCodeInvalidParameterException, aerr.Error())
log.Println(secretsmanager.ErrCodeInvalidParameterException, aerr.Error())
case secretsmanager.ErrCodeInvalidRequestException:
fmt.Println(secretsmanager.ErrCodeInvalidRequestException, aerr.Error())
log.Println(secretsmanager.ErrCodeInvalidRequestException, aerr.Error())
case secretsmanager.ErrCodeDecryptionFailure:
fmt.Println(secretsmanager.ErrCodeDecryptionFailure, aerr.Error())
log.Println(secretsmanager.ErrCodeDecryptionFailure, aerr.Error())
case secretsmanager.ErrCodeInternalServiceError:
fmt.Println(secretsmanager.ErrCodeInternalServiceError, aerr.Error())
log.Println(secretsmanager.ErrCodeInternalServiceError, aerr.Error())
default:
fmt.Println(aerr.Error())
log.Println(aerr.Error())
}
} else {
fmt.Println(err.Error())
log.Println(err.Error())
}
return "", err
}

fmt.Println(result)
return *result.SecretString, err
}

Expand Down
33 changes: 17 additions & 16 deletions mongodbatlas/resource_mongodbatlas_ldap_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mwielbut/pointy"
matlas "go.mongodb.org/atlas/mongodbatlas"
)

Expand Down Expand Up @@ -104,35 +105,35 @@ func resourceMongoDBAtlasLDAPConfigurationCreate(ctx context.Context, d *schema.
ldap := &matlas.LDAP{}

if v, ok := d.GetOk("authentication_enabled"); ok {
ldap.AuthenticationEnabled = v.(bool)
ldap.AuthenticationEnabled = pointy.Bool(v.(bool))
}

if v, ok := d.GetOk("authorization_enabled"); ok {
ldap.AuthorizationEnabled = v.(bool)
ldap.AuthorizationEnabled = pointy.Bool(v.(bool))
}

if v, ok := d.GetOk("hostname"); ok {
ldap.Hostname = v.(string)
ldap.Hostname = pointy.String(v.(string))
}

if v, ok := d.GetOk("port"); ok {
ldap.Port = v.(int)
ldap.Port = pointy.Int(v.(int))
}

if v, ok := d.GetOk("bind_username"); ok {
ldap.BindUsername = v.(string)
ldap.BindUsername = pointy.String(v.(string))
}

if v, ok := d.GetOk("bind_password"); ok {
ldap.BindPassword = v.(string)
ldap.BindPassword = pointy.String(v.(string))
}

if v, ok := d.GetOk("ca_certificate"); ok {
ldap.CaCertificate = v.(string)
ldap.CaCertificate = pointy.String(v.(string))
}

if v, ok := d.GetOk("authz_query_template"); ok {
ldap.AuthzQueryTemplate = v.(string)
ldap.AuthzQueryTemplate = pointy.String(v.(string))
}

if v, ok := d.GetOk("user_to_dn_mapping"); ok {
Expand Down Expand Up @@ -201,35 +202,35 @@ func resourceMongoDBAtlasLDAPConfigurationUpdate(ctx context.Context, d *schema.
ldap := &matlas.LDAP{}

if d.HasChange("authentication_enabled") {
ldap.AuthenticationEnabled = d.Get("").(bool)
ldap.AuthenticationEnabled = pointy.Bool(d.Get("").(bool))
}

if d.HasChange("authorization_enabled") {
ldap.AuthorizationEnabled = d.Get("authorization_enabled").(bool)
ldap.AuthorizationEnabled = pointy.Bool(d.Get("authorization_enabled").(bool))
}

if d.HasChange("hostname") {
ldap.Hostname = d.Get("hostname").(string)
ldap.Hostname = pointy.String(d.Get("hostname").(string))
}

if d.HasChange("port") {
ldap.Port = d.Get("port").(int)
ldap.Port = pointy.Int(d.Get("port").(int))
}

if d.HasChange("bind_username") {
ldap.BindUsername = d.Get("bind_username").(string)
ldap.BindUsername = pointy.String(d.Get("bind_username").(string))
}

if d.HasChange("bind_password") {
ldap.BindPassword = d.Get("bind_password").(string)
ldap.BindPassword = pointy.String(d.Get("bind_password").(string))
}

if d.HasChange("ca_certificate") {
ldap.CaCertificate = d.Get("ca_certificate").(string)
ldap.CaCertificate = pointy.String(d.Get("ca_certificate").(string))
}

if d.HasChange("authz_query_template") {
ldap.AuthzQueryTemplate = d.Get("authz_query_template").(string)
ldap.AuthzQueryTemplate = pointy.String(d.Get("authz_query_template").(string))
}

if d.HasChange("user_to_dn_mapping") {
Expand Down
13 changes: 7 additions & 6 deletions mongodbatlas/resource_mongodbatlas_ldap_verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/mwielbut/pointy"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
matlas "go.mongodb.org/atlas/mongodbatlas"
Expand Down Expand Up @@ -118,22 +119,22 @@ func resourceMongoDBAtlasLDAPVerifyCreate(ctx context.Context, d *schema.Resourc
ldapReq := &matlas.LDAP{}

if v, ok := d.GetOk("hostname"); ok {
ldapReq.Hostname = v.(string)
ldapReq.Hostname = pointy.String(v.(string))
}
if v, ok := d.GetOk("port"); ok {
ldapReq.Port = v.(int)
ldapReq.Port = pointy.Int(v.(int))
}
if v, ok := d.GetOk("bind_username"); ok {
ldapReq.BindUsername = v.(string)
ldapReq.BindUsername = pointy.String(v.(string))
}
if v, ok := d.GetOk("bind_password"); ok {
ldapReq.BindPassword = v.(string)
ldapReq.BindPassword = pointy.String(v.(string))
}
if v, ok := d.GetOk("ca_certificate"); ok {
ldapReq.CaCertificate = v.(string)
ldapReq.CaCertificate = pointy.String(v.(string))
}
if v, ok := d.GetOk("authz_query_template"); ok {
ldapReq.AuthzQueryTemplate = v.(string)
ldapReq.AuthzQueryTemplate = pointy.String(v.(string))
}

ldap, _, err := conn.LDAPConfigurations.Verify(ctx, projectID, ldapReq)
Expand Down