Support SQL Server switchover

.ci/gcb-pr-downstream-generation-and-test.yml

@@ -264,7 +264,11 @@ steps:
         - $COMMIT_SHA
         - $BUILD_ID
         - $PROJECT_ID
+<<<<<<< HEAD
+        - "22"  # Build step
+=======
         - "23"  # Build step
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 
     - name: 'gcr.io/graphite-docker-images/go-plus'
       entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'

.ci/magician/cmd/check_cassettes.go

@@ -64,7 +64,11 @@ var checkCassettesCmd = &cobra.Command{
 
 		ctlr := source.NewController(env["GOPATH"], "modular-magician", githubToken, rnr)
 
+<<<<<<< HEAD
+		vt, err := vcr.NewTester(env, "vcr-check-cassettes", "ci-vcr-cassettes", rnr)
+=======
 		vt, err := vcr.NewTester(env, "ci-vcr-cassettes", "vcr-check-cassettes", rnr)
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 		if err != nil {
 			return fmt.Errorf("error creating VCR tester: %w", err)
 		}

.ci/magician/cmd/generate_comment.go

@@ -504,9 +504,15 @@ func detectMissingTests(diffProcessorPath, tpgbLocalPath string, rnr ExecRunner)
 }
 
 func formatDiffComment(data diffCommentData) (string, error) {
+<<<<<<< HEAD
+	tmpl, err := template.New("DIFF_COMMENT.md").Parse(diffComment)
+	if err != nil {
+		panic(fmt.Sprintf("Unable to parse DIFF_COMMENT.md: %s", err))
+=======
 	tmpl, err := template.New("DIFF_COMMENT.md.tmpl").Parse(diffComment)
 	if err != nil {
 		return "", fmt.Errorf("unable to parse template DIFF_COMMENT.md.tmpl: %s", err)
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 	}
 	sb := new(strings.Builder)
 	err = tmpl.Execute(sb, data)

.ci/magician/cmd/templates/vcr/record_replay.tmpl

@@ -1,10 +1,18 @@
 {{- if gt (len .RecordingResult.PassedTests) 0 -}}
+<<<<<<< HEAD
+$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
+=======
 {{color "green" "Tests passed during RECORDING mode:"}}
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 {{range .RecordingResult.PassedTests}}`{{.}}`[[Debug log](https://storage.cloud.google.com/ci-vcr-logs/beta/refs/heads/auto-pr-{{$.PRNumber}}/artifacts/{{$.BuildID}}/recording/{{.}}.log)]
 {{end}}
 
 {{- if gt (len .ReplayingAfterRecordingResult.FailedTests ) 0 -}}
+<<<<<<< HEAD
+$\textcolor{red}{\textsf{Tests failed when rerunning REPLAYING mode:}}$
+=======
 {{color "red" "Tests failed when rerunning REPLAYING mode:"}}
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 {{range .ReplayingAfterRecordingResult.FailedTests}}`{{.}}`[[Error message](https://storage.cloud.google.com/ci-vcr-logs/beta/refs/heads/auto-pr-{{$.PRNumber}}/artifacts/{{$.BuildID}}/build-log/replaying_build_after_recording/{{.}}_replaying_test.log)] [[Debug log](https://storage.cloud.google.com/ci-vcr-logs/beta/refs/heads/auto-pr-{{$.PRNumber}}/artifacts/{{$.BuildID}}/replaying_after_recording/{{.}}.log)]
 {{end}}
 
@@ -13,19 +21,33 @@ Tests failed due to non-determinism or randomness when the VCR replayed the resp
 Please fix these to complete your PR. If you believe these test failures to be incorrect or unrelated to your change, or if you have any questions, please raise the concern with your reviewer.
 
 {{else}}
+<<<<<<< HEAD
+$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$
+=======
 {{color "green" "No issues found for passed tests after REPLAYING rerun."}}
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 {{end}}{{/* end of if gt (len .ReplayingAfterRecordingResult.FailedTests ) 0 */}}
 ---
 {{end}}{{/* end of if gt (len .RecordingResult.PassedTests) 0 */}}
 
 {{if gt (len .RecordingResult.FailedTests) 0 -}}
+<<<<<<< HEAD
+$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
+=======
 {{color "red" "Tests failed during RECORDING mode:"}}
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 {{range .RecordingResult.FailedTests}}`{{.}}`[[Error message](https://storage.cloud.google.com/ci-vcr-logs/beta/refs/heads/auto-pr-{{$.PRNumber}}/artifacts/{{$.BuildID}}/build-log/recording_build/{{.}}_recording_test.log)] [[Debug log](https://storage.cloud.google.com/ci-vcr-logs/beta/refs/heads/auto-pr-{{$.PRNumber}}/artifacts/{{$.BuildID}}/recording/{{.}}.log)]
 {{end}}
 {{end}} {{- /* end of if gt (len .RecordingResult.FailedTests) 0 */ -}}
 
+<<<<<<< HEAD
+{{if .HasTerminatedTests}}$\textcolor{red}{\textsf{Several tests got terminated during RECORDING mode.}}${{end}}
+{{if .RecordingErr}}$\textcolor{red}{\textsf{Errors occurred during RECORDING mode. Please fix them to complete your PR.}}${{end}}
+{{if .AllRecordingPassed}}$\textcolor{green}{\textsf{All tests passed!}}${{end}}
+=======
 {{if .HasTerminatedTests}}{{color "red" "Several tests got terminated during RECORDING mode."}}{{end}}
 {{if .RecordingErr}}{{color "red" "Errors occurred during RECORDING mode. Please fix them to complete your PR."}}{{end}}
 {{if .AllRecordingPassed}}{{color "green" "All tests passed!"}}{{end}}
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 
 View the [build log](https://storage.cloud.google.com/ci-vcr-logs/beta/refs/heads/auto-pr-{{.PRNumber}}/artifacts/{{.BuildID}}/build-log/recording_test.log) or the [debug log](https://console.cloud.google.com/storage/browser/ci-vcr-logs/beta/refs/heads/auto-pr-{{.PRNumber}}/artifacts/{{.BuildID}}/recording) for each test

.ci/magician/cmd/templates/vcr/without_replay_failed_tests.tmpl

@@ -1,7 +1,13 @@
 {{- if .ReplayingErr -}}
+<<<<<<< HEAD
+$\textcolor{red}{\textsf{Errors occurred during REPLAYING mode. Please fix them to complete your PR.}}$
+{{- else -}}
+$\textcolor{green}{\textsf{All tests passed!}}$
+=======
 {{color "red" "Errors occurred during REPLAYING mode. Please fix them to complete your PR."}}
 {{- else -}}
 {{color "green" "All tests passed!"}}
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 {{- end}}
 
 View the [build log](https://storage.cloud.google.com/ci-vcr-logs/beta/refs/heads/auto-pr-{{.PRNumber}}/artifacts/{{.BuildID}}/build-log/replaying_test.log)

.ci/magician/cmd/test_terraform_vcr.go

@@ -120,7 +120,11 @@ var testTerraformVCRCmd = &cobra.Command{
 		}
 		ctlr := source.NewController(env["GOPATH"], "modular-magician", env["GITHUB_TOKEN_DOWNSTREAMS"], rnr)
 
+<<<<<<< HEAD
+		vt, err := vcr.NewTester(env, "ci-vcr-logs", "ci-vcr-cassettes", rnr)
+=======
 		vt, err := vcr.NewTester(env, "ci-vcr-cassettes", "ci-vcr-logs", rnr)
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 		if err != nil {
 			return fmt.Errorf("error creating VCR tester: %w", err)
 		}
@@ -180,7 +184,11 @@ func execTestTerraformVCR(prNumber, mmCommitSha, buildID, projectID, buildStep,
 	}
 	fmt.Println("Running tests: Go files or test fixtures changed")
 
+<<<<<<< HEAD
+	if err := vt.FetchCassettes(provider.Beta, baseBranch, prNumber); err != nil {
+=======
 	if err := vt.FetchCassettes(provider.Beta, baseBranch, newBranch); err != nil {
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 		return fmt.Errorf("error fetching cassettes: %w", err)
 	}
 
@@ -196,10 +204,17 @@ func execTestTerraformVCR(prNumber, mmCommitSha, buildID, projectID, buildStep,
 	}
 
 	if err := vt.UploadLogs(vcr.UploadLogsOptions{
+<<<<<<< HEAD
+		PRNumber: prNumber,
+		BuildID:  buildID,
+		Mode:     vcr.Replaying,
+		Version:  provider.Beta,
+=======
 		Head:    newBranch,
 		BuildID: buildID,
 		Mode:    vcr.Replaying,
 		Version: provider.Beta,
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 	}); err != nil {
 		return fmt.Errorf("error uploading replaying logs: %w", err)
 	}
@@ -261,12 +276,20 @@ func execTestTerraformVCR(prNumber, mmCommitSha, buildID, projectID, buildStep,
 			testState = "success"
 		}
 
+<<<<<<< HEAD
+		if err := vt.UploadCassettes(prNumber, provider.Beta); err != nil {
+=======
 		if err := vt.UploadCassettes(newBranch, provider.Beta); err != nil {
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 			return fmt.Errorf("error uploading cassettes: %w", err)
 		}
 
 		if err := vt.UploadLogs(vcr.UploadLogsOptions{
+<<<<<<< HEAD
+			PRNumber: prNumber,
+=======
 			Head:     newBranch,
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 			BuildID:  buildID,
 			Parallel: true,
 			Mode:     vcr.Recording,
@@ -295,10 +318,17 @@ func execTestTerraformVCR(prNumber, mmCommitSha, buildID, projectID, buildStep,
 			}
 
 			if err := vt.UploadLogs(vcr.UploadLogsOptions{
+<<<<<<< HEAD
+				PRNumber:       prNumber,
+				BuildID:        buildID,
+				Parallel:       true,
+				AfterRecording: true,
+=======
 				Head:           newBranch,
 				BuildID:        buildID,
 				AfterRecording: true,
 				Parallel:       true,
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 				Mode:           vcr.Replaying,
 				Version:        provider.Beta,
 			}); err != nil {
@@ -477,7 +507,10 @@ func formatComment(fileName string, tmplText string, data any) (string, error) {
 	funcs := template.FuncMap{
 		"join": strings.Join,
 		"add":  func(i, j int) int { return i + j },
+<<<<<<< HEAD
+=======
 		"color": color,
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 	}
 	tmpl, err := template.New(fileName).Funcs(funcs).Parse(tmplText)
 	if err != nil {
@@ -492,6 +525,25 @@ func formatComment(fileName string, tmplText string, data any) (string, error) {
 }
 
 func formatTestsAnalytics(data analytics) (string, error) {
+<<<<<<< HEAD
+	return formatComment("test_terraform_vcr_test_analytics.tmpl", testsAnalyticsTmplText, data)
+}
+
+func formatNonExercisedTests(data nonExercisedTests) (string, error) {
+	return formatComment("test_terraform_vcr_recording_mode_results.tmpl", nonExercisedTestsTmplText, data)
+}
+
+func formatWithReplayFailedTests(data withReplayFailedTests) (string, error) {
+	return formatComment("test_terraform_vcr_with_replay_failed_tests.tmpl", withReplayFailedTestsTmplText, data)
+}
+
+func formatWithoutReplayFailedTests(data withoutReplayFailedTests) (string, error) {
+	return formatComment("test_terraform_vcr_without_replay_failed_tests.tmpl", withoutReplayFailedTestsTmplText, data)
+}
+
+func formatRecordReplay(data recordReplay) (string, error) {
+	return formatComment("test_terraform_vcr_record_replay.tmpl", recordReplayTmplText, data)
+=======
 	return formatComment("test_analytics.tmpl", testsAnalyticsTmplText, data)
 }
 
@@ -509,4 +561,5 @@ func formatWithoutReplayFailedTests(data withoutReplayFailedTests) (string, erro
 
 func formatRecordReplay(data recordReplay) (string, error) {
 	return formatComment("record_replay.tmpl", recordReplayTmplText, data)
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 }

.ci/magician/cmd/vcr_cassette_update.go

@@ -90,7 +90,11 @@ var vcrCassetteUpdateCmd = &cobra.Command{
 		}
 		ctlr := source.NewController(env["GOPATH"], "hashicorp", env["GITHUB_TOKEN_CLASSIC"], rnr)
 
+<<<<<<< HEAD
+		vt, err := vcr.NewTester(env, "", "ci-vcr-cassettes", rnr)
+=======
 		vt, err := vcr.NewTester(env, "ci-vcr-cassettes", "", rnr)
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 		if err != nil {
 			return fmt.Errorf("error creating VCR tester: %w", err)
 		}

.ci/magician/cmd/vcr_cassette_update_test.go

@@ -401,7 +401,11 @@ func TestExecVCRCassetteUpdate(t *testing.T) {
 			ctlr := source.NewController("gopath", "hashicorp", "token", rnr)
 			vt, err := vcr.NewTester(map[string]string{
 				"SA_KEY": "sa_key",
+<<<<<<< HEAD
+			}, "", "ci-vcr-cassettes", rnr)
+=======
 			}, "ci-vcr-cassettes", "", rnr)
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 			if err != nil {
 				t.Fatalf("Failed to create new tester: %v", err)
 			}

.ci/magician/provider/version.go

@@ -6,19 +6,28 @@ const (
 	None Version = iota
 	GA
 	Beta
+<<<<<<< HEAD
+)
+
+const NumVersions = 2
+=======
 	Alpha
 )
 
 const NumVersions = 3
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 
 func (v Version) String() string {
 	switch v {
 	case GA:
 		return "ga"
 	case Beta:
 		return "beta"
+<<<<<<< HEAD
+=======
 	case Alpha:
 		return "alpha"
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 	}
 	return "unknown"
 }
@@ -36,8 +45,11 @@ func (v Version) RepoName() string {
 		return "terraform-provider-google"
 	case Beta:
 		return "terraform-provider-google-beta"
+<<<<<<< HEAD
+=======
 	case Alpha:
 		return "terraform-next"
+>>>>>>> 2fdda66097e2c96688e59f7c58c1f717c7785856
 	}
 	return "unknown"
 }