minfra-cli 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdef57265500c1ab2f82470de61a21d1d604d4cdbc198f2acbcafdab9cb37548
-  data.tar.gz: f7a25a0c65239ccaa49331a0e94d14494b92a44927df112c2258d6b42ef51420
+  metadata.gz: 4c095831fd4a669abd1381046091e615395c93e367051ee051bf48c458167d63
+  data.tar.gz: 3b7219fba8adb56249c8be8f249751613c9f9e529d7a8d9341f44c32e69271ac
 SHA512:
-  metadata.gz: e2875bcf474cbed4017f6fb5e7188745b04357e0181a9ab1d8641d041d880e3152624e21f4fed4317a9c4a24c1c1e3d00c552f4fcaf558324a78d74d08de8930
-  data.tar.gz: f6ae3c0c3a82ca453a886a8d1bfc6ea2170a967f42094a482d769cbb40f60706416f2592465202afc2e04f7bd957068730d8da1420b14b6c13c331864770e1ca
+  metadata.gz: 45aacbd112f2797e1b177f477b9456cb955a20576a11442c8c4799609bbe6a226177d29c3ac1ff27a9b2270a1fd2fd2ac6fe4bd1ab5e813e823ff13bfd1e960c
+  data.tar.gz: 81bd7e7366bf87ca8c048289e74ec3bc2e5819456c6b386063e1831d8465bb2cb4cc18cd573ada93a5aefdd0c5392bba50be02348a31616ff447f60975ab65e2

data/CHANGELOG.md

@@ -1,2 +1,4 @@
+# 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.1.0'.freeze
+    VERSION = '0.2.2'.freeze
   end
 end

data/lib/minfra/cli.rb

@@ -19,7 +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")
+require "#{ENV['MINFRA_PATH']}/config/preload.rb" if File.exist?("#{ENV['MINFRA_PATH']}/config/preload.rb")
 
 module Minfra
   module Cli

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

data/minfra-cli.gemspec

@@ -33,8 +33,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "hashie", "~>3.5"
   spec.add_runtime_dependency "activesupport", "~> 6.1"
   spec.add_runtime_dependency "erubis", "~> 2.7"
-
-  #gem 'byebug', require: true # convenience
-  #gem 'graphiti'
-  #gem 'faraday'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -110,7 +110,6 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".gitignore"
-- ".rspec"
 - CHANGELOG.md
 - Dockerfile
 - bin/build

data/.rspec

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