kerbi 0.0.2 → 0.0.6

data/spec/cli/state_handler_spec.rb

@@ -3,7 +3,8 @@ require_relative './../spec_helper'
 RSpec.describe "$ kerbi state [COMMAND]" do
 
   let(:namespace) { "kerbi-spec" }
-  let(:cm_name) { Kerbi::State::Consts::RESOURCE_NAME }
+  let(:release_name) { "kerbi-spec" }
+  let(:cm_name) { Kerbi::State::ConfigMapBackend.mk_cm_name(release_name) }
   let(:exps_dir) { "state" }
 
   let(:set) do
@@ -16,67 +17,35 @@ RSpec.describe "$ kerbi state [COMMAND]" do
   end
 
   before :each do
-    kmd("create ns #{namespace}")
-    kmd("delete cm #{cm_name} -n #{namespace}")
-    backend = make_backend(namespace)
+    create_ns(release_name)
+    delete_cm(cm_name, namespace)
+    backend = make_backend(release_name, namespace)
     configmap_dict = backend.template_resource(set.entries)
     backend.apply_resource(configmap_dict)
   end
 
-  describe "$ kerbi state init" do
-    let(:cmd) { "state init kerbi-spec" }
-    context "when resources already existed" do
-      it "echoes the correct text" do
-        exp_cli_eq_file(cmd, exps_dir, "init-already-existed")
-      end
-    end
-
-    context "when the resources did not exist" do
-      it "echoes the correct text" do
-        kmd("delete ns #{namespace}")
-        exp_cli_eq_file(cmd, exps_dir, "init-both-created")
-      end
-    end
-  end
-
-  describe "$ kerbi state status" do
-    let(:cmd) { "state status -n #{namespace}" }
-    context "when everything is ready" do
-      it "echoes the correct text" do
-        exp_cli_eq_file(cmd, exps_dir, "status-all-working")
-      end
-    end
-
-    context "when connected but resources not provisioned" do
-      it "echoes the correct text" do
-        kmd("delete ns #{namespace}")
-        exp_cli_eq_file(cmd, exps_dir, "status-not-provisioned")
-      end
-    end
-  end
-
-  describe "$ kerbi state list" do
-    cmd_group_spec("state list -n kerbi-spec", "state", "list")
+  describe "$ kerbi state list [RELEASE_NAME]" do
+    cmd_group_spec("state list kerbi-spec", "state", "list")
   end
 
   describe "$ kerbi state show [TAG]" do
     cmd_group_spec(
-      "state show one -n kerbi-spec",
+      "state show kerbi-spec one",
       "state",
       "show"
     )
 
     cmd_group_spec(
-      "state show @oldest -n kerbi-spec",
+      "state show kerbi-spec @oldest",
       "state",
       "show",
       context_append: " using @oldest instead of a literal tag"
     )
   end
 
-  describe "$ kerbi state retag [OLD_TAG] [NEW_TAG]" do
+  describe "$ kerbi state retag [RELEASE_NAME] [OLD_TAG] [NEW_TAG]" do
     def make_cmd(old_tag)
-      "state retag #{old_tag} born-again -n #{namespace}"
+      "state retag #{namespace} #{old_tag} born-again"
     end
 
     context "when the old tag exists" do
@@ -100,37 +69,37 @@ RSpec.describe "$ kerbi state [COMMAND]" do
     end
   end
 
-  describe "$ kerbi state promote" do
-    let(:cmd) { "state promote @candidate -n #{namespace}" }
+  describe "$ kerbi state promote [RELEASE_NAME] [TAG]" do
+    let(:cmd) { "state promote #{release_name} @candidate" }
     it "echos the expected text" do
       exp_cli_eq_file(cmd, exps_dir, "promote")
     end
   end
 
-  describe "$ kerbi state demote" do
-    let(:cmd) { "state demote @latest -n #{namespace}" }
+  describe "$ kerbi state demote [RELEASE_NAME] [TAG]" do
+    let(:cmd) { "state demote #{release_name} @latest" }
     it "echos the expected text" do
       exp_cli_eq_file(cmd, exps_dir, "demote")
     end
   end
 
-  describe "$ kerbi state set" do
-    let(:easy_part) { "state set @latest message" }
+  describe "$ kerbi state set [RELEASE_NAME] [TAG] [ATTR] [VAL]" do
+    let(:easy_part) { "state set #{release_name} @latest message" }
     let(:cmd) { easy_part.split(" ") + ["new message", "-n", namespace] }
     it "echos the expected text" do
       exp_cli_eq_file(cmd, exps_dir, "set")
     end
   end
 
