fix: separate environmentVariables and secrets condition checks to avoid unintended nesting

[jnyo]

Issue #, if available:
Fix #347, and similar comment #334 (comment)

This pull request separates the condition checks for environmentVariables and secrets.

Previously, the secrets check was nested inside the environmentVariables condition, which could lead to unintended dependencies or confusion in the logic.

Description of changes:

• Moved the secrets condition check outside of the environmentVariables block.
• Ensured both conditions are evaluated independently.

Note
Previous Pull Request #334 that introduced secrets, there was a mention of "backward compatibility".

There is already a pull request here #143 which tries to do this, but it isn't backward compatible

Does this refer to secrets being nested under environmentVariables?
If so, this change modifies that behavior and needs further consideration.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

[jwhitmarsh]

@kg-aws this fixes a problem we're experienceing now - what's required to get it moving?