From 3292a99502cb5fc3fc2b97b01130ccbf4540f2e3 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Wed, 9 Sep 2020 16:14:32 -0500 Subject: [PATCH] =?UTF-8?q?refactor(archival):=20=E2=99=BB=20ren=20FilterL?= =?UTF-8?q?ists.Archival=20->=20FilterLists.Archival.Api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/dependabot.yml | 4 ++-- services/FilterLists.sln | 12 ++++++------ .../Dockerfile | 8 ++++---- .../Dockerfile.dev | 8 ++++---- .../FilterLists.Archival.Api.csproj} | 0 .../Program.cs | 2 +- .../Properties/launchSettings.json | 0 .../Startup.cs | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) rename services/archival/src/{FilterLists.Archival => FilterLists.Archival.Api}/Dockerfile (68%) rename services/archival/src/{FilterLists.Archival => FilterLists.Archival.Api}/Dockerfile.dev (64%) rename services/archival/src/{FilterLists.Archival/FilterLists.Archival.csproj => FilterLists.Archival.Api/FilterLists.Archival.Api.csproj} (100%) rename services/archival/src/{FilterLists.Archival => FilterLists.Archival.Api}/Program.cs (93%) rename services/archival/src/{FilterLists.Archival => FilterLists.Archival.Api}/Properties/launchSettings.json (100%) rename services/archival/src/{FilterLists.Archival => FilterLists.Archival.Api}/Startup.cs (93%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e6dd97b0e..fcc00735e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,13 +1,13 @@ version: 2 updates: - package-ecosystem: nuget - directory: "/services/archival/src/FilterLists.Archival" + directory: "/services/archival/src/FilterLists.Archival.Api" schedule: interval: daily time: "11:00" open-pull-requests-limit: 99 - package-ecosystem: docker - directory: "/services/archival/src/FilterLists.Archival" + directory: "/services/archival/src/FilterLists.Archival.Api" schedule: interval: daily time: "11:00" diff --git a/services/FilterLists.sln b/services/FilterLists.sln index a4a9ca8ab..cdac375fc 100644 --- a/services/FilterLists.sln +++ b/services/FilterLists.sln @@ -48,7 +48,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Archival", "Archival", "{5E52FEF9-9605-4ACB-8A42-A20E06331599}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival", "archival\src\FilterLists.Archival\FilterLists.Archival.csproj", "{20A2E5A2-B218-410A-90DA-090A6A3087DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Archival.Api", "archival\src\FilterLists.Archival.Api\FilterLists.Archival.Api.csproj", "{F625C241-0501-4AEB-8B82-609C93EE6B7D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -84,10 +84,10 @@ Global {8B07EF04-5516-40BB-B21B-CEC6F90EC631}.Debug|Any CPU.Build.0 = Debug|Any CPU {8B07EF04-5516-40BB-B21B-CEC6F90EC631}.Release|Any CPU.ActiveCfg = Release|Any CPU {8B07EF04-5516-40BB-B21B-CEC6F90EC631}.Release|Any CPU.Build.0 = Release|Any CPU - {20A2E5A2-B218-410A-90DA-090A6A3087DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20A2E5A2-B218-410A-90DA-090A6A3087DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20A2E5A2-B218-410A-90DA-090A6A3087DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20A2E5A2-B218-410A-90DA-090A6A3087DF}.Release|Any CPU.Build.0 = Release|Any CPU + {F625C241-0501-4AEB-8B82-609C93EE6B7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F625C241-0501-4AEB-8B82-609C93EE6B7D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F625C241-0501-4AEB-8B82-609C93EE6B7D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F625C241-0501-4AEB-8B82-609C93EE6B7D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -100,7 +100,7 @@ Global {4F7D51FE-A1F3-4473-A8C3-D57EBDD8E60E} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} {8F419098-3EEB-4B4B-99A8-70555FA93DAF} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} {8B07EF04-5516-40BB-B21B-CEC6F90EC631} = {AE5D6471-1B6E-4B06-A313-34EF81F35342} - {20A2E5A2-B218-410A-90DA-090A6A3087DF} = {5E52FEF9-9605-4ACB-8A42-A20E06331599} + {F625C241-0501-4AEB-8B82-609C93EE6B7D} = {5E52FEF9-9605-4ACB-8A42-A20E06331599} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {758B57EF-7505-4BE2-90A2-E2DE2EC32909} diff --git a/services/archival/src/FilterLists.Archival/Dockerfile b/services/archival/src/FilterLists.Archival.Api/Dockerfile similarity index 68% rename from services/archival/src/FilterLists.Archival/Dockerfile rename to services/archival/src/FilterLists.Archival.Api/Dockerfile index fcfa21c9e..89765e0b4 100644 --- a/services/archival/src/FilterLists.Archival/Dockerfile +++ b/services/archival/src/FilterLists.Archival.Api/Dockerfile @@ -6,15 +6,15 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build # restore -WORKDIR /src/FilterLists.Archival -COPY archival/src/FilterLists.Archival/FilterLists.Archival.csproj . +WORKDIR /src/FilterLists.Archival.Api +COPY archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj . RUN dotnet restore # build -COPY archival/src/FilterLists.Archival/. . +COPY archival/src/FilterLists.Archival.Api/. . RUN dotnet publish -c Release --no-restore -o /app/publish -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64 # package final FROM base AS final COPY --from=build /app/publish . -ENTRYPOINT ./FilterLists.Archival \ No newline at end of file +ENTRYPOINT ./FilterLists.Archival.Api \ No newline at end of file diff --git a/services/archival/src/FilterLists.Archival/Dockerfile.dev b/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev similarity index 64% rename from services/archival/src/FilterLists.Archival/Dockerfile.dev rename to services/archival/src/FilterLists.Archival.Api/Dockerfile.dev index 02105eb4a..d85f2f967 100644 --- a/services/archival/src/FilterLists.Archival/Dockerfile.dev +++ b/services/archival/src/FilterLists.Archival.Api/Dockerfile.dev @@ -6,15 +6,15 @@ WORKDIR /app FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build # restore -WORKDIR /src/FilterLists.Archival -COPY archival/src/FilterLists.Archival/FilterLists.Archival.csproj . +WORKDIR /src/FilterLists.Archival.Api +COPY archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj . RUN dotnet restore # build -COPY archival/src/FilterLists.Archival/. . +COPY archival/src/FilterLists.Archival.Api/. . RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64 # package final FROM base AS final COPY --from=build /app/publish . -ENTRYPOINT ./FilterLists.Archival \ No newline at end of file +ENTRYPOINT ./FilterLists.Archival.Api \ No newline at end of file diff --git a/services/archival/src/FilterLists.Archival/FilterLists.Archival.csproj b/services/archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj similarity index 100% rename from services/archival/src/FilterLists.Archival/FilterLists.Archival.csproj rename to services/archival/src/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj diff --git a/services/archival/src/FilterLists.Archival/Program.cs b/services/archival/src/FilterLists.Archival.Api/Program.cs similarity index 93% rename from services/archival/src/FilterLists.Archival/Program.cs rename to services/archival/src/FilterLists.Archival.Api/Program.cs index 5fb7a7903..db8d57878 100644 --- a/services/archival/src/FilterLists.Archival/Program.cs +++ b/services/archival/src/FilterLists.Archival.Api/Program.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; -namespace FilterLists.Archival +namespace FilterLists.Archival.Api { public static class Program { diff --git a/services/archival/src/FilterLists.Archival/Properties/launchSettings.json b/services/archival/src/FilterLists.Archival.Api/Properties/launchSettings.json similarity index 100% rename from services/archival/src/FilterLists.Archival/Properties/launchSettings.json rename to services/archival/src/FilterLists.Archival.Api/Properties/launchSettings.json diff --git a/services/archival/src/FilterLists.Archival/Startup.cs b/services/archival/src/FilterLists.Archival.Api/Startup.cs similarity index 93% rename from services/archival/src/FilterLists.Archival/Startup.cs rename to services/archival/src/FilterLists.Archival.Api/Startup.cs index 2ef80af1f..8d00a9b2f 100644 --- a/services/archival/src/FilterLists.Archival/Startup.cs +++ b/services/archival/src/FilterLists.Archival.Api/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -namespace FilterLists.Archival +namespace FilterLists.Archival.Api { public class Startup {