google-cloud-env 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac62dcc3131def7be6bf69813f79c3d23b6d6ce5199d0250ffad596cf3b7fcb
-  data.tar.gz: d9eadf5f767d8225022ed9551ea3a5a2ee37e8ad5b68da9eea7c94f416333f4f
+  metadata.gz: 874603cbcc635840a5fa275335b574f242b5abe3100217d561189cd8c30ab12d
+  data.tar.gz: f8756d74ac146f9a3148d5149e29fd1b718e1ab5be177aecd81cbac3507212d9
 SHA512:
-  metadata.gz: def8ccefb5d889744cb562a85cc78a9d3b718f80f2d48eab409c6fcdbcbe2dfe9adae14393f06aab3b6a6db83b6fc6d631902d11c1a932e2a77ee2f93a5ca82f
-  data.tar.gz: 5faabdeb543a4237dd19a69a9963237e4b843f93aeeaa1f002cc08bd0269ba005da6a89baee20989076330b97de9551a41a50e658febd173847166fc29013bcb
+  metadata.gz: 6ad688117a2b8cc86596be5d2e0ec5f592f5734927756112a0cd82116d52cc0be6c24b8e8594d9d3ea010977e88275c5916cea676b2d50016973b58a7fd52649
+  data.tar.gz: c347078193dd1cc9cab88f1222327f57d928cf246fad899dca010ad4481f4de7d15a3df924df1dcb42bb7860139d98952b222b53f91cde0c1985319f7d18b832

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History
 
+### 2.1.1 (2024-02-01)
+
+#### Bug Fixes
+
+* Setting non-empty overrides simulates metadata server existence setting ([#64](https://github.com/googleapis/ruby-cloud-env/issues/64)) 
+
+### 2.1.0 (2023-12-12)
+
+#### Features
+
+* Provide retrieval_monotonic_time on compute metadata response objects ([#62](https://github.com/googleapis/ruby-cloud-env/issues/62)) 
+
 ### 2.0.1 (2023-12-01)
 
 #### Bug Fixes

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

@@ -89,7 +89,8 @@ module Google
         # {ComputeMetadata#lookup_response}.
         #
         # This object duck-types the `status`, `body`, and `headers` fields of
-        # `Faraday::Response`.
+        # `Faraday::Response`. It also includes the CLOCK_MONOTONIC time when
+        # the data was retrieved.
         #
         class Response
           ##
@@ -105,6 +106,7 @@ module Google
             @status = status
             @body = body
             @headers = headers
+            @retrieval_monotonic_time = Process.clock_gettime Process::CLOCK_MONOTONIC
           end
 
           ##
@@ -125,6 +127,11 @@ module Google
           #
           attr_reader :headers
 
+          # The CLOCK_MONOTONIC time at which this response was retrieved.
+          # @return [Numeric]
+          #
+          attr_reader :retrieval_monotonic_time
+
           ##
           # Returns true if the metadata-flavor is correct for Google Cloud
           # @return [boolean]
@@ -382,12 +389,12 @@ module Google
                             retry_count: :default,
                             retry_timeout: :default
           query = canonicalize_query query
-          raise MetadataServerNotResponding unless gce_check
           if @overrides
             @mutex.synchronize do
               return lookup_override path, query if @overrides
             end
           end
+          raise MetadataServerNotResponding unless gce_check
           retry_count = self.retry_count if retry_count == :default
           retry_count += 1 if retry_count
           retry_timeout = self.retry_timeout if retry_timeout == :default
@@ -752,9 +759,9 @@ module Google
           end
           response = Response.new http_response.status, http_response.body, http_response.headers
           if path.nil?
-            post_update_existence(response.status == 200 && response.google_flavor?)
+            post_update_existence(response.status == 200 && response.google_flavor?, response.retrieval_monotonic_time)
           elsif response.google_flavor?
-            post_update_existence true
+            post_update_existence true, response.retrieval_monotonic_time
           end
           lifetime = determine_data_lifetime path, response.body.strip
           LazyValue.expiring_value lifetime, response
@@ -767,14 +774,14 @@ module Google
         # @private
         # Update existence based on a received result
         #
-        def post_update_existence success
+        def post_update_existence success, current_time = nil
           return if @existence == :confirmed
           @mutex.synchronize do
             if success
               @existence = :confirmed
-            elsif @existence != :confirmed &&
-                  Process.clock_gettime(Process::CLOCK_MONOTONIC) > @startup_time + warmup_time
-              @existence = :no
+            elsif @existence != :confirmed
+              current_time ||= Process.clock_gettime Process::CLOCK_MONOTONIC
+              @existence = :no if current_time > @startup_time + warmup_time
             end
           end
         end
@@ -838,6 +845,7 @@ module Google
             @existence = :no
             raise MetadataServerNotResponding
           end
+          @existence = :confirmed
           result = @overrides.lookup path, query: query
           result ||= Response.new 404, "Not found", FLAVOR_HEADER
           result

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-env
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2024-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -59,10 +59,10 @@ homepage: https://github.com/googleapis/ruby-cloud-env
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/google-cloud-env/2.0.1/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/google-cloud-env/2.1.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.0.1
+  documentation_uri: https://rubydoc.info/gems/google-cloud-env/2.1.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Google Cloud Platform hosting environment information.