minfra-cli 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4224f87e9e115273ab68701933de59e1f158defa41dce87eb654e99995194e17
-  data.tar.gz: 4d3a42708f78a4f735077e384a22cc1c61dfb3bd53212ceac3cd6e8f2c3a58a2
+  metadata.gz: 4c095831fd4a669abd1381046091e615395c93e367051ee051bf48c458167d63
+  data.tar.gz: 3b7219fba8adb56249c8be8f249751613c9f9e529d7a8d9341f44c32e69271ac
 SHA512:
-  metadata.gz: aa77c060c478f6af724543a962c4ac95f20a224ef8b60d614de57ce65a4de81e6b3b31b992781008db931bd3be670566e2cff6fbfd83b3a847e74c775c24ad77
-  data.tar.gz: 176fbdbdcc45afea7143417a7cb66a3796e95a48028ee2a4cb6890e3e5b80cce3322a915afa87938ab53d4a8f64cae57df0409eace476a1161485ed318404709
+  metadata.gz: 45aacbd112f2797e1b177f477b9456cb955a20576a11442c8c4799609bbe6a226177d29c3ac1ff27a9b2270a1fd2fd2ac6fe4bd1ab5e813e823ff13bfd1e960c
+  data.tar.gz: 81bd7e7366bf87ca8c048289e74ec3bc2e5819456c6b386063e1831d8465bb2cb4cc18cd573ada93a5aefdd0c5392bba50be02348a31616ff447f60975ab65e2

data/CHANGELOG.md

@@ -1,5 +1,4 @@
-# 0.2.1 
- * fixing preload
+# 0.2.2 Secrets support in charts
 
 # 0.1.0 Initial
  * opensourcing a base state, still WIP!

data/bin/run_tests

@@ -61,7 +61,7 @@ volumes << "..:/code" unless ENV["BUILD_ID"]
 
 # Run docker pull on cache
 if @cache_tag
-  run("docker pull 858049876441.dkr.ecr.eu-west-1.amazonaws.com/#{@project_name}:#{@cache_tag}")
+  run("docker pull TBD/#{@project_name}:#{@cache_tag}")
 end
 
 erb = ERB.new(File.open("#{__dir__}/../spec/docker-compose.yml").read, 0, '>')

data/lib/minfra/cli/commands/kube.rb

@@ -87,13 +87,13 @@ module Minfra
 
         method = options["install"] ? "install" : "upgrade"
         File.open(stack.compose_path(blank: true),"w") do |f|
-          Orchparty.print(cluster_name: cluster, 
-                          application_name: stack.name, 
-                          force_variable_definition: false, 
-                          file_name: stack.stack_rb_path.to_s, 
-                          method: method,
-                          options: options,
-                          out_io: f)
+          Orchparty::App.new(cluster_name: cluster, 
+                        application_name: stack.name, 
+                        force_variable_definition: false, 
+                        file_name: stack.stack_rb_path.to_s,
+                        options: options
+                        ).
+                        print( method: method, out_io: f)
         end
         #run_cmd(generate_cmd, :bash)
         bash_cmd = ["cd #{stack.release_path}"]
@@ -128,7 +128,13 @@ module Minfra
 
           message =  "deploying stack #{stack.name}: #{reason_message}."
           Minfra::Cli::Document.document(@config,"started #{message}")
-          Orchparty.send(method, cluster_name: cluster, application_name: stack.name, force_variable_definition: false, file_name: stack.stack_rb_path.to_s, options: options)
+          orch=Orchparty::App.new(cluster_name: cluster, 
+                        application_name: stack.name, 
+                        force_variable_definition: false, 
+                        file_name: stack.stack_rb_path.to_s,
+                        options: options
+                        )
+          orch.send(method)
           Minfra::Cli::Document.document(@config,"finished #{message}")
         end
       end

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.2'.freeze
   end
 end

data/lib/minfra/cli.rb

@@ -19,6 +19,7 @@ require_relative 'cli/plugins'
 require 'active_support'
 require 'active_support/core_ext'
 
+require "#{ENV['MINFRA_PATH']}/config/preload.rb" if File.exist?("#{ENV['MINFRA_PATH']}/config/preload.rb")
 
 module Minfra
   module Cli
@@ -74,9 +75,6 @@ end
 Minfra::Cli::Plugins.load
 Minfra::Cli.scan
 require_relative 'cli/main_command'
-
-require "#{ENV['MINFRA_PATH']}/config/preload.rb" if File.exist?("#{ENV['MINFRA_PATH']}/config/preload.rb")
-
 Minfra::Cli.resolve
 
 

data/lib/orchparty/dsl_parser_kubernetes.rb

@@ -188,6 +188,7 @@ module Orchparty
         self
       end
 
+
       def wait(&block)
         name = SecureRandom.hex
         result = ServiceBuilder.build(name, "wait", block)
@@ -214,7 +215,6 @@ module Orchparty
       end
 
       def service(name, &block)
-
         chart_name = @application.name
         unless @application.services[chart_name]
           @application.services[chart_name] = AST.chart(name: chart_name, _type: "chart" )
@@ -332,6 +332,14 @@ module Orchparty
       def initialize(name, type)
         super AST.service(name: name, _type: type)
       end
+
+      # 1. rememebring the secrets in environment_secrets (so these environments can be created differentyly
+      # 2. create Secret sections
+      def environment_secrets(&block)
+        result = HashBuilder.build(block)
+        @node.environment_secrets = result
+        self
+      end
     end
 
     class ServiceMixinBuilder < CommonBuilder
@@ -356,6 +364,15 @@ module Orchparty
         @node._services << name
         self
       end
+
+      def secrets(name, &block)
+        result =  ServiceBuilder.build(name, "chart-secret", block)
+        @application.services[name] = result
+        @application._service_order << name
+        @node._services << name
+        self
+      end
+      
     end
   end
 end

data/lib/orchparty/kubernetes_application.rb

@@ -32,6 +32,7 @@ module Orchparty
         if(file_path.end_with?(".erb"))
           helm.application = OpenStruct.new(cluster_name: cluster_name, namespace: namespace)
           template = Erubis::Eruby.new(File.read(file_path))
+          template.filename = file_path
           yaml = template.result(helm.get_binding)
           file = Tempfile.new("kube-deploy.yaml")
           file.write(yaml)
@@ -117,14 +118,6 @@ module Orchparty
         @out_io.puts upgrade_cmd(label)
       end
 
-      def upgrade(label)
-        @out_io.puts system(upgrade_cmd(label))
-      end
-
-      def install(label)
-        @out_io.puts system(install_cmd(label))
-      end
-
       def upgrade_cmd(label)
         "kubectl --namespace #{namespace} --context #{cluster_name} label --overwrite #{label[:resource]} #{label[:name]} #{label["value"]}"
       end
@@ -184,7 +177,6 @@ module Orchparty
           output_chart_path: output_chart_path,
           chart_name: chart.name,
         )
-
         params.each do |app_name, subparams|
           subparams[:chart] = chart
           generate_documents_from_erbs(
@@ -203,12 +195,13 @@ module Orchparty
         end
 
         kind = params.fetch(:kind)
-
         Dir[File.join(templates_path, kind, '*.erb')].each do |template_path|
+          puts "Rendering Template: #{template_path}"
           template_name = File.basename(template_path, '.erb')
           output_path = File.join(output_chart_path, 'templates', "#{app_name}-#{template_name}")
 
           template = Erubis::Eruby.new(File.read(template_path))
+          template.filename = template_path
           params.app_name = app_name
           params.templates_path = templates_path
           begin
@@ -216,7 +209,7 @@ module Orchparty
           rescue Exception
             puts "#{template_path} has a problem: #{$!.inspect}"
             raise
-          end  
+          end
           File.write(output_path, document)
         end
       end
@@ -226,6 +219,7 @@ module Orchparty
         output_path = File.join(output_chart_path, 'Chart.yaml')
 
         template = Erubis::Eruby.new(File.read(template_path))
+        template.filename = template_path
         params = Hashie::Mash.new(chart_name: chart_name)
         document = template.result(CleanBinding.new.get_binding(params))
         File.write(output_path, document)
@@ -249,6 +243,7 @@ module Orchparty
 
       def upgrade(chart)
         build_chart(chart) do |chart_path|
+          system("cp -a #{chart_path} /tmp/latest-chart")
           @out_io.puts system("helm upgrade --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}")
         end
       end
@@ -299,6 +294,7 @@ class KubernetesApplication
     services = combine_charts(app_config)
     services.each do |name|
       service = app_config[:services][name]
+      puts "Service: #{name} #{method}"
       "::Orchparty::Services::#{service._type.classify}".constantize.new(cluster_name: cluster_name, namespace: namespace, file_path: file_path, app_config: app_config, out_io: @out_io).send(method, service)
     end
   end

data/lib/orchparty.rb

@@ -1,59 +1,85 @@
-require "deep_merge"
-require "orchparty/version"
-require "orchparty/ast"
-require "orchparty/context"
-require "orchparty/transformations"
-require "orchparty/dsl_parser"
-require "orchparty/dsl_parser_kubernetes"
-require "orchparty/plugin"
-require "orchparty/kubernetes_application"
-require "hash"
+# frozen_string_literal: true
 
-module Orchparty
+require 'deep_merge'
+require 'orchparty/version'
+require 'orchparty/ast'
+require 'orchparty/context'
+require 'orchparty/transformations'
+require 'orchparty/dsl_parser'
+require 'orchparty/dsl_parser_kubernetes'
+require 'orchparty/plugin'
+require 'orchparty/kubernetes_application'
+require 'hash'
 
-  def self.load_all_available_plugins
-    Gem::Specification.map {|f| f.matches_for_glob("orchparty/plugins/*.rb") }.flatten.map{|file_name| File.basename(file_name, ".*").to_sym }.each do |plugin_name|
-      plugin(plugin_name)
-    end
-  end
+module Orchparty
 
   def self.options
-    @@options || {}
+    @@options
   end
-  def self.plugins
-    Orchparty::Plugin.plugins
+  def self.options=(opt)
+     @@options=opt
   end
+  
+  class App
+    attr_reader :options
 
-  def self.plugin(name)
-    Orchparty::Plugin.load_plugin(name)
-  end
+    def initialize(cluster_name:, application_name:, force_variable_definition:, file_name:, options: {})
+      @cluster_name = cluster_name
+      @application_name = application_name
+      @force_variable_definiton = force_variable_definition
+      @file_name = file_name
+      @options = options
+      Orchparty.options=options
+      
+      load_plugins
+    end
 
-  def self.ast(filename: , application:, force_variable_definition: nil )
-    Transformations.transform(Orchparty::DSLParser.new(filename).parse, force_variable_definition: force_variable_definition).applications[application]
-  end
+    def plugins
+      Orchparty::Plugin.plugins
+    end
 
-  def self.generate(plugin_name, options, plugin_options)
-    plugins[plugin_name].generate(ast(options), plugin_options)
-  end
+    def print(method:, out_io:)
+      app(out_io: out_io).print(method)
+    end
 
-  def self.install(cluster_name: , application_name: , force_variable_definition:,  file_name:, options:  )
-    @@options= options
-    app_config = Transformations.transform_kubernetes(Orchparty::Kubernetes::DSLParser.new(file_name).parse, force_variable_definition: force_variable_definition).applications[application_name]
-    app = KubernetesApplication.new(app_config: app_config, namespace: application_name, cluster_name: cluster_name, file_name: file_name)
-    app.install
-  end
+    def install
+      app.install
+    end
 
-  def self.upgrade(cluster_name: , application_name: , force_variable_definition:,  file_name:, options: )
-    @@options = options
-    app_config = Transformations.transform_kubernetes(Orchparty::Kubernetes::DSLParser.new(file_name).parse, force_variable_definition: force_variable_definition).applications[application_name]
-    app = KubernetesApplication.new(app_config: app_config, namespace: application_name, cluster_name: cluster_name, file_name: file_name)
-    app.upgrade
-  end
+    def upgrade
+      app.upgrade
+    end
+
+    private
+
+    def app(out_io: STDOUT)
+      parsed = Orchparty::Kubernetes::DSLParser.new(@file_name).parse
+      app_config = Transformations.transform_kubernetes(parsed, force_variable_definition: @force_variable_definition).applications[@application_name]
+      KubernetesApplication.new(app_config: app_config, namespace: @application_name, cluster_name: @cluster_name, file_name: @file_name, out_io: out_io)
+    end
+    
+    def generate(plugin_name, options, plugin_options)
+      plugins[plugin_name].generate(ast(options), plugin_options)
+    end
 
-  def self.print(cluster_name: , application_name: , force_variable_definition:,  file_name:, method:, options:, out_io: )
-    @@options= options
-    app_config = Transformations.transform_kubernetes(Orchparty::Kubernetes::DSLParser.new(file_name).parse, force_variable_definition: force_variable_definition).applications[application_name]
-    app = KubernetesApplication.new(app_config: app_config, namespace: application_name, cluster_name: cluster_name, file_name: file_name, out_io: out_io)
-    app.print(method)
+    def ast(filename:, application:, force_variable_definition: nil)
+      Transformations.transform(Orchparty::DSLParser.new(filename).parse,
+                                force_variable_definition: force_variable_definition).applications[application]
+    end
+
+    def load_plugins
+      Gem::Specification.map do |f|
+        f.matches_for_glob('orchparty/plugins/*.rb')
+      end.flatten.map do |file_name|
+        File.basename(file_name,
+                      '.*').to_sym
+      end.each do |plugin_name|
+        plugin(plugin_name)
+      end
+    end
+
+    def plugin(name)
+      Orchparty::Plugin.load_plugin(name)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-04 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -110,11 +110,8 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".gitignore"
-- ".rspec"
 - CHANGELOG.md
 - Dockerfile
-- Gemfile
-- Gemfile.lock
 - bin/build
 - bin/console
 - bin/container_exec
@@ -191,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A cli framework for k8s based development and deployment.

data/.rspec

@@ -1,2 +0,0 @@
---format progress
---color

data/Gemfile

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-source 'https://rubygems.org'
-
-#gemspec
-gem "thor"
-gem "table_print", "1.5.6"
-gem "rest-client", "~>2.0"
-gem "hashie", "~>3.5"
-gem "bootsnap"
-gem "gli", "~> 2.16.0"
-gem "activesupport"
-gem "erubis"
-
-gem 'byebug', require: true # convenience
-gem 'graphiti'
-gem 'faraday'
-
-
-group :test do
-  gem 'rspec'
-  gem 'rubocop'
-  gem 'timecop'
-end
-
-group :development, :test do
-  gem 'guard-rspec', require: false
-  gem 'pry'
-  gem 'pry-doc'
-end
-
-  if false && ENV["MINFRA_WITH_PLUGINS"]=="true" # this is only set when we run the exe (not on bundle install...)
-    require 'ostruct'
-    require 'json'
-    require 'byebug'
- 
-    [Pathname.new(ENV["MINFRA_PATH"]).join("config","minfra_plugins.json"),
-     Pathname.new(ENV["MINFRA_PATH"]).join("me","minfra_plugins.json")].each do |file|
- 
-      next unless File.exist?(file)
- 
-      plugins=JSON.parse(File.read(file))
-      plugins["plugins"].each do |spec|
-        opts=spec["opts"] || {}
-        opts.merge(require: false)
-        if opts["path"]
-          gem spec["name"], spec["version"], opts
-        else
-          begin
-            Gem::Specification.find_by_name(spec["name"]) unless ENV["MINFRA_SETUP"]
-            gem spec["name"], spec["version"], opts
-          rescue Gem::MissingSpecError
-            STDERR.puts("Can't load plugin: #{spec["name"]}, #{spec["version"]}; run 'minfra plugin setup'")
-          end
-        end
-      end
-    end
-  end
-
-  

data/Gemfile.lock

@@ -1,171 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.1.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    ast (2.4.0)
-    bootsnap (1.4.6)
-      msgpack (~> 1.0)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    diff-lcs (1.3)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    dry-configurable (0.13.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.9.0)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.1)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-types (1.5.1)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    erubis (2.7.0)
-    faraday (2.0.1)
-      faraday-net_http (~> 2.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.1)
-    ffi (1.14.2)
-    formatador (0.2.5)
-    gli (2.16.1)
-    graphiti (1.3.5)
-      activesupport (>= 4.1)
-      concurrent-ruby (~> 1.0)
-      dry-types (>= 0.15.0, < 2.0)
-      graphiti_errors (~> 1.1.0)
-      jsonapi-renderer (~> 0.2, >= 0.2.2)
-      jsonapi-serializable (~> 0.3.0)
-    graphiti_errors (1.1.2)
-      jsonapi-serializable (~> 0.1)
-    guard (2.16.2)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    hashie (3.5.7)
-    http-accept (1.7.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    jsonapi-renderer (0.2.2)
-    jsonapi-serializable (0.3.1)
-      jsonapi-renderer (~> 0.2.0)
-    listen (3.3.3)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.8)
-    method_source (1.0.0)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0425)
-    minitest (5.14.2)
-    msgpack (1.3.3)
-    nenv (0.3.0)
-    netrc (0.11.0)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-doc (1.1.0)
-      pry (~> 0.11)
-      yard (~> 0.9.11)
-    rainbow (3.0.0)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    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)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      rexml
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.5)
-    shellany (0.0.1)
-    table_print (1.5.6)
-    thor (1.0.1)
-    timecop (0.9.1)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
-    yard (0.9.25)
-    zeitwerk (2.4.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  bootsnap
-  byebug
-  erubis
-  faraday
-  gli (~> 2.16.0)
-  graphiti
-  guard-rspec
-  hashie (~> 3.5)
-  pry
-  pry-doc
-  rest-client (~> 2.0)
-  rspec
-  rubocop
-  table_print (= 1.5.6)
-  thor
-  timecop
-
-BUNDLED WITH
-   2.1.4