deleted file mode 100644

@@ -1,60 +0,0 @@

-package main

-

-import (

-	"bytes"

-	"fmt"

-	"io/ioutil"

-	"os"

-	"path/filepath"

-

-	"github.com/openshift/origin/pkg/cmd/admin"

-	"github.com/openshift/origin/pkg/cmd/cli"

-	"github.com/openshift/origin/pkg/cmd/openshift"

-)

-

-func OutDir(path string) (string, error) {

-	outDir, err := filepath.Abs(path)

-	if err != nil {

-		return "", err

-	}

-

-	stat, err := os.Stat(outDir)

-	if err != nil {

-		return "", err

-	}

-

-	if !stat.IsDir() {

-		return "", fmt.Errorf("output directory %s is not a directory\n", outDir)

-	}

-	outDir = outDir + "/"

-	return outDir, nil

-}

-

-func main() {

-	// use os.Args instead of "flags" because "flags" will mess up the man pages!

-	path := "contrib/completions/bash/"

-	if len(os.Args) == 2 {

-		path = os.Args[1]

-	} else if len(os.Args) > 2 {

-		fmt.Fprintf(os.Stderr, "usage: %s [output directory]\n", os.Args[0])

-		os.Exit(1)

-	}

-

-	outDir, err := OutDir(path)

-	if err != nil {

-		fmt.Fprintf(os.Stderr, "failed to get output directory: %v\n", err)

-		os.Exit(1)

-	}

-	outFile_openshift := outDir + "openshift"

-	openshift := openshift.NewCommandOpenShift("openshift")

-	openshift.GenBashCompletionFile(outFile_openshift)

-

-	outFile_osc := outDir + "oc"

-	out := os.Stdout

-	oc := cli.NewCommandCLI("oc", "openshift cli", &bytes.Buffer{}, out, ioutil.Discard)

-	oc.GenBashCompletionFile(outFile_osc)

-

-	outFile_osadm := outDir + "oadm"

-	oadm := admin.NewCommandAdmin("oadm", "openshift admin", ioutil.Discard)

-	oadm.GenBashCompletionFile(outFile_osadm)

-}

deleted file mode 100644

@@ -1,71 +0,0 @@

-package main

-

-import (

-	"fmt"

-	"io"

-	"os"

-	"runtime"

-	"strings"

-

-	"k8s.io/kubernetes/pkg/api"

-	pkg_runtime "k8s.io/kubernetes/pkg/runtime"

-	"k8s.io/kubernetes/pkg/util/sets"

-

-	"github.com/golang/glog"

-	flag "github.com/spf13/pflag"

-

-	_ "github.com/openshift/origin/pkg/api"

-	_ "github.com/openshift/origin/pkg/api/v1"

-	_ "github.com/openshift/origin/pkg/api/v1beta3"

-)

-

-var (

-	functionDest = flag.StringP("funcDest", "f", "-", "Output for conversion functions; '-' means stdout")

-	version      = flag.StringP("version", "v", "v1beta3", "Version for conversion.")

-)

-

-func main() {

-	runtime.GOMAXPROCS(runtime.NumCPU())

-	flag.Parse()

-

-	var funcOut io.Writer

-	if *functionDest == "-" {

-		funcOut = os.Stdout

-	} else {

-		file, err := os.Create(*functionDest)

-		if err != nil {

-			glog.Fatalf("Couldn't open %v: %v", *functionDest, err)

-		}

-		defer file.Close()

-		funcOut = file

-	}

-

-	generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw(), "github.com/openshift/origin/pkg/api")

-	apiShort := generator.AddImport("k8s.io/kubernetes/pkg/api")

-	generator.AddImport("k8s.io/kubernetes/pkg/api/resource")

-	generator.AssumePrivateConversions()

-	// TODO(wojtek-t): Change the overwrites to a flag.

-	generator.OverwritePackage(*version, "")

-	for _, knownType := range api.Scheme.KnownTypes(*version) {

-		if !strings.Contains(knownType.PkgPath(), "openshift/origin") {

-			continue

-		}

-		if err := generator.GenerateConversionsForType(*version, knownType); err != nil {

-			glog.Errorf("error while generating conversion functions for %v: %v", knownType, err)

-		}

-	}

