Move /internal packages into /pkg

traefik · Feb 24, 2020 · 2533c65 · 2533c65
1 parent bc5eda0
commit 2533c65
Show file tree

Hide file tree

Showing 38 changed files with 21 additions and 21 deletions.
diff --git a/cmd/maesh/maesh.go b/cmd/maesh/maesh.go
@@ -8,9 +8,9 @@ import (
 	"github.com/containous/maesh/cmd"
 	"github.com/containous/maesh/cmd/prepare"
 	"github.com/containous/maesh/cmd/version"
-	"github.com/containous/maesh/internal/controller"
-	"github.com/containous/maesh/internal/k8s"
-	"github.com/containous/maesh/internal/signals"
+	"github.com/containous/maesh/pkg/controller"
+	"github.com/containous/maesh/pkg/k8s"
+	"github.com/containous/maesh/pkg/signals"
 	"github.com/containous/traefik/v2/pkg/cli"
 	log "github.com/sirupsen/logrus"
 )

diff --git a/cmd/prepare/prepare.go b/cmd/prepare/prepare.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/containous/maesh/cmd"
-	"github.com/containous/maesh/internal/k8s"
+	"github.com/containous/maesh/pkg/k8s"
 	"github.com/containous/traefik/v2/pkg/cli"
 	log "github.com/sirupsen/logrus"
 )

diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/cenkalti/backoff/v3"
 	"github.com/containous/maesh/integration/try"
-	"github.com/containous/maesh/internal/k8s"
+	"github.com/containous/maesh/pkg/k8s"
 	"github.com/containous/traefik/v2/pkg/config/dynamic"
 	"github.com/containous/traefik/v2/pkg/safe"
 	"github.com/go-check/check"

diff --git a/integration/try/try.go b/integration/try/try.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/cenkalti/backoff/v3"
-	"github.com/containous/maesh/internal/k8s"
+	"github.com/containous/maesh/pkg/k8s"
 	"github.com/containous/traefik/v2/pkg/safe"
 	log "github.com/sirupsen/logrus"
 	appsv1 "k8s.io/api/apps/v1"

diff --git a/internal/controller/api.go → pkg/controller/api.go b/internal/controller/api.go → pkg/controller/api.go
diff --git a/internal/controller/api_test.go → pkg/controller/api_test.go b/internal/controller/api_test.go → pkg/controller/api_test.go
diff --git a/internal/controller/controller.go → pkg/controller/controller.go b/internal/controller/controller.go → pkg/controller/controller.go
@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"github.com/cenkalti/backoff/v3"
-	"github.com/containous/maesh/internal/k8s"
-	"github.com/containous/maesh/internal/providers/base"
-	"github.com/containous/maesh/internal/providers/kubernetes"
-	"github.com/containous/maesh/internal/providers/smi"
+	"github.com/containous/maesh/pkg/k8s"
+	"github.com/containous/maesh/pkg/providers/base"
+	"github.com/containous/maesh/pkg/providers/kubernetes"
+	"github.com/containous/maesh/pkg/providers/smi"
 	"github.com/containous/traefik/v2/pkg/config/dynamic"
 	"github.com/containous/traefik/v2/pkg/safe"
 	accessInformer "github.com/deislabs/smi-sdk-go/pkg/gen/client/access/informers/externalversions"

