add bucketuser crud

Author: Davor Gajic

create/bucketuser.go

@@ -0,0 +1,79 @@
+package create
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/watch"
+
+	"github.com/alecthomas/kong"
+	runtimev1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
+	meta "github.com/ninech/apis/meta/v1alpha1"
+	storage "github.com/ninech/apis/storage/v1alpha1"
+
+	"github.com/ninech/nctl/api"
+)
+
+type bucketUserCmd struct {
+	resourceCmd
+	Location string `placeholder:"${bucketuser_location_default}" help:"Location where the BucketUser instance is created.  Available locations are: ${bucketuser_location_options}"`
+}
+
+func (cmd *bucketUserCmd) Run(ctx context.Context, client *api.Client) error {
+	fmt.Println("Creating new bucketuser.")
+	bucketuser := cmd.newBucketUser(client.Project)
+
+	c := newCreator(client, bucketuser, "bucketuser")
+	ctx, cancel := context.WithTimeout(ctx, cmd.WaitTimeout)
+	defer cancel()
+
+	if err := c.createResource(ctx); err != nil {
+		return err
+	}
+
+	if !cmd.Wait {
+		return nil
+	}
+
+	return c.wait(ctx, waitStage{
+		objectList: &storage.BucketUserList{},
+		onResult: func(event watch.Event) (bool, error) {
+			if c, ok := event.Object.(*storage.BucketUser); ok {
+				return isAvailable(c), nil
+			}
+			return false, nil
+		},
+	})
+}
+
+func (cmd *bucketUserCmd) newBucketUser(namespace string) *storage.BucketUser {
+	name := getName(cmd.Name)
+
+	bucketUser := &storage.BucketUser{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+		},
+		Spec: storage.BucketUserSpec{
+			ResourceSpec: runtimev1.ResourceSpec{
+				WriteConnectionSecretToReference: &runtimev1.SecretReference{
+					Name:      "bucketuser-" + name,
+					Namespace: namespace,
+				},
+			},
+			ForProvider: storage.BucketUserParameters{
+				Location: meta.LocationName(cmd.Location),
+			},
+		},
+	}
+	return bucketUser
+}
+
+func BucketUserKongVars() kong.Vars {
+	result := make(kong.Vars)
+	result["bucketuser_location_default"] = string(storage.BucketUserLocationDefault)
+	result["bucketuser_location_options"] = strings.Join(storage.BucketUserLocationOptions, ", ")
+	return result
+}

create/bucketuser_test.go

