refactor: move internal packages to internal/ directory

.golangci.yaml

@@ -61,7 +61,7 @@ linters:
               reason: "`aquasecurity/go-version` is designed for our use-cases"
           - github.com/liamg/memoryfs:
               recommendations:
-                - github.com/aquasecurity/trivy/pkg/mapfs
+                - github.com/aquasecurity/trivy/internal/mapfs
     gosec:
       excludes:
         - G101
@@ -162,7 +162,7 @@ linters:
   exclusions:
     generated: lax
     paths:
-      - "pkg/iac/scanners/terraform/parser/funcs" # copies of Terraform functions
+      - "internal/iac/scanners/terraform/parser/funcs" # copies of Terraform functions
     rules:
       - path: ".*_test.go$"
         linters:

integration/integration_test.go

@@ -27,14 +27,14 @@ import (
 	"github.com/xeipuuv/gojsonschema"
 
 	"github.com/aquasecurity/trivy-db/pkg/metadata"
+	"github.com/aquasecurity/trivy/internal/clock"
+	"github.com/aquasecurity/trivy/internal/db"
 	"github.com/aquasecurity/trivy/internal/dbtest"
 	"github.com/aquasecurity/trivy/internal/testutil"
-	"github.com/aquasecurity/trivy/pkg/clock"
+	"github.com/aquasecurity/trivy/internal/uuid"
+	"github.com/aquasecurity/trivy/internal/vex/repo"
 	"github.com/aquasecurity/trivy/pkg/commands"
-	"github.com/aquasecurity/trivy/pkg/db"
 	"github.com/aquasecurity/trivy/pkg/types"
-	"github.com/aquasecurity/trivy/pkg/uuid"
-	"github.com/aquasecurity/trivy/pkg/vex/repo"
 
 	_ "modernc.org/sqlite"
 )

integration/k8s_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	cdx "github.com/CycloneDX/cyclonedx-go"
-	"github.com/aquasecurity/trivy/pkg/k8s/report"
+	"github.com/aquasecurity/trivy/internal/k8s/report"
 	"github.com/aquasecurity/trivy/pkg/types"
 
 	"github.com/samber/lo"

pkg/attestation/attestation_test.go → internal/attestation/attestation_test.go

@@ -9,7 +9,7 @@ import (
 	slsa "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/common"
 	"github.com/stretchr/testify/require"
 
-	"github.com/aquasecurity/trivy/pkg/attestation"
+	"github.com/aquasecurity/trivy/internal/attestation"
 )
 
 func TestStatement_UnmarshalJSON(t *testing.T) {

pkg/attestation/sbom/rekor.go → internal/attestation/sbom/rekor.go

@@ -10,9 +10,9 @@ import (
 	"github.com/samber/lo"
 	"golang.org/x/xerrors"
 
-	"github.com/aquasecurity/trivy/pkg/attestation"
+	"github.com/aquasecurity/trivy/internal/attestation"
+	"github.com/aquasecurity/trivy/internal/rekor"
 	"github.com/aquasecurity/trivy/pkg/log"
-	"github.com/aquasecurity/trivy/pkg/rekor"
 )
 
 var ErrNoSBOMAttestation = xerrors.New("no SBOM attestation found")

pkg/attestation/sbom/rekor_test.go → internal/attestation/sbom/rekor_test.go

@@ -6,9 +6,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/aquasecurity/trivy/pkg/attestation/sbom"
+	"github.com/aquasecurity/trivy/internal/attestation/sbom"
+	"github.com/aquasecurity/trivy/internal/rekortest"
 	"github.com/aquasecurity/trivy/pkg/log"
-	"github.com/aquasecurity/trivy/pkg/rekortest"
 )
 
 func TestRekor_RetrieveSBOM(t *testing.T) {

pkg/compliance/report/json_test.go → internal/compliance/report/json_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/aquasecurity/trivy/pkg/compliance/report"
+	"github.com/aquasecurity/trivy/internal/compliance/report"
 	"github.com/aquasecurity/trivy/pkg/types"
 )
 

pkg/compliance/report/report.go → internal/compliance/report/report.go

@@ -7,7 +7,7 @@ import (
 	"golang.org/x/xerrors"
 
 	dbTypes "github.com/aquasecurity/trivy-db/pkg/types"
-	"github.com/aquasecurity/trivy/pkg/compliance/spec"
+	"github.com/aquasecurity/trivy/internal/compliance/spec"
 	iacTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/aquasecurity/trivy/pkg/types"
 )

pkg/compliance/report/report_test.go → internal/compliance/report/report_test.go

@@ -8,8 +8,8 @@ import (
 
 	dbTypes "github.com/aquasecurity/trivy-db/pkg/types"
 	"github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability"
-	"github.com/aquasecurity/trivy/pkg/compliance/report"
-	"github.com/aquasecurity/trivy/pkg/compliance/spec"
+	"github.com/aquasecurity/trivy/internal/compliance/report"
+	"github.com/aquasecurity/trivy/internal/compliance/spec"
 	ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
 	iacTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/aquasecurity/trivy/pkg/types"

pkg/compliance/report/summary_test.go → internal/compliance/report/summary_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/aquasecurity/trivy/pkg/compliance/report"
+	"github.com/aquasecurity/trivy/internal/compliance/report"
 	"github.com/aquasecurity/trivy/pkg/types"
 )
 

