fog-google 0.6.0 → 1.0.0

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

@@ -8,15 +8,13 @@ module Fog
       end
 
       class Real
+        # Delete an address resource in the specified project
+        # https://cloud.google.com/compute/docs/reference/latest/addresses/delete
+        #
+        # @param address_name [String] Project ID for this address
+        # @param region_name [String] Region for address
         def delete_address(address_name, region_name)
-          api_method = @compute.addresses.delete
-          parameters = {
-            "project" => @project,
-            "address" => address_name,
-            "region" => region_name
-          }
-
-          request(api_method, parameters)
+          @compute.delete_address(@project, region_name, address_name)
         end
       end
     end

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

@@ -2,40 +2,14 @@ module Fog
   module Compute
     class Google
       class Mock
-        def delete_backend_service(backend_service_name, _zone_name = nil)
-          get_backend_service(backend_service_name)
-          backend_service = data[:backend_services][backend_service_name]
-          backend_service["mock-deletionTimestamp"] = Time.now.iso8601
-          backend_service["status"] = "DONE"
-          operation = random_operation
-          data[:operations][operation] = {
-            "kind" => "compute#operation",
-            "id" => Fog::Mock.random_numbers(19).to_s,
-            "name" => operation,
-            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global",
-            "operationType" => "delete",
-            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/backendServices/#{backend_service_name}",
-            "targetId" => data[:backend_services][backend_service_name]["id"],
-            "status" => "DONE",
-            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
-            "progress" => 0,
-            "insertTime" => Time.now.iso8601,
-            "startTime" => Time.now.iso8601,
-            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/operations/#{operation}"
-          }
-          build_excon_response(data[:operations][operation])
+        def delete_backend_service(_backend_service_name, _zone_name = nil)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
         def delete_backend_service(backend_service_name)
-          api_method = @compute.backend_services.delete
-          parameters = {
-            "project" => @project,
-            "backendService" => backend_service_name
-          }
-
-          request(api_method, parameters)
+          @compute.delete_backend_service(@project, backend_service_name)
         end
       end
     end

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

@@ -2,43 +2,20 @@ module Fog
   module Compute
     class Google
       class Mock
-        def delete_disk(disk_name, zone_name)
-          get_disk(disk_name, zone_name)
-
-          operation = random_operation
-          data[:operations][operation] = {
-            "kind" => "compute#operation",
-            "id" => Fog::Mock.random_numbers(19).to_s,
-            "name" => operation,
-            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
-            "operationType" => "delete",
-            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}",
-            "targetId" => data[:disks][disk_name]["id"],
-            "status" => Fog::Compute::Google::Operation::PENDING_STATE,
-            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
-            "progress" => 0,
-            "insertTime" => Time.now.iso8601,
-            "startTime" => Time.now.iso8601,
-            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/#{operation}"
-          }
-          data[:disks].delete disk_name
-
-          build_excon_response(data[:operations][operation])
+        def delete_disk(_disk_name, _zone_name)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
+        # Delete a disk resource
+        # https://cloud.google.com/compute/docs/reference/latest/disks/delete
+        #
+        # @param disk_name [String] Name of the disk to delete
+        # @param zone_name [String] Zone the disk reside in
         def delete_disk(disk_name, zone_name)
           zone_name = zone_name.split("/")[-1] if zone_name.start_with? "http"
-
-          api_method = @compute.disks.delete
-          parameters = {
-            "project" => @project,
-            "disk" => disk_name,
-            "zone" => zone_name
-          }
-
-          request(api_method, parameters)
+          @compute.delete_disk(@project, zone_name, disk_name)
         end
       end
     end

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

@@ -9,13 +9,7 @@ module Fog
 
       class Real
         def delete_firewall(firewall_name)
-          api_method = @compute.firewalls.delete
-          parameters = {
-            "project" => @project,
-            "firewall" => firewall_name
-          }
-
-          request(api_method, parameters)
+          @compute.delete_firewall(@project, firewall_name)
         end
       end
     end

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

@@ -2,46 +2,15 @@ module Fog
   module Compute
     class Google
       class Mock
-        def delete_forwarding_rule(name, region_name)
-          get_forwarding_rule(name, region_name)
-          id = Fog::Mock.random_numbers(19).to_s
-          operation = random_operation
-          data[:operations][operation] = {
-            "kind" => "compute#operation",
-            "id" => Fog::Mock.random_numbers(19).to_s,
-            "name" => operation,
-            "region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/#{region_name}",
-            "operationType" => "delete",
-            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/#{region_name}/forwardingRules/#{name}",
-            "targetId" => id,
-            "status" => "DONE",
-            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
-            "progress" => 0,
-            "insertTime" => Time.now.iso8601,
-            "startTime" => Time.now.iso8601,
-            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/#{region_name}/operations/#{operation}"
-          }
-
-          build_excon_response(data[:operations][operation])
+        def delete_forwarding_rule(_rule, _region)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        # https://developers.google.com/compute/docs/reference/latest/regionOperations
-
-        def delete_forwarding_rule(forwarding_rule_name, region_name)
-          if region_name.start_with? "http"
-            region_name = region_name.split("/")[-1]
-          end
-
-          api_method = @compute.forwarding_rules.delete
-          parameters = {
-            "project" => @project,
-            "forwardingRule" => forwarding_rule_name,
-            "region" => region_name
-          }
-
-          request(api_method, parameters)
+        def delete_forwarding_rule(rule, region)
+          region = region.split("/")[-1] if region.start_with? "http"
+          @compute.delete_forwarding_rule(@project, region, rule)
         end
       end
     end

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

@@ -9,12 +9,7 @@ module Fog
 
       class Real
         def delete_global_address(address_name)
-          api_method = @compute.global_addresses.delete
-          parameters = {
-            "project" => @project,
-            "address" => address_name,
-          }
-          request(api_method, parameters)
+          @compute.delete_global_address(@project, address_name)
         end
       end
     end

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

@@ -2,45 +2,14 @@ module Fog
   module Compute
     class Google
       class Mock
-        def delete_global_forwarding_rule(name, _region_name = "global")
-          get_global_forwarding_rule(name)
-          global_forwarding_rule = data[:global_forwarding_rules][name]
-          global_forwarding_rule["mock-deletionTimestamp"] = Time.now.iso8601
-          global_forwarding_rule["status"] = "DONE"
-          operation = random_operation
-          data[:operations][operation] = {
-            "kind" => "compute#operation",
-            "id" => Fog::Mock.random_numbers(19).to_s,
-            "name" => operation,
-            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global",
-            "operationType" => "delete",
-            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/forwardingRules/#{name}",
-            "targetId" => data[:global_forwarding_rules][name]["id"],
-            "status" => "DONE",
-            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
-            "progress" => 0,
-            "insertTime" => Time.now.iso8601,
-            "startTime" => Time.now.iso8601,
-            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/operations/#{operation}"
-          }
-          build_excon_response(data[:operations][operation])
+        def delete_global_forwarding_rule(_rule)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def delete_global_forwarding_rule(global_forwarding_rule_name, region_name = "global")
-          if region_name.start_with? "http"
-            region_name = region_name.split("/")[-1]
-          end
-
-          api_method = @compute.global_forwarding_rules.delete
-          parameters = {
-            "project" => @project,
-            "forwardingRule" => global_forwarding_rule_name,
-            "region" => region_name
-          }
-
-          request(api_method, parameters)
+        def delete_global_forwarding_rule(rule)
+          @compute.delete_global_forwarding_rule(@project, rule)
         end
       end
     end

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

@@ -8,16 +8,9 @@ module Fog
       end
 
       class Real
-        # https://developers.google.com/compute/docs/reference/latest/globalOperations
-
+        # @see https://developers.google.com/compute/docs/reference/latest/globalOperations/delete
         def delete_global_operation(operation)
-          api_method = @compute.global_operations.delete
-          parameters = {
-            "project" => @project,
-            "operation" => operation
-          }
-
-          request(api_method, parameters)
+          @compute.delete_global_operation(@project, operation)
         end
       end
     end

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

@@ -2,38 +2,14 @@ module Fog
   module Compute
     class Google
       class Mock
-        def delete_http_health_check(name)
-          get_http_health_check(name)
-          check = data[:http_health_checks][name]
-          operation = random_operation
-          data[:operations][operation] = {
-            "kind" => "compute#operation",
-            "id" => Fog::Mock.random_numbers(19).to_s,
-            "name" => operation,
-            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global",
-            "operationType" => "delete",
-            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/httpHealthChecks/#{name}",
-            "targetId" => data[:http_health_checks][name]["id"],
-            "status" => "DONE",
-            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
-            "progress" => 0,
-            "insertTime" => Time.now.iso8601,
-            "startTime" => Time.now.iso8601,
-            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/operations/#{operation}"
-          }
-          build_excon_response(data[:operations][operation])
+        def delete_http_health_check(_check_name)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def delete_http_health_check(name)
-          api_method = @compute.http_health_checks.delete
-          parameters = {
-            "project" => @project,
-            "httpHealthCheck" => name
-          }
-
-          request(api_method, parameters)
+        def delete_http_health_check(check_name)
+          @compute.delete_http_health_check(@project, check_name)
         end
       end
     end

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

@@ -2,39 +2,14 @@ module Fog
   module Compute
     class Google
       class Mock
