biosphere 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c051409302775143098ba72247418e91385e4cc
-  data.tar.gz: cad36da8533ac2d075305cef509a853dc66de7ee
+  metadata.gz: daf18083e0cee8c170b5cedf2362398fcc8cedd6
+  data.tar.gz: 374321563d2b570797295cbd4fe2bee0c5ac5269
 SHA512:
-  metadata.gz: 3588e145bcd8718e9d60a3d1d622805ae7e51e21db5e64f521eef54a80d689d1e423e68fd08e13f783e7f93e6ecb5bfd6be9b03609b6b434a8801e5e420c4ec5
-  data.tar.gz: 06dbd8f38a6e4c02af639559217a3466434f55dbb2a3e0993571f4901c54962a1420732cf9fd44fe66384e14bcb10482a6af3092273ab9187d62f5c6f0caea58
+  metadata.gz: f635d48699b79efc3a77d1e147f730f0a3907a7fd7b952b3f4d7e98771da834c4ce5c27d3301f869c4ac634c7c4925d32b9d5c53c6f2ed9357f5f64000d3ed98
+  data.tar.gz: 5b9ee10cdccb717bc152e431949458efd02a8ece9fc43f925f34b8e535fb447658350f82e5c86e62abcce9235d10837205c3682ddedffa8d935c76a04871e501

data/bin/biosphere

@@ -5,6 +5,7 @@ require 'optparse'
 require 'ostruct'
 require 'pp'
 require "awesome_print"
+require 'colorize'
 
 class BiosphereOpts
 
@@ -49,7 +50,9 @@ class BiosphereOpts
 
 end
 
-
+if !STDOUT.isatty
+	String.disable_colorization true
+end
 
 options = BiosphereOpts.parse(ARGV)
 

data/lib/biosphere/kube.rb

@@ -24,10 +24,105 @@ end
 
 class Biosphere
     module Kube
+
+        class Client
+            def initialize(hostname, ssl_options)
+                @clients = []
+
+                @clients << ::Kubeclient::Client.new("#{hostname}/api" , "v1", ssl_options: ssl_options)
+                @clients << ::Kubeclient::Client.new("#{hostname}/apis/extensions/" , "v1beta1", ssl_options: ssl_options)
+
+                @clients.each { |c| c.discover }
+            end
+
+            def get_resource_name(resource)
+                resource_name = nil
+                kind = resource[:kind].underscore_case
+                @clients.each do |c|
+                    if c.instance_variable_get("@entities")[kind]
+                        return c.instance_variable_get("@entities")[kind].resource_name
+                    end
+                end
+                return nil
+            end
+
+            def get_client(resource)
+                kind = resource[:kind].underscore_case
+                @clients.each do |c|
+                    if c.instance_variable_get("@entities")[kind]
+                        return c
+                    end
+                end
+                return nil
+            end
+
+            def post(resource)
+                name = resource[:metadata][:name]
+                client = get_client(resource)
+                resource_name = get_resource_name(resource)
+
+                if !client
+                    raise ArgumentError, "Unknown resource #{resource[:kind]} of #{name} for kubernetes. Maybe this is in a new extension api?"
+                end
+
+                ns_prefix = client.build_namespace_prefix(resource[:metadata][:namespace])
+                ret =  client.rest_client[ns_prefix + resource_name].post(resource.to_h.to_json, { 'Content-Type' => 'application/json' }.merge(client.instance_variable_get("@headers")))
+                return {
+                    action: :post,
+                    resource: ns_prefix + resource_name + "/#{name}",
+                    body: JSON.parse(ret.body, :symbolize_names => true)
+                }
+            end
+
+            def get(resource)
+                name = resource[:metadata][:name]
+                client = get_client(resource)
+                resource_name = get_resource_name(resource)
+
+                if !client
+                    raise ArgumentError, "Unknown resource #{resource[:kind]} of #{name} for kubernetes. Maybe this is in a new extension api?"
+                end
+
+                ns_prefix = client.build_namespace_prefix(resource[:metadata][:namespace])
+                key = ns_prefix + resource_name + "/#{name}"
+                ret = client.rest_client[key].get(client.instance_variable_get("@headers"))
+                return {
+                    action: :get,
+                    resource: key,
+                    body: JSON.parse(ret.body, :symbolize_names => true)
+                }
+            end
+
+            def put(resource)
+                name = resource[:metadata][:name]
+                client = get_client(resource)
+                resource_name = get_resource_name(resource)
+
+                if !client
+                    raise ArgumentError, "Unknown resource #{resource[:kind]} of #{name} for kubernetes. Maybe this is in a new extension api?"
+                end
+
+                ns_prefix = client.build_namespace_prefix(resource[:metadata][:namespace])
+                key = ns_prefix + resource_name + "/#{name}"
+                ret = client.rest_client[key].put(resource.to_h.to_json, { 'Content-Type' => 'application/json' }.merge(client.instance_variable_get("@headers")))
+                return {
+                    action: :put,
+                    resource: key,
+                    body: JSON.parse(ret.body, :symbolize_names => true)
+                }
+
+            end
+
+        end
+
         def kube_test(str)
             return str
         end
 
