Post-1175 cleanup: AWS OIDC, compose+proxy, OpenTofu rename, valkey#286
Merged
Conversation
… chosen providers
…-fixes # Conflicts: # bootstrap/runner.py
daniele-20tab
approved these changes
May 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Multiple post-merge fixes and tooling refresh on top of #281 (the 1175 Minos integration).
Bootstrap workflow
BACKEND_TEMPLATE_URL_*/FRONTEND_TEMPLATE_URL_*env vars ininit_subreposo local bind-mounted sub-bootstrappers actually get cloned (was silently falling back to GitHubmain).init_subreponow raisesBootstrapErrorongit clone/pip install/sub-runner non-zero exit.cleanup()is no longer called on subrepo failure → dump preserved for retry.try/except → reset_terraform.init_subrepopassesterraform_cloud_project_create=Falseso subs use the platform-created project as data source.Provisioning hardening
~> 4.2.0→~> 5.0.var.secretstyped asanyto accept heterogeneous payloads (platforms/{cluster}/...vsenvs/{env}/...).TF_CLI_ARGS_apply: -parallelism=1to avoidtfe_projectreadiness race that returned sporadic 422s.aws_role_arn(andaws_region) when AWS is among chosen providers; runner registersAWS_ROLE_ARN/AWS_DEFAULT_REGIONas GitLab group variables..gitlab-ci.ymlCORE_PROVIDERmatrix templated fromcookiecutter.resources.core_providers(union of providers across clusters); AWS-specificid_tokens.GITLAB_OIDC_TOKENandAWS_WEB_IDENTITY_TOKEN_FILErendered only when AWS in providers.Scaffolding
compose.yaml,compose.local.yaml,proxy/config/{static,dynamic}.yaml,proxy/tls/{cert,key}.pem(self-signed, broad SANs from gs1-one).terraform/dir →tofu/across the repo and runner..terraform.lock.hcl,.terraform/,terraform.tfvars*,*.auto.tfvars*from Docker build context to prevent leaks.click,cookiecutter, etc).redisreferences tovalkey(CLI flags, env var names, GitLab group vars). Pythonredispackage on the produced backend is intentionally retained because redis-py is protocol-compatible with Valkey.Test plan
python3 -m unittest tests.test_collector— 68/68 pass