From 8add161f53e0cb6e6e7c639fa78a6919a57c4f44 Mon Sep 17 00:00:00 2001 From: Atif Ali Date: Mon, 17 Nov 2025 19:17:09 +0500 Subject: [PATCH] fix(jfrog): replace deprecated --repo-resolve flag for Maven (#535) Fixes deprecated Maven config flags in jfrog-oauth and jfrog-token modules closes #534 Done using GitHub Copilot. --------- Co-authored-by: GitHub Actions Bot Co-authored-by: DevelopmentCats --- registry/coder/modules/jfrog-oauth/README.md | 6 +++--- registry/coder/modules/jfrog-oauth/main.test.ts | 10 +++++++--- registry/coder/modules/jfrog-oauth/run.sh | 8 +++++++- registry/coder/modules/jfrog-token/README.md | 8 ++++---- registry/coder/modules/jfrog-token/main.test.ts | 10 +++++++--- registry/coder/modules/jfrog-token/run.sh | 8 +++++++- 6 files changed, 35 insertions(+), 15 deletions(-) diff --git a/registry/coder/modules/jfrog-oauth/README.md b/registry/coder/modules/jfrog-oauth/README.md index eaddfee6..b2a129d1 100644 --- a/registry/coder/modules/jfrog-oauth/README.md +++ b/registry/coder/modules/jfrog-oauth/README.md @@ -16,7 +16,7 @@ Install the JF CLI and authenticate package managers with Artifactory using OAut module "jfrog" { count = data.coder_workspace.me.start_count source = "registry.coder.com/coder/jfrog-oauth/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://example.jfrog.io" username_field = "username" # If you are using GitHub to login to both Coder and Artifactory, use username_field = "username" @@ -47,7 +47,7 @@ Configure the Python pip package manager to fetch packages from Artifactory whil module "jfrog" { count = data.coder_workspace.me.start_count source = "registry.coder.com/coder/jfrog-oauth/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://example.jfrog.io" username_field = "email" @@ -76,7 +76,7 @@ The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extensio module "jfrog" { count = data.coder_workspace.me.start_count source = "registry.coder.com/coder/jfrog-oauth/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://example.jfrog.io" username_field = "username" # If you are using GitHub to login to both Coder and Artifactory, use username_field = "username" diff --git a/registry/coder/modules/jfrog-oauth/main.test.ts b/registry/coder/modules/jfrog-oauth/main.test.ts index 940d166b..a9c3a082 100644 --- a/registry/coder/modules/jfrog-oauth/main.test.ts +++ b/registry/coder/modules/jfrog-oauth/main.test.ts @@ -159,9 +159,13 @@ EOF`; const coderScript = findResourceInstance(state, "coder_script"); - expect(coderScript.script).toContain( - 'jf mvnc --global --repo-resolve "central"', - ); + expect(coderScript.script).toContain("jf mvnc --global"); + expect(coderScript.script).toContain('--server-id-resolve="0"'); + expect(coderScript.script).toContain('--repo-resolve-releases "central"'); + expect(coderScript.script).toContain('--repo-resolve-snapshots "central"'); + expect(coderScript.script).toContain('--server-id-deploy="0"'); + expect(coderScript.script).toContain('--repo-deploy-releases "central"'); + expect(coderScript.script).toContain('--repo-deploy-snapshots "central"'); expect(coderScript.script).toContain(""); expect(coderScript.script).toContain("central"); diff --git a/registry/coder/modules/jfrog-oauth/run.sh b/registry/coder/modules/jfrog-oauth/run.sh index 6e4e0642..52f1e851 100644 --- a/registry/coder/modules/jfrog-oauth/run.sh +++ b/registry/coder/modules/jfrog-oauth/run.sh @@ -99,7 +99,13 @@ if [ -z "${HAS_MAVEN}" ]; then not_configured maven else echo "☕ Configuring maven..." - jf mvnc --global --repo-resolve "${REPOSITORY_MAVEN}" + jf mvnc --global \ + --server-id-resolve="${JFROG_SERVER_ID}" \ + --repo-resolve-releases "${REPOSITORY_MAVEN}" \ + --repo-resolve-snapshots "${REPOSITORY_MAVEN}" \ + --server-id-deploy="${JFROG_SERVER_ID}" \ + --repo-deploy-releases "${REPOSITORY_MAVEN}" \ + --repo-deploy-snapshots "${REPOSITORY_MAVEN}" # Create Maven config directory if it doesn't exist mkdir -p ~/.m2 cat << EOF > ~/.m2/settings.xml diff --git a/registry/coder/modules/jfrog-token/README.md b/registry/coder/modules/jfrog-token/README.md index 065d7e8e..c457cc6e 100644 --- a/registry/coder/modules/jfrog-token/README.md +++ b/registry/coder/modules/jfrog-token/README.md @@ -13,7 +13,7 @@ Install the JF CLI and authenticate package managers with Artifactory using Arti ```tf module "jfrog" { source = "registry.coder.com/coder/jfrog-token/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://XXXX.jfrog.io" artifactory_access_token = var.artifactory_access_token @@ -42,7 +42,7 @@ For detailed instructions, please see this [guide](https://coder.com/docs/v2/lat ```tf module "jfrog" { source = "registry.coder.com/coder/jfrog-token/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://YYYY.jfrog.io" artifactory_access_token = var.artifactory_access_token # An admin access token @@ -81,7 +81,7 @@ The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extensio ```tf module "jfrog" { source = "registry.coder.com/coder/jfrog-token/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://XXXX.jfrog.io" artifactory_access_token = var.artifactory_access_token @@ -101,7 +101,7 @@ data "coder_workspace" "me" {} module "jfrog" { source = "registry.coder.com/coder/jfrog-token/coder" - version = "1.2.0" + version = "1.2.1" agent_id = coder_agent.example.id jfrog_url = "https://XXXX.jfrog.io" artifactory_access_token = var.artifactory_access_token diff --git a/registry/coder/modules/jfrog-token/main.test.ts b/registry/coder/modules/jfrog-token/main.test.ts index 419b5f28..cabd7e80 100644 --- a/registry/coder/modules/jfrog-token/main.test.ts +++ b/registry/coder/modules/jfrog-token/main.test.ts @@ -197,9 +197,13 @@ EOF`; const coderScript = findResourceInstance(state, "coder_script"); - expect(coderScript.script).toContain( - 'jf mvnc --global --repo-resolve "central"', - ); + expect(coderScript.script).toContain("jf mvnc --global"); + expect(coderScript.script).toContain('--server-id-resolve="0"'); + expect(coderScript.script).toContain('--repo-resolve-releases "central"'); + expect(coderScript.script).toContain('--repo-resolve-snapshots "central"'); + expect(coderScript.script).toContain('--server-id-deploy="0"'); + expect(coderScript.script).toContain('--repo-deploy-releases "central"'); + expect(coderScript.script).toContain('--repo-deploy-snapshots "central"'); expect(coderScript.script).toContain(""); expect(coderScript.script).toContain("central"); diff --git a/registry/coder/modules/jfrog-token/run.sh b/registry/coder/modules/jfrog-token/run.sh index 7f53da00..182b37a2 100644 --- a/registry/coder/modules/jfrog-token/run.sh +++ b/registry/coder/modules/jfrog-token/run.sh @@ -98,7 +98,13 @@ if [ -z "${HAS_MAVEN}" ]; then not_configured maven else echo "☕ Configuring maven..." - jf mvnc --global --repo-resolve "${REPOSITORY_MAVEN}" + jf mvnc --global \ + --server-id-resolve="${JFROG_SERVER_ID}" \ + --repo-resolve-releases "${REPOSITORY_MAVEN}" \ + --repo-resolve-snapshots "${REPOSITORY_MAVEN}" \ + --server-id-deploy="${JFROG_SERVER_ID}" \ + --repo-deploy-releases "${REPOSITORY_MAVEN}" \ + --repo-deploy-snapshots "${REPOSITORY_MAVEN}" # Create Maven config directory if it doesn't exist mkdir -p ~/.m2 cat << EOF > ~/.m2/settings.xml