public/atlantis
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/atlantis.git synced 2026-08-05 08:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: e2e test ensure conftest command to check conftest version is greater or equal to specific version (#2812)

Browse Source
This commit is contained in:
Ken Kaizu
2022-12-18 18:31:40 +09:00
committed by GitHub
parent b6f372416f
commit 063bbb93c9
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@@ -2,7 +2,7 @@ version: 2
jobs:
test:
docker:
- image: ghcr.io/runatlantis/testing-env:2022.11.17
- image: ghcr.io/runatlantis/testing-env:2022.12.17
steps:
- checkout
- run: make check-fmt

2
.github/workflows/test.yml vendored
View File

@@ -27,7 +27,7 @@ jobs:
if: github.event.pull_request.draft == false
name: runner / gotest
runs-on: ubuntu-22.04
container: ghcr.io/runatlantis/testing-env:2022.11.17
container: ghcr.io/runatlantis/testing-env:2022.12.17
steps:
- uses: actions/checkout@v3.0.2
- run: make test-all

4
Makefile
View File

@@ -36,14 +36,14 @@ test: ## Run tests
.PHONY: docker/test
docker/test: ## Run tests in docker
docker run -it -v $(pwd):/atlantis ghcr.io/runatlantis/testing-env:2022.11.17 sh -c "cd /atlantis && make test"
docker run -it -v $(pwd):/atlantis ghcr.io/runatlantis/testing-env:2022.12.17 sh -c "cd /atlantis && make test"
test-all: ## Run tests including integration
@go test $(PKG)
.PHONY: docker/test-all
docker/test-all: ## Run all tests in docker
docker run -it -v $(pwd):/atlantis ghcr.io/runatlantis/testing-env:2022.11.17 sh -c "cd /atlantis && make test-all"
docker run -it -v $(pwd):/atlantis ghcr.io/runatlantis/testing-env:2022.12.17 sh -c "cd /atlantis && make test-all"
test-coverage:
@mkdir -p .cover

8
server/controllers/events/events_controller_e2e_test.go
View File

@@ -636,7 +636,7 @@ func TestGitHubWorkflowWithPolicyCheck(t *testing.T) {
}
// Ensure we have >= TF 0.14 locally.
ensureRunning014(t)
// Ensure we have >= Conftest 0.21 locally.
// Ensure we have conftest locally.
ensureRunningConftest(t)
cases := []struct {
@@ -1363,11 +1363,11 @@ func mkSubDirs(t *testing.T) (string, string, string) {
return tmp, binDir, cachedir
}
// Will fail test if conftest isn't in path and isn't version >= 0.25.0
// Will fail test if conftest isn't in path or is version less than specific version
func ensureRunningConftest(t *testing.T) {
localPath, err := exec.LookPath(fmt.Sprintf("conftest%s", ConftestVersion))
localPath, err := exec.LookPath("conftest")
if err != nil {
t.Logf("conftest >= %s must be installed to run this test", ConftestVersion)
t.Logf("conftest must be installed to run this test")
t.FailNow()
}
versionOutBytes, err := exec.Command(localPath, "--version").Output() // #nosec