fixed cloud connector script

cbellee · Jan 5, 2025 · 3fb67f8 · 3fb67f8
1 parent 887122a
commit 3fb67f8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -132,14 +132,6 @@ jobs:
       with:
         creds: ${{ secrets.AZURE_CREDENTIALS }}
 
-    - name: cloudflareDomain
-      id: cloudflareDomain
-      uses: azure/PowerShell@v2
-      continue-on-error: false
-      with:
-        azPSVersion: "latest"
-        inlineScript: ./scripts/cloudflare-dns.ps1 -cloudFlareApiToken ${cloudFlareApiToken} -cloudFlareZoneId ${cloudFlareZoneId} -storageAccountWebEndpoint ${storage.outputs.webEndpoint} -cName ${cNameRecord}
-
     - name: deploy-infra-cli
       id: deploy-infra-cli
       uses: azure/cli@v2

diff --git a/infra/main.bicep b/infra/main.bicep
@@ -549,7 +549,27 @@ resource enableCloudConnector 'Microsoft.Resources/deploymentScripts@2020-10-01'
   ]
 }
 
-module storageCustomDomain './modules/stor.bicep' = {
+resource setStorageCustomDomain 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
+  name: 'setStorageCustomDomain'
+  location: resourceGroup().location
+  kind: 'AzurePowerShell'
+  properties: {
+    forceUpdateTag: utcValue
+    azPowerShellVersion: '7.0'
+    timeout: 'PT5M'
+    retentionInterval: 'PT1H'
+    storageAccountSettings: {
+      storageAccountName: storageAccountName
+      storageAccountKey: storage.outputs.key
+    }
+    scriptContent: '$storageAccount = Get-AzStorageAccount -ResourceGroupName resourceGroup().name -Name storageAccountName ; $storageAccount.CustomDomain = New-Object Microsoft.Azure.Management.Storage.Models.CustomDomain ; $storageAccount.CustomDomain.Name = "${cNameRecord}.${zoneName}" ; $storageAccount.CustomDomain.UseSubDomainName = $false ; Set-AzStorageAccount -CustomDomain $storageAccount.CustomDomain -ResourceGroupName ${resourceGroup().name} -Name ${storageAccountName}'
+  }
+  dependsOn: [
+    //enableCustomDomainNotProxied
+  ]
+}
+
+/* module storageCustomDomain './modules/stor.bicep' = {
   name: 'StorageCustomDomainDeployment'
   params: {
     kind: 'StorageV2'
@@ -565,7 +585,7 @@ module storageCustomDomain './modules/stor.bicep' = {
     //enableCustomDomainNotProxied
     enableCloudConnector
   ]
-}
+} */
 
 resource enableCustomDomainProxied 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
   name: 'enableCustomDomainProxied'
@@ -584,7 +604,7 @@ resource enableCustomDomainProxied 'Microsoft.Resources/deploymentScripts@2020-1
     arguments: '-cloudFlareApiToken ${cloudFlareApiToken} -storageAccountWebEndpoint ${storage.outputs.webEndpoint} -cloudFlareZoneId ${cloudFlareZoneId} -cName ${cNameRecord} -ZoneName ${zoneName} -ProxyDns'
   }
   dependsOn: [
-    storageCustomDomain
+    setStorageCustomDomain
   ]
 }