sct 1.1.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87ea56635397f45831d78759ad65fa074bbde63827fc8c8fba75903f71bf45a6
-  data.tar.gz: 0c72ba5441f383c3dea4f5912c33734822774c93054fdd332a7f57042d46ec66
+  metadata.gz: aa71b183edc2b021f2c3399d5ca7dffe713e3b7b1a26ceada2e49bb224ae50b8
+  data.tar.gz: 32f4f9e7d27f5f9a77fdb34138150c5b336c21504695dfa174448e5fd6152f88
 SHA512:
-  metadata.gz: 508892aaef3fffe214203682a28f8976abb681c01243154df5c4ef061a3ebd84c97a510858ae91ead399ab56e68329db6b318ff434afa9b48ca966aad62d89cb
-  data.tar.gz: 6b7868aaf906825de525197e174766edca7de50e90775cd9a130a48c6a4c2cd305250e455c964da5088cead2799250d4083a973101a1288bfd5ab1a093c80b5c
+  metadata.gz: 77cdf1a0d171c64d0e90e54e218a4bb904bfba9d806f4f0b56f8bae7b2f8494c88e74d5496890f188acf3058835ea149154582077af5174977809e75f152bab8
+  data.tar.gz: d3b0dcccad17ecd873a9f2288b66c81d82f0e8786e94365b7aa7790a970a794146a9701e9dc510c50dfbf28d6fb03f4fdc50d748b003584d72d4be06676cad41

data/cluster/lib/cluster/runner.rb

@@ -11,11 +11,16 @@ module Cluster
       end
     end
 
+    def dc_system
+      return executer = system("which docker-compose") ? 'docker-compose' : 'docker compose'
+    end
+
     def run_dc command, options = {}
-      run "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}", options
+      run "#{dc_system} -f ~/development/spend-cloud/docker-compose.yml #{command}", options
     end
 
     def start args, options
+      print "DC_SYSTEM: #{dc_system}"
       if options.pull
         run_dc "pull"
       end
@@ -26,7 +31,7 @@ module Cluster
 
       run "docker container prune -f"
 
-      run_dc "up --detach"
+      run_dc "up --detach --remove-orphans --force-recreate --always-recreate-deps"
 
       if options.pull or options.build
         system "docker image prune -f"

data/henk/lib/henk/commands_generator.rb

@@ -40,7 +40,7 @@ module Henk
                     Henk::Runner.new.encrypt_config_data options.domain
                 end
             end
-            
+
             command :copy do |c|
                 c.syntax = 'sct henk copy'
                 c.description = 'Copy a client from another environment to your local environment'
@@ -81,7 +81,7 @@ module Henk
                     Henk::Runner.new.synchronize_employees options.target_domain
                 end
             end
-            
+
             command :remove do |c|
                 c.syntax = 'sct henk remove'
                 c.description = 'Remove a client from your local environment.'
@@ -105,6 +105,48 @@ module Henk
                 end
             end
 
+            command :"list-dumps" do |c|
+                c.syntax = 'sct henk list-dumps'
+                c.description = 'List the customer dumps currently available for import.'
+
+                c.action do |args, options|
+                    Henk::Runner.new.list_dumps args, options
+                end
+            end
+
+            command :"import" do |c|
+                c.syntax = 'sct henk import'
+                c.description = 'Import a customer dump from GCP.'
+
+                c.action do |args, options|
+                    case args.length
+                    when 0
+                        puts "Loading available customer dumps...".blue
+
+                        available_dumps = `sct henk list-dumps`.lines chomp: true
+                        begin
+                            dump_url = choose do |menu|
+                                menu.prompt = "Please choose a dump to import:"
+
+                                for dump in available_dumps
+                                    menu.choice dump
+                                end
+                            end
+                        rescue Interrupt
+                            print "\nStopping import"
+                            exit
+                        end
+                    when 1
+                        dump_url = args.first
+                    else
+                        UI.error "Expected 0 or 1 arguments, received #{args.length}: #{args}"
+                        exit 1
+                    end
+
+                    Henk::Runner.new.import args, options, dump_url
+                end
+            end
+
             run!
         end
 

