dapp 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9bde6d6e0a2f2f7d9d630dfd5307d87900aefba
-  data.tar.gz: 4cfa173162595e257a8e5e0f0c8fbd70dba8c576
+  metadata.gz: 75c3a3047f2f78af31a7a33c972454b929a165f2
+  data.tar.gz: 9047d134234568ac750fd1ba4726e6628a9e515d
 SHA512:
-  metadata.gz: 0a5fcb98d67e9d4111b22d4252623e661c348dfdb1bc0d7ff4404a2db8d9f1ba164782aa0953c8186edd641363f067261d251ecf8f505805daa18add74f5088e
-  data.tar.gz: 7d001567b2075340f756334d281c23d7eb4bff6331d34299e23203d79a04fb0e0730217f2c8ccf424b52862d30adf65c4f07f0046424e0046c557ae4fff0f333
+  metadata.gz: f0d3db56d2c2035b3a4c4a1e4f9f71c72874201110de648f880ad3b853d794f316438b8f8e5988b5941a9cacf0ee32ffd08ba02a98783a524b3629fa455fb947
+  data.tar.gz: 0e03117d5a43c2c1285ad2c77e3be37ce6c3a4d0d58b2a9c2da4652508694cca346b6cc1aac49e4d87442c62295baf23af19ab4fbb28da3bfa484f3f7407c0d7

data/config/en/net_status.yml

@@ -22,18 +22,23 @@ en:
       command_unexpected_dimgs_number: "Command can process only one dimg!\nAmbiguous dimg pattern: `%{dimgs_names}`!"
       mrproper_required_option: "Expected command option `--improper-dev-mode-cache`, `--improper-cache-version-stages` or `--all`!"
       stages_cleanup_required_option: "Expected command option `--improper-cache-version`, `--improper-git-commit` or `--improper-repo-cache`!"
-      tag_command_incorrect_tag: "Incorrect tag (`%{name}`) given!"
-      repo_name_incorrect: "Incorrect repo (`%{name}`) given!"
+      repo_name_incorrect: "Incorrect repo name `%{name}` given!"
+      image_name_incorrect: "Incorrect image name `%{name}` given!"
+      tag_name_incorrect: "Incorrect tag name `%{name}` given!"
       context_directory_not_found: "Context directory `%{path}` not found!"
       stored_build_dir_already_exist: "Cannot store current build_dir `%{path}`: restore or delete old build_dir!"
+      secret_key_not_found: "Secret key `DAPP_SECRET_KEY` not found!"
+      minikube_not_found: "Minikube not found: install minikube (https://github.com/kubernetes/minikube/releases)!"
+      minikube_not_started: "Minikube not started!"
     dapp:
       no_such_dimg: "No such dimg: `%{dimgs_patterns}`!"
+      no_such_app: "No such app: `%{apps_patterns}`!"
       dappfile_not_found: "Dappfile not found!"
       cannot_run_ssh_agent: "Cannot run ssh-agent"
       ssh_key_not_found: "Ssh key `%{path}` not exist!"
     config:
       dimg_name_required: 'Dimg name required!'
-      dimg_name_incorrect: "Dimg has incorrect name `%{name}`: doesn't match regex `%{reg}`!"
+      dimg_name_incorrect: "Dimg has incorrect name `%{value}`: doesn't match regex `%{pattern}`!"
       mount_from_required: "Mount: `from` directive required!"
       export_to_required: "Export: `to` directive required!"
       add_to_required: "Add: `to` directive required!"
@@ -45,7 +50,6 @@ en:
       mount_from_absolute_path_required: "Mount: given `from` path must be absolute!"
       mount_from_type_required: "Mount: `from` directive expect `build_dir` or `tmp_dir` type!"
       builder_type_conflict: 'Conflict between builder types!'
-      builder_type_unsupported: "Defined unsupported builder type `%{type}`!"
       docker_from_incorrect: "`docker.from` has incorrect value `%{name}`!"
       docker_from_without_tag: "`docker.from`: image `%{name}` without tag!"
       stage_artifact_not_associated: "Artifact not associated with any stage: expected `before` or `after` attribute!"
@@ -58,6 +62,22 @@ en:
       scratch_artifact_required: "Scratch dimg without artifacts!"
       scratch_artifact_associated: "Scratch artifact cannot be associated: not expected `before`/`after` attribute!"
       scratch_artifact_docker_from: "Scratch artifact must have directive `docker.from`!"
