drop vendor

Author: moukoublen

.dockerignore

@@ -2,7 +2,6 @@
 /.git/
 /.github/
 /.tools/
-/.tools/
 /.vscode/
 /.idea/
 /cover.out

.gitignore

@@ -17,7 +17,7 @@
 *.out
 
 # Dependency directories (remove the comment below to include it)
-# vendor/
+vendor/
 
 # Go workspace file
 go.work

.vscode/settings.json

@@ -18,6 +18,7 @@
     "editor.insertSpaces": false,
     "editor.formatOnSave": true
   },
+
   "go.disableConcurrentTests": true,
   "go.formatTool": "default",
   "go.lintTool": "golangci-lint",
@@ -31,7 +32,7 @@
   "go.lintOnSave": "package",
   "go.testTags": "test-e2e",
   "go.testFlags": [
-    "-mod=vendor",
+    //"-mod=vendor",
     "-count=1",
     "-p=1",
     "-v",

Makefile

@@ -24,7 +24,7 @@ env:
 	@echo ""
 
 	@echo -e "\e[0;90m>>>\e[0m \e[0;94m Go env \e[0m \e[0;90m<<<\e[0m"
-	$(GO_EXEC) env
+	go env
 	@echo ""
 
 	@echo -e "\e[0;90m>>>\e[0m \e[0;94m Packages \e[0m \e[0;90m<<<\e[0m"

deployments/compose.local.yml

@@ -0,0 +1,41 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json
+
+services:
+  goboilerplate:
+    build:
+      context: ../
+      dockerfile: ./build/docker/debug.Dockerfile
+    volumes:
+      - type: bind
+        source: ../
+        target: /wd
+      - type: volume
+        source: buildcache
+        target: /root/.cache/go-build
+        volume:
+          nocopy: true  # https://docs.docker.com/engine/storage/volumes/ data at the destination isn't copied into the volume if the volume is empty. By default, content at the target destination gets copied into a mounted volume if empty.
+      - type: volume
+        source: go-pkg
+        target: /go/pkg
+        volume:
+          nocopy: true
+    tmpfs:
+      - /run
+      - /tmp
+    ports:
+      - "8888:8888"
+      - "2345:2345"
+    restart: on-failure
+    # https://github.com/go-delve/delve/blob/master/Documentation/usage/dlv_debug.md
+    command: ["air", "-c", ".air.toml"]
+    environment:
+      - APP_HTTP_PORT=8888
+      - APP_HTTP_INBOUND_TRAFFIC_LOG_LEVEL=2
+      - APP_HTTP_OUTBOUND_TRAFFIC_LOG_LEVEL=2
+      - APP_HTTP_READ_HEADER_TIMEOUT=3s
+      - APP_SHUTDOWN_TIMEOUT=6s
+      - APP_LOG_LEVEL=DEBUG
+
+volumes:
+  buildcache: {}
+  go-pkg: {}

deployments/local/compose.local.yml

@@ -3,7 +3,6 @@
 | Target               | Description |
 | -------------------- | ----------- |
 | `mod`                | Runs go mod [tidy](https://go.dev/ref/mod#go-mod-tidy) and [verify](https://go.dev/ref/mod#go-mod-verify). |
-| `vendor`             | Runs [go mod vendor](https://go.dev/ref/mod#go-mod-vendor) that downloads all dependencies into `./vendor` folder. |
 | `go-deps-upgrade`    | Runs updates all `go.mod` dependencies. |
 | `env`                | Prints information regarding the local environment. More specifically: go env, all go packages and folders, and the specified tools bin directory. |
 | `git-reset`          | Full hard reset to HEAD. Cleans up all untracked files and restore all staged and un-staged changes. |

docs/makefile_targets.md

@@ -1,6 +1,3 @@
-GO_EXEC ?= go
-export GO_EXEC
-
 REPO_GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null || true)
 REPO_GIT_COMMIT = $(shell git rev-parse HEAD 2>/dev/null || true)
 REPO_GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD 2>/dev/null || true)
@@ -13,8 +10,8 @@ X_FLAGS = \
 		-X '$(MODULE)/build.CommitShort=$(REPO_GIT_COMMIT_SHORT)' \
 		-X '$(MODULE)/build.Tag=$(REPO_GIT_TAG)'
 
-GO_PACKAGES = $(GO_EXEC) list -tags='$(TAGS)' -mod=vendor ./...
-GO_FOLDERS = $(GO_EXEC) list -tags='$(TAGS)' -mod=vendor -f '{{ .Dir }}' ./...
+GO_PACKAGES = go list -tags='$(TAGS)' ./...
+GO_FOLDERS = go list -tags='$(TAGS)' -f '{{ .Dir }}' ./...
 GO_FILES = find . -type f -name '*.go' -not -path './vendor/*'
 
 export GO111MODULE := on
@@ -26,36 +23,29 @@ BUILD_OUTPUT ?= $(CURDIR)/output
 
 .PHONY: mod
 mod:
-	$(GO_EXEC) mod tidy -go=1.23
-	$(GO_EXEC) mod verify
-
-.PHONY: vendor
-vendor:
-	$(GO_EXEC) mod vendor
+	go mod tidy -go=1.23
+	go mod verify
 
 # https://go.dev/ref/mod#go-get
 # -u flag tells go get to upgrade modules
 # -t flag tells go get to consider modules needed to build tests of packages named on the command line.
 # When -t and -u are used together, go get will update test dependencies as well.
 .PHONY: go-deps-upgrade
 go-deps-upgrade:
-	$(GO_EXEC) get -u -t ./...
-	$(GO_EXEC) mod tidy -go=1.23
-	$(GO_EXEC) mod vendor
+	go get -u -t ./...
+	go mod tidy -go=1.23
 
 # https://pkg.go.dev/cmd/go#hdr-Compile_packages_and_dependencies
 # https://pkg.go.dev/cmd/compile
 # https://pkg.go.dev/cmd/link
 
 #BUILD_FLAGS := -mod=vendor -a -ldflags "-s -w $(X_FLAGS) -extldflags='-static'" -tags '$(TAGS)'
-BUILD_FLAGS := -mod=vendor -a -ldflags '-s -w $(X_FLAGS)' -tags '$(TAGS)'
-BUILD_FLAGS_DEBUG := -mod=vendor -ldflags '$(X_FLAGS)' -tags '$(TAGS)'
+BUILD_FLAGS := -a -ldflags '-s -w $(X_FLAGS)' -tags '$(TAGS)'
+BUILD_FLAGS_DEBUG := -ldflags '$(X_FLAGS)' -tags '$(TAGS)'
 
 cmd.%: CMDNAME=$*
 cmd.%:
-	$(GO_EXEC) env
-	@echo ''
-	CGO_ENABLED=0 $(GO_EXEC) build $(BUILD_FLAGS) -o $(BUILD_OUTPUT)/$(CMDNAME) ./cmd/$(CMDNAME)
+	CGO_ENABLED=0 go build $(BUILD_FLAGS) -o $(BUILD_OUTPUT)/$(CMDNAME) ./cmd/$(CMDNAME)
 
 dbg.%: BUILD_FLAGS=$(BUILD_FLAGS_DEBUG)
 dbg.%: cmd.%
@@ -70,10 +60,10 @@ clean:
 
 .PHONY: test
 test:
-	CGO_ENABLED=1 $(GO_EXEC) test -timeout 60s -race -tags="$(TAGS)" -coverprofile cover.out -covermode atomic ./...
-	@$(GO_EXEC) tool cover -func cover.out
+	CGO_ENABLED=1 go test -timeout 60s -race -tags="$(TAGS)" -coverprofile cover.out -covermode atomic ./...
+	@go tool cover -func cover.out
 	@rm cover.out
 
 .PHONY: run
 run:
-	$(GO_EXEC) run -mod=vendor ./cmd/goboilerplate
+	go run ./cmd/goboilerplate

scripts/go.mk

@@ -41,13 +41,13 @@ $(TOOLS_DB)/%.ver: | $(TOOLS_DB)
 
 define go_install
 	@echo -e "Installing \e[1;36m$(1)\e[0m@\e[1;36m$(3)\e[0m using \e[1;36m$(GO_VER)\e[0m"
-	GOBIN="$(TOOLS_BIN)" CGO_ENABLED=0 $(GO_EXEC) install -trimpath -ldflags '-s -w -extldflags "-static"' "$(2)@$(3)"
+	GOBIN="$(TOOLS_BIN)" CGO_ENABLED=0 go install -trimpath -ldflags '-s -w -extldflags "-static"' "$(2)@$(3)"
 	@echo ""
 endef
 
 .PHONY: vet
 vet:
-	$(GO_EXEC) vet `$(GO_PACKAGES)`
+	go vet `$(GO_PACKAGES)`
 	@echo ""
 
 ## <staticcheck>