uses DrySource revision for app diff/manifests with sourceHydrator

Signed-off-by: Aditya Raj <[email protected]>

Author: adityaraj178

server/application/application.go

@@ -521,11 +521,20 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan
 			}
 			sources = appSpec.GetSources()
 		} else {
-			source := a.Spec.GetSource()
-			if q.GetRevision() != "" {
-				source.TargetRevision = q.GetRevision()
+			// For sourceHydrator applications, use the dry source to generate manifests
+			if a.Spec.SourceHydrator != nil {
+				source := a.Spec.SourceHydrator.GetDrySource()
+				if q.GetRevision() != "" {
+					source.TargetRevision = q.GetRevision()
+				}
+				sources = append(sources, source)
+			} else {
+				source := a.Spec.GetSource()
+				if q.GetRevision() != "" {
+					source.TargetRevision = q.GetRevision()
+				}
+				sources = append(sources, source)
 			}
-			sources = append(sources, source)
 		}
 
 		// Store the map of all sources having ref field into a map for applications with sources field

server/application/application_test.go

@@ -2174,6 +2174,39 @@ func TestGetManifests_WithNoCache(t *testing.T) {
 	mockRepoServiceClient.AssertExpectations(t)
 }
 
+func TestGetManifests_SourceHydrator(t *testing.T) {
+	testApp := newTestApp()
+	testApp.Spec.SourceHydrator = &v1alpha1.SourceHydrator{
+		DrySource: v1alpha1.DrySource{
+			RepoURL:        "https://github.com/org/dry-repo",
+			Path:           "manifests/dry",
+			TargetRevision: "main",
+		},
+		SyncSource: v1alpha1.SyncSource{
+			Path: "manifests/sync",
+		},
+	}
+
+	appServer := newTestAppServer(t, testApp)
+
+	mockRepoServiceClient := mocks.RepoServerServiceClient{}
+
+	mockRepoServiceClient.On("GenerateManifest", mock.Anything, mock.MatchedBy(func(mr *apiclient.ManifestRequest) bool {
+		return mr.Repo.Repo == "https://github.com/org/dry-repo" &&
+			mr.ApplicationSource.Path == "manifests/dry" &&
+			mr.Revision == "some-revision"
+	})).Return(&apiclient.ManifestResponse{}, nil)
+
+	appServer.repoClientset = &mocks.Clientset{RepoServerServiceClient: &mockRepoServiceClient}
+
+	_, err := appServer.GetManifests(t.Context(), &application.ApplicationManifestQuery{
+		Name:     &testApp.Name,
+		Revision: ptr.To("some-revision"),
+	})
+	require.NoError(t, err)
+	mockRepoServiceClient.AssertExpectations(t)
+}
+
 func TestRollbackApp(t *testing.T) {
 	testApp := newTestApp()
 	testApp.Status.History = []v1alpha1.RevisionHistory{{