sct 1.0.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4e19d771e32524e38a9d685d161bdf57a17a71569536ce5af8fd51462b52960
-  data.tar.gz: 610520f2b59b575ccc858c80af79cd1b40b470c403c849e34415559461e9b4ee
+  metadata.gz: d0986700d21895e4341fb5dfccf2ae8ea24dcda3fd62677733fcfa082396f410
+  data.tar.gz: 06d47615615d788cc402f099451b4efc833093f9030b624bfdf849b893c8b98b
 SHA512:
-  metadata.gz: cd68fb3fd3e6c5ba9c4a91232cb83427697631385367eefff7a5477fd99e10f8c524f9d7ea4327c56d7ab31a93fca09e4ee610aad3b099ce14d26f7ab4777e76
-  data.tar.gz: 2ab0d6e33f702ec64050126b05ee818e607ceae6b806a5ee91938295cf7e8e69824e3e3dacf41688e4f538041e67aaacfecd7c7708d168be3ce5311ef527e75b
+  metadata.gz: f778fc09644bd3f8a0ce76f891c9b744216643e61cc1592e654db260b84afd660fbcf6991484e2d2097f577a64b55a0f1fa832fe4a3226c2454e209be870b787
+  data.tar.gz: 3344106a0b57eb94b5cf82cc7e3e6872697fc95eb567e00a1a63149986d695db54e0a84fd8db3ad477394ec0a4620592dbf26381633d5dee218750b2ee94d597

data/cluster/lib/cluster/runner.rb

@@ -26,7 +26,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

@@ -0,0 +1,136 @@
+require 'commander'
+require_relative 'runner'
+require 'pp'
+
+module Henk
+    class CommandsGenerator
+        include Commander::Methods
+
+        def self.start
+            self.new.run
+        end
+
+        def run
+            add_commander_methods
+
+            Henk::Runner.new.verify_cluster_active
+
+            program :name, 'henk'
+            program :version, Sct::VERSION
+            program :description, 'CLI for \'henk\' - Interact with Henk 3.0 to be able to create/copy/delete customers'
+
+            $dev = false
+            $verbose = false
+            global_option('--dev') { $dev = true }
+            global_option('--verbose') { $verbose = true }
+
+            command :create do |c|
+                c.syntax = 'sct henk create'
+                c.description = 'Create a client in your local development.'
+                c.required_option '--domain DOMAIN', 'The domain name of the new customer.'
+                c.required_option '--organization-name ORGANIZATION_NAME', 'The name of the organization.'
+                c.required_option '--modules MODULES', 'Allowed modules. ex: 01, 02, 03, ...'
+
+                c.action do |args, options|
+                    c.validate options
+
+                    options.dev = $dev
+                    options.verbose = $verbose
+                    Henk::Runner.new.henk "create", options
+                    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'
+                c.required_option '--domain DOMAIN', 'The domain to copy.'
+                c.option '--source-environment SOURCE_ENVIRONMENT', 'The name of the source environment (currently only local allowed).'
+                c.option '--target-domain DOMAIN', 'The name of the domain on the local environment. When making a local copy it cannot be the same name'
+                c.option '--overwrite', 'Set this flag if you want to overwrite an existing target-domain.'
+                c.option '--copy-data', 'Set this flag if you want to copy the data of the source client'
+
+                # Specify command options here
+                c.action do |args, options|
+                    c.validate options
+
+                    unless options.source_environment
+                        options.source_environment = "local"
+                    end
+
+                    # Temporary provision until we can copy environments from Accept
+                    if options.source_environment != "local"
+                        raise ArgumentError.new("It's currently not possible to copy an cloud environment.".yellow)
+                    end
+
+                    options.target_environment = "local"
+
+                    unless options.target_domain
+                        options.target_domain = options.domain
+                    end
+
+                    if options.source_environment == options.target_environment \
+                        and options.domain == options.target_domain
+                        raise ArgumentError.new("The source and target domains cannot be the same.")
+                    end
+
+                    options.dev = $dev
+                    options.verbose = $verbose
+                    Henk::Runner.new.henk "copy", options
+                    Henk::Runner.new.encrypt_config_data options.target_domain
+                    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.'
+                c.required_option '--domain DOMAIN', 'The domain to remove.'
+                c.option '--user-email EMAIL', 'The email address of the user removing the customer'
+
+                c.action do |args, options|
+                    c.validate options
+                    options.dev = $dev
+                    options.verbose = $verbose
+                    Henk::Runner.new.henk 'remove', options
+                end
+            end
+
+            command :"list-clients" do |c|
+                c.syntax = 'sct henk list-clients'
+                c.description = 'List all clients that are available on the dev environment'
+
+                c.action do |args, options|
+                    Henk::Runner.new.list_clients
+                end
+            end
+
+            run!
+        end
+
+        # Ruben's suggestion but still need some workaround
+        def add_commander_methods
+            Commander::Command.class_eval {
+                attr_accessor :required
+
+                def required_option(*arg, &block)
+                    unless self.required
+                        @required = []
+                    end
+
+                    option = arg.select{|item| item.start_with?('--')}.map{|a| a.gsub(/\-\-([^\s]*)(.*)/, '\1')}.shift
+                    self.required << option.to_s.tr('-', '_')
+                    self.option(*arg)
+                end
+
+                def validate options
+                    self.required.each do |option|
+                        if options.__hash__[:"#{option}"].nil? || options.__hash__[:"#{option}"] == ''
+                            raise ArgumentError.new("The --#{option} argument is a required argument")
+                        end
+                    end
+                end
+            }
+        end
+    end
+end

