From 2de53aa7679095559a29c045594a5a8c75045ed9 Mon Sep 17 00:00:00 2001 From: Steve Hipwell Date: Tue, 21 Jan 2025 10:07:10 +0000 Subject: [PATCH] fix(nexus3): Fixed user config (#1116) Signed-off-by: Steve Hipwell --- charts/nexus3/CHANGELOG.md | 7 +++++++ charts/nexus3/Chart.yaml | 8 +++----- charts/nexus3/README.md | 8 ++++---- charts/nexus3/ci/ci-values.yaml | 6 +++++- charts/nexus3/scripts/configure.sh | 2 +- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/charts/nexus3/CHANGELOG.md b/charts/nexus3/CHANGELOG.md index 79e3a2b3..7d8f3197 100644 --- a/charts/nexus3/CHANGELOG.md +++ b/charts/nexus3/CHANGELOG.md @@ -14,6 +14,12 @@ ## [UNRELEASED] +## [v5.6.1] - 2025-01-21 + +### Fixed + +- Fixed user configuration bug ([#1115](https://github.com/stevehipwell/helm-charts/issues/1115)). ([#1116](https://github.com/stevehipwell/helm-charts/pull/1116)) _@stevehipwell_ + ## [v5.6.0] - 2025-01-13 ### Added @@ -779,6 +785,7 @@ RELEASE LINKS --> [UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/nexus3 +[v5.6.1]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.6.1 [v5.6.0]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.6.0 [v5.5.1]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.5.1 [v5.5.0]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.5.0 diff --git a/charts/nexus3/Chart.yaml b/charts/nexus3/Chart.yaml index bba0c056..943d336b 100644 --- a/charts/nexus3/Chart.yaml +++ b/charts/nexus3/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: nexus3 description: Helm chart for Sonatype Nexus 3 OSS. type: application -version: 5.6.0 +version: 5.6.1 appVersion: 3.76.0 home: https://www.sonatype.com/products/sonatype-nexus-repository icon: https://raw.githubusercontent.com/stevehipwell/helm-charts/main/charts/nexus3/icon.png @@ -23,7 +23,5 @@ maintainers: annotations: artifacthub.io/alternativeName: nexus artifacthub.io/changes: | - - kind: added - description: "Added a default value of `default` for users and roles where this is undefined." - - kind: changed - description: "Updated the _Nexus3_ OCI image to [v3.76.0](https://github.com/sonatype/nexus-public/releases/tag/release-3.76.0-03)." + - kind: fixed + description: "Fixed user configuration bug." diff --git a/charts/nexus3/README.md b/charts/nexus3/README.md index 70f8746f..79814cb2 100644 --- a/charts/nexus3/README.md +++ b/charts/nexus3/README.md @@ -1,6 +1,6 @@ # nexus3 -![Version: 5.6.0](https://img.shields.io/badge/Version-5.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.76.0](https://img.shields.io/badge/AppVersion-3.76.0-informational?style=flat-square) +![Version: 5.6.1](https://img.shields.io/badge/Version-5.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.76.0](https://img.shields.io/badge/AppVersion-3.76.0-informational?style=flat-square) Helm chart for Sonatype Nexus 3 OSS. @@ -25,7 +25,7 @@ Helm chart for Sonatype Nexus 3 OSS. To install the chart using the recommended OCI method you can use the following command. ```shell -helm upgrade --install nexus3 oci://ghcr.io/stevehipwell/helm-charts/nexus3 --version 5.6.0 +helm upgrade --install nexus3 oci://ghcr.io/stevehipwell/helm-charts/nexus3 --version 5.6.1 ``` #### Verification @@ -33,7 +33,7 @@ helm upgrade --install nexus3 oci://ghcr.io/stevehipwell/helm-charts/nexus3 --ve As the OCI chart release is signed by [Cosign](https://github.com/sigstore/cosign) you can verify the chart before installing it by running the following command. ```shell -cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/nexus3:5.6.0 +cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/nexus3:5.6.1 ``` ### Non-OCI Repository @@ -42,7 +42,7 @@ Alternatively you can use the legacy non-OCI method via the following commands. ```shell helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/ -helm upgrade --install nexus3 stevehipwell/nexus3 --version 5.6.0 +helm upgrade --install nexus3 stevehipwell/nexus3 --version 5.6.1 ``` ## Values diff --git a/charts/nexus3/ci/ci-values.yaml b/charts/nexus3/ci/ci-values.yaml index dd69624e..53e8f7e9 100644 --- a/charts/nexus3/ci/ci-values.yaml +++ b/charts/nexus3/ci/ci-values.yaml @@ -66,6 +66,11 @@ config: privileges: [] roles: - nx-admin + - id: test-role + name: test + description: test role + privileges: [] + roles: [] users: - userId: test firstName: Test @@ -83,7 +88,6 @@ config: firstName: Test2 lastName: User emailAddress: test2@example.org - source: default status: active roles: - nx-anonymous diff --git a/charts/nexus3/scripts/configure.sh b/charts/nexus3/scripts/configure.sh index f607cb16..17352f28 100644 --- a/charts/nexus3/scripts/configure.sh +++ b/charts/nexus3/scripts/configure.sh @@ -183,7 +183,7 @@ echo "Configuring users..." for json_file in "${CONFIG_DIR}"/conf/*-user.json; do if [[ -f "${json_file}" ]]; then id="$(jq -r '.userId' "${json_file}")" - source="$(jq -r '.source // "default' "${json_file}")" + source="$(jq -r '.source // "default"' "${json_file}")" out_file="$(mktemp -p "${tmp_dir}")" status_code=$(curl -sS -o "${out_file}" -w "%{http_code}" -X GET -H 'Content-Type: application/json' -u "${NEXUS_USER}:${password}" "${NEXUS_HOST}/service/rest/v1/security/users/?userId=${id}&source=${source}")