From 7295a9b32e692a11d915afa142ec8a9c5ab7ba23 Mon Sep 17 00:00:00 2001
From: Jeffrey Regan <jregan@google.com>
Date: Tue, 7 May 2019 17:56:48 -0700
Subject: [PATCH] Fix some nits.

---
 pkg/resmap/legacygeneratorargs.go | 10 +++++-----
 plugin/builtin/SecretGenerator.go |  8 +++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkg/resmap/legacygeneratorargs.go b/pkg/resmap/legacygeneratorargs.go
index 2178c1e50..f98f0a8e8 100644
--- a/pkg/resmap/legacygeneratorargs.go
+++ b/pkg/resmap/legacygeneratorargs.go
@@ -12,26 +12,26 @@ func GeneratorArgsFromKunstruct(k ifc.Kunstructured) (
 	result.Name = k.GetName()
 	// TODO: validate behavior values.
 	result.Behavior, err = k.GetFieldValue("behavior")
-	if !isAcceptableError(err) {
+	if !IsAcceptableError(err) {
 		return
 	}
 	result.EnvSources, err = k.GetStringSlice("envFiles")
-	if !isAcceptableError(err) {
+	if !IsAcceptableError(err) {
 		return
 	}
 	result.FileSources, err = k.GetStringSlice("valueFiles")
-	if !isAcceptableError(err) {
+	if !IsAcceptableError(err) {
 		return
 	}
 	result.LiteralSources, err = k.GetStringSlice("literals")
-	if !isAcceptableError(err) {
+	if !IsAcceptableError(err) {
 		return
 	}
 	err = nil
 	return
 }
 
-func isAcceptableError(err error) bool {
+func IsAcceptableError(err error) bool {
 	return err == nil ||
 		strings.HasPrefix(err.Error(), "no field named")
 }
diff --git a/plugin/builtin/SecretGenerator.go b/plugin/builtin/SecretGenerator.go
index 96be2e77e..22188306f 100644
--- a/plugin/builtin/SecretGenerator.go
+++ b/plugin/builtin/SecretGenerator.go
@@ -25,9 +25,11 @@ func (p *plugin) Config(
 	if err != nil {
 		return
 	}
-	// Ignore missing type - it defaults.
-	p.args.Type, _ = k.GetFieldValue("type")
-	return
+	p.args.Type, err = k.GetFieldValue("type")
+	if !resmap.IsAcceptableError(err) {
+		return
+	}
+	return nil
 }
 
 func (p *plugin) Generate() (resmap.ResMap, error) {