Skip to content

Commit 538d89e

Browse files
committed
Fix test induced behavior
1 parent b393552 commit 538d89e

2 files changed

Lines changed: 2 additions & 9 deletions

File tree

plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationAsCode.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,8 @@ public void export(OutputStream out) throws Exception {
598598
final List<NodeTuple> tuples = new ArrayList<>();
599599

600600
final ConfigurationContext context = new ConfigurationContext(registry);
601+
Optional.ofNullable(GlobalConfiguration.all().get(CasCGlobalConfig.class))
602+
.ifPresent(c -> context.setStrictExport(c.isStrictExport()));
601603
for (RootElementConfigurator<?> root : RootElementConfigurator.all()) {
602604
final CNode config = describeRoot(root, context);
603605
final Node valueNode = toYaml(config);

plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationContext.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import java.lang.reflect.Type;
88
import java.util.ArrayList;
99
import java.util.List;
10-
import jenkins.model.GlobalConfiguration;
11-
import jenkins.model.Jenkins;
1210
import org.apache.commons.lang3.math.NumberUtils;
1311
import org.kohsuke.stapler.Stapler;
1412

@@ -62,13 +60,6 @@ public ConfigurationContext(ConfiguratorRegistry registry, String mergeStrategy)
6260
this.mergeStrategy = mergeStrategy != null
6361
? mergeStrategy
6462
: getPropertyOrEnv(CASC_MERGE_STRATEGY_ENV, CASC_MERGE_STRATEGY_PROPERTY);
65-
Jenkins jenkins = Jenkins.getInstanceOrNull();
66-
if (jenkins != null) {
67-
CasCGlobalConfig config = GlobalConfiguration.all().get(CasCGlobalConfig.class);
68-
if (config != null) {
69-
this.strictExport = config.isStrictExport();
70-
}
71-
}
7263
}
7364

7465
private String getPropertyOrEnv(String envKey, String proKey) {

0 commit comments

Comments
 (0)