Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion apps/workspace-engine/pkg/workspace/jobdispatch/argocd.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,14 @@ func (d *ArgoCDDispatcher) DispatchJob(ctx context.Context, job *oapi.Job) error
return fmt.Errorf("failed to get templatable job with release: %w", err)
}

// Convert to map for lowercase template keys (consistent with CEL and verification providers)
templateData, err := structToMap(templatableJobWithRelease)
if err != nil {
span.RecordError(err)
span.SetStatus(codes.Error, "failed to convert job to template data")
return fmt.Errorf("failed to convert job to template data: %w", err)
}

span.SetAttributes(attribute.String("cfg", fmt.Sprintf("%+v", cfg)))
span.SetAttributes(attribute.String("argocd.server_url", cfg.ServerUrl))
t, err := template.New("argoCDAgentConfig").Funcs(sprig.TxtFuncMap()).Option("missingkey=zero").Parse(cfg.Template)
Expand All @@ -110,7 +118,7 @@ func (d *ArgoCDDispatcher) DispatchJob(ctx context.Context, job *oapi.Job) error
}

var buf bytes.Buffer
if err := t.Execute(&buf, templatableJobWithRelease); err != nil {
if err := t.Execute(&buf, templateData); err != nil {
span.RecordError(err)
span.SetStatus(codes.Error, "failed to execute template")
return fmt.Errorf("failed to execute template: %w", err)
Expand Down Expand Up @@ -343,3 +351,18 @@ func (d *ArgoCDDispatcher) startArgoApplicationVerification(
span.SetStatus(codes.Ok, "verification started")
return nil
}

// structToMap converts a struct to a map using JSON marshaling.
// This ensures template keys use lowercase names (from json tags),
// consistent with CEL selectors and verification providers.
func structToMap(v any) (map[string]any, error) {
data, err := json.Marshal(v)
if err != nil {
return nil, err
}
var result map[string]any
if err := json.Unmarshal(data, &result); err != nil {
return nil, err
}
return result, nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,14 @@ func (d *TerraformCloudDispatcher) generateWorkspace(job *oapi.TemplatableJob, t
return nil, fmt.Errorf("failed to parse template: %w", err)
}

// Convert to map for lowercase template keys (consistent with CEL and verification providers)
templateData, err := structToMap(job)
if err != nil {
return nil, fmt.Errorf("failed to convert job to template data: %w", err)
}

var buf bytes.Buffer
if err := t.Execute(&buf, job); err != nil {
if err := t.Execute(&buf, templateData); err != nil {
return nil, fmt.Errorf("failed to execute template: %w", err)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (e *Evaluator) Evaluate(ctx context.Context, scope evaluator.EvaluatorScope

// evaluateCEL evaluates a CEL-based selector
func (e *Evaluator) evaluateCEL(
ctx context.Context,
_ context.Context,
scope evaluator.EvaluatorScope,
deployment *oapi.Deployment,
resource *oapi.Resource,
Expand Down
Loading