From fd148c51827bacd7841281099a51b2de3076e462 Mon Sep 17 00:00:00 2001 From: Atif Ali Date: Wed, 16 Aug 2023 14:21:36 +0000 Subject: [PATCH 1/2] add JFrog VS Code extension to jfrog template --- examples/templates/jfrog/docker/main.tf | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/examples/templates/jfrog/docker/main.tf b/examples/templates/jfrog/docker/main.tf index 034d5fe72148b..d11d2cf659889 100644 --- a/examples/templates/jfrog/docker/main.tf +++ b/examples/templates/jfrog/docker/main.tf @@ -69,6 +69,13 @@ resource "coder_agent" "main" { curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server --version 4.11.0 /tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 & + # Install the JFrog VS Code extension. + # Find the latest version number at + # https://open-vsx.org/extension/JFrog/jfrog-vscode-extension. + JFROG_EXT_VERSION=2.4.1 + curl -o /tmp/jfrog.vsix -L "https://open-vsx.org/api/JFrog/jfrog-vscode-extension/$JFROG_EXT_VERSION/file/JFrog.jfrog-vscode-extension-$JFROG_EXT_VERSION.vsix" + /tmp/code-server/bin/code-server --install-extension /tmp/jfrog.vsix + # The jf CLI checks $CI when determining whether to use interactive # flows. export CI=true @@ -95,6 +102,12 @@ resource "coder_agent" "main" { # Set GOPROXY to use the Artifactory "go" repository. env = { GOPROXY : "https://${local.artifactory_username}:${artifactory_scoped_token.me.access_token}@${var.jfrog_host}/artifactory/api/go/${local.artifactory_repository_keys["go"]}" + # Autheticate with JFrog extension. + JFROG_IDE_URL : "https://${var.jfrog_host}" + JFROG_IDE_USERNAME : "${local.artifactory_username}" + JFROG_IDE_PASSWORD : "${artifactory_scoped_token.me.access_token}" + JFROG_IDE_ACCESS_TOKEN : "${artifactory_scoped_token.me.access_token}" + JFROG_IDE_STORE_CONNECTION : "true" } } From 569a16463fd2eda620f244de5e2a35ea69014a02 Mon Sep 17 00:00:00 2001 From: Atif Ali Date: Wed, 16 Aug 2023 14:39:45 +0000 Subject: [PATCH 2/2] fix typo --- examples/templates/jfrog/docker/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/templates/jfrog/docker/main.tf b/examples/templates/jfrog/docker/main.tf index d11d2cf659889..f5bcb6728cf59 100644 --- a/examples/templates/jfrog/docker/main.tf +++ b/examples/templates/jfrog/docker/main.tf @@ -102,7 +102,7 @@ resource "coder_agent" "main" { # Set GOPROXY to use the Artifactory "go" repository. env = { GOPROXY : "https://${local.artifactory_username}:${artifactory_scoped_token.me.access_token}@${var.jfrog_host}/artifactory/api/go/${local.artifactory_repository_keys["go"]}" - # Autheticate with JFrog extension. + # Authenticate with JFrog extension. JFROG_IDE_URL : "https://${var.jfrog_host}" JFROG_IDE_USERNAME : "${local.artifactory_username}" JFROG_IDE_PASSWORD : "${artifactory_scoped_token.me.access_token}"