kite 0.2.0 → 1.0.0

data/bin/concourse/out

@@ -7,33 +7,29 @@ params = Kite::Helpers::Concourse.params(STDIN.read)
 
 Kite::Helpers::Concourse.fatal '`source` missing' unless params['source']
 
-key = params['source']['json_key']
-kubeconfig = params['source']['kubeconfig']
+token = params['source']['token'] # kubectl service account token
+endpoint = params['source']['endpoint']
+cert = params['source']['certificate-authority']
 command = params['params']['command']
 
-Kite::Helpers::Concourse.fatal '`kubeconfig` missing' if kubeconfig.to_s.empty?
 Kite::Helpers::Concourse.fatal '`command` missing' if command.to_s.empty?
 
+path_certificate = '/tmp/ca.crt'
 path_key = '/tmp/key.json'
 path_kubeconfig = '/tmp/kubeconfig'
+cleaner = [/(token)=[^ ]*/, '\1=REDACTED']
 
-File.write(path_key, key) if key
-File.write(path_kubeconfig, kubeconfig)
-
-env = {
-  'KUBECONFIG' => path_kubeconfig,
-}
-
-if key
-  env['GOOGLE_CREDENTIALS'] = path_key
-  unless Kite::Helpers::Concourse.execute("gcloud auth activate-service-account --key-file=#{ path_key }", env)
-    ::Kite::Helpers::Concourse.respond(
-      version: { status: 'error' },
-      metadata: ["Failed to execute command #{ command }"]
-    )
-    exit 1
-  end
-end
+env = {}
+
+File.write(path_certificate, cert)
+env['KUBECONFIG'] = path_kubeconfig
+
+Kite::Helpers::Concourse.execute("kubectl config set-cluster concourse " \
+                                 "--embed-certs=true --server=#{ endpoint } " \
+                                 "--certificate-authority=#{ path_certificate }", env)
+Kite::Helpers::Concourse.execute("kubectl config set-credentials concourse --token='#{ token }'", env, cleaner)
+Kite::Helpers::Concourse.execute("kubectl config set-context concourse --cluster=concourse --user=concourse", env)
+Kite::Helpers::Concourse.execute("kubectl config use-context concourse", env)
 
 if Kite::Helpers::Concourse.execute(command, env)
   ::Kite::Helpers::Concourse.respond(version: { status: 'ok' })

data/docs/kite-concourse-resource.md

@@ -0,0 +1,45 @@
+# Kite concourse resource
+
+When you define kite resource you should defind `kubeconfig` or kite can generate it from defined `token`, `endpoint`, `user`, `cluster`, `certificate-authority` parameters.
+
+Here is description of parameters:
+- __token__ - service account token for your cluster
+- __endpoint__ - cluster server adress
+- __certificate-autority__ - service account certificate for cluster
+
+### Where to get this parameters ?
+
+Get secret's name
+```shell
+kubectl get serviceAccount <service_account_name> -oyaml
+echo -n SECRET | base64 -d
+```
+
+Then look on secret's yaml. Here you can find certificate-authority and token values:
+```shell
+kubectl get secrets <secrets_name> -oyaml
+echo -n SECRET | base64 -d
+```
+
+Find server address:
+```shell
+kubectl config view
+```
+
+*Example*
+
+```yaml
+resource_types:
+  - name: kite
+    type: docker-image
+    source:
+      repository: heliostech/kite
+
+resources:
+  - name: kite-test
+    type: kite
+    source:
+      token: {{sa_token}}
+      endpoint: {{server_ip}}
+      certificate-autority: {{certificate-autority}}
+```

data/kite.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "git"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "codecov"
 end

data/lib/kite.rb

@@ -1,6 +1,7 @@
 require 'erb'
 require 'yaml'
 require 'ipaddr'
+require 'git'
 require 'thor'
 
 require 'kite/version'
@@ -8,7 +9,8 @@ require 'kite/helpers'
 require 'kite/error'
 
 require 'kite/base'
-require 'kite/render'
 require 'kite/generate'
+require 'kite/module'
+require 'kite/terraform'
 require 'kite/core'
 require 'kite/cloud'

data/lib/kite/cloud.rb

@@ -20,6 +20,7 @@ class Kite::Cloud
     core.inside(name) do
       core.chmod('bin/kite', 0755)
     end
+    Git.init(name)
   end
 
 end

data/lib/kite/core.rb

@@ -13,8 +13,14 @@ module Kite
     desc "generate", "Generate IaC from configuration"
     subcommand "generate", Kite::Generate
 
-    desc 'render MANIFEST', 'Render manifest file from configuration and Terraform output'
-    subcommand "render", Kite::Render
+    desc 'module', 'Use kite modules with environments'
+    subcommand "module", Kite::Module
+
+    desc 'terraform', 'Run Terraform-related commands with environment variables loaded from module vars'
+    method_option :env, type: :string, desc: "Environment", required: true, default: ENV['KITE_ENV']
+    def terraform(command, *args)
+      Kite::Terraform.new(self, options).run(command, *args)
+    end
 
     desc "version", "Return kite version"
     # Return kite version

