Fill email address if there's a value

OctopusDeployLabs · Oct 11, 2024 · 2aef89d · 2aef89d
1 parent d08c127
commit 2aef89d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/octopusdeploy_framework/resource_user.go b/octopusdeploy_framework/resource_user.go
@@ -141,7 +141,7 @@ func updateUser(data *schemas.UserTypeResourceModel, user *users.User) {
 	data.Username = types.StringValue(user.Username)
 	data.CanPasswordBeEdited = types.BoolValue(user.CanPasswordBeEdited)
 	data.DisplayName = types.StringValue(user.DisplayName)
-	if !data.EmailAddress.IsNull() {
+	if user.EmailAddress != "" {
 		data.EmailAddress = types.StringValue(user.EmailAddress)
 	}
 	data.IsRequestor = types.BoolValue(user.IsRequestor)

diff --git a/octopusdeploy_framework/resource_user_test.go b/octopusdeploy_framework/resource_user_test.go
@@ -69,12 +69,11 @@ func TestAccUserBasic(t *testing.T) {
 				Config: testAccUserBasic(localName, displayName, isActive, isService, password, username, emailAddress),
 			},
 			{
-				//Config:                  testAccUserImport(localName, username),
+				Config:                  testAccUserImport(localName, username),
 				ResourceName:            resourceName,
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"password"},
-				ImportStateIdFunc:       testAccUserImportStateIdFunc(resourceName),
 			},
 		},
 	})