sct 0.1.30 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dc9c664ca89d649033d4fcfdcad7e8d72d78b448d800caa8c8097ec1ea7ed47
-  data.tar.gz: f3cdba0dfbaacbf240e4f84f8530cb835308a19203999db78759b17d4eb18150
+  metadata.gz: 8be150a1d5ddc9339df696d2f7db5d6056dfdba0fbb48884e57cfacc700b79ea
+  data.tar.gz: d6fc67a9a3af7c51bf542353f476ec59b60f1c40e7387da64910c4287be857c7
 SHA512:
-  metadata.gz: 56c7e96250c79f3fdb4de6fab3358e4e6eb443f813064d88e9353a766eccecc1ad1c7f2c2878716347676e3c24de1d09456763ccc2c857d13eb6cd4f058f7593
-  data.tar.gz: 27543415be2aac23a5032b2b96bb7504dd12b5cc3d41f73c489251416d1d3bc3ddd83c8af71f7163b96b0bfe1c22a1f8f06e8c9992a5a54d279a89a40d3c90b6
+  metadata.gz: e5046d7b3acb18f4cce8b17b7a8d32586758dfda47ba696b7e0f36192fd5b51d132fe2a770768410728279c08b70ebfeb263a79b82bad5531d889b3fe0b733cc
+  data.tar.gz: 3502a15df6d47b547af6dc7a15cd175a23f45700c6771ccf66055542d2df2d21baadb7c26c03c0736d469ead3108c5b09f968adc318c1d572fa036fea047f454

data/cluster/lib/cluster/commands_generator.rb

@@ -2,96 +2,101 @@ require 'commander'
 require_relative 'runner'
 
 module Cluster
-    class CommandsGenerator
-        include Commander::Methods
+  class CommandsGenerator
+    include Commander::Methods
 
-        def self.start
-            self.new.run
-        end
-
-        def run
-            program :name, 'cluster'
-            program :version, Sct::VERSION
-            program :description, 'CLI for \'cluster\' - Manage your local kubernetes cluster'
-
-            global_option('--verbose') { $verbose = true }
-
-            command :start do |c|
-                c.syntax = "sct cluster start"
-                c.description = "start the cluster"
-
-                c.action do |args, options|
-                    Cluster::Runner.new.start
-                end
-
-            end
-
-            command :stop do |c|
-                c.syntax = 'sct cluster stop'
-                c.description = 'stop the cluster'
+    def self.start
+      self.new.run
+    end
 
-                c.action do |args, options|
-                    Cluster::Runner.new.stop
-                end
-            end
+    def run
+      program :name, 'cluster'
+      program :version, Sct::VERSION
+      program :description, 'CLI for \'cluster\' - Manage your local Docker cluster'
 
-            command :restart do |c|
-                c.syntax = "sct cluster restart"
-                c.description = "restart the cluster"
+      global_option('--verbose') { $verbose = true }
 
-                c.action do |args, options|
-                    Cluster::Runner.new.restart
-                end
+      command :start do |c|
+        c.syntax = "sct cluster start"
+        c.description = "start the cluster"
+        c.option '--build', '(re)build images before starting'
+        c.option '--pull', 'pull latest images before starting'
 
-            end
+        c.action do |args, options|
+          Cluster::Runner.new.start args, options
+        end
+      end
 
-            command :delete do |c|
-                c.syntax = "sct cluster delete"
-                c.description = "delete the cluster"
+      command :stop do |c|
+        c.syntax = 'sct cluster stop'
+        c.description = 'stop the cluster'
 
-                c.action do |args, options|
-                    Cluster::Runner.new.delete
-                end
+        c.action do |args, options|
+          Cluster::Runner.new.stop
+        end
+      end
 
-            end
+      command :restart do |c|
+        c.syntax = "sct cluster restart"
+        c.description = "restart the cluster"
 
-            command :reset do |c|
-                c.syntax = 'sct cluster reset'
-                c.description = 'delete the cluster and start a new cluster'
+        c.action do |args, options|
+          Cluster::Runner.new.restart
+        end
+      end
 
