Merge pull request #492 from DefangLabs/lio-fix-windows-build

Fix windows build
DefangLabs · Jun 24, 2024 · afa830b · afa830b
2 parents 1813f70 + d9c00fe
commit afa830b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -27,6 +27,14 @@ jobs:
         run: go test -test.short -v ./...
         working-directory: src
 
+      - name: Build MacOS binary
+        run: GOOS=darwin go build ./cmd/cli
+        working-directory: src
+
+      - name: Build Windows binary
+        run: GOOS=windows go build ./cmd/cli
+        working-directory: src
+
       - name: Verify Go modules
         working-directory: src
         run: |

diff --git a/src/pkg/cli/cert_test.go b/src/pkg/cli/cert_test.go
@@ -22,6 +22,10 @@ type dnsRequest struct {
 var notFound = errors.New("not found")
 
 func TestGetCNAMEInSync(t *testing.T) {
+	t.Cleanup(func() {
+		dns.ResolverAt = dns.DirectResolverAt
+	})
+
 	notFoundResolver := dns.MockResolver{Records: map[dns.DNSRequest]dns.DNSResponse{
 		{Type: "NS", Domain: "web.test.com"}:    {Records: []string{"ns1.example.com", "ns2.example.com"}, Error: nil},
 		{Type: "CNAME", Domain: "web.test.com"}: {Records: nil, Error: notFound},
@@ -70,6 +74,10 @@ func TestGetCNAMEInSync(t *testing.T) {
 }
 
 func TestGetIPInSync(t *testing.T) {
+	t.Cleanup(func() {
+		dns.ResolverAt = dns.DirectResolverAt
+	})
+
 	notFoundResolver := dns.MockResolver{Records: map[dns.DNSRequest]dns.DNSResponse{
 		{Type: "NS", Domain: "test.com"}: {Records: []string{"ns1.example.com", "ns2.example.com"}, Error: nil},
 		{Type: "A", Domain: "test.com"}:  {Records: nil, Error: notFound},
@@ -156,6 +164,10 @@ func TestCheckDomainDNSReady(t *testing.T) {
 	}}
 	resolver = hasARecordResolver
 
+	t.Cleanup(func() {
+		dns.ResolverAt = dns.DirectResolverAt
+	})
+
 	t.Run("CNAME and A records not found", func(t *testing.T) {
 		dns.ResolverAt = func(_ string) dns.Resolver { return emptyResolver }
 		if checkDomainDNSReady(context.Background(), "api.test.com", []string{"some-alb.domain.com"}) != false {

diff --git a/src/pkg/dns/resolver.go b/src/pkg/dns/resolver.go
@@ -75,10 +75,12 @@ func FindNSServers(ctx context.Context, domain string) ([]*net.NS, error) {
 	}
 }
 
-var ResolverAt = func(nsServer string) Resolver {
+func DirectResolverAt(nsServer string) Resolver {
 	return DirectResolver{NSServer: nsServer}
 }
 
+var ResolverAt = DirectResolverAt
+
 var ErrNoSuchHost = &net.DNSError{Err: "no such host", IsNotFound: true}
 
 type DirectResolver struct {

diff --git a/src/pkg/dns/resolver_test.go b/src/pkg/dns/resolver_test.go
@@ -8,6 +8,10 @@ import (
 )
 
 func TestFindNSServer(t *testing.T) {
+	t.Cleanup(func() {
+		ResolverAt = DirectResolverAt
+	})
+
 	t.Run("NS server not exist on domain", func(t *testing.T) {
 		ResolverAt = func(nsServer string) Resolver {
 			if strings.Contains(nsServer, "root-servers.net") {
@@ -78,9 +82,6 @@ func TestFindNSServer(t *testing.T) {
 func TestRootResolver(t *testing.T) {
 	t.Run("LookupIPAddr on google return both IPv4 and IPv6", func(t *testing.T) {
 		r := RootResolver{}
-		ResolverAt = func(nsServer string) Resolver {
-			return DirectResolver{NSServer: nsServer}
-		}
 		ips, err := r.LookupIPAddr(context.Background(), "www.google.com")
 		if err != nil {
 			t.Errorf("Expected no error, got %v", err)
@@ -104,9 +105,6 @@ func TestRootResolver(t *testing.T) {
 
 	t.Run("LookupIPAddr on defang.io return same set of IPs", func(t *testing.T) {
 		r := RootResolver{}
-		ResolverAt = func(nsServer string) Resolver {
-			return DirectResolver{NSServer: nsServer}
-		}
 		ips, err := r.LookupIPAddr(context.Background(), "fabric-prod1.defang.dev")
 		if err != nil {
 			t.Errorf("Expected no error, got %v", err)

diff --git a/src/pkg/term/colorizer_windows.go b/src/pkg/term/colorizer_windows.go
@@ -17,6 +17,6 @@ func EnableANSI() func() {
 	}
 }
 
-func isTerminal() bool {
+func hasTermInEnv() bool {
 	return true
 }