Skip to content

Commit e2dd7b0

Browse files
committed
New version following agreed standards and compliant with AVM WAF configuration
1 parent 3b8de8e commit e2dd7b0

30 files changed

+3862
-1271
lines changed

infra/main.bicep

Lines changed: 888 additions & 1172 deletions
Large diffs are not rendered by default.

infra/main.parameters.json

Lines changed: 21 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,24 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
3-
"contentVersion": "1.0.0.0",
4-
"parameters": {
5-
"aiModelDeployments": {
6-
"value": [
7-
{
8-
"name": "gpt",
9-
"model": {
10-
"name": "gpt-4o",
11-
"version": "2024-08-06",
12-
"format": "OpenAI"
13-
},
14-
"sku": {
15-
"name": "GlobalStandard",
16-
"capacity": 140
17-
}
18-
}
19-
]
20-
},
21-
"environmentName": {
22-
"value": "${AZURE_ENV_NAME}"
23-
},
24-
"solutionLocation": {
25-
"value": "${AZURE_LOCATION}"
26-
},
27-
"aiDeploymentsLocation": {
28-
"value": "${AZURE_ENV_OPENAI_LOCATION}"
29-
},
30-
"modelDeploymentType": {
31-
"value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}"
32-
},
33-
"gptModelName": {
34-
"value": "${AZURE_ENV_MODEL_NAME}"
35-
},
36-
"gptModelVersion": {
37-
"value": "${AZURE_ENV_MODEL_VERSION}"
38-
},
39-
"gptModelCapacity": {
40-
"value": "${AZURE_ENV_MODEL_CAPACITY}"
41-
},
42-
"existingFoundryProjectResourceId": {
43-
"value": "${AZURE_ENV_FOUNDRY_PROJECT_ID}"
44-
},
45-
"imageTag": {
46-
"value": "${AZURE_ENV_IMAGE_TAG}"
47-
},
48-
"enableTelemetry": {
49-
"value": "${AZURE_ENV_ENABLE_TELEMETRY}"
50-
},
51-
"existingLogAnalyticsWorkspaceId": {
52-
"value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID}"
53-
},
54-
"backendExists": {
55-
"value": "${SERVICE_BACKEND_RESOURCE_EXISTS=false}"
56-
},
57-
"backendDefinition": {
58-
"value": {
59-
"settings": [
60-
{
61-
"name": "",
62-
"value": "${VAR}",
63-
"_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.",
64-
"_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR} to use the value of 'VAR' from the current environment."
65-
},
66-
{
67-
"name": "",
68-
"value": "${VAR_S}",
69-
"secret": true,
70-
"_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.",
71-
"_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR_S} to use the value of 'VAR_S' from the current environment."
72-
}
73-
]
74-
}
75-
},
76-
"frontendExists": {
77-
"value": "${SERVICE_FRONTEND_RESOURCE_EXISTS=false}"
78-
},
79-
"frontendDefinition": {
80-
"value": {
81-
"settings": [
82-
{
83-
"name": "",
84-
"value": "${VAR}",
85-
"_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.",
86-
"_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR} to use the value of 'VAR' from the current environment."
87-
},
88-
{
89-
"name": "",
90-
"value": "${VAR_S}",
91-
"secret": true,
92-
"_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.",
93-
"_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR_S} to use the value of 'VAR_S' from the current environment."
94-
}
95-
]
96-
}
97-
},
98-
"principalId": {
99-
"value": "${AZURE_PRINCIPAL_ID}"
100-
}
2+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
3+
"contentVersion": "1.0.0.0",
4+
"parameters": {
5+
"solutionName": {
6+
"value": "${AZURE_ENV_NAME}"
7+
},
8+
"location": {
9+
"value": "${AZURE_LOCATION}"
10+
},
11+
"azureAiServiceLocation": {
12+
"value": "${AZURE_ENV_OPENAI_LOCATION}"
13+
},
14+
"backendContainerImageTag": {
15+
"value": "${AZURE_ENV_IMAGE_TAG}"
16+
},
17+
"frontendContainerImageTag": {
18+
"value": "${AZURE_ENV_IMAGE_TAG}"
19+
},
20+
"enableTelemetry": {
21+
"value": "${AZURE_ENV_ENABLE_TELEMETRY}"
10122
}
23+
}
10224
}

infra/main.waf.parameters.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
3+
"contentVersion": "1.0.0.0",
4+
"parameters": {
5+
"solutionName": {
6+
"value": "${AZURE_ENV_NAME}"
7+
},
8+
"solutionLocation": {
9+
"value": "${AZURE_LOCATION}"
10+
},
11+
"location": {
12+
"value": "${AZURE_LOCATION}"
13+
},
14+
"azureAiServiceLocation": {
15+
"value": "${AZURE_ENV_OPENAI_LOCATION}"
16+
},
17+
"backendContainerImageTag": {
18+
"value": "${AZURE_ENV_IMAGE_TAG}"
19+
},
20+
"frontendContainerImageTag": {
21+
"value": "${AZURE_ENV_IMAGE_TAG}"
22+
},
23+
"enableTelemetry": {
24+
"value": "${AZURE_ENV_ENABLE_TELEMETRY}"
25+
},
26+
"enableMonitoring": {
27+
"value": true
28+
},
29+
"enablePrivateNetworking": {
30+
"value": true
31+
},
32+
"enableScalability": {
33+
"value": true
34+
},
35+
"virtualMachineAdminUsername": {
36+
"value": "${AZURE_ENV_VM_ADMIN_USERNAME}"
37+
},
38+
"virtualMachineAdminPassword": {
39+
"value": "${AZURE_ENV_VM_ADMIN_PASSWORD}"
40+
}
41+
}
42+
}

0 commit comments

Comments
 (0)