Merge pull request #183 from Netflix/lock-protobuf-generator

Lock protobuf generator

Makefile

@@ -19,6 +19,7 @@ TEST_OUTPUT           ?= test.xml
 TEST_DOCKER_OUTPUT    ?= test-standalone-docker.xml
 GOIMPORTS             := $(GOPATH)/bin/goimports
 GOVENDOR              := $(GOPATH)/bin/govendor
+PROTOC_GEN_GO         := $(GOPATH)/bin/protoc-gen-go
 
 SHORT_CIRCUIT_QUITELITE := true
 
@@ -117,7 +118,7 @@ push-titus-agent: titus-agent
 
 PROTOS := vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/titus_base.proto vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/titus_agent_api.proto vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/agent.proto
 .PHONY: protogen
-protogen:  $(PROTOS) | $(clean) $(clean-proto-defs)
+protogen: $(PROTOS) $(PROTOC_GEN_GO) | $(clean) $(clean-proto-defs)
 	mkdir -p api
 	protoc -Ivendor/github.com/Netflix/titus-api-definitions/src/main/proto/ --go_out=api/ $(PROTOS)
 
@@ -127,6 +128,8 @@ clean-proto-defs: | $(clean)
 
 
 ## Binary dependencies
+$(PROTOC_GEN_GO): vendor/vendor.json vendor/github.com/golang/protobuf/protoc-gen-go
+	govendor install ./vendor/github.com/golang/protobuf/protoc-gen-go
 
 $(GOIMPORTS):
 	go get golang.org/x/tools/cmd/goimports

config/config.go

@@ -256,7 +256,7 @@ func (c *Config) getUserProvided(taskInfo *titus.ContainerInfo) map[string]strin
 // ENV from the deprecated environmentVariable field that had both user and Titus provided values merged
 func getUserProvidedDeprecated(taskInfo *titus.ContainerInfo) map[string]string {
 	vars := make(map[string]string)
-	for _, env := range taskInfo.GetEnvironmentVariable() {
+	for _, env := range taskInfo.GetEnvironmentVariable() { // nolint: megacheck
 		vars[env.GetName()] = env.GetValue()
 	}
 	return vars

executor/runtime/types/types.go

@@ -176,7 +176,7 @@ func (c *Container) UploadDir(namespace string) string {
 func (c *Container) Process() (entrypoint, cmd []string, err error) {
 	if c.TitusInfo.EntrypointStr != nil {
 		// deprecated (old) way of passing entrypoints as a flat string. We need to parse it
-		entrypoint, err = dockershellparser.ProcessWords(c.TitusInfo.GetEntrypointStr(), []string{})
+		entrypoint, err = dockershellparser.ProcessWords(c.TitusInfo.GetEntrypointStr(), []string{}) // nolint: megacheck
 		if err != nil {
 			return nil, nil, err
 		}