From 8d7e2efdb91217147466e62a3664d5f283ebd52c Mon Sep 17 00:00:00 2001 From: Seth Chisamore Date: Thu, 9 Nov 2017 15:24:41 -0500 Subject: [PATCH] InSpec smoke test improvements * Use SSL verifications by default now (our wildcard cert now covers *.cd.chef.co) * Extract the target host from the InSpec backend Signed-off-by: Seth Chisamore --- inspec/chef-server-smoke/controls/base.rb | 7 +------ inspec/chef-server-smoke/libraries/helper.rb | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/inspec/chef-server-smoke/controls/base.rb b/inspec/chef-server-smoke/controls/base.rb index a77463ccc6..0ffbc20519 100644 --- a/inspec/chef-server-smoke/controls/base.rb +++ b/inspec/chef-server-smoke/controls/base.rb @@ -27,14 +27,9 @@ end end -# Only perform SSL verification on hosts where we know the SSL certs are -# properly configured -verify = false # TODO: switch this back after JEX-633 is complete -# verify = fetch_target_host.include?('cd.chef.co') ? false : true - chef_server_version = fetch_chef_server_version -describe http("https://#{fetch_target_host}/_status", ssl_verify: verify) do +describe http("https://#{fetch_target_host}/_status") do its('status') { should eq 200 } end diff --git a/inspec/chef-server-smoke/libraries/helper.rb b/inspec/chef-server-smoke/libraries/helper.rb index cf13801948..e878cccb5f 100644 --- a/inspec/chef-server-smoke/libraries/helper.rb +++ b/inspec/chef-server-smoke/libraries/helper.rb @@ -1,7 +1,7 @@ def fetch_chef_server_version - attribute('application_version', default: ENV['CHEF_SERVER_VERSION']) + attribute('application_version', default: ENV['APPLICATION_VERSION']) end def fetch_target_host - attribute('target_host', default: command('grep -Po "api_fqdn\s[\"\']+\K.*(?=[\"\']+?)" /etc/opscode/chef-server.rb').stdout.strip) + inspec.backend.hostname end