Object browser migrated into bucket details (#1017)

Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>

pkg/acl/endpoints.go

@@ -32,7 +32,11 @@ var (
 	metrics               = "/metrics"
 	profiling             = "/profiling"
 	buckets               = "/buckets"
-	bucketsDetail         = "/buckets/*"
+	bucketsGeneral        = "/buckets/*"
+	bucketsAdmin          = "/buckets/:bucketName/admin/*"
+	bucketsAdminMain      = "/buckets/:bucketName/admin"
+	bucketsBrowser        = "/buckets/:bucketName/browse/*"
+	bucketsBrowserMain    = "/buckets/:bucketName/browse"
 	serviceAccounts       = "/account"
 	changePassword        = "/account/change-password"
 	tenants               = "/tenants"
@@ -50,9 +54,6 @@ var (
 	storageDrives         = "/storage/drives"
 	remoteBuckets         = "/remote-buckets"
 	replication           = "/replication"
-	objectBrowser         = "/object-browser/:bucket/*"
-	objectBrowserBucket   = "/object-browser/:bucket"
-	mainObjectBrowser     = "/object-browser"
 	license               = "/license"
 	watch                 = "/watch"
 	heal                  = "/heal"
@@ -281,30 +282,31 @@ var displayRules = map[string]func() bool{
 
 // endpointRules contains the mapping between endpoints and ActionSets, additional rules can be added here
 var endpointRules = map[string]ConfigurationActionSet{
-	configuration:       configurationActionSet,
-	users:               usersActionSet,
-	usersDetail:         usersActionSet,
-	groups:              groupsActionSet,
-	iamPolicies:         iamPoliciesActionSet,
-	policiesDetail:      iamPoliciesActionSet,
-	dashboard:           dashboardActionSet,
-	metrics:             dashboardActionSet,
-	profiling:           profilingActionSet,
-	buckets:             bucketsActionSet,
-	bucketsDetail:       bucketsActionSet,
-	serviceAccounts:     serviceAccountsActionSet,
-	changePassword:      changePasswordActionSet,
-	remoteBuckets:       remoteBucketsActionSet,
-	replication:         replicationActionSet,
-	objectBrowser:       objectBrowserActionSet,
-	mainObjectBrowser:   objectBrowserActionSet,
-	objectBrowserBucket: objectBrowserActionSet,
-	license:             licenseActionSet,
-	watch:               watchActionSet,
-	heal:                healActionSet,
-	trace:               traceActionSet,
-	logs:                logsActionSet,
-	healthInfo:          healthInfoActionSet,
+	configuration:      configurationActionSet,
+	users:              usersActionSet,
+	usersDetail:        usersActionSet,
+	groups:             groupsActionSet,
+	iamPolicies:        iamPoliciesActionSet,
+	policiesDetail:     iamPoliciesActionSet,
+	dashboard:          dashboardActionSet,
+	metrics:            dashboardActionSet,
+	profiling:          profilingActionSet,
+	buckets:            bucketsActionSet,
+	bucketsGeneral:     bucketsActionSet,
+	bucketsAdmin:       bucketsActionSet,
+	bucketsAdminMain:   bucketsActionSet,
+	serviceAccounts:    serviceAccountsActionSet,
+	changePassword:     changePasswordActionSet,
+	remoteBuckets:      remoteBucketsActionSet,
+	replication:        replicationActionSet,
+	bucketsBrowser:     objectBrowserActionSet,
+	bucketsBrowserMain: objectBrowserActionSet,
+	license:            licenseActionSet,
+	watch:              watchActionSet,
+	heal:               healActionSet,
+	trace:              traceActionSet,
+	logs:               logsActionSet,
+	healthInfo:         healthInfoActionSet,
 }
 
 // operatorRules contains the mapping between endpoints and ActionSets for operator only mode

pkg/acl/endpoints_test.go

@@ -50,7 +50,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 			args: args{
 				[]string{"admin:ServerInfo"},
 			},
-			want: 8,
+			want: 7,
 		},
 		{
 			name: "policies endpoint",
@@ -63,7 +63,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"admin:ListUserPolicies",
 				},
 			},
-			want: 8,
+			want: 7,
 		},
 		{
 			name: "all admin endpoints",
@@ -72,7 +72,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"admin:*",
 				},
 			},
-			want: 22,
+			want: 21,
 		},
 		{
 			name: "all s3 endpoints",
@@ -81,7 +81,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 8,
+			want: 9,
 		},
 		{
 			name: "all admin and s3 endpoints",
@@ -91,14 +91,14 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 24,
+			want: 25,
 		},
 		{
 			name: "Console User - default endpoints",
 			args: args{
 				[]string{},
 			},
-			want: 6,
+			want: 5,
 		},
 	}