Skip to content

Commit

Permalink
remove environment name for individual resource
Browse files Browse the repository at this point in the history
  • Loading branch information
luxu-ms committed May 9, 2024
1 parent 0f82cfa commit cf9a232
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
3 changes: 0 additions & 3 deletions Environments/Todo-Mongo-AKS/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ var sharedAKSResourceGroup = '${sharedAKSProjectName}-${sharedAKSEnvironmentName

var abbrs = loadJsonContent('./abbreviations.json')
var resourceToken = toLower(uniqueString(subscription().id, environmentName, location))
var tags = { 'azd-env-name': environmentName }

// Store secrets in a keyvault
module keyVault './core/security/keyvault.bicep' = {
Expand Down Expand Up @@ -85,7 +84,6 @@ module cosmos './app/db.bicep' = {
accountName: !empty(cosmosAccountName) ? cosmosAccountName : '${abbrs.documentDBDatabaseAccounts}${resourceToken}'
databaseName: cosmosDatabaseName
location: location
tags: tags
keyVaultName: keyVault.outputs.name
}
}
Expand All @@ -109,7 +107,6 @@ resource configStoreKeyValue 'Microsoft.AppConfiguration/configurationStores/key
properties: {
value: cosmos.outputs.connectionStringKey
contentType: contentType
tags: tags
}
}

Expand Down
10 changes: 2 additions & 8 deletions Environments/Todo-Mongo-AKS/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,20 @@ runner: ARM
templatePath: azuredeploy.json

parameters:
- id: "environmentName"
name: "Environment Name (e.g. testenv)"
description: "Name of the Environment"
type: string
required: true

- id: "location"
name: "Region (e.g. eastus)"
description: "Location of the resources"
type: string
required: true

- id: "sharedAKSProjectName"
name: "sharedAKSProjectName"
name: "Shared AKS Project Name"
description: "ADE Project name for the shared AKS cluster"
type: string
required: true

- id: "sharedAKSEnvironmentName"
name: "sharedAKSEnvironmentName"
name: "Shared AKS Environment Name"
description: "ADE environment name for the shared AKS cluster"
type: string
required: true

0 comments on commit cf9a232

Please sign in to comment.