-        def delete_image(image_name)
-          get_image(image_name)
-
-          operation = random_operation
-          data[:operations][operation] = {
-            "kind" => "compute#operation",
-            "id" => Fog::Mock.random_numbers(19).to_s,
-            "name" => operation,
-            "operationType" => "delete",
-            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/images/#{image_name}",
-            "targetId" => data[:images][image_name]["id"],
-            "status" => Fog::Compute::Google::Operation::PENDING_STATE,
-            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
-            "progress" => 0,
-            "insertTime" => Time.now.iso8601,
-            "startTime" => Time.now.iso8601,
-            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/operations/#{operation}"
-          }
-          data[:images].delete image_name
-
-          build_excon_response(data[:operations][operation])
+        def delete_image(_image_name, _project = @project)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def delete_image(image_name)
-          api_method = @compute.images.delete
-          parameters = {
-            "project" => @project,
-            "image" => image_name
-          }
-
-          request(api_method, parameters)
+        def delete_image(image_name, project = @project)
+          @compute.delete_image(project, image_name)
         end
       end
     end

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

@@ -9,14 +9,7 @@ module Fog
 
       class Real
         def delete_instance_group(group_name, zone)
-          api_method = @compute.instance_groups.delete
-          parameters = {
-            "instanceGroup" => group_name,
-            "project" => @project,
-            "zone" => zone
-          }
-
-          request(api_method, parameters)
+          @compute.delete_instance_group(@project, zone, group_name)
         end
       end
     end

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

@@ -9,13 +9,7 @@ module Fog
 
       class Real
         def delete_network(network_name)
-          api_method = @compute.networks.delete
-          parameters = {
-            "project" => @project,
-            "network" => network_name
-          }
-
-          request(api_method, parameters)
+          @compute.delete_network(@project, network_name)
         end
       end
     end

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

@@ -8,20 +8,11 @@ module Fog
       end
 
       class Real
-        # https://developers.google.com/compute/docs/reference/latest/regionOperations
-
-        def delete_region_operation(region_name, operation)
-          if region_name.start_with? "http"
-            region_name = region_name.split("/")[-1]
-          end
-          api_method = @compute.region_operations.delete
-          parameters = {
-            "project" => @project,
-            "region" => region_name,
-            "operation" => operation
-          }
-
-          request(api_method, parameters)
+        # Deletes the specified region-specific Operations resource.
+        # @see https://developers.google.com/compute/docs/reference/latest/regionOperations/delete
+        def delete_region_operation(region, operation)
+          region = region.split("/")[-1] if region.start_with? "http"
+          @compute.delete_region_operation(@project, region, operation)
         end
       end
     end

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

@@ -8,14 +8,12 @@ module Fog
       end
 
       class Real
+        # Deletes the specified Route resource.
+        #
+        # @param identity [String] Name of the route to delete
+        # @see https://cloud.google.com/compute/docs/reference/latest/routes/delete
         def delete_route(identity)
-          api_method = @compute.routes.delete
-          parameters = {
-            "project" => @project,
-            "route" => identity
-          }
-
-          request(api_method, parameters)
+          @compute.delete_route(@project, identity)
         end
       end
     end

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

@@ -1,65 +1,15 @@
 module Fog
   module Compute
     class Google
-      module Shared
-        def find_zone(zone_name)
-          if zone_name.nil?
-            list_zones.body["items"].each do |zone|
-              if get_server(server_name, zone["name"]).status == 200
-                return zone["name"]
-              end
-            end
-          else
-            return zone_name.body["name"] if zone_name.is_a? Excon::Response
-          end
-          zone_name
-        end
-      end
-
       class Mock
-        include Shared
-
-        def delete_server(server_name, zone_name = nil)
-          zone_name = find_zone(zone_name)
-          get_server(server_name, zone_name)
-          server = data[:servers][server_name]
-          server["status"] = "STOPPED"
-          server["mock-deletionTimestamp"] = Time.now.iso8601
-
-          operation = random_operation
-          data[:operations][operation] = {
-            "kind" => "compute#operation",
-            "id" => Fog::Mock.random_numbers(19).to_s,
-            "name" => operation,
-            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
-            "operationType" => "delete",
-            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}",
-            "targetId" => data[:servers][server_name]["id"],
-            "status" => Fog::Compute::Google::Operation::PENDING_STATE,
-            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
-            "progress" => 0,
-            "insertTime" => Time.now.iso8601,
-            "startTime" => Time.now.iso8601,
-            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/#{operation}"
-          }
-
-          build_excon_response(data[:operations][operation])
+        def delete_server(_server, _zone)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        include Shared
-
-        def delete_server(server_name, zone_name = nil)
-          zone_name = find_zone(zone_name)
-          api_method = @compute.instances.delete
-          parameters = {
-            "project" => @project,
-            "zone" => zone_name,
-            "instance" => server_name
-          }
-
-          request(api_method, parameters)
+        def delete_server(server, zone)
+          @compute.delete_instance(@project, zone.split("/")[-1], server)
         end
       end
     end