shiplane_bootstrappers_chef 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1922804b4fc3288c220de8b5ed02a8c77ae7fceada3629e9cb17e84c503875ab
-  data.tar.gz: a008922dbf8c06315c538650ad2a2749ff34d5665105b8aac4516acf02346bf3
+  metadata.gz: f93e993b739e7c74ac9bbc3853e6f910341a70320c6e397e63b09185cad5762b
+  data.tar.gz: 4f90e102ac086f806acdae54c300a76f2bb4c2b347f18901efae37c2e3d6981f
 SHA512:
-  metadata.gz: 353f7639b59079b70a9ec6b35d82e4e90197e826ba9c30f22c42bf26df8175fab19065584c83d5a9d1b80839e144b9926d2d441714445129bc710f22f968aa2e
-  data.tar.gz: ad9e7b572863f86a55d5d0ab97c9ff6397f1b39dbd5647a35b500da32e4969e67a6bf9895904f42f52db095bca5afe89500077a40b42e6dca8f45fe82ed1de56
+  metadata.gz: 4963c059bccb3e3ed41878d0ffb502c5baf45956e9d43c470d320bcf25d31ef59966e044a8fdb6272bbd92896cfacc07ea2143e4cfe168c5909e0e058d1f5d70
+  data.tar.gz: 031336bf31e336a54781ddbcdc22b768bad077a29d1b47c4a03c92f65b0d07432e5570a4823d6cf8c6ee5bedc593fb92bdb4073a338c9fb2d07c9589b5a94bda

data/lib/capistrano/chef_host.rb

@@ -7,7 +7,13 @@ module Shiplane
 
     REMOTE_CHEF_FOLDER_PATH = File.join("/var","chef")
     LOCAL_CHEF_FOLDER_PATH = File.expand_path("../../../lib/chef", __FILE__)
+    LOCAL_CUSTOM_CONFIGURATION_FOLDER_PATH = File.join(Dir.pwd, '.shiplane', 'bootstrap_config')
+    REMOTE_CUSTOM_CONFIGURATION_FOLDER_PATH = File.join(REMOTE_CHEF_FOLDER_PATH, 'cookbooks', 'barebones-docker', 'files', 'default')
     COOKBOOKS_FILE_NAME = "cookbooks.tar.gz"
+    LOCAL_COOKBOOKS_FOLDER_PATH = File.expand_path("../../../cookbooks", __FILE__)
+    LOCAL_SITE_COOKBOOKS_FOLDER_PATH = File.expand_path("../../../site-cookbooks", __FILE__)
+    LOCAL_SITE_BERKS_COOKBOOKS_FOLDER_PATH = File.expand_path("../../../berks-cookbooks", __FILE__)
+    REMOTE_COOKBOOKS_FOLDER_PATH = File.join(REMOTE_CHEF_FOLDER_PATH, 'cookbooks')
     LOCAL_COOKBOOKS_FILE_PATH = File.expand_path("../../../#{COOKBOOKS_FILE_NAME}", __FILE__)
     REMOTE_COOKBOOKS_FILE_PATH = File.join(REMOTE_CHEF_FOLDER_PATH, COOKBOOKS_FILE_NAME)
     CHEF_PACKAGE_NAME = config.fetch("bootstrap", {}).fetch("chef-bootstrapper", {}).fetch("package_name")

data/lib/capistrano/tasks/bootstrap.rake

@@ -1,5 +1,7 @@
 require 'dotenv'
 require_relative '../chef_host'
+require 'open3'
+require 'pry'
 
 namespace :shiplane do
   namespace :bootstrap do
@@ -12,12 +14,18 @@ namespace :shiplane do
       end
     end
 
-    task configure: %i(evaluate_erb_files rsync_chef_configuration upload_cookbooks fix_file_permissions) do
+    task configure: %i(evaluate_erb_files rsync_chef_configuration upload_cookbooks rsync_custom_configuration fix_file_permissions) do
       fetch(:shiplane_hosts).each do |host|
         host.configure
       end
     end
 
+    # task :prepare_files do |task, args|
+    #   rm_r Shiplane::ChefHost::LOCAL_COOKBOOKS_FOLDER_PATH, force: true
+    #   cp_r File.join(Shiplane::ChefHost::LOCAL_SITE_BERKS_COOKBOOKS_FOLDER_PATH, '.'), Shiplane::ChefHost::LOCAL_COOKBOOKS_FOLDER_PATH
+    #   cp_r File.join(Shiplane::ChefHost::LOCAL_SITE_COOKBOOKS_FOLDER_PATH, '.'), Shiplane::ChefHost::LOCAL_COOKBOOKS_FOLDER_PATH
+    # end
+
     # task :cleanup do
     # end
 
@@ -38,6 +46,7 @@ namespace :shiplane do
           compiled_file_name = filename.match(/.*\/chef\/(.*)\.erb/)[1]
 
           sudo :mkdir, '-m', '777', '-p', File.join(Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH, File.dirname(compiled_file_name))
+          execute :sudo, :rm, '-f', File.join(Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH, compiled_file_name), interaction_handler: { "[sudo] password for #{host.netssh_options.fetch(:user)}: " => "#{host.netssh_options.fetch(:password, "")}\n" }
           upload! StringIO.new(compiled_template), File.join(Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH, compiled_file_name)
         end
       end
@@ -53,7 +62,55 @@ namespace :shiplane do
             "#{host.netssh_options.fetch(:user)}@#{host}:#{Shiplane::ChefHost::REMOTE_CHEF_FOLDER_PATH}"
           ]
 
