[va000612]

What does this PR do?

Fixes No matching salt environment for environment '...' found being reported for fileserver environments that are not listed in env_order.

LazyAvailStates builds the list of available saltenvs from BaseHighState._get_envs(). When env_order is configured, _get_envs() returns only the environments listed in env_order, so any other environment on the fileserver is treated as unknown by render_highstate. This hits gitfs branches exposed through gitfs_saltenv_whitelist (for example feature/.*), which can't be listed statically in env_order. The master serves them correctly. fileserver.envs, fileserver.file_list and cp.list_states all show the env, and the sls is still rendered, but every run reports the error.

The fix:

• _get_envs() takes a new restrict_to_env_order argument, default True, so existing behavior is unchanged. get_tops still uses it to order and limit top-file evaluation.
• LazyAvailStates._fill calls _get_envs(restrict_to_env_order=False), so every environment known to the fileserver counts as available.
• A non-existent env still errors.

What issues does this PR fix or reference?

Fixes: #70618

Previous Behavior

With env_order: [base, prod, staging, dev] and gitfs_saltenv_whitelist: [prod, staging, dev, 'feature/.*'], running salt-call state.show_sls mystate saltenv=feature/myfeature returned No matching salt environment for environment 'feature/myfeature' found, although salt-run fileserver.envs listed the branch.

New Behavior

The same command renders the sls with no error. Envs inside env_order behave as before, and an env that does not exist on the fileserver still errors.

Merge requirements satisfied?

• Docs
• Changelog: changelog/70618.fixed.md
• Tests written/updated: tests/pytests/unit/state/test_lazy_avail_states.py

Testing

Unit tests (pytest --core-tests):

• tests/pytests/unit/state/test_lazy_avail_states.py (new, 4 tests): _get_envs() is still limited to env_order by default; the unrestricted call includes envs outside env_order; an empty fileserver env list falls back to env_order; LazyAvailStates accepts an env outside env_order and still rejects a non-existent one.
• tests/pytests/unit/state/test_state_options.py: 5 passed together with the above.

Manual reproduction and verification (master and minion, Salt 3008.5, Python 3.11, Rocky 8.10, gitfs_provider: gitpython, ssh:// remote):

Config:
gitfs_saltenv_whitelist: [prod, staging, dev, 'feature/.*']
env_order: [base, prod, staging, dev]
top_file_merging_strategy: merge_all

After pushing a new branch feature/seven and running salt-run fileserver.update:

Check	Before	After
salt-run fileserver.envs	lists feature/seven	same
salt-run fileserver.file_list saltenv=feature/seven	mystate/init.sls	same
salt-call state.show_sls mystate saltenv=feature/seven	No matching salt environment	renders
salt '<minion>' state.show_sls mystate saltenv=feature/seven	No matching salt environment	renders
show_sls ... saltenv=prod (in env_order)	renders	renders
show_sls ... saltenv=doesnotexist	errors	still errors

Without env_order the same setup rendered correctly before the patch (3008.4 pygit2 and GitPython, 3008.5 GitPython), which isolates env_order as the cause.

Commits signed with GPG?

No