Merge pull request #975 from hongweiliu17/STONEINTG-1110

fix(STONEINTG-1110): fix for IsSnapshotCreatedByPACPushEvent
konflux-ci · Jan 8, 2025 · 7744cfb · 7744cfb
2 parents 5c3f925 + 76bbd60
commit 7744cfb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/gitops/snapshot.go b/gitops/snapshot.go
@@ -678,7 +678,7 @@ func IsSnapshotCreatedByPACPushEvent(snapshot *applicationapiv1alpha1.Snapshot)
 	return metadata.HasLabelWithValue(snapshot, PipelineAsCodeEventTypeLabel, PipelineAsCodePushType) ||
 		metadata.HasLabelWithValue(snapshot, PipelineAsCodeEventTypeLabel, PipelineAsCodeGLPushType) ||
 		!metadata.HasLabel(snapshot, PipelineAsCodeEventTypeLabel) ||
-		!metadata.HasLabel(snapshot, PipelineAsCodePullRequestAnnotation)
+		!metadata.HasLabel(snapshot, PipelineAsCodePullRequestAnnotation) && !IsGroupSnapshot(snapshot)
 }
 
 // IsSnapshotCreatedBySamePACEvent checks if the two snapshot are created by the same PAC event

diff --git a/gitops/snapshot_test.go b/gitops/snapshot_test.go
@@ -844,6 +844,7 @@ var _ = Describe("Gitops functions for managing Snapshots", Ordered, func() {
 			})
 
 			It("Testing annotating snapshot", func() {
+				hasSnapshot.Labels[gitops.PipelineAsCodeEventTypeLabel] = gitops.PipelineAsCodePullRequestType
 				componentSnapshotInfos := []gitops.ComponentSnapshotInfo{
 					{
 						Component:        "com1",
@@ -862,6 +863,8 @@ var _ = Describe("Gitops functions for managing Snapshots", Ordered, func() {
 				Expect(err).ToNot(HaveOccurred())
 				Expect(componentSnapshotInfos).To(HaveLen(2))
 				Expect(snapshot.Labels[gitops.SnapshotTypeLabel]).To(Equal("group"))
+				Expect(gitops.IsSnapshotCreatedByPACPushEvent(snapshot)).To(BeFalse())
+
 			})
 
 			It("Testing UnmarshalJSON", func() {