HiveMind changes
This commit is contained in:
Даниил Соколов-Рудаков
committed by
Kirill
Kirill
parent
78eda5f350
commit
ea1b6c6ee7
@@ -1,49 +0,0 @@
|
||||
using Asp.Versioning;
|
||||
using DevOpsProject.HiveMind.Logic.Services.Interfaces;
|
||||
using DevOpsProject.Shared.Configuration;
|
||||
using DevOpsProject.Shared.Models;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace DevOpsProject.HiveMind.API.Controllers
|
||||
{
|
||||
[ApiVersion("1.0")]
|
||||
[ApiController]
|
||||
[Route("api/v{version:apiVersion}")]
|
||||
public class HiveMindController : Controller
|
||||
{
|
||||
private readonly IHiveMindService _hiveMindService;
|
||||
private readonly IHiveMindMovingService _hiveMindMovingService;
|
||||
|
||||
public HiveMindController(IHiveMindService hiveMindService, IHiveMindMovingService hiveMindMovingService)
|
||||
{
|
||||
_hiveMindService = hiveMindService;
|
||||
_hiveMindMovingService = hiveMindMovingService;
|
||||
}
|
||||
|
||||
[HttpGet("ping")]
|
||||
public IActionResult Ping(IOptionsSnapshot<HiveCommunicationConfig> config)
|
||||
{
|
||||
return Ok(new
|
||||
{
|
||||
Timestamp = DateTime.Now,
|
||||
ID = config.Value.HiveID
|
||||
});
|
||||
}
|
||||
|
||||
[HttpPost("connect")]
|
||||
public async Task<IActionResult> TriggerConnectHive()
|
||||
{
|
||||
await _hiveMindService.ConnectHive();
|
||||
return Ok();
|
||||
}
|
||||
|
||||
[HttpPost("command")]
|
||||
public IActionResult MoveHideMind(MoveHiveMindCommand command)
|
||||
{
|
||||
_hiveMindMovingService.MoveToLocation(command.Location);
|
||||
return Ok();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,94 +1,126 @@
|
||||
using Asp.Versioning;
|
||||
using Asp.Versioning.Builder;
|
||||
using DevOpsProject.HiveMind.API.DI;
|
||||
using DevOpsProject.HiveMind.API.Middleware;
|
||||
using DevOpsProject.HiveMind.Logic.Services.Interfaces;
|
||||
using DevOpsProject.Shared.Clients;
|
||||
using DevOpsProject.Shared.Configuration;
|
||||
using DevOpsProject.Shared.Models;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Microsoft.OpenApi.Models;
|
||||
using Polly;
|
||||
using Polly.Extensions.Http;
|
||||
using Serilog;
|
||||
|
||||
internal class Program
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
builder.Host.UseSerilog((context, services, loggerConfig) =>
|
||||
loggerConfig.ReadFrom.Configuration(context.Configuration)
|
||||
.ReadFrom.Services(services)
|
||||
.Enrich.FromLogContext());
|
||||
|
||||
builder.Services.AddApiVersioning(options =>
|
||||
{
|
||||
private static void Main(string[] args)
|
||||
options.DefaultApiVersion = new ApiVersion(1, 0);
|
||||
options.AssumeDefaultVersionWhenUnspecified = true;
|
||||
options.ReportApiVersions = true;
|
||||
options.ApiVersionReader = ApiVersionReader.Combine(
|
||||
new UrlSegmentApiVersionReader(),
|
||||
new HeaderApiVersionReader("X-Api-Version")
|
||||
);
|
||||
}).AddApiExplorer(options =>
|
||||
{
|
||||
options.GroupNameFormat = "'v'VVV";
|
||||
options.SubstituteApiVersionInUrl = true;
|
||||
});
|
||||
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddAuthorization();
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
c.SwaggerDoc("v1", new OpenApiInfo { Title = "HiveMind - V1", Version = "v1.0" });
|
||||
});
|
||||
builder.Services.AddHiveMindLogic();
|
||||
|
||||
builder.Services.Configure<HiveCommunicationConfig>(builder.Configuration.GetSection("CommunicationConfiguration"));
|
||||
|
||||
var communicationControlTelemetryPolicy = HttpPolicyExtensions
|
||||
.HandleTransientHttpError()
|
||||
.WaitAndRetryAsync(3, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
|
||||
builder.Services.AddHttpClient<HiveMindHttpClient>()
|
||||
.AddPolicyHandler(communicationControlTelemetryPolicy);
|
||||
|
||||
// register NAMED client for connect request
|
||||
builder.Services.AddHttpClient("HiveConnectClient");
|
||||
|
||||
string corsPolicyName = "HiveMindCorsPolicy";
|
||||
builder.Services.AddCors(options =>
|
||||
{
|
||||
options.AddPolicy(name: corsPolicyName,
|
||||
policy =>
|
||||
{
|
||||
policy.AllowAnyOrigin() //SECURITY WARNING ! Never allow all origins
|
||||
.AllowAnyMethod()
|
||||
.AllowAnyHeader();
|
||||
});
|
||||
});
|
||||
|
||||
builder.Services.AddExceptionHandler<ExceptionHandlingMiddleware>();
|
||||
builder.Services.AddProblemDetails();
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
using (var scope = app.Services.CreateScope())
|
||||
{
|
||||
var logger = scope.ServiceProvider.GetRequiredService<ILogger<Program>>();
|
||||
try
|
||||
{
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
builder.Host.UseSerilog((context, services, loggerConfig) =>
|
||||
loggerConfig.ReadFrom.Configuration(context.Configuration)
|
||||
.ReadFrom.Services(services)
|
||||
.Enrich.FromLogContext());
|
||||
|
||||
builder.Services.AddApiVersioning(options =>
|
||||
{
|
||||
options.DefaultApiVersion = new ApiVersion(1, 0);
|
||||
options.AssumeDefaultVersionWhenUnspecified = true;
|
||||
options.ReportApiVersions = true;
|
||||
options.ApiVersionReader = ApiVersionReader.Combine(
|
||||
new UrlSegmentApiVersionReader(),
|
||||
new HeaderApiVersionReader("X-Api-Version")
|
||||
);
|
||||
}).AddApiExplorer(options =>
|
||||
{
|
||||
options.GroupNameFormat = "'v'VVV";
|
||||
options.SubstituteApiVersionInUrl = true;
|
||||
});
|
||||
|
||||
// TODO: double check following approach
|
||||
builder.Services.AddControllers().AddJsonOptions(options =>
|
||||
{
|
||||
options.JsonSerializerOptions.PropertyNamingPolicy = null;
|
||||
});
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
c.SwaggerDoc("v1", new OpenApiInfo { Title = "HiveMind - V1", Version = "v1.0" });
|
||||
});
|
||||
builder.Services.AddHiveMindLogic();
|
||||
|
||||
builder.Services.Configure<HiveCommunicationConfig>(builder.Configuration.GetSection("CommunicationConfiguration"));
|
||||
|
||||
var communicationControlRetryPolicy = HttpPolicyExtensions
|
||||
.HandleTransientHttpError()
|
||||
.WaitAndRetryAsync(3, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
|
||||
builder.Services.AddHttpClient<HiveMindHttpClient>()
|
||||
.AddPolicyHandler(communicationControlRetryPolicy);
|
||||
|
||||
string corsPolicyName = "HiveMindCorsPolicy";
|
||||
builder.Services.AddCors(options =>
|
||||
{
|
||||
options.AddPolicy(name: corsPolicyName,
|
||||
policy =>
|
||||
{
|
||||
policy.AllowAnyOrigin() //SECURITY WARNING ! Never allow all origins
|
||||
.AllowAnyMethod()
|
||||
.AllowAnyHeader();
|
||||
});
|
||||
});
|
||||
|
||||
builder.Services.AddExceptionHandler<ExceptionHandlingMiddleware>();
|
||||
builder.Services.AddProblemDetails();
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
app.UseExceptionHandler();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
app.UseCors(corsPolicyName);
|
||||
|
||||
//app.UseHttpsRedirection();
|
||||
|
||||
app.UseAuthorization();
|
||||
|
||||
app.MapControllers();
|
||||
|
||||
app.Run();
|
||||
var hiveMindService = scope.ServiceProvider.GetRequiredService<IHiveMindService>();
|
||||
await hiveMindService.ConnectHive();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError($"Error occured while connecting Hive to Communication Control. \nException text: {ex.Message}");
|
||||
System.Diagnostics.Process.GetCurrentProcess().Kill();
|
||||
}
|
||||
}
|
||||
|
||||
app.UseExceptionHandler();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
app.UseCors(corsPolicyName);
|
||||
|
||||
//app.UseHttpsRedirection();
|
||||
|
||||
app.UseAuthorization();
|
||||
|
||||
ApiVersionSet apiVersionSet = app.NewApiVersionSet()
|
||||
.HasApiVersion(new ApiVersion(1))
|
||||
.ReportApiVersions()
|
||||
.Build();
|
||||
|
||||
RouteGroupBuilder groupBuilder = app.MapGroup("api/v{apiVersion:apiVersion}").WithApiVersionSet(apiVersionSet);
|
||||
|
||||
groupBuilder.MapGet("ping", (IOptionsSnapshot<HiveCommunicationConfig> config) =>
|
||||
{
|
||||
return Results.Ok(new
|
||||
{
|
||||
Timestamp = DateTime.Now,
|
||||
ID = config.Value.HiveID
|
||||
});
|
||||
});
|
||||
|
||||
groupBuilder.MapPost("command", (MoveHiveMindCommand command, IHiveMindMovingService hiveMindMovingService) =>
|
||||
{
|
||||
hiveMindMovingService.MoveToLocation(command.Location);
|
||||
return Results.Ok();
|
||||
});
|
||||
|
||||
app.Run();
|
||||
|
||||
@@ -1,4 +1,20 @@
|
||||
{
|
||||
|
||||
"CommunicationConfiguration": {
|
||||
"RequestSchema": "http",
|
||||
"CommunicationControlIP": "localhost",
|
||||
"CommunicationControlPort": 8080,
|
||||
"CommunicationControlPath": "api/v1/hive",
|
||||
"HiveIP": "localhost",
|
||||
"HivePort": 5149,
|
||||
"HiveID": "1",
|
||||
"InitialLocation": {
|
||||
"Latitude": 48.719547,
|
||||
"Longitude": 38.092680
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"Urls": "http://0.0.0.0:5149",
|
||||
"Serilog": {
|
||||
"Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
|
||||
"MinimumLevel": {
|
||||
@@ -31,19 +47,6 @@
|
||||
"Application": "DevOpsProject.HiveMind",
|
||||
"Environment": "Development"
|
||||
}
|
||||
},
|
||||
"CommunicationConfiguration": {
|
||||
"RequestSchema": "http",
|
||||
"CommunicationControlIP": "localhost",
|
||||
"CommunicationControlPort": 8080,
|
||||
"CommunicationControlPath": "api/v1/hive",
|
||||
"HiveIP": "localhost",
|
||||
"HivePort": 5149,
|
||||
"HiveID": "1",
|
||||
"InitialLocation": {
|
||||
"Latitude": 48.719547,
|
||||
"Longitude": 38.092680
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*"
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user