dpl 2.0.3.beta.4 → 2.0.3.beta.5

data/lib/dpl/providers/lambda.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dpl/helper/zip'
 
 module Dpl
@@ -9,13 +11,13 @@ module Dpl
 
       full_name 'AWS Lambda'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
-      gem 'aws-sdk-lambda', '~> 1.84.0'
-      gem 'nokogiri', '< 1.10'
-      gem 'rubyzip', '~> 1.2.2', require: 'zip'
+      gem 'aws-sdk-lambda', '~> 1.104.0'
+      gem 'nokogiri', '~> 1.15'
+      gem 'rubyzip', '~> 2.3', require: 'zip'
 
       env :aws, :lambda
       config '~/.aws/credentials', '~/.aws/config', prefix: 'aws'
@@ -32,23 +34,23 @@ module Dpl
       opt '--memory_size MB',         'Amount of memory in MB to allocate to this Lambda', default: 128
       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: '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 '--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: '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'
+      opt '--tracing_mode MODE',      'Tracing mode', default: 'PassThrough', enum: %w[Active PassThrough], note: 'Needs xray:PutTraceSegments xray:PutTelemetryRecords on the role'
       opt '--layers LAYERS',          'Function layer arns', type: :array
-      opt '--function_tags TAGS',     'List of tags to add to the function', type: :array, format: /[\w\-]+=.+/, note: 'Can be encrypted for added security'
+      opt '--function_tags TAGS',     'List of tags to add to the function', type: :array, format: /[\w-]+=.+/, note: 'Can be encrypted for added security'
       opt '--publish',                'Create a new version of the code instead of replacing the existing one.'
       opt '--zip PATH',               'Path to a packaged Lambda, a directory to package, or a single file to package', default: '.'
       opt '--dot_match',              'Include hidden .* files to the zipped archive'
 
-      msgs login:           'Using Access Key: %{access_key_id}',
+      msgs login: 'Using Access Key: %{access_key_id}',
            create_function: 'Creating function %{function_name}.',
-           update_config:   'Updating existing function %{function_name}.',
-           update_tags:     'Updating tags.',
-           update_code:     'Updating code.',
-           description:     'Deploy build %{build_number} to AWS Lambda via Travis CI'
+           update_config: 'Updating existing function %{function_name}.',
+           update_tags: 'Updating tags.',
+           update_code: 'Updating code.',
+           description: 'Deploy build %{build_number} to AWS Lambda via Travis CI'
 
       def login
         info :login
@@ -62,150 +64,148 @@ module Dpl
 
       private
 
-        def exists?
-          !!client.get_function(function_name: function_name)
-        rescue ::Aws::Lambda::Errors::ResourceNotFoundException
-          false
-        end
+      def exists?
+        !!client.get_function(function_name:)
+      rescue ::Aws::Lambda::Errors::ResourceNotFoundException
+        false
+      end
 
-        def create
-          info :create_function
-          config = function_config
-          config = config.merge(code: { zip_file: function_zip })
-          config = config.merge(tags: function_tags) if function_tags?
-          client.create_function(config)
-        end
+      def create
+        info :create_function
+        config = function_config
+        config = config.merge(code: { zip_file: function_zip })
+        config = config.merge(tags: function_tags) if function_tags?
+        client.create_function(config)
+      end
 
-        def update
-          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
+        arn = update_config
+        client.wait_until(:function_updated, { function_name: })
+        update_tags(arn) if function_tags?
+        client.wait_until(:function_updated, { function_name: })
+        update_code
+      rescue Aws::Waiters::Errors::WaiterFailed
+        error 'Update timed out.'
+      end
 
-        def update_config
-          info :update_config
-          response = client.update_function_configuration(function_config)
-          response.function_arn
-        end
+      def update_config
+        info :update_config
+        response = client.update_function_configuration(function_config)
+        response.function_arn
+      end
 
-        def update_tags(arn)
-          info :update_tags
-          client.tag_resource(tag_resource(arn))
-        end
+      def update_tags(arn)
+        info :update_tags
+        client.tag_resource(tag_resource(arn))
+      end
 
-        def update_code
-          info :update_code
-          client.update_function_code(function_code)
-        end
+      def update_code
+        info :update_code
+        client.update_function_code(function_code)
+      end
 
-        def function_config
-          compact(
-            function_name: function_name,
-            role: role,
-            handler: handler,
-            description: description,
-            timeout: timeout,
-            memory_size: memory_size,
-            vpc_config: vpc_config,
-            environment: environment,
-            runtime: runtime,
-            dead_letter_config: dead_letter_arn,
-            kms_key_arn: kms_key_arn,
-            tracing_config: tracing_config,
-            layers: layers
-          )
-        end
+      def function_config
+        compact(
+          function_name:,
+          role:,
+          handler:,
+          description:,
+          timeout:,
+          memory_size:,
+          vpc_config:,
+          environment:,
+          runtime:,
+          dead_letter_config: dead_letter_arn,
+          kms_key_arn:,
+          tracing_config:,
+          layers:
+        )
+      end
 
-        def tag_resource(arn)
-          {
-            resource: arn,
-            tags: function_tags
-          }
-        end
+      def tag_resource(arn)
+        {
+          resource: arn,
+          tags: function_tags
+        }
+      end
 
-        def function_code
-          {
-            function_name: function_name,
-            zip_file: function_zip,
-            publish: publish?
-          }
-        end
+      def function_code
+        {
+          function_name:,
+          zip_file: function_zip,
+          publish: publish?
+        }
+      end
 
-        def handler
-          Handler.new(runtime, module_name, handler_name).to_s if handler_name?
-        end
+      def handler
+        Handler.new(runtime, module_name, handler_name).to_s if handler_name?
+      end
 
-        def function_zip
-          Zip.new(zip, tmp_filename, opts).zip
-        end
+      def function_zip
+        Zip.new(zip, tmp_filename, opts).zip
+      end
 
-        def vpc_config
-          compact(subnet_ids: subnet_ids, security_group_ids: security_group_ids)
-        end
+      def vpc_config
+        compact(subnet_ids:, security_group_ids:)
+      end
 
-        def environment
-          { variables: split_vars(super) } if environment?
-        end
+      def environment
+        { variables: split_vars(super) } if environment?
+      end
 
-        def dead_letter_arn
-          { target_arn: super } if dead_letter_arn?
-        end
+      def dead_letter_arn
+        { target_arn: super } if dead_letter_arn?
+      end
 
-        def tracing_config
-          { mode: tracing_mode } if tracing_mode?
-        end
+      def tracing_config
+        { mode: tracing_mode } if tracing_mode?
+      end
 
-        def function_tags
-          split_vars(super) if function_tags?
-        end
+      def function_tags
+        split_vars(super) if function_tags?
+      end
 
-        def description
-          interpolate(super || msg(:description), vars: vars)
-        end
+      def description
+        interpolate(super || msg(:description), vars:)
+      end
 
-        def client
-          @client ||= Aws::Lambda::Client.new(region: region, credentials: credentials)
-        end
+      def client
+        @client ||= Aws::Lambda::Client.new(region:, credentials:)
+      end
 
-        def credentials
-          Aws::Credentials.new(access_key_id, secret_access_key)
-        end
+      def credentials
+        Aws::Credentials.new(access_key_id, secret_access_key)
+      end
 
-        def split_vars(vars)
-          vars.map { |var| var.split('=', 2) }.to_h
+      def split_vars(vars)
+        vars.map { |var| var.split('=', 2) }.to_h
+      end
+
+      def tmp_filename
+        @tmp_filename ||= "#{tmp_dir}/#{repo_name}.zip"
+      end
+
+      class Handler < Struct.new(:runtime, :module_name, :handler_name)
+        SEP = {
+          default: '.',
+          java: '::',
+          dotnet: '::',
+          go: ''
+        }.freeze
+
+        def to_s
+          [go? ? nil : module_name, sep, handler_name].compact.join
         end
 
-        def tmp_filename
-          @tmp_filename ||= "#{tmp_dir}/#{repo_name}.zip"
+        def sep
+          key = SEP.keys.detect { |key| runtime.start_with?(key.to_s) }
+          SEP[key || :default]
         end
 
-        class Handler < Struct.new(:runtime, :module_name, :handler_name)
-          SEP = {
-            default: '.',
-            java:    '::',
-            dotnet:  '::',
-            go:      ''
-          }
-
-          def to_s
-            [go? ? nil : module_name, sep, handler_name].compact.join
-          end
-
-          def sep
-            key = SEP.keys.detect { |key| runtime.start_with?(key.to_s) }
-            SEP[key || :default]
-          end
-
-          def go?
-            runtime.start_with?('go')
-          end
+        def go?
+          runtime.start_with?('go')
         end
+      end
     end
   end
 end

data/lib/dpl/providers/launchpad.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Launchpad < Provider
@@ -5,18 +7,18 @@ module Dpl
 
       status :alpha
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :launchpad
 
       opt '--oauth_token TOKEN', 'Launchpad OAuth token', secret: true
       opt '--oauth_token_secret SECRET', 'Launchpad OAuth token secret', secret: true
-      opt '--slug SLUG', 'Launchpad project slug', format: /^~[^\/]+\/[^\/]+\/[^\/]+$/, example: '~user-name/project-name/branch-name'
+      opt '--slug SLUG', 'Launchpad project slug', format: %r{^~[^/]+/[^/]+/[^/]+$}, example: '~user-name/project-name/branch-name'
 
       msgs invalid_credentials: 'Invalid credentials (%s)',
-           unknown_error:       'Error: %s (%s)'
+           unknown_error: 'Error: %s (%s)'
 
       def deploy
         handle_response(post)
@@ -24,34 +26,34 @@ module Dpl
 
       private
 
-        def post
-          req = Net::HTTP::Post.new(path)
-          req['Authorization'] = authorization
-          req.set_form_data(data)
-          http.request(req)
-        end
-
-        def handle_response(res)
-          error :invalid_credentials, res.code if res.code == '401'
-          error :unknown_error, res.body, res.code unless res.kind_of?(Net::HTTPSuccess)
-        end
-
-        def http
-          http = Net::HTTP.new('api.launchpad.net', 443)
-          http.use_ssl = true
-          http
-        end
-
-        def path
-          "/1.0/#{slug}/+code-import"
-        end
-
-        def data
-          { 'ws.op' => 'requestImport' }
-        end
-
-        def authorization
-          squish(<<-auth)
+      def post
+        req = Net::HTTP::Post.new(path)
+        req['Authorization'] = authorization
+        req.set_form_data(data)
+        http.request(req)
+      end
+
+      def handle_response(res)
+        error :invalid_credentials, res.code if res.code == '401'
+        error :unknown_error, res.body, res.code unless res.is_a?(Net::HTTPSuccess)
+      end
+
+      def http
+        http = Net::HTTP.new('api.launchpad.net', 443)
+        http.use_ssl = true
+        http
+      end
+
+      def path
+        "/1.0/#{slug}/+code-import"
+      end
+
+      def data
+        { 'ws.op' => 'requestImport' }
+      end
+
+      def authorization
+        squish(<<-AUTH)
             OAuth oauth_consumer_key="Travis%20Deploy",
             oauth_nonce="#{nonce}",
             oauth_signature="%26#{oauth_token_secret}",
@@ -59,20 +61,20 @@ module Dpl
             oauth_timestamp="#{now}",
             oauth_token="#{oauth_token}",
             oauth_version="1.0"
-          auth
-        end
+        AUTH
+      end
 
-        def nonce
-          rand(36 ** 32).to_s(36)
-        end
+      def nonce
+        rand(36**32).to_s(36)
+      end
 
-        def now
-          Time::now().to_i
-        end
+      def now
+        Time.now.to_i
+      end
 
-        def squish(str)
-          str.strip.gsub(/\s+/, ' ')
-        end
+      def squish(str)
+        str.strip.gsub(/\s+/, ' ')
+      end
     end
   end
 end

data/lib/dpl/providers/netlify.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Netlify < Provider
@@ -5,9 +7,9 @@ module Dpl
 
       status :stable
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       node_js '>= 12.0.0'
 
@@ -28,9 +30,9 @@ module Dpl
 
       private
 
-        def deploy_opts
-          opts_for(%i(site auth dir functions message prod))
-        end
+      def deploy_opts
+        opts_for(%i[site auth dir functions message prod])
+      end
     end
   end
 end

data/lib/dpl/providers/npm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Npm < Provider
@@ -7,9 +9,9 @@ module Dpl
 
       full_name 'npm'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       gem 'json'
 
@@ -17,27 +19,27 @@ module Dpl
 
       opt '--email EMAIL', 'npm account email'
       opt '--api_token TOKEN', 'npm api token', alias: :api_key, required: true, secret: true, note: 'can be retrieved from your local ~/.npmrc file', see: 'https://docs.npmjs.com/creating-and-viewing-authentication-tokens'
