pfab 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d731b1aced5361202684f5f3f782ff6846816818499c0d8ce4892cbcb728661d
-  data.tar.gz: 147ae1a483a6a980b138070ffe858ddea9b0bcca8bd86fc311c63d7693bc39a3
+  metadata.gz: '03967e0911ee09d5b46c3c9b3f65b40cfcf3eaa4160edea4f877a12a3262a157'
+  data.tar.gz: b0f26e10f910e669dc40cd370179084eb0bdb9097ac07eb4cb72fe1894856b4c
 SHA512:
-  metadata.gz: c520165411f2fe9023385c896677032c3decd4552209b9e5fab5af6c852b82bac357bb3fe07bd34bb9a02c05990de193b2101e45f2379b7c32dcd3d7dfa8953c
-  data.tar.gz: f963ee37ca9fcaac8f57b6be715b6d06fbe4ebed20ce06ba6fc768d338cf8f231c7f39f13ddbfc242345f169171aa94786e7eec1b42ac038019e96cf313c1e23
+  metadata.gz: 43446c3185c0ea5dab111015c490aa41f823f83aeeaa91928cc4b016c6c52a7e4a1faf2f26295e538fd6abb4b15cbc5e7ddab95ff17bab36137aa70f82df7b9f
+  data.tar.gz: 617049c6303bfaf34c79063f6910555466dd340964b53c4c5da6740f4c62ec94dd20b01f2497ec1c9cd4f877ba99baa4438fa7c8c6bb9e75bbdcb38365863345

data/README.markdown

@@ -1,10 +1,12 @@
 pfab
 ===================
 
-nothing to see here
+The missing k8s deployer
 
 
-set ~/.pfab.yaml
+## Setup
+
+Configure ~/.pfab.yaml
 ```
 container.repository: "gcr.io/$$$$$$$"
 default_cpu_string: "50m/250m"
@@ -16,10 +18,69 @@ envs:
     context: "k8s-production-context"
 ```
 
-Then
+# application.yaml
+```$yaml
+name: myapp
+prebuild: "mvn -T 4 clean package"
+
+deployables:
+  kafkaconsumer:
+    type: daemon
+    command: java  -Xmx550m -javaagent:/app/dd-java-agent.jar -jar myjar.jar kafkarunner
+    cpu: 50m/250m
+    memory: 400Mi/600Mi
+  dbmigrate:
+    type: job
+    command: java -jar myjar.jar db_migrate
+  upsert-usage-logs:
+    type: cron
+    schedule: 2 6 * * *
+    command: java -jar myjar.jar my_nightly_job
+  grpc:
+    type: web
+    port: 8443
+    protocol: h2c # tell traefik this is going to be http2
+    command: java -Xmx550m -javaagent:/app/dd-java-agent.jar -jar myjar.jar server /app/grpc.yml
+    readinessProbe:
+      exec:
+        command: ["/bin/grpc_health_probe", "-addr=:8443"]
+      initialDelaySeconds: 5
+    livenessProbe:
+      exec:
+        command: ["/bin/grpc_health_probe", "-addr=:8443"]
+      initialDelaySeconds: 120
+    staging:
+      host: api.staginghost.com
+      replicas: 1
+    production:
+      host: api.host.com
+      replicas: 2
+    cpu: 50m/250m
+    memory: 600Mi/768Mi
+
+
+staging:
+  environment:
+    ENV: staging
+production:
+  environment:
+    ENV: production
+env_secrets:
+  AWS_SECRET_ACCESS_KEY: secretstore/aws_secret_access_key
+environment:
+  DD_AGENT_HOST: field/status.hostIP
+  AWS_ACCESS_KEY_ID: "1234"
+```
+
+
+
+# Profit
 ```
 pfab shipit
 pfab status
+pfab logs
+pfab exec
+pfab run_local
 ```
 
 Contributing to pfab

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/pfab/cli.rb

@@ -133,6 +133,29 @@ module Pfab
         end
       end
 
+      command :run_local do |c|
+        c.syntax = "pfab run_local"
+        c.summary = "run an app LOCALLY"
+        c.description = "run the application command with all env vars set"
+        c.example "run a command locally",
+                  "pfab run_local"
+        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
+          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]
+
+          puts_and_system "#{env_var_string} #{options.command}"
+        end
+      end
+      alias_command :rl, :run_local
+
       default_command :help
 
       run!
@@ -196,14 +219,18 @@ module Pfab
       return true
     end
 
-    def cmd_generate_yaml
-      wrote = Pfab::Yamls.generate_for(apps: @apps,
-                                       application_yaml: @application_yaml,
-                                       env: $env,
-                                       sha: get_current_sha,
-                                       image_name: image_name,
-                                       config: config
+    def yy
+      Pfab::Yamls.new(apps: @apps,
+                      application_yaml: @application_yaml,
+                      env: $env,
+                      sha: get_current_sha,
+                      image_name: image_name,
+                      config: config
       )
+    end
+
+    def cmd_generate_yaml
+      wrote = yy.generate_all
       puts "Generated #{wrote}"
     end
 

data/lib/pfab/templates/base.rb

@@ -49,11 +49,11 @@ module Pfab
           { name: "DEPLOYED_NAME", value: @data['deployed_name'] },
         ]
 
-        load_env_vars(env_vars, @data["application_yaml"][:environment])
-        load_env_vars(env_vars, @data["application_yaml"][@data["env"]][:environment])
+        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["application_yaml"][:env_secrets])
-        load_secrets(env_vars, @data["application_yaml"][@data["env"]][:env_secrets])
+        load_secrets(env_vars, @data.dig("application_yaml", :env_secrets))
+        load_secrets(env_vars, @data.dig("application_yaml", @data["env"], :env_secrets))
 
         env_vars
       end

data/lib/pfab/yamls.rb

@@ -1,24 +1,39 @@
 require 'pry'
 module Pfab
   class Yamls
-    def self.generate_for(apps:, application_yaml:, image_name:, env:, sha:, config:)
-
-      apps.map do |app, props|
-        puts app
-
-        data = {
-          "env" => env.to_s,
-          'image_name' => image_name,
-          'sha' => sha,
-          'container_repository' => config["container.repository"],
-          'config' => config,
-          'props' => props,
-          'deployed_name' => app,
-          'application' => application_yaml["name"],
-          'application_yaml' => application_yaml
-        }
-
-        filename = ".application-k8s-#{env}-#{app}.yaml"
+
+    def initialize(apps:, application_yaml:, image_name:, env:, sha:, config:)
+      @apps = apps
+      @base_data = {
+        "env" => env.to_s,
+        'image_name' => image_name,
+        'sha' => sha,
+        'container_repository' => config["container.repository"],
+        'config' => config,
+        'application' => application_yaml["name"],
+        'application_yaml' => application_yaml
+      }
+    end
+
+    def env_vars(app)
+      template = Pfab::Templates::Base.new(data_for(app, @apps[app]))
+      template.env_vars
+    end
+
+    def data_for(app, props)
+      data = @base_data.clone
+      data['props'] = props
+      data['deployed_name'] = app
+      data
+    end
+
+    def generate_all
+
+      @apps.map do |app, props|
+
+        data = data_for(app, props)
+
+        filename = ".application-k8s-#{data["env"]}-#{app}.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.6.0 ruby lib
+# stub: pfab 0.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.6.0"
+  s.version = "0.7.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 = "2019-01-08"
+  s.date = "2019-01-10"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander