aws-google 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00e6b5cf021f6b08503bc04f4359fa58028ebd227d0e12e66308af77f5613ba4
-  data.tar.gz: 971a4987281b9e2971574b590edba32a8522f061997cc20098ffa83e42216dac
+  metadata.gz: 25371a240ad0f397fa6b6d1c08d571727a175b85c71acae57c82b2d0b73051b9
+  data.tar.gz: ecd47df8e628731cbea7bf73a7f9f3f345b9c0e1cfc57240a8f3a4207661f19a
 SHA512:
-  metadata.gz: 71812e0486feddadacbff23840630334a9fb29466427542c0da9d2fd36184e3694bea4681ac708c2822fcf43c2ce1829adc530311ede86523359a96c78519205
-  data.tar.gz: d14acf9b9493d55e4ef4b10465a17f6e9cda6fd0bdaef5886a757e078a434ccac9f3faef51689bdc037cb8b5828a947788f0f24640e18039f4365597d1a2805a
+  metadata.gz: '095dcb8792f238c989aa38b904bbd334f16797c0665c6676d37e8e2d1cdaae607ae62084234269a6d0c8218815c1e2bc002b54f80c665c5063f2ee8bb2bc378c'
+  data.tar.gz: f232a36de7e36b7b846a5c5b0f3950bcfdb57e7b5e50705829beb976e76e557fb453831649a66ec73004fe525ecdcbf6e57cf604e679a445ba6edd6dfb5ad28b

data/README.md

@@ -20,8 +20,11 @@ Or install it yourself as:
 
 ## Usage
 
-- Visit the [Google API Console](https://console.developers.google.com/) to create/obtain OAuth 2.0 Client ID credentials (client ID and client secret) for an application in your Google account.
-- Create an AWS IAM Role with the desired IAM policies attached, and a ['trust policy'](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_terms-and-concepts.html#term_trust-policy) ([`AssumeRolePolicyDocument`](https://docs.aws.amazon.com/IAM/latest/APIReference/API_CreateRole.html)) allowing the [`sts:AssumeRoleWithWebIdentity`](https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRoleWithWebIdentity.html) action with [Web Identity Federation condition keys](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_iam-condition-keys.html#condition-keys-wif) authorizing
+### Create a Google Client ID
+Visit the [Google API Console](https://console.developers.google.com/) to create/obtain [OAuth 2.0 Client ID credentials](https://support.google.com/cloud/answer/6158849) (client ID and client secret) for an application in your Google account.
+
+### Create an AWS IAM Role
+Create an AWS IAM Role with the desired IAM policies attached, and a ['trust policy'](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_terms-and-concepts.html#term_trust-policy) ([`AssumeRolePolicyDocument`](https://docs.aws.amazon.com/IAM/latest/APIReference/API_CreateRole.html)) allowing the [`sts:AssumeRoleWithWebIdentity`](https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRoleWithWebIdentity.html) action with [Web Identity Federation condition keys](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_iam-condition-keys.html#condition-keys-wif) authorizing
 your Google Client ID (`accounts.google.com:aud`) and a specific set of Google Account IDs (`accounts.google.com:sub`):
 
 ```json
@@ -48,7 +51,8 @@ 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 the AWS `role_arn`, Google `client_id` and `client_secret`, either as constructor arguments or via the `Aws::Google.config` global defaults:
+### Method 1: `Aws::Google`
+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'
 
@@ -67,6 +71,7 @@ Aws::Google.config = options
 puts Aws::STS::Client.new.get_caller_identity
 ```
 
+### Method 2: AWS Shared Config
 - 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:
 
 ```ini
@@ -78,7 +83,7 @@ google =
 credential_process = aws-google
 ```
 
-The extra `credential_process` config line tells AWS to [Source Credentials with an External Process](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sourcing-external.html), in this case the `aws-google` script, which allows you to seamlessly use the same Google login configuration from non-Ruby SDKs (like the CLI).
+The extra `credential_process` config line tells AWS to [Source Credentials with an External Process](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-sourcing-external.html), in this case the `aws-google` executable script installed by this gem, which allows you to seamlessly use the same Google login configuration from non-Ruby SDKs (like the CLI).
 
 ## Development
 

data/aws-google.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk-core', '~> 3'
+  spec.add_dependency 'aws-sdk-core', '~> 3.130'
   spec.add_dependency 'google-api-client', '~> 0.23'
   spec.add_dependency 'launchy', '~> 2'
 

data/lib/aws/google/cached_credentials.rb

@@ -23,9 +23,9 @@ module Aws
       end
 
       def refresh_if_near_expiration
-        if near_expiration?
+        if near_expiration?(SYNC_EXPIRATION_LENGTH)
           @mutex.synchronize do
-            if near_expiration?
+            if near_expiration?(SYNC_EXPIRATION_LENGTH)
               refresh
               write_credentials
             end

data/lib/aws/google/credential_provider.rb

@@ -22,14 +22,17 @@ module Aws
 
     module GoogleSharedCredentials
       def google_credentials_from_config(opts = {})
-        p = opts[:profile] || @profile_name
+        google_opts = {}
         if @config_enabled && @parsed_config
-          google_opts = @parsed_config.
+          p = opts[:profile] || @profile_name
+          google_opts.merge!(@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
+        google_opts.merge!(::Aws::Google.config)
+        if google_opts.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.6'.freeze
+    VERSION = '0.1.8'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-google
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Will Jordan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.130'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.130'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Use Google OAuth as an AWS credential provider