lint

Signed-off-by: Gerd Oberlechner <[email protected]>
Azure · May 9, 2024 · a64724e · a64724e
1 parent f65234d
commit a64724e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 42 deletions.
diff --git a/dev-infrastructure/configurations/svc-cluster.bicepparam b/dev-infrastructure/configurations/svc-cluster.bicepparam
@@ -18,6 +18,5 @@ param workloadIdentities = items({
 })
 param deployMaestroInfra = false
 
-
 // This parameter is always overriden in the Makefile
 param currentUserId = ''
diff --git a/dev-infrastructure/modules/aks-cluster-base.bicep b/dev-infrastructure/modules/aks-cluster-base.bicep
@@ -333,28 +333,26 @@ resource aksCluster 'Microsoft.ContainerService/managedClusters@2024-01-01' = {
 }
 
 // az aks command invoke --resource-group hcp-standalone-mshen --name aro-hcp-cluster-001 --command "kubectl get ns"
-resource currentUserAksClusterAdmin 'Microsoft.Authorization/roleAssignments@2022-04-01' =
-  if (length(currentUserId) > 0) {
-    scope: aksCluster
-    name: guid(location, aksClusterName, aksClusterAdminRoleId, currentUserId)
-    properties: {
-      roleDefinitionId: aksClusterAdminRoleId
-      principalId: currentUserId
-      principalType: 'User'
-    }
+resource currentUserAksClusterAdmin 'Microsoft.Authorization/roleAssignments@2022-04-01' = if (length(currentUserId) > 0) {
+  scope: aksCluster
+  name: guid(location, aksClusterName, aksClusterAdminRoleId, currentUserId)
+  properties: {
+    roleDefinitionId: aksClusterAdminRoleId
+    principalId: currentUserId
+    principalType: 'User'
   }
+}
 
 // az aks command invoke --resource-group hcp-standalone-mshen --name aro-hcp-cluster-001 --command "kubectl get ns"
-resource currentUserAksRbacClusterAdmin 'Microsoft.Authorization/roleAssignments@2022-04-01' =
-  if (length(currentUserId) > 0) {
-    scope: aksCluster
-    name: guid(location, aksClusterName, aksClusterRbacClusterAdminRoleId, currentUserId)
-    properties: {
-      roleDefinitionId: aksClusterRbacClusterAdminRoleId
-      principalId: currentUserId
-      principalType: 'User'
-    }
+resource currentUserAksRbacClusterAdmin 'Microsoft.Authorization/roleAssignments@2022-04-01' = if (length(currentUserId) > 0) {
+  scope: aksCluster
+  name: guid(location, aksClusterName, aksClusterRbacClusterAdminRoleId, currentUserId)
+  properties: {
+    roleDefinitionId: aksClusterRbacClusterAdminRoleId
+    principalId: currentUserId
+    principalType: 'User'
   }
+}
 
 resource uami 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = [
   for wi in workloadIdentities: {

diff --git a/dev-infrastructure/modules/maestro-eventgrid-access.bicep b/dev-infrastructure/modules/maestro-eventgrid-access.bicep
@@ -54,14 +54,12 @@ resource mqttClient 'Microsoft.EventGrid/namespaces/clients@2023-12-15-preview'
   }
 }
 
-
 // managed identity to access the certificate in key vault
 resource certificateAccessManagedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
   location: location
   name: 'maestro-${location}-${clientName}'
 }
 
-
 var keyVaultCertificateUserRoleId = subscriptionResourceId(
   'Microsoft.Authorization/roleDefinitions/',
   'db79e9a7-68ee-4b58-9aeb-b90e7c24fcba'

diff --git a/dev-infrastructure/modules/maestro-infra.bicep b/dev-infrastructure/modules/maestro-infra.bicep
@@ -80,16 +80,15 @@ var keyVaultAdminRoleId = subscriptionResourceId(
   '00482a5a-887f-4fb3-b363-3b7fe8e74483'
 )
 
-resource keyVaultAdminRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' =
-  if (length(currentUserId) > 0) {
-    scope: kv
-    name: guid(location, maestroKeyVaultName, keyVaultAdminRoleId, currentUserId)
-    properties: {
-      roleDefinitionId: keyVaultAdminRoleId
-      principalId: currentUserId
-      principalType: 'User'
-    }
+resource keyVaultAdminRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = if (length(currentUserId) > 0) {
+  scope: kv
+  name: guid(location, maestroKeyVaultName, keyVaultAdminRoleId, currentUserId)
+  properties: {
+    roleDefinitionId: keyVaultAdminRoleId
+    principalId: currentUserId
+    principalType: 'User'
   }
+}
 
 //
 //   E V E N T   G R I D

diff --git a/dev-infrastructure/templates/svc-cluster.bicep b/dev-infrastructure/templates/svc-cluster.bicep
@@ -57,19 +57,18 @@ module svcCluster '../modules/aks-cluster-base.bicep' = {
 }
 var frontendMI = filter(svcCluster.outputs.userAssignedIdentities, id => id.uamiName == 'frontend')[0]
 
-module rpCosmosDb '../modules/rp-cosmos.bicep' =
-  if (deployFrontendCosmos) {
-    name: 'rp_cosmos_db'
-    scope: resourceGroup()
-    params: {
-      location: location
-      aksNodeSubnetId: svcCluster.outputs.aksNodeSubnetId
-      vnetId: svcCluster.outputs.aksVnetId
-      disableLocalAuth: disableLocalAuth
-      userAssignedMI: frontendMI.uamiID
-      uamiPrincipalId: frontendMI.uamiPrincipalID
-    }
+module rpCosmosDb '../modules/rp-cosmos.bicep' = if (deployFrontendCosmos) {
+  name: 'rp_cosmos_db'
+  scope: resourceGroup()
+  params: {
+    location: location
+    aksNodeSubnetId: svcCluster.outputs.aksNodeSubnetId
+    vnetId: svcCluster.outputs.aksVnetId
+    disableLocalAuth: disableLocalAuth
+    userAssignedMI: frontendMI.uamiID
+    uamiPrincipalId: frontendMI.uamiPrincipalID
   }
+}
 
 output frontend_mi_client_id string = frontendMI.uamiClientID