Skip to content

Refactor SecretSourceResolver map initialization and clarify UpdateCenterConfigurator intent #2832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timja merged 1 commit into from
Apr 15, 2026
+19 −17
Merged

Refactor SecretSourceResolver map initialization and clarify UpdateCenterConfigurator intent #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions plugin/src/main/java/io/jenkins/plugins/casc/SecretSourceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
import java.nio.file.InvalidPathException;
import java.nio.file.Paths;
import java.util.Base64;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand All @@ -38,18 +36,25 @@ public class SecretSourceResolver {
private final StringSubstitutor substitutor;

public SecretSourceResolver(ConfigurationContext configurationContext) {
// TODO update to use Map.of in JDK11+
Map<String, org.apache.commons.text.lookup.StringLookup> map = new HashMap<>(16);
map.put("base64", Base64Lookup.INSTANCE);
map.put("fileBase64", FileBase64Lookup.INSTANCE);
map.put("readFileBase64", FileBase64Lookup.INSTANCE);
map.put("file", FileStringLookup.INSTANCE);
map.put("readFile", FileStringLookup.INSTANCE);
map.put("sysProp", SystemPropertyLookup.INSTANCE);
map.put("decodeBase64", DecodeBase64Lookup.INSTANCE);
map.put("json", JsonLookup.INSTANCE);
map.put("trim", TrimLookup.INSTANCE);
map = Collections.unmodifiableMap(map);
Map<String, StringLookup> map = Map.of(
"base64",
Base64Lookup.INSTANCE,
"fileBase64",
FileBase64Lookup.INSTANCE,
"readFileBase64",
FileBase64Lookup.INSTANCE,
"file",
FileStringLookup.INSTANCE,
"readFile",
FileStringLookup.INSTANCE,
"sysProp",
SystemPropertyLookup.INSTANCE,
"decodeBase64",
DecodeBase64Lookup.INSTANCE,
"json",
JsonLookup.INSTANCE,
"trim",
TrimLookup.INSTANCE);

substitutor = new StringSubstitutor(new FixedInterpolatorStringLookup(
map, new ConfigurationContextStringLookup(configurationContext)))
Expand Down
3 changes: 0 additions & 3 deletions plugin/src/main/java/io/jenkins/plugins/casc/core/UpdateCenterConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;

/**
* TODO would not be required if UpdateCenter had a DataBoundConstructor
*/
@Extension
@Restricted(NoExternalUse.class)
public class UpdateCenterConfigurator extends BaseConfigurator<UpdateCenter> {
Expand Down
Loading