Skip to content

Add SAS token support for nested and LH pipelines #7317

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

Open
gauravIoTEdge wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add SAS token support for nested and LH pipelines #7317

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e45137d
initial commit
Jun 20, 2024
eb9201e
add token generation logic
Jun 27, 2024
06dc3a4
add token generation logic for nested
Jun 28, 2024
a2a9582
Merge branch 'main' into sas-token-for-LH-and-nested
gauravIoTEdge Jul 9, 2024
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
12 changes: 6 additions & 6 deletions builds/e2e/longhaul.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
test.testMode: 'LongHaul'
test.useTRC: '$(useTRC)'
test.deploymentFileName: 'long_haul_deployment.template.json'
testResultCoordinator.storageAccountConnectionString: '$(EdgeLonghaulStorageAccountConnString)'
testResultCoordinator.blobStorageAccountUriWithSasToken: '$(testBlobStoreSas)'
clientModuleTransportType: 'All'

################################################################################
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
test.testMode: 'LongHaul'
test.useTRC: '$(useTRC)'
test.deploymentFileName: 'long_haul_deployment_constrained.template.json'
testResultCoordinator.storageAccountConnectionString: '$(EdgeLonghaulStorageAccountConnString)'
testResultCoordinator.blobStorageAccountUriWithSasToken: '$(testBlobStoreSas)'
clientModuleTransportType: 'amqp'

################################################################################
Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:
test.testMode: 'LongHaul'
test.useTRC: '$(useTRC)'
test.deploymentFileName: 'long_haul_deployment_constrained.template.json'
testResultCoordinator.storageAccountConnectionString: '$(EdgeLonghaulStorageAccountConnString)'
testResultCoordinator.blobStorageAccountUriWithSasToken: '$(testBlobStoreSas)'
clientModuleTransportType: 'mqtt'

################################################################################
Expand Down Expand Up @@ -281,7 +281,7 @@ jobs:
test.testMode: 'LongHaul'
test.useTRC: '$(useTRC)'
test.deploymentFileName: 'long_haul_deployment_constrained.template.json'
testResultCoordinator.storageAccountConnectionString: '$(EdgeLonghaulStorageAccountConnString)'
testResultCoordinator.blobStorageAccountUriWithSasToken: '$(testBlobStoreSas)'
clientModuleTransportType: 'amqp'

################################################################################
Expand Down Expand Up @@ -343,7 +343,7 @@ jobs:
test.testMode: 'LongHaul'
test.useTRC: '$(useTRC)'
test.deploymentFileName: 'long_haul_deployment_constrained.template.json'
testResultCoordinator.storageAccountConnectionString: '$(EdgeLonghaulStorageAccountConnString)'
testResultCoordinator.blobStorageAccountUriWithSasToken: '$(testBlobStoreSas)'
clientModuleTransportType: 'mqtt'

################################################################################
Expand Down Expand Up @@ -409,6 +409,6 @@ jobs:
test.testMode: 'LongHaul'
test.useTRC: '$(useTRC)'
test.deploymentFileName: 'long_haul_deployment.template.json'
testResultCoordinator.storageAccountConnectionString: '$(EdgeLonghaulStorageAccountConnString)'
testResultCoordinator.blobStorageAccountUriWithSasToken: '$(testBlobStoreSas)'
clientModuleTransportType: 'All'
packageType: 'rpm'
4 changes: 2 additions & 2 deletions builds/e2e/templates/longhaul-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ parameters:
test.testMode: ''
test.useTRC: ''
test.deploymentFileName: ''
testResultCoordinator.storageAccountConnectionString: ''
testResultCoordinator.blobStorageAccountUriWithSasToken: ''
clientModuleTransportType: ''
packageType: 'deb'

