1
0
mirror of https://github.com/containers/buildah.git synced 2025-07-31 15:24:26 +03:00

CI: enable the whitespace linter

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai
2024-08-15 13:19:47 -04:00
parent 0ad0ffaad9
commit ca3b80eb0f
9 changed files with 1 additions and 9 deletions

View File

@ -13,3 +13,4 @@ linters:
- revive - revive
- unconvert - unconvert
- unparam - unparam
- whitespace

1
add.go
View File

@ -689,7 +689,6 @@ func (b *Builder) userForRun(mountPoint string, userspec string) (specs.User, st
} else { } else {
u.AdditionalGids = groups u.AdditionalGids = groups
} }
} }
return u, homeDir, err return u, homeDir, err
} }

View File

@ -386,7 +386,6 @@ func updateHealthcheck(builder *buildah.Builder, c *cobra.Command, iopts configR
healthcheck.Retries = iopts.healthcheckRetries healthcheck.Retries = iopts.healthcheckRetries
args = args + "--retries=" + strconv.Itoa(iopts.healthcheckRetries) + " " args = args + "--retries=" + strconv.Itoa(iopts.healthcheckRetries) + " "
// args = fmt.Sprintf("%s --retries=%d ", args, iopts.healthcheckRetries) // args = fmt.Sprintf("%s --retries=%d ", args, iopts.healthcheckRetries)
} }
if c.Flag("healthcheck-start-period").Changed { if c.Flag("healthcheck-start-period").Changed {
duration, err := time.ParseDuration(iopts.healthcheckStartPeriod) duration, err := time.ParseDuration(iopts.healthcheckStartPeriod)

View File

@ -70,7 +70,6 @@ func init() {
if err != nil { if err != nil {
logrus.Error(err.Error()) logrus.Error(err.Error())
os.Exit(1) os.Exit(1)
} }
if len(storageOptions.GraphDriverOptions) > 0 { if len(storageOptions.GraphDriverOptions) > 0 {

View File

@ -505,7 +505,6 @@ func (b *Builder) Commit(ctx context.Context, dest types.ImageReference, options
return imgID, nil, "", err return imgID, nil, "", err
} }
logrus.Debugf("added imgID %s to manifestID %s", imgID, manifestID) logrus.Debugf("added imgID %s to manifestID %s", imgID, manifestID)
} }
return imgID, ref, manifestDigest, nil return imgID, ref, manifestDigest, nil
} }

1
new.go
View File

@ -243,7 +243,6 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
suffixDigitsModulo := 100 suffixDigitsModulo := 100
for { for {
var flags map[string]interface{} var flags map[string]interface{}
// check if we have predefined ProcessLabel and MountLabel // check if we have predefined ProcessLabel and MountLabel
// this could be true if this is another stage in a build // this could be true if this is another stage in a build

View File

@ -60,7 +60,6 @@ func GenBuildOptions(c *cobra.Command, inputArgs []string, iopts BuildOptions) (
if c.Flag("dns-search").Changed { if c.Flag("dns-search").Changed {
return options, nil, nil, errors.New("the --dns-search option cannot be used with --network=none") return options, nil, nil, errors.New("the --dns-search option cannot be used with --network=none")
} }
} }
if c.Flag("tag").Changed { if c.Flag("tag").Changed {
tags = iopts.Tag tags = iopts.Tag

View File

@ -23,7 +23,6 @@ func testFlagCompletion(t *testing.T, flags pflag.FlagSet, flagCompletions compl
t.Errorf(`Flag %q is a bool flag but has a shell completion function set. t.Errorf(`Flag %q is a bool flag but has a shell completion function set.
You have to remove this shell completion function.`, f.Name) You have to remove this shell completion function.`, f.Name)
return return
} }
}) })

View File

@ -250,7 +250,6 @@ func parseSecurityOpts(securityOpts []string, commonOpts *define.CommonBuildOpti
default: default:
return fmt.Errorf("invalid --security-opt 2: %q", opt) return fmt.Errorf("invalid --security-opt 2: %q", opt)
} }
} }
if commonOpts.SeccompProfilePath == "" { if commonOpts.SeccompProfilePath == "" {
@ -1293,7 +1292,6 @@ func Secrets(secrets []string) (map[string]define.Secret, error) {
SourceType: typ, SourceType: typ,
} }
parsed[id] = newSecret parsed[id] = newSecret
} }
return parsed, nil return parsed, nil
} }