Skip to content

Commit f3db885

Browse files
Merge pull request #704 from jetstack/top-level-internal
Relocate internal packages and update imports
2 parents cd6bb05 + da9bd2d commit f3db885

31 files changed

+24
-24
lines changed

pkg/internal/cyberark/client.go renamed to internal/cyberark/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"net/http"
77
"os"
88

9-
"github.com/jetstack/preflight/pkg/internal/cyberark/dataupload"
10-
"github.com/jetstack/preflight/pkg/internal/cyberark/identity"
11-
"github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery"
9+
"github.com/jetstack/preflight/internal/cyberark/dataupload"
10+
"github.com/jetstack/preflight/internal/cyberark/identity"
11+
"github.com/jetstack/preflight/internal/cyberark/servicediscovery"
1212
)
1313

1414
// ClientConfig holds the configuration needed to initialize a CyberArk client.

pkg/internal/cyberark/client_test.go renamed to internal/cyberark/client_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"k8s.io/klog/v2"
1212
"k8s.io/klog/v2/ktesting"
1313

14-
"github.com/jetstack/preflight/pkg/internal/cyberark"
15-
"github.com/jetstack/preflight/pkg/internal/cyberark/dataupload"
16-
"github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery"
14+
"github.com/jetstack/preflight/internal/cyberark"
15+
"github.com/jetstack/preflight/internal/cyberark/dataupload"
16+
"github.com/jetstack/preflight/internal/cyberark/servicediscovery"
1717
"github.com/jetstack/preflight/pkg/testutil"
1818
"github.com/jetstack/preflight/pkg/version"
1919

@@ -53,7 +53,7 @@ func TestCyberArkClient_PutSnapshot_MockAPI(t *testing.T) {
5353
//
5454
// To enable verbose request logging:
5555
//
56-
// go test ./pkg/internal/cyberark \
56+
// go test ./internal/cyberark \
5757
// -v -count 1 -run TestCyberArkClient_PutSnapshot_RealAPI -args -testing.v 6
5858
func TestCyberArkClient_PutSnapshot_RealAPI(t *testing.T) {
5959
logger := ktesting.NewLogger(t, ktesting.DefaultConfig)

pkg/internal/cyberark/dataupload/dataupload_test.go renamed to internal/cyberark/dataupload/dataupload_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"k8s.io/klog/v2"
1010
"k8s.io/klog/v2/ktesting"
1111

12-
"github.com/jetstack/preflight/pkg/internal/cyberark/dataupload"
12+
"github.com/jetstack/preflight/internal/cyberark/dataupload"
1313
"github.com/jetstack/preflight/pkg/version"
1414

1515
_ "k8s.io/klog/v2/ktesting/init"
File renamed without changes.

pkg/internal/cyberark/identity/advance_authentication_test.go renamed to internal/cyberark/identity/advance_authentication_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"k8s.io/klog/v2"
88
"k8s.io/klog/v2/ktesting"
99

10-
"github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery"
10+
"github.com/jetstack/preflight/internal/cyberark/servicediscovery"
1111

1212
_ "k8s.io/klog/v2/ktesting/init"
1313
)

pkg/internal/cyberark/identity/cmd/testidentity/main.go renamed to internal/cyberark/identity/cmd/testidentity/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"k8s.io/client-go/transport"
1313
"k8s.io/klog/v2"
1414

15-
"github.com/jetstack/preflight/pkg/internal/cyberark/identity"
16-
"github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery"
15+
"github.com/jetstack/preflight/internal/cyberark/identity"
16+
"github.com/jetstack/preflight/internal/cyberark/servicediscovery"
1717
"github.com/jetstack/preflight/pkg/version"
1818
)
1919

pkg/internal/cyberark/identity/identity_test.go renamed to internal/cyberark/identity/identity_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"k8s.io/klog/v2"
1616
"k8s.io/klog/v2/ktesting"
1717

18-
"github.com/jetstack/preflight/pkg/internal/cyberark/servicediscovery"
19-
arktesting "github.com/jetstack/preflight/pkg/internal/cyberark/testing"
18+
"github.com/jetstack/preflight/internal/cyberark/servicediscovery"
19+
arktesting "github.com/jetstack/preflight/internal/cyberark/testing"
2020

2121
_ "k8s.io/klog/v2/ktesting/init"
2222
)

0 commit comments

Comments
 (0)