tccli 3.0.1217.1__py2.py3-none-any.whl → 3.0.1218.1__py2.py3-none-any.whl
Sign up to get free protection for your applications and to get access to all the features.
- tccli/__init__.py +1 -1
- tccli/command.py +0 -1
- tccli/configure.py +11 -1
- tccli/services/aa/aa_client.py +13 -1
- tccli/services/aai/aai_client.py +13 -1
- tccli/services/acp/acp_client.py +13 -1
- tccli/services/advisor/advisor_client.py +13 -1
- tccli/services/af/af_client.py +13 -1
- tccli/services/afc/afc_client.py +13 -1
- tccli/services/aiart/aiart_client.py +13 -1
- tccli/services/ame/ame_client.py +13 -1
- tccli/services/ams/ams_client.py +13 -1
- tccli/services/anicloud/anicloud_client.py +13 -1
- tccli/services/antiddos/antiddos_client.py +13 -1
- tccli/services/apcas/apcas_client.py +13 -1
- tccli/services/ape/ape_client.py +13 -1
- tccli/services/api/api_client.py +13 -1
- tccli/services/apigateway/apigateway_client.py +13 -1
- tccli/services/apm/apm_client.py +13 -1
- tccli/services/asr/asr_client.py +13 -1
- tccli/services/asw/asw_client.py +13 -1
- tccli/services/autoscaling/autoscaling_client.py +13 -1
- tccli/services/ba/ba_client.py +13 -1
- tccli/services/batch/batch_client.py +13 -1
- tccli/services/bda/bda_client.py +13 -1
- tccli/services/bh/bh_client.py +13 -1
- tccli/services/bi/bi_client.py +13 -1
- tccli/services/billing/billing_client.py +13 -1
- tccli/services/bizlive/bizlive_client.py +13 -1
- tccli/services/bm/bm_client.py +13 -1
- tccli/services/bma/bma_client.py +13 -1
- tccli/services/bmeip/bmeip_client.py +13 -1
- tccli/services/bmlb/bmlb_client.py +13 -1
- tccli/services/bmvpc/bmvpc_client.py +13 -1
- tccli/services/bpaas/bpaas_client.py +13 -1
- tccli/services/bri/bri_client.py +13 -1
- tccli/services/bsca/bsca_client.py +13 -1
- tccli/services/btoe/btoe_client.py +13 -1
- tccli/services/ca/ca_client.py +13 -1
- tccli/services/cam/cam_client.py +13 -1
- tccli/services/captcha/captcha_client.py +13 -1
- tccli/services/car/car_client.py +13 -1
- tccli/services/cat/cat_client.py +13 -1
- tccli/services/cbs/cbs_client.py +13 -1
- tccli/services/ccc/ccc_client.py +13 -1
- tccli/services/cdb/cdb_client.py +13 -1
- tccli/services/cdc/cdc_client.py +13 -1
- tccli/services/cdn/cdn_client.py +13 -1
- tccli/services/cds/cds_client.py +13 -1
- tccli/services/cdwch/cdwch_client.py +13 -1
- tccli/services/cdwdoris/cdwdoris_client.py +13 -1
- tccli/services/cdwpg/cdwpg_client.py +13 -1
- tccli/services/cdz/cdz_client.py +13 -1
- tccli/services/cfg/cfg_client.py +13 -1
- tccli/services/cfs/cfs_client.py +13 -1
- tccli/services/cfw/cfw_client.py +13 -1
- tccli/services/chdfs/chdfs_client.py +13 -1
- tccli/services/ciam/ciam_client.py +13 -1
- tccli/services/cii/cii_client.py +13 -1
- tccli/services/cim/cim_client.py +13 -1
- tccli/services/cis/cis_client.py +13 -1
- tccli/services/ckafka/ckafka_client.py +13 -1
- tccli/services/clb/clb_client.py +13 -1
- tccli/services/cloudapp/cloudapp_client.py +13 -1
- tccli/services/cloudaudit/cloudaudit_client.py +13 -1
- tccli/services/cloudhsm/cloudhsm_client.py +13 -1
- tccli/services/cloudstudio/cloudstudio_client.py +13 -1
- tccli/services/cls/cls_client.py +13 -1
- tccli/services/cme/cme_client.py +13 -1
- tccli/services/cmq/cmq_client.py +13 -1
- tccli/services/cms/cms_client.py +13 -1
- tccli/services/config/config_client.py +13 -1
- tccli/services/controlcenter/controlcenter_client.py +13 -1
- tccli/services/cpdp/cpdp_client.py +13 -1
- tccli/services/csip/csip_client.py +13 -1
- tccli/services/csxg/csxg_client.py +13 -1
- tccli/services/cvm/cvm_client.py +13 -1
- tccli/services/cwp/cwp_client.py +13 -1
- tccli/services/cws/cws_client.py +13 -1
- tccli/services/cynosdb/cynosdb_client.py +13 -1
- tccli/services/dasb/dasb_client.py +13 -1
- tccli/services/dataintegration/dataintegration_client.py +13 -1
- tccli/services/dayu/dayu_client.py +13 -1
- tccli/services/dbbrain/dbbrain_client.py +13 -1
- tccli/services/dbdc/dbdc_client.py +13 -1
- tccli/services/dc/dc_client.py +13 -1
- tccli/services/dcdb/dcdb_client.py +13 -1
- tccli/services/dlc/dlc_client.py +13 -1
- tccli/services/dnspod/dnspod_client.py +13 -1
- tccli/services/domain/domain_client.py +13 -1
- tccli/services/drm/drm_client.py +13 -1
- tccli/services/ds/ds_client.py +13 -1
- tccli/services/dsgc/dsgc_client.py +13 -1
- tccli/services/dtf/dtf_client.py +13 -1
- tccli/services/dts/dts_client.py +13 -1
- tccli/services/eb/eb_client.py +13 -1
- tccli/services/ecc/ecc_client.py +13 -1
- tccli/services/ecdn/ecdn_client.py +13 -1
- tccli/services/ecm/ecm_client.py +13 -1
- tccli/services/eiam/eiam_client.py +13 -1
- tccli/services/eis/eis_client.py +13 -1
- tccli/services/emr/emr_client.py +13 -1
- tccli/services/es/es_client.py +13 -1
- tccli/services/ess/ess_client.py +13 -1
- tccli/services/essbasic/essbasic_client.py +13 -1
- tccli/services/facefusion/facefusion_client.py +13 -1
- tccli/services/faceid/faceid_client.py +13 -1
- tccli/services/fmu/fmu_client.py +13 -1
- tccli/services/ft/ft_client.py +13 -1
- tccli/services/gaap/gaap_client.py +13 -1
- tccli/services/gme/gme_client.py +13 -1
- tccli/services/goosefs/goosefs_client.py +13 -1
- tccli/services/gpm/gpm_client.py +13 -1
- tccli/services/gs/gs_client.py +13 -1
- tccli/services/gse/gse_client.py +13 -1
- tccli/services/gwlb/gwlb_client.py +13 -1
- tccli/services/habo/habo_client.py +13 -1
- tccli/services/hai/hai_client.py +13 -1
- tccli/services/hasim/hasim_client.py +13 -1
- tccli/services/hcm/hcm_client.py +13 -1
- tccli/services/hunyuan/hunyuan_client.py +13 -1
- tccli/services/iai/iai_client.py +13 -1
- tccli/services/ic/ic_client.py +13 -1
- tccli/services/icr/icr_client.py +13 -1
- tccli/services/ie/ie_client.py +13 -1
- tccli/services/iecp/iecp_client.py +13 -1
- tccli/services/ig/ig_client.py +13 -1
- tccli/services/iir/iir_client.py +13 -1
- tccli/services/ims/ims_client.py +13 -1
- tccli/services/ioa/ioa_client.py +13 -1
- tccli/services/iot/iot_client.py +13 -1
- tccli/services/iotcloud/iotcloud_client.py +13 -1
- tccli/services/iotexplorer/iotexplorer_client.py +13 -1
- tccli/services/iottid/iottid_client.py +13 -1
- tccli/services/iotvideo/iotvideo_client.py +13 -1
- tccli/services/iotvideoindustry/iotvideoindustry_client.py +13 -1
- tccli/services/irp/irp_client.py +13 -1
- tccli/services/iss/iss_client.py +13 -1
- tccli/services/ivld/ivld_client.py +13 -1
- tccli/services/keewidb/keewidb_client.py +13 -1
- tccli/services/kms/kms_client.py +13 -1
- tccli/services/lcic/lcic_client.py +13 -1
- tccli/services/lighthouse/lighthouse_client.py +13 -1
- tccli/services/live/live_client.py +13 -1
- tccli/services/lke/lke_client.py +13 -1
- tccli/services/lowcode/lowcode_client.py +13 -1
- tccli/services/lp/lp_client.py +13 -1
- tccli/services/mall/mall_client.py +13 -1
- tccli/services/mariadb/mariadb_client.py +13 -1
- tccli/services/market/market_client.py +13 -1
- tccli/services/memcached/memcached_client.py +13 -1
- tccli/services/mgobe/mgobe_client.py +13 -1
- tccli/services/mmps/mmps_client.py +13 -1
- tccli/services/mna/mna_client.py +13 -1
- tccli/services/mongodb/mongodb_client.py +13 -1
- tccli/services/monitor/monitor_client.py +13 -1
- tccli/services/mps/mps_client.py +13 -1
- tccli/services/mqtt/mqtt_client.py +13 -1
- tccli/services/mrs/mrs_client.py +13 -1
- tccli/services/ms/ms_client.py +13 -1
- tccli/services/msp/msp_client.py +13 -1
- tccli/services/mvj/mvj_client.py +13 -1
- tccli/services/nlp/nlp_client.py +13 -1
- tccli/services/npp/npp_client.py +13 -1
- tccli/services/oceanus/oceanus_client.py +13 -1
- tccli/services/ocr/ocr_client.py +13 -1
- tccli/services/omics/omics_client.py +13 -1
- tccli/services/organization/organization_client.py +13 -1
- tccli/services/partners/partners_client.py +13 -1
- tccli/services/pds/pds_client.py +13 -1
- tccli/services/postgres/postgres_client.py +13 -1
- tccli/services/privatedns/privatedns_client.py +13 -1
- tccli/services/pts/pts_client.py +13 -1
- tccli/services/rce/rce_client.py +13 -1
- tccli/services/redis/redis_client.py +13 -1
- tccli/services/region/region_client.py +13 -1
- tccli/services/rkp/rkp_client.py +13 -1
- tccli/services/rp/rp_client.py +13 -1
- tccli/services/rum/rum_client.py +13 -1
- tccli/services/scf/scf_client.py +13 -1
- tccli/services/ses/ses_client.py +13 -1
- tccli/services/smh/smh_client.py +13 -1
- tccli/services/smop/smop_client.py +13 -1
- tccli/services/smpn/smpn_client.py +13 -1
- tccli/services/sms/sms_client.py +13 -1
- tccli/services/soe/soe_client.py +13 -1
- tccli/services/solar/solar_client.py +13 -1
- tccli/services/sqlserver/sqlserver_client.py +13 -1
- tccli/services/ssa/ssa_client.py +13 -1
- tccli/services/ssl/ssl_client.py +13 -1
- tccli/services/sslpod/sslpod_client.py +13 -1
- tccli/services/ssm/ssm_client.py +13 -1
- tccli/services/sts/sts_client.py +13 -1
- tccli/services/svp/svp_client.py +13 -1
- tccli/services/taf/taf_client.py +13 -1
- tccli/services/tag/tag_client.py +13 -1
- tccli/services/tan/tan_client.py +13 -1
- tccli/services/tat/tat_client.py +13 -1
- tccli/services/tav/tav_client.py +13 -1
- tccli/services/tbaas/tbaas_client.py +13 -1
- tccli/services/tbm/tbm_client.py +13 -1
- tccli/services/tbp/tbp_client.py +13 -1
- tccli/services/tcaplusdb/tcaplusdb_client.py +13 -1
- tccli/services/tcb/tcb_client.py +13 -1
- tccli/services/tcbr/tcbr_client.py +13 -1
- tccli/services/tcex/tcex_client.py +13 -1
- tccli/services/tchd/tchd_client.py +13 -1
- tccli/services/tci/tci_client.py +13 -1
- tccli/services/tcm/tcm_client.py +13 -1
- tccli/services/tcr/tcr_client.py +13 -1
- tccli/services/tcss/tcss_client.py +13 -1
- tccli/services/tdcpg/tdcpg_client.py +13 -1
- tccli/services/tdid/tdid_client.py +13 -1
- tccli/services/tdmq/tdmq_client.py +13 -1
- tccli/services/tds/tds_client.py +13 -1
- tccli/services/tem/tem_client.py +13 -1
- tccli/services/teo/teo_client.py +13 -1
- tccli/services/thpc/thpc_client.py +13 -1
- tccli/services/tia/tia_client.py +13 -1
- tccli/services/tic/tic_client.py +13 -1
- tccli/services/ticm/ticm_client.py +13 -1
- tccli/services/tics/tics_client.py +13 -1
- tccli/services/tiems/tiems_client.py +13 -1
- tccli/services/tiia/tiia_client.py +13 -1
- tccli/services/tione/tione_client.py +13 -1
- tccli/services/tiw/tiw_client.py +13 -1
- tccli/services/tke/tke_client.py +13 -1
- tccli/services/tkgdq/tkgdq_client.py +13 -1
- tccli/services/tms/tms_client.py +13 -1
- tccli/services/tmt/tmt_client.py +13 -1
- tccli/services/tourism/tourism_client.py +13 -1
- tccli/services/trdp/trdp_client.py +13 -1
- tccli/services/trocket/trocket_client.py +13 -1
- tccli/services/trp/trp_client.py +13 -1
- tccli/services/trro/trro_client.py +13 -1
- tccli/services/trtc/trtc_client.py +13 -1
- tccli/services/tse/tse_client.py +13 -1
- tccli/services/tsf/tsf_client.py +13 -1
- tccli/services/tsi/tsi_client.py +13 -1
- tccli/services/tsw/tsw_client.py +13 -1
- tccli/services/tts/tts_client.py +13 -1
- tccli/services/ump/ump_client.py +13 -1
- tccli/services/vcg/vcg_client.py +13 -1
- tccli/services/vclm/vclm_client.py +13 -1
- tccli/services/vdb/vdb_client.py +13 -1
- tccli/services/vm/vm_client.py +13 -1
- tccli/services/vms/vms_client.py +13 -1
- tccli/services/vod/vod_client.py +13 -1
- tccli/services/vpc/vpc_client.py +13 -1
- tccli/services/vrs/vrs_client.py +13 -1
- tccli/services/vtc/vtc_client.py +13 -1
- tccli/services/waf/waf_client.py +13 -1
- tccli/services/wav/wav_client.py +13 -1
- tccli/services/wedata/wedata_client.py +13 -1
- tccli/services/weilingwith/weilingwith_client.py +13 -1
- tccli/services/wss/wss_client.py +13 -1
- tccli/services/yinsuda/yinsuda_client.py +13 -1
- tccli/services/youmall/youmall_client.py +13 -1
- tccli/services/yunjing/yunjing_client.py +13 -1
- tccli/services/yunsou/yunsou_client.py +13 -1
- tccli/utils.py +8 -0
- {tccli-3.0.1217.1.dist-info → tccli-3.0.1218.1.dist-info}/METADATA +2 -2
- {tccli-3.0.1217.1.dist-info → tccli-3.0.1218.1.dist-info}/RECORD +266 -266
- {tccli-3.0.1217.1.dist-info → tccli-3.0.1218.1.dist-info}/WHEEL +0 -0
- {tccli-3.0.1217.1.dist-info → tccli-3.0.1218.1.dist-info}/entry_points.txt +0 -0
- {tccli-3.0.1217.1.dist-info → tccli-3.0.1218.1.dist-info}/license_files/LICENSE +0 -0
tccli/services/gme/gme_client.py
CHANGED
@@ -1527,7 +1527,13 @@ def action_caller():
|
|
1527
1527
|
|
1528
1528
|
def parse_global_arg(parsed_globals):
|
1529
1529
|
g_param = parsed_globals
|
1530
|
-
|
1530
|
+
cvm_role_flag = True
|
1531
|
+
for param in parsed_globals.keys():
|
1532
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
1533
|
+
OptionsDefine.RoleSessionName]:
|
1534
|
+
if parsed_globals[param] is not None:
|
1535
|
+
cvm_role_flag = False
|
1536
|
+
break
|
1531
1537
|
is_exist_profile = True
|
1532
1538
|
if not parsed_globals["profile"]:
|
1533
1539
|
is_exist_profile = False
|
@@ -1558,6 +1564,7 @@ def parse_global_arg(parsed_globals):
|
|
1558
1564
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
1559
1565
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
1560
1566
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
1567
|
+
cvm_role_flag = False
|
1561
1568
|
|
1562
1569
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
1563
1570
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -1565,6 +1572,11 @@ def parse_global_arg(parsed_globals):
|
|
1565
1572
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
1566
1573
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
1567
1574
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
1575
|
+
cvm_role_flag = False
|
1576
|
+
|
1577
|
+
if cvm_role_flag:
|
1578
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
1579
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
1568
1580
|
|
1569
1581
|
for param in g_param.keys():
|
1570
1582
|
if g_param[param] is None:
|
@@ -1103,7 +1103,13 @@ def action_caller():
|
|
1103
1103
|
|
1104
1104
|
def parse_global_arg(parsed_globals):
|
1105
1105
|
g_param = parsed_globals
|
1106
|
-
|
1106
|
+
cvm_role_flag = True
|
1107
|
+
for param in parsed_globals.keys():
|
1108
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
1109
|
+
OptionsDefine.RoleSessionName]:
|
1110
|
+
if parsed_globals[param] is not None:
|
1111
|
+
cvm_role_flag = False
|
1112
|
+
break
|
1107
1113
|
is_exist_profile = True
|
1108
1114
|
if not parsed_globals["profile"]:
|
1109
1115
|
is_exist_profile = False
|
@@ -1134,6 +1140,7 @@ def parse_global_arg(parsed_globals):
|
|
1134
1140
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
1135
1141
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
1136
1142
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
1143
|
+
cvm_role_flag = False
|
1137
1144
|
|
1138
1145
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
1139
1146
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -1141,6 +1148,11 @@ def parse_global_arg(parsed_globals):
|
|
1141
1148
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
1142
1149
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
1143
1150
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
1151
|
+
cvm_role_flag = False
|
1152
|
+
|
1153
|
+
if cvm_role_flag:
|
1154
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
1155
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
1144
1156
|
|
1145
1157
|
for param in g_param.keys():
|
1146
1158
|
if g_param[param] is None:
|
tccli/services/gpm/gpm_client.py
CHANGED
@@ -997,7 +997,13 @@ def action_caller():
|
|
997
997
|
|
998
998
|
def parse_global_arg(parsed_globals):
|
999
999
|
g_param = parsed_globals
|
1000
|
-
|
1000
|
+
cvm_role_flag = True
|
1001
|
+
for param in parsed_globals.keys():
|
1002
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
1003
|
+
OptionsDefine.RoleSessionName]:
|
1004
|
+
if parsed_globals[param] is not None:
|
1005
|
+
cvm_role_flag = False
|
1006
|
+
break
|
1001
1007
|
is_exist_profile = True
|
1002
1008
|
if not parsed_globals["profile"]:
|
1003
1009
|
is_exist_profile = False
|
@@ -1028,6 +1034,7 @@ def parse_global_arg(parsed_globals):
|
|
1028
1034
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
1029
1035
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
1030
1036
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
1037
|
+
cvm_role_flag = False
|
1031
1038
|
|
1032
1039
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
1033
1040
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -1035,6 +1042,11 @@ def parse_global_arg(parsed_globals):
|
|
1035
1042
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
1036
1043
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
1037
1044
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
1045
|
+
cvm_role_flag = False
|
1046
|
+
|
1047
|
+
if cvm_role_flag:
|
1048
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
1049
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
1038
1050
|
|
1039
1051
|
for param in g_param.keys():
|
1040
1052
|
if g_param[param] is None:
|
tccli/services/gs/gs_client.py
CHANGED
@@ -520,7 +520,13 @@ def action_caller():
|
|
520
520
|
|
521
521
|
def parse_global_arg(parsed_globals):
|
522
522
|
g_param = parsed_globals
|
523
|
-
|
523
|
+
cvm_role_flag = True
|
524
|
+
for param in parsed_globals.keys():
|
525
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
526
|
+
OptionsDefine.RoleSessionName]:
|
527
|
+
if parsed_globals[param] is not None:
|
528
|
+
cvm_role_flag = False
|
529
|
+
break
|
524
530
|
is_exist_profile = True
|
525
531
|
if not parsed_globals["profile"]:
|
526
532
|
is_exist_profile = False
|
@@ -551,6 +557,7 @@ def parse_global_arg(parsed_globals):
|
|
551
557
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
552
558
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
553
559
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
560
|
+
cvm_role_flag = False
|
554
561
|
|
555
562
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
556
563
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -558,6 +565,11 @@ def parse_global_arg(parsed_globals):
|
|
558
565
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
559
566
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
560
567
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
568
|
+
cvm_role_flag = False
|
569
|
+
|
570
|
+
if cvm_role_flag:
|
571
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
572
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
561
573
|
|
562
574
|
for param in g_param.keys():
|
563
575
|
if g_param[param] is None:
|
tccli/services/gse/gse_client.py
CHANGED
@@ -3965,7 +3965,13 @@ def action_caller():
|
|
3965
3965
|
|
3966
3966
|
def parse_global_arg(parsed_globals):
|
3967
3967
|
g_param = parsed_globals
|
3968
|
-
|
3968
|
+
cvm_role_flag = True
|
3969
|
+
for param in parsed_globals.keys():
|
3970
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
3971
|
+
OptionsDefine.RoleSessionName]:
|
3972
|
+
if parsed_globals[param] is not None:
|
3973
|
+
cvm_role_flag = False
|
3974
|
+
break
|
3969
3975
|
is_exist_profile = True
|
3970
3976
|
if not parsed_globals["profile"]:
|
3971
3977
|
is_exist_profile = False
|
@@ -3996,6 +4002,7 @@ def parse_global_arg(parsed_globals):
|
|
3996
4002
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
3997
4003
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
3998
4004
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
4005
|
+
cvm_role_flag = False
|
3999
4006
|
|
4000
4007
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
4001
4008
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -4003,6 +4010,11 @@ def parse_global_arg(parsed_globals):
|
|
4003
4010
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
4004
4011
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
4005
4012
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
4013
|
+
cvm_role_flag = False
|
4014
|
+
|
4015
|
+
if cvm_role_flag:
|
4016
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
4017
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
4006
4018
|
|
4007
4019
|
for param in g_param.keys():
|
4008
4020
|
if g_param[param] is None:
|
@@ -997,7 +997,13 @@ def action_caller():
|
|
997
997
|
|
998
998
|
def parse_global_arg(parsed_globals):
|
999
999
|
g_param = parsed_globals
|
1000
|
-
|
1000
|
+
cvm_role_flag = True
|
1001
|
+
for param in parsed_globals.keys():
|
1002
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
1003
|
+
OptionsDefine.RoleSessionName]:
|
1004
|
+
if parsed_globals[param] is not None:
|
1005
|
+
cvm_role_flag = False
|
1006
|
+
break
|
1001
1007
|
is_exist_profile = True
|
1002
1008
|
if not parsed_globals["profile"]:
|
1003
1009
|
is_exist_profile = False
|
@@ -1028,6 +1034,7 @@ def parse_global_arg(parsed_globals):
|
|
1028
1034
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
1029
1035
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
1030
1036
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
1037
|
+
cvm_role_flag = False
|
1031
1038
|
|
1032
1039
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
1033
1040
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -1035,6 +1042,11 @@ def parse_global_arg(parsed_globals):
|
|
1035
1042
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
1036
1043
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
1037
1044
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
1045
|
+
cvm_role_flag = False
|
1046
|
+
|
1047
|
+
if cvm_role_flag:
|
1048
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
1049
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
1038
1050
|
|
1039
1051
|
for param in g_param.keys():
|
1040
1052
|
if g_param[param] is None:
|
@@ -149,7 +149,13 @@ def action_caller():
|
|
149
149
|
|
150
150
|
def parse_global_arg(parsed_globals):
|
151
151
|
g_param = parsed_globals
|
152
|
-
|
152
|
+
cvm_role_flag = True
|
153
|
+
for param in parsed_globals.keys():
|
154
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
155
|
+
OptionsDefine.RoleSessionName]:
|
156
|
+
if parsed_globals[param] is not None:
|
157
|
+
cvm_role_flag = False
|
158
|
+
break
|
153
159
|
is_exist_profile = True
|
154
160
|
if not parsed_globals["profile"]:
|
155
161
|
is_exist_profile = False
|
@@ -180,6 +186,7 @@ def parse_global_arg(parsed_globals):
|
|
180
186
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
181
187
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
182
188
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
189
|
+
cvm_role_flag = False
|
183
190
|
|
184
191
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
185
192
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -187,6 +194,11 @@ def parse_global_arg(parsed_globals):
|
|
187
194
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
188
195
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
189
196
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
197
|
+
cvm_role_flag = False
|
198
|
+
|
199
|
+
if cvm_role_flag:
|
200
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
201
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
190
202
|
|
191
203
|
for param in g_param.keys():
|
192
204
|
if g_param[param] is None:
|
tccli/services/hai/hai_client.py
CHANGED
@@ -626,7 +626,13 @@ def action_caller():
|
|
626
626
|
|
627
627
|
def parse_global_arg(parsed_globals):
|
628
628
|
g_param = parsed_globals
|
629
|
-
|
629
|
+
cvm_role_flag = True
|
630
|
+
for param in parsed_globals.keys():
|
631
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
632
|
+
OptionsDefine.RoleSessionName]:
|
633
|
+
if parsed_globals[param] is not None:
|
634
|
+
cvm_role_flag = False
|
635
|
+
break
|
630
636
|
is_exist_profile = True
|
631
637
|
if not parsed_globals["profile"]:
|
632
638
|
is_exist_profile = False
|
@@ -657,6 +663,7 @@ def parse_global_arg(parsed_globals):
|
|
657
663
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
658
664
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
659
665
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
666
|
+
cvm_role_flag = False
|
660
667
|
|
661
668
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
662
669
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -664,6 +671,11 @@ def parse_global_arg(parsed_globals):
|
|
664
671
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
665
672
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
666
673
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
674
|
+
cvm_role_flag = False
|
675
|
+
|
676
|
+
if cvm_role_flag:
|
677
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
678
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
667
679
|
|
668
680
|
for param in g_param.keys():
|
669
681
|
if g_param[param] is None:
|
@@ -1209,7 +1209,13 @@ def action_caller():
|
|
1209
1209
|
|
1210
1210
|
def parse_global_arg(parsed_globals):
|
1211
1211
|
g_param = parsed_globals
|
1212
|
-
|
1212
|
+
cvm_role_flag = True
|
1213
|
+
for param in parsed_globals.keys():
|
1214
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
1215
|
+
OptionsDefine.RoleSessionName]:
|
1216
|
+
if parsed_globals[param] is not None:
|
1217
|
+
cvm_role_flag = False
|
1218
|
+
break
|
1213
1219
|
is_exist_profile = True
|
1214
1220
|
if not parsed_globals["profile"]:
|
1215
1221
|
is_exist_profile = False
|
@@ -1240,6 +1246,7 @@ def parse_global_arg(parsed_globals):
|
|
1240
1246
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
1241
1247
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
1242
1248
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
1249
|
+
cvm_role_flag = False
|
1243
1250
|
|
1244
1251
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
1245
1252
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -1247,6 +1254,11 @@ def parse_global_arg(parsed_globals):
|
|
1247
1254
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
1248
1255
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
1249
1256
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
1257
|
+
cvm_role_flag = False
|
1258
|
+
|
1259
|
+
if cvm_role_flag:
|
1260
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
1261
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
1250
1262
|
|
1251
1263
|
for param in g_param.keys():
|
1252
1264
|
if g_param[param] is None:
|
tccli/services/hcm/hcm_client.py
CHANGED
@@ -96,7 +96,13 @@ def action_caller():
|
|
96
96
|
|
97
97
|
def parse_global_arg(parsed_globals):
|
98
98
|
g_param = parsed_globals
|
99
|
-
|
99
|
+
cvm_role_flag = True
|
100
|
+
for param in parsed_globals.keys():
|
101
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
102
|
+
OptionsDefine.RoleSessionName]:
|
103
|
+
if parsed_globals[param] is not None:
|
104
|
+
cvm_role_flag = False
|
105
|
+
break
|
100
106
|
is_exist_profile = True
|
101
107
|
if not parsed_globals["profile"]:
|
102
108
|
is_exist_profile = False
|
@@ -127,6 +133,7 @@ def parse_global_arg(parsed_globals):
|
|
127
133
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
128
134
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
129
135
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
136
|
+
cvm_role_flag = False
|
130
137
|
|
131
138
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
132
139
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -134,6 +141,11 @@ def parse_global_arg(parsed_globals):
|
|
134
141
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
135
142
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
136
143
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
144
|
+
cvm_role_flag = False
|
145
|
+
|
146
|
+
if cvm_role_flag:
|
147
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
148
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
137
149
|
|
138
150
|
for param in g_param.keys():
|
139
151
|
if g_param[param] is None:
|
@@ -997,7 +997,13 @@ def action_caller():
|
|
997
997
|
|
998
998
|
def parse_global_arg(parsed_globals):
|
999
999
|
g_param = parsed_globals
|
1000
|
-
|
1000
|
+
cvm_role_flag = True
|
1001
|
+
for param in parsed_globals.keys():
|
1002
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
1003
|
+
OptionsDefine.RoleSessionName]:
|
1004
|
+
if parsed_globals[param] is not None:
|
1005
|
+
cvm_role_flag = False
|
1006
|
+
break
|
1001
1007
|
is_exist_profile = True
|
1002
1008
|
if not parsed_globals["profile"]:
|
1003
1009
|
is_exist_profile = False
|
@@ -1028,6 +1034,7 @@ def parse_global_arg(parsed_globals):
|
|
1028
1034
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
1029
1035
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
1030
1036
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
1037
|
+
cvm_role_flag = False
|
1031
1038
|
|
1032
1039
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
1033
1040
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -1035,6 +1042,11 @@ def parse_global_arg(parsed_globals):
|
|
1035
1042
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
1036
1043
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
1037
1044
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
1045
|
+
cvm_role_flag = False
|
1046
|
+
|
1047
|
+
if cvm_role_flag:
|
1048
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
1049
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
1038
1050
|
|
1039
1051
|
for param in g_param.keys():
|
1040
1052
|
if g_param[param] is None:
|
tccli/services/iai/iai_client.py
CHANGED
@@ -1903,7 +1903,13 @@ def action_caller():
|
|
1903
1903
|
|
1904
1904
|
def parse_global_arg(parsed_globals):
|
1905
1905
|
g_param = parsed_globals
|
1906
|
-
|
1906
|
+
cvm_role_flag = True
|
1907
|
+
for param in parsed_globals.keys():
|
1908
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
1909
|
+
OptionsDefine.RoleSessionName]:
|
1910
|
+
if parsed_globals[param] is not None:
|
1911
|
+
cvm_role_flag = False
|
1912
|
+
break
|
1907
1913
|
is_exist_profile = True
|
1908
1914
|
if not parsed_globals["profile"]:
|
1909
1915
|
is_exist_profile = False
|
@@ -1934,6 +1940,7 @@ def parse_global_arg(parsed_globals):
|
|
1934
1940
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
1935
1941
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
1936
1942
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
1943
|
+
cvm_role_flag = False
|
1937
1944
|
|
1938
1945
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
1939
1946
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -1941,6 +1948,11 @@ def parse_global_arg(parsed_globals):
|
|
1941
1948
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
1942
1949
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
1943
1950
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
1951
|
+
cvm_role_flag = False
|
1952
|
+
|
1953
|
+
if cvm_role_flag:
|
1954
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
1955
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
1944
1956
|
|
1945
1957
|
for param in g_param.keys():
|
1946
1958
|
if g_param[param] is None:
|
tccli/services/ic/ic_client.py
CHANGED
@@ -520,7 +520,13 @@ def action_caller():
|
|
520
520
|
|
521
521
|
def parse_global_arg(parsed_globals):
|
522
522
|
g_param = parsed_globals
|
523
|
-
|
523
|
+
cvm_role_flag = True
|
524
|
+
for param in parsed_globals.keys():
|
525
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
526
|
+
OptionsDefine.RoleSessionName]:
|
527
|
+
if parsed_globals[param] is not None:
|
528
|
+
cvm_role_flag = False
|
529
|
+
break
|
524
530
|
is_exist_profile = True
|
525
531
|
if not parsed_globals["profile"]:
|
526
532
|
is_exist_profile = False
|
@@ -551,6 +557,7 @@ def parse_global_arg(parsed_globals):
|
|
551
557
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
552
558
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
553
559
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
560
|
+
cvm_role_flag = False
|
554
561
|
|
555
562
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
556
563
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -558,6 +565,11 @@ def parse_global_arg(parsed_globals):
|
|
558
565
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
559
566
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
560
567
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
568
|
+
cvm_role_flag = False
|
569
|
+
|
570
|
+
if cvm_role_flag:
|
571
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
572
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
561
573
|
|
562
574
|
for param in g_param.keys():
|
563
575
|
if g_param[param] is None:
|
tccli/services/icr/icr_client.py
CHANGED
@@ -96,7 +96,13 @@ def action_caller():
|
|
96
96
|
|
97
97
|
def parse_global_arg(parsed_globals):
|
98
98
|
g_param = parsed_globals
|
99
|
-
|
99
|
+
cvm_role_flag = True
|
100
|
+
for param in parsed_globals.keys():
|
101
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
102
|
+
OptionsDefine.RoleSessionName]:
|
103
|
+
if parsed_globals[param] is not None:
|
104
|
+
cvm_role_flag = False
|
105
|
+
break
|
100
106
|
is_exist_profile = True
|
101
107
|
if not parsed_globals["profile"]:
|
102
108
|
is_exist_profile = False
|
@@ -127,6 +133,7 @@ def parse_global_arg(parsed_globals):
|
|
127
133
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
128
134
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
129
135
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
136
|
+
cvm_role_flag = False
|
130
137
|
|
131
138
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
132
139
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -134,6 +141,11 @@ def parse_global_arg(parsed_globals):
|
|
134
141
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
135
142
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
136
143
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
144
|
+
cvm_role_flag = False
|
145
|
+
|
146
|
+
if cvm_role_flag:
|
147
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
148
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
137
149
|
|
138
150
|
for param in g_param.keys():
|
139
151
|
if g_param[param] is None:
|
tccli/services/ie/ie_client.py
CHANGED
@@ -573,7 +573,13 @@ def action_caller():
|
|
573
573
|
|
574
574
|
def parse_global_arg(parsed_globals):
|
575
575
|
g_param = parsed_globals
|
576
|
-
|
576
|
+
cvm_role_flag = True
|
577
|
+
for param in parsed_globals.keys():
|
578
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
579
|
+
OptionsDefine.RoleSessionName]:
|
580
|
+
if parsed_globals[param] is not None:
|
581
|
+
cvm_role_flag = False
|
582
|
+
break
|
577
583
|
is_exist_profile = True
|
578
584
|
if not parsed_globals["profile"]:
|
579
585
|
is_exist_profile = False
|
@@ -604,6 +610,7 @@ def parse_global_arg(parsed_globals):
|
|
604
610
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
605
611
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
606
612
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
613
|
+
cvm_role_flag = False
|
607
614
|
|
608
615
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
609
616
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -611,6 +618,11 @@ def parse_global_arg(parsed_globals):
|
|
611
618
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
612
619
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
613
620
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
621
|
+
cvm_role_flag = False
|
622
|
+
|
623
|
+
if cvm_role_flag:
|
624
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
625
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
614
626
|
|
615
627
|
for param in g_param.keys():
|
616
628
|
if g_param[param] is None:
|
@@ -4389,7 +4389,13 @@ def action_caller():
|
|
4389
4389
|
|
4390
4390
|
def parse_global_arg(parsed_globals):
|
4391
4391
|
g_param = parsed_globals
|
4392
|
-
|
4392
|
+
cvm_role_flag = True
|
4393
|
+
for param in parsed_globals.keys():
|
4394
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
4395
|
+
OptionsDefine.RoleSessionName]:
|
4396
|
+
if parsed_globals[param] is not None:
|
4397
|
+
cvm_role_flag = False
|
4398
|
+
break
|
4393
4399
|
is_exist_profile = True
|
4394
4400
|
if not parsed_globals["profile"]:
|
4395
4401
|
is_exist_profile = False
|
@@ -4420,6 +4426,7 @@ def parse_global_arg(parsed_globals):
|
|
4420
4426
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
4421
4427
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
4422
4428
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
4429
|
+
cvm_role_flag = False
|
4423
4430
|
|
4424
4431
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
4425
4432
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -4427,6 +4434,11 @@ def parse_global_arg(parsed_globals):
|
|
4427
4434
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
4428
4435
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
4429
4436
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
4437
|
+
cvm_role_flag = False
|
4438
|
+
|
4439
|
+
if cvm_role_flag:
|
4440
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
4441
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
4430
4442
|
|
4431
4443
|
for param in g_param.keys():
|
4432
4444
|
if g_param[param] is None:
|
tccli/services/ig/ig_client.py
CHANGED
@@ -96,7 +96,13 @@ def action_caller():
|
|
96
96
|
|
97
97
|
def parse_global_arg(parsed_globals):
|
98
98
|
g_param = parsed_globals
|
99
|
-
|
99
|
+
cvm_role_flag = True
|
100
|
+
for param in parsed_globals.keys():
|
101
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
102
|
+
OptionsDefine.RoleSessionName]:
|
103
|
+
if parsed_globals[param] is not None:
|
104
|
+
cvm_role_flag = False
|
105
|
+
break
|
100
106
|
is_exist_profile = True
|
101
107
|
if not parsed_globals["profile"]:
|
102
108
|
is_exist_profile = False
|
@@ -127,6 +133,7 @@ def parse_global_arg(parsed_globals):
|
|
127
133
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
128
134
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
129
135
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
136
|
+
cvm_role_flag = False
|
130
137
|
|
131
138
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
132
139
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -134,6 +141,11 @@ def parse_global_arg(parsed_globals):
|
|
134
141
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
135
142
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
136
143
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
144
|
+
cvm_role_flag = False
|
145
|
+
|
146
|
+
if cvm_role_flag:
|
147
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
148
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
137
149
|
|
138
150
|
for param in g_param.keys():
|
139
151
|
if g_param[param] is None:
|
tccli/services/iir/iir_client.py
CHANGED
@@ -96,7 +96,13 @@ def action_caller():
|
|
96
96
|
|
97
97
|
def parse_global_arg(parsed_globals):
|
98
98
|
g_param = parsed_globals
|
99
|
-
|
99
|
+
cvm_role_flag = True
|
100
|
+
for param in parsed_globals.keys():
|
101
|
+
if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
|
102
|
+
OptionsDefine.RoleSessionName]:
|
103
|
+
if parsed_globals[param] is not None:
|
104
|
+
cvm_role_flag = False
|
105
|
+
break
|
100
106
|
is_exist_profile = True
|
101
107
|
if not parsed_globals["profile"]:
|
102
108
|
is_exist_profile = False
|
@@ -127,6 +133,7 @@ def parse_global_arg(parsed_globals):
|
|
127
133
|
cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
|
128
134
|
cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
|
129
135
|
cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
|
136
|
+
cvm_role_flag = False
|
130
137
|
|
131
138
|
if os.environ.get(OptionsDefine.ENV_REGION):
|
132
139
|
conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
|
@@ -134,6 +141,11 @@ def parse_global_arg(parsed_globals):
|
|
134
141
|
if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
|
135
142
|
cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
|
136
143
|
cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
|
144
|
+
cvm_role_flag = False
|
145
|
+
|
146
|
+
if cvm_role_flag:
|
147
|
+
if "type" in cred and cred["type"] == "cvm-role":
|
148
|
+
g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
|
137
149
|
|
138
150
|
for param in g_param.keys():
|
139
151
|
if g_param[param] is None:
|