Skip to content

Commit 37608f0

Browse files
Eugene Dementyevekini
authored andcommitted
Fix lint errors and add lint checks to CI
1 parent e299c61 commit 37608f0

File tree

3 files changed

+34
-38
lines changed

3 files changed

+34
-38
lines changed

.github/workflows/build_test.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,27 @@ jobs:
99
name: test if ssm-parent can be built
1010
runs-on: ubuntu-latest
1111
steps:
12-
-
13-
name: checkout
14-
uses: actions/checkout@v2
15-
-
16-
name: set up Go
17-
uses: actions/setup-go@v1
12+
- name: checkout
13+
uses: actions/checkout@v3
14+
- name: set up Go
15+
uses: actions/setup-go@v3
1816
with:
1917
go-version: 1.17.x
20-
-
21-
name: cache modules
18+
- name: cache modules
2219
uses: actions/cache@v2
2320
with:
2421
path: ~/go/pkg/mod
2522
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
2623
restore-keys: |
2724
${{ runner.os }}-go-
28-
-
29-
name: download dependencies
25+
26+
- name: download dependencies
3027
run: go mod download
31-
-
32-
name: build the app
28+
29+
- name: golangci-lint
30+
uses: golangci/golangci-lint-action@v3
31+
32+
- name: build the app
3333
run: go build
34-
-
35-
name: test the app
34+
- name: test the app
3635
run: go test -v ./...
37-

cmd/root.go

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,21 @@ func init() {
123123
rootCmd.PersistentFlags().BoolP("recursive", "r", false, "Walk through the provided SSM paths recursively.")
124124
rootCmd.PersistentFlags().BoolP("strict", "s", false, "Strict mode. Fail if found less parameters than number of names.")
125125

126-
viper.BindPFlag("debug", rootCmd.PersistentFlags().Lookup("debug"))
127-
viper.BindPFlag("expand", rootCmd.PersistentFlags().Lookup("expand"))
128-
viper.BindPFlag("expand-names", rootCmd.PersistentFlags().Lookup("expand-names"))
129-
viper.BindPFlag("expand-paths", rootCmd.PersistentFlags().Lookup("expand-paths"))
130-
viper.BindPFlag("expand-values", rootCmd.PersistentFlags().Lookup("expand-values"))
131-
viper.BindPFlag("paths", rootCmd.PersistentFlags().Lookup("path"))
132-
viper.BindPFlag("names", rootCmd.PersistentFlags().Lookup("name"))
133-
viper.BindPFlag("plain-paths", rootCmd.PersistentFlags().Lookup("plain-path"))
134-
viper.BindPFlag("plain-names", rootCmd.PersistentFlags().Lookup("plain-name"))
135-
viper.BindPFlag("recursive", rootCmd.PersistentFlags().Lookup("recursive"))
136-
viper.BindPFlag("strict", rootCmd.PersistentFlags().Lookup("strict"))
126+
for _, err := range []error{
127+
viper.BindPFlag("debug", rootCmd.PersistentFlags().Lookup("debug")),
128+
viper.BindPFlag("expand", rootCmd.PersistentFlags().Lookup("expand")),
129+
viper.BindPFlag("expand-names", rootCmd.PersistentFlags().Lookup("expand-names")),
130+
viper.BindPFlag("expand-paths", rootCmd.PersistentFlags().Lookup("expand-paths")),
131+
viper.BindPFlag("expand-values", rootCmd.PersistentFlags().Lookup("expand-values")),
132+
viper.BindPFlag("paths", rootCmd.PersistentFlags().Lookup("path")),
133+
viper.BindPFlag("names", rootCmd.PersistentFlags().Lookup("name")),
134+
viper.BindPFlag("plain-paths", rootCmd.PersistentFlags().Lookup("plain-path")),
135+
viper.BindPFlag("plain-names", rootCmd.PersistentFlags().Lookup("plain-name")),
136+
viper.BindPFlag("recursive", rootCmd.PersistentFlags().Lookup("recursive")),
137+
viper.BindPFlag("strict", rootCmd.PersistentFlags().Lookup("strict")),
138+
} {
139+
if err != nil {
140+
log.WithError(err).Fatalf("can't bind flags")
141+
}
142+
}
137143
}

ssm/parameters.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,7 @@ func getAllParameters(names, paths, plainNames, plainPaths []string, strict, rec
187187
log.Fields{"paths": paths},
188188
).Fatal("Can't get parameters by paths")
189189
}
190-
for _, parameter := range parametersFromPaths {
191-
parameters = append(parameters, parameter)
192-
}
190+
parameters = append(parameters, parametersFromPaths...)
193191
}
194192
if len(names) > 0 {
195193
parametersFromNames, err := getJsonSSMParameters(names, strict)
@@ -198,9 +196,7 @@ func getAllParameters(names, paths, plainNames, plainPaths []string, strict, rec
198196
log.Fields{"names": names},
199197
).Fatal("Can't get parameters by names")
200198
}
201-
for _, parameter := range parametersFromNames {
202-
parameters = append(parameters, parameter)
203-
}
199+
parameters = append(parameters, parametersFromNames...)
204200
}
205201
if len(plainPaths) > 0 {
206202
parametersFromPlainPaths, err := getPlainSSMParametersByPaths(plainPaths, strict, recursive)
@@ -209,9 +205,7 @@ func getAllParameters(names, paths, plainNames, plainPaths []string, strict, rec
209205
log.Fields{"plain_paths": plainPaths},
210206
).Fatal("Can't get plain parameters by paths")
211207
}
212-
for _, parameter := range parametersFromPlainPaths {
213-
parameters = append(parameters, parameter)
214-
}
208+
parameters = append(parameters, parametersFromPlainPaths...)
215209
}
216210

217211
if len(plainNames) > 0 {
@@ -221,9 +215,7 @@ func getAllParameters(names, paths, plainNames, plainPaths []string, strict, rec
221215
log.Fields{"plain_names": plainNames},
222216
).Fatal("Can't get plain parameters by names")
223217
}
224-
for _, parameter := range parametersFromPlainNames {
225-
parameters = append(parameters, parameter)
226-
}
218+
parameters = append(parameters, parametersFromPlainNames...)
227219
}
228220

229221
return

0 commit comments

Comments
 (0)