-

-	generator.RepackImports(sets.NewString("k8s.io/kubernetes/pkg/runtime"))

-	// the repack changes the name of the import

-	apiShort = generator.AddImport("k8s.io/kubernetes/pkg/api")

-

-	if err := generator.WriteImports(funcOut); err != nil {

-		glog.Fatalf("error while writing imports: %v", err)

-	}

-	if err := generator.WriteConversionFunctions(funcOut); err != nil {

-		glog.Fatalf("Error while writing conversion functions: %v", err)

-	}

-	if err := generator.RegisterConversionFunctions(funcOut, fmt.Sprintf("%s.Scheme", apiShort)); err != nil {

-		glog.Fatalf("Error while writing conversion functions: %v", err)

-	}

-}

deleted file mode 100644

@@ -1,94 +0,0 @@

-/*

-Copyright 2015 The Kubernetes Authors All rights reserved.

-

-Licensed under the Apache License, Version 2.0 (the "License");

-you may not use this file except in compliance with the License.

-You may obtain a copy of the License at

-

-    http://www.apache.org/licenses/LICENSE-2.0

-

-Unless required by applicable law or agreed to in writing, software

-distributed under the License is distributed on an "AS IS" BASIS,

-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-See the License for the specific language governing permissions and

-limitations under the License.

-*/

-

-package main

-

-import (

-	"fmt"

-	"io"

-	"os"

-	"runtime"

-	"strings"

-

-	"k8s.io/kubernetes/pkg/api"

-	pkg_runtime "k8s.io/kubernetes/pkg/runtime"

-	"k8s.io/kubernetes/pkg/util/sets"

-

-	"github.com/golang/glog"

-	flag "github.com/spf13/pflag"

-

-	_ "github.com/openshift/origin/pkg/api"

-	_ "github.com/openshift/origin/pkg/api/v1"

-	_ "github.com/openshift/origin/pkg/api/v1beta3"

-)

-

-var (

-	functionDest = flag.StringP("func-dest", "f", "-", "Output for deep copy functions; '-' means stdout")

-	version      = flag.StringP("version", "v", "v1beta3", "Version for deep copies.")

-	overwrites   = flag.StringP("overwrites", "o", "", "Comma-separated overwrites for package names")

-)

-

-func main() {

-	runtime.GOMAXPROCS(runtime.NumCPU())

-	flag.Parse()

-

-	var funcOut io.Writer

-	if *functionDest == "-" {

-		funcOut = os.Stdout

-	} else {

-		file, err := os.Create(*functionDest)

-		if err != nil {

-			glog.Fatalf("Couldn't open %v: %v", *functionDest, err)

-		}

-		defer file.Close()

-		funcOut = file

-	}

-

-	knownVersion := *version

-	if knownVersion == "api" {

-		knownVersion = api.Scheme.Raw().InternalVersion

-	}

-	generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), "github.com/openshift/origin/pkg/api", sets.NewString("github.com/openshift/origin"))

-	apiShort := generator.AddImport("k8s.io/kubernetes/pkg/api")

-	generator.ReplaceType("k8s.io/kubernetes/pkg/util/sets", "empty", struct{}{})

-

-	for _, overwrite := range strings.Split(*overwrites, ",") {

-		vals := strings.Split(overwrite, "=")

-		generator.OverwritePackage(vals[0], vals[1])

-	}

-	for _, knownType := range api.Scheme.KnownTypes(knownVersion) {

-		if !strings.Contains(knownType.PkgPath(), "openshift/origin") {

-			continue

-		}

-		if err := generator.AddType(knownType); err != nil {

-			glog.Errorf("error while generating deep copy functions for %v: %v", knownType, err)

-		}

-	}

-

-	generator.RepackImports()

-	// the repack changes the name of the import

-	apiShort = generator.AddImport("k8s.io/kubernetes/pkg/api")

-

-	if err := generator.WriteImports(funcOut); err != nil {

-		glog.Fatalf("error while writing imports: %v", err)

-	}

-	if err := generator.WriteDeepCopyFunctions(funcOut); err != nil {

-		glog.Fatalf("error while writing deep copy functions: %v", err)

-	}