pkg/compliance/report/table_test.go → internal/compliance/report/table_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/aquasecurity/trivy/pkg/compliance/report"
+	"github.com/aquasecurity/trivy/internal/compliance/report"
 	"github.com/aquasecurity/trivy/pkg/types"
 )
 

pkg/compliance/spec/compliance.go → internal/compliance/spec/compliance.go

@@ -10,9 +10,9 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"github.com/aquasecurity/trivy-checks/pkg/specs"
+	"github.com/aquasecurity/trivy/internal/set"
 	iacTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/aquasecurity/trivy/pkg/log"
-	"github.com/aquasecurity/trivy/pkg/set"
 	"github.com/aquasecurity/trivy/pkg/types"
 )
 

pkg/compliance/spec/compliance_test.go → internal/compliance/spec/compliance_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/aquasecurity/trivy/pkg/compliance/spec"
+	"github.com/aquasecurity/trivy/internal/compliance/spec"
 	iacTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 	"github.com/aquasecurity/trivy/pkg/types"
 )

pkg/compliance/spec/mapper_test.go → internal/compliance/spec/mapper_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/aquasecurity/trivy/pkg/compliance/spec"
+	"github.com/aquasecurity/trivy/internal/compliance/spec"
 	"github.com/aquasecurity/trivy/pkg/fanal/secret"
 	ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
 	"github.com/aquasecurity/trivy/pkg/types"

pkg/db/db.go → internal/db/db.go

@@ -14,10 +14,10 @@ import (
 
 	"github.com/aquasecurity/trivy-db/pkg/db"
 	"github.com/aquasecurity/trivy-db/pkg/metadata"
-	"github.com/aquasecurity/trivy/pkg/clock"
+	"github.com/aquasecurity/trivy/internal/clock"
+	"github.com/aquasecurity/trivy/internal/oci"
 	"github.com/aquasecurity/trivy/pkg/fanal/types"
 	"github.com/aquasecurity/trivy/pkg/log"
-	"github.com/aquasecurity/trivy/pkg/oci"
 )
 
 const (

pkg/db/db_test.go → internal/db/db_test.go

@@ -12,9 +12,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/aquasecurity/trivy-db/pkg/metadata"
+	"github.com/aquasecurity/trivy/internal/clock"
+	"github.com/aquasecurity/trivy/internal/db"
 	"github.com/aquasecurity/trivy/internal/dbtest"
-	"github.com/aquasecurity/trivy/pkg/clock"
-	"github.com/aquasecurity/trivy/pkg/db"
 	ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
 	"github.com/aquasecurity/trivy/pkg/log"
 )

internal/dbtest/db.go

@@ -11,7 +11,7 @@ import (
 	fixtures "github.com/aquasecurity/bolt-fixtures"
 	trivydb "github.com/aquasecurity/trivy-db/pkg/db"
 	jdb "github.com/aquasecurity/trivy-java-db/pkg/db"
-	"github.com/aquasecurity/trivy/pkg/db"
+	"github.com/aquasecurity/trivy/internal/db"
 )
 
 // InitDB initializes testing database.

internal/dbtest/fake.go

@@ -13,8 +13,8 @@ import (
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/require"
 
+	"github.com/aquasecurity/trivy/internal/oci"
 	ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
-	"github.com/aquasecurity/trivy/pkg/oci"
 )
 
 const defaultMediaType = "application/vnd.aquasec.trivy.db.layer.v1.tar+gzip"

pkg/downloader/downloader_test.go → internal/downloader/downloader_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/aquasecurity/trivy/pkg/downloader"
+	"github.com/aquasecurity/trivy/internal/downloader"
 	xhttp "github.com/aquasecurity/trivy/pkg/x/http"
 )
 

internal/iac/adapters/arm/adapt.go

@@ -0,0 +1,49 @@
+package arm
+
+import (
+	"context"
+
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/appservice"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/authorization"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/compute"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/container"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/database"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/datafactory"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/datalake"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/keyvault"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/monitor"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/network"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/securitycenter"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/storage"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/synapse"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure"
+	scanner "github.com/aquasecurity/trivy/internal/iac/scanners/azure"
+	"github.com/aquasecurity/trivy/internal/iac/state"
+)
+
+// Adapt adapts an azure arm instance
+func Adapt(_ context.Context, deployment scanner.Deployment) *state.State {
+	return &state.State{
+		Azure: adaptAzure(deployment),
+	}
+}
+
+func adaptAzure(deployment scanner.Deployment) azure.Azure {
+
+	return azure.Azure{
+		AppService:     appservice.Adapt(deployment),
+		Authorization:  authorization.Adapt(deployment),
+		Compute:        compute.Adapt(deployment),
+		Container:      container.Adapt(deployment),
+		Database:       database.Adapt(deployment),
+		DataFactory:    datafactory.Adapt(deployment),
+		DataLake:       datalake.Adapt(deployment),
+		KeyVault:       keyvault.Adapt(deployment),
+		Monitor:        monitor.Adapt(deployment),
+		Network:        network.Adapt(deployment),
+		SecurityCenter: securitycenter.Adapt(deployment),
+		Storage:        storage.Adapt(deployment),
+		Synapse:        synapse.Adapt(deployment),
+	}
+
+}

pkg/iac/adapters/arm/adaptertest/adaptertest.go → internal/iac/adapters/arm/adaptertest/adaptertest.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/aquasecurity/trivy/internal/iac/scanners/azure"
+	"github.com/aquasecurity/trivy/internal/iac/scanners/azure/arm/parser"
 	"github.com/aquasecurity/trivy/internal/testutil"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure/arm/parser"
 )
 
 type adaptFn[T any] func(deployment azure.Deployment) T

pkg/iac/adapters/arm/appservice/adapt.go → internal/iac/adapters/arm/appservice/adapt.go

@@ -1,8 +1,8 @@
 package appservice
 
 import (
-	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/appservice"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure/appservice"
+	"github.com/aquasecurity/trivy/internal/iac/scanners/azure"
 	iacTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 

pkg/iac/adapters/arm/appservice/adapt_test.go → internal/iac/adapters/arm/appservice/adapt_test.go

@@ -3,8 +3,8 @@ package appservice
 import (
 	"testing"
 
-	"github.com/aquasecurity/trivy/pkg/iac/adapters/arm/adaptertest"
-	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/appservice"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/adaptertest"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure/appservice"
 	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 

pkg/iac/adapters/arm/authorization/adapt.go → internal/iac/adapters/arm/authorization/adapt.go

@@ -1,8 +1,8 @@
 package authorization
 
 import (
-	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/authorization"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure/authorization"
+	"github.com/aquasecurity/trivy/internal/iac/scanners/azure"
 )
 
 func Adapt(deployment azure.Deployment) authorization.Authorization {

pkg/iac/adapters/arm/authorization/adapt_test.go → internal/iac/adapters/arm/authorization/adapt_test.go

@@ -3,8 +3,8 @@ package authorization
 import (
 	"testing"
 
-	"github.com/aquasecurity/trivy/pkg/iac/adapters/arm/adaptertest"
-	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/authorization"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/adaptertest"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure/authorization"
 	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 

pkg/iac/adapters/arm/compute/adapt.go → internal/iac/adapters/arm/compute/adapt.go

@@ -1,8 +1,8 @@
 package compute
 
 import (
-	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/compute"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure/compute"
+	"github.com/aquasecurity/trivy/internal/iac/scanners/azure"
 	iacTypes "github.com/aquasecurity/trivy/pkg/iac/types"
 )
 

pkg/iac/adapters/arm/compute/adapt_test.go → internal/iac/adapters/arm/compute/adapt_test.go

@@ -3,8 +3,8 @@ package compute
 import (
 	"testing"
 
-	"github.com/aquasecurity/trivy/pkg/iac/adapters/arm/adaptertest"
-	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/compute"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/adaptertest"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure/compute"
 	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 

pkg/iac/adapters/arm/container/adapt.go → internal/iac/adapters/arm/container/adapt.go

@@ -1,8 +1,8 @@
 package container
 
 import (
-	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/container"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure/container"
+	"github.com/aquasecurity/trivy/internal/iac/scanners/azure"
 )
 
 func Adapt(deployment azure.Deployment) container.Container {

pkg/iac/adapters/arm/database/adapt.go → internal/iac/adapters/arm/database/adapt.go

@@ -1,8 +1,8 @@
 package database
 
 import (
-	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/internal/iac/scanners/azure"
 )
 
 func Adapt(deployment azure.Deployment) database.Database {

pkg/iac/adapters/arm/database/adapt_test.go → internal/iac/adapters/arm/database/adapt_test.go

@@ -3,8 +3,8 @@ package database
 import (
 	"testing"
 
-	"github.com/aquasecurity/trivy/pkg/iac/adapters/arm/adaptertest"
-	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/internal/iac/adapters/arm/adaptertest"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure/database"
 	"github.com/aquasecurity/trivy/pkg/iac/types"
 )
 

pkg/iac/adapters/arm/database/firewall.go → internal/iac/adapters/arm/database/firewall.go

@@ -1,8 +1,8 @@
 package database
 
 import (
-	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/internal/iac/scanners/azure"
 )
 
 // TODO: This is the "Microsoft.Sql/servers/firewallRules" resource

pkg/iac/adapters/arm/database/maria.go → internal/iac/adapters/arm/database/maria.go

@@ -1,8 +1,8 @@
 package database
 
 import (
-	"github.com/aquasecurity/trivy/pkg/iac/providers/azure/database"
-	"github.com/aquasecurity/trivy/pkg/iac/scanners/azure"
+	"github.com/aquasecurity/trivy/internal/iac/providers/azure/database"
+	"github.com/aquasecurity/trivy/internal/iac/scanners/azure"
 )
 
 func adaptMariaDBServers(deployment azure.Deployment) (mariaDbServers []database.MariaDBServer) {