Merge branch 'ping' of https://github.com/dormanze/mc into ping

* 'ping' of https://github.com/dormanze/mc: (44 commits)
  mv:support set tag and checksum (minio#5133)
  ping: support ping a specified node and remove duplicate port printing (minio#5132)
  feat: add `--storage-class` option to `mc put` subcommand (minio#5228)
  mirror and cp support set the maximum number of threads (minio#5220)
  Some paths like url2Stat will send resource with backslashes on windows (minio#5226)
  Include ARN in "replicate list" output (minio#5215)
  Update build version (minio#5218)
  fix: add checks for nil HTTP in admin-trace matches func (minio#5216)
  remove fips 'mc' container Dockerfile
  Fix deletion of previously sync'd buckets and objects during mc-mirror (minio#5205)
  Add STATUS column to batch job list table output (minio#5202)
  fix: remove check if lock config exists before set (minio#5203)
  removing config cmd (minio#5201)
  fix: support chained mirror properly for delete propagation minio#4558 (minio#5197)
  Change support profile defaults (minio#5198)
  Explicitly set file permissions for admin-cluster-{bucket,iam}-export… (minio#5194)
  Add support for catalog batch job type (minio#5150)
  Add `idp openid accesskey` commands (minio#5182)
  feat: add deletemarker info for batch status (minio#5191)
  mirror: skip status message from excluded buckets (minio#5190)
  ...

Author: dormanze

.gitignore

@@ -14,4 +14,5 @@ mc
 mc.RELEASE*
 mc.gz
 .DS_Store
-.vscode/
+.vscode/
+.bin/

.golangci.yml

@@ -1,32 +1,42 @@
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
-    - typecheck
-    - goimports
-    - misspell
-    - staticcheck
+    - gomodguard
     - govet
-    - revive
     - ineffassign
-    - gomodguard
-    - gofmt
+    - misspell
+    - revive
+    - staticcheck
     - unused
+  settings:
+    misspell:
+      locale: US
+  exclusions:
+    generated: lax
+    rules:
+      - path: (.+)\.go$
+        text: instead of using struct literal
+      - path: (.+)\.go$
+        text: should have a package comment
+      - path: (.+)\.go$
+        text: error strings should not be capitalized or end with punctuation or a newline
+      - path: (.+)\.go$
+        text: error strings should not end with punctuation or newlines
+      - path: (.+)\.go$
+        text: error strings should not be capitalized
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
     - gofumpt
-
-linters-settings:
-  golint:
-    min-confidence: 0
-
-  misspell:
-    locale: US
-
-    # Choose whether or not to use the extra rules that are disabled
-    # by default
-    extra-rules: false
-
-issues:
-  exclude-use-default: false
-  exclude:
-    - instead of using struct literal
-    - should have a package comment
-    - error strings should not be capitalized or end with punctuation or a newline
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile.release.fips

@@ -18,7 +18,15 @@
 package cmd
 
 import (
+	"strings"
+	"time"
+
+	"github.com/charmbracelet/lipgloss"
+	humanize "github.com/dustin/go-humanize"
 	"github.com/minio/cli"
+	json "github.com/minio/colorjson"
+	"github.com/minio/madmin-go/v3"
+	"github.com/minio/mc/pkg/probe"
 )
 
 var adminAccesskeyInfoCmd = cli.Command{
@@ -45,6 +53,150 @@ EXAMPLES:
 	`,
 }
 
+type accesskeyMessage struct {
+	op            string
+	Status        string          `json:"status"`
+	AccessKey     string          `json:"accessKey"`
+	SecretKey     string          `json:"secretKey,omitempty"`
+	STS           bool            `json:"sts,omitempty"`
+	ParentUser    string          `json:"parentUser,omitempty"`
+	AccountStatus string          `json:"accountStatus,omitempty"`
+	ImpliedPolicy bool            `json:"impliedPolicy,omitempty"`
+	Policy        json.RawMessage `json:"policy,omitempty"`
+	Name          string          `json:"name,omitempty"`
+	Description   string          `json:"description,omitempty"`
+	Expiration    *time.Time      `json:"expiration,omitempty"`
+	Provider      string          `json:"provider,omitempty"`
+	ProviderInfo  providerInfo    `json:"providerInfo,omitempty"`
+}
+
+func (m accesskeyMessage) String() string {
+	labelStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("#04B575")) // green
+	o := strings.Builder{}
+	switch m.op {
+	case "info":
+		expirationStr := "NONE"
+		if m.Expiration != nil && !m.Expiration.IsZero() && !m.Expiration.Equal(timeSentinel) {
+			expirationStr = humanize.Time(*m.Expiration)
+		}
+		policyStr := "embedded"
+		if m.ImpliedPolicy {
+			policyStr = "implied"
+		}
+		statusStr := "enabled"
+		if m.AccountStatus == "off" {
+			statusStr = "disabled"
+		}
+		stsStr := "false"
+		if m.STS {
+			stsStr = "true"
+		}
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Access Key:"), m.AccessKey))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Parent User:"), m.ParentUser))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Status:"), statusStr))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Policy:"), policyStr))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Name:"), m.Name))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Description:"), m.Description))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Expiration:"), expirationStr))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("STS:"), stsStr))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Provider:"), m.Provider))
+		if m.ProviderInfo != nil {
+			o.WriteString(iFmt(0, "%s\n", labelStyle.Render("Provider Specific Info:")))
+			o.WriteString(m.ProviderInfo.String())
+		}
+	case "create":
+		expirationStr := "NONE"
+		if m.Expiration != nil && !m.Expiration.IsZero() && !m.Expiration.Equal(timeSentinel) {
+			expirationStr = m.Expiration.String()
+		}
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Access Key:"), m.AccessKey))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Secret Key:"), m.SecretKey))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Expiration:"), expirationStr))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Name:"), m.Name))
+		o.WriteString(iFmt(0, "%s %s\n", labelStyle.Render("Description:"), m.Description))
+	case "remove":
+		o.WriteString(labelStyle.Render(iFmt(0, "Successfully removed access key `%s`.", m.AccessKey)))
+	case "edit":
+		o.WriteString(labelStyle.Render(iFmt(0, "Successfully edited access key `%s`.", m.AccessKey)))
+	case "enable":
+		o.WriteString(labelStyle.Render(iFmt(0, "Successfully enabled access key `%s`.", m.AccessKey)))
+	case "disable":
+		o.WriteString(labelStyle.Render(iFmt(0, "Successfully disabled access key `%s`.", m.AccessKey)))
+	}
+	return o.String()
+}
+
+func (m accesskeyMessage) JSON() string {
+	m.Status = "success"
+	jsonMessageBytes, e := json.MarshalIndent(m, "", " ")
+	fatalIf(probe.NewError(e), "Unable to marshal into JSON.")
+
+	return string(jsonMessageBytes)
+}
+
+type providerInfo interface {
+	String() string
+}
+
 func mainAdminAccesskeyInfo(ctx *cli.Context) error {
 	return commonAccesskeyInfo(ctx)
 }
+
+func commonAccesskeyInfo(ctx *cli.Context) error {
+	if len(ctx.Args()) < 2 {
+		showCommandHelpAndExit(ctx, 1) // last argument is exit code
+	}
+
+	args := ctx.Args()
+	aliasedURL := args.Get(0)
+	accessKeys := args.Tail()
+
+	// Create a new MinIO Admin Client
+	client, err := newAdminClient(aliasedURL)
+	fatalIf(err, "Unable to initialize admin connection.")
+
+	for _, accessKey := range accessKeys {
+		// Assume service account by default
+		res, e := client.InfoAccessKey(globalContext, accessKey)
+		fatalIf(probe.NewError(e), "Unable to get info for access key.")
+		m := accesskeyMessage{
+			op:            "info",
+			AccessKey:     accessKey,
+			ParentUser:    res.ParentUser,
+			AccountStatus: res.AccountStatus,
+			ImpliedPolicy: res.ImpliedPolicy,
+			Policy:        json.RawMessage(res.Policy),
+			Name:          res.Name,
+			Description:   res.Description,
+			Expiration:    nilExpiry(res.Expiration),
+			Provider:      res.UserProvider,
+		}
+
+		switch res.UserProvider {
+		case madmin.LDAPProvider:
+			info := res.LDAPSpecificInfo
+			m.ProviderInfo = ldapAccessKeyInfo{
+				Username: info.Username,
+			}
+		case madmin.OpenIDProvider:
+			info := res.OpenIDSpecificInfo
+			m.ProviderInfo = openIDAccessKeyInfo{
+				ConfigName:       info.ConfigName,
+				UserID:           info.UserID,
+				UserIDClaim:      info.UserIDClaim,
+				DisplayName:      info.DisplayName,
+				DisplayNameClaim: info.DisplayNameClaim,
+			}
+		}
+		printMsg(m)
+	}
+
+	return nil
+}
+
+func nilExpiry(expiry *time.Time) *time.Time {
+	if expiry != nil && expiry.Equal(timeSentinel) {
+		return nil
+	}
+	return expiry
+}