neetodeploy 1.1.10 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a3d1d307a336febc75e845090520f3b9682fccb51d37f1d916b7e687f60552f
-  data.tar.gz: 29f7510011934930720d507581cfffa69ea51eeca7c338da3cab3bd496b7a981
+  metadata.gz: 2a9d74525f7507987d4d16ea45b9d73d47d0242e3b8b788c7e90d4992171a2a3
+  data.tar.gz: 2206225d47f369d0c5729a978e53dcfcdec754c3130c49a9e2fe5b852fda5e77
 SHA512:
-  metadata.gz: e1afa2622a80ca5398335fbc166e2ad018be68e679d2d62ab837dca25e2a33a5358de3f1ce3a185d0641b6edf814acc13238a8258f193d3de1e78d73163ba9e2
-  data.tar.gz: 2f5c3ada11bf0ade6600c2e3af217e4b2203ea53e13d7cca543872042e95b334b8698d1b328971c24988cdc57c3b239702db9e6a33faae9e6478be0f4fb659a7
+  metadata.gz: 2d55635297621fc121cddff62a197d37e34e81693ffadd52ba004d0bc1f42a8d3718c59a657929c819dc7d465ee4d9adf989c88e95b77dbf39429c2703a66da9
+  data.tar.gz: 0eaa2ea8e1c1d055f988be41d0bd8ced8c9ede8002813a66f6eb4c82eded065ee77402af7121852bf747c8e5c896807d588b99332fc2b632ef0ee4295edc4f38

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neetodeploy (1.1.10)
+    neetodeploy (1.1.12)
       colorize
       dotenv (~> 2.8.1)
       httparty (~> 0.21.0)

data/lib/neeto_deploy/cli/addon/commands.rb

@@ -9,13 +9,13 @@ module NeetoDeploy
     module Addon
       class Commands < Thor
         desc "info", "Get addon informations"
-        option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
         def info
           Info.new(options).run
         end
 
         desc "scheduled_exports_enabled", "Check whether scheduled exports is enabled for an app"
-        option :app_name, type: :string, aliases: "-a", required: true, desc: "App name"
+        option :app, type: :string, aliases: "-a", required: true, desc: "App name"
         def scheduled_exports_enabled
           ScheduledExportsSettings.new(options).run
         end

data/lib/neeto_deploy/cli/addon/info.rb

@@ -16,7 +16,7 @@ module NeetoDeploy
 
         def initialize(options)
           super()
-          @addon_name = options[:addon_name]
+          @addon_name = options[:addon]
         end
 
         def run

data/lib/neeto_deploy/cli/addon/scheduled_exports_settings.rb

@@ -16,7 +16,7 @@ module NeetoDeploy
 
         def initialize(options)
           super()
-          @app_name = options[:app_name]
+          @app_name = options[:app]
         end
 
         def run

data/lib/neeto_deploy/cli/dyno_console_manager.rb

@@ -5,80 +5,56 @@ require "thor"
 module NeetoDeploy
   class CLI
     class DynoConsoleManager < Base
-      DYNO_CONSOLE_MANAGER_URL = "wss://neeto-deploy-lc.neetodeployapp.com"
+      attr_reader :addon_name, :kind
 
-      def initialize
+      def initialize(addon_name)
         super()
-        @prompt = ""
+        @addon_name = addon_name
       end
 
-      def run_console
+      def process!
         start_spinner
         send_console_session_request
-        ui.error(response) and return unless @response.success?
+        ui.error("\n#{@response.body}") and return unless @response.success?
 
-        send_websocket_request
-        define_websocket_blocks
+        start_console
+        connection_cleanup_callback
       end
 
       private
 
-        def start_spinner
-          @spinner = TTY::Spinner.new("[:spinner] Connecting to #{@instance_name}", format: :classic)
-          @spinner.auto_spin
+        def console_executable_path
+          gem_spec = Gem::Specification.find_by_name("neetodeploy")
+          gem_dir = gem_spec.gem_dir
+          executable_path = File.join(gem_dir, "exe", "console")
         end
 
