configgin 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa8713f79b21460455aa6549b7058438b92e8d58
-  data.tar.gz: fc456cd39b9983f7c03bf3ab3190de6df98f5ea2
+  metadata.gz: 2fd6e663cebb90b482b7d3672a7247c0045c0f03
+  data.tar.gz: c3d44b7a474628a4ee744779a0e266ce600efa97
 SHA512:
-  metadata.gz: f5ea0526b57743572c06ac2ced4a24973daacd1c12e4fefc2d2a3d446b762875a6af8c81f704ba1a10a00423bd96aeea1efd0ecf277b78b53442a66f618f7da7
-  data.tar.gz: f3b3cff5cb6698e8a84bbd7db304fc1d16b837d9fed62dc34c9adc623713602220d26efb35671c8defb8ffe9340e7f488f98d8802dfdbfa8580e7fe465d6f802
+  metadata.gz: 50fc06f1a221322027a8b8e8a3765efbeefe072e1c7496362cee129ea2c09d2e57ab9bffeb079f688f9fd4b0ad0e3e88134d4e21fcbf263ec43730d6e6bc6648
+  data.tar.gz: f5994ae6ef79a9e97f0466ced1e8c1c8f4b5bff0fa457be66359a3904fc090c51848238a9530927f659ebe41677108e7774bfb62bf1f47ee8ee1678e61989fc1

data/.ruby-version

@@ -1 +1 @@
-2.1.7
+2.3.1

data/Gemfile

@@ -5,4 +5,6 @@ gemspec
 group :test do
   gem 'rspec'
   gem 'rubocop'
+  gem 'guard'
+  gem 'guard-rspec'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    configgin (0.17.0)
+    configgin (0.18.0)
       bosh-template (~> 2.0)
       deep_merge (~> 1.1)
       kubeclient (~> 2.0)
@@ -13,13 +13,30 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    ast (2.3.0)
+    ast (2.4.0)
     bosh-template (2.2.0)
       semi_semantic (~> 1.2.0)
+    coderay (1.1.2)
     deep_merge (1.2.1)
     diff-lcs (1.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
+    ffi (1.9.25)
+    formatador (0.2.5)
+    guard (2.14.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     http (2.2.2)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -29,51 +46,75 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
+    jaro_winkler (1.5.1)
     kubeclient (2.5.2)
       http (>= 0.98, < 3)
       recursive-open-struct (~> 1.0.0)
       rest-client
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.13)
+    method_source (0.9.0)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     mustache (1.0.5)
+    nenv (0.3.0)
     netrc (0.11.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parallel (1.12.1)
+    parser (2.5.1.2)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     public_suffix (3.0.3)
-    rainbow (2.1.0)
-    rake (10.4.2)
+    rainbow (2.2.2)
+      rake
+    rake (10.5.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     recursive-open-struct (1.0.5)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.59.2)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.10.0)
+    ruby_dep (1.5.0)
     semi_semantic (1.2.0)
+    shellany (0.0.1)
+    thor (0.20.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.4.0)
 
 PLATFORMS
   ruby
@@ -81,9 +122,11 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.10)
   configgin!
+  guard
+  guard-rspec
   rake (~> 10.0)
   rspec
   rubocop
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/Guardfile

@@ -0,0 +1,14 @@
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+end

data/bin/configgin

@@ -15,68 +15,4 @@ rescue ArgMissingError => e
   exit(1)
 end
 
