pfab 0.37.0 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31f217c1c2c63af2baff59160c71250a9c6d478c68ab49383ff02782f81fc4ac
-  data.tar.gz: 5e05966091f8f5fd06b3ff37a25942ca77bdb4296223549f2378d8e0b99b8b9d
+  metadata.gz: f561887ca5e83e755c6841adc9bd5f7bb665c7fc983f694fae7a0721a6f31803
+  data.tar.gz: ec200b656730a992810235c3ef54fc586f7cfbd55af8779eb43bb71a65da30e7
 SHA512:
-  metadata.gz: 7405b5827ccbf926bb331f5707982834c815b9ca570ccab02b4a066818e61341546c6df2f68550948ac97de7596f7c138cfdd6835c6eed9a6bdf0503ba6e2ed5
-  data.tar.gz: 6562c155f57c212f8de04233573035e9376d2c23eab78065f78862a4486b231d76da03085325b514734202848fd82a944de9fe8482f2acb5bd36db5aefe0089f
+  metadata.gz: aa72a372ca6dbd79130a87a6aeac08211b79f8d97500ed9e854e1affdb219d495e9cf58338de835a9bebd23a7c56099c5871e16e9b2daa2887f66c92785bc98a
+  data.tar.gz: a6f890f67571a0bbc93c1160f1ff7adebb566f3554f945eb4a6a28b9a8db016eab4f5ef2bf84a2650bea6cd0404ea6ef85e33e5a39ad3fbbc358a8b0274b5c39

data/Gemfile

@@ -7,11 +7,13 @@ gem "commander"
 
 gem "activesupport"
 gem "pry-byebug"
+gem 'styled_yaml', '~> 0.0.1'
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
+  gem "bundler", "~> 2.3"
   gem "juwelier", "~> 2.4.9", git: "https://github.com/flajann2/juwelier"
   gem "simplecov", ">= 0"
   gem "test-unit", ">= 0"

data/Gemfile.lock

@@ -53,7 +53,8 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    git (1.11.0)
+    git (1.18.0)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -106,6 +107,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    styled_yaml (0.0.1)
     test-unit (3.2.9)
       power_assert
     thread_safe (0.3.6)
@@ -117,12 +119,13 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  bundler (~> 1.0)
+  bundler (~> 2.3)
   commander
   juwelier (~> 2.4.9)!
   pry-byebug
   rdoc (~> 3.12)
   simplecov
+  styled_yaml (~> 0.0.1)
   test-unit
 
 BUNDLED WITH

data/README.markdown

@@ -124,5 +124,5 @@ Releasing
 Copyright
 ---------
 
-Copyright (c) 2018 Jeff Dwyer. See
+Copyright (c) 2023 Prefab Inc. See
 LICENSE.txt for further details.

data/lib/pfab/cli.rb

@@ -3,6 +3,7 @@ require "net/http"
 require "yaml"
 require "json"
 require 'active_support/core_ext/hash/indifferent_access'
+require 'styled_yaml'
 
 module Pfab
   class CLI
@@ -87,7 +88,7 @@ module Pfab
 
           first_pod = get_first_pod(app_name)
 
-          puts_and_system("kubectl logs -f #{first_pod}")
+          kubectl("logs -f #{first_pod}")
         end
       end
 
@@ -99,7 +100,7 @@ module Pfab
           set_kube_context
           app_name = get_app_name
 
-          puts_and_system "kubectl rollout restart deployment.apps/#{app_name}"
+          kubectl "rollout restart deployment.apps/#{app_name}"
         end
       end
 
@@ -116,7 +117,7 @@ module Pfab
           set_kube_context
           app_name = get_app_name
           first_pod = get_first_pod app_name
-          puts_and_system "kubectl exec -it #{first_pod} -- #{options.command || '/bin/sh'}"
+          kubectl "exec -it #{first_pod} -- #{options.command || '/bin/sh'}"
         end
       end
 
@@ -141,11 +142,11 @@ module Pfab
           selector = "application=#{@application_yaml['name']}"
 
           if options.watch
-            puts_and_system "kubectl get pods -l #{selector} -w"
+            kubectl "get pods -l #{selector} -w"
           elsif $verbose
-            puts_and_system "kubectl describe pods -l #{selector}"
+            kubectl "describe pods -l #{selector}"
           else
-            puts_and_system "kubectl get ingresses,jobs,services,cronjobs,deployments,pods -l #{selector}"
+            kubectl "get ingresses,jobs,services,cronjobs,deployments,pods -l #{selector}"
           end
         end
       end
@@ -184,9 +185,9 @@ module Pfab
           puts "THIS APPLIES TO THE ENTIRE NAMESPACE"
           types = %w(Failed Pending Succeeded)
           types.each do |type|
-            system("kubectl get pods --field-selector status.phase=#{type}")
+            kubectl("get pods --field-selector status.phase=#{type}")
             if agree("Delete those?")
-              `kubectl delete pods --field-selector status.phase=#{type}`
+              kubectl("delete pods --field-selector status.phase=#{type}")
               puts "Deleted"
             end
           end
@@ -205,9 +206,9 @@ module Pfab
         app = deployables[app_name]
         if app[:deployable_type] == "cron"
           deployed_name = deployed_name(app)
-          puts_and_system("kubectl delete cronjob -l deployed-name=#{deployed_name}")
+          kubectl("delete cronjob -l deployed-name=#{deployed_name}")
         end
-        puts_and_system("kubectl apply -f .application-k8s-#{$env}-#{app_name}.yaml")
+        kubectl("apply -f .application-k8s-#{$env}-#{app_name}.yaml")
         puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d-%H-%M-%S")} HEAD")
         puts_and_system("git push origin --tags")
       end
@@ -323,6 +324,10 @@ module Pfab
       @_config ||= YAML.load(File.read(File.join(Dir.home, ".pfab.yaml")))
     end
 
+    def kubectl cmd
+      puts_and_system "kubectl #{cmd} --namespace=#{yy.namespace}"
+    end
+
     def puts_and_system cmd
       puts cmd
       if $dryrun
@@ -368,8 +373,7 @@ module Pfab
     end
 
     def get_pods(app)
-      get_pods_str = "kubectl get pods -o json -l deployed-name=#{app}"
-      puts get_pods_str
+      kubectl "get pods -o json -l deployed-name=#{app}"
       pods_str = `#{get_pods_str}`
       JSON.parse(pods_str)
     end

data/lib/pfab/templates/base.rb

@@ -17,12 +17,16 @@ module Pfab
         app_vars.dig(@data["env"], key) || app_vars[key]
       end
 
-      def get_top_level(key)
-        @data["application_yaml"].dig(@data["env"], key) || @data["application_yaml"][key]
+      def get_namespace
+        @data['namespace']
       end
 
-      def get_namespace()
-        get("namespace") || get_top_level("namespace") || @data['env']
+      def get_command()
+        cmd = get("command")
+        if cmd.kind_of?(Array)
+          return cmd
+        end
+        return cmd.split(" ")
       end
 
       def cpu(req_type)

data/lib/pfab/templates/cron.rb

@@ -2,7 +2,7 @@ module Pfab
   module Templates
     class Cron < Base
       def write_to(f)
-        f << YAML.dump(job.deep_stringify_keys)
+        f << StyledYAML.dump(job.deep_stringify_keys)
       end
 
       def application_type
@@ -23,7 +23,7 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version": "#{@data['sha']}"
+              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
             }
           },
           spec: {
@@ -49,7 +49,7 @@ module Pfab
                       "application-type" => "cron",
                       "tags.datadoghq.com/env": @data['env'],
                       "tags.datadoghq.com/service": @data['deployed_name'],
-                      "tags.datadoghq.com/version": "#{@data['sha']}"
+                      "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
                     },
                   },
                   spec: {
@@ -58,7 +58,7 @@ module Pfab
                       {
                         image: image_name,
                         name: @data['deployed_name'],
-                        command: app_vars["command"].split(" "),
+                        command: get_command,
                         env: env_vars,
                         resources: resources,
                       },

data/lib/pfab/templates/daemon.rb

@@ -2,7 +2,7 @@ module Pfab
   module Templates
     class Daemon < Base
       def write_to(f)
-        f << YAML.dump(deployment.deep_stringify_keys)
+        f << StyledYAML.dump(deployment.deep_stringify_keys)
       end
 
       def application_type
@@ -23,7 +23,7 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version":"#{@data['sha']}"
+              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
             }
           },
           spec: {
@@ -45,7 +45,7 @@ module Pfab
                   "application-type" => "daemon",
                   "tags.datadoghq.com/env": @data['env'],
                   "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": "#{@data['sha']}"
+                  "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
                 },
               },
               spec: {
@@ -54,7 +54,7 @@ module Pfab
                   {
                     image: image_name,
                     name: @data['deployed_name'],
-                    command: get("command").split(" "),
+                    command: get_command,
                     env: env_vars,
                     resources: resources,
                   }

data/lib/pfab/templates/job.rb

@@ -2,7 +2,7 @@ module Pfab
   module Templates
     class Job < Base
       def write_to(f)
-        f << YAML.dump(job.deep_stringify_keys)
+        f << StyledYAML.dump(job.deep_stringify_keys)
       end
 
       def application_type
@@ -23,10 +23,13 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version":"#{@data['sha']}"
+              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
             }
           },
           spec: {
+            ttlSecondsAfterFinished: get('ttlSecondsAfterFinished'),
+            completions: get('completions') || 1,
+            parallelism: get('parallelism') || 1,
             template: {
               metadata: {
                 name: "#{@data['deployed_name']}-#{@data['sha']}",
@@ -37,7 +40,7 @@ module Pfab
                   "application-type" => "job",
                   "tags.datadoghq.com/env": @data['env'],
                   "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": "#{@data['sha']}"
+                  "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
                 },
               },
               spec: {
@@ -46,7 +49,7 @@ module Pfab
                   {
                     image: image_name,
                     name: @data['deployed_name'],
-                    command: app_vars["command"].split(" "),
+                    command: get_command,
                     env: env_vars,
                     resources: resources,
                   },
@@ -55,7 +58,7 @@ module Pfab
               }.compact,
             },
             backoffLimit: 0,
-          },
+          }.compact,
         }
       end
     end

data/lib/pfab/templates/web.rb

@@ -1,3 +1,5 @@
+require "rubygems/safe_yaml"
+
 module Pfab
   module Templates
     class Web < Base
@@ -5,13 +7,13 @@ module Pfab
         if get("host").nil?
           puts "No host to deploy to for #{@data['deployed_name']}. Skipping."
         else
-          f << YAML.dump(service.deep_stringify_keys)
+          f << StyledYAML.dump(service.deep_stringify_keys)
           if not app_vars.has_key?('generateIngressEnabled') || app_vars['generateIngressEnabled']
-            f << YAML.dump(ingress.deep_stringify_keys)
+            f << StyledYAML.dump(ingress.deep_stringify_keys)
           else
             puts "skipping ingress because ingress_disabled = #{@data['generateIngressEnabled']}"
           end
-          f << YAML.dump(deployment.deep_stringify_keys)
+          f << StyledYAML.dump(deployment.deep_stringify_keys)
         end
       end
 
@@ -198,7 +200,7 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version":"#{@data['sha']}"
+              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
             }
           },
           spec: {
@@ -225,7 +227,7 @@ module Pfab
                   "application-type" => "web",
                   "tags.datadoghq.com/env": @data['env'],
                   "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": "#{@data['sha']}"
+                  "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
                 },
               },
               spec: {
@@ -234,7 +236,7 @@ module Pfab
                   {
                     image: image_name,
                     name: @data['deployed_name'],
-                    command: get("command").split(" "),
+                    command: get_command,
                     env: env_vars,
                     resources: resources,
                     ports: [

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 37
+    MINOR = 39
     PATCH = 0
     BUILD = nil
 

data/lib/pfab/yamls.rb

@@ -4,6 +4,8 @@ module Pfab
 
     def initialize(apps:, application_yaml:, image_name:, env:, sha:, config:)
       @apps = apps
+      namespace = application_yaml.dig(env.to_s, "namespace") || application_yaml["namespace"]
+      raise "No namespace founds" unless namespace
       @base_data = {
         "env" => env.to_s,
         'image_name' => image_name,
@@ -11,7 +13,8 @@ module Pfab
         'container_repository' => config["container.repository"],
         'config' => config,
         'application' => application_yaml["name"],
-        'application_yaml' => application_yaml
+        'application_yaml' => application_yaml,
+        'namespace' => namespace,
       }
     end
 
@@ -27,8 +30,11 @@ module Pfab
       data
     end
 
-    def generate(keys)
+    def namespace
+      @base_data['namespace']
+    end
 
+    def generate(keys)
       keys.each do |key|
         props = @apps[key]
         data = data_for(key, props)
@@ -48,9 +54,6 @@ module Pfab
         end
         filename
       end
-
     end
-
-
   end
 end

data/pfab.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: pfab 0.37.0 ruby lib
+# stub: pfab 0.39.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.37.0"
+  s.version = "0.39.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2023-03-15"
+  s.date = "2023-04-14"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -55,8 +55,9 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<commander>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
     s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 2.3"])
     s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
     s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
@@ -64,8 +65,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<commander>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 0"])
     s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
+    s.add_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 2.3"])
     s.add_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<test-unit>.freeze, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.39.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: styled_yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement