Merge branch 'master' into fix_app_name

Author: srinikitha09

cmd/detectExecuteScan.go

@@ -427,10 +427,11 @@ func getDetectScript(config detectExecuteScanOptions, utils detectUtils) error {
 	log.Entry().Infof("Downloading Detect Script")
 
 	downloadScript := func() error {
-		if config.UseDetect9 {
-			return utils.DownloadFile("https://detect.synopsys.com/detect9.sh", "detect.sh", nil, nil)
+		if config.UseDetect8 {
+			return utils.DownloadFile("https://detect.synopsys.com/detect8.sh", "detect.sh", nil, nil)
 		}
-		return utils.DownloadFile("https://detect.synopsys.com/detect8.sh", "detect.sh", nil, nil)
+		return utils.DownloadFile("https://detect.synopsys.com/detect9.sh", "detect.sh", nil, nil)
+
 	}
 
 	if err := downloadScript(); err != nil {

cmd/detectExecuteScan_generated.go

@@ -310,7 +310,7 @@ func TestRunDetect(t *testing.T) {
 		utilsMock.AddFile("detect.sh", []byte(""))
 		err := runDetect(ctx, detectExecuteScanOptions{}, utilsMock, &detectExecuteScanInflux{})
 
-		assert.Equal(t, utilsMock.downloadedFiles["https://detect.synopsys.com/detect8.sh"], "detect.sh")
+		assert.Equal(t, utilsMock.downloadedFiles["https://detect.synopsys.com/detect9.sh"], "detect.sh")
 		assert.True(t, utilsMock.HasRemovedFile("detect.sh"))
 		assert.NoError(t, err)
 		assert.Equal(t, ".", utilsMock.Dir, "Wrong execution directory used")

cmd/detectExecuteScan_test.go

@@ -82,28 +82,33 @@ func NewClientWithToken(cfg *ClientConfig, token string) (*Client, error) {
 func (c *Client) startTokenLifecycleManager(initialLoginDone chan struct{}) {
 	defer func() {
 		// make sure to close channel to avoid blocking of the caller
-		_, open := <-initialLoginDone
-		if open {
-			close(initialLoginDone)
-		}
+		log.Entry().Debugf("exiting Vault token lifecycle manager")
+		initialLoginDone <- struct{}{}
+		close(initialLoginDone)
 	}()
 
 	initialLoginSucceed := false
-	for i := 0; i < c.vaultApiClient.MaxRetries(); i++ {
+	retryAttemptDuration := c.vaultApiClient.MinRetryWait()
+	for i := 0; i <= c.vaultApiClient.MaxRetries(); i++ {
+		if i != 0 {
+			log.Entry().Infof("Retrying Vault login in %.0f seconds. Attempt %d of %d",
+				retryAttemptDuration.Seconds(), i, c.vaultApiClient.MaxRetries())
+			time.Sleep(retryAttemptDuration)
+		}
+
 		vaultLoginResp, err := c.login()
 		if err != nil {
-			log.Entry().Errorf("unable to authenticate to Vault: %v", err)
+			log.Entry().Warnf("unable to authenticate to Vault: %v", err)
 			continue
 		}
 		if !initialLoginSucceed {
 			initialLoginDone <- struct{}{}
-			close(initialLoginDone)
 			initialLoginSucceed = true
 		}
 
 		tokenErr := c.manageTokenLifecycle(vaultLoginResp)
 		if tokenErr != nil {
-			log.Entry().Errorf("unable to start managing token lifecycle: %v", err)
+			log.Entry().Warnf("unable to start managing token lifecycle: %v", err)
 			continue
 		}
 	}

pkg/vault/client.go

@@ -653,11 +653,11 @@ spec:
         resourceRef:
           - name: commonPipelineEnvironment
             param: container/repositoryPassword
-      - name: useDetect9
+      - name: useDetect8
         description:
-          "This flag enables the use of the supported version 9 of the Detect Script instead of v8"
+          "This flag enables the use of the supported version 8 of the Detect Script instead of v9"
         aliases:
-          - name: detect/useDetect9
+          - name: detect/useDetect8
         type: bool
         scope:
           - PARAMETERS

resources/metadata/detectExecuteScan.yaml

@@ -65,17 +65,19 @@ void call(Map parameters = [:]) {
                         writePipelineEnv(script: script, piperGoPath: piperGoPath)
                         withEnv(environment) {
                             influxWrapper(script) {
-                                piperExecuteBin.credentialWrapper(config, credentialInfo) {
-                                    if (stepConfig.instance) {
-                                        withSonarQubeEnv(stepConfig.instance) {
-                                            echo "Instance is deprecated - please use serverUrl parameter to set URL to the Sonar backend."
+                                try {
+                                    piperExecuteBin.credentialWrapper(config, credentialInfo) {
+                                        if (stepConfig.instance) {
+                                            withSonarQubeEnv(stepConfig.instance) {
+                                                echo "Instance is deprecated - please use serverUrl parameter to set URL to the Sonar backend."
+                                                sh "${piperGoPath} ${STEP_NAME}${customDefaultConfig}${customConfigArg}"
+                                            }
+                                        } else {
                                             sh "${piperGoPath} ${STEP_NAME}${customDefaultConfig}${customConfigArg}"
-                                            jenkinsUtils.handleStepResults(STEP_NAME, false, false)
-                                            readPipelineEnv(script: script, piperGoPath: piperGoPath)
                                         }
-                                    } else {
-                                        sh "${piperGoPath} ${STEP_NAME}${customDefaultConfig}${customConfigArg}"
                                     }
+                                } finally {
+                                    jenkinsUtils.handleStepResults(STEP_NAME, false, false)
                                 }
                             }
                         }