@@ -0,0 +1,47 @@
+package create
+
+import (
+	"testing"
+
+	storage "github.com/ninech/apis/storage/v1alpha1"
+	"github.com/ninech/nctl/api"
+	"github.com/ninech/nctl/internal/test"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestBucketUser(t *testing.T) {
+	apiClient, err := test.SetupClient()
+	require.NoError(t, err)
+
+	for name, tc := range map[string]struct {
+		cmd             bucketUserCmd
+		checkBucketUser func(t *testing.T, cmd bucketUserCmd, bu *storage.BucketUser)
+	}{
+		"create": {
+			cmd: bucketUserCmd{
+				resourceCmd: resourceCmd{Name: "create"},
+				Location:    "nine-es34",
+			},
+			checkBucketUser: func(t *testing.T, cmd bucketUserCmd, bu *storage.BucketUser) {
+				assert.Equal(t, "nine-es34", string(bu.Spec.ForProvider.Location))
+			},
+		},
+	} {
+		t.Run(name, func(t *testing.T) {
+			if err != nil {
+				t.Fatal(err)
+			}
+			if err := tc.cmd.Run(t.Context(), apiClient); err != nil {
+				t.Fatal(err)
+			}
+			created := &storage.BucketUser{}
+			if err := apiClient.Get(t.Context(), api.NamespacedName(tc.cmd.Name, apiClient.Project), created); err != nil {
+				t.Fatal(err)
+			}
+			if tc.checkBucketUser != nil {
+				tc.checkBucketUser(t, tc.cmd, created)
+			}
+		})
+	}
+}

create/create.go

@@ -35,6 +35,7 @@ type Cmd struct {
 	OpenSearch          openSearchCmd        `cmd:"" group:"storage.nine.ch" name:"opensearch" aliases:"os" help:"Create a new OpenSearch cluster."`
 	CloudVirtualMachine cloudVMCmd           `cmd:"" group:"infrastructure.nine.ch" name:"cloudvirtualmachine" aliases:"cloudvm" help:"Create a new CloudVM."`
 	ServiceConnection   serviceConnectionCmd `cmd:"" group:"networking.nine.ch" name:"serviceconnection" aliases:"sc" help:"Create a new ServiceConnection."`
+	BucketUser          bucketUserCmd        `cmd:"" group:"storage.nine.ch" name:"bucketuser" aliases:"bu" help:"Create a new BucketUser."`
 }
 
 type resourceCmd struct {

delete/bucketuser.go

@@ -0,0 +1,21 @@
+package delete
+
+import (
+	"context"
+
+	storage "github.com/ninech/apis/storage/v1alpha1"
+	"github.com/ninech/nctl/api"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+type bucketUserCmd struct {
+	resourceCmd
+}
+
+func (cmd *bucketUserCmd) Run(ctx context.Context, client *api.Client) error {
+	ctx, cancel := context.WithTimeout(ctx, cmd.WaitTimeout)
+	defer cancel()
+
+	bu := &storage.BucketUser{ObjectMeta: metav1.ObjectMeta{Name: cmd.Name, Namespace: client.Project}}
+	return newDeleter(bu, storage.BucketUserKind).deleteResource(ctx, client, cmd.WaitTimeout, cmd.Wait, cmd.Force)
+}

delete/bucketuser_test.go

@@ -0,0 +1,59 @@
+package delete
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	meta "github.com/ninech/apis/meta/v1alpha1"
+	storage "github.com/ninech/apis/storage/v1alpha1"
+	"github.com/ninech/nctl/api"
+	"github.com/ninech/nctl/internal/test"
+	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestBucketUser(t *testing.T) {
+	ctx := context.Background()
+	cmd := bucketUserCmd{
+		resourceCmd: resourceCmd{
+			Name:        "test",
+			Force:       true,
+			Wait:        false,
+			WaitTimeout: time.Second,
+		},
+	}
+
+	bu := bucketUser("test", test.DefaultProject, "nine-es34")
+	apiClient, err := test.SetupClient(test.WithObjects(bu))
+	require.NoError(t, err)
+
+	if err := apiClient.Get(ctx, api.ObjectName(bu), bu); err != nil {
+		t.Fatalf("expected bucketuser to exist, got: %s", err)
+	}
+	if err := cmd.Run(ctx, apiClient); err != nil {
+		t.Fatal(err)
+	}
+	err = apiClient.Get(ctx, api.ObjectName(bu), bu)
+	if err == nil {
+		t.Fatalf("expected bucketuser to be deleted, but exists")
+	}
+	if !errors.IsNotFound(err) {
+		t.Fatalf("expected bucketuser to be deleted, got: %s", err.Error())
+	}
+}
+
+func bucketUser(name, project, location string) *storage.BucketUser {
+	return &storage.BucketUser{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: project,
+		},
+		Spec: storage.BucketUserSpec{
+			ForProvider: storage.BucketUserParameters{
+				Location: meta.LocationName(location),
+			},
+		},
+	}
+}

delete/delete.go

@@ -27,6 +27,7 @@ type Cmd struct {
 	OpenSearch          openSearchCmd        `cmd:"" group:"storage.nine.ch" name:"opensearch" aliases:"os" help:"Delete an OpenSearch cluster."`
 	CloudVirtualMachine cloudVMCmd           `cmd:"" group:"infrastructure.nine.ch" name:"cloudvirtualmachine" aliases:"cloudvm" help:"Delete a CloudVM."`
 	ServiceConnection   serviceConnectionCmd `cmd:"" group:"networking.nine.ch" name:"serviceconnection" aliases:"sc" help:"Delete a ServiceConnection."`
+	BucketUser          bucketUserCmd        `cmd:"" group:"storage.nine.ch" name:"bucketuser" aliases:"bu" help:"Update a BucketUser."`
 }
 
 type resourceCmd struct {

get/apiserviceaccount.go

@@ -2,16 +2,12 @@ package get
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"maps"
-	"slices"
 
 	iam "github.com/ninech/apis/iam/v1alpha1"
 	"github.com/ninech/nctl/api"
 	"github.com/ninech/nctl/internal/format"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/yaml"
 )
 
 type apiServiceAccountsCmd struct {
@@ -47,7 +43,7 @@ func (asa *apiServiceAccountsCmd) print(ctx context.Context, client *api.Client,
 			return err
 		}
 		if asa.PrintCredentials {
-			return asa.printCredentials(ctx, client, sa, out)
+			return asa.printCredentials(ctx, client, sa, out, func(key string) bool { return key == iam.APIServiceAccountKubeconfigKey })
 		}
 		key := ""
 		switch sa.Spec.ForProvider.Version {
@@ -134,43 +130,3 @@ func (asa *apiServiceAccountsCmd) printSecret(ctx context.Context, client *api.C
 	fmt.Printf("%s\n", data)
 	return nil
 }
-
-func (asa *apiServiceAccountsCmd) printCredentials(ctx context.Context, client *api.Client, sa *iam.APIServiceAccount, out *output) error {
-	data, err := getConnectionSecretMap(ctx, client, sa)
-	if err != nil {
-		return err
-	}
-	stringData := map[string]string{}
-	for k, v := range data {
-		// skip kubeconfig as it's multiline and it does not format nicely. We
-		// have a separate flag to print it.
-		if k == iam.APIServiceAccountKubeconfigKey {
-			continue
-		}
-		stringData[k] = string(v)
-	}
-
-	switch out.Format {
-	case full:
-		out.writeTabRow("KEY", "VALUE")
-		fallthrough
-	case noHeader:
-		for _, key := range slices.Sorted(maps.Keys(stringData)) {
-			out.writeTabRow(key, stringData[key])
-		}
-		return out.tabWriter.Flush()
-	case yamlOut:
-		b, err := yaml.Marshal(stringData)
-		if err != nil {
-			return err
-		}
-		fmt.Print(string(b))
-	case jsonOut:
-		b, err := json.MarshalIndent(stringData, "", "  ")
-		if err != nil {
-			return err
-		}
-		fmt.Println(string(b))
-	}
-	return nil
-}

get/bucketuser.go

@@ -0,0 +1,102 @@
+package get
+
+import (
+	"context"
+	"fmt"
+
+	storage "github.com/ninech/apis/storage/v1alpha1"
+	"github.com/ninech/nctl/api"
+	"github.com/ninech/nctl/internal/format"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+type bucketUserCmd struct {
+	resourceCmd
+	PrintCredentials bool `help:"Print the credentials of the BucketUser. Requires name to be set." xor:"cred"`
+	PrintAccessKey   bool `help:"Print the access key of the BucketUser. Requires name to be set." xor:"access"`
+	PrintSecretKey   bool `help:"Print the secret key of the BucketUser. Requires name to be set." xor:"secret"`
+}
+
+func (bu *bucketUserCmd) Run(ctx context.Context, client *api.Client, get *Cmd) error {
+	return get.listPrint(ctx, client, bu, api.MatchName(bu.Name))
+}
+
+func (bu *bucketUserCmd) list() client.ObjectList {
+	return &storage.BucketUserList{}
+}
+
+func (bu *bucketUserCmd) print(ctx context.Context, client *api.Client, list client.ObjectList, out *output) error {
+	bucketUserList := list.(*storage.BucketUserList)
+
+	if len(bucketUserList.Items) == 0 {
+		return out.printEmptyMessage(storage.BucketUserKind, client.Project)
+	}
+
+	user := &bucketUserList.Items[0]
+
+	if bu.printFlagSet() {
+		if bu.Name != "" {
+			return fmt.Errorf("name needs to be set to print bucket user information")
+		}
+
+		if bu.PrintCredentials {
+			return bu.printCredentials(ctx, client, user, out, nil)
+		}
+
+		key := ""
+		if bu.PrintAccessKey {
+			key = storage.BucketUserCredentialAccessKey
+		}
+
+		if bu.PrintSecretKey {
+			key = storage.BucketUserCredentialSecretKey
+		}
+		return bu.printSecret(ctx, client, user, key)
+	}
+
+	switch out.Format {
+	case full:
+		return bu.printBucketUserInstances(bucketUserList.Items, out, true)
+	case noHeader:
+		return bu.printBucketUserInstances(bucketUserList.Items, out, false)
+	case yamlOut:
+		return format.PrettyPrintObjects(bucketUserList.GetItems(), format.PrintOpts{Out: out.writer})
+	case jsonOut:
+		return format.PrettyPrintObjects(
+			bucketUserList.GetItems(),
+			format.PrintOpts{
+				Out:    out.writer,
+				Format: format.OutputFormatTypeJSON,
+				JSONOpts: format.JSONOutputOptions{
+					PrintSingleItem: bu.Name != "",
+				},
+			})
+	}
+
+	return nil
+}
+
+func (bu *bucketUserCmd) printBucketUserInstances(list []storage.BucketUser, out *output, header bool) error {
+	if header {
+		out.writeHeader("NAME", "LOCATION")
+	}
+
+	for _, bu := range list {
+		out.writeTabRow(bu.Namespace, bu.Name, string(bu.Spec.ForProvider.Location))
+	}
+
+	return out.tabWriter.Flush()
+}
+
+func (bu *bucketUserCmd) printFlagSet() bool {
+	return bu.PrintCredentials || bu.PrintAccessKey || bu.PrintSecretKey
+}
+
+func (bu *bucketUserCmd) printSecret(ctx context.Context, client *api.Client, user *storage.BucketUser, key string) error {
+	data, err := getConnectionSecret(ctx, client, key, user)
+	if err != nil {
+		return err
+	}
+	fmt.Printf("%s\n", data)
+	return nil
+}