Add stack even when the project name is the same as the tenant name

Author: edw-defang

src/pkg/cli/client/byoc/baseclient.go

@@ -121,12 +121,14 @@ func (b *ByocBaseClient) GetProjectDomain(projectName, zone string) string {
 		return "" // no project name => no custom domain
 	}
 	projectLabel := DnsSafeLabel(projectName)
+	var domain string
 	if projectLabel == DnsSafeLabel(b.TenantName) {
-		return DnsSafe(zone) // the zone will already have the tenant ID
+		domain = DnsSafe(zone) // the zone will already have the tenant ID
+	} else {
+		domain = projectLabel + "." + DnsSafe(zone)
 	}
-	domain := projectLabel + "." + DnsSafe(zone)
 	if hasStack, ok := b.projectBackend.(HasStackSupport); ok {
-		domain = hasStack.GetStackName() + "." + domain // TODO: Should we dns-safe the stack name too?
+		domain = DnsSafeLabel(hasStack.GetStackName()) + "." + domain
 	}
 	return domain
 }

src/pkg/cli/client/byoc/baseclient_test.go

@@ -198,9 +198,10 @@ func TestGetProjectDomain(t *testing.T) {
 		{"test-project", "test-zone", "test-tenant", TestProjectBackendWithoutStack{}, "test-project.test-zone"},
 		{"test-project", "test-zone", "test-tenant", TestProjectBackendWithStack{stack: "test-stack"}, "test-stack.test-project.test-zone"},
 		{"project-is-tenant-name", "test-zone", "project-is-tenant-name", TestProjectBackendWithoutStack{}, "test-zone"},
-		{"project-is-tenant-name", "test-zone", "project-is-tenant-name", TestProjectBackendWithStack{stack: "test-stack"}, "test-zone"}, // Stack is ignored when project name is the same as tenant -- Is that correct?
+		{"project-is-tenant-name", "test-zone", "project-is-tenant-name", TestProjectBackendWithStack{stack: "test-stack"}, "test-stack.test-zone"}, // Stack is ignored when project name is the same as tenant -- Is that correct?
 		{"Test.Project", "tesT.zonE", "test-tenant", TestProjectBackendWithoutStack{}, "test-project.test.zone"},
 		{"Test.Project", "tesT.zonE", "test-tenant", TestProjectBackendWithStack{stack: "test-stack"}, "test-stack.test-project.test.zone"},
+		{"test-project", "test-zone", "test-tenant", TestProjectBackendWithStack{stack: "tEst.sTack"}, "test-stack.test-project.test-zone"},
 	}
 
 	for _, tt := range tests {