fog-google 0.6.0 → 1.0.0

data/lib/fog/google/models/sql/instances.rb

@@ -12,7 +12,7 @@ module Fog
         #
         # @return [Array<Fog::Google::SQL::Instance>] List of instance resources
         def all
-          data = service.list_instances.body["items"] || []
+          data = service.list_instances.to_h[:items] || []
           load(data)
         end
 
@@ -22,16 +22,13 @@ module Fog
         # @param [String] instance_id Instance ID
         # @return [Fog::Google::SQL::Instance] Instance resource
         def get(instance_id)
-          if instance = service.get_instance(instance_id).body
+          instance = service.get_instance(instance_id).to_h
+          if instance
             new(instance)
           end
-        rescue Fog::Errors::NotFound
+        rescue ::Google::Apis::ClientError => e
+          raise e unless e.status_code == 404 || e.status_code == 403
           nil
-        rescue Fog::Errors::Error => e
-          # Google SQL returns a 403 if we try to access a non-existing resource
-          # The default behaviour in Fog is to return a nil
-          return nil if e.message == "The client is not authorized to make this request."
-          raise e
         end
       end
     end

data/lib/fog/google/models/sql/operation.rb

@@ -7,33 +7,39 @@ module Fog
       # An Operation resource contains information about database instance operations
       # such as create, delete, and restart
       #
-      # @see https://developers.google.com/cloud-sql/docs/admin-api/v1beta3/operations
+      # @see https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/operations
       class Operation < Fog::Model
-        identity :operation
+        identity :name
 
-        attribute :end_time, :aliases => "endTime"
-        attribute :enqueued_time, :aliases => "enqueuedTime"
-        attribute :error
-        attribute :export_context, :aliases => "exportContext"
-        attribute :import_context, :aliases => "importContext"
-        attribute :instance
-        attribute :kind
+        attribute :kind, :aliases => "kind"
+        attribute :self_link, :aliases => "selfLink"
+        attribute :target_project, :aliases => "targetProject"
+        attribute :target_id, :aliases => "targetId"
+        attribute :target_link, :aliases => "targetLink"
+        attribute :name, :aliases => "name"
         attribute :operation_type, :aliases => "operationType"
+        attribute :status, :aliases => "status"
+        attribute :user, :aliases => "user"
+        attribute :insert_time, :aliases => "insertTime"
         attribute :start_time, :aliases => "startTime"
-        attribute :state
-        attribute :user_email_address, :aliases => "userEmailAddress"
+        attribute :end_time, :aliases => "endTime"
+        attribute :error, :aliases => "error"
+        attribute :import_context, :aliases => "importContext"
+        attribute :export_context, :aliases => "exportContext"
+        attribute :sql_export_options, :aliases => "sqlExportOptions"
+        attribute :csv_export_options, :aliases => "csvExportOptions"
 
-        DONE_STATE    = "DONE"
-        PENDING_STATE = "PENDING"
-        RUNNING_STATE = "RUNNING"
-        UNKNOWN_STATE = "UNKNOWN"
+        DONE_STATE    = "DONE".freeze
+        PENDING_STATE = "PENDING".freeze
+        RUNNING_STATE = "RUNNING".freeze
+        UNKNOWN_STATE = "UNKNOWN".freeze
 
         ##
         # Checks if the instance operation is pending
         #
         # @return [Boolean] True if the operation is pending; False otherwise
         def pending?
-          state == PENDING_STATE
+          status == PENDING_STATE
         end
 
         ##
@@ -41,7 +47,7 @@ module Fog
         #
         # @return [Boolean] True if the operation is done; False otherwise
         def ready?
-          state == DONE_STATE
+          status == DONE_STATE
         end
 
         ##
@@ -51,7 +57,7 @@ module Fog
         def reload
           requires :identity
 
-          data = collection.get(instance, identity)
+          data = collection.get(identity)
           merge_attributes(data.attributes)
           self
         end

data/lib/fog/google/models/sql/operations.rb

@@ -15,7 +15,8 @@ module Fog
         def all(instance_id)
           data = []
           begin
-            data = service.list_operations(instance_id).body["items"] || []
+            data = service.list_operations(instance_id).items || []
+            data = data.map(&:to_h)
           rescue Fog::Errors::Error => e
             # Google SQL returns a 403 if we try to access a non-existing resource
             # The default behaviour in Fog is to return an empty Array
