From 1242e084733e55cc9d4e8a90c5ee518682ba3a67 Mon Sep 17 00:00:00 2001 From: Jurnell Cockhren Date: Sun, 21 Jan 2018 00:35:04 -0600 Subject: [PATCH] fix(salt-masterless): Compare retrieved variable values with defaults --- .../provisioners/salt-masterless/resource_provisioner.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/provisioners/salt-masterless/resource_provisioner.go b/builtin/provisioners/salt-masterless/resource_provisioner.go index 60486e5caa..0be7ed008f 100644 --- a/builtin/provisioners/salt-masterless/resource_provisioner.go +++ b/builtin/provisioners/salt-masterless/resource_provisioner.go @@ -424,7 +424,7 @@ func validateFn(c *terraform.ResourceConfig) (ws []string, es []error) { var remoteStateTree string remoteStateTreeTmp, ok := c.Get("remote_state_tree") if !ok { - remoteStateTree = "" + remoteStateTree = DefaultStateTreeDir } else { remoteStateTree = remoteStateTreeTmp.(string) } @@ -432,12 +432,12 @@ func validateFn(c *terraform.ResourceConfig) (ws []string, es []error) { var remotePillarRoots string remotePillarRootsTmp, ok := c.Get("remote_pillar_roots") if !ok { - remotePillarRoots = "" + remotePillarRoots = DefaultPillarRootDir } else { remotePillarRoots = remotePillarRootsTmp.(string) } - if minionConfig != "" && (remoteStateTree != "" || remotePillarRoots != "") { + if minionConfig != "" && (remoteStateTree != DefaultStateTreeDir || remotePillarRoots != DefaultPillarRootDir) { es = append(es, errors.New("remote_state_tree and remote_pillar_roots only apply when minion_config_file is not used")) }