hippo-cli 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a621d666288ef2ec40ae5384c0a2ba823f011cd2384db2d0eee53d2dbf6fc1
-  data.tar.gz: 05cf19519259186bd789f02d996b580ba76a7b7e9f598b308c2705c636d25e6c
+  metadata.gz: 9340773519ba8065cba065f1e26edd5634df0456c62c5c7367e2e1e557173b1b
+  data.tar.gz: d4e0939fcb6794659b5399a850d9ef76bc02eaad053fb7e32d2701c383480435
 SHA512:
-  metadata.gz: 911cfb6bdbbcf16ef73a5dc1d36bd53aa06dc7f94e9f53a9cc0aa964400a266cc25583d97651684ebf3394f340f780520bfb7af0e189a656dd48d2338beed7fb
-  data.tar.gz: 466ec97e4b4a4a1dcdd223f18be57fbeddb72aea29aacc1d64fc2b728ca807ec0865619024773b49613ac19aa14dcfea275bcdd9a3cdfa6395ea1dc601b67855
+  metadata.gz: 5bdd945ebe90c00af7b70e8f3a776f2a9ded0cf6b5623f3e3612a41d86c42cb805808623226c29b77d88273c2c452459ff52dd80389e2a960a200bcb40de3fef
+  data.tar.gz: 9f2f4b3ed1a7e8823d3fcc476d71c429422396dbbd1b1b8e18662ddec6aed40775b0f3bb015649fbfd16764ac5a9360b212308898ddbb9f5ecc0be854e6ae98b

data/cli/package_values.rb

@@ -16,7 +16,7 @@ command :'package:values' do
       puts "\e[33m#{'=' * 80}"
       puts package.name
       puts "#{'=' * 80}\e[0m"
-      puts package.final_values.to_yaml.sub(/\A---\n/, '')
+      puts package.final_values.to_yaml(line_width: -1).sub(/\A---\n/, '')
     end
   end
 end

data/lib/hippo/bootstrap_parser.rb

@@ -2,6 +2,7 @@
 
 require 'securerandom'
 require 'secure_random_string'
+require 'openssl'
 
 module Hippo
   class BootstrapParser
@@ -54,6 +55,27 @@ module Hippo
         SecureRandom.hex(value['size'] ? value['size'].to_i : 16)
       when 'random'
         Base64.encode64(SecureRandom.random_bytes(value['size'] ? value['size'].to_i : 16)).strip
+      when 'rsa'
+        OpenSSL::PKey::RSA.new(value['size'] ? value['size'].to_i : 2048).to_s
+      when 'certificate'
+        key = OpenSSL::PKey::RSA.new(value['key_size'] ? value['key_size'].to_i : 2048)
+
+        cert = OpenSSL::X509::Certificate.new
+        cert.subject = cert.issuer = OpenSSL::X509::Name.new(
+          [
+            ['C', value['country'] || 'GB'],
+            ['O', value['organization'] || 'Default'],
+            ['OU', value['organization_unit'] || 'Default'],
+            ['CN', value['common_name'] || 'default']
+          ]
+        )
+        cert.not_before = Time.now
+        cert.not_after = Time.now + (60 * 60 * 24 * (value['days'] ? value['days'].to_i : 730))
+        cert.public_key = key.public_key
+        cert.serial = 0x0
+        cert.version = 2
+        cert.sign key, OpenSSL::Digest::SHA256.new
+        { 'certificate' => cert.to_s, 'key' => key.to_s }
       when nil
         raise Error, "A 'type' must be provided for each generated item"
       else

data/lib/hippo/image.rb

@@ -34,7 +34,11 @@ module Hippo
     end
 
     def image_url
-      "#{host}/#{image_name}:#{tag}"
+      if host
+        "#{host}/#{image_name}:#{tag}"
+      else
+        "#{image_name}:#{tag}"
+      end
     end
 
     def template_vars
@@ -52,6 +56,7 @@ module Hippo
     end
 
     def exists?
+      return true if host.nil?
       return true unless can_check_for_existence?
 
       credentials = Hippo.config.dig('docker', 'credentials', host)

data/lib/hippo/liquid_filters.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Hippo
+  module LiquidFilters
+    def indent(text, depth = 2)
+      text.split("\n").map.each_with_index do |p, i|
+        i == 0 ? p : ' ' * depth + p
+      end.join("\n")
+    end
+
+    def multiline(text)
+      text.inspect
+    end
+  end
+end

data/lib/hippo/object_definition.rb

@@ -30,7 +30,7 @@ module Hippo
     end
 
     def yaml
-      @object.to_yaml
+      @object.to_yaml(line_width: -1)
     end
 
     def yaml_to_apply

data/lib/hippo/package.rb

@@ -93,7 +93,7 @@ module Hippo
     end
 
     def run_install_command(verb, *additional)
-      run(install_command(verb, *additional), stdin: final_values.to_yaml)
+      run(install_command(verb, *additional), stdin: final_values.to_yaml(line_width: -1))
       true
     end
 

data/lib/hippo/secret_manager.rb

@@ -130,9 +130,13 @@ module Hippo
         raise Error, 'Cannot create edit file because no key is available for decryption'
       end
 
-      contents = decrypt(File.read(path))
-      contents = Util.open_in_editor('secret', contents)
-      write_file(contents)
+      old_contents = decrypt(File.read(path))
+      new_contents = Util.open_in_editor('secret', old_contents)
+      if old_contents != new_contents
+        write_file(new_contents)
+      else
+        puts 'No changes detected. Not re-encrypting secret file.'
+      end
     end
 
     def write_file(contents)

data/lib/hippo/stage.rb

@@ -4,6 +4,7 @@ require 'liquid'
 require 'open3'
 require 'hippo/secret_manager'
 require 'hippo/package'
+require 'hippo/liquid_filters'
 
 module Hippo
   class Stage
@@ -67,7 +68,7 @@ module Hippo
       proc do |data|
         begin
           template = Liquid::Template.parse(data)
-          template.render(template_vars)
+          template.render(template_vars, filters: [LiquidFilters])
         rescue Liquid::SyntaxError => e
           raise Error, "Template error: #{e.message}"
         end

data/lib/hippo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hippo
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hippo-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Adam Cooke
@@ -30,7 +30,7 @@ cert_chain:
   3wUJNGnT5XYq+qvTqmjkTSTfdGvZCM63C6bGdN5CAyMokGOOatGqyCMAONolWnfC
   gm3t2GWWrxY=
   -----END CERTIFICATE-----
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: encryptor
@@ -174,6 +174,7 @@ files:
 - lib/hippo/error.rb
 - lib/hippo/extensions.rb
 - lib/hippo/image.rb
+- lib/hippo/liquid_filters.rb
 - lib/hippo/manifest.rb
 - lib/hippo/object_definition.rb
 - lib/hippo/package.rb