Add badges and improve deployment (#22)

paule96 · web-flow · commit eea403ee0470 · 2022-04-02T20:00:17.000+02:00
* add badges

* improve deployment story

* make the deploy ps1 more linux frindly

* fix the defaul cors rules

* fix azure pipeline yaml

* fix name of deployments

* change deployment in azure devops

* try to fix azure part in the yaml

* remove stupid code.

* fix pathes in the azure deployment

* finally fix the azure pipeline

* add link to demo

* fix azure pipelines yml

* fix .net build

* fix archive

* fix caseing in archive task

* fix azure pipeline again
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build_and_deploy_job:
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    if: (github.event_name == 'pull_request' && github.event.action != 'closed')
     runs-on: ubuntu-latest
     name: Build and Deploy Job
     steps:
@@ -80,4 +80,4 @@ jobs:
       - name: compile bicep
         uses: Azure/bicep-build-action@v1.0.0
         with:
-          bicepFilePath: main.bicep
+          bicepFilePath: main.bicep
diff --git a/Readme.md b/Readme.md
@@ -10,6 +10,15 @@ This can be used on the download page:
 
 ![Download](docs/.assets/ce9c3c1a-eb2d-4222-befb-fc57b8823404.png)
 
+A demo can be used here:
+[https://kind-dune-004c2c103.azurestaticapps.net](https://kind-dune-004c2c103.azurestaticapps.net)
+
+## Status
+
+| Azure DevOps | GitHub Action |
+| ------------ | ------------- |
+| [![Build Status](https://dev.azure.com/czon/CZ.Azure.FileExchange/_apis/build/status/codez-one.CZ.Azure.FileExchange?branchName=main)](https://dev.azure.com/czon/CZ.Azure.FileExchange/_build/latest?definitionId=9&branchName=main) | [![Azure Static Web Apps CI/CD](https://github.com/codez-one/CZ.Azure.FileExchange/actions/workflows/main.yml/badge.svg)](https://github.com/codez-one/CZ.Azure.FileExchange/actions/workflows/main.yml) |
+
 ## Deployment
 
 In every [release](https://github.com/codez-one/CZ.Azure.FileExchange/releases/latest) of this repository you will find a `azuredeploy.json`.
@@ -29,6 +38,8 @@ $token = Read-Host -MaskInput;
 
 ### Build App
 
+> Important: If you want deploy this, build it on linux!
+
 ```powershell
 dotnet build
 dotnet publish .\src\CZ.Azure.FileExchange\ -o temp/fe
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -40,18 +40,20 @@ stages:
       displayName: Publish frontend
       inputs:
         command: 'publish'
-        projects: CZ.Azure.FileExchange.csproj
+        projects: $(workingDirectory)/src/CZ.Azure.FileExchange/CZ.Azure.FileExchange.csproj
         arguments: --output $(workingDirectory)/fe/ --configuration Release
         zipAfterPublish: false
         workingDirectory: $(workingDirectory)/src/CZ.Azure.FileExchange/
+        publishWebProjects: false
     - task: DotNetCoreCLI@2
       displayName: Publish api
       inputs:
         command: 'publish'
-        projects: CZ.Azure.FileExchange.Api.csproj
+        projects: $(workingDirectory)/src/CZ.Azure.FileExchange.Api/CZ.Azure.FileExchange.Api.csproj
         arguments: --output $(workingDirectory)/api --configuration Release
         zipAfterPublish: false
         workingDirectory: $(workingDirectory)/src/CZ.Azure.FileExchange.Api/
+        publishWebProjects: false
     - script: 'az bicep build --file $(workingDirectory)/main.bicep --outfile $(Build.ArtifactStagingDirectory)/azuredeploy.json'
       displayName: build bicep file
     - task: ArchiveFiles@2
@@ -68,26 +70,31 @@ stages:
         archiveFile: $(Build.ArtifactStagingDirectory)/API.zip
         archiveType: zip
         includeRootFolder: false
-        rootFolderOrFile: $(workingDirectory)/api/CZ.Azure.FileExchange/
+        rootFolderOrFile: $(workingDirectory)/api/CZ.Azure.FileExchange.Api/
         replaceExistingArchive: true
+    - task: CopyFiles@2
+      displayName: "copy deploy script to the artifact bundle"
+      inputs:
+        SourceFolder: $(workingDirectory)/build/
+        Contents: '**.ps1'
+        TargetFolder: $(Build.ArtifactStagingDirectory)/
     - task: PublishBuildArtifacts@1
       inputs:
         PathtoPublish: '$(Build.ArtifactStagingDirectory)'
         ArtifactName: 'drop'
         publishLocation: Container
 
-- stage: Release
-  displayName: Release to github
+- stage: ReleaseToGithub
+  displayName: Release to Github
   dependsOn: Build
   condition: succeeded()
 
   jobs:
-  - deployment: Deploy
-    displayName: Deploy
+  - deployment: DeployGithub
+    displayName: "Deploy - Github Release"
     environment: 'development'
     pool:
       vmImage: $(vmImageName)
-
     strategy:
       runOnce:
         deploy:
@@ -107,4 +114,36 @@ stages:
               tagSource: userSpecifiedTag
               tag: $(Build.BuildNumber)
               changeLogCompareToRelease: 'lastFullRelease'
-              changeLogType: 'commitBased'
+              changeLogType: 'commitBased'
+- stage: ReleaseToAzure
+  displayName: Release to Azure
+  dependsOn: Build
+  condition: succeeded()
+  jobs:
+    - deployment: DeployAzure
+      displayName: "Deploy - Azure Environment"
+      environment: 'development'
+      pool:
+        vmImage: $(vmImageName)
+      strategy:
+        runOnce:
+          deploy:
+            steps:
+              - task: AzureResourceManagerTemplateDeployment@3
+                displayName: "Deploy ARM template to Azure"
+                inputs:
+                  deploymentScope: 'Resource Group'
+                  azureResourceManagerConnection: 'Nutzungsbasierte Bezahlung (current) (be99037d-eba5-4420-a2d3-0812c5dd9c51)'
+                  subscriptionId: 'be99037d-eba5-4420-a2d3-0812c5dd9c51'
+                  action: 'Create Or Update Resource Group'
+                  resourceGroupName: 'pajetestfileshare'
+                  location: 'West Europe'
+                  templateLocation: 'Linked artifact'
+                  csmFile: '$(Pipeline.Workspace)/drop/azuredeploy.json'
+                  overrideParameters: '-name pajetestfileshare'
+                  deploymentMode: 'Incremental'
+              - task: PowerShell@2
+                displayName: "Deploy static webapp"
+                inputs:
+                  filePath: '$(Pipeline.Workspace)/drop/deploy.ps1'
+                  arguments: '-Token $(staticWebSiteSecret) -appBuildOutput $(Pipeline.Workspace)/drop/Frontend.zip -apiBuildOutput $(Pipeline.Workspace)/drop/API.zip -branchName main -Verbose'
diff --git a/build/deploy.ps1 b/build/deploy.ps1
@@ -15,7 +15,7 @@ param (
     # Set a custom working directory.
     [Parameter(Mandatory = $false)]
     [string]
-    $workingDir = "$pwd\temp\temp\",
+    $workingDir = "$pwd/temp/temp/",
     # Set a branch name that is used in the deciption of the envrionment
     [Parameter(Mandatory = $false)]
     [string]
@@ -34,8 +34,8 @@ param (
     $Delete
 )
 $EventInfo = $null;
-if ($false -eq [string]::IsNullOrWhiteSpace($pullrequestTitle) -or 
-    $false -eq [string]::IsNullOrWhiteSpace($envrionmentName) -or 
+if ($false -eq [string]::IsNullOrWhiteSpace($pullrequestTitle) -or
+    $false -eq [string]::IsNullOrWhiteSpace($envrionmentName) -or
     $false -eq [string]::IsNullOrWhiteSpace($branchName)
 ) {
     $EventInfo = @{
@@ -90,29 +90,46 @@ if($Delete){
     break;
 }
 
-New-Item -ItemType Directory -Force $workingDir;
-Compress-Archive "$apiBuildOutput\*" -DestinationPath $workingDir/api.zip;
-Compress-Archive "$appBuildOutput\*" -DestinationPath $workingDir/app.zip;
-$apiHash = (Get-FileHash $workingDir/api.zip -Algorithm MD5).Hash;
-
-
-
-
+$apiZipToUpload = ([string]::Empty);
+if((Get-Item $apiBuildOutput).PSIsContainer){
+    New-Item -ItemType Directory -Force $workingDir;
+    $apiZipToUpload = "$workingDir/api.zip";
+    Compress-Archive "$apiBuildOutput\*" -DestinationPath $apiZipToUpload -Force;
+}else{
+    $apiZipToUpload = $apiBuildOutput;
+}
+$appZipToUpload = ([string]::Empty);
+if((Get-Item $appBuildOutput).PSIsContainer){
+    New-Item -ItemType Directory -Force $workingDir;
+    $appZipToUpload = "$workingDir/app.zip";
+    Compress-Archive "$appBuildOutput\*" -DestinationPath $appZipToUpload -Force;
+}else{
+    $appZipToUpload = $appBuildOutput;
+}
+$apiHash = (Get-FileHash $apiZipToUpload -Algorithm MD5).Hash;
+
+function Get-ArchiveEntriesCount {
+    param (
+        [string]$pathToZip
+    )
+    $fileHandle = [System.IO.Compression.ZipFile]::OpenRead("$pathToZip");
+    $count = $fileHandle.Entries.Count;
+    $fileHandle.Dispose();
+    return $count;
+}
 
 $siteUrl = $response.response.siteUrl;
 Write-Verbose "The site to be update is: $siteUrl";
 
-
-
 $metaDeployInforamtion = @{
     EventInfo   = $EventInfo;
     PollingInfo = $null;
     UploadInfo  = @{
         # this must be always different. Else it wouldn't upload the api
         ApiContentHash          = "$apiHash";
-        ApiSizeInBytes          = (Get-Item $workingDir/api.zip).Length;
-        AppFileCount            = (Get-ChildItem $appPath -Recurse -File | Measure-Object).Count;
-        AppSizeInBytes          = (Get-Item $workingDir/app.zip).Length;
+        ApiSizeInBytes          = (Get-Item $apiZipToUpload).Length;
+        AppFileCount            = (Get-ArchiveEntriesCount -pathToZip $appZipToUpload);
+        AppSizeInBytes          = (Get-Item $appZipToUpload).Length;
         ConfiguredRoles         = @();
         DefaultFileType         = "index.html";
         # this can be anything
@@ -142,7 +159,7 @@ $metaDeployInforamtionBody;
 if ($null -ne $response.response.packageUris.api -and
     [string]::IsNullOrWhiteSpace($response.response.packageUris.api) -eq $false) {
     $blobGuid = (New-Guid).Guid.ToString();
-    Invoke-WebRequest -Method Put -Uri $response.response.packageUris.api -InFile $workingDir/api.zip -Headers @{
+    Invoke-WebRequest -Method Put -Uri $response.response.packageUris.api -InFile $apiZipToUpload -Headers @{
         "x-ms-blob-type"                = "BlockBlob";
         "x-ms-client-request-id"        = "$blobGuid";
         "x-ms-return-client-request-id" = "true";
@@ -156,7 +173,7 @@ else {
 if ($null -ne $response.response.packageUris.app -and
     [string]::IsNullOrWhiteSpace($response.response.packageUris.app) -eq $false) {
     $blobGuid = (New-Guid).Guid.ToString();
-    Invoke-WebRequest -Method Put -Uri $response.response.packageUris.app -InFile $workingDir/app.zip -Headers @{
+    Invoke-WebRequest -Method Put -Uri $response.response.packageUris.app -InFile $appZipToUpload -Headers @{
         "x-ms-blob-type"                = "BlockBlob";
         "x-ms-client-request-id"        = "$blobGuid";
         "x-ms-return-client-request-id" = "true";
@@ -189,7 +206,8 @@ while (
     $response;
     Start-Sleep 2;
 }
-
-Remove-Item -Recurse -Force $workingDir;
+if((Test-Path $workingDir)){
+    Remove-Item -Recurse -Force $workingDir;
+}
 $response.response.siteUrl;
 Write-Output "::set-output name=SiteUrl::$($response.response.siteUrl)";
diff --git a/main.bicep b/main.bicep
@@ -43,7 +43,7 @@ resource storageBlobServiceConfig 'Microsoft.Storage/storageAccounts/blobService
       corsRules: [
         {
           allowedOrigins: [
-            website.properties.defaultHostname
+            'https://${website.properties.defaultHostname}'
             'https://*.${location}.azurestaticapps.net'
           ]
           exposedHeaders: [

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ resource storageBlobServiceConfig 'Microsoft.Storage/storageAccounts/blobService`
`43`	`43`	`corsRules: [`
`44`	`44`	`{`
`45`	`45`	`allowedOrigins: [`
`46`		`- website.properties.defaultHostname`
	`46`	`+ 'https://${website.properties.defaultHostname}'`
`47`	`47`	`'https://*.${location}.azurestaticapps.net'`
`48`	`48`	`]`
`49`	`49`	`exposedHeaders: [`