Skip to content

Commit

Permalink
refactor: rename crab import api to import api
Browse files Browse the repository at this point in the history
  • Loading branch information
jvandaal authored and ArneD committed Jul 5, 2024
1 parent 159c66a commit b98e4a8
Show file tree
Hide file tree
Showing 21 changed files with 42 additions and 70 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ updates:
rebase-strategy: "disabled"

- package-ecosystem: docker
directory: "/src/MunicipalityRegistry.Api.CrabImport"
directory: "/src/MunicipalityRegistry.Api.Import"
schedule:
interval: weekly
rebase-strategy: "disabled"
Expand Down
42 changes: 7 additions & 35 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,17 @@ jobs:
dotnet-version: ${{ vars.VBR_DOTNET_VERSION_8 }}
secrets: inherit

build-api-crab-import:
name: Build Api CrabImport
build-api-import:
name: Build Api Import
uses: Informatievlaanderen/build-pipeline/.github/workflows/build-image.yml@main
needs: [ set-release-version ]
if: ${{ (github.repository_owner == 'Informatievlaanderen') && (needs.set-release-version.outputs.version != 'none') }}
with:
registry: ${{ vars.VBR_DEVOPS_DOCKER_REGISTRY }}/municipality-registry
image-file: mr-api-crab-import-image.tar
image-name: api-crab-import
image-file: mr-api-import-image.tar
image-name: api-import
test-project: MunicipalityRegistry.Tests
build-project: MunicipalityRegistry.Api.CrabImport
build-project: MunicipalityRegistry.Api.Import
semver: ${{ needs.set-release-version.outputs.version }}
dotnet-version: ${{ vars.VBR_DOTNET_VERSION_8 }}
secrets: inherit
Expand Down Expand Up @@ -199,19 +199,6 @@ jobs:
dotnet-version: ${{ vars.VBR_DOTNET_VERSION_8 }}
secrets: inherit

pack-api-crab-import:
name: Pack Api CrabImport
uses: Informatievlaanderen/build-pipeline/.github/workflows/pack.yml@main
needs: [ set-release-version ]
if: ${{ (github.repository_owner == 'Informatievlaanderen') && (needs.set-release-version.outputs.version != 'none') }}
with:
pack-file: Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.CrabImport
test-project: MunicipalityRegistry.Tests
build-project: MunicipalityRegistry.Api.CrabImport
semver: ${{ needs.set-release-version.outputs.version }}
dotnet-version: ${{ vars.VBR_DOTNET_VERSION_8 }}
secrets: inherit

release:
if: ${{ (github.repository_owner == 'Informatievlaanderen') && (needs.set-release-version.outputs.version != 'none') }}
name: Semantic Release
Expand All @@ -220,11 +207,10 @@ jobs:
pack-api-legacy,
pack-api-oslo,
pack-api-extract,
pack-api-crab-import,
build-api-legacy,
build-api-oslo,
build-api-extract,
build-api-crab-import,
build-api-import,
build-projector,
build-producer,
build-producer-snapshot-oslo ]
Expand Down Expand Up @@ -303,13 +289,6 @@ jobs:
name: nuget-Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.Extract-${{ needs.set-release-version.outputs.version }}
path: dist/nuget/

- name: Download NuGet Api CrabImport
uses: actions/download-artifact@v4
continue-on-error: false
with:
name: nuget-Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.CrabImport-${{ needs.set-release-version.outputs.version }}
path: dist/nuget/

- name: Run Semantic Release
shell: bash
run: npx semantic-release
Expand Down Expand Up @@ -370,19 +349,12 @@ jobs:
name: nuget-Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.Extract-${{ needs.release.outputs.version }}
path: ~/

- name: Download NuGet package api-crab-import
uses: actions/download-artifact@v4
with:
name: nuget-Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.CrabImport-${{ needs.release.outputs.version }}
path: ~/

