Skip to content

Commit 7df9b44

Browse files
authored
Build fix for old AI package type definitions (#1376)
1 parent 4eab782 commit 7df9b44

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

.pipelines/azure_pipeline_validation_appmonitoring.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@ trigger:
1212
include:
1313
- '*-appmonitoring'
1414

15+
pr:
16+
branches:
17+
exclude:
18+
- '*'
19+
1520
variables:
16-
armServiceConnectionName: 'Appmonitoring_AKS_connection'
21+
armServiceConnectionName: 'Appmonitoring_Validation_Pipeline'
1722
subscription: '5a3b3ba4-3a42-42ae-b2cb-f882345803bc'
1823
containerRegistry: 'aicommon' # this build pushes the aidev image to the dev ACR (caution: ACR that has "prod" in its name is the dev one, the one without "prod" is prod AME)
1924
repoImageName: '${{ variables.containerRegistry }}.azurecr.io/public/azuremonitor/applicationinsights/aidev'

appmonitoring/ts/src/.trivyignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ CVE-2024-37890
1313
# temporarily ignore until the next PR is merged that fixes vulnerabilities by updating packages
1414
# need the build to pass to get through the PR gate
1515
CVE-2024-21538
16-
CVE-2024-21534
16+
CVE-2024-21534
17+
CVE-2025-1302

appmonitoring/ts/src/LoggerWrapper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as applicationInsights from "applicationinsights";
2-
import { EventTelemetry, MetricTelemetry, TraceTelemetry } from "applicationinsights/out/Declarations/Contracts";
2+
import { EventTelemetry, MetricTelemetry, TraceTelemetry } from "applicationinsights/out/Declarations/Contracts/index.js";
33
import { PodInfo } from "./RequestDefinition.js";
44

55
import log4js from "log4js";

appmonitoring/ts/src/tests/LoggerWrapper.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, describe, it } from "@jest/globals";
22
import { logger, HeartbeatMetrics, HeartbeatLogs } from "../LoggerWrapper.js";
33
import { TelemetryClient } from "applicationinsights";
4-
import { MetricTelemetry, TraceTelemetry } from "applicationinsights/out/Declarations/Contracts";
4+
import { MetricTelemetry, TraceTelemetry } from "applicationinsights/out/Declarations/Contracts/index.js";
55

66
beforeEach(() => {
77
logger.setUnitTestMode(true);

appmonitoring/validation-helm/appmonitoring-deployment.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ kind: CronJob
33
metadata:
44
name: appmonitoring-cert-housekeeper-hook
55
namespace: kube-system
6-
annotations:
7-
"helm.sh/hook": post-install
86
labels:
97
component: app-monitoring
108
spec:

0 commit comments

Comments
 (0)