Re-use BuildCLI and create release artifacts in the build sub-directory

Author: ilia-db

acceptance/acceptance_test.go

@@ -153,9 +153,7 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
 	// Consistent behavior of locale-dependent tools, such as 'sort'
 	t.Setenv("LC_ALL", "C")
 
-	buildDir := filepath.Join(cwd, "build", fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH))
-	err = os.MkdirAll(buildDir, os.ModePerm)
-	require.NoError(t, err)
+	buildDir := getBuildDir(t, cwd, runtime.GOOS, runtime.GOARCH)
 
 	terraformDir := TerraformDir
 	if terraformDir == "" {
@@ -190,7 +188,7 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
 		if UseVersion != "" {
 			execPath = DownloadCLI(t, buildDir, UseVersion)
 		} else {
-			execPath = BuildCLI(t, buildDir, coverDir)
+			execPath = BuildCLI(t, buildDir, coverDir, runtime.GOOS, runtime.GOARCH)
 		}
 	}
 
@@ -236,7 +234,7 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
 
 	if cloudEnv != "" && UseVersion == "" {
 		// Create linux release artifacts, to be used by the cloud-only ssh tunnel tests
-		releasesDir := CreateReleaseArtifacts(t, cwd, "linux")
+		releasesDir := CreateReleaseArtifacts(t, cwd, coverDir, "linux")
 		t.Setenv("CLI_RELEASES_DIR", releasesDir)
 	}
 
@@ -884,9 +882,20 @@ func readMergedScriptContents(t *testing.T, dir string) string {
 	return strings.Join(prepares, "\n")
 }
 
-func BuildCLI(t *testing.T, buildDir, coverDir string) string {
+func getBuildDirRoot(cwd string) string {
+	return filepath.Join(cwd, "build")
+}
+
+func getBuildDir(t *testing.T, cwd, osName, arch string) string {
+	buildDir := filepath.Join(getBuildDirRoot(cwd), fmt.Sprintf("%s_%s", osName, arch))
+	err := os.MkdirAll(buildDir, os.ModePerm)
+	require.NoError(t, err)
+	return buildDir
+}
+
+func BuildCLI(t *testing.T, buildDir, coverDir, osName, arch string) string {
 	execPath := filepath.Join(buildDir, "databricks")
-	if runtime.GOOS == "windows" {
+	if osName == "windows" {
 		execPath += ".exe"
 	}
 
@@ -898,37 +907,33 @@ func BuildCLI(t *testing.T, buildDir, coverDir string) string {
 		args = append(args, "-cover")
 	}
 
-	if runtime.GOOS == "windows" {
+	if osName == "windows" {
 		// Get this error on my local Windows:
 		// error obtaining VCS status: exit status 128
 		// Use -buildvcs=false to disable VCS stamping.
 		args = append(args, "-buildvcs=false")
 	}
 
-	RunCommand(t, args, "..", []string{})
+	RunCommand(t, args, "..", []string{"GOOS=" + osName, "GOARCH=" + arch})
 	return execPath
 }
 
 // CreateReleaseArtifacts builds release artifacts for the given OS using amd64 and arm64 architectures,
 // archives them into zip files, and returns the directory containing the release artifacts.
-func CreateReleaseArtifacts(t *testing.T, cwd, osName string) string {
-	releasesDir := filepath.Join(cwd, "build", "releases")
+func CreateReleaseArtifacts(t *testing.T, cwd, coverDir, osName string) string {
+	releasesDir := filepath.Join(getBuildDirRoot(cwd), "releases")
 	require.NoError(t, os.MkdirAll(releasesDir, os.ModePerm))
-	arches := []string{"amd64", "arm64"}
-	for _, arch := range arches {
-		CreateReleaseArtifact(t, cwd, releasesDir, osName, arch)
+	for _, arch := range []string{"amd64", "arm64"} {
+		CreateReleaseArtifact(t, cwd, releasesDir, coverDir, osName, arch)
 	}
 	return releasesDir
 }
 
-func CreateReleaseArtifact(t *testing.T, cwd, releasesDir, osName, arch string) {
-	tempBuildDir := filepath.Join(releasesDir, "tmp_"+arch)
-	require.NoError(t, os.MkdirAll(tempBuildDir, os.ModePerm))
-	defer os.RemoveAll(tempBuildDir)
-
-	execPath := filepath.Join(tempBuildDir, "databricks")
-	args := []string{"go", "build", "-o", execPath}
-	RunCommand(t, args, "..", []string{"GOOS=" + osName, "GOARCH=" + arch})
+func CreateReleaseArtifact(t *testing.T, cwd, releasesDir, coverDir, osName, arch string) {
+	buildDir := getBuildDir(t, cwd, osName, arch)
+	execPath := BuildCLI(t, buildDir, coverDir, osName, arch)
+	execInfo, err := os.Stat(execPath)
+	require.NoError(t, err)
 
 	zipName := fmt.Sprintf("databricks_cli_%s_%s.zip", osName, arch)
 	zipPath := filepath.Join(releasesDir, zipName)
@@ -940,10 +945,7 @@ func CreateReleaseArtifact(t *testing.T, cwd, releasesDir, osName, arch string)
 	zipWriter := zip.NewWriter(zipFile)
 	defer zipWriter.Close()
 
-	info, err := os.Stat(execPath)
-	require.NoError(t, err)
-
-	header, err := zip.FileInfoHeader(info)
+	header, err := zip.FileInfoHeader(execInfo)
 	require.NoError(t, err)
 	header.Name = "databricks"
 	header.Method = zip.Deflate

acceptance/ssh/connection/out.stdout.txt

@@ -0,0 +1 @@
+Connection successful

acceptance/ssh/connection/output.txt

@@ -1 +0,0 @@
-Connection successful

acceptance/ssh/connection/script

@@ -1,8 +1,6 @@
-errcode $CLI ssh connect --cluster=$TEST_DEFAULT_CLUSTER_ID --releases-dir=$CLI_RELEASES_DIR -- "echo 'Connection successful'" >LOG.stdout 2>LOG.stderr
+errcode $CLI ssh connect --cluster=$TEST_DEFAULT_CLUSTER_ID --releases-dir=$CLI_RELEASES_DIR -- "echo 'Connection successful'" >out.stdout.txt 2>LOG.stderr
 
-cat LOG.stdout
-
-if ! grep -q "Connection successful" LOG.stdout; then
+if ! grep -q "Connection successful" out.stdout.txt; then
   run_id=$(cat LOG.stderr | grep -o "Job submitted successfully with run ID: [0-9]*" | grep -o "[0-9]*$")
   trace $CLI jobs get-run "$run_id" > LOG.job
 fi