From 01598c031f8d4f7a562ded930cbca1745114c479 Mon Sep 17 00:00:00 2001 From: M Atif Ali Date: Wed, 16 Apr 2025 17:07:39 +0500 Subject: [PATCH 1/3] docs: update jfrog-artifactory integration docs --- docs/admin/integrations/jfrog-artifactory.md | 64 +++++++++----------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/docs/admin/integrations/jfrog-artifactory.md b/docs/admin/integrations/jfrog-artifactory.md index 8f27d687d7e00..2bbe1e0130ab4 100644 --- a/docs/admin/integrations/jfrog-artifactory.md +++ b/docs/admin/integrations/jfrog-artifactory.md @@ -1,15 +1,5 @@ # JFrog Artifactory Integration -
- - M Atif Ali - matifali - -
-January 24, 2024 - ---- - Use Coder and JFrog Artifactory together to secure your development environments without disturbing your developers' existing workflows. @@ -60,8 +50,8 @@ To set this up, follow these steps: ``` 1. Create a new Application Integration by going to - `https://JFROG_URL/ui/admin/configuration/integrations/new` and select the - Application Type as the integration you created in step 1. + `https://JFROG_URL/ui/admin/configuration/integrations/app-integrations/new` and select the + Application Type as the integration you created in step 1 or `Custom Integration` if you are using SaaS instnace i.e. example.jfrog.io. 1. Add a new [external authentication](../../admin/external-auth.md) to Coder by setting these environment variables in a manner consistent with your Coder deployment. Replace `JFROG_URL` with your JFrog Artifactory base URL: @@ -82,18 +72,20 @@ To set this up, follow these steps: ```tf module "jfrog" { - source = "registry.coder.com/modules/jfrog-oauth/coder" - version = "1.0.0" - agent_id = coder_agent.example.id - jfrog_url = "https://jfrog.example.com" - configure_code_server = true # this depends on the code-server - username_field = "username" # If you are using GitHub to login to both Coder and Artifactory, use username_field = "username" - package_managers = { - "npm": "npm", - "go": "go", - "pypi": "pypi" - } - } + count = data.coder_workspace.me.start_count + source = "registry.coder.com/modules/jfrog-oauth/coder" + version = "1.0.19" + 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" + + package_managers = { + npm = ["npm", "@scoped:npm-scoped"] + go = ["go", "another-go-repo"] + pypi = ["pypi", "extra-index-pypi"] + docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"] + } + } ``` ### JFrog-Token @@ -117,18 +109,18 @@ To set this up, follow these steps: } module "jfrog" { - source = "registry.coder.com/modules/jfrog-token/coder" - version = "1.0.0" - agent_id = coder_agent.example.id - jfrog_url = "https://example.jfrog.io" - configure_code_server = true # this depends on the code-server - artifactory_access_token = var.artifactory_access_token - package_managers = { - "npm": "npm", - "go": "go", - "pypi": "pypi" - } - } + source = "registry.coder.com/modules/jfrog-token/coder" + version = "1.0.30" + agent_id = coder_agent.example.id + jfrog_url = "https://XXXX.jfrog.io" + artifactory_access_token = var.artifactory_access_token + package_managers = { + npm = ["npm", "@scoped:npm-scoped"] + go = ["go", "another-go-repo"] + pypi = ["pypi", "extra-index-pypi"] + docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"] + } + } ``` > [!NOTE] From 5a11456c9a0b647a507629a4410e7ae4df935e93 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 16 Apr 2025 12:55:28 +0000 Subject: [PATCH 2/3] typos --- docs/admin/integrations/jfrog-artifactory.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin/integrations/jfrog-artifactory.md b/docs/admin/integrations/jfrog-artifactory.md index 2bbe1e0130ab4..0916be726e3b9 100644 --- a/docs/admin/integrations/jfrog-artifactory.md +++ b/docs/admin/integrations/jfrog-artifactory.md @@ -51,7 +51,7 @@ To set this up, follow these steps: 1. Create a new Application Integration by going to `https://JFROG_URL/ui/admin/configuration/integrations/app-integrations/new` and select the - Application Type as the integration you created in step 1 or `Custom Integration` if you are using SaaS instnace i.e. example.jfrog.io. + Application Type as the integration you created in step 1 or `Custom Integration` if you are using SaaS instance i.e. example.jfrog.io. 1. Add a new [external authentication](../../admin/external-auth.md) to Coder by setting these environment variables in a manner consistent with your Coder deployment. Replace `JFROG_URL` with your JFrog Artifactory base URL: From c5a74f674d30b92f8a7e8c5f9bb2c8aa12d850ca Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Wed, 16 Apr 2025 13:05:56 +0000 Subject: [PATCH 3/3] Fix indentation in JFrog Artifactory code examples --- docs/admin/integrations/jfrog-artifactory.md | 52 ++++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/admin/integrations/jfrog-artifactory.md b/docs/admin/integrations/jfrog-artifactory.md index 0916be726e3b9..3713bb1770f3d 100644 --- a/docs/admin/integrations/jfrog-artifactory.md +++ b/docs/admin/integrations/jfrog-artifactory.md @@ -72,20 +72,20 @@ To set this up, follow these steps: ```tf module "jfrog" { - count = data.coder_workspace.me.start_count - source = "registry.coder.com/modules/jfrog-oauth/coder" - version = "1.0.19" - 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" - - package_managers = { - npm = ["npm", "@scoped:npm-scoped"] - go = ["go", "another-go-repo"] - pypi = ["pypi", "extra-index-pypi"] - docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"] - } - } + count = data.coder_workspace.me.start_count + source = "registry.coder.com/modules/jfrog-oauth/coder" + version = "1.0.19" + 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" + + package_managers = { + npm = ["npm", "@scoped:npm-scoped"] + go = ["go", "another-go-repo"] + pypi = ["pypi", "extra-index-pypi"] + docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"] + } + } ``` ### JFrog-Token @@ -109,18 +109,18 @@ To set this up, follow these steps: } module "jfrog" { - source = "registry.coder.com/modules/jfrog-token/coder" - version = "1.0.30" - agent_id = coder_agent.example.id - jfrog_url = "https://XXXX.jfrog.io" - artifactory_access_token = var.artifactory_access_token - package_managers = { - npm = ["npm", "@scoped:npm-scoped"] - go = ["go", "another-go-repo"] - pypi = ["pypi", "extra-index-pypi"] - docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"] - } - } + source = "registry.coder.com/modules/jfrog-token/coder" + version = "1.0.30" + agent_id = coder_agent.example.id + jfrog_url = "https://XXXX.jfrog.io" + artifactory_access_token = var.artifactory_access_token + package_managers = { + npm = ["npm", "@scoped:npm-scoped"] + go = ["go", "another-go-repo"] + pypi = ["pypi", "extra-index-pypi"] + docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"] + } + } ``` > [!NOTE]