Merge pull request #339 from microsoft/dev

fixed issue with sharedresourcetemplate for org and prj
microsoft · May 10, 2022 · cfab301 · cfab301
2 parents ff2e827 + 5015496
commit cfab301
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/TeamCloud.Orchestrator/Command/Activities/Organizations/OrganizationDeployActivity.cs b/src/TeamCloud.Orchestrator/Command/Activities/Organizations/OrganizationDeployActivity.cs
@@ -46,7 +46,7 @@ public async Task<string> Run(
             var template = new SharedResourcesTemplate();
 
             template.Parameters["organizationId"] = organization.Id;
-            template.Parameters["organizationSlug"] = organization.Slug;
+            template.Parameters["organizationName"] = organization.Slug;
             template.Parameters["organizationTags"] = organization.GetWellKnownTags();
 
 

diff --git a/src/TeamCloud.Orchestrator/TeamCloud.Orchestrator.csproj b/src/TeamCloud.Orchestrator/TeamCloud.Orchestrator.csproj
@@ -85,7 +85,7 @@
 
   <Target Name="TranspileBicepToARM" BeforeTargets="Build">
     <Message Text="Transpiling .\Templates\SharedResourcesTemplate.bicep into .\Templates\SharedResourcesTemplate.json" />
-    <Exec Command="az bicep build --file SharedResourcesTemplate.bicep" WorkingDirectory="Templates" />
+    <Exec Command="az bicep build --file SharedResourcesTemplate.bicep --outfile SharedResourcesTemplate.json" WorkingDirectory="Templates" />
   </Target>
 
   <Target Name="UserSecretIdInfo" BeforeTargets="PreBuildEvent" Condition="'$(UserSecretsId)' != ''">

diff --git a/src/TeamCloud.Orchestrator/Templates/SharedResourcesTemplate.bicep b/src/TeamCloud.Orchestrator/Templates/SharedResourcesTemplate.bicep
@@ -9,7 +9,7 @@ param projectTags object = {}
 @minLength(36)
 @maxLength(36)
 param organizationId string
-param organizationSlug string
+param organizationName string
 param organizationTags object = {}
 
 param deploymentScopes array = []
@@ -20,7 +20,7 @@ var projectResourceGroupName = 'TCP-${projectName}-${uniqueString(projectId)}'
 var projectDeploymentName = take('${deployment().name}-project', 64)
 
 var deployOrganization = !deployProject
-var organizationResourceGroupName = 'TCO-${organizationSlug}-${uniqueString(organizationId)}'
+var organizationResourceGroupName = 'TCO-${organizationName}-${uniqueString(organizationId)}'
 var organizationDeploymentName = take('${deployment().name}-organization', 64)
 
 resource organizationResourceGroup 'Microsoft.Resources/resourceGroups@2019-10-01' = if (deployOrganization) {

diff --git a/src/TeamCloud.Orchestrator/Templates/SharedResourcesTemplate.json b/src/TeamCloud.Orchestrator/Templates/SharedResourcesTemplate.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.6.1.6515",
-      "templateHash": "1437278143323890797"
+      "templateHash": "1106573156801624642"
     }
   },
   "parameters": {
@@ -28,7 +28,7 @@
       "maxLength": 36,
       "minLength": 36
     },
-    "organizationSlug": {
+    "organizationName": {
       "type": "string"
     },
     "organizationTags": {
@@ -49,7 +49,7 @@
     "projectResourceGroupName": "[format('TCP-{0}-{1}', parameters('projectName'), uniqueString(parameters('projectId')))]",
     "projectDeploymentName": "[take(format('{0}-project', deployment().name), 64)]",
     "deployOrganization": "[not(variables('deployProject'))]",
-    "organizationResourceGroupName": "[format('TCO-{0}-{1}', parameters('organizationSlug'), uniqueString(parameters('organizationId')))]",
+    "organizationResourceGroupName": "[format('TCO-{0}-{1}', parameters('organizationName'), uniqueString(parameters('organizationId')))]",
     "organizationDeploymentName": "[take(format('{0}-organization', deployment().name), 64)]"
   },
   "resources": [