Skip to content
Draft
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@azure/identity": "dev",
"@azure/identity": "beta",
"@azure/storage-blob": "^12.17.0",
"express": "^5.2.1",
"dotenv": "^16.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"type": "module",
"license": "ISC",
"dependencies": {
"@azure/identity": "dev",
"@azure/identity": "beta",
"@azure/storage-blob": "^12.17.0",
"express": "^5.2.1",
"tslib": "^1.10.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import { describe, it, assert } from "vitest";
import { requireEnvVar } from "../authTestUtils.js";

describe("AzureFunctions Integration test", function () {
// TODO: Reenable the test https://github.com/Azure/azure-sdk-for-js/issues/35416
it.skip("test the Azure Functions endpoint where the sync MI credential is used.", async function () {
it("test the Azure Functions endpoint where the sync MI credential is used.", async function () {
const baseUri = baseUrl();
const client = new ServiceClient({ baseUri: baseUri });
const pipelineRequest = createPipelineRequest({
Expand Down
12 changes: 6 additions & 6 deletions sdk/identity/test-resources-managed-identity.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ param baseName string = resourceGroup().name
@description('The location of the resource. By default, this is the same as the resource group.')
param location string = resourceGroup().location

@description('The AKS cluster location. Defaults to eastus2 to avoid capacity constraints in the resource group region.')
param aksLocation string = 'eastus2'

@description('The client OID to grant access to test resources.')
param testApplicationOid string

Expand Down Expand Up @@ -220,6 +223,7 @@ resource azureFunction 'Microsoft.Web/sites@2022-09-01' = {
alwaysOn: true
http20Enabled: true
minTlsVersion: '1.2'
linuxFxVersion: 'Node|22'
appSettings: [
{
name: 'IDENTITY_STORAGE_NAME_1'
Expand Down Expand Up @@ -253,10 +257,6 @@ resource azureFunction 'Microsoft.Web/sites@2022-09-01' = {
name: 'FUNCTIONS_WORKER_RUNTIME'
value: 'node'
}
{
name: 'DOCKER_CUSTOM_IMAGE_NAME'
value: 'mcr.microsoft.com/azure-functions/node:4-node24-appservice'
}
]
}
}
Expand Down Expand Up @@ -293,7 +293,7 @@ resource acrResource 'Microsoft.ContainerRegistry/registries@2023-01-01-preview'

resource kubernetesCluster 'Microsoft.ContainerService/managedClusters@2023-06-01' = {
name: baseName
location: location
location: aksLocation
identity: {
type: 'SystemAssigned'
}
Expand All @@ -305,7 +305,7 @@ resource kubernetesCluster 'Microsoft.ContainerService/managedClusters@2023-06-0
{
name: 'agentpool'
count: 1
vmSize: 'Standard_D2s_v3'
vmSize: 'Standard_D2s_v5'
osDiskSizeGB: 128
osDiskType: 'Managed'
kubeletDiskType: 'OS'
Expand Down
23 changes: 12 additions & 11 deletions sdk/identity/test-resources-post.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,18 @@ if ($CI) {
}

# Azure Functions app deployment
# TODO: Skip Azure Functions deployment for timeout error
# Write-Host "Building the code for functions app"
# Push-Location "$webappRoot/AzureFunctions/RunTest"
# npm install
# npm run build
# Pop-Location
# Write-Host "starting azure functions deployment"
# Compress-Archive -Path "$workingFolder/AzureFunctions/RunTest/*" -DestinationPath "$workingFolder/AzureFunctions/app.zip" -Force
# az functionapp deployment source config-zip -g $identityResourceGroup -n $DeploymentOutputs['IDENTITY_FUNCTION_NAME'] --src "$workingFolder/AzureFunctions/app.zip"
# Remove-Item -Force "$workingFolder/AzureFunctions/app.zip"
# Write-Host "Deployed function app"
Write-Host "##[group]Deploying Azure Functions App"
Write-Host "Building the code for functions app"
Push-Location "$webappRoot/AzureFunctions/RunTest"
npm install
npm run build
Pop-Location
Write-Host "starting azure functions deployment"
Compress-Archive -Path "$workingFolder/AzureFunctions/RunTest/*" -DestinationPath "$workingFolder/AzureFunctions/app.zip" -Force
az functionapp deployment source config-zip -g $identityResourceGroup -n $DeploymentOutputs['IDENTITY_FUNCTION_NAME'] --src "$workingFolder/AzureFunctions/app.zip"
Remove-Item -Force "$workingFolder/AzureFunctions/app.zip"
Write-Host "Deployed function app"
Write-Host "##[endgroup]"

Write-Host "##[group]Deploying Identity Web App"
Push-Location "$webappRoot/AzureWebApps"
Expand Down
Loading