From f9fd6f67f94e362f93e96fe5018e767774832c6a Mon Sep 17 00:00:00 2001 From: Amr Mohamed <37353728+Xamrmo@users.noreply.github.com> Date: Fri, 17 Feb 2023 19:50:15 +0000 Subject: [PATCH] [Confidential Ledger] Fix the test pipeline failure (#33585) # Description This PR fixes the failing test pipeline for the Azure Confidential Ledger service. --- .../test-resources.json | 23 ++++++++----------- .../tests.yml | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/sdk/confidentialledger/azure-security-confidentialledger/test-resources.json b/sdk/confidentialledger/azure-security-confidentialledger/test-resources.json index 1b969084af5f0..1de7dee2fd902 100644 --- a/sdk/confidentialledger/azure-security-confidentialledger/test-resources.json +++ b/sdk/confidentialledger/azure-security-confidentialledger/test-resources.json @@ -2,15 +2,13 @@ "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": { - "ledgerName": { + "BaseName": { "type": "string", "metadata": { "description": "Ledger Name" - }, - "minLength": 3, - "maxLength": 24 + } }, - "principalId": { + "TestApplicationId": { "type": "string", "metadata": { "description": "Oid of the user" @@ -18,24 +16,23 @@ }, "location": { "type": "string", - "defaultValue": "[resourceGroup().location]", + "defaultValue": "eastus", "metadata": { - "description": "Location for all resources." + "description": "Location of the ledger." } } }, "functions": [], "variables": {}, "resources": [{ - "name": "[parameters('ledgerName')]", + "name": "[parameters('BaseName')]", "type": "Microsoft.ConfidentialLedger/ledgers", - "ledgerUri": "[concat('https://', parameters('ledgerName'), '.confidential-ledger.azure.com')]", "apiVersion": "2020-12-01-preview", "location": "[parameters('location')]", "properties": { "ledgerType": "Public", "aadBasedSecurityPrincipals": [{ - "principalId": "[parameters('principalId')]", + "principalId": "[parameters('TestApplicationId')]", "ledgerRoleName": "Administrator" }] } @@ -43,15 +40,15 @@ "outputs": { "LEDGER_NAME": { "type": "string", - "value": "[parameters('ledgerName')]" + "value": "[parameters('BaseName')]" }, "LEDGER_URI": { "type": "string", - "value": "[resources[0]('ledgerUri')]" + "value": "[concat('https://', parameters('BaseName'), '.confidential-ledger.azure.com')]" }, "USER_AAD": { "type": "string", - "value": "[parameters('principalId')]" + "value": "[parameters('TestApplicationId')]" } } } diff --git a/sdk/confidentialledger/azure-security-confidentialledger/tests.yml b/sdk/confidentialledger/azure-security-confidentialledger/tests.yml index 33f87e61761e1..71f819885091a 100644 --- a/sdk/confidentialledger/azure-security-confidentialledger/tests.yml +++ b/sdk/confidentialledger/azure-security-confidentialledger/tests.yml @@ -9,5 +9,5 @@ stages: groupId: com.azure safeName: azuresecurityconfidentialledger EnvVars: - LEDGERURI: https://$(LEDGER_NAME).confidential-ledger.azure.com + LEDGERURI: $(LEDGER_URI) IDENTITYSERVICEURI: https://identity.confidential-ledger.core.azure.com/ledgerIdentity/$(LEDGER_NAME)