Created Woodpecker CI/CD deployment

- Created Dockerfile for packing up API and Web projects as Docker image
2024-03-30 22:54:16 -05:00
12 changed files with 58 additions and 128 deletions
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@ -0,0 +1,43 @@
+steps:
+  - name: (YABA.API) Build and run tests
+    image: mcr.microsoft.com/dotnet/sdk:6.0
+    commands:
+      - dotnet build ./API
+      - dotnet test ./API
+  - name: (YABA.API) Deploy Docker Image (Non-Prod Branch)
+    when: 
+      - event: tag
+        branch:
+          exclude: [master]
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: gitea.iwanaga.moe/cjtibule/yaba/api
+      context: ./API
+      dockerfile: ./API/YABA.API/Dockerfile
+      tags: 
+        - latest-dev
+        - ${CI_COMMIT_TAG}
+      username:
+        from_secret: gitea_yaba_registry_username
+      password: 
+        from_secret: gitea_yaba_registry_password
+      registry: gitea.iwanaga.moe
+  - name: (YABA.Web) Deploy Docker Image (Non-Prod Branch)
+    when:
+      - event: tag
+        branch:
+          exclude: [master]
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: gitea.iwanaga.moe/cjtibule/yaba/web
+      context: ./Web
+      dockerfile: ./Web/Dockerfile
+      tags:
+        - latest-dev
+        - ${CI_COMMIT_TAG}
+      username:
+        from_secret: gitea_yaba_registry_username
+      password: 
+        from_secret: gitea_yaba_registry_password
+      registry: gitea.iwanaga.moe
+      
--- a/.woodpecker/.api_build.yaml
+++ b/.woodpecker/.api_build.yaml
@ -1,12 +0,0 @@
-when:
-  - event: [push, pull_request, tag]
-    ref: [refs/tags/APIDEV-*, refs/tags/API-*, refs/heads/api/*]
-steps:
-  - name: (YABA.API) Build and run tests
-    when: 
-      - event: [push, pull_request, tag]
-        branch: [api/*]
-    image: mcr.microsoft.com/dotnet/sdk:6.0
-    commands:
-      - dotnet build ./API
-      - dotnet test ./API
--- a/.woodpecker/.api_uploadimage.yaml
+++ b/.woodpecker/.api_uploadimage.yaml
@ -1,34 +0,0 @@
-when:
-  - event: tag
-    ref: [refs/tags/APIDEV-*, refs/tags/API-*]
-steps:
-  - name: (YABA.API) Determining Docker image version number (dev)
-    when:
-      - ref: refs/tags/APIDEV-*
-    image: alpine:latest
-    commands:
-      - rm -f tags.txt
-      - echo ${CI_COMMIT_TAG} | sed -e "s/^APIDEV-//" >> tags.txt
-      - echo "latest-dev" >> tags.txt
-  - name: (YABA.API) Determining Docker image version number (prod)
-    image: alpine:latest
-    when:
-      - ref: refs/tags/API-*
-    commands:
-      - rm -f tags.txt
-      - echo ${CI_COMMIT_TAG} | sed -e "s/^API-//" >> tags.txt
-      - echo "latest" >> tags.txt
-  - name: (YABA.API) Package and Upload Docker Image
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo: gitea.iwanaga.moe/cjtibule/yaba/api
-      context: ./API
-      dockerfile: ./API/YABA.API/Dockerfile
-      tags_file: tags.txt
-      username:
-        from_secret: gitea_yaba_registry_username
-      password: 
-        from_secret: gitea_yaba_registry_password
-      registry: gitea.iwanaga.moe
-depends_on:
-  - api_build
--- a/.woodpecker/.web_uploadimage.yaml
+++ b/.woodpecker/.web_uploadimage.yaml
@ -1,52 +0,0 @@
-when:
-  - event: tag
-    ref: [refs/tags/WEBDEV-*, refs/tags/WEB-*]
-steps:
-  - name: (YABA.Web) Determining Docker image version number (dev)
-    when:
-      - ref: refs/tags/WEBDEV-*
-    image: alpine:latest
-    commands:
-      - rm -f tags.txt
-      - echo ${CI_COMMIT_TAG} | sed -e "s/^WEBDEV-//" >> tags.txt
-      - echo "latest-dev" >> tags.txt
-  - name: (YABA.Web) Determining Docker image version number (prod)
-    when:
-      - ref: refs/tags/WEB-*
-    image: alpine:latest
-    commands:
-      - rm -f tags.txt
-      - echo ${CI_COMMIT_TAG} | sed -e "s/^WEB-//" >> tags.txt
-      - echo "latest" >> tags.txt
-  - name: (YABA.Web) Package and Upload Docker Image (dev)
-    when:
-      - ref: refs/tags/WEBDEV-*
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo: gitea.iwanaga.moe/cjtibule/yaba/web
-      context: ./Web
-      dockerfile: ./Web/Dockerfile
-      tags_file: tags.txt
-      username:
-        from_secret: gitea_yaba_registry_username
-      password: 
-        from_secret: gitea_yaba_registry_password
-      registry: gitea.iwanaga.moe
-      build_args: 
-        from_secret: DEV1_BUILDARGS
-  - name: (YABA.Web) Package and Upload Docker Image (prod)
-    when:
-        - ref: refs/tags/WEB-*
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo: gitea.iwanaga.moe/cjtibule/yaba/web
-      context: ./Web
-      dockerfile: ./Web/Dockerfile
-      tags_file: tags.txt
-      username:
-        from_secret: gitea_yaba_registry_username
-      password: 
-        from_secret: gitea_yaba_registry_password
-      registry: gitea.iwanaga.moe
-      build_args: 
-        from_secret: PROD_BUILDARGS
--- a/API/YABA.API/Dockerfile
+++ b/API/YABA.API/Dockerfile
@ -13,9 +13,7 @@ ENV ASPNETCORE_Authentication__Auth0__Domain=
 ENV ASPNETCORE_Authentication__Auth0__Identifier=
 ENV ASPNETCORE_ConnectionStrings__YABAReadOnlyDbConnectionString=
 ENV ASPNETCORE_ConnectionStrings__YABAReadWriteDbConnectionString=
-ENV WebClient__Url=
-ENV Serilog__WriteTo__1__Args__Uri=
-ENV Serilog__WriteTo__1__Args__Labels__1__Value=
+ENV ASPNETCORE_WebClient__Url=

 FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
 WORKDIR /src
--- a/API/YABA.API/Middlewares/AddCustomClaimsMiddleware.cs
+++ b/API/YABA.API/Middlewares/AddCustomClaimsMiddleware.cs
@ -2,7 +2,6 @@
 using YABA.API.Extensions;
 using YABA.Common.Extensions;
 using YABA.Common.Lookups;
-using YABA.Common.Utils;
 using YABA.Service.Interfaces;

 namespace YABA.API.Middlewares
@ -32,7 +31,7 @@ namespace YABA.API.Middlewares
                        userId = registedUser.Id;
                    }

-                    httpContext.User.Identities.FirstOrDefault().AddClaim(new Claim(ClaimsLookup.UserId.GetClaimName(EnvironmentUtils.IsDevelopmentEnvironment()), userId.ToString()));
+                    httpContext.User.Identities.FirstOrDefault().AddClaim(new Claim(ClaimsLookup.UserId.GetClaimName(), userId.ToString()));
                }
            }

--- a/API/YABA.Common/Attributes/ClaimNameAttribute.cs
+++ b/API/YABA.Common/Attributes/ClaimNameAttribute.cs
@ -4,13 +4,11 @@ namespace YABA.Common.Attributes
 {
    public class ClaimNameAttribute : Attribute
    {
-        public string DevClaimName { get; private set; }
-        public string ProdClaimName { get; private set; }
+        public string Name { get; private set; }

-        public ClaimNameAttribute(string devClaimName, string prodClaimName)
+        public ClaimNameAttribute(string name)
        {
-            this.DevClaimName = devClaimName;
-            ProdClaimName = prodClaimName;
+            this.Name = name;
        }
    }
 }
--- a/API/YABA.Common/Extensions/EnumExtensions.cs
+++ b/API/YABA.Common/Extensions/EnumExtensions.cs
@ -28,9 +28,9 @@ namespace YABA.Common.Extensions
            return enumValue.GetAttribute<DisplayAttribute>().Name;
        }

-        public static string GetClaimName(this ClaimsLookup claimLookup, bool isDevelopmentEnvironment)
+        public static string GetClaimName(this ClaimsLookup claimLookup)
        {
-            return isDevelopmentEnvironment ? claimLookup.GetAttribute<ClaimNameAttribute>().DevClaimName : claimLookup.GetAttribute<ClaimNameAttribute>().ProdClaimName;
+            return claimLookup.GetAttribute<ClaimNameAttribute>().Name;
        }

        public static bool IsCrudResultSuccessful(this CrudResultLookup importStatusLookup) => SuccessfulCrudStatuses.Contains(importStatusLookup);
--- a/API/YABA.Common/Extensions/UserIdentityExtensions.cs
+++ b/API/YABA.Common/Extensions/UserIdentityExtensions.cs
@ -1,8 +1,6 @@
-using System;
-using System.Security.Claims;
+using System.Security.Claims;
 using System.Security.Principal;
 using YABA.Common.Lookups;
-using YABA.Common.Utils;

 namespace YABA.Common.Extensions
 {
@ -14,7 +12,7 @@ namespace YABA.Common.Extensions
        public static string GetCustomClaim(this IIdentity identity, ClaimsLookup claim)
        {
            var claimsIdentity = identity as ClaimsIdentity;
-            return claimsIdentity.FindFirst(claim.GetClaimName(EnvironmentUtils.IsDevelopmentEnvironment()))?.Value.ToString();
+            return claimsIdentity.FindFirst(claim.GetClaimName())?.Value.ToString();
        }
    }
 }
--- a/API/YABA.Common/Lookups/ClaimsLookup.cs
+++ b/API/YABA.Common/Lookups/ClaimsLookup.cs
@ -4,19 +4,19 @@ namespace YABA.Common.Lookups
 {
    public enum ClaimsLookup
    {
-        [ClaimName("https://auth.dev.iwanaga.moe/api/auth_provider_id", "https://auth.iwanaga.moe/api/auth_provider_id")]
+        [ClaimNameAttribute("https://dev.iwanaga.moe/api/auth_provider_id")]
        AuthProviderId = 1,

-        [ClaimName("https://auth.dev.iwanaga.moe/api/email_address", "https://auth.iwanaga.moe/api/email_address")]
+        [ClaimNameAttribute("https://dev.iwanaga.moe/api/email_address")]
        UserEmail = 2,

-        [ClaimName("https://auth.dev.iwanaga.moe/api/email_verified", "https://auth.iwanaga.moe/api/email_verified")]
+        [ClaimNameAttribute("https://dev.iwanaga.moe/api/email_verified")]
        IsEmailConfirmed = 3,

-        [ClaimName("https://auth.dev.iwanaga.moe/api/username", "https://auth.iwanaga.moe/api/username")]
+        [ClaimNameAttribute("https://dev.iwanaga.moe/api/username")]
        Username = 4,

-        [ClaimName("https://auth.dev.iwanaga.moe/api/id", "https://auth.iwanaga.moe/api/id")]
+        [ClaimNameAttribute("https://dev.iwanaga.moe/api/id")]
        UserId = 5
    }
 }
--- a/API/YABA.Common/Utils/EnvironmentUtils.cs
+++ b/API/YABA.Common/Utils/EnvironmentUtils.cs
@ -1,9 +0,0 @@
-using System;
-
-namespace YABA.Common.Utils
-{
-    public static class EnvironmentUtils
-    {
-        public static bool IsDevelopmentEnvironment() => Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == "Development";
-    }
-}
--- a/Web/nginx.conf
+++ b/Web/nginx.conf
@ -1,5 +1,6 @@
 server {
  listen 80;
+  server_name localhost;
  root /usr/share/nginx/html;
  index index.html;
  location / {