diff --git a/central/clusters/identity_test.go b/central/clusters/identity_test.go index 5d5843754f3ca..aafa6340b6fc1 100644 --- a/central/clusters/identity_test.go +++ b/central/clusters/identity_test.go @@ -3,8 +3,8 @@ package clusters import ( "testing" - testutilsMTLS "github.com/stackrox/rox/central/testutils/mtls" "github.com/stackrox/rox/generated/storage" + testutilsMTLS "github.com/stackrox/rox/pkg/mtls/testutils" "github.com/stackrox/rox/pkg/testutils/envisolator" "github.com/stretchr/testify/suite" ) diff --git a/central/clusters/zip/generate_certs_test.go b/central/clusters/zip/generate_certs_test.go index c9bf4ba97d8f4..267cded953a5b 100644 --- a/central/clusters/zip/generate_certs_test.go +++ b/central/clusters/zip/generate_certs_test.go @@ -7,8 +7,8 @@ import ( "github.com/golang/mock/gomock" "github.com/stackrox/rox/central/serviceidentities/datastore/mocks" - testutilsMTLS "github.com/stackrox/rox/central/testutils/mtls" "github.com/stackrox/rox/generated/storage" + testutilsMTLS "github.com/stackrox/rox/pkg/mtls/testutils" "github.com/stackrox/rox/pkg/testutils/envisolator" "github.com/stretchr/testify/suite" ) diff --git a/central/localscanner/certificates_test.go b/central/localscanner/certificates_test.go index c9027c8381d54..6bc96b89778c7 100644 --- a/central/localscanner/certificates_test.go +++ b/central/localscanner/certificates_test.go @@ -6,11 +6,11 @@ import ( "time" "github.com/cloudflare/cfssl/helpers" - testutilsMTLS "github.com/stackrox/rox/central/testutils/mtls" "github.com/stackrox/rox/generated/storage" "github.com/stackrox/rox/pkg/certgen" "github.com/stackrox/rox/pkg/features" "github.com/stackrox/rox/pkg/mtls" + testutilsMTLS "github.com/stackrox/rox/pkg/mtls/testutils" "github.com/stackrox/rox/pkg/testutils/envisolator" "github.com/stretchr/testify/suite" ) diff --git a/central/metadata/service/service_impl_test.go b/central/metadata/service/service_impl_test.go index 856c10a0a9fb7..83a659c6e4f20 100644 --- a/central/metadata/service/service_impl_test.go +++ b/central/metadata/service/service_impl_test.go @@ -10,8 +10,8 @@ import ( "github.com/gogo/protobuf/proto" cTLS "github.com/google/certificate-transparency-go/tls" - testutilsMTLS "github.com/stackrox/rox/central/testutils/mtls" v1 "github.com/stackrox/rox/generated/api/v1" + testutilsMTLS "github.com/stackrox/rox/pkg/mtls/testutils" "github.com/stackrox/rox/pkg/testutils/envisolator" "github.com/stretchr/testify/suite" ) diff --git a/central/scanner/handler_test.go b/central/scanner/handler_test.go index e2cb73ace13b2..2bb9b65431d7d 100644 --- a/central/scanner/handler_test.go +++ b/central/scanner/handler_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - testutilsMTLS "github.com/stackrox/rox/central/testutils/mtls" "github.com/stackrox/rox/generated/storage" "github.com/stackrox/rox/pkg/apiparams" buildTestutils "github.com/stackrox/rox/pkg/buildinfo/testutils" + testutilsMTLS "github.com/stackrox/rox/pkg/mtls/testutils" "github.com/stackrox/rox/pkg/testutils/envisolator" "github.com/stackrox/rox/pkg/version/testutils" "github.com/stretchr/testify/suite" diff --git a/central/sensor/service/connection/connection_test.go b/central/sensor/service/connection/connection_test.go index c8177ac72a1cc..38fce87c65e5e 100644 --- a/central/sensor/service/connection/connection_test.go +++ b/central/sensor/service/connection/connection_test.go @@ -8,13 +8,13 @@ import ( "github.com/gogo/protobuf/types" "github.com/golang/mock/gomock" clusterMgrMock "github.com/stackrox/rox/central/sensor/service/common/mocks" - testutilsMTLS "github.com/stackrox/rox/central/testutils/mtls" "github.com/stackrox/rox/generated/internalapi/central" "github.com/stackrox/rox/generated/storage" "github.com/stackrox/rox/pkg/booleanpolicy/policyversion" "github.com/stackrox/rox/pkg/centralsensor" "github.com/stackrox/rox/pkg/concurrency" "github.com/stackrox/rox/pkg/features" + testutilsMTLS "github.com/stackrox/rox/pkg/mtls/testutils" "github.com/stackrox/rox/pkg/testutils/envisolator" "github.com/stretchr/testify/suite" "google.golang.org/grpc" diff --git a/central/testutils/mtls/mtls.go b/pkg/mtls/testutils/mtls.go similarity index 98% rename from central/testutils/mtls/mtls.go rename to pkg/mtls/testutils/mtls.go index 6c43f3cc6e787..1e3353edd33cb 100644 --- a/central/testutils/mtls/mtls.go +++ b/pkg/mtls/testutils/mtls.go @@ -1,4 +1,4 @@ -package mtls +package testutils import ( "errors" diff --git a/central/testutils/mtls/testdata/central-certs/ca-key.pem b/pkg/mtls/testutils/testdata/central-certs/ca-key.pem similarity index 100% rename from central/testutils/mtls/testdata/central-certs/ca-key.pem rename to pkg/mtls/testutils/testdata/central-certs/ca-key.pem diff --git a/central/testutils/mtls/testdata/central-certs/ca.pem b/pkg/mtls/testutils/testdata/central-certs/ca.pem similarity index 100% rename from central/testutils/mtls/testdata/central-certs/ca.pem rename to pkg/mtls/testutils/testdata/central-certs/ca.pem diff --git a/central/testutils/mtls/testdata/central-certs/leaf-cert.pem b/pkg/mtls/testutils/testdata/central-certs/leaf-cert.pem similarity index 100% rename from central/testutils/mtls/testdata/central-certs/leaf-cert.pem rename to pkg/mtls/testutils/testdata/central-certs/leaf-cert.pem diff --git a/central/testutils/mtls/testdata/central-certs/leaf-key.pem b/pkg/mtls/testutils/testdata/central-certs/leaf-key.pem similarity index 100% rename from central/testutils/mtls/testdata/central-certs/leaf-key.pem rename to pkg/mtls/testutils/testdata/central-certs/leaf-key.pem diff --git a/central/testutils/mtls/testdata/generate-certs.sh b/pkg/mtls/testutils/testdata/generate-certs.sh similarity index 100% rename from central/testutils/mtls/testdata/generate-certs.sh rename to pkg/mtls/testutils/testdata/generate-certs.sh