Skip to content

Commit 4512b73

Browse files
fix(service-registry create): improve error handling (#1814)
1 parent 63e0eba commit 4512b73

29 files changed

+564
-167
lines changed

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ require (
4141

4242
require (
4343
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/accountmgmt/apiv1/client v0.0.0-20230216114230-4ff0373de47f
44-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/connectormgmt v0.0.0-20230220160753-3c2c52e7e98a
45-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkainstance v0.0.0-20230220160753-3c2c52e7e98a
44+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/connectormgmt v0.0.0-20230222114134-d97c4c88765b
45+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkainstance v0.0.0-20230222114134-d97c4c88765b
4646
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkamgmt v0.0.0-20230220160753-3c2c52e7e98a
47-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registryinstance v0.0.0-20230220160753-3c2c52e7e98a
48-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registrymgmt v0.0.0-20230220160753-3c2c52e7e98a
49-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/serviceaccountmgmt v0.0.0-20230220160753-3c2c52e7e98a
47+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registryinstance v0.0.0-20230222114134-d97c4c88765b
48+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registrymgmt v0.0.0-20230222114134-d97c4c88765b
49+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/serviceaccountmgmt v0.0.0-20230222114134-d97c4c88765b
5050
)
5151

5252
require (
@@ -96,7 +96,7 @@ require (
9696
github.com/prometheus/client_model v0.2.0 // indirect
9797
github.com/prometheus/common v0.26.0 // indirect
9898
github.com/prometheus/procfs v0.6.0 // indirect
99-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0 // indirect
99+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.2.0 // indirect
100100
github.com/rivo/uniseg v0.2.0 // indirect
101101
github.com/russross/blackfriday/v2 v2.1.0 // indirect
102102
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect

go.sum

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -691,22 +691,23 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
691691
github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
692692
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
693693
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
694-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0 h1:bl64y8lVc+rcda483ZvJr+GjuhsQQhkrzUiDfzPjB4Q=
695694
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.1.0/go.mod h1:JPNDOitDoHoHk5ZPRjfOxHQhE4Br0WtiyV8m43E0rso=
695+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.2.0 h1:N2FoVU7tD8S94+xmgYDOfbLJpZz4o6bVoub7D/jFWC4=
696+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go v0.2.0/go.mod h1:JPNDOitDoHoHk5ZPRjfOxHQhE4Br0WtiyV8m43E0rso=
696697
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/accountmgmt/apiv1/client v0.0.0-20230216114230-4ff0373de47f h1:jXUB35TstK4p1JkhMTU0xGRsoNlnwffv4qX9E3LRMck=
697698
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/accountmgmt/apiv1/client v0.0.0-20230216114230-4ff0373de47f/go.mod h1:I2ayTdtOFVLwyASlzvbnKaz23v9c/GiJazXek2k1yUg=
698-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/connectormgmt v0.0.0-20230220160753-3c2c52e7e98a h1:8viwGaF7yMMYX1RJTkH7DUkhuND9b2v0LaPcrIoYWs0=
699-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/connectormgmt v0.0.0-20230220160753-3c2c52e7e98a/go.mod h1:gK7/wdWr89PXSQbJ/KlaBVMdspFkDboi8yQqVuM5Ke0=
700-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkainstance v0.0.0-20230220160753-3c2c52e7e98a h1:k2wz3MgCKzTbOSvhSRD0hXjgfgMzarRZP528kCpcH1E=
701-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkainstance v0.0.0-20230220160753-3c2c52e7e98a/go.mod h1:eJWRq/utm2rgeF/CVTeiMdlUAlEoYE5P3/13KAJyaL8=
699+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/connectormgmt v0.0.0-20230222114134-d97c4c88765b h1:ZbZfNu6+bP2Im8ZIhC3d7yE/SthmuTc5tpvoYBHh8kM=
700+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/connectormgmt v0.0.0-20230222114134-d97c4c88765b/go.mod h1:gK7/wdWr89PXSQbJ/KlaBVMdspFkDboi8yQqVuM5Ke0=
701+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkainstance v0.0.0-20230222114134-d97c4c88765b h1:XL00la+2TXfgI5NibnqlM/2y44FrQv7N/XKqgPYxSqU=
702+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkainstance v0.0.0-20230222114134-d97c4c88765b/go.mod h1:eJWRq/utm2rgeF/CVTeiMdlUAlEoYE5P3/13KAJyaL8=
702703
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkamgmt v0.0.0-20230220160753-3c2c52e7e98a h1:LhFKr0iCPdEUSaIzrl+2Y6CXqV5fkfUktwCDnH2wdeQ=
703704
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/kafkamgmt v0.0.0-20230220160753-3c2c52e7e98a/go.mod h1:AHZLQfBqzwY+uDWfo577AipCpnFPG4GNXTnXyWeFKD4=
704-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registryinstance v0.0.0-20230220160753-3c2c52e7e98a h1:VMkueGJm/lHF0SmNUrUYqrwQzquahX3ZkjUdOll2j+4=
705-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registryinstance v0.0.0-20230220160753-3c2c52e7e98a/go.mod h1:Pvw6KeJUK9tdvCHkDIoXcWUyjxWc3Nn//Eax2mcbMJ0=
706-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registrymgmt v0.0.0-20230220160753-3c2c52e7e98a h1:t0a5qZfNfRjw2fKlyzM878cZOGIpfjLHKJ9jw3y61Ak=
707-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registrymgmt v0.0.0-20230220160753-3c2c52e7e98a/go.mod h1:T20A1WmLYXFpA5QntaAF1B44uj9geAgUbTco0qIX7kY=
708-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/serviceaccountmgmt v0.0.0-20230220160753-3c2c52e7e98a h1:tkIWnEabTTum0iB2mPVAJVdPES296Qo5qPxeBZnzwBY=
709-
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/serviceaccountmgmt v0.0.0-20230220160753-3c2c52e7e98a/go.mod h1:9UjE86bWDvSfAwSAqweZPRNEAjAgI0ZvKYMIoz06qd0=
705+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registryinstance v0.0.0-20230222114134-d97c4c88765b h1:fz4sahm2HQq5dJV7M8LUldosM2RAXzVthn6pUEBSeFM=
706+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registryinstance v0.0.0-20230222114134-d97c4c88765b/go.mod h1:Pvw6KeJUK9tdvCHkDIoXcWUyjxWc3Nn//Eax2mcbMJ0=
707+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registrymgmt v0.0.0-20230222114134-d97c4c88765b h1:tYahCNjxLYtikqnhIdbGyEP+zZ2bkEtxnpJQhN0Se6s=
708+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registrymgmt v0.0.0-20230222114134-d97c4c88765b/go.mod h1:T20A1WmLYXFpA5QntaAF1B44uj9geAgUbTco0qIX7kY=
709+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/serviceaccountmgmt v0.0.0-20230222114134-d97c4c88765b h1:+4KWvTNPiEaz7f8Nncbkyag9MEO9u22d2ijrojAwP1c=
710+
github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/serviceaccountmgmt v0.0.0-20230222114134-d97c4c88765b/go.mod h1:9UjE86bWDvSfAwSAqweZPRNEAjAgI0ZvKYMIoz06qd0=
710711
github.com/redhat-developer/service-binding-operator v0.9.0 h1:CS+eEtzu/PtWuyvYQFQpZXd6ukSuFtN+U0EKKtTsvlA=
711712
github.com/redhat-developer/service-binding-operator v0.9.0/go.mod h1:D415gZQiz5Q8zyRbmrNrlieb6Xp73oFtCb+nCuTL6GA=
712713
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=

pkg/cmd/registry/create/create.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,9 @@ func handleErrors(err error, opts *options) error {
197197
if srsmgmtv1errors.IsAPIError(err, srsmgmtv1errors.ERROR_7) {
198198
return opts.localizer.MustLocalizeError("registry.cmd.create.error.limitreached")
199199
}
200+
if srsmgmtv1errors.IsAPIError(err, srsmgmtv1errors.ERROR_9) {
201+
return opts.localizer.MustLocalizeError("registry.cmd.create.error.name.alreadyExists", localize.NewEntry("Name", opts.name))
202+
}
200203
if srsmgmtv1errors.IsAPIError(err, srsmgmtv1errors.ERROR_13) {
201204
return opts.localizer.MustLocalizeError("registry.cmd.create.error.trial.limitreached")
202205
}

pkg/core/localize/locales/en/cmd/registry_crud.en.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ one = '''
146146
Instance cannot be created. We have reached global the limit of service registry instances.
147147
'''
148148

149+
[registry.cmd.create.error.name.alreadyExists]
150+
one = 'Instance with name "{{.Name}}" already exists'
149151

150152
[registry.cmd.create.flag.use.description]
151153
one = 'Set the new Service Registry instance to the current instance'

vendor/github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registrymgmt/apiv1/client/api_default.go

Lines changed: 22 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/redhat-developer/app-services-sdk-core/app-services-sdk-go/registrymgmt/apiv1/client/api_errors.go

Lines changed: 58 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)