Merge branch 'main' into horizontal-key-icon

Altinn · Feb 13, 2025 · 3e60f4c · 3e60f4c
2 parents 1a8795d + a5839e1
commit 3e60f4c
Show file tree

Hide file tree

Showing 82 changed files with 520 additions and 1,929 deletions.
diff --git a/.github/workflows/deploy-eid-logger.yaml b/.github/workflows/deploy-eid-logger.yaml
diff --git a/.github/workflows/eid-logger-pr-build.yaml b/.github/workflows/eid-logger-pr-build.yaml
diff --git a/.github/workflows/lint-pr.yaml b/.github/workflows/lint-pr.yaml
@@ -15,48 +15,3 @@ jobs:
       - uses: amannn/action-semantic-pull-request@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          scopes: |
-            accessibility
-            analytics
-            app-deploy
-            app-preview
-            attachments
-            authentication
-            authorization
-            contact
-            content-library
-            codelist
-            dashboard
-            data-modeling
-            data-storage
-            dependencies
-            deps
-            designer
-            designsystem
-            documentation
-            form-layout
-            header
-            infrastructure
-            language
-            login
-            message
-            message-box
-            overview
-            pdf
-            prefill
-            process
-            receipt
-            register
-            resource-adm
-            resource-registry
-            settings
-            studio-root
-            subform
-            testing
-            text
-            text-editor
-            ui-component
-            ui-editor
-            ux
-            workspace
diff --git a/backend/src/Designer/Controllers/RepositoryController.cs b/backend/src/Designer/Controllers/RepositoryController.cs
@@ -462,7 +462,7 @@ public ActionResult ContentsZip(string org, string repository, [FromQuery] bool
                         .Status(appContext.Org, appContext.Repo)
                         .Where(f => f.FileStatus != FileStatus.DeletedFromWorkdir)
                         .Select(f => f.FilePath);
-                };
+                }
 
                 foreach (var changedFile in changedFiles)
                 {

diff --git a/backend/src/Designer/EventHandlers/AppDeployed/AppDeployedEidLoggerHandler.cs b/backend/src/Designer/EventHandlers/AppDeployed/AppDeployedEidLoggerHandler.cs
diff --git a/...nd/src/Designer/EventHandlers/DeploymentPipelineQueued/DeploymentPipelineQueuedHandler.cs b/...nd/src/Designer/EventHandlers/DeploymentPipelineQueued/DeploymentPipelineQueuedHandler.cs
@@ -1,5 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
+using Altinn.Studio.Designer.Scheduling;
 using MediatR;
 using Quartz;
 
@@ -8,8 +9,6 @@ namespace Altinn.Studio.Designer.EventHandlers.DeploymentPipelineQueued;
 public class DeploymentPipelineQueuedHandler : INotificationHandler<Events.DeploymentPipelineQueued>
 {
     private readonly ISchedulerFactory _schedulerFactory;
-    private const string DeploymentPipelineGroup = nameof(DeploymentPipelineGroup);
-    private const int PollingIntervalInSeconds = 10;
 
     public DeploymentPipelineQueuedHandler(ISchedulerFactory schedulerFactory)
     {
@@ -21,22 +20,24 @@ public async Task Handle(Events.DeploymentPipelineQueued notification, Cancellat
         var scheduler = await _schedulerFactory.GetScheduler(cancellationToken);
         var jobData = new JobDataMap
         {
-            { "org", notification.EditingContext.Org },
-            { "app", notification.EditingContext.Repo },
-            { "developer", notification.EditingContext.Developer },
-            { "buildId", notification.BuildId.ToString() }
+            { DeploymentPipelinePollingJobConstants.Arguments.Org, notification.EditingContext.Org },
+            { DeploymentPipelinePollingJobConstants.Arguments.App, notification.EditingContext.Repo },
+            { DeploymentPipelinePollingJobConstants.Arguments.Developer, notification.EditingContext.Developer },
+            { DeploymentPipelinePollingJobConstants.Arguments.BuildId, notification.BuildId.ToString() },
+            { DeploymentPipelinePollingJobConstants.Arguments.PipelineType, notification.PipelineType.ToString() },
+            { DeploymentPipelinePollingJobConstants.Arguments.Environment, notification.Environment }
         };
 
         var job = JobBuilder.Create<Scheduling.DeploymentPipelinePollingJob>()
-            .WithIdentity($"{nameof(Scheduling.DeploymentPipelinePollingJob)}-{notification.EditingContext.Org}-{notification.EditingContext.Repo}-{notification.BuildId}", DeploymentPipelineGroup)
+            .WithIdentity(DeploymentPipelinePollingJobConstants.JobIdentity(notification.EditingContext, notification.BuildId), DeploymentPipelinePollingJobConstants.DeploymentPipelineGroup)
             .UsingJobData(jobData)
             .Build();
 
         var trigger = TriggerBuilder.Create()
-            .WithIdentity($"{nameof(Scheduling.DeploymentPipelinePollingJob)}-{notification.EditingContext.Org}-{notification.EditingContext.Repo}-{notification.BuildId}", DeploymentPipelineGroup)
+            .WithIdentity(DeploymentPipelinePollingJobConstants.TriggerIdentity(notification.EditingContext, notification.BuildId), DeploymentPipelinePollingJobConstants.DeploymentPipelineGroup)
             .StartNow()
             .WithSimpleSchedule(x => x
-                .WithIntervalInSeconds(PollingIntervalInSeconds)
+                .WithIntervalInSeconds(DeploymentPipelinePollingJobConstants.PollingIntervalInSeconds)
                 .RepeatForever())
             .Build();
 

diff --git a/backend/src/Designer/Events/AppDeployedEvent.cs b/backend/src/Designer/Events/AppDeployedEvent.cs
diff --git a/backend/src/Designer/Events/DeploymentPipelineQueued.cs b/backend/src/Designer/Events/DeploymentPipelineQueued.cs
@@ -7,4 +7,12 @@ public class DeploymentPipelineQueued : INotification
 {
     public required AltinnRepoEditingContext EditingContext { get; set; }
     public required int BuildId { get; set; }
+    public required string Environment { get; set; }
+    public required PipelineType PipelineType { get; set; }
+}
+
+public enum PipelineType
+{
+    Deploy,
+    Undeploy
 }
diff --git a/backend/src/Designer/Helpers/HttpClientHelper.cs b/backend/src/Designer/Helpers/HttpClientHelper.cs