Skip to content

fix: Dev to main #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Roopan-Microsoft merged 7 commits into from
Sep 24, 2025
Merged

fix: Dev to main #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a987c9
added tags in CI Pipeline Validate Deployment - DKM
VishalS-Microsoft Sep 19, 2025
2b9fca0
removed my feature branch from CI.yml file
VishalS-Microsoft Sep 19, 2025
4027b26
Merge pull request #463 from microsoft/CI-Pipeline-dkm
Roopan-Microsoft Sep 22, 2025
eaddd81
Change CreatedBy tag logic in bicep
NirajC-Microsoft Sep 23, 2025
f7fc4a1
Merge pull request #465 from microsoft/psl-PipelineFix
Roopan-Microsoft Sep 23, 2025
bfd6e8f
added new 'type' tag
VishalS-Microsoft Sep 23, 2025
dcd3799
Merge pull request #467 from microsoft/psl-addnewtag-dkm
Roopan-Microsoft Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@ jobs:
id: deploy
run: |
set -e

# Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ")

az deployment group create \
--name ${{ env.SOLUTION_PREFIX }}-deployment \
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
Expand All @@ -210,7 +214,8 @@ jobs:
enableTelemetry=true \
enableRedundancy=false \
enableScalability=false \
createdBy="Pipeline"
createdBy="Pipeline" \
tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"

- name: Get Deployment Output and extract Values
id: get_output
Expand Down
3 changes: 2 additions & 1 deletion infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ param enableScalability bool = false
param aiDeploymentsLocation string

@description('Optional created by user name')
param createdBy string = empty(deployer().userPrincipalName) ? '' : split(deployer().userPrincipalName, '@')[0]
param createdBy string = contains(deployer(), 'userPrincipalName')? split(deployer().userPrincipalName, '@')[0]: deployer().objectId

// ========== Resource Group Tag ========== //
resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
Expand All @@ -113,6 +113,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
tags: {
...tags
TemplateName: 'DKM'
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
CreatedBy: createdBy
}
}
Expand Down