Merge pull request #678 from cego/bump-versions

Bump versions

Author: SlyngDK

.github/dependabot.yml

@@ -3,8 +3,8 @@ updates:
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
   - package-ecosystem: "npm"
     directory: "/webapp/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"

.github/workflows/gofmt.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Set up Go 1.23
+      - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.23
+          go-version: 1.25
         id: go
 
       - name: Check out code into the Go module directory
@@ -26,9 +26,9 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
-          key: ${{ runner.os }}-gofmt1.23-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-gofmt1.25-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-gofmt1.23-
+            ${{ runner.os }}-gofmt1.25-
 
       - name: gofmt
         run: |

.github/workflows/release.yml

@@ -11,10 +11,10 @@ jobs:
     name: Build Linux All
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.23
+      - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.23
+          go-version: 1.25
 
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/test.yml

@@ -18,10 +18,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Set up Go 1.23
+      - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.23
+          go-version: 1.25
         id: go
 
       - name: Check out code into the Go module directory
@@ -30,12 +30,21 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go1.23-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-go1.25-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-go1.23-
+            ${{ runner.os }}-go1.25-
+
+      - name: Checking go mod tidy
+        run: |
+          go mod tidy -diff
 
       - name: Build
         run: make all -B
 
       - name: Test
         run: make test
+
+      - name: Check for uncommitted changes
+        run: |
+          err_msg="Changes found!!! Run 'make all -B' and commit changes"
+          git -c color.ui=always diff --exit-code || (>&2 echo "${err_msg}" && exit 1)

Makefile

@@ -25,7 +25,7 @@ release: $(ALL:%=build/nebula-provisioner-%.tar.gz)
 
 release-linux: $(ALL_LINUX:%=build/nebula-provisioner-%.tar.gz)
 
-build/%/server: webapp .FORCE
+build/%/server: generate webapp .FORCE
 	CGO_ENABLED=0 \
 			GOOS=$(firstword $(subst -, , $*)) \
     		GOARCH=$(word 2, $(subst -, ,$*)) $(GOENV) \
@@ -46,7 +46,7 @@ build/%/agent: .FORCE
 build/nebula-provisioner-%.tar.gz: build/%/server build/%/server-client build/%/agent
 	tar -zcv -C build/$* -f $@ server server-client agent
 
-bin: protocol server/store/store.pb.go server/graph/generated/generated.go webapp
+bin: generate webapp
 	go build $(BUILD_ARGS) -ldflags "$(LDFLAGS)" $(BUILD_TAGS) -o ./bin/server${CMD_SUFFIX} ${CMD_PATH}/server
 	go build $(BUILD_ARGS) -ldflags "$(LDFLAGS)" $(BUILD_TAGS) -o ./bin/server-client${CMD_SUFFIX} ${CMD_PATH}/server-client
 	go build $(BUILD_ARGS) -ldflags "$(LDFLAGS)" $(BUILD_TAGS) -o ./bin/agent${CMD_SUFFIX} ${CMD_PATH}/agent
@@ -55,12 +55,6 @@ dev: BUILD_TAGS=-tags dev
 dev: LDFLAGS=-X github.com/cego/nebula-provisioner/webapp.Dir=$(CURDIR)/webapp/
 dev: bin
 
-protocol: protocol/protocol.go protocol/models.proto protocol/agent-service.proto protocol/server-command.proto
-	go generate protocol/protocol.go
-
-server/store/store.pb.go: server/store/store.proto
-	go generate server/store/store.go
-
 fmt:
 	go fmt ./...
 
@@ -79,9 +73,65 @@ WEBAPP_FILES = $(shell find ./webapp/ -type f -name '*' | grep -vE 'webapp/(node
 webapp: ./webapp/ $(WEBAPP_DIRS) $(WEBAPP_FILES)
 	$(MAKE) -C webapp build
 
-server/graph/generated/generated.go: server/graph/schema.graphqls gqlgen.yml
-	go generate server/graph/resolver.go
+.PHONY: generate
+generate: protoc-gen-go protoc-gen-go-grpc buf gqlgen
+	$(BUF) generate
+	$(GQLGEN) generate
+
+## Location to install dependencies to
+LOCALBIN ?= $(shell pwd)/bin
+$(LOCALBIN):
+	mkdir -p $(LOCALBIN)
+
+## Tool Binaries
+BUF = $(LOCALBIN)/buf
+PROTOC_GEN_GO = $(LOCALBIN)/protoc-gen-go
+PROTOC_GEN_GO_GRPC = $(LOCALBIN)/protoc-gen-go-grpc
+GQLGEN = $(LOCALBIN)/gqlgen
+
+## Tool Versions
+BUF_VERSION ?= v1.61.0
+PROTOC_GEN_GO_VERSION ?= v1.36.10
+PROTOC_GEN_GO_GRPC_VERSION ?= v1.6.0
+GQLGEN_VERSION ?= v0.17.84
+
+.PHONY: buf
+buf: $(BUF) ## Download buf locally if necessary.
+$(BUF): $(LOCALBIN)
+	$(call go-install-tool,$(BUF),github.com/bufbuild/buf/cmd/buf,$(BUF_VERSION))
+
+.PHONY: protoc-gen-go
+protoc-gen-go: $(PROTOC_GEN_GO) ## Download protoc-gen-go locally if necessary.
+$(PROTOC_GEN_GO): $(LOCALBIN)
+	$(call go-install-tool,$(PROTOC_GEN_GO),google.golang.org/protobuf/cmd/protoc-gen-go,$(PROTOC_GEN_GO_VERSION))
+
+.PHONY: protoc-gen-go-grpc
+protoc-gen-go-grpc: $(PROTOC_GEN_GO_GRPC) ## Download protoc-gen-go-grpc locally if necessary.
+$(PROTOC_GEN_GO_GRPC): $(LOCALBIN)
+	$(call go-install-tool,$(PROTOC_GEN_GO_GRPC),google.golang.org/grpc/cmd/protoc-gen-go-grpc,$(PROTOC_GEN_GO_GRPC_VERSION))
+
+.PHONY: gqlgen
+gqlgen: $(GQLGEN) ## Download gqlgen locally if necessary.
+$(GQLGEN): $(LOCALBIN)
+	$(call go-install-tool,$(GQLGEN),github.com/99designs/gqlgen,$(GQLGEN_VERSION))
+
+
+# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
+# $1 - target path with name of binary
+# $2 - package url which can be installed
+# $3 - specific version of package
+define go-install-tool
+@[ -f "$(1)-$(3)" ] || { \
+set -e; \
+package=$(2)@$(3) ;\
+echo "Downloading $${package}" ;\
+rm -f $(1) || true ;\
+GOBIN=$(LOCALBIN) go install $${package} ;\
+mv $(1) $(1)-$(3) ;\
+} ;\
+ln -sf $(1)-$(3) $(1)
+endef
 
 .FORCE:
-.PHONY: test bin protocol dev
+.PHONY: test bin generate dev
 .DEFAULT_GOAL := bin

buf.gen.yaml

@@ -0,0 +1,13 @@
+---
+version: v2
+managed:
+  enabled: true
+plugins:
+  - local: ./bin/protoc-gen-go
+    out: .
+    opt: paths=source_relative
+  - local: ./bin/protoc-gen-go-grpc
+    out: .
+    opt:
+      - paths=source_relative
+      - require_unimplemented_servers=false

buf.yaml

@@ -0,0 +1,8 @@
+# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml
+version: v2
+lint:
+  use:
+    - STANDARD
+breaking:
+  use:
+    - FILE

go.mod

@@ -1,70 +1,69 @@
 module github.com/cego/nebula-provisioner
 
-go 1.23
-
-toolchain go1.23.2
+go 1.25.4
 
 require (
-	github.com/99designs/gqlgen v0.17.55
+	github.com/99designs/gqlgen v0.17.84
 	github.com/dgraph-io/badger/v3 v3.2103.5
 	github.com/gorilla/mux v1.8.1
 	github.com/gorilla/sessions v1.4.0
-	github.com/hashicorp/vault v1.14.0
-	github.com/jackpal/gateway v1.0.15
+	github.com/jackpal/gateway v1.1.1
 	github.com/jackpal/go-nat-pmp v1.0.2
 	github.com/lafriks/go-spaproxy v0.2.0
 	github.com/mitchellh/go-ps v1.0.0
+	github.com/openbao/openbao/sdk/v2 v2.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
-	github.com/slackhq/nebula v1.9.4
-	github.com/spf13/cobra v1.8.1
-	github.com/vektah/gqlparser/v2 v2.5.18
-	golang.org/x/crypto v0.28.0
-	golang.org/x/oauth2 v0.23.0
-	golang.org/x/tools v0.26.0
-	google.golang.org/grpc v1.67.1
-	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
-	google.golang.org/protobuf v1.35.1
+	github.com/slackhq/nebula v1.9.7
+	github.com/spf13/cobra v1.10.1
+	github.com/vektah/gqlparser/v2 v2.5.31
+	golang.org/x/crypto v0.45.0
+	golang.org/x/oauth2 v0.33.0
+	golang.org/x/tools v0.39.0
+	google.golang.org/grpc v1.77.0
+	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.0
+	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	dario.cat/mergo v1.0.1 // indirect
-	github.com/agnivade/levenshtein v1.2.0 // indirect
+	github.com/agnivade/levenshtein v1.2.1 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgraph-io/ristretto v0.2.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+	github.com/goccy/go-yaml v1.18.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/flatbuffers v24.3.25+incompatible // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/klauspost/compress v1.18.1 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/sosodev/duration v1.3.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.9 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/stretchr/testify v1.9.0 // indirect
-	github.com/urfave/cli/v2 v2.27.5 // indirect
-	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
+	github.com/stretchr/testify v1.11.1 // indirect
+	github.com/urfave/cli/v3 v3.6.1 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/term v0.25.0 // indirect
-	golang.org/x/text v0.19.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
+	golang.org/x/mod v0.30.0 // indirect
+	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 // indirect
+	golang.org/x/term v0.37.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )