From 292ce9341d12786e00c7e81c4f865bae4c05c11f Mon Sep 17 00:00:00 2001 From: Juan Rodriguez Hortala Date: Mon, 7 Feb 2022 18:45:31 +0100 Subject: [PATCH 1/2] Move central/testutils/mtls to pkg/testutils/central so we can easily generate TLS certificates for sensor tests --- central/clusters/identity_test.go | 2 +- central/clusters/zip/generate_certs_test.go | 2 +- central/localscanner/certificates_test.go | 2 +- central/metadata/service/service_impl_test.go | 2 +- central/scanner/handler_test.go | 2 +- central/sensor/service/connection/connection_test.go | 2 +- {central/testutils => pkg/testutils/central}/mtls/mtls.go | 0 .../testutils/central}/mtls/testdata/central-certs/ca-key.pem | 0 .../testutils/central}/mtls/testdata/central-certs/ca.pem | 0 .../central}/mtls/testdata/central-certs/leaf-cert.pem | 0 .../testutils/central}/mtls/testdata/central-certs/leaf-key.pem | 0 .../testutils/central}/mtls/testdata/generate-certs.sh | 0 12 files changed, 6 insertions(+), 6 deletions(-) rename {central/testutils => pkg/testutils/central}/mtls/mtls.go (100%) rename {central/testutils => pkg/testutils/central}/mtls/testdata/central-certs/ca-key.pem (100%) rename {central/testutils => pkg/testutils/central}/mtls/testdata/central-certs/ca.pem (100%) rename {central/testutils => pkg/testutils/central}/mtls/testdata/central-certs/leaf-cert.pem (100%) rename {central/testutils => pkg/testutils/central}/mtls/testdata/central-certs/leaf-key.pem (100%) rename {central/testutils => pkg/testutils/central}/mtls/testdata/generate-certs.sh (100%) diff --git a/central/clusters/identity_test.go b/central/clusters/identity_test.go index 5d5843754f3ca..2261b02cab480 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/testutils/central/mtls" "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..f558b7c425c5c 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/testutils/central/mtls" "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..9d7385e2396cb 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/testutils/central/mtls" "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..ec258eccdbf90 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/testutils/central/mtls" "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..455816bd666a8 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/testutils/central/mtls" "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..b55275d25e591 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/testutils/central/mtls" "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/testutils/central/mtls/mtls.go similarity index 100% rename from central/testutils/mtls/mtls.go rename to pkg/testutils/central/mtls/mtls.go diff --git a/central/testutils/mtls/testdata/central-certs/ca-key.pem b/pkg/testutils/central/mtls/testdata/central-certs/ca-key.pem similarity index 100% rename from central/testutils/mtls/testdata/central-certs/ca-key.pem rename to pkg/testutils/central/mtls/testdata/central-certs/ca-key.pem diff --git a/central/testutils/mtls/testdata/central-certs/ca.pem b/pkg/testutils/central/mtls/testdata/central-certs/ca.pem similarity index 100% rename from central/testutils/mtls/testdata/central-certs/ca.pem rename to pkg/testutils/central/mtls/testdata/central-certs/ca.pem diff --git a/central/testutils/mtls/testdata/central-certs/leaf-cert.pem b/pkg/testutils/central/mtls/testdata/central-certs/leaf-cert.pem similarity index 100% rename from central/testutils/mtls/testdata/central-certs/leaf-cert.pem rename to pkg/testutils/central/mtls/testdata/central-certs/leaf-cert.pem diff --git a/central/testutils/mtls/testdata/central-certs/leaf-key.pem b/pkg/testutils/central/mtls/testdata/central-certs/leaf-key.pem similarity index 100% rename from central/testutils/mtls/testdata/central-certs/leaf-key.pem rename to pkg/testutils/central/mtls/testdata/central-certs/leaf-key.pem diff --git a/central/testutils/mtls/testdata/generate-certs.sh b/pkg/testutils/central/mtls/testdata/generate-certs.sh similarity index 100% rename from central/testutils/mtls/testdata/generate-certs.sh rename to pkg/testutils/central/mtls/testdata/generate-certs.sh From 4de3ec9598655b4580ff676d9c45d69d59242ffa Mon Sep 17 00:00:00 2001 From: Juan Rodriguez Hortala Date: Tue, 8 Feb 2022 10:20:43 +0100 Subject: [PATCH 2/2] move pkg/testutils/central to pkg/mtls/testutils --- central/clusters/identity_test.go | 2 +- central/clusters/zip/generate_certs_test.go | 2 +- central/localscanner/certificates_test.go | 2 +- central/metadata/service/service_impl_test.go | 2 +- central/scanner/handler_test.go | 2 +- central/sensor/service/connection/connection_test.go | 2 +- pkg/{testutils/central/mtls => mtls/testutils}/mtls.go | 2 +- .../mtls => mtls/testutils}/testdata/central-certs/ca-key.pem | 0 .../mtls => mtls/testutils}/testdata/central-certs/ca.pem | 0 .../testutils}/testdata/central-certs/leaf-cert.pem | 0 .../mtls => mtls/testutils}/testdata/central-certs/leaf-key.pem | 0 .../central/mtls => mtls/testutils}/testdata/generate-certs.sh | 0 12 files changed, 7 insertions(+), 7 deletions(-) rename pkg/{testutils/central/mtls => mtls/testutils}/mtls.go (98%) rename pkg/{testutils/central/mtls => mtls/testutils}/testdata/central-certs/ca-key.pem (100%) rename pkg/{testutils/central/mtls => mtls/testutils}/testdata/central-certs/ca.pem (100%) rename pkg/{testutils/central/mtls => mtls/testutils}/testdata/central-certs/leaf-cert.pem (100%) rename pkg/{testutils/central/mtls => mtls/testutils}/testdata/central-certs/leaf-key.pem (100%) rename pkg/{testutils/central/mtls => mtls/testutils}/testdata/generate-certs.sh (100%) diff --git a/central/clusters/identity_test.go b/central/clusters/identity_test.go index 2261b02cab480..aafa6340b6fc1 100644 --- a/central/clusters/identity_test.go +++ b/central/clusters/identity_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stackrox/rox/generated/storage" - testutilsMTLS "github.com/stackrox/rox/pkg/testutils/central/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/clusters/zip/generate_certs_test.go b/central/clusters/zip/generate_certs_test.go index f558b7c425c5c..267cded953a5b 100644 --- a/central/clusters/zip/generate_certs_test.go +++ b/central/clusters/zip/generate_certs_test.go @@ -8,7 +8,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stackrox/rox/central/serviceidentities/datastore/mocks" "github.com/stackrox/rox/generated/storage" - testutilsMTLS "github.com/stackrox/rox/pkg/testutils/central/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/localscanner/certificates_test.go b/central/localscanner/certificates_test.go index 9d7385e2396cb..6bc96b89778c7 100644 --- a/central/localscanner/certificates_test.go +++ b/central/localscanner/certificates_test.go @@ -10,7 +10,7 @@ import ( "github.com/stackrox/rox/pkg/certgen" "github.com/stackrox/rox/pkg/features" "github.com/stackrox/rox/pkg/mtls" - testutilsMTLS "github.com/stackrox/rox/pkg/testutils/central/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 ec258eccdbf90..83a659c6e4f20 100644 --- a/central/metadata/service/service_impl_test.go +++ b/central/metadata/service/service_impl_test.go @@ -11,7 +11,7 @@ import ( "github.com/gogo/protobuf/proto" cTLS "github.com/google/certificate-transparency-go/tls" v1 "github.com/stackrox/rox/generated/api/v1" - testutilsMTLS "github.com/stackrox/rox/pkg/testutils/central/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/scanner/handler_test.go b/central/scanner/handler_test.go index 455816bd666a8..2bb9b65431d7d 100644 --- a/central/scanner/handler_test.go +++ b/central/scanner/handler_test.go @@ -13,7 +13,7 @@ import ( "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/testutils/central/mtls" + 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 b55275d25e591..38fce87c65e5e 100644 --- a/central/sensor/service/connection/connection_test.go +++ b/central/sensor/service/connection/connection_test.go @@ -14,7 +14,7 @@ import ( "github.com/stackrox/rox/pkg/centralsensor" "github.com/stackrox/rox/pkg/concurrency" "github.com/stackrox/rox/pkg/features" - testutilsMTLS "github.com/stackrox/rox/pkg/testutils/central/mtls" + 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/pkg/testutils/central/mtls/mtls.go b/pkg/mtls/testutils/mtls.go similarity index 98% rename from pkg/testutils/central/mtls/mtls.go rename to pkg/mtls/testutils/mtls.go index 6c43f3cc6e787..1e3353edd33cb 100644 --- a/pkg/testutils/central/mtls/mtls.go +++ b/pkg/mtls/testutils/mtls.go @@ -1,4 +1,4 @@ -package mtls +package testutils import ( "errors" diff --git a/pkg/testutils/central/mtls/testdata/central-certs/ca-key.pem b/pkg/mtls/testutils/testdata/central-certs/ca-key.pem similarity index 100% rename from pkg/testutils/central/mtls/testdata/central-certs/ca-key.pem rename to pkg/mtls/testutils/testdata/central-certs/ca-key.pem diff --git a/pkg/testutils/central/mtls/testdata/central-certs/ca.pem b/pkg/mtls/testutils/testdata/central-certs/ca.pem similarity index 100% rename from pkg/testutils/central/mtls/testdata/central-certs/ca.pem rename to pkg/mtls/testutils/testdata/central-certs/ca.pem diff --git a/pkg/testutils/central/mtls/testdata/central-certs/leaf-cert.pem b/pkg/mtls/testutils/testdata/central-certs/leaf-cert.pem similarity index 100% rename from pkg/testutils/central/mtls/testdata/central-certs/leaf-cert.pem rename to pkg/mtls/testutils/testdata/central-certs/leaf-cert.pem diff --git a/pkg/testutils/central/mtls/testdata/central-certs/leaf-key.pem b/pkg/mtls/testutils/testdata/central-certs/leaf-key.pem similarity index 100% rename from pkg/testutils/central/mtls/testdata/central-certs/leaf-key.pem rename to pkg/mtls/testutils/testdata/central-certs/leaf-key.pem diff --git a/pkg/testutils/central/mtls/testdata/generate-certs.sh b/pkg/mtls/testutils/testdata/generate-certs.sh similarity index 100% rename from pkg/testutils/central/mtls/testdata/generate-certs.sh rename to pkg/mtls/testutils/testdata/generate-certs.sh