-	if err := generator.RegisterDeepCopyFunctions(funcOut, fmt.Sprintf("%s.Scheme", apiShort)); err != nil {

-		glog.Fatalf("error while registering deep copy functions: %v", err)

-	}

-}

deleted file mode 100644

@@ -1,56 +0,0 @@

-package main

-

-import (

-	"bytes"

-	"fmt"

-	"io/ioutil"

-	"os"

-	"path/filepath"

-

-	"github.com/openshift/origin/pkg/cmd/admin"

-	"github.com/openshift/origin/pkg/cmd/cli"

-	"github.com/openshift/origin/pkg/cmd/util/gendocs"

-)

-

-func OutDir(path string) (string, error) {

-	outDir, err := filepath.Abs(path)

-	if err != nil {

-		return "", err

-	}

-

-	stat, err := os.Stat(outDir)

-	if err != nil {

-		return "", err

-	}

-

-	if !stat.IsDir() {

-		return "", fmt.Errorf("output directory %s is not a directory\n", outDir)

-	}

-	outDir = outDir + "/"

-	return outDir, nil

-}

-

-func main() {

-	path := "docs/generated/"

-	if len(os.Args) == 2 {

-		path = os.Args[1]

-	} else if len(os.Args) > 2 {

-		fmt.Fprintf(os.Stderr, "usage: %s [output directory]\n", os.Args[0])

-		os.Exit(1)

-	}

-

-	outDir, err := OutDir(path)

-	if err != nil {

-		fmt.Fprintf(os.Stderr, "failed to get output directory: %v\n", err)

-		os.Exit(1)

-	}

-

-	outFile := outDir + "oc_by_example_content.adoc"

-	out := os.Stdout

-	cmd := cli.NewCommandCLI("oc", "oc", &bytes.Buffer{}, out, ioutil.Discard)

-	gendocs.GenDocs(cmd, outFile)

-

-	outFile = outDir + "oadm_by_example_content.adoc"

-	cmd = admin.NewCommandAdmin("oadm", "oadm", ioutil.Discard)

-	gendocs.GenDocs(cmd, outFile)

-}

deleted file mode 100644

@@ -1,46 +0,0 @@

-package main

-

-import (

-	"flag"

-	"fmt"

-	"os"

-	"strings"

-

-	"github.com/openshift/origin/cmd/rebasehelpers/util"

-)

-

-func main() {

-	var start, end string

-	flag.StringVar(&start, "start", "master", "The start of the revision range for analysis")

-	flag.StringVar(&end, "end", "HEAD", "The end of the revision range for analysis")

-	flag.Parse()

-

-	commits, err := util.CommitsBetween(start, end)

-	if err != nil {

-		os.Stderr.WriteString(fmt.Sprintf("ERROR: couldn't find commits from %s..%s: %v\n", start, end, err))

-		os.Exit(1)

-	}

-

-	// TODO: Filter out bump commits for now until we decide how to deal with

-	// them correctly.

-	nonbumpCommits := []util.Commit{}

-	for _, commit := range commits {

-		if commit.DeclaresUpstreamChange() &&

-			!strings.HasPrefix(commit.Summary, "bump(") {

-			nonbumpCommits = append(nonbumpCommits, commit)

-		}

-	}

-

-	errs := []string{}

-	for _, validate := range AllValidators {

-		err := validate(nonbumpCommits)

-		if err != nil {

-			errs = append(errs, err.Error())

-		}

-	}

-

-	if len(errs) > 0 {

-		os.Stderr.WriteString(strings.Join(errs, "\n\n"))

-		os.Exit(2)

-	}

-}

deleted file mode 100644

@@ -1,185 +0,0 @@

-package main

-

-import (

-	"bytes"

-	"fmt"

-	"regexp"

-	"strings"

-	"text/template"

-

-	"github.com/openshift/origin/cmd/rebasehelpers/util"

-)

-

-var CommitSummaryErrorTemplate = `

-The following UPSTREAM commits have invalid summaries:

-

-{{ range .Commits }}  [{{ .Sha }}] {{ .Summary }}

-{{ end }}

-UPSTREAM commit summaries should look like:

-

-  UPSTREAM: [non-kube-repo/name: ]<PR number|carry|drop>: description

-

-UPSTREAM commits which revert previous UPSTREAM commits should look like:

-

-  UPSTREAM: revert: <sha>: <normal upstream format>

-

-UPSTREAM commits are validated against the following regular expression:

-

-  {{ .Pattern }}

-

-Examples of valid summaries:

-

-  UPSTREAM: 12345: A kube fix

-  UPSTREAM: coreos/etcd: 12345: An etcd fix

-  UPSTREAM: <carry>: A carried kube change

-  UPSTREAM: <drop>: A dropped kube change

-  UPSTREAM: revert: abcd123: coreos/etcd: 12345: An etcd fix

-  UPSTREAM: k8s.io/heapster: 12345: A heapster fix

-

-`

-

-var AllValidators = []func([]util.Commit) error{

-	ValidateUpstreamCommitSummaries,

-	ValidateUpstreamCommitsWithoutGodepsChanges,

-	ValidateUpstreamCommitModifiesSingleGodepsRepo,

-	ValidateUpstreamCommitModifiesOnlyGodeps,

-	ValidateUpstreamCommitModifiesOnlyDeclaredGodepRepo,

-}

-

-// ValidateUpstreamCommitsWithoutGodepsChanges returns an error if any

-// upstream commits have no Godeps changes.

-func ValidateUpstreamCommitsWithoutGodepsChanges(commits []util.Commit) error {

-	problemCommits := []util.Commit{}

-	for _, commit := range commits {

-		if commit.HasGodepsChanges() && !commit.DeclaresUpstreamChange() {

-			problemCommits = append(problemCommits, commit)

-		}

-	}

-	if len(problemCommits) > 0 {

-		label := "The following commits contain Godeps changes but aren't declared as UPSTREAM"

-		msg := renderGodepFilesError(label, problemCommits, RenderOnlyGodepsFiles)

-		return fmt.Errorf(msg)

-	}

-	return nil

-}

-

-// ValidateUpstreamCommitModifiesSingleGodepsRepo returns an error if any

-// upstream commits have changes that span more than one Godeps repo.

-func ValidateUpstreamCommitModifiesSingleGodepsRepo(commits []util.Commit) error {

-	problemCommits := []util.Commit{}

-	for _, commit := range commits {

-		godepsChanges, err := commit.GodepsReposChanged()

-		if err != nil {

-			return err

-		}

-		if len(godepsChanges) > 1 {

-			problemCommits = append(problemCommits, commit)

-		}

-	}

-	if len(problemCommits) > 0 {

-		label := "The following UPSTREAM commits modify more than one repo in their changelist"

-		msg := renderGodepFilesError(label, problemCommits, RenderOnlyGodepsFiles)

-		return fmt.Errorf(msg)

-	}

-	return nil

-}

-

-// ValidateUpstreamCommitSummaries ensures that any commits which declare to

-// be upstream match the regular expressions for UPSTREAM summaries.

-func ValidateUpstreamCommitSummaries(commits []util.Commit) error {

-	problemCommits := []util.Commit{}

-	for _, commit := range commits {

-		if commit.DeclaresUpstreamChange() && !commit.MatchesUpstreamSummaryPattern() {

-			problemCommits = append(problemCommits, commit)

-		}

-	}

-	if len(problemCommits) > 0 {

-		tmpl, _ := template.New("problems").Parse(CommitSummaryErrorTemplate)

-		data := struct {

-			Pattern *regexp.Regexp

-			Commits []util.Commit

-		}{

-			Pattern: util.UpstreamSummaryPattern,

-			Commits: problemCommits,

-		}

-		buffer := &bytes.Buffer{}

-		tmpl.Execute(buffer, data)

-		return fmt.Errorf(buffer.String())

-	}

-	return nil

-}

-

-// ValidateUpstreamCommitModifiesOnlyGodeps ensures that any Godeps commits

-// modify ONLY Godeps files.

-func ValidateUpstreamCommitModifiesOnlyGodeps(commits []util.Commit) error {

-	problemCommits := []util.Commit{}

-	for _, commit := range commits {

-		if commit.HasGodepsChanges() && commit.HasNonGodepsChanges() {

-			problemCommits = append(problemCommits, commit)

-		}

-	}

-	if len(problemCommits) > 0 {

-		label := "The following UPSTREAM commits modify files outside Godeps"

-		msg := renderGodepFilesError(label, problemCommits, RenderAllFiles)

-		return fmt.Errorf(msg)

-	}

-	return nil

-}

