From 6c8c16be56b00a227715d2275b310ba210a338ff Mon Sep 17 00:00:00 2001
From: Saurabh Parekh <sjparekh@amazon.com>
Date: Wed, 13 Nov 2024 13:47:04 -0800
Subject: [PATCH] Migrate harbor-scanner-trivy prowjobs from aquasecurity to
 goharbor (#435)

---
 .../harbor-scanner-trivy-presubmits.yaml      |  4 +--
 .../harbor-scanner-trivy-presubmits.yaml      |  4 +--
 templater/jobs/utils.go                       | 26 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/jobs/aws/eks-anywhere-build-tooling/harbor-scanner-trivy-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/harbor-scanner-trivy-presubmits.yaml
index ba74cb65..2ce5845f 100644
--- a/jobs/aws/eks-anywhere-build-tooling/harbor-scanner-trivy-presubmits.yaml
+++ b/jobs/aws/eks-anywhere-build-tooling/harbor-scanner-trivy-presubmits.yaml
@@ -22,7 +22,7 @@ presubmits:
   aws/eks-anywhere-build-tooling:
   - name: harbor-scanner-trivy-tooling-presubmit
     always_run: false
-    run_if_changed: "^build/lib/.*|Common.mk|projects/aquasecurity/harbor-scanner-trivy/.*"
+    run_if_changed: "^build/lib/.*|Common.mk|projects/goharbor/harbor-scanner-trivy/.*"
     branches:
     - ^main$
     cluster: "prow-presubmits-cluster"
@@ -54,7 +54,7 @@ presubmits:
           if $(make check-project-path-exists); then make build -C $PROJECT_PATH; fi
         env:
         - name: PROJECT_PATH
-          value: "projects/aquasecurity/harbor-scanner-trivy"
+          value: "projects/goharbor/harbor-scanner-trivy"
         - name: GITHUB_TOKEN
           valueFrom:
             secretKeyRef:
diff --git a/templater/jobs/presubmit/eks-anywhere-build-tooling/harbor-scanner-trivy-presubmits.yaml b/templater/jobs/presubmit/eks-anywhere-build-tooling/harbor-scanner-trivy-presubmits.yaml
index 3c0dc123..0d5ac94f 100644
--- a/templater/jobs/presubmit/eks-anywhere-build-tooling/harbor-scanner-trivy-presubmits.yaml
+++ b/templater/jobs/presubmit/eks-anywhere-build-tooling/harbor-scanner-trivy-presubmits.yaml
@@ -1,10 +1,10 @@
 jobName: harbor-scanner-trivy-tooling-presubmit
-runIfChanged: ^build/lib/.*|Common.mk|projects/aquasecurity/harbor-scanner-trivy/.*
+runIfChanged: ^build/lib/.*|Common.mk|projects/goharbor/harbor-scanner-trivy/.*
 branches:
 - ^main$
 commands:
 - if $(make check-project-path-exists); then make build -C $PROJECT_PATH; fi
-projectPath: projects/aquasecurity/harbor-scanner-trivy
+projectPath: projects/goharbor/harbor-scanner-trivy
 imageBuild: true
 resources:
   requests:
diff --git a/templater/jobs/utils.go b/templater/jobs/utils.go
index 4f8bcbd9..162af905 100644
--- a/templater/jobs/utils.go
+++ b/templater/jobs/utils.go
@@ -188,17 +188,17 @@ func GenerateJobConfig(data interface{}, filePath string) (types.JobConfig, erro
 
 func IsCuratedPackagesPresubmit(config string) bool {
 	return strings.Contains(config, "autoscaler") ||
-			strings.Contains(config, "cloud-provider-aws") ||
-			strings.Contains(config, "harbor") ||
-			strings.Contains(config, "prometheus") ||
-			config == "aws-otel-collector-tooling-presubmit" ||
-			config == "distribution-tooling-presubmit" ||
-			config == "eks-anywhere-packages-image-tooling-presubmit" ||
-			config == "emissary-tooling-presubmit" ||
-			config == "hello-eks-anywhere-tooling-presubmit" ||
-			config == "metallb-tooling-presubmit" ||
-			config == "metrics-server-presubmit" ||
-			config == "redis-tooling-presubmit" ||
-			config == "rolesanywhere-credential-helper-presubmit" ||
-			config == "trivy-tooling-presubmit"
+		strings.Contains(config, "cloud-provider-aws") ||
+		strings.Contains(config, "harbor") ||
+		strings.Contains(config, "prometheus") ||
+		config == "aws-otel-collector-tooling-presubmit" ||
+		config == "distribution-tooling-presubmit" ||
+		config == "eks-anywhere-packages-image-tooling-presubmit" ||
+		config == "emissary-tooling-presubmit" ||
+		config == "hello-eks-anywhere-tooling-presubmit" ||
+		config == "metallb-tooling-presubmit" ||
+		config == "metrics-server-presubmit" ||
+		config == "redis-tooling-presubmit" ||
+		config == "rolesanywhere-credential-helper-presubmit" ||
+		config == "trivy-tooling-presubmit"
 }