rename dependencies pkg to store (#1400)

internal/controller/datadogagent/controller_reconcile_v2.go

@@ -14,9 +14,9 @@ import (
 	commonv1 "github.com/DataDog/datadog-operator/api/datadoghq/common/v1"
 	datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1"
 	datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1"
-	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/dependencies"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/override"
+	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/store"
 	"github.com/DataDog/datadog-operator/internal/controller/metrics"
 	"github.com/DataDog/datadog-operator/pkg/agentprofile"
 	"github.com/DataDog/datadog-operator/pkg/controller/utils"
@@ -106,14 +106,14 @@ func (r *Reconciler) reconcileInstanceV2(ctx context.Context, logger logr.Logger
 	// -----------------------
 	// Manage dependencies
 	// -----------------------
-	storeOptions := &dependencies.StoreOptions{
+	storeOptions := &store.StoreOptions{
 		SupportCilium: r.options.SupportCilium,
 		VersionInfo:   r.versionInfo,
 		PlatformInfo:  r.platformInfo,
 		Logger:        logger,
 		Scheme:        r.scheme,
 	}
-	depsStore := dependencies.NewStore(instance, storeOptions)
+	depsStore := store.NewStore(instance, storeOptions)
 	resourceManagers := feature.NewResourceManagers(depsStore)
 
 	var errs []error

internal/controller/datadogagent/feature/apm/feature_test.go

@@ -15,10 +15,10 @@ import (
 	v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test"
 	"github.com/DataDog/datadog-operator/api/utils"
 	apiutils "github.com/DataDog/datadog-operator/api/utils"
-	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/dependencies"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test"
+	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/store"
 	"github.com/DataDog/datadog-operator/pkg/kubernetes"
 
 	"github.com/google/go-cmp/cmp"
@@ -256,7 +256,7 @@ func TestAPMFeature(t *testing.T) {
 				Build(),
 			WantConfigure: true,
 			ClusterAgent:  testAPMInstrumentationFull(),
-			WantDependenciesFunc: func(t testing.TB, store dependencies.StoreClient) {
+			WantDependenciesFunc: func(t testing.TB, store store.StoreClient) {
 				_, found := store.Get(kubernetes.ClusterRoleBindingKind, "", "-apm-cluster-agent")
 				if found {
 					t.Error("Should not have created proper RBAC for language detection because language detection is not enabled.")
@@ -313,7 +313,7 @@ func TestAPMFeature(t *testing.T) {
 			FeatureOptions: &feature.Options{ProcessChecksInCoreAgentEnabled: false},
 			ClusterAgent:   testAPMInstrumentationWithLanguageDetectionEnabledForClusterAgent(),
 			Agent:          testAPMInstrumentationWithLanguageDetectionForNodeAgent(true, false),
-			WantDependenciesFunc: func(t testing.TB, store dependencies.StoreClient) {
+			WantDependenciesFunc: func(t testing.TB, store store.StoreClient) {
 				_, found := store.Get(kubernetes.ClusterRoleBindingKind, "", "-apm-cluster-agent")
 				if !found {
 					t.Error("Should have created proper RBAC for language detection")
@@ -332,7 +332,7 @@ func TestAPMFeature(t *testing.T) {
 			WantConfigure: true,
 			ClusterAgent:  testAPMInstrumentation(),
 			Agent:         testAPMInstrumentationWithLanguageDetectionForNodeAgent(false, false),
-			WantDependenciesFunc: func(t testing.TB, store dependencies.StoreClient) {
+			WantDependenciesFunc: func(t testing.TB, store store.StoreClient) {
 				_, found := store.Get(kubernetes.ClusterRoleBindingKind, "", "-apm-cluster-agent")
 				if found {
 					t.Error("Should not have created RBAC for language detection")
@@ -359,7 +359,7 @@ func TestAPMFeature(t *testing.T) {
 			FeatureOptions: &feature.Options{ProcessChecksInCoreAgentEnabled: true},
 			ClusterAgent:   testAPMInstrumentationWithLanguageDetectionEnabledForClusterAgent(),
 			Agent:          testAPMInstrumentationWithLanguageDetectionForNodeAgent(true, true),
-			WantDependenciesFunc: func(t testing.TB, store dependencies.StoreClient) {
+			WantDependenciesFunc: func(t testing.TB, store store.StoreClient) {
 				_, found := store.Get(kubernetes.ClusterRoleBindingKind, "", "-apm-cluster-agent")
 				if !found {
 					t.Error("Should have created proper RBAC for language detection")

internal/controller/datadogagent/feature/autoscaling/feature_test.go

@@ -13,10 +13,10 @@ import (
 	apicommonv1 "github.com/DataDog/datadog-operator/api/datadoghq/common/v1"
 	"github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1"
 	apiutils "github.com/DataDog/datadog-operator/api/utils"
-	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/dependencies"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test"
+	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/store"
 	"github.com/DataDog/datadog-operator/pkg/kubernetes"
 
 	corev1 "k8s.io/api/core/v1"
@@ -78,7 +78,7 @@ func newAgent(enabled bool, admissionEnabled bool) *v2alpha1.DatadogAgent {
 	}
 }
 
-func testRBACResources(t testing.TB, store dependencies.StoreClient) {
+func testRBACResources(t testing.TB, store store.StoreClient) {
 	// RBAC
 	rbacName := fmt.Sprintf("%s-%s", ddaName, "cluster-agent-autoscaling")
 

internal/controller/datadogagent/feature/eventcollection/feature_test.go

@@ -15,10 +15,10 @@ import (
 	"github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1"
 	v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test"
 	apiutils "github.com/DataDog/datadog-operator/api/utils"
-	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/dependencies"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test"
+	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/store"
 	"github.com/DataDog/datadog-operator/pkg/kubernetes"
 
 	"github.com/google/go-cmp/cmp"
@@ -93,7 +93,7 @@ func eventCollectionClusterAgentWantFunc(t testing.TB, mgrInterface feature.PodT
 	assert.True(t, apiutils.IsEqualStruct(dcaEnvVars, want), "DCA envvars \ndiff = %s", cmp.Diff(dcaEnvVars, want))
 }
 
-func unbundledEventsDependencies(t testing.TB, store dependencies.StoreClient) {
+func unbundledEventsDependencies(t testing.TB, store store.StoreClient) {
 	// validate clusterRole policy rules
 	crObj, found := store.Get(kubernetes.ConfigMapKind, "", "ddaDCA-kube-apiserver-config")
 	if !found {

internal/controller/datadogagent/feature/externalmetrics/feature_test.go

@@ -12,10 +12,10 @@ import (
 	apicommonv1 "github.com/DataDog/datadog-operator/api/datadoghq/common/v1"
 	"github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1"
 	apiutils "github.com/DataDog/datadog-operator/api/utils"
-	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/dependencies"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test"
+	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/store"
 	"github.com/DataDog/datadog-operator/pkg/kubernetes"
 
 	"github.com/google/go-cmp/cmp"
@@ -73,7 +73,7 @@ func TestExternalMetricsFeature(t *testing.T) {
 			Name:          "external metrics enabled, secrets set, registerAPIService enabled",
 			DDA:           newAgent(true, true, true, false, secret),
 			WantConfigure: true,
-			WantDependenciesFunc: func(t testing.TB, store dependencies.StoreClient) {
+			WantDependenciesFunc: func(t testing.TB, store store.StoreClient) {
 				apiServiceName := "v1beta1.external.metrics.k8s.io"
 				ns := ""
 
@@ -88,7 +88,7 @@ func TestExternalMetricsFeature(t *testing.T) {
 			Name:          "external metrics enabled, secrets set, registerAPIService disabled",
 			DDA:           newAgent(true, false, true, false, secret),
 			WantConfigure: true,
-			WantDependenciesFunc: func(t testing.TB, store dependencies.StoreClient) {
+			WantDependenciesFunc: func(t testing.TB, store store.StoreClient) {
 				apiServiceName := "v1beta1.external.metrics.k8s.io"
 				ns := ""
 

internal/controller/datadogagent/feature/helmcheck/feature_test.go

@@ -20,11 +20,11 @@ import (
 	apicommonv1 "github.com/DataDog/datadog-operator/api/datadoghq/common/v1"
 	v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test"
 	apiutils "github.com/DataDog/datadog-operator/api/utils"
-	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/dependencies"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/configmap"
+	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/store"
 	"github.com/DataDog/datadog-operator/pkg/controller/utils/comparison"
 	"github.com/DataDog/datadog-operator/pkg/kubernetes"
 )
@@ -72,8 +72,8 @@ func Test_helmCheckFeature_Configure(t *testing.T) {
 	tests.Run(t, buildHelmCheckFeature)
 }
 
-func helmCheckWantDepsFunc(ccr bool, collectEvents bool, valuesAsTags map[string]string, rbacSuffix string) func(t testing.TB, store dependencies.StoreClient) {
-	return func(t testing.TB, store dependencies.StoreClient) {
+func helmCheckWantDepsFunc(ccr bool, collectEvents bool, valuesAsTags map[string]string, rbacSuffix string) func(t testing.TB, store store.StoreClient) {
+	return func(t testing.TB, store store.StoreClient) {
 		// validate configMap
 		configMapName := fmt.Sprintf("%s-%s", resourcesName, apicommon.DefaultHelmCheckConf)
 

internal/controller/datadogagent/feature/test/testsuite.go

@@ -5,9 +5,9 @@ import (
 
 	apicommonv1 "github.com/DataDog/datadog-operator/api/datadoghq/common/v1"
 	"github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1"
-	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/dependencies"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake"
+	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/store"
 	testutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/testutils"
 	"github.com/DataDog/datadog-operator/pkg/kubernetes"
 
@@ -35,8 +35,8 @@ type FeatureTest struct {
 	Options        *Options
 	FeatureOptions *feature.Options
 	// Dependencies Store
-	StoreOption        *dependencies.StoreOptions
-	StoreInitFunc      func(store dependencies.StoreClient)
+	StoreOption        *store.StoreOptions
+	StoreInitFunc      func(store store.StoreClient)
 	RequiredComponents feature.RequiredComponents
 	// Test configuration
 	Agent               *ComponentTest
@@ -45,7 +45,7 @@ type FeatureTest struct {
 	// Want
 	WantConfigure             bool
 	WantManageDependenciesErr bool
-	WantDependenciesFunc      func(testing.TB, dependencies.StoreClient)
+	WantDependenciesFunc      func(testing.TB, store.StoreClient)
 }
 
 // Options use to provide some option to the test.
@@ -155,17 +155,17 @@ func runTest(t *testing.T, tt FeatureTest) {
 	}
 }
 
-func initDependencies(tt FeatureTest, logger logr.Logger, dda metav1.Object) (*dependencies.Store, feature.ResourceManagers) {
+func initDependencies(tt FeatureTest, logger logr.Logger, dda metav1.Object) (*store.Store, feature.ResourceManagers) {
 	if tt.StoreOption == nil {
-		tt.StoreOption = &dependencies.StoreOptions{
+		tt.StoreOption = &store.StoreOptions{
 			Logger: logger,
 		}
 	}
 	if tt.StoreOption.Scheme == nil {
 		tt.StoreOption.Scheme = testutils.TestScheme()
 	}
 
-	store := dependencies.NewStore(dda, tt.StoreOption)
+	store := store.NewStore(dda, tt.StoreOption)
 	if tt.StoreInitFunc != nil {
 		tt.StoreInitFunc(store)
 	}

internal/controller/datadogagent/feature/types.go

@@ -10,8 +10,8 @@ import (
 	apicommonv1 "github.com/DataDog/datadog-operator/api/datadoghq/common/v1"
 	"github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1"
 	apiutils "github.com/DataDog/datadog-operator/api/utils"
-	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/dependencies"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger"
+	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/store"
 
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
@@ -162,7 +162,7 @@ type BuildFunc func(options *Options) Feature
 
 // ResourceManagers used to access the different resources manager.
 type ResourceManagers interface {
-	Store() dependencies.StoreClient
+	Store() store.StoreClient
 	RBACManager() merger.RBACManager
 	PodSecurityManager() merger.PodSecurityManager
 	SecretManager() merger.SecretManager
@@ -174,7 +174,7 @@ type ResourceManagers interface {
 }
 
 // NewResourceManagers return new instance of the ResourceManagers interface
-func NewResourceManagers(store dependencies.StoreClient) ResourceManagers {
+func NewResourceManagers(store store.StoreClient) ResourceManagers {
 	return &resourceManagersImpl{
 		store:         store,
 		rbac:          merger.NewRBACManager(store),
@@ -189,7 +189,7 @@ func NewResourceManagers(store dependencies.StoreClient) ResourceManagers {
 }
 
 type resourceManagersImpl struct {
-	store         dependencies.StoreClient
+	store         store.StoreClient
 	rbac          merger.RBACManager
 	podSecurity   merger.PodSecurityManager
 	secret        merger.SecretManager
@@ -200,7 +200,7 @@ type resourceManagersImpl struct {
 	apiService    merger.APIServiceManager
 }
 
-func (impl *resourceManagersImpl) Store() dependencies.StoreClient {
+func (impl *resourceManagersImpl) Store() store.StoreClient {
 	return impl.store
 }
 

internal/controller/datadogagent/finalizer.go

@@ -10,9 +10,9 @@ import (
 	"fmt"
 
 	datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1"
-	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/dependencies"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature"
 	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/override"
+	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/store"
 	"github.com/DataDog/datadog-operator/pkg/agentprofile"
 	"github.com/DataDog/datadog-operator/pkg/controller/utils"
 	corev1 "k8s.io/api/core/v1"
@@ -81,13 +81,13 @@ func (r *Reconciler) finalizeDadV2(reqLogger logr.Logger, obj client.Object) err
 	features, requiredComponents := feature.BuildFeatures(
 		dda, reconcilerOptionsToFeatureOptions(&r.options, reqLogger))
 
-	storeOptions := &dependencies.StoreOptions{
+	storeOptions := &store.StoreOptions{
 		SupportCilium: r.options.SupportCilium,
 		Logger:        reqLogger,
 		Scheme:        r.scheme,
 		PlatformInfo:  r.platformInfo,
 	}
-	depsStore := dependencies.NewStore(dda, storeOptions)
+	depsStore := store.NewStore(dda, storeOptions)
 	resourceManagers := feature.NewResourceManagers(depsStore)
 
 	var errs []error

internal/controller/datadogagent/merger/apiservice.go

@@ -8,7 +8,7 @@ package merger
 import (
 	"fmt"
 
-	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/dependencies"
+	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/store"
 	"github.com/DataDog/datadog-operator/pkg/kubernetes"
 
 	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
@@ -20,7 +20,7 @@ type APIServiceManager interface {
 }
 
 // NewAPIServiceManager returns a new APIServiceManager instance
-func NewAPIServiceManager(store dependencies.StoreClient) APIServiceManager {
+func NewAPIServiceManager(store store.StoreClient) APIServiceManager {
 	manager := &apiServiceManagerImpl{
 		store: store,
 	}
@@ -29,7 +29,7 @@ func NewAPIServiceManager(store dependencies.StoreClient) APIServiceManager {
 
 // apiServiceManagerImpl is used to manage service resources.
 type apiServiceManagerImpl struct {
-	store dependencies.StoreClient
+	store store.StoreClient
 }
 
 // AddAPIService creates or updates service

internal/controller/datadogagent/merger/cilium.go

@@ -11,7 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/dependencies"
+	"github.com/DataDog/datadog-operator/internal/controller/datadogagent/store"
 	cilium "github.com/DataDog/datadog-operator/pkg/cilium/v1"
 	"github.com/DataDog/datadog-operator/pkg/kubernetes"
 )
@@ -22,7 +22,7 @@ type CiliumPolicyManager interface {
 }
 
 // NewCiliumPolicyManager returns a new CiliumPolicyManager instance
-func NewCiliumPolicyManager(store dependencies.StoreClient) CiliumPolicyManager {
+func NewCiliumPolicyManager(store store.StoreClient) CiliumPolicyManager {
 	manager := &ciliumPolicyManagerImpl{
 		store: store,
 	}
@@ -31,7 +31,7 @@ func NewCiliumPolicyManager(store dependencies.StoreClient) CiliumPolicyManager
 
 // ciliumPolicyManagerImpl is used to manage cilium policy resources.
 type ciliumPolicyManagerImpl struct {
-	store dependencies.StoreClient
+	store store.StoreClient
 }
 
 // AddCiliumPolicy creates a cilium network policy or adds policy specs to a cilium network policy