-  describe "$ kerbi state delete" do
-    let(:cmd) { "state delete @latest -n #{namespace}" }
+  describe "$ kerbi state delete [RELEASE_NAME] [TAG]" do
+    let(:cmd) { "state delete #{release_name} @latest" }
     it "echos the expected text" do
       exp_cli_eq_file(cmd, exps_dir, "delete")
     end
   end
 
-  describe "$ kerbi state prune-candidates" do
-    let(:cmd) { "state prune-candidates -n #{namespace}" }
+  describe "$ kerbi state prune-candidates [RELEASE_NAME]" do
+    let(:cmd) { "state prune-candidates #{release_name}" }
     it "echos the expected text" do
       exp_cli_eq_file(cmd, exps_dir, "prune-candidates")
     end

data/spec/fixtures/expectations/release/delete.txt

@@ -0,0 +1 @@
+Deleted configmaps/kerbi-spec/kerbi-kerbi-spec-db

data/spec/fixtures/expectations/release/init-already-existed.txt

@@ -0,0 +1,2 @@
+\e[1;39;49mnamespaces/kerbi-spec: \e[0m\e[1;32;49mAlready existed\e[0m
+\e[1;39;49mconfigmaps/kerbi-spec/kerbi-kerbi-spec-db: \e[0m\e[1;32;49mAlready existed\e[0m

data/spec/fixtures/expectations/release/init-both-created.txt

@@ -0,0 +1,2 @@
+\e[1;39;49mnamespaces/kerbi-spec: \e[0m\e[1;34;49mCreated\e[0m
+\e[1;39;49mconfigmaps/kerbi-spec/kerbi-kerbi-spec-db: \e[0m\e[1;34;49mCreated\e[0m

data/spec/fixtures/expectations/release/list.txt

@@ -0,0 +1,5 @@
+ NAME  BACKEND    NAMESPACE  RESOURCE                  STATES  LATEST
+
+ tuna  ConfigMap  macron     kerbi-tuna-db  0
+ dirt  ConfigMap  tuna       kerbi-dirt-db  ERR     ERR
+ tuna  ConfigMap  tuna       kerbi-tuna-db  2       1.0.0

data/spec/{expectations/state → fixtures/expectations/release}/status-all-working.txt

@@ -1,4 +1,5 @@
 \e[1;39;49m1. Create Kubernetes client: \e[0m\e[1;32;49mSuccess\e[0m
 \e[1;39;49m2. List cluster namespaces: \e[0m\e[1;32;49mSuccess\e[0m
 \e[1;39;49m3. Target namespace kerbi-spec exists: \e[0m\e[1;32;49mSuccess\e[0m
-\e[1;39;49m4. Resource kerbi-spec/cm/kerbi-state-tracker exists: \e[0m\e[1;32;49mSuccess\e[0m
+\e[1;39;49m4. Resource kerbi-spec/cm/kerbi-kerbi-spec-db exists: \e[0m\e[1;32;49mSuccess\e[0m
+\e[1;39;49m5. Data from resource is readable: \e[0m\e[1;32;49mSuccess\e[0m

data/spec/fixtures/expectations/release/status-data-unreadable.txt

@@ -0,0 +1,5 @@
+\e[1;39;49m1. Create Kubernetes client: \e[0m\e[1;32;49mSuccess\e[0m
+\e[1;39;49m2. List cluster namespaces: \e[0m\e[1;32;49mSuccess\e[0m
+\e[1;39;49m3. Target namespace kerbi-spec exists: \e[0m\e[1;32;49mSuccess\e[0m
+\e[1;39;49m4. Resource kerbi-spec/cm/kerbi-kerbi-spec-db exists: \e[0m\e[1;32;49mSuccess\e[0m
+\e[1;39;49m5. Data from resource is readable: \e[0m\e[1;31;49mFailure\e[0m

data/spec/{expectations/state → fixtures/expectations/release}/status-not-provisioned.txt

@@ -1,4 +1,5 @@
 \e[1;39;49m1. Create Kubernetes client: \e[0m\e[1;32;49mSuccess\e[0m
 \e[1;39;49m2. List cluster namespaces: \e[0m\e[1;32;49mSuccess\e[0m
 \e[1;39;49m3. Target namespace kerbi-spec exists: \e[0m\e[1;31;49mFailure\e[0m
-\e[1;39;49m4. Resource kerbi-spec/cm/kerbi-state-tracker exists: \e[0m\e[1;31;49mFailure\e[0m
+\e[1;39;49m4. Resource kerbi-spec/cm/kerbi-kerbi-spec-db exists: \e[0m\e[1;31;49mFailure\e[0m
+\e[1;39;49m5. Data from resource is readable: \e[0m\e[1;31;49mFailure\e[0m

data/spec/{expectations → fixtures/expectations}/root/template-inlines.yaml

@@ -4,7 +4,7 @@ metadata:
   name: hello-kerbi
   namespace: foo
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:
@@ -20,7 +20,7 @@ metadata:
   name: hello-kerbi
   namespace: foo
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:

data/spec/{expectations → fixtures/expectations}/root/template-production.yaml

@@ -4,7 +4,7 @@ metadata:
   name: hello-kerbi
   namespace: foo
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:
@@ -20,7 +20,7 @@ metadata:
   name: hello-kerbi
   namespace: foo
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:

data/spec/{expectations → fixtures/expectations}/root/template-read-inlines.yaml

@@ -2,9 +2,9 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: hello-kerbi
-  namespace: foo
+  namespace: kerbi-spec
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:
@@ -18,9 +18,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name: hello-kerbi
-  namespace: foo
+  namespace: kerbi-spec
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:

data/spec/{expectations → fixtures/expectations}/root/template-read.yaml

@@ -2,9 +2,9 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: hello-kerbi
-  namespace: foo
+  namespace: kerbi-spec
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:
@@ -18,9 +18,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name: hello-kerbi
-  namespace: foo
+  namespace: kerbi-spec
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:

data/spec/{expectations → fixtures/expectations}/root/template-write.yaml

@@ -2,9 +2,9 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: hello-kerbi
-  namespace: foo
+  namespace: kerbi-spec
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:
@@ -18,9 +18,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name: hello-kerbi
-  namespace: foo
+  namespace: kerbi-spec
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:

data/spec/{expectations → fixtures/expectations}/root/template.yaml

@@ -4,7 +4,7 @@ metadata:
   name: hello-kerbi
   namespace: foo
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:
@@ -20,7 +20,7 @@ metadata:
   name: hello-kerbi
   namespace: foo
   annotations:
-    author: xavier
+    author: person
   labels:
     app: hello-kerbi
 spec:

data/spec/main/configmap_backend_spec.rb

@@ -3,20 +3,20 @@ require_relative './../spec_helper'
 RSpec.describe Kerbi::State::ConfigMapBackend do
 
   let(:namespace) { "kerbi-spec" }
-  let(:cm_name) { Kerbi::State::Consts::RESOURCE_NAME }
+  let(:cm_name) { Kerbi::State::ConfigMapBackend.mk_cm_name(namespace) }
 
   before :each do
-    kmd("create ns #{namespace}")
-    kmd("delete cm #{cm_name} -n #{namespace}")
+    create_ns(namespace)
+    delete_cm(cm_name, namespace)
     # sleep(2) #ADD ME BACK IF WEIRD ERRORS... :/
   end
 
   describe "#provision_missing_resources" do
-    let(:backend) { make_backend(namespace) }
+    let(:backend) { make_backend(namespace, namespace) }
 
     context "when the namespace does not exist" do
       it "provisions accordingly" do
-        kmd("delete ns #{namespace}")
+        delete_ns(namespace)
         expect(backend.read_write_ready?).to be_falsey
         backend.provision_missing_resources
       end
@@ -24,14 +24,14 @@ RSpec.describe Kerbi::State::ConfigMapBackend do
 
     context "when the namespace does exist" do
       before :each do
-        kmd("create ns #{namespace}")
+        create_ns(namespace)
         expect(backend.read_write_ready?).to be_falsey
       end
 
       context "when the configmap does not exist" do
         it "provisions accordingly" do
           backend.provision_missing_resources
-          kmd("delete cm #{cm_name} -n #{namespace}")
+          delete_cm(cm_name, namespace)
           backend.provision_missing_resources
         end
       end
@@ -45,8 +45,8 @@ RSpec.describe Kerbi::State::ConfigMapBackend do
     end
 
     after :each do
-      expect(backend.read_write_ready?).to eq(true)
       expect(backend.namespace_exists?).to eq(true)
+      expect(backend.read_write_ready?).to eq(true)
       expect(backend.resource_exists?).to eq(true)
     end
   end
@@ -55,9 +55,10 @@ RSpec.describe Kerbi::State::ConfigMapBackend do
     context "with 0 entries" do
       it "outputs a descriptor with the right basic properties" do
         result = make_backend("xyz").template_resource([])
+        metadata = (result || {})[:metadata] || {}
         expect(result[:kind]).to eq('ConfigMap')
-        expect(result[:metadata][:name]).to eq('kerbi-state-tracker')
-        expect(result[:metadata][:namespace]).to eq('xyz')
+        expect(metadata[:name]).to eq('kerbi-xyz-db')
+        expect(metadata[:namespace]).to eq('xyz')
         expect(result[:data][:entries]).to eq("[]")
       end
     end
@@ -75,12 +76,12 @@ RSpec.describe Kerbi::State::ConfigMapBackend do
   describe "#namespace_exists?" do
     context "when the namespace exists" do
       it "returns true" do
-        expect(make_backend("default").namespace_exists?).to be_truthy
+        expect(make_backend('', "default").namespace_exists?).to be_truthy
       end
     end
     context "when the namespace does not exist" do
       it "returns false" do
-        expect(make_backend("nope").namespace_exists?).to be_falsey
+        expect(make_backend('', "nope").namespace_exists?).to be_falsey
       end
     end
   end
@@ -94,7 +95,7 @@ RSpec.describe Kerbi::State::ConfigMapBackend do
     end
 
     it "creates a configmap with the right contents" do
-      subject = make_backend(namespace)
+      subject = make_backend(namespace, namespace)
       descriptor = subject.template_resource(entries)
       subject.apply_resource(descriptor)
       sleep(1)

data/spec/main/project_code_gen_spec.rb

@@ -7,6 +7,13 @@ RSpec.describe Kerbi::CodeGen::ProjectGenerator do
   let(:project_name) { "test-project" }
   let(:dir_path) { "#{root}/#{project_name}" }
 
+  subject do
+    Kerbi::CodeGen::ProjectGenerator.new(
+      project_name: project_name,
+      root_dir: root
+    )
+  end
+
   before :each do
     Kerbi::Testing.reset_test_yamls_dir
   end
@@ -15,8 +22,7 @@ RSpec.describe Kerbi::CodeGen::ProjectGenerator do
     let(:expected_files) { %w[Gemfile kerbifile.rb values.yaml] }
     it "creates a new dir and writes the files" do
       expect(File.exists?(dir_path)).to be_falsey
-      generator = klass.new(project_name: project_name, root_dir: root)
-      generator.run
+      subject.run
       expect(File.exists?(dir_path)).to be_truthy
       actual = Dir.entries(dir_path)
       expect((expected_files - actual)).to be_empty

data/spec/mini-projects/hello-kerbi/common/metadata.yaml.erb

@@ -0,0 +1,5 @@
+metadata:
+  annotations:
+    author: person
+  labels:
+    app: hello-kerbi

data/spec/mini-projects/hello-kerbi/consts.rb

@@ -0,0 +1,5 @@
+module HelloKerbi
+  module Consts
+    APP_NAME = "hello-kerbi"
+  end
+end

data/spec/mini-projects/hello-kerbi/helpers.rb

@@ -0,0 +1,8 @@
+module HelloKerbi
+  module Helpers
+    def img2alpine(img_name)
+      return img_name if img_name.include?(":")
+      "#{img_name}:alpine"
+    end
+  end
+end

data/spec/mini-projects/hello-kerbi/kerbifile.rb

@@ -0,0 +1,18 @@
+require_relative 'consts'
+require_relative 'helpers'
+
+module HelloKerbi
+  class Mixer < Kerbi::Mixer
+    include Helpers
+
+    locate_self __dir__
+
+    def mix
+      patched_with file("common/metadata") do
+        push file("pod-and-service")
+      end
+    end
+  end
+end
+
+Kerbi::Globals.mixers << HelloKerbi::Mixer

data/spec/mini-projects/hello-kerbi/pod-and-service.yaml.erb

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: <%= HelloKerbi::Consts::APP_NAME %>
+  namespace: <%= release_name %>
+spec:
+  containers:
+    - name: main
+      image: <%= img2alpine(values[:pod][:image]) %>
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: <%= HelloKerbi::Consts::APP_NAME %>
+  namespace: <%= release_name %>
+spec:
+  type: <%= values[:service][:type] %>
+  selector:
+    app: <%= HelloKerbi::Consts::APP_NAME %>
+  ports:
+    - port: 80

data/spec/mini-projects/hello-kerbi/values/production.yaml

@@ -0,0 +1,2 @@
+service:
+  type: LoadBalancer

data/spec/mini-projects/hello-kerbi/values/v2.yaml

@@ -0,0 +1,2 @@
+pod:
+  image: nginx:1.20

data/spec/mini-projects/hello-kerbi/values/values.yaml

@@ -0,0 +1,4 @@
+pod:
+  image: nginx
+service:
+  type: ClusterIP

data/spec/spec_helper.rb

@@ -5,19 +5,70 @@ SimpleCov.start
 
 require_relative './../lib/kerbi'
 
-def kmd(command)
-  opts = { err: File::NULL, out: File::NULL }
-  system("kubectl #{command} --context kind-kind", **opts)
+def run_opts
+  Kerbi::RunOpts.new({}, Kerbi::Consts::OptionDefaults::BASE)
 end
 
+# @param [String] namespace
 # @return [Kerbi::State::ConfigMapBackend]
-def make_backend(namespace)
-  Kerbi::State::ConfigMapBackend.new(
-    Kerbi::Utils::K8sAuth.kube_config_bundle,
-    namespace
+def make_backend(release_name, namespace=nil)
+  auth_bundle = Kerbi::Utils::Cli.make_k8s_auth_bundle(run_opts)
+  Kerbi::State::ConfigMapBackend.new(auth_bundle, release_name, namespace)
+end
+
+# @return [Kubeclient::Client]
+def make_kube_client(api_name)
+  auth_bundle = Kerbi::Utils::Cli.make_k8s_auth_bundle(run_opts)
+  Kubeclient::Client.new(
+    auth_bundle[:endpoint],
+    api_name,
+    **auth_bundle[:options]
   )
 end
 
+def create_ns(name)
+  dict = { metadata: { name: name } }
+  begin
+    #noinspection RubyResolve
+    make_kube_client("v1").create_namespace(dict)
+  rescue Kubeclient::HttpError
+    true
+  end
+end
+
+def delete_cm(name, namespace)
+  begin
+    #noinspection RubyResolve
+    make_kube_client("v1").delete_config_map(name, namespace)
+    begin
+      sleep(1)
+      #noinspection RubyResolve
+      exists = client.get_config_map(name, namespace) rescue nil
+    end while exists
+  rescue Kubeclient::ResourceNotFoundError
+    true
+  end
+end
+
+def delete_ns(name)
+  begin
+    #noinspection RubyResolve
+    (client = make_kube_client("v1")).delete_namespace(name)
+    begin
+      sleep(1)
+      exists = client.get_namespace(name) rescue nil
+    end while exists
+  rescue Kubeclient::ResourceNotFoundError
+    true
+  end
+end
+
+def corrupt_cm(backend)
+  cm_body = backend.template_resource([])
+  cm_body[:data][:entries] = "not json"
+  backend.send(:client).update_config_map(cm_body)
+end
+
 def new_state(tag, dict={})
   set = dict.delete(:state)
   dict[:tag] = tag
@@ -43,7 +94,7 @@ def cli(command, escaped: false)
 end
 
 def load_exp_file(dir, file, ext)
-  path = "#{__dir__}/expectations/#{dir}/#{file}.#{ext}"
+  path = "#{__dir__}/fixtures/expectations/#{dir}/#{file}.#{ext}"
   File.read(path)
 end
 
@@ -65,8 +116,13 @@ def exp_cli_eq_file(cmd, dir, file, ext='txt')
   if ext == 'json'
     expect(JSON.parse(actual_str)).to eq(expected)
   elsif ext == 'yaml'
-    actual = YAML.load_stream(actual_str)
-    expect(actual).to eq(expected)
+    actual = YAML.load_stream(actual_str) rescue 0
+    if actual != 0
+      expect(actual).to eq(expected)
+    else
+      puts actual_str
+      raise "CMD #{cmd} echoed non-YAML (above)"
+    end
   else
     actual = actual_str.gsub(/\s+/, "").gsub("\e", "\\e")
     expect(actual).to eq(expected)
@@ -74,7 +130,7 @@ def exp_cli_eq_file(cmd, dir, file, ext='txt')
 end
 
 def hello_kerbi(cmd, namespace=nil)
-  target = "#{__dir__}/../examples/hello-kerbi"
+  target = "#{__dir__}/mini-projects/hello-kerbi"
   cmd = "#{cmd} --project-root #{target}"
   cmd = "#{cmd} --namespace #{namespace}" if namespace
   cmd