update go.mod for release

Merge remote-tracking branch 'upstream/master' into release-cmd/config-v0.0

.github/workflows/go.yml

@@ -1,23 +0,0 @@
-name: Go
-on: [push]
-jobs:
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go 1.13
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.13
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-
-    - name: Build
-      run: ./travis/kyaml-pre-commit.sh
-
-    - name: Check
-      run: ./travis/check-go-mod.sh

.golangci-kustomize.yml

@@ -7,13 +7,8 @@ linters:
     - bodyclose
     - deadcode
     - depguard
-    # - dogsled
     - dupl
-    # - errcheck
-    # - funlen
-    # - gochecknoinits
     - goconst
-    # - gocritic
     - gocyclo
     - gofmt
     - goimports
@@ -26,7 +21,6 @@ linters:
     - lll
     - misspell
     - nakedret
-    # - scopelint
     - staticcheck
     - structcheck
     # stylecheck demands that acronyms not be treated as words
@@ -34,10 +28,9 @@ linters:
     # - stylecheck
     - typecheck
     - unconvert
-    - unparam
     - unused
+    - unparam
     - varcheck
-    # - whitespace
 
 linters-settings:
   dupl:

Makefile

@@ -17,14 +17,8 @@ verify-kustomize: \
 	test-examples-kustomize-against-HEAD \
 	test-examples-kustomize-against-latest
 
-# The following target referenced by a file in
-# https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes-sigs/kustomize
-.PHONY: prow-presubmit-check
-prow-presubmit-check: \
-	test-unit-kustomize-all
-
 .PHONY: verify-kustomize-e2e
-verify-kustomize-e2e: test-examples-e2e-kustomize
+verify-kustomize-e2e: test-examples-e2e-kustomize-against-HEAD
 
 # Other builds in this repo might want a different linter version.
 # Without one Makefile to rule them all, the different makes
@@ -208,14 +202,8 @@ test-examples-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip
 	./hack/testExamplesAgainstKustomize.sh HEAD
 
 .PHONY:
-test-examples-e2e-kustomize: $(MYGOBIN)/mdrip $(MYGOBIN)/kind
-	( \
-		set -e; \
-		/bin/rm -f $(MYGOBIN)/kustomize; \
-		echo "Installing kustomize from ."; \
-		cd kustomize; go install .; cd ..; \
-		./hack/testExamplesE2EAgainstKustomize.sh .; \
-	)
+test-examples-e2e-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip $(MYGOBIN)/resource
+	./hack/testExamplesE2EAgainstKustomize.sh HEAD
 
 .PHONY:
 test-examples-kustomize-against-latest: $(MYGOBIN)/mdrip
@@ -261,16 +249,6 @@ $(MYGOBIN)/helm:
 		rm -rf $$d \
 	)
 
-$(MYGOBIN)/kind:
-	( \
-        set -e; \
-        d=$(shell mktemp -d); cd $$d; \
-        wget -O ./kind https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-$(shell uname)-amd64; \
-        chmod +x ./kind; \
-        mv ./kind $(MYGOBIN); \
-        rm -rf $$d; \
-	)
-
 .PHONY: clean
 clean: kustomize-external-go-plugin-clean
 	go clean --cache

api/internal/crawl/backend/search_backend.go

@@ -44,7 +44,7 @@ type kustomizeSearch struct {
 // /register: not implemented, but meant as an endpoint for adding new
 // kustomization files to the corpus.
 func NewKustomizeSearch(ctx context.Context) (*kustomizeSearch, error) {
-	idx, err := index.NewKustomizeIndex(ctx, "kustomize")
+	idx, err := index.NewKustomizeIndex(ctx)
 	if err != nil {
 		return nil, err
 	}

api/internal/crawl/cmd/crawler/crawler.go

@@ -9,8 +9,6 @@ import (
 	"os"
 	"time"
 
-	"sigs.k8s.io/kustomize/api/internal/crawl/utils"
-
 	"sigs.k8s.io/kustomize/api/internal/crawl/crawler"
 	"sigs.k8s.io/kustomize/api/internal/crawl/crawler/github"
 	"sigs.k8s.io/kustomize/api/internal/crawl/doc"
@@ -28,7 +26,6 @@ const (
 )
 
 type CrawlMode int
-
 const (
 	CrawlUnknown CrawlMode = iota
 	// Crawl all the kustomization files in all the repositories of a Github user
@@ -126,15 +123,15 @@ func main() {
 		}
 	}
 
-	// seen tracks the IDs of all the documents in the index and their corresponding file types.
+	// seen tracks the IDs of all the documents in the index.
 	// This helps avoid indexing a given document multiple times.
-	seen := utils.NewSeenMap()
+	seen := crawler.NewSeenMap()
 
 	mode := NewCrawlMode(*modePtr)
 
 	ghCrawlerConstructor := func(user, repo string) crawler.Crawler {
 		if user != "" {
-			return github.NewCrawler(githubToken, retryCount, clientCache,
+			return 	github.NewCrawler(githubToken, retryCount, clientCache,
 				github.QueryWith(
 					github.Filename("kustomization.yaml"),
 					github.Filename("kustomization.yml"),
@@ -167,7 +164,7 @@ func main() {
 		it := idx.IterateQuery(query, 10000, 60*time.Second)
 		for it.Next() {
 			for _, hit := range it.Value().Hits.Hits {
-				seedDocs = append(seedDocs, hit.Document.Document.Copy())
+				seedDocs = append(seedDocs, hit.Document.Copy())
 			}
 		}
 		if err := it.Err(); err != nil {
@@ -187,12 +184,6 @@ func main() {
 		crawler.CrawlFromSeed(ctx, seedDocs, crawlers, docConverter, indexFunc, seen)
 	case CrawlGithub:
 		crawlers := []crawler.Crawler{ghCrawlerConstructor("", "")}
-		// add all the documents in the index into seen.
-		// this greatly reduces the time overhead of CrawlGithub.
-		getSeedDocsFunc()
-		for _, d := range seedDocs {
-			seen[d.ID()] = d.FileType
-		}
 		crawler.CrawlGithub(ctx, crawlers, docConverter, indexFunc, seen)
 	case CrawlUser:
 		if *githubUserPtr == "" {

api/internal/crawl/cmd/kustomize_stats/main.go

@@ -2,16 +2,15 @@ package main
 
 import (
 	"context"
-	"crypto/sha256"
 	"flag"
 	"fmt"
 	"log"
+	"path/filepath"
 	"sort"
 	"time"
 
-	"sigs.k8s.io/kustomize/api/internal/crawl/doc"
-
 	"sigs.k8s.io/kustomize/api/internal/crawl/index"
+	"sigs.k8s.io/kustomize/api/konfig"
 )
 
 // iterateArr adds each item in arr into countMap.
@@ -26,90 +25,29 @@ func iterateArr(arr []string, countMap map[string]int) {
 
 }
 
-// SortMapKeyByValueInt takes a map as its input, sorts its keys according to their values
-// in the map, and outputs the sorted keys as a slice.
-func SortMapKeyByValueInt(m map[string]int) []string {
-	keys := make([]string, 0, len(m))
-	for key := range m {
-		keys = append(keys, key)
+// isKustomizationFile determines whether a file path is a kustomization file
+func isKustomizationFile(path string) bool {
+	basename := filepath.Base(path)
+	for _, name := range konfig.RecognizedKustomizationFileNames() {
+		if basename == name {
+			return true
+		}
 	}
-	// sort keys according to their values in the map m
-	sort.Slice(keys, func(i, j int) bool { return m[keys[i]] > m[keys[j]] })
-	return keys
+	return false
 }
 
 // SortMapKeyByValue takes a map as its input, sorts its keys according to their values
 // in the map, and outputs the sorted keys as a slice.
-func SortMapKeyByValueLen(m map[string][]string) []string {
+func SortMapKeyByValue(m map[string]int) []string {
 	keys := make([]string, 0, len(m))
 	for key := range m {
 		keys = append(keys, key)
 	}
 	// sort keys according to their values in the map m
-	sort.Slice(keys, func(i, j int) bool { return len(m[keys[i]]) > len(m[keys[j]]) })
+	sort.Slice(keys, func(i, j int) bool {return m[keys[i]] > m[keys[j]]})
 	return keys
 }
 
-func GeneratorOrTransformerStats(docs []*doc.KustomizationDocument) {
-	n := len(docs)
-	if n == 0 {
-		return
-	}
-
-	fileType := docs[0].FileType
-	fmt.Printf("There are totally %d %s files.\n", n, fileType)
-
-	GitRepositorySummary(docs, fileType)
-
-	// key of kindToUrls: a string in the KustomizationDocument.Kinds field
-	// value of kindToUrls: a slice of string urls defining a given kind.
-	kindToUrls := make(map[string][]string)
-
-	for _, d := range docs {
-		url := fmt.Sprintf("%s/blob/%s/%s", d.RepositoryURL, d.DefaultBranch, d.FilePath)
-		for _, kind := range d.Kinds {
-			if _, ok := kindToUrls[kind]; !ok {
-				kindToUrls[kind] = []string{url}
-			} else {
-				kindToUrls[kind] = append(kindToUrls[kind], url)
-			}
-		}
-	}
-	fmt.Printf("There are totally %d kinds of %s\n", len(kindToUrls), fileType)
-	sortedKeys := SortMapKeyByValueLen(kindToUrls)
-	for _, k := range sortedKeys {
-		sort.Strings(kindToUrls[k])
-		fmt.Printf("%s kind %s appears %d times\n", fileType, k, len(kindToUrls[k]))
-		for _, url := range kindToUrls[k] {
-			fmt.Printf("%s\n", url)
-		}
-	}
-}
-
-// GitRepositorySummary counts the distribution of docs:
-// 1) how many git repositories are these docs from?
-// 2) how many docs are from each git repository?
-func GitRepositorySummary(docs []*doc.KustomizationDocument, fileType string) {
-	m := make(map[string]int)
-	for _, d := range docs {
-		if _, ok := m[d.RepositoryURL]; ok {
-			m[d.RepositoryURL]++
-		} else {
-			m[d.RepositoryURL] = 1
-		}
-	}
-	sortedKeys := SortMapKeyByValueInt(m)
-	topN := 10
-	i := 0
-	for _, k := range sortedKeys {
-		if i >= topN {
-			break
-		}
-		fmt.Printf("%d %s are from %s\n", m[k], fileType, k)
-		i++
-	}
-}
-
 func main() {
 	topKindsPtr := flag.Int(
 		"kinds", -1,
@@ -126,12 +64,10 @@ If you only want to list the 10 most popular identifiers, set the flag to 10.`)
 		`the number of kustomize features to be listed according to their popularities.
 By default, all the features will be listed.
 If you only want to list the 10 most popular features, set the flag to 10.`)
-	indexNamePtr := flag.String(
-		"index", "kustomize", "The name of the ElasticSearch index.")
 	flag.Parse()
 
 	ctx := context.Background()
-	idx, err := index.NewKustomizeIndex(ctx, *indexNamePtr)
+	idx, err := index.NewKustomizeIndex(ctx)
 	if err != nil {
 		log.Fatalf("Could not create an index: %v\n", err)
 	}
@@ -149,59 +85,35 @@ If you only want to list the 10 most popular features, set the flag to 10.`)
 	// ids tracks the unique IDs of the documents in the index
 	ids := make(map[string]struct{})
 
-	// generatorFiles include all the non-kustomization files whose FileType is generator
-	generatorFiles := make([]*doc.KustomizationDocument, 0)
-
-	// transformersFiles include all the non-kustomization files whose FileType is transformer
-	transformersFiles := make([]*doc.KustomizationDocument, 0)
-
-	checksums := make(map[string]int)
-
 	// get all the documents in the index
 	query := []byte(`{ "query":{ "match_all":{} } }`)
 	it := idx.IterateQuery(query, 10000, 60*time.Second)
 	for it.Next() {
 		for _, hit := range it.Value().Hits.Hits {
-			sum := fmt.Sprintf("%x", sha256.Sum256([]byte(hit.Document.DocumentData)))
-			if _, ok := checksums[sum]; ok {
-				checksums[sum]++
-			} else {
-				checksums[sum] = 1
-			}
-
 			// check whether there is any duplicate IDs in the index
 			if _, ok := ids[hit.ID]; !ok {
 				ids[hit.ID] = struct{}{}
 			} else {
-				log.Printf("Found duplicate ID (%s)\n", hit.ID)
+				fmt.Printf("Found duplicate ID (%s)\n", hit.ID)
 			}
 
 			count++
 			iterateArr(hit.Document.Kinds, kindsMap)
 			iterateArr(hit.Document.Identifiers, identifiersMap)
 
-			if doc.IsKustomizationFile(hit.Document.FilePath) {
+			if isKustomizationFile(hit.Document.FilePath) {
 				kustomizationFilecount++
 				iterateArr(hit.Document.Identifiers, kustomizeIdentifiersMap)
-
-			} else {
-				switch hit.Document.FileType {
-				case "generator":
-					generatorFiles = append(generatorFiles, hit.Document.Copy())
-				case "transformer":
-					transformersFiles = append(transformersFiles, hit.Document.Copy())
-				}
 			}
 		}
 	}
-
 	if err := it.Err(); err != nil {
-		log.Fatalf("Error iterating: %v\n", err)
+		fmt.Printf("Error iterating: %v\n", err)
 	}
 
-	sortedKindsMapKeys := SortMapKeyByValueInt(kindsMap)
-	sortedIdentifiersMapKeys := SortMapKeyByValueInt(identifiersMap)
-	sortedKustomizeIdentifiersMapKeys := SortMapKeyByValueInt(kustomizeIdentifiersMap)
+	sortedKindsMapKeys := SortMapKeyByValue(kindsMap)
+	sortedIdentifiersMapKeys := SortMapKeyByValue(identifiersMap)
+	sortedKustomizeIdentifiersMapKeys := SortMapKeyByValue(kustomizeIdentifiersMap)
 
 	fmt.Printf(`The count of unique document IDs in the kustomize index: %d
 There are %d documents in the kustomize index.
@@ -235,15 +147,4 @@ There are %d documents in the kustomize index.
 			kustomizeFeatureCount++
 		}
 	}
-
-	GeneratorOrTransformerStats(generatorFiles)
-	GeneratorOrTransformerStats(transformersFiles)
-
-	fmt.Printf("There are total %d checksums of document contents\n", len(checksums))
-	sortedChecksums := SortMapKeyByValueInt(checksums)
-	sortedChecksums = sortedChecksums[:20]
-	fmt.Printf("The top 20 checksums are:\n")
-	for _, key := range sortedChecksums {
-		fmt.Printf("checksum %s apprears %d\n", key, checksums[key])
-	}
 }

api/internal/crawl/cmd/log-parser/kustomize-stats-cmd

@@ -1,7 +0,0 @@
-wget <log-file-url> -O log
-go build .
-./log-parser log >out
-cat out | grep "kind \`" | cut -d\` -f2 | tail -n 50
-cat out | grep "kind \`" | awk '{print $6}' | tail -n 50
-cat out | grep "feature \`" | grep -v "\`resources\`" | grep -v -e "\`apiVersion\`" | grep -v -e "\`apiversion\`" | cut -d\` -f2
-cat out | grep "feature \`" | grep -v "\`resources\`" | grep -v -e "\`apiVersion\`" | grep -v -e "\`apiversion\`" | awk '{print $6}'

api/internal/crawl/config/crawler/base/.gitignore

@@ -1 +0,0 @@
-github_api_secret.txt

api/internal/crawl/config/crawler/cronjob/cronjob.yaml

@@ -1,10 +1,9 @@
 apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
-  name: crawler-cronjob
+  name: crawler
 spec:
-  # run the cronjob at 00:00 every 7 days
-  schedule: "0 0 */7 * *"
+  schedule: "5 0 * * */1"
   jobTemplate:
     spec:
       template:
@@ -12,9 +11,7 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: crawler
-            image: gcr.io/haiyanmeng-gke-dev/crawler:v1
-            command: ["/crawler"]
-            args: ["--mode=index+github", "--github-repo=kubernetes-sigs/kustomize", "--index=kustomize"]
+            image: gcr.io/kustomize-search/crawler:latest
             imagePullPolicy: Always
             env:
             - name: GITHUB_ACCESS_TOKEN

api/internal/crawl/config/crawler/kustomize_stats/job.yaml

@@ -11,7 +11,7 @@ spec:
         image: gcr.io/haiyanmeng-gke-dev/kustomize_stats:v1
         imagePullPolicy: Always
         command: ["/kustomize_stats"]
-        args: ["--index=kustomize", "--kinds=51", "--identifiers=50", "--kustomize-features=50"]
+        args: ["--kinds=50", "--identifiers=50", "--kustomize-features=50"]
         env:
         - name: ELASTICSEARCH_URL
           valueFrom:

api/internal/crawl/config/elastic/esbackup.yaml

@@ -1,23 +0,0 @@
-# ESBackup depends on ESCluster, and is depended by ESSnapshot.
-# Creating `esbackup/kustomize-backbup` will create the `kustomize-backup` snapshot repository.
-# Deleting `esbackup/kustomize-backbup` will delete the `kustomize-backup` snapshot repository.
-# Deleting `esbackup/kustomize-backbup` will NOT delete the snapshots in the `kustomize-backup` snapshot repository, instead makes all the snapshots in the repository inaccessible.
-# Deleting `esbackup/kustomize-backbup` will NOT delete the essnapshot objects depending on it, but will cause those essnapshot objects to be reconciled, which update the status of the essnapshot objects to reflect the fact that the esbackup object is missing.
-# If you delete the `kustomize-backup` snapshot repository directly without deleting `esbackup/kustomize-backbup`, the ESBackup object will not recreate the snapshot repository.
-apiVersion: elasticsearch.cloud.google.com/v1alpha1
-kind: ESBackup
-metadata:
-  name: kustomize-backup
-spec:
-  storage:
-    gcs:
-      # the bucket must exist for the snapshot respository to be created successfully.
-      bucket: kustomize-backup
-      # the path does not need to exist.
-      # If the path does not exist, the controller will create the folder in the GCS bucket.
-      # If the path already exists and includes snapshots, these snapshots can be used.
-      path: kustomize
-      secret:
-        name: kustomizesa
-  escluster:
-    name: esbasic

api/internal/crawl/config/elastic/escluster.yaml

@@ -1,4 +1,3 @@
-# ESCluster is depended by ESBackup and ESRestore.
 apiVersion: elasticsearch.cloud.google.com/v1alpha1
 kind: ESCluster
 metadata:
@@ -9,13 +8,6 @@ spec:
     - repository-gcs
     - ingest-user-agent
     - ingest-geoip
-  # To set `gcpserviceaccount`,
-  # First, create and download a GCP service account into a json file, named `sakey.json` following the instruction:
-  #     https://www.elastic.co/guide/en/elasticsearch/plugins/6.5/repository-gcs-usage.html#repository-gcs-using-service-account
-  # Second, create a secret for the service account using the following command:
-  #     $ kubectl create secret generic kustomizesa --from-file=./sakey.json
-  gcpserviceaccount:
-    name: kustomizesa
   config:
     env:
       example: test

api/internal/crawl/config/elastic/esrestore.yaml

@@ -1,19 +0,0 @@
-# ESRestore depends on both ESCluster and ESSnapshot.
-# Creating `esrestore/kustomize-restore` will restore the `kuostmize` index in the `kustomize-snapshot` snapshot to a new index named `kusotmize-restore`.
-# Deleting `esrestore/kustomize-restore` will not delete the restored index.
-# Deleting `esrestore/kustomize-restore` should happen before deleting `essnapshot/kustomize-snapshot`.
-# After the restore is complete, if the `kusotmize-restore` index is deleted manually, the ESRestore object will NOT restore the `kustomize` index to it again.
-# The correct way of using ESRestore is: create a ESRestore object to restore the index; delete the ESRestore object after the restore is complete.
-apiVersion: elasticsearch.cloud.google.com/v1alpha1
-kind: ESRestore
-metadata:
-  name: kustomize-restore
-spec:
-  include_global_state: true
-  ignore_unavailable: true
-  rename_pattern: kustomize
-  rename_replacement: kustomize-restore
-  essnapshot:
-    name: kustomize-snapshot
-  escluster:
-    name: esbasic

api/internal/crawl/config/elastic/essnapshot.yaml

@@ -1,23 +0,0 @@
-# ESSnapshot depends on ESBackup, and is depended by ESRestore.
-# Creating `essnapshot/kustomize-snapshot` will create a snapshot named `kustomize-snapshot` in the `kustomize-backup` snapshot repository.
-# After being created, the `kustomize-snapshot` snapshot will not be automatically updated when the `kuostomize` index is updated.
-# If you delete `essnapshot/kustomize-snapshot` and recreate it, the new snapshot will capture the current status of the `kustomize` index.
-# Deleting `essnapshot/kustomize-snapshot` will delete the snapshot.
-# Deleting `essnapshot/kustomize-snapshot` should happen before deleting `esbackup/kustomize-backup`.
-# If the `kustomize-snapshot` snapshot is deleted directly without deleting `essnapshot/kustomize-snapshot`, the ESSnapshot object will recreate the snapshot.
-# The correct way of using ESSnapshot is: create an ESSnapshot object to create a snapshot, keep the ESSnapshot object until the snapshot is no longer needed.
-# To update the snapshot to capture the latest version of the index, you can either:
-#   1) delete the snapshot, and wait for the ESSnapshot object to recreate the snapshot;
-#   2) delete the ESSnapshot object, and recreate the ESSnapshot object.
-apiVersion: elasticsearch.cloud.google.com/v1alpha1
-kind: ESSnapshot
-metadata:
-  name: kustomize-snapshot
-spec:
-  # indices are optional. If not specified all indices are selected.
-  indices:
-  - kustomize
-  include_global_state: true
-  ignore_unavailable: true
-  esbackup:
-    name: kustomize-backup

api/internal/crawl/crawler/crawler.go

@@ -10,8 +10,6 @@ import (
 	"os"
 	"sync"
 
-	"sigs.k8s.io/kustomize/api/internal/crawl/utils"
-
 	"sigs.k8s.io/kustomize/api/internal/crawl/index"
 
 	_ "github.com/gomodule/redigo/redis"
@@ -31,15 +29,13 @@ type Crawler interface {
 	// Crawl returns when it is done processing. This method does not take
 	// ownership of the channel. The channel is write only, and it
 	// designates where the crawler should forward the documents.
-	Crawl(ctx context.Context, output chan<- CrawledDocument, seen utils.SeenMap) error
+	Crawl(ctx context.Context, output chan<- CrawledDocument, seen SeenMap) error
 
 	// Get the document data given the FilePath, Repo, and Ref/Tag/Branch.
 	FetchDocument(context.Context, *doc.Document) error
 	// Write to the document what the created time is.
 	SetCreated(context.Context, *doc.Document) error
 
-	SetDefaultBranch(*doc.Document)
-
 	Match(*doc.Document) bool
 }
 
@@ -47,15 +43,25 @@ type CrawledDocument interface {
 	ID() string
 	GetDocument() *doc.Document
 	// Get all the Documents directly referred in a Document.
-	// For a Document representing a non-kustomization file, an empty slice will be returned.
-	// For a Document representing a kustomization file:
-	// the `includeResources` parameter determines whether the documents referred in the `resources` field are returned or not;
-	// the `includeTransformers` parameter determines whether the documents referred in the `transformers` field are returned or not;
-	// the `includeGenerators` parameter determines whether the documents referred in the `generators` field are returned or not.
-	GetResources(includeResources, includeTransformers, includeGenerators bool) ([]*doc.Document, error)
+	GetResources() ([]*doc.Document, error)
 	WasCached() bool
 }
 
+type SeenMap map[string]struct{}
+
+func (seen SeenMap) Seen(item string) bool {
+	_, ok := seen[item]
+	return ok
+}
+
+func (seen SeenMap) Add(item string) {
+	seen[item] = struct{}{}
+}
+
+func NewSeenMap() SeenMap {
+	return make(map[string]struct{})
+}
+
 type CrawlSeed []*doc.Document
 
 type IndexFunc func(CrawledDocument, index.Mode) error
@@ -78,27 +84,25 @@ func findMatch(d *doc.Document, crawlers []Crawler) Crawler {
 }
 
 func addBranches(cdoc CrawledDocument, match Crawler, indx IndexFunc,
-	seen utils.SeenMap, stack *CrawlSeed) {
+	seen SeenMap, stack *CrawlSeed) {
 
-	seen.Set(cdoc.ID(), cdoc.GetDocument().FileType)
-
-	match.SetDefaultBranch(cdoc.GetDocument())
+	seen.Add(cdoc.ID())
 
 	// Insert into index
 	if err := indx(cdoc, index.InsertOrUpdate); err != nil {
-		logger.Printf("Failed to insert or update doc(%s): %v",
-			cdoc.GetDocument().Path(), err)
+		logger.Printf("Failed to insert or update %s %s: %v",
+			cdoc.GetDocument().RepositoryURL, cdoc.GetDocument().FilePath, err)
 		return
 	}
 
-	deps, err := cdoc.GetResources(true, true, true)
+	deps, err := cdoc.GetResources()
 	if err != nil {
 		logger.Println(err)
 		return
 	}
 
 	for _, dep := range deps {
-		if seen.Seen(dep.ID()) && seen.Value(dep.ID()) == dep.FileType {
+		if seen.Seen(dep.ID()) {
 			continue
 		}
 		*stack = append(*stack, dep)
@@ -106,7 +110,7 @@ func addBranches(cdoc CrawledDocument, match Crawler, indx IndexFunc,
 }
 
 func doCrawl(ctx context.Context, docsPtr *CrawlSeed, crawlers []Crawler, conv Converter, indx IndexFunc,
-	seen utils.SeenMap, stack *CrawlSeed, refreshDoc bool, updateFileType bool) {
+	seen SeenMap, stack *CrawlSeed) {
 
 	UpdatedDocCount := 0
 	seenDocCount := 0
@@ -127,18 +131,16 @@ func doCrawl(ctx context.Context, docsPtr *CrawlSeed, crawlers []Crawler, conv C
 		*docsPtr = (*docsPtr)[:(len(*docsPtr) - 1)]
 
 		crawledDocCount++
-		logger.Printf("Crawling doc %d: %s", crawledDocCount, tail.Path())
+		logger.Printf("Crawling doc %d: %s %s", crawledDocCount, tail.RepositoryURL, tail.FilePath)
 
 		if seen.Seen(tail.ID()) {
-			if !updateFileType || seen.Value(tail.ID()) == tail.FileType {
-				logger.Printf("this doc has been seen before")
-				seenDocCount++
-				continue
-			}
+			logger.Printf("this doc has been seen before")
+			seenDocCount++
+			continue
 		}
 
 		if tail.WasCached() {
-			logger.Printf("doc(%s) is cached already", tail.Path())
+			logger.Printf("%s %s is cached already", tail.RepositoryURL, tail.FilePath)
 			cachedDocCount++
 			continue
 		}
@@ -150,10 +152,6 @@ func doCrawl(ctx context.Context, docsPtr *CrawlSeed, crawlers []Crawler, conv C
 			continue
 		}
 
-		if tail.User == "" {
-			tail.User = doc.UserName(tail.RepositoryURL)
-		}
-
 		// If the Document represents a kustomization root, FetchDcoument will change
 		// the `filePath` field of the Document by adding `kustomization.yaml` or
 		// `kustomization.yml` or `kustomization` into the the field.
@@ -161,41 +159,38 @@ func doCrawl(ctx context.Context, docsPtr *CrawlSeed, crawlers []Crawler, conv C
 		// calling FetchDocument. Otherwise, the binary may enter into an infinite loop
 		// if a kustomization file points to its kustmozation root in its `resources` or
 		// `bases` field.
-		seen.Set(tail.ID(), tail.FileType)
+		seen.Add(tail.ID())
 
-		if refreshDoc || tail.DefaultBranch == "" {
-			match.SetDefaultBranch(tail)
+
+		if err := match.FetchDocument(ctx, tail); err != nil {
+			logger.Printf("FetchDocument failed on %s %s: %v",
+				tail.RepositoryURL, tail.FilePath, err)
+			FetchDocumentErrCount++
+			// delete the document from the index
+			cdoc := &doc.KustomizationDocument{
+				Document: *tail,
+			}
+			seen.Add(cdoc.ID())
+			if err := indx(cdoc, index.Delete); err != nil {
+				logger.Printf("Failed to delete %s %s: %v",
+					cdoc.RepositoryURL, cdoc.FilePath, err)
+			}
+			deleteDocCount++
+			continue
 		}
 
-		if refreshDoc || tail.DocumentData == "" {
-			if err := match.FetchDocument(ctx, tail); err != nil {
-				logger.Printf("FetchDocument failed on doc(%s): %v", tail.Path(), err)
-				FetchDocumentErrCount++
-				// delete the document from the index
-				cdoc := &doc.KustomizationDocument{
-					Document: *tail,
-				}
-				seen.Set(cdoc.ID(), tail.FileType)
-				if err := indx(cdoc, index.Delete); err != nil {
-					logger.Printf("Failed to delete doc(%s): %v", cdoc.Path(), err)
-				}
-				deleteDocCount++
-				continue
-			}
-		}
-
-		if refreshDoc || tail.CreationTime == nil {
-			if err := match.SetCreated(ctx, tail); err != nil {
-				logger.Printf("SetCreated failed on doc(%s): %v", tail.Path(), err)
-				SetCreatedErrCount++
-			}
+		if err := match.SetCreated(ctx, tail); err != nil {
+			logger.Printf("SetCreated failed on %s %s: %v",
+				tail.RepositoryURL, tail.FilePath, err)
+			SetCreatedErrCount++
 		}
 
 		cdoc, err := conv(tail)
 		// If conv returns an error, cdoc can still be added into the index so that
 		// cdoc.Document can be searched.
 		if err != nil {
-			logger.Printf("conv failed on doc(%s): %v", tail.Path(), err)
+			logger.Printf("conv failed on %s %s: %v",
+				tail.RepositoryURL, tail.FilePath, err)
 			convErrCount++
 		}
 
@@ -216,7 +211,7 @@ func doCrawl(ctx context.Context, docsPtr *CrawlSeed, crawlers []Crawler, conv C
 // CrawlFromSeed updates all the documents in seed, and crawls all the new
 // documents referred in the seed.
 func CrawlFromSeed(ctx context.Context, seed CrawlSeed, crawlers []Crawler,
-	conv Converter, indx IndexFunc, seen utils.SeenMap) {
+	conv Converter, indx IndexFunc, seen SeenMap) {
 
 	// stack tracks the documents directly referred in other documents.
 	stack := make(CrawlSeed, 0)
@@ -224,14 +219,14 @@ func CrawlFromSeed(ctx context.Context, seed CrawlSeed, crawlers []Crawler,
 	// Exploit seed to update bulk of corpus.
 	logger.Printf("updating %d documents from seed\n", len(seed))
 	// each unique document in seed will be crawled once.
-	doCrawl(ctx, &seed, crawlers, conv, indx, seen, &stack, true, false)
+	doCrawl(ctx, &seed, crawlers, conv, indx, seen, &stack)
 
 	// Traverse any new documents added while updating corpus.
 	logger.Printf("crawling %d new documents found in the seed\n", len(stack))
 	// While crawling each document in stack, the documents directly referred in the document
 	// will be added into stack.
 	// After this statement is done, stack will become empty.
-	doCrawl(ctx, &stack, crawlers, conv, indx, seen, &stack, false, true)
+	doCrawl(ctx, &stack, crawlers, conv, indx, seen, &stack)
 }
 
 // CrawlGithubRunner is a blocking function and only returns once all of the
@@ -252,7 +247,7 @@ func CrawlFromSeed(ctx context.Context, seed CrawlSeed, crawlers []Crawler,
 // from the seed will be processed before any other documents from the
 // crawlers.
 func CrawlGithubRunner(ctx context.Context, output chan<- CrawledDocument,
-	crawlers []Crawler, seen utils.SeenMap) []error {
+	crawlers []Crawler, seen SeenMap) []error {
 
 	errs := make([]error, len(crawlers))
 	wg := sync.WaitGroup{}
@@ -296,7 +291,7 @@ func CrawlGithubRunner(ctx context.Context, output chan<- CrawledDocument,
 
 // CrawlGithub crawls all the kustomization files on Github.
 func CrawlGithub(ctx context.Context, crawlers []Crawler, conv Converter,
-	indx IndexFunc, seen utils.SeenMap) {
+	indx IndexFunc, seen SeenMap) {
 	// stack tracks the documents directly referred in other documents.
 	stack := make(CrawlSeed, 0)
 
@@ -312,8 +307,6 @@ func CrawlGithub(ctx context.Context, crawlers []Crawler, conv Converter,
 		for cdoc := range ch {
 			docCount++
 			logger.Printf("Processing doc %d found on Github", docCount)
-			// all the docs here are kustomization files found by querying Github, and
-			// their `FileType` fields all should be empty.
 			if seen.Seen(cdoc.ID()) {
 				logger.Printf("the doc has been seen before")
 				continue
@@ -340,5 +333,5 @@ func CrawlGithub(ctx context.Context, crawlers []Crawler, conv Converter,
 	// Handle deps of newly discovered documents.
 	logger.Printf("crawling the %d new documents referred by other documents",
 		len(stack))
-	doCrawl(ctx, &stack, crawlers, conv, indx, seen, &stack, false, true)
+	doCrawl(ctx, &stack, crawlers, conv, indx, seen, &stack)
 }

api/internal/crawl/crawler/crawler_test.go

@@ -12,8 +12,6 @@ import (
 	"testing"
 	"time"
 
-	"sigs.k8s.io/kustomize/api/internal/crawl/utils"
-
 	"sigs.k8s.io/kustomize/api/internal/crawl/index"
 
 	"sigs.k8s.io/kustomize/api/internal/crawl/doc"
@@ -37,8 +35,6 @@ func (c testCrawler) Match(d *doc.Document) bool {
 	return d != nil
 }
 
-func (c testCrawler) SetDefaultBranch(d *doc.Document) {}
-
 func (c testCrawler) FetchDocument(_ context.Context, d *doc.Document) error {
 	if i, ok := c.lukp[d.ID()]; ok {
 		d.DocumentData = c.docs[i].DocumentData
@@ -80,7 +76,7 @@ func newCrawler(matchPrefix string, err error,
 
 // Crawl implements the Crawler interface for testing.
 func (c testCrawler) Crawl(_ context.Context,
-	output chan<- CrawledDocument, _ utils.SeenMap) error {
+	output chan<- CrawledDocument, _ SeenMap) error {
 
 	for i, d := range c.docs {
 		isResource := true
@@ -186,7 +182,7 @@ func TestCrawlGithubRunner(t *testing.T) {
 			defer close(output)
 			defer wg.Done()
 
-			seen := utils.NewSeenMap()
+			seen := NewSeenMap()
 			errs := CrawlGithubRunner(context.Background(),
 				output, test.tc, seen)
 
@@ -328,7 +324,7 @@ resources:
 				visited[d.ID()]++
 				return nil
 			},
-			utils.NewSeenMap(),
+			NewSeenMap(),
 		)
 		if lv, lc := len(visited), len(tc.corpus); lv != lc {
 			t.Errorf("error: %d of %d documents visited.", lv, lc)

api/internal/crawl/crawler/github/crawler.go

@@ -16,8 +16,6 @@ import (
 	"strings"
 	"time"
 
-	"sigs.k8s.io/kustomize/api/internal/crawl/utils"
-
 	"sigs.k8s.io/kustomize/api/internal/crawl/crawler"
 	"sigs.k8s.io/kustomize/api/internal/crawl/doc"
 	"sigs.k8s.io/kustomize/api/internal/crawl/httpclient"
@@ -60,16 +58,8 @@ func NewCrawler(accessToken string, retryCount uint64, client *http.Client,
 	}
 }
 
-func (gc githubCrawler) SetDefaultBranch(d *doc.Document) {
-	url := gc.client.ReposRequest(d.RepositoryFullName())
-	defaultBranch, err := gc.client.GetDefaultBranch(url, d.RepositoryURL, gc.branchMap)
-	if err != nil {
-		logger.Printf(
-			"(error: %v) setting default_branch to master\n", err)
-		defaultBranch = "master"
-	}
-	d.DefaultBranch = defaultBranch
-	gc.branchMap[d.RepositoryURL] = d.DefaultBranch
+func (gc githubCrawler) SetDefaultBranch(repo, branch string) {
+	gc.branchMap[repo] = branch
 }
 
 func (gc githubCrawler) DefaultBranch(repo string) string {
@@ -78,37 +68,7 @@ func (gc githubCrawler) DefaultBranch(repo string) string {
 
 // Implements crawler.Crawler.
 func (gc githubCrawler) Crawl(ctx context.Context,
-	output chan<- crawler.CrawledDocument, seen utils.SeenMap) error {
-
-	ranges := []RangeWithin{
-		RangeWithin{
-		start: uint64(0),
-		end:   githubMaxFileSize,
-	},
-	}
-
-	errs := make(multiError, 0)
-	for len(ranges) > 0 {
-		tailRange := ranges[len(ranges) - 1]
-		ranges = ranges[:(len(ranges) - 1)]
-		reProcessQueryRanges, err := gc.CrawlSingleRange(ctx, output, seen, tailRange.start, tailRange.end)
-		if err != nil {
-			errs = append(errs, err)
-		}
-		ranges = append(ranges, reProcessQueryRanges...)
-	}
-
-	if len(errs) > 0 {
-		return errs
-	}
-	return nil
-}
-
-func (gc githubCrawler) CrawlSingleRange(ctx context.Context,
-	output chan<- crawler.CrawledDocument, seen utils.SeenMap,
-	lowerBound, upperBound uint64) ([]RangeWithin, error) {
-
-	log.Printf("CrawlSingleRange [%d, %d]", lowerBound, upperBound)
+	output chan<- crawler.CrawledDocument, seen crawler.SeenMap) error {
 
 	noETagClient := GhClient{
 		RequestConfig: gc.client.RequestConfig,
@@ -117,25 +77,12 @@ func (gc githubCrawler) CrawlSingleRange(ctx context.Context,
 		accessToken:   gc.client.accessToken,
 	}
 
-	var reProcessQueryRanges []RangeWithin
-
-	var ranges []string
-	var err error
 	// Since Github returns a max of 1000 results per query, we can use
 	// multiple queries that split the search space into chunks of at most
 	// 1000 files to get all of the data.
-	for i := 0; i < 5; i++ {
-		ranges, err = FindRangesForRepoSearch(newCache(noETagClient, gc.query),
-			lowerBound, upperBound)
-		if err == nil {
-			logger.Printf("FindRangesForRepoSearch succeeded after %d retries", i)
-			break
-		} else {
-			time.Sleep(time.Minute)
-		}
-	}
+	ranges, err := FindRangesForRepoSearch(newCache(noETagClient, gc.query))
 	if err != nil {
-		return reProcessQueryRanges, fmt.Errorf("could not split %v into ranges, %v\n",
+		return fmt.Errorf("could not split %v into ranges, %v\n",
 			gc.query, err)
 	}
 
@@ -145,29 +92,39 @@ func (gc githubCrawler) CrawlSingleRange(ctx context.Context,
 	errs := make(multiError, 0)
 	queryResult := RangeQueryResult{}
 	for _, query := range ranges {
-		reProcessQuery, rangeResult, err := processQuery(ctx, gc.client, query, output, seen, gc.branchMap)
+		rangeResult, err := processQuery(ctx, gc.client, query, output, seen, gc.branchMap)
 		if err != nil {
 			errs = append(errs, err)
 		}
 		queryResult.Add(rangeResult)
-		if reProcessQuery {
-			reProcessQueryRanges = append(reProcessQueryRanges, RangeSizes(query))
-		}
 	}
 
 	logger.Printf("Summary of Crawl: %s", queryResult.String())
 
 	if len(errs) > 0 {
-		return reProcessQueryRanges, errs
+		return errs
 	}
 
-	return reProcessQueryRanges, nil
+	return nil
 }
 
 // FetchDocument first tries to fetch the document with d.FilePath. If it fails,
 // it will try to add each string in konfig.RecognizedKustomizationFileNames() to
 // d.FilePath, and try to fetch the document again.
 func (gc githubCrawler) FetchDocument(_ context.Context, d *doc.Document) error {
+	// set the default branch if it is empty
+	if d.DefaultBranch == "" {
+		url := gc.client.ReposRequest(d.RepositoryFullName())
+		defaultBranch, err := gc.client.GetDefaultBranch(url, d.RepositoryURL, gc.branchMap)
+		if err != nil {
+			logger.Printf(
+				"(error: %v) setting default_branch to master\n", err)
+			defaultBranch = "master"
+		}
+		d.DefaultBranch = defaultBranch
+	}
+	gc.SetDefaultBranch(d.RepositoryURL, d.DefaultBranch)
+
 	repoURL := d.RepositoryURL + "/" + d.FilePath + "?ref=" + d.DefaultBranch
 	repoSpec, err := git.NewRepoSpecFromUrl(repoURL)
 	if err != nil {
@@ -238,9 +195,9 @@ func (gc githubCrawler) Match(d *doc.Document) bool {
 
 type RangeQueryResult struct {
 	totalDocCnt uint64
-	seenDocCnt  uint64
-	newDocCnt   uint64
-	errorCnt    uint64
+	seenDocCnt   uint64
+	newDocCnt uint64
+	errorCnt  uint64
 }
 
 func (r *RangeQueryResult) Add(other RangeQueryResult) {
@@ -252,7 +209,7 @@ func (r *RangeQueryResult) Add(other RangeQueryResult) {
 
 func (r *RangeQueryResult) String() string {
 	return fmt.Sprintf("got %d files from API. "+
-		"%d have been seen before. %d are new and sent to the output channel."+
+		"%d have been seen before. %d are new and sent to the output channel." +
 		" %d have kustomizationResultAdapter errors.",
 		r.totalDocCnt, r.seenDocCnt, r.newDocCnt, r.errorCnt)
 }
@@ -260,8 +217,8 @@ func (r *RangeQueryResult) String() string {
 // processQuery follows all of the pages in a query, and updates/adds the
 // documents from the crawl to the datastore/index.
 func processQuery(ctx context.Context, gcl GhClient, query string,
-	output chan<- crawler.CrawledDocument, seen utils.SeenMap,
-	branchMap map[string]string) (bool, RangeQueryResult, error) {
+	output chan<- crawler.CrawledDocument, seen crawler.SeenMap,
+	branchMap map[string]string) (RangeQueryResult, error) {
 
 	queryPages := make(chan GhResponseInfo)
 
@@ -277,8 +234,6 @@ func processQuery(ctx context.Context, gcl GhClient, query string,
 		close(queryPages)
 	}()
 
-	reProcessQuery := false
-
 	errs := make(multiError, 0)
 	result := RangeQueryResult{}
 	pageID := 1
@@ -309,18 +264,14 @@ func processQuery(ctx context.Context, gcl GhClient, query string,
 		result.Add(pageResult)
 
 		pageID++
-
-		if page.Parsed.TotalCount > githubMaxResultsPerQuery {
-			reProcessQuery = true
-		}
 	}
 
 	logger.Printf("Summary of processQuery: %s", result.String())
 
-	return reProcessQuery, result, errs
+	return result, errs
 }
 
-func kustomizationResultAdapter(gcl GhClient, k GhFileSpec, seen utils.SeenMap,
+func kustomizationResultAdapter(gcl GhClient, k GhFileSpec, seen crawler.SeenMap,
 	branchMap map[string]string) (crawler.CrawledDocument, error) {
 	url := gcl.ReposRequest(k.Repository.FullName)
 	defaultBranch, err := gcl.GetDefaultBranch(url, k.Repository.URL, branchMap)
@@ -330,13 +281,10 @@ func kustomizationResultAdapter(gcl GhClient, k GhFileSpec, seen utils.SeenMap,
 		defaultBranch = "master"
 	}
 
-	// document here is a kustomization file found by querying Github, whose
-	// `FileType` field should be empty.
 	document := doc.Document{
 		FilePath:      k.Path,
 		DefaultBranch: defaultBranch,
 		RepositoryURL: k.Repository.URL,
-		User:          doc.UserName(k.Repository.URL),
 	}
 
 	if seen.Seen(document.ID()) {
@@ -354,7 +302,6 @@ func kustomizationResultAdapter(gcl GhClient, k GhFileSpec, seen utils.SeenMap,
 			FilePath:      k.Path,
 			DefaultBranch: defaultBranch,
 			RepositoryURL: k.Repository.URL,
-			User:          doc.UserName(k.Repository.URL),
 		},
 	}
 	creationTime, err := gcl.GetFileCreationTime(k)
@@ -379,7 +326,7 @@ func (gcl GhClient) ForwardPaginatedQuery(ctx context.Context, query string,
 	output chan<- GhResponseInfo) error {
 
 	logger.Println("querying: ", query)
-	response := gcl.parseGithubResponseWithRetry(query)
+	response := gcl.parseGithubResponse(query)
 
 	if response.Error != nil {
 		return response.Error
@@ -392,7 +339,7 @@ func (gcl GhClient) ForwardPaginatedQuery(ctx context.Context, query string,
 		case <-ctx.Done():
 			return nil
 		default:
-			response = gcl.parseGithubResponseWithRetry(response.NextURL)
+			response = gcl.parseGithubResponse(response.NextURL)
 			if response.Error != nil {
 				return response.Error
 			}
@@ -587,8 +534,6 @@ type githubResponse struct {
 	// This is the number of files that match the query.
 	TotalCount uint64 `json:"total_count,omitempty"`
 
-	IncompleteResults bool `json:"incomplete_results,omitempty"`
-
 	// Github representation of a file.
 	Items []GhFileSpec `json:"items,omitempty"`
 }
@@ -631,17 +576,6 @@ func parseGithubLinkFormat(links string) (string, string) {
 	return next, last
 }
 
-func (gcl GhClient) parseGithubResponseWithRetry(getRequest string) GhResponseInfo {
-	resp := gcl.parseGithubResponse(getRequest)
-	retries := 0
-	for resp.Parsed.IncompleteResults {
-		resp = gcl.parseGithubResponse(getRequest)
-		retries++
-	}
-	log.Printf("The result of query(%s) is complete after %d retries", getRequest, retries)
-	return resp
-}
-
 func (gcl GhClient) parseGithubResponse(getRequest string) GhResponseInfo {
 	resp, err := gcl.SearchGithubAPI(getRequest)
 	requestInfo := GhResponseInfo{

api/internal/crawl/crawler/github/queries.go

@@ -117,7 +117,7 @@ type RequestConfig struct {
 // understand why the request object is useful.
 func (rc RequestConfig) CodeSearchRequestWith(query Query) request {
 	vals := url.Values{
-		"sort":  []string{"indexed"},
+		"sort": []string{"indexed"},
 		"order": []string{"desc"},
 	}
 	req := rc.makeRequest("search/code", query, vals)
@@ -166,7 +166,7 @@ type request struct {
 	query Query
 }
 
-// CopyWith copies the requests and adds the extra query parameters. It is useful
+// CopyWith copies the requests and adds the extra query parameters. Usefull
 // for dynamically adding sizes to a filename only query without modifying it.
 func (r request) CopyWith(queryParams ...queryField) request {
 	cpy := r

api/internal/crawl/crawler/github/split_search_ranges.go

@@ -93,15 +93,13 @@ package github
 //   apiCallsPerResult * 10(pages) * 100(resultsPerPage) * totalResults / 1000
 //   = apiCallsPerResult * totalResults.
 //
-// So it could very well take apiCallsPerResult * 50 times longer to actually
+// So it could very well take apiCallsPerResult * 50 times longer to acutally
 // fetch the results (assuming the quotas for the API calls are the same as the
 // search API), than it does to perform these range searches.
 
 import (
 	"fmt"
 	"math/bits"
-	"strconv"
-	"strings"
 )
 
 // Files cannot be more than 2^19 bytes, according to
@@ -114,7 +112,7 @@ const (
 // Interface instead of struct for testing purposes.
 // Not expecting to have multiple implementations.
 type cachedSearch interface {
-	CountResults(uint64, uint64) (uint64, error)
+	CountResults(uint64) (uint64, error)
 	RequestString(filesize rangeFormatter) string
 }
 
@@ -141,7 +139,7 @@ type cachedSearch interface {
 //    problematic). The current cache implementation looks at the
 //    predecessor entry to find out if the current value is monotonic.
 //    This is where the bit trick is used, since each step in the binary
-//    search is adding or omitting to add a decreasing power of 2 to the query
+//    search is adding or ommiting to add a decreasing power of 2 to the query
 //    value, we can remove the least significant set bit to find the
 //    predecessor in constant time. Ultimately since the search is rate
 //    limited, we could also easily afford to compute this in linear time
@@ -163,16 +161,16 @@ func newCache(client GhClient, query Query) githubCachedSearch {
 	}
 }
 
-func (c githubCachedSearch) CountResults(lowerBound, upperBound uint64) (uint64, error) {
+func (c githubCachedSearch) CountResults(upperBound uint64) (uint64, error) {
 	count, cached := c.cache[upperBound]
 	if cached {
 		return count, nil
 	}
 
-	sizeRange := RangeWithin{lowerBound, upperBound}
+	sizeRange := RangeWithin{0, upperBound}
 	rangeRequest := c.RequestString(sizeRange)
 
-	result := c.gcl.parseGithubResponseWithRetry(rangeRequest)
+	result := c.gcl.parseGithubResponse(rangeRequest)
 	if result.Error != nil {
 		return count, result.Error
 	}
@@ -206,7 +204,7 @@ func (c githubCachedSearch) CountResults(lowerBound, upperBound uint64) (uint64,
 			"Retrying query... current lower bound: %d, got: %d\n",
 			c.cache[prev], result.Parsed.TotalCount)
 
-		result = c.gcl.parseGithubResponseWithRetry(rangeRequest)
+		result = c.gcl.parseGithubResponse(rangeRequest)
 		if result.Error != nil {
 			return count, result.Error
 		}
@@ -221,8 +219,8 @@ func (c githubCachedSearch) CountResults(lowerBound, upperBound uint64) (uint64,
 	}
 
 	count = result.Parsed.TotalCount
-	logger.Printf("Caching new query %s, with count %d (incomplete_results: %v)\n",
-		sizeRange.RangeString(), count, result.Parsed.IncompleteResults)
+	logger.Printf("Caching new query %s, with count %d\n",
+		sizeRange.RangeString(), count)
 	c.cache[upperBound] = count
 	return count, nil
 }
@@ -240,8 +238,8 @@ func (c githubCachedSearch) RequestString(filesize rangeFormatter) string {
 // This would mean that the search as it is could not find all files. If queries
 // are sorted by last indexed, and retrieved on regular intervals, it should be
 // sufficient to get most if not all documents.
-func FindRangesForRepoSearch(cache cachedSearch, lowerBound, upperBound uint64) ([]string, error) {
-	totalFiles, err := cache.CountResults(lowerBound, upperBound)
+func FindRangesForRepoSearch(cache cachedSearch) ([]string, error) {
+	totalFiles, err := cache.CountResults(githubMaxFileSize)
 	if err != nil {
 		return nil, err
 	}
@@ -249,7 +247,7 @@ func FindRangesForRepoSearch(cache cachedSearch, lowerBound, upperBound uint64)
 
 	if githubMaxResultsPerQuery >= totalFiles {
 		return []string{
-			cache.RequestString(RangeWithin{lowerBound, upperBound}),
+			cache.RequestString(RangeWithin{0, githubMaxFileSize}),
 		}, nil
 	}
 
@@ -277,7 +275,6 @@ func FindRangesForRepoSearch(cache cachedSearch, lowerBound, upperBound uint64)
 	// range.
 	filesAccessible := uint64(0)
 	sizes := make([]uint64, 0)
-	sizes = append(sizes, lowerBound)
 	for filesAccessible < totalFiles {
 		target := filesAccessible + githubMaxResultsPerQuery
 		if target >= totalFiles {
@@ -287,22 +284,22 @@ func FindRangesForRepoSearch(cache cachedSearch, lowerBound, upperBound uint64)
 		logger.Printf("%d accessible files, next target = %d\n",
 			filesAccessible, target)
 
-		size, err := FindFileSize(cache, target, lowerBound, upperBound)
+		cur, err := lowerBoundFileCount(cache, target)
 		if err != nil {
 			return nil, err
 		}
 
 		// If there are more than 1000 files in the next bucket, we must
 		// advance anyway and lose out on some files :(.
-		if l := len(sizes); l > 0 && sizes[l-1] == size {
-			size++
+		if l := len(sizes); l > 0 && sizes[l-1] == cur {
+			cur++
 		}
 
-		nextAccessible, err := cache.CountResults(lowerBound, size)
+		nextAccessible, err := cache.CountResults(cur)
 		if err != nil {
 			return nil, fmt.Errorf(
 				"cache should be populated at %d already, got %v",
-				size, err)
+				cur, err)
 		}
 		if nextAccessible < filesAccessible {
 			return nil, fmt.Errorf(
@@ -312,31 +309,31 @@ func FindRangesForRepoSearch(cache cachedSearch, lowerBound, upperBound uint64)
 
 		filesAccessible = nextAccessible
 		if nextAccessible < totalFiles {
-			sizes = append(sizes, size)
+			sizes = append(sizes, cur)
 		}
 	}
-	sizes = append(sizes, upperBound)
+
 	return formatFilesizeRanges(cache, sizes), nil
 }
 
-// FindFileSize finds the filesize range from [lowerBound, return value] that has
+// lowerBoundFileCount finds the filesize range from [0, return value] that has
 // the largest file count that is smaller than or equal to
 // githubMaxResultsPerQuery. It is important to note that this returned value
 // could already be in a previous range if the next file size has more than 1000
 // results. It is left to the caller to handle this bit of logic and guarantee
 // forward progession in this case.
-func FindFileSize(
-	cache cachedSearch, targetFileCount, lowerBound, upperBound uint64) (uint64, error) {
+func lowerBoundFileCount(
+	cache cachedSearch, targetFileCount uint64) (uint64, error) {
 
 	// Binary search for file sizes that make up the next <=1000 element
 	// chunk.
-	cur := lowerBound
-	increase := (upperBound - lowerBound) / 2
+	cur := uint64(0)
+	increase := githubMaxFileSize / 2
 
 	for increase > 0 {
 		mid := cur + increase
 
-		count, err := cache.CountResults(lowerBound, mid)
+		count, err := cache.CountResults(mid)
 		if err != nil {
 			return count, err
 		}
@@ -356,24 +353,26 @@ func FindFileSize(
 }
 
 func formatFilesizeRanges(cache cachedSearch, sizes []uint64) []string {
-	n := len(sizes)
-	if n < 2 {
-		return []string{}
+	ranges := make([]string, 0, len(sizes)+1)
+
+	if len(sizes) > 0 {
+		ranges = append(ranges, cache.RequestString(
+			RangeLessThan{sizes[0] + 1},
+		))
 	}
 
-	ranges := make([]string, 0, n-1)
-	ranges = append(ranges, cache.RequestString(RangeWithin{sizes[0], sizes[1]}))
-	for i := 1; i < n-1; i++ {
-		ranges = append(ranges, cache.RequestString(RangeWithin{sizes[i] + 1, sizes[i+1]}))
+	for i := 0; i < len(sizes)-1; i += 1 {
+		ranges = append(ranges, cache.RequestString(
+			RangeWithin{sizes[i] + 1, sizes[i+1]},
+		))
+
+		if i != len(sizes)-2 {
+			continue
+		}
+		ranges = append(ranges, cache.RequestString(
+			RangeGreaterThan{sizes[i+1]},
+		))
 	}
+
 	return ranges
 }
-
-func RangeSizes(s string) RangeWithin {
-	start := strings.Index(s, "+size:") + len("+size:")
-	end := strings.Index(s, "&")
-	ranges := strings.Split(s[start:end], "..")
-	lowerBound, _ := strconv.ParseUint(ranges[0], 10, 64)
-	upperBound, _ := strconv.ParseUint(ranges[1], 10, 64)
-	return RangeWithin{lowerBound, upperBound}
-}

api/internal/crawl/crawler/github/split_search_ranges_test.go

@@ -11,7 +11,7 @@ type testCachedSearch struct {
 	cache map[uint64]uint64
 }
 
-func (c testCachedSearch) CountResults(lowerBound, upperBound uint64) (uint64, error) {
+func (c testCachedSearch) CountResults(upperBound uint64) (uint64, error) {
 	log.Printf("CountResults(%05x)\n", upperBound)
 	count, ok := c.cache[upperBound]
 	if !ok {
@@ -73,29 +73,19 @@ func TestRangeSplitting(t *testing.T) {
 		},
 	}
 
-	requests, err := FindRangesForRepoSearch(cache, 0, 524288)
+	requests, err := FindRangesForRepoSearch(cache)
 	if err != nil {
 		t.Errorf("Error while finding ranges: %v", err)
 	}
 	expected := []string{
-		"0..106",       // cache.RequestString(RangeWithin{0x00, 0x6a}),
-		"107..128",     // cache.RequestString(RangeWithin{0x6b, 0x80}),
-		"129..256",     // cache.RequestString(RangeWithin{0x81, 0x100}),
-		"257..4095",    // cache.RequestString(RangeWithin{0x101, 0xfff}),
-		"4096..524288", // cache.RequestString(RangeWithin{0x1000, 0x80000}),
+		"<107",      // cache.RequestString(RangeLessThan{0x6b}),
+		"107..128",  // cache.RequestString(RangeWithin{0x6b, 0x80}),
+		"129..256",  // cache.RequestString(RangeWithin{0x81, 0x100}),
+		"257..4095", // cache.RequestString(RangeWithin{0x101, 0xfff}),
+		">4095",     // cache.RequestString(RangeGreaterThan{0xfff}),
 	}
 
 	if !reflect.DeepEqual(requests, expected) {
 		t.Errorf("Expected requests (%v) to equal (%v)", requests, expected)
 	}
 }
-
-func TestRangeSizes(t *testing.T) {
-	s := "https://api.github.com/search/code?q=filename:kustomization.yaml+filename:kustomization.yml" +
-		"+filename:kustomization+size:2365..10000&order=desc&per_page=100&sort=indexed"
-	returnedResult := RangeSizes(s)
-	expectedResult := RangeWithin{uint64(2365), uint64(10000)}
-	if !reflect.DeepEqual(returnedResult, expectedResult) {
-		t.Errorf("RangeSizes expected (%v), got (%v)",expectedResult, returnedResult)
-	}
-}

api/internal/crawl/doc/doc.go

@@ -3,7 +3,6 @@ package doc
 import (
 	"fmt"
 	"log"
-	"path/filepath"
 	"sort"
 	"strings"
 
@@ -46,36 +45,21 @@ type KustomizationDocument struct {
 
 type set map[string]struct{}
 
-func (doc *KustomizationDocument) Copy() *KustomizationDocument {
-	return &KustomizationDocument{
-		Document:    *(doc.Document.Copy()),
-		Kinds:       doc.Kinds,
-		Identifiers: doc.Identifiers,
-		Values:      doc.Values,
-	}
-}
-
 func (doc *KustomizationDocument) String() string {
 	return fmt.Sprintf("%s %s %s %v %v %v len(identifiers):%v  len(values):%v",
 		doc.RepositoryURL, doc.FilePath, doc.DefaultBranch, doc.CreationTime,
 		doc.IsSame, doc.Kinds, len(doc.Identifiers), len(doc.Values))
 }
 
-// IsKustomizationFile determines whether a file path is a kustomization file
-func IsKustomizationFile(path string) bool {
-	basename := filepath.Base(path)
-	for _, name := range konfig.RecognizedKustomizationFileNames() {
-		if basename == name {
-			return true
+// Implements the CrawlerDocument interface.
+func (doc *KustomizationDocument) GetResources() ([]*Document, error) {
+	isResource := true
+	for _, suffix := range konfig.RecognizedKustomizationFileNames() {
+		if strings.HasSuffix(doc.FilePath, "/"+suffix) {
+			isResource = false
 		}
 	}
-	return false
-}
-
-// Implements the CrawlerDocument interface.
-func (doc *KustomizationDocument) GetResources(
-	includeResources, includeTransformers, includeGenerators bool) ([]*Document, error) {
-	if !IsKustomizationFile(doc.FilePath) {
+	if isResource {
 		return []*Document{}, nil
 	}
 
@@ -93,44 +77,20 @@ func (doc *KustomizationDocument) GetResources(
 	}
 	k.FixKustomizationPostUnmarshalling()
 
-	res := make([]*Document, 0)
-
-	if includeResources {
-		resourceDocs := doc.CollectDocuments(k.Resources, "resource")
-		res = append(res, resourceDocs...)
-	}
-
-	if includeGenerators {
-		generatorDocs := doc.CollectDocuments(k.Generators, "generator")
-		res = append(res, generatorDocs...)
-	}
-
-	if includeTransformers {
-		transformerDocs := doc.CollectDocuments(k.Transformers, "transformer")
-		res = append(res, transformerDocs...)
-	}
-
-	return res, nil
-}
-
-// CollectDocuments construct a Document for each path in paths, and return
-// a slice of Document pointers.
-func (doc *KustomizationDocument) CollectDocuments(
-	paths []string, fileType string) []*Document {
-	docs := make([]*Document, 0, len(paths))
-	for _, r := range paths {
+	res := make([]*Document, 0, len(k.Resources))
+	for _, r := range k.Resources {
 		if strings.TrimSpace(r) == "" {
 			continue
 		}
 		next, err := doc.Document.FromRelativePath(r)
 		if err != nil {
-			log.Printf("CollectDocuments error: %v\n", err)
+			log.Printf("GetResources error: %v\n", err)
 			continue
 		}
-		next.FileType = fileType
-		docs = append(docs, &next)
+		res = append(res, &next)
 	}
-	return docs
+
+	return res, nil
 }
 
 func (doc *KustomizationDocument) readBytes() ([]map[string]interface{}, error) {

api/internal/crawl/doc/doc_test.go

@@ -189,13 +189,11 @@ metadata:
 	}
 }
 
-type TestStructForGetResources struct {
-	doc       KustomizationDocument
-	resources []*Document
-}
-
 func TestGetResources(t *testing.T) {
-	tests := []TestStructForGetResources{
+	tests := []struct {
+		doc       KustomizationDocument
+		resources []*Document
+	}{
 		{
 			doc: KustomizationDocument{
 				Document: Document{
@@ -215,27 +213,19 @@ resources:
 				{
 					RepositoryURL: "sigs.k8s.io/kustomize",
 					FilePath:      "some/path/to/base",
-					FileType:      "resource",
-					User:          "sigs.k8s.io",
 				},
 				{
 					RepositoryURL: "sigs.k8s.io/kustomize",
 					FilePath:      "some/path/to/otherbase",
-					FileType:      "resource",
-					User:          "sigs.k8s.io",
 				},
 				{
 					RepositoryURL: "sigs.k8s.io/kustomize",
 					FilePath:      "some/path/to/kdir/file.yaml",
-					FileType:      "resource",
-					User:          "sigs.k8s.io",
 				},
 				{
 					RepositoryURL: "https://github.com/kubernetes-sigs/kustomize",
 					FilePath:      "examples/helloWorld",
 					DefaultBranch: "v3.1.0",
-					FileType:      "resource",
-					User:          "kubernetes-sigs",
 				},
 			},
 		},
@@ -258,12 +248,9 @@ resources:
 			resources: []*Document{},
 		},
 	}
-	runTest(t, tests, true, false, false)
-}
 
-func runTest(t *testing.T, tests []TestStructForGetResources, includeResources, includeTransformers, includeGenerators bool) {
 	for _, test := range tests {
-		res, err := test.doc.GetResources(includeResources, includeTransformers, includeGenerators)
+		res, err := test.doc.GetResources()
 		if err != nil {
 			t.Errorf("Unexpected error: %v\n", err)
 			continue
@@ -297,83 +284,3 @@ func runTest(t *testing.T, tests []TestStructForGetResources, includeResources,
 		}
 	}
 }
-
-func TestGetResourcesAndGenerators(t *testing.T) {
-	tests := []TestStructForGetResources{
-		{
-			doc: KustomizationDocument{
-				Document: Document{
-					RepositoryURL: "sigs.k8s.io/kustomize",
-					FilePath:      "some/path/to/kdir/kustomization.yaml",
-					DocumentData: `
-resources:
-- file.yaml
-
-generators:
-- gen.yaml
-
-transformers:
-- tr.yaml
-`},
-			},
-			resources: []*Document{
-				{
-					RepositoryURL: "sigs.k8s.io/kustomize",
-					FilePath:      "some/path/to/kdir/gen.yaml",
-					FileType:      "generator",
-					User:          "sigs.k8s.io",
-				},
-				{
-					RepositoryURL: "sigs.k8s.io/kustomize",
-					FilePath:      "some/path/to/kdir/file.yaml",
-					FileType:      "resource",
-					User:          "sigs.k8s.io",
-				},
-			},
-		},
-	}
-	runTest(t, tests, true, false, true)
-}
-
-func TestGetResourcesAndGeneratorsAndTransformers(t *testing.T) {
-	tests := []TestStructForGetResources{
-		{
-			doc: KustomizationDocument{
-				Document: Document{
-					RepositoryURL: "sigs.k8s.io/kustomize",
-					FilePath:      "some/path/to/kdir/kustomization.yaml",
-					DocumentData: `
-resources:
-- file.yaml
-
-generators:
-- gen.yaml
-
-transformers:
-- tr.yaml
-`},
-			},
-			resources: []*Document{
-				{
-					RepositoryURL: "sigs.k8s.io/kustomize",
-					FilePath:      "some/path/to/kdir/tr.yaml",
-					FileType:      "transformer",
-					User:          "sigs.k8s.io",
-				},
-				{
-					RepositoryURL: "sigs.k8s.io/kustomize",
-					FilePath:      "some/path/to/kdir/gen.yaml",
-					FileType:      "generator",
-					User:          "sigs.k8s.io",
-				},
-				{
-					RepositoryURL: "sigs.k8s.io/kustomize",
-					FilePath:      "some/path/to/kdir/file.yaml",
-					FileType:      "resource",
-					User:          "sigs.k8s.io",
-				},
-			},
-		},
-	}
-	runTest(t, tests, true, true, true)
-}

api/internal/crawl/doc/docname.go

@@ -11,18 +11,12 @@ import (
 )
 
 type Document struct {
-	RepositoryURL string `json:"repositoryUrl,omitempty"`
-	// User makes it easy to aggregate data in the user level instead
-	// of the repository level
-	User          string     `json:"user,omitempty"`
+	RepositoryURL string     `json:"repositoryUrl,omitempty"`
 	FilePath      string     `json:"filePath,omitempty"`
 	DefaultBranch string     `json:"defaultBranch,omitempty"`
 	DocumentData  string     `json:"document,omitempty"`
 	CreationTime  *time.Time `json:"creationTime,omitempty"`
 	IsSame        bool       `json:"-"`
-	// FileType can be one of the following:
-	// "generator", "transformer", "resource", "".
-	FileType string `json:"fileType,omitempty"`
 }
 
 // Implements the CrawlerDocument interface.
@@ -33,21 +27,14 @@ func (doc *Document) GetDocument() *Document {
 func (doc *Document) Copy() *Document {
 	return &Document{
 		RepositoryURL: doc.RepositoryURL,
-		User:          doc.User,
 		FilePath:      doc.FilePath,
 		DefaultBranch: doc.DefaultBranch,
 		DocumentData:  doc.DocumentData,
 		CreationTime:  doc.CreationTime,
 		IsSame:        doc.IsSame,
-		FileType:      doc.FileType,
 	}
 }
 
-func (doc *Document) Path() string {
-	return fmt.Sprintf("repoURL: %s filePath: %s branch: %s",
-		doc.RepositoryURL, doc.FilePath, doc.DefaultBranch)
-}
-
 // Implements the CrawlerDocument interface.
 func (doc *Document) WasCached() bool {
 	return doc.IsSame
@@ -60,7 +47,6 @@ func (doc *Document) FromRelativePath(newFile string) (Document, error) {
 			RepositoryURL: repoSpec.Host + path.Clean(repoSpec.OrgRepo),
 			FilePath:      path.Clean(repoSpec.Path),
 			DefaultBranch: repoSpec.Ref,
-			User:          UserName(repoSpec.Host + path.Clean(repoSpec.OrgRepo)),
 		}, nil
 	}
 	// else document is probably relative path.
@@ -68,7 +54,6 @@ func (doc *Document) FromRelativePath(newFile string) (Document, error) {
 	ret := Document{
 		RepositoryURL: doc.RepositoryURL,
 		DefaultBranch: doc.DefaultBranch,
-		User:          UserName(doc.RepositoryURL),
 	}
 	ogDir, _ := path.Split(doc.FilePath)
 
@@ -93,7 +78,13 @@ func (doc *Document) ID() string {
 }
 
 func (doc *Document) RepositoryFullName() string {
-	url := TrimUrl(doc.RepositoryURL)
+	url := strings.TrimRight(doc.RepositoryURL, "/")
+
+	gitPrefix := "git@github.com:"
+	if strings.HasPrefix(url, gitPrefix) {
+		url = url[len(gitPrefix):]
+	}
+
 	sections := strings.Split(url, "/")
 	l := len(sections)
 	if l < 2 {
@@ -101,24 +92,3 @@ func (doc *Document) RepositoryFullName() string {
 	}
 	return path.Join(sections[l-2], sections[l-1])
 }
-
-// TrimUrl removes all the trailing slashes and the "git@github.com:" prefix (if exists).
-func TrimUrl(s string) string {
-	url := strings.TrimRight(s, "/")
-
-	gitPrefix := "git@github.com:"
-	if strings.HasPrefix(url, gitPrefix) {
-		url = url[len(gitPrefix):]
-	}
-	return url
-}
-
-func UserName(repositoryURL string) string {
-	url := TrimUrl(repositoryURL)
-	sections := strings.Split(url, "/")
-	l := len(sections)
-	if l < 2 {
-		return url
-	}
-	return sections[l-2]
-}

api/internal/crawl/doc/docname_test.go

@@ -28,7 +28,6 @@ func TestFromRelativePath(t *testing.T) {
 						RepositoryURL: "example.com/repo",
 						FilePath:      "path/to/other/file/resource.yaml",
 						DefaultBranch: "master",
-						User:          "example.com",
 					},
 				},
 				{
@@ -37,7 +36,6 @@ func TestFromRelativePath(t *testing.T) {
 						RepositoryURL: "example.com/repo",
 						FilePath:      "path/to/other/file/patch.yaml",
 						DefaultBranch: "master",
-						User:          "example.com",
 					},
 				},
 				{
@@ -46,7 +44,6 @@ func TestFromRelativePath(t *testing.T) {
 						RepositoryURL: "example.com/repo",
 						FilePath:      "path/to/file/service.yaml",
 						DefaultBranch: "master",
-						User:          "example.com",
 					},
 				},
 			},
@@ -68,7 +65,7 @@ func TestFromRelativePath(t *testing.T) {
 
 func TestDocument_RepositoryFullName(t *testing.T) {
 	testCases := []struct {
-		doc                        Document
+		doc Document
 		expectedRepositoryFullName string
 	}{
 		{
@@ -111,40 +108,4 @@ func TestDocument_RepositoryFullName(t *testing.T) {
 				returnedRepositoryFullName)
 		}
 	}
-}
-
-func TestDocument_UserName(t *testing.T) {
-	testCases := []struct {
-		repositoryURL    string
-		expectedUserName string
-	}{
-		{
-			repositoryURL:    "https://github.com/user/repo",
-			expectedUserName: "user",
-		},
-		{
-			repositoryURL:    "https://github.com//user/repo////",
-			expectedUserName: "user",
-		},
-		{
-			repositoryURL:    "repo/",
-			expectedUserName: "repo",
-		},
-		{
-			repositoryURL:    "",
-			expectedUserName: "",
-		},
-		{
-			repositoryURL:    "git@github.com:user/repo",
-			expectedUserName: "user",
-		},
-	}
-
-	for _, tc := range testCases {
-		returnedUserName := UserName(tc.repositoryURL)
-		if returnedUserName != tc.expectedUserName {
-			t.Errorf("UserName expected %s, got %s",
-				tc.expectedUserName, returnedUserName)
-		}
-	}
-}
+}

api/internal/crawl/doc/unique_doc.go

@@ -1,36 +0,0 @@
-package doc
-
-import (
-	"sigs.k8s.io/kustomize/api/internal/crawl/utils"
-)
-
-// UniqueDocuments make sure a Document with a given ID appears only once
-type UniqueDocuments struct {
-	docs   []*Document
-	docIDs utils.SeenMap
-}
-
-func NewUniqueDocuments() UniqueDocuments {
-	return UniqueDocuments{
-		docs:   []*Document{},
-		docIDs: utils.NewSeenMap(),
-	}
-}
-
-func (uds *UniqueDocuments) Add(d *Document) {
-	if uds.docIDs.Seen(d.ID()) {
-		return
-	}
-	uds.docs = append(uds.docs, d)
-	uds.docIDs.Set(d.ID(), "")
-}
-
-func (uds *UniqueDocuments) AddDocuments(docs []*Document) {
-	for _, d := range docs {
-		uds.Add(d)
-	}
-}
-
-func (uds *UniqueDocuments) Documents() []*Document {
-	return uds.docs
-}

api/internal/crawl/index/elasticsearch.go

@@ -20,18 +20,12 @@ const IndexConfig = `
 				"repositoryUrl": {
 					"type": "keyword"
 				},
-				"user": {
-					"type": "keyword"
-				},
 				"filePath": {
 					"type": "keyword"
 				},
 				"defaultBranch": {
 					"type": "keyword"
 				},
-				"fileType": {
-					"type": "keyword"
-				},
 				"document": {
 					"type": "text"
 				},

api/internal/crawl/index/kustomize.go

@@ -18,7 +18,6 @@ const (
 )
 
 type Mode int
-
 const (
 	InsertOrUpdate = iota
 	Delete
@@ -270,7 +269,7 @@ func (it *KustomizeIterator) Value() KustomizeResult {
 	return it.scrollImpl
 }
 
-// Check if any errors have occurred.
+// Check if any errors have occured.
 func (it *KustomizeIterator) Err() error {
 	return it.err
 }

api/internal/crawl/search_cmds/creationTime.md

@@ -1,6 +1,6 @@
 Find out the largest value of the `creationTime` field:
 ```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X POST "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "aggs" : {
         "max_creationTime" : { "max" : { "field" : "creationTime" } }
@@ -11,7 +11,7 @@ curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 
 Find out the smallest value of the `creationTime` field:
 ```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X POST "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "aggs" : {
         "min_creationTime" : { "min" : { "field" : "creationTime" } }
@@ -22,12 +22,12 @@ curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 
 Find out the smallest value of the `creationTime` field of all the kustomization files:
 ```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X POST "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "bool": {
       "filter": [
-        { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}
+        { "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }}
       ]
     }
   },
@@ -40,58 +40,13 @@ curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 
 Find out the smallest value of the `creationTime` field of all kustomize resource files:
 ```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X POST "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "bool": {
       "must_not": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      }, 
-      "filter": [
-        { "regexp": { "fileType": "resource"  }}
-      ]
-    }
-  },
-  "aggs" : {
-    "min_creationTime" : { "min" : { "field" : "creationTime" } }
-  }
-}
-'
-```
-
-Find out the smallest value of the `creationTime` field of all kustomize generator files:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "must_not": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      }, 
-      "filter": [
-        { "regexp": { "fileType": "generator"  }}
-      ]
-    }
-  },
-  "aggs" : {
-    "min_creationTime" : { "min" : { "field" : "creationTime" } }
-  }
-}
-'
-```
-
-Find out the smallest value of the `creationTime` field of all kustomize transformer files:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "must_not": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      }, 
-      "filter": [
-        { "regexp": { "fileType": "transformer"  }}
-      ]
+        "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }
+      }
     }
   },
   "aggs" : {
@@ -103,7 +58,7 @@ curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 
 Query all the documents whose `creationTime` <= `2016-07-29T17:38:26.000Z`:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "range": {
@@ -118,7 +73,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 
 Query all the documents whose `creationTime` falls within the specific range:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "range": {
@@ -132,38 +87,14 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 '
 ```
 
-Query all the kustomization files whose `creationTime` falls within the specific range:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "size": 20,
-  "query": {
-    "bool": {
-      "filter": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }
-      },
-      "must": {
-        "range": {
-          "creationTime": {
-            "gte": "2017-09-24T15:49:57.000Z",
-            "lte": "2017-09-24T15:49:57.000Z"
-          }
-        }
-      }
-    }
-  }
-}
-'
-```
-
 Aggregate how many new kustomization files were added into Github each month:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "query": {
         "bool": {
             "filter": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
+                { "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }}
             ]
         }
     },
@@ -181,67 +112,12 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 
 Aggregate how many new kustomize resource files were added into Github each month:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "query": {
         "bool": {
             "must_not": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
-            ],
-            "filter": [
-                { "regexp": { "fileType": "resource" }}
-            ]
-        }
-    },
-    "aggs" : {
-        "newFiles_over_time" : {
-            "date_histogram" : {
-                "field" : "creationTime",
-                "interval" : "month"
-            }
-        }
-    }
-}
-'
-```
-
-Aggregate how many new kustomize generator files were added into Github each month:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
-            ],
-            "filter": [
-                { "regexp": { "fileType": "generator" }}
-            ]
-        }
-    },
-    "aggs" : {
-        "newFiles_over_time" : {
-            "date_histogram" : {
-                "field" : "creationTime",
-                "interval" : "month"
-            }
-        }
-    }
-}
-'
-```
-
-Aggregate how many new kustomize transformer files were added into Github each month:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
-            ],
-            "filter": [
-                { "regexp": { "fileType": "transformer" }}
+                { "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }}
             ]
         }
     },
@@ -259,12 +135,12 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 
 Aggregate how many new kustomization files were added into Github each year:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "query": {
         "bool": {
             "filter": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
+                { "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }}
             ]
         }
     },
@@ -282,16 +158,13 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 
 Aggregate how many new kustomize resource files were added into Github each year:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "query": {
         "bool": {
             "must_not": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
-            ],
-            "filter": [
-                { "regexp": { "fileType": "resource" }}
-            ]            
+                { "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }}
+            ]
         }
     },
     "aggs" : {
@@ -304,108 +177,4 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
     }
 }
 '
-```
-
-Aggregate how many new kustomize generator files were added into Github each year:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
-            ],
-            "filter": [
-                { "regexp": { "fileType": "generator" }}
-            ]            
-        }
-    },
-    "aggs" : {
-        "newFiles_over_time" : {
-            "date_histogram" : {
-                "field" : "creationTime",
-                "interval" : "year"
-            }
-        }
-    }
-}
-'
-```
-
-Aggregate how many new kustomize transformer files were added into Github each year:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
-            ],
-            "filter": [
-                { "regexp": { "fileType": "transformer" }}
-            ]            
-        }
-    },
-    "aggs" : {
-        "newFiles_over_time" : {
-            "date_histogram" : {
-                "field" : "creationTime",
-                "interval" : "year"
-            }
-        }
-    }
-}
-'
-```
-
-Find the generator files created within the given time range:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "fileType": "generator" }}
-      ],
-      "must_not": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      },
-      "must": {
-        "range": {
-          "creationTime": {
-           "gte": "2019-04-26T16:40:02.000Z",
-           "lte": "2019-04-26T16:40:02.000Z"
-          }
-        }
-      }
-    }
-  }
-}
-'
-```
-
-Find the transformer files created within the given time range:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "fileType": "transformer" }}
-      ],
-      "must_not": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      },
-      "must": {
-        "range": {
-          "creationTime": {
-           "gte": "2019-04-26T16:40:02.000Z",
-           "lte": "2019-04-26T16:40:02.000Z"
-          }
-        }
-      }
-    }
-  }
-}
-'
 ```

api/internal/crawl/search_cmds/defaultBranch.md

@@ -1,6 +1,6 @@
 Count distinct values of the `defaultBranch` field:
 ```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X POST "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "aggs" : {
         "defaultBranch_count" : {
@@ -17,7 +17,7 @@ curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 List all the github branches where kustomization files and kustomize resource files live, 
 and how many kustomization files and kustomize resource files live in each branch:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
     "aggs" : {
         "defaultBranch" : {

api/internal/crawl/search_cmds/fieldExistence.md

@@ -1,7 +1,7 @@
 Count the documents whose `document` field is empty (The reason why the `document` field
 of a document is empty is because of empty documents):
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
    "size": 10000,
     "query": {
@@ -19,7 +19,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 
 Find all the documents having the `creationTime` field set:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
     "query": {
         "exists": {
@@ -32,7 +32,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 
 Find all the documents whose `creationTime` field is not set:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
    "size": 10000,
     "query": {

api/internal/crawl/search_cmds/fileType.md

@@ -1,301 +0,0 @@
-Find all the documents having the `fileType` field set:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "exists": {
-            "field": "fileType"
-        }
-    }
-}
-'
-```
-
-Find all the documents whose `fileType` field is not set:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-   "size": 10000,
-    "query": {
-        "bool": {
-            "must_not": {
-                "exists": {
-                    "field": "fileType"
-                }
-            }
-        }
-    }
-}
-'
-```
-
-Search for all the documents whose `fileType` field is `resource`:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "fileType": "resource" }}
-      ]
-    }
-  }
-}
-'
-```
-
-Search for all the kustomization files whose `fileType` field is `resource`:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}, 
-       { "regexp": { "fileType": "resource" }}
-      ]
-    }
-  }
-}
-'
-```
-
-Search for all the kustomize resource files:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "fileType": "resource" }}
-      ],
-      "must_not": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      }
-    }
-  }
-}
-'
-```
-
-Search all the kustomization files including a `generators` field:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "size": 10000,
-  "query": {
-    "bool": {
-      "must": {
-        "match" : {
-          "identifiers" : {
-            "query" : "generators"
-          }
-        }
-      },
-      "filter": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      }
-    }
-  }
-}
-'
-```
-
-Search for all the documents whose `fileType` field is `generator`:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "fileType": "generator" }}
-      ]
-    }
-  }
-}
-'
-```
-
-Search for all the kustomization files whose `fileType` field is `generator`:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}, 
-       { "regexp": { "fileType": "generator" }}
-      ]
-    }
-  }
-}
-'
-```
-
-Search for all the kustomize generator files:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "fileType": "generator" }}
-      ],
-      "must_not": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      }
-    }
-  }
-}
-'
-```
-
-Search all the kustomization files including a `transformers` field:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "size": 10000,
-  "query": {
-    "bool": {
-      "must": {
-        "match" : {
-          "identifiers" : {
-            "query" : "transformers"
-          }
-        }
-      },
-      "filter": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      }
-    }
-  }
-}
-'
-```
-
-Search for all the documents whose `fileType` field is `transformer`:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "fileType": "transformer" }}
-      ]
-    }
-  }
-}
-'
-```
-
-Search for all the kustomization files whose `fileType` field is `transformer`:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}, 
-       { "regexp": { "fileType": "transformer" }}
-      ]
-    }
-  }
-}
-'
-```
-
-Search for all the kustomize transformer files:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "fileType": "transformer" }}
-      ],
-      "must_not": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      }
-    }
-  }
-}
-'
-```
-
-Count distinct values of the `fileType` field:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "aggs" : {
-        "fileType_count" : {
-            "cardinality" : {
-                "field" : "fileType",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-List all the values of the `fileType` field and the frequency of each value:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "aggs" : {
-        "fileType" : {
-            "terms" : {
-              "field" : "fileType"
-            }
-        }
-    }
-}
-'
-```
-
-
-For all the kustomization files in the index, list all the values of the
-`fileType` field and the frequency of each value:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-             "filter": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}
-             ]
-        }
-    },
-    "aggs" : {
-        "fileType" : {
-            "terms" : {
-              "field" : "fileType"
-            }
-        }
-    }
-}
-'
-```
-
-For all the non-kustomization files in the index, list all the values of the
-`fileType` field and the frequency of each value:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": {
-                "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-            }
-        }
-    },
-    "aggs" : {
-        "fileType" : {
-            "terms" : {
-              "field" : "fileType"
-            }
-        }
-    }
-}
-'
-```

api/internal/crawl/search_cmds/generator.md

@@ -1,29 +0,0 @@
-Find all the generator files whose `kinds` field includes `ChartRenderer`, and
-only output certain fields of each document:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "size": 200,
-  "_source": {
-    "includes": ["kinds", "repositoryUrl", "defaultBranch", "filePath"]
-  },
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "fileType": "generator" }}
-      ],
-      "must_not": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      },
-      "must": {
-        "match" : {
-          "kinds" : {
-            "query" : "ChartRenderer"
-          }
-        }
-      }
-    }
-  }
-}
-'
-```

api/internal/crawl/search_cmds/id.md

@@ -1,12 +0,0 @@
-Find the document with the given `_id`:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "terms": {
-      "_id": [ "b3a03f3327841617db696e2d6abc30e1a1bd653f1a2bbce05637f7dcae1a43f7" ] 
-    }
-  }
-}
-'
-```

api/internal/crawl/search_cmds/keyword_search.md

@@ -1,7 +1,7 @@
 Count the documents in the index whose `repositoryUrl` field starts with
 `https://github.com/`:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "bool": {
@@ -17,7 +17,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 Count the documents in the index whose `repositoryUrl` field does not start with
 `https://github.com/`:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "bool": {
@@ -33,7 +33,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 Search all the documents matching the given `repositoryUrl` and `filePath`, and return 
 a version for each search hit:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "size": 10000,
   "version": true,
@@ -52,12 +52,12 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 Search all the documents whose filePath ends with one of these following three filenames:
 `kustomization.yaml`, `kustomization.yml`, `kustomization`:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "bool": {
       "filter": [
-       { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
+       { "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }}
       ]
     }
   }
@@ -68,12 +68,12 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 Search all the documents whose filePath does not end with any of these following
 three filenames: `kustomization.yaml`, `kustomization.yml`, `kustomization`:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "bool": {
       "must_not": [
-       { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
+       { "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }}
       ]
     }
   }

api/internal/crawl/search_cmds/misc.md

@@ -1,32 +1,19 @@
 Check the health status of an ElasticSearch cluster:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/_cat/health?v&pretty"
+curl -X GET "${ElasticSearchURL}:9200/_cat/health?v&pretty"
 ```
 
 Check the indices in an ElasticSearch cluster:
 ```
-curl -s "${ElasticSearchURL}:9200/_cat/indices?v"
+curl "${ElasticSearchURL}:9200/_cat/indices?v"
 ```
 
 Get the mapping of the index:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_mapping?pretty"
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_mapping?pretty"
 ```
 
 Delete the kustomize index from the ElasticSearch cluster (**Use this command with caution**):
 ```
-curl -s -X DELETE "${ElasticSearchURL}:9200/${INDEXNAME}?pretty"
-```
-
-Add a new field into an existing index.
-```
-curl -s -X PUT "${ElasticSearchURL}:9200/${INDEXNAME}/_mapping/_doc?pretty" -H 'Content-Type: application/json' -d'
-{
-  "properties": {
-    "fileType": {
-      "type": "keyword"
-    }
-  }
-}
-'
+curl -X DELETE "${ElasticSearchURL}:9200/kustomize?pretty"
 ```

api/internal/crawl/search_cmds/repositoryUrl.md

@@ -1,6 +1,6 @@
 Count distinct values of the `repositoryUrl` field:
 ```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X POST "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "aggs" : {
         "repositoryUrl_count" : {
@@ -16,12 +16,12 @@ curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 
 Count how many Github repositories include kustomization files:
 ```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X POST "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "query": {
         "bool": {
              "filter": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
+                { "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }}
              ]
         }
     },
@@ -37,143 +37,16 @@ curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 '
 ```
 
-Count distinct values of the `repositoryUrl` field for all the kustomize resource files in the index:
+Count how many Github repositories include kustomize resource files:
 ```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X POST "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "query": {
         "bool": {
             "must_not": {
-                "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-            },
-            "filter": [
-                { "regexp": { "fileType": "resource" }}
-            ]
-        }
-    },
-    "aggs" : {
-        "repositoryUrl_count" : {
-            "cardinality" : {
-                "field" : "repositoryUrl",
-                "precision_threshold": 40000
+                "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }
             }
         }
-    }
-}
-'
-```
-
-Count distinct values of the `repositoryUrl` field for all the kustomize generator files in the index:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": {
-                "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-            },
-            "filter": [
-                { "regexp": { "fileType": "generator" }}
-            ]
-        }
-    },
-    "aggs" : {
-        "repositoryUrl_count" : {
-            "cardinality" : {
-                "field" : "repositoryUrl",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-Count distinct values of the `repositoryUrl` field for all the kustomize transformer files in the index:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": {
-                "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-            },
-            "filter": [
-                { "regexp": { "fileType": "transformer" }}
-            ]
-        }
-    },
-    "aggs" : {
-        "repositoryUrl_count" : {
-            "cardinality" : {
-                "field" : "repositoryUrl",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-Count distinct values of the `repositoryUrl` field for all the kustomize resource dirs in the index:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "filter": [
-                { "regexp": { "fileType": "resource" }},
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}
-            ]
-        }
-    },
-    "aggs" : {
-        "repositoryUrl_count" : {
-            "cardinality" : {
-                "field" : "repositoryUrl",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-Count distinct values of the `repositoryUrl` field for all the kustomize generator dirs in the index:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "filter": [
-                { "regexp": { "fileType": "generator" }},
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}
-            ]
-        }
-    },
-    "aggs" : {
-        "repositoryUrl_count" : {
-            "cardinality" : {
-                "field" : "repositoryUrl",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-Count distinct values of the `repositoryUrl` field for all the kustomize transformer dirs in the index:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "filter": [
-                { "regexp": { "fileType": "transformer" }},
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}
-            ]
-        }
     },
     "aggs" : {
         "repositoryUrl_count" : {
@@ -191,7 +64,7 @@ List all the github repositories including kustomization files and kustomize res
 and how many kustomization files and kustomize resource files each github repository includes
 (the github repository including the most kustomization files is listed first):
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "aggs" : {
         "repositoryUrl" : {
@@ -207,12 +80,12 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 
 List the top 20 Github repositories including the most amount of kustomization files:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "query": {
         "bool": {
              "filter": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }}
+                { "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }}
              ]
         }
     },
@@ -230,16 +103,13 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H
 
 List the top 20 Github repositories including the most amount of kustomize resource files:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
 {
     "query": {
         "bool": {
             "must_not": {
-                "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*" }
-            },
-            "filter": [
-                { "regexp": { "fileType": "resource" }}
-            ]
+                "regexp": { "filePath": ".*/kustomization((.yaml)?|(.yml)?)/*" }
+            }
         }
     },
     "aggs" : {

api/internal/crawl/search_cmds/snapshot.md

@@ -1,29 +0,0 @@
-Retrieve information about all registered snapshot repositories:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/_snapshot?pretty"
-```
-
-Retrieve information about a given snapshot repository, `kustomize-backup`:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/_snapshot/kustomize-backup?pretty"
-```
-
-Verify a snapshot repository, `kustomize-backup`, manually:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/_snapshot/kustomize-backup/_verify?pretty"
-```
-
-List all the snapshots in a given snapshot repository:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/_cat/snapshots/kustomize-backup?v&s=id&pretty"
-```
-
-Retrieve a summary information about a given snapshot:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/_snapshot/kustomize-backup/kustomize-snapshot?pretty"
-```
-
-Retrieve a detailed information about a given snapshot:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/_snapshot/kustomize-backup/kustomize-snapshot/_status?pretty"
-```

api/internal/crawl/search_cmds/text_search.md

@@ -1,6 +1,6 @@
 Search for all the kustomize resource files including a Deployment object:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "match" : {
@@ -16,7 +16,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 Search for all the kustomize resource files including a Deployment object, but only
 including the `kinds` field in the result:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "_source": {
     "includes": ["kinds"]
@@ -35,7 +35,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 Search for all the kustomize resource files including both a Deployment object and 
 a Service object:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "match" : {
@@ -52,7 +52,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 Count the number of documents including Deployment and the number of documents 
 including Service:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "size": 0,
   "aggs" : {
@@ -71,7 +71,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 
 Search for all the kustomization files involving CRDs:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "size": 10000,
   "query": {
@@ -87,7 +87,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 
 Search for all the kustomization files defining configMapGenerator:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "size": 10000,
   "query": {
@@ -103,7 +103,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 
 Search for all the documents having a `kind` field:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "bool": {
@@ -118,7 +118,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 
 Search for all the kuostmization files having a `kind` field:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "bool": {
@@ -134,7 +134,7 @@ curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Conten
 
 Search for all the kustomization files defining the `generatorOptions:disableNameSuffixHash` feature:
 ```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
+curl -X GET "${ElasticSearchURL}:9200/kustomize/_search?pretty" -H 'Content-Type: application/json' -d'
 {
   "query": {
     "match" : {

api/internal/crawl/search_cmds/transformer.md

@@ -1,29 +0,0 @@
-Find all the trasnformer files whose `kinds` field includes `HelmValues`, and
-only output certain fields of each document:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "size": 200,
-  "_source": {
-    "includes": ["kinds", "repositoryUrl", "defaultBranch", "filePath"]
-  },
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "fileType": "transformer" }}
-      ],
-      "must_not": {
-        "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-      },
-      "must": {
-        "match" : {
-          "kinds" : {
-            "query" : "HelmValues"
-          }
-        }
-      }
-    }
-  }
-}
-'
-```

api/internal/crawl/search_cmds/user.md

@@ -1,380 +0,0 @@
-Find all the documents having the `user` field set:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "exists": {
-            "field": "user"
-        }
-    }
-}
-'
-```
-
-Find all the documents whose `user` field is not set:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-   "size": 10000,
-    "query": {
-        "bool": {
-            "must_not": {
-                "exists": {
-                    "field": "user"
-                }
-            }
-        }
-    }
-}
-'
-```
-
-Search for all the documents whose `user` field is `kubernetes-sigs`:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?pretty" -H 'Content-Type: application/json' -d'
-{
-  "query": {
-    "bool": {
-      "filter": [
-       { "regexp": { "user": "kubernetes-sigs" }}
-      ]
-    }
-  }
-}
-'
-```
-
-Count distinct values of the `user` field:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "aggs" : {
-        "user_count" : {
-            "cardinality" : {
-                "field" : "user",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-List all the values of the `user` field and the frequency of each value:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "aggs" : {
-        "user" : {
-            "terms" : {
-                "field" : "user",
-                "size" : 20
-            }
-        }
-    }
-}
-'
-```
-
-Count distinct values of the `user` field for all the kustomization files in the index:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-             "filter": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}
-             ]
-        }
-    },
-    "aggs" : {
-        "user_count" : {
-            "cardinality" : {
-                "field" : "user",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-For all the kustomization files in the index, list all the values of the
-`user` field and the frequency of each value:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-             "filter": [
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}
-             ]
-        }
-    },
-    "aggs" : {
-        "user" : {
-            "terms" : {
-                "field" : "user",
-                "size": 20
-            }
-        }
-    }
-}
-'
-```
-
-Count distinct values of the `user` field for all the kustomize resource files in the index:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": {
-                "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-            },
-            "filter": [
-                { "regexp": { "fileType": "resource" }}
-            ]
-        }
-    },
-    "aggs" : {
-        "user_count" : {
-            "cardinality" : {
-                "field" : "user",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-For all the kustomize resource files in the index, list all the values of the
-`user` field and the frequency of each value:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": {
-                "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-            },
-            "filter": [
-                { "regexp": { "fileType": "resource" }}
-            ]
-        }
-    },
-    "aggs" : {
-        "user" : {
-            "terms" : {
-                "field" : "user",
-                "size": 20
-            }
-        }
-    }
-}
-'
-```
-
-Count distinct values of the `user` field for all the kustomize generator files in the index:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": {
-                "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-            },
-            "filter": [
-                { "regexp": { "fileType": "generator" }}
-            ]
-        }
-    },
-    "aggs" : {
-        "user_count" : {
-            "cardinality" : {
-                "field" : "user",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-For all the kustomize generator files in the index, list all the values of the
-`user` field and the frequency of each value:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": {
-                "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-            },
-            "filter": [
-                { "regexp": { "fileType": "generator" }}
-            ]
-        }
-    },
-    "aggs" : {
-        "user" : {
-            "terms" : {
-              "field" : "user",
-              "size": 20  
-            }
-        }
-    }
-}
-'
-```
-
-Count distinct values of the `user` field for all the kustomize transformer files in the index:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": {
-                "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-            },
-            "filter": [
-                { "regexp": { "fileType": "transformer" }}
-            ]
-        }
-    },
-    "aggs" : {
-        "user_count" : {
-            "cardinality" : {
-                "field" : "user",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-For all the kustomize transformer files in the index, list all the values of the
-`user` field and the frequency of each value:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "must_not": {
-                "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }
-            },
-            "filter": [
-                { "regexp": { "fileType": "transformer" }}
-            ]
-        }
-    },
-    "aggs" : {
-        "user" : {
-            "terms" : {
-                "field" : "user",
-                "size": 20
-            }
-        }
-    }
-}
-'
-```
-
-Count distinct values of the `user` field for all the kustomize generator dirs in the index:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "filter": [
-                { "regexp": { "fileType": "generator" }},
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}
-            ]
-        }
-    },
-    "aggs" : {
-        "user_count" : {
-            "cardinality" : {
-                "field" : "user",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-For all the kustomize generator dirs in the index, list all the values of the
-`user` field and the frequency of each value:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "filter": [
-                { "regexp": { "fileType": "generator" }},
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}
-            ]
-        }
-    },
-    "aggs" : {
-        "user" : {
-            "terms" : {
-              "field" : "user",
-              "size": 20  
-            }
-        }
-    }
-}
-'
-```
-
-Count distinct values of the `user` field for all the kustomize transformer dirs in the index:
-```
-curl -s -X POST "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "filter": [
-                { "regexp": { "fileType": "transformer" }},
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}
-            ]
-        }
-    },
-    "aggs" : {
-        "user_count" : {
-            "cardinality" : {
-                "field" : "user",
-                "precision_threshold": 40000
-            }
-        }
-    }
-}
-'
-```
-
-For all the kustomize transformer dirs in the index, list all the values of the
-`user` field and the frequency of each value:
-```
-curl -s -X GET "${ElasticSearchURL}:9200/${INDEXNAME}/_search?size=0&pretty" -H 'Content-Type: application/json' -d'
-{
-    "query": {
-        "bool": {
-            "filter": [
-                { "regexp": { "fileType": "transformer" }},
-                { "regexp": { "filePath": "(.*/)?kustomization((.yaml)?|(.yml)?)(/)*"  }}
-            ]
-        }
-    },
-    "aggs" : {
-        "user" : {
-            "terms" : {
-              "field" : "user"
-            }
-        }
-    }
-}
-'
-```

api/internal/crawl/utils/utils.go

@@ -1,21 +0,0 @@
-package utils
-
-type SeenMap map[string]string
-
-func (seen SeenMap) Seen(item string) bool {
-	_, ok := seen[item]
-	return ok
-}
-
-func (seen SeenMap) Set(k, v string) {
-	seen[k] = v
-}
-
-// The caller should make sure that key is in the map.
-func (seen SeenMap) Value(k string) string {
-	return seen[k]
-}
-
-func NewSeenMap() SeenMap {
-	return make(map[string]string)
-}

api/internal/tools/tools.go

@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // This file exists to automatically trigger installs
-// of the given tools, and is the official 'unofficial'
+// of the given tools, and is the offical 'unofficial'
 // way to declare a dependence on a Go binary until
 // some better technique comes along.
 

api/krusty/baseandoverlaymedium_test.go

@@ -153,8 +153,7 @@ FRUIT=banana
 LEGUME=chickpea
 `)
 	th.WriteF("/app/overlay/configmap/dummy.txt",
-		`Lorem ipsum dolor sit amet, consectetur
- 		 
+		`Lorem ipsum dolor sit amet, consectetur  
 adipiscing elit, sed do eiusmod tempor		
 incididunt ut labore et dolore magna aliqua.   
 `)
@@ -295,7 +294,6 @@ apiVersion: v1
 data:
   nonsense: |
     Lorem ipsum dolor sit amet, consectetur
-
     adipiscing elit, sed do eiusmod tempor
     incididunt ut labore et dolore magna aliqua.
 kind: ConfigMap
@@ -306,6 +304,6 @@ metadata:
     app: mungebot
     org: kubernetes
     repo: test-infra
-  name: test-infra-app-config-hh272bg5d4
+  name: test-infra-app-config-4mt28b5bg2
 `)
 }

api/kv/kv.go

@@ -93,7 +93,7 @@ func (kvl *loader) keyValuesFromFileSources(sources []string) ([]types.Pair, err
 
 // trimTrailingSpacesInLines takes string with multiple lines and trims the trailing white spaces and tabs from each line.
 func trimTrailingSpacesInLines(str string) string {
-	re := regexp.MustCompile(`[ \t]*\n`)
+	re := regexp.MustCompile(`\s*\n`)
 	return re.ReplaceAllString(str, "\n")
 }
 

api/kv/kv_test.go

@@ -97,8 +97,8 @@ func TestKeyValuesFromFileSources(t *testing.T) {
 }
 
 func TestTrimTrailingSpacesInLines(t *testing.T) {
-	input := "\"fooKey\": \"fooValue\"   \t\n \t\t  \n\t\"barKey\": \"barValue\""
-	expected := "\"fooKey\": \"fooValue\"\n\n\t\"barKey\": \"barValue\""
+	input := "\"fooKey\": \"fooValue\"   \t\n\t\"barKey\": \"barValue\""
+	expected := "\"fooKey\": \"fooValue\"\n\t\"barKey\": \"barValue\""
 	res := trimTrailingSpacesInLines(input)
 	if !reflect.DeepEqual(res, expected) {
 		t.Errorf("Trim trailing spaces in lines should succeed, got: %s exptected: %s", res, expected)

cmd/config/configcobra/cmds.go

@@ -45,7 +45,6 @@ Advanced Documentation Topics:
 
 // Export commands publicly for composition
 var (
-	Annotate     = commands.AnnotateCommand
 	Cat          = commands.CatCommand
 	Count        = commands.CountCommand
 	CreateSetter = commands.CreateSetterCommand
@@ -59,8 +58,6 @@ var (
 	Sink         = commands.SinkCommand
 	Source       = commands.SourceCommand
 	Tree         = commands.TreeCommand
-	Wrap         = commands.WrapCommand
-	XArgs        = commands.XArgsCommand
 
 	StackOnError = &commands.StackOnError
 	ExitOnError  = &commands.ExitOnError
@@ -92,7 +89,6 @@ func NewConfigCommand(name string) *cobra.Command {
 
 	name = strings.TrimSpace(name + " config")
 	commands.ExitOnError = true
-	root.AddCommand(commands.AnnotateCommand(name))
 	root.AddCommand(commands.GrepCommand(name))
 	root.AddCommand(commands.TreeCommand(name))
 	root.AddCommand(commands.CatCommand(name))

cmd/config/docs/api-conventions/config-io.md

@@ -29,7 +29,7 @@ metadata:
 ### `config.kubernetes.io/index`
 
 Records the index of a Resource in file. In a multi-object YAML file, Resources are separated
-by three dashes (`---`), and the index represents the position of the Resource starting from zero.
+by three dashes (`---`), and the index represents the positon of the Resource starting from zero.
 
 This annotation **SHOULD** be set when reading Resources from files.
 It **SHOULD** be unset when writing Resources to files.

cmd/config/docs/api-conventions/functions-impl.md

@@ -129,7 +129,7 @@ spec:
 
 ### Output
 
-The function is invoked using byrunning `kustomize config run dir/`.
+The function is invoked using by runing `kustomize config run dir/`.
 
 `dir/my-instance_deployment.yaml` contains the Deployment:
 

cmd/config/docs/commands/annotate.md

@@ -1,18 +0,0 @@
-## annotate
-
-[Alpha] Set an annotation on Resources.
-
-### Synopsis
-
-[Alpha]  Set an annotation on Resources.
-
-  DIR:
-    Path to local directory.
-
-### Examples
-
-    kustomize config annotate my-dir/ --kv foo=bar
-
-    kustomize config annotate my-dir/ --kv foo=bar --kv a=b
-
-    kustomize config annotate my-dir/ --kv foo=bar --kind Deployment --name foo

cmd/config/docs/commands/sink.md

@@ -6,10 +6,10 @@
 
 [Alpha] Implement a Sink by writing input to a local directory.
 
-    kustomize config sink [DIR]
+    kustomize config sink DIR
 
   DIR:
-    Path to local directory.  If unspecified, sink will write to stdout as if it were a single file.
+    Path to local directory.
 
 `sink` writes its input to a directory
 

cmd/config/docs/commands/source.md

@@ -6,11 +6,10 @@
 
 [Alpha] Implement a Source by reading a local directory.
 
-    kustomize config source DIR...
+    kustomize config source DIR
 
   DIR:
-    One or more paths to local directories.  Contents from directories will be concatenated.
-    If no directories are provided, source will read from stdin as if it were a single file.
+    Path to local directory.
 
 `source` emits configuration to act as input to a function
 

cmd/config/go.mod

@@ -10,7 +10,5 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.4.0
 	k8s.io/apimachinery v0.17.0
-	sigs.k8s.io/kustomize/kyaml v0.0.0
+	sigs.k8s.io/kustomize/kyaml v0.0.8
 )
-
-replace sigs.k8s.io/kustomize/kyaml v0.0.0 => ../../kyaml

cmd/config/go.sum

@@ -164,5 +164,7 @@ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+sigs.k8s.io/kustomize/kyaml v0.0.8 h1:RJeaGsiSo1X9qa2pH9NeYZEeK+5/7nIilwfDCIoW3YU=
+sigs.k8s.io/kustomize/kyaml v0.0.8/go.mod h1:tDOfJjL6slQVBLHJ76XfXAFgAOEdfm04AW2HehYOp8k=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=

cmd/config/internal/commands/annotate.go

@@ -1,103 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package commands
-
-import (
-	"strings"
-
-	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands"
-	"sigs.k8s.io/kustomize/kyaml/errors"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-// NewAnnotateRunner returns a command runner.
-func NewAnnotateRunner(parent string) *AnnotateRunner {
-	r := &AnnotateRunner{}
-	c := &cobra.Command{
-		Use:     "annotate [DIR]",
-		Args:    cobra.MaximumNArgs(1),
-		Short:   commands.AnnotateShort,
-		Long:    commands.AnnotateLong,
-		Example: commands.AnnotateExamples,
-		RunE:    r.runE,
-	}
-	fixDocs(parent, c)
-	r.Command = c
-	c.Flags().StringVar(&r.Kind, "kind", "", "Resource kind to annotate")
-	c.Flags().StringVar(&r.ApiVersion, "apiVersion", "", "Resource apiVersion to annotate")
-	c.Flags().StringVar(&r.Name, "name", "", "Resource name to annotate")
-	c.Flags().StringVar(&r.Namespace, "namespace", "", "Resource namespace to annotate")
-	c.Flags().StringSliceVar(&r.Values, "kv", []string{}, "annotation as KEY=VALUE")
-	return r
-}
-
-func AnnotateCommand(parent string) *cobra.Command {
-	return NewAnnotateRunner(parent).Command
-}
-
-type AnnotateRunner struct {
-	Command    *cobra.Command
-	Values     []string
-	Kind       string
-	Name       string
-	ApiVersion string
-	Namespace  string
-	Path       string
-}
-
-func (r *AnnotateRunner) runE(c *cobra.Command, args []string) error {
-	var input []kio.Reader
-	var output []kio.Writer
-	if len(args) == 0 {
-		rw := &kio.ByteReadWriter{Reader: c.InOrStdin(), Writer: c.OutOrStdout()}
-		input = []kio.Reader{rw}
-		output = []kio.Writer{rw}
-	} else {
-		rw := &kio.LocalPackageReadWriter{PackagePath: args[0], NoDeleteFiles: true}
-		input = []kio.Reader{rw}
-		output = []kio.Writer{rw}
-	}
-	return handleError(c, kio.Pipeline{
-		Inputs:  input,
-		Filters: []kio.Filter{r},
-		Outputs: output,
-	}.Execute())
-}
-
-func (r *AnnotateRunner) Filter(nodes []*yaml.RNode) ([]*yaml.RNode, error) {
-	for i := range nodes {
-		n := nodes[i]
-		m, err := n.GetMeta()
-		if err != nil {
-			return nil, err
-		}
-		if r.Kind != "" && r.Kind != m.Kind {
-			continue
-		}
-		if r.ApiVersion != "" && r.ApiVersion != m.APIVersion {
-			continue
-		}
-		if r.Namespace != "" && r.Namespace != m.Namespace {
-			continue
-		}
-		if r.Name != "" && r.Name != m.Name {
-			continue
-		}
-
-		for i := range r.Values {
-			// split key, value pairs
-			kv := strings.SplitN(r.Values[i], "=", 2)
-			if len(kv) != 2 {
-				return nil, errors.Errorf("must specify --kv as KEY=VALUE: %s", r.Values[i])
-			}
-			if err := n.PipeE(yaml.SetAnnotation(kv[0], kv[1])); err != nil {
-				return nil, err
-			}
-		}
-
-	}
-	return nodes, nil
-}

cmd/config/internal/commands/annotate_test.go

@@ -1,488 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package commands
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/kyaml/kio"
-)
-
-func TestAnnotateCommand(t *testing.T) {
-	var tests = []struct {
-		name     string
-		args     []string
-		expected string
-	}{
-		{
-			name:     "single value",
-			args:     []string{"--kv", "a=b"},
-			expected: expectedSingleValue,
-		},
-		{
-			name:     "multi value",
-			args:     []string{"--kv", "a=b", "--kv", "c=d"},
-			expected: expectedMultiValue,
-		},
-		{
-			name:     "filter kind",
-			args:     []string{"--kv", "a=b", "--kind", "Service"},
-			expected: expectedFilterKindService,
-		},
-		{
-			name:     "filter apiVersion",
-			args:     []string{"--kv", "a=b", "--apiVersion", "v1"},
-			expected: expectedFilterApiVersionV1,
-		},
-		{
-			name:     "filter name",
-			args:     []string{"--kv", "a=b", "--name", "bar"},
-			expected: expectedFilterNameBar,
-		},
-		{
-			name:     "filter namespace",
-			args:     []string{"--kv", "a=b", "--namespace", "bar"},
-			expected: expectedFilterNamespaceBar,
-		},
-	}
-	for i := range tests {
-		tt := tests[i]
-		t.Run(tt.name, func(t *testing.T) {
-			d := initTestDir(t)
-			defer os.RemoveAll(d)
-
-			a := NewAnnotateRunner("")
-			a.Command.SetArgs(append([]string{d}, tt.args...))
-			a.Command.SilenceUsage = true
-			a.Command.SilenceErrors = true
-
-			err := a.Command.Execute()
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-
-			actual := &bytes.Buffer{}
-			err = kio.Pipeline{
-				Inputs:  []kio.Reader{kio.LocalPackageReader{PackagePath: d}},
-				Outputs: []kio.Writer{kio.ByteWriter{Writer: actual, KeepReaderAnnotations: true}},
-			}.Execute()
-			if !assert.NoError(t, err) {
-				t.FailNow()
-			}
-			if !assert.Equal(t,
-				strings.TrimSpace(tt.expected),
-				strings.TrimSpace(actual.String())) {
-				t.FailNow()
-			}
-		})
-	}
-}
-
-func initTestDir(t *testing.T) string {
-	d, err := ioutil.TempDir("", "kustomize-annotate-test")
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	err = ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(f1Input), 0600)
-	if !assert.NoError(t, err) {
-		defer os.RemoveAll(d)
-		t.FailNow()
-	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(f2Input), 0600)
-	if !assert.NoError(t, err) {
-		defer os.RemoveAll(d)
-		t.FailNow()
-	}
-	return d
-}
-
-var (
-	f1Input = `
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
-`
-
-	f2Input = `
-apiVersion: v1
-kind: Abstraction
-metadata:
-  name: foo
-  configFn:
-    container:
-      image: gcr.io/example/reconciler:v1
-  annotations:
-    config.kubernetes.io/local-config: "true"
-  namespace: bar
-spec:
-  replicas: 3
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-  namespace: foo
-spec:
-  replicas: 3
-`
-
-	expectedSingleValue = `kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-    a: 'b'
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-    a: 'b'
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  selector:
-    app: nginx
----
-apiVersion: v1
-kind: Abstraction
-metadata:
-  name: foo
-  configFn:
-    container:
-      image: gcr.io/example/reconciler:v1
-  annotations:
-    config.kubernetes.io/local-config: "true"
-    a: 'b'
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: bar
-spec:
-  replicas: 3
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-    a: 'b'
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: foo
-spec:
-  replicas: 3
-`
-
-	expectedMultiValue = `kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-    a: 'b'
-    c: 'd'
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-    a: 'b'
-    c: 'd'
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  selector:
-    app: nginx
----
-apiVersion: v1
-kind: Abstraction
-metadata:
-  name: foo
-  configFn:
-    container:
-      image: gcr.io/example/reconciler:v1
-  annotations:
-    config.kubernetes.io/local-config: "true"
-    a: 'b'
-    c: 'd'
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: bar
-spec:
-  replicas: 3
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-    a: 'b'
-    c: 'd'
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: foo
-spec:
-  replicas: 3
-`
-
-	expectedFilterKindService = `kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-    a: 'b'
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  selector:
-    app: nginx
----
-apiVersion: v1
-kind: Abstraction
-metadata:
-  name: foo
-  configFn:
-    container:
-      image: gcr.io/example/reconciler:v1
-  annotations:
-    config.kubernetes.io/local-config: "true"
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: bar
-spec:
-  replicas: 3
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: foo
-spec:
-  replicas: 3
-`
-
-	expectedFilterApiVersionV1 = `kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  selector:
-    app: nginx
----
-apiVersion: v1
-kind: Abstraction
-metadata:
-  name: foo
-  configFn:
-    container:
-      image: gcr.io/example/reconciler:v1
-  annotations:
-    config.kubernetes.io/local-config: "true"
-    a: 'b'
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: bar
-spec:
-  replicas: 3
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: foo
-spec:
-  replicas: 3
-`
-
-	expectedFilterNameBar = `kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  selector:
-    app: nginx
----
-apiVersion: v1
-kind: Abstraction
-metadata:
-  name: foo
-  configFn:
-    container:
-      image: gcr.io/example/reconciler:v1
-  annotations:
-    config.kubernetes.io/local-config: "true"
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: bar
-spec:
-  replicas: 3
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-    a: 'b'
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: foo
-spec:
-  replicas: 3
-`
-
-	expectedFilterNamespaceBar = `kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f1.yaml'
-spec:
-  selector:
-    app: nginx
----
-apiVersion: v1
-kind: Abstraction
-metadata:
-  name: foo
-  configFn:
-    container:
-      image: gcr.io/example/reconciler:v1
-  annotations:
-    config.kubernetes.io/local-config: "true"
-    a: 'b'
-    config.kubernetes.io/index: '0'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: bar
-spec:
-  replicas: 3
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-    config.kubernetes.io/index: '1'
-    config.kubernetes.io/path: 'f2.yaml'
-  namespace: foo
-spec:
-  replicas: 3
-`
-)

cmd/config/internal/commands/cmdcreatesetter.go

@@ -38,6 +38,7 @@ func NewCreateSetterRunner(parent string) *CreateSetterRunner {
 		"create a partial setter for only part of the field value.")
 	fixDocs(parent, set)
 	set.MarkFlagRequired("type")
+	set.MarkFlagRequired("field")
 	r.Command = set
 	return r
 }

cmd/config/internal/commands/fmt.go

@@ -31,8 +31,6 @@ formatting substitution verbs {'%n': 'metadata.name', '%s': 'metadata.namespace'
 		`if true, keep index and filename annotations set on Resources.`)
 	c.Flags().BoolVar(&r.Override, "override", false,
 		`if true, override existing filepath annotations.`)
-	c.Flags().BoolVar(&r.UseSchema, "use-schema", false,
-		`if true, uses openapi resource schema to format resources.`)
 	r.Command = c
 	return r
 }
@@ -48,7 +46,6 @@ type FmtRunner struct {
 	SetFilenames    bool
 	KeepAnnotations bool
 	Override        bool
-	UseSchema       bool
 }
 
 func (r *FmtRunner) preRunE(c *cobra.Command, args []string) error {
@@ -59,9 +56,7 @@ func (r *FmtRunner) preRunE(c *cobra.Command, args []string) error {
 }
 
 func (r *FmtRunner) runE(c *cobra.Command, args []string) error {
-	f := []kio.Filter{filters.FormatFilter{
-		UseSchema: r.UseSchema,
-	}}
+	f := []kio.Filter{filters.FormatFilter{}}
 
 	// format with file names
 	if r.SetFilenames {

cmd/config/internal/commands/merge3.go

@@ -25,8 +25,6 @@ func GetMerge3Runner(name string) *Merge3Runner {
 		"Path to updated package")
 	c.Flags().StringVar(&r.toDir, "to", "",
 		"Path to destination package")
-	c.Flags().BoolVar(&r.path, "path-merge-key", false,
-		"Use the path as part of the merge key when merging resources")
 
 	r.Command = c
 	return r
@@ -42,7 +40,6 @@ type Merge3Runner struct {
 	ancestor string
 	fromDir  string
 	toDir    string
-	path     bool
 }
 
 func (r *Merge3Runner) runE(c *cobra.Command, args []string) error {
@@ -50,7 +47,6 @@ func (r *Merge3Runner) runE(c *cobra.Command, args []string) error {
 		OriginalPath: r.ancestor,
 		UpdatedPath:  r.fromDir,
 		DestPath:     r.toDir,
-		MergeOnPath:  r.path,
 	}.Merge()
 	if err != nil {
 		return err

cmd/config/internal/commands/run-fns.go

@@ -40,10 +40,6 @@ func GetRunFnRunner(name string) *RunFnRunner {
 	r.Command.Flags().StringVar(
 		&r.Image, "image", "",
 		"run this image as a function instead of discovering them.")
-	r.Command.Flags().BoolVar(
-		&r.Network, "network", false, "enable network access for functions that declare it")
-	r.Command.Flags().StringVar(
-		&r.NetworkName, "network-name", "bridge", "the docker network to run the container in")
 	return r
 }
 
@@ -60,8 +56,6 @@ type RunFnRunner struct {
 	FnPaths            []string
 	Image              string
 	RunFns             runfn.RunFns
-	Network            bool
-	NetworkName        string
 }
 
 func (r *RunFnRunner) runE(c *cobra.Command, args []string) error {
@@ -194,8 +188,6 @@ func (r *RunFnRunner) preRunE(c *cobra.Command, args []string) error {
 		Output:        output,
 		Input:         input,
 		Path:          path,
-		Network:       r.Network,
-		NetworkName:   r.NetworkName,
 	}
 
 	// don't consider args for the function

cmd/config/internal/commands/run_test.go

@@ -25,8 +25,6 @@ func TestRunFnCommand_preRunE(t *testing.T) {
 		input         io.Reader
 		output        io.Writer
 		functionPaths []string
-		network       bool
-		networkName   string
 	}{
 		{
 			name: "config map",
@@ -88,40 +86,6 @@ metadata:
 data: {}
 kind: ConfigMap
 apiVersion: v1
-`,
-		},
-		{
-			name:        "network enabled",
-			args:        []string{"run", "dir", "--image", "foo:bar", "--network"},
-			path:        "dir",
-			network:     true,
-			networkName: "bridge",
-			expected: `
-metadata:
-  name: function-input
-  annotations:
-    config.kubernetes.io/function: |
-      container: {image: 'foo:bar'}
-data: {}
-kind: ConfigMap
-apiVersion: v1
-`,
-		},
-		{
-			name:        "with network name",
-			args:        []string{"run", "dir", "--image", "foo:bar", "--network", "--network-name", "foo"},
-			path:        "dir",
-			network:     true,
-			networkName: "foo",
-			expected: `
-metadata:
-  name: function-input
-  annotations:
-    config.kubernetes.io/function: |
-      container: {image: 'foo:bar'}
-data: {}
-kind: ConfigMap
-apiVersion: v1
 `,
 		},
 		{
@@ -242,20 +206,6 @@ apiVersion: v1
 				t.FailNow()
 			}
 
-			// check if Network was set
-			if tt.network {
-				if !assert.Equal(t, tt.network, r.RunFns.Network) {
-					t.FailNow()
-				}
-				if !assert.Equal(t, tt.networkName, r.RunFns.NetworkName) {
-					t.FailNow()
-				}
-			} else {
-				if !assert.Equal(t, false, r.RunFns.Network) {
-					t.FailNow()
-				}
-			}
-
 			// check if FunctionPaths were set
 			if tt.functionPaths == nil {
 				// make Equal work against flag default

cmd/config/internal/commands/sink.go

@@ -7,7 +7,6 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands"
 	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/kio/kioutil"
 )
 
 // GetSinkRunner returns a command for Sink.
@@ -19,7 +18,7 @@ func GetSinkRunner(name string) *SinkRunner {
 		Long:    commands.SinkLong,
 		Example: commands.SinkExamples,
 		RunE:    r.runE,
-		Args:    cobra.MaximumNArgs(1),
+		Args:    cobra.ExactArgs(1),
 	}
 	fixDocs(name, c)
 	r.Command = c
@@ -36,18 +35,14 @@ type SinkRunner struct {
 }
 
 func (r *SinkRunner) runE(c *cobra.Command, args []string) error {
-	var outputs []kio.Writer
-	if len(args) == 1 {
-		outputs = []kio.Writer{&kio.LocalPackageWriter{PackagePath: args[0]}}
-	} else {
-		outputs = []kio.Writer{&kio.ByteWriter{
-			Writer:           c.OutOrStdout(),
-			ClearAnnotations: []string{kioutil.PathAnnotation}},
-		}
-	}
-
 	err := kio.Pipeline{
-		Inputs:  []kio.Reader{&kio.ByteReader{Reader: c.InOrStdin()}},
-		Outputs: outputs}.Execute()
+		Inputs: []kio.Reader{&kio.ByteReader{Reader: c.InOrStdin()}},
+		Outputs: []kio.Writer{
+			&kio.LocalPackageWriter{
+				PackagePath:      args[0],
+				ClearAnnotations: []string{"config.kubernetes.io/path"},
+			},
+		},
+	}.Execute()
 	return handleError(c, err)
 }

cmd/config/internal/commands/sink_test.go

@@ -21,6 +21,8 @@ func TestSinkCommand(t *testing.T) {
 	}
 	defer os.RemoveAll(d)
 
+	// fmt the files
+	b := &bytes.Buffer{}
 	r := commands.GetSinkRunner("")
 	r.Command.SetIn(bytes.NewBufferString(`apiVersion: config.kubernetes.io/v1alpha1
 kind: ResourceList
@@ -73,6 +75,7 @@ items:
     replicas: 3
 `))
 	r.Command.SetArgs([]string{d})
+	r.Command.SetOut(b)
 	if !assert.NoError(t, r.Command.Execute()) {
 		t.FailNow()
 	}
@@ -135,117 +138,3 @@ spec:
 		t.FailNow()
 	}
 }
-
-func TestSinkCommand_Stdout(t *testing.T) {
-	d, err := ioutil.TempDir("", "kustomize-source-test")
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	defer os.RemoveAll(d)
-
-	// fmt the files
-	out := &bytes.Buffer{}
-	r := commands.GetSinkRunner("")
-	r.Command.SetIn(bytes.NewBufferString(`apiVersion: config.kubernetes.io/v1alpha1
-kind: ResourceList
-items:
-- kind: Deployment
-  metadata:
-    labels:
-      app: nginx2
-    name: foo
-    annotations:
-      app: nginx2
-      config.kubernetes.io/index: '0'
-      config.kubernetes.io/path: 'f1.yaml'
-  spec:
-    replicas: 1
-- kind: Service
-  metadata:
-    name: foo
-    annotations:
-      app: nginx
-      config.kubernetes.io/index: '1'
-      config.kubernetes.io/path: 'f1.yaml'
-  spec:
-    selector:
-      app: nginx
-- apiVersion: v1
-  kind: Abstraction
-  metadata:
-    name: foo
-    annotations:
-      config.kubernetes.io/function: |
-        container:
-          image: gcr.io/example/reconciler:v1
-      config.kubernetes.io/local-config: "true"
-      config.kubernetes.io/index: '0'
-      config.kubernetes.io/path: 'f2.yaml'
-  spec:
-    replicas: 3
-- apiVersion: apps/v1
-  kind: Deployment
-  metadata:
-    labels:
-      app: nginx
-    name: bar
-    annotations:
-      app: nginx
-      config.kubernetes.io/index: '1'
-      config.kubernetes.io/path: 'f2.yaml'
-  spec:
-    replicas: 3
-`))
-
-	r.Command.SetOut(out)
-	r.Command.SetArgs([]string{})
-	if !assert.NoError(t, r.Command.Execute()) {
-		t.FailNow()
-	}
-
-	expected := `kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
----
-apiVersion: v1
-kind: Abstraction
-metadata:
-  name: foo
-  annotations:
-    config.kubernetes.io/function: |
-      container:
-        image: gcr.io/example/reconciler:v1
-    config.kubernetes.io/local-config: "true"
-spec:
-  replicas: 3
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: bar
-  annotations:
-    app: nginx
-spec:
-  replicas: 3
-`
-	if !assert.Equal(t, expected, out.String()) {
-		t.FailNow()
-	}
-}

cmd/config/internal/commands/source.go

@@ -21,6 +21,7 @@ func GetSourceRunner(name string) *SourceRunner {
 		Long:    commands.SourceLong,
 		Example: commands.SourceExamples,
 		RunE:    r.runE,
+		Args:    cobra.ExactArgs(1),
 	}
 	fixDocs(name, c)
 	c.Flags().StringVar(&r.WrapKind, "wrap-kind", kio.ResourceListKind,
@@ -69,14 +70,8 @@ func (r *SourceRunner) runE(c *cobra.Command, args []string) error {
 		FunctionConfig:        functionConfig,
 	})
 
-	var inputs []kio.Reader
-	for _, a := range args {
-		inputs = append(inputs, kio.LocalPackageReader{PackagePath: a})
-	}
-	if len(inputs) == 0 {
-		inputs = []kio.Reader{&kio.ByteReader{Reader: c.InOrStdin()}}
-	}
-
-	err := kio.Pipeline{Inputs: inputs, Outputs: outputs}.Execute()
+	err := kio.Pipeline{
+		Inputs:  []kio.Reader{kio.LocalPackageReader{PackagePath: args[0]}},
+		Outputs: outputs}.Execute()
 	return handleError(c, err)
 }

cmd/config/internal/commands/source_test.go

@@ -134,67 +134,3 @@ items:
 		return
 	}
 }
-
-func TestSourceCommand_Stdin(t *testing.T) {
-	d, err := ioutil.TempDir("", "kustomize-source-test")
-	if !assert.NoError(t, err) {
-		return
-	}
-	defer os.RemoveAll(d)
-
-	in := bytes.NewBufferString(`
-kind: Deployment
-metadata:
-  labels:
-    app: nginx2
-  name: foo
-  annotations:
-    app: nginx2
-spec:
-  replicas: 1
----
-kind: Service
-metadata:
-  name: foo
-  annotations:
-    app: nginx
-spec:
-  selector:
-    app: nginx
-`)
-
-	out := &bytes.Buffer{}
-	r := commands.GetSourceRunner("")
-	r.Command.SetArgs([]string{})
-	r.Command.SetIn(in)
-	r.Command.SetOut(out)
-	if !assert.NoError(t, r.Command.Execute()) {
-		return
-	}
-
-	if !assert.Equal(t, `apiVersion: config.kubernetes.io/v1alpha1
-kind: ResourceList
-items:
-- kind: Deployment
-  metadata:
-    labels:
-      app: nginx2
-    name: foo
-    annotations:
-      app: nginx2
-      config.kubernetes.io/index: '0'
-  spec:
-    replicas: 1
-- kind: Service
-  metadata:
-    name: foo
-    annotations:
-      app: nginx
-      config.kubernetes.io/index: '1'
-  spec:
-    selector:
-      app: nginx
-`, out.String()) {
-		return
-	}
-}

cmd/config/internal/generateddocs/api/docs.go

@@ -33,7 +33,7 @@ Example:
 ### ` + "`" + `config.kubernetes.io/index` + "`" + `
 
 Records the index of a Resource in file. In a multi-object YAML file, Resources are separated
-by three dashes (` + "`" + `---` + "`" + `), and the index represents the position of the Resource starting from zero.
+by three dashes (` + "`" + `---` + "`" + `), and the index represents the positon of the Resource starting from zero.
 
 This annotation **SHOULD** be set when reading Resources from files.
 It **SHOULD** be unset when writing Resources to files.
@@ -187,7 +187,7 @@ are passed to the Function through the ` + "`" + `ResourceList.functionConfig` +
 
 ### Output
 
-The function is invoked using byrunning ` + "`" + `kustomize config run dir/` + "`" + `.
+The function is invoked using by runing ` + "`" + `kustomize config run dir/` + "`" + `.
 
 ` + "`" + `dir/my-instance_deployment.yaml` + "`" + ` contains the Deployment:
 

cmd/config/internal/generateddocs/commands/docs.go

@@ -4,20 +4,6 @@
 // Code generated by "mdtogo"; DO NOT EDIT.
 package commands
 
-var AnnotateShort = `[Alpha] Set an annotation on Resources.`
-var AnnotateLong = `
-[Alpha]  Set an annotation on Resources.
-
-  DIR:
-    Path to local directory.
-`
-var AnnotateExamples = `
-    kustomize config annotate my-dir/ --kv foo=bar
-
-    kustomize config annotate my-dir/ --kv foo=bar --kv a=b
-
-    kustomize config annotate my-dir/ --kv foo=bar --kind Deployment --name foo`
-
 var CatShort = `[Alpha] Print Resource Config from a local directory.`
 var CatLong = `
 [Alpha]  Print Resource Config from a local directory.
@@ -350,10 +336,10 @@ var SinkShort = `[Alpha] Implement a Sink by writing input to a local directory.
 var SinkLong = `
 [Alpha] Implement a Sink by writing input to a local directory.
 
-    kustomize config sink [DIR]
+    kustomize config sink DIR
 
   DIR:
-    Path to local directory.  If unspecified, sink will write to stdout as if it were a single file.
+    Path to local directory.
 
 ` + "`" + `sink` + "`" + ` writes its input to a directory
 `
@@ -364,11 +350,10 @@ var SourceShort = `[Alpha] Implement a Source by reading a local directory.`
 var SourceLong = `
 [Alpha] Implement a Source by reading a local directory.
 
-    kustomize config source DIR...
+    kustomize config source DIR
 
   DIR:
-    One or more paths to local directories.  Contents from directories will be concatenated.
-    If no directories are provided, source will read from stdin as if it were a single file.
+    Path to local directory.
 
 ` + "`" + `source` + "`" + ` emits configuration to act as input to a function
 `

cmd/kubectl/go.mod

