Merge branch 'main' into i4k-use-detected-terraform

terramate-io · Oct 19, 2023 · 26ddfd1 · 26ddfd1
2 parents 7225bd1 + 405e348
commit 26ddfd1
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 3 deletions.
diff --git a/cmd/terramate/e2etests/create_test.go b/cmd/terramate/e2etests/create_test.go
@@ -185,9 +185,8 @@ func TestCreateStackIgnoreExistingFatalOnOtherErrors(t *testing.T) {
 
 	s := sandbox.New(t)
 	root := s.RootEntry()
-	root.CreateDir("stack")
-	// Here we fail stack creating with an access error
-	root.Chmod("stack", 0444)
+	root.CreateFile("stack", "")
+	// Here we fail stack creating because a file with the same name exists
 	cli := newCLI(t, s.RootDir())
 
 	assertRunResult(t, cli.run("create", "stack", "--ignore-existing"), runExpected{

diff --git a/containers/test/Dockerfile b/containers/test/Dockerfile
@@ -0,0 +1,19 @@
+# Copyright 2023 Terramate GmbH
+# SPDX-License-Identifier: MPL-2.0
+
+FROM golang:1.20-alpine3.16
+
+RUN apk add --no-cache git gcc g++
+
+# Needed for go test -race
+ENV CGO_ENABLED=1
+
+WORKDIR /build
+COPY go.mod .
+COPY go.sum .
+RUN go mod download
+
+COPY . .
+
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    go test -race -count=1 -v ./cmd/terramate/e2etests
diff --git a/makefiles/common.mk b/makefiles/common.mk
@@ -162,3 +162,8 @@ help:
 			} \
 	} \
 	{ lastLine = $$0 }' $(MAKEFILE_LIST)
+
+## run tests within docker
+.PHONY: docker/test
+docker/test:
+	docker build --rm -f containers/test/Dockerfile .
diff --git a/makefiles/unix.mk b/makefiles/unix.mk
@@ -5,6 +5,21 @@ GO_BUILD_FLAGS=--ldflags '-extldflags "-static"'
 BUILD_ENV=CGO_ENABLED=0
 EXEC_SUFFIX=
 
+GIT_MIN_MAJOR_VERSION=2
+GIT_MIN_MINOR_VERSION=28
+GIT_MIN_VERSION=$(GIT_MIN_MAJOR_VERSION).$(GIT_MIN_MINOR_VERSION).0
+GIT_CURRENT_VERSION=$(shell git --version | grep ^git | cut -d' ' -f3)
+GIT_CURRENT_MAJOR_VERSION=$(shell echo $(GIT_CURRENT_VERSION) | cut -d. -f1)
+GIT_CURRENT_MINOR_VERSION=$(shell echo $(GIT_CURRENT_VERSION) | cut -d. -f2)
+
+IS_VALID_GIT_VERSION=$(shell expr $(GIT_CURRENT_MAJOR_VERSION) '>=' $(GIT_MIN_MAJOR_VERSION) '&' $(GIT_CURRENT_MINOR_VERSION) '>=' $(GIT_MIN_MINOR_VERSION))
+
+
+ifneq "$(IS_VALID_GIT_VERSION)" "1"
+$(error "$(IS_VALID_GIT_VERSION) Unsupported git version $(GIT_CURRENT_VERSION). Minimum supported version: $(GIT_MIN_VERSION)")
+endif
+
+
 ## build a test binary -- not static, telemetry sent to localhost, etc
 .PHONY: test/build
 test/build: test/fakecloud