Skip to content

Commit 6062d2e

Browse files
Merge branch 'main' into dev
2 parents a9b062a + e3c9d0a commit 6062d2e

File tree

4 files changed

+56
-6
lines changed

4 files changed

+56
-6
lines changed
File renamed without changes.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: validate template property for telemetry
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
paths:
8+
- 'azure.yaml'
9+
10+
jobs:
11+
validate-template-property:
12+
name: validate-template-property
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout code
17+
uses: actions/checkout@v4
18+
19+
- name: Check for required metadata template line
20+
run: |
21+
if grep -E '^\s*#\s*template:\s*conversation-knowledge-mining@1\.0' azure.yaml; then
22+
echo "ERROR: 'template' line is commented out in azure.yaml! Please uncomment template line."
23+
exit 1
24+
fi
25+
26+
if ! grep -E '^\s*template:\s*conversation-knowledge-mining@1\.0' azure.yaml; then
27+
echo "ERROR: Required 'template' line is missing in azure.yaml! Please add template line for telemetry."
28+
exit 1
29+
fi
30+
echo "template line is present and not commented."

infra/main.bicep

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,16 @@ var acrName = useLocalBuildLower == 'true' ? containerRegistryNameCleaned : 'kmc
9595

9696
var baseUrl = 'https://raw.githubusercontent.com/microsoft/Conversation-Knowledge-Mining-Solution-Accelerator/main/'
9797

98+
// ========== Resource Group Tag ========== //
99+
resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
100+
name: 'default'
101+
properties: {
102+
tags: {
103+
TemplateName: 'KM Generic'
104+
}
105+
}
106+
}
107+
98108
// ========== Managed Identity ========== //
99109
module managedIdentityModule 'deploy_managed_identity.bicep' = {
100110
name: 'deploy_managed_identity'

infra/main.json

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.36.177.2456",
8-
"templateHash": "6616332615371481762"
8+
"templateHash": "17704462661346419099"
99
}
1010
},
1111
"parameters": {
@@ -385,6 +385,16 @@
385385
"baseUrl": "https://raw.githubusercontent.com/microsoft/Conversation-Knowledge-Mining-Solution-Accelerator/main/"
386386
},
387387
"resources": [
388+
{
389+
"type": "Microsoft.Resources/tags",
390+
"apiVersion": "2021-04-01",
391+
"name": "default",
392+
"properties": {
393+
"tags": {
394+
"TemplateName": "KM Generic"
395+
}
396+
}
397+
},
388398
{
389399
"type": "Microsoft.Resources/deployments",
390400
"apiVersion": "2022-09-01",
@@ -671,7 +681,7 @@
671681
"_generator": {
672682
"name": "bicep",
673683
"version": "0.36.177.2456",
674-
"templateHash": "1154018530262938884"
684+
"templateHash": "4770505269900967480"
675685
}
676686
},
677687
"parameters": {
@@ -1649,7 +1659,7 @@
16491659
"_generator": {
16501660
"name": "bicep",
16511661
"version": "0.36.177.2456",
1652-
"templateHash": "10311862207366846138"
1662+
"templateHash": "11130863863424769976"
16531663
}
16541664
},
16551665
"parameters": {
@@ -1818,7 +1828,7 @@
18181828
"_generator": {
18191829
"name": "bicep",
18201830
"version": "0.36.177.2456",
1821-
"templateHash": "10311862207366846138"
1831+
"templateHash": "11130863863424769976"
18221832
}
18231833
},
18241834
"parameters": {
@@ -2992,7 +3002,7 @@
29923002
"_generator": {
29933003
"name": "bicep",
29943004
"version": "0.36.177.2456",
2995-
"templateHash": "7356894116193161964"
3005+
"templateHash": "4126116147088050069"
29963006
}
29973007
},
29983008
"parameters": {
@@ -3457,7 +3467,7 @@
34573467
"_generator": {
34583468
"name": "bicep",
34593469
"version": "0.36.177.2456",
3460-
"templateHash": "10311862207366846138"
3470+
"templateHash": "11130863863424769976"
34613471
}
34623472
},
34633473
"parameters": {

0 commit comments

Comments
 (0)