sct 1.10.4 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d431beaeb0cf29317c89db4a01ce1e4b739a84e9482b6195c5a262e7237852f7
-  data.tar.gz: b59d7f44ec721c3818b91bcd652bfbf1ac94202a49731caa18071c7cabca9e7a
+  metadata.gz: 83b5089b7b2e78f5a4b94b62278fa9159e60f1e70654eb65921e59f3b2c69d8e
+  data.tar.gz: 8967410c1dbbfc370d64b6744f93cc76ac01be25db05967d4830cc515292a0db
 SHA512:
-  metadata.gz: a1cca40f38a55f25ff6f531979928b3d6f871f273af5f8015098a98301f19512240ba33c8ab8bc3e7f6611c610827b52e91786e80334fd9310ee366f73cdfe71
-  data.tar.gz: a6e71317f10ebd0535208e3ae1cafb606faec39d4b2c93880b1750754ff35103472c511fd8eef32c5b35e604d8a3a74d6375f5b9b03dfb21ba1d04de56a3d26f
+  metadata.gz: 077e1d0700e0a844cc430bda5ec36016056325a3ec5afa272321ce85da4aaa7dc0a5575011b73fd0973a8a94d80efbde84fc88c193549826c5d0b4e8bd5dbad2
+  data.tar.gz: 8599299496eafc2f35e5ca362d10a2caf37883d174a68b8dddaf898cf54164e8830d033607ba7197f0ef8954ee66288f757dc4bc4122817b1e1c646f1450169e

data/cluster/lib/cluster/runner.rb

@@ -25,6 +25,8 @@ module Cluster
         ENV[KEY_CADDYFILE_PATH] = './docker/caddy/Caddyfile-nuxt'
       end
 
+      dc "down --remove-orphans"
+
       if options.pull
         dc "pull"
       end
@@ -35,12 +37,12 @@ module Cluster
 
       run "docker container prune -f"
 
-      dc "up --detach --remove-orphans --force-recreate --always-recreate-deps"
-
       if options.pull or options.build
         system "docker image prune -f"
       end
 
+      dc "up --detach --remove-orphans"
+
       UI.success("\n\e[32m✔️  You can visit your environment at \e[4;36m👉 https://spend-cloud.dev.spend.cloud \e[0m👌\n\n\e[33mFront-end developers should run \e[1mpnpm run dev\e[0;33m within \e[1m/spend-cloud/ui\e[0;33m and work with their dev server.\e[0m\n\e[34mIt proxies to your development API.\e[0m\n")
     end
 

data/henk/lib/henk/commands_generator.rb

@@ -92,7 +92,7 @@ module Henk
                     c.validate options
                     options.dev = $dev
                     options.verbose = $verbose
-                    Henk::Runner.new.henk 'remove', options
+                    Henk::Runner.new.remove_customer options.domain
                 end
             end
 

data/henk/lib/henk/runner.rb

@@ -4,6 +4,24 @@ module Henk
     class Runner
         attr_accessor :options_mapping
 
