Skip to content

Commit b0e6bc5

Browse files
committed
Fix warnings about errors.As parameters
1 parent daba834 commit b0e6bc5

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

ziti/ziti.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,19 +1607,19 @@ func (context *ContextImpl) createSession(service *rest_model.ServiceDetail, ses
16071607
session, err := context.getOrCreateSession(*service.ID, sessionType)
16081608
if err != nil {
16091609
logger.WithError(err).WithField("errorType", fmt.Sprintf("%T", err)).Warnf("failure creating %s session to service %s", sessionType, *service.Name)
1610-
var target error = &rest_session.CreateSessionUnauthorized{}
1611-
if errors.As(err, &target) {
1610+
var createSessionUnauthorized = &rest_session.CreateSessionUnauthorized{}
1611+
if errors.As(err, &createSessionUnauthorized) {
16121612
if err := context.Authenticate(); err != nil {
1613-
target = &authentication.AuthenticateUnauthorized{}
1614-
if errors.As(err, &target) {
1613+
var authenticateUnauthorized = &authentication.AuthenticateUnauthorized{}
1614+
if errors.As(err, &authenticateUnauthorized) {
16151615
return nil, backoff.Permanent(err)
16161616
}
16171617
return nil, err
16181618
}
16191619
}
16201620

1621-
target = &rest_session.CreateSessionNotFound{}
1622-
if errors.As(err, &target) {
1621+
var createSessionNotFound = &rest_session.CreateSessionNotFound{}
1622+
if errors.As(err, &createSessionNotFound) {
16231623
if refreshErr := context.refreshServices(false); refreshErr != nil {
16241624
logger.WithError(refreshErr).Info("failed to refresh services after create session returned 404 (likely for service)")
16251625
}
@@ -2042,15 +2042,15 @@ func (mgr *listenerManager) refreshSession() {
20422042
session, err := mgr.context.refreshSession(mgr.session)
20432043

20442044
if err != nil {
2045-
var target error = &rest_session.DetailSessionNotFound{}
2046-
if errors.As(err, &target) {
2045+
var detailSessionNotFound = &rest_session.DetailSessionNotFound{}
2046+
if errors.As(err, &detailSessionNotFound) {
20472047
// try to create new session
20482048
mgr.createSessionWithBackoff()
20492049
return
20502050
}
20512051

2052-
target = &rest_session.DetailSessionUnauthorized{}
2053-
if errors.As(err, &target) {
2052+
var detailSessionUnauthorized = &rest_session.DetailSessionUnauthorized{}
2053+
if errors.As(err, &detailSessionUnauthorized) {
20542054
log.WithError(err).Debugf("failure refreshing bind session for service %v", mgr.listener.GetServiceName())
20552055
if err := mgr.context.EnsureAuthenticated(mgr.options); err != nil {
20562056
err := fmt.Errorf("unable to establish API session (%w)", err)
@@ -2063,8 +2063,8 @@ func (mgr *listenerManager) refreshSession() {
20632063

20642064
session, err = mgr.context.refreshSession(mgr.session)
20652065
if err != nil {
2066-
target = &rest_session.DetailSessionUnauthorized{}
2067-
if errors.As(err, &target) {
2066+
detailSessionUnauthorized = &rest_session.DetailSessionUnauthorized{}
2067+
if errors.As(err, &detailSessionUnauthorized) {
20682068
log.WithError(err).Errorf(
20692069
"failure refreshing bind session even after re-authenticating api session. service %v",
20702070
mgr.listener.GetServiceName())

0 commit comments

Comments
 (0)