@@ -28,20 +29,17 @@ module Fog
         ##
         # Retrieves an instance operation that has been performed on an instance
         #
-        # @param [String] instance_id Instance ID
         # @param [String] operation_id Instance operation ID
         # @return [Fog::Google::SQL::Operation] Instance operation resource
-        def get(instance_id, operation_id)
-          if operation = service.get_operation(instance_id, operation_id).body
+        def get(operation_id)
+          if operation = service.get_operation(operation_id).to_h
             new(operation)
           end
-        rescue Fog::Errors::NotFound
-          nil
-        rescue Fog::Errors::Error => e
+        rescue ::Google::Apis::ClientError => e
           # Google SQL returns a 403 if we try to access a non-existing resource
           # The default behaviour in Fog is to return a nil
-          return nil if e.message == "The client is not authorized to make this request."
-          raise e
+          raise e unless e.status_code == 404 || e.status_code == 403
+          nil
         end
       end
     end

data/lib/fog/google/models/sql/ssl_cert.rb

@@ -6,7 +6,7 @@ module Fog
       ##
       # A SSL certificate resource
       #
-      # @see https://developers.google.com/cloud-sql/docs/admin-api/v1beta3/sslCerts
+      # @see https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/sslCerts
       class SslCert < Fog::Model
         identity :sha1_fingerprint, :aliases => "sha1Fingerprint"
 
@@ -17,24 +17,24 @@ module Fog
         attribute :expiration_time, :aliases => "expirationTime"
         attribute :instance
         attribute :kind
+        attribute :self_link, :aliases => "selfLink"
 
         # These attributes are not available in the representation of a 'SSL Certificate' returned by the SQL API.
-        # These attributes are only available as a reponse to a create operation
+        # These attributes are only available as a response to a create operation
         attribute :server_ca_cert, :aliases => "serverCaCert"
         attribute :cert_private_key, :aliases => "certPrivateKey"
 
         ##
         # Deletes a SSL certificate. The change will not take effect until the instance is restarted.
         #
-        # @param [Hash] options Method options
-        # @option options [Boolean] :async If the operation must be performed asynchronously (true by default)
+        # @param async [Boolean] If the operation must be performed asynchronously (true by default)
         # @return [Fog::Google::SQL::Operation] A Operation resource
-        def destroy(options = {})
+        def destroy(async: true)
           requires :instance, :identity
 
           data = service.delete_ssl_cert(instance, identity)
-          operation = Fog::Google::SQL::Operations.new(:service => service).get(instance, data.body["operation"])
-          operation.wait_for { ready? } unless options.fetch(:async, true)
+          operation = Fog::Google::SQL::Operations.new(:service => service).get(data.name)
+          operation.wait_for { ready? } unless async
           operation
         end
 
@@ -59,10 +59,10 @@ module Fog
 
           raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
 
-          data = service.insert_ssl_cert(instance, common_name).body
-          merge_attributes(data["clientCert"]["certInfo"])
-          self.server_ca_cert = Fog::Google::SQL::SslCert.new(data["serverCaCert"])
-          self.cert_private_key = data["clientCert"]["certPrivateKey"]
+          data = service.insert_ssl_cert(instance, common_name)
+          merge_attributes(data.client_cert.cert_info.to_h)
+          self.server_ca_cert = Fog::Google::SQL::SslCert.new(data.server_ca_cert.to_h)
+          self.cert_private_key = data.client_cert.cert_private_key
           self
         end
       end

data/lib/fog/google/models/sql/ssl_certs.rb

@@ -15,11 +15,12 @@ module Fog
         def all(instance_id)
           data = []
           begin
-            data = service.list_ssl_certs(instance_id).body["items"] || []
+            data = service.list_ssl_certs(instance_id).to_h[:items] || []
           rescue Fog::Errors::Error => e
             # Google SQL returns a 403 if we try to access a non-existing resource
             # The default behaviour in Fog is to return an empty Array
-            raise e unless e.message == "The client is not authorized to make this request."
+            return nil if e.status_code == 404 || e.status_code == 403
+            raise e
           end
 
           load(data)