+      unsupported_scale_value: "Define unsupported scale value `%{value}`!"
+      app_name_required: 'App name required!'
+      app_dimg_not_found: 'Not found dimg `%{dimg}` for app `%{app}`!'
+      app_dimg_not_defined: 'Not defined dimg for app `%{app}`!'
+      app_bootstrap_dimg_not_defined: "Not defined dimg for app.bootstrap!"
+      app_bootstrap_dimg_not_found: "Not found dimg `%{dimg}` for app.bootstrap!"
+      app_before_apply_job_dimg_not_defined: "Not defined dimg for app.before_apply_job!"
+      app_before_apply_job_dimg_not_found: "Not found dimg `%{dimg}` for app.before_apply_job!"
+      unsupported_port_number: 'Port number `%{number}` doesn`t support!'
+      unsupported_target_number: 'Target number `%{number}` doesn`t support!'
+      app_name_incorrect: "App has incorrect name `%{value}`: doesn't match regex `%{pattern}`!"
+      namespace_name_incorrect: "Namespace has incorrect name `%{value}`: doesn't match regex `%{pattern}`!"
+      deployment_bootstrap_dimg_not_defined: "Not defined dimg for deployment.bootstrap!"
+      deployment_bootstrap_dimg_not_found: "Not found dimg `%{dimg}` for deployment.bootstrap!"
+      deployment_before_apply_job_dimg_not_defined: "Not defined dimg for deployment.before_apply_job!"
+      deployment_before_apply_job_dimg_not_found: "Not found dimg `%{dimg}` for deployment.before_apply_job!"
     chef:
       stage_checksum_not_calculated: "Chef stage `%{stage}` checksum is not calculated yet, run build first"
       stage_path_overlap: "Cannot install `%{cookbook}` cookbook's path %{from} into %{to}: already exists"
@@ -77,3 +97,15 @@ en:
       branch_not_exist_in_remote_git_repository: "Remote git repo `%{url}`: branch `%{branch}` not exist!"
     lock:
       timeout: "Could not obtain lock for `%{name}` within %{timeout} seconds"
+    app:
+      namespace_not_found: "App `%{name}`: namespace `%{namespace}` not found!"
+      namespace_not_defined: "App `%{name}`: namespace not defined!"
+    deployment:
+      namespace_not_found: "Deployment `%{name}`: namespace `%{namespace}` not found!"
+      namespace_not_defined: "Deployment `%{name}`: namespace not defined!"
+      bootstrap_failed: "Bootstrap failed:\n  phase: `%{phase}`\n  message: `%{message}`"
+      bootstrap_command_failed: "Bootstrap failed:\n  reason: `%{reason}`\n  message: `%{message}`\n  exit_code: `%{exit_code}`"
+      bootstrap_image_not_found: "Bootstrap failed because `%{reason}`: `%{message}`"
+    kubernetes:
+      kube_config_not_found: "Kube config `%{path}` not found!"
+      kube_server_connection_refused: "Kube server `%{url}` connection refused!"

data/lib/dapp.rb

@@ -18,8 +18,10 @@ require 'inifile'
 require 'rugged'
 require 'rubygems/package'
 require 'murmurhash3'
-
 require 'net_status'
+require 'yaml'
+require 'openssl'
+require 'etc'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -35,9 +37,9 @@ require 'dapp/error/dappfile'
 require 'dapp/error/shellout'
 require 'dapp/exception/base'
 require 'dapp/cli'
-require 'dapp/cli/base'
-require 'dapp/config/base'
+require 'dapp/cli/command/base'
 require 'dapp/config/directive/base'
+require 'dapp/config/config'
 require 'dapp/config/error/config'
 require 'dapp/dapp/lock'
 require 'dapp/dapp/ssh_agent'
@@ -53,6 +55,53 @@ require 'dapp/dapp/deps/gitartifact'
 require 'dapp/dapp/shellout/streaming'
 require 'dapp/dapp/shellout/base'
 require 'dapp/dapp'
+require 'dapp/deployment'
+require 'dapp/deployment/config/directive/mod/group'
+require 'dapp/deployment/config/directive/mod/jobs'
+require 'dapp/deployment/error/base'
+require 'dapp/deployment/error/config'
+require 'dapp/deployment/error/app'
+require 'dapp/deployment/error/command'
+require 'dapp/deployment/error/kubernetes'
+require 'dapp/deployment/error/deployment'
+require 'dapp/deployment/config/directive/base'
+require 'dapp/deployment/config/directive/expose'
+require 'dapp/deployment/config/directive/namespace/instance_methods'
+require 'dapp/deployment/config/directive/namespace'
+require 'dapp/deployment/config/directive/app/instance_methods'
+require 'dapp/deployment/config/directive/app'
+require 'dapp/deployment/config/directive/group'
+require 'dapp/deployment/config/directive/deployment'
+require 'dapp/deployment/config/directive/job'
+require 'dapp/deployment/config/config'
+require 'dapp/deployment/core_ext/hash'
+require 'dapp/deployment/mod/namespace'
+require 'dapp/deployment/mod/system_environments'
+require 'dapp/deployment/mod/jobs'
+require 'dapp/deployment/app'
+require 'dapp/deployment/deployment'
+require 'dapp/deployment/kube_base'
+require 'dapp/deployment/kube_app'
+require 'dapp/deployment/kube_deployment'
+require 'dapp/deployment/kubernetes'
+require 'dapp/deployment/kubernetes/error'
+require 'dapp/deployment/cli/command/base'
+require 'dapp/deployment/cli/command/deployment'
+require 'dapp/deployment/cli/command/deployment/apply'
+require 'dapp/deployment/cli/command/deployment/mrproper'
+require 'dapp/deployment/cli/command/deployment/secret_key_generate'
+require 'dapp/deployment/cli/command/deployment/secret_generate'
+require 'dapp/deployment/cli/command/deployment/minikube_setup'
+require 'dapp/deployment/cli/cli'
+require 'dapp/deployment/dapp/command/mrproper'
+require 'dapp/deployment/dapp/command/apply'
+require 'dapp/deployment/dapp/command/secret_key_generate'
+require 'dapp/deployment/dapp/command/secret_generate'
+require 'dapp/deployment/dapp/command/minikube_setup'
+require 'dapp/deployment/dapp/command/common'
+require 'dapp/deployment/dapp/dappfile'
+require 'dapp/deployment/dapp/dapp'
+require 'dapp/deployment/secret'
 require 'dapp/dimg'
 require 'dapp/dimg/builder'
 require 'dapp/dimg/builder/base'
@@ -64,7 +113,6 @@ require 'dapp/dimg/builder/shell'
 require 'dapp/dimg/builder/none'
 require 'dapp/dimg/build/stage/mod/logging'
 require 'dapp/dimg/build/stage/mod/group'
-require 'dapp/dimg/build/stage/mod/git_artifact_dependencies'
 require 'dapp/dimg/build/stage/base'
 require 'dapp/dimg/build/stage/ga_base'
 require 'dapp/dimg/build/stage/ga_dependencies_base'
@@ -94,39 +142,37 @@ require 'dapp/dimg/build/stage/ga_latest_patch'
 require 'dapp/dimg/build/stage/docker_instructions'
 require 'dapp/dimg/build/stage/ga_artifact_patch'
 require 'dapp/dimg/build/stage/build_artifact'
-require 'dapp/dimg/cli/base'
-require 'dapp/dimg/cli/dimg'
-require 'dapp/dimg/cli/build'
-require 'dapp/dimg/cli/push'
-require 'dapp/dimg/cli/spush'
-require 'dapp/dimg/cli/tag'
-require 'dapp/dimg/cli/list'
-require 'dapp/dimg/cli/build_context'
-require 'dapp/dimg/cli/build_context/export'
-require 'dapp/dimg/cli/build_context/import'
-require 'dapp/dimg/cli/stages'
-require 'dapp/dimg/cli/stages/flush_local'
-require 'dapp/dimg/cli/stages/flush_repo'
-require 'dapp/dimg/cli/stages/cleanup_local'
-require 'dapp/dimg/cli/stages/cleanup_repo'
-require 'dapp/dimg/cli/stages/push'
-require 'dapp/dimg/cli/stages/pull'
-require 'dapp/dimg/cli/run'
-require 'dapp/dimg/cli/cleanup'
-require 'dapp/dimg/cli/bp'
-require 'dapp/dimg/cli/mrproper'
-require 'dapp/dimg/cli/stage_image'
+require 'dapp/dimg/cli/command/base'
+require 'dapp/dimg/cli/command/dimg'
+require 'dapp/dimg/cli/command/dimg/build'
+require 'dapp/dimg/cli/command/dimg/push'
+require 'dapp/dimg/cli/command/dimg/spush'
+require 'dapp/dimg/cli/command/dimg/tag'
+require 'dapp/dimg/cli/command/dimg/list'
+require 'dapp/dimg/cli/command/dimg/build_context'
+require 'dapp/dimg/cli/command/dimg/build_context/export'
+require 'dapp/dimg/cli/command/dimg/build_context/import'
+require 'dapp/dimg/cli/command/dimg/stages'
+require 'dapp/dimg/cli/command/dimg/stages/flush_local'
+require 'dapp/dimg/cli/command/dimg/stages/flush_repo'
+require 'dapp/dimg/cli/command/dimg/stages/cleanup_local'
+require 'dapp/dimg/cli/command/dimg/stages/cleanup_repo'
+require 'dapp/dimg/cli/command/dimg/stages/push'
+require 'dapp/dimg/cli/command/dimg/stages/pull'
+require 'dapp/dimg/cli/command/dimg/run'
+require 'dapp/dimg/cli/command/dimg/cleanup'
+require 'dapp/dimg/cli/command/dimg/bp'
+require 'dapp/dimg/cli/command/dimg/mrproper'
+require 'dapp/dimg/cli/command/dimg/stage_image'
 require 'dapp/dimg/cli/cli'
