From 3c470ba0ff20d0b7c9155b97b019b9282121efcf Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <me@matifali.dev>
Date: Tue, 26 Sep 2023 18:09:57 +0300
Subject: [PATCH] all test pass

---
 jfrog/main.tf | 1 +
 jfrog/run.sh  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jfrog/main.tf b/jfrog/main.tf
index 50ba477..807bdf8 100644
--- a/jfrog/main.tf
+++ b/jfrog/main.tf
@@ -60,6 +60,7 @@ resource "coder_script" "jfrog" {
   icon         = "/icon/jfrog.svg"
   script = templatefile("${path.module}/run.sh", {
     JFROG_URL : var.jfrog_url,
+    JFROG_HOST : replace(var.jfrog_url, "https://", ""),
     ARTIFACTORY_USERNAME : data.coder_workspace.me.owner_email,
     ARTIFACTORY_ACCESS_TOKEN : artifactory_scoped_token.me.access_token,
     REPOSITORY_NPM : lookup(var.package_managers, "npm", ""),
diff --git a/jfrog/run.sh b/jfrog/run.sh
index 42ad636..7f58114 100644
--- a/jfrog/run.sh
+++ b/jfrog/run.sh
@@ -35,7 +35,7 @@ else
   mkdir -p ~/.pip
   cat << EOF > ~/.pip/pip.conf
 [global]
-index-url = https://${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}@${JFROG_URL#https://}/artifactory/api/pypi/${REPOSITORY_PYPI}/simple
+index-url = https://${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}@${JFROG_HOST}/artifactory/api/pypi/${REPOSITORY_PYPI}/simple
 EOF
 fi
 
@@ -44,6 +44,6 @@ if [ -z "${REPOSITORY_GO}" ]; then
   echo "🤔 REPOSITORY_GO is not set, skipping go configuration."
 else
   echo "🐹 Configuring go..."
-  export GOPROXY="https://${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}@${JFROG_URL#https://}/artifactory/api/go/${REPOSITORY_GO}"
+  export GOPROXY="https://${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}@${JFROG_HOST}/artifactory/api/go/${REPOSITORY_GO}"
 fi
 echo "🥳 Configuration complete!"
\ No newline at end of file