data/lib/kite/generate.rb

@@ -1,46 +1,8 @@
 module Kite
-  # Subcommand for rendering manifests, deployments etc.
+  # Subcommand for generating environments, services etc.
   class Generate < Base
     include Kite::Helpers
 
-    method_option :provider, type: :string, desc: "Cloud provider", enum: %w{aws gcp}, required: true
-    desc "cloud", "Generate cloud IaC from configuration"
-    # Generates Infrastructure as Code and setup scripts for the given cloud using values from <b>config/cloud.yml</b>
-    def cloud()
-      say "Generating cloud #{ options[:provider] } IaC", :green
-      @values = parse_cloud_config
-
-      case options[:provider]
-        when 'aws'
-          directory('aws/terraform',                          'terraform')
-          copy_file('aws/README.md',                          'README.md', force: true)
-          copy_file('aws/docs/kops.md',                       'docs/kops.md')
-
-          directory('aws/bin/base',                           'bin')
-          template('aws/bin/kops-deploy.sh.erb',              'bin/kops-deploy.sh')
-          template('aws/bin/kops-delete.sh.erb',              'bin/kops-delete.sh')
-          chmod('bin/bootstrap.sh', 0755)
-          chmod('bin/cleanup.sh', 0755)
-          chmod('bin/setup-tunnel.sh', 0755)
-          chmod('bin/kops-deploy.sh', 0755)
-          chmod('bin/kops-delete.sh', 0755)
-
-        when 'gcp'
-          directory('gcp/terraform',                          'terraform')
-          copy_file('gcp/README.md',                          'README.md', force: true)
-
-
-          directory('gcp/bin/base',                           'bin')
-          chmod('bin/bootstrap.sh', 0755)
-          chmod('bin/cleanup.sh', 0755)
-          chmod('bin/setup-tunnel.sh', 0755)
-
-        else
-          say 'Cloud provider not specified'
-
-      end
-    end
-
     method_option :name, type: :string, desc: "Task name", required: true
     desc "task", "Generate task IaC from configuration"
     def task()
@@ -71,15 +33,19 @@ module Kite
       directory('service', path)
     end
 
-    no_commands do
-      def output_path
-        @output ||= "config"
-      end
+    method_option :provider, type: :string, desc: "Cloud provider", enum: %w{aws gcp}, required: true
+    desc 'environment NAME', 'Generate an environment with base terraform files'
+    def environment(name)
+      say "Generating environment for #{options[:provider]}"
 
-      def app_name
-        @name ||= "app-name"
+      unless parse_cloud_config.key? name
+        append_to_file 'config/cloud.yml', "\n#{name}:\n  <<: *default\n"
       end
-    end
 
+      @cloud = parse_cloud_config[name]
+      @env_name = name
+
+      directory("#{options[:provider]}/environment", "config/environments/#{name}")
+    end
   end
 end

data/lib/kite/helpers.rb

@@ -4,22 +4,6 @@ module Kite::Helpers
     raise Kite::Error, 'The config/cloud.yml is not filled out!' unless config.find { |key, hash| hash.find { |k, v| v.nil? } }.nil?
   end
 
-  # Check if Terraform IaC was applied
-  def check_terraform_applied
-    raise Kite::Error, 'Did you terraform apply? terraform.tfstate is missing!' unless File.file? "terraform/terraform.tfstate"
-  end
-
-  # Parse Terraform .tfstate file, returning the output hash
-  def parse_tf_state(path)
-    check_terraform_applied
-
-    tf_state = YAML.load(File.read(path))
-    tf_output = tf_state["modules"].first["outputs"]
-    tf_output.map { |k, v| tf_output[k] = v["value"] }
-
-    tf_output
-  end
-
   # Parse config/cloud.yml, returning the output hash
   def parse_cloud_config
     cloud_config = YAML.load(File.read('config/cloud.yml'))
@@ -27,60 +11,4 @@ module Kite::Helpers
 
     cloud_config
   end
-
-  # Return public subnet id depending on
-  # whether it's declared in config/cloud.yml or not
-  def conditional_subnet_id(values)
-    subnet_id = values['aws']['public_subnet']['id']
-
-    if subnet_id.empty?
-      '${aws_subnet.platform_dmz.id}'
-    else
-      subnet_id
-    end
-  end
-
-  # Return vpc id depending on
-  # whether it's declared in config/cloud.yml or not
-  def conditional_vpc_id(values)
-    vpc_id = values['aws']['vpc_id']
-
-    if vpc_id.empty?
-      '${aws_vpc.platform.id}'
-    else
-      vpc_id
-    end
-  end
-
-
-
-
-  # Returns subnet's IP range slice in a BOSH manifest-compatible way
-  def ip_range(subnet, range)
-
-    subnet = subnet.to_a # Turn subnet into array representation to be DRY
-
-    case range
-    when Integer
-      raise Kite::Error, 'Range number less than one in ip_range()' if range < 1
-
-      subnet[0].to_s + '-' + subnet[range].to_s
-
-    when Array
-      raise Kite::Error, 'Invalid number of elements in ip_range()' unless range.length == 2
-      raise Kite::Error, 'Second index is less than the first one in ip_range()' if range.last < range.first
-
-      subnet[range.first].to_s + '-' + subnet[range.last].to_s
-
-    when Range
-      raise Kite::Error, 'Second index is less than the first one in ip_range()' if range.last < range.first
-
-      range = range.to_a
-      subnet[range.first].to_s + '-' + subnet[range.last].to_s
-
-    else
-      raise Kite::Error, 'Unsupported range type for ip_range()'
-    end
-  end
-
 end

