Merge pull request #7827 from hashicorp/deps-go-msgpack-v1.1.5

Harmonize go-msgpack/codec/codecgen
hashicorp · Apr 28, 2020 · 2a81c12 · 2a81c12
2 parents 407e02c + 1fd2262
commit 2a81c12
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -175,11 +175,7 @@ deps:  ## Install build and development dependencies
 	GO111MODULE=on go get -u gotest.tools/gotestsum
 	GO111MODULE=on go get -u github.com/fatih/hclfmt
 	GO111MODULE=on go get -u github.com/golang/protobuf/[email protected]
-
-	# The tag here must correspoond to codec version nomad uses, e.g. v1.1.5.
-	# Though, v1.1.5 codecgen has a bug in code generator, so using a specific sha
-	# here instead.
-	GO111MODULE=on go get -u github.com/hashicorp/go-msgpack/codec/codecgen@f51b5189210768cf0d476580cf287620374d4f02
+	GO111MODULE=on go get -u github.com/hashicorp/go-msgpack/codec/[email protected]
 
 .PHONY: lint-deps
 lint-deps: ## Install linter dependencies

diff --git a/client/structs/generate.sh b/client/structs/generate.sh
diff --git a/client/structs/structs.go b/client/structs/structs.go
@@ -1,6 +1,6 @@
 package structs
 
-//go:generate ./generate.sh
+//go:generate codecgen -c github.com/hashicorp/go-msgpack/codec -d 102 -t codegen_generated -o structs.generated.go structs.go
 
 import (
 	"errors"