Skip to content
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

Added option to hide log output after git clone in rundeck output tab #14

Merged
merged 1 commit into from
Jul 22, 2020
Merged

Added option to hide log output after git clone in rundeck output tab #14

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
14 changes: 9 additions & 5 deletions src/main/groovy/com/rundeck/plugin/GitCloneWorkflowStep.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import com.dtolabs.rundeck.core.plugins.Plugin
import com.dtolabs.rundeck.core.plugins.configuration.Describable
import com.dtolabs.rundeck.core.plugins.configuration.Description
import com.dtolabs.rundeck.core.plugins.configuration.PropertyUtil
import com.dtolabs.rundeck.plugins.PluginLogger
import com.dtolabs.rundeck.plugins.ServiceNameConstants
import com.dtolabs.rundeck.core.plugins.configuration.PropertyScope
import com.dtolabs.rundeck.plugins.descriptions.PluginDescription
Expand All @@ -29,6 +28,7 @@ class GitCloneWorkflowStep implements StepPlugin, Describable{

public final static String GIT_URL="gitUrl"
public final static String GIT_BASE_DIRECTORY="gitBaseDirectory"
public final static String GIT_LOG_DISABLE ="gitLogDisable"
public final static String GIT_BRANCH="gitBranch"
public final static String GIT_HOSTKEY_CHECKING="strictHostKeyChecking"
public final static String GIT_KEY_STORAGE="gitKeyPath"
Expand Down Expand Up @@ -63,6 +63,8 @@ class GitCloneWorkflowStep implements StepPlugin, Describable{
null,null,null, renderingOptionsConfig))
.property(PropertyUtil.string(GIT_BRANCH, "Branch", "Checkout branch.", true,
"master",null,null, renderingOptionsConfig))
.property(PropertyUtil.bool(GIT_LOG_DISABLE, "Disable log output", "Enabling this flag, the plugin will not show the output log", true,
"false",null, renderingOptionsConfig))
.property(PropertyUtil.string(GIT_PASSWORD_STORAGE, "Git Password", 'Password to authenticate remotely', false,
null,null,null, renderingOptionsAuthenticationPassword))
.property(PropertyUtil.select(GIT_HOSTKEY_CHECKING, "SSH: Strict Host Key Checking", '''Use strict host key checking.
Expand Down Expand Up @@ -127,11 +129,13 @@ If `yes`, require remote host SSH key is defined in the `~/.ssh/known_hosts` fil
try{
gitManager.cloneOrCreate(base)

def jsonMap = base.listFiles().collect {file ->
return [name: file.name, directory: file.directory, file: file.file, path: file.absolutePath]
if (!Boolean.parseBoolean((String) configuration.get(GIT_LOG_DISABLE))) {
def jsonMap = base.listFiles().collect { file ->
return [name: file.name, directory: file.directory, file: file.file, path: file.absolutePath]
}
def json = JsonOutput.toJson(jsonMap)
logger.log(2, json, meta)
}
def json = JsonOutput.toJson(jsonMap)
logger.log(2, json, meta)

}catch(Exception e){
logger.log(0, e.getMessage())
Expand Down
3 changes: 3 additions & 0 deletions src/main/groovy/com/rundeck/plugin/GitResourceModelFactory.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class GitResourceModelFactory implements ResourceModelSourceFactory,Describable

public final static String GIT_URL="gitUrl"
public final static String GIT_BASE_DIRECTORY="gitBaseDirectory"
public final static String GIT_LOG_DISABLE ="gitLogDisable"
public final static String GIT_FILE="gitFile"
public final static String GIT_FORMAT_FILE="gitFormatFile"
public final static String GIT_BRANCH="gitBranch"
Expand Down Expand Up @@ -66,6 +67,8 @@ Some examples:
null,null,null, renderingOptionsConfig))
.property(PropertyUtil.string(GIT_BRANCH, "Branch", "Checkout branch.", true,
"master",null,null, renderingOptionsConfig))
.property(PropertyUtil.bool(GIT_LOG_DISABLE, "Disable log output", "Enabling this flag, the plugin will not show the output log", true,
"false",null, renderingOptionsConfig))
.property(PropertyUtil.string(GIT_FILE, "Resource model File", "Resource model file inside the github repo.", true,
null,null,null, renderingOptionsConfig))
.property(PropertyUtil.select(GIT_FORMAT_FILE, "File Format", 'File Format', true,
Expand Down