From f051acb83c559a9f22bc5fec18d43e421fc2d9a4 Mon Sep 17 00:00:00 2001
From: jregan <jregan@google.com>
Date: Sun, 23 Aug 2020 11:58:28 -0700
Subject: [PATCH] Clean up option construction.

---
 .../{validators.go => kustvalidator.go}          |  0
 api/krusty/options.go                            |  3 ++-
 api/testutils/kusttest/harness.go                | 16 ++++++----------
 kustomize/internal/commands/build/build.go       | 15 ++++-----------
 4 files changed, 12 insertions(+), 22 deletions(-)
 rename api/k8sdeps/validator/{validators.go => kustvalidator.go} (100%)

diff --git a/api/k8sdeps/validator/validators.go b/api/k8sdeps/validator/kustvalidator.go
similarity index 100%
rename from api/k8sdeps/validator/validators.go
rename to api/k8sdeps/validator/kustvalidator.go
diff --git a/api/krusty/options.go b/api/krusty/options.go
index cf4b5c7aa..44d61fc87 100644
--- a/api/krusty/options.go
+++ b/api/krusty/options.go
@@ -37,7 +37,8 @@ type Options struct {
 // MakeDefaultOptions returns a default instance of Options.
 func MakeDefaultOptions() *Options {
 	return &Options{
-		DoLegacyResourceSort: true,
+		DoLegacyResourceSort: false,
+		AddManagedbyLabel:    false,
 		LoadRestrictions:     types.LoadRestrictionsRootOnly,
 		DoPrune:              false,
 		PluginConfig:         konfig.DisabledPluginConfig(),
diff --git a/api/testutils/kusttest/harness.go b/api/testutils/kusttest/harness.go
index d79e40e82..f1d8706ac 100644
--- a/api/testutils/kusttest/harness.go
+++ b/api/testutils/kusttest/harness.go
@@ -16,7 +16,7 @@ import (
 	"sigs.k8s.io/kustomize/api/types"
 )
 
-// Harness manages a kustomize environment for tests.
+// Harness manages a test environment.
 type Harness struct {
 	t    *testing.T
 	fSys filesys.FileSystem
@@ -72,15 +72,12 @@ func (th Harness) MakeDefaultOptions() krusty.Options {
 
 // This has no impact on Builtin plugins, as they are always enabled.
 func (th Harness) MakeOptionsPluginsDisabled() krusty.Options {
-	return krusty.Options{
-		LoadRestrictions: types.LoadRestrictionsRootOnly,
-		PluginConfig:     konfig.DisabledPluginConfig(),
-	}
+	return *krusty.MakeDefaultOptions()
 }
 
 // Enables use of non-builtin plugins.
 func (th Harness) MakeOptionsPluginsEnabled() krusty.Options {
-	c, err := konfig.EnabledPluginConfig(types.BploLoadFromFileSys)
+	pc, err := konfig.EnabledPluginConfig(types.BploLoadFromFileSys)
 	if err != nil {
 		if strings.Contains(err.Error(), "unable to find plugin root") {
 			th.t.Log(
@@ -89,10 +86,9 @@ func (th Harness) MakeOptionsPluginsEnabled() krusty.Options {
 		}
 		th.t.Fatal(err)
 	}
-	return krusty.Options{
-		LoadRestrictions: types.LoadRestrictionsRootOnly,
-		PluginConfig:     c,
-	}
+	o := *krusty.MakeDefaultOptions()
+	o.PluginConfig = pc
+	return o
 }
 
 // Run, failing on error.
diff --git a/kustomize/internal/commands/build/build.go b/kustomize/internal/commands/build/build.go
index 9349e9cd0..7f9f323db 100644
--- a/kustomize/internal/commands/build/build.go
+++ b/kustomize/internal/commands/build/build.go
@@ -120,25 +120,18 @@ func (o *Options) Validate(args []string) (err error) {
 }
 
 func (o *Options) makeOptions() *krusty.Options {
-	opts := &krusty.Options{
-		DoLegacyResourceSort: o.outOrder == legacy,
-		LoadRestrictions:     getFlagLoadRestrictorValue(),
-	}
+	opts := krusty.MakeDefaultOptions()
+	opts.DoLegacyResourceSort = o.outOrder == legacy
+	opts.LoadRestrictions = getFlagLoadRestrictorValue()
 	if isFlagEnablePluginsSet() {
 		c, err := konfig.EnabledPluginConfig(types.BploUseStaticallyLinked)
 		if err != nil {
 			log.Fatal(err)
 		}
-
 		c.FnpLoadingOptions = o.fnOptions
-
 		opts.PluginConfig = c
-	} else {
-		opts.PluginConfig = konfig.DisabledPluginConfig()
-	}
-	if isManagedbyLabelEnabled() {
-		opts.AddManagedbyLabel = true
 	}
+	opts.AddManagedbyLabel = isManagedbyLabelEnabled()
 	return opts
 }