Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ runs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Restore dependencies
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/validate/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Build functions
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-prerelease-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Restore dependencies
run: dotnet restore Lho.Lambda.slnx
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Restore dependencies
run: dotnet restore Lho.Lambda.slnx
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
dotnet-version: "10.0.x"

- name: Restore dependencies
run: dotnet restore Lho.Lambda.slnx
Expand Down
2 changes: 1 addition & 1 deletion src/Lho.Lambda.Authorizer/Lho.Lambda.Authorizer.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Lho.Lambda.Local/Lho.Lambda.Local.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
</PropertyGroup>

Expand Down
3 changes: 1 addition & 2 deletions src/Lho.Lambda.Observability/SentryTelemetry.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using Amazon.Lambda.Core;
using Sentry;

namespace Lho.Lambda.Observability;

public static class SentryTelemetry
{
private static readonly object InitLock = new();
private static readonly Lock InitLock = new();
private static bool _initialised;

public static bool Initialise(ILambdaLogger logger)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Lho.Lambda.Tests/Lho.Lambda.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion src/Lho.Lambda/Functions/ApiFunction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ private static string NormalisePath(string? rawPath)
return path switch
{
"" => "/",
var value when value.StartsWith("/", StringComparison.Ordinal) => value,
_ when path.StartsWith("/", StringComparison.Ordinal) => path,
_ => "/" + path
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/Lho.Lambda/Lho.Lambda.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Lho.Lambda/Utils/MemoryCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace Lho.Lambda.Utils;

public class MemoryCache
{
private readonly object _lock = new();
private readonly Lock _lock = new();
private readonly Dictionary<string, CacheEntry> _cache = [];

public T? Get<T>(string key)
Expand Down
3 changes: 2 additions & 1 deletion terraform/authorizer.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ resource "aws_lambda_function" "api_authorizer" {
role = aws_iam_role.lambda_exec.arn
handler = "Lho.Lambda.Authorizer::Lho.Lambda.Authorizer.Functions.AuthorizerFunction::FunctionHandler"
source_code_hash = data.archive_file.auth_archive.output_base64sha256
runtime = "dotnet8"
runtime = "dotnet10"
memory_size = 256
architectures = ["x86_64"]
timeout = 10
Expand All @@ -29,6 +29,7 @@ resource "aws_lambda_function" "api_authorizer" {
SERVICE_NAME = "now-playing"
ENVIRONMENT = var.env
VERSION = var.app_version
DOTNET_ROLL_FORWARD = "Major"
GIT_SHA = var.git_sha
SENTRY_DSN = var.sentry_dsn
SENTRY_ENVIRONMENT = var.env
Expand Down
3 changes: 2 additions & 1 deletion terraform/lambda.tf
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ resource "aws_iam_role_policy_attachment" "aws_xray_write_only_access" {

resource "aws_lambda_function" "lambda" {
function_name = "${var.project_name}-lambda-${var.env}"
runtime = "dotnet8"
runtime = "dotnet10"
handler = "Lho.Lambda::Lho.Lambda.Functions.ApiFunction::FunctionHandler"
role = aws_iam_role.lambda_exec.arn
filename = "${path.module}/../lambda.zip"
Expand All @@ -56,6 +56,7 @@ resource "aws_lambda_function" "lambda" {
SERVICE_NAME = "now-playing"
ENVIRONMENT = var.env
VERSION = var.app_version
DOTNET_ROLL_FORWARD = "Major"
DEPLOYED_AT = timestamp()
DEPLOYED_BY = var.deployed_by
GIT_SHA = var.git_sha
Expand Down
2 changes: 1 addition & 1 deletion terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 5.0"
version = "6.27.0"
}
}
}
Loading