Исправлен мерж секретов

src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy

@@ -28,19 +28,27 @@ class ConfigurationReader implements Serializable {
         return mergeConfigurations(globalConfiguration, jobConfiguration);
     }
 
-    @NonCPS
     private static JobConfiguration mergeConfigurations(
         JobConfiguration baseConfiguration,
         JobConfiguration configurationToMerge
     ) {
-        BeanUtils.describe(configurationToMerge).entrySet().stream()
+        def nonMergeableSettings = Arrays.asList("secrets").toSet()
-            .filter({ e -> e.getValue() != null })
+
-            .filter({ e -> e.getKey() != "class" })
+        mergeObjects(baseConfiguration, configurationToMerge, nonMergeableSettings);
-            .filter({ e -> e.getKey() != "metaClass" })
+        mergeObjects(baseConfiguration.secrets, configurationToMerge.secrets, Collections.emptySet())
-            .forEach {e ->
-                BeanUtils.setProperty(baseConfiguration, e.getKey(), e.getValue());
-            }
 
         return baseConfiguration;
     }
+
+    @NonCPS
+    private static <T extends Object> void mergeObjects(T baseObject, T objectToMerge, Set<String> nonMergeableSettings) {
+        BeanUtils.describe(objectToMerge).entrySet().stream()
+            .filter({ e -> e.getValue() != null })
+            .filter({ e -> e.getKey() != "class" })
+            .filter({ e -> e.getKey() != "metaClass" })
+            .filter({ e -> !nonMergeableSettings.contains(e.getKey()) })
+            .forEach {e ->
+                BeanUtils.setProperty(baseObject, e.getKey(), e.getValue());
+            }
+    }
 }

test/unit/groovy/ru/pulsar/jenkins/library/configuration/ConfigurationReaderTest.java

@@ -32,6 +32,10 @@ class ConfigurationReaderTest {
     // then
     assertThat(jobConfiguration.getV8version()).isEqualTo("8.3.14.1944");
     assertThat(jobConfiguration.getSonarScannerToolName()).isEqualTo("sonar-scanner");
+    assertThat(jobConfiguration.getSecrets())
+      .hasFieldOrPropertyWithValue("storage", "1234")
+      .hasFieldOrPropertyWithValue("storagePath", "UNKNOWN_ID")
+    ;
   }
 
 }

test/unit/resources/jobConfiguration.json

@@ -1,3 +1,6 @@
 {
-  "v8version": "8.3.14.1944"
+  "v8version": "8.3.14.1944",
+  "secrets": {
+    "storage": "1234"
+  }
 }