🎨 Move Capsule config to clusters

build/.mockery.yaml

@@ -15,3 +15,6 @@ packages:
     interfaces:
       Session:
       Capsule:
+  github.com/rigdev/rig/internal/gateway/cluster:
+    interfaces:
+      ConfigGateway:

cmd/rig-admin/cmd/capsule.go

@@ -16,8 +16,8 @@ import (
 )
 
 var (
-	capsuleName string
-	buildImage  string
+	capsuleID  string
+	buildImage string
 
 	listOffset int
 	listLimit  int
@@ -47,7 +47,7 @@ func init() {
 		Args: cobra.ExactArgs(1),
 		RunE: register(CapsuleUpdate),
 	}
-	update.PersistentFlags().StringVarP(&capsuleName, "name", "n", "", "name of the capsule")
+	update.PersistentFlags().StringVarP(&capsuleID, "name", "n", "", "name of the capsule")
 	capsule.AddCommand(update)
 
 	list := &cobra.Command{
@@ -105,22 +105,19 @@ func CapsuleCreate(ctx context.Context, cmd *cobra.Command, args []string, cs *c
 		return err
 	}
 
-	logger.Info("created capsule", zap.Stringer("capsule_id", id), zap.String("name", args[0]))
+	logger.Info("created capsule", zap.String("capsule_id", id), zap.String("name", args[0]))
 
 	return nil
 }
 
 func CapsuleDelete(ctx context.Context, cmd *cobra.Command, args []string, cs *capsule_service.Service, logger *zap.Logger) error {
-	capsuleID, err := uuid.Parse(args[0])
-	if err != nil {
-		return err
-	}
+	capsuleID := args[0]
 
 	if err := cs.DeleteCapsule(ctx, capsuleID); err != nil {
 		return err
 	}
 
-	logger.Info("capsule deleted", zap.Stringer("capsule_id", capsuleID))
+	logger.Info("capsule deleted", zap.String("capsule_id", capsuleID))
 
 	return nil
 }
@@ -160,17 +157,14 @@ func CapsuleList(ctx context.Context, cmd *cobra.Command, args []string, cs *cap
 				return err
 			}
 		}