data/lib/kite/helpers/concourse.rb

@@ -24,8 +24,9 @@ module Kite
         exit 1
       end
 
-      def self.execute(command, env = {})
-        log("+ #{ command }")
+      def self.execute(command, env = {}, gsub_log_args = nil)
+        command_log = gsub_log_args ? command.gsub(*gsub_log_args) : command
+        log("+ #{ command_log }")
         Open3.popen2e(env, command) do |stdin, stdout, wait_thr|
           ::Kite::Helpers::Concourse.log(stdout.read)
           return wait_thr.value.exitstatus.zero?

data/lib/kite/module.rb

@@ -0,0 +1,76 @@
+module Kite
+  class Module < Base
+    include Kite::Helpers
+
+    method_option :env, type: :string, desc: "Environment", required: true, default: ENV['KITE_ENV']
+    desc 'init https://github.com/foo/bar-module', 'Initialize a kite module and render its vars.module.yml'
+    def init(uri)
+      @uri  = uri
+      @name = uri.gsub(/(.*:|.git)/, '').split('/').last
+      @path = "modules/#{@name}"
+      @env  = options[:env]
+
+      say "Cloning the #{@name} module"
+      clone_module
+
+      say "Rendering vars"
+      render_vars
+
+      say "Use git submodule add #{@path} to be able to commit this module as a submodule", :yellow
+      say "Rendered successfully, please fill out config/environments/#{@env}/vars.#{@name}.yml with correct values", :green
+    end
+
+    method_option :env, type: :string, desc: "Environment", required: true, default: ENV['KITE_ENV']
+    desc 'render PATH', 'Render kite module files using vars.*module*.yml'
+    def render(path)
+      @path  = path
+      @name  = @path.split('/').last
+      @env   = options[:env]
+      @vars  = load_vars
+      @cloud = parse_cloud_config[@env]
+
+      say "Rendering files"
+      render_templates
+    end
+
+    no_commands do
+      def kite_env
+        @env
+      end
+
+      def clone_module
+        if File.exist? @path
+          overwrite = ask "#{@path} already contains a module! Overwrite? (y/N)"
+
+          if overwrite.downcase == 'y'
+            remove_dir @path
+            Git.clone(@uri, @path)
+            say "Successfully cloned the fresh version!", :green
+          else
+            say "Keeping the current module"
+          end
+        else
+          Git.clone(@uri, @path)
+        end
+      end
+
+      def render_vars
+        create_file "config/environments/#{@env}/vars.#{@name}.yml", YAML.dump(manifest['variables'])
+      end
+
+      def render_templates
+        directory "#{ENV['PWD']}/modules/#{@name}/templates", ".", mode: :preserve
+        chmod     "bin", 0755
+      end
+
+      def load_vars
+        YAML.load(File.open("config/environments/#{@env}/vars.#{@name}.yml"))
+      end
+
+      def manifest
+        YAML.load(File.open("modules/#{@name}/manifest.yml"))
+      end
+    end
+
+  end
+end

data/lib/kite/terraform.rb

@@ -0,0 +1,45 @@
+module Kite
+  class Terraform
+
+    def initialize(core, options)
+      @core = core
+      @env_name = options[:env]
+    end
+
+    def run(command, *args)
+      STDERR.puts "Loading env"
+      load_env
+      script = "terraform #{command} #{args.join " "}"
+      STDERR.puts script
+
+      Dir.chdir("config/environments/#{@env_name}") do
+        system(script)
+      end
+    end
+
+    def load_env
+      load_vars
+      @vars.each do |var, val|
+        key = "TF_VAR_#{var}"
+        ENV[key] = val
+        STDERR.puts "%-25s: %s" % [key, ENV["TF_VAR_#{var}"]]
+      end
+
+      # TODO: Need to be set only in case of GCP
+      # ENV['GOOGLE_APPLICATION_CREDENTIALS'] = @vars["credentials"]
+    end
+
+    def cloud
+      YAML.load(File.read('config/cloud.yml'))[@env_name]
+    end
+
+    def load_vars
+      vars_files = Dir["config/environments/#{@env_name}/vars.*.yml"]
+      @vars = Hash.new
+      vars_files.each do |f|
+        tf_vars = YAML.load(File.read(f))['terraform']
+        @vars.merge!(tf_vars) unless tf_vars.nil?
+      end
+    end
+  end
+end