Merge branch 'main' into tenants

Author: lionello

.github/workflows/go.yml

@@ -62,7 +62,7 @@ jobs:
       - name: Check nix-shell default.nix
         run: |
           set -o pipefail
-          nix-shell --pure -E 'with import <nixpkgs> {}; mkShell { buildInputs = [ (import ./default.nix {}) ]; }' --run defang 2>&1 | sed -u 's|\s\+got:|::error file=pkgs/defang/cli.nix,line=9::Replace the vendorHash in cli.nix with the correct value:|'
+          make test-nix 2>&1 | sed -u 's|\s\+got:|::error file=pkgs/defang/cli.nix,line=9::Replace the vendorHash in cli.nix with the correct value:|'
 
   # go-byoc-test:
   #   runs-on: ubuntu-latest
@@ -321,7 +321,7 @@ jobs:
   push-docker:
     runs-on: ubuntu-latest
     needs:
-     - go-release
+      - go-release
     steps:
       - uses: actions/checkout@v4
 

Makefile

@@ -10,9 +10,10 @@ pre-commit:
 	@if git diff --cached --name-only | grep -q '^src/'; then make -C src lint; fi
 
 .PHONY: pre-push
-pre-push: src/README.md
+pre-push: src/README.md test-nix
 	@make -C src test
 
+.PHONY: setup
 setup:
 	go -C src mod tidy
 
@@ -24,3 +25,7 @@ src/README.md: README.md
 	@awk '/^## Environment Variables/{p=1} (/^## /||/^### /){if(p&&!/^## Environment Variables/){exit}} p' $< >> $@
 	@echo 'src/README.md was updated because root README.md changed. Please add src/README.md to your commit.';
 	@false
+
+.PHONY: test-nix
+test-nix:
+	nix-shell --pure -E 'with import <nixpkgs> {}; mkShell { buildInputs = [ (import ./default.nix {}) ]; }' --run defang

flake.nix

@@ -23,7 +23,7 @@
               gnumake
               less
               gnused # force Linux `sed` everywhere
-              go_1_23
+              go_1_24
               golangci-lint
               goreleaser
               nixfmt-rfc-style

src/cmd/cli/command/commands_test.go

@@ -137,19 +137,9 @@ func TestVersion(t *testing.T) {
 func TestCommandGates(t *testing.T) {
 	mockService := &mockFabricService{}
 	_, handler := defangv1connect.NewFabricControllerHandler(mockService)
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get current directory: %v", err)
-	}
-	composeDir := "../../../../src/testdata/sanity"
-	if err = os.Chdir(composeDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir("../../../../src/testdata/sanity")
 
 	t.Setenv("AWS_REGION", "us-west-2")
-	t.Cleanup(func() {
-		os.Chdir(origDir)
-	})
 
 	server := httptest.NewServer(handler)
 	t.Cleanup(server.Close)

src/cmd/cli/command/configrandom_test.go

@@ -18,7 +18,7 @@ func TestCreateRandomConfigValue(t *testing.T) {
 	// create the scanner based on scanner config
 	scannerClient, err := scanner.NewScannerFromConfig(cfg)
 	if err != nil {
-		t.Fatalf("Failed to make a config detector: " + err.Error())
+		t.Fatalf("Failed to make a config detector: %v", err)
 	}
 
 	// a map for storing generated results to check if they are unique
@@ -35,7 +35,7 @@ func TestCreateRandomConfigValue(t *testing.T) {
 		// scan the config
 		ds, err := scannerClient.Scan(randomConfig)
 		if err != nil {
-			t.Fatalf("Failed to scan input: " + err.Error())
+			t.Fatalf("Failed to scan input: %v", err)
 		}
 
 		// the length of ds (detected secrets) should be one

src/go.mod

@@ -1,8 +1,8 @@
 module github.com/DefangLabs/defang/src
 
-go 1.23.0
+go 1.24
 
-toolchain go1.23.9
+toolchain go1.24.5
 
 replace github.com/spf13/cobra v1.8.0 => github.com/DefangLabs/cobra v1.8.0-defang
 

src/pkg/cli/compose/compose_test.go

@@ -146,22 +146,7 @@ func TestLoadProject(t *testing.T) {
 	})
 
 	t.Run("load starting from a sub directory", func(t *testing.T) {
-		cwd, _ := os.Getwd()
-
-		// setup
-		setup := func() {
-			os.MkdirAll("../../../testdata/alttestproj/subdir/subdir2", 0755)
-			os.Chdir("../../../testdata/alttestproj/subdir/subdir2")
-		}
-
-		//teardown
-		teardown := func() {
-			os.Chdir(cwd)
-			os.RemoveAll("../../../testdata/alttestproj/subdir")
-		}
-
-		setup()
-		t.Cleanup(teardown)
+		t.Chdir("../../../testdata/alttestproj/subdir/subdir2")
 
 		// execute test
 		loader := NewLoader()
@@ -213,11 +198,7 @@ func TestComposeGoNoDoubleWarningLog(t *testing.T) {
 }
 
 func TestComposeOnlyOneFile(t *testing.T) {
-	cwd, _ := os.Getwd()
-	t.Cleanup(func() {
-		os.Chdir(cwd)
-	})
-	os.Chdir("../../../testdata/toomany")
+	t.Chdir("../../../testdata/toomany")
 
 	loader := NewLoader()
 	project, err := loader.LoadProject(context.Background())
@@ -231,11 +212,7 @@ func TestComposeOnlyOneFile(t *testing.T) {
 }
 
 func TestComposeMultipleFiles(t *testing.T) {
-	cwd, _ := os.Getwd()
-	t.Cleanup(func() {
-		os.Chdir(cwd)
-	})
-	os.Chdir("../../../testdata/multiple")
+	t.Chdir("../../../testdata/multiple")
 
 	loader := NewLoader(WithPath("compose1.yaml", "compose2.yaml"))
 	project, err := loader.LoadProject(context.Background())

src/pkg/cli/compose/context_test.go

@@ -166,7 +166,7 @@ func TestWalkContextFolder(t *testing.T) {
 			t.Fatalf("WalkContextFolder() failed: %v", err)
 		}
 
-		expected := []string{"Dockerfile", "altcomp.yaml", "compose.yaml.fixup", "compose.yaml.golden", "compose.yaml.warnings"}
+		expected := []string{"Dockerfile", "altcomp.yaml", "compose.yaml.fixup", "compose.yaml.golden", "compose.yaml.warnings", "subdir", "subdir/subdir2", "subdir/subdir2/.gitkeep"}
 		if !reflect.DeepEqual(files, expected) {
 			t.Errorf("Expected files: %v, got %v", expected, files)
 		}