Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-js into…
Browse files Browse the repository at this point in the history 
… harshan/migrate-to-esm/test-utils
  • Loading branch information
@HarshaNalluru
HarshaNalluru committed Apr 1, 2024
2 parents 871b186 + 808963a commit 161b4d6
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion sdk/identity/identity/managed-identity-matrix.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
},
"ArmTemplateParameters": "@{deployMIResources = $true}",
"TestType": "msi",
"TestType": "managed-identity",
"NodeTestVersion": "18.x",
"TestResultsFiles": "**/test-results.xml"
}
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/identity/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"check-format": "dev-tool run vendored prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
"integration-test:browser": "echo skipped",
"integration-test:node": "dev-tool run test:node-ts-input -- --timeout 180000 'test/public/node/*.spec.ts' 'test/internal/node/*.spec.ts'",
"integration-test:msi": "dev-tool run test:node-ts-input -- --timeout 180000 'test/integration/**/*.spec.ts'",
"integration-test:managed-identity": "dev-tool run test:node-ts-input -- --timeout 180000 'test/integration/**/*.spec.ts'",
"integration-test": "npm run integration-test:node && npm run integration-test:browser",
"lint:fix": "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]",
"lint": "eslint package.json api-extractor.json src test --ext .ts",
Expand Down
0 sdk/identity/test-resources-msi.bicep → ...ity/test-resources-managed-identity.bicep
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion sdk/identity/test-resources.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ param principalUserType string = 'User'
@description('Whether to deploy resources for Managed Identity. When set to false, this file deploys nothing.')
param deployMIResources bool = false

module managedIdentityModule 'test-resources-msi.bicep' = if(deployMIResources) {
module managedIdentityModule 'test-resources-managed-identity.bicep' = if(deployMIResources) {
name: 'managedIdentityModule'
params: {
baseName: baseName
Expand Down
16 changes: 8 additions & 8 deletions sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/javascript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
"dependencies": {
"@azure/monitor-opentelemetry-exporter": "next",
"dotenv": "latest",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/resources": "^1.21.0",
"@opentelemetry/semantic-conventions": "^1.21.0",
"@opentelemetry/instrumentation": "^0.48.0",
"@opentelemetry/sdk-trace-base": "^1.21.0",
"@opentelemetry/sdk-trace-node": "^1.21.0",
"@opentelemetry/instrumentation-http": "^0.48.0",
"@opentelemetry/sdk-metrics": "^1.21.0"
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/resources": "^1.22.0",
"@opentelemetry/semantic-conventions": "^1.22.0",
"@opentelemetry/instrumentation": "^0.49.1",
"@opentelemetry/sdk-trace-base": "^1.22.0",
"@opentelemetry/sdk-trace-node": "^1.22.0",
"@opentelemetry/instrumentation-http": "^0.49.1",
"@opentelemetry/sdk-metrics": "^1.22.0"
}
}
16 changes: 8 additions & 8 deletions sdk/monitor/monitor-opentelemetry-exporter/samples/v1-beta/typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
"dependencies": {
"@azure/monitor-opentelemetry-exporter": "next",
"dotenv": "latest",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/resources": "^1.21.0",
"@opentelemetry/semantic-conventions": "^1.21.0",
"@opentelemetry/instrumentation": "^0.48.0",
"@opentelemetry/sdk-trace-base": "^1.21.0",
"@opentelemetry/sdk-trace-node": "^1.21.0",
"@opentelemetry/instrumentation-http": "^0.48.0",
"@opentelemetry/sdk-metrics": "^1.21.0"
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/resources": "^1.22.0",
"@opentelemetry/semantic-conventions": "^1.22.0",
"@opentelemetry/instrumentation": "^0.49.1",
"@opentelemetry/sdk-trace-base": "^1.22.0",
"@opentelemetry/sdk-trace-node": "^1.22.0",
"@opentelemetry/instrumentation-http": "^0.49.1",
"@opentelemetry/sdk-metrics": "^1.22.0"
},
"devDependencies": {
"@types/node": "^18.0.0",
Expand Down
14 changes: 7 additions & 7 deletions sdk/monitor/monitor-opentelemetry-exporter/samples/v1/javascript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
"dependencies": {
"@azure/monitor-opentelemetry-exporter": "next",
"dotenv": "latest",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/resources": "^1.21.0",
"@opentelemetry/semantic-conventions": "^1.21.0",
"@opentelemetry/instrumentation": "^0.48.0",
"@opentelemetry/sdk-trace-base": "^1.21.0",
"@opentelemetry/sdk-trace-node": "^1.21.0",
"@opentelemetry/instrumentation-http": "^0.48.0"
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/resources": "^1.22.0",
"@opentelemetry/semantic-conventions": "^1.22.0",
"@opentelemetry/instrumentation": "^0.49.1",
"@opentelemetry/sdk-trace-base": "^1.22.0",
"@opentelemetry/sdk-trace-node": "^1.22.0",
"@opentelemetry/instrumentation-http": "^0.49.1"
}
}
14 changes: 7 additions & 7 deletions sdk/monitor/monitor-opentelemetry-exporter/samples/v1/typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
"dependencies": {
"@azure/monitor-opentelemetry-exporter": "next",
"dotenv": "latest",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/resources": "^1.17.0",
"@opentelemetry/semantic-conventions": "^1.17.0",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/sdk-trace-base": "^1.17.0",
"@opentelemetry/sdk-trace-node": "^1.17.0",
"@opentelemetry/instrumentation-http": "^0.43.0"
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/resources": "^1.22.0",
"@opentelemetry/semantic-conventions": "^1.22.0",
"@opentelemetry/instrumentation": "^0.49.1",
"@opentelemetry/sdk-trace-base": "^1.22.0",
"@opentelemetry/sdk-trace-node": "^1.22.0",
"@opentelemetry/instrumentation-http": "^0.49.1"
},
"devDependencies": {
"typescript": "~5.3.3",
Expand Down
6 changes: 3 additions & 3 deletions sdk/monitor/monitor-opentelemetry/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@
"@opentelemetry/instrumentation": "^0.49.1",
"@opentelemetry/instrumentation-bunyan": "^0.36.0",
"@opentelemetry/instrumentation-http": "^0.49.1",
"@opentelemetry/instrumentation-mongodb": "^0.40.0",
"@opentelemetry/instrumentation-mongodb": "^0.41.0",
"@opentelemetry/instrumentation-mysql": "^0.36.0",
"@opentelemetry/instrumentation-pg": "^0.39.0",
"@opentelemetry/instrumentation-pg": "^0.39.1",
"@opentelemetry/instrumentation-redis": "^0.37.0",
"@opentelemetry/instrumentation-redis-4": "^0.37.0",
"@opentelemetry/resource-detector-azure": "^0.2.4",
"@opentelemetry/resource-detector-azure": "^0.2.5",
"@opentelemetry/resources": "^1.22.0",
"@opentelemetry/sdk-logs": "^0.49.1",
"@opentelemetry/sdk-metrics": "^1.22.0",
Expand Down
2 changes: 1 addition & 1 deletion sdk/test-utils/test-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@azure/abort-controller": "^2.0.0",
"@azure/core-rest-pipeline": "^1.1.0",
"@azure/core-tracing": "^1.0.0",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/api": "^1.8.0",
"@types/chai": "^4.1.6",
"@types/chai-as-promised": "^7.1.4",
"chai": "^4.2.0",
Expand Down

0 comments on commit 161b4d6

Please sign in to comment.