mirror of
https://github.com/coder/coder.git
synced 2026-06-02 20:48:20 +00:00
Cian Johnston
847a88c6ca
## Changes
- **Commit 1**: Remove 17 unnecessary `//nolint` directives:
- `//nolint:varnamelen` — linter not active
- `//nolint:unused` on exported `SlimUnsupported`
- `//nolint:govet` in `coderd/httpmw/csrf` — no longer fires
- `//nolint:revive` on functions refactored since the nolint was added
- `//nolint:paralleltest` citing Go 1.22 loop variable capture
(obsolete)
- Bare `//nolint` narrowed to specific `//nolint:gocritic` with
justification
- **Commit 2**: Fix root causes behind 5 dangerous nolint suppressions:
- Add `MinVersion: tls.VersionTLS12` to TLS client config (removes
`gosec` G402)
- Delete trivial unexported wrappers `apiKey()`/`normalizeProvider()` in
chatprovider (removes `revive` confusing-naming)
- Add doc comments to `StartWithAssert` and `Router` (removes `revive`
exported)
- Rename unused parameters to `_` in integration test helpers
> 🤖 This PR was created using Coder Agents and reviewed by me.
73 lines
1.8 KiB
Go
73 lines
1.8 KiB
Go
package vpn
|
|
|
|
import (
|
|
"net/netip"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
"tailscale.com/net/dns"
|
|
"tailscale.com/util/dnsname"
|
|
)
|
|
|
|
func TestConvertDNSConfig(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tests := []struct {
|
|
name string
|
|
input dns.OSConfig
|
|
expected *NetworkSettingsRequest_DNSSettings
|
|
}{
|
|
{
|
|
name: "Basic",
|
|
input: dns.OSConfig{
|
|
Nameservers: []netip.Addr{
|
|
netip.MustParseAddr("1.1.1.1"),
|
|
netip.MustParseAddr("8.8.8.8"),
|
|
},
|
|
SearchDomains: []dnsname.FQDN{
|
|
"example.com.",
|
|
"test.local.",
|
|
},
|
|
MatchDomains: []dnsname.FQDN{
|
|
"internal.domain.",
|
|
},
|
|
},
|
|
expected: &NetworkSettingsRequest_DNSSettings{
|
|
Servers: []string{"1.1.1.1", "8.8.8.8"},
|
|
SearchDomains: []string{"example.com", "test.local"},
|
|
DomainName: "coder",
|
|
MatchDomains: []string{"internal.domain"},
|
|
MatchDomainsNoSearch: false,
|
|
},
|
|
},
|
|
{
|
|
name: "Empty",
|
|
input: dns.OSConfig{
|
|
Nameservers: []netip.Addr{},
|
|
SearchDomains: []dnsname.FQDN{},
|
|
MatchDomains: []dnsname.FQDN{},
|
|
},
|
|
expected: &NetworkSettingsRequest_DNSSettings{
|
|
Servers: []string{},
|
|
SearchDomains: []string{},
|
|
DomainName: "coder",
|
|
MatchDomains: []string{},
|
|
MatchDomainsNoSearch: false,
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result := convertDNSConfig(tt.input)
|
|
require.Equal(t, tt.expected.Servers, result.Servers)
|
|
require.Equal(t, tt.expected.SearchDomains, result.SearchDomains)
|
|
require.Equal(t, tt.expected.DomainName, result.DomainName)
|
|
require.Equal(t, tt.expected.MatchDomains, result.MatchDomains)
|
|
require.Equal(t, tt.expected.MatchDomainsNoSearch, result.MatchDomainsNoSearch)
|
|
})
|
|
}
|
|
}
|