changes according to review comments

AzureArcForKubernetes · May 28, 2021 · 26e2a8e · 26e2a8e
1 parent ae49b99
commit 26e2a8e
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 5 deletions.
diff --git a/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py b/src/k8s-extension/azext_k8s_extension/partner_extensions/AzureMLKubernetes.py
@@ -66,7 +66,7 @@ def __init__(self):
         self.SERVICE_BUS_JOB_STATE_TOPIC = 'jobstate-updatedby-computeprovider'
         self.SERVICE_BUS_JOB_STATE_SUB = 'compute-scheduler-jobstate'
 
-        # constants for enableing SSL in inference
+        # constants for enabling SSL in inference
         self.sslKeyPemFile = 'sslKeyPemFile'
         self.sslCertPemFile = 'sslCertPemFile'
         self.allowInsecureConnections = 'allowInsecureConnections'

diff --git a/...ests/latest/data/cert_and_key_encoded.txt → ...st/data/azure_ml/cert_and_key_encoded.txt b/...ests/latest/data/cert_and_key_encoded.txt → ...st/data/azure_ml/cert_and_key_encoded.txt
diff --git a/...extension/tests/latest/data/test_cert.pem → .../tests/latest/data/azure_ml/test_cert.pem b/...extension/tests/latest/data/test_cert.pem → .../tests/latest/data/azure_ml/test_cert.pem
diff --git a/..._extension/tests/latest/data/test_key.pem → ...n/tests/latest/data/azure_ml/test_key.pem b/..._extension/tests/latest/data/test_key.pem → ...n/tests/latest/data/azure_ml/test_key.pem
diff --git a/src/k8s-extension/azext_k8s_extension/tests/latest/test_azureml_extension.py b/src/k8s-extension/azext_k8s_extension/tests/latest/test_azureml_extension.py
@@ -18,8 +18,8 @@ def test_set_up_inference_ssl(self):
         azremlk8sInstance = AzureMLKubernetes()
         config = {'allowInsecureConnections': 'false'}
         # read and encode dummy cert and key
-        sslKeyPemFile = os.path.join(TEST_DIR, 'data', 'test_key.pem')
-        sslCertPemFile = os.path.join(TEST_DIR, 'data', 'test_cert.pem')
+        sslKeyPemFile = os.path.join(TEST_DIR, 'data', 'azure_ml', 'test_key.pem')
+        sslCertPemFile = os.path.join(TEST_DIR, 'data', 'azure_ml', 'test_cert.pem')
         protected_config = {'sslKeyPemFile': sslKeyPemFile, 'sslCertPemFile': sslCertPemFile}
         azremlk8sInstance._AzureMLKubernetes__set_up_inference_ssl(config, protected_config)
         self.assertTrue('scoringFe.sslCert' in protected_config)

diff --git a/testing/test/extensions/data/test_cert.pem → ...st/extensions/data/azure_ml/test_cert.pem b/testing/test/extensions/data/test_cert.pem → ...st/extensions/data/azure_ml/test_cert.pem
diff --git a/testing/test/extensions/data/test_key.pem → ...est/extensions/data/azure_ml/test_key.pem b/testing/test/extensions/data/test_key.pem → ...est/extensions/data/azure_ml/test_key.pem
diff --git a/testing/test/extensions/public/AzureMLKubernetes.Tests.ps1 b/testing/test/extensions/public/AzureMLKubernetes.Tests.ps1
@@ -152,8 +152,8 @@ Describe 'AzureML Kubernetes Testing' {
     }
 
     It 'Creates the extension and checks that it onboards correctly with inference and SSL enabled' {
-        $sslKeyPemFile = Join-Path (Join-Path (Split-Path $PSScriptRoot -Parent) "data") "test_key.pem"
-        $sslCertPemFile = Join-Path (Join-Path (Split-Path $PSScriptRoot -Parent) "data") "test_cert.pem"
+        $sslKeyPemFile = Join-Path (Join-Path (Join-Path (Split-Path $PSScriptRoot -Parent) "data") "azure_ml") "test_key.pem"
+        $sslCertPemFile = Join-Path (Join-Path (Join-Path (Split-Path $PSScriptRoot -Parent) "data") "azure_ml") "test_cert.pem"
         Invoke-Expression "az $Env:K8sExtensionName create -c $($ENVCONFIG.arcClusterName) -g $($ENVCONFIG.resourceGroup) --cluster-type connectedClusters --extension-type $extensionType -n $extensionName --release-train staging --config enableInference=true identity.proxy.remoteEnabled=True identity.proxy.remoteHost=https://master.experiments.azureml-test.net experimental=True --config-protected sslKeyPemFile=$sslKeyPemFile sslCertPemFile=$sslCertPemFile" -ErrorVariable badOut
         $badOut | Should -BeNullOrEmpty