Merge pull request #1269 from machi1990/refactor/move-cluster-mgr-to-…

…cluster-mgrs-package

refactor(cluster_mgrs): move the cluster manager onto the cluster_mgrs package

docs/architecture/cluster-management-interface-and-implementations.md

@@ -2,7 +2,7 @@
 
 ## Why
 
-1. To improve the architecture of kas-fleet-manager so that when there are changes to OCM, it should only have very small impact on the code base. At the moment, more components are directly depending on OCM than it should be, e.g. [`clusters_mgr.go`](../../internal/kafka/internal/workers/clusters_mgr.go), and this makes it difficult to change the code base if OCM changes.  
+1. To improve the architecture of kas-fleet-manager so that when there are changes to OCM, it should only have very small impact on the code base. At the moment, more components are directly depending on OCM than it should be, e.g. [`clusters_mgr.go`](../../internal/kafka/internal/workers/cluster_mgrs/clusters_mgr.go), and this makes it difficult to change the code base if OCM changes.  
 2. To allow us easily open source the project. With the right interface/contract in place for cluster management, OCM will just become an implementation detail of the interface. New implementations can then be added by us or the upstream community to support different mechanisms to manage OpenShift/Kubernetes clusters.
 
 ## How
@@ -17,4 +17,4 @@ Compared to the current implementation, the main changes are:
 2. Each cluster could have different `Provider` implementation, this information needs to be stored. The `api.Cluster` type is updated to include additional fields to store this information.
 3. A new `ProviderFactory` interface is added which will return the concrete `Provider` implementation based on the `Providertype` value in each `api.Cluster` instance.
 4. Modify the [`ClusterService`](../../internal/kafka/internal/services/clusters.go) class to depend on the new `ProviderFactory`, and remove all dependencies on the OCM client.
-5. Modify the [`ClusterManager`](../../internal/kafka/internal/workers/clusters_mgr.go) class to only depend on the `ClusterService`. It should not have any direct dependencies on the OCM clients.
+5. Modify the [`ClusterManager`](../../internal/kafka/internal/workers/cluster_mgrs/clusters_mgr.go) class to only depend on the `ClusterService`. It should not have any direct dependencies on the OCM clients.

internal/kafka/internal/workers/clusters_mgr.go → internal/kafka/internal/workers/cluster_mgrs/clusters_mgr.go

@@ -1,4 +1,4 @@
-package workers
+package cluster_mgrs
 
 import (
 	"fmt"

internal/kafka/internal/workers/clusters_mgr_test.go → internal/kafka/internal/workers/cluster_mgrs/clusters_mgr_test.go

@@ -1,4 +1,4 @@
-package workers
+package cluster_mgrs
 
 import (
 	"fmt"

internal/kafka/providers.go

@@ -10,7 +10,6 @@ import (
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/internal/kafka/internal/routes"
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/internal/kafka/internal/services"
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/internal/kafka/internal/services/quota"
-	kafka_internal_workers "github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/internal/kafka/internal/workers"
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/internal/kafka/internal/workers/cluster_mgrs"
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/internal/kafka/internal/workers/kafka_mgrs"
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/pkg/workers"
@@ -72,7 +71,7 @@ func ServiceProviders() di.Option {
 		di.Provide(clusters.NewDefaultProviderFactory, di.As(new(clusters.ProviderFactory))),
 		di.Provide(routes.NewRouteLoader),
 		di.Provide(quota.NewDefaultQuotaServiceFactory),
-		di.Provide(kafka_internal_workers.NewClusterManager, di.As(new(workers.Worker))),
+		di.Provide(cluster_mgrs.NewClusterManager, di.As(new(workers.Worker))),
 		di.Provide(cluster_mgrs.NewDynamicScaleUpManager, di.As(new(workers.Worker))),
 		di.Provide(cluster_mgrs.NewCleanupClustersManager, di.As(new(workers.Worker))),
 		di.Provide(cluster_mgrs.NewDeprovisioningClustersManager, di.As(new(workers.Worker))),

internal/kafka/test/helper.go

@@ -14,7 +14,7 @@ import (
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/internal/kafka/internal/api/public"
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/internal/kafka/internal/config"
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/internal/kafka/internal/services"
-	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/internal/kafka/internal/workers"
+	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/internal/kafka/internal/workers/cluster_mgrs"
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/pkg/client/keycloak"
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/pkg/client/observatorium"
 	"github.com/bf2fc6cc711aee1a0c2a/kas-fleet-manager/pkg/client/ocm"
@@ -46,7 +46,7 @@ type Services struct {
 	OCMConfig             *ocm.OCMConfig
 	KafkaService          services.KafkaService
 	ObservatoriumClient   *observatorium.Client
-	ClusterManager        *workers.ClusterManager
+	ClusterManager        *cluster_mgrs.ClusterManager
 	ServerConfig          *server.ServerConfig
 }