@@ -32,15 +33,14 @@ module Fog
         # @param [String] sha1_fingerprint Sha1 FingerPrint
         # @return [Fog::Google::SQL::SslCert] SSL certificate resource
         def get(instance_id, sha1_fingerprint)
-          if ssl_cert = service.get_ssl_cert(instance_id, sha1_fingerprint).body
+          ssl_cert = service.get_ssl_cert(instance_id, sha1_fingerprint).to_h
+          if ssl_cert
             new(ssl_cert)
           end
-        rescue Fog::Errors::NotFound
-          nil
-        rescue Fog::Errors::Error => e
+        rescue ::Google::Apis::ClientError => e
           # Google SQL returns a 403 if we try to access a non-existing resource
-          # The default behaviour in Fog is to return a nil
-          return nil if e.message == "The client is not authorized to make this request."
+          # The default behaviour in Fog is to return nil
+          return nil if e.status_code == 404 || e.status_code == 403
           raise e
         end
       end

data/lib/fog/google/models/sql/tier.rb

@@ -6,7 +6,7 @@ module Fog
       ##
       # A Google Cloud SQL service tier resource
       #
-      # @see https://developers.google.com/cloud-sql/docs/admin-api/v1beta3/tiers
+      # @see https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/tiers
       class Tier < Fog::Model
         identity :tier
 

data/lib/fog/google/models/sql/tiers.rb

@@ -12,7 +12,7 @@ module Fog
         #
         # @return [Array<Fog::Google::SQL::Tier>] List of tiers
         def all
-          data = service.list_tiers.body["items"] || []
+          data = service.list_tiers.to_h[:items] || []
           load(data)
         end
       end

data/lib/fog/google/models/sql/user.rb

@@ -0,0 +1,44 @@
+require "fog/core/model"
+
+module Fog
+  module Google
+    class SQL
+      ##
+      # Represents a database user in a Cloud SQL instance.
+      #
+      # @see https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/users
+      class User < Fog::Model
+        attribute :name
+        attribute :etag
+        attribute :host
+        attribute :instance
+        attribute :kind
+        attribute :project
+
+        def destroy(async: true)
+          requires :instance, :name, :host
+
+          resp = service.delete_user(instance, host, name)
+          operation = Fog::Google::SQL::Operations.new(:service => service).get(resp.name)
+          operation.wait_for { ready? } unless async
+          operation
+        end
+
+        def save(password: nil)
+          requires :instance, :name
+
+          data = attributes
+          data[:password] = password unless password.nil?
+          if etag.nil?
+            resp = service.update_user(instance, data)
+          else
+            resp = service.insert_user(instance, data)
+          end
+
+          operation = Fog::Google::SQL::Operations.new(:service => service).get(resp.name)
+          operation.wait_for { !pending? }
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/models/sql/users.rb

@@ -0,0 +1,21 @@
+require "fog/core/collection"
+require "fog/google/models/sql/user"
+
+module Fog
+  module Google
+    class SQL
+      class Users < Fog::Collection
+        model Fog::Google::SQL::User
+
+        ##
+        # Lists all Cloud SQL database users
+        #
+        # @return [Array<Fog::Google::SQL::User>] List of users
+        def all(instance)
+          data = service.list_users(instance).to_h[:items] || []
+          load(data)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/monitoring.rb

@@ -43,12 +43,17 @@ module Fog
 
       # Timeseries
       request :list_timeseries
+      request :create_timeseries
 
       # MetricDescriptors
+      request :get_metric_descriptor
       request :list_metric_descriptors
+      request :create_metric_descriptor
+      request :delete_metric_descriptor
 
       # MonitoredResourceDescriptors
       request :list_monitored_resource_descriptors
+      request :get_monitored_resource_descriptor
     end
   end
 end

data/lib/fog/google/monitoring/real.rb

@@ -4,15 +4,14 @@ module Fog
       class Real
         include Fog::Google::Shared
 
-        attr_accessor :client
         attr_reader :monitoring
 
         def initialize(options)
           shared_initialize(options[:google_project], GOOGLE_MONITORING_API_VERSION, GOOGLE_MONITORING_BASE_URL)
           options[:google_api_scope_url] = GOOGLE_MONITORING_API_SCOPE_URLS.join(" ")
 