-require 'dapp/dimg/config/base'
 require 'dapp/dimg/config/directive/base'
-require 'dapp/dimg/config/dimg/instance_methods'
-require 'dapp/dimg/config/dimg/validation'
-require 'dapp/dimg/config/dimg'
-require 'dapp/dimg/config/artifact_dimg'
-require 'dapp/dimg/config/dimg_group_base'
-require 'dapp/dimg/config/dimg_group_main'
-require 'dapp/dimg/config/dimg_group'
-require 'dapp/dimg/config/artifact_group'
+require 'dapp/dimg/config/directive/dimg/instance_methods'
+require 'dapp/dimg/config/directive/dimg/validation'
+require 'dapp/dimg/config/directive/dimg'
+require 'dapp/dimg/config/directive/artifact_dimg'
+require 'dapp/dimg/config/directive/dimg_group_base'
+require 'dapp/dimg/config/directive/dimg_group'
+require 'dapp/dimg/config/directive/artifact_group'
 require 'dapp/dimg/config/directive/artifact_base'
 require 'dapp/dimg/config/directive/git_artifact_local'
 require 'dapp/dimg/config/directive/git_artifact_remote'
@@ -138,6 +184,7 @@ require 'dapp/dimg/config/directive/docker/base'
 require 'dapp/dimg/config/directive/docker/dimg'
 require 'dapp/dimg/config/directive/docker/artifact'
 require 'dapp/dimg/config/directive/mount'
+require 'dapp/dimg/config/config'
 require 'dapp/dimg/dapp/command/common'
 require 'dapp/dimg/dapp/command/build'
 require 'dapp/dimg/dapp/command/bp'
@@ -159,7 +206,8 @@ require 'dapp/dimg/dapp/command/stages/pull'
 require 'dapp/dimg/dapp/command/build_context/export'
 require 'dapp/dimg/dapp/command/build_context/import'
 require 'dapp/dimg/dapp/command/build_context/common'
-require 'dapp/dimg/dapp/command'
+require 'dapp/dimg/dapp/dappfile'
+require 'dapp/dimg/dapp/dapp'
 require 'dapp/dimg/docker_registry'
 require 'dapp/dimg/docker_registry/base/request'
 require 'dapp/dimg/docker_registry/base/authorization'

data/lib/dapp/cli.rb

@@ -5,14 +5,15 @@ module Dapp
     extend Helper::Cli
     include Helper::Trivia
 
-    SUBCOMMANDS = ['dimg'].freeze
+    SUBCOMMANDS = ['dimg', 'deployment'].freeze
 
     banner <<BANNER.freeze
-Usage: dapp [options] sub-command [sub-command options]
+Usage: dapp sub-command [sub-command options]
 
 Available subcommands: (for details, dapp SUB-COMMAND --help)
 
 dapp dimg
+dapp deployment
 
 Options:
 BANNER

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

