pfab 0.10.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bbc17afd25c1aa631080d916b9c19528916b81d6c57d360f524b56d53e53849
-  data.tar.gz: b2df229562760fc8879aedf8f55dc2e1ef36e956195d5bc2b03454caa173dde0
+  metadata.gz: a53ce6280e22d0792b71639b4b591ee8521778d42ffb300ba68878849ab2b248
+  data.tar.gz: 6bbaa9903e186b835137679e8a7b2fe4d5d333c112488b12fce777453cbf9857
 SHA512:
-  metadata.gz: 47c99495b251f2c33b15dc56d261857fad0bc9defb9b2fb7498e4511a35c4a36fcd9c6d562254f732e03ba76e260bdea09b5619cc918bbea8ff78748dfc92127
-  data.tar.gz: 7da4ba60ee697c0f0979828086d17fc1c9b18f82dc1192dcafa969a747204667e33f6040b8dd4981a73f36fb9c800c7bcc8a5f0c0247eaa21b43868c5a5ffc9e
+  metadata.gz: 0f24d62c35b317c5d5b452a25f7dbafca3b696efc8ce6d669a579eb2765d1a71c3ae45dbb782053ffaa5e807892e00f906553c7f9247baedfe5fa4007cd32bcd
+  data.tar.gz: '029d7e10ba71749f79f8bedac4310dc8d8934ef1c16683c63988c7e3fabd780242828004a14668de5bc4c525bc0fd48c018b9eb8ef06abe27118b4175f270b2b'

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.9

data/Gemfile

@@ -12,7 +12,7 @@ gem "pry-byebug"
 group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
-  gem "juwelier", "~> 2.4.9"
+  gem "juwelier", "~> 2.4.9", git: "https://github.com/flajann2/juwelier"
   gem "simplecov", ">= 0"
   gem "test-unit", ">= 0"
 end

data/Gemfile.lock

@@ -1,3 +1,20 @@
+GIT
+  remote: https://github.com/flajann2/juwelier
+  revision: de59d5a2ddea00c1f18957ab62129c1c141acce1
+  specs:
+    juwelier (2.4.9)
+      builder
+      bundler
+      git
+      github_api
+      highline
+      kamelcase (~> 0)
+      nokogiri
+      psych
+      rake
+      rdoc
+      semver2
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -6,7 +23,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
     byebug (10.0.2)
@@ -17,12 +34,26 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.3.1)
-    faraday (1.3.0)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    git (1.8.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    git (1.9.1)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -35,31 +66,19 @@ GEM
     i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     json (1.8.6)
-    juwelier (2.4.9)
-      builder
-      bundler
-      git
-      github_api
-      highline
-      kamelcase (~> 0)
-      nokogiri
-      psych
-      rake
-      rdoc
-      semver2
-    jwt (2.2.2)
+    jwt (2.3.0)
     kamelcase (0.0.2)
       semver2 (~> 3)
     method_source (0.9.2)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.6.1)
     minitest (5.11.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.11.2)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    oauth2 (1.4.4)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
@@ -72,15 +91,15 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    psych (3.3.1)
+    psych (4.0.2)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
-    rake (13.0.3)
+    rake (13.0.6)
     rchardet (1.8.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     semver2 (3.4.2)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -100,11 +119,11 @@ DEPENDENCIES
   activesupport
   bundler (~> 1.0)
   commander
-  juwelier (~> 2.4.9)
+  juwelier (~> 2.4.9)!
   pry-byebug
   rdoc (~> 3.12)
   simplecov
   test-unit
 
 BUNDLED WITH
-   1.16.6
+   1.17.2

data/README.markdown

@@ -100,6 +100,25 @@ Contributing to pfab
     is fine, but please isolate to its own commit so I can cherry-pick
     around it.
 
+Local Testing
+-----------------------------------------
+```bash
+bundle exec rake build
+gem install --local pkg/pfab-0.11.0.gem
+```
+```ruby
+gem 'pfab', :path => "../pfab"
+```
+
+Releasing
+-----------------------------------------
+
+- modify version.rb
+- ```bundle exec rake gemspec```
+- ```bundle exec rake git:release```
+- ```bundle exec rake build```
+- ```gem push pkg/pfab-0.12.0.gem```
+
 Copyright
 ---------
 

data/lib/pfab/cli.rb

@@ -27,8 +27,6 @@ module Pfab
         $app_name = app_name
       end
 
-      @apps = apps
-
       command :build do |c|
         c.syntax = "pfab build"
         c.summary = "build image"
@@ -142,14 +140,14 @@ module Pfab
         c.option "-c", "--command COMMAND", "Run a command with the ENV vars of the selected app"
         c.action do |_args, options|
           $env = :development
-          app_name = get_app_name
+          app_name = get_app_name(include_run_locals: true)
           puts "RUNNING THE FOLLOWING LOCALLY"
 
           env_vars = yy.env_vars(app_name).
             reject { |v| v.has_key? :valueFrom }
 
-          env_var_string = env_vars.map { |item| "#{item[:name]}=#{item[:value]}" }.join(" ")
-          options.default command: @apps[app_name][:command]
+          env_var_string = env_vars.map { |item| "#{item[:name]}=\"#{item[:value]}\"" }.join(" ")
+          options.default command: all_runnables[app_name][:command]
 
           puts_and_system "#{env_var_string} #{options.command}"
         end
@@ -182,11 +180,10 @@ module Pfab
       run!
     end
 
-
     def cmd_apply
       set_kube_context
       get_apps.each do |app_name|
-        app = @apps[app_name]
+        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}")
@@ -237,7 +234,7 @@ module Pfab
         end
       end
 
-      puts_and_system "docker build -t #{image_name} ."
+      puts_and_system "docker build -t #{image_name} --platform amd64 ."
 
       puts_and_system "docker tag #{image_name}:latest #{image_name}:#{rev}"
       puts_and_system "docker tag #{image_name}:#{rev} #{full_image_name}"
@@ -247,7 +244,7 @@ module Pfab
     end
 
     def yy
-      Pfab::Yamls.new(apps: @apps,
+      Pfab::Yamls.new(apps: all_runnables,
                       application_yaml: @application_yaml,
                       env: $env,
                       sha: get_current_sha,
@@ -257,7 +254,7 @@ module Pfab
     end
 
     def cmd_generate_yaml
-      wrote = yy.generate_all
+      wrote = yy.generate(deployables.keys)
       puts "Generated #{wrote}"
     end
 
@@ -295,14 +292,22 @@ module Pfab
       end
     end
 
-    def apps
-      @_apps ||= calculate_apps
+    def deployables
+      @_deployables ||= calculate_runnables("deployables")
+    end
+
+    def run_locals
+      @_rl ||= calculate_runnables("run_locals")
+    end
+
+    def all_runnables
+      deployables.merge(run_locals)
     end
 
-    def calculate_apps
+    def calculate_runnables(runnable_type)
       application = @application_yaml["name"]
       apps = {}
-      @application_yaml["deployables"].each do |deployable, dep|
+      @application_yaml[runnable_type].each do |deployable, dep|
         deployable_type = dep["type"]
         app_name = [application, deployable_type, deployable].join("-")
         apps[app_name] = {
@@ -329,16 +334,17 @@ module Pfab
       JSON.parse(pods_str)
     end
 
-    def get_app_name(all: false)
+    def get_app_name(all: false, include_run_locals: false)
       return $app_name unless $app_name.nil?
-      apps = @apps.keys
+      apps = deployables.keys
+      apps.concat(run_locals.keys) if include_run_locals
       apps << "all" if all
       $app_name = choose("which app?", *apps)
     end
 
     def get_apps
       name = get_app_name(all: true)
-      (name == "all") ? @apps.keys : [name]
+      (name == "all") ? deployables.keys : [name]
     end
   end
 end

data/lib/pfab/templates/base.rb

@@ -17,7 +17,6 @@ module Pfab
         app_vars.dig(@data["env"], key) || app_vars[key]
       end
 
-
       def cpu(req_type)
         default_cpu_string = @data["config"]["default_cpu_string"] || "50m/250m"
         (request, limit) = (get("cpu") || default_cpu_string).split("/")
@@ -44,44 +43,44 @@ module Pfab
       end
 
       def env_vars
+        env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] } }
 