-

-// ValidateUpstreamCommitModifiesOnlyDeclaredGodepRepo ensures that an

-// upstream commit only modifies the Godep repo the summary declares.

-func ValidateUpstreamCommitModifiesOnlyDeclaredGodepRepo(commits []util.Commit) error {

-	problemCommits := []util.Commit{}

-	for _, commit := range commits {

-		if commit.DeclaresUpstreamChange() {

-			declaredRepo, err := commit.DeclaredUpstreamRepo()

-			if err != nil {

-				return err

-			}

-			reposChanged, err := commit.GodepsReposChanged()

-			if err != nil {

-				return err

-			}

-			for _, changedRepo := range reposChanged {

-				if !strings.Contains(changedRepo, declaredRepo) {

-					problemCommits = append(problemCommits, commit)

-				}

-			}

-		}

-	}

-	if len(problemCommits) > 0 {

-		label := "The following UPSTREAM commits modify Godeps repos other than the repo the commit declares"

-		msg := renderGodepFilesError(label, problemCommits, RenderAllFiles)

-		return fmt.Errorf(msg)

-	}

-	return nil

-}

-

-type CommitFilesRenderOption int

-

-const (

-	RenderNoFiles CommitFilesRenderOption = iota

-	RenderOnlyGodepsFiles

-	RenderOnlyNonGodepsFiles

-	RenderAllFiles

-)

-

-// renderGodepFilesError formats commits and their file lists into readable

-// output prefixed with label.

-func renderGodepFilesError(label string, commits []util.Commit, opt CommitFilesRenderOption) string {

-	msg := fmt.Sprintf("%s:\n\n", label)

-	for _, commit := range commits {

-		msg += fmt.Sprintf("[%s] %s\n", commit.Sha, commit.Summary)

-		if opt == RenderNoFiles {

-			continue

-		}

-		for _, file := range commit.Files {

-			if opt == RenderAllFiles ||

-				(opt == RenderOnlyGodepsFiles && file.HasGodepsChanges()) ||

-				(opt == RenderOnlyNonGodepsFiles && !file.HasGodepsChanges()) {

-				msg += fmt.Sprintf("  - %s\n", file)

-			}

-		}

-	}

-	return msg

-}

deleted file mode 100644

@@ -1,379 +0,0 @@

-package main

-

-import (

-	"testing"

-

-	"github.com/openshift/origin/cmd/rebasehelpers/util"

-)

-

-func TestValidateUpstreamCommitsWithoutGodepsChanges(t *testing.T) {

-	tests := []struct {

-		name          string

-		commits       []util.Commit

-		errorExpected bool

-	}{

-		{

-			name: "test 1",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0000",

-					Summary: "commit 1",

-					Files:   []util.File{"file1", "pkg/file2"},

-				},

-				{

-					Sha:     "aaa0001",

-					Summary: "commit 2",

-					Files:   []util.File{"Godeps/file1", "pkg/file2"},

-				},

-			},

-			errorExpected: true,

-		},

-		{

-			name: "test 2",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0000",

-					Summary: "commit 1",

-					Files:   []util.File{"file1", "pkg/file2"},

-				},

-				{

-					Sha:     "aaa0001",

-					Summary: "UPSTREAM: commit 2",

-					Files:   []util.File{"Godeps/file1", "pkg/file2"},

-				},

-			},

-			errorExpected: false,

-		},

-	}

-	for _, test := range tests {

-		t.Logf("evaluating test %q", test.name)

-		err := ValidateUpstreamCommitsWithoutGodepsChanges(test.commits)

-		if err != nil {

-			if test.errorExpected {

-				t.Logf("got expected error:\n%s", err)

-				continue

-			} else {

-				t.Fatalf("unexpected error:\n%s", err)

-			}

-		} else {

-			if test.errorExpected {

-				t.Fatalf("expected an error, got none")

-			}

-		}

-	}

-}

-

