diff --git a/.gitignore b/.gitignore index 745e43f..45258b0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,9 @@ # Maven log/ target/ +.gradle/ +build/ +out/ # Integration tests build.log \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 0885166..9a716a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,18 +7,18 @@ before_install: after_success: - codecov script: - - mvn clean test install -P release + - gradle clean build env: global: - # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created - # via the "travis encrypt" command using the project repo's public key - - secure: "MULgeNJYgVa+lRZYEj6l7BoGAuxOabW7G4d/4U9kdJwtEwIGoj7/n0GIPJmTBiCqE8i4l++BYk6jvgWmvGUjBn/cjcjmqmp+1itbl2msYOJwOtyOZbvZGhU14a3UyxlnY7bHCVC8IBQO27ajw/2fkljCLw2phLgSw17gnSPmXhxuF0ZyI6M+MVOKvvtvTSxjThA1YUX6v8FisEBqLuk02FOFqKrmoBvydCNJyZpXKT5YU3eI3TEXwJ7wRouwS3WZf4s+NzfjvvkvjWRnHyredjgKucAmSkUHqHHVvYeNlpFIJtCFfLOrUPE/X90QZI13QBptN5zPFtDYyXn9I7JgB9jDIYrv2qc2gAVGSBUQSdgig/DiUTVDNH0I0GLbkUuT5xTKsZMItomHoLr+89d/PKbUEovz3pmBM05axmG2kfoj19wsVdkT9L3oLaWjdGmNZcPr+YNpdnDdiEp/DSraABFz+lpsecliR8oBXnSImEq4IGVw0R6ir3VZg5rLVJ/0u5w5XKUyuZOG9zk4IWowsD4r28Mga9H50N50qc2hA/7J7bGLD2E/n5iB7jcaOs9FC5bUQHN2LAHVwbEEXZJjekCfPlltZhoXVvlXbUwNuQ1KQgtE0pTvG8Xu0n2CN8MMZ2Pm07ZYKwBquat4hXbtMtqxJpl4ngviS6XjxquGRA8=" + # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created + # via the "travis encrypt" command using the project repo's public key + - secure: "MULgeNJYgVa+lRZYEj6l7BoGAuxOabW7G4d/4U9kdJwtEwIGoj7/n0GIPJmTBiCqE8i4l++BYk6jvgWmvGUjBn/cjcjmqmp+1itbl2msYOJwOtyOZbvZGhU14a3UyxlnY7bHCVC8IBQO27ajw/2fkljCLw2phLgSw17gnSPmXhxuF0ZyI6M+MVOKvvtvTSxjThA1YUX6v8FisEBqLuk02FOFqKrmoBvydCNJyZpXKT5YU3eI3TEXwJ7wRouwS3WZf4s+NzfjvvkvjWRnHyredjgKucAmSkUHqHHVvYeNlpFIJtCFfLOrUPE/X90QZI13QBptN5zPFtDYyXn9I7JgB9jDIYrv2qc2gAVGSBUQSdgig/DiUTVDNH0I0GLbkUuT5xTKsZMItomHoLr+89d/PKbUEovz3pmBM05axmG2kfoj19wsVdkT9L3oLaWjdGmNZcPr+YNpdnDdiEp/DSraABFz+lpsecliR8oBXnSImEq4IGVw0R6ir3VZg5rLVJ/0u5w5XKUyuZOG9zk4IWowsD4r28Mga9H50N50qc2hA/7J7bGLD2E/n5iB7jcaOs9FC5bUQHN2LAHVwbEEXZJjekCfPlltZhoXVvlXbUwNuQ1KQgtE0pTvG8Xu0n2CN8MMZ2Pm07ZYKwBquat4hXbtMtqxJpl4ngviS6XjxquGRA8=" addons: coverity_scan: project: - name: "ikogan/rundeck-http-plugin" + name: "rundeck-plugins/rundeck-http-plugin" description: "Rundeck HTTP Workflow Step Plugin" - notification_email: kogan@ohio.edu - build_command_prepend: "mvn clean" - build_command: "mvn -DskipTests=true compile" + notification_email: ltoledo@rundeck.com + build_command_prepend: "gradle clean" + build_command: "gradle build" branch_pattern: code-analysis \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f42b282 --- /dev/null +++ b/build.gradle @@ -0,0 +1,92 @@ +plugins { + id 'pl.allegro.tech.build.axion-release' version '1.10.1' + id 'java' +} + +apply plugin: 'java' + +sourceCompatibility = 1.8 +ext.rundeckPluginVersion = '1.2' +ext.pluginClassNames='edu.ohio.ais.rundeck.HttpWorkflowStepPlugin' +ext.pluginName = 'Http Step' +ext.pluginDescription = 'A workflow plugin that makes HTTP requests' + +scmVersion { + ignoreUncommittedChanges = false + tag { + prefix = '' + versionSeparator = '' + def origDeserialize=deserialize + //apend .0 to satisfy semver if the tag version is only X.Y + deserialize = { config, position, tagName -> + def orig = origDeserialize(config, position, tagName) + if (orig.split('\\.').length < 3) { + orig += ".0" + } + orig + } + } +} +project.version = scmVersion.version + + +repositories { + mavenLocal() + mavenCentral() +} + +configurations{ + //declare custom pluginLibs configuration to include only libs for this plugin + pluginLibs + + //declare compile to extend from pluginLibs so it inherits the dependencies + compile{ + extendsFrom pluginLibs + } +} + +dependencies { + compile 'org.rundeck:rundeck-core:3.0.+' + + pluginLibs group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.8' + pluginLibs group: 'com.google.code.gson', name: 'gson', version:'2.8.5' + pluginLibs group: 'com.esotericsoftware.yamlbeans', name: 'yamlbeans', version:'1.13' + + testCompile group: 'com.github.tomakehurst', name: 'wiremock-standalone', version:'2.23.2' + testCompile group: 'junit', name: 'junit', version:'4.12' +} + + +// task to copy plugin libs to output/lib dir +task copyToLib(type: Copy) { + into "$buildDir/output/lib" + from configurations.pluginLibs +} + + +jar { + from "$buildDir/output" + manifest { + def libList = configurations.pluginLibs.collect{'lib/'+it.name}.join(' ') + + attributes 'Rundeck-Plugin-Classnames': pluginClassNames + attributes 'Rundeck-Plugin-File-Version': version + attributes 'Rundeck-Plugin-Name': '${pluginName}' + attributes 'Rundeck-Plugin-Description': pluginDescription + attributes 'Rundeck-Plugin-Rundeck-Compatibility-Version': '3.x' + attributes 'Rundeck-Plugin-Tags': 'java,WorkflowStep' + attributes 'Rundeck-Plugin-License': 'Apache 2.0' + attributes 'Rundeck-Plugin-Source-Link': 'https://github.com/rundeck-plugins/http-notification' + attributes 'Rundeck-Plugin-Target-Host-Compatibility': 'all' + attributes 'Rundeck-Plugin-Version': rundeckPluginVersion + attributes 'Rundeck-Plugin-Archive': 'true' + attributes 'Rundeck-Plugin-Libs': "${libList}" + + } + dependsOn(copyToLib) + +} + +wrapper { + gradleVersion = '4.4.1' +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..91ca28c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..16d2805 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 6c3eafc..0000000 --- a/pom.xml +++ /dev/null @@ -1,189 +0,0 @@ - - - 4.0.0 - - edu.ohio.ais.rundeck - rundeck-http-plugin - 1.0.9-SNAPSHOT - jar - ${project.groupId}:${project.artifactId} - Perform HTTP requests with authentication as a Rundeck workflow step. - - - 2.7.1 - UTF-8 - ${project.build.directory} - - - - - org.rundeck - rundeck-core - ${rundeckVersion} - provided - - - - - org.apache.httpcomponents - httpclient - 4.5.2 - - - - - com.github.tomakehurst - wiremock-standalone - 2.5.1 - test - - - - junit - junit - 4.12 - test - - - com.google.code.gson - gson - 2.3.1 - - - com.google.code.gson - gson - 2.3.1 - - - com.esotericsoftware.yamlbeans - yamlbeans - 1.11 - - - - - - - maven-compiler-plugin - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${outputDirectory} - - - - 1.1 - true - - edu.ohio.ais.rundeck.HttpWorkflowStepPlugin - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.3 - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - package - - shade - - - - - - - - - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.7.201606060606 - - - - prepare-agent - - - - report - test - - report - - - - - - - - - - release - - - release - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.0 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - - - - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..911c1f4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'http-step' diff --git a/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowStepPlugin.java b/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowStepPlugin.java index 37e0263..204b4fa 100644 --- a/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowStepPlugin.java +++ b/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowStepPlugin.java @@ -600,6 +600,7 @@ private StringBuffer getPageContent(HttpResponse response) { String line = ""; while ((line = rd.readLine()) != null) { result.append(line); + result.append(System.getProperty("line.separator")); } } catch (IOException e) { e.printStackTrace();