diff --git a/internal/controller/handler.go → pkg/controller/handler.go b/internal/controller/handler.go → pkg/controller/handler.go
@@ -1,7 +1,7 @@
 package controller
 
 import (
-	"github.com/containous/maesh/internal/k8s"
+	"github.com/containous/maesh/pkg/k8s"
 	log "github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 )

diff --git a/internal/controller/log.go → pkg/controller/log.go b/internal/controller/log.go → pkg/controller/log.go
diff --git a/internal/controller/log_test.go → pkg/controller/log_test.go b/internal/controller/log_test.go → pkg/controller/log_test.go
diff --git a/internal/k8s/client.go → pkg/k8s/client.go b/internal/k8s/client.go → pkg/k8s/client.go
diff --git a/internal/k8s/client_mock.go → pkg/k8s/client_mock.go b/internal/k8s/client_mock.go → pkg/k8s/client_mock.go
diff --git a/internal/k8s/client_test.go → pkg/k8s/client_test.go b/internal/k8s/client_test.go → pkg/k8s/client_test.go
diff --git a/internal/k8s/constants.go → pkg/k8s/constants.go b/internal/k8s/constants.go → pkg/k8s/constants.go
diff --git a/internal/k8s/fixtures/mock.yaml → pkg/k8s/fixtures/mock.yaml b/internal/k8s/fixtures/mock.yaml → pkg/k8s/fixtures/mock.yaml
diff --git a/internal/k8s/ignore.go → pkg/k8s/ignore.go b/internal/k8s/ignore.go → pkg/k8s/ignore.go
diff --git a/internal/k8s/ignore_test.go → pkg/k8s/ignore_test.go b/internal/k8s/ignore_test.go → pkg/k8s/ignore_test.go
diff --git a/internal/k8s/namespace.go → pkg/k8s/namespace.go b/internal/k8s/namespace.go → pkg/k8s/namespace.go
diff --git a/internal/k8s/namespace_test.go → pkg/k8s/namespace_test.go b/internal/k8s/namespace_test.go → pkg/k8s/namespace_test.go
diff --git a/internal/k8s/service.go → pkg/k8s/service.go b/internal/k8s/service.go → pkg/k8s/service.go
diff --git a/internal/k8s/service_test.go → pkg/k8s/service_test.go b/internal/k8s/service_test.go → pkg/k8s/service_test.go
diff --git a/internal/providers/base/base.go → pkg/providers/base/base.go b/internal/providers/base/base.go → pkg/providers/base/base.go
@@ -1,7 +1,7 @@
 package base
 
 import (
-	"github.com/containous/maesh/internal/k8s"
+	"github.com/containous/maesh/pkg/k8s"
 	"github.com/containous/traefik/v2/pkg/config/dynamic"
 	splitv1alpha2 "github.com/deislabs/smi-sdk-go/pkg/apis/split/v1alpha2"
 	corev1 "k8s.io/api/core/v1"

diff --git a/internal/providers/base/base_test.go → pkg/providers/base/base_test.go b/internal/providers/base/base_test.go → pkg/providers/base/base_test.go
@@ -3,7 +3,7 @@ package base
 import (
 	"testing"
 
-	"github.com/containous/maesh/internal/k8s"
+	"github.com/containous/maesh/pkg/k8s"
 
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"

diff --git a/.../fixtures/build_configuration_simple.yaml → .../fixtures/build_configuration_simple.yaml b/.../fixtures/build_configuration_simple.yaml → .../fixtures/build_configuration_simple.yaml
diff --git a/...onfiguration_simple_http_middlewares.yaml → ...onfiguration_simple_http_middlewares.yaml b/...onfiguration_simple_http_middlewares.yaml → ...onfiguration_simple_http_middlewares.yaml
diff --git a/...tures/build_configuration_simple_tcp.yaml → ...tures/build_configuration_simple_tcp.yaml b/...tures/build_configuration_simple_tcp.yaml → ...tures/build_configuration_simple_tcp.yaml
diff --git a/...ures/build_service_missing_endpoints.yaml → ...ures/build_service_missing_endpoints.yaml b/...ures/build_service_missing_endpoints.yaml → ...ures/build_service_missing_endpoints.yaml
diff --git a/...rnetes/fixtures/build_service_simple.yaml → ...rnetes/fixtures/build_service_simple.yaml b/...rnetes/fixtures/build_service_simple.yaml → ...rnetes/fixtures/build_service_simple.yaml
diff --git a/internal/providers/kubernetes/provider.go → pkg/providers/kubernetes/provider.go b/internal/providers/kubernetes/provider.go → pkg/providers/kubernetes/provider.go
@@ -7,8 +7,8 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/containous/maesh/internal/k8s"
-	"github.com/containous/maesh/internal/providers/base"
+	"github.com/containous/maesh/pkg/k8s"
+	"github.com/containous/maesh/pkg/providers/base"
 	"github.com/containous/traefik/v2/pkg/config/dynamic"
 	log "github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"

diff --git a/...nal/providers/kubernetes/provider_test.go → pkg/providers/kubernetes/provider_test.go b/...nal/providers/kubernetes/provider_test.go → pkg/providers/kubernetes/provider_test.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/containous/maesh/internal/providers/base"
+	"github.com/containous/maesh/pkg/providers/base"
 
-	"github.com/containous/maesh/internal/k8s"
+	"github.com/containous/maesh/pkg/k8s"
 	"github.com/containous/traefik/v2/pkg/config/dynamic"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"

diff --git a/...res/build_configuration_http_service.yaml → ...res/build_configuration_http_service.yaml b/...res/build_configuration_http_service.yaml → ...res/build_configuration_http_service.yaml
diff --git a/internal/providers/smi/fixtures/mock.yaml → pkg/providers/smi/fixtures/mock.yaml b/internal/providers/smi/fixtures/mock.yaml → pkg/providers/smi/fixtures/mock.yaml
diff --git a/...rnal/providers/smi/fixtures/mock_tcp.yaml → pkg/providers/smi/fixtures/mock_tcp.yaml b/...rnal/providers/smi/fixtures/mock_tcp.yaml → pkg/providers/smi/fixtures/mock_tcp.yaml
diff --git a/internal/providers/smi/provider.go → pkg/providers/smi/provider.go b/internal/providers/smi/provider.go → pkg/providers/smi/provider.go
@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containous/maesh/internal/k8s"
-	"github.com/containous/maesh/internal/providers/base"
+	"github.com/containous/maesh/pkg/k8s"
+	"github.com/containous/maesh/pkg/providers/base"
 	"github.com/containous/traefik/v2/pkg/config/dynamic"
 	access "github.com/deislabs/smi-sdk-go/pkg/apis/access/v1alpha1"
 	specs "github.com/deislabs/smi-sdk-go/pkg/apis/specs/v1alpha1"

diff --git a/internal/providers/smi/provider_test.go → pkg/providers/smi/provider_test.go b/internal/providers/smi/provider_test.go → pkg/providers/smi/provider_test.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/containous/maesh/internal/providers/base"
+	"github.com/containous/maesh/pkg/providers/base"
 
-	"github.com/containous/maesh/internal/k8s"
+	"github.com/containous/maesh/pkg/k8s"
 	"github.com/containous/traefik/v2/pkg/config/dynamic"
 	accessv1alpha1 "github.com/deislabs/smi-sdk-go/pkg/apis/access/v1alpha1"
 	specsv1alpha1 "github.com/deislabs/smi-sdk-go/pkg/apis/specs/v1alpha1"

diff --git a/internal/signals/signal.go → pkg/signals/signal.go b/internal/signals/signal.go → pkg/signals/signal.go
diff --git a/internal/signals/signal_posix.go → pkg/signals/signal_posix.go b/internal/signals/signal_posix.go → pkg/signals/signal_posix.go
diff --git a/internal/signals/signal_windows.go → pkg/signals/signal_windows.go b/internal/signals/signal_windows.go → pkg/signals/signal_windows.go