Remove now-unnecessary vendor hack for manifests

Signed-off-by: Max Smythe <smythe@google.com>
open-policy-agent · Mar 25, 2020 · 680f5aa · 680f5aa
1 parent fb7a8cc
commit 680f5aa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -219,11 +219,4 @@ endif
 
 .PHONY: vendor
 vendor:
-	$(eval $@_TMP := $(shell mktemp -d))
-	$(eval $@_CACHE := ${$@_TMP}/pkg/mod/cache/download)
-	GO111MODULE=on go mod download
-	GO111MODULE=on GOPROXY=file://${GOPATH}/pkg/mod/cache/download GOPATH=${$@_TMP} go mod download
-	GO111MODULE=on GOPROXY=file://${$@_CACHE} go mod vendor
-	$(eval $@_PACKAGE := $(shell GO111MODULE=on go mod graph | awk '{print $$2}' | grep '^${FRAMEWORK_PACKAGE}@'))
-	mkdir -p vendor/${FRAMEWORK_PACKAGE}/deploy
-	cp -r ${$@_TMP}/pkg/mod/${$@_PACKAGE}/deploy/* vendor/${FRAMEWORK_PACKAGE}/deploy/.
+	go mod vendor
diff --git a/build/vendormanifests.go b/build/vendormanifests.go
@@ -0,0 +1,8 @@
+// +build tools
+
+package build
+
+import (
+	_ "github.com/open-policy-agent/frameworks/constraint/deploy"
+)
+
diff --git a/go.sum b/go.sum
@@ -292,8 +292,10 @@ github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34=
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
+github.com/open-policy-agent/frameworks v0.0.0-20200324191623-fdfe40285ae8 h1:eUQk4LtLUNKIhyQquMpeCfd37WaFjF+kBMh9ssM90Es=
 github.com/open-policy-agent/frameworks/constraint v0.0.0-20200304180616-c46b44c53e49 h1:l5EgTkzRJB1lRVihCGCnv/r6s5rdx3M4qvrK2GxCNlA=
 github.com/open-policy-agent/frameworks/constraint v0.0.0-20200304180616-c46b44c53e49/go.mod h1:RYtG2t6a5nly9IWFMNgq/K29YzYMV9ftA7XlGOM75bs=
+github.com/open-policy-agent/frameworks/constraint v0.0.0-20200324191623-fdfe40285ae8 h1:HAheBwqSYQ57e0jaSO4sbGDeLb7/QtaIKjuru1Ls658=
 github.com/open-policy-agent/frameworks/constraint v0.0.0-20200325031139-1a8f361c3e49 h1:UWixju7yHJWZ/A0I5VCy+sN6pZD+ahvKcmu4XLlGNvM=
 github.com/open-policy-agent/frameworks/constraint v0.0.0-20200325031139-1a8f361c3e49/go.mod h1:X8DFAmMmNYXIlCsBJevCfoteqP1dylPuKurg3SY+80E=
 github.com/open-policy-agent/opa v0.16.2 h1:Fdt1ysSA3p7z88HVHmUFiPM6hqqXbLDDZF9cQFYaIP0=

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -141,6 +141,7 @@ github.com/onsi/gomega/matchers/support/goraph/node
 github.com/onsi/gomega/matchers/support/goraph/util
 github.com/onsi/gomega/types
 # github.com/open-policy-agent/frameworks/constraint v0.0.0-20200325031139-1a8f361c3e49
+github.com/open-policy-agent/frameworks/constraint/deploy
 github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/v1alpha1
 github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/v1beta1
 github.com/open-policy-agent/frameworks/constraint/pkg/client