From 028a6f108dc1cf96f63606d0985a062d845f099a Mon Sep 17 00:00:00 2001 From: Cory O'Daniel Date: Tue, 8 Jan 2019 10:53:19 -0800 Subject: [PATCH] Added add'l describe block, quoted bools --- .../disable_client_cert/controls/gcloud.rb | 13 +++++++++---- variables.tf | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/test/integration/disable_client_cert/controls/gcloud.rb b/test/integration/disable_client_cert/controls/gcloud.rb index 1992759eaa..e810cb8703 100644 --- a/test/integration/disable_client_cert/controls/gcloud.rb +++ b/test/integration/disable_client_cert/controls/gcloud.rb @@ -42,10 +42,15 @@ expect(data['masterAuth']['clientCertificate']).to be_nil end - it "does not have a basic auth enabled" do - expect(data['masterAuth']['username']).to be_nil - expect(data['masterAuth']['password']).to be_nil + describe "does not have a basic auth enabled" do + it "username is nil" do + expect(data['masterAuth']['username']).to be_nil + end + + it "password is nil" do + expect(data['masterAuth']['password']).to be_nil + end end end end -end \ No newline at end of file +end diff --git a/variables.tf b/variables.tf index de5e6eae0e..84afda8077 100644 --- a/variables.tf +++ b/variables.tf @@ -202,7 +202,7 @@ variable "service_account" { variable "enable_basic_auth" { description = "Basic authentication allows a user to authenticate to the cluster with a username and password. To maximize the security of your cluster, disable this option. Basic authentication is not recommended because it provides no confidentiality protection for transmitted credentials" - default = true + default = "true" } variable "basic_auth_username" { @@ -217,5 +217,5 @@ variable "basic_auth_password" { variable "issue_client_certificate" { description = "Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive!" - default = false + default = "false" }