testagain

Author: fdonnet

.github/workflows/build_and_test_new_on_tenant_users_branch.yml

@@ -1,66 +1,72 @@
-# # This workflow will build a .NET project
-# # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
 
-# name: build_and_test_2
+name: build_and_test_2
 
-# on:
-#   push:
-#     branches: [ "tenants_and_users" ]
-#   pull_request:
-#     branches: [ "tenants_and_users" ]
+on:
+  push:
+    branches: [ "tenants_and_users" ]
+  pull_request:
+    branches: [ "tenants_and_users" ]
 
-# jobs:
-#   build:
-#     runs-on: ubuntu-latest
-#     services:
-#       docker:
-#         image: docker:27.2.0
-#         options: --privileged
-#         # ports:
-#         #   - 8082:8080
-#         #   - 5435:5432
-#         #   - 15672:15672
-#         #   - 5672:5672
-#         #   - 6379:6379
-#         #   - 6380:6379
-#         #   - 8001:8001
-#         #   - 8004:8004
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    services:
+      docker:
+        image: docker:27.2.0
+        options: --privileged
+        # ports:
+        #   - 8082:8080
+        #   - 5435:5432
+        #   - 15672:15672
+        #   - 5672:5672
+        #   - 6379:6379
+        #   - 6380:6379
+        #   - 8001:8001
+        #   - 8004:8004
 
-#     defaults:
-#       run:
-#         working-directory: ./
-#     steps:
-#     - name: Checkout repo
-#       uses: actions/checkout@v4
+    defaults:
+      run:
+        working-directory: ./
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v4
 
-#     - name: Run docker compose
-#       run: docker compose -f docker-compose.yml up --build -d
-#       working-directory: ./
+    - name: Run docker compose
+      run: docker compose -f docker-compose.yml -f docker-integration-tests.yml up --build -d
+      working-directory: ./
 
-#     - name: Print Docker Compose logs
-#       run: docker compose logs
+    - name: Print Docker Compose logs
+      run: docker compose logs
 
-#     # - name: Set up Docker Compose
-#     #   uses: hoverkraft-tech/compose-action@v2.0.2
-#     #   with:
-#     #     compose-file: |
-#     #       docker-compose.yml
-#     #       docker-integration-tests.yml
+    - name: Dump all logs
+      uses: jwalton/gh-docker-logs@v2
+      with:
+        images: 'ubik-security-api-test'
+        tail: '500'
 
-#     - name: Setup .NET
-#       uses: actions/setup-dotnet@v3
-#       with:
-#         dotnet-version: 8.0.x
+    # - name: Set up Docker Compose
+    #   uses: hoverkraft-tech/compose-action@v2.0.2
+    #   with:
+    #     compose-file: |
+    #       docker-compose.yml
+    #       docker-integration-tests.yml
 
-#     - name: Restore dependencies
-#       run: dotnet restore
-#       working-directory: ./src/
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 8.0.x
 
-#     - name: Build
-#       run: dotnet build -c Debug --no-restore
-#       working-directory: ./src/
+    - name: Restore dependencies
+      run: dotnet restore
+      working-directory: ./src/
 
-#     - name: Test
-#       if: ${{ success() }}
-#       run: dotnet test -c Debug --no-build --no-restore
-#       working-directory: ./src/
+    - name: Build
+      run: dotnet build -c Debug --no-restore
+      working-directory: ./src/
+
+    - name: Test
+      if: ${{ success() }}
+      run: dotnet test -c Debug --no-build --no-restore
+      working-directory: ./src/

docker-compose.yml

@@ -200,44 +200,6 @@ services:
     expose:
       - "5435"
 
-  security-api-test:
-    build:
-      context: ./
-      dockerfile: src/Ubik.Security.Api/Dockerfile
-    container_name: "security-api-test"
-    environment:
-      - "ASPNETCORE_ENVIRONMENT=Development"
-      - "AuthServer__MetadataAddress=http://keycloak:8080/realms/ubik/.well-known/openid-configuration"
-      - "AuthServer__Authority=http://keycloak:8080/realms/ubik"
-      - "AuthServer__AuthorizationUrl=http://keycloak:8080/realms/ubik/protocol/openid-connect/auth"
-      - "AuthServer__TokenUrl=http://keycloak:8080/realms/ubik/.protocol/openid-connect/token"
-      - "ConnectionStrings__SecurityDbContext=Host=db-test;Port=5432;Database=ubik_security;Username=postgres;Password=test01"
-      - "AuthManagerKeyCloakClient__RootUrl=http://keycloak:8080/"
-      - "MessageBroker__Host=amqp://rabbit:5672"
-    depends_on:
-      rabbitmq:
-        condition: service_started
-      keycloak-last:
-        condition: service_healthy
-      ubik-proxy-cache:
-        condition: service_started
-      ubik-postgres:
-        condition: service_started
-    networks:
-      - ubik-network
-    ports:
-      - "5000:8080"
-
-  finisher:
-      container_name: wait-for-completion
-      image: alpine
-      healthcheck:
-        test: exit 0
-        interval: 2s
-      depends_on:
-        security-api-test:
-          condition: service_started
-
 volumes:
   ubik-rabbitmq-vol:
   ubik-postgresl-vol:

docker-integration-tests.yml

@@ -22,7 +22,23 @@ services:
         condition: service_started
       ubik-postgres:
         condition: service_started
+    healthcheck:
+      test: ["CMD-SHELL", "curl --fail http://localhost:80/healthcheck || exit 1" ]
+      start_period: 10s
+      interval: 30s
+      retries: 3
+      timeout: 5s
+      
     networks:
       - ubik-network
     ports:
       - "5000:8080"
+  finisher:
+    container_name: wait-for-completion
+    image: alpine
+    healthcheck:
+      test: exit 0
+      interval: 2s
+    depends_on:
+      security-api-test:
+        condition: service_started

src/Ubik.Security.Api/Program.cs

@@ -146,6 +146,8 @@
     options.LowercaseUrls = true;
 });
 
+//builder.Services.AddHealthChecks();
+
 //Build the app
 var app = builder.Build();
 
@@ -194,4 +196,5 @@
 );
 
 app.MapControllers();
+//app.MapHealthChecks("/api/health");
 app.Run();