Index: /branches/rel_apv_10_7_3/usr/click/bin/backend/sys_cmd.c =================================================================== --- /branches/rel_apv_10_7_3/usr/click/bin/backend/sys_cmd.c (revision 39061) +++ /branches/rel_apv_10_7_3/usr/click/bin/backend/sys_cmd.c (working copy) @@ -3909,7 +3909,16 @@ exit(1); } while (fgets(path, sizeof(path)-1, fp) != NULL) { - printf("%s", path); + path[strcspn(path, "\n")] = 0; + + // Check if the output is "True" + if (strcmp(path, "True") == 0) { + printf("aws log on"); + } else if (strcmp(path, "False") == 0) { + printf("aws log off"); + } else { + printf("Fail"); + } } pclose(fp); } @@ -3931,7 +3940,7 @@ pclose(fp); } -void cloud_aws_log_severity() +void cloud_aws_log_loglevel() { FILE *fp; char path[1035]; @@ -4059,7 +4068,7 @@ char path[1035]; char cmd[1024]; - fp = popen("python3 /ca/bin/aws/AWSAuthManager.py -mode show", "r"); + fp = popen("python3 /ca/bin/aws/AWSAuthManager.py -mode show -p", "r"); if (fp == NULL) { printf("Failed to run command\n" ); exit(1); @@ -4145,7 +4154,7 @@ char path[1035]; char cmd[1024]; - fp = popen("python3 /ca/bin/aws/AWSConfigManager.py -ENI show", "r"); + fp = popen("python3 /ca/bin/aws/AWSConfigManager.py -ENI show -p", "r"); if (fp == NULL) { printf("Failed to run command\n" ); exit(1); @@ -4184,8 +4193,6 @@ system(cmd); sleep(2); - printf("Success\n"); - } void cloud_aws_ha_disable() @@ -4205,7 +4212,7 @@ pclose(fp); } -void cloud_aws_ha_show() +void cloud_aws_show_ha() { FILE *fp; char path[1035]; @@ -4217,7 +4224,17 @@ exit(1); } while (fgets(path, sizeof(path)-1, fp) != NULL) { - printf("%s", path); + path[strcspn(path, "\n")] = 0; + + // Check if the output is "True" + if (strcmp(path, "True") == 0) { + printf("aws ha on"); + } else if (strcmp(path, "False") == 0) { + printf("aws ha off"); + } else { + printf("Fail"); + + } } pclose(fp); } Index: /branches/rel_apv_10_7_3/usr/click/lib/libparser/commands.pm =================================================================== --- /branches/rel_apv_10_7_3/usr/click/lib/libparser/commands.pm (revision 39062) +++ /branches/rel_apv_10_7_3/usr/click/lib/libparser/commands.pm (working copy) @@ -1097,12 +1097,12 @@ { obj_type => "ITEM", - name => "severity", + name => "loglevel", menu => "root_cloud_aws_show_log", - help_string => "Show current log severity", + help_string => "Show current log loglevel", cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", user_level => "CLI_LEVEL_CONFIG", - function_name => "cloud_aws_log_severity", + function_name => "cloud_aws_log_loglevel", function_args => [], }, @@ -1180,17 +1180,17 @@ function_args => [ { type => "STRING", - help_string => "Enter access key: ", + help_string => "Access Key", optional => "NO", }, { type => "STRING", - help_string => "Enter secret acces key: ", + help_string => "Secret Access Key", optional => "NO", }, { type => "STRING", - help_string => "Enter region: ", + help_string => "Region", optional => "NO", } ], @@ -1361,7 +1361,7 @@ function_args => [ { type => "STRING", - help_string => "Enter index of eni: ", + help_string => "ENI Index", optional => "NO", }, ], @@ -1405,16 +1405,16 @@ function_args => [], }, - # cloud aws ha show + # cloud aws show ha { obj_type => "ITEM", - name => "show", - menu => "root_cloud_aws_ha", + name => "ha", + menu => "root_cloud_aws_show", help_string => "Check if the cloud aws ha is enable or not.", cmd_attribute => "CMD_ARRAYOS|CMD_SPROXY|CMD_NORMAL|CMD_KILLABLE|CMD_NON_MORE", user_level => "CLI_LEVEL_CONFIG", - function_name => "cloud_aws_ha_show", + function_name => "cloud_aws_show_ha", function_args => [], }, Index: /branches/rel_apv_10_7_3/usr/click/tools/aws/AWSAuthManager.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/aws/AWSAuthManager.py (revision 39056) +++ /branches/rel_apv_10_7_3/usr/click/tools/aws/AWSAuthManager.py (working copy) @@ -1,4 +1,5 @@ import argparse +import json from aws_auth.AWSAuthController import AWSAuthController from logger.ProxyAWSLogger import ProxyAWSLogger @@ -46,6 +47,10 @@ None """ log_in_info = AWSAuthController.get_login_info() + if log_in_info["aws_access_key_id"] or \ + log_in_info["aws_secret_access_key"] or \ + log_in_info["region"]: + print("You didn't sign in.") try: AWSAuthController.logout() ProxyAWSLogger.info(f"log out with access key: " @@ -72,6 +77,32 @@ except Exception as e: ProxyAWSLogger.error(str(e)) + @classmethod + def show_pretty(cls): + """ + Displays the current AWS login information by human-readable format. + + Args: + None + + Returns: + None + """ + try: + log_in_info = AWSAuthController.get_login_info() + ProxyAWSLogger.info(f"show log in information with access key: " + f"{log_in_info['aws_access_key_id']}") + print( + f"AWS Access Key ID: {None if log_in_info['aws_access_key_id'] == '' else log_in_info['aws_access_key_id']}" + ) + print( + f"AWS Secret Access Key: {None if log_in_info['aws_secret_access_key'] == '' else log_in_info['aws_secret_access_key']}" + ) + print( + f"AWS Region: {None if log_in_info['region'] == '' else log_in_info['region']}" + ) + except Exception as e: + ProxyAWSLogger.error(str(e)) if __name__ == "__main__": choices = ["login", "logout", "show"] @@ -85,8 +116,10 @@ parser.add_argument('-access_key', type=str, help='Enter your AWS access key') parser.add_argument('-secret_access_key', type=str, - help='EEnter your AWS secret access key') + help='Enter your AWS secret access key') parser.add_argument('-region', type=str, help='Enter your AWS region') + parser.add_argument('-p', '--pretty', + action='store_true', help='Make output human-readable') args = parser.parse_args() if args.mode == "login": @@ -95,7 +128,10 @@ elif args.mode == "logout": AWSAuthManager.logout() elif args.mode == "show": - AWSAuthManager.show() + if args.pretty: + AWSAuthManager.show_pretty() + else: + AWSAuthManager.show() else: ProxyAWSLogger.error( f'Error: mode must arugment must {", ".join(choices)}.' Index: /branches/rel_apv_10_7_3/usr/click/tools/aws/AWSConfigManager.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/aws/AWSConfigManager.py (revision 39056) +++ /branches/rel_apv_10_7_3/usr/click/tools/aws/AWSConfigManager.py (working copy) @@ -1,4 +1,5 @@ import argparse +import json from logger.ProxyAWSLogger import ProxyAWSLogger from aws_eni.AWSENIConfigurator import AWSENIConfigurator @@ -38,12 +39,43 @@ Returns: None: This function does not return any value. """ + config = cls.get_eni_config() + print(config) + + @classmethod + def get_eni_config(cls) -> dict: + """ + Get all ENI configuration with json format + + Args: + None: This function does not take any arguments. + + Returns: + dict: The data of eni configuration + """ try: config = AWSENIConfigurator.get_config() - print(config) - ProxyAWSLogger.info(f"Successfully get ENI configuration") + return config except Exception as e: ProxyAWSLogger.error(f"Fail to get ENI configuration {str(e)}") + return {} + + @classmethod + def show_eni_config_pretty(cls) -> None: + """ + Print all ENI configuration with json format with human-readable + + Args: + None: This function does not take any arguments. + + Returns: + None: This function does not return any value. + """ + config = cls.get_eni_config() + if config: + print(json.dumps(config, indent=4)) + else: + print("No ENI Configuration") @classmethod def remove_eni_config(cls, index: str) -> None: @@ -95,12 +127,17 @@ help=f"Enter the destination eni id") parser.add_argument('-index', type=str, help=f"Enter the index of pair of ENI configuration") + parser.add_argument('-p', '--pretty', + action='store_true', help='Make output human-readable') args = parser.parse_args() if args.ENI == "set": AWSConfigManger.add_eni_config(args.src_eni_id, args.dest_eni_id) elif args.ENI == "show": - AWSConfigManger.show_eni_config() + if args.pretty: + AWSConfigManger.show_eni_config_pretty() + else: + AWSConfigManger.show_eni_config() elif args.ENI == "remove": AWSConfigManger.remove_eni_config(args.index) elif args.ENI == "clear": Index: /branches/rel_apv_10_7_3/usr/click/tools/aws/aws_auth/AWSAuthController.py =================================================================== --- /branches/rel_apv_10_7_3/usr/click/tools/aws/aws_auth/AWSAuthController.py (revision 39064) +++ /branches/rel_apv_10_7_3/usr/click/tools/aws/aws_auth/AWSAuthController.py (working copy) @@ -41,7 +41,6 @@ capture_output=True, check=True, ) - print("AWS CLI configured successfully!") except Exception as e: ProxyAWSLogger.error(str(e)) @@ -56,7 +55,6 @@ Returns: None: This function does not return any value. """ - print("logout") try: subprocess.run( ["aws", "configure", "set", "aws_access_key_id", ""], @@ -101,7 +99,7 @@ except Exception as e: ProxyAWSLogger.error(str(e)) - if res["aws_access_key_id"] or res["aws_access_key_id"]: + if res["aws_access_key_id"] or res["aws_secret_access_key"]: res["aws_access_key_id"] = cls._mask_credential( res["aws_access_key_id"]) res["aws_secret_access_key"] = cls._mask_credential(