Merge pull request #2 from netresearch/username

feat: add possiblity to set username

.editorconfig

@@ -4,7 +4,7 @@
 root = true
 
 [*]
-indent_style = space
+indent_style = tab
 indent_size = 2
 end_of_line = lf
 charset = utf-8

ad/data_source_ad_user.go

@@ -185,6 +185,11 @@ func dataSourceADUser() *schema.Resource {
  Computed: true,
  Description: "Check if user is trusted for delegation",
  },
+ "username": {
+ Type: schema.TypeString,
+ Computed: true,
+ Description: "Username of the user object.",
+ },
  "dn": {
  Type: schema.TypeString,
  Computed: true,
@@ -239,6 +244,7 @@ func dataSourceADUserRead(d *schema.ResourceData, meta interface{}) error {
  _ = d.Set("title", u.Title)
  _ = d.Set("smart_card_logon_required", u.SmartcardLogonRequired)
  _ = d.Set("trusted_for_delegation", u.TrustedForDelegation)
+ _ = d.Set("username", u.Username)
  _ = d.Set("user_id", userID)
  d.SetId(u.GUID)
 

ad/internal/winrmhelper/winrm_user.go

@@ -56,7 +56,7 @@ type User struct {
  Password string
  Container string
  Domain string
- Username string
+ Username string `json:"Name"`
  PasswordNeverExpires bool
  CannotChangePassword bool
  CustomAttributes map[string]interface{}
@@ -278,6 +278,7 @@ func (u *User) ModifyUser(d *schema.ResourceData, conf *config.ProviderConf) err
  "street_address": "StreetAddress",
  "surname": "Surname",
  "title": "Title",
+ "username": "Username",
  }
 
  cmds := []string{fmt.Sprintf("Set-ADUser -Identity %q", u.GUID)}
@@ -540,10 +541,14 @@ func GetUserFromResource(d *schema.ResourceData) (*User, error) {
  Surname: SanitiseTFInput(d, "surname"),
  Title: SanitiseTFInput(d, "title"),
  TrustedForDelegation: d.Get("trusted_for_delegation").(bool),
+ Username: SanitiseTFInput(d, "username"),
  }
  if user.PrincipalName != "" {
  tokens := strings.Split(user.PrincipalName, "@")
- user.Username = tokens[0]
+ // set user.Username to the first token in the split if it user.Username is empty
+ if user.Username == "" {
+ user.Username = tokens[0]
+ }
  if len(tokens) > 1 {
  user.Domain = tokens[1]
  }
@@ -608,7 +613,9 @@ func unmarshallUser(input []byte, customAttributes []string) (*User, error) {
  }
  if user.PrincipalName != "" {
  tokens := strings.Split(user.PrincipalName, "@")
- user.Username = tokens[0]
+ if user.Username == "" {
+ user.Username = tokens[0]
+ }
  if len(tokens) > 1 {
  user.Domain = tokens[1]
  }

ad/resource_ad_user.go

@@ -219,6 +219,12 @@ func resourceADUser() *schema.Resource {
  Default: false,
  Description: "If set to true, the user account is trusted for Kerberos delegation. A service that runs under an account that is trusted for Kerberos delegation can assume the identity of a client requesting the service. This parameter sets the TrustedForDelegation property of an account object.",
  },
+ "username": {
+ Type: schema.TypeString,
+ Optional: true,
+ Default: false,
+ Description: "Set a username for the user. This parameter is the equivalent to the -Name parameter of New-ADUser cmdlet.",
+ },
  "custom_attributes": {
  Type: schema.TypeString,
  Optional: true,
@@ -342,6 +348,7 @@ func resourceADUserRead(d *schema.ResourceData, meta interface{}) error {
  _ = d.Set("title", u.Title)
  _ = d.Set("smart_card_logon_required", u.SmartcardLogonRequired)
  _ = d.Set("trusted_for_delegation", u.TrustedForDelegation)
+ _ = d.Set("username", u.Username)
 
  if u.CustomAttributes != nil {
  ca, err := structure.FlattenJsonToString(u.CustomAttributes)

ad/resource_ad_user_test.go

@@ -306,6 +306,7 @@ func testAccResourceADUserConfigAttributes() string {
  street_address = "StreetAddress"
  surname = "Surname"
  title = "Title"
+ username = "Username"
  smart_card_logon_required = false
  trusted_for_delegation = true
  }`, defaultVariablesSection(), defaultUserSection("", fmt.Sprintf("%q",