-      opt '--access ACCESS', 'Access level', enum: %w(public private)
+      opt '--access ACCESS', 'Access level', enum: %w[public private]
       opt '--registry URL', 'npm registry url'
       opt '--src SRC', 'directory or tarball to publish', default: '.'
       opt '--tag TAGS', 'distribution tags to add'
       opt '--run_script SCRIPT', 'run the given script from package.json', type: :array, note: 'skips running npm publish'
       opt '--dry_run', 'performs test run without uploading to registry'
-      opt '--auth_method METHOD', 'Authentication method', enum: %w(auth)
+      opt '--auth_method METHOD', 'Authentication method', enum: %w[auth]
 
       REGISTRY = 'https://registry.npmjs.org'
       NPMRC = '~/.npmrc'
 
-      msgs version:  'npm version: %{npm_version}',
-           login:    'Authenticated with API token %{api_token}'
+      msgs version: 'npm version: %{npm_version}',
+           login: 'Authenticated with API token %{api_token}'
 
       cmds registry: 'npm config set registry "%{registry}"',
-           publish:  'npm publish %{src} %{publish_opts}',
-           run:      'npm run %{script}'
+           publish: 'npm publish %{src} %{publish_opts}',
+           run: 'npm run %{script}'
 
       errs registry: 'Failed to set registry config',
-           publish:  'Failed to publish',
-           run:      'Failed to run script %{script}'
+           publish: 'Failed to publish',
+           run: 'Failed to run script %{script}'
 
       def login
         info :version
@@ -60,68 +62,69 @@ module Dpl
 
       private
 
-        def run_scripts
-          run_script.each do |script|
-            shell :run, script: script
-          end
+      def run_scripts
+        run_script.each do |script|
+          shell :run, script:
         end
+      end
 
-        def publish_opts
-          opts_for(%i(access tag dry_run), dashed: true)
-        end
+      def publish_opts
+        opts_for(%i[access tag dry_run], dashed: true)
+      end
 
-        def write_npmrc
-          write_file(npmrc_path, npmrc)
-          info "#{NPMRC} size: #{file_size(npmrc_path)}"
-        end
+      def write_npmrc
+        write_file(npmrc_path, npmrc)
+        info "#{NPMRC} size: #{file_size(npmrc_path)}"
+      end
 
-        def remove_npmrc
-          rm_f npmrc_path
-        end
+      def remove_npmrc
+        rm_f npmrc_path
+      end
 
-        def npmrc_path
-          expand(NPMRC)
-        end
+      def npmrc_path
+        expand(NPMRC)
+      end
 
-        def npmrc
-          if npm_version =~ /^1/ || auth_method == 'auth'
-            "_auth = #{api_token}\nemail = #{email}"
-          else
-            "//#{auth_endpoint}/:_authToken=#{api_token}"
-          end
+      def npmrc
+        if npm_version =~ /^1/ || auth_method == 'auth'
+          "_auth = #{api_token}\nemail = #{email}"
+        else
+          "//#{auth_endpoint}/:_authToken=#{api_token}"
         end
+      end
 
-        def auth_endpoint
-          str = registry
-          str = strip_path(str) if str.include?('npm.pkg.github.com')
-          str = strip_protocol(str).sub(%r(/$), '')
-          str
-        end
+      def auth_endpoint
+        str = registry
+        str = strip_path(str) if str.include?('npm.pkg.github.com')
+        str = strip_protocol(str).sub(%r{/$}, '')
+        str
+      end
 
-        def registry
-          super || registry_from_package_json || REGISTRY
-        end
+      def registry
+        super || registry_from_package_json || REGISTRY
+      end
 
-        def registry_from_package_json
-          return unless data = package_json
-          data && data.fetch('publishConfig', {})['registry']
-        end
+      def registry_from_package_json
+        return unless data = package_json
 
-        def strip_path(url)
-          url.sub(URI(url).path, '')
-        end
+        data && data.fetch('publishConfig', {})['registry']
+      end
 
-        def strip_protocol(url)
-          url.sub("#{URI(url).scheme}://", '')
-        end
+      def strip_path(url)
+        url.sub(URI(url).path, '')
+      end
 
-        def host(url)
-          URI(url).host
-        end
+      def strip_protocol(url)
+        url.sub("#{URI(url).scheme}://", '')
+      end
 
-        def package_json
-          File.exists?('package.json') ? JSON.parse(File.read('package.json')) : {}
-        end
+      def host(url)
+        URI(url).host
+      end
+
+      def package_json
+        File.exist?('package.json') ? JSON.parse(File.read('package.json')) : {}
+      end
     end
   end
 end