-		logger.Info("Capsule Listed", zap.String("name", c.GetName()), zap.String("id", c.GetCapsuleId()),
+		logger.Info("Capsule Listed", zap.String("name", c.GetCapsuleId()), zap.String("id", c.GetCapsuleId()),
 			zap.Uint64("current rollout", c.GetCurrentRollout()))
 	}
 	return nil
 }
 
 func CapsuleCreateBuild(ctx context.Context, cmd *cobra.Command, args []string, cs *capsule_service.Service, logger *zap.Logger) error {
-	capsuleID, err := uuid.Parse(args[0])
-	if err != nil {
-		return err
-	}
+	capsuleID := args[0]
 
 	buildID, err := cs.CreateBuild(ctx, capsuleID, buildImage, "", nil, nil, true)
 	if err != nil {
@@ -183,10 +177,7 @@ func CapsuleCreateBuild(ctx context.Context, cmd *cobra.Command, args []string,
 }
 
 func CapsuleListBuilds(ctx context.Context, cmd *cobra.Command, args []string, cs *capsule_service.Service, logger *zap.Logger) error {
-	capsuleID, err := uuid.Parse(args[0])
-	if err != nil {
-		return err
-	}
+	capsuleID := args[0]
 
 	it, total, err := cs.ListBuilds(ctx, capsuleID, &model.Pagination{
 		Offset: uint32(listOffset),
@@ -196,7 +187,7 @@ func CapsuleListBuilds(ctx context.Context, cmd *cobra.Command, args []string, c
 		return err
 	}
 
-	logger.Info("Builds listed", zap.Int("total", int(total)), zap.Stringer("capsule_id", capsuleID))
+	logger.Info("Builds listed", zap.Int("total", int(total)), zap.String("capsule_id", capsuleID))
 	for {
 		c, err := it.Next()
 		if err != nil {
@@ -212,11 +203,7 @@ func CapsuleListBuilds(ctx context.Context, cmd *cobra.Command, args []string, c
 }
 
 func CapsuleDeleteBuild(ctx context.Context, cmd *cobra.Command, args []string, cs *capsule_service.Service, logger *zap.Logger) error {
-	capsuleID, err := uuid.Parse(args[0])
-	if err != nil {
-		return err
-	}
-
+	capsuleID := args[0]
 	buildID := args[1]
 
 	if err := cs.DeleteBuild(ctx, capsuleID, buildID); err != nil {
@@ -229,11 +216,7 @@ func CapsuleDeleteBuild(ctx context.Context, cmd *cobra.Command, args []string,
 }
 
 func CapsuleDeployBuild(ctx context.Context, cmd *cobra.Command, args []string, cs *capsule_service.Service, logger *zap.Logger) error {
-	capsuleID, err := uuid.Parse(args[0])
-	if err != nil {
-		return err
-	}
-
+	capsuleID := args[0]
 	buildID := args[1]
 	cgs := []*capsule.Change{{
 		Field: &capsule.Change_BuildId{BuildId: buildID},

cmd/rig/cmd/capsule/abort.go

@@ -12,7 +12,7 @@ import (
 func CapsuleAbort(ctx context.Context, cmd *cobra.Command, capsuleID CapsuleID, nc rig.Client) error {
 	c, err := nc.Capsule().Get(ctx, &connect.Request[capsule.GetRequest]{
 		Msg: &capsule.GetRequest{
-			CapsuleId: capsuleID.String(),
+			CapsuleId: capsuleID,
 		},
 	})
 	if err != nil {
@@ -21,7 +21,7 @@ func CapsuleAbort(ctx context.Context, cmd *cobra.Command, capsuleID CapsuleID,
 
 	if _, err := nc.Capsule().AbortRollout(ctx, &connect.Request[capsule.AbortRolloutRequest]{
 		Msg: &capsule.AbortRolloutRequest{
-			CapsuleId: capsuleID.String(),
+			CapsuleId: capsuleID,
 			RolloutId: c.Msg.GetCapsule().GetCurrentRollout(),
 		},
 	}); err != nil {

cmd/rig/cmd/capsule/common.go

@@ -12,7 +12,7 @@ import (
 
 func getCurrentContainerSettings(ctx context.Context, capsuleID CapsuleID, client rig.Client) (*capsule.ContainerSettings, error) {
 	resp, err := client.Capsule().ListRollouts(ctx, connect.NewRequest(&capsule.ListRolloutsRequest{
-		CapsuleId: capsuleID.String(),
+		CapsuleId: capsuleID,
 		Pagination: &model.Pagination{
 			Offset:     0,
 			Limit:      1,
@@ -28,7 +28,7 @@ func getCurrentContainerSettings(ctx context.Context, capsuleID CapsuleID, clien
 	}
 
 	r, err := client.Capsule().GetRollout(ctx, connect.NewRequest(&capsule.GetRolloutRequest{
-		CapsuleId: capsuleID.String(),
+		CapsuleId: capsuleID,
 		RolloutId: resp.Msg.Rollouts[0].RolloutId,
 	}))
 	if err != nil {

cmd/rig/cmd/capsule/config.go

@@ -25,7 +25,7 @@ func CapsuleConfig(ctx context.Context, cmd *cobra.Command, capsuleID CapsuleID,
 
 	if _, err := nc.Capsule().Deploy(ctx, &connect.Request[capsule.DeployRequest]{
 		Msg: &capsule.DeployRequest{
-			CapsuleId: capsuleID.String(),
+			CapsuleId: capsuleID,
 			Changes:   cs,
 		},
 	}); err != nil {

cmd/rig/cmd/capsule/configure_network.go

@@ -48,7 +48,7 @@ func CapsuleConfigureNetwork(ctx context.Context, cmd *cobra.Command, args []str
 
 	if _, err := nc.Capsule().Deploy(ctx, &connect.Request[capsule.DeployRequest]{
 		Msg: &capsule.DeployRequest{
-			CapsuleId: capsuleID.String(),
+			CapsuleId: capsuleID,
 			Changes: []*capsule.Change{{
 				Field: &capsule.Change_Network{
 					Network: n,

cmd/rig/cmd/capsule/create.go

@@ -11,7 +11,6 @@ import (
 	"github.com/rigdev/rig/cmd/common"
 	"github.com/rigdev/rig/cmd/rig/cmd/cmd_config"
 	"github.com/rigdev/rig/pkg/errors"
-	"github.com/rigdev/rig/pkg/uuid"
 	"github.com/spf13/cobra"
 )
 
@@ -226,16 +225,13 @@ func CapsuleCreate(ctx context.Context, cmd *cobra.Command, args []string, nc ri
 		return err
 	}
 
-	capsuleID, err := uuid.Parse(res.Msg.GetCapsuleId())
-	if err != nil {
-		return err
-	}
+	capsuleID := res.Msg.GetCapsuleId()
 
 	if image != "" {
 		var buildID string
 		if res, err := nc.Capsule().CreateBuild(ctx, &connect.Request[capsule.CreateBuildRequest]{
 			Msg: &capsule.CreateBuildRequest{
-				CapsuleId: capsuleID.String(),
+				CapsuleId: capsuleID,
 				Image:     image,
 			},
 		}); err != nil {
@@ -262,7 +258,7 @@ func CapsuleCreate(ctx context.Context, cmd *cobra.Command, args []string, nc ri
 	if len(init) > 0 {
 		if _, err := nc.Capsule().Deploy(ctx, &connect.Request[capsule.DeployRequest]{
 			Msg: &capsule.DeployRequest{
-				CapsuleId: capsuleID.String(),
+				CapsuleId: capsuleID,
 				Changes:   init,
 			},
 		}); err != nil {