data/henk/lib/henk/runner.rb

@@ -3,7 +3,7 @@ require 'pp'
 module Henk
     class Runner
         attr_accessor :options_mapping
-    
+
         def initialize
             @options_mapping = {
                 "organization_name" => {
@@ -56,8 +56,8 @@ module Henk
 
             connected_to_network = `docker network inspect spend-cloud | jq '.[0] | .Containers | map(select((.Name | test("^#{required_containers.join('|^')}")))) | length'`
 
-            if connected_to_network.to_s.strip! != "3"
-                puts "Error: ".red + "Not all required services are running or connected to the cluster (#{connected_to_network}/3)"
+            if connected_to_network.to_s.strip! != "5"
+                puts "Error: ".red + "Not all required services are running or connected to the cluster (#{connected_to_network}/5)"
                 exit(1)
             end
 
@@ -88,7 +88,7 @@ module Henk
         def encrypt_config_data domain
             puts "Manually encrypting config data for #{domain}".green
             php_command = "php /var/www/scripts/encryptConfigData.php -c='#{domain}' --execute"
-            command = 'docker exec -it proactive-config bash -c "#{php_command}"'
+            command = 'docker exec -it proactive-config-php bash -c "#{php_command}"'
             self.run command
         end
 
@@ -171,5 +171,127 @@ module Henk
             options_str += parsed_options.join(' ')
             return options_str
         end
+
+        def list_dumps args, options
+            run "gsutil ls gs://henk-db-dumps/"
+        end
+
+        def import args, options, dump_url
+            puts "Going to import #{dump_url}".blue
+
+            dir = Dir.mktmpdir
+
+            begin
+                zip = download_and_unzip dump_url, dir
+
+                customer = zip.slice 0, zip.rindex("_")
+
+                customer_database = customer.gsub "-", "_"
+
+                remove_customer customer
+
+                copy_db_encryption_key customer, dir
+
+                run_sql_files dir
+
+                add_customer_account customer, customer_database
+
+                update_and_encrypt_customer_config customer, customer_database
+
+                puts "Finished importing #{customer}".green
+            ensure
+                run "rm -r #{dir}"
+            end
+        end
+
+        def download_and_unzip dump_url, dir
+            run "gsutil cp #{dump_url} #{dir}"
+
+            zip_path = Dir["#{dir}/*.zip"].first
+
+            run "unzip #{zip_path} -d #{dir}"
+
+            zip = File.basename zip_path
+        end
+
+        def remove_customer customer
+            local_customers = `sct henk list-clients`.lines chomp: true
+
+            if local_customers.include? customer
+                puts "Customer already exists. Removing customer before importing...".yellow
+
+                run "sct henk remove --domain #{customer}"
+
+                puts "Removed existing customer".green
+            end
+        end
+
+        def copy_db_encryption_key customer, dir
+            run "docker exec proactive-config-php mkdir /data/#{customer}"
+            run "docker cp #{dir}/db_encryption.key proactive-config-php:/data/#{customer}/"
+
+            puts "Copied db_encryption.key to proactive-config-php:/data/#{customer}/".green
+        end
+
+        def run_sql_files dir
+            sql_paths = Dir["#{dir}/*.sql"]
+
+            sql_paths.each_with_index do |path, index|
+                file = File.basename path
+                database = File.basename path, ".*"
+
+                puts "Running #{file} (#{index + 1}/#{sql_paths.length})".blue
+
+                run_query "CREATE DATABASE IF NOT EXISTS `#{database}`"
+
+                run_query "source /sql/#{file}", database: database, volume: "#{dir}:/sql"
+            end
+
+            puts "Finished running SQL files".green
+        end
+
+        def add_customer_account customer, customer_database
+            account_data = "\n[#{customer}]\ndatabase = #{customer_database}\ndomain = NULL\nrewrite = #{customer}\nimport_planning = 1\njobs = 1\nscan_upload = 0\nfiatteren_mailbox = 1\ncontracten_mailbox = 1"
+
+            run "docker exec proactive-config-php sh -c 'echo \"#{account_data}\" >> /data/proactive_accounts.ini'"
+
+            puts "Added account to proactive_accounts.ini".green
+        end
+
+        def update_and_encrypt_customer_config customer, customer_database
+            dsn = "mysql:host=mysql-service;user=root;dbname=#{customer_database};config=proactive-php;config-path=cfg/db;"
+
+            website_application = "https://#{customer}.dev.spend.cloud"
+
+            email_administrator = "noreply@dev.spend.cloud"
+
+            debug_email_address = "noreply@dev.spend.cloud"
+
+            query = "UPDATE `00_settings` SET `045` = \"#{dsn}\", `029` = \"#{website_application}\", `002` = \"#{email_administrator}\", `031` = \"#{debug_email_address}\" WHERE `043` = \"#{customer}\""
+
+            run_query query, database: "spend-cloud-config"
+
+            puts "Updated config values".green
+
+            run "docker exec proactive-config-php php /var/www/scripts/encryptConfigData.php -c='#{customer}' --execute"
+
+            puts "Encrypted config values".green
+        end
+
+        def run_query query, database: nil, volume: nil
+            command = "docker run --rm --network container:mysql-service"
+
+            if volume
+                command = "#{command} -v #{volume}"
+            end
+
+            command = "#{command} arey/mysql-client -h mysql-service"
+
+            if database
+                command = "#{command} -D #{database}"
+            end
+
+            run "#{command} -e '#{query}'"
+        end
     end
 end

data/sct/lib/sct/commands/dev.rb

@@ -10,12 +10,17 @@ module Sct
       exit 1
     end
 
+    def dc_system
+      return executer = system("which docker-compose") ? 'docker-compose' : 'docker compose'
+    end
+
     def dc command, env = {}
-      system env, "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}"
+      system env, "#{dc_system} -f ~/development/spend-cloud/docker-compose.yml #{command}"
     end
 
     def dc_dev command, env = {}
-      system env, "docker-compose -f #{@@file} #{command}"
+
+      system env, "#{dc_system} -f #{@@file} #{command}"
     end
 
     def manifest
@@ -27,6 +32,9 @@ module Sct
     end
 
     def execute args, options
+
+      UI.message('Trying to start development environment')
+
       services = manifest["services"].to_a
 
       if Sct::Helper.is_windows?
@@ -46,7 +54,7 @@ module Sct
       }
 
       if options.pull
-        return unless dc_dev "pull"
+        return unless dc_dev "pull", env
       end
 
       if options.build
@@ -57,18 +65,28 @@ module Sct
         system "docker image prune -f"
       end
 
-      for service, settings in services
+      for service, service_spec in services
         return unless dc "rm --stop --force #{service}"
       end
 
-      begin
-        dc_dev "up", env
-      rescue SystemExit, Interrupt
-      end
+      if services.length == 1
+        service, service_spec = services.first
+
+        container = service_spec["container_name"]
+        command = service_spec["command"] || ""
 
-      dc_dev "rm --force --stop"
+        dc_dev "run --rm --service-ports --name #{container} #{service} #{command}", env
+      else
+        begin
+          dc_dev "up --remove-orphans --force-recreate --always-recreate-deps", env
+        rescue Interrupt
+          # user pressed Ctrl+C, do nothing
+        end
+
+        dc_dev "down --remove-orphans", env
+      end
 
-      for service, settings in services
+      for service, service_spec in services
         dc "up --detach #{service}"
       end
     end

data/sct/lib/sct/commands/shell.rb

@@ -39,6 +39,8 @@ module Sct
 
       user = options.root ? "root:root" : "$(id -u):$(id -g)"
 
+      puts "Attaching to shell in container #{container.bold}".green
+
       system "docker exec -it --user #{user} #{container} #{command}"
     end
 

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.1.2"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored