fastlane-plugin-aws_s3 1.6.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d977b937cc7060f4b57f9cf32b0b27b347bce5a
-  data.tar.gz: 8aaa4575eb1c388ea762f74f8a9e8207f248ac41
+SHA256:
+  metadata.gz: 733d4e8ad5102e8eb943a08a22ceceff539415ec8cdd888780537294165f2c67
+  data.tar.gz: 47a788ae5954bd3fc3a9188debf847ba9b975fdeff29adb77badf170038f3b23
 SHA512:
-  metadata.gz: b8fc79724b7fb26d1395c54b27f9f58e0e4c981e44fcfc9d8bbaaa7e67270426d4bcd90b5823c79f00efa964469884e6c4f5e13a3f02f5b5b4ad41b3b4536a07
-  data.tar.gz: e29b765248b814c56fdfc14c3896a7f525909a0dff8905f5970f9564d11e101a76a10bd66b3e818bb20ab1aed75a9a5ed1d40a4a98df903e30933ee851f8db95
+  metadata.gz: c4f503580810e56959001b855fc677185a4acf240c5618f5d6ad9d871fb2277d0711b1ac93ff855817ef9073f7943d5cef4f98526d80763c31397c323b7f435f
+  data.tar.gz: c30c426048d89bbb43566057ee7d90c05684581ae1d8bfe6f6bd78fd9e625e403a746ccb5d680c4eed7ef7bc76ffec2b002297b8f6407eb5f3f1cfa6b619605b

data/README.md

@@ -32,13 +32,13 @@ You can also customize a lot of options:
 ```ruby
 aws_s3(
   # All of these are used to make Shenzhen's `ipa distribute:s3` command
-  access_key: ENV['S3_ACCESS_KEY'],               # Required from user (unless using aws_profile).
-  secret_access_key: ENV['S3_SECRET_ACCESS_KEY'], # Required from user (unless using aws_profile).
-  aws_profile: ENV['AWS_PROFILE']                 # Required from user (unless using access_key and secret_access_key)
+  access_key: ENV['S3_ACCESS_KEY'],               # Optional - defaults to AWS Instance Profile Creds.
+  secret_access_key: ENV['S3_SECRET_ACCESS_KEY'], # Optional - defaults to AWS Instance Profile Creds.
+  aws_profile: ENV['AWS_PROFILE'],                # Optional - defaults to AWS Instance Profile Creds. (overrides if access_key and secret_access_key specified)
   bucket: ENV['S3_BUCKET'],                       # Required from user.
   region: ENV['S3_REGION'],                       # Required from user.
   acl: ENV['S3_ACL'],                             # Optional - defaults to 'public-read'
-  server_side_encryption: ENV['S3_SERVER_SIDE_ENCRYPTION'] # Optional
+  server_side_encryption: ENV['S3_SERVER_SIDE_ENCRYPTION'], # Optional
 
   endpoint: 'https://s3-us-west-1.amazonaws.com', # Optional, for buckets that require a specific endpoint
   ipa: 'AppName.ipa',                             # Required (if not uploading an APK).
@@ -55,7 +55,7 @@ aws_s3(
 )
 ```
 
-It is recommended to **not** store the AWS access keys in the `Fastfile`.
+It is recommended to **not** store the AWS access keys in the `Fastfile`. You can use [AWS Instance Profiles](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html) by attaching IAM roles to your EC2 configurations.
 
 The uploaded `version.json` file provides an easy way for apps to poll if a new update is available. The JSON looks like:
 
@@ -84,7 +84,4 @@ For more information about how the `fastlane` plugin system works, check out the
 
 ## Author
 
