Skip to content

Commit 0400d14

Browse files
frasermolyneuxfrasermolyneux
committed
Update workflow actions and package references to latest versions
1 parent 460fcf8 commit 0400d14

12 files changed

Lines changed: 42 additions & 41 deletions

File tree

‎.github/workflows/build-and-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
contents: read
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: frasermolyneux/actions/dotnet-web-ci@main
18+
- uses: frasermolyneux/actions/dotnet-web-ci@dotnet-web-ci/v1.4
1919
with:
2020
dotnet-project: "XtremeIdiots.Portal.Web"
2121
dotnet-version: 9.0.x
@@ -31,7 +31,7 @@ jobs:
3131
concurrency:
3232
group: ${{ github.repository }}-dev
3333
steps:
34-
- uses: frasermolyneux/actions/terraform-plan@main
34+
- uses: frasermolyneux/actions/terraform-plan@terraform-plan/v1.4
3535
with:
3636
terraform-folder: "terraform"
3737
terraform-var-file: "tfvars/dev.tfvars"

‎.github/workflows/deploy-dev.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
id-token: write
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: frasermolyneux/actions/dotnet-web-ci@main
15+
- uses: frasermolyneux/actions/dotnet-web-ci@dotnet-web-ci/v1.4
1616
with:
1717
dotnet-project: "XtremeIdiots.Portal.Web"
1818
dotnet-version: 9.0.x
@@ -29,7 +29,7 @@ jobs:
2929
concurrency:
3030
group: ${{ github.repository }}-dev
3131
steps:
32-
- uses: frasermolyneux/actions/terraform-plan-and-apply@main
32+
- uses: frasermolyneux/actions/terraform-plan-and-apply@terraform-plan-and-apply/v1.4
3333
with:
3434
terraform-folder: "terraform"
3535
terraform-var-file: "tfvars/dev.tfvars"
@@ -65,7 +65,7 @@ jobs:
6565
concurrency:
6666
group: ${{ github.repository }}-dev
6767
steps:
68-
- uses: frasermolyneux/actions/deploy-app-service@main
68+
- uses: frasermolyneux/actions/deploy-app-service@deploy-app-service/v1.2
6969
with:
7070
web-artifact-name: "XtremeIdiots.Portal.Web"
7171
web-app-name: ${{ needs.terraform-plan-and-apply-dev.outputs.web_app_name }}

‎.github/workflows/deploy-prd.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
id-token: write
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: frasermolyneux/actions/dotnet-web-ci@main
23+
- uses: frasermolyneux/actions/dotnet-web-ci@dotnet-web-ci/v1.4
2424
with:
2525
dotnet-project: "XtremeIdiots.Portal.Web"
2626
dotnet-version: 9.0.x
@@ -37,7 +37,7 @@ jobs:
3737
concurrency:
3838
group: ${{ github.repository }}-dev
3939
steps:
40-
- uses: frasermolyneux/actions/terraform-plan-and-apply@main
40+
- uses: frasermolyneux/actions/terraform-plan-and-apply@terraform-plan-and-apply/v1.4
4141
with:
4242
terraform-folder: "terraform"
4343
terraform-var-file: "tfvars/dev.tfvars"
@@ -73,7 +73,7 @@ jobs:
7373
concurrency:
7474
group: ${{ github.repository }}-dev
7575
steps:
76-
- uses: frasermolyneux/actions/deploy-app-service@main
76+
- uses: frasermolyneux/actions/deploy-app-service@deploy-app-service/v1.2
7777
with:
7878
web-artifact-name: "XtremeIdiots.Portal.Web"
7979
web-app-name: ${{ needs.terraform-plan-and-apply-dev.outputs.web_app_name }}
@@ -92,7 +92,7 @@ jobs:
9292
concurrency:
9393
group: ${{ github.repository }}-prd
9494
steps:
95-
- uses: frasermolyneux/actions/terraform-plan-and-apply@main
95+
- uses: frasermolyneux/actions/terraform-plan-and-apply@terraform-plan-and-apply/v1.4
9696
with:
9797
terraform-folder: "terraform"
9898
terraform-var-file: "tfvars/prd.tfvars"
@@ -128,7 +128,7 @@ jobs:
128128
concurrency:
129129
group: ${{ github.repository }}-prd
130130
steps:
131-
- uses: frasermolyneux/actions/deploy-app-service@main
131+
- uses: frasermolyneux/actions/deploy-app-service@deploy-app-service/v1.2
132132
with:
133133
web-artifact-name: "XtremeIdiots.Portal.Web"
134134
web-app-name: ${{ needs.terraform-plan-and-apply-prd.outputs.web_app_name }}

‎.github/workflows/destroy-environment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
concurrency:
2525
group: ${{ github.repository }}-${{ inputs.environment }}
2626
steps:
27-
- uses: frasermolyneux/actions/terraform-destroy@main
27+
- uses: frasermolyneux/actions/terraform-destroy@terraform-destroy/v1.2
2828
with:
2929
terraform-folder: "terraform"
3030
terraform-var-file: ${{ inputs.environment == 'prd' && 'tfvars/prd.tfvars' || 'tfvars/dev.tfvars' }}

‎.github/workflows/pr-verify.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: github.event.pull_request.draft == false
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: frasermolyneux/actions/dotnet-web-ci@main
23+
- uses: frasermolyneux/actions/dotnet-web-ci@dotnet-web-ci/v1.4
2424
with:
2525
dotnet-project: "XtremeIdiots.Portal.Web"
2626
dotnet-version: 9.0.x
@@ -43,7 +43,7 @@ jobs:
4343
AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }}
4444
AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }}
4545
steps:
46-
- uses: frasermolyneux/actions/terraform-plan@main
46+
- uses: frasermolyneux/actions/terraform-plan@terraform-plan/v1.4
4747
with:
4848
terraform-folder: "terraform"
4949
terraform-var-file: "tfvars/dev.tfvars"
@@ -64,7 +64,7 @@ jobs:
6464
concurrency:
6565
group: ${{ github.repository }}-dev
6666
steps:
67-
- uses: frasermolyneux/actions/terraform-plan-and-apply@main
67+
- uses: frasermolyneux/actions/terraform-plan-and-apply@terraform-plan-and-apply/v1.4
6868
with:
6969
terraform-folder: "terraform"
7070
terraform-var-file: "tfvars/dev.tfvars"
@@ -102,7 +102,7 @@ jobs:
102102
concurrency:
103103
group: ${{ github.repository }}-dev
104104
steps:
105-
- uses: frasermolyneux/actions/deploy-app-service@main
105+
- uses: frasermolyneux/actions/deploy-app-service@deploy-app-service/v1.2
106106
with:
107107
web-artifact-name: "XtremeIdiots.Portal.Web"
108108
web-app-name: ${{ needs.terraform-plan-and-apply-dev.outputs.web_app_name }}
@@ -127,7 +127,7 @@ jobs:
127127
AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }}
128128
AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }}
129129
steps:
130-
- uses: frasermolyneux/actions/terraform-plan@main
130+
- uses: frasermolyneux/actions/terraform-plan@terraform-plan/v1.4
131131
with:
132132
terraform-folder: "terraform"
133133
terraform-var-file: "tfvars/prd.tfvars"

‎src/XtremeIdiots.Portal.Integrations.Forums/AdminActionTopics.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.Extensions.Logging;
22
using System.Globalization;
3-
using XtremeIdiots.InvisionCommunity;
3+
using MX.InvisionCommunity.Api.Abstractions;
44
using XtremeIdiots.Portal.Integrations.Forums.Extensions;
55
using XtremeIdiots.Portal.Repository.Abstractions.Constants.V1;
66

