kitchen-salt 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29cc6593a410ea2483adfc2d2f02f53df4cd81b140a230af23738e97036ae66c
-  data.tar.gz: de0d4aced4dee05b52088705033f3a2a132f503382293d9b1bd7f3ed36177e96
+  metadata.gz: 31ff032a93c1d76d2a38edb9f9074a84aa4eb19bf80ab0744b243d2ef78e2a09
+  data.tar.gz: c690d95068e7205c1f53305b11971c92ff73b01b86e3d35e2022770768f3e794
 SHA512:
-  metadata.gz: 167647dbc4231e9b55c4dd7258c9238c5fb736bd72c56a3b7db5a481a36cee4163533cab64464ceb9a26dafd343d9ec744888da70b76e03b6b35e33e8d3f8901
-  data.tar.gz: 12b3b3cc1494dc503ffb361bcab007a52a53c69ba600958d9a089df3d922925a5743e2d8593a5399c7953f49ad82c136985d17e7b1b18a1986ee8bddb73589e5
+  metadata.gz: bf0370b1b376923d310a01b1d29482819dcfcba9199075eddceddb4b03c6958754270a40f0d61d811d6f81381f7ee7879b7f8441e9980cb4e72890f592089f9c
+  data.tar.gz: bf35ed5e32ae7a0d25cdaeae7947af67920ecc173fcf41052ea61824882fc89154cbb41db09ef9da744f9dcf50859cc6e369bb96694eeba86d13402bb7bd8536

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = '0.3.3'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/lib/kitchen/provisioner/gpgkey.erb

@@ -0,0 +1,15 @@
+<%=
+<<-GPGKEY
+sh -c '
+#{Util.shell_helpers}
+  # if gpg key exists, install
+  echo "Checking for a GPG Key"
+  if [ -f "#{config[:root_path]}/gpgkey.txt" ]; then
+    echo "Installing \"#{config[:root_path]}/gpgkey.txt\""
+    GPGKEY_DIR="#{config[:root_path]}/etc/salt/gpgkeys/"
+    mkdir -p "$GPGKEY_DIR"
+    chmod 0700 "$GPGKEY_DIR"
+    gpg --allow-secret-key-import --no-default-keyring --homedir "$GPGKEY_DIR" --import < "#{config[:root_path]}/gpgkey.txt"
+  fi'
+GPGKEY
+%>

data/lib/kitchen/provisioner/salt_solo.rb

@@ -41,6 +41,8 @@ module Kitchen
         chef_bootstrap_url: 'https://www.chef.io/chef/install.sh',
         dependencies: [],
         dry_run: false,
+        gpg_home: '~/.gnupg/',
+        gpg_key: nil,
         install_after_init_environment: false,
         is_file_root: false,
         local_salt_root: nil,
@@ -192,6 +194,7 @@ module Kitchen
       def create_sandbox
         super
         prepare_data
+        prepare_gpg_key
         prepare_install
         prepare_minion
         prepare_pillars
@@ -262,6 +265,7 @@ module Kitchen
           # install/update dependencies
           cmd << sudo("chmod +x #{config[:root_path]}/*.sh;")
           cmd << sudo("#{config[:root_path]}/dependencies.sh;")
+          cmd << sudo("#{config[:root_path]}/gpgkey.sh;")
           salt_config_path = config[:salt_config]
           salt_call = 'salt-call'
         end
@@ -317,6 +321,20 @@ module Kitchen
         cp_r_with_filter(config[:data_path], tmpdata_dir, config[:salt_copy_filter])
       end
 
+      def prepare_gpg_key
+        return unless config[:gpg_key]
+
+        info('Preparing gpg_key')
+        debug("Using gpg key: #{config[:gpg_key]}")
+
+        system("gpg --homedir #{config[:gpg_home]} -o #{File.join(sandbox_path, 'gpgkey.txt')} --armor --export-secret-keys #{config[:gpg_key]}")
+
+        gpg_template = File.expand_path('./../gpgkey.erb', __FILE__)
+        erb = ERB.new(File.read(gpg_template)).result(binding)
+        debug('Install Command:' + erb.to_s)
+        write_raw_file(File.join(sandbox_path, 'gpgkey.sh'), erb)
+      end
+
       def prepare_minion_base_config
         if config[:salt_minion_config_template]
           minion_template = File.expand_path(config[:salt_minion_config_template], Kitchen::Config.new.kitchen_root)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - SaltStack Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-14 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -150,6 +150,7 @@ files:
 - lib/kitchen/provisioner/99-minion.conf.erb
 - lib/kitchen/provisioner/dependencies.erb
 - lib/kitchen/provisioner/formula-fetch.sh
+- lib/kitchen/provisioner/gpgkey.erb
 - lib/kitchen/provisioner/install.erb
 - lib/kitchen/provisioner/install_win.erb
 - lib/kitchen/provisioner/minion.erb