fastlane-plugin-aws_s3 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7df234ba9810ff1613f638f322f3b1a11655a84fd20adbd2c6c69254ddf008
-  data.tar.gz: ecd07e315bd0617bea86f701873eb24816faaf13c7e8b63402d2570a948fa8ba
+  metadata.gz: 594f0be26c1299aa2e30916f9cd14fa27f0018577ed7f1a57bc85c925c265e09
+  data.tar.gz: aac3d5fcd0522cf8c1a92b6ef31cfed1183b915eb06f3ff193b41ac1187c8f23
 SHA512:
-  metadata.gz: a1967704db6369e636f52ef318cb345d8022d140d657935c98fea7a6388d15c71f3ba67e1ae937e288922c0d1a53e774d9ec410098b576c3e94011d1d1241abe
-  data.tar.gz: 6e48fdd0b70c3e421510af90779fb55c2a2d91c397871daa0861da758629c693e6241a70dd927382c0f5dbe2f6f7c142cb12cdde87d7a01ecf66d0d5a537c9c9
+  metadata.gz: a125b9f244360d5ffecc66121765a2e764c02af654de7237260ca6ae1a5d8322decec7cfd77543135ca90d661efeb67e9e49b212d19889cb612903dba3794b9f
+  data.tar.gz: 47cd761ae03280ad801e95f30b3aeefc40d7e27593d10ec561b38a7e5f49f7b1a9f793515db2789cfdfecf2619663143300733b47f40127cbfea15fc6360a383

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:
 

data/lib/assets/s3_android_html_template.erb

@@ -83,7 +83,7 @@
     </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://fastlane.tools/assets/images/fastlane-logo-lockup.png" id="fastlaneLogo" />
   </body>

data/lib/assets/s3_ios_html_template.erb

@@ -84,7 +84,7 @@
     </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://fastlane.tools/assets/images/fastlane-logo-lockup.png" id="fastlaneLogo" />
   </body>

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

@@ -74,10 +74,6 @@ 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
@@ -85,8 +81,12 @@ module Fastlane
         require 'aws-sdk-s3'
         if s3_profile
           creds = Aws::SharedCredentials.new(profile_name: s3_profile);
-        else
+        elsif s3_access_key.to_s.length > 0 && s3_secret_access_key.to_s.length > 0
           creds = Aws::Credentials.new(s3_access_key, s3_secret_access_key)
+        else
+          UI.important("No S3 access key or S3 secret access key given, using S3 instance profile by default.")
+          UI.important("If you want to use specific creds to S3 access, you can pass using `access_key: 'key'` and `secret_access_key: 'secret key'` (or use `aws_profile: 'profile'`)")
+          creds = Aws::InstanceProfileCredentials.new()
         end
         Aws.config.update({
                             region: s3_region,

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AwsS3
-    VERSION = "1.7.0"
+    VERSION = "1.8.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-aws_s3
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Josh Holtz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3