OSAC-1551: Add tenant scoping to the CLI

internal/cmd/cli/create/cluster/create_cluster_cmd.go

@@ -316,7 +316,8 @@ func (c *runnerContext) applyOptionalSpecFields(
 func (c *runnerContext) createCluster(ctx context.Context, spec *publicv1.ClusterSpec) error {
 	cluster := publicv1.Cluster_builder{
 		Metadata: publicv1.Metadata_builder{
-			Name: c.args.name,
+			Name:   c.args.name,
+			Tenant: config.TenantFromContext(ctx),
 		}.Build(),
 		Spec: spec,
 	}.Build()

internal/cmd/cli/create/computeinstance/create_compute_instance_cmd.go

@@ -263,7 +263,8 @@ func (c *runnerContext) run(cmd *cobra.Command, args []string) error {
 
 		computeInstance := publicv1.ComputeInstance_builder{
 			Metadata: publicv1.Metadata_builder{
-				Name: c.args.name,
+				Name:   c.args.name,
+				Tenant: config.TenantFromContext(ctx),
 			}.Build(),
 			Spec: specResult,
 		}.Build()

internal/cmd/cli/create/create_cmd.go

@@ -154,13 +154,17 @@ func (c *runnerContext) run(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+	tenant := config.TenantFromContext(ctx)
 	for i, object := range objects {
 		objectDesc := object.ProtoReflect().Descriptor()
 		objectType := string(objectDesc.FullName())
 		objectHelper := helper.Lookup(objectType)
 		if objectHelper == nil {
 			return fmt.Errorf("input object at index %d is of an unknown type '%s'", i, objectType)
 		}
+		if tenant != "" && objectHelper.IsTenantScoped() {
+			objectHelper.SetTenant(object, tenant)
+		}
 		object, err = objectHelper.Create(ctx, object)
 		if err != nil {
 			return fmt.Errorf("failed to create object at index %d: %w", i, err)

internal/cmd/cli/create/publicip/create_publicip_cmd.go

@@ -105,7 +105,7 @@ func (c *runnerContext) run(cmd *cobra.Command, args []string) error {
 		Pool: pool.GetId(),
 	}
 	publicIP := publicv1.PublicIP_builder{
-		Metadata: publicv1.Metadata_builder{Name: c.args.name}.Build(),
+		Metadata: publicv1.Metadata_builder{Name: c.args.name, Tenant: config.TenantFromContext(ctx)}.Build(),
 		Spec:     spec.Build(),
 	}.Build()
 

internal/cmd/cli/create/securitygroup/create_securitygroup_cmd.go

@@ -130,7 +130,7 @@ func (c *runnerContext) run(cmd *cobra.Command, args []string) error {
 	client := publicv1.NewSecurityGroupsClient(conn)
 
 	sg := publicv1.SecurityGroup_builder{
-		Metadata: publicv1.Metadata_builder{Name: c.args.name}.Build(),
+		Metadata: publicv1.Metadata_builder{Name: c.args.name, Tenant: config.TenantFromContext(ctx)}.Build(),
 		Spec: publicv1.SecurityGroupSpec_builder{
 			VirtualNetwork: vn.GetId(),
 			Ingress:        ingress,

internal/cmd/cli/create/subnet/create_subnet_cmd.go

@@ -130,7 +130,7 @@ func (c *runnerContext) run(cmd *cobra.Command, args []string) error {
 		spec.Ipv6Cidr = &c.args.ipv6Cidr
 	}
 	subnet := publicv1.Subnet_builder{
-		Metadata: publicv1.Metadata_builder{Name: c.args.name}.Build(),
+		Metadata: publicv1.Metadata_builder{Name: c.args.name, Tenant: config.TenantFromContext(ctx)}.Build(),
 		Spec:     spec.Build(),
 	}.Build()
 

internal/cmd/cli/create/virtualnetwork/create_virtualnetwork_cmd.go

@@ -123,7 +123,7 @@ func (c *runnerContext) run(cmd *cobra.Command, args []string) error {
 		spec.Ipv6Cidr = &c.args.ipv6Cidr
 	}
 	vn := publicv1.VirtualNetwork_builder{
-		Metadata: publicv1.Metadata_builder{Name: c.args.name}.Build(),
+		Metadata: publicv1.Metadata_builder{Name: c.args.name, Tenant: config.TenantFromContext(ctx)}.Build(),
 		Spec:     spec.Build(),
 	}.Build()
 

internal/cmd/cli/root_cmd.go

@@ -32,6 +32,7 @@ import (
 	"github.com/osac-project/fulfillment-service/internal/cmd/cli/label"
 	"github.com/osac-project/fulfillment-service/internal/cmd/cli/login"
 	"github.com/osac-project/fulfillment-service/internal/cmd/cli/logout"
+	"github.com/osac-project/fulfillment-service/internal/cmd/cli/tenant"
 	"github.com/osac-project/fulfillment-service/internal/cmd/cli/version"
 	"github.com/osac-project/fulfillment-service/internal/config"
 	"github.com/osac-project/fulfillment-service/internal/logging"
@@ -85,6 +86,12 @@ func Root() (result *cobra.Command, err error) {
 		defaultCacheDir,
 		cacheFlagHelp,
 	)
+	flags.StringVar(
+		&runner.args.tenant,
+		tenantFlag,
+		"",
+		tenantFlagHelp,
+	)
 
 	// Add commands:
 	result.AddCommand(annotate.Cmd())
@@ -97,6 +104,7 @@ func Root() (result *cobra.Command, err error) {
 	result.AddCommand(label.Cmd())
 	result.AddCommand(login.Cmd())
 	result.AddCommand(logout.Cmd())
+	result.AddCommand(tenant.Cmd())
 	result.AddCommand(version.Cmd())
 
 	// Configure the root command, and therefore all its subcommands, to use Markdown for their help output:
@@ -110,6 +118,7 @@ type runnerContext struct {
 	args       struct {
 		configDir string
 		cacheDir  string
+		tenant    string
 	}
 }
 
@@ -197,11 +206,21 @@ func (c *runnerContext) persistentPreRun(cmd *cobra.Command, args []string) erro
 		return fmt.Errorf("failed to create console: %w", err)
 	}
 
-	// Replace the default context with one that contains the logger, the settings, and the console:
+	// Resolve the effective tenant: flag takes precedence over saved setting.
+	tenant := settings.Tenant()
+	if flags.Changed(tenantFlag) {
+		tenant = c.args.tenant
+	}
+
+	// Replace the default context with one that contains the logger, the settings, the console,
+	// and the resolved tenant:
 	ctx := cmd.Context()
 	ctx = logging.LoggerIntoContext(ctx, logger)
 	ctx = config.SettingsIntoContext(ctx, settings)
 	ctx = terminal.ConsoleIntoContext(ctx, console)
+	if tenant != "" {
+		ctx = config.TenantIntoContext(ctx, tenant)
+	}
 	cmd.SetContext(ctx)
 
 	return nil
@@ -211,6 +230,7 @@ func (c *runnerContext) persistentPreRun(cmd *cobra.Command, args []string) erro
 const (
 	configFlag = "config"
 	cacheFlag  = "cache"
+	tenantFlag = "tenant"
 )
 
 // Names of the environment variables:
@@ -235,6 +255,12 @@ Secrets, such as tokens and passwords, are stored in the operating system keyrin
 they are stored in a file named {{ bt }}secrets.json{{ bt }} inside this directory.
 `
 
+const tenantFlagHelp = `
+_NAME_ - Scope operations to the specified tenant. When set, list operations automatically filter by tenant,
+and create operations populate {{ bt }}metadata.tenant{{ bt }} on new objects. If a current tenant has been
+saved with {{ bt }}{{ binary }} tenant <name>{{ bt }}, the flag takes precedence.
+`
+
 const cacheFlagHelp = `
 _DIRECTORY_ - Directory where cache and log files are stored. Can also be set with the {{ bt }}OSAC_CACHE{{ bt }}
 environment variable. If both are provided, the flag takes precedence.

internal/cmd/cli/tenant/templates/current_tenant.txt

@@ -0,0 +1 @@
+Current tenant: {{ .Tenant }}

internal/cmd/cli/tenant/templates/multiple_matches.txt

@@ -0,0 +1,14 @@
+Name '{{ .Ref }}' is ambiguous.
+
+{{ if lt (len .Matches) .Total }}
+There are {{ .Total }} matching tenants, these are the first {{ len .Matches }}:
+{{ else }}
+There are {{ .Total }} matching tenants:
+{{ end }}
+
+{{ table .Matches }}
+
+{{ $first := index .Matches 0 }}
+Use the identifier instead of the name to avoid ambiguity:
+
+  {{ binary }} tenant {{ $first.GetId }}

internal/cmd/cli/tenant/templates/no_matches.txt

@@ -0,0 +1,5 @@
+Tenant '{{ .Ref }}' not found.
+
+Use the 'get' command to list available tenants:
+
+  {{ binary }} get tenants

internal/cmd/cli/tenant/templates/no_tenant.txt

@@ -0,0 +1,9 @@
+No tenant is currently set.
+
+To list available tenants:
+
+  {{ binary }} get tenants
+
+To set a tenant:
+
+  {{ binary }} tenant <name>

internal/cmd/cli/tenant/templates/tenant_cleared.txt

@@ -0,0 +1 @@
+Tenant cleared.

internal/cmd/cli/tenant/templates/tenant_set.txt

@@ -0,0 +1 @@
+Tenant '{{ .Tenant }}' saved. It will be used as the default for subsequent commands.