fog-google 0.6.0 → 1.0.0

data/lib/fog/google/requests/sql/restart_instance.rb

@@ -4,42 +4,17 @@ module Fog
       ##
       # Restarts a Cloud SQL instance
       #
-      # @see https://developers.google.com/cloud-sql/docs/admin-api/v1beta3/instances/restart
+      # @see https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/instances/restart
 
       class Real
         def restart_instance(instance_id)
-          api_method = @sql.instances.restart
-          parameters = {
-            "project" => @project,
-            "instance" => instance_id
-          }
-
-          request(api_method, parameters)
+          @sql.restart_instance(@project, instance_id)
         end
       end
 
       class Mock
-        def restart_instance(instance_id)
-          operation = random_operation
-          data[:operations][instance_id] ||= {}
-          data[:operations][instance_id][operation] = {
-            "kind" => 'sql#instanceOperation',
-            "instance" => instance_id,
-            "operation" => operation,
-            "operationType" => "RESTART",
-            "state" => Fog::Google::SQL::Operation::DONE_STATE,
-            "userEmailAddress" => "google_client_email@developer.gserviceaccount.com",
-            "enqueuedTime" => Time.now.iso8601,
-            "startTime" => Time.now.iso8601,
-            "endTime" => Time.now.iso8601
-          }
-
-          body = {
-            "kind" => 'sql#instancesRestart',
-            "operation" => operation
-          }
-
-          build_excon_response(body)
+        def restart_instance(_instance_id)
+          Fog::Mock.not_implemented
         end
       end
     end

data/lib/fog/google/requests/sql/restore_instance_backup.rb

@@ -4,24 +4,23 @@ module Fog
       ##
       # Restores a backup of a Cloud SQL instance
       #
-      # @see https://developers.google.com/cloud-sql/docs/admin-api/v1beta3/instances/restoreBackup
+      # @see https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/instances/restoreBackup
 
       class Real
-        def restore_instance_backup(identity, backup_configuration, due_time)
-          api_method = @sql.instances.reset_ssl_config
-          parameters = {
-            "project" => @project,
-            "instance" => identity,
-            "backupConfiguration" => backup_configuration,
-            "dueTime" => due_time
-          }
-
-          request(api_method, parameters)
+        def restore_instance_backup(instance_id, backup_run_id)
+          request = ::Google::Apis::SqladminV1beta4::RestoreInstancesBackupRequest.new(
+            :restore_backup_context => ::Google::Apis::SqladminV1beta4::RestoreBackupContext.new(
+              :backup_run_id => backup_run_id,
+              :instance_id => instance_id,
+              :kind => "sql#restoreBackupContext"
+            )
+          )
+          @sql.restore_instance_backup(@project, instance_id, request)
         end
       end
 
       class Mock
-        def restore_instance_backup(_identity, _backup_configuration, _due_time)
+        def restore_instance_backup(_instance_id, _backup_run_id)
           Fog::Mock.not_implemented
         end
       end

data/lib/fog/google/requests/sql/update_instance.rb

@@ -4,127 +4,24 @@ module Fog
       ##
       # Updates settings of a Cloud SQL instance
       #
-      # @see https://developers.google.com/cloud-sql/docs/admin-api/v1beta3/instances/update
-
+      # @see https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/instances/update
       class Real
