Merge pull request #12011 from soltysh/fix_godeps

Merged by openshift-bot

Author: OpenShift Bot

Godeps/Godeps.json

@@ -82,6 +82,8 @@ preload-remote "github.com/google" "cadvisor" "github.com/openshift" "cadvisor"
 preload-dep "github.com/elazarl"     "goproxy" "$( go run "${OS_ROOT}/tools/godepversion/godepversion.go" "${OS_ROOT}/Godeps/Godeps.json" "github.com/elazarl/goproxy" )"
 # rkt test dep
 preload-dep "github.com/golang/mock" "gomock"  "$( go run "${OS_ROOT}/tools/godepversion/godepversion.go" "${OS_ROOT}/Godeps/Godeps.json" "github.com/golang/mock/gomock" )"
+# docker storage dep
+preload-dep "google.golang.org" "cloud"  "$( go run "${OS_ROOT}/tools/godepversion/godepversion.go" "${OS_ROOT}/Godeps/Godeps.json" "google.golang.org/cloud" )"
 
 # fill out that nice clean place with the origin godeps
 echo "Starting to download all godeps. This takes a while"

hack/godep-restore.sh

@@ -36,8 +36,13 @@ func main() {
 
 	errs := []string{}
 	for _, validate := range AllValidators {
-		err := validate(nonbumpCommits)
-		if err != nil {
+		if err := validate(nonbumpCommits); err != nil {
+			errs = append(errs, err.Error())
+		}
+	}
+	if len(os.Getenv("RESTORE_AND_VERIFY_GODEPS")) > 0 {
+		// Godeps verifies all commits, including bumps and UPSTREAM
+		if err := ValidateGodeps(commits); err != nil {
 			errs = append(errs, err.Error())
 		}
 	}

tools/rebasehelpers/commitchecker/commitchecker.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"os/exec"
 	"regexp"
 	"strings"
 	"text/template"
@@ -51,7 +52,7 @@ var AllValidators = []func([]util.Commit) error{
 func ValidateUpstreamCommitsWithoutGodepsChanges(commits []util.Commit) error {
 	problemCommits := []util.Commit{}
 	for _, commit := range commits {
-		if commit.HasGodepsChanges() && !commit.DeclaresUpstreamChange() {
+		if commit.HasVendoredCodeChanges() && !commit.DeclaresUpstreamChange() {
 			problemCommits = append(problemCommits, commit)
 		}
 	}
@@ -114,7 +115,7 @@ func ValidateUpstreamCommitSummaries(commits []util.Commit) error {
 func ValidateUpstreamCommitModifiesOnlyGodeps(commits []util.Commit) error {
 	problemCommits := []util.Commit{}
 	for _, commit := range commits {
-		if commit.HasGodepsChanges() && commit.HasNonGodepsChanges() {
+		if commit.HasVendoredCodeChanges() && commit.HasNonVendoredCodeChanges() {
 			problemCommits = append(problemCommits, commit)
 		}
 	}
@@ -155,6 +156,30 @@ func ValidateUpstreamCommitModifiesOnlyDeclaredGodepRepo(commits []util.Commit)
 	return nil
 }
 
+// ValidateGodeps invokes hack/godep-restore.sh whenever it finds at least one commit
+// modifying Godeps/Godeps.json file or vendor/ directory.
+func ValidateGodeps(commits []util.Commit) error {
+	runGodepsRestore := false
+	for _, commit := range commits {
+		if commit.HasVendoredCodeChanges() || commit.HasGodepsChanges() {
+			runGodepsRestore = true
+			break
+		}
+	}
+	if runGodepsRestore {
+		fmt.Println("Running godep-restore")
+		cmd := exec.Command("hack/godep-restore.sh")
+		var stdout bytes.Buffer
+		var stderr bytes.Buffer
+		cmd.Stdout = &stdout
+		cmd.Stderr = &stderr
+		if err := cmd.Run(); err != nil {
+			return fmt.Errorf("Error running hack/godep-restore.sh: %v\n%s\n%s", err, stderr.String(), stdout.String())
+		}
+	}
+	return nil
+}
+
 type CommitFilesRenderOption int
 
 const (
@@ -175,8 +200,8 @@ func renderGodepFilesError(label string, commits []util.Commit, opt CommitFilesR
 		}
 		for _, file := range commit.Files {
 			if opt == RenderAllFiles ||
-				(opt == RenderOnlyGodepsFiles && file.HasGodepsChanges()) ||
-				(opt == RenderOnlyNonGodepsFiles && !file.HasGodepsChanges()) {
+				(opt == RenderOnlyGodepsFiles && file.HasVendoredCodeChanges()) ||
+				(opt == RenderOnlyNonGodepsFiles && !file.HasVendoredCodeChanges()) {
 				msg += fmt.Sprintf("  - %s\n", file)
 			}
 		}

tools/rebasehelpers/commitchecker/validate.go

@@ -59,6 +59,18 @@ func (c Commit) DeclaredUpstreamRepo() (string, error) {
 	return repo, nil
 }
 
+// HasVendoredCodeChanges verifies if the commit has any changes to Godeps/_workspace/
+// or vendor/ directories.
+func (c Commit) HasVendoredCodeChanges() bool {
+	for _, file := range c.Files {
+		if file.HasVendoredCodeChanges() {
+			return true
+		}
+	}
+	return false
+}
+
+// HasGodepsChanges verifies if the commit has any changes to Godeps/Godeps.json file.
 func (c Commit) HasGodepsChanges() bool {
 	for _, file := range c.Files {
 		if file.HasGodepsChanges() {
@@ -68,9 +80,11 @@ func (c Commit) HasGodepsChanges() bool {
 	return false
 }
 
-func (c Commit) HasNonGodepsChanges() bool {
+// HasNonVendoredCodeChanges verifies if the commit didn't modify Godeps/_workspace/
+// or vendor directories.
+func (c Commit) HasNonVendoredCodeChanges() bool {
 	for _, file := range c.Files {
-		if !file.HasGodepsChanges() {
+		if !file.HasVendoredCodeChanges() {
 			return true
 		}
 	}
@@ -80,7 +94,7 @@ func (c Commit) HasNonGodepsChanges() bool {
 func (c Commit) GodepsReposChanged() ([]string, error) {
 	repos := map[string]struct{}{}
 	for _, file := range c.Files {
-		if !file.HasGodepsChanges() {
+		if !file.HasVendoredCodeChanges() {
 			continue
 		}
 		repo, err := file.GodepsRepoChanged()
@@ -98,12 +112,19 @@ func (c Commit) GodepsReposChanged() ([]string, error) {
 
 type File string
 
-func (f File) HasGodepsChanges() bool {
+// HasVendoredCodeChanges verifies if the modified file is from Godeps/_workspace/
+// or vendor/ directories.
+func (f File) HasVendoredCodeChanges() bool {
 	return strings.HasPrefix(string(f), "Godeps/_workspace") || strings.HasPrefix(string(f), "vendor")
 }
 
+// HasGodepsChanges verifies if the modified file is Godeps/Godeps.json.
+func (f File) HasGodepsChanges() bool {
+	return f == "Godeps/Godeps.json"
+}
+
 func (f File) GodepsRepoChanged() (string, error) {
-	if !f.HasGodepsChanges() {
+	if !f.HasVendoredCodeChanges() {
 		return "", fmt.Errorf("file doesn't appear to be a Godeps or vendor change")
 	}
 	// Find the _workspace or vendor path segment index.