-        env_vars = [
-          { name: "DEPLOYED_NAME", value: @data['deployed_name'] },
-        ]
-
+        # load defaults
         load_env_vars(env_vars, @data.dig("application_yaml", :environment))
-        load_env_vars(env_vars, @data.dig("application_yaml", @data["env"], :environment))
-
         load_secrets(env_vars, @data.dig("application_yaml", :env_secrets))
+
+        # load env overrides
+        load_env_vars(env_vars, @data.dig("application_yaml", @data["env"], :environment))
         load_secrets(env_vars, @data.dig("application_yaml", @data["env"], :env_secrets))
 
-        env_vars
+        env_vars.map do |k, v|
+          { name: k }.merge(v)
+        end
       end
 
       def load_env_vars(env_vars, hash)
         (hash || {}).each do |env_var_name, v|
           if v.to_s.start_with? "field/"
             (_, field_name) = v.split("/")
-            env_vars << { name: env_var_name, valueFrom: {
+            env_vars[env_var_name] = { valueFrom: {
               fieldRef: { fieldPath: field_name }
             } }
           else
-            env_vars << { name: env_var_name, value: v }
+            env_vars[env_var_name] = { value: v }
           end
-
         end
       end
 
       def load_secrets(env_vars, hash)
         (hash || {}).each do |env_var_name, v|
           (ref, key) = v.split("/")
-          env_vars << { name: env_var_name,
-                        valueFrom: {
-                          secretKeyRef: {
-                            name: ref,
-                            key: key
-                          }
-                        } }
+          env_vars[env_var_name] = {
+            valueFrom: {
+              secretKeyRef: {
+                name: ref,
+                key: key
+              }
+            } }
         end
       end
     end

data/lib/pfab/templates/web.rb

@@ -2,9 +2,13 @@ module Pfab
   module Templates
     class Web < Base
       def write_to(f)
-        f << YAML.dump(service.deep_stringify_keys)
-        f << YAML.dump(ingress.deep_stringify_keys)
-        f << YAML.dump(deployment.deep_stringify_keys)
+        if get("host").nil?
+          puts "No host to deploy to for #{@data['deployed_name']}. Skipping."
+        else
+          f << YAML.dump(service.deep_stringify_keys)
+          f << YAML.dump(ingress.deep_stringify_keys)
+          f << YAML.dump(deployment.deep_stringify_keys)
+        end
       end
 
       def service
@@ -36,7 +40,7 @@ module Pfab
 
       def ingress
         {
-          apiVersion: "extensions/v1beta1",
+          apiVersion: "networking.k8s.io/v1",
           kind: "Ingress",
           metadata: {
             name: "ingress-#{@data['deployed_name']}",
@@ -62,9 +66,14 @@ module Pfab
               paths: [
                 {
                   path: "/",
+                  pathType: "Prefix",
                   backend: {
-                    serviceName: @data['deployed_name'],
-                    servicePort: "http",
+                    service: {
+                      name: @data['deployed_name'],
+                      port: {
+                        name: "http"
+                      }
+                    }
                   },
                 },
               ],

data/lib/pfab/version.rb

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

data/lib/pfab/yamls.rb

@@ -27,13 +27,13 @@ module Pfab
       data
     end
 
-    def generate_all
+    def generate(keys)
 
-      @apps.map do |app, props|
+      keys.each do |key|
+        props = @apps[key]
+        data = data_for(key, props)
 
-        data = data_for(app, props)
-
-        filename = ".application-k8s-#{data["env"]}-#{app}.yaml"
+        filename = ".application-k8s-#{data["env"]}-#{key}.yaml"
         File.open(filename, "w") do |f|
           case props[:deployable_type]
           when "web" then

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.10.0 ruby lib
+# stub: pfab 0.14.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.10.0"
+  s.version = "0.14.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 = "2021-10-31"
+  s.date = "2022-01-15"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".ruby-version",
+    ".tool-versions",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -43,31 +44,22 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/prefab-cloud/pfab".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.8".freeze
+  s.rubygems_version = "3.2.32".freeze
   s.summary = "helper gem".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      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"])
-    else
-      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<rdoc>.freeze, ["~> 3.12"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    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_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    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"])
   else
     s.add_dependency(%q<commander>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-31 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -133,6 +133,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".ruby-version"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -170,8 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: helper gem