Skip to content

Add mtls/apikey auth setting commands for namespace #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david049 merged 3 commits into from
Jun 25, 2026
Merged

Add mtls/apikey auth setting commands for namespace #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acb93da
Add mtls/apikey auth setting commands for namespace
david049 Jun 25, 2026
9c828ed
consistency with export
david049 Jun 25, 2026
8dd41e1
Merge branch 'main' into dliu/namespaceauthcmds
david049 Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
656 changes: 443 additions & 213 deletions temporalcloudcli/commands.gen.go
View file
Open in desktop

Large diffs are not rendered by default.

82 changes: 82 additions & 0 deletions temporalcloudcli/commands.namespace.apikey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
package temporalcloudcli

import (
"errors"

cloudservice "go.temporal.io/cloud-sdk/api/cloudservice/v1"
namespacev1 "go.temporal.io/cloud-sdk/api/namespace/v1"
"google.golang.org/protobuf/proto"

"github.com/temporalio/cloud-cli/temporalcloudcli/internal/printer"
)

func (c *CloudNamespaceApiKeyGetCommand) run(cctx *CommandContext, _ []string) error {
client, err := cctx.GetCloudClient(c.ClientOptions)
if err != nil {
return err
}
res, err := client.GetNamespace(cctx, &cloudservice.GetNamespaceRequest{Namespace: c.Namespace})
if err != nil {
return err
}

enabled := false
if res.Namespace.Spec.ApiKeyAuth != nil {
enabled = res.Namespace.Spec.ApiKeyAuth.Enabled
}

result := struct {
Namespace string `json:"namespace"`
ApiKeyAuthEnabled bool `json:"apiKeyAuthEnabled"`
}{
Namespace: res.Namespace.Namespace,
ApiKeyAuthEnabled: enabled,
}
return cctx.Printer.PrintStructured(result, printer.StructuredOptions{})
}

func (c *CloudNamespaceApiKeyEnableCommand) run(cctx *CommandContext, _ []string) error {
return setApiKeyAuthEnabled(cctx, c.ClientOptions, c.NamespaceOptions, c.ResourceVersionOptions, c.AsyncOperationOptions, true)
}

func (c *CloudNamespaceApiKeyDisableCommand) run(cctx *CommandContext, _ []string) error {
return setApiKeyAuthEnabled(cctx, c.ClientOptions, c.NamespaceOptions, c.ResourceVersionOptions, c.AsyncOperationOptions, false)
}

func setApiKeyAuthEnabled(cctx *CommandContext, clientOpts ClientOptions, nsOpts NamespaceOptions, rvOpts ResourceVersionOptions, asyncOpts AsyncOperationOptions, enabled bool) error {
client, err := cctx.GetCloudClient(clientOpts)
if err != nil {
return err
}
res, err := client.GetNamespace(cctx, &cloudservice.GetNamespaceRequest{Namespace: nsOpts.Namespace})
if err != nil {
return err
}

ns := res.Namespace
newSpec := proto.Clone(ns.Spec).(*namespacev1.NamespaceSpec)
if newSpec.ApiKeyAuth == nil {
newSpec.ApiKeyAuth = &namespacev1.ApiKeyAuthSpec{}
}
newSpec.ApiKeyAuth.Enabled = enabled

yes, err := cctx.GetPrompter().PromptApply(ns.Spec, newSpec, false)
if err != nil {
return err
}
if !yes {
return errors.New("Aborting.")
}

rv := ns.ResourceVersion
if rvOpts.ResourceVersion != "" {
rv = rvOpts.ResourceVersion
}
resp, err := client.UpdateNamespace(cctx, &cloudservice.UpdateNamespaceRequest{
Namespace: nsOpts.Namespace,
Spec: newSpec,
ResourceVersion: rv,
AsyncOperationId: asyncOpts.AsyncOperationId,
})
return cctx.GetPoller(client, asyncOpts).HandleUpdateOperation(cctx, resp, err)
}
260 changes: 260 additions & 0 deletions temporalcloudcli/commands.namespace.apikey_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
package temporalcloudcli_test

import (
"errors"
"testing"

"github.com/stretchr/testify/mock"
cloudservice "go.temporal.io/cloud-sdk/api/cloudservice/v1"
namespacev1 "go.temporal.io/cloud-sdk/api/namespace/v1"
operation "go.temporal.io/cloud-sdk/api/operation/v1"
"google.golang.org/protobuf/proto"

cloudmock "github.com/temporalio/cloud-cli/internal/cloudservice/mock"
"github.com/temporalio/cloud-cli/temporalcloudcli"
)

