make load_gcloud_project_id module function (#170)

googleapis · Oct 26, 2018 · 0d2becb · 0d2becb
1 parent f0b0c6f
commit 0d2becb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
-## 0.7.0 (2018/10/23)
+## 0.7.1 (2018/10/25)
+
+* Make load_gcloud_project_id module function.
+
+## 0.7.0 (2018/10/24)
 
 * Add project_id instance variable to UserRefreshCredentials, ServiceAccountCredentials, and Credentials.
 

diff --git a/lib/googleauth/credentials_loader.rb b/lib/googleauth/credentials_loader.rb
@@ -147,6 +147,7 @@ def load_gcloud_project_id
       rescue
         warn 'Unable to determine project id.'
       end
+      module_function :load_gcloud_project_id
 
       private
 

diff --git a/lib/googleauth/service_account.rb b/lib/googleauth/service_account.rb
@@ -65,7 +65,7 @@ def self.make_creds(options = {})
           client_email = ENV[CredentialsLoader::CLIENT_EMAIL_VAR]
           project_id = ENV[CredentialsLoader::PROJECT_ID_VAR]
         end
-        project_id ||= self.class.load_gcloud_project_id
+        project_id ||= CredentialsLoader.load_gcloud_project_id
 
         new(token_credential_uri: TOKEN_CRED_URI,
             audience: TOKEN_CRED_URI,
@@ -157,7 +157,7 @@ def initialize(options = {})
           @issuer = ENV[CredentialsLoader::CLIENT_EMAIL_VAR]
           @project_id = ENV[CredentialsLoader::PROJECT_ID_VAR]
         end
-        @project_id ||= self.class.load_gcloud_project_id
+        @project_id ||= CredentialsLoader.load_gcloud_project_id
         @signing_key = OpenSSL::PKey::RSA.new(@private_key)
       end
 

diff --git a/lib/googleauth/user_refresh.rb b/lib/googleauth/user_refresh.rb
@@ -90,7 +90,7 @@ def initialize(options = {})
         options[:token_credential_uri] ||= TOKEN_CRED_URI
         options[:authorization_uri] ||= AUTHORIZATION_URI
         @project_id = options[:project_id]
-        @project_id ||= self.class.load_gcloud_project_id
+        @project_id ||= CredentialsLoader.load_gcloud_project_id
         super(options)
       end
 

diff --git a/lib/googleauth/version.rb b/lib/googleauth/version.rb
@@ -31,6 +31,6 @@ module Google
   # Module Auth provides classes that provide Google-specific authorization
   # used to access Google APIs.
   module Auth
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.7.1'.freeze
   end
 end
diff --git a/spec/googleauth/user_refresh_spec.rb b/spec/googleauth/user_refresh_spec.rb
@@ -221,7 +221,7 @@ def cred_json_text(missing = nil)
         ENV['HOME'] = dir
         ENV['APPDATA'] = dir
         ENV[PROJECT_ID_VAR] = nil
-        expect(@clz).to receive(:load_gcloud_project_id).with(no_args)
+        expect(Google::Auth::CredentialsLoader).to receive(:load_gcloud_project_id).with(no_args)
         @clz.from_well_known_path(@scope)
       end
     end