google-cloud-error_reporting 0.27.0 → 0.28.0

data/lib/google/cloud/error_reporting/v1beta1/error_stats_service_client.rb

@@ -28,6 +28,7 @@ require "pathname"
 require "google/gax"
 
 require "google/devtools/clouderrorreporting/v1beta1/error_stats_service_pb"
+require "google/cloud/error_reporting/credentials"
 
 module Google
   module Cloud
@@ -83,22 +84,24 @@ module Google
             )
           end
 
-          # Parses the project from a project resource.
-          # @param project_name [String]
-          # @return [String]
-          def self.match_project_from_project_name project_name
-            PROJECT_PATH_TEMPLATE.match(project_name)["project"]
-          end
-
-          # @param service_path [String]
-          #   The domain name of the API remote host.
-          # @param port [Integer]
-          #   The port on which to connect to the remote host.
-          # @param channel [Channel]
-          #   A Channel object through which to make calls.
-          # @param chan_creds [Grpc::ChannelCredentials]
-          #   A ChannelCredentials for the setting up the RPC client.
-          # @param client_config[Hash]
+          # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
+          #   Provides the means for authenticating requests made by the client. This parameter can
+          #   be many types.
+          #   A `Google::Auth::Credentials` uses a the properties of its represented keyfile for
+          #   authenticating requests made by this client.
+          #   A `String` will be treated as the path to the keyfile to be used for the construction of
+          #   credentials for this client.
+          #   A `Hash` will be treated as the contents of a keyfile to be used for the construction of
+          #   credentials for this client.
+          #   A `GRPC::Core::Channel` will be used to make calls through.
+          #   A `GRPC::Core::ChannelCredentials` for the setting up the RPC client. The channel credentials
+          #   should already be composed with a `GRPC::Core::CallCredentials` object.
+          #   A `Proc` will be used as an updater_proc for the Grpc channel. The proc transforms the
+          #   metadata for requests, generally, to give OAuth credentials.
+          # @param scopes [Array<String>]
+          #   The OAuth scopes for this service. This parameter is ignored if
+          #   an updater_proc is supplied.
+          # @param client_config [Hash]
           #   A Hash for call options for each method. See
           #   Google::Gax#construct_settings for the structure of
           #   this data. Falls back to the default config if not specified
@@ -110,11 +113,11 @@ module Google
               port: DEFAULT_SERVICE_PORT,
               channel: nil,
               chan_creds: nil,
+              updater_proc: nil,
+              credentials: nil,
               scopes: ALL_SCOPES,
               client_config: {},
               timeout: DEFAULT_TIMEOUT,
-              app_name: nil,
-              app_version: nil,
               lib_name: nil,
               lib_version: ""
             # These require statements are intentionally placed here to initialize
@@ -123,14 +126,38 @@ module Google
             require "google/gax/grpc"
             require "google/devtools/clouderrorreporting/v1beta1/error_stats_service_services_pb"
 
+            if channel || chan_creds || updater_proc
+              warn "The `channel`, `chan_creds`, and `updater_proc` parameters will be removed " \
+                "on 2017/09/08"
+              credentials ||= channel
+              credentials ||= chan_creds
+              credentials ||= updater_proc
+            end
+            if service_path != SERVICE_ADDRESS || port != DEFAULT_SERVICE_PORT
+              warn "`service_path` and `port` parameters are deprecated and will be removed"
+            end
+
+            credentials ||= Google::Cloud::ErrorReporting::Credentials.default
 
-            if app_name || app_version
-              warn "`app_name` and `app_version` are no longer being used in the request headers."
+            if credentials.is_a?(String) || credentials.is_a?(Hash)
+              updater_proc = Google::Cloud::ErrorReporting::Credentials.new(credentials).updater_proc
+            end
+            if credentials.is_a?(GRPC::Core::Channel)
+              channel = credentials
+            end
+            if credentials.is_a?(GRPC::Core::ChannelCredentials)
+              chan_creds = credentials
+            end
+            if credentials.is_a?(Proc)
+              updater_proc = credentials
+            end
+            if credentials.is_a?(Google::Auth::Credentials)
+              updater_proc = credentials.updater_proc
             end
 
             google_api_client = "gl-ruby/#{RUBY_VERSION}"
             google_api_client << " #{lib_name}/#{lib_version}" if lib_name
