Merge pull request #560 from konflux-ci/release1124

feat(RELEASE-1124): validate Application reference

controllers/release/adapter.go

@@ -69,6 +69,7 @@ func newAdapter(ctx context.Context, client client.Client, release *v1alpha1.Rel
 	releaseAdapter.validations = []controller.ValidationFunction{
 		releaseAdapter.validatePipelineDefined,
 		releaseAdapter.validateProcessingResources,
+		releaseAdapter.validateApplication,
 		releaseAdapter.validateAuthor,
 		releaseAdapter.validatePipelineSource,
 	}
@@ -832,6 +833,34 @@ func (a *adapter) registerFinalProcessingStatus(pipelineRun *tektonv1.PipelineRu
 	return a.client.Status().Patch(a.ctx, a.release, patch)
 }
 
+// validateApplication will ensure that the same Application is used in both, the Snapshot and the ReleasePlan. If the
+// resources reference different Applications, an error will be returned.
+func (a *adapter) validateApplication() *controller.ValidationResult {
+	releasePlan, err := a.loader.GetReleasePlan(a.ctx, a.client, a.release)
+	if err != nil {
+		if errors.IsNotFound(err) {
+			a.release.MarkValidationFailed(err.Error())
+			return &controller.ValidationResult{Valid: false}
+		}
+		return &controller.ValidationResult{Err: err}
+	}
+
+	snapshot, err := a.loader.GetSnapshot(a.ctx, a.client, a.release)
+	if err != nil {
+		if errors.IsNotFound(err) {
+			a.release.MarkValidationFailed(err.Error())
+			return &controller.ValidationResult{Valid: false}
+		}
+		return &controller.ValidationResult{Err: err}
+	}
+
+	if releasePlan.Spec.Application != snapshot.Spec.Application {
+		return &controller.ValidationResult{Err: fmt.Errorf("different Application referenced in ReleasePlan and Snapshot")}
+	}
+
+	return &controller.ValidationResult{Valid: true}
+}
+
 // validateAuthor will ensure that a valid author exists for the Release and add it to its status. If the Release
 // has the automated label but doesn't have automated set in its status, this function will return an error so the
 // operation knows to requeue the Release.

controllers/release/adapter_test.go

@@ -2283,6 +2283,66 @@ var _ = Describe("Release adapter", Ordered, func() {
 
 	})
 
+	When("validateApplication is called", func() {
+		var adapter *adapter
+
+		AfterEach(func() {
+			_ = adapter.client.Delete(ctx, adapter.release)
+		})
+
+		BeforeEach(func() {
+			adapter = createReleaseAndAdapter()
+		})
+
+		It("returns valid and no error if the Application match", func() {
+			result := adapter.validateApplication()
+			Expect(result.Valid).To(BeTrue())
+			Expect(result.Err).NotTo(HaveOccurred())
+		})
+
+		It("returns invalid and error if the Application doesn't match", func() {
+			newReleasePlan := releasePlan.DeepCopy()
+			newReleasePlan.Spec.Application = "non-existent"
+			adapter.ctx = toolkit.GetMockedContext(ctx, []toolkit.MockData{
+				{
+					ContextKey: loader.ReleasePlanContextKey,
+					Resource:   newReleasePlan,
+				},
+			})
+
+			result := adapter.validateApplication()
+			Expect(result.Valid).To(BeFalse())
+			Expect(result.Err).To(HaveOccurred())
+			Expect(result.Err.Error()).To(Equal("different Application referenced in ReleasePlan and Snapshot"))
+		})
+
+		It("returns invalid if the ReleasePlan is not found", func() {
+			adapter.ctx = toolkit.GetMockedContext(ctx, []toolkit.MockData{
+				{
+					ContextKey: loader.ReleasePlanContextKey,
+					Err:        errors.NewNotFound(schema.GroupResource{}, ""),
+				},
+			})
+
+			result := adapter.validateApplication()
+			Expect(result.Valid).To(BeFalse())
+			Expect(result.Err).NotTo(HaveOccurred())
+		})
+
+		It("returns invalid if the Snapshot is not found", func() {
+			adapter.ctx = toolkit.GetMockedContext(ctx, []toolkit.MockData{
+				{
+					ContextKey: loader.SnapshotContextKey,
+					Err:        errors.NewNotFound(schema.GroupResource{}, ""),
+				},
+			})
+
+			result := adapter.validateApplication()
+			Expect(result.Valid).To(BeFalse())
+			Expect(result.Err).NotTo(HaveOccurred())
+		})
+	})
+
 	When("calling validateAuthor", func() {
 		var adapter *adapter
 		var conditionMsg string