Merge pull request #422 from runzexia/fix-sonar-status-NPE

fix sonarStatus api NEP, return `[]` if could not get last run

pkg/models/devops/project_pipeline_handler.go

@@ -235,9 +235,12 @@ func GetPipelineSonar(projectId, pipelineId string) ([]*SonarStatus, error) {
 		return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
 	}
 	build, err := job.GetLastBuild()
-	if err != nil {
+	if err != nil && utils.GetJenkinsStatusCode(err) != http.StatusNotFound {
 		glog.Errorf("%+v", err)
 		return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
+	} else if err != nil {
+		glog.Errorf("%+v", err)
+		return nil, nil
 	}
 
 	sonarStatus, err := getBuildSonarResults(build)
@@ -250,6 +253,9 @@ func GetPipelineSonar(projectId, pipelineId string) ([]*SonarStatus, error) {
 		if err != nil && utils.GetJenkinsStatusCode(err) != http.StatusNotFound {
 			glog.Errorf("%+v", err)
 			return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
+		} else if err != nil {
+			glog.Errorf("%+v", err)
+			return nil, nil
 		}
 		sonarStatus, err = getBuildSonarResults(build)
 		if err != nil {
@@ -273,9 +279,12 @@ func GetMultiBranchPipelineSonar(projectId, pipelineId, branchId string) ([]*Son
 		return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
 	}
 	build, err := job.GetLastBuild()
-	if err != nil {
+	if err != nil && utils.GetJenkinsStatusCode(err) != http.StatusNotFound {
 		glog.Errorf("%+v", err)
 		return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
+	} else if err != nil {
+		glog.Errorf("%+v", err)
+		return nil, nil
 	}
 
 	sonarStatus, err := getBuildSonarResults(build)
@@ -288,6 +297,9 @@ func GetMultiBranchPipelineSonar(projectId, pipelineId, branchId string) ([]*Son
 		if err != nil && utils.GetJenkinsStatusCode(err) != http.StatusNotFound {
 			glog.Errorf("%+v", err)
 			return nil, restful.NewError(utils.GetJenkinsStatusCode(err), err.Error())
+		} else if err != nil {
+			glog.Errorf("%+v", err)
+			return nil, nil
 		}
 		sonarStatus, err = getBuildSonarResults(build)
 		if err != nil {

pkg/models/routers/routers.go

@@ -369,7 +369,6 @@ func createOrUpdateRouterWorkload(namespace string, publishService bool, service
 		}
 	}
 
-
 	if deployment.Spec.Template.Annotations == nil {
 		deployment.Spec.Template.Annotations = make(map[string]string, 0)
 	}