-                c.action do |args, options|
-                    Cluster::Runner.new.reset
-                end
-            end
+      command :delete do |c|
+        c.syntax = "sct cluster delete"
+        c.description = "delete the cluster"
 
-            command :status do |c|
-                c.syntax = 'sct cluster status'
-                c.description = 'see the status of your cluster'
+        c.action do |args, options|
+          Cluster::Runner.new.delete
+        end
+      end
 
-                c.action do |args, options|
-                    Cluster::Runner.new.status
-                end
-            end
+      command :reset do |c|
+        c.syntax = 'sct cluster reset'
+        c.description = 'delete the cluster and start a new cluster'
 
-            command :'update config' do |c|
-                c.syntax = 'sct cluster update config'
-                c.description = 'update the cluster configuration'
+        c.action do |args, options|
+          Cluster::Runner.new.reset args, options
+        end
+      end
 
-                c.action do |args, options|
-                    Cluster::Runner.new.update_config
-                end
-            end
+      command :pull do |c|
+        c.syntax = 'sct cluster pull'
+        c.description = 'pull new image versions'
 
-            command :'apply deployments' do |c|
-                c.syntax = 'sct cluster apply deployments'
-                c.description = 'apply deployments from the k8s folder'
+        c.action do |args, options|
+          Cluster::Runner.new.pull
+        end
+      end
 
-                c.action do |args, options|
-                    Cluster::Runner.new.apply_deployments
-                end
-            end
+      command :status do |c|
+        c.syntax = 'sct cluster status'
+        c.description = 'see the status of your cluster'
 
-            run!
+        c.action do |args, options|
+          Cluster::Runner.new.status
+        end
+      end
+
+      command :logs do |c|
+        c.syntax = 'sct cluster logs'
+        c.description = 'see the logs of your cluster'
+        c.option '-f', 'follow log output'
+        c.option '--follow', 'follow log output'
+        c.option '-t', 'show timestamps'
+        c.option '--timestamps', 'show timestamps'
+        c.option '--tail LINES', 'number of lines to show from the end of the logs for each container (default: "all")'
+
+        c.action do |args, options|
+          Cluster::Runner.new.logs args, options
         end
+      end
+
+      run!
     end
+
+  end
 end

data/cluster/lib/cluster/runner.rb

@@ -1,318 +1,73 @@
 module Cluster
-    class Runner
+  class Runner
 
-        def start
-            SctCore::Helper.ensure_windows_administrator # "sct hostfile" will need it later on
-
-            existing_cluster = cluster_exists?
-
-            start_cluster
-
-            if existing_cluster
-                run_command "kubectl rollout restart -n kube-system deployment registry-creds"
-                run_command "kubectl rollout status -n kube-system deployment registry-creds"
-            else
-                create_secrets
-                enable_addons
-                wait_for_gcr_secret
-                run_command "kubectl apply -f ~/development/spend-cloud/k8s/ingress.yml"
-                wait_for_ingress_ip
-                run_command "kubectl apply -f ~/development/spend-cloud/k8s/dependencies.yml"
-                wait_for_pods
-                run_command "kubectl apply -f ~/development/spend-cloud/k8s/"
-            end
-
-            post_start
-        end
-
-        def stop
-            run_command "minikube stop"
-        end
-
-        def restart
-            SctCore::Helper.ensure_windows_administrator # "sct hostfile" will need it later on
-
-            stop
-            start
-        end
-
-        def delete
-            run_command "minikube delete"
-        end
-
-        def reset
-            SctCore::Helper.ensure_windows_administrator # "sct hostfile" will need it later on
-
-            delete
-            start
-        end
-
-        def status
-            print_contexts
-            print_minikube_status
-
-            if get_minikube_status.find_all { |status| status[1] == 'Stopped' }.count == 0
-              print_pods_status("kube-system")
-              print_pods_status
-            else
-              UI.important("Please check your minikube status. If all services are stopped you should start the minikube first.")
-            end
-        end
-
-        def update_config
-            run_command "kubectl config use-context minikube"
-
-            run_command "kubectl replace -n kube-system -f #{File.expand_path('resources/corefile.yml', __dir__)}"
-            run_command "kubectl rollout restart -n kube-system deployment coredns"
-            run_command "kubectl rollout status -n kube-system deployment coredns"
-        end
-
-        def apply_deployments
-            run_command "kubectl apply -f ~/development/spend-cloud/k8s/"
-        end
-
-
-        def cluster_exists?
-            if system "minikube status", { out: "/dev/null" }
-                # cluster exists and is running
-                return true
-            end
-
-            if $?.exitstatus == 85
-                # cluster does not exist
-                return false
-            end
-
-            # cluster exists but is stopped
-            return true
-        end
-
-        def start_cluster
-            if SctCore::Helper.operatingSystem == SctCore::Helper::MAC_OS
-                run_command "minikube start --driver=docker --cpus=$(sysctl -n hw.ncpu) --memory=8G"
-            else
-                run_command "minikube start --driver=docker --cpus=$(cat /proc/cpuinfo | grep processor | wc -l) --memory=3G"
-            end
-            update_config
-        end
-
-        def post_start
-            wait_for_pods
-            copy_proactive_accounts_file
-            run_command "sudo sct hostfile"
-            run_command "minikube tunnel &", { out: "/dev/null", err: "/dev/null" } if SctCore::Helper::is_windows? # leave this running detached forever in the background
-            UI.success("\n✔️ You can visit your environment at 👉 https://spend-cloud.spend.cloud.local 👌")
-        end
-
-        def enable_addons
-            enable_addon "registry-creds"
-            enable_addon "ingress"
-        end
-
-        def enable_addon(addon)
-            run_command "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...")
-
-            previous_lines = 0
-
-            while ! pods.all? { |pod| pod[:ready] }
-                pods_status_lines = get_pods_status.to_s.lines.map { |line| line.chomp }
-
-                current_lines = pods_status_lines.length
-
-                line_difference = current_lines - previous_lines
-
-                if line_difference < 0 # there are now less lines than before
-                    line_difference.abs.times do
-                        print "\033[1A\033[K" # move the cursor up a line and clear the line
-                    end
-
-                    print "\033[#{current_lines}A" # move the cursor all the way up to the start of the table
-                elsif previous_lines > 0
-                    print "\033[#{previous_lines}A" # move the cursor all the way up to the start of the table
-                end
-
-                pods_status_lines.each do |line|
-                    print "#{line}\033[K#{$/}" # print the content of the line, clear remaining characters and add a new line
-                end
-
-                previous_lines = current_lines
-
-                sleep 5
-            end
-
-            previous_lines.times do
-                print "\033[1A\033[K" # move the cursor up a line and clear the line
-            end
-
-            UI.success("Pods are now ready.")
-        end
-
-        def deployments(namespace = "default")
-            output = `kubectl get deployments -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|
-                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|
-                columns = line.split(" ")
-
-                name = columns[0]
-                ready = columns[1].split("/").reduce { |l, r| l == r }
-                replicas = columns[1]
-                status = columns[2]
-
-                {
-                    name: name,
-                    ready: ready,
-                    replicas: replicas,
-                    status: status
-                }
-            end
-        end
-
-        def create_secrets
-            run_command "kubectl create secret generic gcloud-credentials --from-file=\"$(echo ~)/.config/gcloud/application_default_credentials.json\""
-            run_command "kubectl create secret generic -n kube-system registry-creds-dpr --from-literal DOCKER_PRIVATE_REGISTRY_PASSWORD=changeme --from-literal DOCKER_PRIVATE_REGISTRY_SERVER=changeme --from-literal DOCKER_PRIVATE_REGISTRY_USER=changeme"
-            run_command "kubectl patch secret -n kube-system registry-creds-dpr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"dpr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
-            run_command "kubectl create secret generic -n kube-system registry-creds-ecr --from-literal AWS_ACCESS_KEY_ID=changeme --from-literal AWS_SECRET_ACCESS_KEY=changeme --from-literal AWS_SESSION_TOKEN=\"\" --from-literal aws-account=changeme --from-literal aws-assume-role=changeme --from-literal aws-region=changeme"
-            run_command "kubectl patch secret -n kube-system registry-creds-ecr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"ecr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
-            run_command "kubectl create secret generic -n kube-system registry-creds-gcr --from-file=\"$(echo ~)/.config/gcloud/application_default_credentials.json\" --from-literal=gcrurl=\"https://eu.gcr.io\""
-            run_command "kubectl patch secret -n kube-system registry-creds-gcr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"gcr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
-            run_command "kubectl create secret generic -n kube-system registry-creds-acr --from-literal ACR_PASSWORD=changeme --from-literal ACR_CLIENT_ID=changeme --from-literal ACR_URL=changeme"
-            run_command "kubectl patch secret -n kube-system registry-creds-acr -p='{\"metadata\": {\"labels\": { \"app\": \"registry-creds\", \"cloud\": \"acr\", \"kubernetes.io/minikube-addons\": \"registry-creds\"}}}'"
-        end
-
-        def wait_for_gcr_secret
-            UI.important("Waiting for Google Cloud Registry secret to become available...")
-
-            while ! `kubectl get secrets`.include? "gcr-secret"
-                sleep 5
-            end
-
-            UI.success("Google Cloud Registry secret is now available.")
-        end
-
-        def wait_for_ingress_ip
-            UI.important("Waiting for ingress IP to become available...")
-
-            while `kubectl describe ingress | grep "Address" | awk '{print $2}'`.empty?
-                sleep 5
-            end
-
-            UI.success("Ingress IP is now available.")
-        end
-
-        def print_contexts
-          output = `kubectl config get-contexts`
-
-          lines = output.split "\n"
-          lines = lines[1..-1]
-
-          rows = lines.map do |line|
-            columns = line.split(" ")
-
-            current_context = columns[0] == "*" ? "Yes".green : "No".red
-
-            [columns[2], current_context]
-          end
-
-          puts Terminal::Table.new title: "Contexts".green, headings: ['Cluster', 'Using context'], rows: rows
+    def run command, options = {}
+      begin
+        if !system command, options
+          raise command.red
         end
+      rescue Interrupt
+        # user pressed Ctrl+C, do nothing
+      end
+    end
 
-        def print_minikube_status
-          puts Terminal::Table.new title: "Minikube status".green, headings: ['Name', 'Status'], rows: get_minikube_status
-        end
+    def run_dc command, options = {}
+      run "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}", options
+    end
 
-        def get_minikube_status
-          output = `minikube status`
+    def start args, options
+      if options.pull
+        run_dc "pull"
+      end
 
-          lines = output.split "\n"
+      if options.build
+        run_dc "build #{options.pull ? "--pull" : ""}"
+      end
 
-          rows = lines.map do |line|
-              columns = line.split(" ")
+      run_dc "up --detach"
 
-              [columns[0][0..-2], columns[1]]
-          end
-        end
+      if options.pull or options.build
+        system "docker image prune -f"
+      end
 
-        def print_pods_status(namespace = "default")
-            output = get_pods_status(namespace)
+      UI.success("\n✔️ You can visit your environment at 👉 https://spend-cloud.dev.spend.cloud 👌")
+    end
 
-            puts output if output
-        end
+    def stop
+      run_dc "down --remove-orphans"
+    end
 
-        def get_pods_status(namespace = "default")
-          rows = pods(namespace).map do |pod|
-            status = pod[:status]
-            replicas = pod[:replicas]
+    def restart
+      run_dc "restart"
+    end
 
-            [
-                pod[:name],
-                status == "Running" ? status.green : status.red,
-                pod[:ready] ? replicas.green : replicas.red
-            ]
-          end
+    def delete
+      run_dc "down --remove-orphans -v"
+    end
 
-          if rows.empty?
-            return
-          end
+    def reset args, options
+      delete
+      start args, options
+    end
 
-          return Terminal::Table.new title: "Pods (namespace: #{namespace})".green, headings: ['Name', 'Status', 'Replicas ready'], rows: rows
-        end
+    def pull
+      run_dc "pull"
+      run "docker image prune -f"
+    end
 
-        def copy_proactive_accounts_file
-            pod_id = pods().select {|pod| pod[:name].start_with?("proactive-config")}.first[:name]
+    def status
+      run_dc "ps"
+    end
 
-            begin
-                UI.important("Checking ProActive accounts file...")
-                run_command "kubectl exec #{pod_id} -- test -e /data/proactive_accounts.ini", [:out, :err] => File::NULL
-            rescue => e
-                UI.important("Copying ProActive accounts file to deployments...")
-                src_path = "#{Dir.home()}/development/spend-cloud/k8s/conf/proactive_accounts.ini"
-                command = "kubectl cp #{src_path} #{pod_id}:/data/proactive_accounts.ini"
-                run_command command
-            end
+    def logs args, options
+      command = "logs"
 
-            UI.success("ProActive accounts file is available")
-        end
+      command << " --follow" if options.f or options.follow
+      command << " --timestamps" if options.t or options.timestamps
+      command << " --tail #{options.tail}" if options.tail
 
-        def run_command command, options = {}
-            if ! system command, options
-                raise command.red
-            end
-        end
+      run_dc "#{command} #{args.join " "}"
     end
+
+  end
 end

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

@@ -0,0 +1,43 @@
+require 'yaml'
+
+module Sct
+  class DevCommand
+
+    def error message
+      UI.error message
+      exit 1
+    end
+
+    def execute args, options
+      file = "docker-compose.dev.yml"
+
+      if !File.exist? file
+        error "Could not find file '#{file}'."
+      end
+
+      manifest = YAML.load File.read file
+
+      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 options.build
+        return unless system "docker-compose -f #{file} build #{options.pull ? "--pull" : ""}"
+      end
+
+      return unless system "docker-compose -f ~/development/spend-cloud/docker-compose.yml rm --stop --force #{service}"
+
+      system "docker-compose -f #{file} run --rm --service-ports --name #{container} #{service} #{command}"
+
+      system "docker-compose -f ~/development/spend-cloud/docker-compose.yml up --detach #{service}"
+    end
+
+  end
+end

data/sct/lib/sct/commands/mysqlproxy.rb

@@ -1,20 +1,14 @@
 module Sct
   class MysqlproxyCommand
-    
+
     DEFAULT_SECRET_NAME = "gcloud-credentials"
 
     def execute(args, options)
-
-      return UI.error("SCT has not been initialized. Run 'sct init' first.") unless SctCore::Config.exists
-      
-      path = SctCore::Config.get('cloud-proxy-path')
-
       system("kubectl delete secret gcloud-credentials")
-      system("kubectl create secret generic gcloud-credentials --from-file=#{path}")
-      
+      system("kubectl create secret generic gcloud-credentials --from-file=~/.config/gcloud/application_default_credentials.json")
+
       UI.success("Authenticated with secret-name: '#{DEFAULT_SECRET_NAME}'")
     end
-  
-  end
 
-end
+  end
+end

data/sct/lib/sct/commands_generator.rb

@@ -17,51 +17,35 @@ module Sct
 
             global_option('--verbose') { $verbose = true }
 
-            command :init do |c|
-                c.syntax = 'sct init'
-                c.description = 'setup sct'
-
-                c.action do |args, options|
-                    UI.important("setting up sct")
-                    Sct::InitCommand.new.execute(args, options)
-                end
-            end
-
-            command :hostfile do |c|
-
-                c.syntax = 'sct hostfile'
-                c.description = 'patch hostfile with kubernetes ip'
-
-                c.action do |args, options|
-                    UI.important("Trying to patch hosts file...")
-                    Sct::HostfileCommand.new.execute(args, options)
-                end
-            end
-
             command :'mysql-proxy' do |c|
-
                 c.syntax = 'sct mysql-proxy'
                 c.description = 'setup google mysql proxy'
 
                 c.action do |args, options|
                     UI.important("Trying to setup mysql proxy")
-                    Sct::MysqlproxyCommand.new.execute(args, options)
+                    Sct::MysqlproxyCommand.new.execute args, options
                 end
-
             end
 
             command :'cluster' do |c|
-
                 c.syntax = 'sct cluster'
                 c.description = 'make changes to the cluster'
-
             end
 
             command :'shell' do |c|
-
                 c.syntax = 'sct shell'
                 c.description = 'run commands from the shell using docker containers'
+            end
+
+            command :'dev' do |c|
+                c.syntax = 'sct dev'
+                c.description = 'start development container in the current directory'
+                c.option '--build', '(re)build image from Dockerfile before starting'
+                c.option '--pull', 'pull latest base image from Dockerfile before (re)building. only used in combination with --build flag'
 
+                c.action do |args, options|
+                    Sct::DevCommand.new.execute args, options
+                end
             end
 
             run!

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "0.1.30"
+  VERSION = "1.0.0"
 end

data/sct_core/lib/sct_core.rb

@@ -1,5 +1,4 @@
 require_relative 'sct_core/core_ext/string'
-require_relative 'sct_core/config'
 require_relative 'sct_core/helper'
 require_relative 'sct_core/update_checker/update_checker'
 require_relative 'sct_core/command_executor'
@@ -11,4 +10,4 @@ require 'colored'
 require 'commander'
 
 # these need to be imported after commander
-require_relative 'sct_core/module'
+require_relative 'sct_core/module'

data/sct_core/lib/sct_core/helper.rb

@@ -5,13 +5,13 @@ module SctCore
     MAC_OS = "MacOS"
     UBUNTU = "Ubuntu"
 
-    def self.to_hash(str)
+    def self.to_hash str
       Hash[
         str.split("\n").map{|i|i.split('=')}
       ]
     end
 
-    def self.operatingSystem
+    def self.operating_system
       proc = `uname -a`
 
       case proc.downcase
@@ -29,7 +29,7 @@ module SctCore
     def self.homePath
       user = ENV["SUDO_USER"] || ENV["USER"]
 
-      if self.operatingSystem == MAC_OS
+      if self.operating_system == MAC_OS
           home = "/Users"
       else
           home = "/home"
@@ -46,7 +46,7 @@ module SctCore
       return nil
     end
 
-    def self.convertWindowsToWSLPath(path)
+    def self.convertWindowsToWSLPath path
       if self.is_windows?
         return path.gsub(/C:\\/, '/mnt/c/').gsub(/\\\\/, "/").gsub(/\\/, '/').gsub(/\r\n?/, '')
       end
@@ -54,7 +54,7 @@ module SctCore
       return path
     end
 
-    def self.convertWSLToWindowsPath(path)
+    def self.convertWSLToWindowsPath path
       if self.is_windows?
         return path.gsub(/\/mnt\/c/, 'C:/').gsub(/\/\//, '/').gsub(/\\\\/, "/").gsub(/\r\n?/, '')
       end
@@ -67,7 +67,7 @@ module SctCore
     end
 
     def self.is_windows?
-      return self.operatingSystem == WINDOWS
+      return self.operating_system == WINDOWS
     end
 
     def self.is_windows_administrator?
@@ -93,5 +93,6 @@ module SctCore
       self.ensure_sudo
       self.ensure_windows_administrator
     end
+
   end
 end

data/shell/lib/shell/runner.rb

@@ -1,83 +1,48 @@
 require 'yaml'
 
 module Shell
-    class Runner
+  class Runner
 
-        def launch
-            command = ARGV.join(" ")
-
-            if ! File.exist? "./okteto.yml"
-                error "Could not find file 'okteto.yml'."
-            end
-
-            manifest = YAML.load File.read "./okteto.yml"
-
-            deployment = manifest["name"]
-
-            pod = find_pod deployment
-
-            if command.empty?
-                system "kubectl exec #{pod} -it -- sh", { in: :in, out: :out, err: :err }
-            else
-                system "kubectl exec #{pod} -it -- #{command}", { in: :in, out: :out, err: :err }
-            end
-        end
-
-        def find_pod deployment
-            output = `kubectl get pods --show-labels`
-
-            # split output lines
-            lines = output.split "\n"
-
-            #  exclude first line (table header)
-            lines = lines[1..-1]
+    def error message
+      UI.error message
+      exit 1
+    end
 
-            # get the name and labels of each pod
-            pods = lines.map do |line|
-                columns = line.split " "
+    def launch
+      command = ARGV.empty? ? "sh" : ARGV.join(" ")
 
-                name = columns[0]
+      file = "docker-compose.dev.yml"
 
-                labels = columns[5].split(",").reduce({}) do |labels, label|
-                    key, value = label.split "="
-                    labels[key] = value
-                    labels
-                end
+      if !File.exist? file
+        error "Could not find file '#{file}'."
+      end
 
-                {
-                    name: name,
-                    labels: labels
-                }
-            end
+      manifest = YAML.load File.read file
 
-            # filter by deployment
-            pods = pods.filter { |pod| pod[:labels]["app"] == deployment }
+      services = manifest["services"].to_a
 
-            if pods.length == 0
-                error "Could not find pod for deployment #{deployment}."
-            elsif pods.length > 1
-                error "Found more than one pod for deployment #{deployment}. Multiple pods are not supported."
-            end
+      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
 
-            pod = pods.first
+      service, service_spec = services.first
 
-            if pod[:labels]["dev.okteto.com"] != "true"
-                print "The current pod is running a production image and was not started by Okteto. Are you sure you want to continue? [y/N] ".red
+      container = service_spec["container_name"]
 
-                answer = $stdin.readline.chomp.downcase
+      project = `docker container inspect --format '{{index .Config.Labels "com.docker.compose.project"}}' #{container}`.chomp
 