func TestNamespaceApiKeyGet(t *testing.T) {
tests := []struct {
name string
cmd temporalcloudcli.CloudNamespaceApiKeyGetCommand
cloudClientExpectations func(*cloudmock.MockCloudServiceClient)
expectedErr string
expectedJsonOutput any
}{
{
name: "Enabled",
cmd: temporalcloudcli.CloudNamespaceApiKeyGetCommand{NamespaceOptions: temporalcloudcli.NamespaceOptions{Namespace: "my-ns.my-acct"}},
cloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) {
c.EXPECT().
GetNamespace(mock.Anything, &cloudservice.GetNamespaceRequest{Namespace: "my-ns.my-acct"}, mock.Anything).
Return(&cloudservice.GetNamespaceResponse{Namespace: &namespacev1.Namespace{
Namespace: "my-ns.my-acct",
Spec: &namespacev1.NamespaceSpec{
ApiKeyAuth: &namespacev1.ApiKeyAuthSpec{Enabled: true},
},
}}, nil)
},
expectedJsonOutput: map[string]any{
"namespace": "my-ns.my-acct",
"apiKeyAuthEnabled": true,
},
},
{
name: "Disabled",
cmd: temporalcloudcli.CloudNamespaceApiKeyGetCommand{NamespaceOptions: temporalcloudcli.NamespaceOptions{Namespace: "my-ns.my-acct"}},
cloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) {
c.EXPECT().
GetNamespace(mock.Anything, &cloudservice.GetNamespaceRequest{Namespace: "my-ns.my-acct"}, mock.Anything).
Return(&cloudservice.GetNamespaceResponse{Namespace: &namespacev1.Namespace{
Namespace: "my-ns.my-acct",
Spec: &namespacev1.NamespaceSpec{
ApiKeyAuth: &namespacev1.ApiKeyAuthSpec{Enabled: false},
},
}}, nil)
},
expectedJsonOutput: map[string]any{
"namespace": "my-ns.my-acct",
"apiKeyAuthEnabled": false,
},
},
{
name: "NilApiKeyAuth",
cmd: temporalcloudcli.CloudNamespaceApiKeyGetCommand{NamespaceOptions: temporalcloudcli.NamespaceOptions{Namespace: "my-ns.my-acct"}},
cloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) {
c.EXPECT().
GetNamespace(mock.Anything, &cloudservice.GetNamespaceRequest{Namespace: "my-ns.my-acct"}, mock.Anything).
Return(&cloudservice.GetNamespaceResponse{Namespace: &namespacev1.Namespace{
Namespace: "my-ns.my-acct",
Spec: &namespacev1.NamespaceSpec{},
}}, nil)
},
expectedJsonOutput: map[string]any{
"namespace": "my-ns.my-acct",
"apiKeyAuthEnabled": false,
},
},
{
name: "GetNamespaceError",
cmd: temporalcloudcli.CloudNamespaceApiKeyGetCommand{NamespaceOptions: temporalcloudcli.NamespaceOptions{Namespace: "my-ns.my-acct"}},
cloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) {
c.EXPECT().
GetNamespace(mock.Anything, mock.Anything, mock.Anything).
Return(nil, errors.New("namespace not found"))
},
expectedErr: "namespace not found",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
temporalcloudcli.TestCommand(t, &tt.cmd, temporalcloudcli.TestCommandOptions{
CloudClientExpectations: tt.cloudClientExpectations,
JSONOutput: true,
ExpectedError: tt.expectedErr,
ExpectedOutputJson: tt.expectedJsonOutput,
})
})
}
}

func TestNamespaceApiKeyEnable(t *testing.T) {
existingNS := func(apiKeyAuth *namespacev1.ApiKeyAuthSpec) *namespacev1.Namespace {
return &namespacev1.Namespace{
Namespace: "my-ns.my-acct",
ResourceVersion: "rv-fetched",
Spec: &namespacev1.NamespaceSpec{
Name: "my-ns",
Regions: []string{"aws-us-east-1"},
ApiKeyAuth: apiKeyAuth,
},
}
}

tests := []struct {
name string
cmd temporalcloudcli.CloudNamespaceApiKeyEnableCommand
cloudClientExpectations func(*cloudmock.MockCloudServiceClient)
promptOptions temporalcloudcli.TestPromptOptions
asyncPollerOptions temporalcloudcli.TestAsyncPollerOptions
expectedErr string
}{
{
name: "EnableFromNil",
cmd: temporalcloudcli.CloudNamespaceApiKeyEnableCommand{NamespaceOptions: temporalcloudcli.NamespaceOptions{Namespace: "my-ns.my-acct"}},
cloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) {
c.EXPECT().
GetNamespace(mock.Anything, &cloudservice.GetNamespaceRequest{Namespace: "my-ns.my-acct"}, mock.Anything).
Return(&cloudservice.GetNamespaceResponse{Namespace: existingNS(nil)}, nil)
c.EXPECT().
UpdateNamespace(mock.Anything, mock.MatchedBy(func(req *cloudservice.UpdateNamespaceRequest) bool {
return req.Namespace == "my-ns.my-acct" &&
req.ResourceVersion == "rv-fetched" &&
proto.Equal(req.Spec.ApiKeyAuth, &namespacev1.ApiKeyAuthSpec{Enabled: true})
}), mock.Anything).
Return(&cloudservice.UpdateNamespaceResponse{
AsyncOperation: &operation.AsyncOperation{Id: "op-enable"},
}, nil)
},
promptOptions: temporalcloudcli.TestPromptOptions{ExpectPrompApply: true, PromptResult: true},
asyncPollerOptions: temporalcloudcli.TestAsyncPollerOptions{AsyncOperationID: "op-enable"},
},
{
name: "ResourceVersionOverride",
cmd: temporalcloudcli.CloudNamespaceApiKeyEnableCommand{
NamespaceOptions: temporalcloudcli.NamespaceOptions{Namespace: "my-ns.my-acct"},
ResourceVersionOptions: temporalcloudcli.ResourceVersionOptions{ResourceVersion: "rv-user"},
},
cloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) {
c.EXPECT().
GetNamespace(mock.Anything, mock.Anything, mock.Anything).
Return(&cloudservice.GetNamespaceResponse{Namespace: existingNS(nil)}, nil)
c.EXPECT().
UpdateNamespace(mock.Anything, mock.MatchedBy(func(req *cloudservice.UpdateNamespaceRequest) bool {
return req.ResourceVersion == "rv-user"
}), mock.Anything).
Return(&cloudservice.UpdateNamespaceResponse{
AsyncOperation: &operation.AsyncOperation{Id: "op-rv"},
}, nil)
},
promptOptions: temporalcloudcli.TestPromptOptions{ExpectPrompApply: true, PromptResult: true},
asyncPollerOptions: temporalcloudcli.TestAsyncPollerOptions{AsyncOperationID: "op-rv"},
},
{
name: "GetNamespaceError",
cmd: temporalcloudcli.CloudNamespaceApiKeyEnableCommand{NamespaceOptions: temporalcloudcli.NamespaceOptions{Namespace: "my-ns.my-acct"}},
cloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) {
c.EXPECT().
GetNamespace(mock.Anything, mock.Anything, mock.Anything).
Return(nil, errors.New("namespace not found"))
},
expectedErr: "namespace not found",
},
{
name: "PromptDeclined",
cmd: temporalcloudcli.CloudNamespaceApiKeyEnableCommand{NamespaceOptions: temporalcloudcli.NamespaceOptions{Namespace: "my-ns.my-acct"}},
cloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) {
c.EXPECT().
GetNamespace(mock.Anything, mock.Anything, mock.Anything).
Return(&cloudservice.GetNamespaceResponse{Namespace: existingNS(nil)}, nil)
},
promptOptions: temporalcloudcli.TestPromptOptions{ExpectPrompApply: true, PromptResult: false},
expectedErr: "Aborting.",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
temporalcloudcli.TestCommand(t, &tt.cmd, temporalcloudcli.TestCommandOptions{
CloudClientExpectations: tt.cloudClientExpectations,
PromptOptions: tt.promptOptions,
AsyncPollerOptions: tt.asyncPollerOptions,
JSONOutput: true,
ExpectedError: tt.expectedErr,
})
})
}
}

func TestNamespaceApiKeyDisable(t *testing.T) {
existingNS := &namespacev1.Namespace{
Namespace: "my-ns.my-acct",
ResourceVersion: "rv-fetched",
Spec: &namespacev1.NamespaceSpec{
Name: "my-ns",
Regions: []string{"aws-us-east-1"},
ApiKeyAuth: &namespacev1.ApiKeyAuthSpec{Enabled: true},
},
}

tests := []struct {
name string
cmd temporalcloudcli.CloudNamespaceApiKeyDisableCommand
cloudClientExpectations func(*cloudmock.MockCloudServiceClient)
promptOptions temporalcloudcli.TestPromptOptions
asyncPollerOptions temporalcloudcli.TestAsyncPollerOptions
expectedErr string
}{
{
name: "DisableFromEnabled",
cmd: temporalcloudcli.CloudNamespaceApiKeyDisableCommand{NamespaceOptions: temporalcloudcli.NamespaceOptions{Namespace: "my-ns.my-acct"}},
cloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) {
c.EXPECT().
GetNamespace(mock.Anything, mock.Anything, mock.Anything).
Return(&cloudservice.GetNamespaceResponse{Namespace: existingNS}, nil)
c.EXPECT().
UpdateNamespace(mock.Anything, mock.MatchedBy(func(req *cloudservice.UpdateNamespaceRequest) bool {
return proto.Equal(req.Spec.ApiKeyAuth, &namespacev1.ApiKeyAuthSpec{Enabled: false})
}), mock.Anything).
Return(&cloudservice.UpdateNamespaceResponse{
AsyncOperation: &operation.AsyncOperation{Id: "op-disable"},
}, nil)
},
promptOptions: temporalcloudcli.TestPromptOptions{ExpectPrompApply: true, PromptResult: true},
asyncPollerOptions: temporalcloudcli.TestAsyncPollerOptions{AsyncOperationID: "op-disable"},
},
{
name: "UpdateNamespaceError",
cmd: temporalcloudcli.CloudNamespaceApiKeyDisableCommand{NamespaceOptions: temporalcloudcli.NamespaceOptions{Namespace: "my-ns.my-acct"}},
cloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) {
c.EXPECT().
GetNamespace(mock.Anything, mock.Anything, mock.Anything).
Return(&cloudservice.GetNamespaceResponse{Namespace: existingNS}, nil)
c.EXPECT().
UpdateNamespace(mock.Anything, mock.Anything, mock.Anything).
Return(nil, errors.New("update failed"))
},
promptOptions: temporalcloudcli.TestPromptOptions{ExpectPrompApply: true, PromptResult: true},
expectedErr: "update failed",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
temporalcloudcli.TestCommand(t, &tt.cmd, temporalcloudcli.TestCommandOptions{
CloudClientExpectations: tt.cloudClientExpectations,
PromptOptions: tt.promptOptions,
AsyncPollerOptions: tt.asyncPollerOptions,
JSONOutput: true,
ExpectedError: tt.expectedErr,
})
})
}
}
6 changes: 3 additions & 3 deletions temporalcloudcli/commands.namespace.cert_ca.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/temporalio/cloud-cli/temporalcloudcli/internal/printer"
)

func (c *CloudNamespaceCertCaCreateCommand) run(cctx *CommandContext, _ []string) error {
func (c *CloudNamespaceMtlsCertCaCreateCommand) run(cctx *CommandContext, _ []string) error {
namespaceClient, err := getNamespaceClient(cctx, c.ClientOptions)
if err != nil {
return err
Expand All @@ -31,7 +31,7 @@ func (c *CloudNamespaceCertCaCreateCommand) run(cctx *CommandContext, _ []string
})
}

func (c *CloudNamespaceCertCaListCommand) run(cctx *CommandContext, _ []string) error {
func (c *CloudNamespaceMtlsCertCaListCommand) run(cctx *CommandContext, _ []string) error {
namespaceClient, err := getNamespaceClient(cctx, c.ClientOptions)
if err != nil {
return err
Expand All @@ -45,7 +45,7 @@ func (c *CloudNamespaceCertCaListCommand) run(cctx *CommandContext, _ []string)
return cctx.Printer.PrintStructured(certs, printer.StructuredOptions{})
}

func (c *CloudNamespaceCertCaDeleteCommand) run(cctx *CommandContext, _ []string) error {
func (c *CloudNamespaceMtlsCertCaDeleteCommand) run(cctx *CommandContext, _ []string) error {
namespaceClient, err := getNamespaceClient(cctx, c.ClientOptions)
if err != nil {
return err
Expand Down
Loading
Loading