Skip to content

Disable shared key access on test storage account #619

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

Draft
damonbarry wants to merge 5 commits into
base: main
Choose a base branch
from
+25 −4
Draft

Disable shared key access on test storage account #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b175f2
Disable shared key access on test storage account
damonbarry Jun 17, 2024
a957acf
Truncate storage account name if its too long
damonbarry Jun 17, 2024
bcdb3ec
Assign identity to function app
damonbarry Jun 17, 2024
0ce083b
Map configuration variables into env
damonbarry Jun 18, 2024
fe403ad
Give identity the right role on the storage account
damonbarry Jun 18, 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
3 changes: 2 additions & 1 deletion .github/workflows/e2e-tests-manual.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ jobs:
env:
BRANCH: "${{ github.event.inputs.branch }}"

AZURE_RESOURCE_GROUP_NAME: "${{ secrets.AZURE_RESOURCE_GROUP_NAME }}"
AZURE_LOCATION: "${{ secrets.AZURE_LOCATION }}"
AZURE_MANAGED_IDENTITY: "${{ vars.AZURE_MANAGED_IDENTITY }}"
AZURE_RESOURCE_GROUP_NAME: "${{ secrets.AZURE_RESOURCE_GROUP_NAME }}"

test-run:
needs: 'suite-setup'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/e2e-tests-scheduled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ jobs:
env:
BRANCH: "${{ matrix.branch }}"

AZURE_RESOURCE_GROUP_NAME: "${{ secrets.AZURE_RESOURCE_GROUP_NAME }}"
AZURE_LOCATION: "${{ secrets.AZURE_LOCATION }}"
AZURE_MANAGED_IDENTITY: "${{ vars.AZURE_MANAGED_IDENTITY }}"
AZURE_RESOURCE_GROUP_NAME: "${{ secrets.AZURE_RESOURCE_GROUP_NAME }}"

test-run:
if: "github.repository == 'Azure/iot-identity-service'"
Expand Down
19 changes: 17 additions & 2 deletions ci/e2e-tests/helper-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,21 @@ setupCustomAllocationPolicy() {
--location $AZURE_LOCATION \
--resource-group $AZURE_RESOURCE_GROUP_NAME \
--sku Standard_LRS \
--tags "suite_id=$suite_id"
--tags "suite_id=$suite_id" \
--allow-shared-key-access false

# Give managed identity Storage Blob Data Contributor access to the storage account
object_id="$(az identity show --ids "$AZURE_MANAGED_IDENTITY" --query principalId --output tsv)"

scope_id="$(
az storage account show \
--name "$dps_allocation_storage_account" \
--resource-group $AZURE_RESOURCE_GROUP_NAME \
--query id \
--output tsv
)"

az role assignment create --assignee "$object_id" --role "Storage Blob Data Contributor" --scope "$scope_id"

# Create function app
az functionapp create \
Expand All @@ -112,7 +126,8 @@ setupCustomAllocationPolicy() {
--name "$dps_allocation_functionapp_name" \
--disable-app-insights \
--storage-account "$dps_allocation_storage_account" \
--tags "suite_id=$suite_id"
--tags "suite_id=$suite_id" \
--assign-identity "$AZURE_MANAGED_IDENTITY"

# Publishing the app sometimes fails, so retry up to 3 times
for retry in {0..3}; do
Expand Down
4 changes: 4 additions & 0 deletions ci/e2e-tests/suite-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ dps_allocation_function_name='DpsCustomAllocation'
dps_allocation_functionapp_name="alloc-app-${suite_common_resource_name}"
foo_devices_iot_hub="${suite_common_resource_name}-foo-devices"
dps_allocation_storage_account="$(printf '%s' "$suite_id" | tr '[:upper:]' '[:lower:]' | tr -d -C 'a-z0-9')"
# storage accounts names can't be longer than 24 chars; truncate (from the front of the string) if necessary
if [[ ${#dps_allocation_storage_account} -gt 24 ]]; then
dps_allocation_storage_account="${dps_allocation_storage_account: -24}"
fi