Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: override fetch if instance exists #1760

Merged
merged 2 commits into from
Feb 22, 2023
Merged

refactor: override fetch if instance exists #1760

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c210cd
refactor: override fetch if instance exists
rkpattnaik780 Oct 11, 2022
1b874e3
refactor: override fetch if instance exists in control plane ops
rkpattnaik780 Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions pkg/cmd/registry/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,14 @@ type options struct {
logger logging.Logger
Context context.Context
ServiceContext servicecontext.IContext

registryInstance *srsmgmtv1.Registry
}

// NewDescribeCommand describes a service instance, either by passing an `--id flag`
// or by using the service instance set in the current context, if any
func NewDescribeCommand(f *factory.Factory) *cobra.Command {

opts := &options{
Connection: f.Connection,
IO: f.IOStreams,
Expand All @@ -49,7 +52,7 @@ func NewDescribeCommand(f *factory.Factory) *cobra.Command {
Long: f.Localizer.MustLocalize("registry.cmd.describe.longDescription"),
Example: f.Localizer.MustLocalize("registry.cmd.describe.example"),
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
RunE: func(cmd *cobra.Command, args []string) (err error) {
validOutputFormats := flagutil.ValidOutputFormats
if opts.outputFormat != "" && !flagutil.IsValidInput(opts.outputFormat, validOutputFormats...) {
return flagutil.InvalidValueError("output", opts.outputFormat, validOutputFormats...)
Expand All @@ -63,12 +66,12 @@ func NewDescribeCommand(f *factory.Factory) *cobra.Command {
return runDescribe(opts)
}

registryInstance, err := contextutil.GetCurrentRegistryInstance(f)
opts.registryInstance, err = contextutil.GetCurrentRegistryInstance(f)
if err != nil {
return err
}

opts.id = registryInstance.GetId()
opts.id = opts.registryInstance.GetId()

return runDescribe(opts)
},
Expand All @@ -91,24 +94,25 @@ func runDescribe(opts *options) error {

api := conn.API()

var registry *srsmgmtv1.Registry
if opts.name != "" {
registry, _, err = serviceregistryutil.GetServiceRegistryByName(opts.Context, api.ServiceRegistryMgmt(), opts.name)
if err != nil {
return err
}
} else {
registry, _, err = serviceregistryutil.GetServiceRegistryByID(opts.Context, api.ServiceRegistryMgmt(), opts.id)
if err != nil {
return err
if opts.registryInstance == nil {
if opts.name != "" {
opts.registryInstance, _, err = serviceregistryutil.GetServiceRegistryByName(opts.Context, api.ServiceRegistryMgmt(), opts.name)
if err != nil {
return err
}
} else {
opts.registryInstance, _, err = serviceregistryutil.GetServiceRegistryByID(opts.Context, api.ServiceRegistryMgmt(), opts.id)
if err != nil {
return err
}
}
}

if err := dump.Formatted(opts.IO.Out, opts.outputFormat, registry); err != nil {
if err := dump.Formatted(opts.IO.Out, opts.outputFormat, opts.registryInstance); err != nil {
return err
}

compatibleEndpoints := registrycmdutil.GetCompatibilityEndpoints(registry.GetRegistryUrl())
compatibleEndpoints := registrycmdutil.GetCompatibilityEndpoints(opts.registryInstance.GetRegistryUrl())

opts.logger.Info(opts.localizer.MustLocalize(
"registry.common.log.message.compatibleAPIs",
Expand Down