feat: Refactor Go packages to ease collaboration

newrelic · May 3, 2024 · cc821a1 · cc821a1
1 parent 1e905b1
commit cc821a1
Show file tree

Hide file tree

Showing 35 changed files with 29 additions and 29 deletions.
diff --git a/api/v1alpha1/groupversion_info.go → src/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go → src/api/v1alpha1/groupversion_info.go
diff --git a/api/v1alpha1/instrumentation_types.go → src/api/v1alpha1/instrumentation_types.go b/api/v1alpha1/instrumentation_types.go → src/api/v1alpha1/instrumentation_types.go
diff --git a/api/v1alpha1/instrumentation_webhook.go → src/api/v1alpha1/instrumentation_webhook.go b/api/v1alpha1/instrumentation_webhook.go → src/api/v1alpha1/instrumentation_webhook.go
diff --git a/api/v1alpha1/propagators.go → src/api/v1alpha1/propagators.go b/api/v1alpha1/propagators.go → src/api/v1alpha1/propagators.go
diff --git a/api/v1alpha1/samplers.go → src/api/v1alpha1/samplers.go b/api/v1alpha1/samplers.go → src/api/v1alpha1/samplers.go
diff --git a/api/v1alpha1/upgrade_strategy.go → src/api/v1alpha1/upgrade_strategy.go b/api/v1alpha1/upgrade_strategy.go → src/api/v1alpha1/upgrade_strategy.go
diff --git a/api/v1alpha1/webhook_suite_test.go → src/api/v1alpha1/webhook_suite_test.go b/api/v1alpha1/webhook_suite_test.go → src/api/v1alpha1/webhook_suite_test.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go → src/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go → src/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/autodetect/main.go → src/autodetect/main.go b/pkg/autodetect/main.go → src/autodetect/main.go
diff --git a/pkg/autodetect/main_test.go → src/autodetect/main_test.go b/pkg/autodetect/main_test.go → src/autodetect/main_test.go
@@ -27,7 +27,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/rest"
 
