Skip to content

Commit

Permalink
add access mgmt to monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
@andreasisnes
andreasisnes committed Nov 28, 2024
1 parent 7f7ce1f commit ab448b0
Show file tree
Hide file tree
Showing 68 changed files with 1,272 additions and 317 deletions.
48 changes: 24 additions & 24 deletions .github/workflows/_deploy-app.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,27 +89,27 @@ jobs:
echo "Image: ${IMAGE}"
echo "Tag: ${TAG}"
deploy-terraform:
name: Run terraform deployment

if: inputs.terraform

strategy:
fail-fast: false
matrix:
environment: [at21, at22]

needs:
- build-push

uses: ./.github/workflows/_deploy-app-terraform.yml
with:
environment: ${{ matrix.environment }}
working_dir: ${{ inputs.path }}/deploy
tf_state: ${{ inputs.terraformStateFile }}
tf_args: "-var image=${{ needs.build-push.outputs.image }}"

databaseBootstrap: ${{ inputs.databaseBootstrap }}
databaseName: ${{ inputs.databaseName }}
databaseRoleprefix: ${{ inputs.databaseRoleprefix }}
databaseSchema: ${{ inputs.databaseSchema }}
# deploy-terraform:
# name: Run terraform deployment

# if: inputs.terraform

# strategy:
# fail-fast: false
# matrix:
# environment: [at21, at22]

# needs:
# - build-push

# uses: ./.github/workflows/_deploy-app-terraform.yml
# with:
# environment: ${{ matrix.environment }}
# working_dir: ${{ inputs.path }}/deploy
# tf_state: ${{ inputs.terraformStateFile }}
# tf_args: "-var image=${{ needs.build-push.outputs.image }}"

# databaseBootstrap: ${{ inputs.databaseBootstrap }}
# databaseName: ${{ inputs.databaseName }}
# databaseRoleprefix: ${{ inputs.databaseRoleprefix }}
# databaseSchema: ${{ inputs.databaseSchema }}
109 changes: 57 additions & 52 deletions src/Directory.Packages.props
View file
Original file line number Diff line number Diff line change
@@ -1,91 +1,96 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Altinn.Authorization.ServiceDefaults.Npgsql.Yuniql" Version="2.7.0" />
<PackageVersion Include="Altinn.Authorization.ServiceDefaults" Version="2.7.0" />
<PackageVersion Include="Azure.Identity" Version="1.13.1" />
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.3.0-beta.2" />
<PackageVersion Include="Azure.ResourceManager.KeyVault" Version="1.3.0" />
<PackageVersion Include="Azure.ResourceManager.PostgreSql" Version="1.2.0" />
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
<PackageVersion Include="coverlet.collector" Version=" 6.0.2" />
<PackageVersion Include="MassTransit.Azure.ServiceBus.Core" Version=" 8.2.6-develop.1998" />
<PackageVersion Include="MassTransit.Extensions.DependencyInjection" Version=" 7.3.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.11" />
<PackageVersion Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11" />
<PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore"
Version="8.1.0-preview" />
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.8.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.24" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"
Version="8.0.8" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
<PackageVersion Include="Npgsql" Version="9.0.1" />
<PackageVersion Include="Npgsql.OpenTelemetry" Version="9.0.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version=" 1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version=" 1.9.0" />
<PackageVersion Include="OpenTelemetry" Version="1.10.0" />
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
<PackageVersion Include="Yuniql.AspNetCore" Version=" 1.2.25" />
<PackageVersion Include="Yuniql.Core" Version=" 1.3.15" />
<PackageVersion Include="Yuniql.PostgreSql" Version=" 1.3.15" />


<PackageVersion Include="Altinn.Authorization.ABAC" Version="0.0.8" />
<PackageVersion Include="Altinn.Authorization.ProblemDetails.Abstractions" Version="3.0.1" />
<PackageVersion Include="Altinn.Authorization.ProblemDetails" Version="3.0.1" />
<PackageVersion Include="Altinn.Authorization.ProblemDetails.Abstractions"
Version="3.0.1" />
<PackageVersion Include="Altinn.Authorization.ServiceDefaults" Version="2.7.0" />
<PackageVersion Include="Altinn.Authorization.ServiceDefaults.Npgsql.Yuniql"
Version="2.7.0" />
<PackageVersion Include="Altinn.Common.AccessToken" Version="4.5.4" />
<PackageVersion Include="Altinn.Common.AccessTokenClient" Version="3.0.10" />
<PackageVersion Include="Altinn.Common.PEP" Version="4.1.1" />
<PackageVersion Include="Altinn.Common.PEP" Version="4.1.2" />
<PackageVersion Include="Altinn.Platform.Models" Version="1.6.1" />
<PackageVersion Include="Altinn.Platform.Storage.Interface" Version="4.0.4" />
<PackageVersion Include="Altinn.Swashbuckle.Abstractions" Version="2.1.1" />
<PackageVersion Include="Altinn.Urn.Swashbuckle" Version="2.5.1" />
<PackageVersion Include="Altinn.Urn" Version="2.5.1" />
<PackageVersion Include="Altinn.Urn.Swashbuckle" Version="2.5.1" />
<PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection"
Version="12.0.1" />
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" />
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets"
Version="1.3.2" />
<PackageVersion Include="Azure.Identity" Version="1.13.1" />
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.3.0-beta.2" />
<PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
<PackageVersion Include="Azure.ResourceManager.KeyVault" Version="1.3.0" />
<PackageVersion Include="Azure.ResourceManager.PostgreSql" Version="1.2.0" />
<PackageVersion Include="Azure.Security.KeyVault.Certificates" Version="4.7.0" />
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.23.0" />
<PackageVersion Include="Azure.Storage.Queues" Version="12.21.0" />
<PackageVersion Include="coverlet.collector" Version=" 6.0.2" />
<PackageVersion Include="Dapper" Version="2.1.35" />
<PackageVersion Include="JWTCookieAuthentication" Version="4.0.1" />
<PackageVersion Include="MassTransit.Azure.ServiceBus.Core"
Version=" 8.2.6-develop.1998" />
<PackageVersion Include="MassTransit.Extensions.DependencyInjection" Version=" 7.3.1" />
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect"
Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
<PackageVersion Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
<PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore"
Version="8.1.0-preview" />
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.9.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.AzureKeyVault"
Version="3.1.24" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"
Version="8.0.8" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights"
Version="2.22.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.FeatureManagement.AspNetCore" Version="4.0.0" />
<PackageVersion Include="Microsoft.IdentityModel.Logging" Version="8.2.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets"
Version="1.21.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
<PackageVersion Include="Npgsql" Version="8.0.5" />
<PackageVersion Include="Npgsql.OpenTelemetry" Version="8.0.5" />
<PackageVersion Include="OpenTelemetry" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version=" 1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="7.1.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="7.1.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="7.1.0" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.0.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="Yuniql.AspNetCore" Version=" 1.2.25" />
<PackageVersion Include="Yuniql.Core" Version=" 1.3.15" />
<PackageVersion Include="Yuniql.PostgreSql" Version=" 1.3.15" />
</ItemGroup>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
</Project>
49 changes: 49 additions & 0 deletions src/apps/Altinn.Authorization.AccessManagement/Altinn.AccessManagement.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31912.275
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Altinn.AccessManagement", "src\Altinn.AccessManagement\Altinn.AccessManagement.csproj", "{461307C1-8D2B-4D90-AE2D-FC895BA1940B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Altinn.AccessManagement.Core", "src\Altinn.AccessManagement.Core\Altinn.AccessManagement.Core.csproj", "{9D059588-4085-4AEC-8F0A-25CE74BD554B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Altinn.AccessManagement.Tests", "test\Altinn.AccessManagement.Tests\Altinn.AccessManagement.Tests.csproj", "{240CA575-3BAA-4E8E-93CD-A9A40502B772}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Altinn.AccessManagement.Integration", "src\Altinn.AccessManagement.Integration\Altinn.AccessManagement.Integration.csproj", "{4144EF72-F38D-4A2D-876D-77CCBFF28C05}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Altinn.AccessManagement.Persistence", "src\Altinn.AccessManagement.Persistence\Altinn.AccessManagement.Persistence.csproj", "{BC6EE9E4-0C4B-4A2E-95D6-754CC0683863}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{461307C1-8D2B-4D90-AE2D-FC895BA1940B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{461307C1-8D2B-4D90-AE2D-FC895BA1940B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{461307C1-8D2B-4D90-AE2D-FC895BA1940B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{461307C1-8D2B-4D90-AE2D-FC895BA1940B}.Release|Any CPU.Build.0 = Release|Any CPU
{9D059588-4085-4AEC-8F0A-25CE74BD554B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D059588-4085-4AEC-8F0A-25CE74BD554B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D059588-4085-4AEC-8F0A-25CE74BD554B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D059588-4085-4AEC-8F0A-25CE74BD554B}.Release|Any CPU.Build.0 = Release|Any CPU
{240CA575-3BAA-4E8E-93CD-A9A40502B772}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{240CA575-3BAA-4E8E-93CD-A9A40502B772}.Debug|Any CPU.Build.0 = Debug|Any CPU
{240CA575-3BAA-4E8E-93CD-A9A40502B772}.Release|Any CPU.ActiveCfg = Release|Any CPU
{240CA575-3BAA-4E8E-93CD-A9A40502B772}.Release|Any CPU.Build.0 = Release|Any CPU
{4144EF72-F38D-4A2D-876D-77CCBFF28C05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4144EF72-F38D-4A2D-876D-77CCBFF28C05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4144EF72-F38D-4A2D-876D-77CCBFF28C05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4144EF72-F38D-4A2D-876D-77CCBFF28C05}.Release|Any CPU.Build.0 = Release|Any CPU
{BC6EE9E4-0C4B-4A2E-95D6-754CC0683863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC6EE9E4-0C4B-4A2E-95D6-754CC0683863}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC6EE9E4-0C4B-4A2E-95D6-754CC0683863}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC6EE9E4-0C4B-4A2E-95D6-754CC0683863}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1B21404E-E4A6-4F99-AE2D-AF106E1BA0C7}
EndGlobalSection
EndGlobal
57 changes: 0 additions & 57 deletions src/apps/Altinn.Authorization.AccessManagement/Altinn.Authorization.AccessManagement.sln
View file

This file was deleted.

Loading

0 comments on commit ab448b0

Please sign in to comment.