google-cloud-logging 1.6.6 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb805e0101e2f5b5e9f9c21e4d67c46db3e1898940a3d8df972b934a295411d8
-  data.tar.gz: c67765781081152b9c36aa3f5e453b1cc333666e39026c408ec61b0b2acb9ae5
+  metadata.gz: 9844d4e41540ef97cb06a18febc80c45155d6296032a532b31e26cc00a7eeca9
+  data.tar.gz: 5e1b5a06346223d342873406bd87cea59d441458d88192f0000a0d4e43f006d1
 SHA512:
-  metadata.gz: 8f660fb238f57e2df1b9271fce3e2efc4838c37885381bf7b7e39152244a8ed887c8920f577877835f2d18a14fb7f97c37177cb277c5ee14c985f72c30de0b4e
-  data.tar.gz: 2d78590be1672eeabd60e8bb2aaf5427950f32d4fc2a990ec691e9b2876a9df8d6111485ad978886d6ceb37f9e37d49f553d018b5c23245c9453787469f0f8fd
+  metadata.gz: 787ed9af979f2bdb9211ce456e06d40e05b2c397dd1a0750e228ae7dd5ccc6f6a4d0b407a3afdbed2a59a80439bb8a13745f081dd1190aa9e43887c8b70992ba
+  data.tar.gz: f4d201182423411533d12373d21199e659221364e5753d610cf2910b13eade54a15da8843a33867b43d771bc2d3048daeae5edac18ed1f4f19f32f4c94e33d17

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 1.7.0 / 2019-08-23
+
+#### Features
+
+* Support overriding of service endpoint
+
 ### 1.6.6 / 2019-07-31
 
 * Fix max threads setting in thread pools

data/lib/google-cloud-logging.rb

@@ -149,6 +149,7 @@ Google::Cloud.configure.add_config! :logging do |config|
   config.add_field! :scope, nil, match: [String, Array]
   config.add_field! :timeout, nil, match: Integer
   config.add_field! :client_config, nil, match: Hash
+  config.add_field! :endpoint, nil, match: String
   config.add_field! :log_name, nil, match: String
   config.add_field! :log_name_map, nil, match: Hash
   config.add_field! :labels, nil, match: Hash

data/lib/google/cloud/logging.rb

@@ -65,6 +65,8 @@ module Google
       # @param [Integer] timeout Default timeout to use in requests. Optional.
       # @param [Hash] client_config A hash of values to override the default
       #   behavior of the API client. Optional.
+      # @param [String] endpoint Override of the endpoint host name. Optional.
+      #   If the param is nil, uses the default endpoint.
       # @param [String] project Alias for the `project_id` argument. Deprecated.
       # @param [String] keyfile Alias for the `credentials` argument.
       #   Deprecated.
@@ -82,11 +84,12 @@ module Google
       #   end
       #
       def self.new project_id: nil, credentials: nil, scope: nil, timeout: nil,
-                   client_config: nil, project: nil, keyfile: nil
+                   client_config: nil, endpoint: nil, project: nil, keyfile: nil
         project_id    ||= (project || default_project_id)
         scope         ||= configure.scope
         timeout       ||= configure.timeout
         client_config ||= configure.client_config
+        endpoint      ||= configure.endpoint
         credentials   ||= (keyfile || default_credentials(scope: scope))
 
         unless credentials.is_a? Google::Auth::Credentials
@@ -101,8 +104,8 @@ module Google
 
         Logging::Project.new(
           Logging::Service.new(
-            project_id, credentials, timeout:       timeout,
-                                     client_config: client_config
+            project_id, credentials,
+            host: endpoint, timeout: timeout, client_config: client_config
           )
         )
       end
@@ -126,6 +129,8 @@ module Google
       # * `timeout` - (Integer) Default timeout to use in requests.
       # * `client_config` - (Hash) A hash of values to override the default
       #   behavior of the API client.
+      # * `endpoint` - (String) Override of the endpoint host name, or `nil`
+      #   to use the default endpoint.
       # * `log_name` - (String) Name of the application log file. Default:
       #   `"ruby_app_log"`
       # * `log_name_map` - (Hash) Map specific request routes to other log.

data/lib/google/cloud/logging/service.rb

@@ -17,6 +17,7 @@ require "google/cloud/errors"
 require "google/cloud/logging/version"
 require "google/cloud/logging/v2"
 require "google/gax/errors"
+require "uri"
 
 module Google
   module Cloud
@@ -25,26 +26,30 @@ module Google
       # @private Represents the gRPC Logging service, including all the API
       # methods.
       class Service
-        attr_accessor :project, :credentials, :timeout, :client_config
+        attr_accessor :project, :credentials, :timeout, :client_config, :host
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, timeout: nil, client_config: nil
+        def initialize project, credentials, timeout: nil, client_config: nil,
+                       host: nil
           @project = project
           @credentials = credentials
           @timeout = timeout
           @client_config = client_config || {}
+          @host = host || V2::LoggingServiceV2Client::SERVICE_ADDRESS
         end
 
         def logging
           return mocked_logging if mocked_logging
           @logging ||= \
             V2::LoggingServiceV2Client.new(
-              credentials:   credentials,
-              timeout:       timeout,
-              client_config: client_config,
-              lib_name:      "gccl",
-              lib_version:   Google::Cloud::Logging::VERSION
+              credentials:     credentials,
+              timeout:         timeout,
+              client_config:   client_config,
+              service_address: service_address,
+              service_port:    service_port,
+              lib_name:        "gccl",
+              lib_version:     Google::Cloud::Logging::VERSION
             )
         end
         attr_accessor :mocked_logging
@@ -53,11 +58,13 @@ module Google
           return mocked_sinks if mocked_sinks
           @sinks ||= \
             V2::ConfigServiceV2Client.new(
-              credentials:   credentials,
-              timeout:       timeout,
-              client_config: client_config,
-              lib_name:      "gccl",
-              lib_version:   Google::Cloud::Logging::VERSION
+              credentials:     credentials,
+              timeout:         timeout,
+              client_config:   client_config,
+              service_address: service_address,
+              service_port:    service_port,
+              lib_name:        "gccl",
+              lib_version:     Google::Cloud::Logging::VERSION
             )
         end
         attr_accessor :mocked_sinks
@@ -66,11 +73,13 @@ module Google
           return mocked_metrics if mocked_metrics
           @metrics ||= \
             V2::MetricsServiceV2Client.new(
-              credentials:   credentials,
-              timeout:       timeout,
-              client_config: client_config,
-              lib_name:      "gccl",
-              lib_version:   Google::Cloud::Logging::VERSION
+              credentials:     credentials,
+              timeout:         timeout,
+              client_config:   client_config,
+              service_address: service_address,
+              service_port:    service_port,
+              lib_name:        "gccl",
+              lib_version:     Google::Cloud::Logging::VERSION
             )
         end
         attr_accessor :mocked_metrics
@@ -271,6 +280,16 @@ module Google
 
         protected
 
+        def service_address
+          return nil if host.nil?
+          URI.parse("//#{host}").host
+        end
+
+        def service_port
+          return nil if host.nil?
+          URI.parse("//#{host}").port
+        end
+
         def project_path
           "projects/#{@project}"
         end

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Logging
-      VERSION = "1.6.6".freeze
+      VERSION = "1.7.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-logging
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.7.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core