sct 0.1.21 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd0c29ef1fa29ea92d1ecd0e5190b72a10a6b8253c93e3cdea79c6cf02093bc8
-  data.tar.gz: 987dcdf7f07e610c7c1f5dadf0096dbd006bd4a8da601cdeb59919c5b8fb95ac
+  metadata.gz: bccdad524c4eddc87b2e6a51f77bdedbcf455753db1b12e6a111cca020c72ea4
+  data.tar.gz: 85f7cc6150fb7257b847be14c9778ccfd4e47a1e473671a859acad3a10323684
 SHA512:
-  metadata.gz: 7cef3c668d1ff1bf1e92a0d1363582f6310af7f639c15983168cd5ee03e5885d05a4c409c518d90b53b74fedf3f1ac71945e201772dd131fc97ee3e652b062fe
-  data.tar.gz: 98ed6109ff77991041a559db372a2a74e45b6693725025e258c020f506df77c355505af0510050fb2269566b994e42e6a247a03ac08f4538e70833904fd6014d
+  metadata.gz: 06e991dfc21f3bb3de82b55269c0c34bd2ba3997eae02a7e8d153f15a69116c6d2426439b1cd12105a60a36aad65236a3aa940cec75d00d37f6919a3f614440c
+  data.tar.gz: 5aea270e858e20f34ce1aaa97d21ea050e81d682c186affaf5a1985162ae095c1d15f19deac4d8566a0ec331b8bc005ff5c32bf8bf4b248f3a91c3c6f74038bd

data/cluster/lib/cluster/runner.rb

@@ -1,7 +1,7 @@
 module Cluster
     class Runner
-        
-        def launch 
+
+        def launch
             return UI.error("SCT has not been initialized. Run 'sct init' first.") unless SctCore::Config.exists
             start_cluster
             run_command "kubectl delete pod -n kube-system #{pods("kube-system").map { |pod| pod[:name] if pod[:name].start_with? "registry-creds" } .compact.join(" ")}"
@@ -11,11 +11,11 @@ module Cluster
 
         def start_cluster
             if SctCore::Helper.operatingSystem == SctCore::Helper::MAC_OS
-                run_command "#{minikube} start --cpus=$(sysctl -n hw.ncpu) --memory=8G"
+                run_command "#{SctCore::Helper.minikube} start --cpus=$(sysctl -n hw.ncpu) --memory=8G"
             else
-                run_command "#{minikube} start --cpus=$(cat /proc/cpuinfo | grep processor | wc -l) --memory=10G"
+                run_command "#{SctCore::Helper.minikube} start --cpus=$(cat /proc/cpuinfo | grep processor | wc -l) --memory=10G"
             end
-            run_command "#{minikube} ssh -- 'sudo su -c \"echo 10048576 > /proc/sys/fs/inotify/max_user_watches\"'"
+            run_command "#{SctCore::Helper.minikube} ssh -- 'sudo su -c \"echo 10048576 > /proc/sys/fs/inotify/max_user_watches\"'"
             update_config
         end
 
@@ -26,17 +26,14 @@ module Cluster
         end
 
         def down
-            run_command "#{minikube} stop"
+            run_command "#{SctCore::Helper.minikube} stop"
         end
 
         def reset
-            run_command "#{minikube} delete"
+            run_command "#{SctCore::Helper.minikube} delete"
             start_cluster
             create_secrets
-            run_command "#{minikube} addons enable registry-creds"
-            run_command "#{minikube} addons enable ingress"
-            run_command "kubectl rollout status -n kube-system deployment/registry-creds"
-            run_command "kubectl rollout status -n kube-system deployment/nginx-ingress-controller"
+            enable_addons
             wait_for_gcr_secret
             run_command "kubectl apply -f ~/development/spend-cloud/k8s/ingress.yml"
             wait_for_ingress_ip
@@ -46,6 +43,19 @@ module Cluster
             post_start
         end
 
+        def enable_addons
+            enable_addon "registry-creds"
+            enable_addon "ingress"
+        end
+
+        def enable_addon(addon)
+            run_command "#{SctCore::Helper.minikube} addons enable #{addon}"
+
+            deployment = deployments("kube-system").find { |deployment| deployment[:name].include? addon }
+
+            run_command "kubectl rollout status -n kube-system deployment/#{deployment[:name]}"
+        end
+
         def wait_for_pods
             UI.important("Waiting for pods to become ready...")
 
@@ -71,7 +81,7 @@ module Cluster
             end
         end
 
-        def delete_all_pods 
+        def delete_all_pods
             run_command "kubectl delete pods --all"
         end
 
@@ -105,12 +115,8 @@ module Cluster
             run_command "kubectl rollout status -n kube-system deployment/coredns"
         end
 
-        def pods(namespace = nil)
-            if namespace
-                output = `kubectl get pods -n #{namespace}`
-            else
-                output = `kubectl get pods`
-            end
+        def deployments(namespace = "default")
+            output = `kubectl get deployments -n #{namespace}`
 
             # split output lines
             lines = output.split "\n"
@@ -118,9 +124,26 @@ module Cluster
             #  exclude first line (table header)
             lines = lines[1..-1]
 
-            if lines.to_a.empty?
-                return 
+            # get name and status of each pod
+            lines.map do |line|
+                columns = line.split(" ")
+
+                name = columns[0]
+
+                {
+                    name: name
+                }
             end
+        end
+
+        def pods(namespace = "default")
+            output = `kubectl get pods -n #{namespace}`
+
+            # split output lines
+            lines = output.split "\n"
+
+            #  exclude first line (table header)
+            lines = lines[1..-1]
 
             # get name and status of each pod
             lines.map do |line|
@@ -205,7 +228,7 @@ module Cluster
         end
 
         def get_minikube_status
-          output = `#{minikube} status`
+          output = `#{SctCore::Helper.minikube} status`
 
           lines = output.split "\n"
 
@@ -216,12 +239,12 @@ module Cluster
           end
         end
 
-        def print_pods_status(namespace = nil)
+        def print_pods_status(namespace = "default")
 
           pods_list = pods(namespace)
 
           if pods_list.to_a.empty?
-            return 
+            return
           end
 
           rows = pods_list.map do |pod|
@@ -231,7 +254,7 @@ module Cluster
             ]
           end
 
-          puts Terminal::Table.new title: "Pods (namespace: #{namespace || "default"})".green, headings: ['Name', 'Status'], rows: rows
+          puts Terminal::Table.new title: "Pods (namespace: #{namespace})".green, headings: ['Name', 'Status'], rows: rows
         end
 
         def run_command command
@@ -239,13 +262,5 @@ module Cluster
                 raise command.red
             end
         end
-
-        def minikube
-            if SctCore::Helper.operatingSystem == SctCore::Helper::WINDOWS
-                return "minikube.exe"
-            else
-                return "minikube"
-            end
-        end
     end
-end
+end

data/sct/lib/sct/commands/hostfile.rb

@@ -30,6 +30,10 @@ module Sct
         {
           host: "docs.spend.cloud.local",
           comment: "The spend cloud documentation url"
+        },
+        {
+          host: "henk.spend.cloud.local",
+          comment: "The spend cloud Henk web-interface"
         }
       ]
 

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "0.1.21"
+  VERSION = "0.1.26"
 end

data/sct_core/lib/sct_core/helper.rb

@@ -35,10 +35,10 @@ module SctCore
     def self.operatingSystem
       proc = `uname -a`
 
-      case proc
-        when /Microsoft/
+      case proc.downcase
+        when /microsoft/
           os = WINDOWS
-        when /Darwin/
+        when /darwin/
           os = MAC_OS
         else
           os = UBUNTU
@@ -86,5 +86,13 @@ module SctCore
     def self.isSudo
       return !ENV["SUDO_USER"].nil? && !ENV["SUDO_USER"].empty?
     end
+
+    def self.minikube
+      if self.operatingSystem == WINDOWS
+          return "minikube.exe"
+      else
+          return "minikube"
+      end
+    end
   end
 end

data/shell/lib/shell/docker/composer.rb

@@ -6,11 +6,11 @@ module Shell
 
         # Configure the Yarn command
        def self.config
-            self.setImage("eu.gcr.io/dev-pasc-vcdm/helpers-composer:latest", true)
-            self.setPwdAsVolume("/app")
-            self.addVolume(SctCore::Helper.convertWSLToWindowsPath("#{SctCore::Helper.windowsHomePath || SctCore::Helper.homePath}/.composer") , "/tmp")
-            self.setCurrentUserAndGroup()
-            self.setEntrypoint("composer")
+            self.set_image("eu.gcr.io/dev-pasc-vcdm/helpers-composer:latest", true)
+            self.set_pwd_as_volume("/app")
+            self.add_volume(SctCore::Helper.convertWSLToWindowsPath("#{SctCore::Helper.windowsHomePath || SctCore::Helper.homePath}/.composer") , "/tmp")
+            self.set_current_user_and_group()
+            self.set_entrypoint("composer")
         end
     end
 end

data/shell/lib/shell/docker/docker.rb

@@ -4,7 +4,7 @@ require "shell/ClassLevelInheritableAttributes"
 module Shell
     class Docker
         include ClassLevelInheritableAttributes
-        inheritable_attributes :image, :is_private_registry, :entrypoint, :volumes, :ports, :extra_arguments
+        inheritable_attributes :image, :is_private_registry, :entrypoint, :volumes, :ports, :extra_arguments, :env_variables
 
         @image = nil
         @is_private_registry = false
@@ -14,6 +14,7 @@ module Shell
         @ports = {}
         @user_group = []
         @extra_arguments = {}
+        @env_variables = {}
 
         ###
         # The Docker command configuration. This has to be able to execute the command properly
@@ -27,28 +28,28 @@ module Shell
         ###
         def self.exec(cli_arguments)
 
-            self.addExtraArgument(cli_arguments)
+            self.add_extra_argument(cli_arguments)
 
-            self.config()
+            self.config
 
             # Check if the basic variables are set
             if !@image || @image.empty?
                 raise LoadError, "The required image is not defined for this command"
             end
 
-            if !self.checkForImage() && @is_private_registry
-                if !self.loginToPrivateRegistry()
+            if !self.check_for_image && @is_private_registry
+                unless self.login_to_private_registry
                     raise RuntimeError, "Could not authenticate to GCR (" + $?.exitstatus + ")"
                 end
             end
 
-            self.runCommand()
+            self.run_command
         end
 
         ###
         # The image for this Docker command
         ###
-        def self.setImage(image, is_private_registry=false)
+        def self.set_image(image, is_private_registry=false)
             @image = image
             @is_private_registry = is_private_registry
         end
@@ -56,27 +57,27 @@ module Shell
         ###
         # Set the current PWD as a volume on the specified path in the container
         ###
-        def self.setPwdAsVolume(volume_path)
+        def self.set_pwd_as_volume(volume_path)
             pwd = `pwd -P`
 
             if SctCore::Helper.operatingSystem == SctCore::Helper::WINDOWS
                 pwd=SctCore::Helper.convertWSLToWindowsPath(pwd)
             end
 
-            addVolume(pwd, volume_path)
+            add_volume(pwd, volume_path)
         end
 
         ###
         # Add an extra volume in the container
         ###
-        def self.addVolume(localPath, volume_path)
-            @volumes[localPath] = volume_path
+        def self.add_volume(local_path, volume_path)
+            @volumes[local_path] = volume_path
         end
 
         ###
         # Add a port mapping for the container
         ###
-        def self.mapPort(external_port, container_port = nil)
+        def self.map_port(external_port, container_port = nil)
 
             external_port=String(external_port)
             container_port=String(container_port)
