google-cloud-env 2.1.1 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 874603cbcc635840a5fa275335b574f242b5abe3100217d561189cd8c30ab12d
-  data.tar.gz: f8756d74ac146f9a3148d5149e29fd1b718e1ab5be177aecd81cbac3507212d9
+  metadata.gz: e3d2a3f33d0f33823d9203719ac4c49862ed00b6b3b288b6851d83ca3358f8dc
+  data.tar.gz: 16e52c76711260d41d1f0018e022c38c9421b9ce26f4f1b36e63e58c42887d2b
 SHA512:
-  metadata.gz: 6ad688117a2b8cc86596be5d2e0ec5f592f5734927756112a0cd82116d52cc0be6c24b8e8594d9d3ea010977e88275c5916cea676b2d50016973b58a7fd52649
-  data.tar.gz: c347078193dd1cc9cab88f1222327f57d928cf246fad899dca010ad4481f4de7d15a3df924df1dcb42bb7860139d98952b222b53f91cde0c1985319f7d18b832
+  metadata.gz: cbdc0b547fea96b75eefa4b07724d725334258470b2bf932fc6c476c7d8f1f4edde22de46c4eb25dee06d38d5db3fa69344df9b40d1e6c8560a386aca7f62bc7
+  data.tar.gz: d8fd89b5762ec717e42d6b94cfab3a11a0e19c6eee961bc6e6119738d06a4d262936442f675928654a5b50b5e977f1498deff3c535ce4e22e16ff0c85774f436

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Release History
 
