From 3ea2634f56198c9b41fe99785bd764ac135383e2 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Mon, 5 Dec 2022 21:22:07 +0000 Subject: [PATCH 1/2] Replace pkg/ with internal/ There's no need for a public library export. We can share code within this repo via the `internal` directory. --- Dockerfile | 2 +- cni-plugin/main.go | 2 +- {pkg => internal}/linkerd-iptables/iptables.go | 2 +- {pkg => internal}/linkerd-iptables/iptables_test.go | 0 {pkg => internal}/linkerd-util/portrange.go | 0 {pkg => internal}/linkerd-util/portrange_test.go | 0 proxy-init/cmd/root.go | 4 ++-- proxy-init/cmd/root_test.go | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename {pkg => internal}/linkerd-iptables/iptables.go (99%) rename {pkg => internal}/linkerd-iptables/iptables_test.go (100%) rename {pkg => internal}/linkerd-util/portrange.go (100%) rename {pkg => internal}/linkerd-util/portrange_test.go (100%) diff --git a/Dockerfile b/Dockerfile index 52b3ac88..8bc8cbb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ COPY go.mod . COPY go.sum . RUN go mod download COPY ./proxy-init ./proxy-init -COPY pkg pkg +COPY ./internal ./internal ARG TARGETARCH RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o /out/linkerd2-proxy-init -mod=readonly -ldflags "-s -w" -v ./proxy-init diff --git a/cni-plugin/main.go b/cni-plugin/main.go index 030612db..bc851a21 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" - iptables "github.com/linkerd/linkerd2-proxy-init/pkg/linkerd-iptables" + iptables "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-iptables" "github.com/linkerd/linkerd2-proxy-init/proxy-init/cmd" "github.com/sirupsen/logrus" diff --git a/pkg/linkerd-iptables/iptables.go b/internal/linkerd-iptables/iptables.go similarity index 99% rename from pkg/linkerd-iptables/iptables.go rename to internal/linkerd-iptables/iptables.go index 5060f85a..653d9efa 100644 --- a/pkg/linkerd-iptables/iptables.go +++ b/internal/linkerd-iptables/iptables.go @@ -12,7 +12,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/linkerd/linkerd2-proxy-init/pkg/linkerd-util" + util "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-util" ) const ( diff --git a/pkg/linkerd-iptables/iptables_test.go b/internal/linkerd-iptables/iptables_test.go similarity index 100% rename from pkg/linkerd-iptables/iptables_test.go rename to internal/linkerd-iptables/iptables_test.go diff --git a/pkg/linkerd-util/portrange.go b/internal/linkerd-util/portrange.go similarity index 100% rename from pkg/linkerd-util/portrange.go rename to internal/linkerd-util/portrange.go diff --git a/pkg/linkerd-util/portrange_test.go b/internal/linkerd-util/portrange_test.go similarity index 100% rename from pkg/linkerd-util/portrange_test.go rename to internal/linkerd-util/portrange_test.go diff --git a/proxy-init/cmd/root.go b/proxy-init/cmd/root.go index 3ba38bb2..3bc686a7 100644 --- a/proxy-init/cmd/root.go +++ b/proxy-init/cmd/root.go @@ -7,8 +7,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/linkerd/linkerd2-proxy-init/pkg/linkerd-iptables" - "github.com/linkerd/linkerd2-proxy-init/pkg/linkerd-util" + iptables "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-iptables" + util "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-util" "github.com/spf13/cobra" ) diff --git a/proxy-init/cmd/root_test.go b/proxy-init/cmd/root_test.go index 730db3d7..b8853f97 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/pkg/linkerd-iptables" + iptables "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-iptables" ) func TestBuildFirewallConfiguration(t *testing.T) { From e631eb9afe3b6a45442b7f4b4f13a96403c285d4 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Mon, 5 Dec 2022 22:34:46 +0000 Subject: [PATCH 2/2] simplify package names Signed-off-by: Oliver Gould --- cni-plugin/main.go | 2 +- internal/{linkerd-iptables => iptables}/iptables.go | 2 +- internal/{linkerd-iptables => iptables}/iptables_test.go | 0 internal/{linkerd-util => util}/portrange.go | 0 internal/{linkerd-util => util}/portrange_test.go | 0 proxy-init/cmd/root.go | 6 +++--- proxy-init/cmd/root_test.go | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename internal/{linkerd-iptables => iptables}/iptables.go (99%) rename internal/{linkerd-iptables => iptables}/iptables_test.go (100%) rename internal/{linkerd-util => util}/portrange.go (100%) rename internal/{linkerd-util => util}/portrange_test.go (100%) diff --git a/cni-plugin/main.go b/cni-plugin/main.go index bc851a21..93296e67 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" - iptables "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-iptables" + "github.com/linkerd/linkerd2-proxy-init/internal/iptables" "github.com/linkerd/linkerd2-proxy-init/proxy-init/cmd" "github.com/sirupsen/logrus" diff --git a/internal/linkerd-iptables/iptables.go b/internal/iptables/iptables.go similarity index 99% rename from internal/linkerd-iptables/iptables.go rename to internal/iptables/iptables.go index 653d9efa..fc20b06f 100644 --- a/internal/linkerd-iptables/iptables.go +++ b/internal/iptables/iptables.go @@ -12,7 +12,7 @@ import ( log "github.com/sirupsen/logrus" - util "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-util" + util "github.com/linkerd/linkerd2-proxy-init/internal/util" ) const ( diff --git a/internal/linkerd-iptables/iptables_test.go b/internal/iptables/iptables_test.go similarity index 100% rename from internal/linkerd-iptables/iptables_test.go rename to internal/iptables/iptables_test.go diff --git a/internal/linkerd-util/portrange.go b/internal/util/portrange.go similarity index 100% rename from internal/linkerd-util/portrange.go rename to internal/util/portrange.go diff --git a/internal/linkerd-util/portrange_test.go b/internal/util/portrange_test.go similarity index 100% rename from internal/linkerd-util/portrange_test.go rename to internal/util/portrange_test.go diff --git a/proxy-init/cmd/root.go b/proxy-init/cmd/root.go index 3bc686a7..56876972 100644 --- a/proxy-init/cmd/root.go +++ b/proxy-init/cmd/root.go @@ -6,10 +6,10 @@ import ( "os/exec" log "github.com/sirupsen/logrus" - - iptables "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-iptables" - util "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-util" "github.com/spf13/cobra" + + "github.com/linkerd/linkerd2-proxy-init/internal/iptables" + "github.com/linkerd/linkerd2-proxy-init/internal/util" ) // RootOptions provides the information that will be used to build a firewall configuration. diff --git a/proxy-init/cmd/root_test.go b/proxy-init/cmd/root_test.go index b8853f97..222e9222 100644 --- a/proxy-init/cmd/root_test.go +++ b/proxy-init/cmd/root_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - iptables "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-iptables" + "github.com/linkerd/linkerd2-proxy-init/internal/iptables" ) func TestBuildFirewallConfiguration(t *testing.T) {