Merge branch 'main' into 14004-when-a-component-id-is-updated-any-mat…

…ching-json-key-eg-id-type-datamodelbindings--is-also-updated

.github/scripts/release.sh

@@ -28,7 +28,7 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
-CURRENT_VERSION=$(git describe --abbrev=0 --tags 2>/dev/null)
+CURRENT_VERSION=$(curl -s https://api.github.com/repos/Altinn/altinn-studio/releases/latest | jq -r .tag_name)
 CURRENT_VERSION_PARTS=(${CURRENT_VERSION//./ })
 FIRST_PART=${CURRENT_VERSION_PARTS[0]:1}
 SECOND_PART=${CURRENT_VERSION_PARTS[1]}

.github/workflows/release.yaml

@@ -1,8 +1,8 @@
 name: Generate release for Altinn Studio
 on:
   schedule:
-    # run every friday at 14:45
-    - cron: '45 14 * * 5'
+    # run every friday at 14:15 UTC (15:15 Oslo time)
+    - cron: '15 14 * * 5'
 
   workflow_dispatch:
     inputs:

backend/packagegroups/NuGet.props

@@ -40,6 +40,7 @@
     <PackageReference Update="DotNetEnv" Version="3.1.1" />
     <PackageReference Update="NuGet.Versioning" Version="6.11.1" />
     <PackageReference Update="DistributedLock.Postgres" Version="1.2.0" />
+    <PackageReference Update="Community.Microsoft.Extensions.Caching.PostgreSql" Version="4.0.6" />
   </ItemGroup>
 
   <ItemGroup Label="Packages used for testing">

backend/src/Designer/Designer.csproj

@@ -26,6 +26,7 @@
     <PackageReference Include="Altinn.Common.AccessTokenClient" />
     <PackageReference Include="Altinn.Platform.Storage.Interface" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" />
+    <PackageReference Include="Community.Microsoft.Extensions.Caching.PostgreSql" />
     <PackageReference Include="CompilerAttributes" />
     <PackageReference Include="DistributedLock.Postgres" />
     <PackageReference Include="DotNetEnv" />
@@ -167,7 +168,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Migrations/InitialSqlScripts/*.sql" />
+    <EmbeddedResource Include="Migrations/SqlScripts/**/*.sql" />
   </ItemGroup>
 
   <Target Name="AfterPublishScript" AfterTargets="Publish">

backend/src/Designer/Infrastructure/Models/PostgreSQLSettings.cs

@@ -16,5 +16,10 @@ public class PostgreSQLSettings : ISettingsMarker
         /// Password for app user for the postgres db
         /// </summary>
         public string DesignerDbPwd { get; set; }
+
+        public string FormattedConnectionString()
+        {
+            return string.Format(ConnectionString, DesignerDbPwd);
+        }
     }
 }

backend/src/Designer/Infrastructure/ServiceRegistration.cs

@@ -48,10 +48,7 @@ public static IServiceCollection RegisterServiceImplementations(this IServiceCol
             services.AddDbContext<DesignerdbContext>(options =>
             {
                 PostgreSQLSettings postgresSettings = configuration.GetSection(nameof(PostgreSQLSettings)).Get<PostgreSQLSettings>();
-                string connectionString = string.Format(
-                    postgresSettings.ConnectionString,
-                    postgresSettings.DesignerDbPwd);
-                options.UseNpgsql(connectionString);
+                options.UseNpgsql(postgresSettings.FormattedConnectionString());
             });
 
             services.AddScoped<IReleaseRepository, ORMReleaseRepository>();

backend/src/Designer/Middleware/UserRequestSynchronization/RequestSyncExtensions.cs

@@ -24,10 +24,7 @@ public static IServiceCollection RegisterSynchronizationServices(this IServiceCo
         services.AddSingleton<IDistributedLockProvider>(_ =>
         {
             PostgreSQLSettings postgresSettings = configuration.GetSection(nameof(PostgreSQLSettings)).Get<PostgreSQLSettings>();
-            string connectionString = string.Format(
-                postgresSettings.ConnectionString,
-                postgresSettings.DesignerDbPwd);
-            return new PostgresDistributedSynchronizationProvider(connectionString);
+            return new PostgresDistributedSynchronizationProvider(postgresSettings.FormattedConnectionString());
         });
         return services;
     }

backend/src/Designer/Migrations/20240409201554_InitMigration.cs

@@ -1,4 +1,4 @@
-using Altinn.Studio.Designer.Migrations.InitialSqlScripts;
+using Altinn.Studio.Designer.Migrations.SqlScripts;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
@@ -12,11 +12,11 @@ public partial class InitMigration : Migration
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             // initial sql used in yuniql migration are idempotent so it is safe to execute them as initial ef-core migration
-            migrationBuilder.Sql(InitialScriptsReadHelper.ReadInitialSqlScript("01-setup-tables.sql"));
-            migrationBuilder.Sql(InitialScriptsReadHelper.ReadInitialSqlScript("02-setup-deployments.sql"));
-            migrationBuilder.Sql(InitialScriptsReadHelper.ReadInitialSqlScript("03-setup-releases.sql"));
-            migrationBuilder.Sql(InitialScriptsReadHelper.ReadInitialSqlScript("04-setup-grants.sql"));
-            migrationBuilder.Sql(InitialScriptsReadHelper.ReadInitialSqlScript("05-setup-index.sql"));
+            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("InitialSqlScripts/01-setup-tables.sql"));
+            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("InitialSqlScripts/02-setup-deployments.sql"));
+            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("InitialSqlScripts/03-setup-releases.sql"));
+            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("InitialSqlScripts/04-setup-grants.sql"));
+            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("InitialSqlScripts/05-setup-index.sql"));
         }
 
         /// <inheritdoc />

backend/src/Designer/Migrations/20241111093515_DistributedCacheTable.cs

@@ -0,0 +1,24 @@
+using Altinn.Studio.Designer.Migrations.SqlScripts;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Altinn.Studio.Designer.Migrations
+{
+    /// <inheritdoc />
+    public partial class DistributedCacheTable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("DistributedCache/Up/01-setup-distributedcache-table.sql"));
+            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("DistributedCache/Up/02-setup-grants.sql"));
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(SqlScriptsReadHelper.ReadSqlScript("DistributedCache/Down/01-drop-distributedcache-table.sql"));
+        }
+    }
+}

backend/src/Designer/Migrations/DesignerdbContextModelSnapshot.cs

@@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.8")
+                .HasAnnotation("ProductVersion", "8.0.10")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseSerialColumns(modelBuilder);
@@ -36,7 +36,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("character varying")
                         .HasColumnName("app");
 
-                    b.Property<DateTime>("Created")
+                    b.Property<DateTimeOffset>("Created")
                         .HasColumnType("timestamptz")
                         .HasColumnName("created");
 
@@ -58,6 +58,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("jsonb")
                         .HasColumnName("scopes");
 
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
                     b.HasKey("Id")
                         .HasName("app_scopes_pkey");
 

backend/src/Designer/Migrations/SqlScripts/DistributedCache/Down/01-drop-distributedcache-table.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS designer.distributedcache;

backend/src/Designer/Migrations/SqlScripts/DistributedCache/Up/01-setup-distributedcache-table.sql

@@ -0,0 +1,11 @@
+CREATE TABLE IF NOT EXISTS designer.distributedcache
+(
+    "Id" text COLLATE pg_catalog."default" NOT NULL,
+    "Value" bytea,
+    "ExpiresAtTime" timestamp with time zone,
+    "SlidingExpirationInSeconds" double precision,
+    "AbsoluteExpiration" timestamp with time zone,
+    CONSTRAINT "DistCache_pkey" PRIMARY KEY ("Id")
+)
+
+TABLESPACE pg_default;

backend/src/Designer/Migrations/SqlScripts/DistributedCache/Up/02-setup-grants.sql

@@ -0,0 +1 @@
+GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA designer TO designer;

backend/src/Designer/Migrations/SqlScripts/SqlScriptsReadHelper.cs

@@ -0,0 +1,25 @@
+using System;
+using System.IO;
+using System.Linq;
+
+namespace Altinn.Studio.Designer.Migrations.SqlScripts;
+
+public class SqlScriptsReadHelper
+{
+    public static string ReadSqlScript(string scriptName)
+    {
+        string resourceNameEnding = scriptName.Replace('/', '.');
+        if (!resourceNameEnding.EndsWith(".sql"))
+        {
+            throw new ArgumentException("Invalid script name");
+        }
+
+        var assembly = typeof(SqlScriptsReadHelper).Assembly;
+        string resourceName = assembly.GetManifestResourceNames()
+            .Single(x => x.EndsWith(resourceNameEnding));
+
+        using Stream stream = assembly.GetManifestResourceStream(resourceName);
+        using StreamReader reader = new(stream!);
+        return reader.ReadToEnd();
+    }
+}