update all the things and add a local docker dev setup

Author: cat5inthecradle

Dockerfile

@@ -0,0 +1,11 @@
+# Base image for Ruby (you can specify a version)
+FROM ruby:3.9.1
+
+# Install any system dependencies (adjust based on your gem's needs)
+RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
+
+# Set the working directory inside the container
+WORKDIR /app
+
+# Expose a shell to allow interaction inside the container
+CMD ["/bin/bash"]

Rakefile

@@ -1,10 +1,14 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
+
+  # Enable detailed warnings
+  t.ruby_opts << '-W2'
+  t.verbose = true # Shows the detailed output of each test
 end
 
-task :default => :test
+task default: :test

aws-google.gemspec

@@ -22,14 +22,14 @@ 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.201'
-  spec.add_dependency 'google-apis-core'
-  spec.add_dependency 'launchy', '~> 2'
+  spec.add_dependency 'aws-sdk-core', '~> 3.209.1'
+  spec.add_dependency 'google-apis-core', '~> 0.15.1'
+  spec.add_dependency 'launchy', '~> 3.0.1'
 
   spec.add_development_dependency 'activesupport', '~> 6.1.7.8'
   spec.add_development_dependency 'minitest', '~> 5.25.1'
-  spec.add_development_dependency 'mocha', '~> 2.4'
-  spec.add_development_dependency 'rake', '~> 13'
-  spec.add_development_dependency 'timecop', '~> 0.8'
-  spec.add_development_dependency 'webmock', '~> 3'
+  spec.add_development_dependency 'mocha', '~> 2.4.5'
+  spec.add_development_dependency 'rake', '~> 13.2.1'
+  spec.add_development_dependency 'timecop', '~> 0.9.10'
+  spec.add_development_dependency 'webmock', '3.24.0'
 end

docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3'
+services:
+  ruby:
+    build: .
+    volumes:
+      - .:/app   # Map the current directory to /app inside the container
+    stdin_open: true
+    tty: true
+    ports:
+      - "3000:3000"  # If you're using a server (e.g., for testing with Rails), map the port

lib/aws/google/cached_credentials.rb

@@ -17,18 +17,26 @@ def initialize(options = {})
 
         @profile = options[:profile] || ENV['AWS_PROFILE'] || ENV['AWS_DEFAULT_PROFILE'] || 'default'
         @session_profile = @profile + '_session'
-        @expiration = Aws.shared_config.expiration(profile: @session_profile) rescue nil
-        @credentials = Aws.shared_config.credentials(profile: @session_profile) rescue nil
+        @expiration = begin
+          Aws.shared_config.expiration(profile: @session_profile)
+        rescue StandardError
+          nil
+        end
+        @credentials = begin
+          Aws.shared_config.credentials(profile: @session_profile)
+        rescue StandardError
+          nil
+        end
         refresh_if_near_expiration
       end
 
       def refresh_if_near_expiration
-        if near_expiration?(SYNC_EXPIRATION_LENGTH)
-          @mutex.synchronize do
-            if near_expiration?(SYNC_EXPIRATION_LENGTH)
-              refresh
-              write_credentials
-            end
+        return unless near_expiration?(SYNC_EXPIRATION_LENGTH)
+
+        @mutex.synchronize do
+          if near_expiration?(SYNC_EXPIRATION_LENGTH)
+            refresh
+            write_credentials
           end
         end
       end
@@ -42,7 +50,8 @@ def write_credentials
         credentials_map = {
           'aws_access_key_id' => @credentials.access_key_id,
           'aws_secret_access_key' => @credentials.secret_access_key,
-          'aws_session_token' => @credentials.session_token
+          'aws_session_token' => @credentials.session_token,
+          'expiration' => @expiration
         }
 
         # Use the AWS CLI to set the credentials in the session profile

test/aws/google_test.rb

@@ -72,7 +72,7 @@
 
     it 'creates credentials from a Google auth token' do
       @oauth_default.once
-      system.times(4)
+      system.times(5)
 
       c = Aws::Google.new(config).credentials
       _(c.credentials.access_key_id).must_equal credentials[:access_key_id]
@@ -88,7 +88,7 @@
        .then.returns(JWT.encode({ email: 'email' }, ''))
       Google::Auth.stubs(:get_application_default).returns(m)
 
-      system.times(4)
+      system.times(5)
 
       c = Aws::Google.new(config).credentials
       _(c.credentials.access_key_id).must_equal credentials[:access_key_id]
@@ -108,14 +108,15 @@
       expiration = provider.expiration
       _(expiration).must_equal(provider.expiration)
       Timecop.travel(1.5.hours.from_now) do
+        # This test is failing. I don't see where we'd be triggering a refresh, and some debugging sugguests the refresh logic is never called.
         _(expiration).wont_equal(provider.expiration)
       end
     end
 
     it 'refreshes saved expired credentials' do
       config[:profile] = 'cdo-expired'
       @oauth_default.once
-      system.times(4)
+      system.times(5)
       Aws::Google.new(config).credentials
     end
 
@@ -128,7 +129,7 @@
     it 'uses config defaults for new AWS clients' do
       Aws::Google.stubs(:config).returns(config)
       @oauth_default.once
-      system.times(4)
+      system.times(5)
       c = Aws::STS::Client.new.config.credentials
       _(c.credentials.access_key_id).must_equal credentials[:access_key_id]
       _(c.credentials.secret_access_key).must_equal credentials[:secret_access_key]
@@ -147,7 +148,7 @@
       end
 
       it 'retries Google auth when invalid credentials are provided' do
-        system.times(4)
+        system.times(5)
         @oauth_default.once
         Aws::Google.any_instance.expects(:google_oauth).returns(oauth)
         Aws::Google.new(config).credentials
@@ -198,7 +199,7 @@
       end
 
       it 'refreshes Google auth token when expired' do
-        system.times(4)
+        system.times(5)
         @oauth_default.once
         Aws::Google.any_instance.expects(:google_oauth).returns(oauth).once
         Aws::Google.new(config).credentials
@@ -218,7 +219,7 @@
         Aws::Google.stubs(:config).returns(config)
 
         @oauth_default.once
-        system.times(4)
+        system.times(5)
 
         c = Aws::STS::Client.new(region: 'us-east-1').config.credentials
         _(c.credentials.access_key_id).must_equal credentials[:access_key_id]