@@ -91,7 +92,7 @@ module Shell
         ###
         # Set the current user and group in the container
         ###
-        def self.setCurrentUserAndGroup
+        def self.set_current_user_and_group
             @user_group = []
             @user_group << `id -u`
             @user_group << `id -g`
@@ -100,14 +101,14 @@ module Shell
         ###
         # Set the entrypoint for the command in the container
         ###
-        def self.setEntrypoint(entrypoint)
+        def self.set_entrypoint(entrypoint)
             @entrypoint=entrypoint
         end
 
         ###
         # Add extra arguments to be configured for the container
         ###
-        def self.addExtraArgument(argument, value=nil)
+        def self.add_extra_argument(argument, value=nil)
             argument = String(argument)
 
             if value
@@ -117,10 +118,17 @@ module Shell
             self.extra_arguments[argument] = value
         end
 
+        ###
+        # Set environment variables for the container
+        ###
+        def self.set_environment_variables(env_variables)
+            @env_variables = env_variables
+        end
+
         ###
         # Check if the image is already present in the system
         ###
-        def self.checkForImage
+        def self.check_for_image
             image_list=`docker images -q #{@image} 2> /dev/null`
 
             return image_list && !image_list.empty?
@@ -129,7 +137,7 @@ module Shell
         ###
         # Login to the private container registry with the cloud credentials
         ###
-        def self.loginToPrivateRegistry
+        def self.login_to_private_registry
             `docker login -u oauth2accesstoken -p "$(gcloud auth application-default print-access-token)" https://eu.gcr.io &> /dev/null`
             return $?.success?
         end
@@ -137,8 +145,8 @@ module Shell
         ###
         # Run the command
         ###
-        def self.runCommand()
-            command = self.compileCommand()
+        def self.run_command
+            command = self.compile_command
 
             SctCore::CommandExecutor.execute(command: command, print_all: true, suppress_output: false)
         end
@@ -146,42 +154,53 @@ module Shell
         ###
         # Compile the command with all options
         ###
-        def self.compileCommand()
+        def self.compile_command
             # Basic docker run command
-            command = self.addToCommandString("" , "docker run --rm -it")
+            command = self.add_to_command_string("" , "docker run --rm -it")
+
+            # Attach environment variables
+            if @env_variables
+                @env_variables.each do |key, value|
+                    if value && !value.empty?
+                        command  = self.add_to_command_string(command, "-e " + key+"="+value)
+                    else
+                        command  = self.add_to_command_string("-e " + key, value)
+                    end
+                end
+            end
 
             # Attach configured volumes
             if @volumes
                 @volumes.each do |local_path, container_path|
-                    command = self.addToCommandString(command, "--volume " + local_path +":"+ container_path)
+                    command = self.add_to_command_string(command, "--volume " + local_path +":"+ container_path)
                 end
             end
 
             # Map configured ports
             if @ports
                 @ports.each do |external_port, container_port|
-                    command = self.addToCommandString(command, "-p " + external_port +":"+ container_port)
+                    command = self.add_to_command_string(command, "-p " + external_port +":"+ container_port)
                 end
             end
 
             if @user_group
-                command  = self.addToCommandString(command, "--user "+ String(@user_group.shift()) +":"+ String(@user_group.shift()))
+                command  = self.add_to_command_string(command, "--user "+ String(@user_group.shift) +":"+ String(@user_group.shift))
             end
 
             # Add image to command
-            command  = self.addToCommandString(command, @image)
+            command  = self.add_to_command_string(command, @image)
 
             if @entrypoint
-                command  = self.addToCommandString(command, String(@entrypoint))
+                command  = self.add_to_command_string(command, String(@entrypoint))
             end
 
             # Append arguments and options to command
             if @extra_arguments
                 @extra_arguments.each do |argument, value|
                     if value && !value.empty?
-                        command  = self.addToCommandString(command, argument+"="+value)
+                        command  = self.add_to_command_string(command, argument+"="+value)
                     else