-job_configs = JSON.parse(File.read(options[:jobs]))
-templates = YAML.load_file(options[:env2conf])
-
-# SVC_ACC_PATH is the location of the service account secrets
-SVC_ACC_PATH = '/var/run/secrets/kubernetes.io/serviceaccount'.freeze
-
-kube_client = Kubeclient::Client.new(
-  URI::HTTPS.build(host: ENV['KUBERNETES_SERVICE_HOST'],
-                   port: ENV['KUBERNETES_SERVICE_PORT_HTTPS']),
-  'v1',
-  ssl_options: {
-    ca_file: "#{SVC_ACC_PATH}/ca.crt",
-    verify_ssl: OpenSSL::SSL::VERIFY_PEER
-  },
-  auth_options: {
-    bearer_token: File.read("#{SVC_ACC_PATH}/token")
-  }
-)
-kube_client_stateful_set = Kubeclient::Client.new(
-  URI::HTTPS.build(host: ENV['KUBERNETES_SERVICE_HOST'],
-                   port: ENV['KUBERNETES_SERVICE_PORT_HTTPS'],
-                   path: '/apis/apps'),
-  'v1beta1',
-  ssl_options: {
-    ca_file: "#{SVC_ACC_PATH}/ca.crt",
-    verify_ssl: OpenSSL::SSL::VERIFY_PEER
-  },
-  auth_options: {
-    bearer_token: File.read("#{SVC_ACC_PATH}/token")
-  }
-)
-kube_namespace = File.read("#{SVC_ACC_PATH}/namespace")
-
-jobs = {}
-job_configs.each do |job, job_config|
-  base_config = JSON.parse(File.read(job_config['base']))
-
-  begin
-    bosh_spec = EnvironmentConfigTransmogrifier.transmogrify(base_config,
-                                                             templates,
-                                                             secrets: '/etc/secrets')
-  rescue NonHashValueOverride => e
-    STDERR.puts e.to_s
-    STDERR.puts "Error generating #{job}: #{outfile} from #{infile}"
-    exit 1
-  end
-
-  jobs[job] = Job.new(bosh_spec, kube_namespace, kube_client, kube_client_stateful_set)
-end
-
-jobs.each do |name, job|
-  kube_client.patch_pod(
-    ENV['HOSTNAME'],
-    { metadata: { annotations: { :"skiff-exported-properties-#{name}" => job.exported_properties.to_json } } },
-    kube_namespace
-  )
-end
-
-jobs.each do |job_name, job|
-  dns_encoder = KubeDNSEncoder.new(job.spec['links'])
-
-  job_configs[job_name]['files'].each do |infile, outfile|
-    job.generate(infile, outfile, dns_encoder)
-  end
-end
+Configgin.new(options).run

data/lib/base_transmogrifier.rb

@@ -0,0 +1,31 @@
+# BaseTransmogrifier holds shared code for the transmogrifier classes
+class BaseTransmogrifier
+  def self.inject_value(hash, key_grams, value, original_key)
+    # if we only have 1 gram, we can set the value
+    if key_grams.size == 1
+      # If the new value is nil, and the old value was a hash, it's because
+      # somebody didn't provide a full default value; ignore it.
+      unless value.nil? && hash[key_grams[0]].is_a?(Hash)
+        hash[key_grams[0]] = value
+      end
+      return
+    end
+
+    # if there's more than one gram, keep going
+
+    # Initialize a hash if we're going deeper than what's currently available;
+    # sometimes we want to override when the old value is nil (i.e. no default)
+    # but the new value is a hash.
+    hash[key_grams[0]] = {} if hash[key_grams[0]].nil?
+    # error out if we're trying to override
+    # an existing value that's not a hash
+    unless hash[key_grams[0]].is_a?(Hash)
+      raise NonHashValueOverride, \
+            "Refusing to override non-hash value #{hash[key_grams[0]].inspect} " \
+            "with #{value.inspect}: '#{key_grams.join('.')}'" \
+            " - Complete key: '#{original_key}'"
+    end
+    # keep going deeper
+    inject_value(hash[key_grams[0]], key_grams.drop(1), value, original_key)
+  end
+end

data/lib/bosh_deployment_manifest.rb

@@ -0,0 +1,40 @@
+require 'yaml'
+
+# BoshDeploymentManifest is used to parse BOSH manifests
+class BoshDeploymentManifest
+  def initialize(path)
+    @manifest = YAML.load_file(path)
+  end
+
+  def properties_for_instance_group(instance_group_name)
+    return @properties[instance_group] if @properties && @properties[instance_group]
+
+    instance_group = @manifest['instance_groups'].find { |group| group['name'] == instance_group_name }
+    return [] unless instance_group
+
+    properties = {}
+    instance_group['jobs'].each do |job|
+      next unless job.key?('properties')
+
+      job['properties'].each do |key, value|
+        inject_properties(properties, job, key, value)
+      end
+    end
+
+    @properties ||= {}
+    @properties[instance_group] = properties
+  end
+
+  private
+
+  def inject_properties(properties, job, key, value)
+    case value
+    when Hash
+      value.each do |sub_key, sub_value|
+        inject_properties(properties, job, "#{key}.#{sub_key}", sub_value)
+      end
+    else
+      properties["#{job['name']}.#{key}"] = value
+    end
+  end
+end

data/lib/bosh_deployment_manifest_config_transmogrifier.rb

@@ -0,0 +1,13 @@
+require_relative 'base_transmogrifier'
+
+# BoshDeploymentManifestConfigTransmogrifier extracts property values from a bosh
+# manifest and updates the config accordingly.
+class BoshDeploymentManifestConfigTransmogrifier < BaseTransmogrifier
+  def self.transmogrify(base_config, instance_group, bosh_deployment_manifest)
+    bosh_deployment_manifest.properties_for_instance_group(instance_group).each do |key, value|
+      full_key = 'properties.' + key
+      inject_value(base_config, full_key.split('.'), value, full_key)
+    end
+    base_config
+  end
+end

