fix: ls differentiate exit codes for empty and non-existent buckets

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+## v2.3.0
+
+#### Breaking changes
+- Changed the exit code from 1 to 0 for `ls` when used with an empty bucket. Exits with 1 if the bucket is non-existent. ([#722](https://github.com/peak/s5cmd/issues/722))
+
 ## v2.2.2 - 13 Sep 2023 
 
 #### Bugfixes

e2e/du_test.go

@@ -300,3 +300,21 @@ func TestDiskUsageByVersionIDAndAllVersions(t *testing.T) {
 		})
 	}
 }
+
+func TestDiskUsageEmptyBucket(t *testing.T) {
+	t.Parallel()
+
+	s3client, s5cmd := setup(t)
+
+	bucket := s3BucketFromTestName(t)
+	createBucket(t, s3client, bucket)
+
+	cmd := s5cmd("du", "s3://"+bucket)
+	result := icmd.RunCmd(cmd)
+
+	result.Assert(t, icmd.Success)
+
+	assertLines(t, result.Stdout(), map[int]compareFunc{
+		0: suffix(`0 bytes in 0 objects: s3://%v`, bucket),
+	})
+}

e2e/ls_test.go

@@ -786,3 +786,19 @@ func TestListNestedLocalFolders(t *testing.T) {
 		2: match(filepath.ToSlash("file.txt")),
 	}, trimMatch(dateRe), alignment(true))
 }
+
+func TestEmptyBucket(t *testing.T) {
+	t.Parallel()
+
+	s3client, s5cmd := setup(t)
+
+	bucket := s3BucketFromTestName(t)
+	createBucket(t, s3client, bucket)
+
+	cmd := s5cmd("ls", "s3://"+bucket)
+	result := icmd.RunCmd(cmd)
+
+	result.Assert(t, icmd.Success)
+
+	assertLines(t, result.Stdout(), nil)
+}

e2e/select_test.go

