Skip to content

Commit 168ad66

Browse files
committed
wip
1 parent ac354c6 commit 168ad66

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

GNUmakefile

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ else
1616
KUBECONFIG1 := $(shell echo $(KUBECONFIG) | cut -d\: -f1)
1717
endif
1818

19-
ifndef KUBECONFIG1
20-
$(error "Please set KUBE_CONFIG_PATHS or KUBECONFIG environment variable")
21-
endif
22-
2319
ifneq ($(PWD),$(PROVIDER_DIR))
2420
$(error "Makefile must be run from the provider directory")
2521
endif
@@ -67,14 +63,14 @@ test: fmtcheck
6763
xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
6864

6965
testacc: fmtcheck vet
70-
rm -rf kubernetes/testdata || true
71-
mkdir kubernetes/testdata
72-
cp $(KUBECONFIG1) kubernetes/testdata/kubeconfig
73-
rm -rf $(EXT_PROV_DIR)/.terraform $(EXT_PROV_DIR)/.terraform.lock.hcl || true
74-
mkdir $(EXT_PROV_DIR)/.terraform
75-
mkdir -p /tmp/.terraform.d/localhost/test/kubernetes/9.9.9/$(OS_ARCH) || true
76-
ls $(EXT_PROV_BIN) || go build -o $(EXT_PROV_BIN)
77-
cd $(EXT_PROV_DIR) && TF_CLI_CONFIG_FILE=$(EXT_PROV_DIR)/.terraformrc TF_PLUGIN_CACHE_DIR=$(EXT_PROV_DIR)/.terraform terraform init -upgrade
66+
@rm -rf kubernetes/testdata || true
67+
@mkdir kubernetes/testdata
68+
@cp $(KUBECONFIG1) kubernetes/testdata/kubeconfig || (echo "Please set KUBE_CONFIG_PATHS or KUBECONFIG environment variable"; exit 1)
69+
@rm -rf $(EXT_PROV_DIR)/.terraform $(EXT_PROV_DIR)/.terraform.lock.hcl || true
70+
@mkdir $(EXT_PROV_DIR)/.terraform
71+
@mkdir -p /tmp/.terraform.d/localhost/test/kubernetes/9.9.9/$(OS_ARCH) || true
72+
@ls $(EXT_PROV_BIN) || go build -o $(EXT_PROV_BIN)
73+
@cd $(EXT_PROV_DIR) && TF_CLI_CONFIG_FILE=$(EXT_PROV_DIR)/.terraformrc TF_PLUGIN_CACHE_DIR=$(EXT_PROV_DIR)/.terraform terraform init -upgrade
7874
TF_CLI_CONFIG_FILE=$(EXT_PROV_DIR)/.terraformrc TF_PLUGIN_CACHE_DIR=$(EXT_PROV_DIR)/.terraform TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
7975

8076
test-compile:

kubernetes/provider.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ func Provider() *schema.Provider {
2727
p := &schema.Provider{
2828
Schema: map[string]*schema.Schema{
2929
"host": {
30-
Type: schema.TypeString,
31-
Optional: true,
30+
Type: schema.TypeString,
31+
Optional: true,
3232
//DefaultFunc: schema.EnvDefaultFunc("KUBE_HOST", nil),
33-
Description: "The hostname (in form of URI) of Kubernetes master.",
33+
Description: "The hostname (in form of URI) of Kubernetes master.",
3434
//ConflictsWith: []string{"config_path", "config_paths"},
3535
//ValidateDiagFunc: validation.ToDiagFunc(validation.IsURLWithHTTPorHTTPS),
3636
AtLeastOneOf: []string{"token", "exec", "username", "password", "client_certificate", "client_key"},

0 commit comments

Comments
 (0)