Skip to content

Commit 34e2b2a

Browse files
committed
fixed errors and error logging message
1 parent 47f3163 commit 34e2b2a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

backend/services/spec.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func getVariablesSpecFromEnvMap(envVars map[string]string, stage string) []spec.
8888

8989
func findDuplicatesInStage(variablesSpec []spec.VariableSpec, stage string) (error) {
9090
// Extract the names from VariableSpec
91-
justNames := lo.Map(variablesSpec, func(item VariableSpec, i int) string {
91+
justNames := lo.Map(variablesSpec, func(item spec.VariableSpec, i int) string {
9292
return item.Name
9393
})
9494

@@ -101,7 +101,7 @@ func findDuplicatesInStage(variablesSpec []spec.VariableSpec, stage string) (err
101101
}))
102102

103103
if len(duplicates) > 0 {
104-
return fmt.Errorf("In %v stage, found duplicate variables: %v", stage, duplicates)
104+
return fmt.Errorf("duplicate variable names found in '%s' stage: %v", stage, strings.Join(duplicates, ", "))
105105
}
106106

107107
return nil // No duplicates found
@@ -119,13 +119,13 @@ func GetSpecFromJob(job models.DiggerJob) (*spec.Spec, error) {
119119
commandVariables := getVariablesSpecFromEnvMap(jobSpec.CommandEnvVars, "commands")
120120
runVariables := getVariablesSpecFromEnvMap(jobSpec.RunEnvVars, "run")
121121

122-
if err := checkDuplicatesInStage(stateVariables, "state"); err != nil {
122+
if err := findDuplicatesInStage(stateVariables, "state"); err != nil {
123123
return nil, err
124124
}
125-
if err := checkDuplicatesInStage(commandVariables, "commands"); err != nil {
125+
if err := findDuplicatesInStage(commandVariables, "commands"); err != nil {
126126
return nil, err
127127
}
128-
if err := checkDuplicatesInStage(runVariables, "run"); err != nil {
128+
if err := findDuplicatesInStage(runVariables, "run"); err != nil {
129129
return nil, err
130130
}
131131

0 commit comments

Comments
 (0)