From 712eb6631dca989e4bde02dc2cf409234f4dafe7 Mon Sep 17 00:00:00 2001 From: Ashish Dhingra <67916761+ashishdhingra@users.noreply.github.com> Date: Tue, 3 Jun 2025 14:27:50 -0700 Subject: [PATCH 1/4] chore: Pinned to v1.6.0 of aws-github-ops/handle-stale-discussions so that closed GitHub discussions are not auto-reopened. --- .github/workflows/handle-stale-discussions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/handle-stale-discussions.yml b/.github/workflows/handle-stale-discussions.yml index bfa00bd8..25a70559 100644 --- a/.github/workflows/handle-stale-discussions.yml +++ b/.github/workflows/handle-stale-discussions.yml @@ -13,6 +13,6 @@ jobs: discussions: write steps: - name: Stale discussions action - uses: aws-github-ops/handle-stale-discussions@711a9813957be17629fc6933afcd8bd132c57254 #v1.6 + uses: aws-github-ops/handle-stale-discussions@c0beee451a5d33d9c8f048a6d4e7c856b5422544 #v1.6.0 env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From b119a218de73cea46b9a9fe3a199a17f6154363b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jun 2025 01:07:33 +0000 Subject: [PATCH 2/4] chore(deps): bump github/codeql-action from 3.28.17 to 3.28.19 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.17 to 3.28.19. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/60168efe1c415ce0f5521ea06d5c2062adbeed1b...fca7ace96b7d713c7035871441bd52efbe39e27e) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 3.28.19 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/semgrep-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/semgrep-analysis.yml b/.github/workflows/semgrep-analysis.yml index 32528755..7b245166 100644 --- a/.github/workflows/semgrep-analysis.yml +++ b/.github/workflows/semgrep-analysis.yml @@ -35,7 +35,7 @@ jobs: p/owasp-top-ten - name: Upload SARIF file for GitHub Advanced Security Dashboard - uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b #v3.28.17 + uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e #v3.28.19 with: sarif_file: semgrep.sarif if: always() From 6e2c7640d13c734cc4730f9bf5ded9a0c93cbd4d Mon Sep 17 00:00:00 2001 From: Garrett Beatty Date: Tue, 10 Jun 2025 11:53:46 -0400 Subject: [PATCH 3/4] flaky test fix (#253) --- .../SQSMessagePollerTests.cs | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/test/AWS.Messaging.UnitTests/SQSMessagePollerTests.cs b/test/AWS.Messaging.UnitTests/SQSMessagePollerTests.cs index 561df41e..f2dbf624 100644 --- a/test/AWS.Messaging.UnitTests/SQSMessagePollerTests.cs +++ b/test/AWS.Messaging.UnitTests/SQSMessagePollerTests.cs @@ -78,8 +78,11 @@ public async Task SQSMessagePoller_PollingControlStopped_DoesNotPollSQS() public async Task SQSMessagePoller_PollingControlRestarted_PollsSQS() { var client = new Mock(); + var messageReceived = new TaskCompletionSource(); client.Setup(x => x.ReceiveMessageAsync(It.IsAny(), It.IsAny())) - .ReturnsAsync(new ReceiveMessageResponse(), TimeSpan.FromMilliseconds(50)); + .ReturnsAsync(new ReceiveMessageResponse(), TimeSpan.FromMilliseconds(50)) + .Callback(() => messageReceived.TrySetResult(true)); + var pollingControlToken = new PollingControlToken { PollingWaitTime = TimeSpan.FromMilliseconds(25) @@ -90,12 +93,24 @@ public async Task SQSMessagePoller_PollingControlRestarted_PollsSQS() var pump = BuildMessagePumpService(client, options => { options.WaitTimeSeconds = 1; }, pollingControlToken: pollingControlToken); var task = pump.StartAsync(source.Token); + // Verify no messages are received while polling is stopped client.Verify(x => x.ReceiveMessageAsync(It.IsAny(), It.IsAny()), Times.Never); + // Start polling and wait for a message to be received pollingControlToken.StartPolling(); + + // Wait for a message to be received with a timeout + using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5)); + try + { + await messageReceived.Task.WaitAsync(cts.Token); + } + catch (OperationCanceledException) + { + Assert.Fail("Timed out waiting for message to be received after polling was restarted"); + } - SpinWait.SpinUntil(() => false, pollingControlToken.PollingWaitTime * 5); - + // Verify that messages were received client.Verify(x => x.ReceiveMessageAsync(It.IsAny(), It.IsAny()), Times.AtLeastOnce()); source.Cancel(); From 238c12c5998584aa8ccf6be6c63e8edb0b5b8840 Mon Sep 17 00:00:00 2001 From: Sanket T <59204773+sankettangade@users.noreply.github.com> Date: Mon, 16 Jun 2025 14:41:16 -0700 Subject: [PATCH 4/4] Update dependabot.yml --- .github/dependabot.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b76d5c8a..8190c861 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,8 +6,8 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - # Check for updates to GitHub Actions every week - interval: "weekly" + # Check for updates to GitHub Actions every quarter + interval: "quarterly" labels: - "Release Not Needed" - target-branch: "dev" \ No newline at end of file + target-branch: "dev"