sct 1.0.8 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77a9f9b0da2f262d9c336ee3f6f912bb0e097f0caf9d91adbe1b3dd9ad33059d
-  data.tar.gz: 58cbc6da8d20cb35fdc6f1d12d326472ff0a40466010f7b9e4130c7f201a52ec
+  metadata.gz: 87ea56635397f45831d78759ad65fa074bbde63827fc8c8fba75903f71bf45a6
+  data.tar.gz: 0c72ba5441f383c3dea4f5912c33734822774c93054fdd332a7f57042d46ec66
 SHA512:
-  metadata.gz: d8379c969766240db807fb92dea072eea56d7e3e0f0148ee2e9c4318e32eb60903cc5bd9a20353ac5bb031582795e7f20661cfe7a7829151dd6d1d5a12264d57
-  data.tar.gz: 30eded070cff1db7d533c2d3f36e850204ff78c7be2696d504e0d4e1eb86f8564da26278f04621b021f3cfb2f29805f4ece5d9c6a3b156a7f6c145118acfb74e
+  metadata.gz: 508892aaef3fffe214203682a28f8976abb681c01243154df5c4ef061a3ebd84c97a510858ae91ead399ab56e68329db6b318ff434afa9b48ca966aad62d89cb
+  data.tar.gz: 6b7868aaf906825de525197e174766edca7de50e90775cd9a130a48c6a4c2cd305250e455c964da5088cead2799250d4083a973101a1288bfd5ab1a093c80b5c

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

@@ -6,7 +6,10 @@ module Sct
         end
         
         def execute args, options
-            branch = ENV['CI_BRANCH'] || 'master'
+            branch = ENV['CI_BRANCH']
+            if not branch or branch == ""
+                branch = 'master'
+            end
 
             # We need to set this locally, so that we don't save this at the repository 
             pipeline_endpoint = ENV['CI_MERGE_REQUEST_PIPELINE']
@@ -20,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=#{branch} -F variables[DB_PULL_FRAME]=true #{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=#{branch} -F variables[DB_PULL_CONFIG]=true #{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?
@@ -66,11 +57,20 @@ module Sct
         system "docker image prune -f"
       end
 
-      return unless dc "rm --stop --force #{service}"
+      for service, settings in services
+        return unless dc "rm --stop --force #{service}"
+      end
+
+      begin
+        dc_dev "up", env
+      rescue SystemExit, Interrupt
+      end
 
-      dc_dev "run --rm --service-ports --name #{container} #{service} #{command}", env
+      dc_dev "rm --force --stop"
 
-      dc "up --detach #{service}"
+      for service, settings 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"]

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.8"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.2
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-12-21 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