cici-tools 0.16.1__tar.gz → 0.17.0__tar.gz

{cici_tools-0.16.1/cici_tools.egg-info → cici_tools-0.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cici-tools
-Version: 0.16.1
+Version: 0.17.0
 Summary: Continuous Integration Catalog Interface
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0

{cici_tools-0.16.1 → cici_tools-0.17.0}/cici/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.16.1'
-__version_tuple__ = version_tuple = (0, 16, 1)
+__version__ = version = '0.17.0'
+__version_tuple__ = version_tuple = (0, 17, 0)
 
-__commit_id__ = commit_id = 'gcf94f688a'
+__commit_id__ = commit_id = 'ge723e80c8'

{cici_tools-0.16.1 → cici_tools-0.17.0}/cici/cli/bundle.py

@@ -64,6 +64,7 @@ def load_cici_or_nothing(base_path: Path) -> Optional[cici_config.File]:
 
 
 def bundle_command(parser, args):
+
     logging.basicConfig(level=logging.INFO, format="[%(levelname)s] %(message)s")
 
     provider = import_module(f".{DEFAULT_PROVIDER}", "cici.providers")

{cici_tools-0.16.1 → cici_tools-0.17.0}/cici/config/project/serializers.py

@@ -142,6 +142,7 @@ def loads(
         precommit_hooks = {}
 
     yaml = ruamel.yaml.YAML(typ="safe")
+
     data = yaml.load(text)
 
     # verify targets exists even if empty

{cici_tools-0.16.1 → cici_tools-0.17.0}/cici/providers/gitlab/serializers.py

@@ -43,7 +43,12 @@ def to_dict(obj):
     return msgspec.json.decode(encoded)
 
 
-def expand_job_extends(jobs: dict[str, gitlab.Job], job: gitlab.Job) -> gitlab.Job:
+def expand_job_extends(
+    jobs: dict[str, gitlab.Job],
+    job: gitlab.Job,
+    root_name: str,
+) -> gitlab.Job:
+
     # If the job does not use 'extends', return it unchanged
     if not job.extends:
         return job
@@ -58,11 +63,20 @@ def expand_job_extends(jobs: dict[str, gitlab.Job], job: gitlab.Job) -> gitlab.J
     # for each parent job listed in extends:
     for extend in extends:
         # recursively expand the parent first so fit the parent also has 'extends' it gets resolved too
-        parent_job = expand_job_extends(jobs, jobs[extend])
+        parent_job = expand_job_extends(jobs, jobs[extend], root_name=root_name)
         # convert expanded parent struct into plain dict to easily merge its fields
         parent_dict = to_dict(parent_job)
-        # Add parent fields to accumulator (later parents should override earlier ones if conflicts)
-        merged.update(parent_dict)
+
+        # Replace merged.update with block to preserve variables from ALL parents
+        for field_name, parent_value in parent_dict.items():
+            existing_value = merged.get(field_name)
+
+            if isinstance(parent_value, dict) and isinstance(existing_value, dict):
+                # deep merge dict fields (ie variables) so later, parents
+                # override keys without wiping earlier ones
+                merged[field_name] = {**existing_value, **parent_value}
+            else:
+                merged[field_name] = parent_value
 
     # convert child job into a dict
     child_dict = to_dict(job)
@@ -89,8 +103,9 @@ def expand_job_extends(jobs: dict[str, gitlab.Job], job: gitlab.Job) -> gitlab.J
 def expand_jobs(file_struct: gitlab.File) -> gitlab.File:
     patched_jobs = {}
     for job_name, job in file_struct.jobs.items():
-        expanded_job = expand_job_extends(file_struct.jobs, job)
+        expanded_job = expand_job_extends(file_struct.jobs, job, root_name=job_name)
         patched_jobs[job_name] = expanded_job
+
     return replace(file_struct, jobs=patched_jobs)
 
 
@@ -278,7 +293,9 @@ def loads(
     file_struct = expand_jobs(file_struct)
 
     # inject container defaults
-    return inject_container_into_job(file_struct, cici_config_file)
+    file_struct = inject_container_into_job(file_struct, cici_config_file)
+
+    return file_struct
 
 
 # convert struct back to dict, apply container injection + YAML dump

{cici_tools-0.16.1 → cici_tools-0.17.0/cici_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cici-tools
-Version: 0.16.1
+Version: 0.17.0
 Summary: Continuous Integration Catalog Interface
 Author-email: Digital Safety Research Institute <contact@dsri.org>
 License: Apache-2.0

{cici_tools-0.16.1 → cici_tools-0.17.0}/cici_tools.egg-info/SOURCES.txt

@@ -81,6 +81,7 @@ docs/update.md
 scripts/gen-api-doc.py
 tests/test_build.py
 tests/test_cli.py
+tests/test_expand_job_extends.py
 tests/test_import.py
 tests/test_resolve_targets.py
 tests/fixtures/gitlab/extends/simple-job.yml

{cici_tools-0.16.1 → cici_tools-0.17.0}/requirements.txt

@@ -28,10 +28,8 @@ rpds-py==0.30.0
     # via
     #   jsonschema
     #   referencing
-ruamel-yaml==0.18.17
+ruamel-yaml==0.19.1
     # via cici-tools (pyproject.toml)
-ruamel-yaml-clib==0.2.15
-    # via ruamel-yaml
 termcolor==3.3.0
     # via cici-tools (pyproject.toml)
 typing-extensions==4.15.0

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/job-variables/opentofu-development-apply.yml

@@ -32,6 +32,8 @@ opentofu-development-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/job-variables/opentofu-development-auto-apply.yml

@@ -32,6 +32,8 @@ opentofu-development-auto-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-development-destroy.yml

@@ -32,6 +32,8 @@ opentofu-development-destroy:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-development-plan.yml

@@ -32,6 +32,8 @@ opentofu-development-plan:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/job-variables/opentofu-development-trivy.yml

@@ -32,6 +32,8 @@ opentofu-development-trivy:
   stage: build
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-development-validate.yml

@@ -32,6 +32,8 @@ opentofu-development-validate:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-production-apply.yml

@@ -32,6 +32,8 @@ opentofu-production-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-production-auto-apply.yml

@@ -32,6 +32,8 @@ opentofu-production-auto-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/job-variables/opentofu-production-destroy.yml

@@ -32,6 +32,8 @@ opentofu-production-destroy:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/job-variables/opentofu-production-plan.yml

@@ -32,6 +32,8 @@ opentofu-production-plan:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-production-trivy.yml

@@ -32,6 +32,8 @@ opentofu-production-trivy:
   stage: build
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-production-validate.yml

@@ -32,6 +32,8 @@ opentofu-production-validate:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/job-variables/opentofu-staging-apply.yml

@@ -32,6 +32,8 @@ opentofu-staging-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-staging-auto-apply.yml

@@ -32,6 +32,8 @@ opentofu-staging-auto-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-staging-destroy.yml

@@ -32,6 +32,8 @@ opentofu-staging-destroy:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-staging-plan.yml

@@ -32,6 +32,8 @@ opentofu-staging-plan:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-staging-trivy.yml

@@ -32,6 +32,8 @@ opentofu-staging-trivy:
   stage: build
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/job-variables/opentofu-staging-validate.yml

@@ -32,6 +32,8 @@ opentofu-staging-validate:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/targets-dir → cici_tools-0.17.0/tests/fixtures/gitlab/job-variables}/opentofu-validate.yml

@@ -32,6 +32,7 @@ opentofu-validate:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}"
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/targets-dir/opentofu-development-apply.yml

@@ -32,6 +32,8 @@ opentofu-development-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/targets-dir/opentofu-development-auto-apply.yml

@@ -32,6 +32,8 @@ opentofu-development-auto-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-development-destroy.yml

@@ -32,6 +32,8 @@ opentofu-development-destroy:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-development-plan.yml

@@ -32,6 +32,8 @@ opentofu-development-plan:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/targets-dir/opentofu-development-trivy.yml

@@ -32,6 +32,8 @@ opentofu-development-trivy:
   stage: build
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-development-validate.yml

@@ -32,6 +32,8 @@ opentofu-development-validate:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: development
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-production-apply.yml

@@ -32,6 +32,8 @@ opentofu-production-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-production-auto-apply.yml

@@ -32,6 +32,8 @@ opentofu-production-auto-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/targets-dir/opentofu-production-destroy.yml

@@ -32,6 +32,8 @@ opentofu-production-destroy:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/targets-dir/opentofu-production-plan.yml

@@ -32,6 +32,8 @@ opentofu-production-plan:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-production-trivy.yml

@@ -32,6 +32,8 @@ opentofu-production-trivy:
   stage: build
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-production-validate.yml

@@ -32,6 +32,8 @@ opentofu-production-validate:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/targets-dir/opentofu-staging-apply.yml

@@ -32,6 +32,8 @@ opentofu-staging-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-staging-auto-apply.yml

@@ -32,6 +32,8 @@ opentofu-staging-auto-apply:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-staging-destroy.yml

@@ -32,6 +32,8 @@ opentofu-staging-destroy:
   stage: deploy
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-staging-plan.yml

@@ -32,6 +32,8 @@ opentofu-staging-plan:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-staging-trivy.yml

@@ -32,6 +32,8 @@ opentofu-staging-trivy:
   stage: build
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/targets-dir/opentofu-staging-validate.yml

@@ -32,6 +32,8 @@ opentofu-staging-validate:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}/deploy/${OPENTOFU_STATE_NAME}"
+    OPENTOFU_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1/tests/fixtures/gitlab/job-variables → cici_tools-0.17.0/tests/fixtures/gitlab/targets-dir}/opentofu-validate.yml

@@ -32,6 +32,7 @@ opentofu-validate:
   stage: test
   image: "registry.gitlab.com/components/opentofu/gitlab-opentofu:latest"
   variables:
+    OPENTOFU_ROOT: "${CI_PROJECT_DIR}"
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$OPENTOFU_STATE_NAME"
     TF_ROOT: "$OPENTOFU_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/terraform/terraform-production-apply.yml

@@ -21,6 +21,7 @@ terraform-production-apply:
   stage: deploy
   image: "registry.gitlab.com/gitlab-org/terraform-images/stable:latest"
   variables:
+    TERRAFORM_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$TERRAFORM_STATE_NAME"
     TF_ROOT: "$TERRAFORM_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/terraform/terraform-production-plan.yml

@@ -21,6 +21,7 @@ terraform-production-plan:
   stage: test
   image: "registry.gitlab.com/gitlab-org/terraform-images/stable:latest"
   variables:
+    TERRAFORM_STATE_NAME: production
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$TERRAFORM_STATE_NAME"
     TF_ROOT: "$TERRAFORM_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/terraform/terraform-staging-apply.yml

@@ -21,6 +21,7 @@ terraform-staging-apply:
   stage: test
   image: "registry.gitlab.com/gitlab-org/terraform-images/stable:latest"
   variables:
+    TERRAFORM_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$TERRAFORM_STATE_NAME"
     TF_ROOT: "$TERRAFORM_ROOT"

{cici_tools-0.16.1 → cici_tools-0.17.0}/tests/fixtures/gitlab/terraform/terraform-staging-destroy.yml

@@ -21,6 +21,7 @@ terraform-staging-destroy:
   stage: test
   image: "registry.gitlab.com/gitlab-org/terraform-images/stable:latest"
   variables:
+    TERRAFORM_STATE_NAME: staging
     GIT_DEPTH: "1"
     TF_STATE_NAME: "$TERRAFORM_STATE_NAME"
     TF_ROOT: "$TERRAFORM_ROOT"