Skip to content

Commit

Permalink
Component updates Dec-2023 (#750)
Browse files Browse the repository at this point in the history
* dotnet 8

* Bump hashicorp/azurerm in /src/infra/workload/globalresources (#718)

Bumps [hashicorp/azurerm](https://github.com/hashicorp/terraform-provider-azurerm) from 3.78.0 to 3.83.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-azurerm/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-azurerm/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-azurerm@v3.78.0...v3.83.0)

---
updated-dependencies:
- dependency-name: hashicorp/azurerm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump hashicorp/azurerm (#721)

Bumps [hashicorp/azurerm](https://github.com/hashicorp/terraform-provider-azurerm) from 3.78.0 to 3.83.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-azurerm/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-azurerm/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-azurerm@v3.78.0...v3.83.0)

---
updated-dependencies:
- dependency-name: hashicorp/azurerm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump hashicorp/azurerm in /src/infra/monitoring/grafana/terraform/stamps (#714)

Bumps [hashicorp/azurerm](https://github.com/hashicorp/terraform-provider-azurerm) from 3.78.0 to 3.83.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-azurerm/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-azurerm/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-azurerm@v3.78.0...v3.83.0)

---
updated-dependencies:
- dependency-name: hashicorp/azurerm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump hashicorp/azurerm (#716)

Bumps [hashicorp/azurerm](https://github.com/hashicorp/terraform-provider-azurerm) from 3.78.0 to 3.83.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-azurerm/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-azurerm/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-azurerm@v3.78.0...v3.83.0)

---
updated-dependencies:
- dependency-name: hashicorp/azurerm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* npm

* Bump hashicorp/azurerm in /src/infra/workload/releaseunit (#734)

Bumps [hashicorp/azurerm](https://github.com/hashicorp/terraform-provider-azurerm) from 3.78.0 to 3.83.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-azurerm/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-azurerm/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-azurerm@v3.78.0...v3.83.0)

---
updated-dependencies:
- dependency-name: hashicorp/azurerm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump grafana/grafana in /src/infra/monitoring/grafana (#749)

Bumps grafana/grafana from 10.2.0 to 10.2.2.

---
updated-dependencies:
- dependency-name: grafana/grafana
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
sebader and dependabot[bot] authored Dec 6, 2023
1 parent adddbc2 commit 18858ea
Show file tree
Hide file tree
Showing 17 changed files with 414 additions and 374 deletions.
2 changes: 1 addition & 1 deletion .ado/pipelines/config/configuration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ variables:
- name: 'certManagerVersion' # cert-manager helm chart version
value: 'v1.13.1'
- name: 'dotnetSdkVersion' # dotnet sdk version
value: '6.0.415'
value: '8.0.100'
- name: 'uiAppNodeVersion' # nodejs version for the UI app
value: '18.x'
- name: 'testsNodeVersion' # nodejs version used for smoketests / playwright
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>AlwaysOn.BackgroundProcessor</RootNamespace>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..</DockerfileContext>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Data.Tables" Version="12.8.1" />
<PackageReference Include="Azure.Identity" Version="1.10.3" />
<PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.9.3" />
<PackageReference Include="Azure.Data.Tables" Version="12.8.2" />
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.10.0" />
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.21.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/app/AlwaysOn.BackgroundProcessor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
WORKDIR /app

COPY . ./
RUN dotnet publish AlwaysOn.BackgroundProcessor -c Release -o AlwaysOn.BackgroundProcessor/out

FROM mcr.microsoft.com/dotnet/aspnet:6.0
FROM mcr.microsoft.com/dotnet/aspnet:8.0

# Update and upgrade
RUN apt-get update && apt-get upgrade -y \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>AlwaysOn.CatalogService</RootNamespace>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..</DockerfileContext>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.3" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/app/AlwaysOn.CatalogService/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Create build environment
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
WORKDIR /app
COPY . ./
RUN dotnet publish AlwaysOn.CatalogService -c Release -o AlwaysOn.CatalogService/out

# Create application container
FROM mcr.microsoft.com/dotnet/aspnet:6.0
FROM mcr.microsoft.com/dotnet/aspnet:8.0
# Update and upgrade
RUN apt-get update && apt-get upgrade -y \
&& rm -rf /var/lib/apt/lists/*
Expand Down
8 changes: 4 additions & 4 deletions src/app/AlwaysOn.HealthService/AlwaysOn.HealthService.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>AlwaysOn.HealthService</RootNamespace>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.3" />
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Azure.Monitor.Query" Version="1.2.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/app/AlwaysOn.HealthService/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Create build environment
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
WORKDIR /app
COPY . ./
RUN dotnet publish AlwaysOn.HealthService -c Release -o AlwaysOn.HealthService/out

# Create application container
FROM mcr.microsoft.com/dotnet/aspnet:6.0
FROM mcr.microsoft.com/dotnet/aspnet:8.0
# Update and upgrade
RUN apt-get update && apt-get upgrade -y \
&& rm -rf /var/lib/apt/lists/*
Expand Down
10 changes: 5 additions & 5 deletions src/app/AlwaysOn.Shared/AlwaysOn.Shared.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>AlwaysOn.Shared</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Messaging.EventHubs" Version="5.9.3" />
<PackageReference Include="Azure.Messaging.EventHubs" Version="5.10.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.36.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="7.0.13" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.37.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.0" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/app/AlwaysOn.Tests/AlwaysOn.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="NUnit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public async Task ListCatalogItems_Returns_CatalogItems()
var result = await controller.ListCatalogItemsAsync();

// Assert
Assert.IsInstanceOf<ActionResult<IEnumerable<CatalogItem>>>(result); // expecting list of CatalogItems
Assert.IsInstanceOf<OkObjectResult>(result.Result); // expecting HTTP 200 result
Assert.That(result, Is.InstanceOf<ActionResult<IEnumerable<CatalogItem>>>());// expecting list of CatalogItems
Assert.That(result.Result, Is.InstanceOf<OkObjectResult>()); // expecting HTTP 200 result
}

[Test]
Expand All @@ -55,8 +55,9 @@ public async Task ListCatalogItems_DatabaseUnavailable_Returns_InternalServerErr
var result = await controller.ListCatalogItemsAsync();

// Assert
Assert.IsInstanceOf<ObjectResult>(result.Result);
Assert.AreEqual((int)HttpStatusCode.InternalServerError, ((ObjectResult)result.Result).StatusCode);
Assert.That(result.Result, Is.InstanceOf<ObjectResult>());

Assert.That((int)HttpStatusCode.InternalServerError, Is.EqualTo(((ObjectResult)result.Result)?.StatusCode));
}

[Test]
Expand All @@ -73,8 +74,8 @@ public async Task ListCatalogItems_TooManyRequests_Returns_ServiceUnavailable()
var result = await controller.ListCatalogItemsAsync();

// Assert
Assert.IsInstanceOf<ObjectResult>(result.Result);
Assert.AreEqual((int)HttpStatusCode.ServiceUnavailable, ((ObjectResult)result.Result).StatusCode);
Assert.That(result.Result, Is.InstanceOf<ObjectResult>());
Assert.That((int)HttpStatusCode.ServiceUnavailable, Is.EqualTo(((ObjectResult)result.Result)?.StatusCode));
}

[Test]
Expand All @@ -95,7 +96,7 @@ public async Task DeleteCatalogItem_NotExisting_Returns_Accepted()
var result = await controller.DeleteCatalogItemAsync(itemId);

// Assert
Assert.IsInstanceOf<ObjectResult>(result);
Assert.That(result, Is.InstanceOf<ObjectResult>());
}

private List<CatalogItem> GetTestCatalogItems()
Expand Down
Loading

0 comments on commit 18858ea

Please sign in to comment.