biosphere 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0459a0449bf2038aed5733a7c5797a16d05565c7
-  data.tar.gz: 0ba58ee53dd1cced9c435ce00daa960997bb217a
+  metadata.gz: 347ecc8394215627d48fae451787d293607fdbad
+  data.tar.gz: 8f8e03cc288495d430e0477fa74b5eeb12a933fe
 SHA512:
-  metadata.gz: 4d063d3d43599ac7b9ff2dd63541aeefa3e70362478cba3e12db3c08086aa880a63892fde8ddf1f450c913a446e7c94cb17818ed59d87d645e9e1e5010c80730
-  data.tar.gz: fa7f3248955060ce0ac67539c0d5ac99b376f9bd8961936a167cee9c1b87142ff09686fbff0f85f7b23ce740d309f8beb223eb949cd8a6e7810b02362782afbb
+  metadata.gz: 8238bcfcc308dde2a1ee51d88cd6eed69f092f22cef45813b275219358811fd88c12e62c2063ddea6661c6a16c03085bb6b637a3765b896920ed4dbb37700f8c
+  data.tar.gz: a3d298603618dcd1163b7e46e8d9578873d471c0378b858be6afb343a8763f9db160e7ecd692e4cda45a703c9a7d0819ba3637d55bcb4d17f7ee15f86d99a58c

data/bin/biosphere

@@ -6,13 +6,21 @@ require 'ostruct'
 require 'pp'
 require "awesome_print"
 require 'colorize'
+require 'biosphere/s3.rb'
 
 class BiosphereOpts
 
+	def self.normalize_path(path)
+		if path[-1] != '/'
+			path += '/'
+		end
+		return path
+	end
+
 	def self.parse(args)
 
 		options = OpenStruct.new
-		options.build = "build"
+		options.build_dir = "build"
 		options.src = "./"
 		options.version = ::Biosphere::Version
 
@@ -23,8 +31,11 @@ class BiosphereOpts
 
 			opts.separator ""
 			opts.separator "Commands:"
+			opts.separator "\tbuild\tWrite tf files as json into build directory"
 			opts.separator "\tplan\tRun the planning phase"
-			opts.separator "\tjson\tWrite tf files as json into build directory"
+			opts.separator "\tcommit\tCommit changes and update the infrastructure"
+			opts.separator "\tlock\tAcquire lock for remote state"
+			opts.separator "\tunlock\tRelease lock for remote state"
 			opts.separator "\taction [action]\tCall an action defined in the application .rb files"
 			opts.separator ""
 
@@ -34,12 +45,11 @@ class BiosphereOpts
 			end
 
 			opts.on("--src PATH", "Directory where the application .rb files are") do |path|
-				options.src = path
+				options.src = normalize_path(path)
 			end
 
-
-			opts.on("--build PATH", "Directory where to build json files") do |path|
-				options.build = path
+			opts.on("--build-dir PATH", "Directory where to build json files") do |path|
+				options.build_dir = normalize_path(path)
 			end
 
 		end
@@ -62,7 +72,7 @@ if ARGV.length == 0
 end
 
 if !File.directory?(options.src)
-	STDERR.puts "Directory #{options.build} is not a directory or it doesn't exists."
+	STDERR.puts "Directory #{options.build_dir} is not a directory or it doesn't exists."
 	exit -1
 end
 
@@ -76,40 +86,47 @@ if options.src
 		STDERR.puts "No files found. Are you in the right directory where your biosphere .rb files are?"
 		exit -1
 	end
-end
 
-if options.build
-	if !File.directory?(options.build)
-		STDERR.puts "Creating build directory #{options.build} because it was missing"
-		Dir.mkdir(options.build)
+	if suite.node[:settings][:s3_bucket].nil? || suite.node[:settings][:s3_bucket].empty? || suite.node[:settings][:cluster_name].nil? || suite.node[:settings][:cluster_name].empty?
+		puts "\nNo S3 bucket or cluster name defined in configuration, can't continue"
+		exit 1
 	end
+	s3 = S3.new(suite.node[:settings][:s3_bucket], suite.node[:settings][:cluster_name])
 end
 
+if options.build_dir
+	if !File.directory?(options.build_dir)
+		STDERR.puts "Creating build directory #{options.build_dir} because it was missing"
+		Dir.mkdir(options.build_dir)
+	end
+end
 
-if ARGV[0] == "json" && options.src
+if ARGV[0] == "build" && options.src
 	suite.evaluate_resources()
 
-	if !File.directory?(options.build)
-		STDERR.puts "Directory #{options.build} is not a directory or it doesn't exists."
+	if !File.directory?(options.build_dir)
+		STDERR.puts "Directory #{options.build_dir} is not a directory or it doesn't exists."
 		exit -1
 	end
 
 	count = 0
-	suite.write_json_to(options.build) do |file_name, destination, str, proxy|
+	suite.write_json_to(options.build_dir) do |file_name, destination, str, proxy|
 		puts "Wrote #{str.length} bytes from #{file_name} to #{destination} (#{proxy.export["resource"].length} resources)"
 		count = count + 1
 	end
 