-        def define_websocket_blocks
-          stop_spinner = lambda do
-            @spinner.stop unless @connection_established
-          end
-
-          cleanup = lambda do
-            connection_cleanup
-          end
-
-          @ws.on :message do |msg|
-            message = msg.data
-            if message.to_s.eql?("{\"exitCode\":0,\"signal\":0}")
-              cleanup.call
-              exit 0
-            end
-            cmd = message[0]
-            if cmd == "1"
-              extracted_message = message.delete_prefix("1")
-              stop_spinner.call && @connection_established = true unless extracted_message == ""
-              @prompt = "\u001b[2K\u001b[0G#{extracted_message.split("\r\n").last}"
-              print extracted_message
-            end
-          end
-
-          @ws.on :open do
-          end
+        def start_console
+          console_access_token = @response.parsed_response["console_access_token"]
+          pod_name = @response.parsed_response["pod_name"]
+          database_url = @response.parsed_response["database_url"]
+          container_name = @response.parsed_response["container_name"]
 
-          @ws.on :close do |e|
-            puts e
-            exit 1
-          end
+          execute_console(pod_name, console_access_token, container_name, kind, database_url)
+        end
 
-          @ws.on :error do |e|
-            puts e
-            puts "MyserverBackend>> Close entered. Last error:#{$!.class}:#{$!.to_s};Module:#{$0};"
-            $@.each { |backtrace| puts backtrace }
-            exit 1
-          end
+        def execute_console(pod_name, console_access_token, container_name, kind, database_url)
+          system("#{console_executable_path} -podname #{pod_name} -token #{console_access_token} -kind #{kind} -container #{container_name} -url #{database_url}")
+        end
 
-          trap("SIGINT") do
-            Thread.new { @ws.send "4" }
-          end
+        def send_console_session_request
+          @response = send_post_request(console_session_base_url, { addon_name:, kind: })
+          @spinner.stop
+        end
 
-          loop do
-            sleep 0.1
-            input = Readline.readline(@prompt, true)
-            @ws.send "1" + input
-          end
+        def connection_cleanup_callback
+          url = "#{console_session_base_url}/#{addon_name}"
+          send_delete_request(url, { pubsub_token: @pubsub_token })
         end
 
-        def connection_cleanup
+        def start_spinner
+          @spinner = TTY::Spinner.new("Setting up dyno [:spinner]", format: :classic)
+          @spinner.auto_spin
         end
     end
   end

data/lib/neeto_deploy/cli/exec/base.rb

@@ -41,7 +41,8 @@ module NeetoDeploy
             @pubsub_token = @response.parsed_response["console_pubsub_token"]
             console_access_token = @response.parsed_response["console_access_token"]
             pod_name = "#{app_name}-#{@pubsub_token}-console-deployment"
-            system("#{console_executable_path} #{pod_name} #{console_access_token}")
+            container_name = "#{app_name}-#{@pubsub_token}-console"
+            system("#{console_executable_path} -podname #{pod_name} -token #{console_access_token} -container #{container_name}")
           end
 
           def send_console_session_request

data/lib/neeto_deploy/cli/login/constants.rb

@@ -13,7 +13,7 @@ module NeetoDeploy
 
         def session_login_url(org_subdomain)
           org_url = NEETO_DEPLOY_HOST.sub("app.", "#{org_subdomain}.")
-          "#{org_url}/cli/login?token=#{login_token}"
+          "#{org_url}/admin/cli/login?token=#{login_token}"
         end
 
         def session_login_status_url

data/lib/neeto_deploy/cli/pg/commands.rb

@@ -6,12 +6,11 @@ module NeetoDeploy
   class CLI
     module Pg
       class Commands < Thor
-        # desc "cli", "Connect to postgresql console"
-        # option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
-
-        # def cli
-        #   Console.new(options).run
-        # end
+        desc "cli", "Connect to postgresql console"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        def cli
+          Console.new(options[:addon]).process!
+        end
       end
     end
   end

data/lib/neeto_deploy/cli/pg/console.rb

@@ -12,33 +12,10 @@ module NeetoDeploy
         include Constants
         include Session
 
-        attr_reader :addon_name
-
-        def initialize(options)
-          super()
-          @addon_name = options[:addon_name]
-          @instance_name = options[:addon_name]
-          @connection_established = false
-        end
-
-        def run
-          run_console
+        def initialize(addon_name)
+          super(addon_name)
+          @kind = "neetodeploy-postgresql"
         end
-
-        private
-
-          def send_console_session_request
-            @response = send_post_request(console_session_base_url(addon_name), {})
-          end
-
-          def send_websocket_request
-            console_token = @response.parsed_response["console_token"]
-            database_url = @response.parsed_response["url"]
-            deployment_name = @response.parsed_response["internal_name"]
-            app_name = @response.parsed_response["app_name"]
-
-            @ws = WebSocket::Client::Simple.connect "#{DYNO_CONSOLE_MANAGER_URL}/cli_console?app_name=#{app_name}&deployment_name=#{deployment_name}&console_token=#{console_token}&database_url=#{database_url}&kind=postgres"
-          end
       end
     end
   end

data/lib/neeto_deploy/cli/pg/constants.rb

@@ -4,8 +4,8 @@ module NeetoDeploy
   class CLI
     module Pg
       module Constants
-        def console_session_base_url(addon_name)
-          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons/#{addon_name}/console_session"
+        def console_session_base_url
+          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons/console_sessions"
         end
       end
     end

data/lib/neeto_deploy/cli/redis/commands.rb

@@ -4,13 +4,14 @@ require "thor"
 require_relative "./set"
 require_relative "./get"
 require_relative "./reset_stats"
+require_relative "./console"
 
 module NeetoDeploy
   class CLI
     module Redis
       class Commands < Thor
         desc "set", "Set redis config"
-        option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
         option :key, type: :string, aliases: "-k", required: true, desc: "CONFIG name"
         option :value, type: :string, aliases: "-v", required: true, desc: "New value for the CONFIG"
 
@@ -19,18 +20,24 @@ module NeetoDeploy
         end
 
         desc "get", "Get redis config"
-        option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
         option :key, type: :string, aliases: "-k", required: true, desc: "CONFIG name"
         def get
           Get.new(options).run
         end
 
         desc "reset-stats", "Resets the statistics of the Redis instance"
-        option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
         def reset_stats
           ResetStats.new(options).run
         end
 
+        desc "cli", "Connect to redis console"
+        option :addon, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        def cli
+          Console.new(options[:addon]).process!
+        end
+
       end
     end
   end

data/lib/neeto_deploy/cli/redis/console.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "thor"
+require_relative "../session"
+require_relative "./constants"
+require_relative "../dyno_console_manager"
+
+module NeetoDeploy
+  class CLI
+    module Redis
+      class Console < CLI::DynoConsoleManager
+        include Constants
+        include Session
+
+        def initialize(addon_name)
+          super(addon_name)
+          @kind = "neetodeploy-redis"
+        end
+      end
+    end
+  end
+end

data/lib/neeto_deploy/cli/redis/constants.rb

@@ -14,6 +14,10 @@ module NeetoDeploy
         def available_configs_to_edit
           AVAILABLE_REDIS_CONFIGS_TO_EDIT
         end
+
+        def console_session_base_url
+          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons/console_sessions"
+        end
       end
     end
   end

data/lib/neeto_deploy/cli/redis/get.rb

@@ -15,7 +15,7 @@ module NeetoDeploy
 
         def initialize(options)
           super()
-          @addon_name = options[:addon_name]
+          @addon_name = options[:addon]
           @key = options[:key]
         end
 

data/lib/neeto_deploy/cli/redis/reset_stats.rb

@@ -15,7 +15,7 @@ module NeetoDeploy
 
         def initialize(options)
           super()
-          @addon_name = options[:addon_name]
+          @addon_name = options[:addon]
         end
 
         def run

data/lib/neeto_deploy/cli/redis/set.rb

@@ -16,7 +16,7 @@ module NeetoDeploy
 
         def initialize(options)
           super()
-          @addon_name = options[:addon_name]
+          @addon_name = options[:addon]
           @key = options[:key]
           @value = options[:value]
         end

data/lib/neeto_deploy/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NeetoDeploy
-  VERSION = "1.1.10"
+  VERSION = "1.1.12"
   CLI_API_VERSION = "v1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.12
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-07 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -161,6 +161,7 @@ files:
 - lib/neeto_deploy/cli/pg/console.rb
 - lib/neeto_deploy/cli/pg/constants.rb
 - lib/neeto_deploy/cli/redis/commands.rb
+- lib/neeto_deploy/cli/redis/console.rb
 - lib/neeto_deploy/cli/redis/constants.rb
 - lib/neeto_deploy/cli/redis/get.rb
 - lib/neeto_deploy/cli/redis/reset_stats.rb