move to pkg and fix test paths

Signed-off-by: Zahari Dichev <[email protected]>
linkerd · Apr 1, 2024 · dcb5582 · dcb5582
1 parent 194719b
commit dcb5582
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ FROM --platform=$BUILDPLATFORM golang:1.22-alpine as go
 WORKDIR /build
 COPY --link go.mod go.sum .
 COPY --link ./proxy-init ./proxy-init
-COPY --link ./internal ./internal
+COPY --link ./pkg ./pkg
 RUN go mod download
 ARG TARGETARCH
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \

diff --git a/Dockerfile-cni-plugin b/Dockerfile-cni-plugin
@@ -6,7 +6,7 @@ WORKDIR /build
 COPY --link go.mod go.sum ./
 COPY --link ./cni-plugin ./cni-plugin
 COPY --link ./proxy-init ./proxy-init
-COPY --link ./internal ./internal
+COPY --link ./pkg ./pkg
 RUN go mod download
 ARG TARGETARCH
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \

diff --git a/cni-plugin/integration/Dockerfile-tester b/cni-plugin/integration/Dockerfile-tester
@@ -14,6 +14,6 @@ ENV GOCACHE=/tmp/
 WORKDIR /src
 COPY --link go.mod go.sum .
 COPY --link cni-plugin cni-plugin
-COPY --link internal internal
+COPY --link pkg pkg
 COPY --link proxy-init proxy-init
 RUN go mod tidy && go mod download
diff --git a/cni-plugin/main.go b/cni-plugin/main.go
@@ -30,7 +30,7 @@ import (
 	"github.com/containernetworking/cni/pkg/types"
 	cniv1 "github.com/containernetworking/cni/pkg/types/100"
 	"github.com/containernetworking/cni/pkg/version"
-	"github.com/linkerd/linkerd2-proxy-init/iptables"
+	"github.com/linkerd/linkerd2-proxy-init/pkg/iptables"
 	"github.com/linkerd/linkerd2-proxy-init/proxy-init/cmd"
 
 	"github.com/sirupsen/logrus"

diff --git a/justfile b/justfile
@@ -111,7 +111,7 @@ proxy-init-lint *flags:
 # Run proxy-init unit tests
 proxy-init-test-unit:
     go test -v ./proxy-init/...
-    go test -v ./internal/...
+    go test -v ./pkg/...
 
 # Run proxy-init integration tests after preparing dependencies
 proxy-init-test-integration: proxy-init-test-integration-deps proxy-init-test-integration-run
@@ -161,7 +161,7 @@ build-cni-plugin-test-image *args='--load':
 
 ##
 ## CNI plugin integration
-## 
+##
 
 
 # Run cni-plugin integration tests after preparing dependencies By default,

diff --git a/iptables/iptables.go → pkg/iptables/iptables.go b/iptables/iptables.go → pkg/iptables/iptables.go
@@ -10,7 +10,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	util "github.com/linkerd/linkerd2-proxy-init/util"
+	util "github.com/linkerd/linkerd2-proxy-init/pkg/util"
 )
 
 const (

diff --git a/iptables/iptables_test.go → pkg/iptables/iptables_test.go b/iptables/iptables_test.go → pkg/iptables/iptables_test.go
diff --git a/util/portrange.go → pkg/util/portrange.go b/util/portrange.go → pkg/util/portrange.go
diff --git a/util/portrange_test.go → pkg/util/portrange_test.go b/util/portrange_test.go → pkg/util/portrange_test.go
diff --git a/proxy-init/cmd/root.go b/proxy-init/cmd/root.go
@@ -9,8 +9,8 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/linkerd/linkerd2-proxy-init/iptables"
-	"github.com/linkerd/linkerd2-proxy-init/util"
+	"github.com/linkerd/linkerd2-proxy-init/pkg/iptables"
+	"github.com/linkerd/linkerd2-proxy-init/pkg/util"
 )
 
 const (

diff --git a/proxy-init/cmd/root_test.go b/proxy-init/cmd/root_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/linkerd/linkerd2-proxy-init/iptables"
+	"github.com/linkerd/linkerd2-proxy-init/pkg/iptables"
 )
 
 func TestBuildFirewallConfiguration(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	log "github.com/sirupsen/logrus"
-    	util "github.com/linkerd/linkerd2-proxy-init/util"
+    	util "github.com/linkerd/linkerd2-proxy-init/pkg/util"
     )
     const (
@@ Expand Down @@