From 406969e1eab429dbb809d28418fc77dbe2e8012a Mon Sep 17 00:00:00 2001 From: Stuart Paterson Date: Thu, 22 Nov 2018 13:51:00 +0000 Subject: [PATCH] Update the DNS key and zone signing methods to the new key names. Signed-off-by: Stuart Paterson --- libraries/google_dns_managed_zone.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/google_dns_managed_zone.rb b/libraries/google_dns_managed_zone.rb index c4ff97643..62f191035 100644 --- a/libraries/google_dns_managed_zone.rb +++ b/libraries/google_dns_managed_zone.rb @@ -20,10 +20,10 @@ def initialize(opts = {}) catch_gcp_errors do @managed_zone = @gcp.gcp_client(Google::Apis::DnsV2beta1::DnsService).get_managed_zone(opts[:project], opts[:zone]) create_resource_methods(@managed_zone) - @key_specs={} + @key_specs = {} if defined?(@managed_zone.dnssec_config.default_key_specs) && !@managed_zone.dnssec_config.default_key_specs.nil? @managed_zone.dnssec_config.default_key_specs.each do |spec| - @key_specs[spec.key_type]=spec.algorithm + @key_specs[spec.key_type] = spec.algorithm end end end @@ -39,13 +39,13 @@ def creation_time_date end def key_signing_key_algorithm - raise Inspec::Exceptions::ResourceFailed, "google_dns_managed_zone is missing expected property 'dnssec_config.default_key_specs'" if !@key_specs.key?('keySigning') - @key_specs['keySigning'] + raise Inspec::Exceptions::ResourceFailed, "google_dns_managed_zone is missing expected property 'dnssec_config.default_key_specs KEY_SIGNING'" if !@key_specs.key?('KEY_SIGNING') + @key_specs['KEY_SIGNING'] end def zone_signing_key_algorithm - raise Inspec::Exceptions::ResourceFailed, "google_dns_managed_zone is missing expected property 'dnssec_config.default_key_specs'" if !@key_specs.key?('zoneSigning') - @key_specs['zoneSigning'] + raise Inspec::Exceptions::ResourceFailed, "google_dns_managed_zone is missing expected property 'dnssec_config.default_key_specs ZONE_SIGNING'" if !@key_specs.key?('ZONE_SIGNING') + @key_specs['ZONE_SIGNING'] end def to_s