From 512f25b6a3ffa9176fe8e3816fa613a10d01e674 Mon Sep 17 00:00:00 2001 From: Jonathan Conder Date: Tue, 23 Jun 2026 13:03:30 +1200 Subject: [PATCH] Consolidate hostname notes --- internal/workshop/lxd/lxd_backend.go | 4 ++-- internal/workshop/lxd/lxd_backend_dns.go | 4 ++-- internal/workshop/lxd/lxd_backend_dns_test.go | 6 +++--- internal/workshop/lxd/tests/integration/workshop_test.go | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/workshop/lxd/lxd_backend.go b/internal/workshop/lxd/lxd_backend.go index f76fd0324..81ed0e656 100644 --- a/internal/workshop/lxd/lxd_backend.go +++ b/internal/workshop/lxd/lxd_backend.go @@ -865,7 +865,7 @@ func (s *Backend) Workshop(ctx context.Context, name string) (*workshop.Workshop cnames, _ = unmarshalDnsmasq(network.Config["raw.dnsmasq"]) } if cnames == nil { - // Tell loadWorkshop to add the hostname-not-found note. + // Tell loadWorkshop to add the hostname-missing note. cnames = []cname{} } @@ -959,7 +959,7 @@ func (s *Backend) hostname(name string, p workshop.Project, format sdk.Revision, hostname.Domain = cnames[idx].friendly() hostname.Note = cnames[idx].Note } else if running && format.N > 3 { - hostname.Note = "hostname-not-found" + hostname.Note = "hostname-missing" } return hostname diff --git a/internal/workshop/lxd/lxd_backend_dns.go b/internal/workshop/lxd/lxd_backend_dns.go index 8cbdc6358..35783b4b1 100644 --- a/internal/workshop/lxd/lxd_backend_dns.go +++ b/internal/workshop/lxd/lxd_backend_dns.go @@ -151,7 +151,7 @@ func generateCNAME(cnames []cname, projects []workshop.Project, projectId string projectAlias, err := idna.Lookup.ToASCII(projectName) if err != nil { - result.Note = "invalid-project-name" + result.Note = "hostname-fallback" return result, nil //nolint:nilerr } @@ -162,7 +162,7 @@ func generateCNAME(cnames []cname, projects []workshop.Project, projectId string return strings.EqualFold(c.ProjectId, projectAlias) || strings.EqualFold(c.ProjectAlias, projectAlias) }) if conflict { - result.Note = "project-name-in-use" + result.Note = "hostname-fallback" return result, nil } diff --git a/internal/workshop/lxd/lxd_backend_dns_test.go b/internal/workshop/lxd/lxd_backend_dns_test.go index e4863b38a..82854b8f2 100644 --- a/internal/workshop/lxd/lxd_backend_dns_test.go +++ b/internal/workshop/lxd/lxd_backend_dns_test.go @@ -84,7 +84,7 @@ func (s *dnsSuite) TestGenerateCNAMEValidation(c *check.C) { ProjectId: "42424242", ProjectName: "42424242", ProjectAlias: "42424242", - Note: "invalid-project-name", + Note: "hostname-fallback", } replaced := lxdbackend.CNAME{ Workshop: "dev", @@ -160,7 +160,7 @@ func (s *dnsSuite) TestGenerateCNAMETakenByID(c *check.C) { ProjectId: "42424242", ProjectName: "42424242", ProjectAlias: "42424242", - Note: "project-name-in-use", + Note: "hostname-fallback", }) } @@ -182,7 +182,7 @@ func (s *dnsSuite) TestGenerateCNAMETakenByName(c *check.C) { ProjectId: "42424242", ProjectName: "42424242", ProjectAlias: "42424242", - Note: "project-name-in-use", + Note: "hostname-fallback", }) } diff --git a/internal/workshop/lxd/tests/integration/workshop_test.go b/internal/workshop/lxd/tests/integration/workshop_test.go index 43d4b1982..b5c19bf68 100644 --- a/internal/workshop/lxd/tests/integration/workshop_test.go +++ b/internal/workshop/lxd/tests/integration/workshop_test.go @@ -1334,7 +1334,7 @@ cname=other.24242424.wp,other.testprj.wp,other-24242424.wp,0 c.Assert(err, check.IsNil) want = ` cname=other.24242424.wp,other.testprj.wp,other-24242424.wp,0 -cname=test.42424242.wp,test-42424242.wp,0 # project-name-in-use +cname=test.42424242.wp,test-42424242.wp,0 # hostname-fallback # fake custom config line # fake custom config line 2 `[1:] @@ -1349,7 +1349,7 @@ cname=test.42424242.wp,test-42424242.wp,0 # project-name-in-use network, _, err = conn.GetNetwork(network.Name) c.Assert(err, check.IsNil) want = ` -cname=test.42424242.wp,test-42424242.wp,0 # project-name-in-use +cname=test.42424242.wp,test-42424242.wp,0 # hostname-fallback # fake custom config line # fake custom config line 2 `[1:]