data/henk/lib/henk/module.rb

@@ -0,0 +1,7 @@
+module Henk
+
+    # import the helper functionality from SCT
+    Helpers = Sct::Helper
+    UI = Sct::UI
+
+end

data/henk/lib/henk/runner.rb

@@ -0,0 +1,175 @@
+require 'pp'
+
+module Henk
+    class Runner
+        attr_accessor :options_mapping
+    
+        def initialize
+            @options_mapping = {
+                "organization_name" => {
+                    "name" => "organization-name"
+                },
+                "modules"  => {
+                    "name" => "modules",
+                    "type" => "array"
+                },
+                "database_source" => {
+                    "name" => "database-source"
+                },
+                "target_domain" => {
+                    "name" => "target-domain"
+                },
+                "copy_data" => {
+                    "name" => "copy-data"
+                },
+                "source_environment" => {
+                    "name" => "source-environment"
+                },
+                "target_environment" => {
+                    "name" => "target-environment"
+                },
+                "user_email" => {
+                    "name" => "user-email"
+                }
+            }
+        end
+
+        def run command
+            if !system command
+                raise command.red
+            end
+
+            rescue Interrupt
+        end
+
+        def verify_cluster_active
+            required_containers = [
+                "proactive-config",
+                "proactive-frame",
+                "mysql-service"
+            ]
+
+            if !system "docker network inspect spend-cloud > /dev/null"
+                puts "Error: ".red + "The local spend-cloud cluster doesn't seem to be running."
+                exit(1)
+            end
+
+            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)"
+                exit(1)
+            end
+
+            return true
+        end
+
+        def henk command, options = {}
+            begin
+                volumes = get_volumes_string(options.dev)
+                image = get_latest_image
+                verbose = options.verbose
+
+                options = options_to_string options
+                to_run = "docker run -it --rm --network spend-cloud #{volumes} #{image} #{command} #{options}"
+
+                if verbose
+                    puts "Running: #{to_run.green}"
+                end
+
+                self.run to_run
+            end
+        end
+
+        def list_clients
+            self.run "docker exec -it mysql-service mysql -u root -sN -e 'SELECT `043` FROM `spend-cloud-config`.`00_settings` ORDER BY `043` ASC'"
+        end
+
+        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}"'
+            self.run command
+        end
+
+        def synchronize_employees domain
+            puts "Manually synchronizing employees with shared storage for #{domain}".green
+            php_command = "php /var/www/scripts/syncEmployees.php --client='#{domain}'"
+            command = 'docker exec -it proactive-frame bash -c "#{php_command}"'
+            self.run command
+        end
+
+        def get_latest_image
+            latest_version = `gcloud container images list-tags eu.gcr.io/dev-pasc-vcdm/henk-app --limit 1 --format=\"json\" | jq -r '[.[0].tags | sort_by(length)[] | select(match(\"^[0-9]+$\"))] | first'`
+            return "eu.gcr.io/dev-pasc-vcdm/henk-app:#{latest_version.strip}"
+        end
+
+        def get_volumes_string dev = false
+            volumes = {
+                "spend-cloud_shared-storage" => "/data"
+            }
+
+            if dev
+                repoPath = Sct::Helper.homePath + "/development/henk"
+
+                if not Dir.exists?(repoPath)
+                    puts "Warning: ".yellow + "To run in development mode you need a checkout for the Henk repository. Continuing in normal mode."
+                else
+                    dev_volumes = {
+                        repoPath + "/modules"                   => "/var/scripts/modules",
+                        repoPath + "/client.py"                 => "/var/scripts/client.py",
+                        repoPath + "/environment_mapping.json"  => "/var/scripts/environment_mapping.json",
+                        repoPath + "/logging-config.json"       => "/var/scripts/logging-config.json",
+                        repoPath + "/schemas"                   => "/var/scripts/schemas",
+                        repoPath + "/resources"                 => "/var/local"
+                    }
+
+                    volumes = volumes.merge(dev_volumes)
+                end
+            end
+
+            return volumes.map{|k,v| "-v #{k}:#{v}"}.join(' ')
+        end
+
+        def options_to_string options = {}
+            options_str = ''
+
+            if options.verbose
+                options_str += '--verbose '
+            end
+
+            if options.overwrite
+                options_str += '--overwrite '
+            end
+
+            if options.copy_data
+                options_str += '--copy-data '
+            end
+
+            options = options.__hash__
+
+            options.delete(:dev)
+            options.delete(:verbose)
+            options.delete(:overwrite)
+            options.delete(:copy_data)
+
+            parsed_options = []
+
+            options.each do |k,v|
+                if self.options_mapping["#{k}"]
+                    mapping = self.options_mapping["#{k}"]
+                    k = mapping['name']
+
+                    if mapping['type'] == "array"
+                        v = v.split(',').join(' ')
+                    end
+                end
+
+                parsed_options << "--#{k} #{v}"
+            end
+
+            options_str += parsed_options.join(' ')
+            return options_str
+        end
+    end
+end

data/henk/lib/henk.rb

@@ -0,0 +1,5 @@
+require 'sct_core'
+require 'terminal-table'
+
+require_relative 'henk/runner'
+require_relative 'henk/module'

data/sct/lib/sct/commands/databasepull.rb

@@ -23,14 +23,27 @@ module Sct
                 error "Private token not set"
             end
 
-            if options.proactive_frame
-                UI.important("Requesting to pull database for proactive frame")
-                process_request = `curl -X POST -F token=#{private_token} -F ref=master -F variables[DB_PULL_FRAME]=true -F variables[REMOTE_BRANCH_NAME]=#{branch} #{pipeline_endpoint}`
-            end
-            
-            if options.proactive_config
-                UI.important("Requesting to pull database for proactive config")
-                process_request = `curl -X POST -F token=#{private_token} -F ref=master -F variables[DB_PULL_CONFIG]=true -F variables[REMOTE_BRANCH_NAME]=#{branch} #{pipeline_endpoint}`
+            if options.all
+                UI.important("Requesting to pull database changes for proactive frame and proactive config")
+                process_request = `curl -X POST -F token=#{private_token} -F ref=master -F variables[DB_PULL_FRAME]=true -F variables[DB_PULL_CONFIG]=true -F variables[REMOTE_BRANCH_NAME]=#{branch} #{pipeline_endpoint}`
+            else
+                db_pull_frame = ""
+                if options.proactive_frame
+                    UI.important("Requesting to pull database for proactive frame")
+                    db_pull_frame = "-F variables[DB_PULL_FRAME]=true"
+                end
+
+                db_pull_config = ""
+                if options.proactive_config
+                    UI.important("Requesting to pull database for proactive config")
+                    db_pull_config = "-F variables[DB_PULL_CONFIG]=true"
+                end
+
+                if db_pull_frame != "" or db_pull_config != ""
+                    process_request = `curl -X POST -F token=#{private_token} -F ref=master #{db_pull_frame} #{db_pull_config} -F variables[REMOTE_BRANCH_NAME]=#{branch} #{pipeline_endpoint}`
+                else
+                    error "Missing options. Use --help to see the available options"
+                end
             end
         end
     end

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

@@ -29,15 +29,6 @@ module Sct
     def execute args, options
       services = manifest["services"].to_a
 
-      if services.length != 1
-        error "Currently sct only supports a single service declaration in '#{@@file}'. Contact the infra guild if you consider this a limitation."
-      end
-
-      service, service_spec = services.first
-
-      container = service_spec["container_name"]
-      command = service_spec["command"] || ""
-
       if Sct::Helper.is_windows?
         host_machine_IP = (options.wsl_debugger ? `hostname -I | awk '{print $1}'` : `powershell.exe -c '(Test-Connection -ComputerName $env:computername -count 1).ipv4address.IPAddressToString' | dos2unix`).chomp
       elsif Sct::Helper.is_mac_os?
@@ -55,7 +46,7 @@ module Sct
       }
 
       if options.pull
-        return unless dc_dev "pull"
+        return unless dc_dev "pull", env
       end
 
       if options.build
@@ -66,11 +57,30 @@ module Sct
         system "docker image prune -f"
       end
 
-      return unless dc "rm --stop --force #{service}"
+      for service, service_spec in services
+        return unless dc "rm --stop --force #{service}"
+      end
+
+      if services.length == 1
+        service, service_spec = services.first
 
-      dc_dev "run --rm --service-ports --name #{container} #{service} #{command}", env
+        container = service_spec["container_name"]
+        command = service_spec["command"] || ""
 
-      dc "up --detach #{service}"
+        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, service_spec in services
+        dc "up --detach #{service}"
+      end
     end
 
   end

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

@@ -21,10 +21,6 @@ module Sct
 
       services = manifest["services"].to_a
 
-      if services.length != 1
-        error "Currently sct only supports a single service declaration in '#{file}'. Contact the infra guild if you consider this a limitation."
-      end
-
       service, service_spec = services.first
 
       container = service_spec["container_name"]
@@ -43,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/commands_generator.rb

@@ -57,6 +57,7 @@ module Sct
             command :'database-pull' do |c|
                 c.syntax = 'sct database pull'
                 c.description = 'pull database changes for proactive frame and proactive config'
+                c.option '--all', 'pull the database changes for all repositories'
                 c.option '--proactive-frame', 'pull the database changes from proactive-frame'
                 c.option '--proactive-config', 'pull the database changes from proactive-config'
 

data/sct/lib/sct/tools.rb

@@ -1,7 +1,8 @@
 module Sct
     TOOLS = [
       :sct,
-      :cluster
+      :cluster,
+      :henk
     ]
 
     # a list of all the config files we currently expect

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.0.9"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -215,6 +215,10 @@ files:
 - cluster/lib/cluster/commands_generator.rb
 - cluster/lib/cluster/module.rb
 - cluster/lib/cluster/runner.rb
+- henk/lib/henk.rb
+- henk/lib/henk/commands_generator.rb
+- henk/lib/henk/module.rb
+- henk/lib/henk/runner.rb
 - sct/lib/.DS_Store
 - sct/lib/sct.rb
 - sct/lib/sct/.DS_Store
@@ -250,6 +254,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - cluster/lib
+- henk/lib
 - sct/lib
 - sct_core/lib
 required_ruby_version: !ruby/object:Gem::Requirement