test: Refactor linting tests and add Trivy integration test

softwaredevelop · Mar 21, 2024 · 0920bbc · 0920bbc
1 parent 6b45abc
commit 0920bbc
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 15 deletions.
diff --git a/cc/linting/t_test.go b/cc/linting/t_test.go
@@ -15,7 +15,23 @@ func TestT(t *testing.T) {
 
 	t.Run("Test_trivy_run", func(t *testing.T) {
 		t.Parallel()
-		c = c.Pipeline("test_actionlint_run")
+		c = c.Pipeline("test_trivy_run")
+		require.NotNil(t, c)
+
+		_, err := linting.T(c, id).
+			WithNewFile(".trivyignore", dagger.ContainerWithNewFileOpts{
+				Contents: "AVD-DS-0002",
+			}).
+			WithNewFile("Dockerfile.test", dagger.ContainerWithNewFileOpts{
+				Contents: "FROM docker.io/library/alpine:$VARIANT\nHEALTHCHECK none",
+			}).
+			WithExec([]string{"sh", "-c", "/trivy config --severity=MEDIUM,HIGH,CRITICAL --exit-code=1 $(find . -type f \\( -name Dockerfile -o -name Dockerfile.* \\))"}).
+			Stdout(ctx)
+		require.NoError(t, err)
+	})
+	t.Run("Test_trivy_run_error", func(t *testing.T) {
+		t.Parallel()
+		c = c.Pipeline("test_trivy_run_error")
 		require.NotNil(t, c)
 
 		_, err := linting.T(c, id).

diff --git a/cc/main_test.go b/cc/main_test.go
@@ -42,20 +42,27 @@ func TestMain(m *testing.M) {
 func TestCodeQualityFunctions(t *testing.T) {
 	t.Parallel()
 
-	// t.Run("Test_trivy_function", func(t *testing.T) {
-	// 	t.Parallel()
-	// 	c = c.Pipeline("test_trivy_function")
-	// 	require.NotNil(t, c)
-
-	// 	dir, err := os.Getwd()
-	// 	require.NoError(t, err)
-	// 	require.NotEmpty(t, dir)
-	// 	require.IsType(t, "", dir)
-
-	// 	mountedDir := "/mountedtmp"
-	// 	err = linting.Trivy(dir, c, id, mountedDir)
-	// 	require.NoError(t, err)
-	// })
+	t.Run("Test_trivy_function", func(t *testing.T) {
+		t.Parallel()
+		c = c.Pipeline("test_trivy_function")
+		require.NotNil(t, c)
+
+		dir, err := os.Getwd()
+		require.NoError(t, err)
+		require.NotEmpty(t, dir)
+		require.IsType(t, "", dir)
+
+		mountedDir := "/mountedtmp"
+		p := filepath.Join(dir, "..")
+		require.NotEmpty(t, p)
+
+		id, err := util.MountedHostDirectory(c, id, p, mountedDir).
+			ID(context.Background())
+		require.NoError(t, err)
+
+		err = linting.Trivy(c, id)
+		require.NoError(t, err)
+	})
 	t.Run("Test_hadolint_function", func(t *testing.T) {
 		t.Parallel()
 		c = c.Pipeline("test_hadolint_function")