feat: support head with --zip (minio#4219)

adfost · Oct 28, 2022 · 3428d0f · 3428d0f
1 parent b6d7f49
commit 3428d0f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/cmd/cat-main.go b/cmd/cat-main.go
@@ -45,15 +45,15 @@ var catFlags = []cli.Flag{
 	},
 	cli.BoolFlag{
 		Name:  "zip",
-		Usage: "Extract from remote zip file (MinIO server source only)",
+		Usage: "extract from remote zip file (MinIO server source only)",
 	},
 	cli.Int64Flag{
 		Name:  "offset",
-		Usage: "Start offset",
+		Usage: "start offset",
 	},
 	cli.Int64Flag{
 		Name:  "tail",
-		Usage: "Tail number of bytes at ending of file",
+		Usage: "tail number of bytes at ending of file",
 	},
 }
 

diff --git a/cmd/common-methods.go b/cmd/common-methods.go
@@ -145,7 +145,7 @@ func isAliasURLDir(ctx context.Context, aliasURL string, keys map[string][]prefi
 }
 
 // getSourceStreamMetadataFromURL gets a reader from URL.
-func getSourceStreamMetadataFromURL(ctx context.Context, aliasedURL, versionID string, timeRef time.Time, encKeyDB map[string][]prefixSSEPair) (reader io.ReadCloser,
+func getSourceStreamMetadataFromURL(ctx context.Context, aliasedURL, versionID string, timeRef time.Time, encKeyDB map[string][]prefixSSEPair, zip bool) (reader io.ReadCloser,
 	metadata map[string]string, err *probe.Error,
 ) {
 	alias, urlStrFull, _, err := expandAlias(aliasedURL)
@@ -163,7 +163,7 @@ func getSourceStreamMetadataFromURL(ctx context.Context, aliasedURL, versionID s
 		GetOptions: GetOptions{
 			SSE:       getSSE(aliasedURL, encKeyDB[alias]),
 			VersionID: versionID,
-			Zip:       false,
+			Zip:       zip,
 		},
 	})
 }

diff --git a/cmd/head-main.go b/cmd/head-main.go
@@ -47,6 +47,10 @@ var headFlags = []cli.Flag{
 		Name:  "version-id, vid",
 		Usage: "select an object version to display",
 	},
+	cli.BoolFlag{
+		Name:  "zip",
+		Usage: "extract from remote zip file (MinIO server source only)",
+	},
 }
 
 // Display contents of a file.
@@ -89,15 +93,15 @@ EXAMPLES:
 }
 
 // headURL displays contents of a URL to stdout.
-func headURL(sourceURL, sourceVersion string, timeRef time.Time, encKeyDB map[string][]prefixSSEPair, nlines int64) *probe.Error {
+func headURL(sourceURL, sourceVersion string, timeRef time.Time, encKeyDB map[string][]prefixSSEPair, nlines int64, zip bool) *probe.Error {
 	var reader io.ReadCloser
 	switch sourceURL {
 	case "-":
 		reader = os.Stdin
 	default:
 		var err *probe.Error
 		var metadata map[string]string
-		if reader, metadata, err = getSourceStreamMetadataFromURL(context.Background(), sourceURL, sourceVersion, timeRef, encKeyDB); err != nil {
+		if reader, metadata, err = getSourceStreamMetadataFromURL(context.Background(), sourceURL, sourceVersion, timeRef, encKeyDB, zip); err != nil {
 			return err.Trace(sourceURL)
 		}
 		ctype := metadata["Content-Type"]
@@ -199,7 +203,7 @@ func mainHead(ctx *cli.Context) error {
 
 	// Convert arguments to URLs: expand alias, fix format.
 	for _, url := range ctx.Args() {
-		fatalIf(headURL(url, versionID, timeRef, encKeyDB, ctx.Int64("lines")).Trace(url), "Unable to read from `"+url+"`.")
+		fatalIf(headURL(url, versionID, timeRef, encKeyDB, ctx.Int64("lines"), ctx.Bool("zip")).Trace(url), "Unable to read from `"+url+"`.")
 	}
 
 	return nil

diff --git a/cmd/sql-main.go b/cmd/sql-main.go
@@ -310,7 +310,7 @@ func getCSVHeader(sourceURL string, encKeyDB map[string][]prefixSSEPair) ([]stri
 	default:
 		var err *probe.Error
 		var metadata map[string]string
-		if r, metadata, err = getSourceStreamMetadataFromURL(globalContext, sourceURL, "", time.Time{}, encKeyDB); err != nil {
+		if r, metadata, err = getSourceStreamMetadataFromURL(globalContext, sourceURL, "", time.Time{}, encKeyDB, false); err != nil {
 			return nil, err.Trace(sourceURL)
 		}
 		ctype := metadata["Content-Type"]