Skip to content

Use arm template parameters as sole input for live test environment variables #25250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benbp merged 2 commits into from
Nov 15, 2021
Merged

Use arm template parameters as sole input for live test environment variables #25250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcfd50f
Use arm template parameters as sole input for live test environment v…
benbp Nov 10, 2021
1c2f4ca
Add missing storage endpoint suffix mappings in live test ARM templates
benbp Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/eventhub/Microsoft.Azure.EventHubs/tests/Infrastructure/TestConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ internal static class TestConstants
internal const string AuthorityHostEnvironmentVariableName = "AZURE_AUTHORITY_HOST";
internal const string ServiceManagementUrlEnvironmentVariableName = "SERVICE_MANAGEMENT_URL";
internal const string ResourceManagerEnvironmentVariableName = "RESOURCE_MANAGER_URL";
internal const string StorageEndpointSuffixEnvironmentVariableName = "STORAGE_ENDPOINT_SUFFIX";
internal const string StorageEndpointSuffixEnvironmentVariableName = "EVENTHUB_STORAGE_ENDPOINT_SUFFIX";
internal const string EventHubsNamespaceConnectionStringEnvironmentVariable = "EVENTHUB_NAMESPACE_CONNECTION_STRING";
internal const string StorageConnectionStringEnvironmentVariable = "EVENTHUB_PROCESSOR_STORAGE_CONNECTION_STRING";

// General
internal static readonly TimeSpan DefaultOperationTimeout = TimeSpan.FromSeconds(180);
}
}
}
6 changes: 5 additions & 1 deletion sdk/eventhub/test-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@
}
],
"outputs": {
"EVENTHUB_STORAGE_ENDPOINT_SUFFIX": {
"type": "string",
"value": "[parameters('storageEndpointSuffix')]"
},
"EVENTHUB_PER_TEST_LIMIT_MINUTES": {
"type": "string",
"value": "[parameters('perTestExecutionLimitMinutes')]"
Expand All @@ -189,4 +193,4 @@
"value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageAccount'), ';AccountKey=', listKeys(variables('storageAccountId'), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value, ';EndpointSuffix=', parameters('storageEndpointSuffix'))]"
}
}
}
}
24 changes: 23 additions & 1 deletion sdk/search/test-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@
"description": "The location of the resource. By default, this is the same as the resource group."
}
},
"searchEndpointSuffix": {
"type": "string",
"defaultValue": "search.windows.net",
"metadata": {
"description": "The url suffix to use when accessing the search data plane."
}
},
"storageEndpointSuffix": {
"type": "string",
"defaultValue": "core.windows.net",
"metadata": {
"description": "The url suffix to use when accessing the storage data plane."
}
},
"searchSku": {
"type": "string",
"defaultValue": "basic",
Expand Down Expand Up @@ -158,6 +172,14 @@
}
],
"outputs": {
"STORAGE_ENDPOINT_SUFFIX": {
"type": "string",
"value": "[parameters('storageEndpointSuffix')]"
},
"SEARCH_ENDPOINT_SUFFIX": {
"type": "string",
"value": "[parameters('searchEndpointSuffix')]"
},
"SEARCH_SERVICE_NAME": {
"type": "string",
"value": "[variables('searchServiceName')]"
Expand Down Expand Up @@ -188,4 +210,4 @@
"value": "[reference(variables('keyVaultName')).vaultUri]"
}
}
}
}
22 changes: 22 additions & 0 deletions sdk/tables/test-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@
"metadata": {
"description": "The principal to assign the role to. This is application object id."
}
},
"cosmosEndpointSuffix": {
"type": "string",
"defaultValue": "cosmos.azure.com",
"metadata": {
"description": "The url suffix to use when accessing the cosmos data plane."
}
},
"storageEndpointSuffix": {
"type": "string",
"defaultValue": "core.windows.net",
"metadata": {
"description": "The url suffix to use when accessing the storage data plane."
}
}
},
"variables": {
Expand Down Expand Up @@ -107,6 +121,14 @@
}
],
"outputs": {
"COSMOS_TABLES_ENDPOINT_SUFFIX": {
"type": "string",
"value": "[parameters('cosmosEndpointSuffix')]"
},
"STORAGE_ENDPOINT_SUFFIX": {
"type": "string",
"value": "[parameters('storageEndpointSuffix')]"
},
"TABLES_STORAGE_ACCOUNT_NAME": {
"type": "string",
"value": "[variables('primaryAccountName')]"
Expand Down