Get build info property key from env vars only

jfrog · Dec 13, 2023 · 9ee0176 · 9ee0176
1 parent 17ba691
commit 9ee0176
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/BuildInfoExtractorUtils.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/BuildInfoExtractorUtils.java
@@ -273,17 +273,8 @@ private static String getPropertiesFileEncryption(Properties additionalProps, St
         if (StringUtils.isNotBlank(System.getProperty(key))) {
             return System.getProperty(key);
         }
-        if (additionalProps != null) {
-            // Check for the encryption key directly in additional properties
-            if (StringUtils.isNotBlank(additionalProps.getProperty(key))) {
-                return additionalProps.getProperty(key);
-            }
-            // Jenkins prefixes these variables with "env." so let's try that
-            if (StringUtils.isNotBlank(additionalProps.getProperty("env." + key))) {
-                return additionalProps.getProperty("env." + key);
-            }
-        }
-        return null;
+        // Check if the encryption key is set in env vars
+        return System.getenv(key);
     }
 
     private static String getAdditionalPropertiesFile(Properties additionalProps, Log log) {