Skip to content

Commit

Permalink
Colors, symlink and rand suffix
Browse files Browse the repository at this point in the history
* Replace outputs w/ symlink
* disable color in tests
* adding suffix
  • Loading branch information
coryodaniel committed Jan 7, 2019
1 parent a170bc7 commit 485f62f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 71 deletions.
3 changes: 2 additions & 1 deletion .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@ suites:
root_module_directory: test/fixtures/disable_client_cert
verifier:
name: terraform
color: false
systems:
- name: disable_client_cert
backend: local
provisioner:
name: terraform
name: terraform
- name: "node_pool"
driver:
name: "terraform"
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,9 @@ make generate_docs

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).

Seven test-kitchen instances are defined:
Six test-kitchen instances are defined:

- `deploy_service`
- `disable_client_cert`
- `node_pool`
- `shared_vpc`
- `simple_regional`
Expand Down
2 changes: 1 addition & 1 deletion examples/disable_client_cert/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ provider "google" {
module "gke" {
source = "../../"
project_id = "${var.project_id}"
name = "${local.cluster_type}-cluster"
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
region = "${var.region}"
network = "${var.network}"
network_project_id = "${var.network_project_id}"
Expand Down
67 changes: 0 additions & 67 deletions examples/disable_client_cert/test_outputs.tf

This file was deleted.

1 change: 1 addition & 0 deletions examples/disable_client_cert/test_outputs.tf
5 changes: 5 additions & 0 deletions examples/disable_client_cert/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ variable "credentials_path" {
description = "The path to the GCP credentials JSON file"
}

variable "cluster_name_suffix" {
description = "A suffix to append to the default cluster name"
default = ""
}

variable "region" {
description = "The region to host the cluster in"
}
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/disable_client_cert/example.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module "example" {

project_id = "${var.project_id}"
credentials_path = "${local.credentials_path}"
cluster_name_suffix = "-${random_string.suffix.result}"
region = "${var.region}"
network = "${google_compute_network.main.name}"
network_project_id = "${var.project_id}"
Expand Down

0 comments on commit 485f62f

Please sign in to comment.