-            google_api_client << " gapic/0.6.8 gax/#{Google::Gax::VERSION}"
+            google_api_client << " gapic/0.1.0 gax/#{Google::Gax::VERSION}"
             google_api_client << " grpc/#{GRPC::VERSION}"
             google_api_client.freeze
 
@@ -155,6 +182,7 @@ module Google
               port,
               chan_creds: chan_creds,
               channel: channel,
+              updater_proc: updater_proc,
               scopes: scopes,
               &Google::Devtools::Clouderrorreporting::V1beta1::ErrorStatsService::Stub.method(:new)
             )
@@ -184,7 +212,7 @@ module Google
           #   Platform project ID</a>.
           #
           #   Example: <code>projects/my-project-123</code>.
-          # @param time_range [Google::Devtools::Clouderrorreporting::V1beta1::QueryTimeRange]
+          # @param time_range [Google::Devtools::Clouderrorreporting::V1beta1::QueryTimeRange | Hash]
           #   [Optional] List data for the given time range.
           #   If not set a default time range is used. The field time_range_begin
           #   in the response will specify the beginning of this time range.
@@ -192,21 +220,29 @@ module Google
           #   range are returned, unless the request contains an explicit group_id list.
           #   If a group_id list is given, also <code>ErrorGroupStats</code> with zero
           #   occurrences are returned.
+          #   A hash of the same form as `Google::Devtools::Clouderrorreporting::V1beta1::QueryTimeRange`
+          #   can also be provided.
           # @param group_id [Array<String>]
           #   [Optional] List all <code>ErrorGroupStats</code> with these IDs.
-          # @param service_filter [Google::Devtools::Clouderrorreporting::V1beta1::ServiceContextFilter]
+          # @param service_filter [Google::Devtools::Clouderrorreporting::V1beta1::ServiceContextFilter | Hash]
           #   [Optional] List only <code>ErrorGroupStats</code> which belong to a service
           #   context that matches the filter.
           #   Data for all service contexts is returned if this field is not specified.
-          # @param timed_count_duration [Google::Protobuf::Duration]
+          #   A hash of the same form as `Google::Devtools::Clouderrorreporting::V1beta1::ServiceContextFilter`
+          #   can also be provided.
+          # @param timed_count_duration [Google::Protobuf::Duration | Hash]
           #   [Optional] The preferred duration for a single returned +TimedCount+.
           #   If not set, no timed counts are returned.
+          #   A hash of the same form as `Google::Protobuf::Duration`
+          #   can also be provided.
           # @param alignment [Google::Devtools::Clouderrorreporting::V1beta1::TimedCountAlignment]
           #   [Optional] The alignment of the timed counts to be returned.
           #   Default is +ALIGNMENT_EQUAL_AT_END+.
-          # @param alignment_time [Google::Protobuf::Timestamp]
+          # @param alignment_time [Google::Protobuf::Timestamp | Hash]
           #   [Optional] Time where the timed counts shall be aligned if rounded
           #   alignment is chosen. Default is 00:00 UTC.
+          #   A hash of the same form as `Google::Protobuf::Timestamp`
+          #   can also be provided.
           # @param order [Google::Devtools::Clouderrorreporting::V1beta1::ErrorGroupOrder]
           #   [Optional] The sort order in which the results are returned.
           #   Default is +COUNT_DESC+.
@@ -226,14 +262,11 @@ module Google
           #   object.
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/error_reporting/v1beta1/error_stats_service_client"
+          #   require "google/cloud/error_reporting/v1beta1"
           #
-          #   ErrorStatsServiceClient = Google::Cloud::ErrorReporting::V1beta1::ErrorStatsServiceClient
-          #   QueryTimeRange = Google::Devtools::Clouderrorreporting::V1beta1::QueryTimeRange
-          #
-          #   error_stats_service_client = ErrorStatsServiceClient.new
-          #   formatted_project_name = ErrorStatsServiceClient.project_path("[PROJECT]")
-          #   time_range = QueryTimeRange.new
+          #   error_stats_service_client = Google::Cloud::ErrorReporting::V1beta1::ErrorStats.new
+          #   formatted_project_name = Google::Cloud::ErrorReporting::V1beta1::ErrorStatsServiceClient.project_path("[PROJECT]")
+          #   time_range = {}
           #
           #   # Iterate over all results.
           #   error_stats_service_client.list_group_stats(formatted_project_name, time_range).each do |element|