-func TestValidateUpstreamCommitModifiesSingleGodepsRepo(t *testing.T) {

-	tests := []struct {

-		name          string

-		commits       []util.Commit

-		errorExpected bool

-	}{

-		{

-			name: "test 1",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0000",

-					Summary: "commit 1",

-					Files:   []util.File{"file1", "pkg/file2"},

-				},

-				{

-					Sha:     "aaa0001",

-					Summary: "commit 2",

-					Files: []util.File{

-						"Godeps/_workspace/src/k8s.io/kubernetes/file1",

-						"Godeps/_workspace/src/k8s.io/kubernetes/file2",

-					},

-				},

-			},

-			errorExpected: false,

-		},

-		{

-			name: "test 2",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0000",

-					Summary: "commit 1",

-					Files:   []util.File{"file1", "pkg/file2"},

-				},

-				{

-					Sha:     "aaa0001",

-					Summary: "UPSTREAM: commit 2",

-					Files: []util.File{

-						"Godeps/_workspace/src/k8s.io/kubernetes/file1",

-						"Godeps/_workspace/src/k8s.io/kubernetes/file2",

-						"Godeps/_workspace/src/github.com/coreos/etcd/file",

-					},

-				},

-				{

-					Sha:     "aaa0002",

-					Summary: "UPSTREAM: commit 3",

-					Files: []util.File{

-						"Godeps/_workspace/src/k8s.io/heapster/file1",

-						"Godeps/_workspace/src/github.com/coreos/etcd/file1",

-					},

-				},

-			},

-			errorExpected: true,

-		},

-	}

-	for _, test := range tests {

-		t.Logf("evaluating test %q", test.name)

-		err := ValidateUpstreamCommitModifiesSingleGodepsRepo(test.commits)

-		if err != nil {

-			if test.errorExpected {

-				t.Logf("got expected error:\n%s", err)

-				continue

-			} else {

-				t.Fatalf("unexpected error:\n%s", err)

-			}

-		} else {

-			if test.errorExpected {

-				t.Fatalf("expected an error, got none")

-			}

-		}

-	}

-}

-

-func TestValidateUpstreamCommitModifiesOnlyGodeps(t *testing.T) {

-	tests := []struct {

-		name          string

-		commits       []util.Commit

-		errorExpected bool

-	}{

-		{

-			name: "test 1",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0000",

-					Summary: "commit 1",

-					Files:   []util.File{"file1", "pkg/file2"},

-				},

-				{

-					Sha:     "aaa0001",

-					Summary: "UPSTREAM: commit 2",

-					Files: []util.File{

-						"Godeps/_workspace/src/k8s.io/kubernetes/file1",

-						"Godeps/_workspace/src/k8s.io/kubernetes/file2",

-						"pkg/some_file",

-					},

-				},

-			},

-			errorExpected: true,

-		},

-		{

-			name: "test 2",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0000",

-					Summary: "commit 1",

-					Files:   []util.File{"file1", "pkg/file2"},

-				},

-				{

-					Sha:     "aaa0001",

-					Summary: "UPSTREAM: commit 2",

-					Files: []util.File{

-						"Godeps/_workspace/src/k8s.io/kubernetes/file1",

-						"Godeps/_workspace/src/k8s.io/kubernetes/file2",

-					},

-				},

-			},

-			errorExpected: false,

-		},

-	}

-	for _, test := range tests {

-		t.Logf("evaluating test %q", test.name)

-		err := ValidateUpstreamCommitModifiesOnlyGodeps(test.commits)

-		if err != nil {

-			if test.errorExpected {

-				t.Logf("got expected error:\n%s", err)

-				continue

-			} else {

-				t.Fatalf("unexpected error:\n%s", err)

-			}

-		} else {

-			if test.errorExpected {

-				t.Fatalf("expected an error, got none")

-			}

-		}

-	}

-}

-

