use submodules

freddydk · freddydk · commit 0b723eb70b8c · 2022-12-08T08:29:08.000+01:00
diff --git a/BC.ALGoHelper.module.json b/BC.ALGoHelper.module.json
@@ -8,8 +8,7 @@
         "Desktop"
     ],
     "RequiredModules": [
-        "BC.HelperFunctions",
-        "BC.AuthenticationHelper"
+        "BC.HelperFunctions"
     ],
     "files": [
         "InitializeModule.ps1",
diff --git a/BC.ALGoHelper.psm1 b/BC.ALGoHelper.psm1
@@ -7,7 +7,7 @@ param(
     -Silent:$Silent `
     -bcContainerHelperConfigFile $bcContainerHelperConfigFile `
     -moduleName $MyInvocation.MyCommand.Name `
-    -moduleDependencies @( 'BC.HelperFunctions', 'BC.AuthenticationHelper' )
+    -moduleDependencies @( 'BC.HelperFunctions' )
 
 . (Join-Path $PSScriptRoot "HelperFunctions.ps1")
 
diff --git a/BC.AppSourceHelper.module.json b/BC.AppSourceHelper.module.json
@@ -8,8 +8,7 @@
         "Desktop"
     ],
     "RequiredModules": [
-        "BC.HelperFunctions",
-        "BC.AuthenticationHelper"
+        "BC.HelperFunctions"
     ],
     "files": [
         "InitializeModule.ps1",
diff --git a/BC.AppSourceHelper.psm1 b/BC.AppSourceHelper.psm1
@@ -7,7 +7,7 @@ param(
     -Silent:$Silent `
     -bcContainerHelperConfigFile $bcContainerHelperConfigFile `
     -moduleName $MyInvocation.MyCommand.Name `
-    -moduleDependencies @( 'BC.HelperFunctions', 'BC.AuthenticationHelper' )
+    -moduleDependencies @( 'BC.HelperFunctions' )
 
 . (Join-Path $PSScriptRoot "HelperFunctions.ps1")
 
diff --git a/BC.AuthenticationHelper.psm1 b/BC.AuthenticationHelper.psm1
@@ -11,6 +11,6 @@ param(
 
 . (Join-Path $PSScriptRoot "HelperFunctions.ps1")
 
-# BC SaaS specific functions
+# BC Authentication helper functions
 . (Join-Path $PSScriptRoot "Auth\New-BcAuthContext.ps1")
 . (Join-Path $PSScriptRoot "Auth\Renew-BcAuthContext.ps1")
diff --git a/BC.HelperFunctions.module.json b/BC.HelperFunctions.module.json
@@ -12,6 +12,7 @@
         "HelperFunctions.ps1",
         "TelemetryHelper.ps1",
         "Microsoft.ApplicationInsights.dll",
-        "Common\\*"
+        "Common\\*",
+        "Auth\\*"
     ]
 }
diff --git a/BC.HelperFunctions.psm1 b/BC.HelperFunctions.psm1
@@ -215,3 +215,7 @@ Export-ModuleMember -Function TrackException
 . (Join-Path $PSScriptRoot "Common\Invoke-gh.ps1")
 . (Join-Path $PSScriptRoot "Common\Invoke-git.ps1")
 . (Join-Path $PSScriptRoot "Common\ConvertTo-OrderedDictionary.ps1")
+
+# BC Authentication helper functions
+. (Join-Path $PSScriptRoot "Auth\New-BcAuthContext.ps1")
+. (Join-Path $PSScriptRoot "Auth\Renew-BcAuthContext.ps1")
diff --git a/BC.NuGetHelper.module.json b/BC.NuGetHelper.module.json
@@ -8,8 +8,7 @@
         "Desktop"
     ],
     "RequiredModules": [
-        "BC.HelperFunctions",
-        "BC.AuthenticationHelper"
+        "BC.HelperFunctions"
     ],
     "files": [
         "InitializeModule.ps1",
diff --git a/BC.NuGetHelper.psm1 b/BC.NuGetHelper.psm1
@@ -7,7 +7,7 @@ param(
     -Silent:$Silent `
     -bcContainerHelperConfigFile $bcContainerHelperConfigFile `
     -moduleName $MyInvocation.MyCommand.Name `
-    -moduleDependencies @( 'BC.HelperFunctions', 'BC.AuthenticationHelper' )
+    -moduleDependencies @( 'BC.HelperFunctions' )
 
 . (Join-Path $PSScriptRoot "HelperFunctions.ps1")
 
diff --git a/BC.SaasHelper.module.json b/BC.SaasHelper.module.json
@@ -8,8 +8,7 @@
         "Desktop"
     ],
     "RequiredModules": [
-        "BC.HelperFunctions",
-        "BC.AuthenticationHelper"
+        "BC.HelperFunctions"
     ],
     "files": [
         "InitializeModule.ps1",
diff --git a/BC.SaasHelper.psm1 b/BC.SaasHelper.psm1
@@ -7,7 +7,7 @@ param(
     -Silent:$Silent `
     -bcContainerHelperConfigFile $bcContainerHelperConfigFile `
     -moduleName $MyInvocation.MyCommand.Name `
-    -moduleDependencies @( 'BC.HelperFunctions', 'BC.AuthenticationHelper' )
+    -moduleDependencies @( 'BC.HelperFunctions' )
 
 . (Join-Path $PSScriptRoot "HelperFunctions.ps1")
 
diff --git a/BC.module.json b/BC.module.json
@@ -9,7 +9,6 @@
     ],
     "RequiredModules": [
         "BC.HelperFunctions",
-        "BC.AuthenticationHelper",
         "BC.ArtifactsHelper",
         "BC.AppSourceHelper",
         "BC.ALGoHelper",
diff --git a/BC.psm1 b/BC.psm1
@@ -9,7 +9,6 @@ param(
     -moduleName $MyInvocation.MyCommand.Name `
     -moduleDependencies @( 
         "BC.HelperFunctions",
-        "BC.AuthenticationHelper",
         "BC.ArtifactsHelper",
         "BC.AppSourceHelper",
         "BC.ALGoHelper",
diff --git a/BcContainerHelper.ps1 b/BcContainerHelper.ps1
@@ -13,7 +13,6 @@ Remove-Module BC.NuGetHelper -ErrorAction SilentlyContinue
 Remove-Module BC.SaasHelper -ErrorAction SilentlyContinue
 Remove-Module BC.ALGoHelper -ErrorAction SilentlyContinue
 Remove-Module BC.AppSourceHelper -ErrorAction SilentlyContinue
-Remove-Module BC.AuthenticationHelper -ErrorAction SilentlyContinue
 Remove-Module BC.ArtifactsHelper -ErrorAction SilentlyContinue
 Remove-Module BC.HelperFunctions -ErrorAction SilentlyContinue
 
diff --git a/BcContainerHelper.psm1 b/BcContainerHelper.psm1
@@ -7,12 +7,16 @@ param(
     [switch] $useVolumes
 )
 
+'BC.HelperFunctions','BC.ArtifactsHelper.psm1','BC.AppSourceHelper.psm1','BC.ALGoHelper.psm1','BC.SaasHelper.psm1','BC.NuGetHelper.psm1','BC' | ForEach-Object {
+    if (Get-Module $_) { Remove-Module $_}
+}
+
 . (Join-Path $PSScriptRoot "InitializeModule.ps1") `
     -Silent:$Silent `
     -bcContainerHelperConfigFile $bcContainerHelperConfigFile `
     -moduleName $MyInvocation.MyCommand.Name
 
-Import-Module (Join-Path $PSScriptRoot 'BC.HelperFunctions.psm1') -DisableNameChecking -Global -ArgumentList $silent,$bcContainerHelperConfigFile
+    Import-Module (Join-Path $PSScriptRoot 'BC.HelperFunctions.psm1') -DisableNameChecking -Global -ArgumentList $silent,$bcContainerHelperConfigFile
 
 . (Join-Path $PSScriptRoot "HelperFunctions.ps1")
 
@@ -80,7 +84,6 @@ if (!$silent) {
 }
 
 Import-Module (Join-Path $PSScriptRoot 'BC.ArtifactsHelper.psm1') -DisableNameChecking -Global
-Import-Module (Join-Path $PSScriptRoot 'BC.AuthenticationHelper.psm1') -DisableNameChecking -Global
 Import-Module (Join-Path $PSScriptRoot 'BC.AppSourceHelper.psm1') -DisableNameChecking -Global
 Import-Module (Join-Path $PSScriptRoot 'BC.ALGoHelper.psm1') -DisableNameChecking -Global
 Import-Module (Join-Path $PSScriptRoot 'BC.SaasHelper.psm1') -DisableNameChecking -Global
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -1,5 +1,7 @@
 4.0.8
 Add parameter 'features' to Run-AlPipeline which allows for setting the compiler features 
+Add SchemaSyncMode to Publish-PerTenantExtensionApps
+Use submodules inside BcContainerHelper
 
 4.0.7
 Issue #2765 Unused param in Publish-BuildOutputToAzureFeed.ps1
diff --git a/SaaS/Publish-PerTenantExtensionApps.ps1 b/SaaS/Publish-PerTenantExtensionApps.ps1
@@ -72,10 +72,6 @@ try {
         $bcAuthContext = Renew-BcAuthContext -bcAuthContext $bcAuthContext
     }
 
-    if ($schemaSyncMode -eq "Force") {
-        $schemaSyncMode = "Force Sync"
-    }
-
     $appFolder = Join-Path (Get-TempDir) ([guid]::NewGuid().ToString())
     try {
         $appFiles = CopyAppFilesToFolder -appFiles $appFiles -folder $appFolder
@@ -94,9 +90,28 @@ try {
         $extensions = (ConvertFrom-Json $getExtensions.Content).value | Sort-Object -Property DisplayName
         
         Write-Host "Extensions before:"
-        $extensions | % { Write-Host " - $($_.DisplayName), Version $($_.versionMajor).$($_.versionMinor).$($_.versionBuild).$($_.versionRevision), Installed=$($_.isInstalled)" }
+        $extensions | ForEach-Object { Write-Host " - $($_.DisplayName), Version $($_.versionMajor).$($_.versionMinor).$($_.versionBuild).$($_.versionRevision), Installed=$($_.isInstalled)" }
         Write-Host
-        
+
+        $body = @{"schedule" = "Current Version"}
+        $appDep = $extensions | Where-Object { $_.DisplayName -eq 'Application' }
+        $appDepVer = [System.Version]"$($appDep.versionMajor).$($appDep.versionMinor).$($appDep.versionBuild).$($appDep.versionRevision)"
+        if ($appDepVer -ge [System.Version]"21.2.0.0") {
+            if ($schemaSyncMode -eq 'Force') {
+                $body."SchemaSyncMode" = "Force Sync"
+            }
+            else {
+                $body."SchemaSyncMode" = "Add"
+            }
+        }
+        else {
+            if ($schemaSyncMode -eq 'Force') {
+                throw 'SchemaSyncMode Force is not supported before version 21.2'
+            }
+        }
+        $ifMatchHeader = @{ "If-Match" = '*'}
+        $jsonHeader = @{ "Content-Type" = 'application/json'}
+        $streamHeader = @{ "Content-Type" = 'application/octet-stream'}
         try {
             Sort-AppFilesByDependencies -appFiles $appFiles | ForEach-Object {
                 Write-Host "$([System.IO.Path]::GetFileName($_))"
@@ -105,19 +120,39 @@ try {
                 $appJsonFile = Join-Path $tempFolder "app.json"
                 $appJson = [System.IO.File]::ReadAllLines($appJsonFile) | ConvertFrom-Json
                 Remove-Item -Path $tempFolder -Force -Recurse
-
+                $body | ConvertTo-Json | out-host
                 Write-Host @newLine "Publishing and Installing"
-                $body = @{
-                    "schemaSyncMode" = $schemaSyncMode
+                $extensionUpload = (Invoke-RestMethod -Method Get -Uri "$automationApiUrl/companies($companyId)/extensionUpload" -Headers $authHeaders).value
+                Write-Host @newLine "."
+                if ($extensionUpload -and $extensionUpload.systemId) {
+                    $extensionUpload = Invoke-RestMethod `
+                        -Method Patch `
+                        -Uri "$automationApiUrl/companies($companyId)/extensionUpload($($extensionUpload.systemId))" `
+                        -Headers ($authHeaders + $ifMatchHeader + $jsonHeader) `
+                        -Body ($body | ConvertTo-Json -Compress)
+                }
+                else {
+                    $ExtensionUpload = Invoke-RestMethod `
+                        -Method Post `
+                        -Uri "$automationApiUrl/companies($companyId)/extensionUpload" `
+                        -Headers ($authHeaders + $jsonHeader) `
+                        -Body ($body | ConvertTo-Json -Compress)
+                }
+                Write-Host @newLine "."
+                if ($null -eq $extensionUpload.systemId) {
+                    throw "Unable to upload extension"
                 }
-                $headers = $authHeaders
-                $headers['Content-Type'] = 'application/json';
-                $ExtensionUpload = (Invoke-RestMethod -Uri "$automationApiUrl/companies($companyId)/extensionUpload" -Headers $headers -Body (ConvertTo-Json $body)).value
+                $body = (Invoke-WebRequest $_).Content
+                Invoke-RestMethod `
+                    -Method Patch `
+                    -Uri $extensionUpload.'extensionContent@odata.mediaEditLink' `
+                    -Headers ($authHeaders + $ifMatchHeader + $streamHeader) `
+                    -Body $body | Out-Null
                 Write-Host @newLine "."    
-                $Headers = $authHeaders
-                $Headers['If-Match'] = '*';
-                $Headers['Content-Type'] = 'application/octet-stream';
-                Invoke-RestMethod -Uri "$automationApiUrl/companies($companyId)/extensionUpload($($ExtensionUpload.systemId))" -Method Patch -InFile $_ -Headers $Headers
+                Invoke-RestMethod `
+                    -Method Post `
+                    -Uri "$automationApiUrl/companies($companyId)/extensionUpload($($extensionUpload.systemId))/Microsoft.NAV.upload" `
+                    -Headers ($authHeaders + $ifMatchHeader) | Out-Null
                 Write-Host @newLine "."    
                 $completed = $false
                 $errCount = 0
@@ -162,6 +197,7 @@ try {
         }
         catch [System.Net.WebException] {
             Write-Host "ERROR $($_.Exception.Message)"
+            Write-Host $_.ScriptStackTrace
             throw (GetExtendedErrorMessage $_)
         }
         finally {
@@ -170,7 +206,7 @@ try {
             
             Write-Host
             Write-Host "Extensions after:"
-            $extensions | % { Write-Host " - $($_.DisplayName), Version $($_.versionMajor).$($_.versionMinor).$($_.versionBuild).$($_.versionRevision), Installed=$($_.isInstalled)" }
+            $extensions | ForEach-Object { Write-Host " - $($_.DisplayName), Version $($_.versionMajor).$($_.versionMinor).$($_.versionBuild).$($_.versionRevision), Installed=$($_.isInstalled)" }
         }
     }
     catch [System.Net.WebException] {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`"HelperFunctions.ps1",`
`13`	`13`	`"TelemetryHelper.ps1",`
`14`	`14`	`"Microsoft.ApplicationInsights.dll",`
`15`		`- "Common\\*"`
	`15`	`+ "Common\\*",`
	`16`	`+ "Auth\\*"`
`16`	`17`	`]`
`17`	`18`	`}`