-        def update_instance(instance_id, settings_version, tier, options = {})
-          api_method = @sql.instances.update
-          parameters = {
-            "project" => @project,
-            "instance" => instance_id
-          }
-
-          body = {
-            "project" => @project,
-            "instance" => instance_id,
-            "settings" => {
-              "settingsVersion" => settings_version,
-              "tier" => tier
-            }
-          }
-
-          if options[:activation_policy]
-            body["settings"]["activationPolicy"] = options[:activation_policy]
-          end
-          if options[:autorized_gae_applications]
-            body["settings"]["authorizedGaeApplications"] = Array(options[:autorized_gae_applications])
-          end
-          if options[:backup_configuration]
-            body["settings"]["backupConfiguration"] = options[:backup_configuration]
-          end
-          if options[:ip_configuration_authorized_networks]
-            body["settings"]["ipConfiguration"] ||= {}
-            body["settings"]["ipConfiguration"]["authorizedNetworks"] = Array(options[:ip_configuration_authorized_networks])
-          end
-          if options[:ip_configuration_enabled]
-            body["settings"]["ipConfiguration"] ||= {}
-            body["settings"]["ipConfiguration"]["enabled"] = options[:ip_configuration_enabled]
-          end
-          if options[:ip_configuration_require_ssl]
-            body["settings"]["ipConfiguration"] ||= {}
-            body["settings"]["ipConfiguration"]["requireSsl"] = options[:ip_configuration_require_ssl]
-          end
-          if options[:location_preference_zone_follow_gae_application]
-            body["settings"]["locationPreference"] ||= {}
-            body["settings"]["locationPreference"]["followGaeApplication"] = options[:location_preference_zone_follow_gae_application]
-          end
-          if options[:location_preference_zone]
-            body["settings"]["locationPreference"] ||= {}
-            body["settings"]["locationPreference"]["zone"] = options[:location_preference_zone]
-          end
-          if options[:pricing_plan]
-            body["settings"]["pricingPlan"] = options[:pricing_plan]
-          end
-          if options[:replication_type]
-            body["settings"]["replicationType"] = options[:replication_type]
-          end
-
-          request(api_method, parameters, body)
+        def update_instance(instance_id, settings_version, tier, settings = {})
+          settings = ::Google::Apis::SqladminV1beta4::Settings.new(settings)
+          settings.tier = tier
+          settings.settings_version = settings_version
+
+          @sql.update_instance(
+            @project,
+            instance_id,
+            ::Google::Apis::SqladminV1beta4::DatabaseInstance.new(:settings => settings)
+          )
         end
       end
 
       class Mock
-        def update_instance(instance_id, _settings_version, tier, options = {})
-          data = self.data[:instances][instance_id]
-          data["tier"] = tier
-          if options[:activation_policy]
-            data["settings"]["activationPolicy"] = options[:activation_policy]
-          end
-          if options[:autorized_gae_applications]
-            data["settings"]["authorizedGaeApplications"] = Array(options[:autorized_gae_applications])
-          end
-          if options[:backup_configuration]
-            data["settings"]["backupConfiguration"] = options[:backup_configuration]
-          end
-          if options[:ip_configuration_authorized_networks]
-            data["settings"]["ipConfiguration"] ||= {}
-            data["settings"]["ipConfiguration"]["authorizedNetworks"] = Array(options[:ip_configuration_authorized_networks])
-          end
-          if options[:ip_configuration_enabled]
-            data["settings"]["ipConfiguration"] ||= {}
-            data["settings"]["ipConfiguration"]["enabled"] = options[:ip_configuration_enabled]
-          end
-          if options[:ip_configuration_require_ssl]
-            data["settings"]["ipConfiguration"] ||= {}
-            data["settings"]["ipConfiguration"]["requireSsl"] = options[:ip_configuration_require_ssl]
-          end
-          if options[:location_preference_zone_follow_gae_application]
-            data["settings"]["locationPreference"] ||= {}
-            data["settings"]["locationPreference"]["followGaeApplication"] = options[:location_preference_zone_follow_gae_application]
-          end
-          if options[:location_preference_zone]
-            data["settings"]["locationPreference"] ||= {}
-            data["settings"]["locationPreference"]["zone"] = options[:location_preference_zone]
-          end
-          if options[:pricing_plan]
-            data["settings"]["pricingPlan"] = options[:pricing_plan]
-          end
-          if options[:replication_type]
-            data["settings"]["replicationType"] = options[:replication_type]
-          end
-          self.data[:instances][instance_id] = data
-
-          operation = random_operation
-          self.data[:operations][instance_id] ||= {}
-          self.data[:operations][instance_id][operation] = {
-            "kind" => 'sql#instanceOperation',
-            "instance" => instance_id,
-            "operation" => operation,
-            "operationType" => "UPDATE",
-            "state" => Fog::Google::SQL::Operation::DONE_STATE,
-            "userEmailAddress" => "google_client_email@developer.gserviceaccount.com",
-            "enqueuedTime" => Time.now.iso8601,
-            "startTime" => Time.now.iso8601,
-            "endTime" => Time.now.iso8601
-          }
-
-          body = {
-            "kind" => 'sql#instancesUpdate',
-            "operation" => operation
-          }
-          status = 200
-
-          build_excon_response(body, status)
+        def update_instance(_instance_id, _settings_version, _tier, _settings = {})
+          Fog::Mock.not_implemented
         end
       end
     end

