dpl 2.0.3.beta.1 → 2.0.3.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d618f4c1fa2c6225c69987b5349d56a4fa28b8eb911bbee5aba93e0a10c2a83
-  data.tar.gz: 7483c4425320d9bb22971f67366c630dc1dd2aa27ab6aee1cdbbd0b11ad97d55
+  metadata.gz: 5af4ab95e79293f7e9f3806f5d9723cb189f320275e24744749c9aed49974f91
+  data.tar.gz: 54509278236196a41db24890e9163eaf53a5180097767fca19584ddac4358bfe
 SHA512:
-  metadata.gz: 1945bb20863999e620675325ff5681e73624540652423cd91b2194bf01077a385ba026aeb1b5436674d2d1970f078ffdb0ea862a6b5c308029729293e5a7091b
-  data.tar.gz: 898ae8f27890100e81bb55af3d409c0e72a0068e1082ca8ed99512f98b4057f82398e3e5e3713cb457a8fed14ac44e412917a80f49548d81bb6f34772a2bd9aa
+  metadata.gz: 2190b5e32e4247e3c4c7f7dc0c79299cf2ec68026dd7708a4b061ecd6171cb5869cb317f1653ed29422e8ba244cdcde9e9712a0f6c9131ace90a18f304f7758c
+  data.tar.gz: f8508083406134d318aae2ba691d4dec306705dff7bd84140af2d0c737ddfdf8a79a933d307b1971ce4192b8d69df208d805444850df93fe36e21f4b061c0825

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dpl (2.0.3.beta.1)
+    dpl (2.0.3.beta.4)
       cl (~> 1.0)
 
 GEM
@@ -11,38 +11,38 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.547.0)
-    aws-sdk-cloudformation (1.64.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-partitions (1.619.0)
+    aws-sdk-cloudformation (1.70.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.47.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-codedeploy (1.49.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.125.3)
+    aws-sdk-core (3.132.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-ecr (1.52.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-ecr (1.56.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticbeanstalk (1.49.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-elasticbeanstalk (1.51.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.53.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-kms (1.58.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.77.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-lambda (1.84.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-opsworks (1.39.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-opsworks (1.41.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.111.1)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     belafonte (0.5.0)
       optionally
@@ -119,7 +119,7 @@ GEM
     erubis (2.7.0)
     escape (0.0.4)
     eventmachine (1.2.7)
-    excon (0.90.0)
+    excon (0.92.4)
     ey-core (3.5.0)
       addressable
       awesome_print
@@ -140,7 +140,7 @@ 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)
@@ -186,17 +186,17 @@ GEM
       thor (~> 0.20.0)
     hashdiff (1.0.1)
     hashie (3.6.0)
-    hiera (3.8.0)
+    hiera (3.10.0)
     highline (1.7.10)
     hocon (1.3.1)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     http_parser.rb (0.8.0)
     httpclient (2.8.3)
     iniparse (1.5.0)
     ipaddress (0.8.3)
-    jmespath (1.5.0)
+    jmespath (1.6.1)
     json (1.8.6)
     json_pure (1.8.6)
     libyajl2 (2.1.0)
@@ -246,7 +246,7 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    oj (3.13.11)
+    oj (3.13.20)
     oj_mimic_json (1.0.1)
     optionally (0.0.3)
     packagecloud-ruby (1.0.8)
@@ -276,7 +276,7 @@ GEM
       rest-client (~> 2.0)
     puppet-resource_api (1.8.14)
       hocon (>= 1.0)
-    rack (2.2.3)
+    rack (2.2.4)
     rake (12.3.3)
     regstry (1.0.15)
     rendezvous (0.1.3)
@@ -286,22 +286,22 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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.10.0)
+      rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      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)
@@ -310,7 +310,7 @@ GEM
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     semantic_puppet (1.0.4)
-    serverspec (2.41.8)
+    serverspec (2.42.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
@@ -321,7 +321,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    specinfra (2.83.1)
+    specinfra (2.83.3)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
@@ -334,21 +334,21 @@ GEM
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.20.3)
-    tins (1.31.0)
+    tins (1.31.1)
       sync
-    tomlrb (2.0.1)
+    tomlrb (2.0.3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
     uuidtools (2.1.5)
-    webmock (3.14.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    wmi-lite (1.0.5)
+    wmi-lite (1.0.7)
     wrapomatic (0.3.0)
 
 PLATFORMS
@@ -359,7 +359,7 @@ DEPENDENCIES
   aws-sdk-codedeploy (~> 1.0)
   aws-sdk-ecr (~> 1.0)
   aws-sdk-elasticbeanstalk (~> 1.0)
-  aws-sdk-lambda (~> 1.0)
+  aws-sdk-lambda (~> 1.84.0)
   aws-sdk-opsworks (~> 1.0)
   aws-sdk-s3 (~> 1.0)
   chef (~> 12.0)
@@ -393,4 +393,4 @@ RUBY VERSION
    ruby 2.6.3p62
 
 BUNDLED WITH
-   2.1.4
+   2.2.21

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/providers/lambda.rb

@@ -13,7 +13,8 @@ module Dpl
         tbd
       str
 
-      gem 'aws-sdk-lambda', '~> 1.0'
+      gem 'aws-sdk-lambda', '~> 1.84.0'
+      gem 'nokogiri', '< 1.10'
       gem 'rubyzip', '~> 1.2.2', require: 'zip'
 
       env :aws, :lambda
@@ -32,7 +33,7 @@ module Dpl
       opt '--subnet_ids IDS',         'List of subnet IDs to be added to the function', type: :array, note: 'Needs the ec2:DescribeSubnets and ec2:DescribeVpcs permission for the user of the access/secret key to work'
       opt '--security_group_ids IDS', 'List of security group IDs to be added to the function', type: :array, note: 'Needs the ec2:DescribeSecurityGroups and ec2:DescribeVpcs permission for the user of the access/secret key to work'
       opt '--environment VARS',       'List of Environment Variables to add to the function', type: :array, format: /[\w\-]+=.+/, note: 'Can be encrypted for added security', alias: :environment_variables
-      opt '--runtime NAME',           'Lambda runtime to use', note: 'required when creating a new function', default: 'nodejs10.x', enum: %w(nodejs12.x nodejs10.x python3.8 python3.7 python3.6 python2.7 ruby2.7 ruby2.5 java11 java8 go1.x dotnetcore2.1)
+      opt '--runtime NAME',           'Lambda runtime to use', note: 'required when creating a new function', default: 'nodejs12.x', enum: %w(nodejs16.x nodejs14.x nodejs12.x python3.8 python3.7 python3.6 python2.7 ruby2.7 ruby2.5 java11 java8 go1.x dotnetcore2.1)
       opt '--dead_letter_arn ARN',    'ARN to an SNS or SQS resource used for the dead letter queue.'
       opt '--kms_key_arn ARN',        'KMS key ARN to use to encrypt environment_variables.'
       opt '--tracing_mode MODE',      'Tracing mode', default: 'PassThrough', enum: %w(Active PassThrough), note: 'Needs xray:PutTraceSegments xray:PutTelemetryRecords on the role'
@@ -76,9 +77,15 @@ module Dpl
         end
 
         def update
-          arn = update_config
-          update_tags(arn) if function_tags?
-          update_code
+          begin
+            arn = update_config
+            client.wait_until(:function_updated, { function_name: function_name })
+            update_tags(arn) if function_tags?
+            client.wait_until(:function_updated, { function_name: function_name })
+            update_code
+          rescue Aws::Waiters::Errors::WaiterFailed
+            error 'Update timed out.'
+          end
         end
 
         def update_config

data/lib/dpl/providers/pages/git.rb

@@ -58,7 +58,7 @@ module Dpl
         cmds git_clone:           'git clone --quiet --branch="%{target_branch}" --depth=1 "%{remote_url}" . > /dev/null 2>&1',
              git_init:            'git init .',
              git_checkout:        'git checkout --orphan "%{target_branch}"',
-             check_deploy_key:    'ssh -i %{key} -T git@github.com 2>&1 | grep successful > /dev/null',
+             check_deploy_key:    'ssh -i %{key} -T git@%{url} 2>&1 | grep successful > /dev/null',
              copy_files:          'rsync -rl --exclude .git --delete "%{src_dir}/" .',
              git_config_email:    'git config user.email %{quoted_email}',
              git_config_name:     'git config user.name %{quoted_name}',
@@ -119,7 +119,7 @@ module Dpl
           mv deploy_key, path
           chmod 0600, path
           setup_git_ssh path
-          shell :check_deploy_key, key: path
+          shell :check_deploy_key, key: path, url: opts[:url]
         end
 
         def git_clone?

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module Dpl
-  VERSION = '2.0.3.beta.1'
+  VERSION = '2.0.3.beta.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 2.0.3.beta.1
+  version: 2.0.3.beta.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cl