Enable smoke tests

snyk · Apr 19, 2024 · 646ab02 · 646ab02
1 parent 0a5cc24
commit 646ab02
Showing 1 changed file with 57 additions and 57 deletions.
diff --git a/scan_smoke_test.go b/scan_smoke_test.go
@@ -35,7 +35,7 @@ import (
 	"github.com/snyk/code-client-go/internal/util/testutil"
 )
 
-//nolint:dupl // test cases
+
 func Test_SmokeScan_HTTPS(t *testing.T) {
 	if os.Getenv("SMOKE_TESTS") != "true" {
 		t.Skip()
@@ -66,62 +66,62 @@ func Test_SmokeScan_HTTPS(t *testing.T) {
 	require.NotNil(t, response)
 }
 
-////nolint:dupl // test cases
-//func Test_SmokeScan_SSH(t *testing.T) {
-//	if os.Getenv("SMOKE_TESTS") != "true" {
-//		t.Skip()
-//	}
-//	var cloneTargetDir, err = setupCustomTestRepo(t, "git@github.com:snyk-labs/nodejs-goof", "0336589")
-//	defer func(path string) { _ = os.RemoveAll(path) }(cloneTargetDir)
-//	if err != nil {
-//		t.Fatal(err, "Couldn't setup test repo")
-//	}
-//	files := sliceToChannel([]string{filepath.Join(cloneTargetDir, "app.js"), filepath.Join(cloneTargetDir, "utils.js")})
-//
-//	logger := zerolog.New(os.Stdout)
-//	instrumentor := testutil.NewTestInstrumentor()
-//	errorReporter := testutil.NewTestErrorReporter()
-//	config := testutil.NewTestConfig()
-//	httpClient := codeClientHTTP.NewHTTPClient(&logger, func() *http.Client {
-//		client := http.Client{
-//			Timeout:   time.Duration(180) * time.Second,
-//			Transport: TestAuthRoundTripper{http.DefaultTransport},
-//		}
-//		return &client
-//	}, instrumentor, errorReporter)
-//
-//	codeScanner := codeClient.NewCodeScanner(httpClient, config, instrumentor, errorReporter, &logger)
-//	response, bundleHash, scanErr := codeScanner.UploadAndAnalyze(context.Background(), uuid.New().String(), cloneTargetDir, files, map[string]bool{})
-//	require.NoError(t, scanErr)
-//	require.NotEmpty(t, bundleHash)
-//	require.NotNil(t, response)
-//}
-//
-//func Test_SmokeScan_Folder(t *testing.T) {
-//	if os.Getenv("SMOKE_TESTS") != "true" {
-//		t.Skip()
-//	}
-//	currDir, err := os.Getwd()
-//	require.NoError(t, err)
-//	cloneTargetDir := filepath.Join(currDir, "internal/util")
-//	files := sliceToChannel([]string{filepath.Join(cloneTargetDir, "hash.go")})
-//
-//	logger := zerolog.New(os.Stdout)
-//	instrumentor := testutil.NewTestInstrumentor()
-//	errorReporter := testutil.NewTestErrorReporter()
-//	config := testutil.NewTestConfig()
-//	httpClient := codeClientHTTP.NewHTTPClient(&logger, func() *http.Client {
-//		client := http.Client{
-//			Timeout:   time.Duration(180) * time.Second,
-//			Transport: TestAuthRoundTripper{http.DefaultTransport},
-//		}
-//		return &client
-//	}, instrumentor, errorReporter)
-//
-//	codeScanner := codeClient.NewCodeScanner(httpClient, config, instrumentor, errorReporter, &logger)
-//	_, _, scanErr := codeScanner.UploadAndAnalyze(context.Background(), uuid.New().String(), cloneTargetDir, files, map[string]bool{})
-//	require.ErrorContains(t, scanErr, "workspace is not a repository, cannot scan")
-//}
+
+func Test_SmokeScan_SSH(t *testing.T) {
+	if os.Getenv("SMOKE_TESTS") != "true" {
+		t.Skip()
+	}
+	var cloneTargetDir, err = setupCustomTestRepo(t, "git@github.com:snyk-labs/nodejs-goof", "0336589")
+	defer func(path string) { _ = os.RemoveAll(path) }(cloneTargetDir)
+	if err != nil {
+		t.Fatal(err, "Couldn't setup test repo")
+	}
+	files := sliceToChannel([]string{filepath.Join(cloneTargetDir, "app.js"), filepath.Join(cloneTargetDir, "utils.js")})
+
+	logger := zerolog.New(os.Stdout)
+	instrumentor := testutil.NewTestInstrumentor()
+	errorReporter := testutil.NewTestErrorReporter()
+	config := testutil.NewTestConfig()
+	httpClient := codeClientHTTP.NewHTTPClient(&logger, func() *http.Client {
+		client := http.Client{
+			Timeout:   time.Duration(180) * time.Second,
+			Transport: TestAuthRoundTripper{http.DefaultTransport},
+		}
+		return &client
+	}, instrumentor, errorReporter)
+
+	codeScanner := codeClient.NewCodeScanner(httpClient, config, instrumentor, errorReporter, &logger)
+	response, bundleHash, scanErr := codeScanner.UploadAndAnalyze(context.Background(), uuid.New().String(), cloneTargetDir, files, map[string]bool{})
+	require.NoError(t, scanErr)
+	require.NotEmpty(t, bundleHash)
+	require.NotNil(t, response)
+}
+
+func Test_SmokeScan_Folder(t *testing.T) {
+	if os.Getenv("SMOKE_TESTS") != "true" {
+		t.Skip()
+	}
+	currDir, err := os.Getwd()
+	require.NoError(t, err)
+	cloneTargetDir := filepath.Join(currDir, "internal/util")
+	files := sliceToChannel([]string{filepath.Join(cloneTargetDir, "hash.go")})
+
+	logger := zerolog.New(os.Stdout)
+	instrumentor := testutil.NewTestInstrumentor()
+	errorReporter := testutil.NewTestErrorReporter()
+	config := testutil.NewTestConfig()
+	httpClient := codeClientHTTP.NewHTTPClient(&logger, func() *http.Client {
+		client := http.Client{
+			Timeout:   time.Duration(180) * time.Second,
+			Transport: TestAuthRoundTripper{http.DefaultTransport},
+		}
+		return &client
+	}, instrumentor, errorReporter)
+
+	codeScanner := codeClient.NewCodeScanner(httpClient, config, instrumentor, errorReporter, &logger)
+	_, _, scanErr := codeScanner.UploadAndAnalyze(context.Background(), uuid.New().String(), cloneTargetDir, files, map[string]bool{})
+	require.ErrorContains(t, scanErr, "workspace is not a repository, cannot scan")
+}
 
 func setupCustomTestRepo(t *testing.T, url string, targetCommit string) (string, error) {
 	t.Helper()