Skip to content

Commit

Permalink
Switch to nullable string
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexwilcox9
alexwilcox9 committed Sep 7, 2021
1 parent d54f552 commit cc269fd
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
2 changes: 2 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ require (
)

go 1.16

replace github.com/manicminer/hamilton => /home/alexwilcox/go/src/github.com/manicminer/hamilton
18 changes: 9 additions & 9 deletions internal/services/users/user_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,16 +380,16 @@ func userResourceCreate(ctx context.Context, d *schema.ResourceData, meta interf
mailNickName = strings.Split(upn, "@")[0]
}

passwordPolicies := utils.String("")
passwordPolicies := utils.NullableString("")
disable_strong_password := d.Get("disable_strong_password").(bool)
disable_password_expiration := d.Get("disable_password_expiration").(bool)

if disable_strong_password && (!disable_password_expiration) {
passwordPolicies = utils.String("DisableStrongPassword")
passwordPolicies = utils.NullableString("DisableStrongPassword")
} else if (!disable_strong_password) && disable_password_expiration {
passwordPolicies = utils.String("DisablePasswordExpiration")
passwordPolicies = utils.NullableString("DisablePasswordExpiration")
} else if disable_strong_password && disable_password_expiration {
passwordPolicies = utils.String("DisablePasswordExpiration, DisableStrongPassword")
passwordPolicies = utils.NullableString("DisablePasswordExpiration, DisableStrongPassword")
}

properties := msgraph.User{
Expand Down Expand Up @@ -451,16 +451,16 @@ func userResourceCreate(ctx context.Context, d *schema.ResourceData, meta interf
func userResourceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
client := meta.(*clients.Client).Users.UsersClient

passwordPolicies := utils.String("")
passwordPolicies := utils.NullableString("")
disable_strong_password := d.Get("disable_strong_password").(bool)
disable_password_expiration := d.Get("disable_password_expiration").(bool)

if disable_strong_password && (!disable_password_expiration) {
passwordPolicies = utils.String("DisableStrongPassword")
passwordPolicies = utils.NullableString("DisableStrongPassword")
} else if (!disable_strong_password) && disable_password_expiration {
passwordPolicies = utils.String("DisablePasswordExpiration")
passwordPolicies = utils.NullableString("DisablePasswordExpiration")
} else if disable_strong_password && disable_password_expiration {
passwordPolicies = utils.String("DisablePasswordExpiration, DisableStrongPassword")
passwordPolicies = utils.NullableString("DisablePasswordExpiration, DisableStrongPassword")
}

properties := msgraph.User{
Expand Down Expand Up @@ -581,7 +581,7 @@ func userResourceRead(ctx context.Context, d *schema.ResourceData, meta interfac
disable_password_expiration := false

if user.PasswordPolicies != nil {
policies := strings.Split(*user.PasswordPolicies, ",")
policies := strings.Split(string(*user.PasswordPolicies), ",")
for _, p := range policies {
if strings.EqualFold(strings.TrimSpace(p), "DisableStrongPassword") {
disable_strong_password = true
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/manicminer/hamilton/msgraph/models.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ github.com/klauspost/compress/fse
github.com/klauspost/compress/huff0
github.com/klauspost/compress/zstd
github.com/klauspost/compress/zstd/internal/xxhash
# github.com/manicminer/hamilton v0.28.0
# github.com/manicminer/hamilton v0.28.0 => /home/alexwilcox/go/src/github.com/manicminer/hamilton
## explicit
github.com/manicminer/hamilton/auth
github.com/manicminer/hamilton/environments
Expand Down Expand Up @@ -451,3 +451,4 @@ google.golang.org/protobuf/types/known/durationpb
google.golang.org/protobuf/types/known/emptypb
google.golang.org/protobuf/types/known/timestamppb
google.golang.org/protobuf/types/pluginpb
# github.com/manicminer/hamilton => /home/alexwilcox/go/src/github.com/manicminer/hamilton

0 comments on commit cc269fd

Please sign in to comment.