data/lib/fog/google/requests/sql/update_user.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Google
+    class SQL
+      ##
+      # Updates an existing user in a Cloud SQL instance.
+      #
+      # @see https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/users/update
+
+      class Real
+        def update_user(instance_id, host, name, user)
+          @sql.update_user(
+            @project, instance_id, host, name,
+            ::Google::Apis::SqladminV1beta4::User.new(user)
+          )
+        end
+      end
+
+      class Mock
+        def update_user(_instance_id, _host, _name, _user)
+          Fog::Mock.not_implemented
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/shared.rb

@@ -20,6 +20,7 @@ module Fog
       # Initializes the Google API Client
       #
       # @param [Hash] options Google API options
+      # @option options [Google::Auth|Signet] :google_auth Manually created authorization to use
       # @option options [String] :google_client_email A @developer.gserviceaccount.com email address to use
       # @option options [String] :google_key_location The location of a pkcs12 key file
       # @option options [String] :google_key_string The content of the pkcs12 key file
@@ -35,43 +36,50 @@ module Fog
       def initialize_google_client(options)
         # NOTE: loaded here to avoid requiring this as a core Fog dependency
         begin
-          require "google/api_client"
+          # Because of how Google API gem was rewritten, we get to do all sorts
+          # of funky things, like this nonsense.
+          require "google/apis/monitoring_#{Fog::Google::Monitoring::GOOGLE_MONITORING_API_VERSION}"
+          require "google/apis/compute_#{Fog::Compute::Google::GOOGLE_COMPUTE_API_VERSION}"
+          require "google/apis/dns_#{Fog::DNS::Google::GOOGLE_DNS_API_VERSION}"
+          require "google/apis/pubsub_#{Fog::Google::Pubsub::GOOGLE_PUBSUB_API_VERSION}"
+          require "google/apis/resourceviews_v1beta2"
+          require "google/apis/sqladmin_#{Fog::Google::SQL::GOOGLE_SQL_API_VERSION}"
+          require "google/apis/storage_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_API_VERSION}"
+          require "googleauth"
         rescue LoadError => error
-          Fog::Logger.warning("Please install the google-api-client gem before using this provider")
+          Fog::Logger.error("Please install the google-api-client (>= 0.9) gem before using this provider")
           raise error
         end
 
-        # User can provide an existing Google API Client
-        client = options[:google_client]
-        return client unless client.nil?
-
-        # Create a signing key
-        signing_key = create_signing_key(options)
+        # Users can no longer provide their own clients due to rewrite of auth
+        # in https://github.com/google/google-api-ruby-client/ version 0.9.
+        if options[:google_client]
+          raise ArgumentError.new("Deprecated argument no longer works: google_client")
+        end
 
-        # Validate required arguments
-        unless options[:google_client_email]
-          raise ArgumentError.new("Missing required arguments: google_client_email")
+        # They can also no longer use pkcs12 files, because Google's new auth
+        # library doesn't support them either.
+        if options[:google_key_location]
+          raise ArgumentError.new("Deprecated argument no longer works: google_key_location")
+        end
+        if options[:google_key_string]
+          raise ArgumentError.new("Deprecated argument no longer works: google_key_string")
         end
 
+        # Validate required arguments
         unless options[:google_api_scope_url]
           raise ArgumentError.new("Missing required arguments: google_api_scope_url")
         end
 
-        # Create a new Google API Client
-        new_pk12_google_client(
-          options[:google_client_email],
-          signing_key,
-          options[:google_api_scope_url],
-          options[:app_name],
-          options[:app_version],
-          options[:google_client_options] || {}
-        )
-      end
+        application_name = "fog"
+        unless options[:app_name].nil?
+          application_name = "#{options[:app_name]}/#{options[:app_version] || '0.0.0'} fog"
+        end
 