-	"github.com/newrelic/k8s-agents-operator/pkg/autodetect"
+	"github.com/newrelic/k8s-agents-operator/src/autodetect"
 )
 
 func TestDetectPlatformBasedOnAvailableAPIGroups(t *testing.T) {

diff --git a/pkg/autodetect/openshiftroutes.go → src/autodetect/openshiftroutes.go b/pkg/autodetect/openshiftroutes.go → src/autodetect/openshiftroutes.go
diff --git a/pkg/constants/env.go → src/constants/env.go b/pkg/constants/env.go → src/constants/env.go
diff --git a/pkg/instrumentation/annotation.go → src/instrumentation/annotation.go b/pkg/instrumentation/annotation.go → src/instrumentation/annotation.go
diff --git a/pkg/instrumentation/dotnet.go → src/instrumentation/dotnet.go b/pkg/instrumentation/dotnet.go → src/instrumentation/dotnet.go
@@ -21,7 +21,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
 )
 
 const (

diff --git a/pkg/instrumentation/golang.go → src/instrumentation/golang.go b/pkg/instrumentation/golang.go → src/instrumentation/golang.go
@@ -20,7 +20,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
 )
 
 const (

diff --git a/pkg/instrumentation/helper.go → src/instrumentation/helper.go b/pkg/instrumentation/helper.go → src/instrumentation/helper.go
diff --git a/pkg/instrumentation/javaagent.go → src/instrumentation/javaagent.go b/pkg/instrumentation/javaagent.go → src/instrumentation/javaagent.go
@@ -18,7 +18,7 @@ package instrumentation
 import (
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
 )
 
 const (

diff --git a/pkg/instrumentation/nodejs.go → src/instrumentation/nodejs.go b/pkg/instrumentation/nodejs.go → src/instrumentation/nodejs.go
@@ -18,7 +18,7 @@ package instrumentation
 import (
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
 )
 
 const (

diff --git a/pkg/instrumentation/php.go → src/instrumentation/php.go b/pkg/instrumentation/php.go → src/instrumentation/php.go
@@ -20,7 +20,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
 )
 
 const (

diff --git a/pkg/instrumentation/podmutator.go → src/instrumentation/podmutator.go b/pkg/instrumentation/podmutator.go → src/instrumentation/podmutator.go
@@ -25,8 +25,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
-	"github.com/newrelic/k8s-agents-operator/internal/webhookhandler"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/internal/webhookhandler"
 )
 
 var (

diff --git a/pkg/instrumentation/python.go → src/instrumentation/python.go b/pkg/instrumentation/python.go → src/instrumentation/python.go
@@ -20,7 +20,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
 )
 
 const (

diff --git a/pkg/instrumentation/sdk.go → src/instrumentation/sdk.go b/pkg/instrumentation/sdk.go → src/instrumentation/sdk.go
@@ -36,8 +36,8 @@ import (
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
-	"github.com/newrelic/k8s-agents-operator/pkg/constants"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/constants"
 )
 
 const (

diff --git a/pkg/instrumentation/upgrade/upgrade.go → src/instrumentation/upgrade/upgrade.go b/pkg/instrumentation/upgrade/upgrade.go → src/instrumentation/upgrade/upgrade.go
@@ -24,7 +24,7 @@ import (
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
 )
 
 type InstrumentationUpgrade struct {

diff --git a/...rumentation/upgrade/upgrade_suite_test.go → ...rumentation/upgrade/upgrade_suite_test.go b/...rumentation/upgrade/upgrade_suite_test.go → ...rumentation/upgrade/upgrade_suite_test.go
@@ -26,7 +26,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
 )
 
 var k8sClient client.Client

diff --git a/pkg/instrumentation/upgrade/upgrade_test.go → src/instrumentation/upgrade/upgrade_test.go b/pkg/instrumentation/upgrade/upgrade_test.go → src/instrumentation/upgrade/upgrade_test.go
@@ -27,7 +27,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
 )
 
 func TestUpgrade(t *testing.T) {

diff --git a/internal/config/change_handler.go → src/internal/config/change_handler.go b/internal/config/change_handler.go → src/internal/config/change_handler.go
diff --git a/internal/config/change_handler_test.go → src/internal/config/change_handler_test.go b/internal/config/change_handler_test.go → src/internal/config/change_handler_test.go
diff --git a/internal/config/main.go → src/internal/config/main.go b/internal/config/main.go → src/internal/config/main.go
@@ -23,8 +23,8 @@ import (
 	"github.com/go-logr/logr"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/newrelic/k8s-agents-operator/internal/version"
-	"github.com/newrelic/k8s-agents-operator/pkg/autodetect"
+	"github.com/newrelic/k8s-agents-operator/src/autodetect"
+	"github.com/newrelic/k8s-agents-operator/src/internal/version"
 )
 
 const (

diff --git a/internal/config/main_test.go → src/internal/config/main_test.go b/internal/config/main_test.go → src/internal/config/main_test.go
@@ -24,8 +24,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/newrelic/k8s-agents-operator/internal/config"
-	"github.com/newrelic/k8s-agents-operator/pkg/autodetect"
+	"github.com/newrelic/k8s-agents-operator/src/autodetect"
+	"github.com/newrelic/k8s-agents-operator/src/internal/config"
 )
 
 func TestNewConfig(t *testing.T) {

diff --git a/internal/config/options.go → src/internal/config/options.go b/internal/config/options.go → src/internal/config/options.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/go-logr/logr"
 
-	"github.com/newrelic/k8s-agents-operator/internal/version"
-	"github.com/newrelic/k8s-agents-operator/pkg/autodetect"
+	"github.com/newrelic/k8s-agents-operator/src/autodetect"
+	"github.com/newrelic/k8s-agents-operator/src/internal/version"
 )
 
 // Option represents one specific configuration option.

diff --git a/internal/version/main.go → src/internal/version/main.go b/internal/version/main.go → src/internal/version/main.go
diff --git a/internal/version/main_test.go → src/internal/version/main_test.go b/internal/version/main_test.go → src/internal/version/main_test.go
diff --git a/internal/webhookhandler/webhookhandler.go → ...internal/webhookhandler/webhookhandler.go b/internal/webhookhandler/webhookhandler.go → ...internal/webhookhandler/webhookhandler.go
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	"github.com/newrelic/k8s-agents-operator/internal/config"
+	"github.com/newrelic/k8s-agents-operator/src/internal/config"
 )
 
 // +kubebuilder:webhook:path=/mutate-v1-pod,mutating=true,failurePolicy=ignore,groups="",resources=pods,verbs=create;update,versions=v1,name=mpod.kb.io,sideEffects=none,admissionReviewVersions=v1

diff --git a/...bhookhandler/webhookhandler_suite_test.go → ...bhookhandler/webhookhandler_suite_test.go b/...bhookhandler/webhookhandler_suite_test.go → ...bhookhandler/webhookhandler_suite_test.go
@@ -36,7 +36,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
-	"github.com/newrelic/k8s-agents-operator/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
 	// +kubebuilder:scaffold:imports
 )
 

diff --git a/cmd/main.go → src/main.go b/cmd/main.go → src/main.go
@@ -41,13 +41,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	v1alpha1 "github.com/newrelic/k8s-agents-operator/api/v1alpha1"
-	"github.com/newrelic/k8s-agents-operator/internal/config"
-	"github.com/newrelic/k8s-agents-operator/internal/version"
-	"github.com/newrelic/k8s-agents-operator/internal/webhookhandler"
-	"github.com/newrelic/k8s-agents-operator/pkg/autodetect"
-	"github.com/newrelic/k8s-agents-operator/pkg/instrumentation"
-	instrumentationupgrade "github.com/newrelic/k8s-agents-operator/pkg/instrumentation/upgrade"
+	v1alpha1 "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1"
+	"github.com/newrelic/k8s-agents-operator/src/autodetect"
+	"github.com/newrelic/k8s-agents-operator/src/instrumentation"
+	instrumentationupgrade "github.com/newrelic/k8s-agents-operator/src/instrumentation/upgrade"
+	"github.com/newrelic/k8s-agents-operator/src/internal/config"
+	"github.com/newrelic/k8s-agents-operator/src/internal/version"
+	"github.com/newrelic/k8s-agents-operator/src/internal/webhookhandler"
 	// +kubebuilder:scaffold:imports
 )