github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added azure_test resources to test-resources.json (#4858)

Browse Source 
* Added azure_test resources to test-resources.json

* Add RBAC roles to created eventhubs instances

* Eventhubs samples read from the start of the partition, not the end.
This commit is contained in:
Larry Osterman 2023-08-08 16:29:56 -07:00 committed by GitHub
parent 15a8a7b0da
commit 4d580a7fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 201 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events.cpp
View File

@ -43,8 +43,15 @@ int main()
auto partitionProperties{
consumerClient.GetPartitionProperties(eventhubProperties.PartitionIds[0])};
Azure::Messaging::EventHubs::PartitionClient partitionClient{
consumerClient.CreatePartitionClient(eventhubProperties.PartitionIds[0])};
// Create a PartitionClient that we can use to read events from a specific partition.
//
// This partition client is configured to read events from the start of the partition, since the
// default is to read new events only.
Azure::Messaging::EventHubs::PartitionClientOptions partitionClientOptions;
partitionClientOptions.StartPosition.Earliest = true;
partitionClientOptions.StartPosition.Inclusive = true;
Azure::Messaging::EventHubs::PartitionClient partitionClient{consumerClient.CreatePartitionClient(
eventhubProperties.PartitionIds[0], partitionClientOptions)};
std::vector<Azure::Messaging::EventHubs::Models::ReceivedEventData> events
= partitionClient.ReceiveEvents(4);

13
sdk/eventhubs/azure-messaging-eventhubs/samples/consume-events/consume_events_aad.cpp
View File

@ -52,8 +52,17 @@ int main()
auto partitionProperties{
consumerClient.GetPartitionProperties(eventhubProperties.PartitionIds[0])};
Azure::Messaging::EventHubs::PartitionClient partitionClient{
consumerClient.CreatePartitionClient(eventhubProperties.PartitionIds[0])};
// Create a PartitionClient that we can use to read events from a specific partition (in this
// case, the first partition).
//
// This partition client is configured to read events from the start of the partition, since the
// default is to read new events only.
Azure::Messaging::EventHubs::PartitionClientOptions partitionClientOptions;
partitionClientOptions.StartPosition.Earliest = true;
partitionClientOptions.StartPosition.Inclusive = true;
Azure::Messaging::EventHubs::PartitionClient partitionClient{consumerClient.CreatePartitionClient(
eventhubProperties.PartitionIds[0], partitionClientOptions)};
std::vector<Azure::Messaging::EventHubs::Models::ReceivedEventData> events
= partitionClient.ReceiveEvents(4);

16
sdk/eventhubs/azure-messaging-eventhubs/test-resources-post.ps1 Normal file
View File

@ -0,0 +1,16 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
# The purpose of this script is to add a small delay between the creation of the live test resources
# and the execution of the live tests. This allows RBAC to replicate and avoids flakiness in the first set
# of live tests that might otherwise start running before RBAC has replicated.
param (
[hashtable] $DeploymentOutputs,
[string] $TenantId,
[string] $TestApplicationId,
[string] $TestApplicationSecret
)
Write-Verbose "Sleeping for 60 seconds to let RBAC replicate"
Start-Sleep -s 60

222
sdk/eventhubs/azure-messaging-eventhubs/test-resources.json
View File

@ -1,5 +1,5 @@
{
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"baseName": {
@ -9,70 +9,112 @@
"description": "The base resource name."
}
},
"subscriptionId": {
"type": "string",
"defaultValue": "[subscription().subscriptionId]",
"metadata": {
"description": "The subscription ID to which the application and resources belong."
}
},
"tenantId": {
"type": "string",
"defaultValue": "[subscription().tenantId]",
"metadata": {
"description": "The tenant ID to which the application and resources belong."
}
},
"testApplicationOid": {
"type": "string",
"metadata": {
"description": "The client OID to grant access to test resources."
}
},
"testApplicationId": {
"type": "string",
"metadata": {
"description": "The application client ID used to run tests."
}
},
"testApplicationSecret": {
"type": "string",
"metadata": {
"description": "The application client secret used to run tests."
}
},
"location": {
"type": "string",
"defaultValue": "[resourceGroup().location]",
"metadata": {
"description": "The location of the resources. By default, this is the same as the resource group."
}
},
"storageEndpointSuffix": {
"type": "string",
"defaultValue": "core.windows.net",
"metadata": {
"description": "Storage endpoint suffix. The default value uses Azure Public Cloud (core.windows.net)"
"description": "The url suffix to use when creating storage connection strings."
}
},
"perTestExecutionLimitMinutes": {
"type": "string",
"defaultValue": "15",
"metadata": {
"description": "The maximum duration, in minutes, that a single test is permitted to run before it is considered at-risk for being hung."
}
}
},
"variables": {
"apiVersion": "2017-04-01",
"storageApiVersion": "2019-04-01",
"iotApiVersion": "2018-04-01",
"namespaceName": "[parameters('baseName')]",
"storageAccountName": "[concat('storage', parameters('baseName'))]",
"containerName": "container",
"authorizationName": "[concat(parameters('baseName'), '/RootManageSharedAccessKey')]",
"eventHubName": "eventhub",
"eventHubNameFull": "[concat(parameters('baseName'), '/eventhub')]",
"location": "[resourceGroup().location]"
"eventHubName": "eventHub",
"contributorRoleId": "b24988ac-6180-42a0-ab88-20f7382dd24c",
"eventHubsDataOwnerRoleId": "f526a384-b230-433a-b45c-95f59c4a2dec",
"storageDataOwnerRoleId": "b7e6dc6d-f1e8-4753-8033-0f276bb0955b",
"eventHubsNamespace": "[concat('eh-', parameters('baseName'))]",
"storageAccount": "[concat('blb', parameters('baseName'))]",
"defaultSASKeyName": "RootManageSharedAccessKey",
"eventHubsAuthRuleResourceId": "[resourceId('Microsoft.EventHub/namespaces/authorizationRules', variables('eventHubsNamespace'), variables('defaultSASKeyName'))]",
"storageAccountId": "[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccount'))]",
"authorizationName": "[concat(variables('eventHubsNamespace'), '/RootManageSharedAccessKey')]"
},
"resources": [
{
"type": "Microsoft.EventHub/namespaces",
"type": "Microsoft.EventHub/Namespaces",
"apiVersion": "[variables('apiVersion')]",
"name": "[variables('namespaceName')]",
"location": "[variables('location')]",
"name": "[variables('eventHubsNamespace')]",
"location": "[parameters('location')]",
"sku": {
"name": "Standard",
"tier": "Standard",
"capacity": 5
},
"properties": {
"zoneRedundant": false,
"isAutoInflateEnabled": false,
"maximumThroughputUnits": 0
}
},
{
"type": "Microsoft.EventHub/namespaces/AuthorizationRules",
"type": "Microsoft.EventHub/Namespaces/AuthorizationRules",
"apiVersion": "[variables('apiVersion')]",
"name": "[variables('authorizationName')]",
"location": "[variables('location')]",
"dependsOn": ["[resourceId('Microsoft.EventHub/namespaces', variables('namespaceName'))]"],
"location": "[parameters('location')]",
"dependsOn": [ "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespace'))]" ],
"properties": {
"rights": ["Listen", "Manage", "Send"]
"rights": [ "Listen", "Manage", "Send" ]
}
},
{
"type": "Microsoft.EventHub/namespaces/eventhubs",
"type": "Microsoft.EventHub/Namespaces/EventHubs",
"apiVersion": "[variables('apiVersion')]",
"name": "[variables('eventHubNameFull')]",
"location": "[variables('location')]",
"dependsOn": ["[resourceId('Microsoft.EventHub/namespaces', variables('namespaceName'))]"],
"name": "[concat(variables('eventHubsNamespace'), '/', variables('eventHubName'))]",
"location": "[parameters('location')]",
"dependsOn": [ "[resourceId('Microsoft.EventHub/Namespaces', variables('eventHubsNamespace'))]" ],
"properties": {
"messageRetentionInDays": 1,
"partitionCount": 4
}
},
{
"type": "Microsoft.EventHub/namespaces/networkRuleSets",
"type": "Microsoft.EventHub/Namespaces/NetworkRuleSets",
"apiVersion": "[variables('apiVersion')]",
"name": "[concat(variables('namespaceName'), '/default')]",
"location": "[variables('location')]",
"dependsOn": ["[resourceId('Microsoft.EventHub/namespaces', variables('namespaceName'))]"],
"name": "[concat(variables('eventHubsNamespace'), '/default')]",
"location": "[parameters('location')]",
"dependsOn": [ "[resourceId('Microsoft.EventHub/Namespaces', variables('eventHubsNamespace'))]" ],
"properties": {
"defaultAction": "Deny",
"virtualNetworkRules": [],
@ -80,26 +122,26 @@
}
},
{
"type": "Microsoft.EventHub/namespaces/eventhubs/consumergroups",
"type": "Microsoft.EventHub/Namespaces/EventHubs/ConsumerGroups",
"apiVersion": "[variables('apiVersion')]",
"name": "[concat(variables('eventHubNameFull'), '/$Default')]",
"location": "[variables('location')]",
"name": "[concat(variables('eventHubsNamespace'), '/', variables('eventHubName'), '/$Default')]",
"location": "[parameters('location')]",
"dependsOn": [
"[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('namespaceName'), variables('eventHubName'))]",
"[resourceId('Microsoft.EventHub/namespaces', variables('namespaceName'))]"
"[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespace'), variables('eventHubName'))]",
"[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespace'))]"
],
"properties": {}
},
{
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "[variables('storageApiVersion')]",
"name": "[variables('storageAccountName')]",
"location": "[resourceGroup().location]",
"apiVersion": "2019-04-01",
"name": "[variables('storageAccount')]",
"location": "[parameters('location')]",
"sku": {
"name": "Standard_RAGRS",
"name": "Standard_LRS",
"tier": "Standard"
},
"kind": "StorageV2",
"kind": "BlobStorage",
"properties": {
"networkAcls": {
"bypass": "AzureServices",
@ -120,16 +162,66 @@
"keySource": "Microsoft.Storage"
},
"accessTier": "Hot"
},
"resources": [
{
"name": "[concat('default/', variables('containerName'))]",
"type": "blobServices/containers",
"apiVersion": "[variables('storageApiVersion')]",
"dependsOn": ["[variables('storageAccountName')]"]
}
]
}
},
{
"type": "Microsoft.Storage/storageAccounts/blobServices",
"apiVersion": "2019-04-01",
"name": "[concat(variables('storageAccount'), '/default')]",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccount'))]"
],
"properties": {
"cors": {
"corsRules": []
},
"deleteRetentionPolicy": {
"enabled": false
}
}
},
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2019-04-01-preview",
"name": "[guid(resourceGroup().id, parameters('testApplicationOid'), variables('eventHubsDataOwnerRoleId'))]",
"dependsOn": [
"[resourceId('Microsoft.EventHub/Namespaces', variables('eventHubsNamespace'))]",
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccount'))]"
],
"properties": {
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('eventHubsDataOwnerRoleId'))]",
"principalId": "[parameters('testApplicationOid')]",
"scope": "[resourceGroup().id]"
}
},
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2019-04-01-preview",
"name": "[guid(resourceGroup().id, parameters('testApplicationOid'), variables('contributorRoleId'))]",
"dependsOn": [
"[resourceId('Microsoft.EventHub/Namespaces', variables('eventHubsNamespace'))]",
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccount'))]"
],
"properties": {
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('contributorRoleId'))]",
"principalId": "[parameters('testApplicationOid')]",
"scope": "[resourceGroup().id]"
}
},
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2019-04-01-preview",
"name": "[guid(resourceGroup().id, parameters('testApplicationOid'), variables('storageDataOwnerRoleId'))]",
"dependsOn": [
"[resourceId('Microsoft.EventHub/Namespaces', variables('eventHubsNamespace'))]",
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccount'))]"
],
"properties": {
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('storageDataOwnerRoleId'))]",
"principalId": "[parameters('testApplicationOid')]",
"scope": "[resourceGroup().id]"
}
}
],
"outputs": {
"EVENTHUB_NAME": {
@ -138,23 +230,39 @@
},
"EVENTHUBS_HOST": {
"type": "string",
"value": "[concat(parameters('baseName'), '.servicebus.windows.net')]"
"value": "[concat(variables('eventHubsNamespace'), '.servicebus.windows.net')]"
},
"EVENTHUB_STORAGE_ENDPOINT_SUFFIX": {
"type": "string",
"value": "[parameters('storageEndpointSuffix')]"
},
"EVENTHUB_PER_TEST_LIMIT_MINUTES": {
"type": "string",
"value": "[parameters('perTestExecutionLimitMinutes')]"
},
"EVENTHUB_CONNECTION_STRING": {
"type": "string",
"value": "[listKeys(resourceId('Microsoft.EventHub/namespaces/authorizationRules', variables('namespaceName'), 'RootManageSharedAccessKey'), variables('apiVersion')).primaryConnectionString]"
"value": "[listkeys(variables('eventHubsAuthRuleResourceId'), '2015-08-01').primaryConnectionString]"
},
"CHECKPOINTSTORE_STORAGE_CONNECTION_STRING": {
"type": "string",
"value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageAccountName'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), variables('storageApiVersion')).keys[0].value, ';EndpointSuffix=', parameters('storageEndpointSuffix'))]"
},
"RESOURCE_GROUP": {
"type": "string",
"value": "[resourceGroup().name]"
"value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageAccount'), ';AccountKey=', listKeys(variables('storageAccountId'), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value, ';EndpointSuffix=', parameters('storageEndpointSuffix'))]"
},
"AZURE_SUBSCRIPTION_ID": {
"type": "string",
"value": "[subscription().subscriptionId]"
},
"AZURE_TENANT_ID": {
"type": "string",
"value": "[parameters('tenantId')]"
},
"AZURE_CLIENT_ID": {
"type": "string",
"value": "[parameters('testApplicationId')]"
},
"AZURE_CLIENT_SECRET": {
"type": "string",
"value": "[parameters('testApplicationSecret')]"
}
}
}