Skip to content

Commit 2c5c6c5

Browse files
committed
CLEANUP: cluster: fix error variable shadowing
1 parent d2ce90f commit 2c5c6c5

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

handlers/cluster.go

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,8 @@ func (h *ClusterInitiateCertificateRefreshHandlerImpl) Handle(params cluster.Ini
6969

7070
func (h *CreateClusterHandlerImpl) err500(err error, transaction *models.Transaction) middleware.Responder {
7171
if transaction != nil {
72-
73-
configuration, err := h.Client.Configuration()
74-
if err == nil {
72+
configuration, confErr := h.Client.Configuration()
73+
if confErr == nil {
7574
_ = configuration.DeleteTransaction(transaction.ID)
7675
}
7776
}
@@ -86,9 +85,8 @@ func (h *CreateClusterHandlerImpl) err500(err error, transaction *models.Transac
8685
func (h *CreateClusterHandlerImpl) err406(err error, transaction *models.Transaction) middleware.Responder {
8786
// 406 Not Acceptable
8887
if transaction != nil {
89-
90-
configuration, err := h.Client.Configuration()
91-
if err == nil {
88+
configuration, confErr := h.Client.Configuration()
89+
if confErr == nil {
9290
_ = configuration.DeleteTransaction(transaction.ID)
9391
}
9492
}
@@ -103,8 +101,8 @@ func (h *CreateClusterHandlerImpl) err406(err error, transaction *models.Transac
103101
func (h *CreateClusterHandlerImpl) err409(err error, transaction *models.Transaction) middleware.Responder {
104102
// 409 Conflict
105103
if transaction != nil {
106-
configuration, err := h.Client.Configuration()
107-
if err == nil {
104+
configuration, confErr := h.Client.Configuration()
105+
if confErr == nil {
108106
_ = configuration.DeleteTransaction(transaction.ID)
109107
}
110108
}
@@ -276,9 +274,8 @@ func (h *DeleteClusterHandlerImpl) Handle(params cluster.DeleteClusterParams, pr
276274

277275
func (h *DeleteClusterHandlerImpl) err500(err error, transaction *models.Transaction) middleware.Responder {
278276
if transaction != nil {
279-
280-
configuration, err := h.Client.Configuration()
281-
if err == nil {
277+
configuration, confErr := h.Client.Configuration()
278+
if confErr == nil {
282279
_ = configuration.DeleteTransaction(transaction.ID)
283280
}
284281
}

0 commit comments

Comments
 (0)