Skip to content

Commit 6b5876a

Browse files
committed
Colors, symlink and rand suffix
* Replace outputs w/ symlink * disable color in tests * adding suffix
1 parent 318b849 commit 6b5876a

File tree

6 files changed

+11
-71
lines changed

6 files changed

+11
-71
lines changed

.kitchen.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ suites:
4444
root_module_directory: test/fixtures/disable_client_cert
4545
verifier:
4646
name: terraform
47+
color: false
4748
systems:
4849
- name: disable_client_cert
4950
backend: local
5051
provisioner:
51-
name: terraform
52+
name: terraform
5253
- name: "node_pool"
5354
driver:
5455
name: "terraform"

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,9 @@ make generate_docs
222222

223223
Integration tests are run though [test-kitchen](https://github.com/test-kitchen/test-kitchen), [kitchen-terraform](https://github.com/newcontext-oss/kitchen-terraform), and [InSpec](https://github.com/inspec/inspec).
224224

225-
Seven test-kitchen instances are defined:
225+
Six test-kitchen instances are defined:
226226

227227
- `deploy_service`
228-
- `disable_client_cert`
229228
- `node_pool`
230229
- `shared_vpc`
231230
- `simple_regional`

examples/disable_client_cert/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ provider "google" {
2626
module "gke" {
2727
source = "../../"
2828
project_id = "${var.project_id}"
29-
name = "${local.cluster_type}-cluster"
29+
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
3030
region = "${var.region}"
3131
network = "${var.network}"
3232
network_project_id = "${var.network_project_id}"

examples/disable_client_cert/test_outputs.tf

Lines changed: 0 additions & 67 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../test/fixtures/all_examples/test_outputs.tf

examples/disable_client_cert/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ variable "credentials_path" {
2222
description = "The path to the GCP credentials JSON file"
2323
}
2424

25+
variable "cluster_name_suffix" {
26+
description = "A suffix to append to the default cluster name"
27+
default = ""
28+
}
29+
2530
variable "region" {
2631
description = "The region to host the cluster in"
2732
}

test/fixtures/disable_client_cert/example.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ module "example" {
1919

2020
project_id = "${var.project_id}"
2121
credentials_path = "${local.credentials_path}"
22+
cluster_name_suffix = "-${random_string.suffix.result}"
2223
region = "${var.region}"
2324
network = "${google_compute_network.main.name}"
2425
network_project_id = "${var.project_id}"

0 commit comments

Comments
 (0)