dapp 0.11.0 → 0.12.0

data/lib/dapp/deployment/secret.rb

@@ -0,0 +1,93 @@
+module Dapp
+  module Deployment
+    class Secret
+      attr_reader :key
+
+      def initialize(key)
+        self.class._validate_key!(key)
+        @key = key
+      end
+
+      def generate(value)
+        cipher = self.class._openssl_cipher
+        cipher.encrypt
+        cipher.key = self.class._hex_to_binary key
+        iv = cipher.random_iv
+
+        iv_size_prefix = [iv.bytesize].pack('S')
+        encrypted = cipher.update(value.to_s) + cipher.final
+
+        self.class._binary_to_hex "#{iv_size_prefix}#{iv}#{encrypted}"
+      end
+
+      def extract(hexdata)
+        data = self.class._hex_to_binary hexdata.to_s
+
+        iv_size = data.unpack('S').first
+        data = data.byteslice(2..-1)
+        raise ExtractionError, code: :bad_data, data: {data: hexdata} unless data
+
+        iv = data.byteslice(0, iv_size)
+        data = data.byteslice(iv_size..-1)
+        raise ExtractionError, code: :bad_data, data: {data: hexdata} unless data
+
+        decipher = self.class._openssl_cipher
+        decipher.decrypt
+        decipher.key = self.class._hex_to_binary(key)
+
+        begin
+          decipher.iv = iv
+        rescue OpenSSL::Cipher::CipherError
+          raise ExtractionError, code: :bad_data, data: {data: hexdata}
+        end
+
+        begin
+          value = decipher.update(data) + decipher.final
+        rescue OpenSSL::Cipher::CipherError
+          raise ExtractionError, code: :bad_data, data: {data: hexdata}
+        end
+        value.force_encoding('utf-8')
+      end
+
+      class << self
+        def generate_key
+          _binary_to_hex _openssl_cipher.random_key
+        end
+
+        def _openssl_cipher
+          OpenSSL::Cipher::AES.new(128, :CBC)
+        end
+
+        def _hex_to_binary(key)
+          [key].pack('H*')
+        end
+
+        def _binary_to_hex(key)
+          key.unpack('H*').first
+        end
+
+        def _validate_key!(key)
+          # Требуется 128 битный ключ — это 16 байт.
+          # Ключ закодирован в hex кодировке для пользователя.
+          # 2 hex символа на 1 байт в hex кодировке.
+          # Поэтому требуется длина ключа в hex кодировке в 32 символа.
+          if key.bytesize < 32
+            raise InvalidKeyError, code: :key_length_too_short, data: {required_size: 32}
+          end
+        end
+      end
+
+      class Error < ::Dapp::Deployment::Error::Base
+        def initialize(**net_status)
+          super(net_status.merge(context: :secret))
+        end
+      end
+
+      class InvalidKeyError < Error
+      end
+
+      class ExtractionError < Error
+      end
+    end
+  end
+end

data/lib/dapp/dimg/artifact.rb

@@ -5,7 +5,7 @@ module Dapp
       end
 
       def stage_should_be_introspected?(name)
-        dapp.cli_options[:introspect_artifact_stage] == name
+        dapp.options[:introspect_artifact_stage] == name
       end
 
       def artifact?

data/lib/dapp/dimg/build/stage/artifact_default.rb

@@ -30,32 +30,44 @@ module Dapp
 
           # rubocop:disable Metrics/ParameterLists
           def safe_cp(from, to, owner, group, include_paths = [], exclude_paths = [])