-      ##
-      # Creates a Google signing key
-      #
-      def create_signing_key(options)
+        ::Google::Apis::ClientOptions.default.application_name = application_name
+        ::Google::Apis::ClientOptions.default.application_version = Fog::Google::VERSION
+
+        auth = nil
         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])
@@ -86,54 +94,30 @@ module Fog
           end
 
           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]
-          google_key =
-            if options[:google_key_location]
-              File.expand_path(options[:google_key_location])
-            else
-              options[:google_key_string]
-            end
+          unless options[:google_client_email]
+            raise ArgumentError.new("Missing required arguments: google_client_email")
+          end
+
+          if ENV["DEBUG"]
+            ::Google::Apis.logger = ::Logger.new(::STDERR)
+            ::Google::Apis.logger.level = ::Logger::DEBUG
+          end
 
-          ::Google::APIClient::KeyUtils.load_from_pkcs12(google_key, "notasecret")
+          auth = ::Google::Auth::ServiceAccountCredentials.make_creds(
+            :json_key_io => StringIO.new(json_key_hash.to_json),
+            :scope => options[:google_api_scope_url]
+          )
+        elsif options[:google_auth]
+          auth = options[:google_auth]
         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_json_key_location, "\
+            "google_json_key_string or google_auth"
+          )
         end
-      end
 
-      ##
-      # Create a Google API Client with a user email and a pkcs12 key
-      #
-      # @param google_client_email [String] A @developer.gserviceaccount.com.
-      #   email address to use
-      # @param signing_key [OpenSSL::PKey] The private key for signing
-      # @param google_api_scope_url [String] Access scope URLs
-      # @param app_name [String] The app name to set in the user agent
-      # @param app_version [String] The app version to set in the user agent
-      # @param google_client_options [Hash] additional options to pass to the
-      #   underlying google client
-      # @return [Google::APIClient] a newly-constructed Google API Client
-      def new_pk12_google_client(google_client_email, signing_key, google_api_scope_url, app_name = nil, app_version = nil, google_client_options = {})
-        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
-        }.merge(google_client_options)
-        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"
-        )
-        client.authorization.fetch_access_token!
-
-        client
+        ::Google::Apis::RequestOptions.default.authorization = auth
+        auth
       end
 
       ##

data/lib/fog/google/sql.rb

@@ -8,6 +8,7 @@ module Fog
       recognizes(
         :app_name,
         :app_version,
+        :google_auth,
         :google_client,
         :google_client_email,
         :google_client_options,
@@ -17,10 +18,10 @@ module Fog
         :google_json_key_string
       )
 
-      GOOGLE_SQL_API_VERSION    = "v1beta3"
-      GOOGLE_SQL_BASE_URL       = "https://www.googleapis.com/sql/"
+      GOOGLE_SQL_API_VERSION    = "v1beta4".freeze
+      GOOGLE_SQL_BASE_URL       = "https://www.googleapis.com/sql/".freeze
       GOOGLE_SQL_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/sqlservice.admin
-                                     https://www.googleapis.com/auth/cloud-platform)
+                                     https://www.googleapis.com/auth/cloud-platform).freeze
 
       ##
       # MODELS
@@ -50,12 +51,18 @@ module Fog
       model :tier
       collection :tiers
 
+      # User
+      model :user
+      collection :users
+
       ##
       # REQUESTS
       request_path "fog/google/requests/sql"
 
       # Backup Run
+      request :delete_backup_run
       request :get_backup_run
+      request :insert_backup_run
       request :list_backup_runs
 
       # Flag
@@ -72,7 +79,6 @@ module Fog
       request :reset_instance_ssl_config
       request :restart_instance
       request :restore_instance_backup
-      request :set_instance_root_password
       request :update_instance
 
       # Operation
@@ -87,6 +93,12 @@ module Fog
 
       # Tier
       request :list_tiers
+
+      # User
+      request :insert_user
+      request :update_user
+      request :list_users
+      request :delete_user
     end
   end
 end