fix: default argocd verification hits application specific endpoint for health check (#987)

Signed-off-by: Aditya Choudhari <48932219+adityachoudhari26@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Author: adityachoudhari26

apps/workspace-engine/pkg/jobagents/argo/argoapp_test.go

@@ -278,12 +278,10 @@ func TestBuildArgoLinks(t *testing.T) {
 
 func TestVerifications_ValidConfig(t *testing.T) {
 	a := New(&mockUpserter{}, &mockDeleter{}, &mockSetter{}, &mockManifestGetter{})
-	config := oapi.JobAgentConfig{
-		"serverUrl": "argocd.example.com",
-		"apiKey":    "test-token",
-	}
+	job := testJob()
+	config := job.DispatchContext.JobAgentConfig
 
-	specs, err := a.Verifications(config)
+	specs, err := a.Verifications(config, job.DispatchContext)
 	require.NoError(t, err)
 	require.Len(t, specs, 1)
 	assert.Equal(t, "argocd-application-health", specs[0].Name)
@@ -293,14 +291,20 @@ func TestVerifications_ValidConfig(t *testing.T) {
 
 func TestVerifications_MissingServerUrl(t *testing.T) {
 	a := New(&mockUpserter{}, &mockDeleter{}, &mockSetter{}, &mockManifestGetter{})
-	specs, err := a.Verifications(oapi.JobAgentConfig{"apiKey": "token"})
+	specs, err := a.Verifications(
+		oapi.JobAgentConfig{"apiKey": "token", "template": "yaml"},
+		testJob().DispatchContext,
+	)
 	require.NoError(t, err)
 	assert.Nil(t, specs)
 }
 
 func TestVerifications_MissingApiKey(t *testing.T) {
 	a := New(&mockUpserter{}, &mockDeleter{}, &mockSetter{}, &mockManifestGetter{})
-	specs, err := a.Verifications(oapi.JobAgentConfig{"serverUrl": "addr"})
+	specs, err := a.Verifications(
+		oapi.JobAgentConfig{"serverUrl": "addr", "template": "yaml"},
+		testJob().DispatchContext,
+	)
 	require.NoError(t, err)
 	assert.Nil(t, specs)
 }

apps/workspace-engine/pkg/jobagents/argo/argocd_verification.go

@@ -8,11 +8,12 @@ import (
 )
 
 // Verifications returns the ArgoCD application health check spec built from
-// the agent config. The provider URL uses the serverUrl from config; the
-// specific application path is resolved at measurement time via the
-// provider context.
+// the agent config and dispatch context. The dispatch context is used to
+// render the application template and determine the specific application
+// name to query.
 func (a *ArgoApplication) Verifications(
 	config oapi.JobAgentConfig,
+	dispatchCtx *oapi.DispatchContext,
 ) ([]oapi.VerificationMetricSpec, error) {
 	serverAddr, ok := config["serverUrl"].(string)
 	if !ok || serverAddr == "" {
@@ -22,12 +23,25 @@ func (a *ArgoApplication) Verifications(
 	if !ok || apiKey == "" {
 		return nil, nil
 	}
+	template, ok := config["template"].(string)
+	if !ok || template == "" {
+		return nil, nil
+	}
+	if dispatchCtx == nil {
+		return nil, fmt.Errorf("missing dispatch context for application template rendering")
+	}
+
+	app, err := TemplateApplication(dispatchCtx, template)
+	if err != nil {
+		return nil, fmt.Errorf("render application template: %w", err)
+	}
+	MakeApplicationK8sCompatible(app)
 
 	baseURL := serverAddr
 	if !strings.HasPrefix(baseURL, "https://") {
 		baseURL = "https://" + baseURL
 	}
-	appURL := fmt.Sprintf("%s/api/v1/applications", baseURL)
+	appURL := fmt.Sprintf("%s/api/v1/applications/%s", baseURL, app.Name)
 
 	method := oapi.GET
 	timeout := "5s"

apps/workspace-engine/pkg/jobagents/registry.go

@@ -85,6 +85,7 @@ func (r *Registry) Dispatch(ctx context.Context, job *oapi.Job) error {
 func (r *Registry) AgentVerifications(
 	agentType string,
 	config oapi.JobAgentConfig,
+	dispatchCtx *oapi.DispatchContext,
 ) ([]oapi.VerificationMetricSpec, error) {
 	dispatcher, ok := r.dispatchers[agentType]
 	if !ok {
@@ -96,7 +97,7 @@ func (r *Registry) AgentVerifications(
 		return nil, nil
 	}
 
-	return v.Verifications(config)
+	return v.Verifications(config, dispatchCtx)
 }
 
 func (r *Registry) Plan(

apps/workspace-engine/pkg/jobagents/types/types.go

@@ -19,7 +19,10 @@ type Dispatchable interface {
 // the job.
 type Verifiable interface {
 	Type() string
-	Verifications(config oapi.JobAgentConfig) ([]oapi.VerificationMetricSpec, error)
+	Verifications(
+		config oapi.JobAgentConfig,
+		dispatchCtx *oapi.DispatchContext,
+	) ([]oapi.VerificationMetricSpec, error)
 }
 
 // Plannable is optionally implemented by a Dispatchable to compute the

apps/workspace-engine/svc/controllers/jobdispatch/dispatcher.go

@@ -19,6 +19,7 @@ type AgentVerifier interface {
 	AgentVerifications(
 		agentType string,
 		config oapi.JobAgentConfig,
+		dispatchCtx *oapi.DispatchContext,
 	) ([]oapi.VerificationMetricSpec, error)
 }
 

apps/workspace-engine/svc/controllers/jobdispatch/reconcile.go

@@ -69,7 +69,11 @@ func Reconcile(
 
 	var agentSpecs []oapi.VerificationMetricSpec
 	if verifier != nil {
-		agentSpecs, err = verifier.AgentVerifications(agent.Type, job.JobAgentConfig)
+		agentSpecs, err = verifier.AgentVerifications(
+			agent.Type,
+			job.JobAgentConfig,
+			job.DispatchContext,
+		)
 		if err != nil {
 			return nil, err
 		}

apps/workspace-engine/svc/controllers/jobdispatch/reconcile_test.go

@@ -113,6 +113,7 @@ type mockVerifier struct {
 func (m *mockVerifier) AgentVerifications(
 	agentType string,
 	_ oapi.JobAgentConfig,
+	_ *oapi.DispatchContext,
 ) ([]oapi.VerificationMetricSpec, error) {
 	return m.specs[agentType], nil
 }