fog-google 0.1.3 → 0.2.0

data/lib/fog/dns/google/requests/create_managed_zone.rb

@@ -0,0 +1,82 @@
+require "date"
+module Fog
+  module DNS
+    class Google
+      ##
+      # Creates a new Managed Zone.
+      #
+      # @see https://developers.google.com/cloud-dns/api/v1/managedZones/create
+      class Real
+        def create_managed_zone(name, dns_name, description)
+          api_method = @dns.managed_zones.create
+          parameters = {
+            "project" => @project
+          }
+
+          body_object = {
+            "name" => name,
+            "dnsName" => dns_name,
+            "description" => description
+          }
+
+          request(api_method, parameters, body_object)
+        end
+      end
+
+      class Mock
+        def create_managed_zone(name, dns_name, description)
+          id = Fog::Mock.random_numbers(19).to_s
+          data = {
+            "kind" => 'dns#managedZone',
+            "id" => id,
+            "creationTime" => DateTime.now.strftime("%FT%T.%LZ"),
+            "name" => name,
+            "dnsName" => dns_name,
+            "description" => description,
+            "nameServers" => [
+              "ns-cloud-e1.googledomains.com.",
+              "ns-cloud-e2.googledomains.com.",
+              "ns-cloud-e3.googledomains.com.",
+              "ns-cloud-e4.googledomains.com."
+            ]
+          }
+          self.data[:managed_zones][id] = data
+          self.data[:resource_record_sets][id] = [
+            {
+              "kind" => 'dns#resourceRecordSet',
+              "name" => dns_name,
+              "type" => "NS",
+              "ttl" => 21_600,
+              "rrdatas" => [
+                "ns-cloud-c1.googledomains.com.",
+                "ns-cloud-c2.googledomains.com.",
+                "ns-cloud-c3.googledomains.com.",
+                "ns-cloud-c4.googledomains.com."
+              ]
+            },
+            {
+              "kind" => 'dns#resourceRecordSet',
+              "name" => dns_name,
+              "type" => "SOA",
+              "ttl" => 21_600,
+              "rrdatas" => [
+                "ns-cloud-c1.googledomains.com. dns-admin.google.com. 0 21600 3600 1209600 300"
+              ]
+            }
+          ]
+          self.data[:changes][id] = [
+            {
+              "kind" => 'dns#change',
+              "id" => "0",
+              "startTime" => DateTime.now.strftime("%FT%T.%LZ"),
+              "status" => "done",
+              "additions" => self.data[:resource_record_sets][id]
+            }
+          ]
+
+          build_excon_response(data)
+        end
+      end
+    end
+  end
+end

data/lib/fog/{google/requests/dns → dns/google/requests}/delete_managed_zone.rb

@@ -9,8 +9,8 @@ module Fog
         def delete_managed_zone(name_or_id)
           api_method = @dns.managed_zones.delete
           parameters = {
-            'project' => @project,
-            'managedZone' => name_or_id,
+            "project" => @project,
+            "managedZone" => name_or_id
           }
 
           request(api_method, parameters)
@@ -19,10 +19,10 @@ module Fog
 
       class Mock
         def delete_managed_zone(name_or_id)
-          if self.data[:managed_zones].has_key?(name_or_id)
-            self.data[:managed_zones].delete(name_or_id)
-          elsif zone = self.data[:managed_zones].values.find { |zone| zone['name'] = name_or_id }
-            self.data[:managed_zones].delete(zone['id'])
+          if data[:managed_zones].key?(name_or_id)
+            data[:managed_zones].delete(name_or_id)
+          elsif zone = data[:managed_zones].values.detect { |z| z["name"] = name_or_id }
+            data[:managed_zones].delete(zone["id"])
           else
             raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{name_or_id}' does not exist."
           end

data/lib/fog/{google/requests/dns → dns/google/requests}/get_change.rb

@@ -9,9 +9,9 @@ module Fog
         def get_change(zone_name_or_id, identity)
           api_method = @dns.changes.get
           parameters = {
-            'project' => @project,
-            'managedZone' => zone_name_or_id,
-            'changeId' => identity,
+            "project" => @project,
+            "managedZone" => zone_name_or_id,
+            "changeId" => identity
           }
 
           request(api_method, parameters)
@@ -20,17 +20,17 @@ module Fog
 
       class Mock
         def get_change(zone_name_or_id, identity)