-            credentials = ''
-            credentials += "-o #{owner} " if owner
-            credentials += "-g #{group} " if group
-            excludes = find_command_excludes(from, exclude_paths).join(' ')
-
-            copy_files = proc do |from_, path_ = ''|
-              "if [[ -d #{File.join(from_, path_)} ]] || [[ -f #{File.join(from_, path_)} ]]; then " \
-              "#{dimg.dapp.find_bin} #{File.join(from_, path_)} #{excludes} -type f -exec " \
-              "#{dimg.dapp.bash_bin} -ec '#{dimg.dapp.install_bin} -D #{credentials} \"{}\" " \
-              "\"#{File.join(to, '$(echo "{}" | ' \
-              "#{dimg.dapp.sed_bin} -e \"s/^#{from_.gsub('/', '\\/')}\\///g\")")}\"' \\; ;" \
-              'fi'
-            end
+            ''.tap do |cmd|
+              cmd << dimg.dapp.rsync_bin
+              cmd << ' --archive --links'
+              cmd << " --chown=#{owner}:#{group}" if owner or group
 
-            commands = []
-            commands << [dimg.dapp.install_bin, credentials, '-d', to].join(' ')
-            commands.concat(include_paths.empty? ? Array(copy_files.call(from)) : include_paths.map { |path| copy_files.call(from, path) })
-            commands << "#{dimg.dapp.find_bin} #{to} -type d -exec " \
-                        "#{dimg.dapp.bash_bin} -ec '#{dimg.dapp.install_bin} -d #{credentials} {}' \\;"
-            commands.join(' && ')
-          end
-          # rubocop:enable Metrics/ParameterLists
+              if include_paths.any?
+                # Если указали include_paths — это означает, что надо копировать
+                # только указанные пути. Поэтому exclude_paths в приоритете, т.к. в данном режиме
+                # exclude_paths может относится только к путям, указанным в include_paths.
+                # При этом случай, когда в include_paths указали более специальный путь, чем в exclude_paths,
+                # будет обрабатываться в пользу exclude, этот путь не скопируется.
+                exclude_paths.each do |p|
+                  cmd << " --filter='-/ #{File.join(from, p)}'"
+                end
+
+                include_paths.each do |p|
+                  # * На данный момент не знаем директорию или файл имел в виду пользователь,
+                  #   поэтому подставляем фильтры для обоих возможных случаев.
+                  # * Автоматом подставляем паттерн ** для включения файлов, содержащихся в
+                  #   директории, которую пользователь указал в include_paths.
+                  cmd << " --filter='+/ #{File.join(from, p)}'"
+                  cmd << " --filter='+/ #{File.join(from, p, '**')}'"
+                end
 
-          def find_command_excludes(from, exclude_paths)
-            exclude_paths.map { |path| "-not \\( -path #{File.join(from, path)} -prune \\)" }
+                # Все что не подошло по include — исключается
+                cmd << " --filter='-/ #{File.join(from, '**')}'"
+              else
+                exclude_paths.each do |p|
+                  cmd << " --filter='-/ #{File.join(from, p)}'"
+                end
+              end
+
+              # Слэш после from — это инструкция rsync'у для копирования
+              # содержимого директории from, а не самой директории.
+              cmd << " #{from}/ #{to}"
+            end
           end
+          # rubocop:enable Metrics/ParameterLists
         end # ArtifactDefault
       end # Stage
     end # Build

data/lib/dapp/dimg/build/stage/base.rb

@@ -168,7 +168,7 @@ module Dapp
           end
 
           def default_git_artifacts_dependencies(git_artifacts)
-            git_artifacts.map { |git_artifact| git_artifact.stage_dependencies_checksums(self) }
+            git_artifacts.map { |git_artifact| git_artifact.stage_dependencies_checksum(self) }
           end
 
           def dependencies

data/lib/dapp/dimg/build/stage/before_setup.rb

@@ -3,8 +3,6 @@ module Dapp
     module Build
       module Stage
         class BeforeSetup < Base
-          include Mod::GitArtifactsDependencies
-
           def initialize(dimg, next_stage)
             @prev_stage = AfterInstallArtifact.new(dimg, self)
             super

data/lib/dapp/dimg/build/stage/build_artifact.rb