+### 2.3.1 (2025-05-23)
+
+#### Bug Fixes
+
+* Compatibility fix for JRuby 10 on non-Windows systems ([#86](https://github.com/googleapis/ruby-cloud-env/issues/86)) 
+
+### 2.3.0 (2025-04-30)
+
+#### Features
+
+* updated required ruby version to 3.1 ([#84](https://github.com/googleapis/ruby-cloud-env/issues/84)) 
+
+### 2.2.2 (2025-03-13)
+
+#### Bug Fixes
+
+* Updated dependencies to include base64 for Ruby 3.4 ([#81](https://github.com/googleapis/ruby-cloud-env/issues/81)) 
+
+### 2.2.1 (2024-10-04)
+
+#### Bug Fixes
+
+* Fixed edge cases in token expiration extraction ([#73](https://github.com/googleapis/ruby-cloud-env/issues/73)) 
+
+### 2.2.0 (2024-08-22)
+
+#### Features
+
+* Provide a query for whether a logging agent is expected in the current environment ([#70](https://github.com/googleapis/ruby-cloud-env/issues/70)) 
+* Require Ruby 3.0 or later ([#71](https://github.com/googleapis/ruby-cloud-env/issues/71)) 
+
 ### 2.1.1 (2024-02-01)
 
 #### Bug Fixes

data/README.md

@@ -10,7 +10,7 @@ Metadata Server.
 
 ## Supported Ruby Versions
 
-This library is supported on Ruby 2.7+.
+This library is supported on Ruby 3.0+.
 
 In general, Google provides official support for CRuby versions that are
 actively supported by the Ruby Core team -- that is, Ruby versions that are

data/lib/google/cloud/env/compute_metadata.rb

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "base64"
 require "faraday"
 require "json"
 
@@ -670,6 +671,7 @@ module Google
           Errno::ETIMEDOUT,
           Timeout::Error
         ].freeze
+        private_constant :TRANSIENT_EXCEPTIONS
 
         ##
         # @private
@@ -693,6 +695,7 @@ module Google
         # than the previous old token. See internal issue b/311414224.
         #
         TOKEN_EXPIRY_BUFFER = 210
+        private_constant :TOKEN_EXPIRY_BUFFER
 
         ##
         # @private
@@ -806,7 +809,7 @@ module Google
         #
         def access_token_lifetime data
           json = JSON.parse data rescue nil
-          return 0 unless json&.key? "expires_in"
+          return 0 unless json.respond_to?(:key?) && json.key?("expires_in")
           lifetime = json["expires_in"].to_i - TOKEN_EXPIRY_BUFFER
           lifetime = 0 if lifetime.negative?
           lifetime
@@ -818,9 +821,9 @@ module Google
         #
         def identity_token_lifetime data
           return 0 unless data =~ /^[\w=-]+\.([\w=-]+)\.[\w=-]+$/
-          base64 = Base64.decode64 Regexp.last_match[1]
+          base64 = Base64.urlsafe_decode64 Regexp.last_match[1]
           json = JSON.parse base64 rescue nil
-          return 0 unless json&.key? "exp"
+          return 0 unless json.respond_to?(:key?) && json&.key?("exp")
           lifetime = json["exp"].to_i - Time.now.to_i - TOKEN_EXPIRY_BUFFER
           lifetime = 0 if lifetime.negative?
           lifetime

data/lib/google/cloud/env/compute_smbios.rb

@@ -119,11 +119,20 @@ module Google
         private_constant :WINDOWS_KEYPATH, :WINDOWS_KEYNAME, :LINUX_FILEPATH
 
         def load_product_name
-          require "win32/registry"
-          Win32::Registry::HKEY_LOCAL_MACHINE.open WINDOWS_KEYPATH do |reg|
-            return [reg[WINDOWS_KEYNAME].to_s, :windows]
+          begin
+            require "win32/registry"
+            Win32::Registry::HKEY_LOCAL_MACHINE.open WINDOWS_KEYPATH do |reg|
+              return [reg[WINDOWS_KEYNAME].to_s, :windows]
+            end
+          rescue LoadError
+            # Fall through to the Linux routine
+          rescue StandardError => e
+            # With JRuby 10, a Fiddle::DLError is raised, In the case the fiddle gem is not
+            # loadable, safely assert the error type without relying on the Fiddle namespace
+            # having been loaded.
+            raise e unless e.class.name == "Fiddle::DLError" # rubocop:disable Style/ClassEqualityComparison
+            # Fall through to the Linux routine
           end
-        rescue LoadError
           begin
             File.open LINUX_FILEPATH do |file|
               return [file.readline(chomp: true), :linux]

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

@@ -20,7 +20,7 @@ module Google
       # Library version
       # @return [String]
       #
-      VERSION = "2.1.1".freeze
+      VERSION = "2.3.1".freeze
     end
   end
 end

data/lib/google/cloud/env.rb

@@ -497,6 +497,19 @@ module Google
       end
       alias container_engine_namespace_id kubernetes_engine_namespace_id
 
+      ##
+      # Determine whether the application is running in an environment where a
+      # Google Cloud logging agent is expected to be running. In such an
+      # environment, we expect that the standard output and error streams are
+      # likely to be parsed by the logging agent and log entries are written to
+      # the Google Cloud Logging service.
+      #
+      # @return [boolean]
+      #
+      def logging_agent_expected?
+        compute_engine? && !cloud_shell? && (app_engine? || knative? || kubernetes_engine?)
+      end
+
       ##
       # Returns the global instance of {Google::Cloud::Env}.
       #

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-env
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.3.1
 platform: ruby
 authors:
 - Daniel Azuma
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -59,11 +72,10 @@ homepage: https://github.com/googleapis/ruby-cloud-env
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/google-cloud-env/2.1.1/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/google-cloud-env/2.3.1/CHANGELOG.md
   source_code_uri: https://github.com/googleapis/ruby-cloud-env
   bug_tracker_uri: https://github.com/googleapis/ruby-cloud-env/issues
-  documentation_uri: https://rubydoc.info/gems/google-cloud-env/2.1.1
-post_install_message: 
+  documentation_uri: https://rubydoc.info/gems/google-cloud-env/2.3.1
 rdoc_options: []
 require_paths:
 - lib
@@ -71,15 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Google Cloud Platform hosting environment information.
 test_files: []