From 9a5db59abf9ec8ba26e36975e567db012b8cfa03 Mon Sep 17 00:00:00 2001 From: kmetin Date: Fri, 20 Oct 2023 17:16:45 +0300 Subject: [PATCH] fix build tags --- base/commands/migration/cancel_it_test.go | 4 ++-- base/commands/migration/cancel_stages.go | 4 ++-- base/commands/migration/const.go | 4 +--- base/commands/migration/migration_cancel.go | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/base/commands/migration/cancel_it_test.go b/base/commands/migration/cancel_it_test.go index d682ecae9..0f3956ef8 100644 --- a/base/commands/migration/cancel_it_test.go +++ b/base/commands/migration/cancel_it_test.go @@ -1,4 +1,4 @@ -//go:build migration +//go:build std || migration package migration_test @@ -42,7 +42,7 @@ func noMigrationsCancelTest(t *testing.T) { tcx.CLC().Execute(ctx, "cancel") }) wg.Wait() - tcx.AssertStdoutContains("there are no migrations are in progress on migration cluster") + tcx.AssertStderrContains("there are no migrations in progress") }) } diff --git a/base/commands/migration/cancel_stages.go b/base/commands/migration/cancel_stages.go index 1237f602e..073ce0f34 100644 --- a/base/commands/migration/cancel_stages.go +++ b/base/commands/migration/cancel_stages.go @@ -1,4 +1,4 @@ -//go:build migration +//go:build std || migration package migration @@ -57,7 +57,7 @@ func (st *CancelStages) connectStage(ec plug.ExecContext) func(context.Context, return nil, err } if len(all) == 0 { - return nil, fmt.Errorf("there are no migrations are in progress on migration cluster") + return nil, fmt.Errorf("there are no migrations in progress") } var mip MigrationInProgress m := all[0].(serialization.JSON) diff --git a/base/commands/migration/const.go b/base/commands/migration/const.go index 5d9f684df..97d53ba03 100644 --- a/base/commands/migration/const.go +++ b/base/commands/migration/const.go @@ -4,13 +4,11 @@ package migration const ( StartQueueName = "__datamigration_start_queue" - StatusMapEntryName = "status" StatusMapName = "__datamigration_migrations" UpdateTopicPrefix = "__datamigration_updates_" DebugLogsListPrefix = "__datamigration_debug_logs_" MigrationsInProgressList = "__datamigrations_in_progress" - startQueueName = "__datamigration_start_queue" - statusMapEntryName = "status" + CancelQueue = "__datamigration_cancel_queue" argDMTConfig = "dmtConfig" argTitleDMTConfig = "DMT configuration" ) diff --git a/base/commands/migration/migration_cancel.go b/base/commands/migration/migration_cancel.go index ce4eb0dc4..443cc93fe 100644 --- a/base/commands/migration/migration_cancel.go +++ b/base/commands/migration/migration_cancel.go @@ -1,4 +1,4 @@ -//go:build migration +//go:build std || migration package migration