Skip to content
Merged
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
4 changes: 3 additions & 1 deletion cmd/wfctl/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,20 +159,22 @@ func resolveLogCaptureResource(cfg *config.WorkflowConfig, envName, name string)
if m.Name != name {
continue
}
resolvedName := m.Name
resolved := m.Config
if envName != "" {
envResolved, ok := m.ResolveForEnv(envName)
if !ok {
return interfaces.ResourceSpec{}, "", fmt.Errorf("logs capture: resource %q is disabled for environment %q", name, envName)
}
resolvedName = envResolved.Name
resolved = envResolved.Config
}
cfgMap := config.ExpandEnvInMapPreservingKeys(resolved, infraPreserveKeys)
providerRef := resolveIaCProviderRef(cfgMap)
if providerRef == "" {
return interfaces.ResourceSpec{}, "", fmt.Errorf("logs capture: resource %q missing iac_provider/provider", name)
}
return interfaces.ResourceSpec{Name: m.Name, Type: m.Type, Config: cfgMap}, providerRef, nil
return interfaces.ResourceSpec{Name: resolvedName, Type: m.Type, Config: cfgMap}, providerRef, nil
}
return interfaces.ResourceSpec{}, "", fmt.Errorf("logs capture: resource %q not found", name)
}
Expand Down
26 changes: 26 additions & 0 deletions cmd/wfctl/logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,29 @@ func TestResolveLogCaptureResourcePreservesSecretEnvVars(t *testing.T) {
t.Fatalf("env_vars_secret DATABASE_URL = %v, want literal placeholder", got)
}
}

func TestResolveLogCaptureResourceUsesEnvResolvedName(t *testing.T) {
cfg := &config.WorkflowConfig{
Modules: []config.ModuleConfig{{
Name: "web",
Type: "infra.container_service",
Config: map[string]any{
"provider": "do",
},
Environments: map[string]*config.InfraEnvironmentResolution{
"staging": {Config: map[string]any{"name": "web-staging"}},
},
}},
}

spec, _, err := resolveLogCaptureResource(cfg, "staging", "web")
if err != nil {
t.Fatalf("resolveLogCaptureResource: %v", err)
}
if spec.Name != "web-staging" {
t.Fatalf("spec.Name = %q, want env-resolved cloud name", spec.Name)
}
if got := logCaptureResourceCloudName(spec); got != "web-staging" {
t.Fatalf("cloud name = %q, want env-resolved cloud name", got)
}
}
Loading