@@ -0,0 +1,69 @@
+module Dapp
+  class CLI
+    module Command
+      class Base < ::Dapp::CLI
+        option :dir,
+               long: '--dir PATH',
+               description: 'Change to directory',
+               on: :head
+
+        option :build_dir,
+               long: '--build-dir PATH',
+               description: 'Directory where build cache stored (DIR/.dapp_build by default)'
+
+        option :log_quiet,
+               short: '-q',
+               long: '--quiet',
+               description: 'Suppress logging',
+               default: false,
+               boolean: true
+
+        option :log_verbose,
+               long: '--verbose',
+               description: 'Enable verbose output',
+               default: false,
+               boolean: true
+
+        option :log_time,
+               long: '--time',
+               description: 'Enable output with time',
+               default: false,
+               boolean: true
+
+        option :ignore_config_warning,
+               long: '--ignore-config-sequential-processing-warnings',
+               default: false,
+               boolean: true
+
+        option :log_color,
+               long: '--color MODE',
+               description: 'Display output in color on the terminal',
+               in: %w(auto on off),
+               default: 'auto'
+
+        option :dry_run,
+               long: '--dry-run',
+               default: false,
+               boolean: true
+
+        option :dev,
+               long: '--dev',
+               default: false,
+               boolean: true
+
+        def initialize
+          self.class.options.merge!(Base.options)
+          super()
+        end
+
+        def run(_argv = ARGV)
+          raise
+        end
+
+        def cli_options(**kvargs)
+          config.merge(**kvargs)
+        end
+      end
+    end
+  end
+end

data/lib/dapp/config/config.rb

@@ -0,0 +1,17 @@
+module Dapp
+  module Config
+    class Config < Directive::Base
+      def dev_mode
+        @_dev_mode = true
+      end
+
+      def _dev_mode
+        !!@_dev_mode
+      end
+
+      def validate!
+        do_all!('_validate!')
+      end
+    end
+  end
+end

data/lib/dapp/config/directive/base.rb

@@ -1,20 +1,107 @@
 module Dapp
   module Config
     module Directive
-      class Base < Config::Base
+      class Base
+        def initialize(dapp:, &blk)
+          @dapp = dapp
+          initialize_variables
+          instance_eval(&blk) if block_given?
+        end
+
         def clone
           _clone
         end
 
         protected
 
+        attr_reader :dapp
+
+        def path_format(path)
+          path.to_s.chomp('/')
+        end
+
+        def validate_compliance!(pattern, value, error_code)
+          raise Error::Config, code: error_code, data: { value: value, pattern: pattern } unless /^#{pattern}$/ =~ value
+        end
+
+        def initialize_variables
+          do_all!('_init_variables!')
+        end
+
+        def do_all!(postfix)
+          methods
+            .select { |m| m.to_s.end_with? postfix }
+            .each(&method(:send))
+        end
+
+        def directive_eval(directive, &blk)
+          directive.instance_eval(&blk) if block_given?
+          directive
+        end
+
         def sub_directive_eval
           yield if block_given?
           self
         end
 
-        def path_format(path)
-          path.to_s.chomp('/')
+        def pass_to(obj, clone_method = :clone)
+          passed_directives.each do |directive|
+            next if (variable = instance_variable_get(directive)).nil?
+
+            obj.instance_variable_set(directive, begin
+              case variable
+              when Base then variable.public_send(clone_method)
+              when String, Symbol, Integer, TrueClass, FalseClass then variable
+              when Array, Hash then marshal_clone(variable)
+              else
+                raise
+              end
+            end)
+          end
+          obj
+        end
+
+        def passed_directives
+          []
+        end
+
+        def ref_variables
+          [:@dapp]
+        end
+
+        def marshal_dump
+          instance_variables
+            .reject {|variable| ref_variables.include? variable}
+            .map {|variable| [variable, instance_variable_get(variable)]}
+        end
+
+        def marshal_load(variable_values)
+          variable_values.each do |variable, value|
+            instance_variable_set(variable, value)
+          end
+
+          self
+        end
+
+        def _clone
+          marshal_clone(self).tap do |obj|
+            _set_ref_variables_to(obj)
+          end
+        end
+
+        def _clone_to(obj)
+          obj.marshal_load(marshal_dump)
+          _set_ref_variables_to(obj)
+        end
+
+        def _set_ref_variables_to(obj)
+          ref_variables.each do |ref_variable|
+            obj.instance_variable_set(ref_variable, instance_variable_get(ref_variable))
+          end
+        end
+
+        def marshal_clone(obj)
+          Marshal.load(Marshal.dump(obj))
         end
       end
     end