diff --git a/jfrog-oauth/README.md b/jfrog-oauth/README.md index 1a8b0cb..3827e2e 100644 --- a/jfrog-oauth/README.md +++ b/jfrog-oauth/README.md @@ -79,6 +79,7 @@ module "jfrog" { } } ``` + ### Using the access token in other terraform resources JFrog Access token is also available as a terraform output. You can use it in other terraform resources. For example, you can use it to configure an [Artifactory docker registry](https://jfrog.com/help/r/jfrog-artifactory-documentation/docker-registry) with the [docker terraform provider](https://registry.terraform.io/providers/kreuzwerker/docker/latest/docs). diff --git a/jfrog-oauth/main.tf b/jfrog-oauth/main.tf index 78017c4..8af19ab 100644 --- a/jfrog-oauth/main.tf +++ b/jfrog-oauth/main.tf @@ -95,35 +95,35 @@ output "username" { } resource "coder_env" "jfrog_ide_url" { - count = var.configure_code_server ? 1 : 0 + count = var.configure_code_server ? 1 : 0 agent_id = var.agent_id - name = "JFROG_IDE_URL" - value = var.jfrog_url + name = "JFROG_IDE_URL" + value = var.jfrog_url } resource "coder_env" "jfrog_ide_username" { - count = var.configure_code_server ? 1 : 0 + count = var.configure_code_server ? 1 : 0 agent_id = var.agent_id - name = "JFROG_IDE_USERNAME" - value = local.username + name = "JFROG_IDE_USERNAME" + value = local.username } resource "coder_env" "jfrog_ide_password" { - count = var.configure_code_server ? 1 : 0 + count = var.configure_code_server ? 1 : 0 agent_id = var.agent_id - name = "JFROG_IDE_PASSWORD" - value = data.coder_external_auth.jfrog.access_token + name = "JFROG_IDE_PASSWORD" + value = data.coder_external_auth.jfrog.access_token } resource "coder_env" "jfrog_ide_access_token" { - count = var.configure_code_server ? 1 : 0 + count = var.configure_code_server ? 1 : 0 agent_id = var.agent_id name = "JFROG_IDE_ACCESS_TOKEN" value = data.coder_external_auth.jfrog.access_token } resource "coder_env" "jfrog_ide_store_connection" { - count = var.configure_code_server ? 1 : 0 + count = var.configure_code_server ? 1 : 0 agent_id = var.agent_id name = "JFROG_IDE_STORE_CONNECTION" value = true diff --git a/jfrog-oauth/run.sh b/jfrog-oauth/run.sh index ebcac53..b20b0f2 100644 --- a/jfrog-oauth/run.sh +++ b/jfrog-oauth/run.sh @@ -73,4 +73,4 @@ if [ "${CONFIGURE_CODE_SERVER}" == "true" ]; then fi else echo "🤔 CONFIGURE_CODE_SERVER is not set to true, skipping JFrog extension installation." -fi \ No newline at end of file +fi diff --git a/jfrog-token/README.md b/jfrog-token/README.md index 512c863..3b66319 100644 --- a/jfrog-token/README.md +++ b/jfrog-token/README.md @@ -14,15 +14,15 @@ Install the JF CLI and authenticate package managers with Artifactory using Arti ```hcl module "jfrog" { - source = "https://registry.coder.com/modules/jfrog-token" - agent_id = coder_agent.example.id - jfrog_url = "https://XXXX.jfrog.io" - artifactory_access_token = var.artifactory_access_token - package_managers = { - "npm": "npm", - "go": "go", - "pypi": "pypi" - } + source = "https://registry.coder.com/modules/jfrog-token" + agent_id = coder_agent.example.id + jfrog_url = "https://XXXX.jfrog.io" + artifactory_access_token = var.artifactory_access_token + package_managers = { + "npm": "npm", + "go": "go", + "pypi": "pypi" + } } ``` @@ -30,8 +30,8 @@ Get a JFrog access token from your Artifactory instance. The token must be an [a ```hcl variable "artifactory_access_token" { - type = string - sensitive = true + type = string + sensitive = true } ``` @@ -43,15 +43,15 @@ variable "artifactory_access_token" { ```hcl module "jfrog" { - source = "https://registry.coder.com/modules/jfrog-token" - agent_id = coder_agent.example.id - jfrog_url = "https://YYYY.jfrog.io" - artifactory_access_token = var.artifactory_access_token # An admin access token - package_managers = { - "npm": "npm-local", - "go": "go-local", - "pypi": "pypi-local" - } + source = "https://registry.coder.com/modules/jfrog-token" + agent_id = coder_agent.example.id + jfrog_url = "https://YYYY.jfrog.io" + artifactory_access_token = var.artifactory_access_token # An admin access token + package_managers = { + "npm": "npm-local", + "go": "go-local", + "pypi": "pypi-local" + } } ``` @@ -69,6 +69,25 @@ go get github.com/golang/example/hello pip install requests ``` +### Configure code-server with JFrog extension + +The [JFrog extension](https://open-vsx.org/extension/JFrog/jfrog-vscode-extension) for VS Code allows you to interact with Artifactory from within the IDE. + +```hcl +module "jfrog" { + source = "https://registry.coder.com/modules/jfrog-token" + agent_id = coder_agent.example.id + jfrog_url = "https://XXXX.jfrog.io" + artifactory_access_token = var.artifactory_access_token + configure_code_server = true + package_managers = { + "npm": "npm",Add JFrog extension configuration for code-server + "go": "go", + "pypi": "pypi" + } +} +``` + ### Using the access token in other terraform resources JFrog Access token is also available as a terraform output. You can use it in other terraform resources. For example, you can use it to configure an [Artifactory docker registry](https://jfrog.com/help/r/jfrog-artifactory-documentation/docker-registry) with the [docker terraform provider](https://registry.terraform.io/providers/kreuzwerker/docker/latest/docs).