(#175) Make holos render --cluster-name flag optional

Problem:
Rendering the whole platform doesn't need a cluster name.

Solution:
Make the flag optional, do not set the cue tag if it's empty.

Result:
Holos renders the platform resource and proceeds to the point where we
need to implement the iteration over platform components, passing the
platform model to each one and rendering the component.

api/v1alpha1/buildplan.go

@@ -9,9 +9,8 @@ import (
 type BuildPlan struct {
 	TypeMeta `json:",inline" yaml:",inline"`
 	// Metadata represents the holos component name
-	Metadata ObjectMeta     `json:"metadata,omitempty" yaml:"metadata,omitempty"`
-	Spec     BuildPlanSpec  `json:"spec,omitempty" yaml:"spec,omitempty"`
-	Platform map[string]any `json:"platform,omitempty" yaml:"platform,omitempty"`
+	Metadata ObjectMeta    `json:"metadata,omitempty" yaml:"metadata,omitempty"`
+	Spec     BuildPlanSpec `json:"spec,omitempty" yaml:"spec,omitempty"`
 }
 
 type BuildPlanSpec struct {

api/v1alpha1/platform.go

@@ -1,9 +1,22 @@
 package v1alpha1
 
-// Platform represents a platform to manage.  A Platform resource tells holos
-// which components to build.  The primary use case is to specify the cluster
-// names, cluster types, and holos components to build.
+import "google.golang.org/protobuf/types/known/structpb"
+
+// Platform represents a platform to manage.  A Platform resource informs holos
+// which components to build.  The platform resource also acts as a container
+// for the platform model form values provided by the PlatformService.  The
+// primary use case is to collect the cluster names, cluster types, platform
+// model, and holos components to build into one resource.
 type Platform struct {
 	TypeMeta `json:",inline" yaml:",inline"`
-	Metadata ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
+	Metadata ObjectMeta   `json:"metadata,omitempty" yaml:"metadata,omitempty"`
+	Spec     PlatformSpec `json:"spec,omitempty" yaml:"spec,omitempty"`
+}
+
+// PlatformSpec represents the platform build plan specification.
+type PlatformSpec struct {
+	// Model represents the platform model holos gets from from the
+	// holos.platform.v1alpha1.PlatformService.GetPlatform method and provides to
+	// CUE using a tag.
+	Model structpb.Struct `json:"model,omitempty" yaml:"model,omitempty"`
 }

cmd/holos/testdata/version.txt

@@ -1,5 +1,3 @@
 exec holos --version
 # want version with no v on stdout
 stdout -count=1 '^\d+\.\d+\.\d+$'
-# want nothing on stderr
-! stderr .

docs/examples/platforms/reference/clusters/workload/holos-run/dev/app/holos-run-app.cue

@@ -34,7 +34,7 @@ let OBJECTS = #APIObjects & {
 					containers: [
 						{
 							name:            Holos
-							image:           "271053619184.dkr.ecr.us-east-2.amazonaws.com/holos-run/holos-server/holos:v0.76.0"
+							image:           "271053619184.dkr.ecr.us-east-2.amazonaws.com/holos-run/holos-server/holos:v0.79.0"
 							imagePullPolicy: "Always"
 							env: [
 								{

go.mod

@@ -87,7 +87,7 @@ require (
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/cli v26.0.0+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v26.0.0+incompatible // indirect
+	github.com/docker/docker v26.0.2+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.1 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect

go.sum

@@ -187,8 +187,8 @@ github.com/docker/cli v26.0.0+incompatible h1:90BKrx1a1HKYpSnnBFR6AgDq/FqkHxwlUy
 github.com/docker/cli v26.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v26.0.0+incompatible h1:Ng2qi+gdKADUa/VM+6b6YaY2nlZhk/lVJiKR/2bMudU=
-github.com/docker/docker v26.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v26.0.2+incompatible h1:yGVmKUFGgcxA6PXWAokO0sQL22BrQ67cgVjko8tGdXE=
+github.com/docker/docker v26.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo=
 github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=

internal/builder/builder.go

@@ -99,7 +99,9 @@ func (b *Builder) Instances(ctx context.Context) ([]*build.Instance, error) {
 	}
 
 	// Refer to https://github.com/cue-lang/cue/blob/v0.7.0/cmd/cue/cmd/common.go#L429
-	cfg.Tags = append(cfg.Tags, "cluster="+b.Cluster())
+	if b.Cluster() != "" {
+		cfg.Tags = append(cfg.Tags, "cluster="+b.Cluster())
+	}
 	log.DebugContext(ctx, fmt.Sprintf("cue: tags %v", cfg.Tags))
 
 	return load.Instances(args, &cfg), nil

internal/cli/push/push.go

@@ -2,11 +2,15 @@
 package push
 
 import (
+	"fmt"
+	"log/slog"
+
 	"github.com/holos-run/holos/internal/cli/command"
 	"github.com/holos-run/holos/internal/client"
 	"github.com/holos-run/holos/internal/errors"
 	"github.com/holos-run/holos/internal/holos"
 	"github.com/holos-run/holos/internal/push"
+	"github.com/holos-run/holos/internal/server/middleware/logger"
 	"github.com/spf13/cobra"
 )
 
@@ -46,6 +50,7 @@ func NewPlatformForm(cfg *client.Config) *cobra.Command {
 		if ctx == nil {
 			return errors.Wrap(errors.New("cannot execute: no context"))
 		}
+		ctx = logger.NewContext(ctx, logger.FromContext(ctx).With("server", cfg.Client().Server()))
 		rpc := client.New(cfg)
 		for _, name := range args {
 			// Get the platform metadata for the platform id.
@@ -62,6 +67,7 @@ func NewPlatformForm(cfg *client.Config) *cobra.Command {
 			if err := rpc.UpdateForm(ctx, p.GetId(), form); err != nil {
 				return errors.Wrap(err)
 			}
+			slog.Default().InfoContext(ctx, fmt.Sprintf("pushed: %s/ui/platform/%s", cfg.Client().Server(), p.GetId()))
 		}
 		return nil
 	}

internal/cli/render/render.go

@@ -28,11 +28,7 @@ func New(cfg *holos.Config) *cobra.Command {
 	cmd.Flags().AddGoFlagSet(flagSet)
 
 	cmd.RunE = func(cmd *cobra.Command, args []string) error {
-		if cfg.ClusterName() == "" {
-			return errors.Wrap(fmt.Errorf("missing cluster name"))
-		}
-
-		ctx := cmd.Context()
+		ctx := cmd.Root().Context()
 		log := logger.FromContext(ctx).With("cluster", cfg.ClusterName())
 		build := builder.New(builder.Entrypoints(args), builder.Cluster(cfg.ClusterName()))
 

internal/client/client.go

@@ -64,6 +64,6 @@ func (c *Client) UpdateForm(ctx context.Context, platformID string, form *object
 		return errors.Wrap(err)
 	}
 	log := logger.FromContext(ctx)
-	log.InfoContext(ctx, "updated platform", "platform_id", platformID, "duration", time.Since(start))
+	log.DebugContext(ctx, "updated platform", "platform_id", platformID, "duration", time.Since(start))
 	return nil
 }

internal/generate/platforms/bare/platform.cue

@@ -0,0 +1,22 @@
+package holos
+
+import "encoding/json"
+
+import v1 "github.com/holos-run/holos/api/v1alpha1"
+
+// _Platform provides a platform resource to the holos cli for rendering.  The
+// field is hidden because most components need to refer to platform data,
+// specifically the platform model and the project models.  The platform
+// resource itself is output once when rendering the entire platform, see the
+// platform/ subdirectory.
+_Platform: v1.#Platform & {
+	metadata: name: string | *"bare" @tag(platform_name, type=string)
+
+	// spec is the platform specification
+	spec: {
+		// model represents the web form values provided by the user.
+		model: json.Unmarshal(_model)
+		// _model is the json representation of model injected into CUE from holos.
+		_model: string | *"{}" @tag(platform_model, type=string)
+	}
+}

internal/generate/platforms/bare/platform/platform.cue

@@ -0,0 +1,4 @@
+package holos
+
+// Output the Platform resource for holos to render the entire platform.
+{} & _Platform

internal/generate/platforms/cue.mod/gen/github.com/holos-run/holos/api/v1alpha1/buildplan_go_gen.cue

@@ -11,7 +11,6 @@ package v1alpha1
 	// Metadata represents the holos component name
 	metadata?: #ObjectMeta    @go(Metadata)
 	spec?:     #BuildPlanSpec @go(Spec)
-	platform?: {...} @go(Platform,map[string]any)
 }
 
 #BuildPlanSpec: {

internal/generate/platforms/cue.mod/gen/github.com/holos-run/holos/api/v1alpha1/platform_go_gen.cue

@@ -4,10 +4,23 @@
 
 package v1alpha1
 
-// Platform represents a platform to manage.  A Platform resource tells holos
-// which components to build.  The primary use case is to specify the cluster
-// names, cluster types, and holos components to build.
+import "google.golang.org/protobuf/types/known/structpb"
+
+// Platform represents a platform to manage.  A Platform resource informs holos
+// which components to build.  The platform resource also acts as a container
+// for the platform model form values provided by the PlatformService.  The
+// primary use case is to collect the cluster names, cluster types, platform
+// model, and holos components to build into one resource.
 #Platform: {
 	#TypeMeta
-	metadata?: #ObjectMeta @go(Metadata)
+	metadata?: #ObjectMeta   @go(Metadata)
+	spec?:     #PlatformSpec @go(Spec)
+}
+
+// PlatformSpec represents the platform build plan specification.
+#PlatformSpec: {
+	// Model represents the platform model holos gets from from the
+	// holos.platform.v1alpha1.PlatformService.GetPlatform method and provides to
+	// CUE using a tag.
+	model?: structpb.#Struct @go(Model)
 }

internal/generate/platforms/cue.mod/pkg/github.com/holos-run/holos/api/v1alpha1/platform.cue

@@ -12,9 +12,5 @@ package v1alpha1
 		// model represents the user defined platform model, which is produced and
 		// defined by the user supplied form.
 		model: {...}
-
-		// components represents components to manage in the platform, organized by
-		// the kind of cluster the rendered configuration applies to.
-		components: {}
 	}
 }

internal/holos/clientcontext.go

@@ -40,6 +40,9 @@ func (cc *ClientContext) Save(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	if len(data) > 0 {
+		data = append(data, '\n')
+	}
 	if err := os.WriteFile(config, data, 0644); err != nil {
 		return err
 	}

internal/register/register.go

@@ -48,8 +48,17 @@ func User(ctx context.Context, cfg *client.Config) error {
 		}
 	}
 
-	// Ensure the current user id gets saved.
-	cc.UserID = u.GetId()
+	server := cfg.Client().Server()
+
+	// If the user switched servers, they've switched contexts and we need to
+	// replace the current context.  Consider indexing the client context on the
+	// server hostname instead of replacing it.  For now, it's easy enough to
+	// re-run the registration command to get the current context.
+	if cc.UserID != u.GetId() {
+		log.WarnContext(ctx, "context changed", "server", server, "prevUserID", cc.UserID, "currentUserID", u.GetId())
+		cc.UserID = u.GetId()
+		cc.OrgID = ""
+	}
 
 	// Ensure an org ID gets saved.
 	if cc.OrgID == "" {
@@ -65,7 +74,7 @@ func User(ctx context.Context, cfg *client.Config) error {
 		return errors.Wrap(err)
 	}
 
-	log.InfoContext(ctx, "user", "email", u.GetEmail(), "user_id", cc.UserID, "org_id", cc.OrgID)
+	log.InfoContext(ctx, "user", "email", u.GetEmail(), "server", server, "user_id", cc.UserID, "org_id", cc.OrgID)
 	return nil
 }
 

version/embedded/minor

@@ -1 +1 @@
-79
+80