fog-google 0.6.0 → 1.0.0

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

@@ -8,13 +8,17 @@ module Fog
       end
 
       class Real
-        def list_routes
-          api_method = @compute.routes.list
-          parameters = {
-            "project" => @project
-          }
-
-          request(api_method, parameters)
+        # Retrieves the list of Route resources available to the specified project.
+        #
+        # @see https://cloud.google.com/compute/docs/reference/latest/routes/list
+        def list_routes(filter: nil, max_results: nil, order_by: nil, page_token: nil)
+          @compute.list_routes(
+            @project,
+            :filter => filter,
+            :max_results => max_results,
+            :order_by => order_by,
+            :page_token => page_token
+          )
         end
       end
     end

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

@@ -2,26 +2,19 @@ module Fog
   module Compute
     class Google
       class Mock
-        def list_servers(zone_name)
-          get_zone(zone_name)
-          zone = data[:zones][zone_name]
-          servers = data[:servers].values.select { |s| s["zone"] == zone["selfLink"] }
-          build_excon_response("kind" => "compute#instanceList",
-                               "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/instances",
-                               "id" => "projects/#{@project}/zones/#{zone_name}/instances",
-                               "items" => servers)
+        def list_servers(_zone, _opts = {})
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def list_servers(zone_name)
-          api_method = @compute.instances.list
-          parameters = {
-            "project" => @project,
-            "zone" => zone_name
-          }
-
-          request(api_method, parameters)
+        def list_servers(zone, filter: nil, max_results: nil,
+                         order_by: nil, page_token: nil)
+          @compute.list_instances(
+            @project, zone.split("/")[-1],
+            :filter => filter, :max_results => max_results,
+            :order_by => order_by, :page_token => page_token
+          )
         end
       end
     end

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

@@ -8,15 +8,11 @@ module Fog
       end
 
       class Real
-        def list_snapshots(project = nil, next_page_token = nil)
-          api_method = @compute.snapshots.list
-          project = @project if project.nil?
-          parameters = {
-            "project" => project,
-            "pageToken" => next_page_token
-          }
-
-          request(api_method, parameters)
+        def list_snapshots(project = @project, filter: nil, max_results: nil,
+                           order_by: nil, page_token: nil)
+          @compute.list_snapshots(project,
+                                  :filter => filter, :max_results => max_results,
+                                  :order_by => order_by, :page_token => page_token)
         end
       end
     end

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

@@ -8,12 +8,15 @@ module Fog
       end
 
       class Real
-        def list_ssl_certificates
-          api_method = @compute.ssl_certificates.list
-          parameters = {
-            "project" => @project
-          }
-          request(api_method, parameters)
+        def list_ssl_certificates(filter: nil, max_results: nil,
+                                  order_by: nil, page_token: nil)
+          @compute.list_ssl_certificates(
+            @project,
+            :filter => filter,
+            :max_results => max_results,
+            :order_by => order_by,
+            :page_token => page_token
+          )
         end
       end
     end

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

@@ -2,32 +2,34 @@ module Fog
   module Compute
     class Google
       class Mock
-        def list_subnetworks(region_name)
-          region_name = region_name.split("/")[-1] if region_name.start_with? "http"
-          subnetworks = data[:subnetworks].values.select { |d| d["region"].split("/")[-1] == region_name }
-
-          build_excon_response("kind" => "compute#subnetworkList",
-                               "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/#{region_name}/subnetworks",
-                               "id" => "projects/#{@project}/regions/#{region_name}/subnetworks",
-                               "items" => subnetworks)
+        def list_subnetworks(_region_name, _filter: nil, _max_results: nil,
+                             _order_by: nil, _page_token: nil)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def list_subnetworks(region_name, options = {})
-          region_name = region_name.split("/")[-1] if region_name.start_with? "http"
-
-          api_method = @compute.subnetworks.list
-          parameters = {
-            "project" => @project,
-            "region"  => region_name
-          }
-
-          parameters["filter"] = options[:filter] if options[:filter]
-          parameters["maxResults"] = options[:max_results] if options[:max_results]
-          parameters["pageToken"] = options[:page_token] if options[:page_token]
-
-          request(api_method, parameters)
+        ##
+        # Retrieves a list of subnetworks specific to a region and project.
+        #
+        # @param region_name [String] the name of the subnetwork's region
+        # @param filter [String] A filter expression for filtering listed resources.
+        # @param max_results [Fixnum] Max number of results to return
+        # @param order_by [String] Sorts list results by a certain order
+        # @param page_token [String] specifies a page token to use
+        # @return [Google::Apis::ComputeV1::SubnetworkList] list result
+        #
+        # @see https://cloud.google.com/compute/docs/reference/latest/subnetworks/list
+        def list_subnetworks(region_name, filter: nil, max_results: nil,
+                             order_by: nil, page_token: nil)
+          if region_name.start_with? "http"
+            region_name = region_name.split("/")[-1]
+          end
+          @compute.list_subnetworks(@project, region_name,
+                                    :filter => filter,
+                                    :max_results => max_results,
+                                    :order_by => order_by,
+                                    :page_token => page_token)
         end
       end
     end

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

@@ -2,24 +2,20 @@ module Fog
   module Compute
     class Google
       class Mock
-        def list_target_http_proxies
-          proxies = data[:target_http_proxies].values
-
-          build_excon_response("kind" => "compute#targetHttpProxyList",
-                               "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/targetHttpProxies",
-                               "id" => "projects/#{@project}/global/targetHttpProxies",
-                               "items" => proxies)
+        def list_target_http_proxies(_filter: nil, _max_results: nil,
+                                     _order_by: nil, _page_token: nil)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def list_target_http_proxies
-          api_method = @compute.target_http_proxies.list
-          parameters = {
-            "project" => @project
-          }
-
-          request(api_method, parameters)
+        def list_target_http_proxies(filter: nil, max_results: nil,
+                                     order_by: nil, page_token: nil)
+          @compute.list_target_http_proxies(
+            @project,
+            :filter => filter, :max_results => max_results,
+            :order_by => order_by, :page_token => page_token
+          )
         end
       end
     end

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

@@ -8,13 +8,13 @@ module Fog
       end
 
       class Real
-        def list_target_https_proxies
-          api_method = @compute.target_https_proxies.list
-          parameters = {
-            "project" => @project
-          }
-
-          request(api_method, parameters)
+        def list_target_https_proxies(filter: nil, max_results: nil,
+                                      order_by: nil, page_token: nil)
+          @compute.list_target_https_proxies(
+            @project,
+            :filter => filter, :max_results => max_results,
+            :order_by => order_by, :page_token => page_token
+          )
         end
       end
     end

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

@@ -2,25 +2,22 @@ module Fog
   module Compute
     class Google
       class Mock
-        def list_target_instances(zone_name = "us-central1-a")
-          zone = data[:zones][zone_name]
-          target_instances = data[:target_instances].values.select { |s| s["zone"] == zone_name }
-          build_excon_response("kind" => "compute#targetInstanceList",
-                               "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/targetInstances",
-                               "id" => "projects/#{@project}/zones/#{zone_name}/targetInstances",
-                               "items" => target_instances)
+        def list_target_instances(_zone, _opts: {})
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def list_target_instances(zone_name)
-          api_method = @compute.target_instances.list
-          parameters = {
-            "project" => @project,
-            "zone" => zone_name
-          }
-
-          request(api_method, parameters)
+        def list_target_instances(zone, filter: nil, max_results: nil,
+                                  order_by: nil, page_token: nil)
+          zone = zone.split("/")[-1] if zone.start_with? "http"
+          @compute.list_target_instances(
+            @project, zone,
+            :filter => filter,
+            :max_results => max_results,
+            :order_by => order_by,
+            :page_token => page_token
+          )
         end
       end
     end

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

@@ -2,24 +2,21 @@ module Fog
   module Compute
     class Google
       class Mock
-        def list_target_pools(region_name)
-          target_pools = data[:target_pools].values.select { |d| d["region"].split("/")[-1] == region_name }
-          build_excon_response("kind" => "compute#forwardingRuleList",
-                               "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/#{region_name}/targetPools",
-                               "id" => "projects/#{@project}/regions/#{region_name}/regions",
-                               "items" => target_pools)
+        def list_target_pools(_region, _opts = {})
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def list_target_pools(region_name)
-          api_method = @compute.target_pools.list
-          parameters = {
-            "project" => @project,
-            "region" => region_name
-          }
-
-          request(api_method, parameters)
+        def list_target_pools(region, filter: nil, max_results: nil,
+                              order_by: nil, page_token: nil)
+          @compute.list_target_pools(
+            @project, region.split("/")[-1],
+            :filter => filter,
+            :max_results => max_results,
+            :order_by => order_by,
+            :page_token => page_token
+          )
         end
       end
     end

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

@@ -2,24 +2,20 @@ module Fog
   module Compute
     class Google
       class Mock
-        def list_url_maps
-          url_maps = data[:url_maps].values
-
-          build_excon_response("kind" => "compute#urlMapList",
-                               "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/urlMaps",
-                               "id" => "projects/#{@project}/global/urlMaps",
-                               "items" => url_maps)
+        def list_url_maps(_filter: nil, _max_results: nil,
+                          _order_by: nil, _page_token: nil)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def list_url_maps
-          api_method = @compute.url_maps.list
-          parameters = {
-            "project" => @project
-          }
-
-          request(api_method, parameters)
+        def list_url_maps(filter: nil, max_results: nil,
+                          order_by: nil, page_token: nil)
+          @compute.list_url_maps(
+            @project,
+            :filter => filter, :max_results => max_results,
+            :order_by => order_by, :page_token => page_token
+          )
         end
       end
     end

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

@@ -8,16 +8,17 @@ module Fog
       end
 
       class Real
-        # https://developers.google.com/compute/docs/reference/latest/zoneOperations
-
-        def list_zone_operations(zone)
-          api_method = @compute.zone_operations.list
-          parameters = {
-            "zone" => zone,
-            "project" => @project
-          }
-
-          request(api_method, parameters)
+        # @see https://developers.google.com/compute/docs/reference/latest/zoneOperations/list
+        def list_zone_operations(zone, filter: nil, max_results: nil,
+                                 order_by: nil, page_token: nil)
+          zone = zone.split("/")[-1] if zone.start_with? "http"
+          @compute.list_zone_operations(
+            @project, zone,
+            :filter => filter,
+            :max_results => max_results,
+            :order_by => order_by,
+            :page_token => page_token
+          )
         end
       end
     end

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

@@ -3,22 +3,20 @@ module Fog
     class Google
       class Mock
         def list_zones
-          zones = data[:zones].values
-          build_excon_response("kind" => "compute#zoneList",
-                               "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones",
-                               "id" => "projects/#{@project}/zones",
-                               "items" => zones)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def list_zones
-          api_method = @compute.zones.list
-          parameters = {
-            "project" => @project
-          }
-
-          request(api_method, parameters)
+        def list_zones(filter: nil, max_results: nil,
+                       order_by: nil, page_token: nil)
+          @compute.list_zones(
+            @project,
+            :filter => filter,
+            :max_results => max_results,
+            :order_by => order_by,
+            :page_token => page_token
+          )
         end
       end
     end

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

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def patch_firewall(_firewall_name, _firewall_opts = {})
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        ##
+        # Patch a Firewall resource. Supports PATCH semantics.
+        #
+        # @see https://cloud.google.com/compute/docs/reference/latest/firewalls/patch
+        def patch_firewall(firewall_name, opts = {})
+          opts = opts.select { |k, _| UPDATABLE_FIREWALL_FIELDS.include? k }
+          @compute.patch_firewall(
+            @project, firewall_name,
+            ::Google::Apis::ComputeV1::Firewall.new(opts)
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def patch_url_map(_url_map_name, _options = {})
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        def patch_url_map(url_map_name, options = {})
+          @compute.patch_url_map(
+            @project, url_map_name, ::Google::Apis::ComputeV1::UrlMap.new(options)
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -9,27 +9,25 @@ module Fog
 
       class Real
         def remove_instance_group_instances(group_name, zone, instances)
-          api_method = @compute.instance_groups.remove_instances
-
-          parameters = {
-            "project" => @project,
-            "instanceGroup" => group_name,
-            "zone" => zone
-          }
-
           instances.map! do |instance|
             if instance.start_with?("https:")
-              { "instance" => instance }
+              ::Google::Apis::ComputeV1::InstanceReference.new(:instance => instance)
             else
-              { "instance" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone}/instances/#{instance}\n" }
+              ::Google::Apis::ComputeV1::InstanceReference.new(
+                :instance => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone}/instances/#{instance}\n"
+              )
             end
           end
 
-          body_object = {
-            "instances" => instances
-          }
-
-          request(api_method, parameters, body_object)
+          request = ::Google::Apis::ComputeV1::InstanceGroupsRemoveInstancesRequest.new(
+            :instances => instances
+          )
+          @compute.remove_instance_group_instances(
+            @project,
+            zone,
+            group_name,
+            request
+          )
         end
       end
     end