From e87fc24245999ee296d90e79901fd486dd517293 Mon Sep 17 00:00:00 2001
From: Nick Cross <ncross@redhat.com>
Date: Wed, 6 Nov 2024 08:16:54 +0000
Subject: [PATCH] Conditionally activate proxies

---
 deploy/tasks/maven-deployment.yaml                         | 2 ++
 .../container/build/preprocessor/AbstractPreprocessor.java | 7 ++++---
 pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go    | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/deploy/tasks/maven-deployment.yaml b/deploy/tasks/maven-deployment.yaml
index c703e6901..9d53a2444 100644
--- a/deploy/tasks/maven-deployment.yaml
+++ b/deploy/tasks/maven-deployment.yaml
@@ -78,6 +78,8 @@ spec:
               key: mavenpassword
         - name: ACCESS_TOKEN
           value: $(params.ACCESS_TOKEN)
+        - name: PROXY_ENABLED
+          value: "false"
       args:
         - deploy
         - --directory=/var/workdir/deployment
diff --git a/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java b/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java
index 22ab09c3d..9441afeb6 100644
--- a/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java
+++ b/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java
@@ -91,6 +91,8 @@ public void run() {
             export HOME=${HOME:=/root}
             # Custom base working directory.
             export JBS_WORKDIR=${JBS_WORKDIR:=/var/workdir/workspace}
+            # TODO: Until domain-proxy is implemented disable this
+            export PROXY_ENABLED=false
 
             export LANG="en_US.UTF-8"
             export LC_ALL="en_US.UTF-8"
@@ -302,8 +304,7 @@ private String getMavenSetup() {
           <proxies>
             <proxy>
               <id>indy-http</id>
-              <!-- TODO: Until domain-proxy is implemented disable this - probably needs conditional activation but settings profiles don't support interpolation -->
-              <active>false</active>
+              <active>${PROXY_ENABLED}</active>
               <protocol>http</protocol>
               <host>domain-proxy</host>
               <port>80</port>
@@ -314,7 +315,7 @@ private String getMavenSetup() {
             </proxy>
             <proxy>
               <id>indy-https</id>
-              <active>false</active>
+              <active>${PROXY_ENABLED}</active>
               <protocol>https</protocol>
               <host>domain-proxy</host>
               <port>80</port>
diff --git a/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go b/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
index 8f6a33fd7..55c036d6f 100644
--- a/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
+++ b/pkg/apis/jvmbuildservice/v1alpha1/systemconfig_types.go
@@ -49,5 +49,5 @@ const (
 	KonfluxGitDefinition          = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/git-clone/0.1/git-clone.yaml"
 	KonfluxPreBuildDefinitions    = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/pre-build.yaml"
 	KonfluxBuildDefinitions       = "https://raw.githubusercontent.com/konflux-ci/build-definitions/refs/heads/main/task/buildah-oci-ta/0.2/buildah-oci-ta.yaml"
-	KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/redhat-appstudio/jvm-build-service/main/deploy/tasks/maven-deployment.yaml"
+	KonfluxMavenDeployDefinitions = "https://raw.githubusercontent.com/rnc/jvm-build-service/PROXY/deploy/tasks/maven-deployment.yaml"
 )