{AppConfig} Fix bug in print preview of restore command (#17344)

* Fix bug in print preview of restore command * Add AAD test recording to cred scan suppression
Azure · Mar 29, 2021 · 7a5538f · 7a5538f
1 parent 44e1af8
commit 7a5538f
Show file tree

Hide file tree

Showing 18 changed files with 10,592 additions and 8,976 deletions.
diff --git a/scripts/ci/credscan/CredScanSuppressions.json b/scripts/ci/credscan/CredScanSuppressions.json
@@ -12,6 +12,7 @@
     {
       "file": [
         "src\\azure-cli\\azure\\cli\\command_modules\\appconfig\\tests\\latest\\recordings\\test_appconfig_to_appconfig_import_export.yaml",
+        "src\\azure-cli\\azure\\cli\\command_modules\\appconfig\\tests\\latest\\recordings\\test_azconfig_aad_auth.yaml",
         "src\\azure-cli\\azure\\cli\\command_modules\\appconfig\\tests\\latest\\recordings\\test_azconfig_credential.yaml",
         "src\\azure-cli\\azure\\cli\\command_modules\\appconfig\\tests\\latest\\recordings\\test_azconfig_feature.yaml",
         "src\\azure-cli\\azure\\cli\\command_modules\\appconfig\\tests\\latest\\recordings\\test_azconfig_feature_filter.yaml",

diff --git a/src/azure-cli/azure/cli/command_modules/appconfig/_kv_helpers.py b/src/azure-cli/azure/cli/command_modules/appconfig/_kv_helpers.py
@@ -541,7 +541,7 @@ def __serialize_kv_list_to_comparable_json_list(keyvalues):
         kv_json = {'key': kv.key,
                    'value': kv.value,
                    'label': kv.label,
-                   'locked': kv.read_only,
+                   'locked': kv.locked,
                    'last modified': kv.last_modified,
                    'content type': kv.content_type}
         # tags

diff --git a/src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/export_features_prop.json b/src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/export_features_prop.json
@@ -1,4 +1,4 @@
-#Fri Mar 12 15:17:32 China Standard Time 2021
+#Tue Mar 16 18:28:38 Pacific Daylight Time 2021
 Color=Red
 Region=West US
 feature-management.FalseFeature=false

diff --git a/src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/export_keyvault.json b/src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/export_keyvault.json
@@ -0,0 +1,3 @@
+{
+  "testSecret": "testValue"
+}
diff --git a/..._modules/appconfig/tests/latest/recordings/test_appconfig_to_appconfig_import_export.yaml b/..._modules/appconfig/tests/latest/recordings/test_appconfig_to_appconfig_import_export.yaml
diff --git a/...i/azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_aad_auth.yaml b/...i/azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_aad_auth.yaml
diff --git a/...azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_credential.yaml b/...azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_credential.yaml
diff --git a/...li/azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_feature.yaml b/...li/azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_feature.yaml
diff --git a/...e/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_feature_filter.yaml b/...e/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_feature_filter.yaml
diff --git a/...i/azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_identity.yaml b/...i/azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_identity.yaml
diff --git a/...re/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_import_export.yaml b/...re/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_import_export.yaml
diff --git a/...les/appconfig/tests/latest/recordings/test_azconfig_import_export_naming_conventions.yaml b/...les/appconfig/tests/latest/recordings/test_azconfig_import_export_naming_conventions.yaml
diff --git a/...li/command_modules/appconfig/tests/latest/recordings/test_azconfig_json_content_type.yaml b/...li/command_modules/appconfig/tests/latest/recordings/test_azconfig_json_content_type.yaml
diff --git a/...e/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_key_validation.yaml b/...e/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_key_validation.yaml
diff --git a/...ure-cli/azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_kv.yaml b/...ure-cli/azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_kv.yaml
diff --git a/...e-cli/azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_mgmt.yaml b/...e-cli/azure/cli/command_modules/appconfig/tests/latest/recordings/test_azconfig_mgmt.yaml
diff --git a/...ommand_modules/appconfig/tests/latest/recordings/test_azconfig_public_network_access.yaml b/...ommand_modules/appconfig/tests/latest/recordings/test_azconfig_public_network_access.yaml
diff --git a/...li/azure/cli/command_modules/appconfig/tests/latest/recordings/test_resolve_keyvault.yaml b/...li/azure/cli/command_modules/appconfig/tests/latest/recordings/test_resolve_keyvault.yaml