From 81ba0f806631cfebc9195db7a1775ab1a8b2ed7b Mon Sep 17 00:00:00 2001
From: Stefan Majer <stefan.majer@f-i-ts.de>
Date: Thu, 13 Apr 2023 11:35:17 +0200
Subject: [PATCH] Simpler tests

---
 .github/workflows/test.yaml | 12 ++++++++----
 Makefile                    | 28 +---------------------------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 7005e7e..018f6c1 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   build:
-    name: Test Build
+    name: Test and Lint
     runs-on: ubuntu-latest
 
     steps:
@@ -25,6 +25,10 @@ jobs:
       with:
         go-version: '1.20.x'
 
-    - name: Check (lint) and Test
-      run: |
-        make test-in-docker
+    - name: Lint
+      uses: golangci/golangci-lint-action@v3
+      with:
+        args: --build-tags integration -p bugs -p unused --timeout=3m
+
+    - name: Test
+      run: make test
\ No newline at end of file
diff --git a/Makefile b/Makefile
index a63379f..fcad86f 100644
--- a/Makefile
+++ b/Makefile
@@ -82,11 +82,6 @@ clean:
 check-generate:
 	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check-generate.sh $(REPO_ROOT)
 
-.PHONY: check
-check: $(GOIMPORTS) $(GOLANGCI_LINT) $(HELM)
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check.sh --golangci-lint-config=./.golangci.yaml ./cmd/... ./pkg/...
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check-charts.sh ./charts
-
 .PHONY: generate
 generate: $(HELM)
 	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/generate.sh ./charts/... ./cmd/... ./pkg/...
@@ -101,30 +96,9 @@ generate-in-docker: revendor $(HELM)
 				# && make install generate \
 				&& chown -R $(shell id -u):$(shell id -g) ."
 
-.PHONY: format
-format: $(GOIMPORTS)
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/format.sh ./cmd ./pkg
-
 .PHONY: test
 test:
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/test.sh ./cmd/... ./pkg/...
-
-.PHONY: test-in-docker
-test-in-docker: revendor $(HELM)
-	docker run --rm -i$(DOCKER_TTY_ARG) -v $(PWD):/go/src/github.com/fi-ts/gardener-extension-authn golang:1.19.4 \
-		sh -c "cd /go/src/github.com/fi-ts/gardener-extension-authn \
-				&& make install check # add back test target as soon as there are test files"
-
-.PHONY: test-cov
-test-cov:
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/test-cover.sh ./cmd/... ./pkg/...
-
-.PHONY: test-clean
-test-clean:
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/test-cover-clean.sh
-
-.PHONY: verify
-verify: check format test
+	go test -v ./...
 
 .PHONY: push-to-gardener-local
 push-to-gardener-local: