Merge pull request #56 from felipementel/feature/update-csproj

Feature/update csproj
felipementel · May 14, 2024 · 91d01e1 · 91d01e1
2 parents e956d85 + dcb1608
commit 91d01e1
Show file tree

Hide file tree

Showing 34 changed files with 143 additions and 35 deletions.
diff --git a/.github/workflows/pull-request-sonar.yml b/.github/workflows/pull-request-sonar.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
     paths:
-      - "src/*"
+      - "src/**"
   workflow_dispatch:
 
 # defaults:

diff --git a/.github/workflows/push-image.yaml b/.github/workflows/push-image.yaml
@@ -3,7 +3,7 @@ name: Publish Image
 on:
   push:
     paths:
-      - 'src/*'
+      - 'src/**'
     branches:
       - main
   workflow_dispatch:

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -2,7 +2,6 @@
 # docker-compose -f ../docker/docker-compose.yml up -d --build
 # docker-compose -f ../docker/docker-compose.yml down --remove-orphans
 
-version: '3.8'
 services:
   # cachorro.api:
   #   hostname: cachorro-api
@@ -43,15 +42,15 @@ services:
     ports:
       - 1433:1433
 
-  sonarqube:
-    image: sonarqube:10.4.1-community
-    hostname: sonar-canal-deploy
-    container_name: sonar-canal-deploy
-    restart: always
-    networks:
-      - cachorro-net
-    ports:
-      - 9044:9000
+  # sonarqube:
+  #   image: sonarqube:10.4.1-community
+  #   hostname: sonar-canal-deploy
+  #   container_name: sonar-canal-deploy
+  #   restart: always
+  #   networks:
+  #     - cachorro-net
+  #   ports:
+  #     - 9044:9000
 
 networks:
   cachorro-net:

diff --git a/src/DEPLOY.Cachorro.Api/Controllers/TestsResourcesController.cs b/src/DEPLOY.Cachorro.Api/Controllers/TestsResourcesController.cs
@@ -3,9 +3,12 @@
 using Azure.Security.KeyVault.Secrets;
 using DEPLOY.Cachorro.Api.Extensions.AppConfiguration.Configs;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using Microsoft.FeatureManagement;
+using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
 
 namespace DEPLOY.Cachorro.Api.Controllers
 {
@@ -34,7 +37,7 @@ public TestsResourcesController(
         }
 
         [HttpGet("keyvault/withoptions/{key}")]
-        public async Task<IActionResult> GetAsync(string key)
+        public async Task<IActionResult> GetKeyAsync(string key)
         {
             SecretClientOptions options = new SecretClientOptions()
             {

diff --git a/src/DEPLOY.Cachorro.Api/Controllers/v1/AdocoesController.cs b/src/DEPLOY.Cachorro.Api/Controllers/v1/AdocoesController.cs
@@ -1,8 +1,13 @@
 using Asp.Versioning;
 using DEPLOY.Cachorro.Application.Interfaces.Services;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace DEPLOY.Cachorro.Api.Controllers.v1
 {

diff --git a/src/DEPLOY.Cachorro.Api/Controllers/v1/CachorrosController.cs b/src/DEPLOY.Cachorro.Api/Controllers/v1/CachorrosController.cs
@@ -3,8 +3,14 @@
 using DEPLOY.Cachorro.Application.Dtos;
 using DEPLOY.Cachorro.Application.Interfaces.Services;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace DEPLOY.Cachorro.Api.Controllers.v1
 {

diff --git a/src/DEPLOY.Cachorro.Api/Controllers/v1/TutoresController.cs b/src/DEPLOY.Cachorro.Api/Controllers/v1/TutoresController.cs
@@ -2,9 +2,13 @@
 using DEPLOY.Cachorro.Application.Dtos;
 using DEPLOY.Cachorro.Application.Interfaces.Services;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace DEPLOY.Cachorro.Api.Controllers.v1
 {
@@ -82,19 +86,21 @@ public async Task<IActionResult> CreateAsync(
             CancellationToken cancellationToken = default)
         {
             var item = await _tutorAppServices.InsertAsync(
-                tutorDto, 
+                tutorDto,
                 cancellationToken);
 
             if (item.Erros.Any())
                 return UnprocessableEntity(item.Erros);
 
             return CreatedAtAction("GetById",
-                new { 
+                new
+                {
                     id = item.Id,
                     version = new ApiVersion(
                         1,
                         0)
-                    .ToString() },
+                    .ToString()
+                },
                 item);
         }
 
@@ -119,11 +125,11 @@ public async Task<IActionResult> UpdateAsync(
 
             var retorned = await _tutorAppServices.UpdateAsync(
                 id,
-                tutorDto, 
+                tutorDto,
                 cancellationToken);
 
-               return !retorned.Any() ? NoContent() 
-                : UnprocessableEntity(retorned);
+            return !retorned.Any() ? NoContent()
+             : UnprocessableEntity(retorned);
         }
 
         [HttpDelete("{id:long}")]

diff --git a/src/DEPLOY.Cachorro.Api/DEPLOY.Cachorro.Api.csproj b/src/DEPLOY.Cachorro.Api/DEPLOY.Cachorro.Api.csproj
@@ -6,11 +6,10 @@
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<NoWarn>$(NoWarn);8604</NoWarn>
 		<NoWarn>$(NoWarn);8603</NoWarn>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<UserSecretsId>CachorroAPI_Local</UserSecretsId>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<NoWarn>$(NoWarn);8602</NoWarn>
+		<UserSecretsId>CachorroAPI_MVP</UserSecretsId>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<ApplicationInsightsResourceId>/subscriptions/f4574f09-7fab-45bd-8eb5-508b8c6aa04a/resourceGroups/rg-canaldeploy-dev/providers/microsoft.insights/components/appi-cachorroapi-dev</ApplicationInsightsResourceId>
 		<Version>2.3.0</Version>
 	</PropertyGroup>
 

diff --git a/src/DEPLOY.Cachorro.Api/Extensions/AppConfiguration/AppConfigurationExtension.cs b/src/DEPLOY.Cachorro.Api/Extensions/AppConfiguration/AppConfigurationExtension.cs
@@ -1,6 +1,9 @@
 using DEPLOY.Cachorro.Api.Extensions.AppConfiguration.Configs;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration.AzureAppConfiguration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.FeatureManagement;
+using System;
 using System.Diagnostics.CodeAnalysis;
 
 namespace DEPLOY.Cachorro.Api.Extensions.AppConfiguration

diff --git a/src/DEPLOY.Cachorro.Api/Extensions/Auth/AuthExtension.cs b/src/DEPLOY.Cachorro.Api/Extensions/Auth/AuthExtension.cs
@@ -1,6 +1,8 @@
 using Azure.Identity;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.Azure;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Identity.Web;
 using System.Diagnostics.CodeAnalysis;
 

diff --git a/src/DEPLOY.Cachorro.Api/Extensions/Database/DatabaseExtension.cs b/src/DEPLOY.Cachorro.Api/Extensions/Database/DatabaseExtension.cs
@@ -1,6 +1,9 @@
 using DEPLOY.Cachorro.Infra.Repository;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Diagnostics.CodeAnalysis;
 
 namespace DEPLOY.Cachorro.Api.Extensions.Database

diff --git a/src/DEPLOY.Cachorro.Api/Extensions/KeyVault/KeyVaultExtension.cs b/src/DEPLOY.Cachorro.Api/Extensions/KeyVault/KeyVaultExtension.cs
@@ -1,5 +1,7 @@
 using Azure.Identity;
 using Microsoft.Extensions.Azure;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using System.Diagnostics.CodeAnalysis;
 
 namespace DEPLOY.Cachorro.Api.Extensions.KeyVault

diff --git a/src/DEPLOY.Cachorro.Api/Extensions/Swagger/ConfigureSwaggerOptions.cs b/src/DEPLOY.Cachorro.Api/Extensions/Swagger/ConfigureSwaggerOptions.cs
@@ -1,9 +1,11 @@
 using Asp.Versioning;
 using Asp.Versioning.ApiExplorer;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Text;

diff --git a/src/DEPLOY.Cachorro.Api/Extensions/Swagger/SwaggerDefaultValues.cs b/src/DEPLOY.Cachorro.Api/Extensions/Swagger/SwaggerDefaultValues.cs
@@ -2,7 +2,9 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
+using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Text.Json;
 
 namespace DEPLOY.Cachorro.Api.Extensions.Swagger

diff --git a/src/DEPLOY.Cachorro.Api/Extensions/Swagger/SwaggerExtension.cs b/src/DEPLOY.Cachorro.Api/Extensions/Swagger/SwaggerExtension.cs
@@ -1,7 +1,12 @@
 using Asp.Versioning;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Swashbuckle.AspNetCore.SwaggerGen;
+using System;
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
 
 namespace DEPLOY.Cachorro.Api.Extensions.Swagger
 {

diff --git a/src/DEPLOY.Cachorro.Api/Extensions/Telemetria/AppInsightsExtensions.cs b/src/DEPLOY.Cachorro.Api/Extensions/Telemetria/AppInsightsExtensions.cs
@@ -1,5 +1,7 @@
 using Microsoft.ApplicationInsights.DependencyCollector;
 using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using System.Diagnostics.CodeAnalysis;
 
 namespace DEPLOY.Cachorro.Api.Extensions.Telemetria

diff --git a/src/DEPLOY.Cachorro.Api/Extensions/Telemetria/LoggingExtensions.cs b/src/DEPLOY.Cachorro.Api/Extensions/Telemetria/LoggingExtensions.cs
@@ -1,4 +1,6 @@
-using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using System.Diagnostics.CodeAnalysis;
 
 namespace DEPLOY.Cachorro.Api.Extensions.Telemetria
 {

diff --git a/src/DEPLOY.Cachorro.Api/Program.cs b/src/DEPLOY.Cachorro.Api/Program.cs
@@ -7,6 +7,9 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using DEPLOY.Cachorro.Infra.CrossCutting;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
 namespace DEPLOY.Cachorro.Api
 {
     [ExcludeFromCodeCoverage]

diff --git a/src/DEPLOY.Cachorro.MinimalApi/DEPLOY.Cachorro.MinimalApi.csproj b/src/DEPLOY.Cachorro.MinimalApi/DEPLOY.Cachorro.MinimalApi.csproj
@@ -7,12 +7,10 @@
 		<NoWarn>$(NoWarn);8604</NoWarn>
 		<NoWarn>$(NoWarn);8603</NoWarn>
 		<NoWarn>$(NoWarn);8602</NoWarn>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<UserSecretsId>CachorroAPI_Local</UserSecretsId>
+		<UserSecretsId>CachorroAPI_MVP</UserSecretsId>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<ApplicationInsightsResourceId>/subscriptions/f4574f09-7fab-45bd-8eb5-508b8c6aa04a/resourceGroups/rg-canaldeploy-dev/providers/microsoft.insights/components/appi-cachorroapi-dev</ApplicationInsightsResourceId>
-		<Version>1.1.0-MinimalApi</Version>
+		<Version>1.3.0-MinimalApi</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/DEPLOY.Cachorro.MinimalApi/Endpoints/TestResourcesEndpoints.cs b/src/DEPLOY.Cachorro.MinimalApi/Endpoints/TestResourcesEndpoints.cs
@@ -2,10 +2,21 @@
 using Azure.Core;
 using Azure.Identity;
 using Azure.Security.KeyVault.Secrets;
+using DEPLOY.Cachorro.Application.Dtos;
 using DEPLOY.Cachorro.MinimalApi.Configs;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using Microsoft.FeatureManagement;
 using Microsoft.OpenApi.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace DEPLOY.Cachorro.MinimalApi.Endpoints
 {
@@ -30,7 +41,7 @@ public static void MapTestResourcesEndpoints(this IEndpointRouteBuilder app)
                     IConfiguration configuration,
                     CancellationToken cancellationToken) =>
                 {
-                    async Task<IResult> GetAsync(
+                    async Task<IResult> GetKeyAsync(
                         string key)
                     {
                         SecretClientOptions options = new SecretClientOptions()
@@ -56,7 +67,7 @@ async Task<IResult> GetAsync(
                         return TypedResults.Ok(secretValue);
                     }
 
-                    return await GetAsync(key);
+                    return await GetKeyAsync(key);
                 })
                 .WithOpenApi(operation => new(operation)
                 {
@@ -99,7 +110,7 @@ string key
                     IOptions<Settings> settings,
                     CancellationToken cancellationToken) =>
                 {
-                    async Task<IResult> GetAsync()
+                    async Task<Ok<string>> GetAsync()
                     {
                         return TypedResults.Ok(settings.Value.ValorDaMensagem);
                     }

diff --git a/src/DEPLOY.Cachorro.MinimalApi/Endpoints/v1/AdocoesEndpoints.cs b/src/DEPLOY.Cachorro.MinimalApi/Endpoints/v1/AdocoesEndpoints.cs
@@ -1,7 +1,15 @@
 using Asp.Versioning;
 using DEPLOY.Cachorro.Application.Interfaces.Services;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.OpenApi.Models;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace DEPLOY.Cachorro.MinimalApi.Endpoints.v1
 {

diff --git a/src/DEPLOY.Cachorro.MinimalApi/Endpoints/v1/CachorroEndpoints.cs b/src/DEPLOY.Cachorro.MinimalApi/Endpoints/v1/CachorroEndpoints.cs
@@ -1,9 +1,17 @@
 using Asp.Versioning;
 using DEPLOY.Cachorro.Application.Dtos;
 using DEPLOY.Cachorro.Application.Interfaces.Services;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.HttpResults;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.OpenApi.Models;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace DEPLOY.Cachorro.MinimalApi.Endpoints.v1
 {

diff --git a/src/DEPLOY.Cachorro.MinimalApi/Endpoints/v1/TutorEndpoints.cs b/src/DEPLOY.Cachorro.MinimalApi/Endpoints/v1/TutorEndpoints.cs
@@ -1,9 +1,17 @@
 using Asp.Versioning;
 using DEPLOY.Cachorro.Application.Dtos;
 using DEPLOY.Cachorro.Application.Interfaces.Services;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.OpenApi.Models;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace DEPLOY.Cachorro.MinimalApi.Endpoints.v1
 {
@@ -113,7 +121,7 @@ async Task<IResult> CreateTutorAsync()
                     Description = "Operação para cadastrar tutor",
                     Tags = new List<OpenApiTag> { new() { Name = "Tutores" } }
                 });
-            
+
             tutores.MapPut("/{id:long}", async (
                 long id,
                 TutorDto tutorDto,
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Publish Image @@
     on:
       push:
         paths:
-          - 'src/*'
+          - 'src/**'
         branches:
           - main
       workflow_dispatch:
@@ Expand Down @@