-                if answer != "y"
-                    exit
-                end
-            end
+      if project == "spend-cloud"
+        print "This container was not started with 'sct dev'. Are you sure you want to continue? [y/N] ".red
 
-            pod[:name]
-        end
+        answer = $stdin.readline.chomp.downcase
 
-        def error message
-            UI.error message
-            exit 1
+        if answer != "y"
+          exit
         end
+      end
 
+      system "docker exec -it #{container} #{command}"
     end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 1.0.0
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -200,16 +200,13 @@ files:
 - cluster/lib/cluster.rb
 - cluster/lib/cluster/commands_generator.rb
 - cluster/lib/cluster/module.rb
-- cluster/lib/cluster/resources/.DS_Store
-- cluster/lib/cluster/resources/corefile.yml
 - cluster/lib/cluster/runner.rb
 - sct/lib/.DS_Store
 - sct/lib/sct.rb
 - sct/lib/sct/.DS_Store
 - sct/lib/sct/cli_tools_distributor.rb
 - sct/lib/sct/command.rb
-- sct/lib/sct/commands/hostfile.rb
-- sct/lib/sct/commands/init.rb
+- sct/lib/sct/commands/dev.rb
 - sct/lib/sct/commands/mysqlproxy.rb
 - sct/lib/sct/commands_generator.rb
 - sct/lib/sct/tools.rb
@@ -218,7 +215,6 @@ files:
 - sct_core/lib/sct_core.rb
 - sct_core/lib/sct_core/.DS_Store
 - sct_core/lib/sct_core/command_executor.rb
-- sct_core/lib/sct_core/config.rb
 - sct_core/lib/sct_core/core_ext/string.rb
 - sct_core/lib/sct_core/helper.rb
 - sct_core/lib/sct_core/module.rb
@@ -241,10 +237,10 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- shell/lib
 - cluster/lib
 - sct/lib
 - sct_core/lib
+- shell/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/cluster/lib/cluster/resources/corefile.yml

@@ -1,45 +0,0 @@
-apiVersion: v1
-data:
-  Corefile: |
-    .:53 {
-        errors
-        health {
-           lameduck 5s
-        }
-        ready
-        kubernetes cluster.local in-addr.arpa ip6.arpa {
-           pods insecure
-           fallthrough in-addr.arpa ip6.arpa
-           ttl 30
-        }
-        prometheus :9153
-        forward . 8.8.8.8
-        cache 30
-        loop
-        reload
-        loadbalance
-    }
-  Corefile-backup: |
-    .:53 {
-        errors
-        health {
-           lameduck 5s
-        }
-        ready
-        kubernetes cluster.local in-addr.arpa ip6.arpa {
-           pods insecure
-           fallthrough in-addr.arpa ip6.arpa
-           ttl 30
-        }
-        prometheus :9153
-        forward . /etc/resolv.conf
-        cache 30
-        loop
-        reload
-        loadbalance
-    }
-kind: ConfigMap
-metadata:
-  creationTimestamp: null
-  name: coredns
-  selfLink: /api/v1/namespaces/kube-system/configmaps/coredns

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