- name: Publish packages to NuGet
shell: bash
run: |
dotnet nuget push ~/Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.Legacy.$SEMVER.nupkg --source nuget.org --api-key $NUGET_API_KEY
dotnet nuget push ~/Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.Oslo.$SEMVER.nupkg --source nuget.org --api-key $NUGET_API_KEY
dotnet nuget push ~/Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.Extract.$SEMVER.nupkg --source nuget.org --api-key $NUGET_API_KEY
dotnet nuget push ~/Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.CrabImport.$SEMVER.nupkg --source nuget.org --api-key $NUGET_API_KEY
env:
SEMVER: ${{ needs.release.outputs.version }}
WORKSPACE: ${{ github.workspace }}
Expand Down Expand Up @@ -445,7 +417,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
image: ['api-legacy', 'api-oslo', 'api-crab-import', 'api-extract', 'projector', 'producer', 'producer-snapshot-oslo']
image: ['api-legacy', 'api-oslo', 'api-import', 'api-extract', 'projector', 'producer', 'producer-snapshot-oslo']
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4.0.2
Expand Down
30 changes: 15 additions & 15 deletions MunicipalityRegistry.sln
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MunicipalityRegistry.Projec
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MunicipalityRegistry.Api.Legacy", "src\MunicipalityRegistry.Api.Legacy\MunicipalityRegistry.Api.Legacy.csproj", "{C448DC9B-CEAB-4894-8F77-72B1F4EC50B3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MunicipalityRegistry.Api.CrabImport", "src\MunicipalityRegistry.Api.CrabImport\MunicipalityRegistry.Api.CrabImport.csproj", "{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MunicipalityRegistry.Projections.LastChangedList", "src\MunicipalityRegistry.Projections.LastChangedList\MunicipalityRegistry.Projections.LastChangedList.csproj", "{5C006F19-A6E2-4467-983F-59D5A8B36CD0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MunicipalityRegistry.Projections.Extract", "src\MunicipalityRegistry.Projections.Extract\MunicipalityRegistry.Projections.Extract.csproj", "{4F34EA64-2C48-4DE2-A35E-F9E5030BCF41}"
Expand Down Expand Up @@ -71,6 +69,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MunicipalityRegistry.Projec
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MunicipalityRegistry.GeometryImporter", "src\MunicipalityRegistry.GeometryImporter\MunicipalityRegistry.GeometryImporter.csproj", "{DC611F91-5E5B-4508-831A-928C3F5080AE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MunicipalityRegistry.Api.Import", "src\MunicipalityRegistry.Api.Import\MunicipalityRegistry.Api.Import.csproj", "{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -165,18 +165,6 @@ Global
{C448DC9B-CEAB-4894-8F77-72B1F4EC50B3}.Release|x64.Build.0 = Release|Any CPU
{C448DC9B-CEAB-4894-8F77-72B1F4EC50B3}.Release|x86.ActiveCfg = Release|Any CPU
{C448DC9B-CEAB-4894-8F77-72B1F4EC50B3}.Release|x86.Build.0 = Release|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Debug|x64.ActiveCfg = Debug|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Debug|x64.Build.0 = Debug|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Debug|x86.ActiveCfg = Debug|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Debug|x86.Build.0 = Debug|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Release|Any CPU.Build.0 = Release|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Release|x64.ActiveCfg = Release|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Release|x64.Build.0 = Release|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Release|x86.ActiveCfg = Release|Any CPU
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1}.Release|x86.Build.0 = Release|Any CPU
{5C006F19-A6E2-4467-983F-59D5A8B36CD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5C006F19-A6E2-4467-983F-59D5A8B36CD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C006F19-A6E2-4467-983F-59D5A8B36CD0}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -345,6 +333,18 @@ Global
{DC611F91-5E5B-4508-831A-928C3F5080AE}.Release|x64.Build.0 = Release|Any CPU
{DC611F91-5E5B-4508-831A-928C3F5080AE}.Release|x86.ActiveCfg = Release|Any CPU
{DC611F91-5E5B-4508-831A-928C3F5080AE}.Release|x86.Build.0 = Release|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Debug|x64.ActiveCfg = Debug|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Debug|x64.Build.0 = Debug|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Debug|x86.ActiveCfg = Debug|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Debug|x86.Build.0 = Debug|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Release|Any CPU.Build.0 = Release|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Release|x64.ActiveCfg = Release|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Release|x64.Build.0 = Release|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Release|x86.ActiveCfg = Release|Any CPU
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -357,7 +357,6 @@ Global
{74376690-FB03-4DBA-811B-DD913570C65F} = {C2F8FF63-7A48-4179-A720-86206C42F496}
{9B5986F2-CE2E-45D1-9841-3440850049FC} = {8EA18457-86E2-4D2D-AC9E-2552FDC9676F}
{C448DC9B-CEAB-4894-8F77-72B1F4EC50B3} = {C2F8FF63-7A48-4179-A720-86206C42F496}
{9E00CAAB-26EE-4A9B-AC12-D13264B837F1} = {C2F8FF63-7A48-4179-A720-86206C42F496}
{5C006F19-A6E2-4467-983F-59D5A8B36CD0} = {C2F8FF63-7A48-4179-A720-86206C42F496}
{4F34EA64-2C48-4DE2-A35E-F9E5030BCF41} = {C2F8FF63-7A48-4179-A720-86206C42F496}
{490AEAC8-8262-4115-99F4-4EF2DE2EB780} = {C2F8FF63-7A48-4179-A720-86206C42F496}
Expand All @@ -372,6 +371,7 @@ Global
{D787FB5D-C59A-4513-BA18-4AEF619E035B} = {C2F8FF63-7A48-4179-A720-86206C42F496}
{78B9AC64-8E44-4C30-AD24-B279533EA0DD} = {C2F8FF63-7A48-4179-A720-86206C42F496}
{DC611F91-5E5B-4508-831A-928C3F5080AE} = {C2F8FF63-7A48-4179-A720-86206C42F496}
{8B10D942-AEA3-48C7-8C94-9FB5A6B7F9AA} = {C2F8FF63-7A48-4179-A720-86206C42F496}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2EB87445-E263-4E1E-89CC-3839170028E5}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

To fill up the database for the first time:

* Run `MunicipalityRegistry.Api.CrabImport` (`MunicipalityRegistry.sln`)
* Run `MunicipalityRegistry.Api.Import` (`MunicipalityRegistry.sln`)

#### Projections

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MunicipalityRegistry.Api.CrabImport.CrabImport
namespace MunicipalityRegistry.Api.Import.CrabImport
{
using System;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MunicipalityRegistry.Api.CrabImport.CrabImport.Requests
namespace MunicipalityRegistry.Api.Import.CrabImport.Requests
{
using System.ComponentModel.DataAnnotations;
using Newtonsoft.Json;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MunicipalityRegistry.Api.CrabImport.Infrastructure
namespace MunicipalityRegistry.Api.Import.Infrastructure
{
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MunicipalityRegistry.Api.CrabImport.Infrastructure.Configuration
namespace MunicipalityRegistry.Api.Import.Infrastructure.Configuration
{
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MunicipalityRegistry.Api.CrabImport.Infrastructure
namespace MunicipalityRegistry.Api.Import.Infrastructure
{
using System.Reflection;
using Asp.Versioning;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MunicipalityRegistry.Api.CrabImport.Infrastructure.Modules
namespace MunicipalityRegistry.Api.Import.Infrastructure.Modules
{
using Autofac;
using Autofac.Extensions.DependencyInjection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MunicipalityRegistry.Api.CrabImport.Infrastructure
namespace MunicipalityRegistry.Api.Import.Infrastructure
{
using Be.Vlaanderen.Basisregisters.Api;
using Microsoft.AspNetCore.Hosting;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MunicipalityRegistry.Api.CrabImport.Infrastructure
namespace MunicipalityRegistry.Api.Import.Infrastructure
{
using System;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>bin\Debug\net8.0\MunicipalityRegistry.Api.CrabImport.xml</DocumentationFile>
<DocumentationFile>bin\Debug\net8.0\MunicipalityRegistry.Api.Import.xml</DocumentationFile>
<NoWarn>1701;1702;1705;1591</NoWarn>
<DefineConstants>TRACE;DEBUG;NETCOREAPP;NET8_0</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DocumentationFile>bin\Release\net8.0\MunicipalityRegistry.Api.CrabImport.xml</DocumentationFile>
<DocumentationFile>bin\Release\net8.0\MunicipalityRegistry.Api.Import.xml</DocumentationFile>
<NoWarn>1701;1702;1705;1591</NoWarn>
</PropertyGroup>

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"MunicipalityRegistry.Api.CrabImport": {
"MunicipalityRegistry.Api.Import": {
"commandName": "Project",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ CONTAINERID=$(curl -s http://169.254.170.2/v2/metadata | jq -r ".Containers[] |

sed -i "s/REPLACE_CONTAINERID/$CONTAINERID/g" appsettings.json

./MunicipalityRegistry.Api.CrabImport
./MunicipalityRegistry.Api.Import
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
type file
version 1.0.0

id Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.CrabImport
title Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.CrabImport
id Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.Import
title Be.Vlaanderen.Basisregisters.MunicipalityRegistry.Api.Import

authors Basisregisters Vlaanderen
owners Digitaal Vlaanderen <https://vlaanderen.be/digitaal-vlaanderen>
Expand All @@ -24,10 +24,10 @@ dependencies
AspNetCore.HealthChecks.SqlServer >= LOCKEDVERSION

files
MunicipalityRegistry.Api.CrabImport.dll => lib\net8.0
MunicipalityRegistry.Api.CrabImport.pdb => lib\net8.0
MunicipalityRegistry.Api.CrabImport.xml => lib\net8.0
MunicipalityRegistry.Api.CrabImport.xml => content
MunicipalityRegistry.Api.Import.dll => lib\net8.0
MunicipalityRegistry.Api.Import.pdb => lib\net8.0
MunicipalityRegistry.Api.Import.xml => lib\net8.0
MunicipalityRegistry.Api.Import.xml => content

MunicipalityRegistry.dll => lib\net8.0
MunicipalityRegistry.pdb => lib\net8.0

0 comments on commit b98e4a8

Please sign in to comment.