const

ethanndickson · ethanndickson · commit 0c9285605fb3 · 2025-04-11T02:03:57.000Z
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -354,6 +354,11 @@ func NewConn(options *Options) (conn *Conn, err error) {
 	return server, nil
 }
 
+// A FQDN to be mapped to `tsaddr.CoderServiceIPv6`. This address can be used
+// when you want to know if Coder Connect is running, but are not trying to
+// connect to a specific known workspace.
+const IsCoderConnectEnabledFQDNString = "is--coder--connect--enabled--right--now.coder."
+
 type ServicePrefix [6]byte
 
 var (
diff --git a/tailnet/controllers.go b/tailnet/controllers.go
@@ -1266,7 +1266,7 @@ func (t *tunnelUpdater) updateDNSNamesLocked() map[dnsname.FQDN][]netip.Addr {
 			}
 		}
 	}
-	fqdn, err := dnsname.ToFQDN("is--coder--connect--enabled--right--now.coder.")
+	fqdn, err := dnsname.ToFQDN(IsCoderConnectEnabledFQDNString)
 	if err != nil {
 		panic(fmt.Sprintf("failed to create static FQDN: %v", err))
 	}
diff --git a/tailnet/controllers_test.go b/tailnet/controllers_test.go
@@ -1564,14 +1564,14 @@ func TestTunnelAllWorkspaceUpdatesController_Initial(t *testing.T) {
 
 	// Also triggers setting DNS hosts
 	expectedDNS := map[dnsname.FQDN][]netip.Addr{
-		"w1a1.w1.me.coder.":    {ws1a1IP},
-		"w2a1.w2.me.coder.":    {w2a1IP},
-		"w2a2.w2.me.coder.":    {w2a2IP},
-		"w1a1.w1.testy.coder.": {ws1a1IP},
-		"w2a1.w2.testy.coder.": {w2a1IP},
-		"w2a2.w2.testy.coder.": {w2a2IP},
-		"w1.coder.":            {ws1a1IP},
-		"is--coder--connect--enabled--right--now.coder.": {tsaddr.CoderServiceIPv6()},
+		"w1a1.w1.me.coder.":                     {ws1a1IP},
+		"w2a1.w2.me.coder.":                     {w2a1IP},
+		"w2a2.w2.me.coder.":                     {w2a2IP},
+		"w1a1.w1.testy.coder.":                  {ws1a1IP},
+		"w2a1.w2.testy.coder.":                  {w2a1IP},
+		"w2a2.w2.testy.coder.":                  {w2a2IP},
+		"w1.coder.":                             {ws1a1IP},
+		tailnet.IsCoderConnectEnabledFQDNString: {tsaddr.CoderServiceIPv6()},
 	}
 	dnsCall := testutil.RequireRecvCtx(ctx, t, fDNS.calls)
 	require.Equal(t, expectedDNS, dnsCall.hosts)
@@ -1663,10 +1663,10 @@ func TestTunnelAllWorkspaceUpdatesController_DeleteAgent(t *testing.T) {
 
 	// DNS for w1a1
 	expectedDNS := map[dnsname.FQDN][]netip.Addr{
-		"w1a1.w1.testy.coder.": {ws1a1IP},
-		"w1a1.w1.me.coder.":    {ws1a1IP},
-		"w1.coder.":            {ws1a1IP},
-		"is--coder--connect--enabled--right--now.coder.": {tsaddr.CoderServiceIPv6()},
+		"w1a1.w1.testy.coder.":                  {ws1a1IP},
+		"w1a1.w1.me.coder.":                     {ws1a1IP},
+		"w1.coder.":                             {ws1a1IP},
+		tailnet.IsCoderConnectEnabledFQDNString: {tsaddr.CoderServiceIPv6()},
 	}
 	dnsCall := testutil.RequireRecvCtx(ctx, t, fDNS.calls)
 	require.Equal(t, expectedDNS, dnsCall.hosts)
@@ -1719,10 +1719,10 @@ func TestTunnelAllWorkspaceUpdatesController_DeleteAgent(t *testing.T) {
 
 	// DNS contains only w1a2
 	expectedDNS = map[dnsname.FQDN][]netip.Addr{
-		"w1a2.w1.testy.coder.": {ws1a2IP},
-		"w1a2.w1.me.coder.":    {ws1a2IP},
-		"w1.coder.":            {ws1a2IP},
-		"is--coder--connect--enabled--right--now.coder.": {tsaddr.CoderServiceIPv6()},
+		"w1a2.w1.testy.coder.":                  {ws1a2IP},
+		"w1a2.w1.me.coder.":                     {ws1a2IP},
+		"w1.coder.":                             {ws1a2IP},
+		tailnet.IsCoderConnectEnabledFQDNString: {tsaddr.CoderServiceIPv6()},
 	}
 	dnsCall = testutil.RequireRecvCtx(ctx, t, fDNS.calls)
 	require.Equal(t, expectedDNS, dnsCall.hosts)
@@ -1802,10 +1802,10 @@ func TestTunnelAllWorkspaceUpdatesController_DNSError(t *testing.T) {
 
 	// DNS for w1a1
 	expectedDNS := map[dnsname.FQDN][]netip.Addr{
-		"w1a1.w1.me.coder.":    {ws1a1IP},
-		"w1a1.w1.testy.coder.": {ws1a1IP},
-		"w1.coder.":            {ws1a1IP},
-		"is--coder--connect--enabled--right--now.coder.": {tsaddr.CoderServiceIPv6()},
+		"w1a1.w1.me.coder.":                     {ws1a1IP},
+		"w1a1.w1.testy.coder.":                  {ws1a1IP},
+		"w1.coder.":                             {ws1a1IP},
+		tailnet.IsCoderConnectEnabledFQDNString: {tsaddr.CoderServiceIPv6()},
 	}
 	dnsCall := testutil.RequireRecvCtx(ctx, t, fDNS.calls)
 	require.Equal(t, expectedDNS, dnsCall.hosts)

Original file line number	Diff line number	Diff line change
`@@ -1266,7 +1266,7 @@ func (t *tunnelUpdater) updateDNSNamesLocked() map[dnsname.FQDN][]netip.Addr {`
`1266`	`1266`	`}`
`1267`	`1267`	`}`
`1268`	`1268`	`}`
`1269`		`- fqdn, err := dnsname.ToFQDN("is--coder--connect--enabled--right--now.coder.")`
	`1269`	`+ fqdn, err := dnsname.ToFQDN(IsCoderConnectEnabledFQDNString)`
`1270`	`1270`	`if err != nil {`
`1271`	`1271`	`panic(fmt.Sprintf("failed to create static FQDN: %v", err))`
`1272`	`1272`	`}`