Skip to content
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.

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

Add source parameter to user resource #475

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions docs/resources/security_user.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ resource "nexus_security_user" "admin" {
password = "admin123"
roles = ["nx-admin"]
status = "active"
source = "default"
}
```
<!-- schema generated by tfplugindocs -->
Expand Down
4 changes: 2 additions & 2 deletions examples/local-development/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# arbitrary example
resource "nexus_blobstore" "default" {
resource "nexus_blobstore_file" "default" {
name = "blobstore-file"
type = "File"
path = "/nexus-data/blobstore-file"
Expand All @@ -8,4 +8,4 @@ resource "nexus_blobstore" "default" {
limit = 1024000000
type = "spaceRemainingQuota"
}
}
}
1 change: 1 addition & 0 deletions examples/resources/nexus_security_user/resource.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ resource "nexus_security_user" "admin" {
password = "admin123"
roles = ["nx-admin"]
status = "active"
source = "default"
}
5 changes: 5 additions & 0 deletions internal/services/security/data_source_security_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ func DataSourceSecurityUser() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"source": {
Description: "The user's source, e.g. default (local) or LDAP.",
Type: schema.TypeString,
Computed: true,
},
},
}
}
Expand Down
2 changes: 2 additions & 0 deletions internal/services/security/data_source_security_user_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func TestAccDataSourceSecurityUser(t *testing.T) {
Status: "active",
Password: acctest.RandString(16),
Roles: []string{"nx-admin"},
Source: fmt.Sprintf("default"),
}

resource.Test(t, resource.TestCase{
Expand All @@ -39,6 +40,7 @@ func TestAccDataSourceSecurityUser(t *testing.T) {
resource.TestCheckResourceAttr(resName, "email", user.EmailAddress),
resource.TestCheckResourceAttr(resName, "status", user.Status),
resource.TestCheckResourceAttr(resName, "roles.#", strconv.Itoa(len(user.Roles))),
resource.TestCheckResourceAttr(resName, "source", user.Source),
),
},
},
Expand Down
12 changes: 12 additions & 0 deletions internal/services/security/resource_security_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ func ResourceSecurityUser() *schema.Resource {
"disabled",
}, false),
},
"source": {
Default: "default",
Description: "The user's source, e.g. default (local) or LDAP.",
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringInSlice([]string{
"default",
"LDAP",
}, false),
},
},
}
}
Expand All @@ -80,6 +90,7 @@ func getSecurityUserFromResourceData(d *schema.ResourceData) security.User {
Password: d.Get("password").(string),
Status: d.Get("status").(string),
Roles: tools.InterfaceSliceToStringSlice(d.Get("roles").(*schema.Set).List()),
Source: d.Get("source").(string),
}
}

Expand Down Expand Up @@ -114,6 +125,7 @@ func resourceSecurityUserRead(d *schema.ResourceData, m interface{}) error {
d.Set("roles", tools.StringSliceToInterfaceSlice(user.Roles))
d.Set("status", user.Status)
d.Set("userid", user.UserID)
d.Set("source", user.Source)

return nil
}
Expand Down
5 changes: 4 additions & 1 deletion internal/services/security/resource_security_user_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func testAccResourceSecurityUser() security.User {
Status: "active",
Password: acctest.RandString(16),
Roles: []string{"nx-admin"},
Source: fmt.Sprintf("default"),
}
}

Expand All @@ -45,6 +46,7 @@ func TestAccResourceSecurityUser(t *testing.T) {
resource.TestCheckResourceAttr(resName, "email", user.EmailAddress),
resource.TestCheckResourceAttr(resName, "status", user.Status),
resource.TestCheckResourceAttr(resName, "roles.#", strconv.Itoa(len(user.Roles))),
resource.TestCheckResourceAttr(resName, "source", user.Source),
// FIXME: (BUG) Incorrect roles state representation.
// For some reasons, 1st element in array is not stored as roles.0, but instead it's stored
// as roles.3360874991 where 3360874991 is a "random" number.
Expand Down Expand Up @@ -75,6 +77,7 @@ resource "nexus_security_user" "acceptance" {
password = "%s"
status = "%s"
roles = ["%s"]
source = "%s"
}
`, user.UserID, user.FirstName, user.LastName, user.EmailAddress, user.Password, user.Status, strings.Join(user.Roles, "\", \""))
`, user.UserID, user.FirstName, user.LastName, user.EmailAddress, user.Password, user.Status, strings.Join(user.Roles, "\", \""), user.Source)
}