@@ -88,7 +88,7 @@ func getVariablesSpecFromEnvMap(envVars map[string]string, stage string) []spec.
88
88
89
89
func findDuplicatesInStage (variablesSpec []spec.VariableSpec , stage string ) (error ) {
90
90
// 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 {
92
92
return item .Name
93
93
})
94
94
@@ -101,7 +101,7 @@ func findDuplicatesInStage(variablesSpec []spec.VariableSpec, stage string) (err
101
101
}))
102
102
103
103
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 , ", " ) )
105
105
}
106
106
107
107
return nil // No duplicates found
@@ -119,13 +119,13 @@ func GetSpecFromJob(job models.DiggerJob) (*spec.Spec, error) {
119
119
commandVariables := getVariablesSpecFromEnvMap (jobSpec .CommandEnvVars , "commands" )
120
120
runVariables := getVariablesSpecFromEnvMap (jobSpec .RunEnvVars , "run" )
121
121
122
- if err := checkDuplicatesInStage (stateVariables , "state" ); err != nil {
122
+ if err := findDuplicatesInStage (stateVariables , "state" ); err != nil {
123
123
return nil , err
124
124
}
125
- if err := checkDuplicatesInStage (commandVariables , "commands" ); err != nil {
125
+ if err := findDuplicatesInStage (commandVariables , "commands" ); err != nil {
126
126
return nil , err
127
127
}
128
- if err := checkDuplicatesInStage (runVariables , "run" ); err != nil {
128
+ if err := findDuplicatesInStage (runVariables , "run" ); err != nil {
129
129
return nil , err
130
130
}
131
131
0 commit comments