@@ -46,8 +46,8 @@ def setup_kms(sub_test_name: str) -> None:
46
46
sub_test_target = sub_test_name
47
47
sub_test_type = ""
48
48
49
- assert sub_test_target in ["azure" , "kms" ]
50
- assert sub_test_type in ["" , "remote" , "fail" ]
49
+ assert sub_test_target in ["azure" , "gcp" ], sub_test_target
50
+ assert sub_test_type in ["" , "remote" , "fail" ], sub_test_type
51
51
success = sub_test_type != "fail"
52
52
53
53
if sub_test_target == "azure" :
@@ -64,18 +64,18 @@ def setup_kms(sub_test_name: str) -> None:
64
64
if sub_test_target == "azure" :
65
65
os .environ ["AZUREKMS_VMNAME_PREFIX" ] = "PYTHON_DRIVER"
66
66
67
- run_command (f"{ CSFLE_FOLDER } /{ sub_test_target } kms/setup-secrets.sh" )
68
- config = read_env (f"{ CSFLE_FOLDER } /{ sub_test_target } kms/secrets-export.sh" )
69
67
if success :
70
68
run_command (f"{ CSFLE_FOLDER } /{ sub_test_target } kms/setup.sh" )
71
69
create_archive ()
72
70
73
71
if sub_test_target == "azure" :
74
- setup_azure_vm (config )
72
+ setup_azure_vm ()
75
73
else :
76
- setup_gcp_vm (config )
74
+ setup_gcp_vm ()
77
75
78
76
if sub_test_target == "azure" :
77
+ run_command (f"{ CSFLE_FOLDER } /{ sub_test_target } kms/setup-secrets.sh" )
78
+ config = read_env (f"{ CSFLE_FOLDER } /{ sub_test_target } kms/secrets-export.sh" )
79
79
write_env ("KEY_NAME" , config ["AZUREKMS_KEYNAME" ])
80
80
write_env ("KEY_VAULT_ENDPOINT" , config ["AZUREKMS_KEYVAULTENDPOINT" ])
81
81
0 commit comments