-Josh Holtz, josh@rokkincat.com, [@joshdholtz](https://twitter.com/joshdholtz)
-
-I'm available for freelance work (Fastlane, iOS, and Android development) :muscle:
-Feel free to contact me :rocket:
+Josh Holtz, me@joshholtz.com, [@joshdholtz](https://twitter.com/joshdholtz)

data/lib/assets/s3_android_html_template.erb

@@ -43,6 +43,11 @@
       a:hover {
         text-decoration: underline;
       }
+      #os-message {
+        text-align: center;
+        color: #737373;
+        font-size: 14px;
+      }
       #footnote {
         color: #737373;
         font-size: 14px;
@@ -58,7 +63,6 @@
     <h1 style="text-align: center;"><%= title %></h1>
     <h2><%= version_name %> (<%= version_code %>)</h2>
     <p><em>Built on <%= Time.now.strftime('%a, %e %b %Y %H:%M %p') %></em></p>
-    <!-- <img src="app_icon.png" id="appIcon"> -->
 
     <div class="oneRow">
       <span class="download" id="android">
@@ -70,31 +74,17 @@
       <span class="info">
         <p><%= release_notes %></p>
       </span>
-
-      <!-- <span class="download" id="android">
-      </span> -->
     </div>
 
-    <h3 id="desktop">Please open this page on your Android device!</h3>
+    <h3 id="os-message">Please open this page on your Android device!</h3>
 
     <p id="finished">
       App is being installed. You might have to close the browser.
     </p>
 
     <p id="footnote">
-      This is a beta version and is not meant to share with the public.
+      This is a beta version and is not intended for public sharing.
     </p>
-    <img src="https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane_medium.png" id="fastlaneLogo" />
+    <img src="https://fastlane.tools/assets/images/fastlane-logo-lockup.png" id="fastlaneLogo" />
   </body>
-
-  <script type='text/javascript'>
-    if (/Android/i.test(navigator.userAgent))
-    {
-      document.getElementById("desktop").remove()
-    }
-    else
-    {
-      document.getElementById("android").remove()
-    }
-  </script>
 </html>

data/lib/assets/s3_android_version_template.erb

@@ -3,5 +3,5 @@
     "updateUrl": "<%= apk_url %>",
     "version_code": "<%= version_code %>",
     "version_name": "<%= version_name %>",
-    "release_notes": "<%= release_notes %>"
+    "release_notes": <%= release_notes.to_json %>
 }

data/lib/assets/s3_ios_html_template.erb

@@ -43,6 +43,11 @@
       a:hover {
         text-decoration: underline;
       }
+      #os-message {
+        text-align: center;
+        color: #737373;
+        font-size: 14px;
+      }
       #footnote {
         color: #737373;
         font-size: 14px;
@@ -58,7 +63,6 @@
     <h1 style="text-align: center;"><%= title %></h1>
     <h2><%= bundle_version %> (<%= build_num %>)</h2>
     <p><em>Built on <%= Time.now.strftime('%a, %e %b %Y %H:%M %p') %></em></p>
-    <!-- <img src="app_icon.png" id="appIcon"> -->
 
     <div class="oneRow">
 
@@ -71,38 +75,17 @@
       <span class="info">
         <p><%= release_notes %></p>
       </span>
-
-      <!-- <span class="download" id="android">
-      </span> -->
     </div>
 
-    <h3 id="desktop">Please open this page on your iPhone!</h3>
+    <h3 id="os-message">Please open this page on your iOS device!</h3>
 
     <p id="finished">
       App is being installed. Close Safari using the home button.
     </p>
 
     <p id="footnote">
-      This is a beta version and is not meant to share with the public.
+      This is a beta version and is not intended for public sharing.
     </p>
-    <img src="https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane_medium.png" id="fastlaneLogo" />
+    <img src="https://fastlane.tools/assets/images/fastlane-logo-lockup.png" id="fastlaneLogo" />
   </body>
-
-  <script type='text/javascript'>
-    // if (/Android/i.test(navigator.userAgent))
-    // {
-    //   document.getElementById("ios").remove()
-    //   document.getElementById("desktop").remove()
-    // }
-    if (/iPhone|iPad|iPod/i.test(navigator.userAgent))
-    {
-      // document.getElementById("android").remove()
-      document.getElementById("desktop").remove()
-    }
-    else
-    {
-      document.getElementById("ios").remove()
-      // document.getElementById("android").remove()
-    }
-  </script>
 </html>

data/lib/assets/s3_ios_version_template.erb

@@ -5,5 +5,5 @@
     "ipa_url": "<%= ipa_url %>",
     "build_number": "<%= build_num %>",
     "bundle_version": "<%= bundle_version %>",
-    "release_notes": "<%= release_notes %>"
+    "release_notes": <%= release_notes.to_json %>
 }

data/lib/fastlane/plugin/aws_s3/actions/aws_s3_action.rb

@@ -35,6 +35,8 @@ module Fastlane
         params[:aws_profile] = config[:aws_profile]
         params[:bucket] = config[:bucket]
         params[:endpoint] = config[:endpoint]
+        params[:download_endpoint] = config[:download_endpoint]
+        params[:download_endpoint_replacement_regex] = config[:download_endpoint_replacement_regex]
         params[:region] = config[:region]
         params[:app_directory] = config[:app_directory]
         params[:acl] = config[:acl]
@@ -49,6 +51,9 @@ module Fastlane
         params[:html_file_name] = config[:html_file_name]
         params[:skip_html_upload] = config[:skip_html_upload]
         params[:html_in_folder] = config[:html_in_folder]
+        params[:html_in_root] = config[:html_in_root]
+        params[:version_in_folder] = config[:version_in_folder]
+        params[:version_in_root] = config[:version_in_root]
         params[:version_template_path] = config[:version_template_path]
         params[:version_file_name] = config[:version_file_name]
         params[:version_template_params] = config[:version_template_params]
@@ -74,30 +79,19 @@ module Fastlane
         acl     = params[:acl].to_sym
         server_side_encryption = params[:server_side_encryption]
 
-        unless s3_profile
-          UI.user_error!("No S3 access key given, pass using `access_key: 'key'` (or use `aws_profile: 'profile'`)") unless s3_access_key.to_s.length > 0
-          UI.user_error!("No S3 secret access key given, pass using `secret_access_key: 'secret key'` (or use `aws_profile: 'profile'`)") unless s3_secret_access_key.to_s.length > 0
-        end
         UI.user_error!("No S3 bucket given, pass using `bucket: 'bucket'`") unless s3_bucket.to_s.length > 0
         UI.user_error!("No IPA, APK file, folder or files paths given, pass using `ipa: 'ipa path'` or `apk: 'apk path'` or `folder: 'folder path' or files: [`file path1`, `file path 2`]") if ipa_file.to_s.length == 0 && apk_file.to_s.length == 0 && files.to_a.count == 0 && folder.to_s.length == 0
         UI.user_error!("Please only give IPA path or APK path (not both)") if ipa_file.to_s.length > 0 && apk_file.to_s.length > 0
 
-        require 'aws-sdk'
-        if s3_profile
-          creds = Aws::SharedCredentials.new(profile_name: s3_profile);
-        else
-          creds = Aws::Credentials.new(s3_access_key, s3_secret_access_key)
-        end
-        Aws.config.update({
-                            region: s3_region,
-                            credentials: creds
-        })
+        require 'aws-sdk-s3'
 
-        s3_client = if s3_endpoint
-          Aws::S3::Client.new(endpoint: s3_endpoint)
-        else
-          Aws::S3::Client.new
-        end
+        client_cfg = {}
+        client_cfg[:region] = s3_region if s3_region
+        client_cfg[:endpoint] = s3_endpoint if s3_endpoint
+        client_cfg[:profile] = s3_profile if s3_profile
+        client_cfg[:credentials] = Aws::Credentials.new(s3_access_key, s3_secret_access_key) if s3_access_key && s3_secret_access_key
+
+        s3_client = Aws::S3::Client.new(client_cfg)
 
         if xcarchive_file.nil?
           xcarchive_file = Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE]
@@ -124,18 +118,22 @@ module Fastlane
         html_template_params = params[:html_template_params] || {}
         html_file_name = params[:html_file_name]
         generate_html_in_folder = params[:html_in_folder]
+        generate_html_in_root = params[:html_in_root]
+        generate_version_in_folder = params[:version_in_folder]
+        generate_version_in_root = params[:version_in_root]
         version_template_path = params[:version_template_path]
         version_template_params = params[:version_template_params] || {}
         version_file_name = params[:version_file_name]
         override_file_name = params[:override_file_name]
-
+        download_endpoint = params[:download_endpoint]
+        download_endpoint_replacement_regex = params[:download_endpoint_replacement_regex]
         url_part = self.expand_path_with_substitutions_from_ipa_plist(ipa_file, s3_path)
 
         ipa_file_basename = File.basename(ipa_file)
         ipa_file_name = "#{url_part}#{override_file_name ? override_file_name : ipa_file_basename}"
         ipa_file_data = File.open(ipa_file, 'rb')
 
-        ipa_url = self.upload_file(s3_client, s3_bucket, app_directory, ipa_file_name, ipa_file_data, acl, server_side_encryption)
+        ipa_url = self.upload_file(s3_client, s3_bucket, app_directory, ipa_file_name, ipa_file_data, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_IPA_OUTPUT_PATH] = ipa_url
@@ -146,7 +144,7 @@ module Fastlane
           dsym_file_name = "#{url_part}#{dsym_file_basename}"
           dsym_file_data = File.open(dsym_file, 'rb')
 
-          dsym_url = self.upload_file(s3_client, s3_bucket, app_directory, dsym_file_name, dsym_file_data, acl, server_side_encryption)
+          dsym_url = self.upload_file(s3_client, s3_bucket, app_directory, dsym_file_name, dsym_file_data, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
 
           # Setting action and environment variables
           Actions.lane_context[SharedValues::S3_DSYM_OUTPUT_PATH] = dsym_url
@@ -207,7 +205,7 @@ module Fastlane
         # plist uploading
         #
         #####################################
-        plist_url = self.upload_file(s3_client, s3_bucket, app_directory, plist_file_name, plist_render, acl, server_side_encryption)
+        plist_url = self.upload_file(s3_client, s3_bucket, app_directory, plist_file_name, plist_render, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
 
         # Creates html from template
         if html_template_path && File.exist?(html_template_path)
@@ -249,9 +247,34 @@ module Fastlane
         #####################################
 
         skip_html = params[:skip_html_upload]
-        html_file_name = "#{url_part}#{html_file_name}" if generate_html_in_folder
-        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl, server_side_encryption) unless skip_html
-        version_url = self.upload_file(s3_client, s3_bucket, app_directory, version_file_name, version_render, acl, server_side_encryption)
+
+        html_file_names = []
+        version_file_names = []
+
+        unless skip_html
+          if generate_html_in_root
+            html_file_names << html_file_name
+          end
+          if generate_html_in_folder
+            html_file_names << "#{url_part}#{html_file_name}"
+          end
+        end
+        if generate_version_in_root
+          version_file_names << version_file_name
+        end
+        if generate_version_in_folder
+          version_file_names << "#{url_part}#{version_file_name}"
+        end
+
+        html_url = nil
+        version_url = nil
+
+        html_file_names.each do |html_file_name|
+          html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
+        end
+        version_file_names.each do |version_file_name|
+          version_url = self.upload_file(s3_client, s3_bucket, app_directory, version_file_name, version_render, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
+        end
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_PLIST_OUTPUT_PATH] = plist_url
@@ -283,8 +306,10 @@ module Fastlane
         sh("zip -r '#{archive_zip}' '#{archive}'")
         full_archive_zip_name = "#{url_part}#{archive_zip_name}"
         archive_zip_data = File.open(archive_zip, 'rb')
+        download_endpoint = params[:download_endpoint]
+        download_endpoint_replacement_regex = params[:download_endpoint_replacement_regex]
 
-        archive_url = self.upload_file(s3_client, s3_bucket, app_directory, full_archive_zip_name, archive_zip_data, acl, server_side_encryption)
+        archive_url = self.upload_file(s3_client, s3_bucket, app_directory, full_archive_zip_name, archive_zip_data, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
 
         Actions.lane_context[SharedValues::S3_XCARCHIVE_OUTPUT_PATH] = archive_url
         ENV[SharedValues::S3_XCARCHIVE_OUTPUT_PATH.to_s] = archive_url
@@ -299,7 +324,7 @@ module Fastlane
         version_name = version[1]
         title = version[2]
 
-        s3_path = "#{version_code}_#{version_name}/" unless s3_path
+        s3_path = "v{version_name}_b{version_code}/" unless s3_path
 
         app_directory = params[:app_directory]
 
@@ -307,18 +332,23 @@ module Fastlane
         html_template_params = params[:html_template_params] || {}
         html_file_name = params[:html_file_name]
         generate_html_in_folder = params[:html_in_folder]
+        generate_html_in_root = params[:html_in_root]
+        generate_version_in_folder = params[:version_in_folder]
+        generate_version_in_root = params[:version_in_root]
         version_template_path = params[:version_template_path]
         version_template_params = params[:version_template_params] || {}
         version_file_name = params[:version_file_name]
         override_file_name = params[:override_file_name]
+        download_endpoint = params[:download_endpoint]
+        download_endpoint_replacement_regex = params[:download_endpoint_replacement_regex]
 
-        url_part = s3_path
+        url_part = self.expand_path_with_substitutions_with_versions(version_code, version_name, s3_path)
 
         apk_file_basename = File.basename(apk_file)
         apk_file_name = "#{url_part}#{override_file_name ? override_file_name : apk_file_basename}"
         apk_file_data = File.open(apk_file, 'rb')
 
-        apk_url = self.upload_file(s3_client, s3_bucket, app_directory, apk_file_name, apk_file_data, acl, server_side_encryption)
+        apk_url = self.upload_file(s3_client, s3_bucket, app_directory, apk_file_name, apk_file_data, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_APK_OUTPUT_PATH] = apk_url
@@ -376,9 +406,35 @@ module Fastlane
         #####################################
 
         skip_html = params[:skip_html_upload]
-        html_file_name = "#{url_part}#{html_file_name}" if generate_html_in_folder
-        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl, server_side_encryption) unless skip_html
-        version_url = self.upload_file(s3_client, s3_bucket, app_directory, version_file_name, version_render, acl, server_side_encryption)
+
+        html_file_names = []
+        version_file_names = []
+
+        unless skip_html
+          if generate_html_in_root
+            html_file_names << html_file_name
+          end
+          if generate_html_in_folder
+            html_file_names << "#{url_part}#{html_file_name}"
+          end
+        end
+        if generate_version_in_root
+          version_file_names << version_file_name
+        end
+        if generate_version_in_folder
+          version_file_names << "#{url_part}#{version_file_name}"
+        end
+
+        html_url = nil
+        version_url = nil
+
+        html_file_names.each do |html_file_name|
+          html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
+        end
+
+        version_file_names do |version_file_name|
+          version_url = self.upload_file(s3_client, s3_bucket, app_directory, version_file_name, version_render, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
+        end
 
         Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url unless skip_html
         ENV[SharedValues::S3_HTML_OUTPUT_PATH.to_s] = html_url unless skip_html
@@ -408,7 +464,9 @@ module Fastlane
           zip_file_name = "#{url_part}source.zip"
 
           output_path_data = File.open("#{output_file_path}", 'rb')
-          source_url = self.upload_file(s3_client, s3_bucket, app_directory, zip_file_name, output_path_data, acl, server_side_encryption)
+          download_endpoint = params[:download_endpoint]
+          download_endpoint_replacement_regex = params[:download_endpoint_replacement_regex]
+          source_url = self.upload_file(s3_client, s3_bucket, app_directory, zip_file_name, output_path_data, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
 
           Actions.lane_context[SharedValues::S3_SOURCE_OUTPUT_PATH] = source_url
           ENV[SharedValues::S3_SOURCE_OUTPUT_PATH.to_s] = source_url
@@ -462,13 +520,16 @@ module Fastlane
         app_directory = params[:app_directory]
         url_part = s3_path
 
+        download_endpoint = params[:download_endpoint]
+        download_endpoint_replacement_regex = params[:download_endpoint_replacement_regex]
+
         Actions.lane_context[SharedValues::S3_FILES_OUTPUT_PATHS] = []
         files.each do |file|
           file_basename = File.basename(file)
           file_data = File.open(file, 'rb')
           file_name = url_part + '/' + file_basename
 
-          file_url = self.upload_file(s3_client, s3_bucket, app_directory, file_name, file_data, acl, server_side_encryption)
+          file_url = self.upload_file(s3_client, s3_bucket, app_directory, file_name, file_data, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
 
           # Setting action and environment variables
           Actions.lane_context[SharedValues::S3_FILES_OUTPUT_PATHS] << file_url
@@ -483,6 +544,9 @@ module Fastlane
         url_part = s3_path
         app_directory = params[:app_directory]
 
+        download_endpoint = params[:download_endpoint]
+        download_endpoint_replacement_regex = params[:download_endpoint_replacement_regex]
+
         unless File.directory?(folder)
           UI.user_error!("Invalid folder parameter. `#{File.expand_path(folder)} is not a directory!")
         end
@@ -493,14 +557,12 @@ module Fastlane
           file_relative_path_to_folder = Pathname.new(File.expand_path(file)).relative_path_from(Pathname.new(File.expand_path(folder))).to_s
           file_name = url_part + '/' + file_relative_path_to_folder
 
-          file_url = self.upload_file(s3_client, s3_bucket, app_directory, file_name, file_data, acl, server_side_encryption)
-          Actions.lane_context[SharedValues::S3_FOLDER_OUTPUT_PATH] = file_url.gsub('/' + file_relative_path_to_folder, '')
+          file_url = self.upload_file(s3_client, s3_bucket, app_directory, file_name, file_data, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
+          Actions.lane_context[SharedValues::S3_FOLDER_OUTPUT_PATH] = CGI.unescape(file_url).gsub('/' + file_relative_path_to_folder, '')
         end
       end
 
-
-
-      def self.upload_file(s3_client, bucket_name, app_directory, file_name, file_data, acl, server_side_encryption)
+      def self.upload_file(s3_client, bucket_name, app_directory, file_name, file_data, acl, server_side_encryption, download_endpoint, download_endpoint_replacement_regex)
 
         if app_directory
           file_name = "#{app_directory}/#{file_name}"
@@ -525,7 +587,14 @@ module Fastlane
         end
 
         # Return public url
-        obj.public_url.to_s
+        url = obj.public_url.to_s
+
+        # if a download endpoint is provided, then swap it in before returning
+        if download_endpoint
+          url = url.gsub(Regexp.new(download_endpoint_replacement_regex), download_endpoint)
+        end
+
+        return url
       end
 
       #
@@ -551,6 +620,12 @@ module Fastlane
         return path
       end
 
+      def self.expand_path_with_substitutions_with_versions(version_code, version_name, path)
+        path.gsub!(/\{version_code\}/, version_code.to_s) if version_code
+        path.gsub!(/\{version_name\}/, version_name) if version_name
+        return path
+      end
+
       def self.description
         "Generates a plist file and uploads all to AWS S3"
       end
@@ -616,10 +691,28 @@ module Fastlane
                                        is_string: false),
           FastlaneCore::ConfigItem.new(key: :html_in_folder,
                                        env_name: "",
-                                       description: "move the uploaded html file into the version folder",
+                                       description: "upload the html file into the version folder",
+                                       optional: true,
+                                       default_value: false,
+                                       is_string: false),
+          FastlaneCore::ConfigItem.new(key: :html_in_root,
+                                       env_name: "",
+                                       description: "upload the html file into the 'root' folder",
+                                       optional: true,
+                                       default_value: true,
+                                       is_string: false),
+          FastlaneCore::ConfigItem.new(key: :version_in_folder,
+                                       env_name: "",
+                                       description: "upload the version file into the version folder",
                                        optional: true,
                                        default_value: false,
                                        is_string: false),
+          FastlaneCore::ConfigItem.new(key: :version_in_root,
+                                       env_name: "",
+                                       description: "upload the html file into the 'root' folder",
+                                       optional: true,
+                                       default_value: true,
+                                       is_string: false),
           FastlaneCore::ConfigItem.new(key: :version_template_path,
                                        env_name: "",
                                        description: "version erb template path",
@@ -685,6 +778,16 @@ module Fastlane
                                        description: "The base endpoint for your S3 bucket",
                                        optional: true,
                                        default_value: nil),
+          FastlaneCore::ConfigItem.new(key: :download_endpoint,
+                                       env_name: "S3_DOWNLOAD_ENDPOINT",
+                                       description: "The endpoint for downloads from your S3 bucket",
+                                       optional: true,
+                                       default_value: nil),
+          FastlaneCore::ConfigItem.new(key: :download_endpoint_replacement_regex,
+                                       env_name: "S3_DOWNLOAD_ENDPOINT_REPLACEMENT_REGEX",
+                                       description: "A regex used to determine which part of the S3 URL to replace with S3_DOWNLOAD_ENDPOINT",
+                                       optional: true,
+                                       default_value: '^https?://[^/]*'),
           FastlaneCore::ConfigItem.new(key: :override_file_name,
                                        env_name: "",
                                        description: "Optional override ipa/apk uploaded file name",

data/lib/fastlane/plugin/aws_s3/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module AwsS3
-    VERSION = "1.6.0"
+    VERSION = "2.0.1"
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-aws_s3
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Josh Holtz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: apktools
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -100,15 +100,15 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.93.1
+        version: 2.144.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.93.1
-description: 
+        version: 2.144.0
+description:
 email: josh@rokkincat.com
 executables: []
 extensions: []
@@ -125,11 +125,11 @@ files:
 - lib/fastlane/plugin/aws_s3/actions/aws_s3_action.rb
 - lib/fastlane/plugin/aws_s3/helper/aws_s3_helper.rb
 - lib/fastlane/plugin/aws_s3/version.rb
-homepage: https://github.com/joshdholtz/fastlane-plugin-s3
+homepage: https://github.com/fastlane-community/fastlane-plugin-s3
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,9 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Upload IPA and APK to S3
 test_files: []