-                        command  = self.addToCommandString(command, argument)
+                        command  = self.add_to_command_string(command, argument)
                     end
                 end
             end
@@ -192,7 +211,7 @@ module Shell
         ###
         # Append a part to the command string and remove any unwanted characters
         ###
-        def self.addToCommandString(command_string, append)
+        def self.add_to_command_string(command_string, append)
             return command_string + append.gsub(/\r?\n/, "") + " "
         end
     end

data/shell/lib/shell/docker/php.rb

@@ -1,15 +1,60 @@
 require "sct_core"
+
 require_relative "docker"
 
 module Shell
-    class Php < Docker
-
-        # Configure the Yarn command
-       def self.config
-            self.setImage("eu.gcr.io/dev-pasc-vcdm/proactive-base:latest", true)
-            self.setPwdAsVolume("/var/www")
-            self.setCurrentUserAndGroup()
-            self.setEntrypoint("php")
+  class Php < Docker
+
+    attr_accessor :make
+
+    # Configure the Yarn command
+    def self.config
+      self.set_image("eu.gcr.io/dev-pasc-vcdm/proactive-base:latest", true)
+      self.set_pwd_as_volume("/var/www")
+      self.set_current_user_and_group
+      self.set_entrypoint("php")
+      self.set_environment_variables(self.get_environment_variables)
+    end
+
+    def self.get_environment_variables
+      environment_variables = {}
+      environment_variables.store("ENVIRONMENT", "local")
+
+      environment_variables = self.add_service_ip_and_port(environment_variables)
+
+      return environment_variables
+    end
+
+    def self.add_service_ip_and_port(environment_variables)
+      service_names = %w[mysql-service redis-service]
+
+      minikube_status
+
+      service_names.each { |service_name|
+        url = `#{SctCore::Helper.minikube} service #{service_name} --url`
+
+        ip_and_port = url.match /(?<ip>[0-9]+(?:\.[0-9]+){3}):(?<port>[0-9]+)/
+
+        case service_name
+        when "mysql-service"
+          environment_variables.store("DB_HOST", ip_and_port[:ip])
+          environment_variables.store("DB_PORT", ip_and_port[:port])
+        when "redis-service"
+          environment_variables.store("REDIS_HOST", ip_and_port[:ip])
+          environment_variables.store("REDIS_PORT", ip_and_port[:port])
         end
+      }
+
+      return environment_variables
+    end
+
+    def self.minikube_status
+      output = `#{SctCore::Helper.minikube} status`
+
+      if output.scan(/Running/).length != 3 && output.scan(/Configured/).length != 1
+        UI.important("Please check your minikube status. If all services are stopped you should start the minikube first.")
+        exit
+      end
     end
+  end
 end

data/shell/lib/shell/docker/yarn.rb

@@ -6,12 +6,12 @@ module Shell
 
         # Configure the Yarn command
        def self.config
-            self.setImage("eu.gcr.io/dev-pasc-vcdm/helpers-yarn:latest", true)
-            self.setPwdAsVolume("/app")
-            self.addVolume(SctCore::Helper.convertWSLToWindowsPath("#{SctCore::Helper.windowsHomePath || SctCore::Helper.homePath}/.cache") , "/.cache")
-            self.mapPort(8081, 8080)
-            self.mapPort(9001)
-            self.setCurrentUserAndGroup()
+            self.set_image("eu.gcr.io/dev-pasc-vcdm/helpers-yarn:latest", true)
+            self.set_pwd_as_volume("/app")
+            self.add_volume(SctCore::Helper.convertWSLToWindowsPath("#{SctCore::Helper.windowsHomePath || SctCore::Helper.homePath}/.cache") , "/.cache")
+            self.map_port(8081, 8080)
+            self.map_port(9001)
+            self.set_current_user_and_group()
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.26
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -249,9 +249,9 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - cluster/lib
-- shell/lib
 - sct/lib
 - sct_core/lib
+- shell/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Spend Cloud Tool.