Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ConflictsWith to provider authentication config #1141

Closed
wants to merge 8 commits into from
+641 −63
Closed

Add ConflictsWith to provider authentication config #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ebf75fa
Add ConflictsWith to provider config
dak1n1 Feb 1, 2021
ff0db58
Update examples used for testing ConflictsWith
dak1n1 Feb 19, 2021
7651347
Fix function name
dak1n1 Feb 20, 2021
ce198a4
Remove lockfile
dak1n1 Mar 14, 2021
211009c
run test lint fix
dak1n1 Mar 14, 2021
415a860
Add conflictswith warning level message
dak1n1 Apr 20, 2021
0ef58a6
Use new type for ConditionsMode
dak1n1 Apr 23, 2021
ce5d98b
Merge branch 'main' into conflictswith
BBBmau Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ PKG_NAME := kubernetes
OS_ARCH := $(shell go env GOOS)_$(shell go env GOARCH)
TF_PROV_DOCS := $(PWD)/kubernetes/test-infra/tfproviderdocs

ifdef KUBE_CONFIG_PATHS
KUBECONFIG1 := $(shell echo $(KUBE_CONFIG_PATHS) | cut -d\: -f1)
else
KUBECONFIG1 := $(shell echo $(KUBECONFIG) | cut -d\: -f1)
endif

ifneq ($(PWD),$(PROVIDER_DIR))
$(error "Makefile must be run from the provider directory")
endif
Expand Down Expand Up @@ -74,6 +80,15 @@ test: fmtcheck
go test ./tools

testacc: fmtcheck vet
@rm -rf kubernetes/testdata || true
@mkdir kubernetes/testdata
@cp $(KUBECONFIG1) kubernetes/testdata/kubeconfig || (echo "Please set KUBE_CONFIG_PATHS or KUBECONFIG environment variable"; exit 1)
@rm -rf $(EXT_PROV_DIR)/.terraform $(EXT_PROV_DIR)/.terraform.lock.hcl || true
@mkdir $(EXT_PROV_DIR)/.terraform
@mkdir -p /tmp/.terraform.d/localhost/test/kubernetes/9.9.9/$(OS_ARCH) || true
@ls $(EXT_PROV_BIN) || go build -o $(EXT_PROV_BIN)
@cd $(EXT_PROV_DIR) && TF_CLI_CONFIG_FILE=$(EXT_PROV_DIR)/.terraformrc TF_PLUGIN_CACHE_DIR=$(EXT_PROV_DIR)/.terraform terraform init -upgrade
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
TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 3h

test-compile:
Expand Down
Loading