From d8585334ccdf884eb0762ddd82a401801baa7f5e Mon Sep 17 00:00:00 2001
From: Jingfang Liu <jingfangliu@google.com>
Date: Mon, 4 Feb 2019 09:44:33 -0800
Subject: [PATCH] minor fix: incorrect apiVersion and add NoOpTransformer for
 vars (#757)

---
 pkg/target/generatoroptions_test.go | 4 ++--
 pkg/target/nullvalues_test.go       | 2 +-
 pkg/transformers/refvars.go         | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/target/generatoroptions_test.go b/pkg/target/generatoroptions_test.go
index 5836446fd..e3c81c1ee 100644
--- a/pkg/target/generatoroptions_test.go
+++ b/pkg/target/generatoroptions_test.go
@@ -20,7 +20,7 @@ import (
 func TestGeneratorOptionsWithBases(t *testing.T) {
 	th := NewKustTestHarness(t, "/app/overlay")
 	th.writeK("/app/base", `
-apiVersion: v1beta1
+apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 generatorOptions:
   disableNameSuffixHash: true
@@ -32,7 +32,7 @@ configMapGenerator:
   - foo=bar
 `)
 	th.writeK("/app/overlay", `
-apiVersion: v1beta1
+apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
 - ../base
diff --git a/pkg/target/nullvalues_test.go b/pkg/target/nullvalues_test.go
index 06ca1ddc0..f04cfb932 100644
--- a/pkg/target/nullvalues_test.go
+++ b/pkg/target/nullvalues_test.go
@@ -44,7 +44,7 @@ spec:
         name: example
 `)
 	th.writeF("/app/kustomization.yaml", `
-apiVersion: v1beta1
+apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - deployment.yaml
diff --git a/pkg/transformers/refvars.go b/pkg/transformers/refvars.go
index 3e2d18523..1d35c9602 100644
--- a/pkg/transformers/refvars.go
+++ b/pkg/transformers/refvars.go
@@ -18,6 +18,9 @@ type refvarTransformer struct {
 // The fieldSpecs are the places to look for occurrences of $(VAR).
 func NewRefVarTransformer(
 	varMap map[string]string, fs []config.FieldSpec) Transformer {
+	if len(varMap) == 0 {
+		return NewNoOpTransformer()
+	}
 	return &refvarTransformer{
 		fieldSpecs:  fs,
 		mappingFunc: expansion.MappingFuncFor(varMap),