@@ -47,13 +47,13 @@ public async Task<int> CreateTopicForAdminAction(AdminActionType type, GameType
4747

4848
var postTopicResult = await forumsClient.Forums.PostTopic(forumId, userId, $"{username} - {type}", PostContent(type, playerId, username, created, text), type.ToString()).ConfigureAwait(false);
4949

50-
if (postTopicResult is null)
50+
if (postTopicResult?.Result?.Data is null)
5151
{
5252
logger.LogWarning("Failed to create forum topic for admin action - null response");
5353
return 0;
5454
}
5555

56-
return postTopicResult.TopicId;
56+
return postTopicResult.Result.Data.TopicId;
5757
}
5858
catch (Exception ex)
5959
{

‎src/XtremeIdiots.Portal.Integrations.Forums/DemoManager.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using XtremeIdiots.InvisionCommunity;
1+
using MX.InvisionCommunity.Api.Abstractions;
22
using XtremeIdiots.Portal.Integrations.Forums.Models;
33

44
namespace XtremeIdiots.Portal.Integrations.Forums;
@@ -17,7 +17,8 @@ public class DemoManager(IInvisionApiClient forumsClient) : IDemoManager
1717
/// <exception cref="InvalidOperationException">Thrown when demo manager download file cannot be retrieved or URL is missing</exception>
1818
public async Task<DemoManagerClientDto> GetDemoManagerClient()
1919
{
20-
var downloadFile = await forumsClient.Downloads.GetDownloadFile(2753).ConfigureAwait(false);
20+
var downloadFileResult = await forumsClient.Downloads.GetDownloadFile(2753).ConfigureAwait(false);
21+
var downloadFile = downloadFileResult?.Result?.Data;
2122

2223
return downloadFile is null
2324
? throw new InvalidOperationException("Unable to retrieve demo manager download file from forums")

‎src/XtremeIdiots.Portal.Integrations.Forums/XtremeIdiots.Portal.Integrations.Forums.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<ItemGroup>
1212
<PackageReference Include="Azure.Identity" Version="1.17.1" />
1313
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.3" />
14-
<PackageReference Include="XtremeIdiots.InvisionCommunity" Version="1.1.132.1" />
15-
<PackageReference Include="XtremeIdiots.Portal.Repository.Api.Client.V1" Version="2.1.113" />
14+
<PackageReference Include="MX.InvisionCommunity.Api.Client" Version="1.0.18" />
15+
<PackageReference Include="XtremeIdiots.Portal.Repository.Api.Client.V1" Version="2.1.135" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/XtremeIdiots.Portal.Web/ApiControllers/HealthCheckController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Microsoft.AspNetCore.Authorization;
33
using Microsoft.AspNetCore.Mvc;
44

5-
using XtremeIdiots.InvisionCommunity;
5+
using MX.InvisionCommunity.Api.Abstractions;
66
using XtremeIdiots.Portal.Repository.Abstractions.Constants.V1;
77

88
namespace XtremeIdiots.Portal.Web.ApiControllers;
@@ -41,7 +41,7 @@ public HealthCheckController(
4141
try
4242
{
4343
var response = await this.forumsClient.Core.GetCoreHello().ConfigureAwait(false);
44-
var checkResponse = response?.CommunityUrl == "https://www.xtremeidiots.com/";
44+
var checkResponse = response?.Result?.Data?.CommunityUrl == "https://www.xtremeidiots.com/";
4545
return new Tuple<bool, string>(checkResponse, "OK");
4646
}
4747
catch (Exception ex)

‎src/XtremeIdiots.Portal.Web/Auth/XtremeIdiots/XtremeIdiotsAuth.cs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using Microsoft.AspNetCore.Authentication;
22
using Microsoft.AspNetCore.Identity;
33
using System.Security.Claims;
4-
using XtremeIdiots.InvisionCommunity;
5-
using XtremeIdiots.InvisionCommunity.Models;
4+
using MX.InvisionCommunity.Api.Abstractions;
5+
using MX.InvisionCommunity.Api.Abstractions.Models;
66
using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.UserProfiles;
77
using XtremeIdiots.Portal.Repository.Api.Client.V1;
88

@@ -74,7 +74,8 @@ private async Task UpdateExistingUser(ExternalLoginInfo info, CancellationToken
7474
{
7575
cancellationToken.ThrowIfCancellationRequested();
7676

77-
var member = await forumsClient.Core.GetMember(id).ConfigureAwait(false) ?? throw new InvalidOperationException($"Member not found with ID: {id}");
77+
var memberResult = await forumsClient.Core.GetMember(id).ConfigureAwait(false);
78+
var member = memberResult?.Result?.Data ?? throw new InvalidOperationException($"Member not found with ID: {id}");
7879
var user = await userManager.FindByLoginAsync(info.LoginProvider, info.ProviderKey).ConfigureAwait(false) ?? throw new InvalidOperationException($"User not found for login provider: {info.LoginProvider}, key: {info.ProviderKey}");
7980
cancellationToken.ThrowIfCancellationRequested();
8081

@@ -126,7 +127,8 @@ private async Task RegisterNewUser(ExternalLoginInfo info, CancellationToken can
126127
{
127128
cancellationToken.ThrowIfCancellationRequested();
128129

129-
var member = await forumsClient.Core.GetMember(id).ConfigureAwait(false) ?? throw new InvalidOperationException($"Member not found with ID: {id}");
130+
var memberResult = await forumsClient.Core.GetMember(id).ConfigureAwait(false);
131+
var member = memberResult?.Result?.Data ?? throw new InvalidOperationException($"Member not found with ID: {id}");
130132
var user = new IdentityUser { Id = id, UserName = username, Email = email };
131133
var createUserResult = await userManager.CreateAsync(user).ConfigureAwait(false);
132134

@@ -167,7 +169,7 @@ private async Task RegisterNewUser(ExternalLoginInfo info, CancellationToken can
167169
}
168170
}
169171

170-
private async Task<UserProfileDto?> EnsureUserProfileExists(string memberId, Member member, CancellationToken cancellationToken = default)
172+
private async Task<UserProfileDto?> EnsureUserProfileExists(string memberId, MemberDto member, CancellationToken cancellationToken = default)
171173
{
172174
if (string.IsNullOrWhiteSpace(memberId))
173175
{

0 commit comments

Comments
 (0)