Skip to content

Commit

Permalink
refactor: added lint skip to some wanted globals
Browse files Browse the repository at this point in the history
  • Loading branch information
robot9706 committed Jul 27, 2022
1 parent c97bbca commit d6abc4f
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
31 changes: 16 additions & 15 deletions agent/internal/grpc/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ func (g *GrpcConnection) SetConn(conn *grpc.ClientConn) {
g.Conn = conn
}

var GrpcConn *GrpcConnection
// Singleton instance
var grpcConn *GrpcConnection //nolint:gochecknoglobals

func fetchCertificatesFromURL(url string) (*x509.CertPool, error) {
log.Println("Retrieving certificate")
Expand Down Expand Up @@ -114,14 +115,14 @@ func fetchCertificatesFromURL(url string) (*x509.CertPool, error) {

func Init(connParams *GrpcConnectionParams, appConfig *config.CommonConfiguration, workerFuncs WorkerFunctions) {
log.Println("Spinning up gRPC Agent client...")
if GrpcConn == nil {
GrpcConn = &GrpcConnection{}
if grpcConn == nil {
grpcConn = &GrpcConnection{}
}

ctx, cancel := context.WithCancel(context.TODO())
ctx = metadata.AppendToOutgoingContext(ctx, "dyo-node-token", connParams.token)

if GrpcConn.Conn == nil {
if grpcConn.Conn == nil {
var creds credentials.TransportCredentials
if connParams.insecure {
creds = insecure.NewCredentials()
Expand Down Expand Up @@ -169,7 +170,7 @@ func Init(connParams *GrpcConnectionParams, appConfig *config.CommonConfiguratio
if err != nil {
log.Println("gRPC connection error: " + err.Error())
}
GrpcConn.Conn = conn
grpcConn.Conn = conn
}

// if binding multiple ports, eg http, we have to run stuff in go func
Expand All @@ -185,19 +186,19 @@ func grpcLoop(
var stream agent.Agent_ConnectClient
var err error
defer cancel()
defer GrpcConn.Conn.Close()
defer grpcConn.Conn.Close()
for {
if GrpcConn.Client == nil {
client := agent.NewAgentClient(GrpcConn.Conn)
GrpcConn.SetClient(client)
stream, err = GrpcConn.Client.Connect(
if grpcConn.Client == nil {
client := agent.NewAgentClient(grpcConn.Conn)
grpcConn.SetClient(client)
stream, err = grpcConn.Client.Connect(
ctx, &agent.AgentInfo{Id: nodeID, Version: version.BuildVersion()},
grpc.WaitForReady(true),
)
if err != nil {
log.Println(err)
time.Sleep(time.Second)
GrpcConn.Client = nil
grpcConn.Client = nil
continue
} else {
log.Println("Stream connection is up")
Expand All @@ -208,12 +209,12 @@ func grpcLoop(
err = stream.RecvMsg(command)
if err == io.EOF {
log.Print("End of receiving")
GrpcConn.Client = nil
grpcConn.Client = nil
continue
}
if err != nil {
log.Println(status.Errorf(codes.Unknown, "Cannot receive stream: %v", err))
GrpcConn.Client = nil
grpcConn.Client = nil
time.Sleep(appConfig.DefaultTimeout)
// TODO replace the line above with an error status code check and terminate dagent accordingly
continue
Expand All @@ -239,7 +240,7 @@ func executeVersionDeployRequest(
log.Println("Deployment -", req.Id, "Opening status channel.")

deployCtx := metadata.AppendToOutgoingContext(ctx, "dyo-deployment-id", req.Id)
statusStream, err := GrpcConn.Client.DeploymentStatus(deployCtx, grpc.WaitForReady(true))
statusStream, err := grpcConn.Client.DeploymentStatus(deployCtx, grpc.WaitForReady(true))

if err != nil {
log.Println("Deployment -", req.Id, "Status connect error: ", err.Error())
Expand Down Expand Up @@ -291,7 +292,7 @@ func executeWatchContainerStatus(ctx context.Context, req *agent.ContainerStatus
log.Printf("Opening container status channel for prefix: %s", filterPrefix)

streamCtx := metadata.AppendToOutgoingContext(ctx, "dyo-filter-prefix", filterPrefix)
stream, err := GrpcConn.Client.ContainerStatus(streamCtx, grpc.WaitForReady(true))
stream, err := grpcConn.Client.ContainerStatus(streamCtx, grpc.WaitForReady(true))
if err != nil {
log.Printf("Failed to open container status channel: %s", err.Error())
return
Expand Down
3 changes: 2 additions & 1 deletion agent/internal/sigmalr/sigmalr.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import (

const KeepAliveIntervalSeconds = 5

var signalrServerInstance signalr.Server = nil
// Singleton, accessed only in GetSignalrInstance
var signalrServerInstance signalr.Server = nil //nolint:gochecknoglobals

// GetSignalrInstance if not yet initialized spawn a signaler server & hub
func GetSignalrInstance() (signalr.Server, error) {
Expand Down
6 changes: 3 additions & 3 deletions agent/pkg/api/v1/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ type Volume struct {
Class string `json:"class"`
}

var ValidSize validator.Func = func(fl validator.FieldLevel) bool {
var ValidSize validator.Func = func(fl validator.FieldLevel) bool { //nolint:gochecknoglobals
size := fl.Field().String()
_, err := resource.ParseQuantity(size)
return err == nil
Expand Down Expand Up @@ -480,7 +480,7 @@ func (e *ErrRestartPolicyUnmarshalInvalid) Error() string {
}

// PolicyToString static mapping enum type into the docker supported string values
var policyToString = map[RestartPolicyName]string{
var policyToString = map[RestartPolicyName]string{ //nolint:gochecknoglobals
EmptyRestartPolicy: "unless-stopped",
RestartUnlessStoppedRestartPolicy: "unless-stopped",
NoRestartPolicy: "no",
Expand All @@ -489,7 +489,7 @@ var policyToString = map[RestartPolicyName]string{
}

// PolicyToID static mapping string values eg. from JSON into enums
var policyToID = map[string]RestartPolicyName{
var policyToID = map[string]RestartPolicyName{ //nolint:gochecknoglobals
"": RestartUnlessStoppedRestartPolicy,
"unless-stopped": RestartUnlessStoppedRestartPolicy,
"no": NoRestartPolicy,
Expand Down
4 changes: 2 additions & 2 deletions agent/pkg/dagent/utils/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (

const DockerClientTimeoutSeconds = 30

var val time.Duration = (time.Duration(DockerClientTimeoutSeconds) * time.Second)
var containerTimeout *time.Duration = &val
var val time.Duration = (time.Duration(DockerClientTimeoutSeconds) * time.Second) //nolint:gochecknoglobals
var containerTimeout *time.Duration = &val //nolint:gochecknoglobals

type DockerVersion struct {
ServerVersion string
Expand Down

0 comments on commit d6abc4f

Please sign in to comment.