Fix: help message, init func and ssh-add cmd in --crt

mgrctl/api/base.py

@@ -7,6 +7,7 @@ import requests
 from time import sleep
 
 from mgrctl.settings.api import (
+    API_INPUT_PORT,
     API_URL,
     API_HEADERS,
     API_EMAIL,
@@ -14,6 +15,7 @@ from mgrctl.settings.api import (
     API_VERIFY_SSL,
     API_COUNT_TRY_CONNECTIONS
 )
+from mgrctl.settings.platform import PLATFORM_TYPE
 
 
 class BaseAPI(object):
@@ -33,6 +35,7 @@ class BaseAPI(object):
     def call_api(self, url, method='GET', headers={}, data={}):
         attempt = API_COUNT_TRY_CONNECTIONS
         while attempt:
+            attempt -= 1
             try:
                 uri = self._gen_request_url(url)
                 headers = self.API_HEADERS if not headers else headers
@@ -52,6 +55,17 @@ class BaseAPI(object):
                         verify=self.API_VERIFY_SSL
                     )
             except Exception as error:
+                ConnectionError = requests.exceptions.ConnectionError
+                if type(error) is ConnectionError and PLATFORM_TYPE == 'dci':
+                    # ? workaround if new docker version use dashes
+                    # TODO: ISPsystem developers must set container_name !!!
+                    self.API_URL = f'http://dci-input-1:{API_INPUT_PORT}'
+                    if attempt == 0:
+                        click.echo(f'Error: {type(error).__name__}')
+                        sys.exit()
+                    else:
+                        continue
+                else:
                     click.echo(f'Error: {type(error).__name__}')
                     sys.exit()
 
@@ -60,8 +74,6 @@ class BaseAPI(object):
 
             # Validate response:
             if self._error_handler(response):
-                attempt -= 1
-                sleep(2)  # wait 2 second timeout
                 continue  # new attempt connection
 
             return response
@@ -80,6 +92,7 @@ class BaseAPI(object):
 
     def _is_error_3004(self, error):
         if error.get('code') == 3004:
+            sleep(2)  # wait 2 second timeout
             return True
 
     def _error_handler(self, response):

scripts/gogo/gogo.sh

@@ -6,7 +6,7 @@
 
 # INIT GLOBAL VARIABLES:
 _VERSION="0.1.0"
-_SCRIPT_NAME="$0"
+_SCRIPT_NAME="$(basename $0)"
 _GO_CMD="go3"
 _DEBUG_MODE=false
 
@@ -65,20 +65,21 @@ help() {
 	printf "                                                              \n"
 	printf "Examples:                                                     \n"
 	printf "                                                              \n"
-	printf "./gogo.sh --init | init config file                           \n"
-	printf "./gogo.sh --crt  | get ssh certificate for go3 connections    \n"
+	printf "${script} --init | init config file                           \n"
+	printf "${script} --crt  | get ssh certificate for go3 connections    \n"
 	printf "                                                              \n"
-	printf "./gogo.sh --bill my.example.com                               \n"
-	printf "./gogo.sh --vm 0.0.0.0 --ssh | only ssh access                \n"
-	printf "./gogo.sh --vm 0.0.0.0 --tty | use mgrctl interactive         \n"
+	printf "${script} --bill my.example.com                               \n"
+	printf "${script} --vm 0.0.0.0 --ssh | only ssh access                \n"
+	printf "${script} --vm 0.0.0.0 --tty | use mgrctl interactive         \n"
 	printf "                                                              \n"
-	printf "./gogo.sh --dci 0.0.0.0 --mgrctl user access --id 3 --count 5 \n"
-	printf "./gogo.sh --dci 0.0.0.0 --mgrctl user ls --admins             \n"
-	printf "./gogo.sh --dci 0.0.0.0 --mgrctl user --help                  \n"
-	printf "./gogo.sh --vm 0.0.0.0 --port 22122 --mgrctl user ls --admins \n"
-	printf "./gogo.sh --dns ns1.example.com --web-port 1501               \n"
-	printf "./gogo.sh --dns ns1.example.com --port 22122 --web-port 1501  \n"
-	printf "./gogo.sh --bill my.example.com --port 22 --web-port 1501     \n"
+	printf "${script} --dci 0.0.0.0 --mgrctl user access --id 3 --count 5 \n"
+	printf "${script} --dci 0.0.0.0 --mgrctl user ls --admins             \n"
+	printf "${script} --dci 0.0.0.0 --mgrctl user --help                  \n"
+	printf "${script} --vm 0.0.0.0 --port 22122 --mgrctl user ls --admins \n"
+	printf "${script} --vm 0.0.0.0 --tty --mgrctl user ls --admins        \n"
+	printf "${script} --dns ns1.example.com --web-port 1501               \n"
+	printf "${script} --dns ns1.example.com --port 22122 --web-port 1501  \n"
+	printf "${script} --bill my.example.com --port 22 --web-port 1501     \n"
 	printf "                                                              \n"
 	printf "Options:                                                      \n"
 	printf "                                                              \n"
@@ -86,6 +87,7 @@ help() {
 	printf " --port     | -p       ssh port,   default 22                 \n"
 	printf " --web-port | -wp      web port,   default 443                \n"
 	printf " --go/--go3            go version, default go3                \n"
+	printf " --ssh                 open only ssh session                  \n"
 	printf " --tty                 for vm6/dci6 echo cmd for run container\n"
 	printf " --mgrctl [args]       for vm6/dci6 customize access params   \n"
 	printf "                                                              \n"
@@ -109,7 +111,7 @@ init_config() {
 	local script_name=$(colorize GREEN "${_SCRIPT_NAME}")
 	# check if config file exists:
 	if [ -f $_CONFIG ]; then
-		echo "${warning}: Config file is already exists"
+		echo "${warning} Config file is already exists"
 		echo "New initialization rewrites current config"
 		continue_handler
 	fi
@@ -133,7 +135,9 @@ SSH_CRT_FILE=$_SSH_CRT_FILE
 MGRCTL_IMAGE=$_MGRCTL_IMAGE
 DEBUG_MODE=false
 EOF
-	echo "${success}: Config file was created, run ${script_name} again"
+	echo ""
+	echo "${success} Config file was created, run ${script_name} again"
+	echo ""
 }
 
 
@@ -373,7 +377,7 @@ set_ssh_agent() {
 renewal_crt() {
 	export VAULT_ADDR=$_VAULT_SERVER_ADDR
 	get_vault_crt $_VAULT_SSH_PUBLIC_KEY $_SSH_CRT_FILE
-	set_ssh_agent $SSH_PRIVATE_KEY_PATH
+	set_ssh_agent $_SSH_PRIVATE_KEY_PATH
 }
 
 
@@ -386,6 +390,13 @@ optparser() {
 		help
 		exit 2
 	fi
+	# run init config if flag --init and exit:
+	if [[ "$1" == "--init" ]]; then
+		init_config
+		exit 0
+	fi
+	# load config from config file:
+	load_config
 	# parse opts:
 	while [ ! -z "$1" ]; do
 		case "$1" in
@@ -426,10 +437,6 @@ optparser() {
 					_IS_SSH_ONLY=true
 				fi
 				;;
-			--init|-i)
-				init_config
-				exit 0
-				;;
 			--crt|-c)
 				renewal_crt
 				exit 0
@@ -456,7 +463,6 @@ optparser() {
 
 # Entrypoint:
 main() {
-	load_config
 	optparser $@
 	get_access
 }