Drain the top level internal.

api/builtinconfig/loaddefaultconfig_test.go

@@ -7,9 +7,9 @@ import (
 	"reflect"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 )
 
 func TestLoadDefaultConfigsFromFiles(t *testing.T) {

api/internal/accumulator/expansion/expand_test.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/api/accumulator/expansion"
+	. "sigs.k8s.io/kustomize/v3/api/internal/accumulator/expansion"
 )
 
 type expected struct {

api/internal/accumulator/loadconfigfromcrds_test.go

@@ -7,12 +7,12 @@ import (
 	"reflect"
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/api/accumulator"
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/ifc"
+	. "sigs.k8s.io/kustomize/v3/api/internal/accumulator"
+	"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 )
 
 // This defines two CRD's:  Bee and MyKind.

api/internal/accumulator/refvartransformer.go

@@ -6,7 +6,8 @@ package accumulator
 import (
 	"fmt"
 
-	"sigs.k8s.io/kustomize/v3/api/accumulator/expansion"
+	expansion2 "sigs.k8s.io/kustomize/v3/api/internal/accumulator/expansion"
+
 	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/api/types"
@@ -39,7 +40,7 @@ func (rv *refVarTransformer) replaceVars(in interface{}) (interface{}, error) {
 	case []interface{}:
 		var xs []interface{}
 		for _, a := range in.([]interface{}) {
-			xs = append(xs, expansion.Expand(a.(string), rv.mappingFunc))
+			xs = append(xs, expansion2.Expand(a.(string), rv.mappingFunc))
 		}
 		return xs, nil
 	case map[string]interface{}:
@@ -56,7 +57,7 @@ func (rv *refVarTransformer) replaceVars(in interface{}) (interface{}, error) {
 				// This field can potentially contains a $(VAR) since it is
 				// of string type. For instance .spec.replicas: $(REPLICAS)
 				// in a Deployment object
-				xs[k] = expansion.Expand(s, rv.mappingFunc)
+				xs[k] = expansion2.Expand(s, rv.mappingFunc)
 			}
 		}
 		return xs, nil
@@ -68,7 +69,7 @@ func (rv *refVarTransformer) replaceVars(in interface{}) (interface{}, error) {
 		}
 		// This field can potentially contain a $(VAR) since it is
 		// of string type.
-		return expansion.Expand(s, rv.mappingFunc), nil
+		return expansion2.Expand(s, rv.mappingFunc), nil
 	case nil:
 		return nil, nil
 	default:
@@ -92,7 +93,7 @@ func (rv *refVarTransformer) UnusedVars() []string {
 // Transform replaces $(VAR) style variables with values.
 func (rv *refVarTransformer) Transform(m resmap.ResMap) error {
 	rv.replacementCounts = make(map[string]int)
-	rv.mappingFunc = expansion.MappingFuncFor(
+	rv.mappingFunc = expansion2.MappingFuncFor(
 		rv.replacementCounts, rv.varMap)
 	for _, res := range m.Resources() {
 		for _, fieldSpec := range rv.fieldSpecs {

api/internal/accumulator/resaccumulator_test.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/api/accumulator"
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
+	. "sigs.k8s.io/kustomize/v3/api/internal/accumulator"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/resource"

api/internal/kusterr/yamlformaterror.go

@@ -1,18 +1,5 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
 // Package error has contextual error types.
 package kusterr

api/internal/kusterr/yamlformaterror_test.go

@@ -1,18 +1,5 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
 package kusterr
 

api/loader/fileloader.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/git"
 	"sigs.k8s.io/kustomize/v3/api/ifc"
-	"sigs.k8s.io/kustomize/v3/api/internal/git"
 )
 
 // fileLoader is a kustomization's interface to files.

api/loader/fileloader_test.go

@@ -13,8 +13,8 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/git"
 	"sigs.k8s.io/kustomize/v3/api/ifc"
-	"sigs.k8s.io/kustomize/v3/api/internal/git"
 	"sigs.k8s.io/kustomize/v3/api/pgmconfig"
 )
 

api/loader/loader.go

@@ -6,8 +6,8 @@ package loader
 
 import (
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/git"
 	"sigs.k8s.io/kustomize/v3/api/ifc"
-	"sigs.k8s.io/kustomize/v3/api/internal/git"
 )
 
 // NewLoader returns a Loader pointed at the given target.

api/plugins/execplugin/execplugin_test.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/api/plugins/config"
 	. "sigs.k8s.io/kustomize/v3/api/plugins/execplugin"
 	"sigs.k8s.io/kustomize/v3/api/plugins/loader"
@@ -15,7 +16,6 @@ import (
 	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 )
 

api/plugins/loader/loader_test.go

@@ -6,13 +6,13 @@ package loader_test
 import (
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/api/plugins/config"
 	. "sigs.k8s.io/kustomize/v3/api/plugins/loader"
 	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
-	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 )
 

api/resmap/factory.go

@@ -6,9 +6,9 @@ package resmap
 import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/v3/api/internal/kusterr"
 	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/internal/kusterr"
 )
 
 // Factory makes instances of ResMap.

api/resmap/factory_test.go

@@ -12,13 +12,13 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
 	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/api/kv"
 	"sigs.k8s.io/kustomize/v3/api/loader"
 	. "sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
 	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 )
 
 func TestFromFile(t *testing.T) {

api/resource/factory.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/v3/api/internal/kusterr"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/internal/kusterr"
 )
 
 // Factory makes instances of Resource.

api/resource/factory_test.go

@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
 	. "sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 )
 
 func TestSliceFromPatches(t *testing.T) {

api/target/kusttarget.go

@@ -13,9 +13,9 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"sigs.k8s.io/kustomize/v3/api/accumulator"
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/v3/api/internal/accumulator"
 	"sigs.k8s.io/kustomize/v3/api/pgmconfig"
 	"sigs.k8s.io/kustomize/v3/api/plugins/builtins"
 	"sigs.k8s.io/kustomize/v3/api/plugins/loader"

api/target/kusttarget_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/resource"
@@ -17,7 +18,6 @@ import (
 	"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
 	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 )
 
 const (

api/testutils/kusttest/kusttestharness.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig/consts"
+	"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
 	fLdr "sigs.k8s.io/kustomize/v3/api/loader"
 	"sigs.k8s.io/kustomize/v3/api/pgmconfig"
 	"sigs.k8s.io/kustomize/v3/api/plugins/config"
@@ -19,7 +20,6 @@ import (
 	"sigs.k8s.io/kustomize/v3/api/target"
 	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/transformer"
 )

hacks/crawl/crawler/crawler_test.go

@@ -339,7 +339,7 @@ resources:
 				}, nil
 			},
 			func(d CrawledDocument, cr Crawler) error {
-				visited[d.ID()]++
+				visited[ID()]++
 				return nil
 			},
 		)

hacks/crawl/crawler/github/crawler.go

@@ -122,7 +122,7 @@ func (gc githubCrawler) FetchDocument(ctx context.Context, d *doc.Document) erro
 		return nil
 	}
 
-	for _, file := range pgmconfig.KustomizationFileNames {
+	for _, file := range pgmconfig.RecognizedKustomizationFileNames() {
 		resp, err = gc.client.GetRawUserContent(url + "/" + file)
 		err := handle(resp, err, "/"+file)
 		if err != nil {

hacks/crawl/crawler/github/split_search_ranges_test.go

@@ -20,7 +20,7 @@ func (c testCachedSearch) CountResults(upperBound uint64) (uint64, error) {
 }
 
 func (c testCachedSearch) RequestString(filesize rangeFormatter) string {
-	return filesize.RangeString()
+	return RangeString()
 }
 
 // TODO(damienr74) make tests easier to write.. I'm thinking I can make the test

hacks/crawl/doc/doc.go

@@ -47,7 +47,7 @@ type set map[string]struct{}
 // Implements the CrawlerDocument interface.
 func (doc *KustomizationDocument) GetResources() ([]*Document, error) {
 	isResource := true
-	for _, suffix := range pgmconfig.KustomizationFileNames {
+	for _, suffix := range pgmconfig.RecognizedKustomizationFileNames() {
 		if strings.HasSuffix(doc.FilePath, "/"+suffix) {
 			isResource = false
 		}
@@ -86,7 +86,7 @@ func (doc *KustomizationDocument) GetResources() ([]*Document, error) {
 func (doc *KustomizationDocument) readBytes() ([]map[string]interface{}, error) {
 	data := []byte(doc.DocumentData)
 
-	for _, suffix := range pgmconfig.KustomizationFileNames {
+	for _, suffix := range pgmconfig.RecognizedKustomizationFileNames() {
 		if !strings.HasSuffix(doc.FilePath, "/"+suffix) {
 			continue
 		}

hacks/crawl/doc/docname.go

@@ -4,7 +4,7 @@ import (
 	"path"
 	"time"
 
-	"sigs.k8s.io/kustomize/v3/api/internal/git"
+	"sigs.k8s.io/kustomize/v3/api/git"
 )
 
 type Document struct {