biosphere 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a63904122980f99e791afdbd4e49ad165ef26ac
-  data.tar.gz: d7d5ea118f8321eb6cac9173d633b2bd5ca49522
+  metadata.gz: bc686dce74249976a49fd057c0afe79a7fe09912
+  data.tar.gz: aa2aa286f7d61f3c9f0c8693f5368597303c1b8b
 SHA512:
-  metadata.gz: 4b3666b2efec558ca7d2d29356d8194078534dc777bbe02d26aae34a7db284d900b0e6ae96e2e0cb419cebaa3996f06baa78dc72de6e7f0f83020bc097461da0
-  data.tar.gz: 1af9536e8c8cbe9b0ebed3e93fbf0e2be42b6333640dc73ef56ac60fecb5aadd501998e5b09bd2443642c62c87b270d1f779c5a6d23a2e20061047ad3b5f3c7a
+  metadata.gz: 97e05ad763e9c9869e73b234cd6542f7b0c4451c170f1381b8ae88ed6365763de5653847b97e7bb3a3689cbb36939e389d57ee18e0d84c75f4026c8140c8b67b
+  data.tar.gz: 95c255c267f676aba43ff08b63cc3045a3c9cf7bcde66e6c2bea9c2c0a9dd0b6e19b4c94c8cc34aa30beaa6809a3f9da5657b383fa237e57795676ad22118491

data/bin/biosphere

@@ -180,8 +180,12 @@ elsif ARGV[0] == "commit" && options.src
         puts "\nOk, will not proceed with commit"
     elsif answer == "y"
         puts "\nApplying the changes (this may take several minutes)"
-        tf_apply = %x( terraform apply -state=#{options.build_dir}/#{deployment}.tfstate #{options.build_dir})
+        state_file = "#{options.build_dir}/#{deployment}.tfstate"
+        tf_apply = %x( terraform apply -state=#{state_file} #{options.build_dir})
         puts "\n" + tf_apply
+        puts "Loading outputs from #{state_file}"
+        suite.deployments[deployment].load_outputs(state_file)
+        state.save()
         s3.save("#{options.build_dir}/#{deployment}.tfstate")
         s3.save("#{options.build_dir}/state.node")
     end

data/lib/biosphere/deployment.rb

@@ -58,6 +58,7 @@ class Biosphere
             @resources = []
             @actions = {}
             @deployments = []
+            @outputs = []
 
             self.setup(settings)
 
@@ -124,10 +125,46 @@ class Biosphere
 
         end
 
-        def output(name, value)
+        def output(name, value, &block)
             @export["output"][name] = {
                 "value" => value
             }
+
+            if block_given?
+                output = {
+                    :name => name,
+                    :block => block
+                }
+
+                @outputs << output
+            end
+        end
+
+        def evaluate_outputs(outputs)
+
+            # Call first sub-deployments
+            @deployments.each do |deployment|
+                deployment.evaluate_outputs(outputs)
+            end
+            
+            @outputs.each do |output|
+                value = outputs[output[:name]]
+                instance_exec(value["value"], value, &output[:block])
+            end
+        end
+
+        def load_outputs(tfstate_filename)
+
+            begin
+                tf_state = JSON.parse(File.read(tfstate_filename))
+            rescue SystemCallError
+                puts "Couldn't read Terraform statefile, can't continue"
+                exit
+            end
+
+            outputs = tf_state["modules"].first["outputs"]
+
+            evaluate_outputs(outputs)
         end
 
         def evaluate_resources()

data/lib/biosphere/kube.rb

@@ -2,6 +2,7 @@ require 'yaml'
 require 'kubeclient'
 require 'erb'
 require 'hashdiff'
+require 'ostruct'
 
 class String
     # Converts "CamelCase"" into "camel_case"
@@ -114,6 +115,46 @@ class Biosphere
 
             end
 
+            def apply_resource(resource)
+                name = resource[:metadata][:name]
+                responses = []
+                not_found = false
+                begin
+                    response = get(resource)
+                rescue RestClient::NotFound => e
+                    not_found = true
+                end
+
+                if not_found
+                    begin
+                        response = post(resource)
+                        puts "Created resource #{response[:resource]}"
+                        responses << response
+                    rescue RestClient::UnprocessableEntity => e
+                        pp e
+                        pp JSON.parse(e.response.body)
+                    end
+                else
+                    puts "Updating resource #{response[:resource]}"
+
+                    # Get the current full resource from apiserver
+                    current_resource = response[:body]
+
+                    update_resource = Kube.kube_merge_resource_for_put!(current_resource, resource)
+
+                    begin
+                        responses << put(update_resource)
+                    rescue RestClient::Exception => e
+                        puts "Error updating resource: #{e} #{e.class}"
+                        pp JSON.parse(e.response)
+                    rescue RestClient::Exception => e
+                        puts "Misc exception: #{e}, #{e.class}, #{e.response}"
+                    end
+                    
+                    return responses
+                end
+            end
+
         end # end of class Client
 
         def kube_test(str)
@@ -124,25 +165,18 @@ class Biosphere
             return Client.new(hostname, ssl_options)
         end
 
-        def kube_load_manifest_files(dir)
-            files = Dir[dir + "/**/*.erb"]
-            resources = []
-            files.each do |file|
-                resources += kube_load_manifest_file(file)
-            end
-
-            files = Dir[dir + "/**/*.yaml"]
-            files.each do |file|
-                resources += kube_load_manifest_file(file)
-            end
+        def self.find_manifest_files(dir)
+            files = []
+            files += Dir[dir + "/**/*.erb"]
 
-            resources
+            files += Dir[dir + "/**/*.yaml"]
+            files
         end
 
-        def kube_load_manifest_file(file)
+        def self.load_resources(file, context={})
             resources = []
             puts "Loading file #{file}"
-            str = ERB.new(IO.read(file)).result(binding)
+            str = ERB.new(IO.read(file)).result(OpenStruct.new(context).instance_eval { binding })
             begin
                 Psych.load_stream(str) do |document|
                     kind = document["kind"]
@@ -206,44 +240,6 @@ class Biosphere
             return new_version
         end
 
-        def kube_apply_resource(client, resource)
-            name = resource[:metadata][:name]
-            responses = []
-            not_found = false
-            begin
-                response = client.get(resource)
-            rescue RestClient::NotFound => e
-                not_found = true
-            end
-
-            if not_found
-                begin
-                    response = client.post(resource)
-                    puts "Created resource #{response[:resource]}"
-                    responses << response
-                rescue RestClient::UnprocessableEntity => e
-                    pp e
-                    pp JSON.parse(e.response.body)
-                end
-            else
-                puts "Updating resource #{response[:resource]}"
-
-                # Get the current full resource from apiserver
-                current_resource = response[:body]
-
-                update_resource = Kube.kube_merge_resource_for_put!(current_resource, resource)
 
-                begin
-                    responses << client.put(update_resource)
-                rescue RestClient::Exception => e
-                    puts "Error updating resource: #{e} #{e.class}"
-                    pp JSON.parse(e.response)
-                rescue RestClient::Exception => e
-                    puts "Misc exception: #{e}, #{e.class}, #{e.response}"
-                end
-                
-                return responses
-            end
-        end        
     end
 end

data/lib/biosphere/suite.rb

@@ -100,6 +100,5 @@ class Biosphere
             end
 
         end
-
     end
 end

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.1.0"
+  Version = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biosphere
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec