Skip to content

Commit

Permalink
fix linter issues
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Tingaikin <[email protected]>
  • Loading branch information
denis-tingaikin committed Jun 26, 2023
1 parent 7c60f7c commit 4d6c93b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
6 changes: 1 addition & 5 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ linters-settings:
- unnamedResult
- unnecessaryBlock
- underef
- unlambda
- unslice
- valSwap
- weakCond
Expand All @@ -133,7 +132,7 @@ linters:
- goheader
- bodyclose
- deadcode
- depguard
# - depguard
- dogsled
- dupl
- errcheck
Expand Down Expand Up @@ -302,6 +301,3 @@ issues:
linters:
- interfacer
text: "`rawSrv` can be `github.com/networkservicemesh/sdk/pkg/networkservice/common/monitor.EventConsumer`"
- path: pkg/registry/chains/proxydns/.*_test.go
linters:
- unlambda
4 changes: 2 additions & 2 deletions pkg/registry/chains/proxydns/server_ns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ func TestInterdomainNetworkServiceRegistryWithDifferentDNSScheme(t *testing.T) {
dnsServer.DeleteSRVEntry(dnsresolve.DefaultNsmgrProxyService, domain2.Name)
dnsServer.DeleteSRVEntry(dnsresolve.DefaultRegistryService, domain2.Name)

dnsServer.AddSRVEntry("example.com", "nsmgr-proxy2", domain2.NSMgrProxy.URL)
dnsServer.AddSRVEntry("example.com", "registry2", domain2.Registry.URL)
require.NoError(t, dnsServer.AddSRVEntry("example.com", "nsmgr-proxy2", domain2.NSMgrProxy.URL))
require.NoError(t, dnsServer.AddSRVEntry("example.com", "registry2", domain2.Registry.URL))

client1 := registryclient.NewNetworkServiceRegistryClient(ctx,
registryclient.WithDialOptions(grpc.WithTransportCredentials(insecure.NewCredentials())),
Expand Down
4 changes: 2 additions & 2 deletions pkg/registry/chains/proxydns/server_nse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ func TestInterdomainNetworkServiceEndpointRegistryWithDifferentDNSScheme(t *test
dnsServer.DeleteSRVEntry(dnsresolve.DefaultNsmgrProxyService, domain2.Name)
dnsServer.DeleteSRVEntry(dnsresolve.DefaultRegistryService, domain2.Name)

dnsServer.AddSRVEntry("example.com", "nsmgr-proxy2", domain2.NSMgrProxy.URL)
dnsServer.AddSRVEntry("example.com", "registry2", domain2.Registry.URL)
require.NoError(t, dnsServer.AddSRVEntry("example.com", "nsmgr-proxy2", domain2.NSMgrProxy.URL))
require.NoError(t, dnsServer.AddSRVEntry("example.com", "registry2", domain2.Registry.URL))

expirationTime := timestamppb.New(time.Now().Add(time.Hour))

Expand Down
2 changes: 1 addition & 1 deletion pkg/registry/common/dnsresolve/ns_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func TestDNSResolve_LoopUsecase(t *testing.T) {
u, err := url.Parse("tcp://127.0.0.1:80")
require.NoError(t, err)

require.NoError(t, sandbox.AddSRVEntry(resolver, "domain1", srv, u))
require.NoError(t, resolver.AddSRVEntry("domain1", srv, u))

s := dnsresolve.NewNetworkServiceRegistryServer(
dnsresolve.WithRegistryService(srv),
Expand Down

0 comments on commit 4d6c93b

Please sign in to comment.