fog-google 0.6.0 → 1.0.0

data/lib/fog/compute/google/requests/set_target_https_proxy_url_map.rb

@@ -2,24 +2,19 @@ module Fog
   module Compute
     class Google
       class Mock
-        def set_target_https_proxy_url_map(_target_https_proxy, _url_map)
+        def set_target_https_proxy_url_map(_proxy_name, _url_map)
           Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def set_target_https_proxy_url_map(target_https_proxy, url_map)
-          api_method = @compute.target_https_proxies.set_url_map
-          parameters = {
-            "project" => @project,
-            "targetHttpsProxy" => target_https_proxy.name
-          }
-          url_map = url_map.self_link unless url_map.class == String
-          body = {
-            "urlMap" => url_map
-          }
-
-          request(api_method, parameters, body)
+        def set_target_https_proxy_url_map(proxy_name, url_map)
+          @compute.set_target_https_proxy_url_map(
+            @project, proxy_name,
+            ::Google::Apis::ComputeV1::UrlMapReference.new(
+              :url_map => url_map.class == String ? url_map : url_map.self_link
+            )
+          )
         end
       end
     end

data/lib/fog/compute/google/requests/set_target_pool_backup.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def set_target_pool_backup(_target_pool, _region, _backup_target,
+                                   _failover_ratio: nil)
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        def set_target_pool_backup(target_pool, region, backup_target,
+                                   failover_ratio: nil)
+          target_ref = ::Google::Apis::ComputeV1::TargetReference.new(
+            :target => backup_target
+          )
+
+          @compute.set_target_pool_backup(
+            project,
+            region.split("/")[-1],
+            target_pool,
+            target_ref,
+            :failover_ratio => failover_ratio
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/google/requests/start_server.rb

@@ -2,21 +2,14 @@ module Fog
   module Compute
     class Google
       class Mock
-        def start_server(_identity, _zone_name)
+        def start_server(_identity, _zone)
           Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def start_server(identity, zone_name)
-          api_method = @compute.instances.start
-          parameters = {
-            "project" => @project,
-            "zone" => zone_name,
-            "instance" => identity
-          }
-
-          request(api_method, parameters)
+        def start_server(identity, zone)
+          @compute.start_instance(@project, zone.split("/")[-1], identity)
         end
       end
     end

data/lib/fog/compute/google/requests/stop_server.rb

@@ -2,21 +2,14 @@ module Fog
   module Compute
     class Google
       class Mock
-        def stop_server(_identity, _zone_name)
+        def stop_server(_identity, _zone)
           Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def stop_server(identity, zone_name)
-          api_method = @compute.instances.stop
-          parameters = {
-            "project" => @project,
-            "zone" => zone_name,
-            "instance" => identity
-          }
-
-          request(api_method, parameters)
+        def stop_server(identity, zone)
+          @compute.stop_instance(@project, zone.split("/")[-1], identity)
         end
       end
     end

data/lib/fog/compute/google/requests/update_firewall.rb

@@ -2,40 +2,44 @@ module Fog
   module Compute
     class Google
       class Mock
-        def update_firewall(_firewall_name, _allowed, _network = GOOGLE_COMPUTE_DEFAULT_NETWORK, _options = {})
+        def update_firewall(_firewall_name, _firewall_opts = {})
           Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def update_firewall(firewall_name, allowed, network = GOOGLE_COMPUTE_DEFAULT_NETWORK, options = {})
-          unless network.start_with? "http"
-            network = "#{@api_url}#{@project}/global/networks/#{network}"
-          end
+        UPDATABLE_FIREWALL_FIELDS = %i{
+          allowed
+          description
+          source_ranges
+          source_service_accounts
+          source_tags
+          target_service_accounts
+          target_tags
+        }.freeze
 
-          api_method = @compute.firewalls.update
-          parameters = {
-            "project" => @project,
-            "firewall" => firewall_name
-          }
-          body_object = {
-            "allowed" => allowed,
-            "network" => network
-          }
-          unless options[:description].nil?
-            body_object["description"] = options[:description]
-          end
-          unless options[:source_ranges].nil? || options[:source_ranges].empty?
-            body_object["sourceRanges"] = options[:source_ranges]
-          end
-          unless options[:source_tags].nil? || options[:source_tags].empty?
-            body_object["sourceTags"] = options[:source_tags]
-          end
-          unless options[:target_tags].nil? || options[:target_tags].empty?
-            body_object["targetTags"] = options[:target_tags]
-          end
-
-          request(api_method, parameters, body_object)
+        ##
+        # Update a Firewall resource.
+        #
+        # Only the following fields can/will be changed.
+        #
+        # @param [Hash] opts The firewall object to create
+        # @option opts [Array<Hash>] allowed
+        # @option opts [String] description
+        # @option opts [Array<String>] destination_ranges
+        # @option opts [Array<String>] source_ranges
+        # @option opts [Array<String>] source_service_accounts
+        # @option opts [Array<String>] source_tags
+        # @option opts [Array<String>] target_service_accounts
+        # @option opts [Array<String>] target_tags
+        #
+        # @see https://cloud.google.com/compute/docs/reference/latest/firewalls/insert
+        def update_firewall(firewall_name, opts = {})
+          opts = opts.select { |k, _| UPDATABLE_FIREWALL_FIELDS.include? k }
+          @compute.update_firewall(
+            @project, firewall_name,
+            ::Google::Apis::ComputeV1::Firewall.new(opts)
+          )
         end
       end
     end

data/lib/fog/compute/google/requests/update_http_health_check.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def update_http_health_check(_check_name, _opts = {})
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        def update_http_health_check(check_name, opts = {})
+          @compute.update_http_health_check(
+            @project,
+            check_name,
+            ::Google::Apis::ComputeV1::HttpHealthCheck.new(
+              opts.merge(:name => check_name)
+            )
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/google/requests/update_url_map.rb

@@ -2,36 +2,23 @@ module Fog
   module Compute
     class Google
       class Mock
-        def update_url_map(_url_map, _host_rules)
+        def update_url_map(_url_map_name, _url_map = {})
           Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def update_url_map(url_map, host_rules, path_matchers = nil)
-          api_method = @compute.url_maps.update
-          parameters = {
-            "project" => @project,
-            "urlMap" => url_map.name
-          }
+        def update_url_map(url_map_name, url_map = {})
+          url_map[:host_rules] = url_map[:host_rules] || []
+          url_map[:path_matchers] = url_map[:path_matchers] || []
+          url_map[:tests] = url_map[:tests] || []
 
-          # add new properties to the url_map resource
-          if url_map.hostRules
-            url_map.hostRules.concat(host_rules)
-          else
-            url_map.hostRules = host_rules
-          end
-
-          # a path matcher can only be created with a host rule that uses it
-          if path_matchers
-            if url_map.pathMatchers
-              url_map.pathMatchers.concat(path_matchers)
-            else
-              url_map.pathMatchers = path_matchers
-            end
-          end
-
-          request(api_method, parameters, body_object = url_map)
+          @compute.update_url_map(
+            @project, url_map_name,
+            ::Google::Apis::ComputeV1::UrlMap.new(
+              url_map.merge(:name => url_map_name)
+            )
+          )
         end
       end
     end

data/lib/fog/compute/google/requests/validate_url_map.rb

@@ -2,21 +2,19 @@ module Fog
   module Compute
     class Google
       class Mock
-        def validate_url_map(_url_map)
+        def validate_url_map(_url_map_name, _url_map: {})
           Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def validate_url_map(url_map)
-          api_method = @compute.url_maps.validate
-          parameters = {
-            "project" => @project,
-            "urlMap" => url_map.name
-          }
-          body = { "resource" => url_map }
-
-          request(api_method, parameters, body_object = body)
+        def validate_url_map(url_map_name, url_map = {})
+          @compute.validate_url_map(
+            @project, url_map_name,
+            ::Google::Apis::ComputeV1::ValidateUrlMapsRequest.new(
+              :url_map => ::Google::Apis::ComputeV1::UrlMap.new(url_map)
+            )
+          )
         end
       end
     end

data/lib/fog/dns/google.rb

@@ -8,6 +8,7 @@ module Fog
       recognizes(
         :app_name,
         :app_version,
+        :google_auth,
         :google_client,
         :google_client_email,
         :google_client_options,
@@ -17,9 +18,9 @@ module Fog
         :google_json_key_string
       )
 
-      GOOGLE_DNS_API_VERSION     = "v1"
-      GOOGLE_DNS_BASE_URL        = "https://www.googleapis.com/dns/"
-      GOOGLE_DNS_API_SCOPE_URLS  = %w(https://www.googleapis.com/auth/ndev.clouddns.readwrite)
+      GOOGLE_DNS_API_VERSION     = "v1".freeze
+      GOOGLE_DNS_BASE_URL        = "https://www.googleapis.com/dns/".freeze
+      GOOGLE_DNS_API_SCOPE_URLS  = %w(https://www.googleapis.com/auth/ndev.clouddns.readwrite).freeze
 
       ##
       # MODELS

data/lib/fog/dns/google/models/change.rb

@@ -14,8 +14,8 @@ module Fog
         attribute :additions
         attribute :deletions
 
-        DONE_STATE    = "done"
-        PENDING_STATE = "pending"
+        DONE_STATE    = "done".freeze
+        PENDING_STATE = "pending".freeze
 
         ##
         # Checks if the change operation is pending

data/lib/fog/dns/google/models/changes.rb

@@ -13,9 +13,10 @@ module Fog
         def all
           requires :zone
 
-          data = service.list_changes(zone.identity).body["changes"] || []
+          data = service.list_changes(zone.identity).to_h[:changes] || []
           load(data)
-        rescue Fog::Errors::NotFound
+        rescue ::Google::Apis::ClientError => e
+          raise e unless e.status_code == 404
           []
         end
 
@@ -26,11 +27,11 @@ module Fog
         # @return [Fog::DNS::Google::Change] Change resource
         def get(identity)
           requires :zone
-
-          if change = service.get_change(zone.identity, identity).body
+          if change = service.get_change(zone.identity, identity).to_h
             new(change)
           end
-        rescue Fog::Errors::NotFound
+        rescue ::Google::Apis::ClientError => e
+          raise e unless e.status_code == 404
           nil
         end
 

data/lib/fog/dns/google/models/project.rb

@@ -25,7 +25,7 @@ module Fog
         #
         # @return [Integer] Maximum allowed number of managed zones in the project
         def managed_zones
-          quota["managedZones"]
+          quota[:managed_zones]
         end
 
         ##
@@ -33,7 +33,7 @@ module Fog
         #
         # @return [Integer] The maximum allowed number of ResourceRecordSets per zone in the project
         def rrsets_per_managed_zone
-          quota["rrsetsPerManagedZone"]
+          quota[:rrsets_per_managed_zone]
         end
 
         ##
@@ -41,7 +41,7 @@ module Fog
         #
         # @return [Integer] The maximum allowed number of resource records per ResourceRecordSet
         def resource_records_per_rrset
-          quota["resourceRecordsPerRrset"]
+          quota[:resource_records_per_rrset]
         end
 
         ##
@@ -49,7 +49,7 @@ module Fog
         #
         # @return [Integer] The maximum allowed number of ResourceRecordSets to add per Changes.create request
         def rrset_additions_per_change
-          quota["rrsetAdditionsPerChange"]
+          quota[:rrset_additions_per_change]
         end
 
         ##
@@ -57,7 +57,7 @@ module Fog
         #
         # @return [Integer] The maximum allowed number of ResourceRecordSets to delete per Changes.create request
         def rrset_deletions_per_change
-          quota["rrsetDeletionsPerChange"]
+          quota[:rrset_deletions_per_change]
         end
 
         ##
@@ -65,7 +65,7 @@ module Fog
         #
         # @return [Integer] The maximum allowed size in bytes for the rrdata field in one Changes.create request
         def total_rrdatasize_per_change
-          quota["totalRrdataSizePerChange"]
+          quota[:total_rrdata_size_per_change]
         end
       end
     end

data/lib/fog/dns/google/models/projects.rb

@@ -10,10 +10,11 @@ module Fog
         # @param [String] identity Project identity
         # @return [Fog::DNS::Google::Project] Project resource
         def get(identity)
-          if project = service.get_project(identity).body
+          if project = service.get_project(identity).to_h
             new(project)
           end
-        rescue Fog::Errors::NotFound
+        rescue ::Google::Apis::ClientError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/dns/google/models/record.rb

@@ -22,7 +22,9 @@ module Fog
           requires :name, :type, :ttl, :rrdatas
 
           data = service.create_change(zone.id, [], [resource_record_set_format])
-          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body["id"])
+          change = Fog::DNS::Google::Changes
+                   .new(:service => service, :zone => zone)
+                   .get(data.id)
           change.wait_for { ready? } unless async
           true
         end
@@ -39,8 +41,10 @@ module Fog
           merge_attributes(new_attributes)
 
           data = service.create_change(zone.id, [resource_record_set_format], [deletions])
-          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body["id"])
-          async = new_attributes.key?(:async) ? new_attributes[:async] : true
+          change = Fog::DNS::Google::Changes
+                   .new(:service => service, :zone => zone)
+                   .get(data.id)
+          new_attributes.key?(:async) ? async = new_attributes[:async] : async = true
           change.wait_for { ready? } unless async
           self
         end
@@ -52,7 +56,7 @@ module Fog
         def reload
           requires :name, :type
 
-          data = collection.get(name, type)
+          data = collection.get(name, type).to_h
           merge_attributes(data.attributes)
           self
         end
@@ -65,7 +69,9 @@ module Fog
           requires :name, :type, :ttl, :rrdatas
 
           data = service.create_change(zone.id, [resource_record_set_format], [])
-          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body["id"])
+          change = Fog::DNS::Google::Changes
+                   .new(:service => service, :zone => zone)
+                   .get(data.id)
           change.wait_for { !pending? }
           self
         end
@@ -89,11 +95,11 @@ module Fog
         #
         def resource_record_set_format
           {
-            "kind" => 'dns#resourceRecordSet',
-            "name" => name,
-            "type" => type,
-            "ttl"  => ttl,
-            "rrdatas" => rrdatas
+            :kind => "dns#resourceRecordSet",
+            :name => name,
+            :type => type,
+            :ttl  => ttl,
+            :rrdatas => rrdatas
           }
         end
       end