-func TestValidateUpstreamCommitSummaries(t *testing.T) {

-	tests := []struct {

-		summary string

-		valid   bool

-	}{

-		{valid: true, summary: "UPSTREAM: 12345: a change"},

-		{valid: true, summary: "UPSTREAM: k8s.io/heapster: 12345: a change"},

-		{valid: true, summary: "UPSTREAM: <carry>: a change"},

-		{valid: true, summary: "UPSTREAM: <drop>: a change"},

-		{valid: true, summary: "UPSTREAM: coreos/etcd: <carry>: a change"},

-		{valid: true, summary: "UPSTREAM: coreos/etcd: <drop>: a change"},

-		{valid: true, summary: "UPSTREAM: revert: abcd123: 12345: a change"},

-		{valid: true, summary: "UPSTREAM: revert: abcd123: k8s.io/heapster: 12345: a change"},

-		{valid: true, summary: "UPSTREAM: revert: abcd123: <carry>: a change"},

-		{valid: true, summary: "UPSTREAM: revert: abcd123: <drop>: a change"},

-		{valid: true, summary: "UPSTREAM: revert: abcd123: coreos/etcd: <carry>: a change"},

-		{valid: true, summary: "UPSTREAM: revert: abcd123: coreos/etcd: <drop>: a change"},

-		{valid: false, summary: "UPSTREAM: whoopsie daisy"},

-	}

-	for _, test := range tests {

-		commit := util.Commit{Summary: test.summary, Sha: "abcd000"}

-		err := ValidateUpstreamCommitSummaries([]util.Commit{commit})

-		if err != nil {

-			if test.valid {

-				t.Fatalf("unexpected error:\n%s", err)

-			} else {

-				t.Logf("got expected error:\n%s", err)

-			}

-		} else {

-			if !test.valid {

-				t.Fatalf("expected an error, got none; summary: %s", test.summary)

-			}

-		}

-	}

-}

-

-func TestValidateUpstreamCommitModifiesOnlyDeclaredGodepRepo(t *testing.T) {

-	tests := []struct {

-		name          string

-		commits       []util.Commit

-		errorExpected bool

-	}{

-		{

-			name: "test 1",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0000",

-					Summary: "commit 1",

-					Files:   []util.File{"file1", "pkg/file2"},

-				},

-				{

-					Sha:     "aaa0001",

-					Summary: "UPSTREAM: coreos/etcd: 12345: a change",

-					Files: []util.File{

-						"Godeps/_workspace/src/k8s.io/kubernetes/file1",

-						"Godeps/_workspace/src/k8s.io/kubernetes/file2",

-						"Godeps/_workspace/src/github.com/coreos/etcd/file1",

-					},

-				},

-			},

-			errorExpected: true,

-		},

-		{

-			name: "test 2",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0001",

-					Summary: "UPSTREAM: coreos/etcd: 12345: a change",

-					Files: []util.File{

-						"Godeps/_workspace/src/github.com/coreos/etcd/file1",

-						"Godeps/_workspace/src/github.com/coreos/etcd/file2",

-					},

-				},

-			},

-			errorExpected: false,

-		},

-		{

-			name: "test three segments",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0001",

-					Summary: "UPSTREAM: coreos/etcd: 12345: a change",

-					Files: []util.File{

-						"Godeps/_workspace/src/github.com/coreos/etcd/a/file1",

-						"Godeps/_workspace/src/github.com/coreos/etcd/b/file2",

-					},

-				},

-			},

-			errorExpected: false,

-		},

-		{

-			name: "test 3",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0001",

-					Summary: "UPSTREAM: 12345: a change",

-					Files: []util.File{

-						"Godeps/_workspace/src/k8s.io/kubernetes/file1",

-						"Godeps/_workspace/src/k8s.io/kubernetes/file2",

-					},

-				},

-			},

-			errorExpected: false,

-		},

-		{

-			name: "test 4",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0001",

-					Summary: "UPSTREAM: 12345: a change",

-					Files: []util.File{

-						"Godeps/_workspace/src/github.com/coreos/etcd/file1",

-						"Godeps/_workspace/src/github.com/coreos/etcd/file2",

-					},

-				},

-			},

-			errorExpected: true,

-		},

-		{

-			name: "test 5",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0001",

-					Summary: "UPSTREAM: revert: abcd000: 12345: a change",

-					Files: []util.File{

-						"Godeps/_workspace/src/k8s.io/kubernetes/file1",

-						"Godeps/_workspace/src/k8s.io/kubernetes/file2",

-					},

-				},

-			},

-			errorExpected: false,

-		},

-		{

-			name: "test 6",

-			commits: []util.Commit{

-				{

-					Sha:     "aaa0001",