@@ -1,76 +0,0 @@
-module Sct
-  class HostfileCommand
-
-    def execute(args, options)
-      SctCore::Helper.ensure_permissions
-
-      entries = [
-        {
-          host: "spend.cloud.local",
-          comment: "The spend cloud ingress url"
-        },
-        {
-          host: "mail.spend.cloud.local",
-          comment: "The spend cloud mail url"
-        },
-        {
-          host: "config.spend.cloud.local",
-          comment: "The spend cloud config url"
-        },
-        {
-          host: "spend-cloud.spend.cloud.local",
-          comment: "The spend cloud web app url"
-        },
-        {
-          host: "docs.spend.cloud.local",
-          comment: "The spend cloud documentation url"
-        },
-        {
-          host: "henk.spend.cloud.local",
-          comment: "The spend cloud Henk web-interface"
-        }
-      ]
-
-      is_windows = SctCore::Helper::is_windows?
-
-      if is_windows
-        ingress_address = "127.0.0.1"
-      else
-        ingress_address = `sudo -u $SUDO_USER minikube ip`.chomp
-      end
-
-      windows_hosts_path = "/mnt/c/Windows/System32/drivers/etc/hosts"
-
-      if options.path
-        hosts_paths = [options.path]
-      else
-        hosts_paths = ["/etc/hosts"]
-
-        if is_windows
-          hosts_paths << windows_hosts_path
-        end
-      end
-
-      hosts_paths.each do |hosts_path|
-        line_ending = hosts_path == windows_hosts_path ? "\r\n" : "\n"
-
-        lines = File.readlines hosts_path
-
-        # select the lines that do not include any entry
-        lines = lines.select { |line| ! entries.any? { |entry| line.include? " #{entry[:host]}" } }
-
-        # add entries
-        entries.each do |entry|
-          lines << "#{ingress_address} #{entry[:host]} # #{entry[:comment]}#{line_ending}"
-        end
-
-        File.write hosts_path, lines.join
-
-        UI.success("Patched #{hosts_path} with #{ingress_address}")
-      end
-
-    end
-
-  end
-
-end

data/sct/lib/sct/commands/init.rb

@@ -1,37 +0,0 @@
-require 'sct_core/ui/ui'
-require 'sct_core/config'
-
-module Sct
-
-  class InitCommand
-
-    def execute(args, options)
-
-      dir = SctCore::Config.dir
-
-      cli = HighLine.new
-
-      email = cli.ask("What is your email address?") { |q|
-          q.validate = URI::MailTo::EMAIL_REGEXP
-      }
-
-      cloud_proxy_path = cli.ask("What is the path of your cloud proxy json credentials?") { |q|
-          q.default = "~/.config/gcloud/application_default_credentials.json"
-      }
-
-      contents = ""
-      contents << "email=#{email}\n"
-      contents << "cloud-proxy-path=#{File.expand_path(cloud_proxy_path)}\n"
-
-      if !File.directory?(dir)
-          FileUtils.mkdir_p(dir)
-      end
-
-      File.write(SctCore::Config.path, contents)
-
-      puts "Generated config file at #{SctCore::Config.path}"
-    end
-
-  end
-
-end

data/sct_core/lib/sct_core/config.rb

@@ -1,36 +0,0 @@
-module SctCore
-    class Config
-
-        def self.dir
-            return "#{SctCore::Helper.homePath}/.config/sct"
-        end
-
-        def self.path
-            return File.expand_path(File.join(self.dir, 'config'))
-        end
-
-        def self.exists
-            return File.exists?(Config.path)
-        end
-
-        def self.get(key)
-            config = self.read
-
-            if !config.key?(key)
-                return nil
-            end
-
-            return config[key]
-        end
-
-        def self.read
-            if !self.exists
-                return {}
-            end
-
-            contents = File.read(self.path)
-
-            return SctCore::Helper.to_hash(contents)
-        end
-    end
-end