Undo vschema changes on workflow creation fail

Signed-off-by: Matt Lord <mattalord@gmail.com>
vitessio · Sep 19, 2024 · 8381a76 · 8381a76
1 parent 53a6ea4
commit 8381a76
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 50 deletions.
diff --git a/go/vt/vtctl/workflow/materializer_test.go b/go/vt/vtctl/workflow/materializer_test.go
@@ -1174,7 +1174,7 @@ func TestCreateLookupVindexCreateDDL(t *testing.T) {
  setStartingVschema()
  }()
  }
- outms, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.SourceKeyspace, tcase.specs, false)
+ outms, _, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.SourceKeyspace, tcase.specs, false)
  if tcase.err != "" {
  require.Error(t, err)
  require.Contains(t, err.Error(), tcase.err, "prepareCreateLookup(%s) err: %v, does not contain %v", tcase.description, err, tcase.err)
@@ -1419,7 +1419,7 @@ func TestCreateLookupVindexSourceVSchema(t *testing.T) {
  t.Fatal(err)
  }
 
- _, got, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.SourceKeyspace, specs, false)
+ _, got, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.SourceKeyspace, specs, false)
  require.NoError(t, err)
  if !proto.Equal(got, tcase.out) {
  t.Errorf("%s: got:\n%v, want\n%v", tcase.description, got, tcase.out)
@@ -1654,7 +1654,7 @@ func TestCreateLookupVindexTargetVSchema(t *testing.T) {
  t.Fatal(err)
  }
 
- _, _, got, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.SourceKeyspace, specs, false)
+ _, _, got, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.SourceKeyspace, specs, false)
  if tcase.err != "" {
  if err == nil || !strings.Contains(err.Error(), tcase.err) {
  t.Errorf("prepareCreateLookup(%s) err: %v, must contain %v", tcase.description, err, tcase.err)
@@ -1772,7 +1772,7 @@ func TestCreateLookupVindexSameKeyspace(t *testing.T) {
  t.Fatal(err)
  }
 
- _, got, _, err := env.ws.prepareCreateLookup(ctx, "keyspace", ms.TargetKeyspace, specs, false)
+ _, got, _, _, err := env.ws.prepareCreateLookup(ctx, "keyspace", ms.TargetKeyspace, specs, false)
  require.NoError(t, err)
  if !proto.Equal(got, want) {
  t.Errorf("same keyspace: got:\n%v, want\n%v", got, want)
@@ -1898,7 +1898,7 @@ func TestCreateCustomizedVindex(t *testing.T) {
  t.Fatal(err)
  }
 
- _, got, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, false)
+ _, got, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, false)
  require.NoError(t, err)
  if !proto.Equal(got, want) {
  t.Errorf("customize create lookup error same: got:\n%v, want\n%v", got, want)
@@ -2016,7 +2016,7 @@ func TestCreateLookupVindexIgnoreNulls(t *testing.T) {
  t.Fatal(err)
  }
 
- ms, ks, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, false)
+ ms, ks, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, false)
  require.NoError(t, err)
  if !proto.Equal(wantKs, ks) {
  t.Errorf("unexpected keyspace value: got:\n%v, want\n%v", ks, wantKs)
@@ -2096,11 +2096,11 @@ func TestStopAfterCopyFlag(t *testing.T) {
  t.Fatal(err)
  }
 
- ms1, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, false)
+ ms1, _, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, false)
  require.NoError(t, err)
  require.Equal(t, ms1.StopAfterCopy, true)
 
- ms2, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, true)
+ ms2, _, _, _, err := env.ws.prepareCreateLookup(ctx, "workflow", ms.TargetKeyspace, specs, true)
  require.NoError(t, err)
  require.Equal(t, ms2.StopAfterCopy, false)
 }