From ec858312174532a81a978aa8ca7f36cb357dd9b5 Mon Sep 17 00:00:00 2001 From: Enda Phelan Date: Thu, 6 Jan 2022 09:18:45 +0000 Subject: [PATCH] refactor: move cluster package out of core --- pkg/{core => }/cluster/bind.go | 6 +++--- pkg/{core => }/cluster/clean.go | 6 +++--- pkg/{core => }/cluster/cluster.go | 0 pkg/{core => }/cluster/cluster_api.go | 8 ++++---- pkg/{core => }/cluster/connect.go | 8 ++++---- pkg/{core => }/cluster/constants/constants.go | 0 pkg/{core => }/cluster/kubeclient/kube_helpers.go | 3 ++- pkg/{core => }/cluster/kubeclient/kubeclients.go | 3 ++- pkg/{core => }/cluster/services/custom_connection.go | 0 pkg/{core => }/cluster/services/kafka.go | 8 ++++---- .../cluster/services/resources/KafkaConnection.go | 0 .../services/resources/ServiceRegistryConnection.go | 0 pkg/{core => }/cluster/services/resources/definitions.go | 0 pkg/{core => }/cluster/services/service-registry.go | 8 ++++---- pkg/{core => }/cluster/status.go | 4 ++-- pkg/{core => }/cluster/v1alpha/cluster.go | 0 pkg/cmd/cluster/bind/bind.go | 9 +++++---- pkg/cmd/cluster/clean/clean.go | 6 +++--- pkg/cmd/cluster/connect/connect.go | 9 +++++---- pkg/cmd/cluster/status/status.go | 7 ++++--- 20 files changed, 45 insertions(+), 40 deletions(-) rename pkg/{core => }/cluster/bind.go (96%) rename pkg/{core => }/cluster/clean.go (91%) rename pkg/{core => }/cluster/cluster.go (100%) rename pkg/{core => }/cluster/cluster_api.go (81%) rename pkg/{core => }/cluster/connect.go (97%) rename pkg/{core => }/cluster/constants/constants.go (100%) rename pkg/{core => }/cluster/kubeclient/kube_helpers.go (92%) rename pkg/{core => }/cluster/kubeclient/kubeclients.go (97%) rename pkg/{core => }/cluster/services/custom_connection.go (100%) rename pkg/{core => }/cluster/services/kafka.go (89%) rename pkg/{core => }/cluster/services/resources/KafkaConnection.go (100%) rename pkg/{core => }/cluster/services/resources/ServiceRegistryConnection.go (100%) rename pkg/{core => }/cluster/services/resources/definitions.go (100%) rename pkg/{core => }/cluster/services/service-registry.go (89%) rename pkg/{core => }/cluster/status.go (90%) rename pkg/{core => }/cluster/v1alpha/cluster.go (100%) diff --git a/pkg/core/cluster/bind.go b/pkg/cluster/bind.go similarity index 96% rename from pkg/core/cluster/bind.go rename to pkg/cluster/bind.go index 7149cdf32..3326c4fc3 100644 --- a/pkg/core/cluster/bind.go +++ b/pkg/cluster/bind.go @@ -4,9 +4,9 @@ import ( "crypto/rand" "fmt" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/constants" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + "github.com/redhat-developer/app-services-cli/pkg/cluster/constants" + "github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/color" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/icon" "github.com/redhat-developer/app-services-cli/pkg/core/localize" diff --git a/pkg/core/cluster/clean.go b/pkg/cluster/clean.go similarity index 91% rename from pkg/core/cluster/clean.go rename to pkg/cluster/clean.go index aba794e00..b8416384a 100644 --- a/pkg/core/cluster/clean.go +++ b/pkg/cluster/clean.go @@ -2,9 +2,9 @@ package cluster import ( "github.com/AlecAivazis/survey/v2" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/constants" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + "github.com/redhat-developer/app-services-cli/pkg/cluster/constants" + "github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/icon" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/core/cluster/cluster.go b/pkg/cluster/cluster.go similarity index 100% rename from pkg/core/cluster/cluster.go rename to pkg/cluster/cluster.go diff --git a/pkg/core/cluster/cluster_api.go b/pkg/cluster/cluster_api.go similarity index 81% rename from pkg/core/cluster/cluster_api.go rename to pkg/cluster/cluster_api.go index b213ed321..9656c0789 100644 --- a/pkg/core/cluster/cluster_api.go +++ b/pkg/cluster/cluster_api.go @@ -2,10 +2,10 @@ package cluster import ( "github.com/AlecAivazis/survey/v2" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/services" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + "github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient" + "github.com/redhat-developer/app-services-cli/pkg/cluster/services" + "github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" ) // KubernetesClusterAPIImpl implements KubernetesClusterAPI diff --git a/pkg/core/cluster/connect.go b/pkg/cluster/connect.go similarity index 97% rename from pkg/core/cluster/connect.go rename to pkg/cluster/connect.go index b556aa01a..77fcee16f 100644 --- a/pkg/core/cluster/connect.go +++ b/pkg/cluster/connect.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/constants" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/services" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + "github.com/redhat-developer/app-services-cli/pkg/cluster/constants" + "github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient" + "github.com/redhat-developer/app-services-cli/pkg/cluster/services" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/color" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/icon" "github.com/redhat-developer/app-services-cli/pkg/core/localize" diff --git a/pkg/core/cluster/constants/constants.go b/pkg/cluster/constants/constants.go similarity index 100% rename from pkg/core/cluster/constants/constants.go rename to pkg/cluster/constants/constants.go diff --git a/pkg/core/cluster/kubeclient/kube_helpers.go b/pkg/cluster/kubeclient/kube_helpers.go similarity index 92% rename from pkg/core/cluster/kubeclient/kube_helpers.go rename to pkg/cluster/kubeclient/kube_helpers.go index 3acfba1d2..7cfc95ff1 100644 --- a/pkg/core/cluster/kubeclient/kube_helpers.go +++ b/pkg/cluster/kubeclient/kube_helpers.go @@ -2,7 +2,8 @@ package kubeclient import ( "fmt" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/core/cluster/kubeclient/kubeclients.go b/pkg/cluster/kubeclient/kubeclients.go similarity index 97% rename from pkg/core/cluster/kubeclient/kubeclients.go rename to pkg/cluster/kubeclient/kubeclients.go index 6c1463b76..d0be42441 100644 --- a/pkg/core/cluster/kubeclient/kubeclients.go +++ b/pkg/cluster/kubeclient/kubeclients.go @@ -2,10 +2,11 @@ package kubeclient import ( "fmt" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" "os" "path/filepath" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/core/cluster/services/custom_connection.go b/pkg/cluster/services/custom_connection.go similarity index 100% rename from pkg/core/cluster/services/custom_connection.go rename to pkg/cluster/services/custom_connection.go diff --git a/pkg/core/cluster/services/kafka.go b/pkg/cluster/services/kafka.go similarity index 89% rename from pkg/core/cluster/services/kafka.go rename to pkg/cluster/services/kafka.go index 7ae06b146..641fe3acb 100644 --- a/pkg/core/cluster/services/kafka.go +++ b/pkg/cluster/services/kafka.go @@ -1,10 +1,10 @@ package services import ( - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/constants" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + "github.com/redhat-developer/app-services-cli/pkg/cluster/constants" + "github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient" + "github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/kafkautil" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/core/cluster/services/resources/KafkaConnection.go b/pkg/cluster/services/resources/KafkaConnection.go similarity index 100% rename from pkg/core/cluster/services/resources/KafkaConnection.go rename to pkg/cluster/services/resources/KafkaConnection.go diff --git a/pkg/core/cluster/services/resources/ServiceRegistryConnection.go b/pkg/cluster/services/resources/ServiceRegistryConnection.go similarity index 100% rename from pkg/core/cluster/services/resources/ServiceRegistryConnection.go rename to pkg/cluster/services/resources/ServiceRegistryConnection.go diff --git a/pkg/core/cluster/services/resources/definitions.go b/pkg/cluster/services/resources/definitions.go similarity index 100% rename from pkg/core/cluster/services/resources/definitions.go rename to pkg/cluster/services/resources/definitions.go diff --git a/pkg/core/cluster/services/service-registry.go b/pkg/cluster/services/service-registry.go similarity index 89% rename from pkg/core/cluster/services/service-registry.go rename to pkg/cluster/services/service-registry.go index 41932a348..3b9fc10ed 100644 --- a/pkg/core/cluster/services/service-registry.go +++ b/pkg/cluster/services/service-registry.go @@ -1,10 +1,10 @@ package services import ( - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/constants" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + "github.com/redhat-developer/app-services-cli/pkg/cluster/constants" + "github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient" + "github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/core/cluster/status.go b/pkg/cluster/status.go similarity index 90% rename from pkg/core/cluster/status.go rename to pkg/cluster/status.go index b2ee1e116..dd0ea3698 100644 --- a/pkg/core/cluster/status.go +++ b/pkg/cluster/status.go @@ -1,8 +1,8 @@ package cluster import ( - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + "github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" bindv1alpha1 "github.com/redhat-developer/service-binding-operator/apis/binding/v1alpha1" ) diff --git a/pkg/core/cluster/v1alpha/cluster.go b/pkg/cluster/v1alpha/cluster.go similarity index 100% rename from pkg/core/cluster/v1alpha/cluster.go rename to pkg/cluster/v1alpha/cluster.go diff --git a/pkg/cmd/cluster/bind/bind.go b/pkg/cmd/cluster/bind/bind.go index 2d3f1d057..1bf0089d2 100644 --- a/pkg/cmd/cluster/bind/bind.go +++ b/pkg/cmd/cluster/bind/bind.go @@ -2,10 +2,11 @@ package bind import ( "context" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + + "github.com/redhat-developer/app-services-cli/pkg/cluster" + "github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient" + "github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/config" "github.com/redhat-developer/app-services-cli/pkg/core/connection" diff --git a/pkg/cmd/cluster/clean/clean.go b/pkg/cmd/cluster/clean/clean.go index 93a97d53c..6755b9528 100644 --- a/pkg/cmd/cluster/clean/clean.go +++ b/pkg/cmd/cluster/clean/clean.go @@ -3,9 +3,9 @@ package clean import ( "context" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + "github.com/redhat-developer/app-services-cli/pkg/cluster" + "github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/config" "github.com/redhat-developer/app-services-cli/pkg/core/connection" diff --git a/pkg/cmd/cluster/connect/connect.go b/pkg/cmd/cluster/connect/connect.go index 8a940acc4..0fe4ac851 100644 --- a/pkg/cmd/cluster/connect/connect.go +++ b/pkg/cmd/cluster/connect/connect.go @@ -2,11 +2,12 @@ package connect import ( "context" + "github.com/redhat-developer/app-services-cli/internal/build" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/services/resources" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + "github.com/redhat-developer/app-services-cli/pkg/cluster" + "github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient" + "github.com/redhat-developer/app-services-cli/pkg/cluster/services/resources" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/config" "github.com/redhat-developer/app-services-cli/pkg/core/connection" diff --git a/pkg/cmd/cluster/status/status.go b/pkg/cmd/cluster/status/status.go index ccd8eddc7..a1e3726e9 100644 --- a/pkg/cmd/cluster/status/status.go +++ b/pkg/cmd/cluster/status/status.go @@ -3,9 +3,10 @@ package status import ( "context" "fmt" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/kubeclient" - "github.com/redhat-developer/app-services-cli/pkg/core/cluster/v1alpha" + + "github.com/redhat-developer/app-services-cli/pkg/cluster" + "github.com/redhat-developer/app-services-cli/pkg/cluster/kubeclient" + "github.com/redhat-developer/app-services-cli/pkg/cluster/v1alpha" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/config" "github.com/redhat-developer/app-services-cli/pkg/core/connection"