google-cloud-pubsub 2.15.5 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2a4108df2f16d93f03bb560375274bb816a5958c8c0ad22ca061943ef40ee24
-  data.tar.gz: 8efa65c9aed030d0b1832aa8d0aec7ef4e9d8605a427bef6517cf77d9e363d5c
+  metadata.gz: 9baf526a8b94705a0743ca0614706046c014c11e9823a255aef8de94eb927962
+  data.tar.gz: b90d14a0b11cbfd8685ed11d631d61ba27032d4a91ee71f5ae245e505c3e755b
 SHA512:
-  metadata.gz: 1599c8a8adac4fdde84b5782cfa4f4f8c236528452966496a9fce7343b05076772a6c071f99114d7bb93813d0707975e892c262a30616ed13232ce85dfe1b63d
-  data.tar.gz: 1c661569d004bfc3abd20e60938cad744faa5b474a8df6a67f0b6c36e6c428744e76703fc25e73d20298372894880a40a963a923e21059cd9f4f5454c4b65c01
+  metadata.gz: dae5a2eedf9edece6daf5225271961853a1c43490ed64f44ba9f0d2e747cec8eb2943111be2ea608961313697c597e555ceb93fee795e59d992562f0c5fca01a
+  data.tar.gz: 5e394bb76ccade24fcb11ac80055cb62fe41f8872e48a2de39ace663e4815aafcee3b977af20dd0ff80f71ad9083c703ef5a3dca4f6606d894f8bf37744c2c1a

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History
 
+### 2.17.0 (2024-03-07)
+
+#### Features
+
+* Update minimum supported Ruby version to 2.7 ([#25298](https://github.com/googleapis/google-cloud-ruby/issues/25298)) 
+
+### 2.16.0 (2024-01-25)
+
+#### Features
+
+* Support for universe_domain ([#24437](https://github.com/googleapis/google-cloud-ruby/issues/24437)) 
+
 ### 2.15.5 (2023-11-06)
 
 #### Bug Fixes

data/lib/google/cloud/pubsub/convert.rb

@@ -69,7 +69,7 @@ module Google
             data_bytes = String(data).dup.force_encoding(Encoding::ASCII_8BIT).freeze
 
             # Convert attributes to strings to match the protobuf definition
-            attributes = Hash[attributes.map { |k, v| [String(k), String(v)] }]
+            attributes = attributes.to_h { |k, v| [String(k), String(v)] }
 
             # Ordering Key must always be a string
             ordering_key = String(ordering_key).freeze

data/lib/google/cloud/pubsub/flow_controller.rb

@@ -84,7 +84,6 @@ module Google
 
         protected
 
-        # rubocop:disable Style/IdenticalConditionalBranches
         # rubocop:disable Style/GuardClause
 
         def acquire_or_wait message_size
@@ -117,7 +116,6 @@ module Google
           end
         end
 
-        # rubocop:enable Style/IdenticalConditionalBranches
         # rubocop:enable Style/GuardClause
 
         def is_new_and_others_wait? waiter

data/lib/google/cloud/pubsub/message.rb

@@ -62,7 +62,7 @@ module Google
         # This can be used to publish several messages in bulk.
         def initialize data = nil, attributes = {}
           # Convert attributes to strings to match the protobuf definition
-          attributes = Hash[attributes.map { |k, v| [String(k), String(v)] }]
+          attributes = attributes.to_h { |k, v| [String(k), String(v)] }
 
           @grpc = Google::Cloud::PubSub::V1::PubsubMessage.new(
             data:       String(data).dup.force_encoding(Encoding::ASCII_8BIT),
@@ -81,8 +81,7 @@ module Google
         # Optional attributes for the message.
         def attributes
           return @grpc.attributes.to_h if @grpc.attributes.respond_to? :to_h
-          # Enumerable doesn't have to_h on Ruby 2.0, so fallback to this
-          Hash[@grpc.attributes.to_a]
+          @grpc.attributes.to_a.to_h
         end
 
         ##

data/lib/google/cloud/pubsub/project.rb

@@ -76,6 +76,15 @@ module Google
         end
         alias project project_id
 
+        ##
+        # The universe domain the client is connected to
+        #
+        # @return [String]
+        #
+        def universe_domain
+          service.universe_domain
+        end
+
         ##
         # Retrieves topic by name.
         #

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

@@ -37,14 +37,17 @@ module Google
         # value to be replaced for unit testing.
         attr_accessor :client_id
 
+        attr_reader :universe_domain
+
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, host: nil, timeout: nil
+        def initialize project, credentials, host: nil, timeout: nil, universe_domain: nil
           @project = project
           @credentials = credentials
           @host = host
           @timeout = timeout
           @client_id = SecureRandom.uuid.freeze
+          @universe_domain = universe_domain || ENV["GOOGLE_CLOUD_UNIVERSE_DOMAIN"] || "googleapis.com"
         end
 
         def subscriber
@@ -53,6 +56,7 @@ module Google
             config.credentials = credentials if credentials
             override_client_config_timeouts config if timeout
             config.endpoint = host if host
+            config.universe_domain = universe_domain
             config.lib_name = "gccl"
             config.lib_version = Google::Cloud::PubSub::VERSION
             config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
@@ -66,6 +70,7 @@ module Google
             config.credentials = credentials if credentials
             override_client_config_timeouts config if timeout
             config.endpoint = host if host
+            config.universe_domain = universe_domain
             config.lib_name = "gccl"
             config.lib_version = Google::Cloud::PubSub::VERSION
             config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
@@ -75,13 +80,15 @@ module Google
 
         def iam
           return mocked_iam if mocked_iam
-          @iam ||= V1::IAMPolicy::Client.new do |config|
-            config.credentials = credentials if credentials
-            override_client_config_timeouts config if timeout
-            config.endpoint = host if host
-            config.lib_name = "gccl"
-            config.lib_version = Google::Cloud::PubSub::VERSION
-            config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+          @iam ||= begin
+            iam = (@publisher || @subscriber || @schemas || subscriber).iam_policy_client
+            iam.configure do |config|
+              override_client_config_timeouts config if timeout
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::PubSub::VERSION
+              config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+            end
+            iam
           end
         end
         attr_accessor :mocked_iam
@@ -92,6 +99,7 @@ module Google
             config.credentials = credentials if credentials
             override_client_config_timeouts config if timeout
             config.endpoint = host if host
+            config.universe_domain = universe_domain
             config.lib_name = "gccl"
             config.lib_version = Google::Cloud::PubSub::VERSION
             config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
@@ -254,7 +262,7 @@ module Google
         # Modifies the PushConfig for a specified subscription.
         def modify_push_config subscription, endpoint, attributes
           # Convert attributes to strings to match the protobuf definition
-          attributes = Hash[attributes.map { |k, v| [String(k), String(v)] }]
+          attributes = attributes.to_h { |k, v| [String(k), String(v)] }
           push_config = Google::Cloud::PubSub::V1::PushConfig.new(
             push_endpoint: endpoint,
             attributes:    attributes

data/lib/google/cloud/pubsub/subscriber/stream.rb

@@ -246,7 +246,7 @@ module Google
               break if synchronize { @stopped }
 
               begin
-                # Cannot syncronize the enumerator, causes deadlock
+                # Cannot synchronize the enumerator, causes deadlock
                 response = enum.next
                 new_exactly_once_delivery_enabled = response&.subscription_properties&.exactly_once_delivery_enabled
                 received_messages = response.received_messages

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module PubSub
-      VERSION = "2.15.5".freeze
+      VERSION = "2.17.0".freeze
     end
 
     Pubsub = PubSub unless const_defined? :Pubsub

data/lib/google/cloud/pubsub.rb

@@ -62,6 +62,7 @@ module Google
       # @param [String] project Alias for the `project_id` argument. Deprecated.
       # @param [String] keyfile Alias for the `credentials` argument.
       #   Deprecated.
+      # @param universe_domain [String] A custom universe domain. Optional.
       #
       # @return [Google::Cloud::PubSub::Project]
       #
@@ -77,34 +78,36 @@ module Google
                    credentials: nil,
                    scope: nil,
                    timeout: nil,
+                   universe_domain: nil,
                    endpoint: nil,
                    emulator_host: nil,
                    project: nil,
                    keyfile: nil
-        project_id    ||= (project || default_project_id)
-        scope         ||= configure.scope
-        timeout       ||= configure.timeout
-        endpoint      ||= configure.endpoint
+        project_id ||= project || default_project_id
+        scope ||= configure.scope
+        timeout ||= configure.timeout
+        endpoint ||= configure.endpoint
+        universe_domain ||= configure.universe_domain
         emulator_host ||= configure.emulator_host
 
         if emulator_host
-          project_id = project_id.to_s # Always cast to a string
-          raise ArgumentError, "project_id is missing" if project_id.empty?
-
-          service = PubSub::Service.new project_id, :this_channel_is_insecure, host: emulator_host, timeout: timeout
-          return PubSub::Project.new service
-        end
-
-        credentials ||= (keyfile || default_credentials(scope: scope))
-        unless credentials.is_a? Google::Auth::Credentials
-          credentials = PubSub::Credentials.new credentials, scope: scope
+          credentials = :this_channel_is_insecure
+          endpoint = emulator_host
+        else
+          credentials ||= keyfile || default_credentials(scope: scope)
+          unless credentials.is_a? Google::Auth::Credentials
+            credentials = PubSub::Credentials.new credentials, scope: scope
+          end
         end
 
         project_id ||= credentials.project_id if credentials.respond_to? :project_id
         project_id = project_id.to_s # Always cast to a string
         raise ArgumentError, "project_id is missing" if project_id.empty?
 
-        service = PubSub::Service.new project_id, credentials, host: endpoint, timeout: timeout
+        service = PubSub::Service.new project_id, credentials,
+                                      host: endpoint,
+                                      timeout: timeout,
+                                      universe_domain: universe_domain
         PubSub::Project.new service
       end
 

data/lib/google-cloud-pubsub.rb

@@ -110,7 +110,7 @@ module Google
 end
 
 # Set the default pubsub configuration
-Google::Cloud.configure.add_config! :pubsub do |config|
+Google::Cloud.configure.add_config! :pubsub do |config| # rubocop:disable Metrics/BlockLength
   default_project = Google::Cloud::Config.deferred do
     ENV["PUBSUB_PROJECT"]
   end
@@ -136,5 +136,6 @@ Google::Cloud.configure.add_config! :pubsub do |config|
   config.add_field! :timeout, nil, match: Numeric
   config.add_field! :emulator_host, default_emulator, match: String, allow_nil: true
   config.add_field! :on_error, nil, match: Proc
-  config.add_field! :endpoint, "pubsub.googleapis.com", match: String
+  config.add_field! :endpoint, nil, match: String
+  config.add_field! :universe_domain, nil, match: String
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-pubsub
 version: !ruby/object:Gem::Version
-  version: 2.15.5
+  version: 2.17.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2024-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
@@ -67,160 +67,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: autotest-suffix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: avro
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: google-style
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.25.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.25.1
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.16'
-- !ruby/object:Gem::Dependency
-  name: minitest-autotest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: minitest-focus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: minitest-rg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: yard-doctest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.13
 description: google-cloud-pubsub is the official library for Google Cloud Pub/Sub.
 email:
 - mike@blowmage.com
@@ -284,14 +130,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Pub/Sub