Added optional maven-settings workspace

Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
 name: task-maven
-version: 0.2.0
+version: 0.2.1
 description: todo
 type: application

scripts/maven-generate.sh

@@ -10,6 +10,15 @@ if [[ -f ${MAVEN_SETTINGS_FILE} ]]; then
     exit 0
 fi
 
+# Check if settings.xml exists in the workspace maven-settings
+if [[ -f "${WORKSPACES_MAVEN_SETTINGS_PATH}/settings.xml" ]]; then
+    cp "${WORKSPACES_MAVEN_SETTINGS_PATH}/settings.xml" "${MAVEN_SETTINGS_FILE}"
+    echo "Using '${MAVEN_SETTINGS_FILE}' copied from optional workspace maven-settings"
+    cat ${MAVEN_SETTINGS_FILE}
+    exit 0
+fi
+
+
 mkdir "${MAVEN_GENERATE_DIRECTORY}"
 
 cat > "${MAVEN_SETTINGS_FILE}" <<EOF

templates/task-maven.yaml

@@ -19,14 +19,16 @@ spec:
       description: The workspace consisting of maven project.
     - name: server_secret
       optional: true
-      description: The workspace containing server secrets (user and password file)
+      description: The workspace containing server secrets (username and password)
     - name: proxy_secret
       optional: true
-      description: The workspace containing proxy server access credentials.
+      description: The workspace containing proxy server access credentials (username, password).
     - name: proxy_configmap
       optional: true
       description: The workspace containing some proxy values (proxy_port,proxy_host,proxy_non_proxy_hosts)
-
+    - name: maven_settings
+      optional: true
+      description: The workspace consisting of the custom maven settings provided by the user.
   params:
     - name: GOALS
       description: maven goals to run
@@ -57,6 +59,8 @@ spec:
       "workspaces.proxy_secret.bound"
       "workspaces.proxy_configmap.path"
       "workspaces.proxy_configmap.bound"
+      "workspaces.maven_settings.path"
+      "workspaces.maven_settings.bound"
 }}
 {{- include "environment" ( list $variables ) | nindent 6 }}
 

test/e2e/e2e.bats

@@ -19,6 +19,7 @@ source ./test/helper/helper.sh
         --workspace="name=server_secret,secret=${E2E_MAVEN_PARAMS_SERVER_SECRET}" \
         --workspace="name=proxy_secret,secret=${E2E_MAVEN_PARAMS_PROXY_SECRET}" \
         --workspace="name=proxy_configmap,secret=${E2E_MAVEN_PARAMS_PROXY_CONFIGMAP}" \
+        --workspace name=maven_settings,volumeClaimTemplateFile=./test/e2e/resources/workspace-template.yaml \
         --workspace="name=source,claimName=task-maven,subPath=source" \
         --filename=test/e2e/resources/pipeline-maven.yaml \
         --showlog

test/e2e/resources/workspace-template.yaml

@@ -0,0 +1,6 @@
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 250Mi