-          if self.data[:managed_zones].has_key?(zone_name_or_id)
-            zone = self.data[:managed_zones][zone_name_or_id]
+          if data[:managed_zones].key?(zone_name_or_id)
+            zone = data[:managed_zones][zone_name_or_id]
           else
-            zone = self.data[:managed_zones].values.find { |zone| zone['name'] = zone_name_or_id }
+            zone = data[:managed_zones].values.detect { |z| z["name"] = zone_name_or_id }
           end
 
           unless zone
             raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{zone_name_or_id}' does not exist."
           end
 
-          unless data = self.data[:changes][zone['id']].find { |c| c['id'] == identity }
+          unless data = self.data[:changes][zone["id"]].detect { |c| c["id"] == identity }
             raise Fog::Errors::NotFound, "The 'parameters.changeId' resource named '#{identity}' does not exist."
           end
 

data/lib/fog/{google/requests/dns → dns/google/requests}/get_managed_zone.rb

@@ -9,8 +9,8 @@ module Fog
         def get_managed_zone(name_or_id)
           api_method = @dns.managed_zones.get
           parameters = {
-            'project' => @project,
-            'managedZone' => name_or_id,
+            "project" => @project,
+            "managedZone" => name_or_id
           }
 
           request(api_method, parameters)
@@ -19,10 +19,10 @@ module Fog
 
       class Mock
         def get_managed_zone(name_or_id)
-          if self.data[:managed_zones].has_key?(name_or_id)
+          if data[:managed_zones].key?(name_or_id)
             data = self.data[:managed_zones][name_or_id]
           else
-            data = self.data[:managed_zones].values.find { |zone| zone['name'] = name_or_id }
+            data = self.data[:managed_zones].values.detect { |zone| zone["name"] = name_or_id }
           end
 
           unless data

data/lib/fog/{google/requests/dns → dns/google/requests}/get_project.rb

@@ -10,7 +10,7 @@ module Fog
         def get_project(identity)
           api_method = @dns.projects.get
           parameters = {
-            :project => identity,
+            :project => identity
           }
 
           request(api_method, parameters)
@@ -20,17 +20,17 @@ module Fog
       class Mock
         def get_project(identity)
           body = {
-            'kind' => 'dns#project',
-            'number' => Fog::Mock.random_numbers(12).to_s,
-            'id' => identity,
-            'quota' => {
-              'kind' => 'dns#quota',
-              'managedZones' => 100,
-              'rrsetsPerManagedZone' => 10000,
-              'rrsetAdditionsPerChange' => 100,
-              'rrsetDeletionsPerChange'=>100,
-              'totalRrdataSizePerChange' => 10000,
-              'resourceRecordsPerRrset' => 20,
+            "kind" => 'dns#project',
+            "number" => Fog::Mock.random_numbers(12).to_s,
+            "id" => identity,
+            "quota" => {
+              "kind" => 'dns#quota',
+              "managedZones" => 100,
+              "rrsetsPerManagedZone" => 10_000,
+              "rrsetAdditionsPerChange" => 100,
+              "rrsetDeletionsPerChange" => 100,
+              "totalRrdataSizePerChange" => 10_000,
+              "resourceRecordsPerRrset" => 20
             }
           }
 

data/lib/fog/{google/requests/dns → dns/google/requests}/list_changes.rb

@@ -9,8 +9,8 @@ module Fog
         def list_changes(zone_name_or_id)
           api_method = @dns.changes.list
           parameters = {
-            'project' => @project,
-            'managedZone' => zone_name_or_id,
+            "project" => @project,
+            "managedZone" => zone_name_or_id
           }
 
           request(api_method, parameters)
@@ -19,10 +19,10 @@ module Fog
 
       class Mock
         def list_changes(zone_name_or_id)
-          if self.data[:managed_zones].has_key?(zone_name_or_id)
-            zone = self.data[:managed_zones][zone_name_or_id]
+          if data[:managed_zones].key?(zone_name_or_id)
+            zone = data[:managed_zones][zone_name_or_id]
           else
-            zone = self.data[:managed_zones].values.find { |zone| zone['name'] == zone_name_or_id }
+            zone = data[:managed_zones].values.detect { |z| z["name"] == zone_name_or_id }
           end
 
           unless zone
@@ -30,8 +30,8 @@ module Fog
           end
 
           body = {
-            'kind' => 'dns#changesListResponse',
-            'changes' => self.data[:changes][zone['id']],
+            "kind" => 'dns#changesListResponse',
+            "changes" => data[:changes][zone["id"]]
           }
           build_excon_response(body)
         end

data/lib/fog/{google/requests/dns → dns/google/requests}/list_managed_zones.rb

@@ -6,10 +6,10 @@ module Fog
       #
       # @see hhttps://developers.google.com/cloud-dns/api/v1/managedZones/list
       class Real
-        def list_managed_zones()
+        def list_managed_zones
           api_method = @dns.managed_zones.list
           parameters = {
-            'project' => @project,
+            "project" => @project
           }
 
           request(api_method, parameters)
@@ -17,10 +17,10 @@ module Fog
       end
 
       class Mock
-        def list_managed_zones()
+        def list_managed_zones
           body = {
-            'kind' => 'dns#managedZonesListResponse',
-            'managedZones' => self.data[:managed_zones].values,
+            "kind" => 'dns#managedZonesListResponse',
+            "managedZones" => data[:managed_zones].values
           }
 
           build_excon_response(body)

data/lib/fog/{google/requests/dns → dns/google/requests}/list_resource_record_sets.rb

@@ -9,11 +9,11 @@ module Fog
         def list_resource_record_sets(zone_name_or_id, options = {})
           api_method = @dns.resource_record_sets.list
           parameters = {
-            'project' => @project,
-            'managedZone' => zone_name_or_id,
+            "project" => @project,
+            "managedZone" => zone_name_or_id
           }
 
-          [:name, :type].reject{ |o| options[o].nil? }.each do |key|
+          [:name, :type].reject { |o| options[o].nil? }.each do |key|
             parameters[key] = options[key]
           end
 
@@ -23,24 +23,24 @@ module Fog
 
       class Mock
         def list_resource_record_sets(zone_name_or_id, options = {})
-          if self.data[:managed_zones].has_key?(zone_name_or_id)
-            zone = self.data[:managed_zones][zone_name_or_id]
+          if data[:managed_zones].key?(zone_name_or_id)
+            zone = data[:managed_zones][zone_name_or_id]
           else
-            zone = self.data[:managed_zones].values.find { |zone| zone['name'] = zone_name_or_id }
+            zone = data[:managed_zones].values.detect { |z| z["name"] = zone_name_or_id }
           end
 
           unless zone
             raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{zone_name_or_id}' does not exist."
           end
 
-          rrsets = self.data[:resource_record_sets][zone['id']]
-          if options.has_key?(:name) && options.has_key?(:type)
-            rrsets.delete_if { |rrset| rrset['name'] != options[:name] || rrset['type'] != options[:type] }
+          rrsets = data[:resource_record_sets][zone["id"]]
+          if options.key?(:name) && options.key?(:type)
+            rrsets.delete_if { |rrset| rrset["name"] != options[:name] || rrset["type"] != options[:type] }
           end
 
           body = {
-            'kind' => 'dns#resourceRecordSetsListResponse',
-            'rrsets' => rrsets,
+            "kind" => 'dns#resourceRecordSetsListResponse',
+            "rrsets" => rrsets
           }
           build_excon_response(body)
         end

data/lib/fog/google.rb

@@ -4,47 +4,35 @@ require "fog/xml"
 require "fog/google/version"
 
 module Fog
-  module Compute
-    autoload :Google, "fog/google/compute"
-  end
-
-  module DNS
-    autoload :Google, "fog/google/dns"
-  end
-  
-  module Storage
-    autoload :Google, "fog/google/storage"
-  end
-
   module Google
     autoload :Monitoring, "fog/google/monitoring"
     autoload :SQL, "fog/google/sql"
 
     extend Fog::Provider
 
-    service(:compute,    'Compute')
-    service(:dns,        'DNS')
-    service(:monitoring, 'Monitoring')
-    service(:storage,    'Storage')
-    service(:sql,        'SQL')
+    service(:compute, "Compute")
+    service(:dns, "DNS")
+    service(:monitoring, "Monitoring")
+    service(:storage, "Storage")
+    service(:sql, "SQL")
 
     # CGI.escape, but without special treatment on spaces
-    def self.escape(str,extra_exclude_chars = '')
+    def self.escape(str, extra_exclude_chars = "")
       # '-' is a special character inside a regex class so it must be first or last.
       # Add extra excludes before the final '-' so it always remains trailing, otherwise
       # an unwanted range is created by mistake.
       str.gsub(/([^a-zA-Z0-9_.#{extra_exclude_chars}-]+)/) do
-        '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+        "%" + Regexp.last_match(1).unpack("H2" * Regexp.last_match(1).bytesize).join("%").upcase
       end
     end
-    
+
     class Mock
       def self.etag
         hex(32)
       end
 
       def self.hex(length)
-        max = ('f' * length).to_i(16)
+        max = ("f" * length).to_i(16)
         rand(max).to_s(16)
       end
     end
@@ -62,7 +50,7 @@ module Fog
       def shared_initialize(project, api_version, base_url)
         @project = project
         @api_version = api_version
-        @api_url = base_url + api_version + '/projects/'
+        @api_url = base_url + api_version + "/projects/"
       end
 
       ##
@@ -83,9 +71,9 @@ module Fog
       def initialize_google_client(options)
         # NOTE: loaded here to avoid requiring this as a core Fog dependency
         begin
-          require 'google/api_client'
+          require "google/api_client"
         rescue LoadError => error
-          Fog::Logger.warning('Please install the google-api-client gem before using this provider')
+          Fog::Logger.warning("Please install the google-api-client gem before using this provider")
           raise error
         end
 
@@ -98,20 +86,20 @@ module Fog
 
         # Validate required arguments
         unless options[:google_client_email]
-          raise ArgumentError.new('Missing required arguments: google_client_email')
+          raise ArgumentError.new("Missing required arguments: google_client_email")
         end
 
         unless options[:google_api_scope_url]
-          raise ArgumentError.new('Missing required arguments: google_api_scope_url')
+          raise ArgumentError.new("Missing required arguments: google_api_scope_url")
         end
 
         # Create a new Google API Client
-        self.new_pk12_google_client(
-            options[:google_client_email],
-            signing_key,
-            options[:google_api_scope_url],
-            options[:app_name],
-            options[:app_version]
+        new_pk12_google_client(
+          options[:google_client_email],
+          signing_key,
+          options[:google_api_scope_url],
+          options[:app_name],
+          options[:app_version]
         )
       end
 
@@ -122,18 +110,18 @@ module Fog
         if options[:google_json_key_location] || options[:google_json_key_string]
           if options[:google_json_key_location]
             json_key_location = File.expand_path(options[:google_json_key_location])
-            json_key = File.open(json_key_location, 'r') { |file| file.read }
+            json_key = File.open(json_key_location, "r", &:read)
           else
             json_key = options[:google_json_key_string]
           end
 
           json_key_hash = Fog::JSON.decode(json_key)
-          unless json_key_hash.has_key?('client_email') || json_key_hash.has_key?('private_key')
-            raise ArgumentError.new('Invalid Google JSON key')
+          unless json_key_hash.key?("client_email") || json_key_hash.key?("private_key")
+            raise ArgumentError.new("Invalid Google JSON key")
           end
 
-          options[:google_client_email] = json_key_hash['client_email']
-          ::Google::APIClient::KeyUtils.load_from_pem(json_key_hash['private_key'], 'notasecret')
+          options[:google_client_email] = json_key_hash["client_email"]
+          ::Google::APIClient::KeyUtils.load_from_pem(json_key_hash["private_key"], "notasecret")
         elsif options[:google_key_location] || options[:google_key_string]
           if options[:google_key_location]
             google_key = File.expand_path(options[:google_key_location])
@@ -141,10 +129,10 @@ module Fog
             google_key = options[:google_key_string]
           end
 
-          ::Google::APIClient::KeyUtils.load_from_pkcs12(google_key, 'notasecret')
+          ::Google::APIClient::KeyUtils.load_from_pkcs12(google_key, "notasecret")
         else
-          raise ArgumentError.new('Missing required arguments: google_key_location, google_key_string, ' \
-                                  'google_json_key_location or google_json_key_string')
+          raise ArgumentError.new("Missing required arguments: google_key_location, google_key_string, " \
+                                  "google_json_key_location or google_json_key_string")
         end
       end
 
@@ -158,23 +146,21 @@ module Fog
       # @param [String] app_version The app version to set in the user agent
       # @return [Google::APIClient] Google API Client
       def new_pk12_google_client(google_client_email, signing_key, google_api_scope_url, app_name = nil, app_version = nil)
-        application_name = app_name.nil? ? 'fog' : "#{app_name}/#{app_version || '0.0.0'} fog"
+        application_name = app_name.nil? ? "fog" : "#{app_name}/#{app_version || '0.0.0'} fog"
         api_client_options = {
-            :application_name => application_name,
-            :application_version => Fog::Google::VERSION,
+          :application_name => application_name,
+          :application_version => Fog::Google::VERSION
         }
         client = ::Google::APIClient.new(api_client_options)
 
         client.authorization = Signet::OAuth2::Client.new(
-            {
-                :audience => 'https://accounts.google.com/o/oauth2/token',
-                :auth_provider_x509_cert_url => 'https://www.googleapis.com/oauth2/v1/certs',
-                :client_x509_cert_url => "https://www.googleapis.com/robot/v1/metadata/x509/#{google_client_email}",
-                :issuer => google_client_email,
-                :scope => google_api_scope_url,
-                :signing_key => signing_key,
-                :token_credential_uri => 'https://accounts.google.com/o/oauth2/token',
-            }
+          :audience => "https://accounts.google.com/o/oauth2/token",
+          :auth_provider_x509_cert_url => "https://www.googleapis.com/oauth2/v1/certs",
+          :client_x509_cert_url => "https://www.googleapis.com/robot/v1/metadata/x509/#{google_client_email}",
+          :issuer => google_client_email,
+          :scope => google_api_scope_url,
+          :signing_key => signing_key,
+          :token_credential_uri => "https://accounts.google.com/o/oauth2/token"
         )
         client.authorization.fetch_access_token!
 
@@ -188,15 +174,16 @@ module Fog
       # @param [Hash] parameters The parameters to send to the method
       # @param [Hash] body_object The body object of the request
       # @return [Excon::Response] The result from the API
-      def request(api_method, parameters, body_object = nil)
+      def request(api_method, parameters, body_object = nil, media = nil)
         client_parms = {
-            :api_method => api_method,
-            :parameters => parameters,
+          :api_method => api_method,
+          :parameters => parameters
         }
         # The Google API complains when given null values for enums, so just don't pass it any null fields
         # XXX It may still balk if we have a nested object, e.g.:
         #   {:a_field => "string", :a_nested_field => { :an_empty_nested_field => nil } }
-        client_parms[:body_object] = body_object.reject { |k, v| v.nil? } if body_object
+        client_parms[:body_object] = body_object.reject { |_k, v| v.nil? } if body_object
+        client_parms[:media] = media if media
 
         result = @client.execute(client_parms)
 
@@ -211,25 +198,25 @@ module Fog
       # @return [Excon::Response] Excon response
       def build_excon_response(body, status = 200)
         response = Excon::Response.new(:body => body, :status => status)
-        if body && body.has_key?('error')
-          msg = 'Google Cloud did not return an error message'
-
-          if body['error'].kind_of?(Hash)
-            response.status = body['error']['code']
-            if body['error'].has_key?('errors')
-              msg = body['error']['errors'].map{ |error| error['message'] }.join(', ')
-            elsif body['error'].has_key?('message')
-              msg = body['error']['message']
+        if body && body.key?("error")
+          msg = "Google Cloud did not return an error message"
+
+          if body["error"].is_a?(Hash)
+            response.status = body["error"]["code"]
+            if body["error"].key?("errors")
+              msg = body["error"]["errors"].map { |error| error["message"] }.join(", ")
+            elsif body["error"].key?("message")
+              msg = body["error"]["message"]
             end
-          elsif body['error'].kind_of?(Array)
-            msg = body['error'].map{ |error| error['code'] }.join(', ')
+          elsif body["error"].is_a?(Array)
+            msg = body["error"].map { |error| error["code"] }.join(", ")
           end
 
           case response.status
-            when 404
-              raise Fog::Errors::NotFound.new(msg)
-            else
-              raise Fog::Errors::Error.new(msg)
+          when 404
+            raise Fog::Errors::NotFound.new(msg)
+          else
+            raise Fog::Errors::Error.new(msg)
           end
         end
 
@@ -237,4 +224,24 @@ module Fog
       end
     end
   end
+
+  module Compute
+    autoload :Google, File.expand_path("../compute/google", __FILE__)
+  end
+
+  module DNS
+    autoload :Google, File.expand_path("../dns/google", __FILE__)
+  end
+
+  module Parsers
+    module Storage
+      autoload :Google, File.expand_path("../parsers/storage/google", __FILE__)
+    end
+  end
+
+  module Storage
+    autoload :Google, File.expand_path("../storage/google", __FILE__)
+    autoload :GoogleJSON, File.expand_path("../storage/google_json", __FILE__)
+    autoload :GoogleXML, File.expand_path("../storage/google_xml", __FILE__)
+  end
 end