-	puts "Wrote #{count} files into #{options.build}"
+	puts "Wrote #{count} files into #{options.build_dir}"
 	suite.save_node()
 
 elsif ARGV[0] == "plan" && options.src
 	suite.evaluate_plans()
 	ap suite.node, :indent=>-4
+
 elsif ARGV[0] == "action" && options.src
+	s3.retrieve("#{options.build_dir}terraform.tfstate")
+	s3.retrieve("#{options.build_dir}state.node")
 	context = Biosphere::ActionContext.new()
-
-	context.build_directory = options.build
+	context.build_directory = options.build_dir
 
 	if suite.call_action(ARGV[1], context)
 		STDERR.puts "Executing action #{ARGV[1]}"
@@ -118,6 +135,37 @@ elsif ARGV[0] == "action" && options.src
 	end
 
 	suite.save_node()
+
+elsif ARGV[0] == "commit" && options.src
+	s3.set_lock()
+	s3.retrieve("#{options.build_dir}terraform.tfstate")
+	s3.retrieve("#{options.build_dir}state.node")
+	tf_plan = %x( terraform plan -state=#{options.build_dir}terraform.tfstate #{options.build_dir} )
+	puts "\n" + tf_plan
+	answer = ""
+	while answer.empty? || (answer != "y" && answer != "n")
+		print "\nDoes the plan look reasonable? (Answering yes will apply the changes) y/n: "
+		answer = STDIN.gets.chomp
+	end
+
+	if answer == "n"
+		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}terraform.tfstate #{options.build_dir})
+		puts "\n" + tf_apply
+		s3.save("#{options.build_dir}terraform.tfstate")
+		s3.save("#{options.src}state.node")
+	end
+
+	s3.release_lock()
+
+elsif ARGV[0] == "lock"
+	s3.set_lock()
+
+elsif ARGV[0] == "unlock"
+	s3.release_lock()
+
 else
 	STDERR.puts "\nERROR: Unknown command #{ARGV[0]}. Maybe you wanted to do: \"biosphere action #{ARGV[0]}\"?"
 	exit -1

data/lib/biosphere/kube.rb

@@ -66,6 +66,7 @@ class Biosphere
                 end
 
                 ns_prefix = client.build_namespace_prefix(resource[:metadata][:namespace])
+                ns_prefix = ns_prefix.empty? ? "namespaces/default/" : ns_prefix
                 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,

data/lib/biosphere/s3.rb

@@ -0,0 +1,82 @@
+require 'aws-sdk'
+
+class S3
+    def initialize(bucket, main_key)
+        @client = Aws::S3::Client.new
+        @bucket_name = bucket
+        @main_key = main_key
+    end
+
+    def save(path_to_file)
+        puts "\nSaving #{path_to_file} to S3"
+        filename = path_to_file.split('/')[-1]
+        begin
+            File.open(path_to_file, 'rb') do |file|
+                @client.put_object({
+                    :bucket => @bucket_name,
+                    :key => "#{@main_key}/#{filename}",
+                    :body => file
+                })
+            end
+        rescue
+            puts "\nError occurred while saving the remote state, can't continue"
+            puts "Error: #{$!}"
+            exit 1
+        end
+    end
+
+    def retrieve(path_to_file)
+        filename = path_to_file.split('/')[-1]
+        puts "\nFetching #{filename} from S3"
+        begin
+            resp = @client.get_object({
+                :bucket => @bucket_name,
+                :key => "#{@main_key}/#{filename}"
+            })
+            File.open(path_to_file, 'w') do |f|
+                f.puts(resp.body.read)
+            end
+        rescue Aws::S3::Errors::NoSuchKey
+            puts "\nCouldn't find remote file #{filename} from S3."
+        rescue
+            puts "\nError occurred while fetching the remote state, can't continue."
+            puts "Error: #{$!}"
+            exit 1
+        end
+    end
+
+    def set_lock()
+        begin
+            resp = @client.get_object({
+                :bucket => @bucket_name,
+                :key => "#{@main_key}/biosphere.lock"
+            })
+            puts "\nThe remote state is locked since #{resp.last_modified}\nCan't continue."
+            exit 1
+        rescue Aws::S3::Errors::NoSuchKey
+            puts "\nRemote state was not locked, adding the lockfile.\n"
+            @client.put_object({
+                :bucket => @bucket_name,
+                :key => "#{@main_key}/biosphere.lock"
+            })
+        rescue
+            puts "\There was an error while accessing the lock. Can't continue.'"
+            puts "Error: #{$!}"
+            exit 1
+        end
+    end
+
+    def release_lock()
+        begin
+            @client.delete_object({
+                :bucket => @bucket_name,
+                :key => "#{@main_key}/biosphere.lock"
+            })
+        rescue
+            puts "\nCouldn't release the lock!"
+            puts "Error: #{$!}"
+            exit 1
+        end
+        puts "\nLock released successfully"
+    end
+end

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.0.11"
+  Version = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biosphere
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 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
@@ -111,6 +125,7 @@ files:
 - lib/biosphere/kube.rb
 - lib/biosphere/mixing/from_file.rb
 - lib/biosphere/node.rb
+- lib/biosphere/s3.rb
 - lib/biosphere/suite.rb
 - lib/biosphere/terraformproxy.rb
 - lib/biosphere/version.rb