-          execute 'rsync', *rsync_arguments
+          $stderr.puts rsync_arguments.join(" ")
+          execute :rsync, *rsync_arguments
+          # *outputs, status = Open3.capture3('rsync', *rsync_arguments)
+        end
+      end
+    end
+
+    # task :rsync_chef_cookbooks_configuration do |task, args|
+    #   on fetch(:shiplane_hosts).map(&:capistrano_role) do |host|
+    #     execute :sudo, :rm, '-Rf', Shiplane::ChefHost::REMOTE_COOKBOOKS_FOLDER_PATH, interaction_handler: { "[sudo] password for #{host.netssh_options.fetch(:user)}: " => "#{host.netssh_options.fetch(:password, "")}\n" }
+    #     execute :sudo, :mkdir, '-m', '2777', '-p', Shiplane::ChefHost::REMOTE_COOKBOOKS_FOLDER_PATH, interaction_handler: { "[sudo] password for #{host.netssh_options.fetch(:user)}: " => "#{host.netssh_options.fetch(:password, "")}\n" }
+    #   end
+
+    #   run_locally do
+    #     fetch(:shiplane_hosts).map(&:capistrano_role).each do |host|
+    #       rsync_arguments = [
+    #         '-r',
+    #         '-e', "\"ssh -p #{host.port || 22} -i #{host.netssh_options.fetch(:keys)}\"",
+    #         "#{Shiplane::ChefHost::LOCAL_COOKBOOKS_FOLDER_PATH}/",
+    #         "#{host.netssh_options.fetch(:user)}@#{host}:#{Shiplane::ChefHost::REMOTE_COOKBOOKS_FOLDER_PATH}"
+    #       ]
+
+    #       $stderr.puts rsync_arguments.join(" ")
+    #       # execute :rsync, *rsync_arguments
+    #       *outputs, status = Open3.capture3('rsync', *rsync_arguments)
+    #     end
+    #   end
+    # end
+
+    task :rsync_custom_configuration, :role, :username, :keypath do |task, args|
+      on fetch(:shiplane_hosts).map(&:capistrano_role) do |host|
+        execute :sudo, :rm, '-Rf', Shiplane::ChefHost::REMOTE_CUSTOM_CONFIGURATION_FOLDER_PATH, interaction_handler: { "[sudo] password for #{host.netssh_options.fetch(:user)}: " => "#{host.netssh_options.fetch(:password, "")}\n" }
+        execute :sudo, :mkdir, '-m', '2777', '-p', Shiplane::ChefHost::REMOTE_CUSTOM_CONFIGURATION_FOLDER_PATH, interaction_handler: { "[sudo] password for #{host.netssh_options.fetch(:user)}: " => "#{host.netssh_options.fetch(:password, "")}\n" }
+      end
+
+      run_locally do
+        if Dir.exist?(Shiplane::ChefHost::LOCAL_CUSTOM_CONFIGURATION_FOLDER_PATH)
+          fetch(:shiplane_hosts).map(&:capistrano_role).each do |host|
+            rsync_arguments = [
+              '-r',
+              '-e', "ssh -p #{host.port || 22} -i #{host.netssh_options.fetch(:keys)}",
+              "#{Shiplane::ChefHost::LOCAL_CUSTOM_CONFIGURATION_FOLDER_PATH}/",
+              "#{host.netssh_options.fetch(:user)}@#{host}:#{Shiplane::ChefHost::REMOTE_CUSTOM_CONFIGURATION_FOLDER_PATH}"
+            ]
+
+            $stderr.puts rsync_arguments.join(" ")
+            # execute :rsync, *rsync_arguments
+            *outputs, status = Open3.capture3('rsync', *rsync_arguments)
+          end
         end
       end
     end

data/lib/capistrano/tasks/provision.rake

@@ -1,5 +1,6 @@
 require 'rake'
 require 'dotenv'
+require 'open3'
 
 desc "Provision host"
 task :provision, [:role, :username, :keypath] => ['provision:default']
@@ -11,8 +12,9 @@ namespace :provision do
     :set_host_options,
     :prepare_host,
     :evaluate_erb_files,
-    :rsync_chef,
     'upload-cookbooks',
+    :rsync_chef,
+    :rsync_custom_configuration,
     :fix_file_permissions,
   ] do |task, args|
     errors = {}
@@ -84,6 +86,19 @@ namespace :provision do
     end
   end
 
+  task :rsync_custom_configuration, :role, :username, :keypath do |task, args|
+    on roles(fetch(:host_options).role) do |host|
+      rsync_arguments = [
+        '-r',
+        '-e', "ssh -p #{host.port || 22} -i #{host.netssh_options.fetch(:keys)}",
+        "#{boostrap_config_path}/",
+        "#{host.netssh_options.fetch(:user)}@#{host}:/var/chef/cookbooks/barebones-docker/files"
+      ]
+      stdout, stderr, status = Open3.capture3("rsync" *rsync_arguments)
+      binding.pry
+    end
+  end
+
   desc "Uploads the tarballed cookbooks"
   task :'upload-cookbooks', :role, :username, :keypath do |task, args|
     on roles(args['role']) do |host|
@@ -144,6 +159,10 @@ def chef_folder_path
   File.expand_path("../../../chef", __FILE__)
 end
 
+def boostrap_config_path
+  @boostrap_config_path ||= File.join(Dir.pwd, '.shiplane', 'bootstrap_config')
+end
+
 def sudo(*args)
   execute :sudo, *args, interaction_handler: {
     "[sudo] password for #{fetch(:host_options).username}: " => "#{fetch(:host_options).password}\n"

data/lib/shiplane/bootstrappers/chef/version.rb

@@ -3,7 +3,7 @@
 module Shiplane
   module Bootstrappers
     module Chef
-      VERSION = "0.2.22"
+      VERSION = "0.2.23"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiplane_bootstrappers_chef
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
 platform: ruby
 authors:
 - John Epperson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano