dpl 2.0.0.beta.3 → 2.0.3.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a1f01c5ac0b8b54c0193bcbcd82563e6e721fcba
-  data.tar.gz: d6c14a5f04ad1992314280aa0bcee24d5d11e3c8
+SHA256:
+  metadata.gz: 8986144ffd8e2b01a258e50d348a92a548a7b5e8d6a4851c628dfb4daed713f4
+  data.tar.gz: ffcb50346cf2006a399567f6bb9891045656782386e4a8abc83fa53c633d0bd7
 SHA512:
-  metadata.gz: d6abcb163c1b0126c90f8687c7f3f3e804f447c89ef5b6789931726f3b9383450a121f522e13521603907506d9424b73baa35b246c018ab465c4f2a83ea47b19
-  data.tar.gz: ad90bc374e92a96db13243806da650a39ca633a4bd7571fad63e7da328cd9ce1c90924f40076dfbc2270ce7250e1ed9bf790f6a178369f3a99016d76dd1bc49a
+  metadata.gz: b80ee9f27d5214976f7196b9939564b82c81b6c0dbc8dd14190a0bcbdaf34f105489a36026f2521444b965a692701f44f827c86638a1ec5d2fb0a7bf7dde6ff7
+  data.tar.gz: c1b76a7cfa0d44c50e3ef736b759f731c29d937234237be0c8c969eda79ce56a158e3daf5f9626f2909f9ecc8c221b91ad5d2a9cb7468a7475b714ea39abf5f5

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## dpl v2.0.3-beta.1 (2022-03-15)
+
+* Deprecate support for Ruby 2.2
+
+## dpl v2.0.2-beta.1 (2020-09-15)
+
+* Add AWS ECR support
+
 ## dpl v2.0.1-beta.3 (unreleased)
 
 * Change git_push to use the GitHub token's user name and email as the

data/Gemfile

@@ -2,7 +2,7 @@ $: << 'lib'
 require 'dpl/support/gems'
 
 source 'https://rubygems.org'
-ruby '>= 2.2'
+ruby '>= 2.3'
 
 gemspec name: 'dpl'
 # gem 'cl', path: '../../cl'

data/Gemfile.lock

@@ -1,46 +1,49 @@
 PATH
   remote: .
   specs:
-    dpl (2.0.0.beta.2)
+    dpl (2.0.3.beta.1)
       cl (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    awesome_print (1.8.0)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.273.0)
