Skip to content

Commit 1f44e15

Browse files
fixing all related changes and removed Waf
1 parent f5039bf commit 1f44e15

File tree

3 files changed

+9
-55
lines changed

3 files changed

+9
-55
lines changed
Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
1-
name: Azure Template Validation
1+
name: Azure Template Validation
22
on:
3-
push:
4-
branches:
5-
- main
6-
- vee-pipeline-fixes
7-
3+
# workflow_dispatch:
4+
push:
5+
branches:
6+
- main
7+
- vee-pipeline-fixes
88
permissions:
99
contents: read
1010
id-token: write
1111
pull-requests: write
12-
1312
jobs:
1413
template_validation_job:
1514
runs-on: ubuntu-latest
16-
environment: production
15+
environment: dev
1716
name: Template validation
1817
steps:
1918
# Step 1: Checkout the code from your repository
2019
- name: Checkout code
2120
uses: actions/checkout@v4
22-
2321
# Step 2: Validate the Azure template using microsoft/template-validation-action
2422
- name: Validate Azure Template
25-
uses: microsoft/template-validation-action@Latest
23+
uses: microsoft/template-validation-action@v0.3.5
2624
id: validation
27-
with:
28-
# disable auto test generation that breaks validation
29-
validateTests: none
3025
env:
3126
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
3227
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
@@ -35,8 +30,6 @@ jobs:
3530
AZURE_ENV_NAME: ${{ secrets.AZURE_ENV_NAME }}
3631
AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
3732
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38-
3933
# Step 3: Print the result of the validation
4034
- name: Print result
41-
run: cat ${{ steps.validation.outputs.resultFile }}
42-
35+
run: cat ${{ steps.validation.outputs.resultFile }}

infra/main.bicep

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ metadata name = 'Modernize Your Code Solution Accelerator'
22
metadata description = '''CSA CTO Gold Standard Solution Accelerator for Modernize Your Code.
33
'''
44

5-
@description('Set to true if you want to deploy WAF-aligned infrastructure.')
6-
param useWafAlignedArchitecture bool = false
7-
85
@minLength(3)
96
@maxLength(16)
107
@description('Required. A unique application/solution name for all resources in this deployment. This should be 3-16 characters long.')
@@ -46,21 +43,12 @@ param aiDeploymentsLocation string
4643
@description('Optional. AI model deployment token capacity. Defaults to 150K tokens per minute.')
4744
param capacity int = 150
4845

49-
@description('Optional. Enable monitoring for the resources. This will enable Application Insights and Log Analytics. Defaults to false.')
50-
param enableMonitoring bool = useWafAlignedArchitecture? true : false
51-
52-
@description('Optional. Enable scaling for the container apps. Defaults to false.')
53-
param enableScaling bool = useWafAlignedArchitecture? true : false
54-
5546
@description('Optional. Enable redundancy for applicable resources. Defaults to false.')
5647
param enableRedundancy bool = false
5748

5849
@description('Optional. The secondary location for the Cosmos DB account if redundancy is enabled.')
5950
param secondaryLocation string?
6051

61-
@description('Optional. Enable private networking for the resources. Set to true to enable private networking. Defaults to false.')
62-
param enablePrivateNetworking bool = useWafAlignedArchitecture? true : false
63-
6452
@description('Optional. Size of the Jumpbox Virtual Machine when created. Set to custom value if enablePrivateNetworking is true.')
6553
param vmSize string?
6654

infra/main.json

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212
"description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \r\n"
1313
},
1414
"parameters": {
15-
"useWafAlignedArchitecture": {
16-
"type": "bool",
17-
"metadata": {
18-
"description": "Set to true if you want to deploy WAF-aligned infrastructure."
19-
}
20-
},
2115
"solutionName": {
2216
"type": "string",
2317
"minLength": 3,
@@ -77,20 +71,6 @@
7771
"description": "Optional. AI model deployment token capacity. Defaults to 150K tokens per minute."
7872
}
7973
},
80-
"enableMonitoring": {
81-
"type": "bool",
82-
"defaultValue": "[if(parameters('useWafAlignedArchitecture'), true(), false())]",
83-
"metadata": {
84-
"description": "Optional. Enable monitoring for the resources. This will enable Application Insights and Log Analytics. Defaults to false."
85-
}
86-
},
87-
"enableScaling": {
88-
"type": "bool",
89-
"defaultValue": "[if(parameters('useWafAlignedArchitecture'), true(), false())]",
90-
"metadata": {
91-
"description": "Optional. Enable scaling for the container apps. Defaults to false."
92-
}
93-
},
9474
"enableRedundancy": {
9575
"type": "bool",
9676
"defaultValue": false,
@@ -105,13 +85,6 @@
10585
"description": "Optional. The secondary location for the Cosmos DB account if redundancy is enabled."
10686
}
10787
},
108-
"enablePrivateNetworking": {
109-
"type": "bool",
110-
"defaultValue": "[if(parameters('useWafAlignedArchitecture'), true(), false())]",
111-
"metadata": {
112-
"description": "Optional. Enable private networking for the resources. Set to true to enable private networking. Defaults to false."
113-
}
114-
},
11588
"vmSize": {
11689
"type": "string",
11790
"nullable": true,

0 commit comments

Comments
 (0)