Skip to content

Instantly share code, notes, and snippets.

@jayunit100
Created August 26, 2020 21:25
Show Gist options
  • Save jayunit100/a0ae30a0fbab09b12931b82eb48a721d to your computer and use it in GitHub Desktop.
Save jayunit100/a0ae30a0fbab09b12931b82eb48a721d to your computer and use it in GitHub Desktop.
commit 2597df1a71dc27a0d491e36e478ccc29a60d47dd
Author: jay vyas <[email protected]>
Date: Wed Aug 26 17:10:44 2020 -0400
AZURE_CLIENT_SECRET
diff --git a/release-pipelines/install-pipelines/azure.gvy b/release-pipelines/install-pipelines/azure.gvy
index 1a98a4b..d9c7a22 100644
--- a/release-pipelines/install-pipelines/azure.gvy
+++ b/release-pipelines/install-pipelines/azure.gvy
@@ -9,7 +9,7 @@ installPipeline(
string(name: 'AZURE_SUBSCRIPTION_ID', description: 'Subscription ID', defaultValue: ''),
string(name: 'AZURE_TENANT_ID', description: 'Tenant ID', defaultValue: ''),
string(name: 'AZURE_CLIENT_ID', description: 'Client ID', defaultValue: ''),
- string(name: 'AZURE_CLIENT_PASSWORD', description: 'Client Password', defaultValue: ''),
+ string(name: 'AZURE_CLIENT_SECRET', description: 'Client Password/Secret', defaultValue: ''),
string(name: 'AZURE_LOCATION', description: 'Region to create clusters in', defaultValue: 'westus'),
],
extraEnvironments: [],
@@ -17,7 +17,7 @@ installPipeline(
"AZURE_SUBSCRIPTION_ID",
"AZURE_TENANT_ID",
"AZURE_CLIENT_ID",
- "AZURE_CLIENT_PASSWORD",
+ "AZURE_CLIENT_SECRET",
"AZURE_LOCATION",
]
)
\ No newline at end of file
diff --git a/tests/lib/testbed/azure.py b/tests/lib/testbed/azure.py
index 2f08290..c044918 100644
--- a/tests/lib/testbed/azure.py
+++ b/tests/lib/testbed/azure.py
@@ -68,15 +68,15 @@ class AzureTestbed(Testbed):
def _build_azure_env(self):
"""Build env vars for ec2"""
- self.breadcrumb("Checking Azure environment Var input sanity")
- for i in ["AZURE_SUBSCRIPTION_ID", "AZURE_TENANT_ID", "AZURE_CLIENT_ID", "AZURE_CLIENT_PASSWORD"]:
+ self.breadcrumb("Checking Azure environment Var input sanity of input vars...")
+ for i in ["AZURE_SUBSCRIPTION_ID", "AZURE_TENANT_ID", "AZURE_CLIENT_ID", "AZURE_CLIENT_SECRET"]:
assert os.environ[i]
env = {
"AZURE_SUBSCRIPTION_ID": os.environ["AZURE_SUBSCRIPTION_ID"],
"AZURE_TENANT_ID": os.environ["AZURE_TENANT_ID"],
"AZURE_CLIENT_ID": os.environ["AZURE_CLIENT_ID"],
- "AZURE_CLIENT_PASSWORD": os.environ["AZURE_CLIENT_PASSWORD"],
+ "AZURE_CLIENT_SECRET": os.environ["AZURE_CLIENT_SECRET"],
"AZURE_LOCATION": os.environ["AZURE_LOCATION"],
"AZURE_CONTROL_PLANE_MACHINE_TYPE": "Standard_D2s_v3",
"AZURE_NODE_MACHINE_TYPE": "Standard_D2s_v3",
@@ -85,7 +85,7 @@ class AzureTestbed(Testbed):
**env,
"AZURE_CLIENT_ID_B64": base64It(env["AZURE_CLIENT_ID"]),
"AZURE_TENANT_ID_B64": base64It(env["AZURE_TENANT_ID"]),
- "AZURE_CLIENT_SECRET_B64": base64It(env["AZURE_CLIENT_PASSWORD"]),
+ "AZURE_CLIENT_SECRET_B64": base64It(env["AZURE_CLIENT_SECRET"]),
"AZURE_SUBSCRIPTION_ID_B64": base64It(env["AZURE_SUBSCRIPTION_ID"])
}
logging.info(f"env: {env}")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment