testing AtLeastOneOf

Author: dak1n1

kubernetes/provider.go

@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/mitchellh/go-homedir"
 	apimachineryschema "k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/discovery"
@@ -28,15 +27,13 @@ func Provider() *schema.Provider {
 	p := &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"host": {
-				Type:             schema.TypeString,
-				Optional:         true,
-				DefaultFunc:      schema.EnvDefaultFunc("KUBE_HOST", nil),
-				Description:      "The hostname (in form of URI) of Kubernetes master.",
-				ConflictsWith:    []string{"config_path", "config_paths"},
-				ValidateDiagFunc: validation.ToDiagFunc(validation.IsURLWithHTTPorHTTPS),
-				// TODO: enable this when AtLeastOneOf works with optional attributes.
-				// Currently, it will require at least one of the following keys to be set, even if 'host' isn't set.
-				//	AtLeastOneOf:     []string{"token", "exec", "username", "password", "client_certificate", "client_key"},
+				Type:         schema.TypeString,
+				Optional:     true,
+				//DefaultFunc:      schema.EnvDefaultFunc("KUBE_HOST", nil),
+				Description:  "The hostname (in form of URI) of Kubernetes master.",
+				//ConflictsWith:    []string{"config_path", "config_paths"},
+				//ValidateDiagFunc: validation.ToDiagFunc(validation.IsURLWithHTTPorHTTPS),
+				AtLeastOneOf: []string{"token", "exec", "username", "password", "client_certificate", "client_key"},
 			},
 			"username": {
 				Type:          schema.TypeString,
@@ -226,13 +223,14 @@ func configPathsEnv() (interface{}, error) {
 	if exists {
 		log.Print("[DEBUG] using environment variable KUBE_CONFIG_PATHS to define config_paths")
 		log.Printf("[DEBUG] value of KUBE_CONFIG_PATHS: %v", value)
+		pathList := filepath.SplitList(value)
+		configPaths := new([]interface{})
+		for _, p := range pathList {
+			*configPaths = append(*configPaths, p)
+		}
+		return *configPaths, nil
 	}
-	pathList := filepath.SplitList(value)
-	configPaths := new([]interface{})
-	for _, p := range pathList {
-		*configPaths = append(*configPaths, p)
-	}
-	return *configPaths, nil
+	return nil, nil
 }
 
 type KubeClientsets interface {
@@ -373,10 +371,6 @@ func initializeConfiguration(d *schema.ResourceData) (*restclient.Config, error)
 		for _, p := range v {
 			configPaths = append(configPaths, p.(string))
 		}
-	} else if v := os.Getenv("KUBE_CONFIG_PATHS"); v != "" {
-		// NOTE we have to do this here because the schema
-		// does not yet allow you to set a default for a TypeList
-		configPaths = filepath.SplitList(v)
 	}
 
 	if len(configPaths) > 0 {