Skip to content

Relocate internal packages and update imports #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wallrj-cyberark merged 1 commit into from
Sep 4, 2025
Merged

Relocate internal packages and update imports #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/internal/cyberark/client.go → internal/cyberark/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions pkg/internal/cyberark/client_test.go → internal/cyberark/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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)
Expand Down
0 ...nternal/cyberark/dataupload/dataupload.go → internal/cyberark/dataupload/dataupload.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...al/cyberark/dataupload/dataupload_test.go → ...al/cyberark/dataupload/dataupload_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 pkg/internal/cyberark/dataupload/mock.go → internal/cyberark/dataupload/mock.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...k/identity/advance_authentication_test.go → ...k/identity/advance_authentication_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 ...ark/identity/authenticated_http_client.go → ...ark/identity/authenticated_http_client.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...yberark/identity/cmd/testidentity/main.go → ...yberark/identity/cmd/testidentity/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pkg/internal/cyberark/identity/identity.go → internal/cyberark/identity/identity.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ternal/cyberark/identity/identity_test.go → internal/cyberark/identity/identity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 pkg/internal/cyberark/identity/mock.go → internal/cyberark/identity/mock.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ark/identity/start_authentication_test.go → ...ark/identity/start_authentication_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
0 ...tdata/advance_authentication_failure.json → ...tdata/advance_authentication_failure.json
View file
Open in desktop
File renamed without changes.
0 ...tdata/advance_authentication_success.json → ...tdata/advance_authentication_success.json
View file
Open in desktop
File renamed without changes.
0 ...t_authentication_bad_user_session_id.json → ...t_authentication_bad_user_session_id.json
View file
Open in desktop
File renamed without changes.
0 ...estdata/start_authentication_failure.json → ...estdata/start_authentication_failure.json
View file
Open in desktop
File renamed without changes.
0 ...estdata/start_authentication_success.json → ...estdata/start_authentication_success.json
View file
Open in desktop
File renamed without changes.
0 ...tication_success_multiple_challenges.json → ...tication_success_multiple_challenges.json
View file
Open in desktop
File renamed without changes.
0 ...tication_success_multiple_mechanisms.json → ...tication_success_multiple_mechanisms.json
View file
Open in desktop
File renamed without changes.
0 ...thentication_success_no_up_mechanism.json → ...thentication_success_no_up_mechanism.json
View file
Open in desktop
File renamed without changes.
0 ...al/cyberark/servicediscovery/discovery.go → ...al/cyberark/servicediscovery/discovery.go
View file
Open in desktop
File renamed without changes.
0 ...berark/servicediscovery/discovery_test.go → ...berark/servicediscovery/discovery_test.go
View file
Open in desktop
File renamed without changes.
0 ...nternal/cyberark/servicediscovery/mock.go → internal/cyberark/servicediscovery/mock.go
View file
Open in desktop
File renamed without changes.
0 ...erark/servicediscovery/testdata/README.md → ...erark/servicediscovery/testdata/README.md
View file
Open in desktop
File renamed without changes.
0 .../testdata/discovery_success.json.template → .../testdata/discovery_success.json.template
View file
Open in desktop
File renamed without changes.
0 pkg/internal/cyberark/testing/testing.go → internal/cyberark/testing/testing.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion make/test-unit.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions pkg/client/client_cyberark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/client/client_cyberark_convertdatareadings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions pkg/client/client_cyberark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/testutil/envtest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down