aws-google 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ea7ae0f33a7dafe59e62cb045d143ed0fdc0a0a017d3e2a17d380cf1f46a49e
-  data.tar.gz: b5bc47171255473122de1cf179828f869a32cd7d6fb5cf5343d85204e7e96c26
+  metadata.gz: 00e6b5cf021f6b08503bc04f4359fa58028ebd227d0e12e66308af77f5613ba4
+  data.tar.gz: 971a4987281b9e2971574b590edba32a8522f061997cc20098ffa83e42216dac
 SHA512:
-  metadata.gz: 7801674b5be60e16e4e32608162b5c79baa06b794ddc4c494f6c04a46b2ad630b6a0ef7d6a552ff9f56091a6f4079cd95942a28a8b35d1a337f7cf335d4a4ba3
-  data.tar.gz: 405d08b37bb3167508fc705d458a9472067ddb53c4dcd02fc831a8c33155623c11c414d7bd2181d93a68a5cad0443cd325ea27451f416eeefd2d6e395e47a740
+  metadata.gz: 71812e0486feddadacbff23840630334a9fb29466427542c0da9d2fd36184e3694bea4681ac708c2822fcf43c2ce1829adc530311ede86523359a96c78519205
+  data.tar.gz: d14acf9b9493d55e4ef4b10465a17f6e9cda6fd0bdaef5886a757e078a434ccac9f3faef51689bdc037cb8b5828a947788f0f24640e18039f4365597d1a2805a

data/README.md

@@ -48,21 +48,23 @@ your Google Client ID (`accounts.google.com:aud`) and a specific set of Google A
 }
 ```
 
-- In your Ruby code, construct an `Aws::Google` object by passing in the AWS role, client id and client secret:
+- In your Ruby code, construct an `Aws::Google` object by passing the AWS `role_arn`, Google `client_id` and `client_secret`, either as constructor arguments or via the `Aws::Google.config` global defaults:
 ```ruby
 require 'aws/google'
 
-aws_role = 'arn:aws:iam::[AccountID]:role/[Role]'
-client_id = '123456789012-abcdefghijklmnopqrstuvwzyz0123456.apps.googleusercontent.com'
-client_secret = '01234567890abcdefghijklmn'
+options = {
+  aws_role: 'arn:aws:iam::[AccountID]:role/[Role]',
+  client_id: '123456789012-abcdefghijklmnopqrstuvwzyz0123456.apps.googleusercontent.com',
+  client_secret: '01234567890abcdefghijklmn'
+}
 
-role_credentials = Aws::Google.new(
-  role_arn: aws_role,
-  google_client_id: client_id,
-  google_client_secret: client_secret
-)
+# Pass constructor arguments:
+credentials = Aws::Google.new(options)
+puts Aws::STS::Client.new(credentials: credentials).get_caller_identity
 
-puts Aws::STS::Client.new(credentials: role_credentials).get_caller_identity
+# Set global defaults:
+Aws::Google.config = options
+puts Aws::STS::Client.new.get_caller_identity
 ```
 
 - Or, add the properties to your AWS config profile ([`~/.aws/config`](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html#cli-configure-files-where)) to use Google as the AWS credential provider without any changes to your application code:

data/lib/aws/google.rb

@@ -27,8 +27,10 @@ module Aws
     include ::Aws::Google::CachedCredentials
 
     class << self
+      # Use `Aws::Google.config` to set default options for any instance of this provider.
       attr_accessor :config
     end
+    self.config = {}
 
     # @option options [required, String] :role_arn
     # @option options [String] :policy
@@ -43,6 +45,7 @@ module Aws
     # @option options [String] :client_id Google client ID
     # @option options [String] :client_secret Google client secret
     def initialize(options = {})
+      options = options.merge(self.class.config)
       @oauth_attempted = false
       @assume_role_params = options.slice(
         *Aws::STS::Client.api.operation(:assume_role_with_web_identity).

data/lib/aws/google/credential_provider.rb

@@ -24,9 +24,11 @@ module Aws
       def google_credentials_from_config(opts = {})
         p = opts[:profile] || @profile_name
         if @config_enabled && @parsed_config
-          entry = @parsed_config.fetch(p, {})
-          if (google_opts = entry['google'])
-            Google.new(google_opts.transform_keys(&:to_sym))
+          google_opts = @parsed_config.
+            fetch(p, {}).fetch('google', {}).
+            transform_keys(&:to_sym)
+          if google_opts.merge(::Aws::Google.config).has_key?(:role_arn)
+            Google.new(google_opts)
           end
         end
       end

data/lib/aws/google/version.rb

@@ -1,5 +1,5 @@
 module Aws
   class Google
-    VERSION = '0.1.5'.freeze
+    VERSION = '0.1.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-google
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Will Jordan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core