+        def kube_get_client(hostname, ssl_options)
+            return Client.new(hostname, ssl_options)
+        end
+
         def kube_load_manifest_files(dir)
             files = Dir[dir + "/**/*.erb"]
             resources = []
@@ -47,10 +142,31 @@ class Biosphere
             resources = []
             puts "Loading file #{file}"
             str = ERB.new(IO.read(file)).result(binding)
-            Psych.load_stream(str) do |document|
-                kind = document["kind"]
-                resource = ::Kubeclient::Resource.new(document)
-                resources << resource
+            begin
+                Psych.load_stream(str) do |document|
+                    kind = document["kind"]
+                    resource = ::Kubeclient::Resource.new(document)
+                    resources << resource
+                end
+            rescue Psych::SyntaxError => e
+                STDERR.puts "\n"
+                STDERR.puts "YAML syntax error while parsing file #{file}. Notice this happens after ERB templating, so line numbers might not match."
+                STDERR.puts "Here are the relevant lines. Error '#{e.problem}' occured at line #{e.line}"
+                STDERR.puts "Notice that yaml is very picky about indentation when you have arrays and maps. Check those first."
+                lines = str.split("\n")
+                start_line = [0, e.line - 3].max
+                end_line = [lines.length - 1, e.line + 3].min
+                lines[start_line..end_line].each_with_index do |line, num|
+                    num += start_line
+                    if num == e.line
+                        STDERR.printf("%04d>  %s\n".red, num, line)
+                    else
+                        STDERR.printf("%04d|  %s\n", num, line)
+                    end
+
+                end
+                STDERR.puts "\n"
+                raise e
             end
             return resources
         end
@@ -68,41 +184,27 @@ class Biosphere
 
         def kube_apply_resource(client, resource)
             name = resource[:metadata][:name]
-            resource_name = client.instance_variable_get("@entities")[resource[:kind].underscore_case].resource_name
-            ns_prefix = client.build_namespace_prefix(resource[:metadata][:namespace])
-
             responses = []
             begin
-                ret = client.rest_client[ns_prefix + resource_name]
-                .post(resource.to_h.to_json, { 'Content-Type' => 'application/json' }.merge(client.instance_variable_get("@headers")))
-                responses << {
-                    action: :post,
-                    resource: ns_prefix + resource_name + "/#{name}",
-                    body: JSON.parse(ret.body)
-                }
-                puts "Created resource #{ns_prefix + resource_name}/#{name}"
+                response = client.post(resource)
+                puts "Created resource #{response[:resource]}"
+                responses << response
 
             rescue RestClient::Conflict => e
-                key = ns_prefix + resource_name + "/#{name}"
-                rest = client.rest_client[key]
-
-                ret = rest.get(client.instance_variable_get("@headers"))
-                current_data = JSON.parse(ret.body, :symbolize_names => true)
-                puts "Updating resource #{key}"
-                headers = { 'Content-Type' => 'application/json' }.merge(client.instance_variable_get("@headers"))
-                update_resource = resource.dup
-                update_resource.delete_field(:apiVersion)
-                current_data.merge(update_resource)
-                pp current_data.to_h
+                response = client.get(resource)
+                puts "Updating resource #{response[:resource]}"
+
+                # Get the current full resource from apiserver
+                update_resource = response[:body]
+
+                # Merge the updates on top of it
+                update_resource.merge(resource)
+
+                # Remove fields which apiserver refuses to accept in PUT requests
+                update_resource.delete(:apiVersion)
                 
                 begin
-                    ret = rest.put(current_data.to_h.to_json, headers)
-                    responses << {
-                        action: :put,
-                        resource: key,
-                        body: JSON.parse(ret.body)
-                    }
-                    
+                    responses << client.put(update_resource)
                 rescue RestClient::Exception => e
                     puts "Error updating resource: #{e} #{e.class}"
                     pp JSON.parse(e.response)

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.0.9"
+  Version = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biosphere
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 description: "Terraform's HCL lacks quite many programming features like iterators,
   true variables, advanced string manipulation, functions etc.\n\n  This Ruby tool
   provides an easy-to-use DSL to define Terraform compatible .json files which can