Merge pull request #449 from Kern--/main

Pin dependencies

Author: Kern--

.buildkite/pipeline.yml

@@ -76,8 +76,6 @@ steps:
       # To use ${FC_TEST_DATA_PATH} as testdata/, all files in the original directory must be
       # copied to the new directory.
       - cp -r testdata/* ${FC_TEST_DATA_PATH}
-      # Install tc-redirect-tap.
-      - 'go get github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap'
       # Copy vmlinux and root-drive.img.
       - ln -s /var/lib/fc-ci/vmlinux.bin ${FC_TEST_DATA_PATH}/vmlinux
       - ln -s /var/lib/fc-ci/rootfs.ext4 ${FC_TEST_DATA_PATH}/root-drive.img

.hack/go.mod

@@ -0,0 +1,15 @@
+// This is a fake go.mod
+// Older versions of go have different go get/go install semantics. In particular:
+// 1. `go get` with `GO111MODULES=off` will retrieve and and install a package, but you can't specify a version
+// 2. `go get` with `GO111MODULES=on` will retrive a packge at a specific version, but messes with the go.mod. The package can then be installed with `go install`
+
+// We don't actually want binary dependencies to modify the go.mod but since we want to pin versions, we create this unused go.mod
+// that `go get` can mess with without affecting our main codebase.
+module hack
+
+go 1.11
+
+require (
+	github.com/awslabs/tc-redirect-tap v0.0.0-20220715050423-f2af44521093 // indirect
+	github.com/containernetworking/plugins v1.1.1 // indirect
+)

.hack/go.sum

@@ -55,6 +55,18 @@ testdata_dir = testdata/firecracker.tgz testdata/firecracker_spec-$(firecracker_
 # --location is needed to follow redirects on github.com
 curl = curl --location
 
+GO_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1,2)
+ifeq ($(GO_VERSION), $(filter $(GO_VERSION),1.14 1.15))
+    define install_go
+		cd .hack; GO111MODULE=on GOBIN=$(abspath $(FC_TEST_BIN_PATH)) go get $(1)@$(2) 
+		cd .hack; GO111MODULE=on GOBIN=$(abspath $(FC_TEST_BIN_PATH)) go install $(1)
+    endef
+else
+    define install_go
+		GOBIN=$(abspath $(FC_TEST_BIN_PATH)) go install $(1)@$(2)
+    endef
+endif
+
 all: build
 
 test: all-tests
@@ -106,24 +118,19 @@ else
 endif
 
 $(FC_TEST_BIN_PATH)/ptp:
-	GO111MODULE=off GOBIN=$(abspath $(FC_TEST_BIN_PATH)) \
-	go get github.com/containernetworking/plugins/plugins/main/ptp
+	$(call install_go,github.com/containernetworking/plugins/plugins/main/ptp,v1.1.1)
 
 $(FC_TEST_BIN_PATH)/host-local:
-	GO111MODULE=off GOBIN=$(abspath $(FC_TEST_BIN_PATH)) \
-	go get github.com/containernetworking/plugins/plugins/ipam/host-local
+	$(call install_go,github.com/containernetworking/plugins/plugins/ipam/host-local,v1.1.1)
 
 $(FC_TEST_BIN_PATH)/static:
-	GO111MODULE=off GOBIN=$(abspath $(FC_TEST_BIN_PATH)) \
-	go get github.com/containernetworking/plugins/plugins/ipam/static
+	$(call install_go,github.com/containernetworking/plugins/plugins/ipam/static,v1.1.1)
 
 $(FC_TEST_BIN_PATH)/tc-redirect-tap:
-	GO111MODULE=off GOBIN=$(abspath $(FC_TEST_BIN_PATH)) \
-	go get github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap
+	$(call install_go,github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap,v0.0.0-20220715050423-f2af44521093)
 
 $(FC_TEST_DATA_PATH)/ltag:
-	GO111MODULE=on GOBIN=$(abspath $(FC_TEST_BIN_PATH)) \
-	go get github.com/kunalkushwaha/[email protected]
+	$(call install_go,github.com/kunalkushwaha/ltag,v0.2.3)
 
 $(FIRECRACKER_DIR):
 	- git clone https://github.com/firecracker-microvm/firecracker.git $(FIRECRACKER_DIR)

Makefile

@@ -0,0 +1,2 @@
+bin/
+

examples/cmd/snapshotting/.gitignore

@@ -0,0 +1,15 @@
+// This is a fake go.mod
+// Older versions of go have different go get/go install semantics. In particular:
+// 1. `go get` with `GO111MODULES=off` will retrieve and and install a package, but you can't specify a version
+// 2. `go get` with `GO111MODULES=on` will retrive a packge at a specific version, but messes with the go.mod. The package can then be installed with `go install`
+
+// We don't actually want binary dependencies to modify the go.mod but since we want to pin versions, we create this unused go.mod
+// that `go get` can mess with without affecting our main codebase.
+module hack
+
+go 1.11
+
+require (
+	github.com/awslabs/tc-redirect-tap v0.0.0-20220715050423-f2af44521093 // indirect
+	github.com/containernetworking/plugins v1.1.1 // indirect
+)

examples/cmd/snapshotting/.hack/go.mod

@@ -18,8 +18,21 @@ ARCH=$(shell uname -m)
 GID = $(shell id -g)
 
 PWD=$(shell pwd)
+GOBIN=$(PWD)/bin
 FC_TEST_DATA_PATH?=$(PWD)
 
+GO_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1,2)
+ifeq ($(GO_VERSION), $(filter $(GO_VERSION),1.14 1.15))
+    define install_go
+		cd .hack; GO111MODULE=on GOBIN=$(GOBIN) go get $(1)@$(2) 
+		cd .hack; GO111MODULE=on GOBIN=$(GOBIN) go install $(1)
+    endef
+else
+    define install_go
+		GOBIN=$(GOBIN) go install $(1)@$(2)
+    endef
+endif
+
 all: plugins image vmlinux firecracker
 
 plugins: bin/tc-redirect-tap bin/ptp bin/host-local | bin
@@ -28,16 +41,13 @@ bin:
 	mkdir -p bin
 
 bin/tc-redirect-tap: bin
-	GO111MODULE=off GOBIN=$(PWD)/bin \
-	go get github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap
+	$(call install_go,github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap,v0.0.0-20220715050423-f2af44521093)
 
 bin/ptp: bin
-	GO111MODULE=off GOBIN=$(PWD)/bin \
-	go get github.com/containernetworking/plugins/plugins/main/ptp
+	$(call install_go,github.com/containernetworking/plugins/plugins/main/ptp,v1.1.1)
 
 bin/host-local: bin
-	GO111MODULE=off GOBIN=$(PWD)/bin \
-	go get github.com/containernetworking/plugins/plugins/ipam/host-local
+	$(call install_go,github.com/containernetworking/plugins/plugins/ipam/host-local,v1.1.1)
 
 image:
 ifeq ($(GID), 0)
@@ -70,4 +80,4 @@ run: all
 clean:
 	rm -rf bin firecracker root-drive-ssh-key root-drive-with-ssh.img vmlinux
 
-.PHONY: all clean image plugins run
+.PHONY: all clean image plugins run