From e05a976dba863b1e2960f58ca35c56a788644684 Mon Sep 17 00:00:00 2001 From: David Liu Date: Tue, 3 Nov 2026 15:56:57 -0500 Subject: [PATCH] Add support for disabling standalone activity export --- temporalcloudcli/commands.gen.go | 28 + temporalcloudcli/commands.namespace.export.go | 855 ++++------ .../commands.namespace.export_test.go | 1460 +++++------------ temporalcloudcli/commands.yml | 17 + 4 files changed, 763 insertions(+), 1597 deletions(-) diff --git a/temporalcloudcli/commands.gen.go b/temporalcloudcli/commands.gen.go index f34129c..0c4edd8 100644 --- a/temporalcloudcli/commands.gen.go +++ b/temporalcloudcli/commands.gen.go @@ -182,6 +182,16 @@ func (v *ExportSinkOptions) BuildFlags(f *pflag.FlagSet) { _ = cobra.MarkFlagRequired(f, "sink-name") } +type ExportFilterOptions struct { + DisableStandaloneActivityExport bool + FlagSet *pflag.FlagSet +} + +func (v *ExportFilterOptions) BuildFlags(f *pflag.FlagSet) { + v.FlagSet = f + f.BoolVar(&v.DisableStandaloneActivityExport, "disable-standalone-activity-export", false, "Disable export of standalone activity events. Workflow history export is unaffected. On update, omitting this flag keeps the current setting. Use --disable-standalone-activity-export=false to re-enable standalone activity export.") +} + type ExportS3Options struct { RoleArn string BucketName string @@ -3004,6 +3014,7 @@ type CloudNamespaceExportAzureBlobCreateCommand struct { NamespaceOptions AsyncOperationOptions ExportSinkOptions + ExportFilterOptions ExportAzureBlobOptions ExportAzureBlobRegionOptions } @@ -3024,6 +3035,7 @@ func NewCloudNamespaceExportAzureBlobCreateCommand(cctx *CommandContext, parent s.NamespaceOptions.BuildFlags(s.Command.Flags()) s.AsyncOperationOptions.BuildFlags(s.Command.Flags()) s.ExportSinkOptions.BuildFlags(s.Command.Flags()) + s.ExportFilterOptions.BuildFlags(s.Command.Flags()) s.ExportAzureBlobOptions.BuildFlags(s.Command.Flags()) s.ExportAzureBlobRegionOptions.BuildFlags(s.Command.Flags()) s.Command.Run = func(c *cobra.Command, args []string) { @@ -3042,6 +3054,7 @@ type CloudNamespaceExportAzureBlobUpdateCommand struct { AsyncOperationOptions ResourceVersionOptions ExportSinkOptions + ExportFilterOptions TenantId string SubscriptionId string ResourceGroup string @@ -3071,6 +3084,7 @@ func NewCloudNamespaceExportAzureBlobUpdateCommand(cctx *CommandContext, parent s.AsyncOperationOptions.BuildFlags(s.Command.Flags()) s.ResourceVersionOptions.BuildFlags(s.Command.Flags()) s.ExportSinkOptions.BuildFlags(s.Command.Flags()) + s.ExportFilterOptions.BuildFlags(s.Command.Flags()) s.Command.Run = func(c *cobra.Command, args []string) { if err := s.run(cctx, args); err != nil { cctx.Options.Fail(err) @@ -3085,6 +3099,7 @@ type CloudNamespaceExportAzureBlobValidateCommand struct { ClientOptions NamespaceOptions ExportSinkOptions + ExportFilterOptions ExportAzureBlobOptions ExportAzureBlobRegionOptions } @@ -3104,6 +3119,7 @@ func NewCloudNamespaceExportAzureBlobValidateCommand(cctx *CommandContext, paren s.ClientOptions.BuildFlags(s.Command.Flags()) s.NamespaceOptions.BuildFlags(s.Command.Flags()) s.ExportSinkOptions.BuildFlags(s.Command.Flags()) + s.ExportFilterOptions.BuildFlags(s.Command.Flags()) s.ExportAzureBlobOptions.BuildFlags(s.Command.Flags()) s.ExportAzureBlobRegionOptions.BuildFlags(s.Command.Flags()) s.Command.Run = func(c *cobra.Command, args []string) { @@ -3244,6 +3260,7 @@ type CloudNamespaceExportGcsCreateCommand struct { NamespaceOptions AsyncOperationOptions ExportSinkOptions + ExportFilterOptions ExportGcsOptions ExportGcsRegionOptions } @@ -3264,6 +3281,7 @@ func NewCloudNamespaceExportGcsCreateCommand(cctx *CommandContext, parent *Cloud s.NamespaceOptions.BuildFlags(s.Command.Flags()) s.AsyncOperationOptions.BuildFlags(s.Command.Flags()) s.ExportSinkOptions.BuildFlags(s.Command.Flags()) + s.ExportFilterOptions.BuildFlags(s.Command.Flags()) s.ExportGcsOptions.BuildFlags(s.Command.Flags()) s.ExportGcsRegionOptions.BuildFlags(s.Command.Flags()) s.Command.Run = func(c *cobra.Command, args []string) { @@ -3282,6 +3300,7 @@ type CloudNamespaceExportGcsUpdateCommand struct { AsyncOperationOptions ResourceVersionOptions ExportSinkOptions + ExportFilterOptions ServiceAccountEmail string BucketName string } @@ -3305,6 +3324,7 @@ func NewCloudNamespaceExportGcsUpdateCommand(cctx *CommandContext, parent *Cloud s.AsyncOperationOptions.BuildFlags(s.Command.Flags()) s.ResourceVersionOptions.BuildFlags(s.Command.Flags()) s.ExportSinkOptions.BuildFlags(s.Command.Flags()) + s.ExportFilterOptions.BuildFlags(s.Command.Flags()) s.Command.Run = func(c *cobra.Command, args []string) { if err := s.run(cctx, args); err != nil { cctx.Options.Fail(err) @@ -3319,6 +3339,7 @@ type CloudNamespaceExportGcsValidateCommand struct { ClientOptions NamespaceOptions ExportSinkOptions + ExportFilterOptions ExportGcsOptions ExportGcsRegionOptions } @@ -3338,6 +3359,7 @@ func NewCloudNamespaceExportGcsValidateCommand(cctx *CommandContext, parent *Clo s.ClientOptions.BuildFlags(s.Command.Flags()) s.NamespaceOptions.BuildFlags(s.Command.Flags()) s.ExportSinkOptions.BuildFlags(s.Command.Flags()) + s.ExportFilterOptions.BuildFlags(s.Command.Flags()) s.ExportGcsOptions.BuildFlags(s.Command.Flags()) s.ExportGcsRegionOptions.BuildFlags(s.Command.Flags()) s.Command.Run = func(c *cobra.Command, args []string) { @@ -3433,6 +3455,7 @@ type CloudNamespaceExportS3CreateCommand struct { NamespaceOptions AsyncOperationOptions ExportSinkOptions + ExportFilterOptions ExportS3Options ExportS3RegionOptions } @@ -3453,6 +3476,7 @@ func NewCloudNamespaceExportS3CreateCommand(cctx *CommandContext, parent *CloudN s.NamespaceOptions.BuildFlags(s.Command.Flags()) s.AsyncOperationOptions.BuildFlags(s.Command.Flags()) s.ExportSinkOptions.BuildFlags(s.Command.Flags()) + s.ExportFilterOptions.BuildFlags(s.Command.Flags()) s.ExportS3Options.BuildFlags(s.Command.Flags()) s.ExportS3RegionOptions.BuildFlags(s.Command.Flags()) s.Command.Run = func(c *cobra.Command, args []string) { @@ -3471,6 +3495,7 @@ type CloudNamespaceExportS3UpdateCommand struct { AsyncOperationOptions ResourceVersionOptions ExportSinkOptions + ExportFilterOptions RoleArn string BucketName string KmsArn string @@ -3496,6 +3521,7 @@ func NewCloudNamespaceExportS3UpdateCommand(cctx *CommandContext, parent *CloudN s.AsyncOperationOptions.BuildFlags(s.Command.Flags()) s.ResourceVersionOptions.BuildFlags(s.Command.Flags()) s.ExportSinkOptions.BuildFlags(s.Command.Flags()) + s.ExportFilterOptions.BuildFlags(s.Command.Flags()) s.Command.Run = func(c *cobra.Command, args []string) { if err := s.run(cctx, args); err != nil { cctx.Options.Fail(err) @@ -3510,6 +3536,7 @@ type CloudNamespaceExportS3ValidateCommand struct { ClientOptions NamespaceOptions ExportSinkOptions + ExportFilterOptions ExportS3Options ExportS3RegionOptions } @@ -3529,6 +3556,7 @@ func NewCloudNamespaceExportS3ValidateCommand(cctx *CommandContext, parent *Clou s.ClientOptions.BuildFlags(s.Command.Flags()) s.NamespaceOptions.BuildFlags(s.Command.Flags()) s.ExportSinkOptions.BuildFlags(s.Command.Flags()) + s.ExportFilterOptions.BuildFlags(s.Command.Flags()) s.ExportS3Options.BuildFlags(s.Command.Flags()) s.ExportS3RegionOptions.BuildFlags(s.Command.Flags()) s.Command.Run = func(c *cobra.Command, args []string) { diff --git a/temporalcloudcli/commands.namespace.export.go b/temporalcloudcli/commands.namespace.export.go index 38ee15c..37bdd53 100644 --- a/temporalcloudcli/commands.namespace.export.go +++ b/temporalcloudcli/commands.namespace.export.go @@ -60,135 +60,6 @@ type ( Prompter Prompter OperationHandler AsyncOperationHandler } - - CreateS3ExportSinkParams struct { - Namespace string - SinkName string - RoleName string - BucketName string - Region string - AwsAccountID string - KmsArn string - AsyncOperationID string - - Cloud cloudservice.CloudServiceClient - Prompter Prompter - OperationHandler AsyncOperationHandler - } - - UpdateS3ExportSinkParams struct { - Namespace string - SinkName string - RoleName string - BucketName string - AwsAccountID string - KmsArn string - ResourceVersion string - AsyncOperationID string - - Cloud cloudservice.CloudServiceClient - Prompter Prompter - OperationHandler AsyncOperationHandler - } - - ValidateS3ExportSinkParams struct { - Namespace string - SinkName string - RoleName string - BucketName string - Region string - AwsAccountID string - KmsArn string - - Cloud cloudservice.CloudServiceClient - Printer *printer.Printer - } - - CreateGCSExportSinkParams struct { - Namespace string - SinkName string - SaID string - BucketName string - GcpProjectID string - Region string - AsyncOperationID string - - Cloud cloudservice.CloudServiceClient - Prompter Prompter - OperationHandler AsyncOperationHandler - } - - UpdateGCSExportSinkParams struct { - Namespace string - SinkName string - SaID string - BucketName string - GcpProjectID string - ResourceVersion string - AsyncOperationID string - - Cloud cloudservice.CloudServiceClient - Prompter Prompter - OperationHandler AsyncOperationHandler - } - - ValidateGCSExportSinkParams struct { - Namespace string - SinkName string - SaID string - BucketName string - GcpProjectID string - Region string - - Cloud cloudservice.CloudServiceClient - Printer *printer.Printer - } - - CreateAzureBlobExportSinkParams struct { - Namespace string - SinkName string - TenantID string - SubscriptionID string - ResourceGroup string - StorageAccount string - ContainerName string - Region string - AsyncOperationID string - - Cloud cloudservice.CloudServiceClient - Prompter Prompter - OperationHandler AsyncOperationHandler - } - - UpdateAzureBlobExportSinkParams struct { - Namespace string - SinkName string - TenantID string - SubscriptionID string - ResourceGroup string - StorageAccount string - ContainerName string - ResourceVersion string - AsyncOperationID string - - Cloud cloudservice.CloudServiceClient - Prompter Prompter - OperationHandler AsyncOperationHandler - } - - ValidateAzureBlobExportSinkParams struct { - Namespace string - SinkName string - TenantID string - SubscriptionID string - ResourceGroup string - StorageAccount string - ContainerName string - Region string - - Cloud cloudservice.CloudServiceClient - Printer *printer.Printer - } ) func GetExportSink(ctx context.Context, params GetExportSinkParams) error { @@ -329,303 +200,6 @@ func DisableExportSink(ctx context.Context, params DisableExportSinkParams) erro }) } -func CreateS3ExportSink(ctx context.Context, params CreateS3ExportSinkParams) error { - spec := &namespacev1.ExportSinkSpec{ - Name: params.SinkName, - Enabled: true, - S3: &sinkv1.S3Spec{ - RoleName: params.RoleName, - BucketName: params.BucketName, - Region: params.Region, - AwsAccountId: params.AwsAccountID, - KmsArn: params.KmsArn, - }, - } - if err := params.Prompter.PromptApply(&namespacev1.ExportSinkSpec{}, spec, false); err != nil { - return err - } - createSink := wrapCreateOperation( - params.Cloud.CreateNamespaceExportSink, - params.OperationHandler, - func(_ *cloudservice.CreateNamespaceExportSinkResponse) string { return params.SinkName }, - ) - return createSink(ctx, &cloudservice.CreateNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Spec: spec, - AsyncOperationId: params.AsyncOperationID, - }) -} - -func UpdateS3ExportSink(ctx context.Context, params UpdateS3ExportSinkParams) error { - sinkRes, err := params.Cloud.GetNamespaceExportSink(ctx, &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Name: params.SinkName, - }) - if err != nil { - return err - } - sink := sinkRes.Sink - - rv := sink.ResourceVersion - if params.ResourceVersion != "" { - rv = params.ResourceVersion - } - - oldSpec := sink.Spec - newS3 := proto.Clone(oldSpec.GetS3()).(*sinkv1.S3Spec) - if params.RoleName != "" { - newS3.RoleName = params.RoleName - } - if params.AwsAccountID != "" { - newS3.AwsAccountId = params.AwsAccountID - } - if params.BucketName != "" { - newS3.BucketName = params.BucketName - } - if params.KmsArn != "" { - newS3.KmsArn = params.KmsArn - } - newSpec := &namespacev1.ExportSinkSpec{ - Name: params.SinkName, - Enabled: oldSpec.GetEnabled(), - S3: newS3, - } - - if err := params.Prompter.PromptApply(oldSpec, newSpec, false); err != nil { - return err - } - - updateSink := wrapUpdateOperation(params.Cloud.UpdateNamespaceExportSink, params.OperationHandler, params.SinkName) - return updateSink(ctx, &cloudservice.UpdateNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Spec: newSpec, - ResourceVersion: rv, - AsyncOperationId: params.AsyncOperationID, - }) -} - -func ValidateS3ExportSink(ctx context.Context, params ValidateS3ExportSinkParams) error { - spec := &namespacev1.ExportSinkSpec{ - Name: params.SinkName, - S3: &sinkv1.S3Spec{ - RoleName: params.RoleName, - BucketName: params.BucketName, - Region: params.Region, - AwsAccountId: params.AwsAccountID, - KmsArn: params.KmsArn, - }, - } - _, err := params.Cloud.ValidateNamespaceExportSink(ctx, &cloudservice.ValidateNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Spec: spec, - }) - if err != nil { - return err - } - return params.Printer.PrintStructured( - struct{ Status string }{Status: fmt.Sprintf("Export sink %q configuration is valid.", params.SinkName)}, - printer.StructuredOptions{}, - ) -} - -func CreateGCSExportSink(ctx context.Context, params CreateGCSExportSinkParams) error { - spec := &namespacev1.ExportSinkSpec{ - Name: params.SinkName, - Enabled: true, - Gcs: &sinkv1.GCSSpec{ - SaId: params.SaID, - BucketName: params.BucketName, - GcpProjectId: params.GcpProjectID, - Region: params.Region, - }, - } - if err := params.Prompter.PromptApply(&namespacev1.ExportSinkSpec{}, spec, false); err != nil { - return err - } - createSink := wrapCreateOperation( - params.Cloud.CreateNamespaceExportSink, - params.OperationHandler, - func(_ *cloudservice.CreateNamespaceExportSinkResponse) string { return params.SinkName }, - ) - return createSink(ctx, &cloudservice.CreateNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Spec: spec, - AsyncOperationId: params.AsyncOperationID, - }) -} - -func UpdateGCSExportSink(ctx context.Context, params UpdateGCSExportSinkParams) error { - sinkRes, err := params.Cloud.GetNamespaceExportSink(ctx, &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Name: params.SinkName, - }) - if err != nil { - return err - } - sink := sinkRes.Sink - - rv := sink.ResourceVersion - if params.ResourceVersion != "" { - rv = params.ResourceVersion - } - - oldSpec := sink.Spec - newGcs := proto.Clone(oldSpec.GetGcs()).(*sinkv1.GCSSpec) - if params.SaID != "" { - newGcs.SaId = params.SaID - } - if params.GcpProjectID != "" { - newGcs.GcpProjectId = params.GcpProjectID - } - if params.BucketName != "" { - newGcs.BucketName = params.BucketName - } - newSpec := &namespacev1.ExportSinkSpec{ - Name: params.SinkName, - Enabled: oldSpec.GetEnabled(), - Gcs: newGcs, - } - - if err := params.Prompter.PromptApply(oldSpec, newSpec, false); err != nil { - return err - } - - updateSink := wrapUpdateOperation(params.Cloud.UpdateNamespaceExportSink, params.OperationHandler, params.SinkName) - return updateSink(ctx, &cloudservice.UpdateNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Spec: newSpec, - ResourceVersion: rv, - AsyncOperationId: params.AsyncOperationID, - }) -} - -func ValidateGCSExportSink(ctx context.Context, params ValidateGCSExportSinkParams) error { - spec := &namespacev1.ExportSinkSpec{ - Name: params.SinkName, - Gcs: &sinkv1.GCSSpec{ - SaId: params.SaID, - BucketName: params.BucketName, - GcpProjectId: params.GcpProjectID, - Region: params.Region, - }, - } - _, err := params.Cloud.ValidateNamespaceExportSink(ctx, &cloudservice.ValidateNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Spec: spec, - }) - if err != nil { - return err - } - return params.Printer.PrintStructured( - struct{ Status string }{Status: fmt.Sprintf("Export sink %q configuration is valid.", params.SinkName)}, - printer.StructuredOptions{}, - ) -} - -func CreateAzureBlobExportSink(ctx context.Context, params CreateAzureBlobExportSinkParams) error { - spec := &namespacev1.ExportSinkSpec{ - Name: params.SinkName, - Enabled: true, - AzureBlob: &sinkv1.AzureBlobSpec{ - TenantId: params.TenantID, - SubscriptionId: params.SubscriptionID, - ResourceGroup: params.ResourceGroup, - StorageAccount: params.StorageAccount, - ContainerName: params.ContainerName, - Region: params.Region, - }, - } - if err := params.Prompter.PromptApply(&namespacev1.ExportSinkSpec{}, spec, false); err != nil { - return err - } - createSink := wrapCreateOperation( - params.Cloud.CreateNamespaceExportSink, - params.OperationHandler, - func(_ *cloudservice.CreateNamespaceExportSinkResponse) string { return params.SinkName }, - ) - return createSink(ctx, &cloudservice.CreateNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Spec: spec, - AsyncOperationId: params.AsyncOperationID, - }) -} - -func UpdateAzureBlobExportSink(ctx context.Context, params UpdateAzureBlobExportSinkParams) error { - sinkRes, err := params.Cloud.GetNamespaceExportSink(ctx, &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Name: params.SinkName, - }) - if err != nil { - return err - } - sink := sinkRes.Sink - - rv := sink.ResourceVersion - if params.ResourceVersion != "" { - rv = params.ResourceVersion - } - - oldSpec := sink.Spec - newAzureBlob := proto.Clone(oldSpec.GetAzureBlob()).(*sinkv1.AzureBlobSpec) - if params.TenantID != "" { - newAzureBlob.TenantId = params.TenantID - } - if params.SubscriptionID != "" { - newAzureBlob.SubscriptionId = params.SubscriptionID - } - if params.ResourceGroup != "" { - newAzureBlob.ResourceGroup = params.ResourceGroup - } - if params.StorageAccount != "" { - newAzureBlob.StorageAccount = params.StorageAccount - } - if params.ContainerName != "" { - newAzureBlob.ContainerName = params.ContainerName - } - newSpec := &namespacev1.ExportSinkSpec{ - Name: params.SinkName, - Enabled: oldSpec.GetEnabled(), - AzureBlob: newAzureBlob, - } - - if err := params.Prompter.PromptApply(oldSpec, newSpec, false); err != nil { - return err - } - - updateSink := wrapUpdateOperation(params.Cloud.UpdateNamespaceExportSink, params.OperationHandler, params.SinkName) - return updateSink(ctx, &cloudservice.UpdateNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Spec: newSpec, - ResourceVersion: rv, - AsyncOperationId: params.AsyncOperationID, - }) -} - -func ValidateAzureBlobExportSink(ctx context.Context, params ValidateAzureBlobExportSinkParams) error { - spec := &namespacev1.ExportSinkSpec{ - Name: params.SinkName, - AzureBlob: &sinkv1.AzureBlobSpec{ - TenantId: params.TenantID, - SubscriptionId: params.SubscriptionID, - ResourceGroup: params.ResourceGroup, - StorageAccount: params.StorageAccount, - ContainerName: params.ContainerName, - Region: params.Region, - }, - } - _, err := params.Cloud.ValidateNamespaceExportSink(ctx, &cloudservice.ValidateNamespaceExportSinkRequest{ - Namespace: params.Namespace, - Spec: spec, - }) - if err != nil { - return err - } - return params.Printer.PrintStructured( - struct{ Status string }{Status: fmt.Sprintf("Export sink %q configuration is valid.", params.SinkName)}, - printer.StructuredOptions{}, - ) -} - func (c *CloudNamespaceExportGetCommand) run(cctx *CommandContext, _ []string) error { cloudClient, err := cctx.BuildCloudClient(c.ClientOptions) if err != nil { @@ -704,23 +278,40 @@ func (c *CloudNamespaceExportS3CreateCommand) run(cctx *CommandContext, _ []stri if err != nil { return err } - cloudClient, err := cctx.BuildCloudClient(c.ClientOptions) + cloudClient, err := cctx.GetCloudClient(c.ClientOptions) + if err != nil { + return err + } + spec := &namespacev1.ExportSinkSpec{ + Name: c.SinkName, + Enabled: true, + S3: &sinkv1.S3Spec{ + RoleName: roleName, + BucketName: c.BucketName, + Region: c.Region, + AwsAccountId: accountID, + KmsArn: c.KmsArn, + }, + } + if c.Command.Flags().Changed("disable-standalone-activity-export") { + spec.Filter = &namespacev1.ExportSinkSpec_SinkFilter{ + DisableStandaloneActivityExport: c.DisableStandaloneActivityExport, + } + } + + yes, err := cctx.GetPrompter().PromptApply(&namespacev1.ExportSinkSpec{}, spec, false) if err != nil { return err } - return CreateS3ExportSink(cctx.Context, CreateS3ExportSinkParams{ + if !yes { + return nil + } + resp, err := cloudClient.CreateNamespaceExportSink(cctx, &cloudservice.CreateNamespaceExportSinkRequest{ Namespace: c.Namespace, - SinkName: c.SinkName, - RoleName: roleName, - BucketName: c.BucketName, - Region: c.Region, - AwsAccountID: accountID, - KmsArn: c.KmsArn, - AsyncOperationID: c.AsyncOperationId, - Cloud: cloudClient.CloudService(), - Prompter: newPrompter(cctx), - OperationHandler: NewOperationHandler(cctx, c.AsyncOperationOptions, c.ClientOptions), + Spec: spec, + AsyncOperationId: c.AsyncOperationId, }) + return cctx.GetPoller(cloudClient, c.AsyncOperationOptions).HandleCreateAsyncOperationResponse(cctx, resp, err) } func (c *CloudNamespaceExportS3UpdateCommand) run(cctx *CommandContext, _ []string) error { @@ -732,23 +323,63 @@ func (c *CloudNamespaceExportS3UpdateCommand) run(cctx *CommandContext, _ []stri return err } } - cloudClient, err := cctx.BuildCloudClient(c.ClientOptions) + cloudClient, err := cctx.GetCloudClient(c.ClientOptions) + if err != nil { + return err + } + sinkRes, err := cloudClient.GetNamespaceExportSink(cctx, &cloudservice.GetNamespaceExportSinkRequest{ + Namespace: c.Namespace, + Name: c.SinkName, + }) + if err != nil { + return err + } + sink := sinkRes.Sink + + rv := sink.ResourceVersion + if c.ResourceVersion != "" { + rv = c.ResourceVersion + } + + oldSpec := sink.Spec + newSpec := proto.Clone(oldSpec).(*namespacev1.ExportSinkSpec) + newS3 := newSpec.GetS3() + if roleName != "" { + newS3.RoleName = roleName + } + if accountID != "" { + newS3.AwsAccountId = accountID + } + if c.BucketName != "" { + newS3.BucketName = c.BucketName + } + if c.KmsArn != "" { + newS3.KmsArn = c.KmsArn + } + + // AIDEV-NOTE: Check flag presence so an omitted bool preserves the existing filter. + if c.Command.Flags().Changed("disable-standalone-activity-export") { + if newSpec.Filter == nil { + newSpec.Filter = &namespacev1.ExportSinkSpec_SinkFilter{} + } + newSpec.Filter.DisableStandaloneActivityExport = c.DisableStandaloneActivityExport + } + + yes, err := cctx.GetPrompter().PromptApply(oldSpec, newSpec, false) if err != nil { return err } - return UpdateS3ExportSink(cctx.Context, UpdateS3ExportSinkParams{ + if !yes { + return nil + } + + resp, err := cloudClient.UpdateNamespaceExportSink(cctx, &cloudservice.UpdateNamespaceExportSinkRequest{ Namespace: c.Namespace, - SinkName: c.SinkName, - RoleName: roleName, - BucketName: c.BucketName, - AwsAccountID: accountID, - KmsArn: c.KmsArn, - ResourceVersion: c.ResourceVersion, - AsyncOperationID: c.AsyncOperationId, - Cloud: cloudClient.CloudService(), - Prompter: newPrompter(cctx), - OperationHandler: NewOperationHandler(cctx, c.AsyncOperationOptions, c.ClientOptions), + Spec: newSpec, + ResourceVersion: rv, + AsyncOperationId: c.AsyncOperationId, }) + return cctx.GetPoller(cloudClient, c.AsyncOperationOptions).HandleUpdateOperation(cctx, resp, err) } func (c *CloudNamespaceExportS3ValidateCommand) run(cctx *CommandContext, _ []string) error { @@ -756,21 +387,37 @@ func (c *CloudNamespaceExportS3ValidateCommand) run(cctx *CommandContext, _ []st if err != nil { return err } - cloudClient, err := cctx.BuildCloudClient(c.ClientOptions) + cloudClient, err := cctx.GetCloudClient(c.ClientOptions) if err != nil { return err } - return ValidateS3ExportSink(cctx.Context, ValidateS3ExportSinkParams{ - Namespace: c.Namespace, - SinkName: c.SinkName, - RoleName: roleName, - BucketName: c.BucketName, - Region: c.Region, - AwsAccountID: accountID, - KmsArn: c.KmsArn, - Cloud: cloudClient.CloudService(), - Printer: cctx.Printer, + spec := &namespacev1.ExportSinkSpec{ + Name: c.SinkName, + S3: &sinkv1.S3Spec{ + RoleName: roleName, + BucketName: c.BucketName, + Region: c.Region, + AwsAccountId: accountID, + KmsArn: c.KmsArn, + }, + } + if c.Command.Flags().Changed("disable-standalone-activity-export") { + spec.Filter = &namespacev1.ExportSinkSpec_SinkFilter{ + DisableStandaloneActivityExport: c.DisableStandaloneActivityExport, + } + } + + _, err = cloudClient.ValidateNamespaceExportSink(cctx, &cloudservice.ValidateNamespaceExportSinkRequest{ + Namespace: c.Namespace, + Spec: spec, }) + if err != nil { + return err + } + return cctx.Printer.PrintStructured( + struct{ Status string }{Status: fmt.Sprintf("Export sink %q configuration is valid.", c.SinkName)}, + printer.StructuredOptions{}, + ) } func (c *CloudNamespaceExportGcsCreateCommand) run(cctx *CommandContext, _ []string) error { @@ -778,22 +425,39 @@ func (c *CloudNamespaceExportGcsCreateCommand) run(cctx *CommandContext, _ []str if err != nil { return err } - cloudClient, err := cctx.BuildCloudClient(c.ClientOptions) + cloudClient, err := cctx.GetCloudClient(c.ClientOptions) if err != nil { return err } - return CreateGCSExportSink(cctx.Context, CreateGCSExportSinkParams{ + spec := &namespacev1.ExportSinkSpec{ + Name: c.SinkName, + Enabled: true, + Gcs: &sinkv1.GCSSpec{ + SaId: saID, + BucketName: c.BucketName, + GcpProjectId: projectID, + Region: c.Region, + }, + } + if c.Command.Flags().Changed("disable-standalone-activity-export") { + spec.Filter = &namespacev1.ExportSinkSpec_SinkFilter{ + DisableStandaloneActivityExport: c.DisableStandaloneActivityExport, + } + } + + yes, err := cctx.GetPrompter().PromptApply(&namespacev1.ExportSinkSpec{}, spec, false) + if err != nil { + return err + } + if !yes { + return nil + } + resp, err := cloudClient.CreateNamespaceExportSink(cctx, &cloudservice.CreateNamespaceExportSinkRequest{ Namespace: c.Namespace, - SinkName: c.SinkName, - SaID: saID, - BucketName: c.BucketName, - GcpProjectID: projectID, - Region: c.Region, - AsyncOperationID: c.AsyncOperationId, - Cloud: cloudClient.CloudService(), - Prompter: newPrompter(cctx), - OperationHandler: NewOperationHandler(cctx, c.AsyncOperationOptions, c.ClientOptions), + Spec: spec, + AsyncOperationId: c.AsyncOperationId, }) + return cctx.GetPoller(cloudClient, c.AsyncOperationOptions).HandleCreateAsyncOperationResponse(cctx, resp, err) } func (c *CloudNamespaceExportGcsUpdateCommand) run(cctx *CommandContext, _ []string) error { @@ -805,22 +469,60 @@ func (c *CloudNamespaceExportGcsUpdateCommand) run(cctx *CommandContext, _ []str return err } } - cloudClient, err := cctx.BuildCloudClient(c.ClientOptions) + cloudClient, err := cctx.GetCloudClient(c.ClientOptions) if err != nil { return err } - return UpdateGCSExportSink(cctx.Context, UpdateGCSExportSinkParams{ + sinkRes, err := cloudClient.GetNamespaceExportSink(cctx, &cloudservice.GetNamespaceExportSinkRequest{ + Namespace: c.Namespace, + Name: c.SinkName, + }) + if err != nil { + return err + } + sink := sinkRes.Sink + + rv := sink.ResourceVersion + if c.ResourceVersion != "" { + rv = c.ResourceVersion + } + + oldSpec := sink.Spec + newSpec := proto.Clone(oldSpec).(*namespacev1.ExportSinkSpec) + newGcs := newSpec.GetGcs() + if saID != "" { + newGcs.SaId = saID + } + if projectID != "" { + newGcs.GcpProjectId = projectID + } + if c.BucketName != "" { + newGcs.BucketName = c.BucketName + } + + // AIDEV-NOTE: Check flag presence so an omitted bool preserves the existing filter. + if c.Command.Flags().Changed("disable-standalone-activity-export") { + if newSpec.Filter == nil { + newSpec.Filter = &namespacev1.ExportSinkSpec_SinkFilter{} + } + newSpec.Filter.DisableStandaloneActivityExport = c.DisableStandaloneActivityExport + } + + yes, err := cctx.GetPrompter().PromptApply(oldSpec, newSpec, false) + if err != nil { + return err + } + if !yes { + return nil + } + + resp, err := cloudClient.UpdateNamespaceExportSink(cctx, &cloudservice.UpdateNamespaceExportSinkRequest{ Namespace: c.Namespace, - SinkName: c.SinkName, - SaID: saID, - BucketName: c.BucketName, - GcpProjectID: projectID, - ResourceVersion: c.ResourceVersion, - AsyncOperationID: c.AsyncOperationId, - Cloud: cloudClient.CloudService(), - Prompter: newPrompter(cctx), - OperationHandler: NewOperationHandler(cctx, c.AsyncOperationOptions, c.ClientOptions), + Spec: newSpec, + ResourceVersion: rv, + AsyncOperationId: c.AsyncOperationId, }) + return cctx.GetPoller(cloudClient, c.AsyncOperationOptions).HandleUpdateOperation(cctx, resp, err) } func (c *CloudNamespaceExportGcsValidateCommand) run(cctx *CommandContext, _ []string) error { @@ -828,79 +530,170 @@ func (c *CloudNamespaceExportGcsValidateCommand) run(cctx *CommandContext, _ []s if err != nil { return err } - cloudClient, err := cctx.BuildCloudClient(c.ClientOptions) + cloudClient, err := cctx.GetCloudClient(c.ClientOptions) if err != nil { return err } - return ValidateGCSExportSink(cctx.Context, ValidateGCSExportSinkParams{ - Namespace: c.Namespace, - SinkName: c.SinkName, - SaID: saID, - BucketName: c.BucketName, - GcpProjectID: projectID, - Region: c.Region, - Cloud: cloudClient.CloudService(), - Printer: cctx.Printer, + spec := &namespacev1.ExportSinkSpec{ + Name: c.SinkName, + Gcs: &sinkv1.GCSSpec{ + SaId: saID, + BucketName: c.BucketName, + GcpProjectId: projectID, + Region: c.Region, + }, + } + if c.Command.Flags().Changed("disable-standalone-activity-export") { + spec.Filter = &namespacev1.ExportSinkSpec_SinkFilter{ + DisableStandaloneActivityExport: c.DisableStandaloneActivityExport, + } + } + + _, err = cloudClient.ValidateNamespaceExportSink(cctx, &cloudservice.ValidateNamespaceExportSinkRequest{ + Namespace: c.Namespace, + Spec: spec, }) + if err != nil { + return err + } + return cctx.Printer.PrintStructured( + struct{ Status string }{Status: fmt.Sprintf("Export sink %q configuration is valid.", c.SinkName)}, + printer.StructuredOptions{}, + ) } func (c *CloudNamespaceExportAzureBlobCreateCommand) run(cctx *CommandContext, _ []string) error { - cloudClient, err := cctx.BuildCloudClient(c.ClientOptions) + cloudClient, err := cctx.GetCloudClient(c.ClientOptions) + if err != nil { + return err + } + spec := &namespacev1.ExportSinkSpec{ + Name: c.SinkName, + Enabled: true, + AzureBlob: &sinkv1.AzureBlobSpec{ + TenantId: c.TenantId, + SubscriptionId: c.SubscriptionId, + ResourceGroup: c.ResourceGroup, + StorageAccount: c.StorageAccount, + ContainerName: c.ContainerName, + Region: c.Region, + }, + } + if c.Command.Flags().Changed("disable-standalone-activity-export") { + spec.Filter = &namespacev1.ExportSinkSpec_SinkFilter{ + DisableStandaloneActivityExport: c.DisableStandaloneActivityExport, + } + } + + yes, err := cctx.GetPrompter().PromptApply(&namespacev1.ExportSinkSpec{}, spec, false) if err != nil { return err } - return CreateAzureBlobExportSink(cctx.Context, CreateAzureBlobExportSinkParams{ + if !yes { + return nil + } + resp, err := cloudClient.CreateNamespaceExportSink(cctx, &cloudservice.CreateNamespaceExportSinkRequest{ Namespace: c.Namespace, - SinkName: c.SinkName, - TenantID: c.TenantId, - SubscriptionID: c.SubscriptionId, - ResourceGroup: c.ResourceGroup, - StorageAccount: c.StorageAccount, - ContainerName: c.ContainerName, - Region: c.Region, - AsyncOperationID: c.AsyncOperationId, - Cloud: cloudClient.CloudService(), - Prompter: newPrompter(cctx), - OperationHandler: NewOperationHandler(cctx, c.AsyncOperationOptions, c.ClientOptions), + Spec: spec, + AsyncOperationId: c.AsyncOperationId, }) + return cctx.GetPoller(cloudClient, c.AsyncOperationOptions).HandleCreateAsyncOperationResponse(cctx, resp, err) } func (c *CloudNamespaceExportAzureBlobUpdateCommand) run(cctx *CommandContext, _ []string) error { - cloudClient, err := cctx.BuildCloudClient(c.ClientOptions) + cloudClient, err := cctx.GetCloudClient(c.ClientOptions) if err != nil { return err } - return UpdateAzureBlobExportSink(cctx.Context, UpdateAzureBlobExportSinkParams{ + sinkRes, err := cloudClient.GetNamespaceExportSink(cctx, &cloudservice.GetNamespaceExportSinkRequest{ + Namespace: c.Namespace, + Name: c.SinkName, + }) + if err != nil { + return err + } + sink := sinkRes.Sink + + rv := sink.ResourceVersion + if c.ResourceVersion != "" { + rv = c.ResourceVersion + } + + oldSpec := sink.Spec + newSpec := proto.Clone(oldSpec).(*namespacev1.ExportSinkSpec) + newAzureBlob := newSpec.GetAzureBlob() + if c.TenantId != "" { + newAzureBlob.TenantId = c.TenantId + } + if c.SubscriptionId != "" { + newAzureBlob.SubscriptionId = c.SubscriptionId + } + if c.ResourceGroup != "" { + newAzureBlob.ResourceGroup = c.ResourceGroup + } + if c.StorageAccount != "" { + newAzureBlob.StorageAccount = c.StorageAccount + } + if c.ContainerName != "" { + newAzureBlob.ContainerName = c.ContainerName + } + + // AIDEV-NOTE: Check flag presence so an omitted bool preserves the existing filter. + if c.Command.Flags().Changed("disable-standalone-activity-export") { + if newSpec.Filter == nil { + newSpec.Filter = &namespacev1.ExportSinkSpec_SinkFilter{} + } + newSpec.Filter.DisableStandaloneActivityExport = c.DisableStandaloneActivityExport + } + + yes, err := cctx.GetPrompter().PromptApply(oldSpec, newSpec, false) + if err != nil { + return err + } + if !yes { + return nil + } + + resp, err := cloudClient.UpdateNamespaceExportSink(cctx, &cloudservice.UpdateNamespaceExportSinkRequest{ Namespace: c.Namespace, - SinkName: c.SinkName, - TenantID: c.TenantId, - SubscriptionID: c.SubscriptionId, - ResourceGroup: c.ResourceGroup, - StorageAccount: c.StorageAccount, - ContainerName: c.ContainerName, - ResourceVersion: c.ResourceVersion, - AsyncOperationID: c.AsyncOperationId, - Cloud: cloudClient.CloudService(), - Prompter: newPrompter(cctx), - OperationHandler: NewOperationHandler(cctx, c.AsyncOperationOptions, c.ClientOptions), + Spec: newSpec, + ResourceVersion: rv, + AsyncOperationId: c.AsyncOperationId, }) + return cctx.GetPoller(cloudClient, c.AsyncOperationOptions).HandleUpdateOperation(cctx, resp, err) } func (c *CloudNamespaceExportAzureBlobValidateCommand) run(cctx *CommandContext, _ []string) error { - cloudClient, err := cctx.BuildCloudClient(c.ClientOptions) + cloudClient, err := cctx.GetCloudClient(c.ClientOptions) if err != nil { return err } - return ValidateAzureBlobExportSink(cctx.Context, ValidateAzureBlobExportSinkParams{ - Namespace: c.Namespace, - SinkName: c.SinkName, - TenantID: c.TenantId, - SubscriptionID: c.SubscriptionId, - ResourceGroup: c.ResourceGroup, - StorageAccount: c.StorageAccount, - ContainerName: c.ContainerName, - Region: c.Region, - Cloud: cloudClient.CloudService(), - Printer: cctx.Printer, + spec := &namespacev1.ExportSinkSpec{ + Name: c.SinkName, + AzureBlob: &sinkv1.AzureBlobSpec{ + TenantId: c.TenantId, + SubscriptionId: c.SubscriptionId, + ResourceGroup: c.ResourceGroup, + StorageAccount: c.StorageAccount, + ContainerName: c.ContainerName, + Region: c.Region, + }, + } + if c.Command.Flags().Changed("disable-standalone-activity-export") { + spec.Filter = &namespacev1.ExportSinkSpec_SinkFilter{ + DisableStandaloneActivityExport: c.DisableStandaloneActivityExport, + } + } + + _, err = cloudClient.ValidateNamespaceExportSink(cctx, &cloudservice.ValidateNamespaceExportSinkRequest{ + Namespace: c.Namespace, + Spec: spec, }) + if err != nil { + return err + } + return cctx.Printer.PrintStructured( + struct{ Status string }{Status: fmt.Sprintf("Export sink %q configuration is valid.", c.SinkName)}, + printer.StructuredOptions{}, + ) } diff --git a/temporalcloudcli/commands.namespace.export_test.go b/temporalcloudcli/commands.namespace.export_test.go index 59bea21..39e37e3 100644 --- a/temporalcloudcli/commands.namespace.export_test.go +++ b/temporalcloudcli/commands.namespace.export_test.go @@ -6,7 +6,9 @@ import ( "errors" "testing" + "github.com/spf13/cobra" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" cloudmock "github.com/temporalio/cloud-cli/internal/cloudservice/mock" "github.com/temporalio/cloud-cli/temporalcloudcli" @@ -16,6 +18,19 @@ import ( namespacev1 "go.temporal.io/cloud-sdk/api/namespace/v1" operation "go.temporal.io/cloud-sdk/api/operation/v1" sinkv1 "go.temporal.io/cloud-sdk/api/sink/v1" + "google.golang.org/protobuf/proto" +) + +type ( + exportCommandFactory func() (temporalcloudcli.CommandIfc, *cobra.Command, *bool) + exportTestProvider struct { + name string + spec *namespacev1.ExportSinkSpec + updatedSpec *namespacev1.ExportSinkSpec + create exportCommandFactory + update func(string, bool) (temporalcloudcli.CommandIfc, *cobra.Command, *bool) + validate exportCommandFactory + } ) // testS3Spec returns a sample S3 spec for use in tests. @@ -503,1096 +518,409 @@ func TestDisableExportSink_PromptDeclined(t *testing.T) { require.ErrorIs(t, err, promptErr) } -// --- CreateS3ExportSink --- - -func TestCreateS3ExportSink_Success(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - - expectedSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - S3: testS3Spec(), +func exportTestProviders() []exportTestProvider { + return []exportTestProvider{ + { + name: "S3", + spec: &namespacev1.ExportSinkSpec{Name: "my-sink", Enabled: true, S3: testS3Spec()}, + updatedSpec: &namespacev1.ExportSinkSpec{Name: "my-sink", + Enabled: true, + S3: &sinkv1.S3Spec{RoleName: "new-role", + AwsAccountId: "987654321012", + BucketName: "new-bucket", + KmsArn: "new-kms", + Region: "us-east-1"}}, + create: func() (temporalcloudcli.CommandIfc, *cobra.Command, *bool) { + c := &temporalcloudcli.CloudNamespaceExportS3CreateCommand{} + c.Namespace = "my-namespace" + c.SinkName = "my-sink" + c.RoleArn = "arn:aws:iam::123456789012:role/my-role" + c.BucketName = "my-bucket" + c.Region = "us-east-1" + c.AsyncOperationId = "request-id" + return c, &c.Command, &c.DisableStandaloneActivityExport + }, + update: func(resourceVersion string, filterOnly bool) (temporalcloudcli.CommandIfc, *cobra.Command, *bool) { + c := &temporalcloudcli.CloudNamespaceExportS3UpdateCommand{} + c.Namespace = "my-namespace" + c.SinkName = "my-sink" + c.ResourceVersion = resourceVersion + if !filterOnly { + c.RoleArn = "arn:aws:iam::987654321012:role/new-role" + c.BucketName = "new-bucket" + c.KmsArn = "new-kms" + } + c.AsyncOperationId = "request-id" + return c, &c.Command, &c.DisableStandaloneActivityExport + }, + validate: func() (temporalcloudcli.CommandIfc, *cobra.Command, *bool) { + c := &temporalcloudcli.CloudNamespaceExportS3ValidateCommand{} + c.Namespace = "my-namespace" + c.SinkName = "my-sink" + c.RoleArn = "arn:aws:iam::123456789012:role/my-role" + c.BucketName = "my-bucket" + c.Region = "us-east-1" + return c, &c.Command, &c.DisableStandaloneActivityExport + }, + }, + { + name: "GCS", + spec: &namespacev1.ExportSinkSpec{Name: "my-sink", Enabled: true, Gcs: testGCSSpec()}, + updatedSpec: &namespacev1.ExportSinkSpec{Name: "my-sink", + Enabled: true, + Gcs: &sinkv1.GCSSpec{SaId: "new-sa", + GcpProjectId: "new-project", + BucketName: "new-bucket", + Region: "us-central1"}}, + create: func() (temporalcloudcli.CommandIfc, *cobra.Command, *bool) { + c := &temporalcloudcli.CloudNamespaceExportGcsCreateCommand{} + c.Namespace = "my-namespace" + c.SinkName = "my-sink" + c.ServiceAccountEmail = "my-sa@my-project.iam.gserviceaccount.com" + c.BucketName = "my-bucket" + c.Region = "us-central1" + c.AsyncOperationId = "request-id" + return c, &c.Command, &c.DisableStandaloneActivityExport + }, + update: func(resourceVersion string, filterOnly bool) (temporalcloudcli.CommandIfc, *cobra.Command, *bool) { + c := &temporalcloudcli.CloudNamespaceExportGcsUpdateCommand{} + c.Namespace = "my-namespace" + c.SinkName = "my-sink" + c.ResourceVersion = resourceVersion + if !filterOnly { + c.ServiceAccountEmail = "new-sa@new-project.iam.gserviceaccount.com" + c.BucketName = "new-bucket" + } + c.AsyncOperationId = "request-id" + return c, &c.Command, &c.DisableStandaloneActivityExport + }, + validate: func() (temporalcloudcli.CommandIfc, *cobra.Command, *bool) { + c := &temporalcloudcli.CloudNamespaceExportGcsValidateCommand{} + c.Namespace = "my-namespace" + c.SinkName = "my-sink" + c.ServiceAccountEmail = "my-sa@my-project.iam.gserviceaccount.com" + c.BucketName = "my-bucket" + c.Region = "us-central1" + return c, &c.Command, &c.DisableStandaloneActivityExport + }, + }, + { + name: "AzureBlob", + spec: &namespacev1.ExportSinkSpec{Name: "my-sink", Enabled: true, AzureBlob: testAzureBlobSpec()}, + updatedSpec: &namespacev1.ExportSinkSpec{Name: "my-sink", + Enabled: true, + AzureBlob: &sinkv1.AzureBlobSpec{TenantId: "my-tenant", + SubscriptionId: "my-subscription", + ResourceGroup: "my-resource-group", + StorageAccount: "new-storage-account", + ContainerName: "new-container", + Region: "eastus"}}, + create: func() (temporalcloudcli.CommandIfc, *cobra.Command, *bool) { + c := &temporalcloudcli.CloudNamespaceExportAzureBlobCreateCommand{} + c.Namespace = "my-namespace" + c.SinkName = "my-sink" + c.TenantId = "my-tenant" + c.SubscriptionId = "my-subscription" + c.ResourceGroup = "my-resource-group" + c.StorageAccount = "my-storage-account" + c.ContainerName = "my-container" + c.Region = "eastus" + c.AsyncOperationId = "request-id" + return c, &c.Command, &c.DisableStandaloneActivityExport + }, + update: func(resourceVersion string, filterOnly bool) (temporalcloudcli.CommandIfc, *cobra.Command, *bool) { + c := &temporalcloudcli.CloudNamespaceExportAzureBlobUpdateCommand{} + c.Namespace = "my-namespace" + c.SinkName = "my-sink" + c.ResourceVersion = resourceVersion + if !filterOnly { + c.StorageAccount = "new-storage-account" + c.ContainerName = "new-container" + } + c.AsyncOperationId = "request-id" + return c, &c.Command, &c.DisableStandaloneActivityExport + }, + validate: func() (temporalcloudcli.CommandIfc, *cobra.Command, *bool) { + c := &temporalcloudcli.CloudNamespaceExportAzureBlobValidateCommand{} + c.Namespace = "my-namespace" + c.SinkName = "my-sink" + c.TenantId = "my-tenant" + c.SubscriptionId = "my-subscription" + c.ResourceGroup = "my-resource-group" + c.StorageAccount = "my-storage-account" + c.ContainerName = "my-container" + c.Region = "eastus" + return c, &c.Command, &c.DisableStandaloneActivityExport + }, + }, } - mockPrompter.EXPECT(). - PromptApply(&namespacev1.ExportSinkSpec{}, expectedSpec, false). - Return(nil) - - op := &operation.AsyncOperation{Id: "op-123"} - mockCloud.EXPECT(). - CreateNamespaceExportSink(context.Background(), &cloudservice.CreateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: expectedSpec, - }). - Return(&cloudservice.CreateNamespaceExportSinkResponse{AsyncOperation: op}, nil) - - mockHandler.EXPECT(). - HandleOperation(op, "my-sink"). - Return(nil) - - err := temporalcloudcli.CreateS3ExportSink(context.Background(), temporalcloudcli.CreateS3ExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - RoleName: "my-role", - BucketName: "my-bucket", - Region: "us-east-1", - AwsAccountID: "123456789012", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.NoError(t, err) } -func TestCreateS3ExportSink_PromptDeclined(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - promptErr := errors.New("Aborting apply.") - - expectedSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - S3: testS3Spec(), +// AIDEV-NOTE: Register and parse the bool flag to exercise explicit false versus omission. +func parseExportFilterFlag(t *testing.T, command *cobra.Command, value *bool, flag string) { + t.Helper() + command.Flags().BoolVar(value, "disable-standalone-activity-export", false, "") + if flag != "" { + require.NoError(t, command.Flags().Parse([]string{"--disable-standalone-activity-export=" + flag})) } - mockPrompter.EXPECT(). - PromptApply(&namespacev1.ExportSinkSpec{}, expectedSpec, false). - Return(promptErr) - - err := temporalcloudcli.CreateS3ExportSink(context.Background(), temporalcloudcli.CreateS3ExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - RoleName: "my-role", - BucketName: "my-bucket", - Region: "us-east-1", - AwsAccountID: "123456789012", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.ErrorIs(t, err, promptErr) } -func TestCreateS3ExportSink_CreateError(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - createErr := errors.New("create error") - - expectedSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - S3: testS3Spec(), +func TestCreateExportSink_Filter(t *testing.T) { + for _, provider := range exportTestProviders() { + for _, tt := range []struct { + name string + flag string + filter *namespacev1.ExportSinkSpec_SinkFilter + }{ + {name: "Omitted"}, + {name: "Disabled", flag: "true", filter: &namespacev1.ExportSinkSpec_SinkFilter{ + DisableStandaloneActivityExport: true, + }}, + {name: "Enabled", flag: "false", filter: &namespacev1.ExportSinkSpec_SinkFilter{}}, + } { + t.Run(provider.name+"/"+tt.name, func(t *testing.T) { + command, cobraCommand, flag := provider.create() + parseExportFilterFlag(t, cobraCommand, flag, tt.flag) + expected := proto.Clone(provider.spec).(*namespacev1.ExportSinkSpec) + expected.Filter = tt.filter + temporalcloudcli.TestCommand(t, command, temporalcloudcli.TestCommandOptions{ + CloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) { + c.EXPECT().CreateNamespaceExportSink(mock.Anything, &cloudservice.CreateNamespaceExportSinkRequest{ + Namespace: "my-namespace", Spec: expected, AsyncOperationId: "request-id", + }, mock.Anything).Return(&cloudservice.CreateNamespaceExportSinkResponse{ + AsyncOperation: &operation.AsyncOperation{Id: "op-123"}, + }, nil) + }, + PromptOptions: temporalcloudcli.TestPromptOptions{ + ExpectPrompApply: true, PromptResult: true, + ExpectPromptApplyExisting: &namespacev1.ExportSinkSpec{}, + ExpectPromptApplyModified: expected, + }, + AsyncPollerOptions: temporalcloudcli.TestAsyncPollerOptions{AsyncOperationID: "op-123"}, + }) + }) + } } - mockPrompter.EXPECT(). - PromptApply(&namespacev1.ExportSinkSpec{}, expectedSpec, false). - Return(nil) - - mockCloud.EXPECT(). - CreateNamespaceExportSink(context.Background(), &cloudservice.CreateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: expectedSpec, - }). - Return(nil, createErr) - - mockHandler.EXPECT(). - HandleCreateErr(createErr). - Return(createErr) - - err := temporalcloudcli.CreateS3ExportSink(context.Background(), temporalcloudcli.CreateS3ExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - RoleName: "my-role", - BucketName: "my-bucket", - Region: "us-east-1", - AwsAccountID: "123456789012", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.ErrorIs(t, err, createErr) } -// --- UpdateS3ExportSink --- - -func TestUpdateS3ExportSink_Success(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - - sink := testExportSink(true) - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(&cloudservice.GetNamespaceExportSinkResponse{Sink: sink}, nil) - - newSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - S3: &sinkv1.S3Spec{ - RoleName: "new-role", - BucketName: "my-bucket", - Region: "us-east-1", - AwsAccountId: "123456789012", - }, +func TestUpdateExportSink_Filter(t *testing.T) { + for _, provider := range exportTestProviders() { + for _, tt := range []struct { + name string + flag string + existing *namespacev1.ExportSinkSpec_SinkFilter + expected *namespacev1.ExportSinkSpec_SinkFilter + enabled bool + resourceVersion string + filterOnly bool + }{ + {name: "OmittedWithoutFilter", enabled: true}, + {name: "FilterOnly", flag: "true", filterOnly: true, enabled: true, + expected: &namespacev1.ExportSinkSpec_SinkFilter{DisableStandaloneActivityExport: true}}, + {name: "OmittedPreservesDisabled", existing: &namespacev1.ExportSinkSpec_SinkFilter{ + DisableStandaloneActivityExport: true, + }, expected: &namespacev1.ExportSinkSpec_SinkFilter{DisableStandaloneActivityExport: true}}, + {name: "OmittedPreservesEnabled", existing: &namespacev1.ExportSinkSpec_SinkFilter{}, + expected: &namespacev1.ExportSinkSpec_SinkFilter{}, enabled: true}, + {name: "DisableWithoutFilter", flag: "true", expected: &namespacev1.ExportSinkSpec_SinkFilter{ + DisableStandaloneActivityExport: true, + }, enabled: true}, + {name: "DisableExistingFilter", flag: "true", existing: &namespacev1.ExportSinkSpec_SinkFilter{}, + expected: &namespacev1.ExportSinkSpec_SinkFilter{DisableStandaloneActivityExport: true}, enabled: true}, + {name: "Reenable", flag: "false", existing: &namespacev1.ExportSinkSpec_SinkFilter{ + DisableStandaloneActivityExport: true, + }, expected: &namespacev1.ExportSinkSpec_SinkFilter{}, resourceVersion: "explicit-rv"}, + {name: "EnableWithoutFilter", flag: "false", expected: &namespacev1.ExportSinkSpec_SinkFilter{}, enabled: true}, + } { + t.Run(provider.name+"/"+tt.name, func(t *testing.T) { + command, cobraCommand, flag := provider.update(tt.resourceVersion, tt.filterOnly) + parseExportFilterFlag(t, cobraCommand, flag, tt.flag) + existing := proto.Clone(provider.spec).(*namespacev1.ExportSinkSpec) + existing.Filter = tt.existing + existing.Enabled = tt.enabled + original := proto.Clone(existing) + expected := proto.Clone(provider.updatedSpec).(*namespacev1.ExportSinkSpec) + if tt.filterOnly { + expected = proto.Clone(provider.spec).(*namespacev1.ExportSinkSpec) + } + expected.Filter = tt.expected + expected.Enabled = tt.enabled + rv := "rv-1" + if tt.resourceVersion != "" { + rv = tt.resourceVersion + } + temporalcloudcli.TestCommand(t, command, temporalcloudcli.TestCommandOptions{ + CloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) { + c.EXPECT().GetNamespaceExportSink(mock.Anything, &cloudservice.GetNamespaceExportSinkRequest{ + Namespace: "my-namespace", Name: "my-sink", + }, mock.Anything).Return(&cloudservice.GetNamespaceExportSinkResponse{ + Sink: &namespacev1.ExportSink{Spec: existing, ResourceVersion: "rv-1"}, + }, nil) + c.EXPECT().UpdateNamespaceExportSink(mock.Anything, &cloudservice.UpdateNamespaceExportSinkRequest{ + Namespace: "my-namespace", Spec: expected, ResourceVersion: rv, AsyncOperationId: "request-id", + }, mock.Anything).Return(&cloudservice.UpdateNamespaceExportSinkResponse{ + AsyncOperation: &operation.AsyncOperation{Id: "op-123"}, + }, nil) + }, + PromptOptions: temporalcloudcli.TestPromptOptions{ + ExpectPrompApply: true, PromptResult: true, + ExpectPromptApplyExisting: existing, ExpectPromptApplyModified: expected, + }, + AsyncPollerOptions: temporalcloudcli.TestAsyncPollerOptions{AsyncOperationID: "op-123"}, + }) + assert.Equal(t, original, proto.Clone(existing)) + }) + } } - mockPrompter.EXPECT(). - PromptApply(sink.Spec, newSpec, false). - Return(nil) - - op := &operation.AsyncOperation{Id: "op-123"} - mockCloud.EXPECT(). - UpdateNamespaceExportSink(context.Background(), &cloudservice.UpdateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: newSpec, - ResourceVersion: "rv-1", - }). - Return(&cloudservice.UpdateNamespaceExportSinkResponse{AsyncOperation: op}, nil) - - mockHandler.EXPECT(). - HandleOperation(op, "my-sink"). - Return(nil) - - err := temporalcloudcli.UpdateS3ExportSink(context.Background(), temporalcloudcli.UpdateS3ExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - RoleName: "new-role", - BucketName: "my-bucket", - AwsAccountID: "123456789012", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.NoError(t, err) } -func TestUpdateS3ExportSink_PromptDeclined(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - promptErr := errors.New("Aborting apply.") - - sink := testExportSink(true) - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(&cloudservice.GetNamespaceExportSinkResponse{Sink: sink}, nil) - - newSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - S3: &sinkv1.S3Spec{ - RoleName: "new-role", - BucketName: "my-bucket", - Region: "us-east-1", - AwsAccountId: "123456789012", - }, +func TestValidateExportSink_Filter(t *testing.T) { + for _, provider := range exportTestProviders() { + for _, tt := range []struct { + name string + flag string + filter *namespacev1.ExportSinkSpec_SinkFilter + }{ + {name: "Omitted"}, + {name: "Disabled", flag: "true", filter: &namespacev1.ExportSinkSpec_SinkFilter{ + DisableStandaloneActivityExport: true, + }}, + {name: "Enabled", flag: "false", filter: &namespacev1.ExportSinkSpec_SinkFilter{}}, + } { + t.Run(provider.name+"/"+tt.name, func(t *testing.T) { + command, cobraCommand, flag := provider.validate() + parseExportFilterFlag(t, cobraCommand, flag, tt.flag) + expected := proto.Clone(provider.spec).(*namespacev1.ExportSinkSpec) + expected.Enabled = false + expected.Filter = tt.filter + temporalcloudcli.TestCommand(t, command, temporalcloudcli.TestCommandOptions{ + CloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) { + c.EXPECT().ValidateNamespaceExportSink(mock.Anything, &cloudservice.ValidateNamespaceExportSinkRequest{ + Namespace: "my-namespace", Spec: expected, + }, mock.Anything).Return(&cloudservice.ValidateNamespaceExportSinkResponse{}, nil) + }, + JSONOutput: true, + ExpectedOutputJson: struct{ Status string }{Status: `Export sink "my-sink" configuration is valid.`}, + }) + }) + } } - mockPrompter.EXPECT(). - PromptApply(sink.Spec, newSpec, false). - Return(promptErr) - - err := temporalcloudcli.UpdateS3ExportSink(context.Background(), temporalcloudcli.UpdateS3ExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - RoleName: "new-role", - BucketName: "my-bucket", - AwsAccountID: "123456789012", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.ErrorIs(t, err, promptErr) } -func TestUpdateS3ExportSink_GetSinkError(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - apiErr := errors.New("api error") - - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(nil, apiErr) - - err := temporalcloudcli.UpdateS3ExportSink(context.Background(), temporalcloudcli.UpdateS3ExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - RoleName: "my-role", - BucketName: "my-bucket", - AwsAccountID: "123456789012", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.ErrorIs(t, err, apiErr) +func TestCreateExportSink_Prompt(t *testing.T) { + for _, provider := range exportTestProviders() { + for _, tt := range []struct { + name string + promptError error + expectedError string + }{ + {name: "Declined"}, + {name: "Error", promptError: errors.New("prompt failed"), expectedError: "prompt failed"}, + } { + t.Run(provider.name+"/"+tt.name, func(t *testing.T) { + command, _, _ := provider.create() + temporalcloudcli.TestCommand(t, command, temporalcloudcli.TestCommandOptions{ + PromptOptions: temporalcloudcli.TestPromptOptions{ + ExpectPrompApply: true, PromptError: tt.promptError, + }, + ExpectedError: tt.expectedError, + }) + }) + } + } } -func TestUpdateS3ExportSink_PreservesEnabledState(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - - // Sink is currently disabled — update should preserve that. - sink := testExportSink(false) - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(&cloudservice.GetNamespaceExportSinkResponse{Sink: sink}, nil) - - newSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: false, // preserved from existing sink - S3: testS3Spec(), +func TestUpdateExportSink_Prompt(t *testing.T) { + for _, provider := range exportTestProviders() { + for _, tt := range []struct { + name string + promptError error + expectedError string + }{ + {name: "Declined"}, + {name: "Error", promptError: errors.New("prompt failed"), expectedError: "prompt failed"}, + } { + t.Run(provider.name+"/"+tt.name, func(t *testing.T) { + command, _, _ := provider.update("", false) + temporalcloudcli.TestCommand(t, command, temporalcloudcli.TestCommandOptions{ + CloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) { + c.EXPECT().GetNamespaceExportSink(mock.Anything, mock.Anything, mock.Anything). + Return(&cloudservice.GetNamespaceExportSinkResponse{ + Sink: &namespacev1.ExportSink{Spec: provider.spec, ResourceVersion: "rv-1"}, + }, nil) + }, + PromptOptions: temporalcloudcli.TestPromptOptions{ + ExpectPrompApply: true, PromptError: tt.promptError, + }, + ExpectedError: tt.expectedError, + }) + }) + } } - mockPrompter.EXPECT(). - PromptApply(sink.Spec, newSpec, false). - Return(nil) - - op := &operation.AsyncOperation{Id: "op-123"} - mockCloud.EXPECT(). - UpdateNamespaceExportSink(context.Background(), &cloudservice.UpdateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: newSpec, - ResourceVersion: "rv-1", - }). - Return(&cloudservice.UpdateNamespaceExportSinkResponse{AsyncOperation: op}, nil) - - mockHandler.EXPECT(). - HandleOperation(op, "my-sink"). - Return(nil) - - err := temporalcloudcli.UpdateS3ExportSink(context.Background(), temporalcloudcli.UpdateS3ExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - RoleName: "my-role", - BucketName: "my-bucket", - AwsAccountID: "123456789012", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.NoError(t, err) } -func TestUpdateS3ExportSink_PartialUpdate(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - - sink := testExportSink(true) - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(&cloudservice.GetNamespaceExportSinkResponse{Sink: sink}, nil) - - // Only the IAM role and account ID change; bucket-name, region, and kms-arn - // must be preserved from the existing sink spec. - expectedNewSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - S3: &sinkv1.S3Spec{ - RoleName: "rotated-role", - BucketName: "my-bucket", - Region: "us-east-1", - AwsAccountId: "999988887777", - }, +func TestCreateExportSink_APIError(t *testing.T) { + for _, provider := range exportTestProviders() { + t.Run(provider.name, func(t *testing.T) { + command, _, _ := provider.create() + temporalcloudcli.TestCommand(t, command, temporalcloudcli.TestCommandOptions{ + CloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) { + c.EXPECT().CreateNamespaceExportSink(mock.Anything, mock.Anything, mock.Anything). + Return(nil, errors.New("api failed")) + }, + PromptOptions: temporalcloudcli.TestPromptOptions{ExpectPrompApply: true, PromptResult: true}, + ExpectedError: "api failed", + }) + }) } - mockPrompter.EXPECT(). - PromptApply(sink.Spec, expectedNewSpec, false). - Return(nil) - - op := &operation.AsyncOperation{Id: "op-partial-s3"} - mockCloud.EXPECT(). - UpdateNamespaceExportSink(context.Background(), &cloudservice.UpdateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: expectedNewSpec, - ResourceVersion: "rv-1", - }). - Return(&cloudservice.UpdateNamespaceExportSinkResponse{AsyncOperation: op}, nil) - - mockHandler.EXPECT(). - HandleOperation(op, "my-sink"). - Return(nil) - - err := temporalcloudcli.UpdateS3ExportSink(context.Background(), temporalcloudcli.UpdateS3ExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - RoleName: "rotated-role", - AwsAccountID: "999988887777", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.NoError(t, err) } -// --- ValidateS3ExportSink --- - -func TestValidateS3ExportSink_Success(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) +func TestUpdateExportSink_APIError(t *testing.T) { + for _, provider := range exportTestProviders() { + t.Run(provider.name, func(t *testing.T) { + command, _, _ := provider.update("", false) + temporalcloudcli.TestCommand(t, command, temporalcloudcli.TestCommandOptions{ + CloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) { + c.EXPECT().GetNamespaceExportSink(mock.Anything, mock.Anything, mock.Anything). + Return(&cloudservice.GetNamespaceExportSinkResponse{ + Sink: &namespacev1.ExportSink{Spec: provider.spec, ResourceVersion: "rv-1"}, + }, nil) + c.EXPECT().UpdateNamespaceExportSink(mock.Anything, mock.Anything, mock.Anything). + Return(nil, errors.New("api failed")) + }, + PromptOptions: temporalcloudcli.TestPromptOptions{ExpectPrompApply: true, PromptResult: true}, + ExpectedError: "api failed", + }) + }) + } +} - mockCloud.EXPECT(). - ValidateNamespaceExportSink(context.Background(), &cloudservice.ValidateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - S3: testS3Spec(), - }, - }). - Return(&cloudservice.ValidateNamespaceExportSinkResponse{}, nil) +func TestValidateExportSink_APIError(t *testing.T) { + for _, provider := range exportTestProviders() { + t.Run(provider.name, func(t *testing.T) { + command, _, _ := provider.validate() + temporalcloudcli.TestCommand(t, command, temporalcloudcli.TestCommandOptions{ + CloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) { + c.EXPECT().ValidateNamespaceExportSink(mock.Anything, mock.Anything, mock.Anything). + Return(nil, errors.New("api failed")) + }, + ExpectedError: "api failed", + }) + }) + } +} - var buf bytes.Buffer - err := temporalcloudcli.ValidateS3ExportSink(context.Background(), temporalcloudcli.ValidateS3ExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - RoleName: "my-role", - BucketName: "my-bucket", - Region: "us-east-1", - AwsAccountID: "123456789012", - Cloud: mockCloud, - Printer: newTestPrinter(&buf), - }) - require.NoError(t, err) - assert.Contains(t, buf.String(), "my-sink") -} - -func TestValidateS3ExportSink_Error(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - apiErr := errors.New("invalid config") - - mockCloud.EXPECT(). - ValidateNamespaceExportSink(context.Background(), &cloudservice.ValidateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - S3: testS3Spec(), - }, - }). - Return(nil, apiErr) - - var buf bytes.Buffer - err := temporalcloudcli.ValidateS3ExportSink(context.Background(), temporalcloudcli.ValidateS3ExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - RoleName: "my-role", - BucketName: "my-bucket", - Region: "us-east-1", - AwsAccountID: "123456789012", - Cloud: mockCloud, - Printer: newTestPrinter(&buf), - }) - require.ErrorIs(t, err, apiErr) -} - -// --- CreateGCSExportSink --- - -func TestCreateGCSExportSink_Success(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - - expectedSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - Gcs: testGCSSpec(), - } - mockPrompter.EXPECT(). - PromptApply(&namespacev1.ExportSinkSpec{}, expectedSpec, false). - Return(nil) - - op := &operation.AsyncOperation{Id: "op-123"} - mockCloud.EXPECT(). - CreateNamespaceExportSink(context.Background(), &cloudservice.CreateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: expectedSpec, - }). - Return(&cloudservice.CreateNamespaceExportSinkResponse{AsyncOperation: op}, nil) - - mockHandler.EXPECT(). - HandleOperation(op, "my-sink"). - Return(nil) - - err := temporalcloudcli.CreateGCSExportSink(context.Background(), temporalcloudcli.CreateGCSExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - SaID: "my-sa", - BucketName: "my-bucket", - GcpProjectID: "my-project", - Region: "us-central1", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.NoError(t, err) -} - -func TestCreateGCSExportSink_PromptDeclined(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - promptErr := errors.New("Aborting apply.") - - expectedSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - Gcs: testGCSSpec(), - } - mockPrompter.EXPECT(). - PromptApply(&namespacev1.ExportSinkSpec{}, expectedSpec, false). - Return(promptErr) - - err := temporalcloudcli.CreateGCSExportSink(context.Background(), temporalcloudcli.CreateGCSExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - SaID: "my-sa", - BucketName: "my-bucket", - GcpProjectID: "my-project", - Region: "us-central1", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.ErrorIs(t, err, promptErr) -} - -// --- UpdateGCSExportSink --- - -func TestUpdateGCSExportSink_Success(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - - existingSink := &namespacev1.ExportSink{ - ResourceVersion: "rv-1", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - Gcs: testGCSSpec(), - }, - } - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(&cloudservice.GetNamespaceExportSinkResponse{Sink: existingSink}, nil) - - newSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - Gcs: &sinkv1.GCSSpec{ - SaId: "new-sa", - BucketName: "my-bucket", - GcpProjectId: "my-project", - Region: "us-central1", - }, - } - mockPrompter.EXPECT(). - PromptApply(existingSink.Spec, newSpec, false). - Return(nil) - - op := &operation.AsyncOperation{Id: "op-123"} - mockCloud.EXPECT(). - UpdateNamespaceExportSink(context.Background(), &cloudservice.UpdateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: newSpec, - ResourceVersion: "rv-1", - }). - Return(&cloudservice.UpdateNamespaceExportSinkResponse{AsyncOperation: op}, nil) - - mockHandler.EXPECT(). - HandleOperation(op, "my-sink"). - Return(nil) - - err := temporalcloudcli.UpdateGCSExportSink(context.Background(), temporalcloudcli.UpdateGCSExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - SaID: "new-sa", - BucketName: "my-bucket", - GcpProjectID: "my-project", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.NoError(t, err) -} - -func TestUpdateGCSExportSink_PromptDeclined(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - promptErr := errors.New("Aborting apply.") - - existingSink := &namespacev1.ExportSink{ - ResourceVersion: "rv-1", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - Gcs: testGCSSpec(), - }, - } - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(&cloudservice.GetNamespaceExportSinkResponse{Sink: existingSink}, nil) - - newSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - Gcs: &sinkv1.GCSSpec{ - SaId: "new-sa", - BucketName: "my-bucket", - GcpProjectId: "my-project", - Region: "us-central1", - }, - } - mockPrompter.EXPECT(). - PromptApply(existingSink.Spec, newSpec, false). - Return(promptErr) - - err := temporalcloudcli.UpdateGCSExportSink(context.Background(), temporalcloudcli.UpdateGCSExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - SaID: "new-sa", - BucketName: "my-bucket", - GcpProjectID: "my-project", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.ErrorIs(t, err, promptErr) -} - -func TestUpdateGCSExportSink_GetSinkError(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - apiErr := errors.New("api error") - - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(nil, apiErr) - - err := temporalcloudcli.UpdateGCSExportSink(context.Background(), temporalcloudcli.UpdateGCSExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - SaID: "my-sa", - BucketName: "my-bucket", - GcpProjectID: "my-project", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.ErrorIs(t, err, apiErr) -} - -func TestUpdateGCSExportSink_PartialUpdate(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - - existingSink := &namespacev1.ExportSink{ - ResourceVersion: "rv-1", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - Gcs: testGCSSpec(), - }, - } - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(&cloudservice.GetNamespaceExportSinkResponse{Sink: existingSink}, nil) - - // Only the service account changes; bucket-name and region must be preserved. - expectedNewSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - Gcs: &sinkv1.GCSSpec{ - SaId: "new-sa", - BucketName: "my-bucket", - GcpProjectId: "new-project", - Region: "us-central1", - }, - } - mockPrompter.EXPECT(). - PromptApply(existingSink.Spec, expectedNewSpec, false). - Return(nil) - - op := &operation.AsyncOperation{Id: "op-partial-gcs"} - mockCloud.EXPECT(). - UpdateNamespaceExportSink(context.Background(), &cloudservice.UpdateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: expectedNewSpec, - ResourceVersion: "rv-1", - }). - Return(&cloudservice.UpdateNamespaceExportSinkResponse{AsyncOperation: op}, nil) - - mockHandler.EXPECT(). - HandleOperation(op, "my-sink"). - Return(nil) - - err := temporalcloudcli.UpdateGCSExportSink(context.Background(), temporalcloudcli.UpdateGCSExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - SaID: "new-sa", - GcpProjectID: "new-project", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.NoError(t, err) -} - -// --- ValidateGCSExportSink --- - -func TestValidateGCSExportSink_Success(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - - mockCloud.EXPECT(). - ValidateNamespaceExportSink(context.Background(), &cloudservice.ValidateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Gcs: testGCSSpec(), - }, - }). - Return(&cloudservice.ValidateNamespaceExportSinkResponse{}, nil) - - var buf bytes.Buffer - err := temporalcloudcli.ValidateGCSExportSink(context.Background(), temporalcloudcli.ValidateGCSExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - SaID: "my-sa", - BucketName: "my-bucket", - GcpProjectID: "my-project", - Region: "us-central1", - Cloud: mockCloud, - Printer: newTestPrinter(&buf), - }) - require.NoError(t, err) - assert.Contains(t, buf.String(), "my-sink") -} - -func TestValidateGCSExportSink_Error(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - apiErr := errors.New("invalid config") - - mockCloud.EXPECT(). - ValidateNamespaceExportSink(context.Background(), &cloudservice.ValidateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Gcs: testGCSSpec(), - }, - }). - Return(nil, apiErr) - - var buf bytes.Buffer - err := temporalcloudcli.ValidateGCSExportSink(context.Background(), temporalcloudcli.ValidateGCSExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - SaID: "my-sa", - BucketName: "my-bucket", - GcpProjectID: "my-project", - Region: "us-central1", - Cloud: mockCloud, - Printer: newTestPrinter(&buf), - }) - require.ErrorIs(t, err, apiErr) -} - -// --- CreateAzureBlobExportSink --- - -func TestCreateAzureBlobExportSink_Success(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - - expectedSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - AzureBlob: testAzureBlobSpec(), - } - mockPrompter.EXPECT(). - PromptApply(&namespacev1.ExportSinkSpec{}, expectedSpec, false). - Return(nil) - - op := &operation.AsyncOperation{Id: "op-123"} - mockCloud.EXPECT(). - CreateNamespaceExportSink(context.Background(), &cloudservice.CreateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: expectedSpec, - }). - Return(&cloudservice.CreateNamespaceExportSinkResponse{AsyncOperation: op}, nil) - - mockHandler.EXPECT(). - HandleOperation(op, "my-sink"). - Return(nil) - - err := temporalcloudcli.CreateAzureBlobExportSink(context.Background(), temporalcloudcli.CreateAzureBlobExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - TenantID: "my-tenant", - SubscriptionID: "my-subscription", - ResourceGroup: "my-resource-group", - StorageAccount: "my-storage-account", - ContainerName: "my-container", - Region: "eastus", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.NoError(t, err) -} - -func TestCreateAzureBlobExportSink_PromptDeclined(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - promptErr := errors.New("Aborting apply.") - - expectedSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - AzureBlob: testAzureBlobSpec(), - } - mockPrompter.EXPECT(). - PromptApply(&namespacev1.ExportSinkSpec{}, expectedSpec, false). - Return(promptErr) - - err := temporalcloudcli.CreateAzureBlobExportSink(context.Background(), temporalcloudcli.CreateAzureBlobExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - TenantID: "my-tenant", - SubscriptionID: "my-subscription", - ResourceGroup: "my-resource-group", - StorageAccount: "my-storage-account", - ContainerName: "my-container", - Region: "eastus", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.ErrorIs(t, err, promptErr) -} - -func TestCreateAzureBlobExportSink_CreateError(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - createErr := errors.New("create error") - - expectedSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - AzureBlob: testAzureBlobSpec(), - } - mockPrompter.EXPECT(). - PromptApply(&namespacev1.ExportSinkSpec{}, expectedSpec, false). - Return(nil) - - mockCloud.EXPECT(). - CreateNamespaceExportSink(context.Background(), &cloudservice.CreateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: expectedSpec, - }). - Return(nil, createErr) - - mockHandler.EXPECT(). - HandleCreateErr(createErr). - Return(createErr) - - err := temporalcloudcli.CreateAzureBlobExportSink(context.Background(), temporalcloudcli.CreateAzureBlobExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - TenantID: "my-tenant", - SubscriptionID: "my-subscription", - ResourceGroup: "my-resource-group", - StorageAccount: "my-storage-account", - ContainerName: "my-container", - Region: "eastus", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.ErrorIs(t, err, createErr) -} - -// --- UpdateAzureBlobExportSink --- - -func TestUpdateAzureBlobExportSink_Success(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - - existingSink := &namespacev1.ExportSink{ - ResourceVersion: "rv-1", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - AzureBlob: testAzureBlobSpec(), - }, - } - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(&cloudservice.GetNamespaceExportSinkResponse{Sink: existingSink}, nil) - - newSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - AzureBlob: &sinkv1.AzureBlobSpec{ - TenantId: "new-tenant", - SubscriptionId: "my-subscription", - ResourceGroup: "my-resource-group", - StorageAccount: "my-storage-account", - ContainerName: "my-container", - Region: "eastus", - }, - } - mockPrompter.EXPECT(). - PromptApply(existingSink.Spec, newSpec, false). - Return(nil) - - op := &operation.AsyncOperation{Id: "op-123"} - mockCloud.EXPECT(). - UpdateNamespaceExportSink(context.Background(), &cloudservice.UpdateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: newSpec, - ResourceVersion: "rv-1", - }). - Return(&cloudservice.UpdateNamespaceExportSinkResponse{AsyncOperation: op}, nil) - - mockHandler.EXPECT(). - HandleOperation(op, "my-sink"). - Return(nil) - - err := temporalcloudcli.UpdateAzureBlobExportSink(context.Background(), temporalcloudcli.UpdateAzureBlobExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - TenantID: "new-tenant", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.NoError(t, err) -} - -func TestUpdateAzureBlobExportSink_PromptDeclined(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - promptErr := errors.New("Aborting apply.") - - existingSink := &namespacev1.ExportSink{ - ResourceVersion: "rv-1", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - AzureBlob: testAzureBlobSpec(), - }, - } - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(&cloudservice.GetNamespaceExportSinkResponse{Sink: existingSink}, nil) - - newSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - AzureBlob: &sinkv1.AzureBlobSpec{ - TenantId: "new-tenant", - SubscriptionId: "my-subscription", - ResourceGroup: "my-resource-group", - StorageAccount: "my-storage-account", - ContainerName: "my-container", - Region: "eastus", - }, - } - mockPrompter.EXPECT(). - PromptApply(existingSink.Spec, newSpec, false). - Return(promptErr) - - err := temporalcloudcli.UpdateAzureBlobExportSink(context.Background(), temporalcloudcli.UpdateAzureBlobExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - TenantID: "new-tenant", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.ErrorIs(t, err, promptErr) -} - -func TestUpdateAzureBlobExportSink_GetSinkError(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - apiErr := errors.New("api error") - - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(nil, apiErr) - - err := temporalcloudcli.UpdateAzureBlobExportSink(context.Background(), temporalcloudcli.UpdateAzureBlobExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - TenantID: "my-tenant", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.ErrorIs(t, err, apiErr) -} - -func TestUpdateAzureBlobExportSink_PartialUpdate(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - mockPrompter := cmdmock.NewMockPrompter(t) - mockHandler := cmdmock.NewMockAsyncOperationHandler(t) - - existingSink := &namespacev1.ExportSink{ - ResourceVersion: "rv-1", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - AzureBlob: testAzureBlobSpec(), - }, - } - mockCloud.EXPECT(). - GetNamespaceExportSink(context.Background(), &cloudservice.GetNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Name: "my-sink", - }). - Return(&cloudservice.GetNamespaceExportSinkResponse{Sink: existingSink}, nil) - - // Only the storage account and container name change; the rest must be preserved. - expectedNewSpec := &namespacev1.ExportSinkSpec{ - Name: "my-sink", - Enabled: true, - AzureBlob: &sinkv1.AzureBlobSpec{ - TenantId: "my-tenant", - SubscriptionId: "my-subscription", - ResourceGroup: "my-resource-group", - StorageAccount: "new-storage-account", - ContainerName: "new-container", - Region: "eastus", - }, +func TestUpdateExportSink_GetError(t *testing.T) { + for _, provider := range exportTestProviders() { + t.Run(provider.name, func(t *testing.T) { + command, _, _ := provider.update("", false) + temporalcloudcli.TestCommand(t, command, temporalcloudcli.TestCommandOptions{ + CloudClientExpectations: func(c *cloudmock.MockCloudServiceClient) { + c.EXPECT().GetNamespaceExportSink(mock.Anything, mock.Anything, mock.Anything). + Return(nil, errors.New("get failed")) + }, + ExpectedError: "get failed", + }) + }) } - mockPrompter.EXPECT(). - PromptApply(existingSink.Spec, expectedNewSpec, false). - Return(nil) - - op := &operation.AsyncOperation{Id: "op-partial-azure"} - mockCloud.EXPECT(). - UpdateNamespaceExportSink(context.Background(), &cloudservice.UpdateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: expectedNewSpec, - ResourceVersion: "rv-1", - }). - Return(&cloudservice.UpdateNamespaceExportSinkResponse{AsyncOperation: op}, nil) - - mockHandler.EXPECT(). - HandleOperation(op, "my-sink"). - Return(nil) - - err := temporalcloudcli.UpdateAzureBlobExportSink(context.Background(), temporalcloudcli.UpdateAzureBlobExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - StorageAccount: "new-storage-account", - ContainerName: "new-container", - Cloud: mockCloud, - Prompter: mockPrompter, - OperationHandler: mockHandler, - }) - require.NoError(t, err) -} - -// --- ValidateAzureBlobExportSink --- - -func TestValidateAzureBlobExportSink_Success(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - - mockCloud.EXPECT(). - ValidateNamespaceExportSink(context.Background(), &cloudservice.ValidateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - AzureBlob: testAzureBlobSpec(), - }, - }). - Return(&cloudservice.ValidateNamespaceExportSinkResponse{}, nil) - - var buf bytes.Buffer - err := temporalcloudcli.ValidateAzureBlobExportSink(context.Background(), temporalcloudcli.ValidateAzureBlobExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - TenantID: "my-tenant", - SubscriptionID: "my-subscription", - ResourceGroup: "my-resource-group", - StorageAccount: "my-storage-account", - ContainerName: "my-container", - Region: "eastus", - Cloud: mockCloud, - Printer: newTestPrinter(&buf), - }) - require.NoError(t, err) - assert.Contains(t, buf.String(), "my-sink") -} - -func TestValidateAzureBlobExportSink_Error(t *testing.T) { - mockCloud := cloudmock.NewMockCloudServiceClient(t) - apiErr := errors.New("invalid config") - - mockCloud.EXPECT(). - ValidateNamespaceExportSink(context.Background(), &cloudservice.ValidateNamespaceExportSinkRequest{ - Namespace: "my-namespace", - Spec: &namespacev1.ExportSinkSpec{ - Name: "my-sink", - AzureBlob: testAzureBlobSpec(), - }, - }). - Return(nil, apiErr) - - var buf bytes.Buffer - err := temporalcloudcli.ValidateAzureBlobExportSink(context.Background(), temporalcloudcli.ValidateAzureBlobExportSinkParams{ - Namespace: "my-namespace", - SinkName: "my-sink", - TenantID: "my-tenant", - SubscriptionID: "my-subscription", - ResourceGroup: "my-resource-group", - StorageAccount: "my-storage-account", - ContainerName: "my-container", - Region: "eastus", - Cloud: mockCloud, - Printer: newTestPrinter(&buf), - }) - require.ErrorIs(t, err, apiErr) } diff --git a/temporalcloudcli/commands.yml b/temporalcloudcli/commands.yml index 986fabb..63e821b 100644 --- a/temporalcloudcli/commands.yml +++ b/temporalcloudcli/commands.yml @@ -1375,6 +1375,7 @@ commands: - namespace - async-operation - export-sink + - export-filter - export-s3 - export-s3-region - name: cloud namespace export s3 update @@ -1397,6 +1398,7 @@ commands: - async-operation - resource-version - export-sink + - export-filter options: - name: role-arn type: string @@ -1433,6 +1435,7 @@ commands: - client - namespace - export-sink + - export-filter - export-s3 - export-s3-region - name: cloud namespace export gcs @@ -1459,6 +1462,7 @@ commands: - namespace - async-operation - export-sink + - export-filter - export-gcs - export-gcs-region - name: cloud namespace export gcs update @@ -1481,6 +1485,7 @@ commands: - async-operation - resource-version - export-sink + - export-filter options: - name: service-account-email type: string @@ -1512,6 +1517,7 @@ commands: - client - namespace - export-sink + - export-filter - export-gcs - export-gcs-region - name: cloud namespace export azure-blob @@ -1540,6 +1546,7 @@ commands: - namespace - async-operation - export-sink + - export-filter - export-azure-blob - export-azure-blob-region - name: cloud namespace export azure-blob update @@ -1562,6 +1569,7 @@ commands: - async-operation - resource-version - export-sink + - export-filter options: - name: tenant-id type: string @@ -1609,6 +1617,7 @@ commands: - client - namespace - export-sink + - export-filter - export-azure-blob - export-azure-blob-region @@ -5604,6 +5613,14 @@ option-sets: required: true description: | The name of the export sink. + - name: export-filter + options: + - name: disable-standalone-activity-export + type: bool + description: | + Disable export of standalone activity events. Workflow history export is unaffected. + On update, omitting this flag keeps the current setting. Use + --disable-standalone-activity-export=false to re-enable standalone activity export. - name: export-s3 options: - name: role-arn