Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/support custom aws endpoint #1101

Merged
merged 5 commits into from
Oct 26, 2024
Merged

Feature/support custom aws endpoint #1101

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2495737
custom aws endpoint
graysonchen Oct 21, 2024
2e7a645
s3 endpoint option.
graysonchen Oct 21, 2024
14c37b2
Update app/uploaders/camaleon_cms_aws_uploader.rb
graysonchen Oct 22, 2024
d9dde80
Fix Style/SafeNavigation in sessions_controller.rb
texpert Oct 26, 2024
cfc87c3
Add changelog entry
texpert Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/uploaders/camaleon_cms_aws_uploader.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ def after_initialize
@aws_akey = @aws_settings[:access_key] || @current_site.get_option('filesystem_s3_access_key')
@aws_asecret = @aws_settings[:secret_key] || @current_site.get_option('filesystem_s3_secret_key')
@aws_bucket = @aws_settings[:bucket] || @current_site.get_option('filesystem_s3_bucket_name')
@aws_endpoint = @aws_settings[:endpoint] || @current_site.get_option('filesystem_s3_endpoint')
@aws_settings[:aws_file_upload_settings] ||= ->(settings) { settings }
@aws_settings[:aws_file_read_settings] ||= ->(data, _s3_file) { data }
end
Expand Down Expand Up @@ -140,8 +141,13 @@ def delete_file(key)
def bucket
@bucket ||= lambda {
Aws.config.update({ region: @aws_region, credentials: Aws::Credentials.new(@aws_akey, @aws_asecret) })
s3 = Aws::S3::Resource.new
s3 = Aws::S3::Resource.new(resource_parameters)
s3.bucket(@aws_bucket)
}.call
end

def resource_parameters
return {} if @aws_endpoint.blank?
{ endpoint: @aws_endpoint }
graysonchen marked this conversation as resolved.
Show resolved Hide resolved
end
end
10 changes: 5 additions & 5 deletions app/views/camaleon_cms/admin/settings/_file_system_settings.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<%= label_tag t('camaleon_cms.admin.settings.filesystem_region', default: 'filesystem_region') %> <small>(*)</small><br>
<%= text_field :options, :filesystem_region, :class => "form-control required", value: @site.get_option("filesystem_region"), placeholder: 'us-west-2' %>
</div>
<!--<div class="form-group">
<%#= label_tag t('camaleon_cms.admin.settings.filesystem_s3_endpoint', default: 'filesystem_s3_endpoint') %> <small>(*)</small><br>
<%#= text_field :options, :filesystem_s3_endpoint, :class => "form-control required", value: @site.get_option("filesystem_s3_endpoint"), placeholder: 's3-us-west-2.amazonaws.com' %>
</div>-->
<div class="form-group">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR, @graysonchen !

Let's ask first @owen2345 why the code has been commented from the very creation? Are there any obstacles to enable it?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIR, the implementation was not complete and thus I preserved the HTML part commented.

<%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_endpoint', default: 'filesystem_s3_endpoint') %><br>
<%= text_field :options, :filesystem_s3_endpoint, :class => "form-control required", value: @site.get_option("filesystem_s3_endpoint"), placeholder: 's3-us-west-2.amazonaws.com' %>
</div>
<div class="form-group">
<%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_cloudfront', default: 'Cloudfront URL') %><br>
<%= text_field :options, :filesystem_s3_cloudfront, :class => "form-control", value: @site.get_option("filesystem_s3_cloudfront"), placeholder: 'https://cloudfront_id.cloudfront.net' %>
</div>
</div>
</div>
</div>
Loading