dpl 1.7.13.travis.837.4 → 1.7.13.travis.839.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzFhNWU1ZTVjMWFmZDhlZjIyOTMyMGEwNTRiOTA3ZjI4NGM2ODhjMA==
+    YmZiNDI3Yzk4YTgwOGNiNDUxNjI0MDBhZDUwNmMxNzI1NjE0ZDYxNw==
   data.tar.gz: !binary |-
-    OTgwOWE3OTA5N2Q4ODNiZTE0ZjVmY2I5OGJmY2Q0Mzc0Mzg4MzFmNA==
+    OTdiZjk2MjhhYzc3YjViOTJlZDI4OTkzYjdlNWVkM2U3MzE3NTYzMA==
 SHA512:
   metadata.gz: !binary |-
-    MzU5ODFjMzExODE3NTZhNGIxMmI4Mjk1ODcxOGI3MDVjYTg2ZGMyZTIzMzky
-    MzFhZTIxOGFkYTJjYmVjOWIyZGU2MTJlZTBlM2Y5YTc0NTViYzBhNjFkZmRm
-    MGRiMGY5NGQxNGFhYzkxMWViZTlmZTQzYTlmMGJhODEyYmM0ZjQ=
+    ZTU2Nzg2NDdhZjBkOTZlODdlZTc5NjIwNmJiNWQ3NzY1Y2Q5ZmI4NmYyM2Nj
+    ZmVlMmQzYjYxZGM3NDBmZGZmY2Y0NzU4YjgzMjhiNmQ1ZDg4ODVhMDI2ZGJh
+    NjVkYTY4NmE0MmI5NTkzMDdhNGM1YzQwZTgzNGM3OWIyNzU0M2Q=
   data.tar.gz: !binary |-
-    MDQ2MDNiZDU3MDg1MDExMGFkMzQ2NWZmZmU3YTQ2ZDRlYWRkZDc0OTI4ZGNh
-    MTIwN2EwNmU0OGQwZjAzMzdlNjdiYWRmNzA1ZjA3OGYxMDc3YjdmODQxMTMz
-    ZGQxM2VlNmZkYjRkZWIxYTg0M2I5YjQ2OWRjYWIxOGJkMmJkNTE=
+    YTcxNTFmYTcwNzNiNmYzODMxYjBjNDhhMDAyNTMwYzBlNzAzYmZkNDMzMzBl
+    MzhiOTJkM2Q3NzkxZTRiZGRkNDk1NWI1MTliYjdhOTk3YjVjMmNlZjhmODll
+    MmU2OTE1NWEzMGJlMmRhOWQwNTdiNjEzZjkwZmY5ZjU0NmIwZjc=

data/README.md

@@ -212,6 +212,11 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 
 It is possible to set file-specific `Cache-Control` and `Expires` headers using `value: file[, file]` format.
 
+#### Environment variables:
+
+ * **AWS_ACCESS_KEY_ID**: AWS Access Key ID. Used if the `access-key-id` option is omitted.
+ * **AWS_SECRET_ACCESS_KEY**: AWS Secret Key. Used if the `secret-access-key` option is omitted.
+
 ##### Example:
 
     --cache_control="no-cache: index.html"
@@ -232,6 +237,12 @@ It is possible to set file-specific `Cache-Control` and `Expires` headers using
 * **app-id**: The app ID.
 * **migrate**: Migrate the database. (Default: false)
 * **wait-until-deployed**: Wait until the app is deployed and return the deployment status. (Default: false)
+
+#### Environment variables:
+
+ * **AWS_ACCESS_KEY_ID**: AWS Access Key ID. Used if the `access-key-id` option is omitted.
+ * **AWS_SECRET_ACCESS_KEY**: AWS Secret Key. Used if the `secret-access-key` option is omitted.
+
 #### Examples:
 
     dpl --provider=opsworks --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --app-id=<app-id> --migrate --wait-until-deployed
@@ -393,6 +404,11 @@ For accounts using two factor authentication, you have to use an oauth token as
  * **bucket_name**: Bucket name to upload app to.
  * **bucket_path**: Location within Bucket to upload app to.
 
+#### Environment variables:
+
+ * **AWS_ACCESS_KEY_ID**: AWS Access Key ID. Used if the `access-key-id` option is omitted.
+ * **AWS_SECRET_ACCESS_KEY**: AWS Secret Key. Used if the `secret-access-key` option is omitted.
+
 #### Examples:
 
     dpl --provider=elasticbeanstalk --access-key-id=<access-key-id> --secret-access-key="<secret-access-key>" --app="example-app-name" --env="example-app-environment" --region="us-west-2"
@@ -541,6 +557,11 @@ and your testers can start testing your app.
 * **region**: AWS Availability Zone.
 * **wait-until-deployed**: Wait until the app is deployed and return the deployment status (Optional, Default false).
 
+#### Environment variables:
+
+ * **AWS_ACCESS_KEY_ID**: AWS Access Key ID. Used if the `access-key-id` option is omitted.
+ * **AWS_SECRET_ACCESS_KEY**: AWS Secret Key. Used if the `secret-access-key` option is omitted.
+
 #### Examples:
 
     dpl --provider=codedeploy --access-key-id=<aws access key> --secret_access_key=<aws secret access key> --application=<application name> --deployment_group=<deployment group> --revision_type=<s3/github> --commit_id=<commit ID> --repository=<repo name> --region=<AWS availability zone> --wait-until-deployed=<true>

data/lib/dpl/provider/code_deploy.rb

@@ -12,12 +12,20 @@ module DPL
       def code_deploy_options
         code_deploy_options = {
           region:      options[:region] || 'us-east-1',
-          credentials: Aws::Credentials.new(option(:access_key_id), option(:secret_access_key))
+          credentials: Aws::Credentials.new(access_key_id, secret_access_key)
         }
         code_deploy_options[:endpoint] = options[:endpoint] if options[:endpoint]
         code_deploy_options
       end
 
+      def access_key_id
+        options[:access_key_id] || context.env['AWS_ACCESS_KEY_ID'] || raise(Error, "missing access_key_id")
+      end
+
+      def secret_access_key
+        options[:secret_access_key] || context.env['AWS_SECRET_ACCESS_KEY'] || raise(Error, "missing secret_access_key")
+      end
+
       def needs_key?
         false
       end

data/lib/dpl/provider/elastic_beanstalk.rb

@@ -12,8 +12,16 @@ module DPL
         false
       end
 
+      def access_key_id
+        options[:access_key_id] || context.env['AWS_ACCESS_KEY_ID'] || raise(Error, "missing access_key_id")
+      end
+
+      def secret_access_key
+        options[:secret_access_key] || context.env['AWS_SECRET_ACCESS_KEY'] || raise(Error, "missing secret_access_key")
+      end
+
       def check_auth
-        AWS.config(access_key_id: option(:access_key_id), secret_access_key: option(:secret_access_key), region: region)
+        AWS.config(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region)
       end
 
       def check_app

data/lib/dpl/provider/ops_works.rb

@@ -22,8 +22,16 @@ module DPL
 
       end
 
+      def access_key_id
+        options[:access_key_id] || context.env['AWS_ACCESS_KEY_ID'] || raise(Error, "missing access_key_id")
+      end
+
+      def secret_access_key
+        options[:secret_access_key] || context.env['AWS_SECRET_ACCESS_KEY'] || raise(Error, "missing secret_access_key")
+      end
+
       def setup_auth
-        AWS.config(access_key_id: option(:access_key_id), secret_access_key: option(:secret_access_key))
+        AWS.config(access_key_id: access_key_id, secret_access_key: secret_access_key)
       end
 
       def check_auth

data/lib/dpl/provider/s3.rb

@@ -18,6 +18,14 @@ module DPL
 
       end
 
+      def access_key_id
+        options[:access_key_id] || context.env['AWS_ACCESS_KEY_ID'] || raise(Error, "missing access_key_id")
+      end
+
+      def secret_access_key
+        options[:secret_access_key] || context.env['AWS_SECRET_ACCESS_KEY'] || raise(Error, "missing secret_access_key")
+      end
+
       def setup_auth
         AWS.config(:access_key_id => option(:access_key_id), :secret_access_key => option(:secret_access_key), :region => options[:region]||'us-east-1')
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.13.travis.837.4
+  version: 1.7.13.travis.839.4
 platform: ruby
 authors:
 - Konstantin Haase