Merge pull request #1473 from jackyalbo/jacky-fixes

Adapting operator to new bucket list API change
noobaa · Nov 12, 2024 · b62bb7e · b62bb7e
2 parents 87b1023 + 066a328
commit b62bb7e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/pkg/bucket/bucket.go b/pkg/bucket/bucket.go
@@ -239,7 +239,7 @@ func RunStatus(cmd *cobra.Command, args []string) {
 func RunList(cmd *cobra.Command, args []string) {
 	log := util.Logger()
 	nbClient := system.GetNBClient()
-	list, err := nbClient.ListBucketsAPI()
+	list, err := nbClient.ListBucketsAPI(nb.ListBucketsParams{})
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/pkg/nb/api.go b/pkg/nb/api.go
@@ -19,7 +19,7 @@ type Client interface {
 	SetNamespaceStoreInfo(NamespaceStoreInfo) error
 
 	ListAccountsAPI(ListAccountsParams) (ListAccountsReply, error)
-	ListBucketsAPI() (ListBucketsReply, error)
+	ListBucketsAPI(ListBucketsParams) (ListBucketsReply, error)
 	ListHostsAPI(ListHostsParams) (ListHostsReply, error)
 
 	CreateAuthAPI(CreateAuthParams) (CreateAuthReply, error)
@@ -146,8 +146,8 @@ func (c *RPCClient) ListAccountsAPI(params ListAccountsParams) (ListAccountsRepl
 }
 
 // ListBucketsAPI calls bucket_api.list_buckets()
-func (c *RPCClient) ListBucketsAPI() (ListBucketsReply, error) {
-	req := &RPCMessage{API: "bucket_api", Method: "list_buckets"}
+func (c *RPCClient) ListBucketsAPI(params ListBucketsParams) (ListBucketsReply, error) {
+	req := &RPCMessage{API: "bucket_api", Method: "list_buckets", Params: params}
 	res := &struct {
 		RPCMessage `json:",inline"`
 		Reply      ListBucketsReply `json:"reply"`

diff --git a/pkg/nb/types.go b/pkg/nb/types.go
@@ -283,6 +283,12 @@ type ListAccountsReply struct {
 	Accounts []*AccountInfo `json:"accounts"`
 }
 
+// ListBcuketsParams is the params to account_api.list_buckets()
+type ListBucketsParams struct {
+	ContinuationToken *string `json:"continuation_token,omitempty"`
+	MaxBuckets *int `json:"max_buckets,omitempty"`
+}
+
 // ListBucketsReply is the reply of bucket_api.list_buckets()
 type ListBucketsReply struct {
 	Buckets []struct {