From 697ea561e000de38c5a92f2e9c143cf8dcb28cfb Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Sun, 20 Sep 2020 16:04:05 -0400 Subject: [PATCH] Fix breakage from dual merges --- .../controller/handlers/targets/target_service.go | 2 +- .../controller/handlers/workers/worker_service.go | 12 ++++++------ internal/session/session.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/servers/controller/handlers/targets/target_service.go b/internal/servers/controller/handlers/targets/target_service.go index 1af4f08673..3c0865323b 100644 --- a/internal/servers/controller/handlers/targets/target_service.go +++ b/internal/servers/controller/handlers/targets/target_service.go @@ -373,7 +373,7 @@ HostSetIterationLoop: if err != nil { return nil, err } - sess, _, privKey, err := sessionRepo.CreateSession(ctx, wrapper, sess) + sess, privKey, err := sessionRepo.CreateSession(ctx, wrapper, sess) if err != nil { return nil, err } diff --git a/internal/servers/controller/handlers/workers/worker_service.go b/internal/servers/controller/handlers/workers/worker_service.go index ff87c3f164..a410e8466d 100644 --- a/internal/servers/controller/handlers/workers/worker_service.go +++ b/internal/servers/controller/handlers/workers/worker_service.go @@ -85,21 +85,21 @@ func (ws *workerServiceServer) Status(ctx context.Context, req *pbs.StatusReques continue } sessionId := si.GetSessionId() - sessionInfo, sessionStates, err := sessRepo.LookupSession(ctx, sessionId) + sessionInfo, err := sessRepo.LookupSession(ctx, sessionId) if err != nil { return nil, status.Errorf(codes.Internal, "Error looking up session with id %s: %v", sessionId, err) } if sessionInfo == nil { return nil, status.Errorf(codes.Internal, "Unknown session ID %s at status time.", sessionId) } - if len(sessionStates) == 0 { + if len(sessionInfo.States) == 0 { return nil, status.Error(codes.Internal, "Empty session states during lookup at status time.") } // If the session from the DB is in canceling status, and we're // here, it means the job is in pending or active; cancel it. If // it's in termianted status something went wrong and we're // mismatched, so ensure we cancel it also. - currState := sessionStates[0].Status + currState := sessionInfo.States[0].Status switch currState { case session.StatusCancelling, session.StatusTerminated: @@ -129,14 +129,14 @@ func (ws *workerServiceServer) LookupSession(ctx context.Context, req *pbs.Looku return nil, status.Errorf(codes.Internal, "Error getting session repo: %v", err) } - sessionInfo, sessionStates, err := sessRepo.LookupSession(ctx, req.GetSessionId()) + sessionInfo, err := sessRepo.LookupSession(ctx, req.GetSessionId()) if err != nil { return nil, status.Errorf(codes.Internal, "Error looking up session: %v", err) } if sessionInfo == nil { return nil, status.Error(codes.PermissionDenied, "Unknown session ID.") } - if len(sessionStates) == 0 { + if len(sessionInfo.States) == 0 { return nil, status.Error(codes.Internal, "Empty session states during lookup.") } @@ -145,7 +145,7 @@ func (ws *workerServiceServer) LookupSession(ctx context.Context, req *pbs.Looku SessionId: sessionInfo.GetPublicId(), Certificate: sessionInfo.Certificate, }, - Status: sessionStates[0].Status.ProtoVal(), + Status: sessionInfo.States[0].Status.ProtoVal(), Version: sessionInfo.Version, TofuToken: string(sessionInfo.TofuToken), Endpoint: sessionInfo.Endpoint, diff --git a/internal/session/session.go b/internal/session/session.go index 6891e2cce1..f6db63a56b 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -376,7 +376,7 @@ type sessionView struct { UpdateTime *timestamp.Timestamp `json:"update_time,omitempty" gorm:"default:current_timestamp"` Version uint32 `json:"version,omitempty" gorm:"default:null"` Endpoint string `json:"-" gorm:"default:null"` - ConnectionLimit uint32 `json:"connection_limit,omitempty" gorm:"default:null"` + ConnectionLimit int32 `json:"connection_limit,omitempty" gorm:"default:null"` KeyId string `json:"key_id,omitempty" gorm:"not_null"` // State fields