From dc4853a6e70abb5443b9d0753baccca4a2fbbfe2 Mon Sep 17 00:00:00 2001 From: Bernardo Guerreiro <39738771+bernardobridge@users.noreply.github.com> Date: Mon, 15 Jan 2024 20:18:04 +0000 Subject: [PATCH 1/3] ci(tests): change gh var for aws role (#2417) --- .github/workflows/run-aws-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-aws-tests.yml b/.github/workflows/run-aws-tests.yml index 4a049aef9f..1bfa55b8dc 100644 --- a/.github/workflows/run-aws-tests.yml +++ b/.github/workflows/run-aws-tests.yml @@ -56,7 +56,7 @@ jobs: SHOW_STACK_TRACE: true with: aws-region: eu-west-1 - role-to-assume: ${{ secrets.ARTILLERY_AWS_CLI_ROLE_ARN_TEST1 }} + role-to-assume: ${{ secrets.AWS_TEST_EXECUTION_ROLE_ARN_TEST5 }} role-session-name: OIDCSession mask-aws-account-id: true - name: Use Node.js 18.x From 9eb6e310c9667b0a1ab86083b5f30fd18c5ccc09 Mon Sep 17 00:00:00 2001 From: Hassy Veldstra Date: Wed, 17 Jan 2024 10:08:15 +0000 Subject: [PATCH 2/3] docs: update contributor's guide --- CONTRIBUTING.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f1cf560817..ce5cdc8f2b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,17 +2,18 @@ ## Need to get in touch? -All project discussions should happen in the [issue tracker](https://github.com/artilleryio/artillery/issues) or on [Gitter](https://gitter.im/artilleryio/artillery). -However if you are a first-time contributor and want some help getting started, -feel free to get in touch over email: +All project discussions should happen in the [issue tracker](https://github.com/artilleryio/artillery/issues) or via [Discussions](https://github.com/artilleryio/artillery/discussions). + +If you are a first-time contributor and want some help getting started, feel free to get in touch over email: * Hassy Veldstra - [h@artillery.io](mailto:h@artillery.io?subject=Artillery Contribution Help) ## Guide for Contributions -* We use the popular Fork+Pull model (more info here: [https://help.github.com/articles/using-pull-requests/](https://help.github.com/articles/using-pull-requests/)] +* We use the usual Fork+Pull model (more info here: [https://help.github.com/articles/using-pull-requests/](https://help.github.com/articles/using-pull-requests/)] * Pull requests that modify or add behavior should have tests, whether it's a new feature or a bug fix. If you're unsure how to structure a test, we can help. -* Ideally, pull requests should reference an existing [Issue](https://github.com/artilleryio/artillery/issues) to provide opportunity for discussion of any proposed features or changes which aren't a bug fix. +* We love PRs that fix bugs. +* Do not add a new feature without discussing it via [Discussions](https://github.com/artilleryio/artillery/discussions) first. We've had to decline feature suggestions submitted via PRs in the past because they duplicate existing functionality, have limited utility to the wider user base, or carry too much maintenance burden. We don't want you to spend your time on something that we will not accept. * One logical change per commit please. We'll ask you to rebase PRs containing commits that change several unrelated things. * The smaller a PR is the better. Smaller PRs are much easier to review and provide feedback on. Always lean towards smaller PRs. * Before you write more than a few lines of code, please make sure: @@ -35,3 +36,5 @@ feel free to get in touch over email: ## Licensing By sending a patch you certify that you have the rights to and agree for your contribution to be distributed under the terms of [MPL2](https://www.mozilla.org/en-US/MPL/2.0/). + +You will also need to sign a CLA before your first PR is merged. A GitHub bot will guide you through that after a new PR is opened. From e2eb716e54e470df8d7e52702c32ed4bb56ec3a3 Mon Sep 17 00:00:00 2001 From: Bernardo Guerreiro <39738771+bernardobridge@users.noreply.github.com> Date: Wed, 17 Jan 2024 10:24:52 +0000 Subject: [PATCH 3/3] fix(fargate): send taskArns of non-leader tasks to cloud (#2421) --- .../artillery/lib/platform/aws-ecs/legacy/run-cluster.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/artillery/lib/platform/aws-ecs/legacy/run-cluster.js b/packages/artillery/lib/platform/aws-ecs/legacy/run-cluster.js index 3b144ba99a..98c7caec3e 100644 --- a/packages/artillery/lib/platform/aws-ecs/legacy/run-cluster.js +++ b/packages/artillery/lib/platform/aws-ecs/legacy/run-cluster.js @@ -1583,9 +1583,11 @@ async function ecsRunTask(context) { } if (runData.tasks?.length > 0) { - context.taskArns = context.taskArns.concat( - runData.tasks.map((task) => task.taskArn) - ); + const newTaskArns = runData.tasks.map((task) => task.taskArn); + context.taskArns = context.taskArns.concat(newTaskArns); + artillery.globalEvents.emit('metadata', { + platformMetadata: { taskArns: newTaskArns } + }); debug(`Launched ${launchCount} tasks`); tasksRemaining -= launchCount; await sleep(250);