From dcb55825d6939bd91ce2d83f78e5609fef7c4851 Mon Sep 17 00:00:00 2001
From: Zahari Dichev <zaharidichev@gmail.com>
Date: Mon, 1 Apr 2024 07:57:18 +0000
Subject: [PATCH] move to pkg and fix test paths

Signed-off-by: Zahari Dichev <zaharidichev@gmail.com>
---
 Dockerfile                                  | 2 +-
 Dockerfile-cni-plugin                       | 2 +-
 cni-plugin/integration/Dockerfile-tester    | 2 +-
 cni-plugin/main.go                          | 2 +-
 justfile                                    | 4 ++--
 {iptables => pkg/iptables}/iptables.go      | 2 +-
 {iptables => pkg/iptables}/iptables_test.go | 0
 {util => pkg/util}/portrange.go             | 0
 {util => pkg/util}/portrange_test.go        | 0
 proxy-init/cmd/root.go                      | 4 ++--
 proxy-init/cmd/root_test.go                 | 2 +-
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename {iptables => pkg/iptables}/iptables.go (99%)
 rename {iptables => pkg/iptables}/iptables_test.go (100%)
 rename {util => pkg/util}/portrange.go (100%)
 rename {util => pkg/util}/portrange_test.go (100%)

diff --git a/Dockerfile b/Dockerfile
index 4c16cbf1..41cd0a26 100644
--- 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
index 0a7a2429..7bd8837a 100644
--- 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
index 7bedef80..27a908de 100644
--- 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
index 281d4544..7e6af21b 100644
--- 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
index b279fd34..879c1b53 100644
--- 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 b/pkg/iptables/iptables.go
similarity index 99%
rename from iptables/iptables.go
rename to pkg/iptables/iptables.go
index 4b4e0b42..a064b6fd 100644
--- a/iptables/iptables.go
+++ b/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 b/pkg/iptables/iptables_test.go
similarity index 100%
rename from iptables/iptables_test.go
rename to pkg/iptables/iptables_test.go
diff --git a/util/portrange.go b/pkg/util/portrange.go
similarity index 100%
rename from util/portrange.go
rename to pkg/util/portrange.go
diff --git a/util/portrange_test.go b/pkg/util/portrange_test.go
similarity index 100%
rename from util/portrange_test.go
rename to pkg/util/portrange_test.go
diff --git a/proxy-init/cmd/root.go b/proxy-init/cmd/root.go
index 6ea96475..27e2bf53 100644
--- 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
index 79e801fc..5a93725e 100644
--- 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) {