google-cloud-env 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6d375b8826aef95a69318b7eef8fdc66b804d955
-  data.tar.gz: f2c8e7c5f719745949b7266ca1f84c3bde18dff5
+SHA256:
+  metadata.gz: 13df693b9c86c79c889db27da633337603ee581f5f9735ed7760ee659832351d
+  data.tar.gz: 828a46811e472363e9d860451b0dc7424f50ab0c884fb31650ecc086fd0cd8ff
 SHA512:
-  metadata.gz: 4fa3202316e7253e2ed46141da48174c6747644533be409755fc12e4b66c8a80fee34ee4ef06b5e3a0194e49ca2c8f41b9b9777196f7edc82e022fcb4b40c579
-  data.tar.gz: e874658ba8ec008575ee65a7dc2c655eb6d4e0803b9627a3a0edd9a5417a0ac6a6d8bfb9cb93dad5d33451cc42d16fcadee8d4b09380ea97e603c0200a3e9efb
+  metadata.gz: 60161c4e104e8759ad896f3f434f619b71b51eb2609928128e61e77098f1700174272837a54d8aa38e1f6d6a192e9c107eb88328991d1d72684e3195e635b27d
+  data.tar.gz: 66bfccc4ee66d9ad9df65e2211c9578e0c30c4aed9958a5c586d9a773dca101f1cdd45970e33db17c7350dda593e4eff513b61362fae25102feabd92817d8967

data/LICENSE

@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

data/README.md

@@ -8,6 +8,13 @@ This library provides information on the application hosting environment for app
 
 This library is supported on Ruby 2.0+.
 
+However, Ruby 2.3 or later is strongly recommended, as earlier releases have
+reached or are nearing end-of-life. After June 1, 2018, Google will provide
+official support only for Ruby versions that are considered current and
+supported by Ruby Core (that is, Ruby versions that are either in normal
+maintenance or in security maintenance).
+See https://www.ruby-lang.org/en/downloads/branches/ for further details.
+
 ## Versioning
 
 This library follows [Semantic Versioning](http://semver.org/).

data/lib/google-cloud-env.rb

@@ -1,10 +1,10 @@
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

data/lib/google/cloud/env.rb

@@ -1,10 +1,10 @@
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +25,7 @@ module Google
     # This library provides access to information about the application's
     # hosting environment if it is running on Google Cloud Platform. You may
     # use this library to determine which Google Cloud product is hosting your
-    # application (e.g. app engine, container engine), information about the
+    # application (e.g. App Engine, Kubernetes Engine), information about the
     # Google Cloud project hosting the application, information about the
     # virtual machine instance, authentication information, and so forth.
     #
@@ -67,9 +67,10 @@ module Google
       #
       # @param [Hash] env Mock environment variables.
       # @param [Faraday::Connection] connection Faraday connection to use.
+      # @param [Hash] metadata_cache Mock cache.
       #
-      def initialize env: nil, connection: nil
-        @metadata_cache = {}
+      def initialize env: nil, connection: nil, metadata_cache: nil
+        @metadata_cache = metadata_cache || {}
         @env = env || ::ENV
         @connection = connection ||
                       ::Faraday.new(url: METADATA_HOST,
@@ -86,13 +87,15 @@ module Google
       end
 
       ##
-      # Determine whether the application is running on Google Container Engine.
+      # Determine whether the application is running on Google Kubernetes
+      # Engine (GKE).
       #
       # @return [Boolean]
       #
-      def container_engine?
-        container_engine_cluster_name ? true : false
+      def kubernetes_engine?
+        kubernetes_engine_cluster_name ? true : false
       end
+      alias container_engine? kubernetes_engine?
 
       ##
       # Determine whether the application is running on Google Cloud Shell.
@@ -106,7 +109,7 @@ module Google
       ##
       # Determine whether the application is running on Google Compute Engine.
       #
-      # Note that most other products (e.g. App Engine, Container Engine,
+      # Note that most other products (e.g. App Engine, Kubernetes Engine,
       # Cloud Shell) themselves use Compute Engine under the hood, so this
       # method will return true for all the above products. If you want to
       # determine whether the application is running on a "raw" Compute Engine
@@ -122,12 +125,12 @@ module Google
       ##
       # Determine whether the application is running on "raw" Google Compute
       # Engine without using a higher level hosting product such as App
-      # Engine or Container Engine.
+      # Engine or Kubernetes Engine.
       #
       # @return [Boolean]
       #
       def raw_compute_engine?
-        !app_engine? && !cloud_shell? && metadata? && !container_engine?
+        !app_engine? && !cloud_shell? && metadata? && !kubernetes_engine?
       end
 
       ##
@@ -272,26 +275,36 @@ module Google
       end
 
       ##
-      # Returns the name of the Container Engine cluster hosting the
+      # Returns the name of the Kubernetes Engine cluster hosting the
       # application, or `nil` if the current code is not running in
-      # Container Engine.
+      # Kubernetes Engine.
       #
       # @return [String,nil]
       #
-      def container_engine_cluster_name
+      def kubernetes_engine_cluster_name
         instance_attribute "cluster-name"
       end
+      alias container_engine_cluster_name kubernetes_engine_cluster_name
 
       ##
-      # Returns the name of the Container Engine namespace hosting the
+      # Returns the name of the Kubernetes Engine namespace hosting the
       # application, or `nil` if the current code is not running in
-      # Container Engine.
+      # Kubernetes Engine.
       #
       # @return [String,nil]
       #
-      def container_engine_namespace_id
-        env["GKE_NAMESPACE_ID"]
+      def kubernetes_engine_namespace_id
+        # The Kubernetes namespace is difficult to obtain without help from
+        # the application using the Downward API. The environment variable
+        # below is set in some older versions of GKE, and the file below is
+        # present in Kubernetes as of version 1.9, but it is possible that
+        # alternatives will need to be found in the future.
+        env["GKE_NAMESPACE_ID"] ||
+          ::IO.read("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
+      rescue SystemCallError
+        nil
       end
+      alias container_engine_namespace_id kubernetes_engine_namespace_id
 
       ##
       # Determine whether the Google Compute Engine Metadata Service is running.
@@ -304,7 +317,8 @@ module Google
             resp = connection.get METADATA_ROOT_PATH
             metadata_cache[METADATA_ROOT_PATH] = \
               resp.status == 200 && resp.headers["Metadata-Flavor"] == "Google"
-          rescue ::Faraday::TimeoutError, ::Faraday::ConnectionFailed
+          rescue ::Faraday::TimeoutError, ::Faraday::ConnectionFailed,
+                 Errno::EHOSTDOWN
             metadata_cache[METADATA_ROOT_PATH] = false
           end
         end
@@ -329,7 +343,8 @@ module Google
               req.headers = { "Metadata-Flavor" => "Google" }
             end
             metadata_cache[path] = resp.status == 200 ? resp.body.strip : nil
-          rescue ::Faraday::TimeoutError, ::Faraday::ConnectionFailed
+          rescue ::Faraday::TimeoutError, ::Faraday::ConnectionFailed,
+                 Errno::EHOSTDOWN
             metadata_cache[path] = nil
           end
         end

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

@@ -1,10 +1,10 @@
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 module Google
   module Cloud
     class Env
-      VERSION = "1.0.1".freeze
+      VERSION = "1.0.2".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-env
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -98,16 +98,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Google Cloud Platform hosting environment information.