Skip to content

Commit 9d544d7

Browse files
committed
Remove UAMI from infrastructure bicep
1 parent fa70f8c commit 9d544d7

6 files changed

Lines changed: 0 additions & 85 deletions

File tree

scripts/automation/infrastructure-dev.bicepparam

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ param objectIdFgRobots = '5ac08731-48dd-4499-9151-7bf6b8ab8eac'
77

88
param objectIdEnterpriseApplication = '8814d87c-169b-49b1-9237-2347041157ca' // ObjectID enterprise application sara-dev
99

10-
param managedIdentityName = '${environment}-mi'
11-
1210
param keyVaultName = '${environment}-kv'
1311

1412
param storageAccountNameAnon = '${environment}storeanon'
@@ -17,8 +15,5 @@ param storageAccountNameVis = '${environment}storevis'
1715
param storageAccountNameThermalRef = '${environment}thermalref'
1816
param storageAccountNameTimeseries = '${environment}storetime'
1917

20-
param principalId = '80b30892-2768-4b33-92a6-bec41a7f4e2c' //aurora-aks-kubelet-shared dev environment
21-
param roleDefinitionId = 'f1a07417-d97a-45cb-824c-7a7467783830' // azure built-in role for managed identity operator
22-
2318
// Grant Flotilla (FlotillaBackendAuthDev) role assignment as "Storage Blob Data Reader" to storageanon account
2419
param principalIdFlotillaApp = '8256d35d-5c07-440b-9f47-4abce94c8565' // ObjectID enterprise application FlotillaBackendAuthDev

scripts/automation/infrastructure-prod.bicepparam

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ param objectIdFgRobots = '5ac08731-48dd-4499-9151-7bf6b8ab8eac'
77

88
param objectIdEnterpriseApplication = '49613d59-1f36-4835-8dc4-caff1591c8e9' // ObjectID enterprise application sara-prod
99

10-
param managedIdentityName = '${environment}-mi'
11-
1210
param keyVaultName = '${environment}-kv'
1311

1412
param storageAccountNameAnon = '${environment}storeanon'
@@ -17,8 +15,5 @@ param storageAccountNameVis = '${environment}storevis'
1715
param storageAccountNameThermalRef = '${environment}thermalref'
1816
param storageAccountNameTimeseries = '${environment}storetime'
1917

20-
param principalId = 'bf81095d-e13d-481d-a4e8-a5c17faad398' //aurora-aks-kubelet-shared prod environment
21-
param roleDefinitionId = 'f1a07417-d97a-45cb-824c-7a7467783830' // azure built-in role for managed identity operator
22-
2318
// Grant Flotilla (FlotillaBackendAuthProd) role assignment as "Storage Blob Data Reader" to storageanon account
2419
param principalIdFlotillaApp = '17c50841-e5d6-4eae-a74b-98d0d2e0b592' // ObjectID enterprise application FlotillaBackendAuthProd

scripts/automation/infrastructure-staging.bicepparam

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ param objectIdFgRobots = '5ac08731-48dd-4499-9151-7bf6b8ab8eac'
77

88
param objectIdEnterpriseApplication = '7b6946f3-eefd-4036-acd2-d8ba2782e9eb' // ObjectID enterprise application sara-staging
99

10-
param managedIdentityName = '${environment}-mi'
11-
1210
param keyVaultName = '${environment}-kv'
1311

1412
param storageAccountNameAnon = '${environment}storeanon'
@@ -17,8 +15,5 @@ param storageAccountNameVis = '${environment}storevis'
1715
param storageAccountNameThermalRef = '${environment}thermalref'
1816
param storageAccountNameTimeseries = '${environment}storetime'
1917

20-
param principalId = 'bf81095d-e13d-481d-a4e8-a5c17faad398' //aurora-aks-kubelet-shared staging environment
21-
param roleDefinitionId = 'f1a07417-d97a-45cb-824c-7a7467783830' // azure built-in role for managed identity operator
22-
2318
// Grant Flotilla (FlotillaBackendAuthStaging) role assignment as "Storage Blob Data Reader" to storageanon account
2419
param principalIdFlotillaApp = 'e7c92357-387d-4c11-a88f-638828a5d4dd' // ObjectID enterprise application FlotillaBackendAuthStaging

scripts/automation/infrastructure.bicep

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ param objectIdFgRobots string
1616

1717
param objectIdEnterpriseApplication string
1818

19-
param managedIdentityName string
20-
param principalId string
21-
param roleDefinitionId string
22-
2319
param principalIdFlotillaApp string
2420

2521
resource resourceGroup 'Microsoft.Resources/resourceGroups@2024-03-01' = {
@@ -74,17 +70,6 @@ module storageAccountTimeseries 'modules/storage-account-timeseries.bicep' = {
7470
}
7571
}
7672

77-
module managedIdentity 'modules/managed-identity.bicep' = {
78-
scope: resourceGroup
79-
name: 'infrastructure-mi-${deploymentId}'
80-
params: {
81-
location: location
82-
managedIdentityName: managedIdentityName
83-
principalId: principalId
84-
roleDefinitionID: roleDefinitionId
85-
}
86-
}
87-
8873
module keyVault 'modules/key-vault.bicep' = {
8974
scope: resourceGroup
9075
name: 'infrastructure-kv-${deploymentId}'
@@ -93,8 +78,5 @@ module keyVault 'modules/key-vault.bicep' = {
9378
keyVaultName: keyVaultName
9479
objectIdFgRobots: objectIdFgRobots
9580
objectIdEnterpriseApplication: objectIdEnterpriseApplication
96-
principalId: principalId
97-
managedIdentityName: managedIdentityName
98-
roleDefinitionID: roleDefinitionId
9981
}
10082
}

scripts/automation/modules/key-vault.bicep

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@ param location string
22
param keyVaultName string
33
param objectIdFgRobots string
44
param objectIdEnterpriseApplication string
5-
param managedIdentityName string
6-
param principalId string
7-
param roleDefinitionID string
8-
9-
module managedIdentity 'managed-identity.bicep' = {
10-
name: 'managedidentity'
11-
params: {
12-
location: location
13-
managedIdentityName: managedIdentityName
14-
principalId: principalId
15-
roleDefinitionID: roleDefinitionID
16-
}
17-
}
185

196
resource keyVault 'Microsoft.KeyVault/vaults@2024-04-01-preview' = {
207
name: keyVaultName
@@ -52,17 +39,6 @@ resource keyVaultAccessPolicy 'Microsoft.KeyVault/vaults/accessPolicies@2024-04-
5239
]
5340
}
5441
}
55-
{
56-
tenantId: keyVault.properties.tenantId
57-
objectId: managedIdentity.outputs.objectIdManagedIdentity
58-
permissions: {
59-
keys: []
60-
secrets: [
61-
'get'
62-
'list'
63-
]
64-
}
65-
}
6642
{
6743
tenantId: keyVault.properties.tenantId
6844
objectId: objectIdEnterpriseApplication

scripts/automation/modules/managed-identity.bicep

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)