fix(sdk/go): apply functional options to CreateFromTemplate

Extend the WithLabels/WithAnnotations pattern to the
CreateFromTemplate and CreateSandboxFromTemplate methods added
by upstream. Updates all call sites including template tests.

Signed-off-by: Roland Huß <rhuss@redhat.com>

Author: rhuss

sdk/go/openshell/v1/client.go

@@ -20,7 +20,7 @@ type Config = types.Config
 type ClientInterface interface {
 	Sandboxes() SandboxInterface
 	SandboxTemplates() SandboxTemplateInterface
-	CreateSandboxFromTemplate(ctx context.Context, workspace, name, templateName string, spec *SandboxSpec, labels map[string]string, opts ...CreateOptions) (*Sandbox, error)
+	CreateSandboxFromTemplate(ctx context.Context, workspace, name, templateName string, spec *SandboxSpec, opts ...CreateOption) (*Sandbox, error)
 	Providers() ProviderInterface
 	Services() ServiceInterface
 	Exec() ExecInterface
@@ -125,8 +125,8 @@ func (c *Client) SandboxTemplates() SandboxTemplateInterface { return c.template
 
 // CreateSandboxFromTemplate creates a sandbox from a named workload template
 // without changing the legacy Sandboxes() interface.
-func (c *Client) CreateSandboxFromTemplate(ctx context.Context, workspace, name, templateName string, spec *SandboxSpec, labels map[string]string, opts ...CreateOptions) (*Sandbox, error) {
-	return c.templateCreate.CreateFromTemplate(ctx, workspace, name, templateName, spec, labels, opts...)
+func (c *Client) CreateSandboxFromTemplate(ctx context.Context, workspace, name, templateName string, spec *SandboxSpec, opts ...CreateOption) (*Sandbox, error) {
+	return c.templateCreate.CreateFromTemplate(ctx, workspace, name, templateName, spec, opts...)
 }
 
 // Providers returns the provider sub-client.

sdk/go/openshell/v1/fake/fake.go

@@ -120,8 +120,8 @@ func (fc *Client) SandboxTemplates() v1.SandboxTemplateInterface { return fc.tem
 
 // CreateSandboxFromTemplate creates a sandbox from a named workload template
 // without changing the legacy Sandboxes() interface.
-func (fc *Client) CreateSandboxFromTemplate(ctx context.Context, workspace, name, templateName string, spec *types.SandboxSpec, labels map[string]string, opts ...types.CreateOptions) (*types.Sandbox, error) {
-	return fc.templateCreate.CreateFromTemplate(ctx, workspace, name, templateName, spec, labels, opts...)
+func (fc *Client) CreateSandboxFromTemplate(ctx context.Context, workspace, name, templateName string, spec *types.SandboxSpec, opts ...types.CreateOption) (*types.Sandbox, error) {
+	return fc.templateCreate.CreateFromTemplate(ctx, workspace, name, templateName, spec, opts...)
 }
 
 // Providers returns the provider sub-client.

sdk/go/openshell/v1/fake/sandbox.go

@@ -324,7 +324,7 @@ func (c *fakeSandboxClient) Create(_ context.Context, workspace, name string, sp
 }
 
 // CreateFromTemplate creates a new sandbox from a named template with Provisioning phase.
-func (c *fakeSandboxClient) CreateFromTemplate(_ context.Context, workspace, name, templateName string, spec *types.SandboxSpec, labels map[string]string, opts ...types.CreateOptions) (*types.Sandbox, error) {
+func (c *fakeSandboxClient) CreateFromTemplate(_ context.Context, workspace, name, templateName string, spec *types.SandboxSpec, opts ...types.CreateOption) (*types.Sandbox, error) {
 	if c.closedFunc() {
 		return nil, &types.StatusError{Code: types.ErrorUnavailable, Message: "client is closed"}
 	}
@@ -342,10 +342,7 @@ func (c *fakeSandboxClient) CreateFromTemplate(_ context.Context, workspace, nam
 		spec = &types.SandboxSpec{}
 	}
 
-	var annotations map[string]string
-	if len(opts) > 0 {
-		annotations = copyStringMap(opts[0].Annotations)
-	}
+	cfg := types.ApplyCreateOptions(opts)
 
 	resolvedSpec := sandboxSpecFromWorkloadTemplate(template)
 	resolvedSpec.Providers = copyStringSlice(spec.Providers)
@@ -357,8 +354,8 @@ func (c *fakeSandboxClient) CreateFromTemplate(_ context.Context, workspace, nam
 		Name:            name,
 		Workspace:       workspace,
 		CreatedAt:       time.Now(),
-		Labels:          copyStringMap(labels),
-		Annotations:     annotations,
+		Labels:          copyStringMap(cfg.Labels()),
+		Annotations:     copyStringMap(cfg.Annotations()),
 		ResourceVersion: 1,
 		Spec:            resolvedSpec,
 		CreatedFromWorkloadTemplate: &types.SandboxWorkloadTemplateProvenance{

sdk/go/openshell/v1/fake/sandbox_template_test.go

@@ -245,7 +245,7 @@ func TestSandboxTemplate_CreateSandboxFromTemplateResolvesWorkloadAndGovernance(
 			Providers: []string{"github"},
 			Policy:    policy,
 		},
-		map[string]string{"team": "runtime"},
+		types.WithLabels(map[string]string{"team": "runtime"}),
 	)
 
 	require.NoError(t, err)
@@ -358,7 +358,6 @@ func TestSandboxTemplate_CreateSandboxFromTemplatePreservesDefaultGPURequest(t *
 		"job-default-gpu",
 		"default-gpu",
 		nil,
-		nil,
 	)
 
 	require.NoError(t, err)

sdk/go/openshell/v1/fake/sandbox_test.go

@@ -932,7 +932,7 @@ func TestFakeSandboxCreateFromTemplatePreservesCommandAndTTY(t *testing.T) {
 		TTY:       true,
 	}
 
-	created, err := sc.CreateFromTemplate(ctx, "default", "job-1", "gpu-kata", spec, map[string]string{"team": "runtime"})
+	created, err := sc.CreateFromTemplate(ctx, "default", "job-1", "gpu-kata", spec, types.WithLabels(map[string]string{"team": "runtime"}))
 
 	require.NoError(t, err)
 	assert.Equal(t, []string{"/opt/worker", "--serve"}, created.Spec.Command)

sdk/go/openshell/v1/sandbox.go

@@ -71,5 +71,5 @@ type SandboxInterface interface {
 // SandboxTemplateCreateInterface defines additive sandbox creation from named
 // workload templates without widening SandboxInterface.
 type SandboxTemplateCreateInterface interface {
-	CreateFromTemplate(ctx context.Context, workspace, name, templateName string, spec *SandboxSpec, labels map[string]string, opts ...CreateOptions) (*Sandbox, error)
+	CreateFromTemplate(ctx context.Context, workspace, name, templateName string, spec *SandboxSpec, opts ...CreateOption) (*Sandbox, error)
 }

sdk/go/openshell/v1/sandbox_client.go

@@ -48,7 +48,7 @@ func (s *sandboxClient) Create(ctx context.Context, workspace, name string, spec
 	return converter.SandboxFromProto(resp.GetSandbox()), nil
 }
 
-func (s *sandboxClient) CreateFromTemplate(ctx context.Context, workspace, name, templateName string, spec *SandboxSpec, labels map[string]string, opts ...CreateOptions) (*Sandbox, error) {
+func (s *sandboxClient) CreateFromTemplate(ctx context.Context, workspace, name, templateName string, spec *SandboxSpec, opts ...CreateOption) (*Sandbox, error) {
 	if templateName == "" {
 		return nil, &StatusError{Code: ErrorInvalidArgument, Message: "template name is required"}
 	}
@@ -59,16 +59,15 @@ func (s *sandboxClient) CreateFromTemplate(ctx context.Context, workspace, name,
 	if err != nil {
 		return nil, &StatusError{Code: ErrorInvalidArgument, Message: err.Error()}
 	}
+	cfg := types.ApplyCreateOptions(opts)
 	req := &pb.CreateSandboxRequest{
 		Name:                 name,
 		Spec:                 protoSpec,
-		Labels:               labels,
+		Labels:               converter.CopyStringMap(cfg.Labels()),
+		Annotations:          converter.CopyStringMap(cfg.Annotations()),
 		Workspace:            workspace,
 		WorkloadTemplateName: templateName,
 	}
-	if len(opts) > 0 {
-		req.Annotations = converter.CopyStringMap(opts[0].Annotations)
-	}
 	resp, err := s.client.CreateSandbox(ctx, req)
 	if err != nil {
 		return nil, converter.FromGRPCError(err)

sdk/go/openshell/v1/sandbox_client_test.go

@@ -274,7 +274,7 @@ func TestSandboxCreate_DefaultGPURequest(t *testing.T) {
 
 	result, err := client.Create(context.Background(), "default", "gpu-sandbox", &SandboxSpec{
 		GPU: true,
-	}, nil)
+	})
 
 	require.NoError(t, err)
 	require.NotNil(t, result)
@@ -312,7 +312,7 @@ func TestSandboxCreateFromTemplateRejectsGPUOverrideBeforeRPC(t *testing.T) {
 
 	_, err := client.CreateFromTemplate(context.Background(), "default", "bad", "gpu-kata", &SandboxSpec{
 		GPU: true,
-	}, nil)
+	})
 
 	require.Error(t, err)
 	assert.True(t, IsInvalidArgument(err))
@@ -330,7 +330,7 @@ func TestSandboxCreateFromTemplateSendsCommandAndTTY(t *testing.T) {
 		Providers: []string{"github"},
 		Command:   []string{"/opt/worker", "--serve"},
 		TTY:       true,
-	}, map[string]string{"team": "runtime"})
+	}, WithLabels(map[string]string{"team": "runtime"}))
 
 	require.NoError(t, err)
 	require.NotNil(t, result)