@@ -3,8 +3,6 @@ module Dapp
     module Build
       module Stage
         class BuildArtifact < Base
-          include Mod::GitArtifactsDependencies
-
           def initialize(dimg)
             @prev_stage = GAArtifactPatch.new(dimg, self)
             @dimg = dimg

data/lib/dapp/dimg/build/stage/ga_latest_patch.rb

@@ -15,12 +15,12 @@ module Dapp
           def dependencies
             [].tap do |dependencies|
               dependencies << commit_list
-              dependencies << dimg.local_git_artifacts.map { |git_artifact| git_artifact.dev_patch_hash(self) } if dimg.dapp.dev_mode?
+              dependencies << dimg.local_git_artifacts.map { |git_artifact| git_artifact.dev_patch_hash(self) } if dimg.dev_mode?
             end
           end
 
           def prepare_local_git_artifacts_command
-            return super unless dimg.dapp.dev_mode?
+            return super unless dimg.dev_mode?
             dimg.local_git_artifacts.each { |git_artifact| image.add_command git_artifact.apply_dev_patch_command(self) }
           end
 

data/lib/dapp/dimg/build/stage/install/install.rb

@@ -5,7 +5,6 @@ module Dapp
         module Install
           class Install < Base
             include Mod::Group
-            include Mod::GitArtifactsDependencies
 
             def initialize(dimg, next_stage)
               @prev_stage = GAPreInstallPatch.new(dimg, self)

data/lib/dapp/dimg/build/stage/setup/setup.rb

@@ -5,7 +5,6 @@ module Dapp
         module Setup
           class Setup < Base
             include Mod::Group
-            include Mod::GitArtifactsDependencies
 
             def initialize(dimg, next_stage)
               @prev_stage = GAPreSetupPatch.new(dimg, self)

data/lib/dapp/dimg/cli/cli.rb

@@ -1 +1 @@
-::Dapp::CLI.send(:include, ::Dapp::Dimg::CLI)
+::Dapp::CLI.send(:include, ::Dapp::Dimg::CLI::Command)

data/lib/dapp/dimg/cli/command/base.rb

@@ -0,0 +1,14 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Base < ::Dapp::CLI::Command::Base
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+        ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments)).public_send(run_method)
+      end
+
+      def run_method
+        class_to_lowercase
+      end
+    end
+  end
+end

data/lib/dapp/dimg/cli/{dimg.rb → command/dimg.rb}

@@ -1,10 +1,9 @@
-module Dapp
-  module Dimg
-    module CLI
-      class Dimg < ::Dapp::CLI
-        SUBCOMMANDS = ['build', 'push', 'spush', 'list', 'run', 'stages', 'cleanup', 'bp', 'mrproper', 'stage image', 'tag', 'build-context'].freeze
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      SUBCOMMANDS = ['build', 'push', 'spush', 'list', 'run', 'stages', 'cleanup', 'bp', 'mrproper', 'stage image', 'tag', 'build-context'].freeze
 
-        banner <<BANNER.freeze
+      banner <<BANNER.freeze
 Usage: dapp dimg [options] sub-command [sub-command options]
 
 Available subcommands: (for details, dapp dimg SUB-COMMAND --help)
@@ -24,7 +23,6 @@ dapp dimg build-context
 
 Options:
 BANNER
-      end
     end
   end
 end

data/lib/dapp/dimg/cli/{bp.rb → command/dimg/bp.rb}

@@ -1,6 +1,6 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Bp < Push
         banner <<BANNER.freeze
 Usage:

data/lib/dapp/dimg/cli/{build.rb → command/dimg/build.rb}

@@ -1,6 +1,6 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Build < Base
         banner <<BANNER.freeze
 Usage:

data/lib/dapp/dimg/cli/{build_context.rb → command/dimg/build_context.rb}

@@ -1,6 +1,6 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class BuildContext < ::Dapp::CLI
         SUBCOMMANDS = %w(import export).freeze
 

data/lib/dapp/dimg/cli/{build_context → command/dimg/build_context}/export.rb

@@ -1,7 +1,7 @@
-module Dapp
-  module Dimg
-    module CLI
-      class BuildContext
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class BuildContext < ::Dapp::CLI
         class Export < Base
           banner <<BANNER.freeze
 Usage:

data/lib/dapp/dimg/cli/{build_context → command/dimg/build_context}/import.rb

@@ -1,7 +1,7 @@
-module Dapp
-  module Dimg
-    module CLI
-      class BuildContext
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class BuildContext < ::Dapp::CLI
         class Import < Export
           banner <<BANNER.freeze
 Usage:

data/lib/dapp/dimg/cli/{cleanup.rb → command/dimg/cleanup.rb}

@@ -1,6 +1,6 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Cleanup < Base
         banner <<BANNER.freeze
 Usage:

data/lib/dapp/dimg/cli/{list.rb → command/dimg/list.rb}

@@ -1,6 +1,6 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class List < Base
         banner <<BANNER.freeze
 Usage:

data/lib/dapp/dimg/cli/{mrproper.rb → command/dimg/mrproper.rb}

@@ -1,11 +1,11 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Mrproper < Base
         banner <<BANNER.freeze
 Usage:
 
-  dapp dimg mrprooper [options]
+  dapp dimg mrproper [options]
 
 Options:
 BANNER

data/lib/dapp/dimg/cli/{push.rb → command/dimg/push.rb}

@@ -1,6 +1,6 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Push < Base
         banner <<BANNER.freeze
 Usage:
@@ -52,8 +52,8 @@ BANNER
 
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
-          repo = self.class.required_argument(self)
-          ::Dapp::Dapp.new(cli_options: config, dimgs_patterns: cli_arguments).public_send(class_to_lowercase, repo)
+          repo = self.class.required_argument(self, 'repo')
+          ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments, repo: repo)).public_send(class_to_lowercase)
         end
       end
     end

data/lib/dapp/dimg/cli/{run.rb → command/dimg/run.rb}

@@ -1,6 +1,6 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Run < Base
         banner <<BANNER.freeze
 Usage:
@@ -19,7 +19,7 @@ BANNER
                default: nil,
                proc: ->(v) { composite_options(:ssh_key) << v }
 
-        def read_cli_options(args)
+        def read_options(args)
           self.class.cli_wrapper(self) do
             args.each_with_index do |arg, i|
               next if arg == '--'
@@ -31,7 +31,7 @@ BANNER
                 cli_option << args.slice!(i)
               end
               parse_options(cli_option)
-              return read_cli_options(args)
+              return read_options(args)
             end
           end
         end
@@ -46,12 +46,12 @@ BANNER
         end
 
         def run(argv = ARGV)
-          filtered_args = read_cli_options(argv)
-          pattern = filtered_args.any? && !filtered_args.first.start_with?('-') ? [filtered_args.shift] : []
+          filtered_args = read_options(argv)
+          patterns = filtered_args.any? && !filtered_args.first.start_with?('-') ? [filtered_args.shift] : []
           index = filtered_args.index('--') || filtered_args.count
           docker_options = index.nonzero? ? filtered_args.slice(0..index - 1) : []
           command = filtered_args.slice(index + 1..-1) || []
-          ::Dapp::Dapp.new(cli_options: config, dimgs_patterns: pattern).run(docker_options, command)
+          ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: patterns)).run(docker_options, command)
         end
       end
     end

data/lib/dapp/dimg/cli/{spush.rb → command/dimg/spush.rb}

@@ -1,12 +1,12 @@
-module Dapp
-  module Dimg
-    module CLI
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
       class Spush < Push
         banner <<BANNER.freeze
 Usage:
 
   dapp dimg spush [options] [DIMG] REPO
-
+  
     DIMG                        Dapp image to process [default: *].
     REPO                        Pushed image name.