Fixes for applying static data.

cmd/admin/v2/network.go

@@ -205,6 +205,7 @@ func (c *networkCmd) Create(rq *adminv2.NetworkServiceCreateRequest) (*apiv2.Net
 		if errorutil.IsConflict(err) {
 			return nil, genericcli.AlreadyExistsError()
 		}
+
 		return nil, err
 	}
 

cmd/admin/v2/partition.go

@@ -5,6 +5,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/metal-stack/api/go/errorutil"
 	adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
 	"github.com/metal-stack/cli/cmd/config"
@@ -48,14 +49,6 @@ func newPartitionCmd(c *config.Config) *cobra.Command {
 		ListPrinter:     func() printers.Printer { return c.ListPrinter },
 		ValidArgsFn:     c.Completion.Partition,
 		Sorter:          sorters.PartitionSorter(),
-		OnlyCmds: genericcli.OnlyCmds(
-			genericcli.DescribeCmd,
-			genericcli.ListCmd,
-			genericcli.CreateCmd,
-			genericcli.UpdateCmd,
-			genericcli.DeleteCmd,
-			genericcli.EditCmd,
-		),
 		CreateCmdMutateFn: func(cmd *cobra.Command) {
 			cmd.Flags().String("id", "", "the id of the partition to create")
 			addMutableFlags(cmd)
@@ -173,7 +166,11 @@ func (c *partition) Create(rq *adminv2.PartitionServiceCreateRequest) (*apiv2.Pa
 
 	resp, err := c.c.Client.Adminv2().Partition().Create(ctx, rq)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create partition: %w", err)
+		if errorutil.IsConflict(err) {
+			return nil, genericcli.AlreadyExistsError()
+		}
+
+		return nil, err
 	}
 
 	return resp.Partition, nil

cmd/admin/v2/project.go

@@ -3,6 +3,7 @@ package v2
 import (
 	"fmt"
 
+	"github.com/metal-stack/api/go/errorutil"
 	adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
 	"github.com/metal-stack/cli/cmd/config"
@@ -24,7 +25,7 @@ func newProjectCmd(c *config.Config) *cobra.Command {
 		c: c,
 	}
 
-	cmdsConfig := &genericcli.CmdsConfig[*apiv2.ProjectServiceCreateRequest, *apiv2.ProjectServiceUpdateRequest, *apiv2.Project]{
+	cmdsConfig := &genericcli.CmdsConfig[*adminv2.ProjectServiceCreateRequest, *apiv2.ProjectServiceUpdateRequest, *apiv2.Project]{
 		BinaryName:      config.BinaryName,
 		GenericCLI:      genericcli.NewGenericCLI(w).WithFS(c.Fs),
 		Singular:        "project",
@@ -43,7 +44,19 @@ func newProjectCmd(c *config.Config) *cobra.Command {
 }
 
 func (c *project) Get(id string) (*apiv2.Project, error) {
-	panic("unimplemented")
+	ctx, cancel := c.c.NewRequestContext()
+	defer cancel()
+
+	req := &apiv2.ProjectServiceGetRequest{
+		Project: id,
+	}
+
+	resp, err := c.c.Client.Apiv2().Project().Get(ctx, req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get project: %w", err)
+	}
+
+	return resp.GetProject(), nil
 }
 
 func (c *project) List() ([]*apiv2.Project, error) {
@@ -73,18 +86,62 @@ func (c *project) List() ([]*apiv2.Project, error) {
 	return resp.GetProjects(), nil
 }
 
-func (c *project) Create(rq *apiv2.ProjectServiceCreateRequest) (*apiv2.Project, error) {
-	panic("unimplemented")
+func (c *project) Create(rq *adminv2.ProjectServiceCreateRequest) (*apiv2.Project, error) {
+	ctx, cancel := c.c.NewRequestContext()
+	defer cancel()
+
+	resp, err := c.c.Client.Adminv2().Project().Create(ctx, rq)
+	if err != nil {
+		if errorutil.IsConflict(err) {
+			return nil, genericcli.AlreadyExistsError()
+		}
+
+		return nil, err
+	}
+
+	return resp.Project, nil
 }
 
 func (c *project) Delete(id string) (*apiv2.Project, error) {
-	panic("unimplemented")
+	ctx, cancel := c.c.NewRequestContext()
+	defer cancel()
+
+	resp, err := c.c.Client.Apiv2().Project().Delete(ctx, &apiv2.ProjectServiceDeleteRequest{
+		Project: id,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to delete project: %w", err)
+	}
+
+	return resp.Project, nil
 }
 
-func (c *project) Convert(r *apiv2.Project) (string, *apiv2.ProjectServiceCreateRequest, *apiv2.ProjectServiceUpdateRequest, error) {
-	panic("unimplemented")
+func (c *project) Convert(r *apiv2.Project) (string, *adminv2.ProjectServiceCreateRequest, *apiv2.ProjectServiceUpdateRequest, error) {
+	return r.Uuid, &adminv2.ProjectServiceCreateRequest{
+		Login:       r.Tenant,
+		Name:        r.Name,
+		Description: r.Description,
+		AvatarUrl:   r.AvatarUrl,
+		Labels:      pointer.SafeDeref(r.Meta).Labels,
+		Project:     pointer.PointerOrNil(r.Uuid),
+	}, &apiv2.ProjectServiceUpdateRequest{
+		Project:     r.Uuid,
+		Name:        pointer.PointerOrNil(r.Name),
+		Description: pointer.PointerOrNil(r.Description),
+		AvatarUrl:   r.AvatarUrl,
+		UpdateMeta:  helpers.UpdateMetaFromMeta(r.Meta),
+		Labels:      helpers.UpdateLabelsFromMeta(r.Meta),
+	}, nil
 }
 
 func (c *project) Update(rq *apiv2.ProjectServiceUpdateRequest) (*apiv2.Project, error) {
-	panic("unimplemented")
+	ctx, cancel := c.c.NewRequestContext()
+	defer cancel()
+
+	resp, err := c.c.Client.Apiv2().Project().Update(ctx, rq)
+	if err != nil {
+		return nil, fmt.Errorf("failed to update project: %w", err)
+	}
+
+	return resp.Project, nil
 }

cmd/admin/v2/tenant.go

@@ -25,7 +25,7 @@ func newTenantCmd(c *config.Config) *cobra.Command {
 		c: c,
 	}
 
-	cmdsConfig := &genericcli.CmdsConfig[*adminv2.TenantServiceCreateRequest, any, *apiv2.Tenant]{
+	cmdsConfig := &genericcli.CmdsConfig[*adminv2.TenantServiceCreateRequest, *apiv2.TenantServiceUpdateRequest, *apiv2.Tenant]{
 		BinaryName:      config.BinaryName,
 		GenericCLI:      genericcli.NewGenericCLI(w).WithFS(c.Fs),
 		Singular:        "tenant",
@@ -54,15 +54,26 @@ func newTenantCmd(c *config.Config) *cobra.Command {
 				AvatarUrl:   pointer.PointerOrNil(viper.GetString("avatar-url")),
 			}, nil
 		},
-		OnlyCmds:    genericcli.OnlyCmds(genericcli.ListCmd, genericcli.CreateCmd),
 		ValidArgsFn: w.c.Completion.AdminTenant,
 	}
 
 	return genericcli.NewCmds(cmdsConfig, newAddMemberCmd(c))
 }
 
 func (c *tenant) Get(id string) (*apiv2.Tenant, error) {
-	panic("unimplemented")
+	ctx, cancel := c.c.NewRequestContext()
+	defer cancel()
+
+	req := &apiv2.TenantServiceGetRequest{
+		Login: id,
+	}
+
+	resp, err := c.c.Client.Apiv2().Tenant().Get(ctx, req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get tenant: %w", err)
+	}
+
+	return resp.GetTenant(), nil
 }
 
 func (c *tenant) List() ([]*apiv2.Tenant, error) {
@@ -110,15 +121,50 @@ func (c *tenant) Create(rq *adminv2.TenantServiceCreateRequest) (*apiv2.Tenant,
 }
 
 func (c *tenant) Delete(id string) (*apiv2.Tenant, error) {
-	panic("unimplemented")
+	ctx, cancel := c.c.NewRequestContext()
+	defer cancel()
+
+	resp, err := c.c.Client.Apiv2().Tenant().Delete(ctx, &apiv2.TenantServiceDeleteRequest{
+		Login: id,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to delete tenant: %w", err)
+	}
+
+	return resp.Tenant, nil
 }
 
-func (c *tenant) Convert(r *apiv2.Tenant) (string, *adminv2.TenantServiceCreateRequest, any, error) {
-	panic("unimplemented")
+func (c *tenant) Convert(r *apiv2.Tenant) (string, *adminv2.TenantServiceCreateRequest, *apiv2.TenantServiceUpdateRequest, error) {
+	return r.Login, &adminv2.TenantServiceCreateRequest{
+			Name:        r.Name,
+			Description: pointer.PointerOrNil(r.Description),
+			Email:       pointer.PointerOrNil(r.Email),
+			AvatarUrl:   pointer.PointerOrNil(r.AvatarUrl),
+			Labels:      pointer.SafeDeref(r.Meta).Labels,
+			Login:       pointer.PointerOrNil(r.Login),
+		},
+		&apiv2.TenantServiceUpdateRequest{
+			Login:       r.Login,
+			Name:        pointer.PointerOrNil(r.Name),
+			Email:       pointer.PointerOrNil(r.Email),
+			Description: pointer.PointerOrNil(r.Description),
+			AvatarUrl:   pointer.PointerOrNil(r.AvatarUrl),
+			UpdateMeta:  helpers.UpdateMetaFromMeta(r.Meta),
+			Labels:      helpers.UpdateLabelsFromMeta(r.Meta),
+		},
+		nil
 }
 
-func (c *tenant) Update(rq any) (*apiv2.Tenant, error) {
-	panic("unimplemented")
+func (c *tenant) Update(rq *apiv2.TenantServiceUpdateRequest) (*apiv2.Tenant, error) {
+	ctx, cancel := c.c.NewRequestContext()
+	defer cancel()
+
+	resp, err := c.c.Client.Apiv2().Tenant().Update(ctx, rq)
+	if err != nil {
+		return nil, fmt.Errorf("failed to update tenant: %w", err)
+	}
+
+	return resp.Tenant, nil
 }
 
 func newAddMemberCmd(c *config.Config) *cobra.Command {

cmd/api/v2/project.go

@@ -114,57 +114,7 @@ func newProjectCmd(c *config.Config) *cobra.Command {
 
 	inviteCmd.AddCommand(generateInviteCmd, deleteInviteCmd, listInvitesCmd, joinProjectCmd)
 
-	memberCmd := &cobra.Command{
-		Use:     "member",
-		Aliases: []string{"members"},
-		Short:   "manage project members",
-	}
-
-	listMembersCmd := &cobra.Command{
-		Use:     "list",
-		Aliases: []string{"ls"},
-		Short:   "lists members of a project",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return w.listMembers()
-		},
-	}
-
-	listMembersCmd.Flags().StringP("project", "p", "", "the project of which to list the members")
-
-	genericcli.AddSortFlag(listMembersCmd, sorters.ProjectMemberSorter())
-
-	removeMemberCmd := &cobra.Command{
-		Use:     "delete <member>",
-		Aliases: []string{"destroy", "rm", "remove"},
-		Short:   "remove member from a project",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return w.removeMember(args)
-		},
-		ValidArgsFunction: c.Completion.ProjectMember,
-	}
-
-	removeMemberCmd.Flags().StringP("project", "p", "", "the project in which to remove the member")
-
-	genericcli.Must(removeMemberCmd.RegisterFlagCompletionFunc("project", c.Completion.Project))
-
-	updateMemberCmd := &cobra.Command{
-		Use:   "update <member>",
-		Short: "update member from a project",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return w.updateMember(args)
-		},
-		ValidArgsFunction: c.Completion.ProjectMember,
-	}
-
-	updateMemberCmd.Flags().StringP("project", "p", "", "the project in which to remove the member")
-	updateMemberCmd.Flags().String("role", "", "the role of the member")
-
-	genericcli.Must(updateMemberCmd.RegisterFlagCompletionFunc("project", c.Completion.Project))
-	genericcli.Must(updateMemberCmd.RegisterFlagCompletionFunc("role", c.Completion.ProjectRole))
-
-	memberCmd.AddCommand(removeMemberCmd, updateMemberCmd, listMembersCmd)
-
-	return genericcli.NewCmds(cmdsConfig, joinProjectCmd, inviteCmd, memberCmd)
+	return genericcli.NewCmds(cmdsConfig, joinProjectCmd, inviteCmd, newProjectMemberCmd(c))
 }
 
 func (c *project) Get(id string) (*apiv2.Project, error) {
@@ -223,6 +173,7 @@ func (c *project) Create(rq *apiv2.ProjectServiceCreateRequest) (*apiv2.Project,
 
 		return nil, err
 	}
+
 	return resp.Project, nil
 }
 
@@ -245,10 +196,15 @@ func (c *project) Convert(r *apiv2.Project) (string, *apiv2.ProjectServiceCreate
 		Login:       r.Tenant,
 		Name:        r.Name,
 		Description: r.Description,
+		AvatarUrl:   r.AvatarUrl,
+		Labels:      pointer.SafeDeref(r.Meta).Labels,
 	}, &apiv2.ProjectServiceUpdateRequest{
 		Project:     r.Uuid,
-		Name:        new(r.Name),
-		Description: new(r.Description),
+		Name:        pointer.PointerOrNil(r.Name),
+		Description: pointer.PointerOrNil(r.Description),
+		AvatarUrl:   r.AvatarUrl,
+		UpdateMeta:  helpers.UpdateMetaFromMeta(r.Meta),
+		Labels:      helpers.UpdateLabelsFromMeta(r.Meta),
 	}, nil
 }
 
@@ -409,66 +365,3 @@ func (c *project) deleteInvite(args []string) error {
 
 	return nil
 }
-
-func (c *project) removeMember(args []string) error {
-	member, err := genericcli.GetExactlyOneArg(args)
-	if err != nil {
-		return err
-	}
-
-	ctx, cancel := c.c.NewRequestContext()
-	defer cancel()
-
-	_, err = c.c.Client.Apiv2().Project().RemoveMember(ctx, &apiv2.ProjectServiceRemoveMemberRequest{
-		Project: c.c.GetProject(),
-		Member:  member,
-	})
-	if err != nil {
-		return fmt.Errorf("failed to remove member from project: %w", err)
-	}
-
-	_, _ = fmt.Fprintf(c.c.Out, "%s successfully removed member %q\n", color.GreenString("✔"), member)
-
-	return nil
-}
-
-func (c *project) updateMember(args []string) error {
-	member, err := genericcli.GetExactlyOneArg(args)
-	if err != nil {
-		return err
-	}
-
-	ctx, cancel := c.c.NewRequestContext()
-	defer cancel()
-
-	resp, err := c.c.Client.Apiv2().Project().UpdateMember(ctx, &apiv2.ProjectServiceUpdateMemberRequest{
-		Project: c.c.GetProject(),
-		Member:  member,
-		Role:    apiv2.ProjectRole(apiv2.ProjectRole_value[viper.GetString("role")]),
-	})
-	if err != nil {
-		return fmt.Errorf("failed to update member: %w", err)
-	}
-
-	return c.c.DescribePrinter.Print(resp.GetProjectMember())
-}
-
-func (c *project) listMembers() error {
-	ctx, cancel := c.c.NewRequestContext()
-	defer cancel()
-
-	resp, err := c.c.Client.Apiv2().Project().Get(ctx, &apiv2.ProjectServiceGetRequest{
-		Project: c.c.GetProject(),
-	})
-	if err != nil {
-		return fmt.Errorf("failed to get project: %w", err)
-	}
-
-	members := resp.GetProjectMembers()
-
-	if err := sorters.ProjectMemberSorter().SortBy(members); err != nil {
-		return err
-	}
-
-	return c.c.ListPrinter.Print(members)
-}