From c62ff5938de6d076d09935e55101860b97d1db07 Mon Sep 17 00:00:00 2001 From: Ramakrishna Pattnaik Date: Thu, 6 Jan 2022 20:46:36 +0530 Subject: [PATCH 1/3] refactor: place utility methods in pkg/cmd --- pkg/{kafkautil => cmd/kafka/acl}/aclutil/acl_table.go | 0 pkg/{kafkautil => cmd/kafka/acl}/aclutil/constants.go | 0 pkg/{kafkautil => cmd/kafka/acl}/aclutil/enums.go | 0 pkg/{kafkautil => cmd/kafka/acl}/aclutil/enums_test.go | 0 pkg/{kafkautil => cmd/kafka/acl}/aclutil/util.go | 0 pkg/cmd/kafka/acl/admin/admin.go | 2 +- pkg/cmd/kafka/acl/create/create.go | 2 +- pkg/cmd/kafka/acl/delete/delete.go | 2 +- pkg/cmd/kafka/acl/flagutil/flagset.go | 2 +- pkg/cmd/kafka/acl/grant/grant.go | 2 +- pkg/cmd/kafka/acl/list/list.go | 2 +- .../kafka/consumergroup}/consumergrouputil/util.go | 0 .../kafka/consumergroup}/consumergrouputil/validators.go | 0 .../consumergroup}/consumergrouputil/validators_test.go | 0 pkg/cmd/kafka/consumergroup/describe/describe.go | 2 +- pkg/cmd/kafka/consumergroup/list/list.go | 2 +- pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go | 2 +- pkg/cmd/kafka/create/create.go | 5 +++-- pkg/cmd/kafka/list/list.go | 4 ++-- pkg/{kafkautil => cmd/kafka/shared}/kafka_util.go | 9 +++++---- pkg/{kafkautil => cmd/kafka/shared}/kafka_util_test.go | 2 +- pkg/cmd/kafka/topic/create/create.go | 2 +- pkg/cmd/kafka/topic/list/list.go | 2 +- pkg/{kafkautil => cmd/kafka/topic}/topicutil/util.go | 0 .../kafka/topic}/topicutil/util_test.go | 0 .../kafka/topic}/topicutil/validators.go | 0 .../kafka/topic}/topicutil/validators_test.go | 0 pkg/cmd/kafka/topic/update/update.go | 2 +- pkg/cmd/registry/artifact/crud/create/create.go | 3 ++- pkg/cmd/registry/artifact/crud/delete/delete.go | 7 ++++--- pkg/cmd/registry/artifact/crud/get/get.go | 9 +++++---- pkg/cmd/registry/artifact/crud/list/list.go | 5 +++-- pkg/cmd/registry/artifact/download/download.go | 9 +++++---- pkg/cmd/registry/artifact/metadata/get.go | 3 ++- pkg/cmd/registry/artifact/metadata/set.go | 7 ++++--- pkg/cmd/registry/artifact/migrate/export.go | 9 +++++---- pkg/cmd/registry/artifact/migrate/import.go | 7 ++++--- pkg/cmd/registry/artifact/role/add/add.go | 9 +++++---- pkg/cmd/registry/artifact/role/list/list.go | 4 ++-- pkg/cmd/registry/artifact/role/revoke/revoke.go | 5 +++-- pkg/cmd/registry/artifact/state/state.go | 5 +++-- pkg/cmd/registry/artifact/versions/versions.go | 5 +++-- pkg/cmd/registry/create/create.go | 6 +++--- .../registry/registryutil}/error.go | 2 +- .../registry/registryutil}/registry_util.go | 2 +- pkg/cmd/serviceaccount/create/create.go | 2 +- pkg/cmd/serviceaccount/delete/delete.go | 5 +++-- .../serviceaccount/resetcredentials/reset_credentials.go | 2 +- .../serviceaccount/shared}/validation/validation.go | 0 .../serviceaccount/shared}/validation/validation_test.go | 0 50 files changed, 83 insertions(+), 67 deletions(-) rename pkg/{kafkautil => cmd/kafka/acl}/aclutil/acl_table.go (100%) rename pkg/{kafkautil => cmd/kafka/acl}/aclutil/constants.go (100%) rename pkg/{kafkautil => cmd/kafka/acl}/aclutil/enums.go (100%) rename pkg/{kafkautil => cmd/kafka/acl}/aclutil/enums_test.go (100%) rename pkg/{kafkautil => cmd/kafka/acl}/aclutil/util.go (100%) rename pkg/{kafkautil => cmd/kafka/consumergroup}/consumergrouputil/util.go (100%) rename pkg/{kafkautil => cmd/kafka/consumergroup}/consumergrouputil/validators.go (100%) rename pkg/{kafkautil => cmd/kafka/consumergroup}/consumergrouputil/validators_test.go (100%) rename pkg/{kafkautil => cmd/kafka/shared}/kafka_util.go (91%) rename pkg/{kafkautil => cmd/kafka/shared}/kafka_util_test.go (99%) rename pkg/{kafkautil => cmd/kafka/topic}/topicutil/util.go (100%) rename pkg/{kafkautil => cmd/kafka/topic}/topicutil/util_test.go (100%) rename pkg/{kafkautil => cmd/kafka/topic}/topicutil/validators.go (100%) rename pkg/{kafkautil => cmd/kafka/topic}/topicutil/validators_test.go (100%) rename pkg/{serviceregistryutil => cmd/registry/registryutil}/error.go (97%) rename pkg/{serviceregistryutil => cmd/registry/registryutil}/registry_util.go (95%) rename pkg/{serviceaccountutil => cmd/serviceaccount/shared}/validation/validation.go (100%) rename pkg/{serviceaccountutil => cmd/serviceaccount/shared}/validation/validation_test.go (100%) diff --git a/pkg/kafkautil/aclutil/acl_table.go b/pkg/cmd/kafka/acl/aclutil/acl_table.go similarity index 100% rename from pkg/kafkautil/aclutil/acl_table.go rename to pkg/cmd/kafka/acl/aclutil/acl_table.go diff --git a/pkg/kafkautil/aclutil/constants.go b/pkg/cmd/kafka/acl/aclutil/constants.go similarity index 100% rename from pkg/kafkautil/aclutil/constants.go rename to pkg/cmd/kafka/acl/aclutil/constants.go diff --git a/pkg/kafkautil/aclutil/enums.go b/pkg/cmd/kafka/acl/aclutil/enums.go similarity index 100% rename from pkg/kafkautil/aclutil/enums.go rename to pkg/cmd/kafka/acl/aclutil/enums.go diff --git a/pkg/kafkautil/aclutil/enums_test.go b/pkg/cmd/kafka/acl/aclutil/enums_test.go similarity index 100% rename from pkg/kafkautil/aclutil/enums_test.go rename to pkg/cmd/kafka/acl/aclutil/enums_test.go diff --git a/pkg/kafkautil/aclutil/util.go b/pkg/cmd/kafka/acl/aclutil/util.go similarity index 100% rename from pkg/kafkautil/aclutil/util.go rename to pkg/cmd/kafka/acl/aclutil/util.go diff --git a/pkg/cmd/kafka/acl/admin/admin.go b/pkg/cmd/kafka/acl/admin/admin.go index d80a5728c..eefd9df80 100644 --- a/pkg/cmd/kafka/acl/admin/admin.go +++ b/pkg/cmd/kafka/acl/admin/admin.go @@ -3,8 +3,8 @@ package admin import ( "context" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" flagset "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/aclutil" "github.com/AlecAivazis/survey/v2" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" diff --git a/pkg/cmd/kafka/acl/create/create.go b/pkg/cmd/kafka/acl/create/create.go index 5f44f169a..04f9fd0ea 100644 --- a/pkg/cmd/kafka/acl/create/create.go +++ b/pkg/cmd/kafka/acl/create/create.go @@ -2,6 +2,7 @@ package create import ( "github.com/AlecAivazis/survey/v2" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" aclFlagutil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" @@ -10,7 +11,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/dump" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/spinner" "github.com/redhat-developer/app-services-cli/pkg/core/localize" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/aclutil" kafkainstanceclient "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal/client" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/kafka/acl/delete/delete.go b/pkg/cmd/kafka/acl/delete/delete.go index ce532e241..fa3254c88 100644 --- a/pkg/cmd/kafka/acl/delete/delete.go +++ b/pkg/cmd/kafka/acl/delete/delete.go @@ -2,6 +2,7 @@ package delete import ( "github.com/AlecAivazis/survey/v2" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" aclFlagUtil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" @@ -11,7 +12,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/icon" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/spinner" "github.com/redhat-developer/app-services-cli/pkg/core/localize" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/aclutil" kafkainstanceclient "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal/client" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/kafka/acl/flagutil/flagset.go b/pkg/cmd/kafka/acl/flagutil/flagset.go index 618f10046..8e080b25f 100644 --- a/pkg/cmd/kafka/acl/flagutil/flagset.go +++ b/pkg/cmd/kafka/acl/flagutil/flagset.go @@ -1,10 +1,10 @@ package flagutil import ( + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/localize" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/aclutil" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/kafka/acl/grant/grant.go b/pkg/cmd/kafka/acl/grant/grant.go index e336aa181..08637f629 100644 --- a/pkg/cmd/kafka/acl/grant/grant.go +++ b/pkg/cmd/kafka/acl/grant/grant.go @@ -3,8 +3,8 @@ package grant import ( "context" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/aclutil" "github.com/AlecAivazis/survey/v2" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" diff --git a/pkg/cmd/kafka/acl/list/list.go b/pkg/cmd/kafka/acl/list/list.go index 3714b6068..dd39a9dad 100644 --- a/pkg/cmd/kafka/acl/list/list.go +++ b/pkg/cmd/kafka/acl/list/list.go @@ -3,9 +3,9 @@ package list import ( "context" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/aclutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/config" diff --git a/pkg/kafkautil/consumergrouputil/util.go b/pkg/cmd/kafka/consumergroup/consumergrouputil/util.go similarity index 100% rename from pkg/kafkautil/consumergrouputil/util.go rename to pkg/cmd/kafka/consumergroup/consumergrouputil/util.go diff --git a/pkg/kafkautil/consumergrouputil/validators.go b/pkg/cmd/kafka/consumergroup/consumergrouputil/validators.go similarity index 100% rename from pkg/kafkautil/consumergrouputil/validators.go rename to pkg/cmd/kafka/consumergroup/consumergrouputil/validators.go diff --git a/pkg/kafkautil/consumergrouputil/validators_test.go b/pkg/cmd/kafka/consumergroup/consumergrouputil/validators_test.go similarity index 100% rename from pkg/kafkautil/consumergrouputil/validators_test.go rename to pkg/cmd/kafka/consumergroup/consumergrouputil/validators_test.go diff --git a/pkg/cmd/kafka/consumergroup/describe/describe.go b/pkg/cmd/kafka/consumergroup/describe/describe.go index baeedfaa9..4eadddefc 100644 --- a/pkg/cmd/kafka/consumergroup/describe/describe.go +++ b/pkg/cmd/kafka/consumergroup/describe/describe.go @@ -7,8 +7,8 @@ import ( "net/http" "sort" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/consumergrouputil" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/consumergrouputil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" diff --git a/pkg/cmd/kafka/consumergroup/list/list.go b/pkg/cmd/kafka/consumergroup/list/list.go index 6b4a9320c..90fdab924 100644 --- a/pkg/cmd/kafka/consumergroup/list/list.go +++ b/pkg/cmd/kafka/consumergroup/list/list.go @@ -4,8 +4,8 @@ import ( "context" "net/http" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/consumergrouputil" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/consumergrouputil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" diff --git a/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go b/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go index d41abf71d..308b81121 100644 --- a/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go +++ b/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go @@ -4,8 +4,8 @@ import ( "context" "net/http" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/consumergrouputil" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/consumergrouputil" "github.com/AlecAivazis/survey/v2" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" diff --git a/pkg/cmd/kafka/create/create.go b/pkg/cmd/kafka/create/create.go index bfab9be0d..2254ec418 100644 --- a/pkg/cmd/kafka/create/create.go +++ b/pkg/cmd/kafka/create/create.go @@ -11,6 +11,7 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/svcstatus" "github.com/redhat-developer/app-services-cli/pkg/accountmgmtutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/shared" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -80,7 +81,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { if opts.name != "" { - validator := &pkgKafka.Validator{ + validator := &shared.Validator{ Localizer: opts.localizer, Connection: opts.Connection, } @@ -277,7 +278,7 @@ func promptKafkaPayload(opts *options) (payload *kafkamgmtclient.KafkaRequestPay api := conn.API() - validator := &pkgKafka.Validator{ + validator := &shared.Validator{ Localizer: opts.localizer, Connection: opts.Connection, } diff --git a/pkg/cmd/kafka/list/list.go b/pkg/cmd/kafka/list/list.go index b727ae53d..2a5ea41ff 100644 --- a/pkg/cmd/kafka/list/list.go +++ b/pkg/cmd/kafka/list/list.go @@ -7,6 +7,7 @@ import ( kafkaFlagutil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/flagutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/shared" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -17,7 +18,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil" kafkamgmtclient "github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client" @@ -75,7 +75,7 @@ func NewListCommand(f *factory.Factory) *cobra.Command { return flagutil.InvalidValueError("output", opts.outputFormat, flagutil.ValidOutputFormats...) } - validator := &kafkautil.Validator{ + validator := &shared.Validator{ Localizer: opts.localizer, } diff --git a/pkg/kafkautil/kafka_util.go b/pkg/cmd/kafka/shared/kafka_util.go similarity index 91% rename from pkg/kafkautil/kafka_util.go rename to pkg/cmd/kafka/shared/kafka_util.go index a3d2a821f..3ba9dfc78 100644 --- a/pkg/kafkautil/kafka_util.go +++ b/pkg/cmd/kafka/shared/kafka_util.go @@ -1,4 +1,4 @@ -package kafkautil +package shared import ( "context" @@ -11,6 +11,7 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/connection" "github.com/redhat-developer/app-services-cli/pkg/core/errors" "github.com/redhat-developer/app-services-cli/pkg/core/localize" + "github.com/redhat-developer/app-services-cli/pkg/kafkautil" kafkamgmtclient "github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client" ) @@ -43,7 +44,7 @@ func (v *Validator) ValidateName(val interface{}) error { return nil } - return InvalidNameError(name) + return kafkautil.InvalidNameError(name) } // TransformKafkaRequestListItems modifies fields fields from a list of kafka instances @@ -89,7 +90,7 @@ func (v *Validator) ValidateSearchInput(val interface{}) error { return nil } - return InvalidSearchValueError(search) + return kafkautil.InvalidSearchValueError(search) } // ValidateNameIsAvailable checks if a kafka instance with the given name already exists @@ -103,7 +104,7 @@ func (v *Validator) ValidateNameIsAvailable(val interface{}) error { api := conn.API() - _, httpRes, _ := GetKafkaByName(context.Background(), api.KafkaMgmt(), name) + _, httpRes, _ := kafkautil.GetKafkaByName(context.Background(), api.KafkaMgmt(), name) if httpRes != nil { defer httpRes.Body.Close() diff --git a/pkg/kafkautil/kafka_util_test.go b/pkg/cmd/kafka/shared/kafka_util_test.go similarity index 99% rename from pkg/kafkautil/kafka_util_test.go rename to pkg/cmd/kafka/shared/kafka_util_test.go index 8a7915cae..3fc741731 100644 --- a/pkg/kafkautil/kafka_util_test.go +++ b/pkg/cmd/kafka/shared/kafka_util_test.go @@ -1,4 +1,4 @@ -package kafkautil +package shared import ( "testing" diff --git a/pkg/cmd/kafka/topic/create/create.go b/pkg/cmd/kafka/topic/create/create.go index 5d39f67bd..8b418ba65 100644 --- a/pkg/cmd/kafka/topic/create/create.go +++ b/pkg/cmd/kafka/topic/create/create.go @@ -5,7 +5,7 @@ import ( "net/http" "strconv" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/topicutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/topicutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" diff --git a/pkg/cmd/kafka/topic/list/list.go b/pkg/cmd/kafka/topic/list/list.go index 926055642..6b235298c 100644 --- a/pkg/cmd/kafka/topic/list/list.go +++ b/pkg/cmd/kafka/topic/list/list.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/topicutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/topicutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" diff --git a/pkg/kafkautil/topicutil/util.go b/pkg/cmd/kafka/topic/topicutil/util.go similarity index 100% rename from pkg/kafkautil/topicutil/util.go rename to pkg/cmd/kafka/topic/topicutil/util.go diff --git a/pkg/kafkautil/topicutil/util_test.go b/pkg/cmd/kafka/topic/topicutil/util_test.go similarity index 100% rename from pkg/kafkautil/topicutil/util_test.go rename to pkg/cmd/kafka/topic/topicutil/util_test.go diff --git a/pkg/kafkautil/topicutil/validators.go b/pkg/cmd/kafka/topic/topicutil/validators.go similarity index 100% rename from pkg/kafkautil/topicutil/validators.go rename to pkg/cmd/kafka/topic/topicutil/validators.go diff --git a/pkg/kafkautil/topicutil/validators_test.go b/pkg/cmd/kafka/topic/topicutil/validators_test.go similarity index 100% rename from pkg/kafkautil/topicutil/validators_test.go rename to pkg/cmd/kafka/topic/topicutil/validators_test.go diff --git a/pkg/cmd/kafka/topic/update/update.go b/pkg/cmd/kafka/topic/update/update.go index 208c8d41c..6800e3801 100644 --- a/pkg/cmd/kafka/topic/update/update.go +++ b/pkg/cmd/kafka/topic/update/update.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/topicutil" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" - "github.com/redhat-developer/app-services-cli/pkg/kafkautil/topicutil" "github.com/AlecAivazis/survey/v2" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" diff --git a/pkg/cmd/registry/artifact/crud/create/create.go b/pkg/cmd/registry/artifact/crud/create/create.go index 985e4e05a..ebcaabac1 100644 --- a/pkg/cmd/registry/artifact/crud/create/create.go +++ b/pkg/cmd/registry/artifact/crud/create/create.go @@ -6,6 +6,7 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -174,7 +175,7 @@ func runCreate(opts *options) error { request = request.Body(specifiedFile) metadata, _, err := request.Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.created")) diff --git a/pkg/cmd/registry/artifact/crud/delete/delete.go b/pkg/cmd/registry/artifact/crud/delete/delete.go index 9006b42b4..fd7a36491 100644 --- a/pkg/cmd/registry/artifact/crud/delete/delete.go +++ b/pkg/cmd/registry/artifact/crud/delete/delete.go @@ -3,8 +3,10 @@ package delete import ( "context" "errors" + "github.com/AlecAivazis/survey/v2" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -12,7 +14,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" "github.com/spf13/cobra" ) @@ -105,7 +106,7 @@ func runDelete(opts *options) error { request := dataAPI.ArtifactsApi.DeleteArtifactsInGroup(opts.Context, opts.group) _, err = request.Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.AllArtifactsInGroupDeleted", localize.NewEntry("GroupName", opts.group))) } else { @@ -122,7 +123,7 @@ func runDelete(opts *options) error { _, err = request.Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.deleted", localize.NewEntry("Name", opts.artifact))) } diff --git a/pkg/cmd/registry/artifact/crud/get/get.go b/pkg/cmd/registry/artifact/crud/get/get.go index 2976d9b0b..a289a571e 100644 --- a/pkg/cmd/registry/artifact/crud/get/get.go +++ b/pkg/cmd/registry/artifact/crud/get/get.go @@ -3,7 +3,11 @@ package get import ( "context" "fmt" + "io/ioutil" + "os" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -12,9 +16,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" - "io/ioutil" - "os" "github.com/spf13/cobra" ) @@ -113,7 +114,7 @@ func runGet(opts *options) error { dataFile, _, err = request.Execute() } if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } fileContent, err := ioutil.ReadFile(dataFile.Name()) if err != nil { diff --git a/pkg/cmd/registry/artifact/crud/list/list.go b/pkg/cmd/registry/artifact/crud/list/list.go index 053cead62..a4c5f34c8 100644 --- a/pkg/cmd/registry/artifact/crud/list/list.go +++ b/pkg/cmd/registry/artifact/crud/list/list.go @@ -2,8 +2,9 @@ package list import ( "context" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -135,7 +136,7 @@ func runList(opts *options) error { response, _, err := request.Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } if len(response.Artifacts) == 0 && opts.outputFormat == "" { diff --git a/pkg/cmd/registry/artifact/download/download.go b/pkg/cmd/registry/artifact/download/download.go index 70888b339..8e85e3188 100644 --- a/pkg/cmd/registry/artifact/download/download.go +++ b/pkg/cmd/registry/artifact/download/download.go @@ -3,7 +3,11 @@ package download import ( "context" "fmt" + "io/ioutil" + "os" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -12,9 +16,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" - "io/ioutil" - "os" "github.com/spf13/cobra" ) @@ -123,7 +124,7 @@ func runGet(opts *options) error { } if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } fileContent, err := ioutil.ReadFile(dataFile.Name()) diff --git a/pkg/cmd/registry/artifact/metadata/get.go b/pkg/cmd/registry/artifact/metadata/get.go index 0509f20df..44ffc5763 100644 --- a/pkg/cmd/registry/artifact/metadata/get.go +++ b/pkg/cmd/registry/artifact/metadata/get.go @@ -4,6 +4,7 @@ import ( "context" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -110,7 +111,7 @@ func runGet(opts *GetOptions) error { request := dataAPI.MetadataApi.GetArtifactMetaData(opts.Context, opts.group, opts.artifact) response, _, err := request.Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } artifactURL, ok := util.GetArtifactURL(registry, &response) diff --git a/pkg/cmd/registry/artifact/metadata/set.go b/pkg/cmd/registry/artifact/metadata/set.go index d8103a24f..9ef37073c 100644 --- a/pkg/cmd/registry/artifact/metadata/set.go +++ b/pkg/cmd/registry/artifact/metadata/set.go @@ -3,7 +3,9 @@ package metadata import ( "context" "encoding/json" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -13,7 +15,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" "github.com/spf13/cobra" registryinstanceclient "github.com/redhat-developer/app-services-sdk-go/registryinstance/apiv1internal/client" @@ -116,7 +117,7 @@ func runSet(opts *SetOptions) error { request := dataAPI.MetadataApi.GetArtifactMetaData(opts.Context, opts.group, opts.artifact) currentMetadata, _, err := request.Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } editableMedata := ®istryinstanceclient.EditableMetaData{ @@ -147,7 +148,7 @@ func runSet(opts *SetOptions) error { editRequest := dataAPI.MetadataApi.UpdateArtifactMetaData(opts.Context, opts.group, opts.artifact) _, err = editRequest.EditableMetaData(*editableMedata).Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } opts.Logger.Info(icon.SuccessPrefix(), opts.localizer.MustLocalize("artifact.common.message.artifact.metadata.updated")) diff --git a/pkg/cmd/registry/artifact/migrate/export.go b/pkg/cmd/registry/artifact/migrate/export.go index 93763ce07..2d014b095 100644 --- a/pkg/cmd/registry/artifact/migrate/export.go +++ b/pkg/cmd/registry/artifact/migrate/export.go @@ -2,15 +2,16 @@ package migrate import ( "context" + "io" + "os" + + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "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" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" - "io" - "os" "github.com/spf13/cobra" ) @@ -88,7 +89,7 @@ func runExport(opts *ExportOptions) error { request := dataAPI.AdminApi.ExportData(opts.Context) file, _, err := request.Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } _, err = io.Copy(fileContent, file) if err != nil { diff --git a/pkg/cmd/registry/artifact/migrate/import.go b/pkg/cmd/registry/artifact/migrate/import.go index 8248026fa..d4d77d4a4 100644 --- a/pkg/cmd/registry/artifact/migrate/import.go +++ b/pkg/cmd/registry/artifact/migrate/import.go @@ -2,14 +2,15 @@ package migrate import ( "context" + "os" + + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "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" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" - "os" "github.com/spf13/cobra" ) @@ -91,7 +92,7 @@ func runImport(opts *ImportOptions) error { request := dataAPI.AdminApi.ImportData(opts.Context) _, err = request.Body(specifiedFile).Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.import.success")) diff --git a/pkg/cmd/registry/artifact/role/add/add.go b/pkg/cmd/registry/artifact/role/add/add.go index e70ab8672..83ffacec2 100644 --- a/pkg/cmd/registry/artifact/role/add/add.go +++ b/pkg/cmd/registry/artifact/role/add/add.go @@ -2,14 +2,15 @@ package add import ( "context" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "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" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" registryinstanceclient "github.com/redhat-developer/app-services-sdk-go/registryinstance/apiv1internal/client" "github.com/spf13/cobra" @@ -122,7 +123,7 @@ func runAdd(opts *options) error { Role: *role, }).Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } } else { opts.Logger.Info(opts.localizer.MustLocalize("registry.role.cmd.creating")) @@ -133,7 +134,7 @@ func runAdd(opts *options) error { request := dataAPI.AdminApi.CreateRoleMapping(opts.Context) _, err = request.RoleMapping(roleMapping).Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } } @@ -146,7 +147,7 @@ func runAdd(opts *options) error { func principalHasRole(opts *options, admin registryinstanceclient.AdminApi) bool { _, _, err := admin.GetRoleMapping(opts.Context, opts.principal).Execute() if err != nil { - apiError, _ := serviceregistryutil.GetInstanceAPIError(err) + apiError, _ := registryutil.GetInstanceAPIError(err) return apiError.GetErrorCode() != 404 } return true diff --git a/pkg/cmd/registry/artifact/role/list/list.go b/pkg/cmd/registry/artifact/role/list/list.go index c9ae34b74..ed7c7600c 100644 --- a/pkg/cmd/registry/artifact/role/list/list.go +++ b/pkg/cmd/registry/artifact/role/list/list.go @@ -2,8 +2,8 @@ package list import ( "context" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -100,7 +100,7 @@ func runList(opts *options) error { } mappings, _, err := a.AdminApi.ListRoleMappings(opts.Context).Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } if len(mappings) == 0 && opts.outputFormat == "" { diff --git a/pkg/cmd/registry/artifact/role/revoke/revoke.go b/pkg/cmd/registry/artifact/role/revoke/revoke.go index 65b0a538b..7d1c91dd3 100644 --- a/pkg/cmd/registry/artifact/role/revoke/revoke.go +++ b/pkg/cmd/registry/artifact/role/revoke/revoke.go @@ -2,13 +2,14 @@ package revoke import ( "context" + + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "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" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" "github.com/spf13/cobra" ) @@ -97,7 +98,7 @@ func runRevoke(opts *options) error { _, err = dataAPI.AdminApi.DeleteRoleMapping(opts.Context, opts.principal).Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("registry.role.cmd.revoke.success")) diff --git a/pkg/cmd/registry/artifact/state/state.go b/pkg/cmd/registry/artifact/state/state.go index 1c8a4b038..9bcd67bce 100644 --- a/pkg/cmd/registry/artifact/state/state.go +++ b/pkg/cmd/registry/artifact/state/state.go @@ -2,14 +2,15 @@ package state import ( "context" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "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" "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" "github.com/spf13/cobra" registryinstanceclient "github.com/redhat-developer/app-services-sdk-go/registryinstance/apiv1internal/client" @@ -111,7 +112,7 @@ func runSet(opts *options) error { request := dataAPI.ArtifactsApi.UpdateArtifactState(opts.context, opts.group, opts.artifact) _, err = request.UpdateState(*registryinstanceclient.NewUpdateState(*updateState)).Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.artifact.state.updated")) diff --git a/pkg/cmd/registry/artifact/versions/versions.go b/pkg/cmd/registry/artifact/versions/versions.go index 5b8be1be9..8d8aec694 100644 --- a/pkg/cmd/registry/artifact/versions/versions.go +++ b/pkg/cmd/registry/artifact/versions/versions.go @@ -2,7 +2,9 @@ package versions import ( "context" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -12,7 +14,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" "github.com/spf13/cobra" ) @@ -103,7 +104,7 @@ func runGet(opts *options) error { request := dataAPI.VersionsApi.ListArtifactVersions(opts.Context, opts.group, opts.artifact) response, _, err := request.Execute() if err != nil { - return serviceregistryutil.TransformInstanceError(err) + return registryutil.TransformInstanceError(err) } opts.Logger.Info(icon.SuccessPrefix(), opts.localizer.MustLocalize("artifact.common.message.artifact.versions.fetched")) diff --git a/pkg/cmd/registry/create/create.go b/pkg/cmd/registry/create/create.go index 04bfe7339..ce0c1738d 100644 --- a/pkg/cmd/registry/create/create.go +++ b/pkg/cmd/registry/create/create.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/redhat-developer/app-services-cli/pkg/accountmgmtutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -14,7 +15,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceregistryutil" srsmgmtv1 "github.com/redhat-developer/app-services-sdk-go/registrymgmt/apiv1/client" @@ -58,7 +58,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { if opts.name != "" { - if err := serviceregistryutil.ValidateName(opts.name); err != nil { + if err := registryutil.ValidateName(opts.name); err != nil { return err } } @@ -183,7 +183,7 @@ func promptPayload(opts *options) (payload *srsmgmtv1.RegistryCreate, err error) Help: opts.localizer.MustLocalize("registry.cmd.create.input.name.help"), } - err = survey.AskOne(promptName, &answers.Name, survey.WithValidator(serviceregistryutil.ValidateName)) + err = survey.AskOne(promptName, &answers.Name, survey.WithValidator(registryutil.ValidateName)) if err != nil { return nil, err } diff --git a/pkg/serviceregistryutil/error.go b/pkg/cmd/registry/registryutil/error.go similarity index 97% rename from pkg/serviceregistryutil/error.go rename to pkg/cmd/registry/registryutil/error.go index c6b45b2c4..679618872 100644 --- a/pkg/serviceregistryutil/error.go +++ b/pkg/cmd/registry/registryutil/error.go @@ -1,4 +1,4 @@ -package serviceregistryutil +package registryutil import ( "errors" diff --git a/pkg/serviceregistryutil/registry_util.go b/pkg/cmd/registry/registryutil/registry_util.go similarity index 95% rename from pkg/serviceregistryutil/registry_util.go rename to pkg/cmd/registry/registryutil/registry_util.go index 787a1ed47..5fcc2cd2d 100644 --- a/pkg/serviceregistryutil/registry_util.go +++ b/pkg/cmd/registry/registryutil/registry_util.go @@ -1,4 +1,4 @@ -package serviceregistryutil +package registryutil import ( "errors" diff --git a/pkg/cmd/serviceaccount/create/create.go b/pkg/cmd/serviceaccount/create/create.go index c46d90abf..a95fc4dfa 100644 --- a/pkg/cmd/serviceaccount/create/create.go +++ b/pkg/cmd/serviceaccount/create/create.go @@ -5,6 +5,7 @@ import ( "fmt" "os" + "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/shared/validation" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -16,7 +17,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" "github.com/redhat-developer/app-services-cli/pkg/serviceaccountutil/credentials" - "github.com/redhat-developer/app-services-cli/pkg/serviceaccountutil/validation" kafkamgmtclient "github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client" diff --git a/pkg/cmd/serviceaccount/delete/delete.go b/pkg/cmd/serviceaccount/delete/delete.go index ed4f21300..d8b2c6330 100644 --- a/pkg/cmd/serviceaccount/delete/delete.go +++ b/pkg/cmd/serviceaccount/delete/delete.go @@ -2,6 +2,9 @@ package delete import ( "context" + "net/http" + + "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/shared/validation" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -10,8 +13,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/ioutil/iostreams" "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" - "github.com/redhat-developer/app-services-cli/pkg/serviceaccountutil/validation" - "net/http" "github.com/AlecAivazis/survey/v2" "github.com/spf13/cobra" diff --git a/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go b/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go index c3ec9625a..ab416c29c 100644 --- a/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go +++ b/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go @@ -6,6 +6,7 @@ import ( "net/http" "os" + "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/shared/validation" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -16,7 +17,6 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/core/localize" "github.com/redhat-developer/app-services-cli/pkg/core/logging" "github.com/redhat-developer/app-services-cli/pkg/serviceaccountutil/credentials" - "github.com/redhat-developer/app-services-cli/pkg/serviceaccountutil/validation" kafkamgmtclient "github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client" diff --git a/pkg/serviceaccountutil/validation/validation.go b/pkg/cmd/serviceaccount/shared/validation/validation.go similarity index 100% rename from pkg/serviceaccountutil/validation/validation.go rename to pkg/cmd/serviceaccount/shared/validation/validation.go diff --git a/pkg/serviceaccountutil/validation/validation_test.go b/pkg/cmd/serviceaccount/shared/validation/validation_test.go similarity index 100% rename from pkg/serviceaccountutil/validation/validation_test.go rename to pkg/cmd/serviceaccount/shared/validation/validation_test.go From 379ce3316cb46bee40b62260d8d4f46660f01ded Mon Sep 17 00:00:00 2001 From: Ramakrishna Pattnaik Date: Fri, 7 Jan 2022 13:20:55 +0530 Subject: [PATCH 2/3] refactor: rename util packages to sdk --- pkg/cmd/kafka/acl/admin/admin.go | 14 +++---- pkg/cmd/kafka/acl/create/create.go | 42 +++++++++---------- pkg/cmd/kafka/acl/delete/delete.go | 40 +++++++++--------- pkg/cmd/kafka/acl/flagutil/flagset.go | 16 +++---- pkg/cmd/kafka/acl/grant/grant.go | 22 +++++----- pkg/cmd/kafka/acl/list/list.go | 24 +++++------ .../kafka/acl/{aclutil => sdk}/acl_table.go | 2 +- .../kafka/acl/{aclutil => sdk}/constants.go | 2 +- pkg/cmd/kafka/acl/{aclutil => sdk}/enums.go | 2 +- .../kafka/acl/{aclutil => sdk}/enums_test.go | 2 +- pkg/cmd/kafka/acl/{aclutil => sdk}/util.go | 2 +- .../kafka/consumergroup/describe/describe.go | 8 ++-- pkg/cmd/kafka/consumergroup/list/list.go | 6 +-- .../consumergroup/resetoffset/reset_offset.go | 12 +++--- .../{consumergrouputil => sdk}/util.go | 2 +- .../{consumergrouputil => sdk}/validators.go | 2 +- .../validators_test.go | 2 +- pkg/cmd/kafka/create/create.go | 6 +-- pkg/cmd/kafka/list/list.go | 4 +- pkg/cmd/kafka/{shared => sdk}/kafka_util.go | 2 +- .../kafka/{shared => sdk}/kafka_util_test.go | 2 +- pkg/cmd/kafka/topic/create/create.go | 22 +++++----- pkg/cmd/kafka/topic/list/list.go | 8 ++-- .../kafka/topic/{topicutil => sdk}/util.go | 2 +- .../topic/{topicutil => sdk}/util_test.go | 2 +- .../topic/{topicutil => sdk}/validators.go | 2 +- .../{topicutil => sdk}/validators_test.go | 2 +- pkg/cmd/kafka/topic/update/update.go | 38 ++++++++--------- .../registry/artifact/crud/create/create.go | 4 +- .../registry/artifact/crud/delete/delete.go | 6 +-- pkg/cmd/registry/artifact/crud/get/get.go | 4 +- pkg/cmd/registry/artifact/crud/list/list.go | 4 +- .../registry/artifact/download/download.go | 4 +- pkg/cmd/registry/artifact/metadata/get.go | 4 +- pkg/cmd/registry/artifact/metadata/set.go | 6 +-- pkg/cmd/registry/artifact/migrate/export.go | 4 +- pkg/cmd/registry/artifact/migrate/import.go | 4 +- pkg/cmd/registry/artifact/role/add/add.go | 8 ++-- pkg/cmd/registry/artifact/role/list/list.go | 4 +- .../registry/artifact/role/revoke/revoke.go | 4 +- pkg/cmd/registry/artifact/state/state.go | 4 +- .../registry/artifact/versions/versions.go | 4 +- pkg/cmd/registry/create/create.go | 6 +-- .../registry/{registryutil => sdk}/error.go | 2 +- .../{registryutil => sdk}/registry_util.go | 2 +- pkg/cmd/serviceaccount/create/create.go | 2 +- pkg/cmd/serviceaccount/delete/delete.go | 2 +- .../resetcredentials/reset_credentials.go | 2 +- .../{shared => sdk}/validation/validation.go | 0 .../validation/validation_test.go | 0 50 files changed, 185 insertions(+), 185 deletions(-) rename pkg/cmd/kafka/acl/{aclutil => sdk}/acl_table.go (99%) rename pkg/cmd/kafka/acl/{aclutil => sdk}/constants.go (98%) rename pkg/cmd/kafka/acl/{aclutil => sdk}/enums.go (99%) rename pkg/cmd/kafka/acl/{aclutil => sdk}/enums_test.go (99%) rename pkg/cmd/kafka/acl/{aclutil => sdk}/util.go (99%) rename pkg/cmd/kafka/consumergroup/{consumergrouputil => sdk}/util.go (97%) rename pkg/cmd/kafka/consumergroup/{consumergrouputil => sdk}/validators.go (98%) rename pkg/cmd/kafka/consumergroup/{consumergrouputil => sdk}/validators_test.go (99%) rename pkg/cmd/kafka/{shared => sdk}/kafka_util.go (99%) rename pkg/cmd/kafka/{shared => sdk}/kafka_util_test.go (99%) rename pkg/cmd/kafka/topic/{topicutil => sdk}/util.go (99%) rename pkg/cmd/kafka/topic/{topicutil => sdk}/util_test.go (98%) rename pkg/cmd/kafka/topic/{topicutil => sdk}/validators.go (99%) rename pkg/cmd/kafka/topic/{topicutil => sdk}/validators_test.go (99%) rename pkg/cmd/registry/{registryutil => sdk}/error.go (97%) rename pkg/cmd/registry/{registryutil => sdk}/registry_util.go (96%) rename pkg/cmd/serviceaccount/{shared => sdk}/validation/validation.go (100%) rename pkg/cmd/serviceaccount/{shared => sdk}/validation/validation_test.go (100%) diff --git a/pkg/cmd/kafka/acl/admin/admin.go b/pkg/cmd/kafka/acl/admin/admin.go index eefd9df80..acba451af 100644 --- a/pkg/cmd/kafka/acl/admin/admin.go +++ b/pkg/cmd/kafka/acl/admin/admin.go @@ -3,8 +3,8 @@ package admin import ( "context" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" flagset "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" "github.com/AlecAivazis/survey/v2" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" @@ -83,7 +83,7 @@ func NewAdminACLCommand(f *factory.Factory) *cobra.Command { } // user and service account should not allow wildcard - if userID == aclutil.Wildcard || serviceAccount == aclutil.Wildcard || userID == aclutil.AllAlias || serviceAccount == aclutil.AllAlias { + if userID == sdk.Wildcard || serviceAccount == sdk.Wildcard || userID == sdk.AllAlias || serviceAccount == sdk.AllAlias { return opts.localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag") } @@ -96,7 +96,7 @@ func NewAdminACLCommand(f *factory.Factory) *cobra.Command { } if allAccounts { - opts.principal = aclutil.Wildcard + opts.principal = sdk.Wildcard } return runAdmin(opts) @@ -131,9 +131,9 @@ func runAdmin(opts *options) (err error) { aclBindClusterAlter := kafkainstanceclient.NewAclBinding( kafkainstanceclient.ACLRESOURCETYPE_CLUSTER, - aclutil.KafkaCluster, + sdk.KafkaCluster, kafkainstanceclient.ACLPATTERNTYPE_LITERAL, - aclutil.FormatPrincipal(opts.principal), + sdk.FormatPrincipal(opts.principal), kafkainstanceclient.ACLOPERATION_ALTER, kafkainstanceclient.ACLPERMISSIONTYPE_ALLOW, ) @@ -141,7 +141,7 @@ func runAdmin(opts *options) (err error) { opts.logger.Info(opts.localizer.MustLocalize("kafka.acl.grantPermissions.log.info.aclsPreview")) opts.logger.Info() - rows := aclutil.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*aclBindClusterAlter}, opts.localizer) + rows := sdk.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*aclBindClusterAlter}, opts.localizer) dump.Table(opts.io.Out, rows) opts.logger.Info() @@ -164,7 +164,7 @@ func runAdmin(opts *options) (err error) { req = req.AclBinding(*aclBindClusterAlter) - err = aclutil.ExecuteACLRuleCreate(req, opts.localizer, kafkaName) + err = sdk.ExecuteACLRuleCreate(req, opts.localizer, kafkaName) if err != nil { return err } diff --git a/pkg/cmd/kafka/acl/create/create.go b/pkg/cmd/kafka/acl/create/create.go index 04f9fd0ea..32f88742d 100644 --- a/pkg/cmd/kafka/acl/create/create.go +++ b/pkg/cmd/kafka/acl/create/create.go @@ -2,8 +2,8 @@ package create import ( "github.com/AlecAivazis/survey/v2" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" aclFlagutil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -33,7 +33,7 @@ type requestParams struct { // NewCreateCommand creates a new command to add Kafka ACLs func NewCreateCommand(f *factory.Factory) *cobra.Command { - opts := &aclutil.CrudOptions{ + opts := &sdk.CrudOptions{ Config: f.Config, Connection: f.Connection, Logger: f.Logger, @@ -63,7 +63,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { errorCollection = append(errorCollection, opts.Localizer.MustLocalizeError("kafka.acl.common.flag.operation.required")) } - if resourceErrors := aclutil.ValidateAndSetResources(opts, aclFlagutil.ResourceTypeFlagEntries); resourceErrors != nil { + if resourceErrors := sdk.ValidateAndSetResources(opts, aclFlagutil.ResourceTypeFlagEntries); resourceErrors != nil { errorCollection = append(errorCollection, resourceErrors) } @@ -72,7 +72,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { } if len(errorCollection) > 0 { - return aclutil.BuildInstructions(errorCollection) + return sdk.BuildInstructions(errorCollection) } return runAdd(opts.InstanceID, opts) @@ -99,7 +99,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { } // nolint:funlen -func runAdd(instanceID string, opts *aclutil.CrudOptions) error { +func runAdd(instanceID string, opts *sdk.CrudOptions) error { ctx := opts.Context conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth) @@ -122,7 +122,7 @@ func runAdd(instanceID string, opts *aclutil.CrudOptions) error { return err } - if isValidOp, validResourceOperations := aclutil.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp { + if isValidOp, validResourceOperations := sdk.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.invalidResourceOperation", localize.NewEntry("ResourceType", opts.ResourceType), localize.NewEntry("Operation", opts.Operation), @@ -136,7 +136,7 @@ func runAdd(instanceID string, opts *aclutil.CrudOptions) error { kafkainstanceclient.AclResourceType(requestParams.resourceType), requestParams.resourceName, kafkainstanceclient.AclPatternType(requestParams.patternType), - aclutil.FormatPrincipal(opts.Principal), + sdk.FormatPrincipal(opts.Principal), kafkainstanceclient.AclOperation(requestParams.operation), kafkainstanceclient.AclPermissionType(requestParams.permission), ) @@ -144,7 +144,7 @@ func runAdd(instanceID string, opts *aclutil.CrudOptions) error { opts.Logger.Info(opts.Localizer.MustLocalize("kafka.acl.grantPermissions.log.info.aclsPreview")) opts.Logger.Info() - rows := aclutil.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*newAclBinding}, opts.Localizer) + rows := sdk.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*newAclBinding}, opts.Localizer) dump.Table(opts.IO.Out, rows) opts.Logger.Info() @@ -173,7 +173,7 @@ func runAdd(instanceID string, opts *aclutil.CrudOptions) error { req = req.AclBinding(*newAclBinding) - err = aclutil.ExecuteACLRuleCreate(req, opts.Localizer, kafkaName) + err = sdk.ExecuteACLRuleCreate(req, opts.Localizer, kafkaName) spinnr.Stop() if err != nil { return err @@ -182,25 +182,25 @@ func runAdd(instanceID string, opts *aclutil.CrudOptions) error { return nil } -func getRequestParams(opts *aclutil.CrudOptions) *requestParams { +func getRequestParams(opts *sdk.CrudOptions) *requestParams { return &requestParams{ - resourceType: kafkainstanceclient.AclResourceType(aclutil.GetMappedResourceTypeFilterValue(opts.ResourceType)), - principal: aclutil.FormatPrincipal(opts.Principal), - resourceName: aclutil.GetResourceName(opts.ResourceName), - patternType: aclutil.GetMappedPatternTypeValue(opts.PatternType), - operation: aclutil.GetMappedOperationValue(opts.Operation), - permission: aclutil.GetMappedPermissionTypeValue(opts.Permission), + resourceType: kafkainstanceclient.AclResourceType(sdk.GetMappedResourceTypeFilterValue(opts.ResourceType)), + principal: sdk.FormatPrincipal(opts.Principal), + resourceName: sdk.GetResourceName(opts.ResourceName), + patternType: sdk.GetMappedPatternTypeValue(opts.PatternType), + operation: sdk.GetMappedOperationValue(opts.Operation), + permission: sdk.GetMappedPermissionTypeValue(opts.Permission), } } -func validateAndSetOpts(opts *aclutil.CrudOptions) error { +func validateAndSetOpts(opts *sdk.CrudOptions) error { // user and service account should not be provided together if userID != "" && serviceAccount != "" { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.bothPrincipalsSelected") } - if userID == aclutil.Wildcard || serviceAccount == aclutil.Wildcard || userID == aclutil.AllAlias || serviceAccount == aclutil.AllAlias { + if userID == sdk.Wildcard || serviceAccount == sdk.Wildcard || userID == sdk.AllAlias || serviceAccount == sdk.AllAlias { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag") } @@ -208,7 +208,7 @@ func validateAndSetOpts(opts *aclutil.CrudOptions) error { if userID != "" || serviceAccount != "" { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.allAccountsCannotBeUsedWithUserFlag") } - opts.Principal = aclutil.Wildcard + opts.Principal = sdk.Wildcard } // check if principal is provided @@ -216,9 +216,9 @@ func validateAndSetOpts(opts *aclutil.CrudOptions) error { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.noPrincipalsSelected") } - opts.PatternType = aclutil.PatternTypeLITERAL + opts.PatternType = sdk.PatternTypeLITERAL if prefix { - opts.PatternType = aclutil.PatternTypePREFIX + opts.PatternType = sdk.PatternTypePREFIX } if userID != "" { diff --git a/pkg/cmd/kafka/acl/delete/delete.go b/pkg/cmd/kafka/acl/delete/delete.go index fa3254c88..a960ec582 100644 --- a/pkg/cmd/kafka/acl/delete/delete.go +++ b/pkg/cmd/kafka/acl/delete/delete.go @@ -2,8 +2,8 @@ package delete import ( "github.com/AlecAivazis/survey/v2" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" aclFlagUtil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -34,7 +34,7 @@ type requestParams struct { // NewDeleteCommand creates a new command to delete Kafka ACLs func NewDeleteCommand(f *factory.Factory) *cobra.Command { - opts := &aclutil.CrudOptions{ + opts := &sdk.CrudOptions{ Config: f.Config, Connection: f.Connection, Logger: f.Logger, @@ -60,7 +60,7 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command { errorCollection = append(errorCollection, opts.Localizer.MustLocalizeError("kafka.acl.common.flag.operation.required")) } - if resourceErrors := aclutil.ValidateAndSetResources(opts, aclFlagUtil.ResourceTypeFlagEntries); resourceErrors != nil { + if resourceErrors := sdk.ValidateAndSetResources(opts, aclFlagUtil.ResourceTypeFlagEntries); resourceErrors != nil { errorCollection = append(errorCollection, resourceErrors) } @@ -69,7 +69,7 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command { } if len(errorCollection) > 0 { - return aclutil.BuildInstructions(errorCollection) + return sdk.BuildInstructions(errorCollection) } return runDelete(opts.InstanceID, opts) @@ -97,7 +97,7 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command { } // nolint:funlen -func runDelete(instanceID string, opts *aclutil.CrudOptions) error { +func runDelete(instanceID string, opts *sdk.CrudOptions) error { ctx := opts.Context conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth) @@ -118,7 +118,7 @@ func runDelete(instanceID string, opts *aclutil.CrudOptions) error { return err } - if isValidOp, validResourceOperations := aclutil.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp { + if isValidOp, validResourceOperations := sdk.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.invalidResourceOperation", localize.NewEntry("ResourceType", opts.ResourceType), localize.NewEntry("Operation", opts.Operation), @@ -162,7 +162,7 @@ func runDelete(instanceID string, opts *aclutil.CrudOptions) error { defer httpRes.Body.Close() } - err = aclutil.ValidateAPIError(httpRes, opts.Localizer, err, "delete", kafkaInstance.GetName()) + err = sdk.ValidateAPIError(httpRes, opts.Localizer, err, "delete", kafkaInstance.GetName()) spinnr.Stop() if err != nil { @@ -184,32 +184,32 @@ func runDelete(instanceID string, opts *aclutil.CrudOptions) error { opts.Logger.Info(opts.Localizer.MustLocalize("kafka.acl.grantPermissions.log.delete.info.aclsPreview")) opts.Logger.Info() - rows := aclutil.MapACLsToTableRows(*deletedACLs.Items, opts.Localizer) + rows := sdk.MapACLsToTableRows(*deletedACLs.Items, opts.Localizer) dump.Table(opts.IO.Out, rows) opts.Logger.Info() return nil } -func getRequestParams(opts *aclutil.CrudOptions) *requestParams { +func getRequestParams(opts *sdk.CrudOptions) *requestParams { return &requestParams{ - resourceType: aclutil.GetMappedResourceTypeFilterValue(opts.ResourceType), - principal: aclutil.FormatPrincipal(opts.Principal), - resourceName: aclutil.GetResourceName(opts.ResourceName), - patternType: aclutil.GetMappedPatternTypeFilterValue(opts.PatternType), - operation: aclutil.GetMappedOperationFilterValue(opts.Operation), - permission: aclutil.GetMappedPermissionTypeFilterValue(opts.Permission), + resourceType: sdk.GetMappedResourceTypeFilterValue(opts.ResourceType), + principal: sdk.FormatPrincipal(opts.Principal), + resourceName: sdk.GetResourceName(opts.ResourceName), + patternType: sdk.GetMappedPatternTypeFilterValue(opts.PatternType), + operation: sdk.GetMappedOperationFilterValue(opts.Operation), + permission: sdk.GetMappedPermissionTypeFilterValue(opts.Permission), } } -func validateAndSetOpts(opts *aclutil.CrudOptions) error { +func validateAndSetOpts(opts *sdk.CrudOptions) error { // user and service account should not be provided together if userID != "" && serviceAccount != "" { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.bothPrincipalsSelected") } - if userID == aclutil.Wildcard || serviceAccount == aclutil.Wildcard || userID == aclutil.AllAlias || serviceAccount == aclutil.AllAlias { + if userID == sdk.Wildcard || serviceAccount == sdk.Wildcard || userID == sdk.AllAlias || serviceAccount == sdk.AllAlias { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag") } @@ -217,7 +217,7 @@ func validateAndSetOpts(opts *aclutil.CrudOptions) error { if userID != "" || serviceAccount != "" { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.allAccountsCannotBeUsedWithUserFlag") } - opts.Principal = aclutil.Wildcard + opts.Principal = sdk.Wildcard } // check if principal is provided @@ -225,9 +225,9 @@ func validateAndSetOpts(opts *aclutil.CrudOptions) error { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.noPrincipalsSelected") } - opts.PatternType = aclutil.PatternTypeLITERAL + opts.PatternType = sdk.PatternTypeLITERAL if prefix { - opts.PatternType = aclutil.PatternTypePREFIX + opts.PatternType = sdk.PatternTypePREFIX } if userID != "" { diff --git a/pkg/cmd/kafka/acl/flagutil/flagset.go b/pkg/cmd/kafka/acl/flagutil/flagset.go index 8e080b25f..f5fc7aa80 100644 --- a/pkg/cmd/kafka/acl/flagutil/flagset.go +++ b/pkg/cmd/kafka/acl/flagutil/flagset.go @@ -1,7 +1,7 @@ package flagutil import ( - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/localize" @@ -41,7 +41,7 @@ func NewFlagSet(cmd *cobra.Command, f *factory.Factory) *flagSet { func (fs *flagSet) AddResourceType(resourceType *string) *flagutil.FlagOptions { flagName := "resource-type" - resourceTypeFilterMap := aclutil.GetResourceTypeFilterMap() + resourceTypeFilterMap := sdk.GetResourceTypeFilterMap() resourceTypes := make([]string, 0, len(resourceTypeFilterMap)) for i := range resourceTypeFilterMap { @@ -51,7 +51,7 @@ func (fs *flagSet) AddResourceType(resourceType *string) *flagutil.FlagOptions { fs.StringVar( resourceType, flagName, - aclutil.ResourceTypeANY, + sdk.ResourceTypeANY, flagutil.FlagDescription(fs.factory.Localizer, "kafka.acl.common.flag.resourceType", resourceTypes...), ) @@ -66,7 +66,7 @@ func (fs *flagSet) AddResourceType(resourceType *string) *flagutil.FlagOptions { func (fs *flagSet) AddOperationFilter(operationType *string) *flagutil.FlagOptions { flagName := "operation" - operationFilterMap := aclutil.GetOperationFilterMap() + operationFilterMap := sdk.GetOperationFilterMap() operations := make([]string, 0, len(operationFilterMap)) for i := range operationFilterMap { @@ -91,7 +91,7 @@ func (fs *flagSet) AddOperationFilter(operationType *string) *flagutil.FlagOptio func (fs *flagSet) AddOperationCreate(operationType *string) *flagutil.FlagOptions { flagName := "operation" - operationMap := aclutil.GetOperationMap() + operationMap := sdk.GetOperationMap() operations := make([]string, 0, len(operationMap)) for i := range operationMap { @@ -116,7 +116,7 @@ func (fs *flagSet) AddOperationCreate(operationType *string) *flagutil.FlagOptio func (fs *flagSet) AddPermissionFilter(permission *string) *flagutil.FlagOptions { flagName := "permission" - permissionTypeFilterMap := aclutil.GetPermissionTypeFilterMap() + permissionTypeFilterMap := sdk.GetPermissionTypeFilterMap() permissions := make([]string, 0, len(permissionTypeFilterMap)) for i := range permissionTypeFilterMap { @@ -126,7 +126,7 @@ func (fs *flagSet) AddPermissionFilter(permission *string) *flagutil.FlagOptions fs.StringVar( permission, flagName, - aclutil.PermissionANY, + sdk.PermissionANY, flagutil.FlagDescription(fs.factory.Localizer, "kafka.acl.common.flag.permission.description", permissions...), ) @@ -141,7 +141,7 @@ func (fs *flagSet) AddPermissionFilter(permission *string) *flagutil.FlagOptions func (fs *flagSet) AddPermissionCreate(permission *string) *flagutil.FlagOptions { flagName := "permission" - permissionTypeMap := aclutil.GetPermissionTypeMap() + permissionTypeMap := sdk.GetPermissionTypeMap() permissions := make([]string, 0, len(permissionTypeMap)) for i := range permissionTypeMap { diff --git a/pkg/cmd/kafka/acl/grant/grant.go b/pkg/cmd/kafka/acl/grant/grant.go index 08637f629..753aca6b9 100644 --- a/pkg/cmd/kafka/acl/grant/grant.go +++ b/pkg/cmd/kafka/acl/grant/grant.go @@ -3,8 +3,8 @@ package grant import ( "context" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" "github.com/AlecAivazis/survey/v2" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" @@ -127,7 +127,7 @@ func runGrantPermissions(opts *options) (err error) { var groupPatternArg = kafkainstanceclient.ACLPATTERNTYPE_LITERAL if opts.topic != "" { - topicNameArg = aclutil.GetResourceName(opts.topic) + topicNameArg = sdk.GetResourceName(opts.topic) } if opts.topicPrefix != "" { @@ -136,7 +136,7 @@ func runGrantPermissions(opts *options) (err error) { } if opts.group != "" { - groupIdArg = aclutil.GetResourceName(opts.group) + groupIdArg = sdk.GetResourceName(opts.group) } if opts.groupPrefix != "" { @@ -153,13 +153,13 @@ func runGrantPermissions(opts *options) (err error) { } if allAccounts { - opts.principal = aclutil.Wildcard + opts.principal = sdk.Wildcard } var aclBindRequests []kafkainstanceclient.ApiCreateAclRequest var aclBindingList []kafkainstanceclient.AclBinding - userArg := aclutil.FormatPrincipal(opts.principal) + userArg := sdk.FormatPrincipal(opts.principal) req := api.AclsApi.CreateAcl(opts.Context) @@ -237,7 +237,7 @@ func runGrantPermissions(opts *options) (err error) { // Add ACLs for transactional IDs aclBindTransactionIDWrite := kafkainstanceclient.NewAclBinding( kafkainstanceclient.ACLRESOURCETYPE_TRANSACTIONAL_ID, - aclutil.Wildcard, + sdk.Wildcard, kafkainstanceclient.ACLPATTERNTYPE_LITERAL, userArg, kafkainstanceclient.ACLOPERATION_WRITE, @@ -250,7 +250,7 @@ func runGrantPermissions(opts *options) (err error) { aclBindTransactionIDDescribe := kafkainstanceclient.NewAclBinding( kafkainstanceclient.ACLRESOURCETYPE_TRANSACTIONAL_ID, - aclutil.Wildcard, + sdk.Wildcard, kafkainstanceclient.ACLPATTERNTYPE_LITERAL, userArg, kafkainstanceclient.ACLOPERATION_DESCRIBE, @@ -265,7 +265,7 @@ func runGrantPermissions(opts *options) (err error) { opts.Logger.Info(opts.localizer.MustLocalize("kafka.acl.grantPermissions.log.info.aclsPreview")) opts.Logger.Info() - rows := aclutil.MapACLsToTableRows(aclBindingList, opts.localizer) + rows := sdk.MapACLsToTableRows(aclBindingList, opts.localizer) dump.Table(opts.IO.Out, rows) opts.Logger.Info() @@ -288,7 +288,7 @@ func runGrantPermissions(opts *options) (err error) { // Execute ACL rule creations for _, req := range aclBindRequests { - if err = aclutil.ExecuteACLRuleCreate(req, opts.localizer, kafkaName); err != nil { + if err = sdk.ExecuteACLRuleCreate(req, opts.localizer, kafkaName); err != nil { return err } } @@ -360,12 +360,12 @@ func validateFlagInputCombination(opts *options) error { } // user and service account should not allow wildcard - if userID == aclutil.Wildcard || serviceAccount == aclutil.Wildcard || userID == aclutil.AllAlias || serviceAccount == aclutil.AllAlias { + if userID == sdk.Wildcard || serviceAccount == sdk.Wildcard || userID == sdk.AllAlias || serviceAccount == sdk.AllAlias { errorCollection = append(errorCollection, opts.localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag")) } if len(errorCollection) > 0 { - return aclutil.BuildInstructions(errorCollection) + return sdk.BuildInstructions(errorCollection) } return nil diff --git a/pkg/cmd/kafka/acl/list/list.go b/pkg/cmd/kafka/acl/list/list.go index dd39a9dad..187ac1d1e 100644 --- a/pkg/cmd/kafka/acl/list/list.go +++ b/pkg/cmd/kafka/acl/list/list.go @@ -3,8 +3,8 @@ package list import ( "context" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclutil" "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" @@ -93,7 +93,7 @@ func NewListACLCommand(f *factory.Factory) *cobra.Command { } // user and service account should not allow wildcard - if userID == aclutil.Wildcard || serviceAccount == aclutil.Wildcard || userID == aclutil.AllAlias || serviceAccount == aclutil.AllAlias { + if userID == sdk.Wildcard || serviceAccount == sdk.Wildcard || userID == sdk.AllAlias || serviceAccount == sdk.AllAlias { return opts.localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag") } @@ -106,7 +106,7 @@ func NewListACLCommand(f *factory.Factory) *cobra.Command { } if allAccounts { - opts.principal = aclutil.Wildcard + opts.principal = sdk.Wildcard } return runList(opts) @@ -154,7 +154,7 @@ func runList(opts *options) (err error) { req = req.Order("asc").OrderKey("principal") if opts.principal != "" { - principalQuery := aclutil.FormatPrincipal(opts.principal) + principalQuery := sdk.FormatPrincipal(opts.principal) req = req.Principal(principalQuery) } @@ -164,20 +164,20 @@ func runList(opts *options) (err error) { if opts.topic != "" { selectedResourceTypeCount++ - resourceType = aclutil.ResourceTypeTOPIC + resourceType = sdk.ResourceTypeTOPIC resourceName = opts.topic } if opts.group != "" { selectedResourceTypeCount++ - resourceType = aclutil.ResourceTypeGROUP + resourceType = sdk.ResourceTypeGROUP resourceName = opts.group } if opts.cluster { selectedResourceTypeCount++ - resourceType = aclutil.ResourceTypeCLUSTER - resourceName = aclutil.KafkaCluster + resourceType = sdk.ResourceTypeCLUSTER + resourceName = sdk.KafkaCluster } if selectedResourceTypeCount > 1 { @@ -185,11 +185,11 @@ func runList(opts *options) (err error) { } if resourceType != "" { - req = req.ResourceType(aclutil.GetMappedResourceTypeFilterValue(resourceType)) + req = req.ResourceType(sdk.GetMappedResourceTypeFilterValue(resourceType)) } if resourceName != "" { - req = req.ResourceName(aclutil.GetResourceName(resourceName)) + req = req.ResourceName(sdk.GetResourceName(resourceName)) } permissionsData, httpRes, err := req.Execute() @@ -197,7 +197,7 @@ func runList(opts *options) (err error) { defer httpRes.Body.Close() } - if err = aclutil.ValidateAPIError(httpRes, opts.localizer, err, "list", kafkaInstance.GetName()); err != nil { + if err = sdk.ValidateAPIError(httpRes, opts.localizer, err, "list", kafkaInstance.GetName()); err != nil { return err } @@ -211,7 +211,7 @@ func runList(opts *options) (err error) { case dump.EmptyFormat: opts.logger.Info("") permissions := permissionsData.GetItems() - rows := aclutil.MapACLsToTableRows(permissions, opts.localizer) + rows := sdk.MapACLsToTableRows(permissions, opts.localizer) dump.Table(opts.io.Out, rows) default: return dump.Formatted(opts.io.Out, opts.output, permissionsData) diff --git a/pkg/cmd/kafka/acl/aclutil/acl_table.go b/pkg/cmd/kafka/acl/sdk/acl_table.go similarity index 99% rename from pkg/cmd/kafka/acl/aclutil/acl_table.go rename to pkg/cmd/kafka/acl/sdk/acl_table.go index 6a524ca23..257668a0b 100644 --- a/pkg/cmd/kafka/acl/aclutil/acl_table.go +++ b/pkg/cmd/kafka/acl/sdk/acl_table.go @@ -1,4 +1,4 @@ -package aclutil +package sdk import ( "fmt" diff --git a/pkg/cmd/kafka/acl/aclutil/constants.go b/pkg/cmd/kafka/acl/sdk/constants.go similarity index 98% rename from pkg/cmd/kafka/acl/aclutil/constants.go rename to pkg/cmd/kafka/acl/sdk/constants.go index cdcd949ce..fddc2378f 100644 --- a/pkg/cmd/kafka/acl/aclutil/constants.go +++ b/pkg/cmd/kafka/acl/sdk/constants.go @@ -1,4 +1,4 @@ -package aclutil +package sdk const ( Wildcard = "*" diff --git a/pkg/cmd/kafka/acl/aclutil/enums.go b/pkg/cmd/kafka/acl/sdk/enums.go similarity index 99% rename from pkg/cmd/kafka/acl/aclutil/enums.go rename to pkg/cmd/kafka/acl/sdk/enums.go index 025fa831e..9e3a17fc6 100644 --- a/pkg/cmd/kafka/acl/aclutil/enums.go +++ b/pkg/cmd/kafka/acl/sdk/enums.go @@ -1,4 +1,4 @@ -package aclutil +package sdk import kafkainstanceclient "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal/client" diff --git a/pkg/cmd/kafka/acl/aclutil/enums_test.go b/pkg/cmd/kafka/acl/sdk/enums_test.go similarity index 99% rename from pkg/cmd/kafka/acl/aclutil/enums_test.go rename to pkg/cmd/kafka/acl/sdk/enums_test.go index 13df77f29..53e60165e 100644 --- a/pkg/cmd/kafka/acl/aclutil/enums_test.go +++ b/pkg/cmd/kafka/acl/sdk/enums_test.go @@ -1,4 +1,4 @@ -package aclutil +package sdk import ( "reflect" diff --git a/pkg/cmd/kafka/acl/aclutil/util.go b/pkg/cmd/kafka/acl/sdk/util.go similarity index 99% rename from pkg/cmd/kafka/acl/aclutil/util.go rename to pkg/cmd/kafka/acl/sdk/util.go index 7f209605f..2ef4c4953 100644 --- a/pkg/cmd/kafka/acl/aclutil/util.go +++ b/pkg/cmd/kafka/acl/sdk/util.go @@ -1,4 +1,4 @@ -package aclutil +package sdk import ( "context" diff --git a/pkg/cmd/kafka/consumergroup/describe/describe.go b/pkg/cmd/kafka/consumergroup/describe/describe.go index 4eadddefc..719d0848d 100644 --- a/pkg/cmd/kafka/consumergroup/describe/describe.go +++ b/pkg/cmd/kafka/consumergroup/describe/describe.go @@ -7,7 +7,7 @@ import ( "net/http" "sort" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/consumergrouputil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/sdk" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" @@ -189,9 +189,9 @@ func printConsumerGroupDetails(w io.Writer, consumerGroupData kafkainstanceclien fmt.Fprintln(w, "") consumers := consumerGroupData.GetConsumers() - activeMembersCount := consumergrouputil.GetActiveConsumersCount(consumers) - partitionsWithLagCount := consumergrouputil.GetPartitionsWithLag(consumers) - unassignedPartitions := consumergrouputil.GetUnassignedPartitions(consumers) + activeMembersCount := sdk.GetActiveConsumersCount(consumers) + partitionsWithLagCount := sdk.GetPartitionsWithLag(consumers) + unassignedPartitions := sdk.GetUnassignedPartitions(consumers) fmt.Fprintln(w, color.Bold(localizer.MustLocalize("kafka.consumerGroup.describe.output.activeMembers")), activeMembersCount, "\t", color.Bold(localizer.MustLocalize("kafka.consumerGroup.describe.output.partitionsWithLag")), partitionsWithLagCount, "\t", color.Bold(localizer.MustLocalize("kafka.consumerGroup.describe.output.unassignedPartitions")), unassignedPartitions) fmt.Fprintln(w, "") diff --git a/pkg/cmd/kafka/consumergroup/list/list.go b/pkg/cmd/kafka/consumergroup/list/list.go index 90fdab924..8fd969ee5 100644 --- a/pkg/cmd/kafka/consumergroup/list/list.go +++ b/pkg/cmd/kafka/consumergroup/list/list.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/consumergrouputil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/sdk" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" @@ -182,8 +182,8 @@ func mapConsumerGroupResultsToTableFormat(consumerGroups []kafkainstanceclient.C consumers := t.GetConsumers() row := consumerGroupRow{ ConsumerGroupID: t.GetGroupId(), - ActiveMembers: consumergrouputil.GetActiveConsumersCount(consumers), - PartitionsWithLag: consumergrouputil.GetPartitionsWithLag(consumers), + ActiveMembers: sdk.GetActiveConsumersCount(consumers), + PartitionsWithLag: sdk.GetPartitionsWithLag(consumers), } rows[i] = row } diff --git a/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go b/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go index 308b81121..3d5443587 100644 --- a/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go +++ b/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/consumergrouputil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/sdk" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" "github.com/AlecAivazis/survey/v2" @@ -37,7 +37,7 @@ type options struct { Context context.Context } -var validator consumergrouputil.Validator +var validator sdk.Validator // NewResetOffsetConsumerGroupCommand gets a new command for resetting offset for a consumer group. func NewResetOffsetConsumerGroupCommand(f *factory.Factory) *cobra.Command { @@ -57,7 +57,7 @@ func NewResetOffsetConsumerGroupCommand(f *factory.Factory) *cobra.Command { Example: opts.localizer.MustLocalize("kafka.consumerGroup.resetOffset.cmd.example"), Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) (err error) { - validator = consumergrouputil.Validator{ + validator = sdk.Validator{ Localizer: opts.localizer, } @@ -67,7 +67,7 @@ func NewResetOffsetConsumerGroupCommand(f *factory.Factory) *cobra.Command { } } - if opts.value == "" && (opts.offset == consumergrouputil.OffsetAbsolute || opts.offset == consumergrouputil.OffsetTimestamp) { + if opts.value == "" && (opts.offset == sdk.OffsetAbsolute || opts.offset == sdk.OffsetTimestamp) { return opts.localizer.MustLocalizeError("kafka.consumerGroup.resetOffset.error.valueRequired", localize.NewEntry("Offset", opts.offset)) } @@ -115,7 +115,7 @@ func NewResetOffsetConsumerGroupCommand(f *factory.Factory) *cobra.Command { }) flagutil.EnableOutputFlagCompletion(cmd) - flagutil.EnableStaticFlagCompletion(cmd, "offset", consumergrouputil.ValidOffsets) + flagutil.EnableStaticFlagCompletion(cmd, "offset", sdk.ValidOffsets) return cmd } @@ -141,7 +141,7 @@ func runCmd(opts *options) error { offsetResetParams.Value = &opts.value } - if opts.offset == consumergrouputil.OffsetAbsolute || opts.offset == consumergrouputil.OffsetTimestamp { + if opts.offset == sdk.OffsetAbsolute || opts.offset == sdk.OffsetTimestamp { if err = validator.ValidateOffsetValue(opts.offset, opts.value); err != nil { return err } diff --git a/pkg/cmd/kafka/consumergroup/consumergrouputil/util.go b/pkg/cmd/kafka/consumergroup/sdk/util.go similarity index 97% rename from pkg/cmd/kafka/consumergroup/consumergrouputil/util.go rename to pkg/cmd/kafka/consumergroup/sdk/util.go index b9f1e3d92..a4bde18bd 100644 --- a/pkg/cmd/kafka/consumergroup/consumergrouputil/util.go +++ b/pkg/cmd/kafka/consumergroup/sdk/util.go @@ -1,4 +1,4 @@ -package consumergrouputil +package sdk import ( kafkainstanceclient "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal/client" diff --git a/pkg/cmd/kafka/consumergroup/consumergrouputil/validators.go b/pkg/cmd/kafka/consumergroup/sdk/validators.go similarity index 98% rename from pkg/cmd/kafka/consumergroup/consumergrouputil/validators.go rename to pkg/cmd/kafka/consumergroup/sdk/validators.go index a0ec7e3eb..10bc420e9 100644 --- a/pkg/cmd/kafka/consumergroup/consumergrouputil/validators.go +++ b/pkg/cmd/kafka/consumergroup/sdk/validators.go @@ -1,4 +1,4 @@ -package consumergrouputil +package sdk import ( "regexp" diff --git a/pkg/cmd/kafka/consumergroup/consumergrouputil/validators_test.go b/pkg/cmd/kafka/consumergroup/sdk/validators_test.go similarity index 99% rename from pkg/cmd/kafka/consumergroup/consumergrouputil/validators_test.go rename to pkg/cmd/kafka/consumergroup/sdk/validators_test.go index e801f7f05..3bb61cbd3 100644 --- a/pkg/cmd/kafka/consumergroup/consumergrouputil/validators_test.go +++ b/pkg/cmd/kafka/consumergroup/sdk/validators_test.go @@ -1,4 +1,4 @@ -package consumergrouputil +package sdk import ( "testing" diff --git a/pkg/cmd/kafka/create/create.go b/pkg/cmd/kafka/create/create.go index 2254ec418..b2d72a8ea 100644 --- a/pkg/cmd/kafka/create/create.go +++ b/pkg/cmd/kafka/create/create.go @@ -11,7 +11,7 @@ import ( "github.com/redhat-developer/app-services-cli/pkg/svcstatus" "github.com/redhat-developer/app-services-cli/pkg/accountmgmtutil" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/shared" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -81,7 +81,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { if opts.name != "" { - validator := &shared.Validator{ + validator := &sdk.Validator{ Localizer: opts.localizer, Connection: opts.Connection, } @@ -278,7 +278,7 @@ func promptKafkaPayload(opts *options) (payload *kafkamgmtclient.KafkaRequestPay api := conn.API() - validator := &shared.Validator{ + validator := &sdk.Validator{ Localizer: opts.localizer, Connection: opts.Connection, } diff --git a/pkg/cmd/kafka/list/list.go b/pkg/cmd/kafka/list/list.go index 2a5ea41ff..5f890ad80 100644 --- a/pkg/cmd/kafka/list/list.go +++ b/pkg/cmd/kafka/list/list.go @@ -7,7 +7,7 @@ import ( kafkaFlagutil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/flagutil" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/shared" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -75,7 +75,7 @@ func NewListCommand(f *factory.Factory) *cobra.Command { return flagutil.InvalidValueError("output", opts.outputFormat, flagutil.ValidOutputFormats...) } - validator := &shared.Validator{ + validator := &sdk.Validator{ Localizer: opts.localizer, } diff --git a/pkg/cmd/kafka/shared/kafka_util.go b/pkg/cmd/kafka/sdk/kafka_util.go similarity index 99% rename from pkg/cmd/kafka/shared/kafka_util.go rename to pkg/cmd/kafka/sdk/kafka_util.go index 3ba9dfc78..11e3c43bc 100644 --- a/pkg/cmd/kafka/shared/kafka_util.go +++ b/pkg/cmd/kafka/sdk/kafka_util.go @@ -1,4 +1,4 @@ -package shared +package sdk import ( "context" diff --git a/pkg/cmd/kafka/shared/kafka_util_test.go b/pkg/cmd/kafka/sdk/kafka_util_test.go similarity index 99% rename from pkg/cmd/kafka/shared/kafka_util_test.go rename to pkg/cmd/kafka/sdk/kafka_util_test.go index 3fc741731..04540e03a 100644 --- a/pkg/cmd/kafka/shared/kafka_util_test.go +++ b/pkg/cmd/kafka/sdk/kafka_util_test.go @@ -1,4 +1,4 @@ -package shared +package sdk import ( "testing" diff --git a/pkg/cmd/kafka/topic/create/create.go b/pkg/cmd/kafka/topic/create/create.go index 8b418ba65..2a654e161 100644 --- a/pkg/cmd/kafka/topic/create/create.go +++ b/pkg/cmd/kafka/topic/create/create.go @@ -5,7 +5,7 @@ import ( "net/http" "strconv" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/topicutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -77,13 +77,13 @@ func NewCreateTopicCommand(f *factory.Factory) *cobra.Command { } // check that a valid --cleanup-policy flag value is used - validPolicy := flagutil.IsValidInput(opts.cleanupPolicy, topicutil.ValidCleanupPolicies...) + validPolicy := flagutil.IsValidInput(opts.cleanupPolicy, sdk.ValidCleanupPolicies...) if !validPolicy { - return flagutil.InvalidValueError("cleanup-policy", opts.cleanupPolicy, topicutil.ValidCleanupPolicies...) + return flagutil.InvalidValueError("cleanup-policy", opts.cleanupPolicy, sdk.ValidCleanupPolicies...) } if !opts.interactive { - validator := topicutil.Validator{ + validator := sdk.Validator{ Localizer: opts.localizer, } @@ -134,7 +134,7 @@ func NewCreateTopicCommand(f *factory.Factory) *cobra.Command { flags.AddOutput(&opts.outputFormat) flagutil.EnableOutputFlagCompletion(cmd) - flagutil.EnableStaticFlagCompletion(cmd, "cleanup-policy", topicutil.ValidCleanupPolicies) + flagutil.EnableStaticFlagCompletion(cmd, "cleanup-policy", sdk.ValidCleanupPolicies) return cmd } @@ -203,7 +203,7 @@ func runCmd(opts *options) error { } func runInteractivePrompt(opts *options) (err error) { - validator := topicutil.Validator{ + validator := sdk.Validator{ Localizer: opts.localizer, InstanceID: opts.kafkaID, Connection: opts.Connection, @@ -264,7 +264,7 @@ func runInteractivePrompt(opts *options) (err error) { cleanupPolicyPrompt := &survey.Select{ Message: opts.localizer.MustLocalize("kafka.topic.create.input.cleanupPolicy.message"), Help: opts.localizer.MustLocalize("kafka.topic.common.input.cleanupPolicy.description"), - Options: topicutil.ValidCleanupPolicies, + Options: sdk.ValidCleanupPolicies, Default: defaultCleanupPolicy, } @@ -281,9 +281,9 @@ func createConfigEntries(opts *options) *[]kafkainstanceclient.ConfigEntry { retentionBytesStr := strconv.Itoa(opts.retentionBytes) cleanupPolicyStr := opts.cleanupPolicy configEntryMap := map[string]*string{ - topicutil.RetentionMsKey: &retentionMsStr, - topicutil.RetentionSizeKey: &retentionBytesStr, - topicutil.CleanupPolicy: &cleanupPolicyStr, + sdk.RetentionMsKey: &retentionMsStr, + sdk.RetentionSizeKey: &retentionBytesStr, + sdk.CleanupPolicy: &cleanupPolicyStr, } - return topicutil.CreateConfigEntries(configEntryMap) + return sdk.CreateConfigEntries(configEntryMap) } diff --git a/pkg/cmd/kafka/topic/list/list.go b/pkg/cmd/kafka/topic/list/list.go index 6b235298c..7395cb04a 100644 --- a/pkg/cmd/kafka/topic/list/list.go +++ b/pkg/cmd/kafka/topic/list/list.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/topicutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" @@ -77,7 +77,7 @@ func NewListTopicCommand(f *factory.Factory) *cobra.Command { } if opts.search != "" { - validator := topicutil.Validator{ + validator := sdk.Validator{ Localizer: opts.localizer, } if err := validator.ValidateSearchInput(opts.search); err != nil { @@ -191,7 +191,7 @@ func mapTopicResultsToTableFormat(topics []kafkainstanceclient.Topic) []topicRow for _, conf := range t.GetConfig() { unlimitedVal := "-1 (Unlimited)" - if *conf.Key == topicutil.RetentionMsKey { + if *conf.Key == sdk.RetentionMsKey { val := conf.GetValue() if val == "-1" { row.RetentionTime = unlimitedVal @@ -199,7 +199,7 @@ func mapTopicResultsToTableFormat(topics []kafkainstanceclient.Topic) []topicRow row.RetentionTime = val } } - if *conf.Key == topicutil.RetentionSizeKey { + if *conf.Key == sdk.RetentionSizeKey { val := conf.GetValue() if val == "-1" { row.RetentionSize = unlimitedVal diff --git a/pkg/cmd/kafka/topic/topicutil/util.go b/pkg/cmd/kafka/topic/sdk/util.go similarity index 99% rename from pkg/cmd/kafka/topic/topicutil/util.go rename to pkg/cmd/kafka/topic/sdk/util.go index bc05b6d5b..1612efaa8 100644 --- a/pkg/cmd/kafka/topic/topicutil/util.go +++ b/pkg/cmd/kafka/topic/sdk/util.go @@ -1,4 +1,4 @@ -package topicutil +package sdk import ( "fmt" diff --git a/pkg/cmd/kafka/topic/topicutil/util_test.go b/pkg/cmd/kafka/topic/sdk/util_test.go similarity index 98% rename from pkg/cmd/kafka/topic/topicutil/util_test.go rename to pkg/cmd/kafka/topic/sdk/util_test.go index a09984a8d..513c04534 100644 --- a/pkg/cmd/kafka/topic/topicutil/util_test.go +++ b/pkg/cmd/kafka/topic/sdk/util_test.go @@ -1,4 +1,4 @@ -package topicutil +package sdk import ( "reflect" diff --git a/pkg/cmd/kafka/topic/topicutil/validators.go b/pkg/cmd/kafka/topic/sdk/validators.go similarity index 99% rename from pkg/cmd/kafka/topic/topicutil/validators.go rename to pkg/cmd/kafka/topic/sdk/validators.go index 44508dcea..322a16e17 100644 --- a/pkg/cmd/kafka/topic/topicutil/validators.go +++ b/pkg/cmd/kafka/topic/sdk/validators.go @@ -1,4 +1,4 @@ -package topicutil +package sdk import ( "context" diff --git a/pkg/cmd/kafka/topic/topicutil/validators_test.go b/pkg/cmd/kafka/topic/sdk/validators_test.go similarity index 99% rename from pkg/cmd/kafka/topic/topicutil/validators_test.go rename to pkg/cmd/kafka/topic/sdk/validators_test.go index 7efb68fa6..137b52978 100644 --- a/pkg/cmd/kafka/topic/topicutil/validators_test.go +++ b/pkg/cmd/kafka/topic/sdk/validators_test.go @@ -1,4 +1,4 @@ -package topicutil +package sdk import ( "testing" diff --git a/pkg/cmd/kafka/topic/update/update.go b/pkg/cmd/kafka/topic/update/update.go index 6800e3801..8948e6bb0 100644 --- a/pkg/cmd/kafka/topic/update/update.go +++ b/pkg/cmd/kafka/topic/update/update.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/topicutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/sdk" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" "github.com/AlecAivazis/survey/v2" @@ -63,7 +63,7 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { Example: opts.localizer.MustLocalize("kafka.topic.update.cmd.example"), Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) (err error) { - validator := topicutil.Validator{ + validator := sdk.Validator{ Localizer: opts.localizer, } @@ -85,9 +85,9 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { // check that a valid --cleanup-policy flag value is used if opts.cleanupPolicy != "" { - validPolicy := flagutil.IsValidInput(opts.cleanupPolicy, topicutil.ValidCleanupPolicies...) + validPolicy := flagutil.IsValidInput(opts.cleanupPolicy, sdk.ValidCleanupPolicies...) if !validPolicy { - return flagutil.InvalidValueError("cleanup-policy", opts.cleanupPolicy, topicutil.ValidCleanupPolicies...) + return flagutil.InvalidValueError("cleanup-policy", opts.cleanupPolicy, sdk.ValidCleanupPolicies...) } } @@ -96,7 +96,7 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { // check if the partition flag is set if opts.partitionsStr != "" { // nolint:govet - partitionCount, err = topicutil.ConvertPartitionsToInt(opts.partitionsStr) + partitionCount, err = sdk.ConvertPartitionsToInt(opts.partitionsStr) if err != nil { return err } @@ -107,7 +107,7 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { } if opts.retentionMsStr != "" { - retentionPeriodMs, err = topicutil.ConvertRetentionMsToInt(opts.retentionMsStr) + retentionPeriodMs, err = sdk.ConvertRetentionMsToInt(opts.retentionMsStr) if err != nil { return err } @@ -118,7 +118,7 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { } if opts.retentionBytesStr != "" { - retentionSizeBytes, err = topicutil.ConvertRetentionBytesToInt(opts.retentionBytesStr) + retentionSizeBytes, err = sdk.ConvertRetentionBytesToInt(opts.retentionBytesStr) if err != nil { return err } @@ -159,7 +159,7 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { flagutil.EnableOutputFlagCompletion(cmd) - flagutil.EnableStaticFlagCompletion(cmd, "cleanup-policy", topicutil.ValidCleanupPolicies) + flagutil.EnableStaticFlagCompletion(cmd, "cleanup-policy", sdk.ValidCleanupPolicies) return cmd } @@ -174,21 +174,21 @@ func runCmd(opts *options) error { } if opts.retentionMsStr != "" { - retentionPeriodMs, err = topicutil.ConvertRetentionMsToInt(opts.retentionMsStr) + retentionPeriodMs, err = sdk.ConvertRetentionMsToInt(opts.retentionMsStr) if err != nil { return err } } if opts.retentionBytesStr != "" { - retentionSizeBytes, err = topicutil.ConvertRetentionBytesToInt(opts.retentionBytesStr) + retentionSizeBytes, err = sdk.ConvertRetentionBytesToInt(opts.retentionBytesStr) if err != nil { return err } } if opts.partitionsStr != "" { - partitionCount, err = topicutil.ConvertPartitionsToInt(opts.partitionsStr) + partitionCount, err = sdk.ConvertPartitionsToInt(opts.partitionsStr) if err != nil { return err } @@ -234,17 +234,17 @@ func runCmd(opts *options) error { if opts.retentionMsStr != "" { needsUpdate = true - configEntryMap[topicutil.RetentionMsKey] = &opts.retentionMsStr + configEntryMap[sdk.RetentionMsKey] = &opts.retentionMsStr } if opts.retentionBytesStr != "" { needsUpdate = true - configEntryMap[topicutil.RetentionSizeKey] = &opts.retentionBytesStr + configEntryMap[sdk.RetentionSizeKey] = &opts.retentionBytesStr } - if opts.cleanupPolicy != "" && strings.Compare(opts.cleanupPolicy, topicutil.GetConfigValue(topic.GetConfig(), topicutil.CleanupPolicy)) != 0 { + if opts.cleanupPolicy != "" && strings.Compare(opts.cleanupPolicy, sdk.GetConfigValue(topic.GetConfig(), sdk.CleanupPolicy)) != 0 { needsUpdate = true - configEntryMap[topicutil.CleanupPolicy] = &opts.cleanupPolicy + configEntryMap[sdk.CleanupPolicy] = &opts.cleanupPolicy } if opts.partitionsStr != "" { @@ -258,7 +258,7 @@ func runCmd(opts *options) error { } if len(configEntryMap) > 0 { - configEntries := topicutil.CreateConfigEntries(configEntryMap) + configEntries := sdk.CreateConfigEntries(configEntryMap) topicSettings.SetConfig(*configEntries) } @@ -325,7 +325,7 @@ func runInteractivePrompt(opts *options) (err error) { } } - validator := topicutil.Validator{ + validator := sdk.Validator{ Localizer: opts.localizer, } @@ -366,8 +366,8 @@ func runInteractivePrompt(opts *options) (err error) { cleanupPolicyPrompt := &survey.Select{ Message: opts.localizer.MustLocalize("kafka.topic.update.input.cleanupPolicy.message"), Help: opts.localizer.MustLocalize("kafka.topic.update.input.cleanupPolicy.help"), - Options: topicutil.ValidCleanupPolicies, - Default: topicutil.GetConfigValue(topic.GetConfig(), topicutil.CleanupPolicy), + Options: sdk.ValidCleanupPolicies, + Default: sdk.GetConfigValue(topic.GetConfig(), sdk.CleanupPolicy), } err = survey.AskOne(cleanupPolicyPrompt, &opts.cleanupPolicy) diff --git a/pkg/cmd/registry/artifact/crud/create/create.go b/pkg/cmd/registry/artifact/crud/create/create.go index ebcaabac1..8e2373f35 100644 --- a/pkg/cmd/registry/artifact/crud/create/create.go +++ b/pkg/cmd/registry/artifact/crud/create/create.go @@ -5,8 +5,8 @@ import ( "os" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -175,7 +175,7 @@ func runCreate(opts *options) error { request = request.Body(specifiedFile) metadata, _, err := request.Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.created")) diff --git a/pkg/cmd/registry/artifact/crud/delete/delete.go b/pkg/cmd/registry/artifact/crud/delete/delete.go index fd7a36491..4b92f811e 100644 --- a/pkg/cmd/registry/artifact/crud/delete/delete.go +++ b/pkg/cmd/registry/artifact/crud/delete/delete.go @@ -6,7 +6,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -106,7 +106,7 @@ func runDelete(opts *options) error { request := dataAPI.ArtifactsApi.DeleteArtifactsInGroup(opts.Context, opts.group) _, err = request.Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.AllArtifactsInGroupDeleted", localize.NewEntry("GroupName", opts.group))) } else { @@ -123,7 +123,7 @@ func runDelete(opts *options) error { _, err = request.Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.deleted", localize.NewEntry("Name", opts.artifact))) } diff --git a/pkg/cmd/registry/artifact/crud/get/get.go b/pkg/cmd/registry/artifact/crud/get/get.go index a289a571e..70faa7f3a 100644 --- a/pkg/cmd/registry/artifact/crud/get/get.go +++ b/pkg/cmd/registry/artifact/crud/get/get.go @@ -7,7 +7,7 @@ import ( "os" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -114,7 +114,7 @@ func runGet(opts *options) error { dataFile, _, err = request.Execute() } if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } fileContent, err := ioutil.ReadFile(dataFile.Name()) if err != nil { diff --git a/pkg/cmd/registry/artifact/crud/list/list.go b/pkg/cmd/registry/artifact/crud/list/list.go index a4c5f34c8..602c3dfcb 100644 --- a/pkg/cmd/registry/artifact/crud/list/list.go +++ b/pkg/cmd/registry/artifact/crud/list/list.go @@ -4,7 +4,7 @@ import ( "context" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -136,7 +136,7 @@ func runList(opts *options) error { response, _, err := request.Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } if len(response.Artifacts) == 0 && opts.outputFormat == "" { diff --git a/pkg/cmd/registry/artifact/download/download.go b/pkg/cmd/registry/artifact/download/download.go index 8e85e3188..33c4961bd 100644 --- a/pkg/cmd/registry/artifact/download/download.go +++ b/pkg/cmd/registry/artifact/download/download.go @@ -7,7 +7,7 @@ import ( "os" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -124,7 +124,7 @@ func runGet(opts *options) error { } if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } fileContent, err := ioutil.ReadFile(dataFile.Name()) diff --git a/pkg/cmd/registry/artifact/metadata/get.go b/pkg/cmd/registry/artifact/metadata/get.go index 44ffc5763..71e12a799 100644 --- a/pkg/cmd/registry/artifact/metadata/get.go +++ b/pkg/cmd/registry/artifact/metadata/get.go @@ -4,7 +4,7 @@ import ( "context" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -111,7 +111,7 @@ func runGet(opts *GetOptions) error { request := dataAPI.MetadataApi.GetArtifactMetaData(opts.Context, opts.group, opts.artifact) response, _, err := request.Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } artifactURL, ok := util.GetArtifactURL(registry, &response) diff --git a/pkg/cmd/registry/artifact/metadata/set.go b/pkg/cmd/registry/artifact/metadata/set.go index 9ef37073c..66fdd9705 100644 --- a/pkg/cmd/registry/artifact/metadata/set.go +++ b/pkg/cmd/registry/artifact/metadata/set.go @@ -5,7 +5,7 @@ import ( "encoding/json" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -117,7 +117,7 @@ func runSet(opts *SetOptions) error { request := dataAPI.MetadataApi.GetArtifactMetaData(opts.Context, opts.group, opts.artifact) currentMetadata, _, err := request.Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } editableMedata := ®istryinstanceclient.EditableMetaData{ @@ -148,7 +148,7 @@ func runSet(opts *SetOptions) error { editRequest := dataAPI.MetadataApi.UpdateArtifactMetaData(opts.Context, opts.group, opts.artifact) _, err = editRequest.EditableMetaData(*editableMedata).Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } opts.Logger.Info(icon.SuccessPrefix(), opts.localizer.MustLocalize("artifact.common.message.artifact.metadata.updated")) diff --git a/pkg/cmd/registry/artifact/migrate/export.go b/pkg/cmd/registry/artifact/migrate/export.go index 2d014b095..97ee012a6 100644 --- a/pkg/cmd/registry/artifact/migrate/export.go +++ b/pkg/cmd/registry/artifact/migrate/export.go @@ -5,7 +5,7 @@ import ( "io" "os" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "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" @@ -89,7 +89,7 @@ func runExport(opts *ExportOptions) error { request := dataAPI.AdminApi.ExportData(opts.Context) file, _, err := request.Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } _, err = io.Copy(fileContent, file) if err != nil { diff --git a/pkg/cmd/registry/artifact/migrate/import.go b/pkg/cmd/registry/artifact/migrate/import.go index d4d77d4a4..c63cb2214 100644 --- a/pkg/cmd/registry/artifact/migrate/import.go +++ b/pkg/cmd/registry/artifact/migrate/import.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "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" @@ -92,7 +92,7 @@ func runImport(opts *ImportOptions) error { request := dataAPI.AdminApi.ImportData(opts.Context) _, err = request.Body(specifiedFile).Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.import.success")) diff --git a/pkg/cmd/registry/artifact/role/add/add.go b/pkg/cmd/registry/artifact/role/add/add.go index 83ffacec2..b7648cf1c 100644 --- a/pkg/cmd/registry/artifact/role/add/add.go +++ b/pkg/cmd/registry/artifact/role/add/add.go @@ -4,7 +4,7 @@ import ( "context" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "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" @@ -123,7 +123,7 @@ func runAdd(opts *options) error { Role: *role, }).Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } } else { opts.Logger.Info(opts.localizer.MustLocalize("registry.role.cmd.creating")) @@ -134,7 +134,7 @@ func runAdd(opts *options) error { request := dataAPI.AdminApi.CreateRoleMapping(opts.Context) _, err = request.RoleMapping(roleMapping).Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } } @@ -147,7 +147,7 @@ func runAdd(opts *options) error { func principalHasRole(opts *options, admin registryinstanceclient.AdminApi) bool { _, _, err := admin.GetRoleMapping(opts.Context, opts.principal).Execute() if err != nil { - apiError, _ := registryutil.GetInstanceAPIError(err) + apiError, _ := sdk.GetInstanceAPIError(err) return apiError.GetErrorCode() != 404 } return true diff --git a/pkg/cmd/registry/artifact/role/list/list.go b/pkg/cmd/registry/artifact/role/list/list.go index ed7c7600c..b603d6131 100644 --- a/pkg/cmd/registry/artifact/role/list/list.go +++ b/pkg/cmd/registry/artifact/role/list/list.go @@ -3,7 +3,7 @@ package list import ( "context" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -100,7 +100,7 @@ func runList(opts *options) error { } mappings, _, err := a.AdminApi.ListRoleMappings(opts.Context).Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } if len(mappings) == 0 && opts.outputFormat == "" { diff --git a/pkg/cmd/registry/artifact/role/revoke/revoke.go b/pkg/cmd/registry/artifact/role/revoke/revoke.go index 7d1c91dd3..0fdb857a0 100644 --- a/pkg/cmd/registry/artifact/role/revoke/revoke.go +++ b/pkg/cmd/registry/artifact/role/revoke/revoke.go @@ -3,7 +3,7 @@ package revoke import ( "context" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "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" @@ -98,7 +98,7 @@ func runRevoke(opts *options) error { _, err = dataAPI.AdminApi.DeleteRoleMapping(opts.Context, opts.principal).Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("registry.role.cmd.revoke.success")) diff --git a/pkg/cmd/registry/artifact/state/state.go b/pkg/cmd/registry/artifact/state/state.go index 9bcd67bce..b374a7bd7 100644 --- a/pkg/cmd/registry/artifact/state/state.go +++ b/pkg/cmd/registry/artifact/state/state.go @@ -4,7 +4,7 @@ import ( "context" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "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" @@ -112,7 +112,7 @@ func runSet(opts *options) error { request := dataAPI.ArtifactsApi.UpdateArtifactState(opts.context, opts.group, opts.artifact) _, err = request.UpdateState(*registryinstanceclient.NewUpdateState(*updateState)).Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.artifact.state.updated")) diff --git a/pkg/cmd/registry/artifact/versions/versions.go b/pkg/cmd/registry/artifact/versions/versions.go index 8d8aec694..8eeaa30da 100644 --- a/pkg/cmd/registry/artifact/versions/versions.go +++ b/pkg/cmd/registry/artifact/versions/versions.go @@ -4,7 +4,7 @@ import ( "context" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -104,7 +104,7 @@ func runGet(opts *options) error { request := dataAPI.VersionsApi.ListArtifactVersions(opts.Context, opts.group, opts.artifact) response, _, err := request.Execute() if err != nil { - return registryutil.TransformInstanceError(err) + return sdk.TransformInstanceError(err) } opts.Logger.Info(icon.SuccessPrefix(), opts.localizer.MustLocalize("artifact.common.message.artifact.versions.fetched")) diff --git a/pkg/cmd/registry/create/create.go b/pkg/cmd/registry/create/create.go index ce0c1738d..6e4fd6f17 100644 --- a/pkg/cmd/registry/create/create.go +++ b/pkg/cmd/registry/create/create.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/redhat-developer/app-services-cli/pkg/accountmgmtutil" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registryutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -58,7 +58,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { if opts.name != "" { - if err := registryutil.ValidateName(opts.name); err != nil { + if err := sdk.ValidateName(opts.name); err != nil { return err } } @@ -183,7 +183,7 @@ func promptPayload(opts *options) (payload *srsmgmtv1.RegistryCreate, err error) Help: opts.localizer.MustLocalize("registry.cmd.create.input.name.help"), } - err = survey.AskOne(promptName, &answers.Name, survey.WithValidator(registryutil.ValidateName)) + err = survey.AskOne(promptName, &answers.Name, survey.WithValidator(sdk.ValidateName)) if err != nil { return nil, err } diff --git a/pkg/cmd/registry/registryutil/error.go b/pkg/cmd/registry/sdk/error.go similarity index 97% rename from pkg/cmd/registry/registryutil/error.go rename to pkg/cmd/registry/sdk/error.go index 679618872..c93f2412d 100644 --- a/pkg/cmd/registry/registryutil/error.go +++ b/pkg/cmd/registry/sdk/error.go @@ -1,4 +1,4 @@ -package registryutil +package sdk import ( "errors" diff --git a/pkg/cmd/registry/registryutil/registry_util.go b/pkg/cmd/registry/sdk/registry_util.go similarity index 96% rename from pkg/cmd/registry/registryutil/registry_util.go rename to pkg/cmd/registry/sdk/registry_util.go index 5fcc2cd2d..c4bd1ec49 100644 --- a/pkg/cmd/registry/registryutil/registry_util.go +++ b/pkg/cmd/registry/sdk/registry_util.go @@ -1,4 +1,4 @@ -package registryutil +package sdk import ( "errors" diff --git a/pkg/cmd/serviceaccount/create/create.go b/pkg/cmd/serviceaccount/create/create.go index a95fc4dfa..93c00b889 100644 --- a/pkg/cmd/serviceaccount/create/create.go +++ b/pkg/cmd/serviceaccount/create/create.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/shared/validation" + "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/sdk/validation" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" diff --git a/pkg/cmd/serviceaccount/delete/delete.go b/pkg/cmd/serviceaccount/delete/delete.go index d8b2c6330..e91c1f046 100644 --- a/pkg/cmd/serviceaccount/delete/delete.go +++ b/pkg/cmd/serviceaccount/delete/delete.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/shared/validation" + "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/sdk/validation" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" diff --git a/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go b/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go index ab416c29c..bf3cda308 100644 --- a/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go +++ b/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/shared/validation" + "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/sdk/validation" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" diff --git a/pkg/cmd/serviceaccount/shared/validation/validation.go b/pkg/cmd/serviceaccount/sdk/validation/validation.go similarity index 100% rename from pkg/cmd/serviceaccount/shared/validation/validation.go rename to pkg/cmd/serviceaccount/sdk/validation/validation.go diff --git a/pkg/cmd/serviceaccount/shared/validation/validation_test.go b/pkg/cmd/serviceaccount/sdk/validation/validation_test.go similarity index 100% rename from pkg/cmd/serviceaccount/shared/validation/validation_test.go rename to pkg/cmd/serviceaccount/sdk/validation/validation_test.go From c327ea6cc147211cd5dcf5ae27bfd9ff70b04458 Mon Sep 17 00:00:00 2001 From: Ramakrishna Pattnaik Date: Sat, 8 Jan 2022 21:56:13 +0530 Subject: [PATCH 3/3] fix: rename sdk to cmd specific --- .../acl/{sdk => aclcmdutil}/acl_table.go | 2 +- .../acl/{sdk => aclcmdutil}/constants.go | 2 +- .../kafka/acl/{sdk => aclcmdutil}/enums.go | 2 +- .../acl/{sdk => aclcmdutil}/enums_test.go | 2 +- pkg/cmd/kafka/acl/{sdk => aclcmdutil}/util.go | 2 +- pkg/cmd/kafka/acl/admin/admin.go | 14 +++---- pkg/cmd/kafka/acl/create/create.go | 42 +++++++++---------- pkg/cmd/kafka/acl/delete/delete.go | 40 +++++++++--------- pkg/cmd/kafka/acl/flagutil/flagset.go | 16 +++---- pkg/cmd/kafka/acl/grant/grant.go | 22 +++++----- pkg/cmd/kafka/acl/list/list.go | 24 +++++------ .../kafka/consumergroup/describe/describe.go | 8 ++-- .../{sdk => groupcmdutil}/util.go | 2 +- .../{sdk => groupcmdutil}/validators.go | 2 +- .../{sdk => groupcmdutil}/validators_test.go | 2 +- pkg/cmd/kafka/consumergroup/list/list.go | 6 +-- .../consumergroup/resetoffset/reset_offset.go | 12 +++--- pkg/cmd/kafka/create/create.go | 6 +-- .../kafka/{sdk => kafkacmdutil}/kafka_util.go | 2 +- .../{sdk => kafkacmdutil}/kafka_util_test.go | 2 +- pkg/cmd/kafka/list/list.go | 4 +- pkg/cmd/kafka/topic/create/create.go | 23 +++++----- pkg/cmd/kafka/topic/list/list.go | 9 ++-- .../kafka/topic/{sdk => topiccmdutil}/util.go | 2 +- .../topic/{sdk => topiccmdutil}/util_test.go | 2 +- .../topic/{sdk => topiccmdutil}/validators.go | 2 +- .../{sdk => topiccmdutil}/validators_test.go | 2 +- pkg/cmd/kafka/topic/update/update.go | 38 ++++++++--------- .../registry/artifact/crud/create/create.go | 4 +- .../registry/artifact/crud/delete/delete.go | 6 +-- pkg/cmd/registry/artifact/crud/get/get.go | 4 +- pkg/cmd/registry/artifact/crud/list/list.go | 4 +- .../registry/artifact/download/download.go | 4 +- pkg/cmd/registry/artifact/metadata/get.go | 4 +- pkg/cmd/registry/artifact/metadata/set.go | 6 +-- pkg/cmd/registry/artifact/migrate/export.go | 4 +- pkg/cmd/registry/artifact/migrate/import.go | 4 +- pkg/cmd/registry/artifact/role/add/add.go | 8 ++-- pkg/cmd/registry/artifact/role/list/list.go | 4 +- .../registry/artifact/role/revoke/revoke.go | 4 +- pkg/cmd/registry/artifact/state/state.go | 4 +- .../registry/artifact/versions/versions.go | 4 +- pkg/cmd/registry/create/create.go | 6 +-- .../{sdk => registrycmdutil}/error.go | 2 +- .../{sdk => registrycmdutil}/registry_util.go | 2 +- .../validation/validation.go | 0 .../validation/validation_test.go | 0 pkg/cmd/serviceaccount/create/create.go | 2 +- pkg/cmd/serviceaccount/delete/delete.go | 2 +- .../resetcredentials/reset_credentials.go | 2 +- 50 files changed, 185 insertions(+), 187 deletions(-) rename pkg/cmd/kafka/acl/{sdk => aclcmdutil}/acl_table.go (99%) rename pkg/cmd/kafka/acl/{sdk => aclcmdutil}/constants.go (97%) rename pkg/cmd/kafka/acl/{sdk => aclcmdutil}/enums.go (99%) rename pkg/cmd/kafka/acl/{sdk => aclcmdutil}/enums_test.go (99%) rename pkg/cmd/kafka/acl/{sdk => aclcmdutil}/util.go (99%) rename pkg/cmd/kafka/consumergroup/{sdk => groupcmdutil}/util.go (98%) rename pkg/cmd/kafka/consumergroup/{sdk => groupcmdutil}/validators.go (98%) rename pkg/cmd/kafka/consumergroup/{sdk => groupcmdutil}/validators_test.go (99%) rename pkg/cmd/kafka/{sdk => kafkacmdutil}/kafka_util.go (99%) rename pkg/cmd/kafka/{sdk => kafkacmdutil}/kafka_util_test.go (99%) rename pkg/cmd/kafka/topic/{sdk => topiccmdutil}/util.go (98%) rename pkg/cmd/kafka/topic/{sdk => topiccmdutil}/util_test.go (97%) rename pkg/cmd/kafka/topic/{sdk => topiccmdutil}/validators.go (99%) rename pkg/cmd/kafka/topic/{sdk => topiccmdutil}/validators_test.go (99%) rename pkg/cmd/registry/{sdk => registrycmdutil}/error.go (97%) rename pkg/cmd/registry/{sdk => registrycmdutil}/registry_util.go (96%) rename pkg/cmd/serviceaccount/{sdk => accountcmdutil}/validation/validation.go (100%) rename pkg/cmd/serviceaccount/{sdk => accountcmdutil}/validation/validation_test.go (100%) diff --git a/pkg/cmd/kafka/acl/sdk/acl_table.go b/pkg/cmd/kafka/acl/aclcmdutil/acl_table.go similarity index 99% rename from pkg/cmd/kafka/acl/sdk/acl_table.go rename to pkg/cmd/kafka/acl/aclcmdutil/acl_table.go index 257668a0b..24d64db20 100644 --- a/pkg/cmd/kafka/acl/sdk/acl_table.go +++ b/pkg/cmd/kafka/acl/aclcmdutil/acl_table.go @@ -1,4 +1,4 @@ -package sdk +package aclcmdutil import ( "fmt" diff --git a/pkg/cmd/kafka/acl/sdk/constants.go b/pkg/cmd/kafka/acl/aclcmdutil/constants.go similarity index 97% rename from pkg/cmd/kafka/acl/sdk/constants.go rename to pkg/cmd/kafka/acl/aclcmdutil/constants.go index fddc2378f..f912e436b 100644 --- a/pkg/cmd/kafka/acl/sdk/constants.go +++ b/pkg/cmd/kafka/acl/aclcmdutil/constants.go @@ -1,4 +1,4 @@ -package sdk +package aclcmdutil const ( Wildcard = "*" diff --git a/pkg/cmd/kafka/acl/sdk/enums.go b/pkg/cmd/kafka/acl/aclcmdutil/enums.go similarity index 99% rename from pkg/cmd/kafka/acl/sdk/enums.go rename to pkg/cmd/kafka/acl/aclcmdutil/enums.go index 9e3a17fc6..eb6b75b98 100644 --- a/pkg/cmd/kafka/acl/sdk/enums.go +++ b/pkg/cmd/kafka/acl/aclcmdutil/enums.go @@ -1,4 +1,4 @@ -package sdk +package aclcmdutil import kafkainstanceclient "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal/client" diff --git a/pkg/cmd/kafka/acl/sdk/enums_test.go b/pkg/cmd/kafka/acl/aclcmdutil/enums_test.go similarity index 99% rename from pkg/cmd/kafka/acl/sdk/enums_test.go rename to pkg/cmd/kafka/acl/aclcmdutil/enums_test.go index 53e60165e..fee9ed009 100644 --- a/pkg/cmd/kafka/acl/sdk/enums_test.go +++ b/pkg/cmd/kafka/acl/aclcmdutil/enums_test.go @@ -1,4 +1,4 @@ -package sdk +package aclcmdutil import ( "reflect" diff --git a/pkg/cmd/kafka/acl/sdk/util.go b/pkg/cmd/kafka/acl/aclcmdutil/util.go similarity index 99% rename from pkg/cmd/kafka/acl/sdk/util.go rename to pkg/cmd/kafka/acl/aclcmdutil/util.go index 2ef4c4953..9040dac36 100644 --- a/pkg/cmd/kafka/acl/sdk/util.go +++ b/pkg/cmd/kafka/acl/aclcmdutil/util.go @@ -1,4 +1,4 @@ -package sdk +package aclcmdutil import ( "context" diff --git a/pkg/cmd/kafka/acl/admin/admin.go b/pkg/cmd/kafka/acl/admin/admin.go index acba451af..0744807bd 100644 --- a/pkg/cmd/kafka/acl/admin/admin.go +++ b/pkg/cmd/kafka/acl/admin/admin.go @@ -3,8 +3,8 @@ package admin import ( "context" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclcmdutil" flagset "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" "github.com/AlecAivazis/survey/v2" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" @@ -83,7 +83,7 @@ func NewAdminACLCommand(f *factory.Factory) *cobra.Command { } // user and service account should not allow wildcard - if userID == sdk.Wildcard || serviceAccount == sdk.Wildcard || userID == sdk.AllAlias || serviceAccount == sdk.AllAlias { + if userID == aclcmdutil.Wildcard || serviceAccount == aclcmdutil.Wildcard || userID == aclcmdutil.AllAlias || serviceAccount == aclcmdutil.AllAlias { return opts.localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag") } @@ -96,7 +96,7 @@ func NewAdminACLCommand(f *factory.Factory) *cobra.Command { } if allAccounts { - opts.principal = sdk.Wildcard + opts.principal = aclcmdutil.Wildcard } return runAdmin(opts) @@ -131,9 +131,9 @@ func runAdmin(opts *options) (err error) { aclBindClusterAlter := kafkainstanceclient.NewAclBinding( kafkainstanceclient.ACLRESOURCETYPE_CLUSTER, - sdk.KafkaCluster, + aclcmdutil.KafkaCluster, kafkainstanceclient.ACLPATTERNTYPE_LITERAL, - sdk.FormatPrincipal(opts.principal), + aclcmdutil.FormatPrincipal(opts.principal), kafkainstanceclient.ACLOPERATION_ALTER, kafkainstanceclient.ACLPERMISSIONTYPE_ALLOW, ) @@ -141,7 +141,7 @@ func runAdmin(opts *options) (err error) { opts.logger.Info(opts.localizer.MustLocalize("kafka.acl.grantPermissions.log.info.aclsPreview")) opts.logger.Info() - rows := sdk.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*aclBindClusterAlter}, opts.localizer) + rows := aclcmdutil.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*aclBindClusterAlter}, opts.localizer) dump.Table(opts.io.Out, rows) opts.logger.Info() @@ -164,7 +164,7 @@ func runAdmin(opts *options) (err error) { req = req.AclBinding(*aclBindClusterAlter) - err = sdk.ExecuteACLRuleCreate(req, opts.localizer, kafkaName) + err = aclcmdutil.ExecuteACLRuleCreate(req, opts.localizer, kafkaName) if err != nil { return err } diff --git a/pkg/cmd/kafka/acl/create/create.go b/pkg/cmd/kafka/acl/create/create.go index 32f88742d..23b5f6b53 100644 --- a/pkg/cmd/kafka/acl/create/create.go +++ b/pkg/cmd/kafka/acl/create/create.go @@ -2,8 +2,8 @@ package create import ( "github.com/AlecAivazis/survey/v2" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclcmdutil" aclFlagutil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -33,7 +33,7 @@ type requestParams struct { // NewCreateCommand creates a new command to add Kafka ACLs func NewCreateCommand(f *factory.Factory) *cobra.Command { - opts := &sdk.CrudOptions{ + opts := &aclcmdutil.CrudOptions{ Config: f.Config, Connection: f.Connection, Logger: f.Logger, @@ -63,7 +63,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { errorCollection = append(errorCollection, opts.Localizer.MustLocalizeError("kafka.acl.common.flag.operation.required")) } - if resourceErrors := sdk.ValidateAndSetResources(opts, aclFlagutil.ResourceTypeFlagEntries); resourceErrors != nil { + if resourceErrors := aclcmdutil.ValidateAndSetResources(opts, aclFlagutil.ResourceTypeFlagEntries); resourceErrors != nil { errorCollection = append(errorCollection, resourceErrors) } @@ -72,7 +72,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { } if len(errorCollection) > 0 { - return sdk.BuildInstructions(errorCollection) + return aclcmdutil.BuildInstructions(errorCollection) } return runAdd(opts.InstanceID, opts) @@ -99,7 +99,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { } // nolint:funlen -func runAdd(instanceID string, opts *sdk.CrudOptions) error { +func runAdd(instanceID string, opts *aclcmdutil.CrudOptions) error { ctx := opts.Context conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth) @@ -122,7 +122,7 @@ func runAdd(instanceID string, opts *sdk.CrudOptions) error { return err } - if isValidOp, validResourceOperations := sdk.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp { + if isValidOp, validResourceOperations := aclcmdutil.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.invalidResourceOperation", localize.NewEntry("ResourceType", opts.ResourceType), localize.NewEntry("Operation", opts.Operation), @@ -136,7 +136,7 @@ func runAdd(instanceID string, opts *sdk.CrudOptions) error { kafkainstanceclient.AclResourceType(requestParams.resourceType), requestParams.resourceName, kafkainstanceclient.AclPatternType(requestParams.patternType), - sdk.FormatPrincipal(opts.Principal), + aclcmdutil.FormatPrincipal(opts.Principal), kafkainstanceclient.AclOperation(requestParams.operation), kafkainstanceclient.AclPermissionType(requestParams.permission), ) @@ -144,7 +144,7 @@ func runAdd(instanceID string, opts *sdk.CrudOptions) error { opts.Logger.Info(opts.Localizer.MustLocalize("kafka.acl.grantPermissions.log.info.aclsPreview")) opts.Logger.Info() - rows := sdk.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*newAclBinding}, opts.Localizer) + rows := aclcmdutil.MapACLsToTableRows([]kafkainstanceclient.AclBinding{*newAclBinding}, opts.Localizer) dump.Table(opts.IO.Out, rows) opts.Logger.Info() @@ -173,7 +173,7 @@ func runAdd(instanceID string, opts *sdk.CrudOptions) error { req = req.AclBinding(*newAclBinding) - err = sdk.ExecuteACLRuleCreate(req, opts.Localizer, kafkaName) + err = aclcmdutil.ExecuteACLRuleCreate(req, opts.Localizer, kafkaName) spinnr.Stop() if err != nil { return err @@ -182,25 +182,25 @@ func runAdd(instanceID string, opts *sdk.CrudOptions) error { return nil } -func getRequestParams(opts *sdk.CrudOptions) *requestParams { +func getRequestParams(opts *aclcmdutil.CrudOptions) *requestParams { return &requestParams{ - resourceType: kafkainstanceclient.AclResourceType(sdk.GetMappedResourceTypeFilterValue(opts.ResourceType)), - principal: sdk.FormatPrincipal(opts.Principal), - resourceName: sdk.GetResourceName(opts.ResourceName), - patternType: sdk.GetMappedPatternTypeValue(opts.PatternType), - operation: sdk.GetMappedOperationValue(opts.Operation), - permission: sdk.GetMappedPermissionTypeValue(opts.Permission), + resourceType: kafkainstanceclient.AclResourceType(aclcmdutil.GetMappedResourceTypeFilterValue(opts.ResourceType)), + principal: aclcmdutil.FormatPrincipal(opts.Principal), + resourceName: aclcmdutil.GetResourceName(opts.ResourceName), + patternType: aclcmdutil.GetMappedPatternTypeValue(opts.PatternType), + operation: aclcmdutil.GetMappedOperationValue(opts.Operation), + permission: aclcmdutil.GetMappedPermissionTypeValue(opts.Permission), } } -func validateAndSetOpts(opts *sdk.CrudOptions) error { +func validateAndSetOpts(opts *aclcmdutil.CrudOptions) error { // user and service account should not be provided together if userID != "" && serviceAccount != "" { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.bothPrincipalsSelected") } - if userID == sdk.Wildcard || serviceAccount == sdk.Wildcard || userID == sdk.AllAlias || serviceAccount == sdk.AllAlias { + if userID == aclcmdutil.Wildcard || serviceAccount == aclcmdutil.Wildcard || userID == aclcmdutil.AllAlias || serviceAccount == aclcmdutil.AllAlias { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag") } @@ -208,7 +208,7 @@ func validateAndSetOpts(opts *sdk.CrudOptions) error { if userID != "" || serviceAccount != "" { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.allAccountsCannotBeUsedWithUserFlag") } - opts.Principal = sdk.Wildcard + opts.Principal = aclcmdutil.Wildcard } // check if principal is provided @@ -216,9 +216,9 @@ func validateAndSetOpts(opts *sdk.CrudOptions) error { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.noPrincipalsSelected") } - opts.PatternType = sdk.PatternTypeLITERAL + opts.PatternType = aclcmdutil.PatternTypeLITERAL if prefix { - opts.PatternType = sdk.PatternTypePREFIX + opts.PatternType = aclcmdutil.PatternTypePREFIX } if userID != "" { diff --git a/pkg/cmd/kafka/acl/delete/delete.go b/pkg/cmd/kafka/acl/delete/delete.go index a960ec582..84dfe65de 100644 --- a/pkg/cmd/kafka/acl/delete/delete.go +++ b/pkg/cmd/kafka/acl/delete/delete.go @@ -2,8 +2,8 @@ package delete import ( "github.com/AlecAivazis/survey/v2" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclcmdutil" aclFlagUtil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -34,7 +34,7 @@ type requestParams struct { // NewDeleteCommand creates a new command to delete Kafka ACLs func NewDeleteCommand(f *factory.Factory) *cobra.Command { - opts := &sdk.CrudOptions{ + opts := &aclcmdutil.CrudOptions{ Config: f.Config, Connection: f.Connection, Logger: f.Logger, @@ -60,7 +60,7 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command { errorCollection = append(errorCollection, opts.Localizer.MustLocalizeError("kafka.acl.common.flag.operation.required")) } - if resourceErrors := sdk.ValidateAndSetResources(opts, aclFlagUtil.ResourceTypeFlagEntries); resourceErrors != nil { + if resourceErrors := aclcmdutil.ValidateAndSetResources(opts, aclFlagUtil.ResourceTypeFlagEntries); resourceErrors != nil { errorCollection = append(errorCollection, resourceErrors) } @@ -69,7 +69,7 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command { } if len(errorCollection) > 0 { - return sdk.BuildInstructions(errorCollection) + return aclcmdutil.BuildInstructions(errorCollection) } return runDelete(opts.InstanceID, opts) @@ -97,7 +97,7 @@ func NewDeleteCommand(f *factory.Factory) *cobra.Command { } // nolint:funlen -func runDelete(instanceID string, opts *sdk.CrudOptions) error { +func runDelete(instanceID string, opts *aclcmdutil.CrudOptions) error { ctx := opts.Context conn, err := opts.Connection(connection.DefaultConfigRequireMasAuth) @@ -118,7 +118,7 @@ func runDelete(instanceID string, opts *sdk.CrudOptions) error { return err } - if isValidOp, validResourceOperations := sdk.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp { + if isValidOp, validResourceOperations := aclcmdutil.IsValidResourceOperation(opts.ResourceType, opts.Operation, resourceOperations); !isValidOp { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.invalidResourceOperation", localize.NewEntry("ResourceType", opts.ResourceType), localize.NewEntry("Operation", opts.Operation), @@ -162,7 +162,7 @@ func runDelete(instanceID string, opts *sdk.CrudOptions) error { defer httpRes.Body.Close() } - err = sdk.ValidateAPIError(httpRes, opts.Localizer, err, "delete", kafkaInstance.GetName()) + err = aclcmdutil.ValidateAPIError(httpRes, opts.Localizer, err, "delete", kafkaInstance.GetName()) spinnr.Stop() if err != nil { @@ -184,32 +184,32 @@ func runDelete(instanceID string, opts *sdk.CrudOptions) error { opts.Logger.Info(opts.Localizer.MustLocalize("kafka.acl.grantPermissions.log.delete.info.aclsPreview")) opts.Logger.Info() - rows := sdk.MapACLsToTableRows(*deletedACLs.Items, opts.Localizer) + rows := aclcmdutil.MapACLsToTableRows(*deletedACLs.Items, opts.Localizer) dump.Table(opts.IO.Out, rows) opts.Logger.Info() return nil } -func getRequestParams(opts *sdk.CrudOptions) *requestParams { +func getRequestParams(opts *aclcmdutil.CrudOptions) *requestParams { return &requestParams{ - resourceType: sdk.GetMappedResourceTypeFilterValue(opts.ResourceType), - principal: sdk.FormatPrincipal(opts.Principal), - resourceName: sdk.GetResourceName(opts.ResourceName), - patternType: sdk.GetMappedPatternTypeFilterValue(opts.PatternType), - operation: sdk.GetMappedOperationFilterValue(opts.Operation), - permission: sdk.GetMappedPermissionTypeFilterValue(opts.Permission), + resourceType: aclcmdutil.GetMappedResourceTypeFilterValue(opts.ResourceType), + principal: aclcmdutil.FormatPrincipal(opts.Principal), + resourceName: aclcmdutil.GetResourceName(opts.ResourceName), + patternType: aclcmdutil.GetMappedPatternTypeFilterValue(opts.PatternType), + operation: aclcmdutil.GetMappedOperationFilterValue(opts.Operation), + permission: aclcmdutil.GetMappedPermissionTypeFilterValue(opts.Permission), } } -func validateAndSetOpts(opts *sdk.CrudOptions) error { +func validateAndSetOpts(opts *aclcmdutil.CrudOptions) error { // user and service account should not be provided together if userID != "" && serviceAccount != "" { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.bothPrincipalsSelected") } - if userID == sdk.Wildcard || serviceAccount == sdk.Wildcard || userID == sdk.AllAlias || serviceAccount == sdk.AllAlias { + if userID == aclcmdutil.Wildcard || serviceAccount == aclcmdutil.Wildcard || userID == aclcmdutil.AllAlias || serviceAccount == aclcmdutil.AllAlias { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag") } @@ -217,7 +217,7 @@ func validateAndSetOpts(opts *sdk.CrudOptions) error { if userID != "" || serviceAccount != "" { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.allAccountsCannotBeUsedWithUserFlag") } - opts.Principal = sdk.Wildcard + opts.Principal = aclcmdutil.Wildcard } // check if principal is provided @@ -225,9 +225,9 @@ func validateAndSetOpts(opts *sdk.CrudOptions) error { return opts.Localizer.MustLocalizeError("kafka.acl.common.error.noPrincipalsSelected") } - opts.PatternType = sdk.PatternTypeLITERAL + opts.PatternType = aclcmdutil.PatternTypeLITERAL if prefix { - opts.PatternType = sdk.PatternTypePREFIX + opts.PatternType = aclcmdutil.PatternTypePREFIX } if userID != "" { diff --git a/pkg/cmd/kafka/acl/flagutil/flagset.go b/pkg/cmd/kafka/acl/flagutil/flagset.go index f5fc7aa80..6012d3e48 100644 --- a/pkg/cmd/kafka/acl/flagutil/flagset.go +++ b/pkg/cmd/kafka/acl/flagutil/flagset.go @@ -1,7 +1,7 @@ package flagutil import ( - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclcmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/localize" @@ -41,7 +41,7 @@ func NewFlagSet(cmd *cobra.Command, f *factory.Factory) *flagSet { func (fs *flagSet) AddResourceType(resourceType *string) *flagutil.FlagOptions { flagName := "resource-type" - resourceTypeFilterMap := sdk.GetResourceTypeFilterMap() + resourceTypeFilterMap := aclcmdutil.GetResourceTypeFilterMap() resourceTypes := make([]string, 0, len(resourceTypeFilterMap)) for i := range resourceTypeFilterMap { @@ -51,7 +51,7 @@ func (fs *flagSet) AddResourceType(resourceType *string) *flagutil.FlagOptions { fs.StringVar( resourceType, flagName, - sdk.ResourceTypeANY, + aclcmdutil.ResourceTypeANY, flagutil.FlagDescription(fs.factory.Localizer, "kafka.acl.common.flag.resourceType", resourceTypes...), ) @@ -66,7 +66,7 @@ func (fs *flagSet) AddResourceType(resourceType *string) *flagutil.FlagOptions { func (fs *flagSet) AddOperationFilter(operationType *string) *flagutil.FlagOptions { flagName := "operation" - operationFilterMap := sdk.GetOperationFilterMap() + operationFilterMap := aclcmdutil.GetOperationFilterMap() operations := make([]string, 0, len(operationFilterMap)) for i := range operationFilterMap { @@ -91,7 +91,7 @@ func (fs *flagSet) AddOperationFilter(operationType *string) *flagutil.FlagOptio func (fs *flagSet) AddOperationCreate(operationType *string) *flagutil.FlagOptions { flagName := "operation" - operationMap := sdk.GetOperationMap() + operationMap := aclcmdutil.GetOperationMap() operations := make([]string, 0, len(operationMap)) for i := range operationMap { @@ -116,7 +116,7 @@ func (fs *flagSet) AddOperationCreate(operationType *string) *flagutil.FlagOptio func (fs *flagSet) AddPermissionFilter(permission *string) *flagutil.FlagOptions { flagName := "permission" - permissionTypeFilterMap := sdk.GetPermissionTypeFilterMap() + permissionTypeFilterMap := aclcmdutil.GetPermissionTypeFilterMap() permissions := make([]string, 0, len(permissionTypeFilterMap)) for i := range permissionTypeFilterMap { @@ -126,7 +126,7 @@ func (fs *flagSet) AddPermissionFilter(permission *string) *flagutil.FlagOptions fs.StringVar( permission, flagName, - sdk.PermissionANY, + aclcmdutil.PermissionANY, flagutil.FlagDescription(fs.factory.Localizer, "kafka.acl.common.flag.permission.description", permissions...), ) @@ -141,7 +141,7 @@ func (fs *flagSet) AddPermissionFilter(permission *string) *flagutil.FlagOptions func (fs *flagSet) AddPermissionCreate(permission *string) *flagutil.FlagOptions { flagName := "permission" - permissionTypeMap := sdk.GetPermissionTypeMap() + permissionTypeMap := aclcmdutil.GetPermissionTypeMap() permissions := make([]string, 0, len(permissionTypeMap)) for i := range permissionTypeMap { diff --git a/pkg/cmd/kafka/acl/grant/grant.go b/pkg/cmd/kafka/acl/grant/grant.go index 753aca6b9..981e0e4d2 100644 --- a/pkg/cmd/kafka/acl/grant/grant.go +++ b/pkg/cmd/kafka/acl/grant/grant.go @@ -3,8 +3,8 @@ package grant import ( "context" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclcmdutil" "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" "github.com/AlecAivazis/survey/v2" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" @@ -127,7 +127,7 @@ func runGrantPermissions(opts *options) (err error) { var groupPatternArg = kafkainstanceclient.ACLPATTERNTYPE_LITERAL if opts.topic != "" { - topicNameArg = sdk.GetResourceName(opts.topic) + topicNameArg = aclcmdutil.GetResourceName(opts.topic) } if opts.topicPrefix != "" { @@ -136,7 +136,7 @@ func runGrantPermissions(opts *options) (err error) { } if opts.group != "" { - groupIdArg = sdk.GetResourceName(opts.group) + groupIdArg = aclcmdutil.GetResourceName(opts.group) } if opts.groupPrefix != "" { @@ -153,13 +153,13 @@ func runGrantPermissions(opts *options) (err error) { } if allAccounts { - opts.principal = sdk.Wildcard + opts.principal = aclcmdutil.Wildcard } var aclBindRequests []kafkainstanceclient.ApiCreateAclRequest var aclBindingList []kafkainstanceclient.AclBinding - userArg := sdk.FormatPrincipal(opts.principal) + userArg := aclcmdutil.FormatPrincipal(opts.principal) req := api.AclsApi.CreateAcl(opts.Context) @@ -237,7 +237,7 @@ func runGrantPermissions(opts *options) (err error) { // Add ACLs for transactional IDs aclBindTransactionIDWrite := kafkainstanceclient.NewAclBinding( kafkainstanceclient.ACLRESOURCETYPE_TRANSACTIONAL_ID, - sdk.Wildcard, + aclcmdutil.Wildcard, kafkainstanceclient.ACLPATTERNTYPE_LITERAL, userArg, kafkainstanceclient.ACLOPERATION_WRITE, @@ -250,7 +250,7 @@ func runGrantPermissions(opts *options) (err error) { aclBindTransactionIDDescribe := kafkainstanceclient.NewAclBinding( kafkainstanceclient.ACLRESOURCETYPE_TRANSACTIONAL_ID, - sdk.Wildcard, + aclcmdutil.Wildcard, kafkainstanceclient.ACLPATTERNTYPE_LITERAL, userArg, kafkainstanceclient.ACLOPERATION_DESCRIBE, @@ -265,7 +265,7 @@ func runGrantPermissions(opts *options) (err error) { opts.Logger.Info(opts.localizer.MustLocalize("kafka.acl.grantPermissions.log.info.aclsPreview")) opts.Logger.Info() - rows := sdk.MapACLsToTableRows(aclBindingList, opts.localizer) + rows := aclcmdutil.MapACLsToTableRows(aclBindingList, opts.localizer) dump.Table(opts.IO.Out, rows) opts.Logger.Info() @@ -288,7 +288,7 @@ func runGrantPermissions(opts *options) (err error) { // Execute ACL rule creations for _, req := range aclBindRequests { - if err = sdk.ExecuteACLRuleCreate(req, opts.localizer, kafkaName); err != nil { + if err = aclcmdutil.ExecuteACLRuleCreate(req, opts.localizer, kafkaName); err != nil { return err } } @@ -360,12 +360,12 @@ func validateFlagInputCombination(opts *options) error { } // user and service account should not allow wildcard - if userID == sdk.Wildcard || serviceAccount == sdk.Wildcard || userID == sdk.AllAlias || serviceAccount == sdk.AllAlias { + if userID == aclcmdutil.Wildcard || serviceAccount == aclcmdutil.Wildcard || userID == aclcmdutil.AllAlias || serviceAccount == aclcmdutil.AllAlias { errorCollection = append(errorCollection, opts.localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag")) } if len(errorCollection) > 0 { - return sdk.BuildInstructions(errorCollection) + return aclcmdutil.BuildInstructions(errorCollection) } return nil diff --git a/pkg/cmd/kafka/acl/list/list.go b/pkg/cmd/kafka/acl/list/list.go index 187ac1d1e..397a00a13 100644 --- a/pkg/cmd/kafka/acl/list/list.go +++ b/pkg/cmd/kafka/acl/list/list.go @@ -3,8 +3,8 @@ package list import ( "context" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/aclcmdutil" "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/flagutil" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/acl/sdk" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" @@ -93,7 +93,7 @@ func NewListACLCommand(f *factory.Factory) *cobra.Command { } // user and service account should not allow wildcard - if userID == sdk.Wildcard || serviceAccount == sdk.Wildcard || userID == sdk.AllAlias || serviceAccount == sdk.AllAlias { + if userID == aclcmdutil.Wildcard || serviceAccount == aclcmdutil.Wildcard || userID == aclcmdutil.AllAlias || serviceAccount == aclcmdutil.AllAlias { return opts.localizer.MustLocalizeError("kafka.acl.common.error.useAllAccountsFlag") } @@ -106,7 +106,7 @@ func NewListACLCommand(f *factory.Factory) *cobra.Command { } if allAccounts { - opts.principal = sdk.Wildcard + opts.principal = aclcmdutil.Wildcard } return runList(opts) @@ -154,7 +154,7 @@ func runList(opts *options) (err error) { req = req.Order("asc").OrderKey("principal") if opts.principal != "" { - principalQuery := sdk.FormatPrincipal(opts.principal) + principalQuery := aclcmdutil.FormatPrincipal(opts.principal) req = req.Principal(principalQuery) } @@ -164,20 +164,20 @@ func runList(opts *options) (err error) { if opts.topic != "" { selectedResourceTypeCount++ - resourceType = sdk.ResourceTypeTOPIC + resourceType = aclcmdutil.ResourceTypeTOPIC resourceName = opts.topic } if opts.group != "" { selectedResourceTypeCount++ - resourceType = sdk.ResourceTypeGROUP + resourceType = aclcmdutil.ResourceTypeGROUP resourceName = opts.group } if opts.cluster { selectedResourceTypeCount++ - resourceType = sdk.ResourceTypeCLUSTER - resourceName = sdk.KafkaCluster + resourceType = aclcmdutil.ResourceTypeCLUSTER + resourceName = aclcmdutil.KafkaCluster } if selectedResourceTypeCount > 1 { @@ -185,11 +185,11 @@ func runList(opts *options) (err error) { } if resourceType != "" { - req = req.ResourceType(sdk.GetMappedResourceTypeFilterValue(resourceType)) + req = req.ResourceType(aclcmdutil.GetMappedResourceTypeFilterValue(resourceType)) } if resourceName != "" { - req = req.ResourceName(sdk.GetResourceName(resourceName)) + req = req.ResourceName(aclcmdutil.GetResourceName(resourceName)) } permissionsData, httpRes, err := req.Execute() @@ -197,7 +197,7 @@ func runList(opts *options) (err error) { defer httpRes.Body.Close() } - if err = sdk.ValidateAPIError(httpRes, opts.localizer, err, "list", kafkaInstance.GetName()); err != nil { + if err = aclcmdutil.ValidateAPIError(httpRes, opts.localizer, err, "list", kafkaInstance.GetName()); err != nil { return err } @@ -211,7 +211,7 @@ func runList(opts *options) (err error) { case dump.EmptyFormat: opts.logger.Info("") permissions := permissionsData.GetItems() - rows := sdk.MapACLsToTableRows(permissions, opts.localizer) + rows := aclcmdutil.MapACLsToTableRows(permissions, opts.localizer) dump.Table(opts.io.Out, rows) default: return dump.Formatted(opts.io.Out, opts.output, permissionsData) diff --git a/pkg/cmd/kafka/consumergroup/describe/describe.go b/pkg/cmd/kafka/consumergroup/describe/describe.go index 719d0848d..b61a7cb63 100644 --- a/pkg/cmd/kafka/consumergroup/describe/describe.go +++ b/pkg/cmd/kafka/consumergroup/describe/describe.go @@ -7,7 +7,7 @@ import ( "net/http" "sort" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/groupcmdutil" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" @@ -189,9 +189,9 @@ func printConsumerGroupDetails(w io.Writer, consumerGroupData kafkainstanceclien fmt.Fprintln(w, "") consumers := consumerGroupData.GetConsumers() - activeMembersCount := sdk.GetActiveConsumersCount(consumers) - partitionsWithLagCount := sdk.GetPartitionsWithLag(consumers) - unassignedPartitions := sdk.GetUnassignedPartitions(consumers) + activeMembersCount := groupcmdutil.GetActiveConsumersCount(consumers) + partitionsWithLagCount := groupcmdutil.GetPartitionsWithLag(consumers) + unassignedPartitions := groupcmdutil.GetUnassignedPartitions(consumers) fmt.Fprintln(w, color.Bold(localizer.MustLocalize("kafka.consumerGroup.describe.output.activeMembers")), activeMembersCount, "\t", color.Bold(localizer.MustLocalize("kafka.consumerGroup.describe.output.partitionsWithLag")), partitionsWithLagCount, "\t", color.Bold(localizer.MustLocalize("kafka.consumerGroup.describe.output.unassignedPartitions")), unassignedPartitions) fmt.Fprintln(w, "") diff --git a/pkg/cmd/kafka/consumergroup/sdk/util.go b/pkg/cmd/kafka/consumergroup/groupcmdutil/util.go similarity index 98% rename from pkg/cmd/kafka/consumergroup/sdk/util.go rename to pkg/cmd/kafka/consumergroup/groupcmdutil/util.go index a4bde18bd..34419ca19 100644 --- a/pkg/cmd/kafka/consumergroup/sdk/util.go +++ b/pkg/cmd/kafka/consumergroup/groupcmdutil/util.go @@ -1,4 +1,4 @@ -package sdk +package groupcmdutil import ( kafkainstanceclient "github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal/client" diff --git a/pkg/cmd/kafka/consumergroup/sdk/validators.go b/pkg/cmd/kafka/consumergroup/groupcmdutil/validators.go similarity index 98% rename from pkg/cmd/kafka/consumergroup/sdk/validators.go rename to pkg/cmd/kafka/consumergroup/groupcmdutil/validators.go index 10bc420e9..661282690 100644 --- a/pkg/cmd/kafka/consumergroup/sdk/validators.go +++ b/pkg/cmd/kafka/consumergroup/groupcmdutil/validators.go @@ -1,4 +1,4 @@ -package sdk +package groupcmdutil import ( "regexp" diff --git a/pkg/cmd/kafka/consumergroup/sdk/validators_test.go b/pkg/cmd/kafka/consumergroup/groupcmdutil/validators_test.go similarity index 99% rename from pkg/cmd/kafka/consumergroup/sdk/validators_test.go rename to pkg/cmd/kafka/consumergroup/groupcmdutil/validators_test.go index 3bb61cbd3..575a3ff0d 100644 --- a/pkg/cmd/kafka/consumergroup/sdk/validators_test.go +++ b/pkg/cmd/kafka/consumergroup/groupcmdutil/validators_test.go @@ -1,4 +1,4 @@ -package sdk +package groupcmdutil import ( "testing" diff --git a/pkg/cmd/kafka/consumergroup/list/list.go b/pkg/cmd/kafka/consumergroup/list/list.go index 8fd969ee5..1ce1d83c6 100644 --- a/pkg/cmd/kafka/consumergroup/list/list.go +++ b/pkg/cmd/kafka/consumergroup/list/list.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/groupcmdutil" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" @@ -182,8 +182,8 @@ func mapConsumerGroupResultsToTableFormat(consumerGroups []kafkainstanceclient.C consumers := t.GetConsumers() row := consumerGroupRow{ ConsumerGroupID: t.GetGroupId(), - ActiveMembers: sdk.GetActiveConsumersCount(consumers), - PartitionsWithLag: sdk.GetPartitionsWithLag(consumers), + ActiveMembers: groupcmdutil.GetActiveConsumersCount(consumers), + PartitionsWithLag: groupcmdutil.GetPartitionsWithLag(consumers), } rows[i] = row } diff --git a/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go b/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go index 3d5443587..6eb3f4ec6 100644 --- a/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go +++ b/pkg/cmd/kafka/consumergroup/resetoffset/reset_offset.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/consumergroup/groupcmdutil" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" "github.com/AlecAivazis/survey/v2" @@ -37,7 +37,7 @@ type options struct { Context context.Context } -var validator sdk.Validator +var validator groupcmdutil.Validator // NewResetOffsetConsumerGroupCommand gets a new command for resetting offset for a consumer group. func NewResetOffsetConsumerGroupCommand(f *factory.Factory) *cobra.Command { @@ -57,7 +57,7 @@ func NewResetOffsetConsumerGroupCommand(f *factory.Factory) *cobra.Command { Example: opts.localizer.MustLocalize("kafka.consumerGroup.resetOffset.cmd.example"), Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) (err error) { - validator = sdk.Validator{ + validator = groupcmdutil.Validator{ Localizer: opts.localizer, } @@ -67,7 +67,7 @@ func NewResetOffsetConsumerGroupCommand(f *factory.Factory) *cobra.Command { } } - if opts.value == "" && (opts.offset == sdk.OffsetAbsolute || opts.offset == sdk.OffsetTimestamp) { + if opts.value == "" && (opts.offset == groupcmdutil.OffsetAbsolute || opts.offset == groupcmdutil.OffsetTimestamp) { return opts.localizer.MustLocalizeError("kafka.consumerGroup.resetOffset.error.valueRequired", localize.NewEntry("Offset", opts.offset)) } @@ -115,7 +115,7 @@ func NewResetOffsetConsumerGroupCommand(f *factory.Factory) *cobra.Command { }) flagutil.EnableOutputFlagCompletion(cmd) - flagutil.EnableStaticFlagCompletion(cmd, "offset", sdk.ValidOffsets) + flagutil.EnableStaticFlagCompletion(cmd, "offset", groupcmdutil.ValidOffsets) return cmd } @@ -141,7 +141,7 @@ func runCmd(opts *options) error { offsetResetParams.Value = &opts.value } - if opts.offset == sdk.OffsetAbsolute || opts.offset == sdk.OffsetTimestamp { + if opts.offset == groupcmdutil.OffsetAbsolute || opts.offset == groupcmdutil.OffsetTimestamp { if err = validator.ValidateOffsetValue(opts.offset, opts.value); err != nil { return err } diff --git a/pkg/cmd/kafka/create/create.go b/pkg/cmd/kafka/create/create.go index b2d72a8ea..37183680b 100644 --- a/pkg/cmd/kafka/create/create.go +++ b/pkg/cmd/kafka/create/create.go @@ -8,10 +8,10 @@ import ( "time" kafkaFlagutil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/flagutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/kafkacmdutil" "github.com/redhat-developer/app-services-cli/pkg/svcstatus" "github.com/redhat-developer/app-services-cli/pkg/accountmgmtutil" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -81,7 +81,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { if opts.name != "" { - validator := &sdk.Validator{ + validator := &kafkacmdutil.Validator{ Localizer: opts.localizer, Connection: opts.Connection, } @@ -278,7 +278,7 @@ func promptKafkaPayload(opts *options) (payload *kafkamgmtclient.KafkaRequestPay api := conn.API() - validator := &sdk.Validator{ + validator := &kafkacmdutil.Validator{ Localizer: opts.localizer, Connection: opts.Connection, } diff --git a/pkg/cmd/kafka/sdk/kafka_util.go b/pkg/cmd/kafka/kafkacmdutil/kafka_util.go similarity index 99% rename from pkg/cmd/kafka/sdk/kafka_util.go rename to pkg/cmd/kafka/kafkacmdutil/kafka_util.go index 11e3c43bc..126261290 100644 --- a/pkg/cmd/kafka/sdk/kafka_util.go +++ b/pkg/cmd/kafka/kafkacmdutil/kafka_util.go @@ -1,4 +1,4 @@ -package sdk +package kafkacmdutil import ( "context" diff --git a/pkg/cmd/kafka/sdk/kafka_util_test.go b/pkg/cmd/kafka/kafkacmdutil/kafka_util_test.go similarity index 99% rename from pkg/cmd/kafka/sdk/kafka_util_test.go rename to pkg/cmd/kafka/kafkacmdutil/kafka_util_test.go index 04540e03a..ecb1d3bf9 100644 --- a/pkg/cmd/kafka/sdk/kafka_util_test.go +++ b/pkg/cmd/kafka/kafkacmdutil/kafka_util_test.go @@ -1,4 +1,4 @@ -package sdk +package kafkacmdutil import ( "testing" diff --git a/pkg/cmd/kafka/list/list.go b/pkg/cmd/kafka/list/list.go index 5f890ad80..0a5ed6cc8 100644 --- a/pkg/cmd/kafka/list/list.go +++ b/pkg/cmd/kafka/list/list.go @@ -6,8 +6,8 @@ import ( "strconv" kafkaFlagutil "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/flagutil" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/kafkacmdutil" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/sdk" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -75,7 +75,7 @@ func NewListCommand(f *factory.Factory) *cobra.Command { return flagutil.InvalidValueError("output", opts.outputFormat, flagutil.ValidOutputFormats...) } - validator := &sdk.Validator{ + validator := &kafkacmdutil.Validator{ Localizer: opts.localizer, } diff --git a/pkg/cmd/kafka/topic/create/create.go b/pkg/cmd/kafka/topic/create/create.go index 2a654e161..c9d40a19f 100644 --- a/pkg/cmd/kafka/topic/create/create.go +++ b/pkg/cmd/kafka/topic/create/create.go @@ -5,8 +5,7 @@ import ( "net/http" "strconv" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/sdk" - + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/topiccmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -77,13 +76,13 @@ func NewCreateTopicCommand(f *factory.Factory) *cobra.Command { } // check that a valid --cleanup-policy flag value is used - validPolicy := flagutil.IsValidInput(opts.cleanupPolicy, sdk.ValidCleanupPolicies...) + validPolicy := flagutil.IsValidInput(opts.cleanupPolicy, topiccmdutil.ValidCleanupPolicies...) if !validPolicy { - return flagutil.InvalidValueError("cleanup-policy", opts.cleanupPolicy, sdk.ValidCleanupPolicies...) + return flagutil.InvalidValueError("cleanup-policy", opts.cleanupPolicy, topiccmdutil.ValidCleanupPolicies...) } if !opts.interactive { - validator := sdk.Validator{ + validator := topiccmdutil.Validator{ Localizer: opts.localizer, } @@ -134,7 +133,7 @@ func NewCreateTopicCommand(f *factory.Factory) *cobra.Command { flags.AddOutput(&opts.outputFormat) flagutil.EnableOutputFlagCompletion(cmd) - flagutil.EnableStaticFlagCompletion(cmd, "cleanup-policy", sdk.ValidCleanupPolicies) + flagutil.EnableStaticFlagCompletion(cmd, "cleanup-policy", topiccmdutil.ValidCleanupPolicies) return cmd } @@ -203,7 +202,7 @@ func runCmd(opts *options) error { } func runInteractivePrompt(opts *options) (err error) { - validator := sdk.Validator{ + validator := topiccmdutil.Validator{ Localizer: opts.localizer, InstanceID: opts.kafkaID, Connection: opts.Connection, @@ -264,7 +263,7 @@ func runInteractivePrompt(opts *options) (err error) { cleanupPolicyPrompt := &survey.Select{ Message: opts.localizer.MustLocalize("kafka.topic.create.input.cleanupPolicy.message"), Help: opts.localizer.MustLocalize("kafka.topic.common.input.cleanupPolicy.description"), - Options: sdk.ValidCleanupPolicies, + Options: topiccmdutil.ValidCleanupPolicies, Default: defaultCleanupPolicy, } @@ -281,9 +280,9 @@ func createConfigEntries(opts *options) *[]kafkainstanceclient.ConfigEntry { retentionBytesStr := strconv.Itoa(opts.retentionBytes) cleanupPolicyStr := opts.cleanupPolicy configEntryMap := map[string]*string{ - sdk.RetentionMsKey: &retentionMsStr, - sdk.RetentionSizeKey: &retentionBytesStr, - sdk.CleanupPolicy: &cleanupPolicyStr, + topiccmdutil.RetentionMsKey: &retentionMsStr, + topiccmdutil.RetentionSizeKey: &retentionBytesStr, + topiccmdutil.CleanupPolicy: &cleanupPolicyStr, } - return sdk.CreateConfigEntries(configEntryMap) + return topiccmdutil.CreateConfigEntries(configEntryMap) } diff --git a/pkg/cmd/kafka/topic/list/list.go b/pkg/cmd/kafka/topic/list/list.go index 7395cb04a..ff52bda76 100644 --- a/pkg/cmd/kafka/topic/list/list.go +++ b/pkg/cmd/kafka/topic/list/list.go @@ -4,8 +4,7 @@ import ( "context" "net/http" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/sdk" - + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/topiccmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -77,7 +76,7 @@ func NewListTopicCommand(f *factory.Factory) *cobra.Command { } if opts.search != "" { - validator := sdk.Validator{ + validator := topiccmdutil.Validator{ Localizer: opts.localizer, } if err := validator.ValidateSearchInput(opts.search); err != nil { @@ -191,7 +190,7 @@ func mapTopicResultsToTableFormat(topics []kafkainstanceclient.Topic) []topicRow for _, conf := range t.GetConfig() { unlimitedVal := "-1 (Unlimited)" - if *conf.Key == sdk.RetentionMsKey { + if *conf.Key == topiccmdutil.RetentionMsKey { val := conf.GetValue() if val == "-1" { row.RetentionTime = unlimitedVal @@ -199,7 +198,7 @@ func mapTopicResultsToTableFormat(topics []kafkainstanceclient.Topic) []topicRow row.RetentionTime = val } } - if *conf.Key == sdk.RetentionSizeKey { + if *conf.Key == topiccmdutil.RetentionSizeKey { val := conf.GetValue() if val == "-1" { row.RetentionSize = unlimitedVal diff --git a/pkg/cmd/kafka/topic/sdk/util.go b/pkg/cmd/kafka/topic/topiccmdutil/util.go similarity index 98% rename from pkg/cmd/kafka/topic/sdk/util.go rename to pkg/cmd/kafka/topic/topiccmdutil/util.go index 1612efaa8..ea3a876ea 100644 --- a/pkg/cmd/kafka/topic/sdk/util.go +++ b/pkg/cmd/kafka/topic/topiccmdutil/util.go @@ -1,4 +1,4 @@ -package sdk +package topiccmdutil import ( "fmt" diff --git a/pkg/cmd/kafka/topic/sdk/util_test.go b/pkg/cmd/kafka/topic/topiccmdutil/util_test.go similarity index 97% rename from pkg/cmd/kafka/topic/sdk/util_test.go rename to pkg/cmd/kafka/topic/topiccmdutil/util_test.go index 513c04534..a7e03a335 100644 --- a/pkg/cmd/kafka/topic/sdk/util_test.go +++ b/pkg/cmd/kafka/topic/topiccmdutil/util_test.go @@ -1,4 +1,4 @@ -package sdk +package topiccmdutil import ( "reflect" diff --git a/pkg/cmd/kafka/topic/sdk/validators.go b/pkg/cmd/kafka/topic/topiccmdutil/validators.go similarity index 99% rename from pkg/cmd/kafka/topic/sdk/validators.go rename to pkg/cmd/kafka/topic/topiccmdutil/validators.go index 322a16e17..e09de34cf 100644 --- a/pkg/cmd/kafka/topic/sdk/validators.go +++ b/pkg/cmd/kafka/topic/topiccmdutil/validators.go @@ -1,4 +1,4 @@ -package sdk +package topiccmdutil import ( "context" diff --git a/pkg/cmd/kafka/topic/sdk/validators_test.go b/pkg/cmd/kafka/topic/topiccmdutil/validators_test.go similarity index 99% rename from pkg/cmd/kafka/topic/sdk/validators_test.go rename to pkg/cmd/kafka/topic/topiccmdutil/validators_test.go index 137b52978..2379aa230 100644 --- a/pkg/cmd/kafka/topic/sdk/validators_test.go +++ b/pkg/cmd/kafka/topic/topiccmdutil/validators_test.go @@ -1,4 +1,4 @@ -package sdk +package topiccmdutil import ( "testing" diff --git a/pkg/cmd/kafka/topic/update/update.go b/pkg/cmd/kafka/topic/update/update.go index 8948e6bb0..aa9782418 100644 --- a/pkg/cmd/kafka/topic/update/update.go +++ b/pkg/cmd/kafka/topic/update/update.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/kafka/topic/topiccmdutil" kafkacmdutil "github.com/redhat-developer/app-services-cli/pkg/kafkautil" "github.com/AlecAivazis/survey/v2" @@ -63,7 +63,7 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { Example: opts.localizer.MustLocalize("kafka.topic.update.cmd.example"), Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) (err error) { - validator := sdk.Validator{ + validator := topiccmdutil.Validator{ Localizer: opts.localizer, } @@ -85,9 +85,9 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { // check that a valid --cleanup-policy flag value is used if opts.cleanupPolicy != "" { - validPolicy := flagutil.IsValidInput(opts.cleanupPolicy, sdk.ValidCleanupPolicies...) + validPolicy := flagutil.IsValidInput(opts.cleanupPolicy, topiccmdutil.ValidCleanupPolicies...) if !validPolicy { - return flagutil.InvalidValueError("cleanup-policy", opts.cleanupPolicy, sdk.ValidCleanupPolicies...) + return flagutil.InvalidValueError("cleanup-policy", opts.cleanupPolicy, topiccmdutil.ValidCleanupPolicies...) } } @@ -96,7 +96,7 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { // check if the partition flag is set if opts.partitionsStr != "" { // nolint:govet - partitionCount, err = sdk.ConvertPartitionsToInt(opts.partitionsStr) + partitionCount, err = topiccmdutil.ConvertPartitionsToInt(opts.partitionsStr) if err != nil { return err } @@ -107,7 +107,7 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { } if opts.retentionMsStr != "" { - retentionPeriodMs, err = sdk.ConvertRetentionMsToInt(opts.retentionMsStr) + retentionPeriodMs, err = topiccmdutil.ConvertRetentionMsToInt(opts.retentionMsStr) if err != nil { return err } @@ -118,7 +118,7 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { } if opts.retentionBytesStr != "" { - retentionSizeBytes, err = sdk.ConvertRetentionBytesToInt(opts.retentionBytesStr) + retentionSizeBytes, err = topiccmdutil.ConvertRetentionBytesToInt(opts.retentionBytesStr) if err != nil { return err } @@ -159,7 +159,7 @@ func NewUpdateTopicCommand(f *factory.Factory) *cobra.Command { flagutil.EnableOutputFlagCompletion(cmd) - flagutil.EnableStaticFlagCompletion(cmd, "cleanup-policy", sdk.ValidCleanupPolicies) + flagutil.EnableStaticFlagCompletion(cmd, "cleanup-policy", topiccmdutil.ValidCleanupPolicies) return cmd } @@ -174,21 +174,21 @@ func runCmd(opts *options) error { } if opts.retentionMsStr != "" { - retentionPeriodMs, err = sdk.ConvertRetentionMsToInt(opts.retentionMsStr) + retentionPeriodMs, err = topiccmdutil.ConvertRetentionMsToInt(opts.retentionMsStr) if err != nil { return err } } if opts.retentionBytesStr != "" { - retentionSizeBytes, err = sdk.ConvertRetentionBytesToInt(opts.retentionBytesStr) + retentionSizeBytes, err = topiccmdutil.ConvertRetentionBytesToInt(opts.retentionBytesStr) if err != nil { return err } } if opts.partitionsStr != "" { - partitionCount, err = sdk.ConvertPartitionsToInt(opts.partitionsStr) + partitionCount, err = topiccmdutil.ConvertPartitionsToInt(opts.partitionsStr) if err != nil { return err } @@ -234,17 +234,17 @@ func runCmd(opts *options) error { if opts.retentionMsStr != "" { needsUpdate = true - configEntryMap[sdk.RetentionMsKey] = &opts.retentionMsStr + configEntryMap[topiccmdutil.RetentionMsKey] = &opts.retentionMsStr } if opts.retentionBytesStr != "" { needsUpdate = true - configEntryMap[sdk.RetentionSizeKey] = &opts.retentionBytesStr + configEntryMap[topiccmdutil.RetentionSizeKey] = &opts.retentionBytesStr } - if opts.cleanupPolicy != "" && strings.Compare(opts.cleanupPolicy, sdk.GetConfigValue(topic.GetConfig(), sdk.CleanupPolicy)) != 0 { + if opts.cleanupPolicy != "" && strings.Compare(opts.cleanupPolicy, topiccmdutil.GetConfigValue(topic.GetConfig(), topiccmdutil.CleanupPolicy)) != 0 { needsUpdate = true - configEntryMap[sdk.CleanupPolicy] = &opts.cleanupPolicy + configEntryMap[topiccmdutil.CleanupPolicy] = &opts.cleanupPolicy } if opts.partitionsStr != "" { @@ -258,7 +258,7 @@ func runCmd(opts *options) error { } if len(configEntryMap) > 0 { - configEntries := sdk.CreateConfigEntries(configEntryMap) + configEntries := topiccmdutil.CreateConfigEntries(configEntryMap) topicSettings.SetConfig(*configEntries) } @@ -325,7 +325,7 @@ func runInteractivePrompt(opts *options) (err error) { } } - validator := sdk.Validator{ + validator := topiccmdutil.Validator{ Localizer: opts.localizer, } @@ -366,8 +366,8 @@ func runInteractivePrompt(opts *options) (err error) { cleanupPolicyPrompt := &survey.Select{ Message: opts.localizer.MustLocalize("kafka.topic.update.input.cleanupPolicy.message"), Help: opts.localizer.MustLocalize("kafka.topic.update.input.cleanupPolicy.help"), - Options: sdk.ValidCleanupPolicies, - Default: sdk.GetConfigValue(topic.GetConfig(), sdk.CleanupPolicy), + Options: topiccmdutil.ValidCleanupPolicies, + Default: topiccmdutil.GetConfigValue(topic.GetConfig(), topiccmdutil.CleanupPolicy), } err = survey.AskOne(cleanupPolicyPrompt, &opts.cleanupPolicy) diff --git a/pkg/cmd/registry/artifact/crud/create/create.go b/pkg/cmd/registry/artifact/crud/create/create.go index 8e2373f35..d26ebd3b3 100644 --- a/pkg/cmd/registry/artifact/crud/create/create.go +++ b/pkg/cmd/registry/artifact/crud/create/create.go @@ -5,7 +5,7 @@ import ( "os" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -175,7 +175,7 @@ func runCreate(opts *options) error { request = request.Body(specifiedFile) metadata, _, err := request.Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.created")) diff --git a/pkg/cmd/registry/artifact/crud/delete/delete.go b/pkg/cmd/registry/artifact/crud/delete/delete.go index 4b92f811e..dfffd7134 100644 --- a/pkg/cmd/registry/artifact/crud/delete/delete.go +++ b/pkg/cmd/registry/artifact/crud/delete/delete.go @@ -6,7 +6,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -106,7 +106,7 @@ func runDelete(opts *options) error { request := dataAPI.ArtifactsApi.DeleteArtifactsInGroup(opts.Context, opts.group) _, err = request.Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.AllArtifactsInGroupDeleted", localize.NewEntry("GroupName", opts.group))) } else { @@ -123,7 +123,7 @@ func runDelete(opts *options) error { _, err = request.Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.deleted", localize.NewEntry("Name", opts.artifact))) } diff --git a/pkg/cmd/registry/artifact/crud/get/get.go b/pkg/cmd/registry/artifact/crud/get/get.go index 70faa7f3a..af7a7f0f5 100644 --- a/pkg/cmd/registry/artifact/crud/get/get.go +++ b/pkg/cmd/registry/artifact/crud/get/get.go @@ -7,7 +7,7 @@ import ( "os" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -114,7 +114,7 @@ func runGet(opts *options) error { dataFile, _, err = request.Execute() } if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } fileContent, err := ioutil.ReadFile(dataFile.Name()) if err != nil { diff --git a/pkg/cmd/registry/artifact/crud/list/list.go b/pkg/cmd/registry/artifact/crud/list/list.go index 602c3dfcb..206f2e110 100644 --- a/pkg/cmd/registry/artifact/crud/list/list.go +++ b/pkg/cmd/registry/artifact/crud/list/list.go @@ -4,7 +4,7 @@ import ( "context" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" @@ -136,7 +136,7 @@ func runList(opts *options) error { response, _, err := request.Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } if len(response.Artifacts) == 0 && opts.outputFormat == "" { diff --git a/pkg/cmd/registry/artifact/download/download.go b/pkg/cmd/registry/artifact/download/download.go index 33c4961bd..653db13b0 100644 --- a/pkg/cmd/registry/artifact/download/download.go +++ b/pkg/cmd/registry/artifact/download/download.go @@ -7,7 +7,7 @@ import ( "os" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -124,7 +124,7 @@ func runGet(opts *options) error { } if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } fileContent, err := ioutil.ReadFile(dataFile.Name()) diff --git a/pkg/cmd/registry/artifact/metadata/get.go b/pkg/cmd/registry/artifact/metadata/get.go index 71e12a799..3247a5154 100644 --- a/pkg/cmd/registry/artifact/metadata/get.go +++ b/pkg/cmd/registry/artifact/metadata/get.go @@ -4,7 +4,7 @@ import ( "context" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -111,7 +111,7 @@ func runGet(opts *GetOptions) error { request := dataAPI.MetadataApi.GetArtifactMetaData(opts.Context, opts.group, opts.artifact) response, _, err := request.Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } artifactURL, ok := util.GetArtifactURL(registry, &response) diff --git a/pkg/cmd/registry/artifact/metadata/set.go b/pkg/cmd/registry/artifact/metadata/set.go index 66fdd9705..40cd49dd8 100644 --- a/pkg/cmd/registry/artifact/metadata/set.go +++ b/pkg/cmd/registry/artifact/metadata/set.go @@ -5,7 +5,7 @@ import ( "encoding/json" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -117,7 +117,7 @@ func runSet(opts *SetOptions) error { request := dataAPI.MetadataApi.GetArtifactMetaData(opts.Context, opts.group, opts.artifact) currentMetadata, _, err := request.Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } editableMedata := ®istryinstanceclient.EditableMetaData{ @@ -148,7 +148,7 @@ func runSet(opts *SetOptions) error { editRequest := dataAPI.MetadataApi.UpdateArtifactMetaData(opts.Context, opts.group, opts.artifact) _, err = editRequest.EditableMetaData(*editableMedata).Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } opts.Logger.Info(icon.SuccessPrefix(), opts.localizer.MustLocalize("artifact.common.message.artifact.metadata.updated")) diff --git a/pkg/cmd/registry/artifact/migrate/export.go b/pkg/cmd/registry/artifact/migrate/export.go index 97ee012a6..bf94bb195 100644 --- a/pkg/cmd/registry/artifact/migrate/export.go +++ b/pkg/cmd/registry/artifact/migrate/export.go @@ -5,7 +5,7 @@ import ( "io" "os" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "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" @@ -89,7 +89,7 @@ func runExport(opts *ExportOptions) error { request := dataAPI.AdminApi.ExportData(opts.Context) file, _, err := request.Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } _, err = io.Copy(fileContent, file) if err != nil { diff --git a/pkg/cmd/registry/artifact/migrate/import.go b/pkg/cmd/registry/artifact/migrate/import.go index c63cb2214..88f08b8cb 100644 --- a/pkg/cmd/registry/artifact/migrate/import.go +++ b/pkg/cmd/registry/artifact/migrate/import.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "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" @@ -92,7 +92,7 @@ func runImport(opts *ImportOptions) error { request := dataAPI.AdminApi.ImportData(opts.Context) _, err = request.Body(specifiedFile).Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.import.success")) diff --git a/pkg/cmd/registry/artifact/role/add/add.go b/pkg/cmd/registry/artifact/role/add/add.go index b7648cf1c..033182fc9 100644 --- a/pkg/cmd/registry/artifact/role/add/add.go +++ b/pkg/cmd/registry/artifact/role/add/add.go @@ -4,7 +4,7 @@ import ( "context" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "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" @@ -123,7 +123,7 @@ func runAdd(opts *options) error { Role: *role, }).Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } } else { opts.Logger.Info(opts.localizer.MustLocalize("registry.role.cmd.creating")) @@ -134,7 +134,7 @@ func runAdd(opts *options) error { request := dataAPI.AdminApi.CreateRoleMapping(opts.Context) _, err = request.RoleMapping(roleMapping).Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } } @@ -147,7 +147,7 @@ func runAdd(opts *options) error { func principalHasRole(opts *options, admin registryinstanceclient.AdminApi) bool { _, _, err := admin.GetRoleMapping(opts.Context, opts.principal).Execute() if err != nil { - apiError, _ := sdk.GetInstanceAPIError(err) + apiError, _ := registrycmdutil.GetInstanceAPIError(err) return apiError.GetErrorCode() != 404 } return true diff --git a/pkg/cmd/registry/artifact/role/list/list.go b/pkg/cmd/registry/artifact/role/list/list.go index b603d6131..6dc81e383 100644 --- a/pkg/cmd/registry/artifact/role/list/list.go +++ b/pkg/cmd/registry/artifact/role/list/list.go @@ -3,7 +3,7 @@ package list import ( "context" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -100,7 +100,7 @@ func runList(opts *options) error { } mappings, _, err := a.AdminApi.ListRoleMappings(opts.Context).Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } if len(mappings) == 0 && opts.outputFormat == "" { diff --git a/pkg/cmd/registry/artifact/role/revoke/revoke.go b/pkg/cmd/registry/artifact/role/revoke/revoke.go index 0fdb857a0..d966fb869 100644 --- a/pkg/cmd/registry/artifact/role/revoke/revoke.go +++ b/pkg/cmd/registry/artifact/role/revoke/revoke.go @@ -3,7 +3,7 @@ package revoke import ( "context" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "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" @@ -98,7 +98,7 @@ func runRevoke(opts *options) error { _, err = dataAPI.AdminApi.DeleteRoleMapping(opts.Context, opts.principal).Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("registry.role.cmd.revoke.success")) diff --git a/pkg/cmd/registry/artifact/state/state.go b/pkg/cmd/registry/artifact/state/state.go index b374a7bd7..14ccaf249 100644 --- a/pkg/cmd/registry/artifact/state/state.go +++ b/pkg/cmd/registry/artifact/state/state.go @@ -4,7 +4,7 @@ import ( "context" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "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" @@ -112,7 +112,7 @@ func runSet(opts *options) error { request := dataAPI.ArtifactsApi.UpdateArtifactState(opts.context, opts.group, opts.artifact) _, err = request.UpdateState(*registryinstanceclient.NewUpdateState(*updateState)).Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } opts.Logger.Info(opts.localizer.MustLocalize("artifact.common.message.artifact.state.updated")) diff --git a/pkg/cmd/registry/artifact/versions/versions.go b/pkg/cmd/registry/artifact/versions/versions.go index 8eeaa30da..2625c1e06 100644 --- a/pkg/cmd/registry/artifact/versions/versions.go +++ b/pkg/cmd/registry/artifact/versions/versions.go @@ -4,7 +4,7 @@ import ( "context" "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/artifact/util" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -104,7 +104,7 @@ func runGet(opts *options) error { request := dataAPI.VersionsApi.ListArtifactVersions(opts.Context, opts.group, opts.artifact) response, _, err := request.Execute() if err != nil { - return sdk.TransformInstanceError(err) + return registrycmdutil.TransformInstanceError(err) } opts.Logger.Info(icon.SuccessPrefix(), opts.localizer.MustLocalize("artifact.common.message.artifact.versions.fetched")) diff --git a/pkg/cmd/registry/create/create.go b/pkg/cmd/registry/create/create.go index 6e4fd6f17..bf88e8213 100644 --- a/pkg/cmd/registry/create/create.go +++ b/pkg/cmd/registry/create/create.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/redhat-developer/app-services-cli/pkg/accountmgmtutil" - "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/sdk" + "github.com/redhat-developer/app-services-cli/pkg/cmd/registry/registrycmdutil" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" @@ -58,7 +58,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { if opts.name != "" { - if err := sdk.ValidateName(opts.name); err != nil { + if err := registrycmdutil.ValidateName(opts.name); err != nil { return err } } @@ -183,7 +183,7 @@ func promptPayload(opts *options) (payload *srsmgmtv1.RegistryCreate, err error) Help: opts.localizer.MustLocalize("registry.cmd.create.input.name.help"), } - err = survey.AskOne(promptName, &answers.Name, survey.WithValidator(sdk.ValidateName)) + err = survey.AskOne(promptName, &answers.Name, survey.WithValidator(registrycmdutil.ValidateName)) if err != nil { return nil, err } diff --git a/pkg/cmd/registry/sdk/error.go b/pkg/cmd/registry/registrycmdutil/error.go similarity index 97% rename from pkg/cmd/registry/sdk/error.go rename to pkg/cmd/registry/registrycmdutil/error.go index c93f2412d..14f0a84f9 100644 --- a/pkg/cmd/registry/sdk/error.go +++ b/pkg/cmd/registry/registrycmdutil/error.go @@ -1,4 +1,4 @@ -package sdk +package registrycmdutil import ( "errors" diff --git a/pkg/cmd/registry/sdk/registry_util.go b/pkg/cmd/registry/registrycmdutil/registry_util.go similarity index 96% rename from pkg/cmd/registry/sdk/registry_util.go rename to pkg/cmd/registry/registrycmdutil/registry_util.go index c4bd1ec49..574b235be 100644 --- a/pkg/cmd/registry/sdk/registry_util.go +++ b/pkg/cmd/registry/registrycmdutil/registry_util.go @@ -1,4 +1,4 @@ -package sdk +package registrycmdutil import ( "errors" diff --git a/pkg/cmd/serviceaccount/sdk/validation/validation.go b/pkg/cmd/serviceaccount/accountcmdutil/validation/validation.go similarity index 100% rename from pkg/cmd/serviceaccount/sdk/validation/validation.go rename to pkg/cmd/serviceaccount/accountcmdutil/validation/validation.go diff --git a/pkg/cmd/serviceaccount/sdk/validation/validation_test.go b/pkg/cmd/serviceaccount/accountcmdutil/validation/validation_test.go similarity index 100% rename from pkg/cmd/serviceaccount/sdk/validation/validation_test.go rename to pkg/cmd/serviceaccount/accountcmdutil/validation/validation_test.go diff --git a/pkg/cmd/serviceaccount/create/create.go b/pkg/cmd/serviceaccount/create/create.go index 93c00b889..a9848d933 100644 --- a/pkg/cmd/serviceaccount/create/create.go +++ b/pkg/cmd/serviceaccount/create/create.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/sdk/validation" + "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/accountcmdutil/validation" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" diff --git a/pkg/cmd/serviceaccount/delete/delete.go b/pkg/cmd/serviceaccount/delete/delete.go index e91c1f046..7e615571b 100644 --- a/pkg/cmd/serviceaccount/delete/delete.go +++ b/pkg/cmd/serviceaccount/delete/delete.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/sdk/validation" + "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/accountcmdutil/validation" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config" diff --git a/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go b/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go index bf3cda308..76435d511 100644 --- a/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go +++ b/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/sdk/validation" + "github.com/redhat-developer/app-services-cli/pkg/cmd/serviceaccount/accountcmdutil/validation" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/factory" "github.com/redhat-developer/app-services-cli/pkg/core/cmdutil/flagutil" "github.com/redhat-developer/app-services-cli/pkg/core/config"