refactor: use slices.Contains to simplify code

[keeghcet]

Fixed: #XXXX

Implementation details

There is a new function added in the go1.21 standard library, which can make the code more concise and easy to read.

Please ensure the following requirements are met before submitting a pull request:

• The pull request is targeted against the correct target branch
• The pull request is linked to an issue with appropriate discussion and an accepted design OR is linked to a spec that describes the work.
• The pull request includes a description of the implementation/work done in detail.
• The pull request includes any and all appropriate unit/integration tests
• You have added a relevant changelog entry to CHANGELOG_UNRELEASED.md
• You have re-reviewed the files affected by the pull request (e.g. using the Files changed tab in the Github PR explorer)

[RogerKSI]

Closing this PR as it duplicates the changes from #755 .