run gofumpt -extra on all source files

cmd/alias-set.go

@@ -100,7 +100,7 @@ EXAMPLES:
 }
 
 // checkAliasSetSyntax - verifies input arguments to 'alias set'.
-func checkAliasSetSyntax(ctx *cli.Context, accessKey string, secretKey string, deprecated bool) {
+func checkAliasSetSyntax(ctx *cli.Context, accessKey, secretKey string, deprecated bool) {
  args := ctx.Args()
  argsNr := len(args)
 

cmd/auto-complete.go

@@ -58,7 +58,7 @@ func (fs fsComplete) Predict(a complete.Args) []string {
  return complete.PredictFiles("*").Predict(a)
 }
 
-func completeAdminConfigKeys(aliasPath string, keyPrefix string) (prediction []string) {
+func completeAdminConfigKeys(aliasPath, keyPrefix string) (prediction []string) {
  // Convert alias/bucket/incompl to alias/bucket/ to list its contents
  parentDirPath := filepath.Dir(aliasPath) + "/"
  clnt, err := newAdminClient(parentDirPath)

cmd/client-fs.go

@@ -925,7 +925,7 @@ func (f *fsClient) listInRoutine(contentCh chan<- *ClientContent) {
 }
 
 // List files recursively using non-recursive mode.
-func (f *fsClient) listDirOpt(contentCh chan *ClientContent, isIncomplete bool, _ bool, dirOpt DirOpt) {
+func (f *fsClient) listDirOpt(contentCh chan *ClientContent, isIncomplete, _ bool, dirOpt DirOpt) {
  defer close(contentCh)
 
  // Trim trailing / or \.
@@ -1191,7 +1191,7 @@ func (f *fsClient) GetObjectLegalHold(_ context.Context, _ string) (minio.LegalH
 }
 
 // GetAccess - get access policy permissions.
-func (f *fsClient) GetAccess(_ context.Context) (access string, policyJSON string, err *probe.Error) {
+func (f *fsClient) GetAccess(_ context.Context) (access, policyJSON string, err *probe.Error) {
  // For windows this feature is not implemented.
  if runtime.GOOS == "windows" {
  return "", "", probe.NewError(APINotImplemented{API: "GetAccess", APIType: "filesystem"})

cmd/client-s3.go

@@ -336,7 +336,7 @@ func (c *S3Client) AddNotificationConfig(ctx context.Context, arn string, events
 }
 
 // RemoveNotificationConfig - Remove bucket notification
-func (c *S3Client) RemoveNotificationConfig(ctx context.Context, arn string, event string, prefix string, suffix string) *probe.Error {
+func (c *S3Client) RemoveNotificationConfig(ctx context.Context, arn, event, prefix, suffix string) *probe.Error {
  bucket, _ := c.url2BucketAndObject()
  // Remove all notification configs if arn is empty
  if arn == "" {
@@ -1140,7 +1140,7 @@ func (c *S3Client) removeIncompleteObjects(ctx context.Context, bucket string, o
 }
 
 // AddUserAgent - add custom user agent.
-func (c *S3Client) AddUserAgent(app string, version string) {
+func (c *S3Client) AddUserAgent(app, version string) {
  c.api.SetAppInfo(app, version)
 }
 
@@ -1508,7 +1508,7 @@ func (c *S3Client) SetAccess(ctx context.Context, bucketPolicy string, isJSON bo
 }
 
 // listObjectWrapper - select ObjectList mode depending on arguments
-func (c *S3Client) listObjectWrapper(ctx context.Context, bucket, object string, isRecursive bool, timeRef time.Time, withVersions, withDeleteMarkers bool, metadata bool, maxKeys int, zip bool) <-chan minio.ObjectInfo {
+func (c *S3Client) listObjectWrapper(ctx context.Context, bucket, object string, isRecursive bool, timeRef time.Time, withVersions, withDeleteMarkers, metadata bool, maxKeys int, zip bool) <-chan minio.ObjectInfo {
  if !timeRef.IsZero() || withVersions {
  return c.listVersions(ctx, bucket, object, ListOptions{Recursive: isRecursive, TimeRef: timeRef, WithOlderVersions: withVersions, WithDeleteMarkers: withDeleteMarkers})
  }
@@ -2150,7 +2150,7 @@ func (c *S3Client) bucketInfo2ClientContent(bucket minio.BucketInfo) *ClientCont
 }
 
 // Convert objectInfo to ClientContent
-func (c *S3Client) prefixInfo2ClientContent(bucket string, prefix string) *ClientContent {
+func (c *S3Client) prefixInfo2ClientContent(bucket, prefix string) *ClientContent {
  // Join bucket and incoming object key.
  if bucket == "" {
  panic("should never happen, bucket cannot be empty")
@@ -2815,7 +2815,7 @@ func (c *S3Client) GetEncryption(ctx context.Context) (algorithm, keyID string,
 }
 
 // SetEncryption - Set encryption configuration on a bucket
-func (c *S3Client) SetEncryption(ctx context.Context, encType string, kmsKeyID string) *probe.Error {
+func (c *S3Client) SetEncryption(ctx context.Context, encType, kmsKeyID string) *probe.Error {
  bucket, _ := c.url2BucketAndObject()
  if bucket == "" {
  return probe.NewError(BucketNameEmpty{})

cmd/client-url.go

@@ -69,7 +69,7 @@ func getScheme(rawurl string) (scheme, path string) {
 // Assuming s is of the form [s delimiter s].
 // If so, return s, [delimiter]s or return s, s if cutdelimiter == true
 // If no delimiter found return s, "".
-func splitSpecial(s string, delimiter string, cutdelimiter bool) (string, string) {
+func splitSpecial(s, delimiter string, cutdelimiter bool) (string, string) {
  i := strings.Index(s, delimiter)
  if i < 0 {
  // if delimiter not found return as is.

cmd/client.go

@@ -113,7 +113,7 @@ type Client interface {
  GetObjectLockConfig(ctx context.Context) (status string, mode minio.RetentionMode, validity uint64, unit minio.ValidityUnit, perr *probe.Error)
 
  // Access policy operations.
- GetAccess(ctx context.Context) (access string, policyJSON string, error *probe.Error)
+ GetAccess(ctx context.Context) (access, policyJSON string, error *probe.Error)
  GetAccessRules(ctx context.Context) (policyRules map[string]string, error *probe.Error)
  SetAccess(ctx context.Context, access string, isJSON bool) *probe.Error
 

cmd/common-methods.go

@@ -293,7 +293,7 @@ func getSourceStream(ctx context.Context, alias, urlStr string, opts getSourceOp
 }
 
 // putTargetRetention sets retention headers if any
-func putTargetRetention(ctx context.Context, alias string, urlStr string, metadata map[string]string) *probe.Error {
+func putTargetRetention(ctx context.Context, alias, urlStr string, metadata map[string]string) *probe.Error {
  targetClnt, err := newClientFromAlias(alias, urlStr)
  if err != nil {
  return err.Trace(alias, urlStr)

cmd/config.go

@@ -310,7 +310,7 @@ func expandAliasFromEnv(envURL string) (*aliasConfigV10, *probe.Error) {
 }
 
 // expandAlias expands aliased URL if any match is found, returns as is otherwise.
-func expandAlias(aliasedURL string) (alias string, urlStr string, aliasCfg *aliasConfigV10, err *probe.Error) {
+func expandAlias(aliasedURL string) (alias, urlStr string, aliasCfg *aliasConfigV10, err *probe.Error) {
  // Extract alias from the URL.
  alias, path := url2Alias(aliasedURL)
 
@@ -336,7 +336,7 @@ func expandAlias(aliasedURL string) (alias string, urlStr string, aliasCfg *alia
 }
 
 // mustExpandAlias expands aliased URL if any match is found, returns as is otherwise.
-func mustExpandAlias(aliasedURL string) (alias string, urlStr string, aliasCfg *aliasConfigV10) {
+func mustExpandAlias(aliasedURL string) (alias, urlStr string, aliasCfg *aliasConfigV10) {
  alias, urlStr, aliasCfg, _ = expandAlias(aliasedURL)
  return alias, urlStr, aliasCfg
 }

cmd/cp-main.go

@@ -244,7 +244,7 @@ type ProgressReader interface {
 }
 
 // doCopy - Copy a single file from source to destination
-func doCopy(ctx context.Context, cpURLs URLs, pg ProgressReader, encKeyDB map[string][]prefixSSEPair, isMvCmd bool, preserve, isZip bool) URLs {
+func doCopy(ctx context.Context, cpURLs URLs, pg ProgressReader, encKeyDB map[string][]prefixSSEPair, isMvCmd, preserve, isZip bool) URLs {
  if cpURLs.Error != nil {
  cpURLs.Error = cpURLs.Error.Trace()
  return cpURLs

cmd/cp-url-syntax.go

@@ -151,7 +151,7 @@ func checkCopySyntaxTypeA(ctx context.Context, srcURL, versionID string, keys ma
 }
 
 // checkCopySyntaxTypeB verifies if the source is a valid file and target is a valid folder.
-func checkCopySyntaxTypeB(ctx context.Context, srcURL, versionID string, tgtURL string, keys map[string][]prefixSSEPair, isZip bool, timeRef time.Time) {
+func checkCopySyntaxTypeB(ctx context.Context, srcURL, versionID, tgtURL string, keys map[string][]prefixSSEPair, isZip bool, timeRef time.Time) {
  _, srcContent, err := url2Stat(ctx, srcURL, versionID, false, keys, timeRef, isZip)
  fatalIf(err.Trace(srcURL), "Unable to stat source `"+srcURL+"`.")
 

cmd/cp-url.go

@@ -91,7 +91,7 @@ func guessCopyURLType(ctx context.Context, o prepareCopyURLsOpts) (copyURLsType,
 
 // SINGLE SOURCE - Type A: copy(f, f) -> copy(f, f)
 // prepareCopyURLsTypeA - prepares target and source clientURLs for copying.
-func prepareCopyURLsTypeA(ctx context.Context, sourceURL, sourceVersion string, targetURL string, encKeyDB map[string][]prefixSSEPair, isZip bool) URLs {
+func prepareCopyURLsTypeA(ctx context.Context, sourceURL, sourceVersion, targetURL string, encKeyDB map[string][]prefixSSEPair, isZip bool) URLs {
  // Extract alias before fiddling with the clientURL.
  sourceAlias, _, _ := mustExpandAlias(sourceURL)
  // Find alias and expanded clientURL.
@@ -112,7 +112,7 @@ func prepareCopyURLsTypeA(ctx context.Context, sourceURL, sourceVersion string,
 }
 
 // prepareCopyContentTypeA - makes CopyURLs content for copying.
-func makeCopyContentTypeA(sourceAlias string, sourceContent *ClientContent, targetAlias string, targetURL string) URLs {
+func makeCopyContentTypeA(sourceAlias string, sourceContent *ClientContent, targetAlias, targetURL string) URLs {
  targetContent := ClientContent{URL: *newClientURL(targetURL)}
  return URLs{
  SourceAlias: sourceAlias,
@@ -124,7 +124,7 @@ func makeCopyContentTypeA(sourceAlias string, sourceContent *ClientContent, targ
 
 // SINGLE SOURCE - Type B: copy(f, d) -> copy(f, d/f) -> A
 // prepareCopyURLsTypeB - prepares target and source clientURLs for copying.
-func prepareCopyURLsTypeB(ctx context.Context, sourceURL, sourceVersion string, targetURL string, encKeyDB map[string][]prefixSSEPair, isZip bool) URLs {
+func prepareCopyURLsTypeB(ctx context.Context, sourceURL, sourceVersion, targetURL string, encKeyDB map[string][]prefixSSEPair, isZip bool) URLs {
  // Extract alias before fiddling with the clientURL.
  sourceAlias, _, _ := mustExpandAlias(sourceURL)
  // Find alias and expanded clientURL.
@@ -149,7 +149,7 @@ func prepareCopyURLsTypeB(ctx context.Context, sourceURL, sourceVersion string,
 }
 
 // makeCopyContentTypeB - CopyURLs content for copying.
-func makeCopyContentTypeB(sourceAlias string, sourceContent *ClientContent, targetAlias string, targetURL string) URLs {
+func makeCopyContentTypeB(sourceAlias string, sourceContent *ClientContent, targetAlias, targetURL string) URLs {
  // All OK.. We can proceed. Type B: source is a file, target is a folder and exists.
  targetURLParse := newClientURL(targetURL)
  targetURLParse.Path = filepath.ToSlash(filepath.Join(targetURLParse.Path, filepath.Base(sourceContent.URL.Path)))
@@ -193,7 +193,7 @@ func prepareCopyURLsTypeC(ctx context.Context, sourceURL, targetURL string, isRe
 }
 
 // makeCopyContentTypeC - CopyURLs content for copying.
-func makeCopyContentTypeC(sourceAlias string, sourceURL ClientURL, sourceContent *ClientContent, targetAlias string, targetURL string) URLs {
+func makeCopyContentTypeC(sourceAlias string, sourceURL ClientURL, sourceContent *ClientContent, targetAlias, targetURL string) URLs {
  newSourceURL := sourceContent.URL
  pathSeparatorIndex := strings.LastIndex(sourceURL.Path, string(sourceURL.Separator))
  newSourceSuffix := filepath.ToSlash(newSourceURL.Path)

cmd/idp-openid-subcommands.go

@@ -488,7 +488,7 @@ func mainIDPOpenIDEnable(ctx *cli.Context) error {
  return idpEnableDisable(ctx, isOpenID, enable)
 }
 
-func idpEnableDisable(ctx *cli.Context, isOpenID bool, enable bool) error {
+func idpEnableDisable(ctx *cli.Context, isOpenID, enable bool) error {
  if len(ctx.Args()) < 1 || len(ctx.Args()) > 2 {
  showCommandHelpAndExit(ctx, 1)
  }

cmd/ilm-tier-info-ui.go

@@ -93,7 +93,7 @@ func (t tierInfos) TableUI() *tview.Table {
  return table
 }
 
-func (t tierInfos) Barcharts(tier string) (objects *tvxwidgets.BarChart, versions *tvxwidgets.BarChart) {
+func (t tierInfos) Barcharts(tier string) (objects, versions *tvxwidgets.BarChart) {
  var maxObj int
  var maxVer int
  for _, t := range t {

cmd/license-update.go

@@ -119,7 +119,7 @@ func performLicenseRenew(alias string) licUpdateMessage {
  }
 }
 
-func performLicenseUpdate(licFile string, alias string) licUpdateMessage {
+func performLicenseUpdate(licFile, alias string) licUpdateMessage {
  lum := licUpdateMessage{
  Alias: alias,
  Status: "success",

cmd/mirror-url.go

@@ -214,7 +214,7 @@ type mirrorOptions struct {
 }
 
 // Prepares urls that need to be copied or removed based on requested options.
-func prepareMirrorURLs(ctx context.Context, sourceURL string, targetURL string, opts mirrorOptions) <-chan URLs {
+func prepareMirrorURLs(ctx context.Context, sourceURL, targetURL string, opts mirrorOptions) <-chan URLs {
  URLsCh := make(chan URLs)
  go deltaSourceTarget(ctx, sourceURL, targetURL, opts, URLsCh)
  return URLsCh

cmd/od-main.go

@@ -121,7 +121,7 @@ func getOdUrls(ctx context.Context, args argKVS) (odURLs URLs, e error) {
  return odURLs, nil
 }
 
-func prepareOdUrls(ctx context.Context, sourceURL, sourceVersion string, targetURL string) URLs {
+func prepareOdUrls(ctx context.Context, sourceURL, sourceVersion, targetURL string) URLs {
  // Extract alias before fiddling with the clientURL.
  sourceAlias, _, _ := mustExpandAlias(sourceURL)
  // Find alias and expanded clientURL.

cmd/od-stream.go

@@ -180,7 +180,7 @@ func odCopy(ctx context.Context, odURLs URLs, args argKVS, odType string) (odMes
 }
 
 // odSetParts sets parts for object download.
-func odSetParts(args argKVS) (parts int, skip int, e error) {
+func odSetParts(args argKVS) (parts, skip int, e error) {
  if args.Get("size") != "" {
  return 0, 0, fmt.Errorf("size cannot be specified getting from server")
  }

cmd/pipechan.go

@@ -35,7 +35,7 @@ import "github.com/rjeczalik/notify"
 // BenchmarkPipeChan1K-4 100000 550623 ns/op
 
 // PipeChan builds a new dynamically sized channel
-func PipeChan(capacity int) (inputCh chan notify.EventInfo, outputCh chan notify.EventInfo) {
+func PipeChan(capacity int) (inputCh, outputCh chan notify.EventInfo) {
  // A set of channels which store all elements received from input
  channels := make(chan chan notify.EventInfo, 1000)
 

cmd/replicate-backlog.go

@@ -234,7 +234,7 @@ func newKeyMap() keyMap {
  }
 }
 
-func initReplicateBacklogUI(arn string, op string, diffCh interface{}) *replicateBacklogUI {
+func initReplicateBacklogUI(arn, op string, diffCh interface{}) *replicateBacklogUI {
  s := spinner.New()
  s.Spinner = spinner.Points
  s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("205"))

cmd/share-db-v1.go

@@ -55,7 +55,7 @@ func newShareDBV1() *shareDBV1 {
 }
 
 // Set upload info for each share.
-func (s *shareDBV1) Set(objectURL string, shareURL string, expiry time.Duration, contentType string) {
+func (s *shareDBV1) Set(objectURL, shareURL string, expiry time.Duration, contentType string) {
  s.mutex.Lock()
  defer s.mutex.Unlock()
 

cmd/share-upload-main.go

@@ -135,7 +135,7 @@ func makeCurlCmd(key, postURL string, isRecursive bool, uploadInfo map[string]st
 }
 
 // save shared URL to disk.
-func saveSharedURL(objectURL string, shareURL string, expiry time.Duration, contentType string) *probe.Error {
+func saveSharedURL(objectURL, shareURL string, expiry time.Duration, contentType string) *probe.Error {
  // Load previously saved upload-shares.
  shareDB := newShareDBV1()
  if err := shareDB.Load(getShareUploadsFile()); err != nil {