Skip to content

Commit 8df7e35

Browse files
author
Mikolaj Umanski
committed
fix: remove incorrect const
1 parent 9f1ab80 commit 8df7e35

4 files changed

Lines changed: 26 additions & 25 deletions

File tree

src/azure-cli/azure/cli/command_modules/acs/_consts.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -206,24 +206,6 @@
206206
CONST_PRIVATE_DNS_ZONE_CONTRIBUTOR_ROLE = "Private DNS Zone Contributor"
207207
CONST_DNS_ZONE_CONTRIBUTOR_ROLE = "DNS Zone Contributor"
208208

209-
CONST_CUSTOM_CA_TEST_CERT = '-----BEGIN CERTIFICATE-----\n' \
210-
'MIICljCCAX4CCQC9zUAgqqqrWzANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJQ\n' \
211-
'TDAeFw0yMjA5MTQwNjIzMjdaFw0yMjA5MTUwNjIzMjdaMA0xCzAJBgNVBAYTAlBM\n' \
212-
'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAopKNIIbvvcPCw9fc4KLX\n' \
213-
'KDtRZobp5L+/1hCN+3OGhk5NvSTpSUrFifxqc0o3IF7YkO3K1n2jAvCMXO16Bf9b\n' \
214-
'OAR7VkCrwGFVkXNjM4wvXAX8CNNvjqd1zDPXSKdE7Wd8k3fTzx6nGUM0UgljIPhH\n' \
215-
'yh4a4Zujd5Ig2P/ZSX0pGJm47JTtMu7MDFHVM5wRWcCrN/H0TCYPIvEOs0B8AZxc\n' \
216-
'p3TF7A6veT5U9pVhQ3Xl9JN6LvvLqPxG3ea10rdv9DYzaiXmSY3ujI3Ri1Q11uWC\n' \
217-
'dtrFIpFu5cHW2OBW+jBXxL0v8xQmkxTLik4BR/PLCl30wxKQNsq3pjDgu0mutKuu\n' \
218-
'5wIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAVEAIs/hLwTVCwpEXdoXR24LelNNuB\n' \
219-
'/8ptK6lyjE11XwfMN3yy7F2oB1lrA4rI3j9obpDsHDJBNB13bi/lKgvAcbIn/Tyu\n' \
220-
'RKThtUdPgxNnqDUyxnb3OofMF3gB8ePTu+jZpd3zrlEuxdl40ByATCSyOgR6DHMt\n' \
221-
'SDd+joypnOHFAeSM+V0AaTelXSCK9OAWSAp5e6S76a6lRx+D5Xl3hBedBI0tX59h\n' \
222-
'tEYNEGZaRElFU79WcEF0cH+ZW0+jJ95xE3thZffRz6QI6yF63m8aC9l9bbdJS2zg\n' \
223-
'Yv8W+lCZi//ODeOBUugr++z9uj+vGk47JDSpV0n4JOun3ALUDJ0gqmcS\n' \
224-
'-----END CERTIFICATE-----'
225-
226-
227209
# consts for decorator pattern
228210
class DecoratorMode(Enum):
229211
"""Enumerations used to distinguish whether to handle creation or update.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# --------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# --------------------------------------------------------------------------------------------
5+
6+
CUSTOM_CA_TEST_CERT_STR = '-----BEGIN CERTIFICATE-----\n' \
7+
'MIICljCCAX4CCQC9zUAgqqqrWzANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJQ\n' \
8+
'TDAeFw0yMjA5MTQwNjIzMjdaFw0yMjA5MTUwNjIzMjdaMA0xCzAJBgNVBAYTAlBM\n' \
9+
'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAopKNIIbvvcPCw9fc4KLX\n' \
10+
'KDtRZobp5L+/1hCN+3OGhk5NvSTpSUrFifxqc0o3IF7YkO3K1n2jAvCMXO16Bf9b\n' \
11+
'OAR7VkCrwGFVkXNjM4wvXAX8CNNvjqd1zDPXSKdE7Wd8k3fTzx6nGUM0UgljIPhH\n' \
12+
'yh4a4Zujd5Ig2P/ZSX0pGJm47JTtMu7MDFHVM5wRWcCrN/H0TCYPIvEOs0B8AZxc\n' \
13+
'p3TF7A6veT5U9pVhQ3Xl9JN6LvvLqPxG3ea10rdv9DYzaiXmSY3ujI3Ri1Q11uWC\n' \
14+
'dtrFIpFu5cHW2OBW+jBXxL0v8xQmkxTLik4BR/PLCl30wxKQNsq3pjDgu0mutKuu\n' \
15+
'5wIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAVEAIs/hLwTVCwpEXdoXR24LelNNuB\n' \
16+
'/8ptK6lyjE11XwfMN3yy7F2oB1lrA4rI3j9obpDsHDJBNB13bi/lKgvAcbIn/Tyu\n' \
17+
'RKThtUdPgxNnqDUyxnb3OofMF3gB8ePTu+jZpd3zrlEuxdl40ByATCSyOgR6DHMt\n' \
18+
'SDd+joypnOHFAeSM+V0AaTelXSCK9OAWSAp5e6S76a6lRx+D5Xl3hBedBI0tX59h\n' \
19+
'tEYNEGZaRElFU79WcEF0cH+ZW0+jJ95xE3thZffRz6QI6yF63m8aC9l9bbdJS2zg\n' \
20+
'Yv8W+lCZi//ODeOBUugr++z9uj+vGk47JDSpV0n4JOun3ALUDJ0gqmcS\n' \
21+
'-----END CERTIFICATE-----'

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@
2121
sort_asm_revisions,
2222
use_shared_identity,
2323
)
24-
from azure.cli.command_modules.acs._consts import (
25-
CONST_CUSTOM_CA_TEST_CERT,
26-
)
2724
from azure.cli.command_modules.acs.tests.latest.custom_preparers import (
2825
AKSCustomResourceGroupPreparer, AKSCustomRoleBasedServicePrincipalPreparer,
2926
AKSCustomVirtualNetworkPreparer)
27+
from azure.cli.command_modules.acs.tests.latest.data.certs import CUSTOM_CA_TEST_CERT_STR
3028
from azure.cli.command_modules.acs.tests.latest.recording_processors import \
3129
KeyReplacer
3230
from azure.cli.command_modules.acs.tests.latest.utils import get_test_data_file_path
@@ -12033,7 +12031,7 @@ def test_aks_create_add_nodepool_with_custom_ca_trust_certificates(self, resourc
1203312031
'--custom-ca-trust-certificates={custom_ca_trust_certificates}'
1203412032
self.cmd(create_cmd, checks=[
1203512033
self.check('provisioningState', 'Succeeded'),
12036-
self.check('securityProfile.customCaTrustCertificates', [CONST_CUSTOM_CA_TEST_CERT for _ in range(2)]),
12034+
self.check('securityProfile.customCaTrustCertificates', [CUSTOM_CA_TEST_CERT_STR for _ in range(2)]),
1203712035
])
1203812036

1203912037
# delete

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_managed_cluster_decorator.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
CONST_AZURE_SERVICE_MESH_UPGRADE_COMMAND_COMPLETE,
5050
CONST_AZURE_SERVICE_MESH_UPGRADE_COMMAND_ROLLBACK,
5151
CONST_AZURE_SERVICE_MESH_MODE_DISABLED,
52-
CONST_CUSTOM_CA_TEST_CERT
5352
)
5453
from azure.cli.command_modules.acs.agentpool_decorator import AKSAgentPoolContext, AKSAgentPoolParamDict
5554
from azure.cli.command_modules.acs.managed_cluster_decorator import (
@@ -59,6 +58,7 @@
5958
AKSManagedClusterParamDict,
6059
AKSManagedClusterUpdateDecorator,
6160
)
61+
from azure.cli.command_modules.acs.tests.latest.data.certs import CUSTOM_CA_TEST_CERT_STR
6262
from azure.cli.command_modules.acs.tests.latest.mocks import (
6363
MockCLI,
6464
MockClient,
@@ -11591,7 +11591,7 @@ def test_set_up_custom_ca_trust_certificates(self):
1159111591
dec_1.context.attach_mc(mc_1)
1159211592
dec_mc_1 = dec_1.set_up_custom_ca_trust_certificates(mc_1)
1159311593
sec_profile = self.models.ManagedClusterSecurityProfile(
11594-
custom_ca_trust_certificates=[str.encode(CONST_CUSTOM_CA_TEST_CERT) for _ in range(2)]
11594+
custom_ca_trust_certificates=[str.encode(CUSTOM_CA_TEST_CERT_STR) for _ in range(2)]
1159511595
)
1159611596
ground_truth_mc_1 = self.models.ManagedCluster(location="test_location", security_profile=sec_profile)
1159711597
self.assertEqual(dec_mc_1, ground_truth_mc_1)
@@ -11844,7 +11844,7 @@ def test_update_custom_ca_certificates(self):
1184411844
ground_truth_mc_1 = self.models.ManagedCluster(
1184511845
location="test_location",
1184611846
security_profile=self.models.ManagedClusterSecurityProfile(
11847-
custom_ca_trust_certificates=[str.encode(CONST_CUSTOM_CA_TEST_CERT) for _ in range(2)]
11847+
custom_ca_trust_certificates=[str.encode(CUSTOM_CA_TEST_CERT_STR) for _ in range(2)]
1184811848
),
1184911849
)
1185011850
self.assertEqual(dec_mc_1, ground_truth_mc_1)

0 commit comments

Comments
 (0)