-    aws-sdk-cloudformation (1.30.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    awesome_print (1.9.2)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.577.0)
+    aws-sdk-cloudformation (1.68.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.27.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-codedeploy (1.49.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.90.1)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+    aws-sdk-core (3.130.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-elasticbeanstalk (1.26.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-ecr (1.56.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.29.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-elasticbeanstalk (1.51.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.35.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-kms (1.55.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-opsworks (1.21.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-lambda (1.83.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.60.2)
-      aws-sdk-core (~> 3, >= 3.83.0)
-      aws-sdk-kms (~> 1)
+    aws-sdk-opsworks (1.41.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sdk-s3 (1.113.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
+      aws-eventstream (~> 1, >= 1.0.2)
     belafonte (0.5.0)
       optionally
       wrapomatic (~> 0.3)
@@ -88,8 +91,9 @@ GEM
     cistern (0.12.3)
     cl (1.2.4)
       regstry (~> 1.0.3)
-    coderay (1.1.2)
+    coderay (1.1.3)
     colorize (0.8.1)
+    concurrent-ruby (1.1.10)
     cookiejar (0.3.3)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
@@ -97,13 +101,14 @@ GEM
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    docile (1.3.2)
+    crack (0.4.5)
+      rexml
+    deep_merge (1.2.2)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    em-http-request (1.1.5)
+    em-http-request (1.1.7)
       addressable (>= 2.3.4)
       cookiejar (!= 0.3.1)
       em-socksify (>= 0.3)
@@ -114,7 +119,7 @@ GEM
     erubis (2.7.0)
     escape (0.0.4)
     eventmachine (1.2.7)
-    excon (0.72.0)
+    excon (0.92.2)
     ey-core (3.5.0)
       addressable
       awesome_print
@@ -135,27 +140,27 @@ GEM
       rack
       sshkey (~> 1.6)
       table_print
-    ey-hmac (2.2.0)
+    ey-hmac (2.4.0)
     facter (2.5.7)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    fast_gettext (1.1.2)
-    faye (1.2.4)
+    fast_gettext (1.8.0)
+    faye (1.4.0)
       cookiejar (>= 0.3.0)
-      em-http-request (>= 0.3.0)
+      em-http-request (>= 1.1.6)
       eventmachine (>= 0.12.0)
-      faye-websocket (>= 0.9.1)
+      faye-websocket (>= 0.11.0)
       multi_json (>= 1.0.0)
       rack (>= 1.0.0)
       websocket-driver (>= 0.5.1)
-    faye-websocket (0.10.9)
+    faye-websocket (0.11.1)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    ffi (1.12.2)
-    ffi-yajl (2.3.3)
-      libyajl2 (~> 1.2)
+    ffi (1.15.5)
+    ffi-yajl (2.4.0)
+      libyajl2 (>= 1.2)
     fog-core (2.1.0)
       builder
       excon (~> 0.58)
@@ -169,35 +174,38 @@ GEM
       fog-json (>= 1.0)
       fog-xml (>= 0.1)
       ipaddress (>= 0.8)
-    fog-xml (0.1.3)
+    fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.2.5)
+    formatador (0.3.0)
     fuzzyurl (0.9.0)
     gems (1.1.1)
       json
-    gleis (0.6.2)
-      rest-client (~> 2.0.0)
+    gleis (0.8.0)
+      rest-client (~> 2.1.0)
       thor (~> 0.20.0)
-    hashdiff (1.0.0)
+    hashdiff (1.0.1)
     hashie (3.6.0)
-    hiera (3.6.0)
+    hiera (3.8.0)
     highline (1.7.10)
-    http-cookie (1.0.3)
+    hocon (1.3.1)
+    http-accept (1.7.0)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
-    http_parser.rb (0.6.0)
-    iniparse (1.4.4)
+    http_parser.rb (0.8.0)
+    httpclient (2.8.3)
+    iniparse (1.5.0)
     ipaddress (0.8.3)
-    jmespath (1.4.0)
+    jmespath (1.6.1)
     json (1.8.6)
     json_pure (1.8.6)
-    libyajl2 (1.2.0)
+    libyajl2 (2.1.0)
     locale (2.1.3)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mime (0.4.4)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2022.0105)
     mini_portile2 (2.4.0)
     mixlib-archive (0.4.20)
       mixlib-log
@@ -207,10 +215,10 @@ GEM
       tomlrb
     mixlib-log (1.7.1)
     mixlib-shellout (2.4.4)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multipart-post (2.0.0)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
@@ -238,7 +246,7 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    oj (3.10.2)
+    oj (3.13.11)
     oj_mimic_json (1.0.1)
     optionally (0.0.3)
     packagecloud-ruby (1.0.8)
@@ -247,54 +255,62 @@ GEM
       mime (~> 0.4)
       multi_json (~> 1.0)
     pathspec (0.2.1)
-    plist (3.5.0)
+    plist (3.6.0)
     proxifier (1.0.3)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     public_suffix (3.0.3)
-    puppet (5.5.18)
-      facter (> 2.0.1, < 4)
-      fast_gettext (~> 1.1.2)
+    puppet (6.26.0)
+      concurrent-ruby (~> 1.0)
+      deep_merge (~> 1.0)
+      facter (> 2.0.1, < 5)
+      fast_gettext (~> 1.1)
       hiera (>= 3.2.1, < 4)
+      httpclient (~> 2.8)
       locale (~> 2.1)
       multi_json (~> 1.10)
-    puppet-blacksmith (3.3.1)
-      puppet (>= 2.7.16)
-      rest-client
-    rack (2.2.2)
+      puppet-resource_api (~> 1.5)
+      semantic_puppet (~> 1.0)
+    puppet-blacksmith (4.1.2)
+      rest-client (~> 2.0)
+    puppet-resource_api (1.8.14)
+      hocon (>= 1.0)
+    rack (2.2.3)
     rake (12.3.3)
     regstry (1.0.15)
     rendezvous (0.1.3)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.8.1)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubyzip (1.2.4)
-    safe_yaml (1.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    serverspec (2.41.5)
+    semantic_puppet (1.0.4)
+    serverspec (2.42.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
@@ -305,32 +321,34 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    specinfra (2.82.9)
+    specinfra (2.83.2)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
       sfl
     sshkey (1.9.0)
+    sync (0.5.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    table_print (1.5.6)
+    table_print (1.5.7)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.20.3)
-    tins (1.21.1)
-    tomlrb (1.2.9)
+    tins (1.31.0)
+      sync
+    tomlrb (2.0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
+    unf_ext (0.0.8.1)
     uuidtools (2.1.5)
-    webmock (3.8.2)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    wmi-lite (1.0.5)
+    websocket-extensions (0.1.5)
+    wmi-lite (1.0.7)
     wrapomatic (0.3.0)
 
 PLATFORMS
@@ -339,6 +357,7 @@ PLATFORMS
 DEPENDENCIES
   aws-sdk-cloudformation (~> 1.0)
   aws-sdk-codedeploy (~> 1.0)
+  aws-sdk-ecr (~> 1.0)
   aws-sdk-elasticbeanstalk (~> 1.0)
   aws-sdk-lambda (~> 1.0)
   aws-sdk-opsworks (~> 1.0)
@@ -351,7 +370,7 @@ DEPENDENCIES
   fog-core (= 2.1.0)
   fog-rackspace (~> 0.1.6)
   gems (~> 1.1.1)
-  gleis (~> 0.6.0)
+  gleis (~> 0.8.0)
   json
   mime-types (~> 3.2.2)
   multipart-post (~> 2.0.0)
@@ -361,8 +380,8 @@ DEPENDENCIES
   packagecloud-ruby (~> 1.0.8)
   pathspec (~> 0.2.1)
   public_suffix (~> 3.0.3)
-  puppet (~> 5.5.14)
-  puppet-blacksmith (~> 3.3.1)
+  puppet (~> 6.26.0)
+  puppet-blacksmith (~> 4.1.2)
   rack
   rake (~> 12.3)
   rendezvous (~> 0.1.3)
@@ -371,7 +390,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 2.4.1p111
+   ruby 2.5.8p224
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -29,7 +29,7 @@ please do not hesitate to get in touch, and we'll help you [add it](#contributin
 
 ## Requirements
 
-Dpl requires Ruby 2.2 or later.
+Dpl requires Ruby 2.3 or later.
 
 Depending on the deployment target dpl might require additional runtimes (e.g.
 Go, Node.js, or Python) to be installed. It also might require sudo access in
@@ -98,6 +98,7 @@ Dpl supports the following providers:
   * [Anynines](#anynines)
   * [AWS CloudFormation](#aws-cloudformation)
   * [AWS Code Deploy](#aws-code-deploy)
+  * [AWS ECR](#aws-ecr)
   * [AWS Elastic Beanstalk](#aws-elastic-beanstalk)
   * [AWS Lambda](#aws-lambda)
   * [AWS OpsWorks](#aws-opsworks)
@@ -116,9 +117,9 @@ Dpl supports the following providers:
   * [Engineyard](#engineyard)
   * [Firebase](#firebase)
   * [Flynn](#flynn)
-  * [Git (push)](#git-push-)
+  * [Git (push)](#git-push)
   * [GitHub Pages](#github-pages)
-  * [GitHub Pages (API)](#github-pages-api-)
+  * [GitHub Pages (API)](#github-pages-api)
   * [GitHub Releases](#github-releases)
   * [Gleis](#gleis)
   * [Google App Engine](#google-app-engine)
@@ -299,6 +300,49 @@ The following variable are availabe for interpolation on `description`:
   `application`, `bucket`, `bundle_type`, `commit_id`, `deployment_group`, `endpoint`, `file_exists_behavior`, `git_author_email`, `git_author_name`, `git_branch`, `git_commit_author`, `git_commit_msg`, `git_sha`, `git_tag`, `key`, `region`, `repository`, `revision_type`, `build_number`
 
 
+### AWS ECR
+
+Support for deployments to AWS ECR is in **alpha**. Please see [Maturity Levels](https://github.com/travis-ci/dpl/#maturity-levels) for details.
+
+```
+Usage: dpl ecr [options]
+
+Summary:
+
+  AWS ECR deployment provider
+
+Description:
+
+  tbd
+
+Options:
+
+  --access_key_id ID           AWS access key (type: string, required)
+  --secret_access_key KEY      AWS secret access key (type: string, required)
+  --account_id ID              AWS Account ID (type: string, note: Required if the repository is owned by a
+                               different account than the IAM user)
+  --source SOURCE              Image to push (type: string, required, note: can be the id or the name and
+                               optional tag (e.g. mysql:5.6))
+  --target TARGET              Comma separated list of partial repository names to push to (type: string,
+                               required)
+  --region REGION              Comma separated list of regions to push to (type: string, default: us-east-1)
+
+Common Options:
+
+  --cleanup                    Clean up build artifacts from the Git working directory before the deployment
+  --run CMD                    Commands to execute after the deployment finished successfully (type: array
+                               (string, can be given multiple times))
+  --help                       Get help on this command
+
+Examples:
+
+  dpl ecr --access_key_id id --secret_access_key key --source source --target target
+  dpl ecr --access_key_id id --secret_access_key key --source source --target target --account_id id
+```
+
+Options can be given via env vars if prefixed with `AWS_`. E.g. the option `--access_key_id` can be
+given as `AWS_ACCESS_KEY_ID=<access_key_id>`.
+
 ### AWS Elastic Beanstalk
 
 
@@ -396,9 +440,10 @@ Options:
   --environment VARS            List of Environment Variables to add to the function (type: array (string, can
                                 be given multiple times), alias: environment_variables, format: /[\w\-]+=.+/,
                                 note: Can be encrypted for added security)
-  --runtime NAME                Lambda runtime to use (type: string, default: nodejs8.10, known values: java8,
-                                nodejs8.10, nodejs10.x, python2.7, python3.6, python3.7, dotnetcore2.1, go1.x,
-                                ruby2.5, note: required when creating a new function)
+  --runtime NAME                Lambda runtime to use (type: string, default: nodejs10.x, known values:
+                                nodejs12.x, nodejs10.x, python3.8, python3.7, python3.6, python2.7, ruby2.7,
+                                ruby2.5, java11, java8, go1.x, dotnetcore2.1, note: required when creating a new
+                                function)
   --dead_letter_arn ARN         ARN to an SNS or SQS resource used for the dead letter queue. (type: string)
   --kms_key_arn ARN             KMS key ARN to use to encrypt environment_variables. (type: string)
   --tracing_mode MODE           Tracing mode (type: string, default: PassThrough, known values: Active,
@@ -847,23 +892,24 @@ Description:
 
 Options:
 
-  --username USER                 Cloud Foundry username (type: string, required)
-  --password PASS                 Cloud Foundry password (type: string, required)
-  --organization ORG              Cloud Foundry organization (type: string, required)
-  --space SPACE                   Cloud Foundry space (type: string, required)
-  --api URL                       Cloud Foundry api URL (type: string, default: https://api.run.pivotal.io)
-  --app_name APP                  Application name (type: string)
-  --buildpack PACK                Buildpack name or Git URL (type: string)
-  --manifest FILE                 Path to the manifest (type: string)
-  --[no-]skip_ssl_validation      Skip SSL validation
-  --[no-]v3                       Use the v3 API version to push the application
+  --username USER                     Cloud Foundry username (type: string, required)
+  --password PASS                     Cloud Foundry password (type: string, required)
+  --organization ORG                  Cloud Foundry organization (type: string, required)
+  --space SPACE                       Cloud Foundry space (type: string, required)
+  --api URL                           Cloud Foundry api URL (type: string, default: https://api.run.pivotal.io)
+  --app_name APP                      Application name (type: string)
+  --buildpack PACK                    Buildpack name or Git URL (type: string)
+  --manifest FILE                     Path to the manifest (type: string)
+  --[no-]skip_ssl_validation          Skip SSL validation
+  --deployment_strategy STRATEGY      Deployment strategy, either rolling or null (type: string)
+  --[no-]v3                           Use the v3 API version to push the application
 
 Common Options:
 
-  --cleanup                       Clean up build artifacts from the Git working directory before the deployment
-  --run CMD                       Commands to execute after the deployment finished successfully (type: array
-                                  (string, can be given multiple times))
-  --help                          Get help on this command
+  --cleanup                           Clean up build artifacts from the Git working directory before the deployment
+  --run CMD                           Commands to execute after the deployment finished successfully (type: array
+                                      (string, can be given multiple times))
+  --help                              Get help on this command
 
 Examples:
 
@@ -2695,4 +2741,4 @@ This tool would not exist without your help.
 
 A huge thank you goes out to all of our current and past [contributors](https://github.com/travis-ci/dpl/graphs/contributors):
 
-5c077yP, A.J. May, A92hm, Aakriti Gupta, Aaron Hill, Aaron1011, Abdón Rodríguez Davila, Adam King, Adam Mcgrath, adinata, Adrian Moreno, Ahmad Nassri, Ahmed Refaey, Ainun Nazieb, Albertin Loic, Alex Jurkiewicz, Alexander Springer, Alexey Kotlyarov, Ali Hajimirza, Amos Wenger, Anders Olsen Sandvik, Andrey Lushchick, Andy Vanbutsele, Angelo Livanos, Anne-Julia Seitz, Antoine Savignac, Anton Babenko, Anton Ilin, Arnold Daniels, Ashen Gunaratne, awesomescot, Axel Fontaine, Baptiste Courtois, Ben Hale, Benjamin Guttmann, Bob, Bob Zoller, Brad Gignac, Brandon Burton, Brandon LeBlanc, Brian Hou, Cameron White, capotej, Carla, carlad, Chad Engler, Chathan Driehuys, Chris Patterson, Christian Elsen, Christian Rackerseder, Clay Reimann, cleem, Cryptophobia, Damien Mathieu, Dan Buch, Dan Powell, Daniel X Moore, David F. Severski, Denis Cornehl, Dennis Koot, dependabot[bot], Devin J. Pohly, Dominic Jodoin, Dwayne Forde, emdantrim, Eric Peterson, Erik Dalén, Esteban Santiesteban, Étienne Michon, eyalbe4, Fabio Napoleoni, Felix Rieseberg, fgogolli, Filip Š, Flamur Gogolli, Gabriel Saldana, George Brighton, Gil, Gil Megidish, Gil Tselenchuk, Hao Luo, Hauke Stange, Henrik Hodne, Hiro Asari, IMANAKA, Kouta, Ivan Evtuhovich, Ivan Kusalic, Ivan Pozdeev, Jacob Burkhart, Jake Hewitt, Jakub Holy, James Adam, James Awesome, James Parker, Janderson, Jannis Leidel, Jeffrey Yasskin, Jeremy Frasier, JMSwag, Joe Damato, Joep van Delft, Johannes Würbach, johanneswuerbach, Johnny Dobbins, Jon Benson, Jon Rowe, Jon-Erik Schneiderhan, Jonatan Männchen, Jonathan Stites, Jonathan Sundqvist, jorgecasar, Josh Kalderimis, joshua-anderson, Jouni Kaplas, Julia S.Simon, Julio Capote, jung_b@localhost, Karim Fateem, Ke Zhu, konrad-c, Konstantin Haase, Kouta Imanaka, Kristofer Svardstal, Kyle Fazzari, Kyle VanderBeek, Loïc Mahieu, Lorenz Leutgeb, Lorne Currie, Louis Lagrange, Louis St-Amour, Luke Yeager, Maciej Skierkowski, Mahdi Nami Damirchi, Marc, María de Antón, mariadeanton, Mariana Lenetis and Zachary Gershman, Marius Gripsgard, Mark Pundsack, marscher, Marwan Rabbâa, Mathias Meyer, Mathias Rangel Wulff, Mathias San Miguel, Matt Hernandez, Matt Knox, Matt Travi, Matthew Knox, Maxime Brugidou, mayeut, Meir Gottlieb, Michael Bleigh, Michael Dunn, Michael Friis, Michel Boudreau, Mike Bryant, Nat Welch, Nicholas Bruning, Nick Mohoric, Nico Lindemann, Nigel Ramsay, Nikhil, Ole Michaelis, Olle Jonsson, Omer Katz, Patrique Legault, Paul Beaudoin, Paul Nikitochkin, Peter, Peter Georgantas, Peter Newman, Philipp Hansch, Piotr Sarnacki, Radek Lisowski, Radosław Lisowski, Rail Aliiev, Randall A. Gordon, Robert, Robert Gogolok, Rokas Brazdžionis, Romuald Bulyshko, root, ryanj, Ryn Daniels, Samir Talwar, Samuel Wright, Sandor Zeestraten, Sascha Zarhuber, SAULEAU Sven, Scot Spinner, Sebastien Estienne, Sergei Chertkov, shunyi, Simon, Solly, Sorin Sbarnea, Soulou, Stefan Kolb, Steffen Kötte, step76, Steven Berlanga, Sven Fuchs, Sviatoslav Sydorenko, testfairy, Tim Ysewyn, Troels Thomsen, Tyler Cross, Uriah Levy, Vincent Jacques, Vojtech Vondra, Vojtěch Vondra, Wael M. Nasreddine, Wen Kokke, Wim Looman, Xavier Krantz, yeonhoyoon, Zane Williamson
+5c077yP, A.J. May, A92hm, Aakriti Gupta, Aaron Hill, Aaron1011, Abdón Rodríguez Davila, Adam King, Adam Mcgrath, adinata, Adrian Moreno, Ahmad Nassri, Ahmed Refaey, Ainun Nazieb, Albertin Loic, Alex Jurkiewicz, Alexander Springer, Alexey Kotlyarov, Ali Hajimirza, Amos Wenger, Anders Olsen Sandvik, Andrew Nichols, Andrey Lushchick, Andy Vanbutsele, Angelo Livanos, Anne-Julia Seitz, Antoine Savignac, Anton Babenko, Anton Ilin, Arnold Daniels, Ashen Gunaratne, awesomescot, Axel Fontaine, Baptiste Courtois, Ben Hale, Benjamin Guttmann, Bob, Bob Zoller, Brad Gignac, Brandon Burton, Brandon LeBlanc, Brian Hou, Cameron White, capotej, Carla, carlad, Chad Engler, Chathan Driehuys, Chris Patterson, Christian Elsen, Christian Rackerseder, Clay Reimann, cleem, Cryptophobia, Damien Mathieu, Dan Buch, Dan Powell, Daniel X Moore, David F. Severski, Denis Cornehl, Dennis Koot, dependabot[bot], Devin J. Pohly, Dominic Jodoin, Dwayne Forde, emdantrim, Eric Peterson, Erik Dalén, Esteban Santiesteban, Étienne Michon, Eugene, Eugene Shubin, eyalbe4, Fabio Napoleoni, Felix Rieseberg, fgogolli, Filip Š, Flamur Gogolli, Gabriel Saldana, George Brighton, Gil, Gil Megidish, Gil Tselenchuk, Hao Luo, Hauke Stange, Henrik Hodne, Hiro Asari, IMANAKA, Kouta, Ivan Evtuhovich, Ivan Kusalic, Ivan Pozdeev, Jacob Burkhart, Jake Hewitt, Jakub Holy, James Adam, James Awesome, James Parker, Janderson, Jannis Leidel, Jeffrey Yasskin, Jeremy Frasier, JMSwag, Joe Damato, Joep van Delft, Johannes Würbach, johanneswuerbach, Johnny Dobbins, Jon Benson, Jon Rowe, Jon-Erik Schneiderhan, Jonatan Männchen, Jonathan Stites, Jonathan Sundqvist, jorgecasar, Josh Kalderimis, joshua-anderson, Jouni Kaplas, Julia S.Simon, Julio Capote, jung_b@localhost, Karim Fateem, Ke Zhu, konrad-c, Konstantin Haase, Kouta Imanaka, Kristofer Svardstal, Kyle Fazzari, Kyle VanderBeek, Loïc Mahieu, Lorenz Leutgeb, Lorne Currie, Louis Lagrange, Louis St-Amour, Luke Yeager, Maciej Skierkowski, Mahdi Nami Damirchi, Marc, María de Antón, mariadeanton, Mariana Lenetis and Zachary Gershman, Marius Gripsgard, Mark Pundsack, marscher, Marwan Rabbâa, Mathias Meyer, Mathias Rangel Wulff, Mathias San Miguel, Matt Hernandez, Matt Knox, Matt Travi, Matthew Knox, Maxime Brugidou, mayeut, Meir Gottlieb, Michael Bleigh, Michael Dunn, Michael Friis, Michel Boudreau, Mike Bryant, Nat Welch, Nicholas Bruning, Nick Mohoric, Nico Lindemann, Nigel Ramsay, Nikhil, Ole Michaelis, Olle Jonsson, Omer Katz, Patrique Legault, Paul Beaudoin, Paul Nikitochkin, Peter, Peter Georgantas, Peter Newman, Philipp Hansch, Piotr Sarnacki, Radek Lisowski, Radosław Lisowski, Rail Aliiev, Randall A. Gordon, Robert, Robert Gogolok, Rokas Brazdžionis, Romuald Bulyshko, root, ryanj, Ryn Daniels, Samir Talwar, Samuel Wright, Sandor Zeestraten, Sascha Zarhuber, SAULEAU Sven, Scot Spinner, Sebastien Estienne, Sergei Chertkov, shunyi, Simon, Solly, Sorin Sbarnea, Soulou, Stefan Kolb, Steffen Kötte, step76, Steven Berlanga, Sven Fuchs, Sviatoslav Sydorenko, testfairy, Tim Ysewyn, Troels Thomsen, Tyler Cross, Uriah Levy, Vincent Jacques, Vojtech Vondra, Vojtěch Vondra, Wael M. Nasreddine, Wen Kokke, Wim Looman, Xavier Krantz, yeonhoyoon, Zane Williamson

data/lib/dpl/assets/dpl/README.erb.md

@@ -29,7 +29,7 @@ please do not hesitate to get in touch, and we'll help you [add it](#contributin
 
 ## Requirements
 
-Dpl requires Ruby 2.2 or later.
+Dpl requires Ruby 2.3 or later.
 
 Depending on the deployment target dpl might require additional runtimes (e.g.
 Go, Node.js, or Python) to be installed. It also might require sudo access in
@@ -96,7 +96,7 @@ the following maturity levels, according to the given criteria:
 Dpl supports the following providers:
 
 <% providers.each do |key, name| -%>
-  * <%= "[#{name}](##{name.gsub(/\W+/, '-').downcase})" %>
+  * <%= "[#{name}](##{name.split(/\W+/).compact.join('-').downcase})" %>
 <% end -%>
 
 <% providers.each do |key, name|%>

data/lib/dpl/assets/dpl/git_ssh

@@ -1,2 +1,8 @@
 #!/bin/sh
-exec ssh -o StrictHostKeychecking=no -o CheckHostIP=no -o UserKnownHostsFile=/dev/null -i %s $@
+exec ssh \
+	-o CheckHostIP=no \
+	-o IdentitiesOnly=yes \
+	-o StrictHostKeychecking=no \
+	-o UserKnownHostsFile=/dev/null \
+	-i %s \
+	$@

data/lib/dpl/cli.rb

@@ -36,7 +36,7 @@ module Dpl
     # Tainting is being used for automatically obfuscating values for secure
     # options, so we want to untaint all incoming args here.
     def untaint(args)
-      args.map(&:dup).each(&:untaint)
+      args.map(&:dup).each(&:whitelist)
     end
 
     def with_cmd_opts(args, cmds)

data/lib/dpl/helper/interpolate.rb

@@ -66,7 +66,7 @@ module Dpl
     # the string to a standard length of 20 characters. N depends on the
     # length of the original string.
     def obfuscate(str, opts = {})
-      return str if opts[:secure] || !str.tainted?
+      return str if opts[:secure] || !str.blacklisted?
       keep = (str.length / (4.0 + str.length / 5).round).round
       keep = 1 if keep == 0
       str[0, keep] + '*' * (20 - keep)
@@ -90,17 +90,24 @@ module Dpl
 
       def interpolate(str)
         str = str % args if args.is_a?(Array) && args.any?
-        str.to_s.gsub(PATTERN) { normalize(lookup($1.to_sym)) }
+        @blacklist_result = false
+        str = str.to_s.gsub(PATTERN) do
+          @blacklist_result = true
+          normalize(lookup($1.to_sym))
+        end
+        @blacklist_result || (args.is_a?(Array) && args.any? { |arg| arg.is_a?(String) && arg.blacklisted? }) ? str.blacklist : str
       end
 
       def obfuscate(str)
         secrets(str).inject(str) do |str, secret|
+          secret = secret.dup if secret.frozen?
+          secret.blacklist if str.blacklisted?
           str.gsub(secret, super(secret))
         end
       end
 
       def secrets(str)
-        return [] unless str.is_a?(String) && str.tainted?
+        return [] unless str.is_a?(String) && str.blacklisted?
         opts = obj.class.opts.select(&:secret?)
         secrets = opts.map { |opt| obj.opts[opt.name] }.compact
         secrets.select { |secret| str.include?(secret) }
@@ -110,7 +117,7 @@ module Dpl
         obj.is_a?(Array) ? obj.join(' ') : obj.to_s
       end
 
-      def lookup(key)
+      def lookup(key)        
         if vars? && !var?(key)
           UNKNOWN % key
         elsif mod = modifier(key)