Skip to content

Commit

Permalink
run golangci-lint --fix
Browse files Browse the repository at this point in the history 
Signed-off-by: Denis Tingajkin <denis.tingajkin@xored.com>
  • Loading branch information
@denis-tingaikin
denis-tingaikin committed Feb 2, 2020
1 parent ef9420e commit 5823473
Show file tree
Hide file tree
Showing 31 changed files with 8 additions and 37 deletions.
1 change: 0 additions & 1 deletion pkg/networkservice/chains/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package client
import (
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/chains/endpoint/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package endpoint
import (
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/authorize/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/authorize/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (

"github.com/golang/protobuf/ptypes/empty"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/authorize/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/clienturl/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (

"github.com/golang/protobuf/ptypes/empty"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/discover/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"


"github.com/networkservicemesh/api/pkg/api/networkservice"
"github.com/networkservicemesh/api/pkg/api/registry"

Expand Down
3 changes: 1 addition & 2 deletions pkg/networkservice/common/filtermechanisms/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/cls"
"github.com/networkservicemesh/api/pkg/api/networkservice"
"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/cls"

"github.com/networkservicemesh/sdk/pkg/networkservice/common/clienturl"
"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
Expand Down
3 changes: 1 addition & 2 deletions pkg/networkservice/common/filtermechanisms/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"google.golang.org/grpc/peer"


"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/cls"
"github.com/networkservicemesh/api/pkg/api/networkservice"
"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/cls"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
)
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/heal/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"github.com/pkg/errors"
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/trace"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/localbypass/networkservice_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (

"github.com/golang/protobuf/ptypes/empty"


"github.com/networkservicemesh/api/pkg/api/networkservice"
"github.com/networkservicemesh/api/pkg/api/registry"

Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/monitor/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (

"github.com/golang/protobuf/ptypes/empty"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/refresh/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"github.com/pkg/errors"
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/roundrobin/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/common/clienturl"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/setid/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/google/uuid"
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/setid/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/google/uuid"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/timeout/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/updatepath/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/pkg/errors"
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/common/updatepath/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/core/adapters/client_to_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (

"github.com/golang/protobuf/ptypes/empty"


"github.com/networkservicemesh/api/pkg/api/networkservice"
)

Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/core/adapters/server_to_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice"
)

Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/core/next/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice"
)

Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/core/next/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (

"github.com/golang/protobuf/ptypes/empty"


"github.com/networkservicemesh/api/pkg/api/networkservice"
)

Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/core/next/tail_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice"
)

Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/core/next/tail_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (

"github.com/golang/protobuf/ptypes/empty"


"github.com/networkservicemesh/api/pkg/api/networkservice"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/networkservice/core/next/tests/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"context"

"github.com/golang/protobuf/ptypes/empty"

"github.com/networkservicemesh/api/pkg/api/networkservice"
"google.golang.org/grpc"

Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/core/trace/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"google.golang.org/grpc"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/tools/spanhelper"
Expand Down
1 change: 0 additions & 1 deletion pkg/networkservice/core/trace/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (

"github.com/golang/protobuf/ptypes/empty"


"github.com/networkservicemesh/api/pkg/api/networkservice"

"github.com/networkservicemesh/sdk/pkg/tools/spanhelper"
Expand Down
2 changes: 1 addition & 1 deletion pkg/tools/serialize/serialize.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func NewExecutor() Executor {
execCh: make(chan func(), 100),
finalizedCh: make(chan struct{}),
}
go eventLoop(rv.execCh,rv.finalizedCh)
go eventLoop(rv.execCh, rv.finalizedCh)
runtime.SetFinalizer(rv, func(f *executor) {
close(f.finalizedCh)
})
Expand Down
8 changes: 4 additions & 4 deletions pkg/tools/serialize/serialize_finalizer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ func TestFinalizer(t *testing.T) {
// Run the garbage collector
runtime.GC()
select {
case <-finalizedCh:
return
case <- time.After(30*time.Second):
assert.Fail(t,"Timeout waiting for finalizer to run")
case <-finalizedCh:
return
case <-time.After(30 * time.Second):
assert.Fail(t, "Timeout waiting for finalizer to run")
}
}
2 changes: 0 additions & 2 deletions pkg/tools/serialize/serialize_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,5 +138,3 @@ func TestAsyncExecOneAtATime(t *testing.T) {
<-done
}
}


0 comments on commit 5823473

Please sign in to comment.