-          @client = initialize_google_client(options)
-          @monitoring = @client.discovered_api("monitoring", api_version)
+          initialize_google_client(options)
+          @monitoring = ::Google::Apis::MonitoringV3::MonitoringService.new
         end
       end
     end

data/lib/fog/google/pubsub.rb

@@ -8,6 +8,7 @@ module Fog
       recognizes(
         :app_name,
         :app_version,
+        :google_auth,
         :google_client,
         :google_client_email,
         :google_client_options,

data/lib/fog/google/pubsub/real.rb

@@ -12,7 +12,7 @@ module Fog
           options[:google_api_scope_url] = GOOGLE_PUBSUB_API_SCOPE_URLS.join(" ")
 
           @client = initialize_google_client(options)
-          @pubsub = @client.discovered_api("pubsub", api_version)
+          @pubsub = ::Google::Apis::PubsubV1::PubsubService.new
         end
       end
     end

data/lib/fog/google/requests/monitoring/create_metric_descriptor.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Google
+    class Monitoring
+      class Real
+        ##
+        # Create a metric descriptor. User-created metric descriptors define custom metrics.
+        # @param metric_type [String] Required - the metric type. User-created metric descriptors should start
+        #   with custom.googleapis.com.
+        # @param unit [String]  The unit in which the metric value is reported.
+        #   It is only applicable if the valueType is INT64, DOUBLE, or DISTRIBUTION.
+        # @param value_type [String]  Whether the measurement is an integer, a floating-point number, etc.
+        #   Some combinations of metricKind and valueType might not be supported.
+        # @param description [String]  A detailed description of the metric, which can be used in documentation.
+        # @param display_name [String]  A concise name for the metric, which can be displayed in user interfaces.
+        #   Use sentence casing without an ending period, for example "Request count".
+        # @param labels [Array<Hash>] A list of label hash objects that can be used to describe a specific
+        #   instance of this metric type.
+        # @option labels [String] key The label key.
+        # @option labels [String] value_type The type of data that can be assigned to the label.
+        # @option labels [String] description A human-readable description for the label.
+        # @param metric_kind [String]  The pagination token, which is used to page through large result sets.
+        #
+        # @return [::Google::Apis::MonitoringV3::MetricDescriptor] created metric descriptor
+        # @see https://cloud.google.com/monitoring/api/ref_v3/rest/v3/projects.metricDescriptors/create
+        def create_metric_descriptor(metric_type: nil, unit: nil, value_type: nil,
+                                     description: nil, display_name: nil, labels: [], metric_kind: nil)
+          metric_descriptor = ::Google::Apis::MonitoringV3::MetricDescriptor.new(
+            :name => "projects/#{@project}/metricDescriptors/#{metric_type}",
+            :type => metric_type,
+            :unit => unit,
+            :value_type => value_type,
+            :description => description,
+            :display_name => display_name,
+            :labels => labels.map { |l| ::Google::Apis::MonitoringV3::LabelDescriptor.new(l) },
+            :metric_kind => metric_kind
+          )
+
+          @monitoring.create_project_metric_descriptor("projects/#{@project}", metric_descriptor)
+        end
+      end
+
+      class Mock
+        def create_metric_descriptor(**_args)
+          Fog::Mock.not_implemented
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/requests/monitoring/create_timeseries.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Google
+    class Monitoring
+      class Real
+        ##
+        # Create a timeseries. User-created time series should only be used with custom metrics.
+        #
+        # @param timeseries [Array<Hash>] Timeseries to create/update.
+        #   @see https://cloud.google.com/monitoring/api/ref_v3/rest/v3/TimeSeries for expected format.
+        # @see https://cloud.google.com/monitoring/api/ref_v3/rest/v3/projects.timeSeries/create
+        #
+        def create_timeseries(timeseries: [])
+          request = ::Google::Apis::MonitoringV3::CreateTimeSeriesRequest.new(
+            :time_series => timeseries
+          )
+          @monitoring.create_time_series("projects/#{@project}", request)
+        end
+      end
+
+      class Mock
+        def create_timeseries(_timeseries: [])
+          Fog::Mock.not_implemented
+        end
+      end
+    end
+  end
+end