Use base36 to get denser hash string for project domain

Author: edw-defang

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

@@ -5,6 +5,7 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/base64"
+	"encoding/binary"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -653,8 +654,9 @@ func (b *ByocAws) getProjectDomain(account, zone string) string {
 		return "" // no project name => no custom domain
 	}
 	h := sha256.New()
-	fmt.Fprintf(h, "%s.%s.%s.%s", account, b.ProjectName, b.TenantID, zone)
-	return fmt.Sprintf("%x", h.Sum(nil)[:8]) + "." + byoc.DnsSafe(zone)
+	fmt.Fprintf(h, "%s.%s.%s.%s.%s", account, b.ProjectName, b.PulumiStack, b.TenantID, zone)
+
+	return pkg.Base36ID(binary.LittleEndian.Uint64(h.Sum(nil)[:8])) + "." + byoc.DnsSafe(zone)
 }
 
 func (b *ByocAws) TearDown(ctx context.Context) error {

src/pkg/cli/client/byoc/aws/byoc_test.go

@@ -2,6 +2,7 @@ package aws
 
 import (
 	"context"
+	"regexp"
 	"testing"
 
 	"github.com/DefangLabs/defang/src/pkg/cli/client"
@@ -23,17 +24,17 @@ func TestDomainMultipleProjectSupport(t *testing.T) {
 		PublicFqdn  string
 		PrivateFqdn string
 	}{
-		{"tenant1", "tenant1", "web", port80, "web--80.1fa1857b71717f6b.example.com", "web.1fa1857b71717f6b.example.com", "web.tenant1.internal"},
-		{"tenant1", "tenant1", "web", hostModePort, "web.tenant1.internal:80", "web.1fa1857b71717f6b.example.com", "web.tenant1.internal"},
-		{"project1", "tenant1", "web", port80, "web--80.1ac7562668796635.example.com", "web.1ac7562668796635.example.com", "web.project1.internal"},
-		{"Project1", "tenant1", "web", port80, "web--80.40b35d8b26ff71ae.example.com", "web.40b35d8b26ff71ae.example.com", "web.project1.internal"},
-		{"project1", "tenant1", "web", hostModePort, "web.project1.internal:80", "web.1ac7562668796635.example.com", "web.project1.internal"},
-		{"project1", "tenant1", "api", port8080, "api--8080.1ac7562668796635.example.com", "api.1ac7562668796635.example.com", "api.project1.internal"},
-		{"tenant1", "tenant1", "web", port80, "web--80.1fa1857b71717f6b.example.com", "web.1fa1857b71717f6b.example.com", "web.tenant1.internal"},
-		{"tenant1", "tenant1", "web", hostModePort, "web.tenant1.internal:80", "web.1fa1857b71717f6b.example.com", "web.tenant1.internal"},
-		{"Project1", "tenant1", "web", port80, "web--80.40b35d8b26ff71ae.example.com", "web.40b35d8b26ff71ae.example.com", "web.project1.internal"},
-		{"Tenant2", "tenant1", "web", port80, "web--80.f5600a0d61784e9d.example.com", "web.f5600a0d61784e9d.example.com", "web.tenant2.internal"},
-		{"tenant1", "tenAnt1", "web", port80, "web--80.7360f2237c979f46.example.com", "web.7360f2237c979f46.example.com", "web.tenant1.internal"},
+		{"tenant1", "tenant1", "web", port80, `web--80\.[0-9a-z]{12}\.example\.com`, `web\.[0-9a-z]{12}\.example\.com`, "web.tenant1.internal"},
+		{"tenant1", "tenant1", "web", hostModePort, `web\.tenant1.internal:80`, `web.[0-9a-z]{12}.example\.com`, "web.tenant1.internal"},
+		{"project1", "tenant1", "web", port80, `web--80\.[0-9a-z]{12}\.example\.com`, `web\.[0-9a-z]{12}\.example\.com`, "web.project1.internal"},
+		{"Project1", "tenant1", "web", port80, `web--80\.[0-9a-z]{12}\.example\.com`, `web\.[0-9a-z]{12}\.example\.com`, "web.project1.internal"},
+		{"project1", "tenant1", "web", hostModePort, `web\.project1\.internal:80`, `web\.[0-9a-z]{12}\.example\.com`, "web.project1.internal"},
+		{"project1", "tenant1", "api", port8080, `api--8080\.[0-9a-z]{12}\.example\.com`, `api\.[0-9a-z]{12}\.example\.com`, "api.project1.internal"},
+		{"tenant1", "tenant1", "web", port80, `web--80\.[0-9a-z]{12}\.example\.com`, `web\.[0-9a-z]{12}\.example\.com`, "web.tenant1.internal"},
+		{"tenant1", "tenant1", "web", hostModePort, `web\.tenant1\.internal:80`, `web\.[0-9a-z]{12}\.example\.com`, "web.tenant1.internal"},
+		{"Project1", "tenant1", "web", port80, `web--80\.[0-9a-z]{12}\.example\.com`, `web\.[0-9a-z]{12}\.example\.com`, "web.project1.internal"},
+		{"Tenant2", "tenant1", "web", port80, `web--80\.[0-9a-z]{12}\.example\.com`, `web\.[0-9a-z]{12}\.example\.com`, "web.tenant2.internal"},
+		{"tenant1", "tenAnt1", "web", port80, `web--80\.[0-9a-z]{12}\.example\.com`, `web\.[0-9a-z]{12}\.example\.com`, "web.tenant1.internal"},
 	}
 
 	for _, tt := range tests {
@@ -46,12 +47,12 @@ func TestDomainMultipleProjectSupport(t *testing.T) {
 			b.ProjectDomain = b.getProjectDomain("123456789012", "example.com")
 
 			endpoint := b.getEndpoint(tt.Fqn, tt.Port)
-			if endpoint != tt.EndPoint {
+			if !regexp.MustCompile(tt.EndPoint).MatchString(endpoint) {
 				t.Errorf("expected endpoint %q, got %q", tt.EndPoint, endpoint)
 			}
 
 			publicFqdn := b.getPublicFqdn(tt.Fqn)
-			if publicFqdn != tt.PublicFqdn {
+			if !regexp.MustCompile(tt.PublicFqdn).MatchString(publicFqdn) {
 				t.Errorf("expected public fqdn %q, got %q", tt.PublicFqdn, publicFqdn)
 			}
 

src/pkg/utils.go

@@ -66,15 +66,19 @@ func (l *OneOrList) UnmarshalJSON(data []byte) error {
 }
 
 func RandomID() string {
-	const uint64msb = 1 << 63 // always set the MSB to ensure we get ≥12 digits
-	return strconv.FormatUint(rand.Uint64()|uint64msb, 36)[1:]
+	return Base36ID(rand.Uint64())
 }
 
 func IsValidRandomID(s string) bool {
 	_, err := strconv.ParseUint(s, 36, 64)
 	return len(s) == 12 && err == nil
 }
 
+func Base36ID(i uint64) string {
+	const uint64msb = 1 << 63 // always set the MSB to ensure we get ≥12 digits
+	return strconv.FormatUint(i|uint64msb, 36)[1:]
+}
+
 func Min(a, b int) int {
 	if a < b {
 		return a