Conditional proxy settings via PROXY_ENABLED. Simply generation

Author: rnc

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java

@@ -213,7 +213,8 @@ private String getContainerFile() {
      * altDeploymentDirectory to be used by default.
      */
     private String getMavenSetup() {
-        String result = """
+
+        return """
             echo "MAVEN_HOME:$MAVEN_HOME"
             PATH="${MAVEN_HOME}/bin:$PATH"
 
@@ -278,14 +279,18 @@ private String getMavenSetup() {
                 </altDeploymentRepository>
               </properties>
             </profile>
+            <profile>
+              <id>PROXY_ENABLED</id>
+              <activation>
+                <activeByDefault>true</activeByDefault>
+              </activation>
+              <properties>
+                <PROXY_ENABLED>false</PROXY_ENABLED>
+              </properties>
+            </profile>
           </profiles>
 
            <interactiveMode>false</interactiveMode>
-        """;
-
-        // This block is only needed when running outside of JBS
-        if (isEmpty(System.getenv("jvm-build-service"))) {
-            result += """
           <!--
             Needed for Maven 3.9+. Switched to native resolver
             https://maven.apache.org/guides/mini/guide-resolver-transport.html
@@ -304,13 +309,12 @@ private String getMavenSetup() {
               </configuration>
             </server>
           </servers>
-
           <proxies>
             <proxy>
               <id>indy-http</id>
-              <active>true</active>
+              <active>${PROXY_ENABLED}</active>
               <protocol>http</protocol>
-              <host>indy-generic-proxy</host>
+              <host>domain-proxy</host>
               <port>80</port>
               <!-- <username>build-ADDTW3JAGHYAA+tracking</username> -->
               <username>${BUILD_ID}+tracking</username>
@@ -319,19 +323,16 @@ private String getMavenSetup() {
             </proxy>
             <proxy>
               <id>indy-https</id>
-              <active>true</active>
+              <active>${PROXY_ENABLED}</active>
               <protocol>https</protocol>
-              <host>indy-generic-proxy</host>
+              <host>domain-proxy</host>
               <port>80</port>
               <username>${BUILD_ID}+tracking</username>
               <password>${ACCESS_TOKEN}</password>
               <nonProxyHosts>${PROXY_URL}|localhost</nonProxyHosts>
             </proxy>
           </proxies>
-        """;
-        }
 
-        result += """
         </settings>
         EOF
 
@@ -368,8 +369,6 @@ private String getMavenSetup() {
         </toolchains>
         EOF
         """.formatted(javaVersion);
-
-        return result;
     }