Skip to content

Commit b033a4a

Browse files
antoinegellozantoinegelloz
committed
fix: linters
Signed-off-by: Antoine Gelloz <[email protected]>
1 parent 0e46d4b commit b033a4a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+628
-142
lines changed

‎cmd/build.go‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Otherwise, dib will create a new tag based on the previous tag.`
4545
longHelp += "\n"
4646
longHelp += "WARNING: `dib build` is not supported on Windows yet."
4747
}
48+
4849
cmd := &cobra.Command{
4950
Use: "build",
5051
Short: "Run oci images builds",
@@ -103,6 +104,7 @@ func buildAction(cmd *cobra.Command, _ []string) error {
103104
// Ping the buildkit host to ensure its availability.
104105
// Based on the ping result, we may override the host (e.g., fallback to default buildkit host).
105106
var err error
107+
106108
opts.BuildkitHost, err = getBuildkitHost(cmd)
107109
if err != nil {
108110
return err
@@ -131,10 +133,13 @@ func buildAction(cmd *cobra.Command, _ []string) error {
131133
}
132134
}
133135

134-
if err := doBuild(opts, buildArgs); err != nil {
136+
err := doBuild(opts, buildArgs)
137+
if err != nil {
135138
return fmt.Errorf("build failed: %w", err)
136139
}
140+
137141
logger.Infof("Build process completed")
142+
138143
return nil
139144
}
140145

@@ -146,6 +151,7 @@ func doBuild(opts dib.BuildOpts, buildArgs map[string]string) error {
146151
case types.BackendKaniko:
147152
logger.Warnf("The kaniko backend is deprecated and will be removed in a future release. " +
148153
"Please use the buildkit backend instead.")
154+
149155
if opts.LocalOnly {
150156
logger.Warnf("Using Backend \"kaniko\" with the --local-only flag is partially supported.")
151157
}
@@ -157,10 +163,12 @@ func doBuild(opts dib.BuildOpts, buildArgs map[string]string) error {
157163
logger.Infof("Building images in directory \"%s\"", buildPath)
158164

159165
logger.Debugf("Generate DAG")
166+
160167
graph, err := dib.GenerateDAG(buildPath, opts.RegistryURL, opts.HashListFilePath, buildArgs)
161168
if err != nil {
162169
return fmt.Errorf("cannot generate DAG: %w", err)
163170
}
171+
164172
logger.Debugf("Generate DAG -- Done")
165173

166174
dibBuilder := dib.Builder{
@@ -175,7 +183,8 @@ func doBuild(opts dib.BuildOpts, buildArgs map[string]string) error {
175183
return fmt.Errorf("cannot connect to registry: %w", err)
176184
}
177185

178-
if err := dibBuilder.Plan(gcrRegistry); err != nil {
186+
err = dibBuilder.Plan(gcrRegistry)
187+
if err != nil {
179188
return fmt.Errorf("cannot plan build: %w", err)
180189
}
181190

@@ -194,7 +203,9 @@ func doBuild(opts dib.BuildOpts, buildArgs map[string]string) error {
194203
if err != nil {
195204
return err
196205
}
206+
197207
shell.Env = os.Environ()
208+
198209
builder, err = buildkit.NewBKBuilder(opts.Buildkit, shell, buildctlBinary, opts.LocalOnly)
199210
if err != nil {
200211
return err
@@ -206,11 +217,14 @@ func doBuild(opts dib.BuildOpts, buildArgs map[string]string) error {
206217
res := dibBuilder.RebuildGraph(builder, ratelimit.NewChannelRateLimiter(opts.RateLimit), buildArgs)
207218

208219
res.Print()
209-
if err := report.Generate(res, dibBuilder.Graph); err != nil {
220+
221+
err = report.Generate(res, dibBuilder.Graph)
222+
if err != nil {
210223
return fmt.Errorf("cannot generate report: %w", err)
211224
}
212225

213-
if err := res.CheckError(); err != nil {
226+
err = res.CheckError()
227+
if err != nil {
214228
return err
215229
}
216230

@@ -226,25 +240,30 @@ func doBuild(opts dib.BuildOpts, buildArgs map[string]string) error {
226240
if err != nil {
227241
return err
228242
}
243+
229244
workerType, err := buildkit.GetBuildkitWorkerType(buildctlBinary, opts.BuildkitHost, shell)
230245
if err != nil {
231246
return fmt.Errorf("failed to detect buildkit worker type: %w", err)
232247
}
248+
233249
switch workerType {
234250
case buildkit.OciExecutorType:
235251
logger.Warnf("Cannot retag the image with %s worker, please do it manually", buildkit.OciExecutorType)
236252
case buildkit.ContainerdExecutorType:
237253
//nolint:lll
238254
logger.Warnf("Retag with %s worker is not yet implemented, please make a manual retag", buildkit.ContainerdExecutorType)
239255
}
256+
240257
return nil
241258
}
259+
242260
tagger = dockerBuilderTagger
243261
} else {
244262
tagger = gcrRegistry
245263
}
246264

247-
if err := dib.Retag(graph, tagger, opts.PlaceholderTag, opts.Release); err != nil {
265+
err = dib.Retag(graph, tagger, opts.PlaceholderTag, opts.Release)
266+
if err != nil {
248267
return fmt.Errorf("cannot retag images: %w", err)
249268
}
250269

@@ -266,12 +285,15 @@ func getBuildkitHost(cmd *cobra.Command) (string, error) {
266285
return "", err
267286
}
268287
}
269-
if err = buildkit.PingBKDaemon(buildkitHost); err != nil {
288+
289+
err = buildkit.PingBKDaemon(buildkitHost)
290+
if err != nil {
270291
return "", err
271292
}
272293

273294
return buildkitHost, nil
274295
}
296+
275297
return buildkit.GetBuildkitHostAdress()
276298
}
277299

@@ -295,6 +317,7 @@ func checkRequirements(opts dib.BuildOpts) {
295317
}
296318
}
297319
}
320+
298321
preflight.RunPreflightChecks(requiredBinaries)
299322
}
300323

@@ -306,16 +329,20 @@ func getTestRunners(opts dib.BuildOpts, workingDir string) []types.TestRunner {
306329
if err != nil {
307330
logger.Fatalf("cannot create goss test runner: %v", err)
308331
}
332+
309333
testRunners = append(testRunners, gossRunner)
310334
}
335+
311336
if isTestRunnerEnabled(types.TestRunnerTrivy, enabledTestsRunner) {
312337
trivyRunner, err := trivy.CreateTestRunner(opts.Trivy, opts.LocalOnly, workingDir)
313338
if err != nil {
314339
logger.Fatalf("cannot create trivy test runner: %v", err)
315340
}
341+
316342
testRunners = append(testRunners, trivyRunner)
317343
}
318344
}
345+
319346
return testRunners
320347
}
321348

@@ -325,5 +352,6 @@ func isTestRunnerEnabled(runner string, list []string) bool {
325352
return true
326353
}
327354
}
355+
328356
return false
329357
}

‎cmd/build_internal_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
func TestBuildCommand(t *testing.T) {
1111
t.Parallel()
12+
1213
cmd := buildCommand()
1314

1415
assert.NotNil(t, cmd)

‎cmd/docgen.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ func docgenCommand() *cobra.Command {
3333
}
3434

3535
func docgenAction(_ *cobra.Command, _ []string) error {
36-
if err := os.MkdirAll(cmdDocPath, 0o750); err != nil {
36+
err := os.MkdirAll(cmdDocPath, 0o750)
37+
if err != nil {
3738
return err
3839
}
3940

‎cmd/list.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ func listAction(cmd *cobra.Command, _ []string) error {
5555
}
5656

5757
buildArgs := map[string]string{}
58+
5859
for _, arg := range opts.BuildArg {
5960
key, val, hasVal := strings.Cut(arg, "=")
6061
if hasVal {
@@ -70,6 +71,7 @@ func listAction(cmd *cobra.Command, _ []string) error {
7071
}
7172

7273
buildPath := path.Join(workingDir, opts.BuildPath)
74+
7375
graph, err := dib.GenerateDAG(buildPath, opts.RegistryURL, opts.HashListFilePath, buildArgs)
7476
if err != nil {
7577
return fmt.Errorf("cannot generate DAG: %w", err)

‎cmd/root.go‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ Dockerfiles are always valid (images can still be built even without using dib).
6565
rootCmd.PersistentFlags().String("hash-list-file-path", "",
6666
"Path to custom hash list file that will be used to humanize hash")
6767

68-
if err := viper.BindPFlags(rootCmd.PersistentFlags()); err != nil {
68+
err := viper.BindPFlags(rootCmd.PersistentFlags())
69+
if err != nil {
6970
cobra.CheckErr(err)
7071
}
7172

@@ -77,6 +78,7 @@ Dockerfiles are always valid (images can still be built even without using dib).
7778

7879
func initConfig() {
7980
var err error
81+
8082
workingDir, err = os.Getwd()
8183
cobra.CheckErr(err)
8284

@@ -115,7 +117,8 @@ func initConfig() {
115117
viper.AutomaticEnv()
116118

117119
// If a config file is found, read it in.
118-
if err := viper.ReadInConfig(); err != nil {
120+
err = viper.ReadInConfig()
121+
if err != nil {
119122
// Non-blocking, because some command does not require config file, ie: docgen.
120123
logger.Warnf("%s", err)
121124
} else {
@@ -135,22 +138,27 @@ func preInitLogLevelFromFlags() {
135138
if rootCmd == nil {
136139
return
137140
}
141+
138142
flag := rootCmd.PersistentFlags().Lookup("log-level")
139143
if flag != nil && flag.Changed {
140-
if val, err := rootCmd.PersistentFlags().GetString("log-level"); err == nil {
144+
val, err := rootCmd.PersistentFlags().GetString("log-level")
145+
if err == nil {
141146
logger.SetLevel(&val)
142147
return
143148
}
144149
}
150+
145151
if val, ok := os.LookupEnv("DIB_LOG_LEVEL"); ok && val != "" {
146152
logger.SetLevel(&val)
147153
}
148154
}
149155

150156
func setConfigFile(name string) {
151-
if _, err := os.Stat(name); err != nil {
157+
_, err := os.Stat(name)
158+
if err != nil {
152159
cobra.CheckErr(fmt.Errorf("config file %q not found", name))
153160
}
161+
154162
viper.SetConfigFile(name)
155163
}
156164

‎cmd/version.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func versionCommand() *cobra.Command {
2828

2929
func versionAction(*cobra.Command, []string) {
3030
goVersion := "unknown"
31+
3132
buildInfo, available := debug.ReadBuildInfo()
3233
if available {
3334
goVersion = buildInfo.GoVersion
@@ -42,6 +43,7 @@ func versionAction(*cobra.Command, []string) {
4243
goVersion,
4344
commit,
4445
)
46+
4547
if available && buildInfo.Main.Sum != "" {
4648
fmt.Printf("module version: %s, checksum: %q\n", buildInfo.Main.Version, buildInfo.Main.Sum)
4749
}

‎internal/logger/logger.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ func (l LogLevel) String() string {
123123
case LogLevelFatal:
124124
return "FATAL"
125125
}
126+
126127
return "Unknown"
127128
}
128129

@@ -151,6 +152,7 @@ func Get() Logger {
151152
if !ok {
152153
panic("invalid logger")
153154
}
155+
154156
return l
155157
}
156158

@@ -159,6 +161,7 @@ func Debugf(msg string, args ...any) {
159161
if !ok {
160162
panic("invalid logger")
161163
}
164+
162165
l.log(LogLevelDebug, fmt.Sprintf(msg, args...))
163166
}
164167

@@ -167,6 +170,7 @@ func Infof(msg string, args ...any) {
167170
if !ok {
168171
panic("invalid logger")
169172
}
173+
170174
l.log(LogLevelInfo, fmt.Sprintf(msg, args...))
171175
}
172176

@@ -175,6 +179,7 @@ func Warnf(msg string, args ...any) {
175179
if !ok {
176180
panic("invalid logger")
177181
}
182+
178183
l.log(LogLevelWarn, fmt.Sprintf(msg, args...))
179184
}
180185

@@ -183,6 +188,7 @@ func Errorf(msg string, args ...any) {
183188
if !ok {
184189
panic("invalid logger")
185190
}
191+
186192
l.log(LogLevelError, fmt.Sprintf(msg, args...))
187193
}
188194

@@ -191,7 +197,9 @@ func Fatalf(msg string, args ...any) {
191197
if !ok {
192198
panic("invalid logger")
193199
}
200+
194201
l.log(LogLevelFatal, fmt.Sprintf(msg, args...))
202+
195203
if l.CanPrint(LogLevelFatal) {
196204
os.Exit(1)
197205
}

0 commit comments

Comments
 (0)