Also save assets to bucket so they can be served from CDN

Many assets from the asset library are rendered on the page at once which will cause a lot of requests to editor API.

This is being stored in the editor-assets r2 bucket. Note that region isn't used by has to be set to a valid value.

Author: zetter-rpf

lib/scratch_asset_importer.rb

@@ -32,15 +32,67 @@ def initialize(asset_name, asset_base_url)
   end
 
   def import
+    create_scratch_asset
+    save_to_editor_asset_bucket
+  rescue StandardError => e
+    Rails.logger.error("Failed to import asset #{asset_name}: #{e.message}")
+  end
+
+  def asset
+    @asset ||= begin
+      sleep(ASSET_FETCHING_DELAY)
+      connection.get("#{asset_name}/get/")
+    end
+  end
+
+  def create_scratch_asset
     return if ScratchAsset.global_assets.exists?(filename: asset_name)
 
-    sleep(ASSET_FETCHING_DELAY)
-    asset = connection.get("#{asset_name}/get/")
+    io = StringIO.new(asset.body)
+
     ScratchAsset.create!(filename: asset_name, project_id: nil, uploaded_user_id: nil)
                 .file
-                .attach(io: StringIO.new(asset.body), filename: asset_name)
-  rescue StandardError => e
-    Rails.logger.error("Failed to import asset #{asset_name}: #{e.message}")
+                .attach(io:, filename: asset_name)
+  end
+
+  def save_to_editor_asset_bucket
+    return unless save_to_editor_asset_bucket?
+
+    body = StringIO.new(asset.body)
+
+    s3_client.put_object(
+      bucket: ENV.fetch('EDITOR_ASSETS_BUCKET'),
+      key: asset_key,
+      body:,
+      content_type: asset_content_type
+    )
+  end
+
+  def save_to_editor_asset_bucket?
+    return false unless ENV['EDITOR_ASSETS_BUCKET']
+
+    s3_client.head_object(bucket: ENV.fetch('EDITOR_ASSETS_BUCKET'), key: asset_key)
+    false
+  rescue Aws::S3::Errors::NotFound
+    true
+  end
+
+  def asset_key
+    "internalapi/asset/#{asset_name}/get/"
+  end
+
+  def asset_content_type
+    extension = File.extname(asset_name).delete('.')
+    Mime::Type.lookup_by_extension(extension).to_s
+  end
+
+  def s3_client
+    @s3_client ||= Aws::S3::Client.new(
+      access_key_id: ENV.fetch('EDITOR_ASSETS_ACCESS_KEY_ID'),
+      secret_access_key: ENV.fetch('EDITOR_ASSETS_SECRET_ACCESS_KEY'),
+      endpoint: ENV.fetch('EDITOR_ASSETS_ENDPOINT'),
+      region: 'auto'
+    )
   end
 
   def connection

spec/lib/scratch_asset_importer_spec.rb

@@ -59,5 +59,51 @@
       expect(ScratchAsset.find_by(filename: '123abc.png')).not_to be_present
       expect(ScratchAsset.find_by(filename: '456xyz.png')).to be_present
     end
+
+    describe 'syncing to editor asset bucket' do
+      let(:s3_client) { instance_double(Aws::S3::Client) }
+
+      around do |example|
+        editor_asset_env_vars = {
+          EDITOR_ASSETS_BUCKET: 'test-bucket',
+          EDITOR_ASSETS_ACCESS_KEY_ID: 'test-access-key-id',
+          EDITOR_ASSETS_SECRET_ACCESS_KEY: 'test-secret-access-key',
+          EDITOR_ASSETS_ENDPOINT: 'https://r2.example.com'
+        }
+        ClimateControl.modify(editor_asset_env_vars) do
+          example.run
+        end
+      end
+
+      before do
+        allow(Aws::S3::Client).to receive(:new).and_return(s3_client)
+        allow(s3_client).to receive(:head_object).and_raise(Aws::S3::Errors::NotFound.new(nil, nil))
+        allow(s3_client).to receive(:put_object)
+      end
+
+      it 'saves asset to editor asset bucket if it does not exist' do
+        image = Rails.root.join('spec/fixtures/files/test_image_1.png').read
+        stub_request(:get, 'https://example.net/internalapi/asset/123abc.png/get/').to_return(status: 200, body: image)
+
+        described_class.import_all(['123abc.png'], 'https://example.net/internalapi/asset/')
+
+        expect(s3_client).to have_received(:put_object).with(
+          bucket: 'test-bucket',
+          key: 'internalapi/asset/123abc.png/get/',
+          body: instance_of(StringIO),
+          content_type: 'image/png'
+        )
+      end
+
+      it 'does not save asset to editor asset bucket if it already exists' do
+        image = Rails.root.join('spec/fixtures/files/test_image_1.png').read
+        stub_request(:get, 'https://example.net/internalapi/asset/123abc.png/get/').to_return(status: 200, body: image)
+
+        allow(s3_client).to receive(:head_object).with(bucket: 'test-bucket', key: 'internalapi/asset/123abc.png/get/').and_return(true)
+
+        described_class.import_all(['123abc.png'], 'https://example.net/internalapi/asset/')
+        expect(s3_client).not_to have_received(:put_object)
+      end
+    end
   end
 end