data/lib/cli.rb

@@ -34,6 +34,11 @@ module Cli
         options[:env2conf] = e
       end
 
+      # Bosh deployment manifest
+      opts.on('-b', '--bosh-deployment-manifest', 'Bosh deployment manifest') do |b|
+        options[:bosh_deployment_manifest] = b
+      end
+
       opts.on('--version', 'Print the configgin version') do
         puts Configgin::VERSION
         exit 0

data/lib/configgin.rb

@@ -1,4 +1,112 @@
 require_relative 'cli'
 require_relative 'job'
 require_relative 'environment_config_transmogrifier'
+require_relative 'bosh_deployment_manifest_config_transmogrifier'
 require_relative 'kube_link_generator'
+require_relative 'bosh_deployment_manifest'
+
+# Configgin is the main class which puts all the pieces together and configures
+# the container according to the options.
+class Configgin
+  # SVC_ACC_PATH is the location of the service account secrets
+  SVC_ACC_PATH = '/var/run/secrets/kubernetes.io/serviceaccount'.freeze
+
+  def initialize(options)
+    @job_configs = JSON.parse(File.read(options[:jobs]))
+    @templates = YAML.load_file(options[:env2conf])
+    @bosh_deployment_manifest = options[:bosh_deployment_manifest]
+  end
+
+  def run
+    jobs = generate_jobs(@job_configs, @templates)
+    set_job_metadata(jobs)
+    render_job_templates(jobs, @job_configs)
+  end
+
+  def generate_jobs(job_configs, templates)
+    jobs = {}
+    job_configs.each do |job, job_config|
+      base_config = JSON.parse(File.read(job_config['base']))
+
+      begin
+        bosh_spec = EnvironmentConfigTransmogrifier.transmogrify(base_config, templates, secrets: '/etc/secrets')
+
+        if @bosh_deployment_manifest
+          manifest = BoshDeploymentManifest.new(@bosh_deployment_manifest)
+          bosh_spec = BoshDeploymentManifestConfigTransmogrifier.transmogrify(bosh_spec, ENV['HOSTNAME'], manifest)
+        end
+      rescue NonHashValueOverride => e
+        STDERR.puts e.to_s
+        STDERR.puts "Error generating #{job}: #{outfile} from #{infile}"
+        exit 1
+      end
+
+      jobs[job] = Job.new(bosh_spec, @kube_namespace, kube_client, kube_client_stateful_set)
+    end
+  end
+
+  def set_job_metadata(jobs)
+    jobs.each do |name, job|
+      kube_client.patch_pod(
+        ENV['HOSTNAME'],
+        { metadata: { annotations: { :"skiff-exported-properties-#{name}" => job.exported_properties.to_json } } },
+        @kube_namespace
+      )
+    end
+  end
+
+  def render_job_templates(jobs, job_configs)
+    jobs.each do |job_name, job|
+      dns_encoder = KubeDNSEncoder.new(job.spec['links'])
+
+      job_configs[job_name]['files'].each do |infile, outfile|
+        job.generate(infile, outfile, dns_encoder)
+      end
+    end
+  end
+
+  def kube_namespace
+    @kube_namespace ||= File.read("#{SVC_ACC_PATH}/namespace")
+  end
+
+  def kube_token
+    @kube_token ||= File.read("#{SVC_ACC_PATH}/token")
+  end
+
+  private
+
+  def kube_client
+    @kube_client ||= Kubeclient::Client.new(
+      URI::HTTPS.build(
+        host: ENV['KUBERNETES_SERVICE_HOST'],
+        port: ENV['KUBERNETES_SERVICE_PORT_HTTPS']
+      ),
+      'v1',
+      ssl_options: {
+        ca_file: "#{SVC_ACC_PATH}/ca.crt",
+        verify_ssl: OpenSSL::SSL::VERIFY_PEER
+      },
+      auth_options: {
+        bearer_token: kube_token
+      }
+    )
+  end
+
+  def kube_client_stateful_set
+    @kube_client_stateful_set ||= Kubeclient::Client.new(
+      URI::HTTPS.build(
+        host: ENV['KUBERNETES_SERVICE_HOST'],
+        port: ENV['KUBERNETES_SERVICE_PORT_HTTPS'],
+        path: '/apis/apps'
+      ),
+      'v1beta1',
+      ssl_options: {
+        ca_file: "#{SVC_ACC_PATH}/ca.crt",
+        verify_ssl: OpenSSL::SSL::VERIFY_PEER
+      },
+      auth_options: {
+        bearer_token: kube_token
+      }
+    )
+  end
+end

data/lib/configgin/version.rb

@@ -1,3 +1,3 @@
-module Configgin
-  VERSION = '0.17.0'.freeze
+class Configgin
+  VERSION = '0.18.0'.freeze
 end

data/lib/environment_config_transmogrifier.rb

@@ -1,10 +1,13 @@
 require 'yaml'
 require 'mustache'
 require 'shellwords'
+require 'tmpdir'
+
+require_relative 'base_transmogrifier'
 
 # EnvironmentConfigTransmogrifier uses environment variables to generate config values
 # for specific keys.
-module EnvironmentConfigTransmogrifier
+class EnvironmentConfigTransmogrifier < BaseTransmogrifier
   @@memoize_mustache = {}
 
   # NoEscapeMustache does not escape these characters: & \ " < > '
@@ -98,33 +101,4 @@ module EnvironmentConfigTransmogrifier
       hash[key.upcase.tr('-', '_')] = value
     end
   end
-
-  def self.inject_value(hash, key_grams, value, original_key)
-    # if we only have 1 gram, we can set the value
-    if key_grams.size == 1
-      # If the new value is nil, and the old value was a hash, it's because
-      # somebody didn't provide a full default value; ignore it.
-      unless value.nil? && hash[key_grams[0]].is_a?(Hash)
-        hash[key_grams[0]] = value
-      end
-      return
-    end
-
-    # if there's more than one gram, keep going
-
-    # Initialize a hash if we're going deeper than what's currently available;
-    # sometimes we want to override when the old value is nil (i.e. no default)
-    # but the new value is a hash.
-    hash[key_grams[0]] = {} if hash[key_grams[0]].nil?
-    # error out if we're trying to override
-    # an existing value that's not a hash
-    unless hash[key_grams[0]].is_a?(Hash)
-      raise NonHashValueOverride, \
-            "Refusing to override non-hash value #{hash[key_grams[0]].inspect} " \
-            "with #{value.inspect}: '#{key_grams.join('.')}'" \
-            " - Complete key: '#{original_key}'"
-    end
-    # keep going deeper
-    inject_value(hash[key_grams[0]], key_grams.drop(1), value, original_key)
-  end
 end

data/lib/job.rb

@@ -11,7 +11,7 @@ class Job
     links = @spec['links'] = KubeLinkSpecs.new(@spec, @namespace, @client, client_stateful_set)
 
     # Figure out whether _this_ should bootstrap
-    pods = @client.get_pods(namespace: @namespace, label_selector: "skiff-role-name=#{self_role}")
+    pods = @client.get_pods(namespace: @namespace, label_selector: "app.kubernetes.io/component=#{self_role}")
     pods_per_image = links.get_pods_per_image(pods)
     @spec['bootstrap'] = pods_per_image[self_pod.metadata.uid] < 2
   end
@@ -41,7 +41,7 @@ class Job
   end
 
   def self_role
-    self_pod['metadata']['labels']['skiff-role-name']
+    self_pod['metadata']['labels']['app.kubernetes.io/component']
   end
 
   # Process the given template using a provided spec and output filename

data/lib/kube_link_generator.rb

@@ -37,7 +37,7 @@ class KubeLinkSpecs
   end
 
   def _get_pods_for_role(role_name)
-    client.get_pods(namespace: namespace, label_selector: "skiff-role-name=#{role_name}")
+    client.get_pods(namespace: namespace, label_selector: "app.kubernetes.io/component=#{role_name}")
   end
 
   def get_pods_for_role(role_name, job, options = {})

data/make/include/darwin-support

@@ -20,7 +20,7 @@ if [ "$(uname)" == "Darwin" ]; then
        --workdir ${WORK_DIR} \
        --entrypoint bash \
        ${DOCKER_RUNTIME} \
-       -l -c "export RBENV_VERSION=2.1.7 && ${BASH_SOURCE[1]}"
+       -l -c "${BASH_SOURCE[1]}"
 
     exit
 fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configgin
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.md
 - Makefile
 - NOTICE
@@ -139,6 +140,9 @@ files:
 - bin/configgin
 - bin/setup
 - configgin.gemspec
+- lib/base_transmogrifier.rb
+- lib/bosh_deployment_manifest.rb
+- lib/bosh_deployment_manifest_config_transmogrifier.rb
 - lib/cli.rb
 - lib/configgin.rb
 - lib/configgin/version.rb
@@ -177,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A simple cli app in Ruby to generate configurations using BOSH ERB templates