lib/chef/knife/cloud/google_service.rb in knife-google-3.1.0 vs lib/chef/knife/cloud/google_service.rb in knife-google-3.1.1
- old
+ new
@@ -243,15 +243,14 @@
def image_exist?(image_project, image_name)
check_api_call { connection.get_image(image_project, image_name) }
end
def valid_public_ip_setting?(public_ip)
- public_ip.downcase! if public_ip.respond_to?(:downcase)
-
- if public_ip.nil? || public_ip == "ephemeral" || public_ip == "none"
+ case
+ when public_ip.nil? || public_ip.match(/(ephemeral|none)/i)
true
- elsif valid_ip_address?(public_ip)
+ when valid_ip_address?(public_ip)
true
else
false
end
end
@@ -407,12 +406,10 @@
Array(interface)
end
def instance_access_configs_for(public_ip)
- public_ip.downcase! if public_ip.respond_to?(:downcase)
-
- return [] if public_ip.nil? || public_ip == "none"
+ return [] if public_ip.nil? || public_ip.match(/none/i)
access_config = Google::Apis::ComputeV1::AccessConfig.new
access_config.name = "External NAT"
access_config.type = "ONE_TO_ONE_NAT"
access_config.nat_ip = public_ip if valid_ip_address?(public_ip)