Skip to content

Commit b090d61

Browse files
committed
tailcfg: rename prototype field to reflect its status
(Added earlier today in tailscale#8916, 57da1f1) Updates tailscale/corp#13969 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
1 parent 57da1f1 commit b090d61

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

client/tailscale/apitype/controltype.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
package apitype
55

66
type DNSConfig struct {
7-
Resolvers []DNSResolver `json:"resolvers"`
8-
FallbackResolvers []DNSResolver `json:"fallbackResolvers"`
9-
Routes map[string][]DNSResolver `json:"routes"`
10-
Domains []string `json:"domains"`
11-
Nameservers []string `json:"nameservers"`
12-
Proxied bool `json:"proxied"`
13-
DNSFilterURL string `json:"DNSFilterURL"`
7+
Resolvers []DNSResolver `json:"resolvers"`
8+
FallbackResolvers []DNSResolver `json:"fallbackResolvers"`
9+
Routes map[string][]DNSResolver `json:"routes"`
10+
Domains []string `json:"domains"`
11+
Nameservers []string `json:"nameservers"`
12+
Proxied bool `json:"proxied"`
13+
TempCorpIssue13969 string `json:"TempCorpIssue13969,omitempty"`
1414
}
1515

1616
type DNSResolver struct {

tailcfg/tailcfg.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,8 +1403,11 @@ type DNSConfig struct {
14031403
//
14041404
// Matches are case insensitive.
14051405
ExitNodeFilteredSet []string `json:",omitempty"`
1406-
// DNSFilterURL contains a user inputed URL that should have a list of domains to be blocked
1407-
DNSFilterURL string `json:",omitempty"`
1406+
1407+
// TempCorpIssue13969 is a temporary (2023-08-16) field for an internal hack day prototype.
1408+
// It contains a user inputed URL that should have a list of domains to be blocked.
1409+
// See https://github.com/tailscale/corp/issues/13969.
1410+
TempCorpIssue13969 string `json:",omitempty"`
14081411
}
14091412

14101413
// DNSRecord is an extra DNS record to add to MagicDNS.

tailcfg/tailcfg_clone.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tailcfg/tailcfg_view.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)