-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Upgrade Sinks api for eventhub/servicebus IT case #20343
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.
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
saragluna
merged 12 commits into
Azure:master
from
moarychan:feature/upgrade-reactor-api-for-eventhub-servicebus-it-case
Apr 12, 2021
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
b8d20be
update package to com.azure.spring.test.eventhubs
def9a1e
Upgrade to Sinks api to emit message
a091a42
Add timeout process for eventhub IT test case
82d13c6
fix bugs
45431e5
Merge branch 'master'
2a4ad55
Add eventhub and container(storage) resources to each IT class to test
5a061ff
Merge branch 'master' of github.com:Azure/azure-sdk-for-java into fea…
c772e5a
Specify subscription id for kafka sample
b24dba7
Use system default variables for kafka sample configuration; update r…
9a9fb37
Customize the variables for kafka sample resource file; use different…
6b050c7
Ensure name and value of each environment variable are isolated witho…
d055e50
fix bug
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 0 additions & 18 deletions
18
...azure-spring-cloud-sample-eventhubs-binder/src/test/resources/application-test.properties
This file was deleted.
Oops, something went wrong.
27 changes: 27 additions & 0 deletions
27
...ot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/resources/application.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| spring: | ||
| main: | ||
| banner-mode: off | ||
| cloud: | ||
| azure: | ||
| eventhub: | ||
| connection-string: ${EVENTHUB_CONNECTION_STRING_BINDER} | ||
| checkpoint-storage-account: ${STORAGE_ACCOUNT_BINDER} | ||
| checkpoint-access-key: ${STORAGE_ACCOUNT_KEY_BINDER} | ||
| checkpoint-container: binder-test | ||
| stream: | ||
| function: | ||
| definition: consume;supply | ||
| bindings: | ||
| consume-in-0: | ||
| destination: binder-test | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we should think about how to name this destination |
||
| group: $Default | ||
| supply-out-0: | ||
| destination: binder-test | ||
| eventhub: | ||
| bindings: | ||
| consume-in-0: | ||
| consumer: | ||
| checkpoint-mode: MANUAL | ||
| default: | ||
| producer: | ||
| errorChannelEnabled: true | ||
192 changes: 192 additions & 0 deletions
192
.../azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/test-resources.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,192 @@ | ||
| { | ||
| "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", | ||
| "contentVersion": "1.0.0.0", | ||
| "parameters": { | ||
| "baseName": { | ||
| "defaultValue": "[resourceGroup().name]", | ||
| "type": "String" | ||
| }, | ||
| "storageNamePrefix": { | ||
| "defaultValue": "[substring(uniqueString(parameters('baseName')), 0, 11)]", | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "functions": [], | ||
| "variables": { | ||
| "eventHubsNamespaceName": "[concat(parameters('baseName'),'-binder-eventhub')]", | ||
| "eventHubsNamespaceKeyName": "RootManageSharedAccessKey", | ||
| "storageAccountName": "[concat(substring(toLower(concat(parameters('storageNamePrefix'), uniqueString(resourceGroup().id), 'binder')), 0, 18), 'binder')]", | ||
| "location": "[resourceGroup().location]" | ||
| }, | ||
| "resources": [ | ||
| { | ||
| "type": "Microsoft.EventHub/namespaces", | ||
| "apiVersion": "2018-01-01-preview", | ||
| "name": "[variables('eventHubsNamespaceName')]", | ||
| "location": "[variables('location')]", | ||
| "sku": { | ||
| "name": "Standard", | ||
| "tier": "Standard", | ||
| "capacity": 1 | ||
| }, | ||
| "properties": { | ||
| "zoneRedundant": false, | ||
| "isAutoInflateEnabled": false, | ||
| "maximumThroughputUnits": 0, | ||
| "kafkaEnabled": true | ||
| } | ||
| }, | ||
| { | ||
| "type": "Microsoft.EventHub/namespaces/AuthorizationRules", | ||
| "apiVersion": "2017-04-01", | ||
| "name": "[concat(variables('eventHubsNamespaceName'), '/RootManageSharedAccessKey')]", | ||
| "location": "[variables('location')]", | ||
| "dependsOn": [ | ||
| "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" | ||
| ], | ||
| "properties": { | ||
| "rights": [ | ||
| "Listen", | ||
| "Manage", | ||
| "Send" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "Microsoft.EventHub/namespaces/eventhubs", | ||
| "apiVersion": "2017-04-01", | ||
| "name": "[concat(variables('eventHubsNamespaceName'), '/binder-test')]", | ||
| "location": "[variables('location')]", | ||
| "dependsOn": [ | ||
| "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" | ||
| ], | ||
| "properties": { | ||
| "messageRetentionInDays": 1, | ||
| "partitionCount": 1, | ||
| "status": "Active" | ||
| } | ||
| }, | ||
| { | ||
| "type": "Microsoft.EventHub/namespaces/networkRuleSets", | ||
| "apiVersion": "2018-01-01-preview", | ||
| "name": "[concat(variables('eventHubsNamespaceName'), '/default')]", | ||
| "location": "[variables('location')]", | ||
| "dependsOn": [ | ||
| "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" | ||
| ], | ||
| "properties": { | ||
| "defaultAction": "Deny", | ||
| "virtualNetworkRules": [], | ||
| "ipRules": [] | ||
| } | ||
| }, | ||
| { | ||
| "type": "Microsoft.EventHub/namespaces/eventhubs/consumergroups", | ||
| "apiVersion": "2017-04-01", | ||
| "name": "[concat(variables('eventHubsNamespaceName'), '/binder-test/$Default')]", | ||
| "location": "[variables('location')]", | ||
| "dependsOn": [ | ||
| "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'binder-test')]", | ||
| "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" | ||
| ], | ||
| "properties": {} | ||
| }, | ||
| { | ||
| "type": "Microsoft.Storage/storageAccounts", | ||
| "apiVersion": "2019-06-01", | ||
| "name": "[variables('storageAccountName')]", | ||
| "location": "[variables('location')]", | ||
| "sku": { | ||
| "name": "Standard_RAGRS", | ||
| "tier": "Standard" | ||
| }, | ||
| "kind": "StorageV2", | ||
| "properties": { | ||
| "networkAcls": { | ||
| "bypass": "AzureServices", | ||
| "virtualNetworkRules": [], | ||
| "ipRules": [], | ||
| "defaultAction": "Allow" | ||
| }, | ||
| "supportsHttpsTrafficOnly": true, | ||
| "encryption": { | ||
| "services": { | ||
| "file": { | ||
| "keyType": "Account", | ||
| "enabled": true | ||
| }, | ||
| "blob": { | ||
| "keyType": "Account", | ||
| "enabled": true | ||
| } | ||
| }, | ||
| "keySource": "Microsoft.Storage" | ||
| }, | ||
| "accessTier": "Hot" | ||
| } | ||
| }, | ||
| { | ||
| "type": "Microsoft.Storage/storageAccounts/blobServices", | ||
| "apiVersion": "2019-06-01", | ||
| "name": "[concat(variables('storageAccountName'), '/default')]", | ||
| "dependsOn": [ | ||
| "[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]" | ||
| ], | ||
| "sku": { | ||
| "name": "Standard_RAGRS", | ||
| "tier": "Standard" | ||
| }, | ||
| "properties": { | ||
| "cors": { | ||
| "corsRules": [] | ||
| }, | ||
| "deleteRetentionPolicy": { | ||
| "enabled": false | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "type": "Microsoft.Storage/storageAccounts/fileServices", | ||
| "apiVersion": "2019-06-01", | ||
| "name": "[concat(variables('storageAccountName'), '/default')]", | ||
| "dependsOn": [ | ||
| "[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]" | ||
| ], | ||
| "sku": { | ||
| "name": "Standard_RAGRS", | ||
| "tier": "Standard" | ||
| }, | ||
| "properties": { | ||
| "cors": { | ||
| "corsRules": [] | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "type": "Microsoft.Storage/storageAccounts/blobServices/containers", | ||
| "apiVersion": "2019-06-01", | ||
| "name": "[concat(variables('storageAccountName'), '/default/binder-test')]", | ||
| "dependsOn": [ | ||
| "[resourceId('Microsoft.Storage/storageAccounts/blobServices', variables('storageAccountName'), 'default')]", | ||
| "[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]" | ||
| ], | ||
| "properties": { | ||
| "publicAccess": "None" | ||
| } | ||
| } | ||
| ], | ||
| "outputs": { | ||
| "STORAGE_ACCOUNT_BINDER": { | ||
| "type": "string", | ||
| "value": "[variables('storageAccountName')]" | ||
| }, | ||
| "STORAGE_ACCOUNT_KEY_BINDER": { | ||
| "type": "string", | ||
| "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2019-06-01').keys[0].value]" | ||
| }, | ||
| "EVENTHUB_CONNECTION_STRING_BINDER": { | ||
| "type": "string", | ||
| "value": "[listKeys(resourceId('Microsoft.EventHub/namespaces/authorizationRules', variables('eventHubsNamespaceName'), variables('eventHubsNamespaceKeyName')), '2017-04-01').primaryConnectionString]" | ||
| } | ||
| } | ||
| } | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. empty line |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could the same event hub namespace and storage account, but a different event hub and storage container.