refactor: Serverless bucket creation

Author: xorphitus

influxdb3/management.go renamed to influxdb3/management_serverless.go

@@ -9,6 +9,11 @@ import (
 )
 
 type (
+	// ServerlessClient represents a client for InfluxDB Serverless administration operations.
+	ServerlessClient struct {
+		client *Client
+	}
+
 	Bucket struct {
 		Name           string                `json:"name"`
 		OrgID          string                `json:"orgID,omitempty"`
@@ -23,25 +28,43 @@ type (
 	}
 )
 
-func (c *Client) CreateBucket(ctx context.Context, bucket *Bucket) error {
-	u, _ := c.apiURL.Parse("/api/v2/buckets")
+// NewServerlessClient creates new ServerlessClient with given InfluxDB client.
+func NewServerlessClient(client *Client) *ServerlessClient {
+	return &ServerlessClient{client: client}
+}
+
+// CreateBucket creates a new bucket
+func (c *ServerlessClient) CreateBucket(ctx context.Context, bucket *Bucket) error {
+	if bucket == nil {
+		return fmt.Errorf("bucket must not be nil")
+	}
 
 	if bucket.OrgID == "" {
-		bucket.OrgID = c.config.Organization
+		bucket.OrgID = c.client.config.Organization
 	}
 
 	if bucket.Name == "" {
-		bucket.Name = c.config.Database
+		bucket.Name = c.client.config.Database
 	}
 
-	headers := http.Header{}
-	headers.Set("Content-Type", "application/json")
+	return c.createBucket(ctx, "/api/v2/buckets", bucket)
+}
+
+// createBucket is a helper function for CreateBucket to enhance test coverage.
+func (c *ServerlessClient) createBucket(ctx context.Context, path string, bucket any) error {
+	u, err := c.client.apiURL.Parse(path)
+	if err != nil {
+		return fmt.Errorf("failed to parth bucket creation path: %w", err)
+	}
 
 	body, err := json.Marshal(bucket)
 	if err != nil {
 		return fmt.Errorf("failed to marshal bucket creation request body: %w", err)
 	}
 
+	headers := http.Header{}
+	headers.Set("Content-Type", "application/json")
+
 	param := httpParams{
 		endpointURL: u,
 		queryParams: nil,
@@ -50,6 +73,6 @@ func (c *Client) CreateBucket(ctx context.Context, bucket *Bucket) error {
 		body:        bytes.NewReader(body),
 	}
 
-	_, err = c.makeAPICall(ctx, param)
+	_, err = c.client.makeAPICall(ctx, param)
 	return err
 }

influxdb3/management_test.go renamed to influxdb3/management_serverless_test.go

@@ -12,17 +12,18 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestCreateBucket(t *testing.T) {
+func TestServerlessClientCreateBucket(t *testing.T) {
 	correctPath := "/api/v2/buckets"
 
 	tests := []struct {
 		name     string
-		bucket   Bucket
+		bucket   *Bucket
 		wantBody map[string]any
+		wantErr  bool
 	}{
 		{
 			name: "Apply bucket orgID and name",
-			bucket: Bucket{
+			bucket: &Bucket{
 				OrgID: "my-organization",
 				Name:  "my-bucket",
 				RetentionRules: []BucketRetentionRule{
@@ -42,10 +43,11 @@ func TestCreateBucket(t *testing.T) {
 					},
 				},
 			},
+			wantErr: false,
 		},
 		{
 			name: "fallback to client config orgID and database name",
-			bucket: Bucket{
+			bucket: &Bucket{
 				RetentionRules: []BucketRetentionRule{
 					{
 						Type:         "expire",
@@ -63,6 +65,13 @@ func TestCreateBucket(t *testing.T) {
 					},
 				},
 			},
+			wantErr: false,
+		},
+		{
+			name:     "nil bucket",
+			bucket:   nil,
+			wantBody: nil,
+			wantErr:  true,
 		},
 	}
 
@@ -92,8 +101,31 @@ func TestCreateBucket(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			err = c.CreateBucket(context.Background(), &tt.bucket)
-			require.NoError(t, err)
+			sc := NewServerlessClient(c)
+			err = sc.CreateBucket(context.Background(), tt.bucket)
+			if tt.wantErr {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+			}
 		})
 	}
+
+	t.Run("Internal error cases", func(t *testing.T) {
+		c, err := New(ClientConfig{
+			Host:  "dummy",
+			Token: "dummy",
+		})
+		require.NoError(t, err)
+
+		sc := NewServerlessClient(c)
+		err = sc.createBucket(context.Background(), "wrong path:", nil)
+		assert.Error(t, err)
+
+		wrongBody := map[string]any{
+			"funcField": func() {},
+		}
+		err = sc.createBucket(context.Background(), correctPath, wrongBody)
+		assert.Error(t, err)
+	})
 }