diff --git a/pkg/internal/cyberark/client.go b/internal/cyberark/client.go similarity index 92% rename from pkg/internal/cyberark/client.go rename to internal/cyberark/client.go index 36d9202b..18c1a31c 100644 --- a/pkg/internal/cyberark/client.go +++ b/internal/cyberark/client.go @@ -6,9 +6,9 @@ import ( "net/http" "os" - "github.com/jetstack/preflight/pkg/internal/cyberark/dataupload" - "github.com/jetstack/preflight/pkg/internal/cyberark/identity" - "github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery" + "github.com/jetstack/preflight/internal/cyberark/dataupload" + "github.com/jetstack/preflight/internal/cyberark/identity" + "github.com/jetstack/preflight/internal/cyberark/servicediscovery" ) // ClientConfig holds the configuration needed to initialize a CyberArk client. diff --git a/pkg/internal/cyberark/client_test.go b/internal/cyberark/client_test.go similarity index 91% rename from pkg/internal/cyberark/client_test.go rename to internal/cyberark/client_test.go index 644d0248..6d0afb00 100644 --- a/pkg/internal/cyberark/client_test.go +++ b/internal/cyberark/client_test.go @@ -11,9 +11,9 @@ import ( "k8s.io/klog/v2" "k8s.io/klog/v2/ktesting" - "github.com/jetstack/preflight/pkg/internal/cyberark" - "github.com/jetstack/preflight/pkg/internal/cyberark/dataupload" - "github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery" + "github.com/jetstack/preflight/internal/cyberark" + "github.com/jetstack/preflight/internal/cyberark/dataupload" + "github.com/jetstack/preflight/internal/cyberark/servicediscovery" "github.com/jetstack/preflight/pkg/testutil" "github.com/jetstack/preflight/pkg/version" @@ -53,7 +53,7 @@ func TestCyberArkClient_PutSnapshot_MockAPI(t *testing.T) { // // To enable verbose request logging: // -// go test ./pkg/internal/cyberark \ +// go test ./internal/cyberark \ // -v -count 1 -run TestCyberArkClient_PutSnapshot_RealAPI -args -testing.v 6 func TestCyberArkClient_PutSnapshot_RealAPI(t *testing.T) { logger := ktesting.NewLogger(t, ktesting.DefaultConfig) diff --git a/pkg/internal/cyberark/dataupload/dataupload.go b/internal/cyberark/dataupload/dataupload.go similarity index 100% rename from pkg/internal/cyberark/dataupload/dataupload.go rename to internal/cyberark/dataupload/dataupload.go diff --git a/pkg/internal/cyberark/dataupload/dataupload_test.go b/internal/cyberark/dataupload/dataupload_test.go similarity index 97% rename from pkg/internal/cyberark/dataupload/dataupload_test.go rename to internal/cyberark/dataupload/dataupload_test.go index bdedd4f5..1f2ff636 100644 --- a/pkg/internal/cyberark/dataupload/dataupload_test.go +++ b/internal/cyberark/dataupload/dataupload_test.go @@ -9,7 +9,7 @@ import ( "k8s.io/klog/v2" "k8s.io/klog/v2/ktesting" - "github.com/jetstack/preflight/pkg/internal/cyberark/dataupload" + "github.com/jetstack/preflight/internal/cyberark/dataupload" "github.com/jetstack/preflight/pkg/version" _ "k8s.io/klog/v2/ktesting/init" diff --git a/pkg/internal/cyberark/dataupload/mock.go b/internal/cyberark/dataupload/mock.go similarity index 100% rename from pkg/internal/cyberark/dataupload/mock.go rename to internal/cyberark/dataupload/mock.go diff --git a/pkg/internal/cyberark/identity/advance_authentication_test.go b/internal/cyberark/identity/advance_authentication_test.go similarity index 98% rename from pkg/internal/cyberark/identity/advance_authentication_test.go rename to internal/cyberark/identity/advance_authentication_test.go index fb0a814a..9340da30 100644 --- a/pkg/internal/cyberark/identity/advance_authentication_test.go +++ b/internal/cyberark/identity/advance_authentication_test.go @@ -7,7 +7,7 @@ import ( "k8s.io/klog/v2" "k8s.io/klog/v2/ktesting" - "github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery" + "github.com/jetstack/preflight/internal/cyberark/servicediscovery" _ "k8s.io/klog/v2/ktesting/init" ) diff --git a/pkg/internal/cyberark/identity/authenticated_http_client.go b/internal/cyberark/identity/authenticated_http_client.go similarity index 100% rename from pkg/internal/cyberark/identity/authenticated_http_client.go rename to internal/cyberark/identity/authenticated_http_client.go diff --git a/pkg/internal/cyberark/identity/cmd/testidentity/main.go b/internal/cyberark/identity/cmd/testidentity/main.go similarity index 94% rename from pkg/internal/cyberark/identity/cmd/testidentity/main.go rename to internal/cyberark/identity/cmd/testidentity/main.go index 181eb2cd..e0028231 100644 --- a/pkg/internal/cyberark/identity/cmd/testidentity/main.go +++ b/internal/cyberark/identity/cmd/testidentity/main.go @@ -12,8 +12,8 @@ import ( "k8s.io/client-go/transport" "k8s.io/klog/v2" - "github.com/jetstack/preflight/pkg/internal/cyberark/identity" - "github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery" + "github.com/jetstack/preflight/internal/cyberark/identity" + "github.com/jetstack/preflight/internal/cyberark/servicediscovery" "github.com/jetstack/preflight/pkg/version" ) diff --git a/pkg/internal/cyberark/identity/identity.go b/internal/cyberark/identity/identity.go similarity index 100% rename from pkg/internal/cyberark/identity/identity.go rename to internal/cyberark/identity/identity.go diff --git a/pkg/internal/cyberark/identity/identity_test.go b/internal/cyberark/identity/identity_test.go similarity index 96% rename from pkg/internal/cyberark/identity/identity_test.go rename to internal/cyberark/identity/identity_test.go index c392a0d8..732805e7 100644 --- a/pkg/internal/cyberark/identity/identity_test.go +++ b/internal/cyberark/identity/identity_test.go @@ -15,8 +15,8 @@ import ( "k8s.io/klog/v2" "k8s.io/klog/v2/ktesting" - "github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery" - arktesting "github.com/jetstack/preflight/pkg/internal/cyberark/testing" + "github.com/jetstack/preflight/internal/cyberark/servicediscovery" + arktesting "github.com/jetstack/preflight/internal/cyberark/testing" _ "k8s.io/klog/v2/ktesting/init" ) diff --git a/pkg/internal/cyberark/identity/mock.go b/internal/cyberark/identity/mock.go similarity index 100% rename from pkg/internal/cyberark/identity/mock.go rename to internal/cyberark/identity/mock.go diff --git a/pkg/internal/cyberark/identity/start_authentication_test.go b/internal/cyberark/identity/start_authentication_test.go similarity index 97% rename from pkg/internal/cyberark/identity/start_authentication_test.go rename to internal/cyberark/identity/start_authentication_test.go index 17dd85eb..40bd7d5c 100644 --- a/pkg/internal/cyberark/identity/start_authentication_test.go +++ b/internal/cyberark/identity/start_authentication_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery" + "github.com/jetstack/preflight/internal/cyberark/servicediscovery" ) func Test_IdentityStartAuthentication(t *testing.T) { diff --git a/pkg/internal/cyberark/identity/testdata/advance_authentication_failure.json b/internal/cyberark/identity/testdata/advance_authentication_failure.json similarity index 100% rename from pkg/internal/cyberark/identity/testdata/advance_authentication_failure.json rename to internal/cyberark/identity/testdata/advance_authentication_failure.json diff --git a/pkg/internal/cyberark/identity/testdata/advance_authentication_success.json b/internal/cyberark/identity/testdata/advance_authentication_success.json similarity index 100% rename from pkg/internal/cyberark/identity/testdata/advance_authentication_success.json rename to internal/cyberark/identity/testdata/advance_authentication_success.json diff --git a/pkg/internal/cyberark/identity/testdata/start_authentication_bad_user_session_id.json b/internal/cyberark/identity/testdata/start_authentication_bad_user_session_id.json similarity index 100% rename from pkg/internal/cyberark/identity/testdata/start_authentication_bad_user_session_id.json rename to internal/cyberark/identity/testdata/start_authentication_bad_user_session_id.json diff --git a/pkg/internal/cyberark/identity/testdata/start_authentication_failure.json b/internal/cyberark/identity/testdata/start_authentication_failure.json similarity index 100% rename from pkg/internal/cyberark/identity/testdata/start_authentication_failure.json rename to internal/cyberark/identity/testdata/start_authentication_failure.json diff --git a/pkg/internal/cyberark/identity/testdata/start_authentication_success.json b/internal/cyberark/identity/testdata/start_authentication_success.json similarity index 100% rename from pkg/internal/cyberark/identity/testdata/start_authentication_success.json rename to internal/cyberark/identity/testdata/start_authentication_success.json diff --git a/pkg/internal/cyberark/identity/testdata/start_authentication_success_multiple_challenges.json b/internal/cyberark/identity/testdata/start_authentication_success_multiple_challenges.json similarity index 100% rename from pkg/internal/cyberark/identity/testdata/start_authentication_success_multiple_challenges.json rename to internal/cyberark/identity/testdata/start_authentication_success_multiple_challenges.json diff --git a/pkg/internal/cyberark/identity/testdata/start_authentication_success_multiple_mechanisms.json b/internal/cyberark/identity/testdata/start_authentication_success_multiple_mechanisms.json similarity index 100% rename from pkg/internal/cyberark/identity/testdata/start_authentication_success_multiple_mechanisms.json rename to internal/cyberark/identity/testdata/start_authentication_success_multiple_mechanisms.json diff --git a/pkg/internal/cyberark/identity/testdata/start_authentication_success_no_up_mechanism.json b/internal/cyberark/identity/testdata/start_authentication_success_no_up_mechanism.json similarity index 100% rename from pkg/internal/cyberark/identity/testdata/start_authentication_success_no_up_mechanism.json rename to internal/cyberark/identity/testdata/start_authentication_success_no_up_mechanism.json diff --git a/pkg/internal/cyberark/servicediscovery/discovery.go b/internal/cyberark/servicediscovery/discovery.go similarity index 100% rename from pkg/internal/cyberark/servicediscovery/discovery.go rename to internal/cyberark/servicediscovery/discovery.go diff --git a/pkg/internal/cyberark/servicediscovery/discovery_test.go b/internal/cyberark/servicediscovery/discovery_test.go similarity index 100% rename from pkg/internal/cyberark/servicediscovery/discovery_test.go rename to internal/cyberark/servicediscovery/discovery_test.go diff --git a/pkg/internal/cyberark/servicediscovery/mock.go b/internal/cyberark/servicediscovery/mock.go similarity index 100% rename from pkg/internal/cyberark/servicediscovery/mock.go rename to internal/cyberark/servicediscovery/mock.go diff --git a/pkg/internal/cyberark/servicediscovery/testdata/README.md b/internal/cyberark/servicediscovery/testdata/README.md similarity index 100% rename from pkg/internal/cyberark/servicediscovery/testdata/README.md rename to internal/cyberark/servicediscovery/testdata/README.md diff --git a/pkg/internal/cyberark/servicediscovery/testdata/discovery_success.json.template b/internal/cyberark/servicediscovery/testdata/discovery_success.json.template similarity index 100% rename from pkg/internal/cyberark/servicediscovery/testdata/discovery_success.json.template rename to internal/cyberark/servicediscovery/testdata/discovery_success.json.template diff --git a/pkg/internal/cyberark/testing/testing.go b/internal/cyberark/testing/testing.go similarity index 100% rename from pkg/internal/cyberark/testing/testing.go rename to internal/cyberark/testing/testing.go diff --git a/make/test-unit.mk b/make/test-unit.mk index 8176c8b1..e80fc5f2 100644 --- a/make/test-unit.mk +++ b/make/test-unit.mk @@ -7,7 +7,7 @@ test-unit: | $(NEEDS_GO) $(NEEDS_GOTESTSUM) $(ARTIFACTS) $(NEEDS_ETCD) $(NEEDS_K --junitfile=$(ARTIFACTS)/junit-go-e2e.xml \ -- \ -coverprofile=$(ARTIFACTS)/filtered.cov \ - ./cmd/... ./api/... ./pkg/... \ + ./... \ -- \ -ldflags $(go_preflight_ldflags) diff --git a/pkg/client/client_cyberark.go b/pkg/client/client_cyberark.go index 0737bbf9..c2b14f35 100644 --- a/pkg/client/client_cyberark.go +++ b/pkg/client/client_cyberark.go @@ -9,8 +9,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "github.com/jetstack/preflight/api" - "github.com/jetstack/preflight/pkg/internal/cyberark" - "github.com/jetstack/preflight/pkg/internal/cyberark/dataupload" + "github.com/jetstack/preflight/internal/cyberark" + "github.com/jetstack/preflight/internal/cyberark/dataupload" "github.com/jetstack/preflight/pkg/version" ) diff --git a/pkg/client/client_cyberark_convertdatareadings_test.go b/pkg/client/client_cyberark_convertdatareadings_test.go index 5724335d..82ab36f3 100644 --- a/pkg/client/client_cyberark_convertdatareadings_test.go +++ b/pkg/client/client_cyberark_convertdatareadings_test.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/version" "github.com/jetstack/preflight/api" - "github.com/jetstack/preflight/pkg/internal/cyberark/dataupload" + "github.com/jetstack/preflight/internal/cyberark/dataupload" ) // TestExtractServerVersionFromReading tests the extractServerVersionFromReading function. diff --git a/pkg/client/client_cyberark_test.go b/pkg/client/client_cyberark_test.go index 77c5e983..2294119c 100644 --- a/pkg/client/client_cyberark_test.go +++ b/pkg/client/client_cyberark_test.go @@ -13,9 +13,9 @@ import ( "k8s.io/klog/v2/ktesting" "github.com/jetstack/preflight/api" + "github.com/jetstack/preflight/internal/cyberark" + "github.com/jetstack/preflight/internal/cyberark/servicediscovery" "github.com/jetstack/preflight/pkg/client" - "github.com/jetstack/preflight/pkg/internal/cyberark" - "github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery" "github.com/jetstack/preflight/pkg/testutil" "github.com/jetstack/preflight/pkg/version" @@ -50,7 +50,7 @@ func TestCyberArkClient_PostDataReadingsWithOptions_MockAPI(t *testing.T) { // // To enable verbose request logging: // -// go test ./pkg/internal/cyberark/dataupload/... \ +// go test ./internal/cyberark/dataupload/... \ // -v -count 1 -run TestCyberArkClient_PostDataReadingsWithOptions_RealAPI -args -testing.v 6 func TestCyberArkClient_PostDataReadingsWithOptions_RealAPI(t *testing.T) { t.Run("success", func(t *testing.T) { diff --git a/pkg/testutil/envtest.go b/pkg/testutil/envtest.go index 73251ec6..0c56fbe4 100644 --- a/pkg/testutil/envtest.go +++ b/pkg/testutil/envtest.go @@ -25,10 +25,10 @@ import ( ctrlruntime "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" + "github.com/jetstack/preflight/internal/cyberark/dataupload" + "github.com/jetstack/preflight/internal/cyberark/identity" + "github.com/jetstack/preflight/internal/cyberark/servicediscovery" "github.com/jetstack/preflight/pkg/client" - "github.com/jetstack/preflight/pkg/internal/cyberark/dataupload" - "github.com/jetstack/preflight/pkg/internal/cyberark/identity" - "github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery" ) // To see the API server logs, set: