Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: datadrivers/terraform-provider-nexus
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: Edu-DevOps/terraform-provider-nexus
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: refs/heads/add_source_parameter_to_user_resource
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 10 commits
  • 7 files changed
  • 4 contributors

Commits on Mar 13, 2024

  1. fix: routing_rules refresh

    Edu-DevOps committed Mar 13, 2024
    Copy the full SHA
    b14d95a View commit details

Commits on Oct 18, 2024

  1. Copy the full SHA
    4c637e1 View commit details
  2. Copy the full SHA
    73af16a View commit details
  3. Revert "fix: routing_rules refresh"

    This reverts commit b14d95a.
    Edu-DevOps committed Oct 18, 2024
    Copy the full SHA
    eaae9be View commit details
  4. Fixing examples/local-development/main.tf file

    Edu-DevOps committed Oct 18, 2024
    Copy the full SHA
    8b5b61c View commit details

Commits on Feb 14, 2025

  1. Update examples/local-development/main.tf

    Co-authored-by: Christopher Rücker <ruecker.christopher@protonmail.com>
    Edu-DevOps and chris-ruecker authored Feb 14, 2025
    Copy the full SHA
    1845a58 View commit details
  2. Update internal/services/security/resource_security_user_test.go

    Co-authored-by: Christopher Rücker <ruecker.christopher@protonmail.com>
    Edu-DevOps and chris-ruecker authored Feb 14, 2025
    Copy the full SHA
    c03b9b5 View commit details

Commits on Feb 19, 2025

  1. addressing comments

    Edu-DevOps committed Feb 19, 2025
    Copy the full SHA
    68c8693 View commit details
  2. Copy the full SHA
    a73c5cb View commit details

Commits on Mar 21, 2025

  1. Copy the full SHA
    599a685 View commit details
1 change: 1 addition & 0 deletions docs/resources/security_user.md
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ resource "nexus_security_user" "admin" {
password = "admin123"
roles = ["nx-admin"]
status = "active"
source = "default"
}
```
<!-- schema generated by tfplugindocs -->
5 changes: 2 additions & 3 deletions examples/local-development/main.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# arbitrary example
resource "nexus_blobstore" "default" {
resource "nexus_blobstore_file" "default" {
name = "blobstore-file"
type = "File"
path = "/nexus-data/blobstore-file"

soft_quota {
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
@@ -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
@@ -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,
},
},
}
}
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
@@ -21,6 +21,7 @@ func TestAccDataSourceSecurityUser(t *testing.T) {
Status: "active",
Password: acctest.RandString(16),
Roles: []string{"nx-admin"},
Source: "default",
}

resource.Test(t, resource.TestCase{
@@ -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),
),
},
},
11 changes: 11 additions & 0 deletions internal/services/security/resource_security_user.go
Original file line number Diff line number Diff line change
@@ -67,6 +67,15 @@ func ResourceSecurityUser() *schema.Resource {
"disabled",
}, false),
},
"source": {
Default: "default",
Description: "The user's source, e.g. default (local)",
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringInSlice([]string{
"default",
}, false),
},
},
}
}
@@ -80,6 +89,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),
}
}

@@ -114,6 +124,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
}
5 changes: 4 additions & 1 deletion internal/services/security/resource_security_user_test.go
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@ func testAccResourceSecurityUser() security.User {
Status: "active",
Password: acctest.RandString(16),
Roles: []string{"nx-admin"},
Source: "default",
}
}

@@ -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.
@@ -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)
}