Expand Down Expand Up @@ -91,7 +91,7 @@ steps:
-metricsScrapeFrequencyInSecs "${{ parameters['metricsCollector.scrapeFrequencyInSecs'] }}" \
-metricsUploadTarget "${{ parameters['metricsCollector.uploadTarget'] }}" \
-deploymentFileName "${{ parameters['test.deploymentFileName'] }}" \
-storageAccountConnectionString "${{ parameters['testResultCoordinator.storageAccountConnectionString'] }}" \
-blobStorageAccountUriWithSasToken "$(testBlobStoreSas)" \
-testRuntimeLogLevel "${{ parameters['test.runtimeLogLevel'] }}" \
-testInfo "$testInfo" \
-twinUpdateSize "${{ parameters['twinTester.twinUpdateSize'] }}" \
Expand Down
1 change: 0 additions & 1 deletion builds/e2e/templates/longhaul-setup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ steps:
SnitchLongHaulAlertUrl,
kvLogAnalyticWorkspaceId,
kvLogAnalyticSharedKey,
EdgeLonghaulStorageAccountConnString,
GitHubAccessToken
- task: AzureKeyVault@1
displayName: 'Azure Key Vault: $(azure.keyVault)'
Expand Down
2 changes: 1 addition & 1 deletion builds/e2e/templates/nested-deploy-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ steps:
-containerRegistryPassword "$(edgebuilds-azurecr-io-pwd)" \
-iotHubConnectionString "$(IotHub-ConnStr)" \
-deploymentFileName "${{ parameters.deploymentFile }}" \
-storageAccountConnectionString "$(EdgeConnectivityStorageAccountConnString)" \
-blobStorageAccountUriWithSasToken "$(testBlobStoreSas)" \
-edgeRuntimeBuildNumber "$(Build.BuildNumber)" \
-customEdgeAgentImage "$(customEdgeAgent.image)" \
-customEdgeHubImage "$(customEdgeHub.image)" \
Expand Down
2 changes: 0 additions & 2 deletions builds/e2e/templates/nested-get-secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ steps:
edgebuilds-azurecr-io-pwd,
kvLogAnalyticWorkspaceId,
kvLogAnalyticSharedKey,
EdgeConnectivityStorageAccountConnString,
EdgeLonghaulStorageAccountConnString,
GitHubAccessToken,
edgebuild-service-principal-secret,

Expand Down
2 changes: 1 addition & 1 deletion builds/e2e/templates/nested-longhaul-deploy-amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
metricsCollector.hostPlatform: '$(hostPlatform)'
longHaul.parentHostname: '$(parentName)'
longHaul.parentEdgeDevice: '$(parentDeviceId)'
testResultCoordinator.storageAccountConnectionString: '$(EdgeLonghaulStorageAccountConnString)'
testResultCoordinator.blobStorageAccountUriWithSasToken: '$(testBlobStoreSas)'
quickstart.package.name: '$(quickstart.package.name)'
testInfo.testName: "${{ parameters['testInfo.testName'] }}"
upstream.protocol: "${{ parameters['upstream.protocol'] }}"
4 changes: 2 additions & 2 deletions builds/e2e/templates/nested-longhaul-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ parameters:
test.runtimeLogLevel: ''
longHaul.parentHostname: ''
longHaul.parentEdgeDevice: ''
testResultCoordinator.storageAccountConnectionString: ''
testResultCoordinator.blobStorageAccountUriWithSasToken: ''
quickstart.package.name: ''
upstream.protocol: ''

Expand Down Expand Up @@ -176,7 +176,7 @@ steps:
-metricsScrapeFrequencyInSecs "${{ parameters['metricsCollector.scrapeFrequencyInSecs'] }}" \
-metricsUploadTarget "${{ parameters['metricsCollector.uploadTarget'] }}" \
-deploymentFileName "${{ parameters['test.deploymentFileName'] }}" \
-storageAccountConnectionString "${{ parameters['testResultCoordinator.storageAccountConnectionString'] }}" \
-blobStorageAccountUriWithSasToken "$(testBlobStoreSas)" \
-testRuntimeLogLevel "${{ parameters['test.runtimeLogLevel'] }}" \
-testInfo "$testInfo" \
-twinUpdateSize "${{ parameters['twinTester.twinUpdateSize'] }}" \
Expand Down
4 changes: 2 additions & 2 deletions e2e_deployment_files/edgehub_restart_deployment.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@
"IOT_HUB_CONNECTION_STRING": {
"value": "<IoTHubConnectionString>"
},
"STORAGE_ACCOUNT_CONNECTION_STRING": {
"value": "<TestResultCoordinator.StorageAccountConnectionString>"
"BLOB_STORE_SAS": {
"value": "<testBlobStoreSas>"
},
"NetworkControllerRunProfile": {
"value": "<NetworkController.RunProfile>"
Expand Down
4 changes: 2 additions & 2 deletions e2e_deployment_files/long_haul_deployment.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,8 @@
"logUploadEnabled": {
"value": "<TestResultCoordinator.logUploadEnabled>"
},
"STORAGE_ACCOUNT_CONNECTION_STRING": {
"value": "<TestResultCoordinator.StorageAccountConnectionString>"
"BLOB_STORE_SAS": {
"value": "<testBlobStoreSas>"
},
"NetworkControllerRunProfile": {
"value": "<NetworkController.RunProfile>"
Expand Down
4 changes: 2 additions & 2 deletions e2e_deployment_files/long_haul_deployment_constrained.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@
"logUploadEnabled": {
"value": "<TestResultCoordinator.logUploadEnabled>"
},
"STORAGE_ACCOUNT_CONNECTION_STRING": {
"value": "<TestResultCoordinator.StorageAccountConnectionString>"
"BLOB_STORE_SAS": {
"value": "<testBlobStoreSas>"
},
"NetworkControllerRunProfile": {
"value": "<NetworkController.RunProfile>"
Expand Down
4 changes: 2 additions & 2 deletions e2e_deployment_files/nestededge_bottomLayerBaseDeployment_long_haul_amqp.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@
"logUploadEnabled": {
"value": "<TestResultCoordinator.logUploadEnabled>"
},
"STORAGE_ACCOUNT_CONNECTION_STRING": {
"value": "<TestResultCoordinator.StorageAccountConnectionString>"
"BLOB_STORE_SAS": {
"value": "<testBlobStoreSas>"
},
"NetworkControllerRunProfile": {
"value": "<NetworkController.RunProfile>"
Expand Down
6 changes: 3 additions & 3 deletions scripts/linux/nested-edge-deploy-agent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function process_args() {
IOT_HUB_CONNECTION_STRING="$arg"
saveNextArg=0
elif [ $saveNextArg -eq 8 ]; then
STORAGE_ACCOUNT_CONNECTION_STRING="$arg"
BLOB_STORE_SAS="$arg"
saveNextArg=0
elif [ $saveNextArg -eq 9 ]; then
DEPLOYMENT_FILE_NAME="$arg"
Expand Down Expand Up @@ -203,7 +203,7 @@ function process_args() {
'-containerRegistryUsername' ) saveNextArg=5;;
'-containerRegistryPassword' ) saveNextArg=6;;
'-iotHubConnectionString' ) saveNextArg=7;;
'-storageAccountConnectionString' ) saveNextArg=8;;
'-blobStorageAccountUriWithSasToken' ) saveNextArg=8;;
'-deploymentFileName' ) saveNextArg=9;;
'-edgeRuntimeBuildNumber' ) saveNextArg=10;;
'-customEdgeAgentImage' ) saveNextArg=11;;
Expand Down Expand Up @@ -237,7 +237,7 @@ function process_args() {
[[ -z "$CONTAINER_REGISTRY_PASSWORD" ]] && { print_error 'Container registry password is required'; exit 1; }
[[ -z "$DEPLOYMENT_FILE_NAME" ]] && { print_error 'Deployment file name is required'; exit 1; }
[[ -z "$IOT_HUB_CONNECTION_STRING" ]] && { print_error 'IoT hub connection string is required'; exit 1; }
[[ -z "$STORAGE_ACCOUNT_CONNECTION_STRING" ]] && { print_error 'Storage account connection string is required'; exit 1; }
[[ -z "$BLOB_STORE_SAS" ]] && { print_error 'Blob storage URI is required'; exit 1; }

echo 'Required parameters are provided'
}
Expand Down