+        # Tables in spend-cloud-config database that have a client_id column
+        # These will be cleaned up when removing a customer
+        # This list matches the production Go service deleteClient function
+        CONFIG_TABLES_WITH_CLIENT_ID = [
+            '00_settings',
+            '01_settings',
+            '02_settings',
+            '03_settings',
+            '04_settings',
+            '05_settings',
+            '06_settings',
+            '07_settings',
+            '08_settings',
+            '06_settings_external_supplier',
+            'translation_settings',
+            'client_module'
+        ].freeze
+
         def initialize
             @options_mapping = {
                 "organization_name" => {
@@ -180,7 +198,9 @@ module Henk
             begin
                 zip = download_and_unzip dump_url, dir
 
-                customer = zip.slice 0, zip.rindex("_")
+                # Extract customer name from zip filename (format: customer_timestamp or just customer)
+                underscore_index = zip.rindex("_")
+                customer = underscore_index ? zip.slice(0, underscore_index) : zip
 
                 customer_database = customer.gsub "-", "_"
 
@@ -207,7 +227,7 @@ module Henk
 
             run "unzip #{zip_path} -d #{dir}"
 
-            zip = File.basename zip_path
+            File.basename zip_path, ".zip"
         end
 
         def remove_customer customer
@@ -216,14 +236,60 @@ module Henk
             if local_customers.include? customer
                 puts "Customer already exists. Removing customer before importing...".yellow
 
-                run "sct henk remove --domain #{customer}"
+                customer_database = customer.gsub "-", "_"
+
+                remove_customer_from_config_database customer
+
+                puts "Dropping database #{customer_database}...".blue
+                run_query "DROP DATABASE IF EXISTS `#{customer_database}`"
+
+                puts "Removing customer from proactive_accounts.ini...".blue
+                run "docker exec proactive-config sed -i '/^\\[#{customer}\\]/,/^$/d' /data/proactive_accounts.ini"
+
+                puts "Removing customer data directory...".blue
+                run "docker exec proactive-config rm -rf /data/#{customer}"
 
                 puts "Removed existing customer".green
             end
         end
 
+        def remove_customer_from_config_database customer
+            puts "Finding client_id for #{customer}...".blue
+            client_id_result = `docker exec mysql-service mysql -u root -sN -e 'SELECT client_id FROM \`spend-cloud-config\`.\`00_settings\` WHERE \`043\` = "#{customer}"'`.strip
+
+            if !client_id_result.empty?
+                client_id = client_id_result.to_i
+                puts "Found client_id: #{client_id}".blue
+
+                puts "Removing customer from #{CONFIG_TABLES_WITH_CLIENT_ID.length} config tables...".blue
+                delete_client_data_from_tables client_id
+
+                puts "Removing customer from client table...".blue
+                run_query "DELETE FROM `client` WHERE `id` = #{client_id}", database: "spend-cloud-config"
+
+                puts "Removed all config database entries".green
+            else
+                puts "Warning: ".yellow + "Could not find client_id in config database, attempting cleanup with domain name only"
+                run_query "DELETE FROM `00_settings` WHERE `043` = \"#{customer}\"", database: "spend-cloud-config"
+            end
+        end
+
+        def delete_client_data_from_tables client_id
+            CONFIG_TABLES_WITH_CLIENT_ID.each do |table|
+                next if table == 'client'
+
+                puts "  Deleting from #{table}...".blue
+                run_query "DELETE FROM `#{table}` WHERE `client_id` = #{client_id}", database: "spend-cloud-config"
+            end
+
+            puts "  Cleaning up orphaned records...".blue
+            run_query "DELETE FROM `01_settings_extra_velden` WHERE `settings_id` NOT IN (SELECT `id` FROM `01_settings`)", database: "spend-cloud-config"
+            run_query "DELETE FROM `04_settings_contractgegevens` WHERE `settings_id` NOT IN (SELECT `id` FROM `04_settings`)", database: "spend-cloud-config"
+        end
+
         def copy_db_encryption_key customer, dir
-            run "docker exec --user www-data proactive-config mkdir /data/#{customer}"
+            run "docker exec proactive-config mkdir -p /data/#{customer}"
+            run "docker exec proactive-config chown www-data:www-data /data/#{customer}"
             run "docker cp #{dir}/db_encryption.key proactive-config:/data/#{customer}/"
 
             puts "Copied db_encryption.key to proactive-config:/data/#{customer}/".green

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.10.4"
+  VERSION = "1.11.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.11.3
 platform: ruby
 authors:
 - Reshad Farid
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-16 00:00:00.000000000 Z
+date: 2025-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.7
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.7
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -106,54 +106,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.17.0
+        version: '4.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.17.0
+        version: '4.19'
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -174,28 +162,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
 description: Spend Cloud Tool enables to setup a local development environment for
   the Spend Cloud.
 email:
@@ -253,22 +241,22 @@ metadata:
 post_install_message:
 rdoc_options: []
 require_paths:
-- sct/lib
+- cluster/lib
 - henk/lib
+- sct/lib
 - sct_core/lib
-- cluster/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Spend Cloud Tool.