Merge 801b24b into a85e350

ssc-sp · Sep 29, 2023 · 362fc98 · 362fc98
2 parents a85e350 + 801b24b
commit 362fc98
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/Portal/src/Datahub.Functions/TerraformOutputHandler.cs b/Portal/src/Datahub.Functions/TerraformOutputHandler.cs
@@ -100,6 +100,13 @@ private async Task ProcessPostTerraformTriggers(IReadOnlyDictionary<string, Terr
             _logger.LogInformation("Project version is below 2.13.0, skipping post terraform triggers");
             return;
         }
+
+        if(!output.ContainsKey(TerraformVariables.OutputAzureDatabricksWorkspaceUrl) 
+           || string.IsNullOrWhiteSpace(output[TerraformVariables.OutputAzureDatabricksWorkspaceUrl].Value))
+        {
+           _logger.LogInformation("Azure Databricks workspace url is null or empty, skipping post terraform triggers");
+           return;
+        }
 
         // handle external user permissions
         var projectAcronym = output[TerraformVariables.OutputProjectAcronym];

diff --git a/Portal/src/Datahub.Infrastructure/Services/ProjectCreationService.cs b/Portal/src/Datahub.Infrastructure/Services/ProjectCreationService.cs
@@ -125,7 +125,7 @@ public async Task<bool> CreateProjectAsync(string projectName, string? acronym,
 
                 await AddProjectToDb(user, projectName, acronym, organization);
 
-                await CreateNewTemplateProjectResourceAsync(acronym);
+                await CreateNewTemplateProjectResourceAsync(acronym); 
 
                 var currentPortalUser = await _userInformationService.GetCurrentPortalUserAsync();
                 var workspaceDefinition = await _resourceMessagingService.GetWorkspaceDefinition(acronym, currentPortalUser.Email);

diff --git a/Portal/src/Datahub.Portal/Pages/Project/DataProject/ProjectInfo.razor b/Portal/src/Datahub.Portal/Pages/Project/DataProject/ProjectInfo.razor
@@ -127,10 +127,10 @@
                 </MudLink>
             </MudAlert>
         }
-        else if (_project.Project_Phase == TerraformOutputStatus.PendingApproval)
-        {
-            <MudAlert Severity="Severity.Warning">@Localizer["The workspace is currently being configured in Azure. No resources can be provisioned until this step is completed."]</MudAlert>
-        }
+        @* else if (_project.Project_Phase == TerraformOutputStatus.PendingApproval) *@
+        @* { *@
+        @*     <MudAlert Severity="Severity.Warning">@Localizer["The workspace is currently being configured in Azure. No resources can be provisioned until this step is completed."]</MudAlert> *@
+        @* } *@
     </DatahubAuthView>
     <DHMarkdown class="description" Content="@GetProjectDescription()"/>
 </MudStack>

diff --git a/Portal/src/Datahub.ProjectTools/Buttons/RequestingButton.razor b/Portal/src/Datahub.ProjectTools/Buttons/RequestingButton.razor
@@ -37,12 +37,12 @@ else if (ResourceRequested)
         @Localizer["Resource is being provisioned"]
     </MudButton>
 }
-else if (Project?.Project_Phase == TerraformOutputStatus.PendingApproval)
-{
-    <MudButton Size="Size.Small" Variant="Variant.Filled" Disabled EndIcon="@Icons.Custom.Brands.MicrosoftAzure">
-        @Localizer["Configuring Azure"]
-    </MudButton>
-}
+@* else if (Project?.Project_Phase == TerraformOutputStatus.PendingApproval) *@
+@* { *@
+@*     <MudButton Size="Size.Small" Variant="Variant.Filled" Disabled EndIcon="@Icons.Custom.Brands.MicrosoftAzure"> *@
+@*         @Localizer["Configuring Azure"] *@
+@*     </MudButton> *@
+@* } *@
 else
 {
     <MudButton Size="Size.Small" OnClick="@OnRequestService" Variant="Variant.Filled" EndIcon="fas fa-layer-plus" Color="Color.Primary">