asset_sync 2.17.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30fcfd0667904cde532ba24578e9bbc15f33051d5bde3e345226915c7135ccde
-  data.tar.gz: 67cff250568d8473c940733f182e425b811550be1c95e940498508fe5d81e656
+  metadata.gz: b64084370fbccba4e315b80d8877893f7e556fc24eecc938f1dda2a328a78e3b
+  data.tar.gz: f387731557d333a5d295c4c62ac9fedc3d6b23c57509f1cefb306d823d91845e
 SHA512:
-  metadata.gz: 6c2471c8dcad1fdd461fac5e7881723f012888e295e5f8bda6c13137ff1cb31f3aef2db669d71588a3a699dbd2d56366abacdf9ab0d0cae4b8e7b5dba2bff8f8
-  data.tar.gz: 1c5fb8a038bc21c0f8218a1dd74ec6cff47df3b43588e0b9599032559a639564341814f1576faa5b6a9f9378ca2e37de1c08f219748999f0e7a437f48e96fe22
+  metadata.gz: f64ebb5f182457d6010c0c2c5ad8535668f980594c8d59bc7c59838d105e64d2ae7c067dca99604bca9e1dacccd2dedc5104cc88cedd2dfc7679aab7ebbe0d22
+  data.tar.gz: 87bf1e02addf61a30abfddd4ea082f2d730db5428425d2676808624349d3f2f987967051a85b9d075155e1555dbdfe3dcd34ab2d18580e39d272280d1436596f

data/CHANGELOG.md

@@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
-- Add `fog_options` configuration option.
+- Nothing
 
 ### Changed
 
@@ -18,6 +18,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.18.0] - 2023-01-30
+
+### Added
+
+- Add `google_auth` configuration option
+  (https://github.com/AssetSync/asset_sync/pull/432)
+
+
 ## [2.17.0] - 2023-01-13
 
 ### Added

data/lib/asset_sync/config.rb

@@ -56,6 +56,7 @@ module AssetSync
     attr_accessor :rackspace_username, :rackspace_api_key, :rackspace_auth_url
 
     # Google Storage
+    attr_accessor :google_auth # when using generic auth (like access tokens)
     attr_accessor :google_storage_secret_access_key, :google_storage_access_key_id  # when using S3 interop
     attr_accessor :google_json_key_location # when using service accounts
     attr_accessor :google_json_key_string # when using service accounts
@@ -81,7 +82,7 @@ module AssetSync
     validates :rackspace_api_key,     :presence => true, :if => :rackspace?
     validates :google_storage_secret_access_key,  :presence => true, :if => :google_interop?
     validates :google_storage_access_key_id,      :presence => true, :if => :google_interop?
-    validates :google_project,                    :presence => true, :if => :google_service_account?
+    validates :google_project,                    :presence => true, :if => -> (c) { c.google_auth || c.google_service_account? }
     validate(:if => :google_service_account?) do
       unless google_json_key_location.present? || google_json_key_string.present?
         errors.add(:base, 'must provide either google_json_key_location or google_json_key_string if using Google service account')
@@ -162,7 +163,7 @@ module AssetSync
     end
 
     def google_interop?
-      google? && google_json_key_location.nil? && google_json_key_string.nil?
+      google? && google_auth.nil? && google_json_key_location.nil? && google_json_key_string.nil?
     end
 
     def google_service_account?
@@ -310,7 +311,9 @@ module AssetSync
         options.merge!({ :rackspace_region => fog_region }) if fog_region
         options.merge!({ :rackspace_auth_url => rackspace_auth_url }) if rackspace_auth_url
       elsif google?
-        if google_json_key_location
+        if google_auth
+          options.merge!({:google_auth => google_auth, :google_project => google_project})
+        elsif google_json_key_location
           options.merge!({:google_json_key_location => google_json_key_location, :google_project => google_project})
         elsif google_json_key_string
           options.merge!({:google_json_key_string => google_json_key_string, :google_project => google_project})

data/lib/asset_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AssetSync
-  VERSION = "2.17.0"
+  VERSION = "2.18.0"
 end

data/spec/unit/google_spec.rb

@@ -38,6 +38,30 @@ describe AssetSync do
       expect(AssetSync.config.manifest).to be_falsey
     end
 
+    describe "when using user-specified google credentials" do
+      before(:each) do
+        AssetSync.configure do |config|
+          config.google_auth = "access-token"
+          config.google_project = 'a-google-project-name'
+        end
+      end
+
+      it "should configure google_auth" do
+        expect(AssetSync.config.google_auth).to eq("access-token")
+      end
+
+      it "should return the correct fog_options" do
+        expected_fog_options = { google_auth: "access-token",
+                                google_project: 'a-google-project-name',
+                                provider: "Google"}
+        expect(AssetSync.config.fog_options).to eq(expected_fog_options)
+      end
+
+      it "should not require that other parameters be set" do
+        expect(AssetSync.config.valid?).to eq(true)
+      end
+    end
+
     describe "when using S3 interop API" do
       before(:each) do
         AssetSync.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and