@@ -3,9 +3,7 @@ module sigs.k8s.io/kustomize/cmd/kubectl
 go 1.13
 
 require (
-	github.com/go-errors/errors v1.0.1
 	github.com/spf13/cobra v0.0.5
-	github.com/stretchr/testify v1.4.0
 	k8s.io/api v0.17.0
 	k8s.io/apimachinery v0.17.0
 	k8s.io/cli-runtime v0.17.0
@@ -13,11 +11,11 @@ require (
 	k8s.io/component-base v0.17.0 // indirect
 	k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd
 	sigs.k8s.io/controller-runtime v0.4.0
-	sigs.k8s.io/kustomize/kstatus v0.0.1
+	sigs.k8s.io/kustomize/kstatus v0.0.0-20200109211150-9555095de939
 	sigs.k8s.io/kustomize/kyaml v0.0.2
 )
 
 replace (
-	sigs.k8s.io/kustomize/kstatus v0.0.1 => ../../kstatus
+	sigs.k8s.io/kustomize/kstatus v0.0.0-20200109211150-9555095de939 => ../../kstatus
 	sigs.k8s.io/kustomize/kyaml v0.0.0 => ../../kyaml
 )

cmd/kubectl/go.sum

@@ -83,7 +83,6 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -365,6 +364,7 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190909003024-a7b16738d86b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -504,6 +504,7 @@ k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd h1:nZX5+wEqTu/EBIYjrZlFOA63z4+
 k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd/go.mod h1:9ehGcuUGjXVZh0qbYSB0vvofQw2JQe6c6cO0k4wu/Oo=
 k8s.io/metrics v0.0.0-20191214191643-6b1944c9f765/go.mod h1:5V7rewilItwK0cz4nomU0b3XCcees2Ka5EBYWS1HBeM=
 k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 k8s.io/utils v0.0.0-20191114184206-e782cd3c129f h1:GiPwtSzdP43eI1hpPCbROQCCIgCuiMMNF8YUVLF3vJo=
 k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=

cmd/kubectl/kubectlcobra/applier.go

@@ -1,205 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package kubectlcobra
-
-import (
-	"context"
-	"time"
-
-	"github.com/go-errors/errors"
-	"github.com/spf13/cobra"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
-	"k8s.io/cli-runtime/pkg/resource"
-	"k8s.io/kubectl/pkg/cmd/apply"
-	"k8s.io/kubectl/pkg/cmd/util"
-	"k8s.io/kubectl/pkg/scheme"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/kustomize/kstatus/wait"
-)
-
-// newApplier returns a new Applier. It will set up the applyOptions and
-// statusOptions which are responsible for capturing any command line flags.
-// It currently requires IOStreams, but this is a legacy from when
-// the ApplyOptions were responsible for printing progress. This is now
-// handled by a separate printer with the KubectlPrinterAdapter bridging
-// between the two.
-func newApplier(factory util.Factory, ioStreams genericclioptions.IOStreams) *Applier {
-	return &Applier{
-		applyOptions:  apply.NewApplyOptions(ioStreams),
-		statusOptions: NewStatusOptions(),
-		factory:       factory,
-		ioStreams:     ioStreams,
-	}
-}
-
-// resolver defines the interface the applier needs to observe status for resources.
-type resolver interface {
-	WaitForStatusOfObjects(ctx context.Context, objects []wait.KubernetesObject) <-chan wait.Event
-}
-
-// Applier performs the step of applying a set of resources into a cluster,
-// conditionally waits for all of them to be fully reconciled and finally
-// performs prune to clean up any resources that has been deleted.
-type Applier struct {
-	factory   util.Factory
-	ioStreams genericclioptions.IOStreams
-
-	applyOptions  *apply.ApplyOptions
-	statusOptions *StatusOptions
-	resolver      resolver
-}
-
-// Initialize sets up the Applier for actually doing an apply against
-// a cluster. This involves validating command line inputs and configuring
-// clients for communicating with the cluster.
-func (a *Applier) Initialize(cmd *cobra.Command) error {
-	a.applyOptions.PreProcessorFn = PrependGroupingObject(a.applyOptions)
-	err := a.applyOptions.Complete(a.factory, cmd)
-	if err != nil {
-		return errors.WrapPrefix(err, "error setting up ApplyOptions", 1)
-	}
-	// Default PostProcessor is configured in "Complete" function,
-	// so the prune must happen after "Complete".
-	a.applyOptions.PostProcessorFn = prune(a.factory, a.applyOptions)
-
-	resolver, err := a.newResolver(a.statusOptions.period)
-	if err != nil {
-		return errors.WrapPrefix(err, "error creating resolver", 1)
-	}
-	a.resolver = resolver
-	return nil
-}
-
-// SetFlags configures the command line flags needed for apply and
-// status. This is a temporary solution as we should separate the configuration
-// of cobra flags from the Applier.
-func (a *Applier) SetFlags(cmd *cobra.Command) {
-	a.applyOptions.DeleteFlags.AddFlags(cmd)
-	a.applyOptions.RecordFlags.AddFlags(cmd)
-	a.applyOptions.PrintFlags.AddFlags(cmd)
-	a.statusOptions.AddFlags(cmd)
-	a.applyOptions.Overwrite = true
-}
-
-// newResolver sets up a new Resolver for computing status. The configuration
-// needed for the resolver is taken from the Factory.
-func (a *Applier) newResolver(pollInterval time.Duration) (*wait.Resolver, error) {
-	config, err := a.factory.ToRESTConfig()
-	if err != nil {
-		return nil, errors.WrapPrefix(err, "error getting RESTConfig", 1)
-	}
-
-	mapper, err := a.factory.ToRESTMapper()
-	if err != nil {
-		return nil, errors.WrapPrefix(err, "error getting RESTMapper", 1)
-	}
-
-	c, err := client.New(config, client.Options{Scheme: scheme.Scheme, Mapper: mapper})
-	if err != nil {
-		return nil, errors.WrapPrefix(err, "error creating client", 1)
-	}
-
-	return wait.NewResolver(c, mapper, pollInterval), nil
-}
-
-// Run performs the Apply step. This happens asynchronously with updates
-// on progress and any errors are reported back on the event channel.
-// Cancelling the operation or setting timeout on how long to wait
-// for it complete can be done with the passed in context.
-// Note: There sn't currently any way to interrupt the operation
-// before all the given resources have been applied to the cluster. Any
-// cancellation or timeout will only affect how long we wait for the
-// resources to become current.
-func (a *Applier) Run(ctx context.Context) <-chan Event {
-	ch := make(chan Event)
-
-	go func() {
-		defer close(ch)
-		adapter := &KubectlPrinterAdapter{
-			ch: ch,
-		}
-		// The adapter is used to intercept what is meant to be printing
-		// in the ApplyOptions, and instead turn those into events.
-		a.applyOptions.ToPrinter = adapter.toPrinterFunc()
-		// This provides us with a slice of all the objects that will be
-		// applied to the cluster.
-		infos, _ := a.applyOptions.GetObjects()
-		err := a.applyOptions.Run()
-		if err != nil {
-			// If we see an error here we just report it on the channel and then
-			// give up. Eventually we might be able to determine which errors
-			// are fatal and which might allow us to continue.
-			ch <- Event{
-				EventType: ErrorEventType,
-				ErrorEvent: ErrorEvent{
-					Err: errors.WrapPrefix(err, "error applying resources", 1),
-				},
-			}
-			return
-		}
-
-		if a.statusOptions.wait {
-			statusChannel := a.resolver.WaitForStatusOfObjects(ctx, infosToObjects(infos))
-			// As long as the statusChannel remains open, we take every statusEvent,
-			// wrap it in an Event and send it on the channel.
-			for statusEvent := range statusChannel {
-				ch <- Event{
-					EventType:   StatusEventType,
-					StatusEvent: statusEvent,
-				}
-			}
-		}
-
-	}()
-	return ch
-}
-
-func infosToObjects(infos []*resource.Info) []wait.KubernetesObject {
-	var objects []wait.KubernetesObject
-	for _, info := range infos {
-		u := info.Object.(*unstructured.Unstructured)
-		objects = append(objects, u)
-	}
-	return objects
-}
-
-// EventType determines the type of events that are available.
-type EventType string
-
-const (
-	ErrorEventType  EventType = "error"
-	ApplyEventType  EventType = "apply"
-	StatusEventType EventType = "status"
-)
-
-// Event is the type of the objects that will be returned through
-// the channel that is returned from a call to Run. It contains
-// information about progress and errors encountered during
-// the process of doing apply, waiting for status and doing a prune.
-type Event struct {
-	// EventType is the type of event.
-	EventType EventType
-
-	// ErrorEvent contains information about any errors encountered.
-	ErrorEvent ErrorEvent
-
-	// ApplyEvent contains information about progress pertaining to
-	// applying a resource to the cluster.
-	ApplyEvent ApplyEvent
-
-	// StatusEvents contains information about the status of one of
-	// the applied resources.
-	StatusEvent wait.Event
-}
-
-type ErrorEvent struct {
-	Err error
-}
-
-type ApplyEvent struct {
-	Operation string
-	Object    runtime.Object
-}

cmd/kubectl/kubectlcobra/applier_test.go

@@ -1,48 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package kubectlcobra
-
-import (
-	"context"
-	"github.com/stretchr/testify/assert"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
-	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
-	"testing"
-)
-
-// The applier is currently hard to test, as the dependencies on the ApplyOptions and
-// the resolver are hard to stub out. As we work to better separate the different
-// responsibilities of the apply functionality, we should also make it easier to test.
-// This provides some basic tests for now.
-
-func TestApplierWithUnknownFile(t *testing.T) {
-	tf := cmdtesting.NewTestFactory()
-	defer tf.Cleanup()
-	iostreams, _, _, _ := genericclioptions.NewTestIOStreams()
-	cmd := NewCmdApply("base", tf, iostreams)
-
-	applier := newApplier(tf, iostreams)
-	filenames := []string{"file.yaml"}
-	applier.applyOptions.DeleteFlags.FileNameFlags.Filenames = &filenames
-
-	err := applier.Initialize(cmd)
-	assert.NoError(t, err)
-
-	ch := applier.Run(context.TODO())
-
-	var events []Event
-	for msg := range ch {
-		events = append(events, msg)
-	}
-
-	if !assert.Equal(t, 1, len(events)) {
-		return
-	}
-
-	event := events[0]
-	if !assert.Equal(t, ErrorEventType, event.EventType) {
-		return
-	}
-	assert.Contains(t, event.ErrorEvent.Err.Error(), "does not exist")
-}

cmd/kubectl/kubectlcobra/basic_printer.go

@@ -1,62 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package kubectlcobra
-
-import (
-	"fmt"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"strings"
-
-	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
-	cmdutil "k8s.io/kubectl/pkg/cmd/util"
-	"sigs.k8s.io/kustomize/kstatus/wait"
-)
-
-// BasicPrinter is a simple implementation that just prints the events
-// from the channel in the default format for kubectl.
-// We need to support different printers for different output formats.
-type BasicPrinter struct {
-	ioStreams genericclioptions.IOStreams
-}
-
-// Print outputs the events from the provided channel in a simple
-// format on StdOut. As we support other printer implementations
-// this should probably be an interface.
-// This function will block until the channel is closed.
-func (b *BasicPrinter) Print(ch <-chan Event) {
-	for event := range ch {
-		switch event.EventType {
-		case ErrorEventType:
-			cmdutil.CheckErr(event.ErrorEvent.Err)
-		case ApplyEventType:
-			obj := event.ApplyEvent.Object
-			gvk := obj.GetObjectKind().GroupVersionKind()
-			name := "<unknown>"
-			if acc, err := meta.Accessor(obj); err == nil {
-				if n := acc.GetName(); len(n) > 0 {
-					name = n
-				}
-			}
-			fmt.Fprintf(b.ioStreams.Out, "%s %s\n", resourceIdToString(gvk.GroupKind(), name), event.ApplyEvent.Operation)
-		case StatusEventType:
-			statusEvent := event.StatusEvent
-			switch statusEvent.Type {
-			case wait.ResourceUpdate:
-				id := statusEvent.EventResource.ResourceIdentifier
-				gk := id.GroupKind
-				fmt.Fprintf(b.ioStreams.Out, "%s is %s: %s\n", resourceIdToString(gk, id.Name), statusEvent.EventResource.Status.String(), statusEvent.EventResource.Message)
-			case wait.Completed:
-				fmt.Fprint(b.ioStreams.Out, "all resources has reached the Current status\n")
-			case wait.Aborted:
-				fmt.Fprintf(b.ioStreams.Out, "resources failed to the reached Current status\n")
-			}
-		}
-	}
-}
-
-// resourceIdToString returns the string representation of a GroupKind and a resource name.
-func resourceIdToString(gk schema.GroupKind, name string) string {
-	return fmt.Sprintf("%s/%s", strings.ToLower(gk.String()), name)
-}

cmd/kubectl/kubectlcobra/commands.go

@@ -5,7 +5,6 @@
 package kubectlcobra
 
 import (
-	"context"
 	"flag"
 	"fmt"
 	"os"
@@ -80,10 +79,9 @@ func updateHelp(names []string, c *cobra.Command) {
 
 // NewCmdApply creates the `apply` command
 func NewCmdApply(baseName string, f util.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
-	applier := newApplier(f, ioStreams)
-	printer := &BasicPrinter{
-		ioStreams: ioStreams,
-	}
+	o := apply.NewApplyOptions(ioStreams)
+	so := newStatusOptions(f, ioStreams)
+	o.PreProcessorFn = PrependGroupingObject(o)
 
 	cmd := &cobra.Command{
 		Use:                   "apply (-f FILENAME | -k DIRECTORY)",
@@ -95,28 +93,28 @@ func NewCmdApply(baseName string, f util.Factory, ioStreams genericclioptions.IO
 		Run: func(cmd *cobra.Command, args []string) {
 			if len(args) > 0 {
 				// check is kustomize, if so update
-				applier.applyOptions.DeleteFlags.FileNameFlags.Kustomize = &args[0]
+				o.DeleteFlags.FileNameFlags.Kustomize = &args[0]
 			}
 
-			cmdutil.CheckErr(applier.Initialize(cmd))
-
-			// Create a context with the provided timout from the cobra parameter.
-			ctx, cancel := context.WithTimeout(context.Background(), applier.statusOptions.timeout)
-			defer cancel()
-			// Run the applier. It will return a channel where we can receive updates
-			// to keep track of progress and any issues.
-			ch := applier.Run(ctx)
-
-			// The printer will print updates from the channel. It will block
-			// until the channel is closed.
-			printer.Print(ch)
+			cmdutil.CheckErr(o.Complete(f, cmd))
+			cmdutil.CheckErr(o.Run())
+			infos, _ := o.GetObjects()
+			if so.wait {
+				cmdutil.CheckErr(so.waitForStatus(infos))
+			}
 		},
 	}
 
-	applier.SetFlags(cmd)
+	// bind flag structs
+	o.DeleteFlags.AddFlags(cmd)
+	o.RecordFlags.AddFlags(cmd)
+	o.PrintFlags.AddFlags(cmd)
+	so.AddFlags(cmd)
+
+	o.Overwrite = true
 
 	cmdutil.AddValidateFlags(cmd)
-	cmd.Flags().BoolVar(&applier.applyOptions.ServerDryRun, "server-dry-run", applier.applyOptions.ServerDryRun, "If true, request will be sent to server with dry-run flag, which means the modifications won't be persisted. This is an alpha feature and flag.")
+	cmd.Flags().BoolVar(&o.ServerDryRun, "server-dry-run", o.ServerDryRun, "If true, request will be sent to server with dry-run flag, which means the modifications won't be persisted. This is an alpha feature and flag.")
 	cmd.Flags().Bool("dry-run", false, "If true, only print the object that would be sent, without sending it. Warning: --dry-run cannot accurately output the result of merging the local manifest and the server-side data. Use --server-dry-run to get the merged result instead.")
 	cmdutil.AddServerSideApplyFlags(cmd)
 
@@ -146,16 +144,3 @@ func PrependGroupingObject(o *apply.ApplyOptions) func() error {
 		return nil
 	}
 }
-
-// Prune deletes previously applied objects that have been
-// omitted in the current apply. The previously applied objects
-// are reached through ConfigMap grouping objects.
-func prune(f util.Factory, o *apply.ApplyOptions) func() error {
-	return func() error {
-		po, err := NewPruneOptions(f, o)
-		if err != nil {
-			return err
-		}
-		return po.Prune()
-	}
-}

cmd/kubectl/kubectlcobra/grouping.go

@@ -22,26 +22,6 @@ const (
 	GroupingHash  = "kustomize.config.k8s.io/inventory-hash"
 )
 
-// retrieveGroupingLabel returns the string value of the GroupingLabel
-// for the passed object. Returns error if the passed object is nil or
-// is not a grouping object.
-func retrieveGroupingLabel(obj runtime.Object) (string, error) {
-	var groupingLabel string
-	if obj == nil {
-		return "", fmt.Errorf("Grouping object is nil.\n")
-	}
-	accessor, err := meta.Accessor(obj)
-	if err != nil {
-		return "", err
-	}
-	labels := accessor.GetLabels()
-	groupingLabel, exists := labels[GroupingLabel]
-	if !exists {
-		return "", fmt.Errorf("Grouping label does not exist for grouping object: %s\n", GroupingLabel)
-	}
-	return strings.TrimSpace(groupingLabel), nil
-}
-
 // isGroupingObject returns true if the passed object has the
 // grouping label.
 // TODO(seans3): Check type is ConfigMap.
@@ -49,9 +29,13 @@ func isGroupingObject(obj runtime.Object) bool {
 	if obj == nil {
 		return false
 	}
-	groupingLabel, err := retrieveGroupingLabel(obj)
-	if err == nil && len(groupingLabel) > 0 {
-		return true
+	accessor, err := meta.Accessor(obj)
+	if err == nil {
+		labels := accessor.GetLabels()
+		_, exists := labels[GroupingLabel]
+		if exists {
+			return true
+		}
 	}
 	return false
 }

cmd/kubectl/kubectlcobra/grouping_test.go

@@ -22,8 +22,6 @@ var pod1Name = "pod-1"
 var pod2Name = "pod-2"
 var pod3Name = "pod-3"
 
-var testGroupingLabel = "test-app-label"
-
 var groupingObj = unstructured.Unstructured{
 	Object: map[string]interface{}{
 		"apiVersion": "v1",
@@ -32,7 +30,7 @@ var groupingObj = unstructured.Unstructured{
 			"name":      groupingObjName,
 			"namespace": testNamespace,
 			"labels": map[string]interface{}{
-				GroupingLabel: testGroupingLabel,
+				GroupingLabel: "true",
 			},
 		},
 	},
@@ -111,67 +109,6 @@ var nilInfo = &resource.Info{
 	Object:    nil,
 }
 
-var groupingObjLabelWithSpace = unstructured.Unstructured{
-	Object: map[string]interface{}{
-		"apiVersion": "v1",
-		"kind":       "ConfigMap",
-		"metadata": map[string]interface{}{
-			"name":      groupingObjName,
-			"namespace": testNamespace,
-			"labels": map[string]interface{}{
-				GroupingLabel: "\tgrouping-label ",
-			},
-		},
-	},
-}
-
-func TestRetrieveGroupingLabel(t *testing.T) {
-	tests := []struct {
-		obj           runtime.Object
-		groupingLabel string
-		isError       bool
-	}{
-		// Nil grouping object throws error.
-		{
-			obj:           nil,
-			groupingLabel: "",
-			isError:       true,
-		},
-		// Pod is not a grouping object.
-		{
-			obj:           &pod2,
-			groupingLabel: "",
-			isError:       true,
-		},
-		// Retrieves label without preceding/trailing whitespace.
-		{
-			obj:           &groupingObjLabelWithSpace,
-			groupingLabel: "grouping-label",
-			isError:       false,
-		},
-		{
-			obj:           &groupingObj,
-			groupingLabel: testGroupingLabel,
-			isError:       false,
-		},
-	}
-
-	for _, test := range tests {
-		actual, err := retrieveGroupingLabel(test.obj)
-		if test.isError && err == nil {
-			t.Errorf("Did not receive expected error.\n")
-		}
-		if !test.isError {
-			if err != nil {
-				t.Fatalf("Received unexpected error: %s\n", err)
-			}
-			if test.groupingLabel != actual {
-				t.Errorf("Expected grouping label (%s), got (%s)\n", test.groupingLabel, actual)
-			}
-		}
-	}
-}
-
 func TestIsGroupingObject(t *testing.T) {
 	tests := []struct {
 		obj        runtime.Object

cmd/kubectl/kubectlcobra/inventory.go

@@ -6,7 +6,6 @@ package kubectlcobra
 
 import (
 	"fmt"
-	"sort"
 	"strings"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -71,9 +70,6 @@ func parseInventory(inv string) (*Inventory, error) {
 // Equals returns true if the Inventory structs are identical;
 // false otherwise.
 func (i *Inventory) Equals(other *Inventory) bool {
-	if other == nil {
-		return false
-	}
 	return i.String() == other.String()
 }
 
@@ -85,109 +81,3 @@ func (i *Inventory) String() string {
 		i.GroupKind.Group, fieldSeparator,
 		i.GroupKind.Kind)
 }
-
-// InventorySet encapsulates a grouping of unique Inventory
-// structs. Organizes the Inventory structs with a map,
-// which ensures there are no duplicates. Allows set
-// operations such as merging sets and subtracting sets.
-type InventorySet struct {
-	set map[string]*Inventory
-}
-
-// NewInventorySet returns a pointer to an InventorySet
-// struct grouping the passed Inventory items.
-func NewInventorySet(items []*Inventory) *InventorySet {
-	invSet := InventorySet{set: map[string]*Inventory{}}
-	invSet.AddItems(items)
-	return &invSet
-}
-
-// GetItems returns the set of pointers to Inventory
-// structs.
-func (is *InventorySet) GetItems() []*Inventory {
-	items := []*Inventory{}
-	for _, item := range is.set {
-		items = append(items, item)
-	}
-	return items
-}
-
-// AddItems adds Inventory structs to the set which
-// are not already in the set.
-func (is *InventorySet) AddItems(items []*Inventory) {
-	for _, item := range items {
-		if item != nil {
-			is.set[item.String()] = item
-		}
-	}
-}
-
-// DeleteItem removes an Inventory struct from the
-// set if it exists in the set. Returns true if the
-// Inventory item was deleted, false if it did not exist
-// in the set.
-func (is *InventorySet) DeleteItem(item *Inventory) bool {
-	if item == nil {
-		return false
-	}
-	if _, ok := is.set[item.String()]; ok {
-		delete(is.set, item.String())
-		return true
-	}
-	return false
-}
-
-// Merge combines the unique set of Inventory items from the
-// current set with the passed "other" set, returning a new
-// set or error. Returns an error if the passed set to merge
-// is nil.
-func (is *InventorySet) Merge(other *InventorySet) (*InventorySet, error) {
-	if other == nil {
-		return nil, fmt.Errorf("InventorySet to merge is nil.")
-	}
-	// Copy the current InventorySet into result
-	result := NewInventorySet(is.GetItems())
-	result.AddItems(other.GetItems())
-	return result, nil
-}
-
-// Subtract removes the Inventory items in the "other" set from the
-// current set, returning a new set. This does not modify the current
-// set. Returns an error if the passed set to subtract is nil.
-func (is *InventorySet) Subtract(other *InventorySet) (*InventorySet, error) {
-	if other == nil {
-		return nil, fmt.Errorf("InventorySet to subtract is nil.")
-	}
-	// Copy the current InventorySet into result
-	result := NewInventorySet(is.GetItems())
-	// Remove each item in "other" which exists in "result"
-	for _, item := range other.GetItems() {
-		result.DeleteItem(item)
-	}
-	return result, nil
-}
-
-// Equals returns true if the "other" inventory set is the same
-// as this current inventory set. Relies on the fact that the
-// inventory items are sorted for the String() function.
-func (is *InventorySet) Equals(other *InventorySet) bool {
-	if other == nil {
-		return false
-	}
-	return is.String() == other.String()
-}
-
-// String returns a string describing set of Inventory structs.
-func (is *InventorySet) String() string {
-	strs := []string{}
-	for _, item := range is.GetItems() {
-		strs = append(strs, item.String())
-	}
-	sort.Strings(strs)
-	return strings.Join(strs, ", ")
-}
-
-// Size returns the number of Inventory structs in the set.
-func (is *InventorySet) Size() int {
-	return len(is.set)
-}

cmd/kubectl/kubectlcobra/inventory_test.go

@@ -80,18 +80,6 @@ func TestInventoryEqual(t *testing.T) {
 		inventory2 *Inventory
 		isEqual    bool
 	}{
-		// "Other" inventory is nil, then not equal.
-		{
-			inventory1: &Inventory{
-				Name: "test-inv",
-				GroupKind: schema.GroupKind{
-					Group: "apps",
-					Kind:  "Deployment",
-				},
-			},
-			inventory2: nil,
-			isEqual:    false,
-		},
 		// Two equal inventories without a namespace
 		{
 			inventory1: &Inventory{
@@ -228,331 +216,3 @@ func TestParseInventory(t *testing.T) {
 		}
 	}
 }
-
-var inventory1 = Inventory{
-	Namespace: "test-namespace",
-	Name:      "test-inv-1",
-	GroupKind: schema.GroupKind{
-		Group: "apps",
-		Kind:  "Deployment",
-	},
-}
-
-var inventory2 = Inventory{
-	Namespace: "test-namespace",
-	Name:      "test-inv-2",
-	GroupKind: schema.GroupKind{
-		Group: "",
-		Kind:  "Pod",
-	},
-}
-
-var inventory3 = Inventory{
-	Namespace: "test-namespace",
-	Name:      "test-inv-3",
-	GroupKind: schema.GroupKind{
-		Group: "",
-		Kind:  "Service",
-	},
-}
-
-var inventory4 = Inventory{
-	Namespace: "test-namespace",
-	Name:      "test-inv-4",
-	GroupKind: schema.GroupKind{
-		Group: "apps",
-		Kind:  "DaemonSet",
-	},
-}
-
-func TestNewInventorySet(t *testing.T) {
-	tests := []struct {
-		items        []*Inventory
-		expectedStr  string
-		expectedSize int
-	}{
-		{
-			items:        []*Inventory{},
-			expectedStr:  "",
-			expectedSize: 0,
-		},
-		{
-			items:        []*Inventory{&inventory1},
-			expectedStr:  "test-namespace_test-inv-1_apps_Deployment",
-			expectedSize: 1,
-		},
-		{
-			items:        []*Inventory{&inventory1, &inventory2},
-			expectedStr:  "test-namespace_test-inv-1_apps_Deployment, test-namespace_test-inv-2__Pod",
-			expectedSize: 2,
-		},
-	}
-
-	for _, test := range tests {
-		invSet := NewInventorySet(test.items)
-		actualStr := invSet.String()
-		actualSize := invSet.Size()
-		if test.expectedStr != actualStr {
-			t.Errorf("Expected InventorySet (%s), got (%s)\n", test.expectedStr, actualStr)
-		}
-		if test.expectedSize != actualSize {
-			t.Errorf("Expected InventorySet size (%d), got (%d)\n", test.expectedSize, actualSize)
-		}
-		actualItems := invSet.GetItems()
-		if len(test.items) != len(actualItems) {
-			t.Errorf("Expected num inventory items (%d), got (%d)\n", len(test.items), len(actualItems))
-		}
-	}
-}
-
-func TestInventorySetAddItems(t *testing.T) {
-	tests := []struct {
-		initialItems  []*Inventory
-		addItems      []*Inventory
-		expectedItems []*Inventory
-	}{
-		// Adding no items to empty inventory set.
-		{
-			initialItems:  []*Inventory{},
-			addItems:      []*Inventory{},
-			expectedItems: []*Inventory{},
-		},
-		// Adding item to empty inventory set.
-		{
-			initialItems:  []*Inventory{},
-			addItems:      []*Inventory{&inventory1},
-			expectedItems: []*Inventory{&inventory1},
-		},
-		// Adding no items does not change the inventory set
-		{
-			initialItems:  []*Inventory{&inventory1},
-			addItems:      []*Inventory{},
-			expectedItems: []*Inventory{&inventory1},
-		},
-		// Adding an item which alread exists does not increase size.
-		{
-			initialItems:  []*Inventory{&inventory1, &inventory2},
-			addItems:      []*Inventory{&inventory1},
-			expectedItems: []*Inventory{&inventory1, &inventory2},
-		},
-		{
-			initialItems:  []*Inventory{&inventory1, &inventory2},
-			addItems:      []*Inventory{&inventory3, &inventory4},
-			expectedItems: []*Inventory{&inventory1, &inventory2, &inventory3, &inventory4},
-		},
-	}
-
-	for _, test := range tests {
-		invSet := NewInventorySet(test.initialItems)
-		invSet.AddItems(test.addItems)
-		if len(test.expectedItems) != invSet.Size() {
-			t.Errorf("Expected num inventory items (%d), got (%d)\n", len(test.expectedItems), invSet.Size())
-		}
-	}
-}
-
-func TestInventorySetDeleteItem(t *testing.T) {
-	tests := []struct {
-		initialItems  []*Inventory
-		deleteItem    *Inventory
-		expected      bool
-		expectedItems []*Inventory
-	}{
-		{
-			initialItems:  []*Inventory{},
-			deleteItem:    nil,
-			expected:      false,
-			expectedItems: []*Inventory{},
-		},
-		{
-			initialItems:  []*Inventory{},
-			deleteItem:    &inventory1,
-			expected:      false,
-			expectedItems: []*Inventory{},
-		},
-		{
-			initialItems:  []*Inventory{&inventory2},
-			deleteItem:    &inventory1,
-			expected:      false,
-			expectedItems: []*Inventory{&inventory2},
-		},
-		{
-			initialItems:  []*Inventory{&inventory1},
-			deleteItem:    &inventory1,
-			expected:      true,
-			expectedItems: []*Inventory{},
-		},
-		{
-			initialItems:  []*Inventory{&inventory1, &inventory2},
-			deleteItem:    &inventory1,
-			expected:      true,
-			expectedItems: []*Inventory{&inventory2},
-		},
-	}
-
-	for _, test := range tests {
-		invSet := NewInventorySet(test.initialItems)
-		actual := invSet.DeleteItem(test.deleteItem)
-		if test.expected != actual {
-			t.Errorf("Expected return value (%t), got (%t)\n", test.expected, actual)
-		}
-		if len(test.expectedItems) != invSet.Size() {
-			t.Errorf("Expected num inventory items (%d), got (%d)\n", len(test.expectedItems), invSet.Size())
-		}
-	}
-}
-
-func TestInventorySetMerge(t *testing.T) {
-	tests := []struct {
-		set1   []*Inventory
-		set2   []*Inventory
-		merged []*Inventory
-	}{
-		{
-			set1:   []*Inventory{},
-			set2:   []*Inventory{},
-			merged: []*Inventory{},
-		},
-		{
-			set1:   []*Inventory{},
-			set2:   []*Inventory{&inventory1},
-			merged: []*Inventory{&inventory1},
-		},
-		{
-			set1:   []*Inventory{&inventory1},
-			set2:   []*Inventory{},
-			merged: []*Inventory{&inventory1},
-		},
-		{
-			set1:   []*Inventory{&inventory1, &inventory2},
-			set2:   []*Inventory{&inventory1},
-			merged: []*Inventory{&inventory1, &inventory2},
-		},
-		{
-			set1:   []*Inventory{&inventory1, &inventory2},
-			set2:   []*Inventory{&inventory1, &inventory2},
-			merged: []*Inventory{&inventory1, &inventory2},
-		},
-		{
-			set1:   []*Inventory{&inventory1, &inventory2},
-			set2:   []*Inventory{&inventory3, &inventory4},
-			merged: []*Inventory{&inventory1, &inventory2, &inventory3, &inventory4},
-		},
-	}
-
-	for _, test := range tests {
-		invSet1 := NewInventorySet(test.set1)
-		invSet2 := NewInventorySet(test.set2)
-		expected := NewInventorySet(test.merged)
-		merged, _ := invSet1.Merge(invSet2)
-		if expected.Size() != merged.Size() {
-			t.Errorf("Expected merged inventory set size (%d), got (%d)\n", expected.Size(), merged.Size())
-		}
-	}
-}
-
-func TestInventorySetSubtract(t *testing.T) {
-	tests := []struct {
-		initialItems  []*Inventory
-		subtractItems []*Inventory
-		expected      []*Inventory
-	}{
-		{
-			initialItems:  []*Inventory{},
-			subtractItems: []*Inventory{},
-			expected:      []*Inventory{},
-		},
-		{
-			initialItems:  []*Inventory{},
-			subtractItems: []*Inventory{&inventory1},
-			expected:      []*Inventory{},
-		},
-		{
-			initialItems:  []*Inventory{&inventory1},
-			subtractItems: []*Inventory{},
-			expected:      []*Inventory{&inventory1},
-		},
-		{
-			initialItems:  []*Inventory{&inventory1, &inventory2},
-			subtractItems: []*Inventory{&inventory1},
-			expected:      []*Inventory{&inventory2},
-		},
-		{
-			initialItems:  []*Inventory{&inventory1, &inventory2},
-			subtractItems: []*Inventory{&inventory1, &inventory2},
-			expected:      []*Inventory{},
-		},
-		{
-			initialItems:  []*Inventory{&inventory1, &inventory2},
-			subtractItems: []*Inventory{&inventory3, &inventory4},
-			expected:      []*Inventory{&inventory1, &inventory2},
-		},
-	}
-
-	for _, test := range tests {
-		invInitialItems := NewInventorySet(test.initialItems)
-		invSubtractItems := NewInventorySet(test.subtractItems)
-		expected := NewInventorySet(test.expected)
-		actual, _ := invInitialItems.Subtract(invSubtractItems)
-		if expected.Size() != actual.Size() {
-			t.Errorf("Expected subtracted inventory set size (%d), got (%d)\n", expected.Size(), actual.Size())
-		}
-	}
-}
-
-func TestInventorySetEquals(t *testing.T) {
-	tests := []struct {
-		set1    []*Inventory
-		set2    []*Inventory
-		isEqual bool
-	}{
-		{
-			set1:    []*Inventory{},
-			set2:    []*Inventory{&inventory1},
-			isEqual: false,
-		},
-		{
-			set1:    []*Inventory{&inventory1},
-			set2:    []*Inventory{},
-			isEqual: false,
-		},
-		{
-			set1:    []*Inventory{&inventory1, &inventory2},
-			set2:    []*Inventory{&inventory1},
-			isEqual: false,
-		},
-		{
-			set1:    []*Inventory{&inventory1, &inventory2},
-			set2:    []*Inventory{&inventory3, &inventory4},
-			isEqual: false,
-		},
-		// Empty sets are equal.
-		{
-			set1:    []*Inventory{},
-			set2:    []*Inventory{},
-			isEqual: true,
-		},
-		{
-			set1:    []*Inventory{&inventory1},
-			set2:    []*Inventory{&inventory1},
-			isEqual: true,
-		},
-		// Ordering of the inventory items does not matter for equality.
-		{
-			set1:    []*Inventory{&inventory1, &inventory2},
-			set2:    []*Inventory{&inventory2, &inventory1},
-			isEqual: true,
-		},
-	}
-
-	for _, test := range tests {
-		invSet1 := NewInventorySet(test.set1)
-		invSet2 := NewInventorySet(test.set2)
-		if !invSet1.Equals(invSet2) && test.isEqual {
-			t.Errorf("Expected equal inventory sets; got unequal (%s)/(%s)\n", invSet1, invSet2)
-		}
-		if invSet1.Equals(invSet2) && !test.isEqual {
-			t.Errorf("Expected inequal inventory sets; got equal (%s)/(%s)\n", invSet1, invSet2)
-		}
-	}
-}

cmd/kubectl/kubectlcobra/printer_adapter.go

@@ -1,53 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package kubectlcobra
-
-import (
-	"io"
-
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/cli-runtime/pkg/printers"
-)
-
-// KubectlPrinterAdapter is a workaround for capturing progress from
-// ApplyOptions. ApplyOptions were originally meant to print progress
-// directly using a configurable printer. The KubectlPrinterAdapter
-// plugs into ApplyOptions as a ToPrinter function, but instead of
-// printing the info, it emits it as an event on the provided channel.
-type KubectlPrinterAdapter struct {
-	ch chan<- Event
-}
-
-// resourcePrinterImpl implements the ResourcePrinter interface. But
-// instead of printing, it emits information on the provided channel.
-type resourcePrinterImpl struct {
-	operation string
-	ch        chan<- Event
-}
-
-// PrintObj takes the provided object and operation and emits
-// it on the channel.
-func (r *resourcePrinterImpl) PrintObj(obj runtime.Object, _ io.Writer) error {
-	r.ch <- Event{
-		EventType: ApplyEventType,
-		ApplyEvent: ApplyEvent{
-			Operation: r.operation,
-			Object:    obj,
-		},
-	}
-	return nil
-}
-
-type toPrinterFunc func(string) (printers.ResourcePrinter, error)
-
-// toPrinterFunc returns a function of type toPrinterFunc. This
-// is the type required by the ApplyOptions.
-func (p *KubectlPrinterAdapter) toPrinterFunc() toPrinterFunc {
-	return func(operation string) (printers.ResourcePrinter, error) {
-		return &resourcePrinterImpl{
-			ch:        p.ch,
-			operation: operation,
-		}, nil
-	}
-}

cmd/kubectl/kubectlcobra/printer_adapter_test.go

@@ -1,49 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package kubectlcobra
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	appsv1 "k8s.io/api/apps/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-func TestKubectlPrinterAdapter(t *testing.T) {
-	ch := make(chan Event)
-	buffer := bytes.Buffer{}
-	operation := "operation"
-
-	adapter := KubectlPrinterAdapter{
-		ch: ch,
-	}
-
-	toPrinterFunc := adapter.toPrinterFunc()
-	resourcePrinter, err := toPrinterFunc(operation)
-	assert.NoError(t, err)
-
-	deployment := appsv1.Deployment{
-		TypeMeta: v1.TypeMeta{
-			APIVersion: "apps/v1",
-			Kind:       "Deployment",
-		},
-		ObjectMeta: v1.ObjectMeta{
-			Name:      "name",
-			Namespace: "namespace",
-		},
-	}
-
-	// Need to run this in a separate gorutine since go channels
-	// are blocking.
-	go func() {
-		err = resourcePrinter.PrintObj(&deployment, &buffer)
-	}()
-	msg := <-ch
-
-	assert.NoError(t, err)
-	assert.Equal(t, operation, msg.ApplyEvent.Operation)
-	assert.Equal(t, &deployment, msg.ApplyEvent.Object)
-}

cmd/kubectl/kubectlcobra/prune.go

@@ -1,258 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// package kubectlcobra contains cobra commands from kubectl
-package kubectlcobra
-
-import (
-	"fmt"
-	"io"
-	"strings"
-
-	"k8s.io/apimachinery/pkg/api/meta"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/cli-runtime/pkg/printers"
-	"k8s.io/cli-runtime/pkg/resource"
-	"k8s.io/client-go/dynamic"
-	"k8s.io/kubectl/pkg/cmd/apply"
-	"k8s.io/kubectl/pkg/cmd/util"
-	"k8s.io/kubectl/pkg/validation"
-)
-
-// PruneOptions encapsulates the necessary information to
-// implement the prune functionality.
-type PruneOptions struct {
-	client    dynamic.Interface
-	builder   *resource.Builder
-	mapper    meta.RESTMapper
-	namespace string
-	// The currently applied objects (as Infos), including the
-	// current grouping object. These objects are used to
-	// calculate the prune set after retreiving the previous
-	// grouping objects.
-	currentGroupingObject *resource.Info
-	// The set of retrieved grouping objects (as Infos) selected
-	// by the grouping label. This set should also include the
-	// current grouping object. Stored here to make testing
-	// easier by manually setting the retrieved grouping infos.
-	pastGroupingObjects      []*resource.Info
-	retrievedGroupingObjects bool
-
-	toPrinter func(string) (printers.ResourcePrinter, error)
-	out       io.Writer
-
-	validator validation.Schema
-
-	// TODO: DeleteOptions--cascade?
-}
-
-// NewPruneOptions returns a struct (PruneOptions) encapsulating the necessary
-// information to run the prune. Returns an error if an error occurs
-// gathering this information.
-// TODO: Add dry-run options.
-func NewPruneOptions(f util.Factory, ao *apply.ApplyOptions) (*PruneOptions, error) {
-
-	po := &PruneOptions{}
-	var err error
-	// Fields copied from ApplyOptions.
-	po.namespace = ao.Namespace
-	po.toPrinter = ao.ToPrinter
-	po.out = ao.Out
-	// Client/Builder fields from the Factory.
-	po.client, err = f.DynamicClient()
-	if err != nil {
-		return nil, err
-	}
-	po.builder = f.NewBuilder()
-	po.mapper, err = f.ToRESTMapper()
-	if err != nil {
-		return nil, err
-	}
-	po.validator, err = f.Validator(false)
-	if err != nil {
-		return nil, err
-	}
-	// Retrieve/store the grouping object for current apply.
-	currentObjects, err := ao.GetObjects()
-	if err != nil {
-		return nil, err
-	}
-	currentGroupingObject, found := findGroupingObject(currentObjects)
-	if !found {
-		return nil, fmt.Errorf("Current grouping object not found during prune.")
-	}
-	po.currentGroupingObject = currentGroupingObject
-	// Initialize past grouping objects as empty.
-	po.pastGroupingObjects = []*resource.Info{}
-	po.retrievedGroupingObjects = false
-
-	return po, nil
-}
-
-// getPreviousGroupingObjects returns the set of grouping objects
-// that have the same label as the current grouping object. Removes
-// the current grouping object from this set. Returns an error
-// if there is a problem retrieving the grouping objects.
-func (po *PruneOptions) getPreviousGroupingObjects() ([]*resource.Info, error) {
-
-	// Ensures the "pastGroupingObjects" is set.
-	if !po.retrievedGroupingObjects {
-		if err := po.retrievePreviousGroupingObjects(); err != nil {
-			return nil, err
-		}
-	}
-
-	// Remove the current grouping info from the previous grouping infos.
-	currentInventory, err := infoToInventory(po.currentGroupingObject)
-	if err != nil {
-		return nil, err
-	}
-	pastGroupInfos := []*resource.Info{}
-	for _, pastInfo := range po.pastGroupingObjects {
-		pastInventory, err := infoToInventory(pastInfo)
-		if err != nil {
-			return nil, err
-		}
-		if !currentInventory.Equals(pastInventory) {
-			pastGroupInfos = append(pastGroupInfos, pastInfo)
-		}
-	}
-	return pastGroupInfos, nil
-}
-
-// retrievePreviousGroupingObjects requests the previous grouping objects
-// using the grouping label from the current grouping object. Sets
-// the field "pastGroupingObjects". Returns an error if the grouping
-// label doesn't exist for the current currentGroupingObject does not
-// exist or if the call to retrieve the past grouping objects fails.
-func (po *PruneOptions) retrievePreviousGroupingObjects() error {
-	// Get the grouping label for this grouping object, and create
-	// a label selector from it.
-	if po.currentGroupingObject == nil || po.currentGroupingObject.Object == nil {
-		return fmt.Errorf("Missing current grouping object.\n")
-	}
-	groupingLabel, err := retrieveGroupingLabel(po.currentGroupingObject.Object)
-	if err != nil {
-		return err
-	}
-	labelSelector := fmt.Sprintf("%s=%s", GroupingLabel, groupingLabel)
-	retrievedGroupingInfos, err := po.builder.
-		Unstructured().
-		// TODO: Check if this validator is necessary.
-		Schema(po.validator).
-		ContinueOnError().
-		NamespaceParam(po.namespace).DefaultNamespace().
-		ResourceTypes("configmap").
-		LabelSelectorParam(labelSelector).
-		Flatten().
-		Do().
-		Infos()
-	if err != nil {
-		return err
-	}
-	po.pastGroupingObjects = retrievedGroupingInfos
-	po.retrievedGroupingObjects = true
-	return nil
-}
-
-// infoToInventory transforms the object represented by the passed "info"
-// into its Inventory representation. Returns error if the passed Info
-// is nil, or the Object in the Info is empty.
-func infoToInventory(info *resource.Info) (*Inventory, error) {
-	if info == nil || info.Object == nil {
-		return nil, fmt.Errorf("Empty resource.Info can not calculate as inventory.\n")
-	}
-	obj := info.Object
-	gk := obj.GetObjectKind().GroupVersionKind().GroupKind()
-	return createInventory(info.Namespace, info.Name, gk)
-}
-
-// unionPastInventory takes a set of grouping objects (infos), returning the
-// union of the objects referenced by these grouping objects as an
-// InventorySet. Returns an error if any of the passed objects are not
-// grouping objects, or if unable to retrieve the inventory from any
-// grouping object.
-func unionPastInventory(infos []*resource.Info) (*InventorySet, error) {
-	inventorySet := NewInventorySet([]*Inventory{})
-	for _, info := range infos {
-		inv, err := retrieveInventoryFromGroupingObj([]*resource.Info{info})
-		if err != nil {
-			return nil, err
-		}
-		inventorySet.AddItems(inv)
-	}
-	return inventorySet, nil
-}
-
-// calcPruneSet returns the InventorySet representing the objects to
-// delete (prune). pastGroupInfos are the set of past applied grouping
-// objects, storing the inventory of the objects applied at the same time.
-// Calculates the prune set as:
-//
-//   prune set = (prev1 U prev2 U ... U prevN) - (curr1, curr2, ..., currN)
-//
-// Returns an error if we are unable to retrieve the set of previously
-// applied objects, or if we are unable to get the currently applied objects
-// from the current grouping object.
-func (po *PruneOptions) calcPruneSet(pastGroupingInfos []*resource.Info) (*InventorySet, error) {
-	pastInventory, err := unionPastInventory(pastGroupingInfos)
-	if err != nil {
-		return nil, err
-	}
-	// Current grouping object as inventory set.
-	c := []*resource.Info{po.currentGroupingObject}
-	currentInv, err := retrieveInventoryFromGroupingObj(c)
-	if err != nil {
-		return nil, err
-	}
-	return pastInventory.Subtract(NewInventorySet(currentInv))
-}
-
-// Prune deletes the set of resources which were previously applied
-// (retrieved from previous grouping objects) but omitted in
-// the current apply. Prune also delete all previous grouping
-// objects. Returns an error if there was a problem.
-func (po *PruneOptions) Prune() error {
-
-	// Retrieve previous grouping objects, and calculate the
-	// union of the previous applies as an inventory set.
-	pastGroupingInfos, err := po.getPreviousGroupingObjects()
-	if err != nil {
-		return err
-	}
-	pruneSet, err := po.calcPruneSet(pastGroupingInfos)
-	if err != nil {
-		return err
-	}
-
-	// Delete the prune objects.
-	for _, inv := range pruneSet.GetItems() {
-		mapping, err := po.mapper.RESTMapping(inv.GroupKind)
-		if err != nil {
-			return err
-		}
-		err = po.client.Resource(mapping.Resource).Namespace(inv.Namespace).Delete(inv.Name, &metav1.DeleteOptions{})
-		if err != nil {
-			return err
-		}
-		fmt.Fprintf(po.out, "%s/%s deleted\n", strings.ToLower(inv.GroupKind.Kind), inv.Name)
-	}
-	// Delete previous grouping objects.
-	for _, pastGroupInfo := range pastGroupingInfos {
-		err = po.client.Resource(pastGroupInfo.Mapping.Resource).
-			Namespace(pastGroupInfo.Namespace).
-			Delete(pastGroupInfo.Name, &metav1.DeleteOptions{})
-		if err != nil {
-			return err
-		}
-		printer, err := po.toPrinter("deleted")
-		if err != nil {
-			return err
-		}
-		if err = printer.PrintObj(pastGroupInfo.Object, po.out); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

cmd/kubectl/kubectlcobra/prune_test.go

@@ -1,244 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// package kubectlcobra contains cobra commands from kubectl
-package kubectlcobra
-
-import (
-	"testing"
-
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/cli-runtime/pkg/resource"
-)
-
-var pod1Inv = &Inventory{
-	Namespace: testNamespace,
-	Name:      pod1Name,
-	GroupKind: schema.GroupKind{
-		Group: "",
-		Kind:  "Pod",
-	},
-}
-
-var pod2Inv = &Inventory{
-	Namespace: testNamespace,
-	Name:      pod2Name,
-	GroupKind: schema.GroupKind{
-		Group: "",
-		Kind:  "Pod",
-	},
-}
-
-var pod3Inv = &Inventory{
-	Namespace: testNamespace,
-	Name:      pod3Name,
-	GroupKind: schema.GroupKind{
-		Group: "",
-		Kind:  "Pod",
-	},
-}
-
-var groupingInv = &Inventory{
-	Namespace: testNamespace,
-	Name:      groupingObjName,
-	GroupKind: schema.GroupKind{
-		Group: "",
-		Kind:  "ConfigMap",
-	},
-}
-
-func TestInfoToInventory(t *testing.T) {
-	tests := map[string]struct {
-		info     *resource.Info
-		expected *Inventory
-		isError  bool
-	}{
-		"Nil info is an error": {
-			info:     nil,
-			expected: nil,
-			isError:  true,
-		},
-		"Nil info object is an error": {
-			info:     nilInfo,
-			expected: nil,
-			isError:  true,
-		},
-		"Pod 1 object becomes Pod 1 inventory": {
-			info:     pod1Info,
-			expected: pod1Inv,
-			isError:  false,
-		},
-		"Grouping object becomes grouping inventory": {
-			info:     copyGroupingInfo(),
-			expected: groupingInv,
-			isError:  false,
-		},
-	}
-
-	for name, test := range tests {
-		t.Run(name, func(t *testing.T) {
-			actual, err := infoToInventory(test.info)
-			if test.isError && err == nil {
-				t.Errorf("Did not receive expected error.\n")
-			}
-			if !test.isError {
-				if err != nil {
-					t.Errorf("Receieved unexpected error: %s\n", err)
-				}
-				if !test.expected.Equals(actual) {
-					t.Errorf("Expected inventory (%s), got (%s)\n", test.expected, actual)
-				}
-			}
-		})
-	}
-}
-
-// Returns a grouping object with the inventory set from
-// the passed "children".
-func createGroupingInfo(name string, children ...(*resource.Info)) *resource.Info {
-	groupingObjCopy := groupingObj.DeepCopy()
-	var groupingInfo = &resource.Info{
-		Namespace: testNamespace,
-		Name:      groupingObjName,
-		Object:    groupingObjCopy,
-	}
-	infos := []*resource.Info{groupingInfo}
-	infos = append(infos, children...)
-	_ = addInventoryToGroupingObj(infos)
-	return groupingInfo
-}
-
-func TestUnionPastInventory(t *testing.T) {
-	tests := map[string]struct {
-		groupingInfos []*resource.Info
-		expected      []*Inventory
-	}{
-		"Empty grouping objects = empty inventory set": {
-			groupingInfos: []*resource.Info{},
-			expected:      []*Inventory{},
-		},
-		"No children in grouping object, equals no inventory": {
-			groupingInfos: []*resource.Info{createGroupingInfo("test-1")},
-			expected:      []*Inventory{},
-		},
-		"Grouping object with Pod1 returns inventory with Pod1": {
-			groupingInfos: []*resource.Info{createGroupingInfo("test-1", pod1Info)},
-			expected:      []*Inventory{pod1Inv},
-		},
-		"Grouping object with three pods returns inventory with three pods": {
-			groupingInfos: []*resource.Info{
-				createGroupingInfo("test-1", pod1Info, pod2Info, pod3Info),
-			},
-			expected: []*Inventory{pod1Inv, pod2Inv, pod3Inv},
-		},
-		"Two grouping objects with different pods returns inventory with both pods": {
-			groupingInfos: []*resource.Info{
-				createGroupingInfo("test-1", pod1Info),
-				createGroupingInfo("test-2", pod2Info),
-			},
-			expected: []*Inventory{pod1Inv, pod2Inv},
-		},
-		"Two grouping objects with overlapping pods returns set of pods": {
-			groupingInfos: []*resource.Info{
-				createGroupingInfo("test-1", pod1Info, pod2Info),
-				createGroupingInfo("test-2", pod2Info, pod3Info),
-			},
-			expected: []*Inventory{pod1Inv, pod2Inv, pod3Inv},
-		},
-	}
-
-	for name, test := range tests {
-		t.Run(name, func(t *testing.T) {
-			actual, err := unionPastInventory(test.groupingInfos)
-			expected := NewInventorySet(test.expected)
-			if err != nil {
-				t.Errorf("Unexpected error received: %s\n", err)
-			}
-			if !expected.Equals(actual) {
-				t.Errorf("Expected inventory (%s), got (%s)\n", expected, actual)
-			}
-		})
-	}
-}
-
-func TestCalcPruneSet(t *testing.T) {
-	tests := map[string]struct {
-		past     []*resource.Info
-		current  *resource.Info
-		expected []*Inventory
-		isError  bool
-	}{
-		"Object not unstructured--error": {
-			past:     []*resource.Info{nonUnstructuredGroupingInfo},
-			current:  &resource.Info{},
-			expected: []*Inventory{},
-			isError:  true,
-		},
-		"No past group objects--no prune set": {
-
-			past:     []*resource.Info{},
-			current:  createGroupingInfo("test-1"),
-			expected: []*Inventory{},
-			isError:  false,
-		},
-		"Empty past grouping object--no prune set": {
-			past:     []*resource.Info{createGroupingInfo("test-1")},
-			current:  createGroupingInfo("test-1"),
-			expected: []*Inventory{},
-			isError:  false,
-		},
-		"Pod1 - Pod1 = empty set": {
-			past: []*resource.Info{
-				createGroupingInfo("test-1", pod1Info),
-			},
-			current:  createGroupingInfo("test-1", pod1Info),
-			expected: []*Inventory{},
-			isError:  false,
-		},
-		"(Pod1, Pod2) - Pod1 = Pod2": {
-			past: []*resource.Info{
-				createGroupingInfo("test-1", pod1Info, pod2Info),
-			},
-			current:  createGroupingInfo("test-1", pod1Info),
-			expected: []*Inventory{pod2Inv},
-			isError:  false,
-		},
-		"(Pod1, Pod2) - Pod2 = Pod1": {
-			past: []*resource.Info{
-				createGroupingInfo("test-1", pod1Info, pod2Info),
-			},
-			current:  createGroupingInfo("test-1", pod2Info),
-			expected: []*Inventory{pod1Inv},
-			isError:  false,
-		},
-		"(Pod1, Pod2, Pod3) - Pod2 = Pod1, Pod3": {
-			past: []*resource.Info{
-				createGroupingInfo("test-1", pod1Info, pod2Info),
-				createGroupingInfo("test-1", pod2Info, pod3Info),
-			},
-			current:  createGroupingInfo("test-1", pod2Info),
-			expected: []*Inventory{pod1Inv, pod3Inv},
-			isError:  false,
-		},
-	}
-
-	for name, test := range tests {
-		t.Run(name, func(t *testing.T) {
-			po := &PruneOptions{}
-			po.currentGroupingObject = test.current
-			actual, err := po.calcPruneSet(test.past)
-			expected := NewInventorySet(test.expected)
-			if test.isError && err == nil {
-				t.Errorf("Did not receive expected error.\n")
-			}
-			if !test.isError {
-				if err != nil {
-					t.Errorf("Unexpected error received: %s\n", err)
-				}
-				if !expected.Equals(actual) {
-					t.Errorf("Expected prune set (%s), got (%s)\n", expected, actual)
-				}
-			}
-		})
-	}
-}

cmd/kubectl/kubectlcobra/status.go

@@ -4,27 +4,102 @@
 package kubectlcobra
 
 import (
+	"context"
+	"fmt"
+	"strings"
 	"time"
 
 	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/resource"
+	"k8s.io/kubectl/pkg/cmd/util"
+	"k8s.io/kubectl/pkg/scheme"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/kustomize/kstatus/wait"
 )
 
-func NewStatusOptions() *StatusOptions {
-	return &StatusOptions{
-		wait:    false,
-		period:  2 * time.Second,
-		timeout: time.Minute,
-	}
-}
-
 type StatusOptions struct {
+	factory   util.Factory
+	ioStreams genericclioptions.IOStreams
+
 	wait    bool
 	period  time.Duration
 	timeout time.Duration
 }
 
+func newStatusOptions(factory util.Factory, ioStreams genericclioptions.IOStreams) *StatusOptions {
+	return &StatusOptions{
+		factory:   factory,
+		ioStreams: ioStreams,
+
+		wait:    false,
+		period:  2 * time.Second,
+		timeout: 1 * time.Minute,
+	}
+}
+
 func (s *StatusOptions) AddFlags(c *cobra.Command) {
 	c.Flags().BoolVar(&s.wait, "status", s.wait, "Wait for all applied resources to reach the Current status.")
 	c.Flags().DurationVar(&s.period, "status-period", s.period, "Polling period for resource statuses.")
 	c.Flags().DurationVar(&s.timeout, "status-timeout", s.timeout, "Timeout threshold for waiting for all resources to reach the Current status.")
 }
+
+func (s *StatusOptions) waitForStatus(infos []*resource.Info) error {
+	mapper, err := getRESTMapper(s.factory)
+	if err != nil {
+		return err
+	}
+
+	c, err := getClient(s.factory, mapper)
+	if err != nil {
+		return err
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), s.timeout)
+	defer cancel()
+
+	resolver := wait.NewResolver(c, mapper, s.period)
+	ch := resolver.WaitForStatus(ctx, infosToResourceIdentifiers(infos))
+
+	for msg := range ch {
+		switch msg.Type {
+		case wait.ResourceUpdate:
+			id := msg.EventResource.ResourceIdentifier
+			gk := id.GroupKind
+			fmt.Fprintf(s.ioStreams.Out, "%s/%s is %s: %s\n", strings.ToLower(gk.String()), id.Name, msg.EventResource.Status.String(), msg.EventResource.Message)
+		case wait.Completed:
+			fmt.Fprint(s.ioStreams.Out, "all resources has reached the Current status\n")
+		case wait.Aborted:
+			fmt.Fprintf(s.ioStreams.Out, "resources failed to the reached Current status after %s\n", s.timeout.String())
+		}
+	}
+	return nil
+}
+
+func infosToResourceIdentifiers(infos []*resource.Info) []wait.ResourceIdentifier {
+	var resources []wait.ResourceIdentifier
+	for _, info := range infos {
+		u := info.Object.(*unstructured.Unstructured)
+		resources = append(resources, wait.ResourceIdentifier{
+			GroupKind: u.GroupVersionKind().GroupKind(),
+			Namespace: u.GetNamespace(),
+			Name:      u.GetName(),
+		})
+	}
+	return resources
+}
+
+func getRESTMapper(f util.Factory) (meta.RESTMapper, error) {
+	return f.ToRESTMapper()
+}
+
+func getClient(f util.Factory, mapper meta.RESTMapper) (client.Reader, error) {
+	config, err := f.ToRESTConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	return client.New(config, client.Options{Scheme: scheme.Scheme, Mapper: mapper})
+}

cmd/resource/LICENSE_TEMPLATE

@@ -0,0 +1,2 @@
+Copyright {{.Year}} {{.Holder}}
+SPDX-License-Identifier: Apache-2.0

cmd/resource/Makefile

@@ -0,0 +1,39 @@
+# Copyright 2019 The Kubernetes Authors.
+# SPDX-License-Identifier: Apache-2.0
+
+.PHONY: generate license fix vet fmt test build tidy
+
+GOBIN := $(shell go env GOPATH)/bin
+
+build:
+	go build -v -o $(GOBIN)/resource .
+
+all: generate build license fix vet fmt test lint tidy
+
+fix:
+	go fix ./...
+
+fmt:
+	go fmt ./...
+
+generate:
+	(which $(GOBIN)/mdtogo || go get sigs.k8s.io/kustomize/cmd/mdtogo)
+	GOBIN=$(GOBIN) go generate ./...
+
+license:
+	(which $(GOBIN)/addlicense || go get github.com/google/addlicense)
+	$(GOBIN)/addlicense  -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
+
+tidy:
+	go mod tidy
+
+lint:
+	(which $(GOBIN)/golangci-lint || go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.19.1)
+	$(GOBIN)/golangci-lint run ./...
+
+test:
+	go test -cover ./...
+
+vet:
+	go vet ./...
+

cmd/resource/fixgomod.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# Copyright 2019 The Kubernetes Authors.
+# SPDX-License-Identifier: Apache-2.0
+
+set -e
+
+: "${kyaml_major?Need to source VERSIONS}"
+: "${kyaml_minor?Need to source VERSIONS}"
+: "${kyaml_patch?Need to source VERSIONS}"
+
+: "${kstatus_major?Need to source VERSIONS}"
+: "${kstatus_minor?Need to source VERSIONS}"
+: "${kstatus_patch?Need to source VERSIONS}"
+
+
+go mod edit -dropreplace=sigs.k8s.io/kustomize/kyaml@v0.0.0
+go mod edit -require=sigs.k8s.io/kustomize/kyaml@v$kyaml_major.$kyaml_minor.$kyaml_patch
+
+go mod edit -dropreplace=sigs.k8s.io/kustomize/kstatus@v0.0.0
+go mod edit -require=sigs.k8s.io/kustomize/kstatus@v$kstatus_major.$kstatus_minor.$kstatus_patch

cmd/resource/go.mod

@@ -0,0 +1,21 @@
+module sigs.k8s.io/kustomize/cmd/resource
+
+go 1.12
+
+require (
+	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
+	github.com/pkg/errors v0.8.1
+	github.com/spf13/cobra v0.0.5
+	github.com/stretchr/testify v1.4.0
+	k8s.io/api v0.17.0
+	k8s.io/apimachinery v0.17.0
+	k8s.io/client-go v0.17.0
+	sigs.k8s.io/controller-runtime v0.4.0
+	sigs.k8s.io/kustomize/kstatus v0.0.0
+	sigs.k8s.io/kustomize/kyaml v0.0.0
+)
+
+replace (
+	sigs.k8s.io/kustomize/kstatus v0.0.0 => ../../kstatus
+	sigs.k8s.io/kustomize/kyaml v0.0.0 => ../../kyaml
+)

cmd/resource/go.sum

@@ -0,0 +1,444 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
+github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs=
+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
+github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU=
+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
+github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM=
+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0=
+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY=
+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
+github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
+github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
+github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
+github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-logr/zapr v0.1.0 h1:h+WVe9j6HAA01niTJPA/kKH0i7e0rLZBCwauQFcRE54=
+github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk=
+github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
+github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
+github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
+github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
+github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
+github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
+github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
+github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
+github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
+github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
+github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
+github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
+github.com/go-openapi/spec v0.19.5 h1:Xm0Ao53uqnk9QE/LlYV5DEU09UAgpliA85QoT9LzqPw=
+github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
+github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
+github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
+github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
+github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
+github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 h1:u4bArs140e9+AfE52mFHOXVFnOSBJBRlzTHrOPLOIhE=
+github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk=
+github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
+github.com/gophercloud/gophercloud v0.1.0 h1:P/nh25+rzXouhytV2pUHBb65fnds26Ghl8/391+sT5o=
+github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
+github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.4.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.3.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+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/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
+github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
+github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca h1:1CFlNzQhALwjS9mBAUkycX616GzgsuYUOCHA5+HSlXI=
+github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180112015858-5ccada7d0a7b/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180117170059-2c42eef0765b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 h1:SW/0nsKCUaozCUtZTakri5laocGx/5bkDSSLrFUsa5s=
+golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gomodules.xyz/jsonpatch/v2 v2.0.1 h1:xyiBuvkD2g5n7cYzx6u2sxQvsAy4QJsZFCzGVdzOXZ0=
+gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
+gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
+gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.0.0/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d h1:LCPbGQ34PMrwad11aMZ+dbz5SAsq/0ySjRwQ8I9Qwd8=
+gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+k8s.io/api v0.0.0-20190918155943-95b840bb6a1f h1:8FRUST8oUkEI45WYKyD8ed7Ad0Kg5v11zHyPkEVb2xo=
+k8s.io/api v0.0.0-20190918155943-95b840bb6a1f/go.mod h1:uWuOHnjmNrtQomJrvEBg0c0HRNyQ+8KTEERVsK0PW48=
+k8s.io/api v0.17.0 h1:H9d/lw+VkZKEVIUc8F3wgiQ+FUXTTr21M87jXLU7yqM=
+k8s.io/api v0.17.0/go.mod h1:npsyOePkeP0CPwyGfXDHxvypiYMJxBWAMpQxCaJ4ZxI=
+k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783 h1:V6ndwCPoao1yZ52agqOKaUAl7DYWVGiXjV7ePA2i610=
+k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783/go.mod h1:xvae1SZB3E17UpV59AWc271W/Ph25N+bjPyR63X6tPY=
+k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 h1:CS1tBQz3HOXiseWZu6ZicKX361CZLT97UFnnPx0aqBw=
+k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4=
+k8s.io/apimachinery v0.17.0 h1:xRBnuie9rXcPxUkDizUsGvPf1cnlZCFu210op7J7LJo=
+k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
+k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad/go.mod h1:XPCXEwhjaFN29a8NldXA901ElnKeKLrLtREO9ZhFyhg=
+k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90 h1:mLmhKUm1X+pXu0zXMEzNsOF5E2kKFGe5o6BZBIIqA6A=
+k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90/go.mod h1:J69/JveO6XESwVgG53q3Uz5OSfgsv4uxpScmmyYOOlk=
+k8s.io/client-go v0.17.0 h1:8QOGvUGdqDMFrm9sD6IUFl256BcffynGoe80sxgTEDg=
+k8s.io/client-go v0.17.0/go.mod h1:TYgR6EUHs6k45hb6KWjVD6jFZvJV4gHDikv/It0xz+k=
+k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE=
+k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090/go.mod h1:933PBGtQFJky3TEwYx4aEPZ4IxqhWh3R6DCmzqIn1hA=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20191114184206-e782cd3c129f h1:GiPwtSzdP43eI1hpPCbROQCCIgCuiMMNF8YUVLF3vJo=
+k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
+modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
+modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
+modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
+modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
+sigs.k8s.io/controller-runtime v0.4.0 h1:wATM6/m+3w8lj8FXNaO6Fs/rq/vqoOjO1Q116Z9NPsg=
+sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
+sigs.k8s.io/testing_frameworks v0.1.2 h1:vK0+tvjF0BZ/RYFeZ1E6BYBwHJJXhjuZ3TdsEKH+UQM=
+sigs.k8s.io/testing_frameworks v0.1.2/go.mod h1:ToQrwSC3s8Xf/lADdZp3Mktcql9CG0UAmdJG9th5i0w=
+sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=

cmd/resource/main.go

@@ -0,0 +1,29 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	"os"
+
+	"github.com/spf13/cobra"
+
+	"sigs.k8s.io/kustomize/cmd/resource/status"
+
+	// This is here rather than in the libraries because of
+	// https://github.com/kubernetes-sigs/kustomize/issues/2060
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
+)
+
+var root = &cobra.Command{
+	Use:   "resource",
+	Short: "resource reference command",
+}
+
+func main() {
+	root.AddCommand(status.StatusCommand())
+
+	if err := root.Execute(); err != nil {
+		os.Exit(1)
+	}
+}

cmd/resource/status/cmd/events.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/status/generateddocs/commands"
+	"sigs.k8s.io/kustomize/cmd/resource/status/generateddocs/commands"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 )
 
@@ -54,7 +54,7 @@ type EventsRunner struct {
 func (r *EventsRunner) runE(c *cobra.Command, args []string) error {
 	ctx := context.Background()
 
-	resolver, mapper, err := r.newResolverFunc(r.Interval)
+	resolver, err := r.newResolverFunc(r.Interval)
 	if err != nil {
 		return errors.Wrap(err, "error creating resolver")
 	}
@@ -62,9 +62,7 @@ func (r *EventsRunner) runE(c *cobra.Command, args []string) error {
 	// Set up a CaptureIdentifierFilter and run all inputs through the
 	// filter with the pipeline to capture the inventory of resources
 	// which we are interested in.
-	captureFilter := &CaptureIdentifiersFilter{
-		Mapper: mapper,
-	}
+	captureFilter := &CaptureIdentifiersFilter{}
 	filters := []kio.Filter{captureFilter}
 
 	var inputs []kio.Reader

cmd/resource/status/cmd/events_test.go

@@ -200,11 +200,7 @@ func (e *EventOutput) allResources() []ResourceIdentifier {
 		if !event.isResourceUpdateEvent() {
 			continue
 		}
-		r := ResourceIdentifier{
-			namespace: event.namespace,
-			name:      event.name,
-			kind:      event.kind,
-		}
+		r := event.identifier
 		if _, found := seenResources[r]; !found {
 			resources = append(resources, r)
 			seenResources[r] = true
@@ -219,12 +215,7 @@ func (e *EventOutput) statusesForResource(resource ResourceIdentifier) []status.
 		if !event.isResourceUpdateEvent() {
 			continue
 		}
-		identifier := ResourceIdentifier{
-			namespace: event.namespace,
-			name:      event.name,
-			kind:      event.kind,
-		}
-		if identifier.Equals(resource) {
+		if event.identifier.Equals(resource) {
 			statuses = append(statuses, event.status)
 		}
 	}
@@ -232,36 +223,32 @@ func (e *EventOutput) statusesForResource(resource ResourceIdentifier) []status.
 }
 
 type EventOutputLine struct {
-	eventType wait.EventType
-	aggStatus status.Status
-	kind      string
-	namespace string
-	name      string
-	status    status.Status
-	message   string
+	eventType  string
+	aggStatus  status.Status
+	identifier ResourceIdentifier
+	status     status.Status
+	message    string
 }
 
 func (e *EventOutputLine) isResourceUpdateEvent() bool {
-	return e.eventType == wait.ResourceUpdate
+	return e.eventType == string(wait.ResourceUpdate)
 }
 
 var (
 	eventRegex = regexp.MustCompile(`^\s*` +
-		`(?P<aggStatus>(?:Current|InProgress|Failed|Terminating|Unknown))\s+` +
-		`(?P<message>.*\S)` +
-		`\s*$`)
-	resourceEventRegex = regexp.MustCompile(`^\s*` +
+		`(?P<eventType>\S+)\s+` +
+		`(?P<aggStatus>\S+)\s+` +
+		`((?P<resourceType>\S+)\s+` +
 		`(?P<namespace>\S+)\s+` +
-		`(?P<aggStatus>(?:Current|InProgress|Failed|Terminating|Unknown))\s+` +
-		`(?P<resourceType>\S+)\s+` +
 		`(?P<name>\S+)\s+` +
-		`(?P<status>(?:Current|InProgress|Failed|Terminating|Unknown))\s+` +
-		`(?P<message>.*\S)` +
+		`(?P<status>\S+)\s+` +
+		`(?P<message>.*\S)){0,1}` +
 		`\s*$`)
 	eventHeaderRegex = regexp.MustCompile(`^\s*` +
-		`NAMESPACE\s+` +
+		`EVENT TYPE\s+` +
 		`AGG STATUS\s+` +
 		`TYPE\s+` +
+		`NAMESPACE\s+` +
 		`NAME\s+` +
 		`STATUS\s+` +
 		`MESSAGE` +
@@ -275,43 +262,40 @@ func parseEventOutput(_ *testing.T, output string) EventOutput {
 		if len(line) == 0 {
 			continue // Ignore empty lines
 		}
-
 		match := eventHeaderRegex.FindStringSubmatch(line)
 		if match != nil {
 			continue // Ignore headers
 		}
-
 		match = eventRegex.FindStringSubmatch(line)
-		if match != nil {
-			aggStatus := status.FromStringOrDie(match[1])
-			var eventType wait.EventType
-			if aggStatus == status.CurrentStatus {
-				eventType = wait.Completed
-			} else {
-				eventType = wait.Aborted
-			}
-			eventOutput.events = append(eventOutput.events, EventOutputLine{
-				eventType: eventType,
-				aggStatus: aggStatus,
-				message:   match[2],
-			})
-		}
-
-		match = resourceEventRegex.FindStringSubmatch(line)
 		if match == nil {
 			eventOutput.unknownLines = append(eventOutput.unknownLines, line)
 			continue
 		}
 
-		eventOutput.events = append(eventOutput.events, EventOutputLine{
-			eventType: wait.ResourceUpdate,
+		eventOutputLine := EventOutputLine{
+			eventType: match[1],
 			aggStatus: status.FromStringOrDie(match[2]),
-			kind:      match[3],
-			namespace: match[1],
-			name:      match[4],
-			status:    status.FromStringOrDie(match[5]),
-			message:   match[6],
-		})
+		}
+
+		if eventOutputLine.eventType == string(wait.ResourceUpdate) {
+			resourceType := match[4]
+			parts := strings.Split(resourceType, "/")
+			var identifier ResourceIdentifier
+			if len(parts) == 2 {
+				identifier.apiVersion = parts[0]
+				identifier.kind = parts[1]
+			} else {
+				identifier.apiVersion = strings.Join(parts[:2], "/")
+				identifier.kind = parts[2]
+			}
+			identifier.namespace = match[5]
+			identifier.name = match[6]
+			eventOutputLine.identifier = identifier
+			eventOutputLine.status = status.FromStringOrDie(match[7])
+			eventOutputLine.message = match[8]
+		}
+
+		eventOutput.events = append(eventOutput.events, eventOutputLine)
 	}
 	return eventOutput
 }

cmd/resource/status/cmd/fetch.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kustomize/cmd/resource/status/generateddocs/commands"
 	"sigs.k8s.io/kustomize/kstatus/status"
 	"sigs.k8s.io/kustomize/kstatus/wait"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/status/generateddocs/commands"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 )
 
@@ -50,7 +50,7 @@ type FetchRunner struct {
 func (r *FetchRunner) runE(c *cobra.Command, args []string) error {
 	ctx := context.Background()
 
-	resolver, mapper, err := r.newResolverFunc(time.Minute)
+	resolver, err := r.newResolverFunc(time.Minute)
 	if err != nil {
 		return errors.Wrap(err, "error creating resolver")
 	}
@@ -58,9 +58,7 @@ func (r *FetchRunner) runE(c *cobra.Command, args []string) error {
 	// Set up a CaptureIdentifierFilter and run all inputs through the
 	// filter with the pipeline to capture the inventory of resources
 	// which we are interested in.
-	captureFilter := &CaptureIdentifiersFilter{
-		Mapper: mapper,
-	}
+	captureFilter := &CaptureIdentifiersFilter{}
 	filters := []kio.Filter{captureFilter}
 
 	var inputs []kio.Reader

cmd/resource/status/cmd/helpers_test.go

@@ -241,7 +241,7 @@ func (f *FakeClient) List(context.Context, runtime.Object, ...client.ListOption)
 }
 
 func fakeResolver(fakeClient client.Reader, mapperTypes ...schema.GroupVersionKind) newResolverFunc {
-	return func(pollInterval time.Duration) (*wait.Resolver, meta.RESTMapper, error) {
+	return func(pollInterval time.Duration) (*wait.Resolver, error) {
 		var groupVersions []schema.GroupVersion
 		for _, gvk := range mapperTypes {
 			groupVersions = append(groupVersions, gvk.GroupVersion())
@@ -251,7 +251,7 @@ func fakeResolver(fakeClient client.Reader, mapperTypes ...schema.GroupVersionKi
 			mapper.Add(gvk, meta.RESTScopeNamespace)
 		}
 
-		return wait.NewResolver(fakeClient, mapper, pollInterval), mapper, nil
+		return wait.NewResolver(fakeClient, mapper, pollInterval), nil
 	}
 }
 

cmd/resource/status/cmd/print.go

@@ -19,12 +19,11 @@ const (
 	statusColumn    = "status"
 	messageColumn   = "message"
 
-	RESET         = 0
-	ESC           = 27
-	RED     color = 31
-	GREEN   color = 32
-	YELLOW  color = 33
-	DEFAULT color = -1 // This is not a valid ANSI escape code. It is used here to mean that no color should be set.
+	ESC          = 27
+	RED    color = 31
+	GREEN  color = 32
+	YELLOW color = 33
+	WHITE  color = 37
 )
 
 type color int
@@ -37,6 +36,10 @@ func eraseCurrentLine(w io.Writer) {
 	printOrDie(w, "%c[2K\r", ESC)
 }
 
+func setColor(w io.Writer, color color) {
+	printOrDie(w, "%c[%dm", ESC, color)
+}
+
 type colorFunc func(s status.Status) color
 type contentFunc func(resource ResourceStatusData) string
 
@@ -48,7 +51,7 @@ type tableColumnInfo struct {
 }
 
 func defaultColorFunc(_ status.Status) color {
-	return DEFAULT
+	return WHITE
 }
 
 var (
@@ -134,6 +137,7 @@ func (s *TablePrinter) Print() {
 
 func (s *TablePrinter) PrintUntil(stop <-chan struct{}, interval time.Duration) <-chan struct{} {
 	completed := make(chan struct{})
+	setColor(s.out, WHITE)
 	s.printTable(s.statusInfo.CurrentStatus(), false)
 	go func() {
 		defer close(completed)
@@ -163,7 +167,9 @@ func (s *TablePrinter) printTable(data StatusData, deleteUp bool) {
 	eraseCurrentLine(s.out)
 	if s.showAggStatus {
 		printOrDie(s.out, "AggregateStatus: ")
-		printWithColorOrDie(s.out, colorForStatus(data.AggregateStatus), "%s\n", data.AggregateStatus)
+		setColor(s.out, colorForStatus(data.AggregateStatus))
+		printOrDie(s.out, "%s\n", data.AggregateStatus)
+		setColor(s.out, WHITE)
 	}
 	s.printTableRow(headers())
 	for _, resource := range data.ResourceStatuses {
@@ -173,12 +179,13 @@ func (s *TablePrinter) printTable(data StatusData, deleteUp bool) {
 
 func (s *TablePrinter) printTableRow(rowData []RowData) {
 	for i, row := range rowData {
-
+		setColor(s.out, row.color)
 		format := fmt.Sprintf("%%-%ds", row.width)
-		printWithColorOrDie(s.out, row.color, format, trimString(row.content, row.width))
+		printOrDie(s.out, format, trimString(row.content, row.width))
 		if i != len(rowData)-1 {
 			printOrDie(s.out, "  ")
 		}
+		setColor(s.out, WHITE)
 	}
 	printOrDie(s.out, "\n")
 }
@@ -195,7 +202,7 @@ func headers() []RowData {
 		column := tableColumns[columnName]
 		headers = append(headers, RowData{
 			content: column.header,
-			color:   DEFAULT,
+			color:   WHITE,
 			width:   column.width,
 		})
 	}
@@ -227,11 +234,11 @@ type eventColumnInfo struct {
 var (
 	eventColumns = []eventColumnInfo{
 		{
-			header:                     "NAMESPACE",
+			header:                     "EVENT TYPE",
 			width:                      15,
-			requireResourceUpdateEvent: true,
+			requireResourceUpdateEvent: false,
 			contentFunc: func(event wait.Event) string {
-				return event.EventResource.ResourceIdentifier.Namespace
+				return string(event.Type)
 			},
 		},
 		{
@@ -247,7 +254,16 @@ var (
 			width:                      20,
 			requireResourceUpdateEvent: true,
 			contentFunc: func(event wait.Event) string {
-				return event.EventResource.ResourceIdentifier.GroupKind.Kind
+				return fmt.Sprintf("%s/%s", event.EventResource.ResourceIdentifier.GroupKind.Group,
+					event.EventResource.ResourceIdentifier.GroupKind.Kind)
+			},
+		},
+		{
+			header:                     "NAMESPACE",
+			width:                      15,
+			requireResourceUpdateEvent: true,
+			contentFunc: func(event wait.Event) string {
+				return event.EventResource.ResourceIdentifier.Namespace
 			},
 		},
 		{
@@ -269,20 +285,12 @@ var (
 		{
 			header:                     "MESSAGE",
 			width:                      50,
-			requireResourceUpdateEvent: false,
+			requireResourceUpdateEvent: true,
 			contentFunc: func(event wait.Event) string {
-				switch event.Type {
-				case wait.ResourceUpdate:
-					if event.EventResource.Error != nil {
-						return event.EventResource.Error.Error()
-					}
-					return event.EventResource.Message
-				case wait.Aborted:
-					return fmt.Sprint("Operation aborted before all resources have become Current")
-				case wait.Completed:
-					return fmt.Sprint("All resources have become Current")
+				if event.EventResource.Error != nil {
+					return event.EventResource.Error.Error()
 				}
-				return ""
+				return event.EventResource.Message
 			},
 		},
 	}
@@ -307,14 +315,11 @@ func newEventPrinter(out io.Writer, err io.Writer) *EventPrinter {
 
 func (e *EventPrinter) printEvent(event wait.Event) {
 	for _, column := range eventColumns {
-		var text string
 		if event.Type != wait.ResourceUpdate && column.requireResourceUpdateEvent {
-			text = ""
-		} else {
-			text = trimString(column.contentFunc(event), column.width)
+			continue
 		}
 		format := fmt.Sprintf("%%-%ds  ", column.width)
-		printOrDie(e.out, format, text)
+		printOrDie(e.out, format, trimString(column.contentFunc(event), column.width))
 	}
 	printOrDie(e.out, "\n")
 }
@@ -326,26 +331,18 @@ func printOrDie(w io.Writer, format string, a ...interface{}) {
 	}
 }
 
-func printWithColorOrDie(w io.Writer, color color, format string, a ...interface{}) {
-	if color == DEFAULT {
-		printOrDie(w, format, a...)
-	} else {
-		printOrDie(w, "%c[%dm", ESC, color)
-		printOrDie(w, format, a...)
-		printOrDie(w, "%c[%dm", ESC, RESET)
-	}
-}
-
 func colorForStatus(s status.Status) color {
 	switch s {
 	case status.CurrentStatus:
 		return GREEN
+	case status.UnknownStatus:
+		return WHITE
 	case status.InProgressStatus:
 		return YELLOW
 	case status.FailedStatus:
 		return RED
 	}
-	return DEFAULT
+	return WHITE
 }
 
 func trimString(str string, maxLength int) string {

cmd/resource/status/cmd/util.go

@@ -6,7 +6,6 @@ package cmd
 import (
 	"time"
 
-	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -26,74 +25,53 @@ func init() {
 	_ = clientgoscheme.AddToScheme(scheme)
 }
 
-type newResolverFunc func(pollInterval time.Duration) (*wait.Resolver, meta.RESTMapper, error)
+type newResolverFunc func(pollInterval time.Duration) (*wait.Resolver, error)
 
 // newResolver returns a new resolver that can resolve status for resources based
 // on polling the cluster.
-func newResolver(pollInterval time.Duration) (*wait.Resolver, meta.RESTMapper, error) {
+func newResolver(pollInterval time.Duration) (*wait.Resolver, error) {
 	config := ctrl.GetConfigOrDie()
 	mapper, err := apiutil.NewDiscoveryRESTMapper(config)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	c, err := client.New(config, client.Options{Scheme: scheme, Mapper: mapper})
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
-	return wait.NewResolver(c, mapper, pollInterval), mapper, nil
+	return wait.NewResolver(c, mapper, pollInterval), nil
 }
 
 // CaptureIdentifiersFilter implements the Filter interface in the kio package. It
 // captures the identifiers for all resources passed through the pipeline.
 type CaptureIdentifiersFilter struct {
 	Identifiers []wait.ResourceIdentifier
-	Mapper      meta.RESTMapper
 }
 
 var _ kio.Filter = &CaptureIdentifiersFilter{}
 
 func (f *CaptureIdentifiersFilter) Filter(slice []*yaml.RNode) ([]*yaml.RNode, error) {
 	for i := range slice {
-		objectMeta, err := slice[i].GetMeta()
+		meta, err := slice[i].GetMeta()
 		if err != nil {
 			return nil, err
 		}
 		// TODO(mortent): Update kyaml library
-		id := objectMeta.GetIdentifier()
+		id := meta.GetIdentifier()
 		gv, err := schema.ParseGroupVersion(id.APIVersion)
 		if err != nil {
 			return nil, err
 		}
-		gk := schema.GroupKind{
-			Group: gv.Group,
-			Kind:  id.Kind,
-		}
-		mapping, err := f.Mapper.RESTMapping(gk)
-		if err != nil {
-			return nil, err
-		}
-		var namespace string
-		if mapping.Scope.Name() == meta.RESTScopeNameNamespace && id.Namespace == "" {
-			namespace = "default"
-		} else {
-			namespace = id.Namespace
-		}
-		if IsValidKubernetesResource(id) {
-			f.Identifiers = append(f.Identifiers, wait.ResourceIdentifier{
-				Name:      id.Name,
-				Namespace: namespace,
-				GroupKind: schema.GroupKind{
-					Group: gv.Group,
-					Kind:  id.Kind,
-				},
-			})
-		}
+		f.Identifiers = append(f.Identifiers, wait.ResourceIdentifier{
+			Name:      id.Name,
+			Namespace: id.Namespace,
+			GroupKind: schema.GroupKind{
+				Group: gv.Group,
+				Kind:  id.Kind,
+			},
+		})
 	}
 	return slice, nil
 }
-
-func IsValidKubernetesResource(id yaml.ResourceIdentifier) bool {
-	return id.GetKind() != "" && id.GetAPIVersion() != "" && id.GetName() != ""
-}

cmd/resource/status/cmd/wait.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kustomize/cmd/resource/status/generateddocs/commands"
 	"sigs.k8s.io/kustomize/kstatus/status"
 	"sigs.k8s.io/kustomize/kstatus/wait"
-	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/status/generateddocs/commands"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 )
 
@@ -60,14 +60,12 @@ type WaitRunner struct {
 func (r *WaitRunner) runE(c *cobra.Command, args []string) error {
 	ctx := context.Background()
 
-	resolver, mapper, err := r.newResolverFunc(r.Interval)
+	resolver, err := r.newResolverFunc(r.Interval)
 	if err != nil {
 		return errors.Wrap(err, "errors creating resolver")
 	}
 
-	captureFilter := &CaptureIdentifiersFilter{
-		Mapper: mapper,
-	}
+	captureFilter := &CaptureIdentifiersFilter{}
 	filters := []kio.Filter{captureFilter}
 
 	var inputs []kio.Reader