Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b5a97f7
commit 05dee8c
Showing
6 changed files
with
99 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectEnvVars.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package org.jenkinsci.plugins.envinject.service; | ||
|
|
||
| import hudson.EnvVars; | ||
| import hudson.Util; | ||
| import hudson.model.Computer; | ||
| import org.jenkinsci.plugins.envinject.EnvInjectLogger; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.Serializable; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * @author Gregory Boissinot | ||
| */ | ||
| public class EnvInjectEnvVars implements Serializable { | ||
|
|
||
| EnvInjectLogger logger; | ||
|
|
||
| public EnvInjectEnvVars(EnvInjectLogger logger) { | ||
| this.logger = logger; | ||
| } | ||
|
|
||
| public Map<String, String> getComputerEnvVars() { | ||
| Map<String, String> result = new HashMap<String, String>(); | ||
| try { | ||
| Computer c = Computer.currentComputer(); | ||
| EnvVars envVars = c.getEnvironment(); | ||
| for (Map.Entry<String, String> entry : envVars.entrySet()) { | ||
| result.put(entry.getKey(), entry.getValue()); | ||
| } | ||
| } catch (IOException ioe) { | ||
| logger.error(ioe.getMessage()); | ||
| } catch (InterruptedException ie) { | ||
| logger.error(ie.getMessage()); | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| public void resolveVars(Map<String, String> variables, Map<String, String> env) { | ||
| for (Map.Entry<String, String> entry : variables.entrySet()) { | ||
| entry.setValue(Util.replaceMacro(entry.getValue(), env)); | ||
| } | ||
| EnvVars.resolve(variables); | ||
| } | ||
|
|
||
| public Map<String, String> removeUnsetVars(Map<String, String> envVars) { | ||
| Map<String, String> result = new HashMap<String, String>(); | ||
| for (Map.Entry<String, String> entry : envVars.entrySet()) { | ||
| if (!isUnresolvedVar(entry.getValue())) { | ||
| result.put(entry.getKey(), entry.getValue()); | ||
| } else { | ||
| logger.info(String.format("Unset unresolved '%s' variable.", entry.getKey())); | ||
| } | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| private boolean isUnresolvedVar(String value) { | ||
| if (value == null) { | ||
| return false; | ||
| } | ||
| return value.contains("$"); | ||
| } | ||
|
|
||
| } |
38 changes: 0 additions & 38 deletions
38
src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectEnvVarsUnset.java
This file was deleted.
Oops, something went wrong.