@@ -259,7 +292,7 @@ module Google
               order: nil,
               page_size: nil,
               options: nil
-            req = Google::Devtools::Clouderrorreporting::V1beta1::ListGroupStatsRequest.new({
+            req = {
               project_name: project_name,
               time_range: time_range,
               group_id: group_id,
@@ -269,7 +302,8 @@ module Google
               alignment_time: alignment_time,
               order: order,
               page_size: page_size
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Devtools::Clouderrorreporting::V1beta1::ListGroupStatsRequest)
             @list_group_stats.call(req, options)
           end
 
@@ -278,19 +312,23 @@ module Google
           # @param project_name [String]
           #   [Required] The resource name of the Google Cloud Platform project. Written
           #   as +projects/+ plus the
-          #   {Google Cloud Platform project
-          #   ID}[https://support.google.com/cloud/answer/6158840].
+          #   [Google Cloud Platform project
+          #   ID](https://support.google.com/cloud/answer/6158840).
           #   Example: +projects/my-project-123+.
           # @param group_id [String]
           #   [Required] The group for which events shall be returned.
-          # @param service_filter [Google::Devtools::Clouderrorreporting::V1beta1::ServiceContextFilter]
+          # @param service_filter [Google::Devtools::Clouderrorreporting::V1beta1::ServiceContextFilter | Hash]
           #   [Optional] List only ErrorGroups which belong to a service context that
           #   matches the filter.
           #   Data for all service contexts is returned if this field is not specified.
-          # @param time_range [Google::Devtools::Clouderrorreporting::V1beta1::QueryTimeRange]
+          #   A hash of the same form as `Google::Devtools::Clouderrorreporting::V1beta1::ServiceContextFilter`
+          #   can also be provided.
+          # @param time_range [Google::Devtools::Clouderrorreporting::V1beta1::QueryTimeRange | Hash]
           #   [Optional] List only data for the given time range.
           #   If not set a default time range is used. The field time_range_begin
           #   in the response will specify the beginning of this time range.
+          #   A hash of the same form as `Google::Devtools::Clouderrorreporting::V1beta1::QueryTimeRange`
+          #   can also be provided.
           # @param page_size [Integer]
           #   The maximum number of resources contained in the underlying API
           #   response. If page streaming is performed per-resource, this
@@ -307,12 +345,10 @@ module Google
           #   object.
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/error_reporting/v1beta1/error_stats_service_client"
-          #
-          #   ErrorStatsServiceClient = Google::Cloud::ErrorReporting::V1beta1::ErrorStatsServiceClient
+          #   require "google/cloud/error_reporting/v1beta1"
           #
-          #   error_stats_service_client = ErrorStatsServiceClient.new
-          #   formatted_project_name = ErrorStatsServiceClient.project_path("[PROJECT]")
+          #   error_stats_service_client = Google::Cloud::ErrorReporting::V1beta1::ErrorStats.new
+          #   formatted_project_name = Google::Cloud::ErrorReporting::V1beta1::ErrorStatsServiceClient.project_path("[PROJECT]")
           #   group_id = ''
           #
           #   # Iterate over all results.
@@ -335,13 +371,14 @@ module Google
               time_range: nil,
               page_size: nil,
               options: nil
-            req = Google::Devtools::Clouderrorreporting::V1beta1::ListEventsRequest.new({
+            req = {
               project_name: project_name,
               group_id: group_id,
               service_filter: service_filter,
               time_range: time_range,
               page_size: page_size
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Devtools::Clouderrorreporting::V1beta1::ListEventsRequest)
             @list_events.call(req, options)
           end
 
@@ -350,8 +387,8 @@ module Google
           # @param project_name [String]
           #   [Required] The resource name of the Google Cloud Platform project. Written
           #   as +projects/+ plus the
-          #   {Google Cloud Platform project
-          #   ID}[https://support.google.com/cloud/answer/6158840].
+          #   [Google Cloud Platform project
+          #   ID](https://support.google.com/cloud/answer/6158840).
           #   Example: +projects/my-project-123+.
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
@@ -359,20 +396,19 @@ module Google
           # @return [Google::Devtools::Clouderrorreporting::V1beta1::DeleteEventsResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/error_reporting/v1beta1/error_stats_service_client"
-          #
-          #   ErrorStatsServiceClient = Google::Cloud::ErrorReporting::V1beta1::ErrorStatsServiceClient
+          #   require "google/cloud/error_reporting/v1beta1"
           #
-          #   error_stats_service_client = ErrorStatsServiceClient.new
-          #   formatted_project_name = ErrorStatsServiceClient.project_path("[PROJECT]")
+          #   error_stats_service_client = Google::Cloud::ErrorReporting::V1beta1::ErrorStats.new
+          #   formatted_project_name = Google::Cloud::ErrorReporting::V1beta1::ErrorStatsServiceClient.project_path("[PROJECT]")
           #   response = error_stats_service_client.delete_events(formatted_project_name)
 
           def delete_events \
               project_name,
               options: nil
-            req = Google::Devtools::Clouderrorreporting::V1beta1::DeleteEventsRequest.new({
+            req = {
               project_name: project_name
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Devtools::Clouderrorreporting::V1beta1::DeleteEventsRequest)
             @delete_events.call(req, options)
           end
         end

data/lib/google/cloud/error_reporting/v1beta1/report_errors_service_client.rb

@@ -28,6 +28,7 @@ require "pathname"
 require "google/gax"
 
 require "google/devtools/clouderrorreporting/v1beta1/report_errors_service_pb"
+require "google/cloud/error_reporting/credentials"
 
 module Google
   module Cloud
@@ -69,22 +70,24 @@ module Google
             )
           end
 
-          # Parses the project from a project resource.
-          # @param project_name [String]
-          # @return [String]
-          def self.match_project_from_project_name project_name
-            PROJECT_PATH_TEMPLATE.match(project_name)["project"]
-          end
-
-          # @param service_path [String]
-          #   The domain name of the API remote host.
-          # @param port [Integer]
-          #   The port on which to connect to the remote host.
-          # @param channel [Channel]
-          #   A Channel object through which to make calls.
-          # @param chan_creds [Grpc::ChannelCredentials]
-          #   A ChannelCredentials for the setting up the RPC client.
-          # @param client_config[Hash]
+          # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
+          #   Provides the means for authenticating requests made by the client. This parameter can
+          #   be many types.
+          #   A `Google::Auth::Credentials` uses a the properties of its represented keyfile for
+          #   authenticating requests made by this client.
+          #   A `String` will be treated as the path to the keyfile to be used for the construction of
+          #   credentials for this client.
+          #   A `Hash` will be treated as the contents of a keyfile to be used for the construction of
+          #   credentials for this client.
+          #   A `GRPC::Core::Channel` will be used to make calls through.
+          #   A `GRPC::Core::ChannelCredentials` for the setting up the RPC client. The channel credentials
+          #   should already be composed with a `GRPC::Core::CallCredentials` object.
+          #   A `Proc` will be used as an updater_proc for the Grpc channel. The proc transforms the
+          #   metadata for requests, generally, to give OAuth credentials.
+          # @param scopes [Array<String>]
+          #   The OAuth scopes for this service. This parameter is ignored if
+          #   an updater_proc is supplied.
+          # @param client_config [Hash]
           #   A Hash for call options for each method. See
           #   Google::Gax#construct_settings for the structure of
           #   this data. Falls back to the default config if not specified
@@ -96,11 +99,11 @@ module Google
               port: DEFAULT_SERVICE_PORT,
               channel: nil,
               chan_creds: nil,
+              updater_proc: nil,
+              credentials: nil,
               scopes: ALL_SCOPES,
               client_config: {},
               timeout: DEFAULT_TIMEOUT,
-              app_name: nil,
-              app_version: nil,
               lib_name: nil,
               lib_version: ""
             # These require statements are intentionally placed here to initialize
@@ -109,14 +112,38 @@ module Google
             require "google/gax/grpc"
             require "google/devtools/clouderrorreporting/v1beta1/report_errors_service_services_pb"
 
+            if channel || chan_creds || updater_proc
+              warn "The `channel`, `chan_creds`, and `updater_proc` parameters will be removed " \
+                "on 2017/09/08"
+              credentials ||= channel
+              credentials ||= chan_creds
+              credentials ||= updater_proc
+            end
+            if service_path != SERVICE_ADDRESS || port != DEFAULT_SERVICE_PORT
+              warn "`service_path` and `port` parameters are deprecated and will be removed"
+            end
+
+            credentials ||= Google::Cloud::ErrorReporting::Credentials.default
 
-            if app_name || app_version
-              warn "`app_name` and `app_version` are no longer being used in the request headers."
+            if credentials.is_a?(String) || credentials.is_a?(Hash)
+              updater_proc = Google::Cloud::ErrorReporting::Credentials.new(credentials).updater_proc
+            end
+            if credentials.is_a?(GRPC::Core::Channel)
+              channel = credentials
+            end
+            if credentials.is_a?(GRPC::Core::ChannelCredentials)
+              chan_creds = credentials
+            end
+            if credentials.is_a?(Proc)
+              updater_proc = credentials
+            end
+            if credentials.is_a?(Google::Auth::Credentials)
+              updater_proc = credentials.updater_proc
             end
 
             google_api_client = "gl-ruby/#{RUBY_VERSION}"
             google_api_client << " #{lib_name}/#{lib_version}" if lib_name
-            google_api_client << " gapic/0.6.8 gax/#{Google::Gax::VERSION}"
+            google_api_client << " gapic/0.1.0 gax/#{Google::Gax::VERSION}"
             google_api_client << " grpc/#{GRPC::VERSION}"
             google_api_client.freeze
 
@@ -140,6 +167,7 @@ module Google
               port,
               chan_creds: chan_creds,
               channel: channel,
+              updater_proc: updater_proc,
               scopes: scopes,
               &Google::Devtools::Clouderrorreporting::V1beta1::ReportErrorsService::Stub.method(:new)
             )
@@ -164,34 +192,34 @@ module Google
           # @param project_name [String]
           #   [Required] The resource name of the Google Cloud Platform project. Written
           #   as +projects/+ plus the
-          #   {Google Cloud Platform project ID}[https://support.google.com/cloud/answer/6158840].
+          #   [Google Cloud Platform project ID](https://support.google.com/cloud/answer/6158840).
           #   Example: +projects/my-project-123+.
-          # @param event [Google::Devtools::Clouderrorreporting::V1beta1::ReportedErrorEvent]
+          # @param event [Google::Devtools::Clouderrorreporting::V1beta1::ReportedErrorEvent | Hash]
           #   [Required] The error event to be reported.
+          #   A hash of the same form as `Google::Devtools::Clouderrorreporting::V1beta1::ReportedErrorEvent`
+          #   can also be provided.
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
           # @return [Google::Devtools::Clouderrorreporting::V1beta1::ReportErrorEventResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/error_reporting/v1beta1/report_errors_service_client"
-          #
-          #   ReportErrorsServiceClient = Google::Cloud::ErrorReporting::V1beta1::ReportErrorsServiceClient
-          #   ReportedErrorEvent = Google::Devtools::Clouderrorreporting::V1beta1::ReportedErrorEvent
+          #   require "google/cloud/error_reporting/v1beta1"
           #
-          #   report_errors_service_client = ReportErrorsServiceClient.new
-          #   formatted_project_name = ReportErrorsServiceClient.project_path("[PROJECT]")
-          #   event = ReportedErrorEvent.new
+          #   report_errors_service_client = Google::Cloud::ErrorReporting::V1beta1::ReportErrors.new
+          #   formatted_project_name = Google::Cloud::ErrorReporting::V1beta1::ReportErrorsServiceClient.project_path("[PROJECT]")
+          #   event = {}
           #   response = report_errors_service_client.report_error_event(formatted_project_name, event)
 
           def report_error_event \
               project_name,
               event,
               options: nil
-            req = Google::Devtools::Clouderrorreporting::V1beta1::ReportErrorEventRequest.new({
+            req = {
               project_name: project_name,
               event: event
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Devtools::Clouderrorreporting::V1beta1::ReportErrorEventRequest)
             @report_error_event.call(req, options)
           end
         end

data/lib/google/cloud/error_reporting/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module ErrorReporting
-      VERSION = "0.27.0".freeze
+      VERSION = "0.28.0".freeze
     end
   end
 end