@@ -153,7 +153,7 @@ func TestSelectCommand(t *testing.T) {
 				expectedValue: "id0\n",
 			},
 			{
-				name: "input:json-lines,output:csv,compression:gzip,select:with-where",
+				name: "input:json-lines,output:csv,select:with-where",
 				cmd: []string{
 					"select", "json",
 					"--output-format", "csv",
@@ -165,7 +165,7 @@ func TestSelectCommand(t *testing.T) {
 				expectedValue: "id0\n",
 			},
 			{
-				name: "input:json-document,output:json,select:with-document-access",
+				name: "input:json-document,output:json-lines,select:with-document-access",
 				cmd: []string{
 					"select", "json",
 					"--structure", "document",
@@ -177,7 +177,7 @@ func TestSelectCommand(t *testing.T) {
 				expectedValue: "{\"id\":\"id0\"}\n",
 			},
 			{
-				name: "input:json-document,output:json,compression:gzip,select:with-document-access",
+				name: "input:json-document,output:json-lines,compression:gzip,select:with-document-access",
 				cmd: []string{
 					"select", "json",
 					"--structure", "document",
@@ -200,11 +200,11 @@ func TestSelectCommand(t *testing.T) {
 				},
 				informat:      "json",
 				structure:     "document",
-				outformat:     "json",
+				outformat:     "csv",
 				expectedValue: "id0\n",
 			},
 			{
-				name: "input:json-document,output:json,compression:gzip,select:with-document-access",
+				name: "input:json-document,output:csv,compression:gzip,select:with-document-access",
 				cmd: []string{
 					"select", "json",
 					"--structure", "document",
@@ -215,13 +215,36 @@ func TestSelectCommand(t *testing.T) {
 				informat:      "json",
 				compression:   true,
 				structure:     "document",
-				outformat:     "json",
+				outformat:     "csv",
 				expectedValue: "id0\n",
 			},
+			{
+				name: "input:json-lines,output:json-lines,all-versions:true,empty-bucket:true",
+				cmd: []string{
+					"select", "json",
+					"--all-versions",
+					"--query", query,
+				},
+				informat:      "json",
+				structure:     "lines",
+				outformat:     "json",
+				expectedValue: "-",
+			},
 		},
 		"csv": {
 			{
-				name: "input:csv,output:csv,delimiter:comma",
+				name: "input:csv,output:json,delimiter:comma",
+				cmd: []string{
+					"select", "csv",
+					"--output-format", "json",
+					"--query", query,
+				},
+				informat:  "csv",
+				structure: ",",
+				outformat: "json",
+			},
+			{
+				name: "input:csv,output:csv,delimiter:comma,extra-flag:false",
 				cmd: []string{
 					"select", "csv",
 					"--query", query,
@@ -231,7 +254,7 @@ func TestSelectCommand(t *testing.T) {
 				outformat: "csv",
 			},
 			{
-				name: "input:csv,output:csv,delimiter:comma,compression:gzip",
+				name: "input:csv,output:csv,delimiter:comma,compression:gzip,extra-flag:false",
 				cmd: []string{
 					"select", "csv",
 					"--compression", "gzip",
@@ -242,6 +265,19 @@ func TestSelectCommand(t *testing.T) {
 				structure:   ",",
 				outformat:   "csv",
 			},
+			{
+				name: "input:csv,output:json,delimiter:comma,compression:gzip",
+				cmd: []string{
+					"select", "csv",
+					"--compression", "gzip",
+					"--output-format", "json",
+					"--query", query,
+				},
+				informat:    "csv",
+				compression: true,
+				structure:   ",",
+				outformat:   "json",
+			},
 			{
 				name: "input:csv,output:csv,delimiter:comma,compression:gzip",
 				cmd: []string{
@@ -267,7 +303,7 @@ func TestSelectCommand(t *testing.T) {
 				outformat: "csv",
 			},
 			{
-				name: "input:csv,output:csv,delimiter:tab",
+				name: "input:csv,output:csv,delimiter:tab,extra-flag:false",
 				cmd: []string{
 					"select", "csv",
 					"--delimiter", "\t",
@@ -277,6 +313,18 @@ func TestSelectCommand(t *testing.T) {
 				structure: "\t",
 				outformat: "csv",
 			},
+			{
+				name: "input:csv,output:json,delimiter:tab",
+				cmd: []string{
+					"select", "csv",
+					"--delimiter", "\t",
+					"--output-format", "json",
+					"--query", query,
+				},
+				informat:  "csv",
+				structure: "\t",
+				outformat: "json",
+			},
 			{
 				name: "input:csv,output:csv,delimiter:tab",
 				cmd: []string{
@@ -372,7 +420,7 @@ func TestSelectCommand(t *testing.T) {
 				informat:      "csv",
 				compression:   true,
 				structure:     ",",
-				outformat:     "csv",
+				outformat:     "json",
 				expectedValue: "{\"id\":\"id0\"}\n",
 			},
 			{
@@ -386,7 +434,7 @@ func TestSelectCommand(t *testing.T) {
 				},
 				informat:      "csv",
 				structure:     "\t",
-				outformat:     "csv",
+				outformat:     "json",
 				expectedValue: "{\"id\":\"id0\"}\n",
 			},
 			{
@@ -402,9 +450,21 @@ func TestSelectCommand(t *testing.T) {
 				informat:      "csv",
 				compression:   true,
 				structure:     "\t",
-				outformat:     "csv",
+				outformat:     "json",
 				expectedValue: "{\"id\":\"id0\"}\n",
 			},
+			{
+				name: "input:csv,output:csv,delimiter:comma,all-versions:true,empty-bucket:true",
+				cmd: []string{
+					"select", "csv",
+					"--all-versions",
+					"--query", query,
+				},
+				informat:      "csv",
+				structure:     ",",
+				outformat:     "csv",
+				expectedValue: "-",
+			},
 		},
 		"backwards-compatibility": {
 			{
@@ -471,8 +531,13 @@ func TestSelectCommand(t *testing.T) {
 
 					s3client, s5cmd := setup(t, withEndpointURL(endpoint), withRegion(region), withAccessKeyID(accessKeyID), withSecretKey(secretKey))
 					createBucket(t, s3client, bucket)
-					putFile(t, s3client, bucket, filename, contents)
 
+					if tc.expectedValue == "-" { // test empty bucket case
+						src = fmt.Sprintf("s3://%s/", bucket)
+						expected = ""
+					} else {
+						putFile(t, s3client, bucket, filename, contents)
+					}
 					tc.cmd = append(tc.cmd, src)
 					cmd := s5cmd(tc.cmd...)
 

storage/s3.go

@@ -288,7 +288,7 @@ func (s *S3) listObjectVersions(ctx context.Context, url *url.URL) <-chan *Objec
 			return
 		}
 
-		if !objectFound {
+		if !objectFound && !url.IsBucket() {
 			objCh <- &Object{Err: ErrNoObjectFound}
 		}
 	}()
@@ -378,7 +378,7 @@ func (s *S3) listObjectsV2(ctx context.Context, url *url.URL) <-chan *Object {
 			return
 		}
 
-		if !objectFound {
+		if !objectFound && !url.IsBucket() {
 			objCh <- &Object{Err: ErrNoObjectFound}
 		}
 	}()
@@ -470,7 +470,7 @@ func (s *S3) listObjects(ctx context.Context, url *url.URL) <-chan *Object {
 			return
 		}
 
-		if !objectFound {
+		if !objectFound && !url.IsBucket() {
 			objCh <- &Object{Err: ErrNoObjectFound}
 		}
 	}()