tailcfg: rename prototype field to reflect its status

(Added earlier today in #8916, 57da1f150)

Updates tailscale/corp#13969

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/8919/head
Brad Fitzpatrick 1 year ago committed by Brad Fitzpatrick
parent 57da1f1501
commit b090d61c0f

@ -4,13 +4,13 @@
package apitype package apitype
type DNSConfig struct { type DNSConfig struct {
Resolvers []DNSResolver `json:"resolvers"` Resolvers []DNSResolver `json:"resolvers"`
FallbackResolvers []DNSResolver `json:"fallbackResolvers"` FallbackResolvers []DNSResolver `json:"fallbackResolvers"`
Routes map[string][]DNSResolver `json:"routes"` Routes map[string][]DNSResolver `json:"routes"`
Domains []string `json:"domains"` Domains []string `json:"domains"`
Nameservers []string `json:"nameservers"` Nameservers []string `json:"nameservers"`
Proxied bool `json:"proxied"` Proxied bool `json:"proxied"`
DNSFilterURL string `json:"DNSFilterURL"` TempCorpIssue13969 string `json:"TempCorpIssue13969,omitempty"`
} }
type DNSResolver struct { type DNSResolver struct {

@ -1403,8 +1403,11 @@ type DNSConfig struct {
// //
// Matches are case insensitive. // Matches are case insensitive.
ExitNodeFilteredSet []string `json:",omitempty"` ExitNodeFilteredSet []string `json:",omitempty"`
// DNSFilterURL contains a user inputed URL that should have a list of domains to be blocked
DNSFilterURL string `json:",omitempty"` // TempCorpIssue13969 is a temporary (2023-08-16) field for an internal hack day prototype.
// It contains a user inputed URL that should have a list of domains to be blocked.
// See https://github.com/tailscale/corp/issues/13969.
TempCorpIssue13969 string `json:",omitempty"`
} }
// DNSRecord is an extra DNS record to add to MagicDNS. // DNSRecord is an extra DNS record to add to MagicDNS.

@ -261,7 +261,7 @@ var _DNSConfigCloneNeedsRegeneration = DNSConfig(struct {
CertDomains []string CertDomains []string
ExtraRecords []DNSRecord ExtraRecords []DNSRecord
ExitNodeFilteredSet []string ExitNodeFilteredSet []string
DNSFilterURL string TempCorpIssue13969 string
}{}) }{})
// Clone makes a deep copy of RegisterResponse. // Clone makes a deep copy of RegisterResponse.

@ -557,7 +557,7 @@ func (v DNSConfigView) ExtraRecords() views.Slice[DNSRecord] { return views.Slic
func (v DNSConfigView) ExitNodeFilteredSet() views.Slice[string] { func (v DNSConfigView) ExitNodeFilteredSet() views.Slice[string] {
return views.SliceOf(v.ж.ExitNodeFilteredSet) return views.SliceOf(v.ж.ExitNodeFilteredSet)
} }
func (v DNSConfigView) DNSFilterURL() string { return v.ж.DNSFilterURL } func (v DNSConfigView) TempCorpIssue13969() string { return v.ж.TempCorpIssue13969 }
// A compilation failure here means this code must be regenerated, with the command at the top of this file. // A compilation failure here means this code must be regenerated, with the command at the top of this file.
var _DNSConfigViewNeedsRegeneration = DNSConfig(struct { var _DNSConfigViewNeedsRegeneration = DNSConfig(struct {
@ -570,7 +570,7 @@ var _DNSConfigViewNeedsRegeneration = DNSConfig(struct {
CertDomains []string CertDomains []string
ExtraRecords []DNSRecord ExtraRecords []DNSRecord
ExitNodeFilteredSet []string ExitNodeFilteredSet []string
DNSFilterURL string TempCorpIssue13969 string
}{}) }{})
// View returns a readonly view of RegisterResponse. // View returns a readonly view of RegisterResponse.

Loading…
Cancel
Save