build: fix integration test and lint errors

Signed-off-by: Thomas Gosteli <thomas.gosteli@protonmail.ch>
anchore · Oct 24, 2024 · 7db9704 · 7db9704
1 parent bf19582
commit 7db9704
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 2 deletions.
diff --git a/cmd/syft/internal/test/integration/catalog_packages_cases_test.go b/cmd/syft/internal/test/integration/catalog_packages_cases_test.go
@@ -418,6 +418,13 @@ var dirOnlyTestCases = []testCase{
 			"ocaml-base-compiler": "4.14.0",
 		},
 	},
+	{
+		name:    "find terraform packages",
+		pkgType: pkg.TerraformPkg,
+		pkgInfo: map[string]string{
+			"registry.terraform.io/hashicorp/aws": "5.72.1",
+		},
+	},
 }
 
 var commonTestCases = []testCase{

diff --git a/cmd/syft/internal/test/integration/catalog_packages_test.go b/cmd/syft/internal/test/integration/catalog_packages_test.go
@@ -82,6 +82,7 @@ func TestPkgCoverageImage(t *testing.T) {
 	definedPkgs.Remove(string(pkg.OpamPkg))
 	definedPkgs.Remove(string(pkg.GithubActionPkg))
 	definedPkgs.Remove(string(pkg.GithubActionWorkflowPkg))
+	definedPkgs.Remove(string(pkg.TerraformPkg))
 
 	var cases []testCase
 	cases = append(cases, commonTestCases...)

diff --git a/.../internal/test/integration/test-fixtures/image-pkg-coverage/terraform/.terraform.lock.hcl b/.../internal/test/integration/test-fixtures/image-pkg-coverage/terraform/.terraform.lock.hcl
diff --git a/syft/pkg/cataloger/terraform/parse_tf_lock.go b/syft/pkg/cataloger/terraform/parse_tf_lock.go
@@ -23,7 +23,7 @@ type lockFile struct {
 	} `hcl:"provider,block"`
 }
 
-func parseTerraformLock(_ context.Context, resolver file.Resolver, env *generic.Environment, reader file.LocationReadCloser) ([]pkg.Package, []artifact.Relationship, error) {
+func parseTerraformLock(_ context.Context, _ file.Resolver, _ *generic.Environment, reader file.LocationReadCloser) ([]pkg.Package, []artifact.Relationship, error) {
 	var lockFile lockFile
 
 	contents, err := io.ReadAll(reader)

diff --git a/syft/pkg/type.go b/syft/pkg/type.go
@@ -174,7 +174,7 @@ func TypeFromPURL(p string) Type {
 	return TypeByName(ptype)
 }
 
-//nolint:funlen
+//nolint:funlen,gocyclo
 func TypeByName(name string) Type {
 	switch name {
 	case packageurl.TypeDebian: