feat (kuberenetesDeploy) allow adding a timeout to the helm test commands

cmd/integrationArtifactTransport.go

@@ -34,7 +34,7 @@ func runIntegrationArtifactTransport(config *integrationArtifactTransportOptions
 	return CreateIntegrationArtifactTransportRequest(config, apimData)
 }
 
-//CreateIntegrationArtifactTransportRequest - Create a transport request for Integration Package
+// CreateIntegrationArtifactTransportRequest - Create a transport request for Integration Package
 func CreateIntegrationArtifactTransportRequest(config *integrationArtifactTransportOptions, apistruct apim.Bundle) error {
 	httpMethod := http.MethodPost
 	httpClient := apistruct.Client
@@ -90,7 +90,7 @@ func CreateIntegrationArtifactTransportRequest(config *integrationArtifactTransp
 	return errors.Errorf("integration flow deployment failed, response Status code: %v", createTransportRequestResp.StatusCode)
 }
 
-//pollTransportStatus - Poll the integration package transport processing, return status or error details
+// pollTransportStatus - Poll the integration package transport processing, return status or error details
 func pollTransportStatus(processId string, remainingRetries int, config *integrationArtifactTransportOptions, httpClient piperhttp.Sender, apiHost string) error {
 
 	if remainingRetries <= 0 {
@@ -126,7 +126,7 @@ func pollTransportStatus(processId string, remainingRetries int, config *integra
 	return nil
 }
 
-//GetJSONPayload -return http payload as byte array
+// GetJSONPayload -return http payload as byte array
 func GetCPITransportReqPayload(config *integrationArtifactTransportOptions) (*bytes.Buffer, error) {
 	jsonObj := gabs.New()
 	jsonObj.Set(rand.Intn(5000), "id")
@@ -153,7 +153,7 @@ func GetCPITransportReqPayload(config *integrationArtifactTransportOptions) (*by
 	return bytes.NewBuffer(jsonBody), nil
 }
 
-//getIntegrationTransportProcessingStatus - Get integration package transport request processing Status
+// getIntegrationTransportProcessingStatus - Get integration package transport request processing Status
 func getIntegrationTransportProcessingStatus(config *integrationArtifactTransportOptions, httpClient piperhttp.Sender, apiHost string, processId string) (string, error) {
 	httpMethod := "GET"
 	header := make(http.Header)
@@ -192,7 +192,7 @@ func getIntegrationTransportProcessingStatus(config *integrationArtifactTranspor
 	return "", errors.Errorf("failed to get transport request processing status, response Status code: %v", transportProcStatusResp.StatusCode)
 }
 
-//getTransportError - Get integration package transport failures error details
+// getTransportError - Get integration package transport failures error details
 func getIntegrationTransportError(config *integrationArtifactTransportOptions, httpClient piperhttp.Sender, apiHost string, processId string) (string, error) {
 	httpMethod := "GET"
 	header := make(http.Header)

cmd/kubernetesDeploy.go

@@ -226,6 +226,14 @@ func runHelmDeploy(config kubernetesDeployOptions, utils kubernetes.DeployUtils,
 		"--namespace", config.Namespace,
 	}
 
+	if config.HelmTestWaitSeconds > 0 {
+		testParams = append(
+			testParams,
+			"--timeout",
+			strconv.Itoa(config.HelmTestWaitSeconds),
+		)
+	}
+
 	if config.ShowTestLogs {
 		testParams = append(
 			testParams,

cmd/kubernetesDeploy_test.go

@@ -481,6 +481,7 @@ func TestRunKubernetesDeploy(t *testing.T) {
 			DockerConfigJSON:          ".pipeline/docker/config.json",
 			RunHelmTests:              true,
 			ShowTestLogs:              true,
+			HelmTestWaitSeconds:       300,
 		}
 
 		dockerConfigJSON := `{"kind": "Secret","data":{".dockerconfigjson": "ThisIsOurBase64EncodedSecret=="}}`
@@ -538,6 +539,8 @@ func TestRunKubernetesDeploy(t *testing.T) {
 			"deploymentName",
 			"--namespace",
 			"deploymentNamespace",
+			"--timeout",
+			"300",
 			"--logs",
 		}, mockUtils.Calls[2].Params, "Wrong test parameters")
 	})

resources/metadata/kubernetesDeploy.yaml

@@ -279,6 +279,14 @@ spec:
           - STAGES
           - STEPS
         default: 300
+      - name: helmTestWaitSeconds
+        type: int
+        description: Time to wait for any individual Kubernetes operation (like Jobs for hooks) . this param gets translated to `--timeout param` for helm cli during helm test.
+          Default value is 5m0s (5 min and 0 seconds) if not set via parameter. See https://helm.sh/docs/helm/helm_test/#options for further details
+        scope:
+          - PARAMETERS
+          - STAGES
+          - STEPS
       - name: helmValues
         type: "[]string"
         description: List of helm values as YAML file reference or URL (as per helm parameter description for `-f` / `--values`)