Fix for build_info computation

Author: MaciejKaras

scripts/release/build/build_info.py

@@ -1,61 +1,49 @@
 import json
+from dataclasses import dataclass
 from typing import Dict
 
 from scripts.release.build.build_scenario import BuildScenario
 from scripts.release.constants import DEFAULT_REPOSITORY_PATH, DEFAULT_CHANGELOG_PATH, RELEASE_INITIAL_VERSION_ENV_VAR, \
     get_initial_version, get_initial_commit_sha
 
 
-class ImageInfo(dict):
-    def __init__(self, repository: str, platforms: list[str], version: str, sign: bool):
-        super().__init__()
-        self.repository = repository
-        self.platforms = platforms
-        self.version = version
-        self.sign = sign
+@dataclass
+class ImageInfo:
+    repository: str
+    platforms: list[str]
+    version: str
+    sign: bool
 
     def to_json(self):
         return {"repository": self.repository, "platforms": self.platforms, "version": self.version}
 
 
-class BinaryInfo(dict):
-    def __init__(self, s3_store: str, platforms: list[str], version: str, sign: bool):
-        super().__init__()
-        self.s3_store = s3_store
-        self.platforms = platforms
-        self.version = version
-        self.sign = sign
+@dataclass
+class BinaryInfo:
+    s3_store: str
+    platforms: list[str]
+    version: str
+    sign: bool
 
     def to_json(self):
         return {"platforms": self.platforms, "version": self.version}
 
 
-class HelmChartInfo(dict):
-    def __init__(self, repository: str, version: str, sign: bool):
-        super().__init__()
-        self.repository = repository
-        self.version = version
-        self.sign = sign
+@dataclass
+class HelmChartInfo:
+    repository: str
+    version: str
+    sign: bool
 
     def to_json(self):
         return {"repository": self.repository, "version": self.version}
 
 
-class BuildInfo(dict):
-    def __init__(
-            self, images: Dict[str, ImageInfo], binaries: Dict[str, BinaryInfo], helm_charts: Dict[str, HelmChartInfo]
-    ):
-        super().__init__()
-        self.images = images
-        self.binaries = binaries
-        self.helm_charts = helm_charts
-
-    def __dict__(self):
-        return {
-            "images": {name: images.__dict__ for name, images in self.images.items()},
-            "binaries": {name: bin.__dict__ for name, bin in self.binaries.items()},
-            "helm-charts": {name: chart.__dict__ for name, chart in self.helm_charts.items()},
-        }
+@dataclass
+class BuildInfo:
+    images: Dict[str, ImageInfo]
+    binaries: Dict[str, BinaryInfo]
+    helm_charts: Dict[str, HelmChartInfo]
 
     def to_json(self):
         return {

scripts/release/build/build_info_test.py

@@ -103,7 +103,7 @@ def test_load_build_info_patch(git_repo: Repo):
 
     build_info = load_build_info(BuildScenario.PATCH, git_repo.working_dir)
 
-    assert build_info.__dict__() == expected_build_info.__dict__()
+    assert build_info == expected_build_info
 
 
 def test_load_build_info_staging(git_repo: Repo):
@@ -199,7 +199,7 @@ def test_load_build_info_staging(git_repo: Repo):
 
     build_info = load_build_info(BuildScenario.STAGING, git_repo.working_dir)
 
-    assert build_info.__dict__() == expected_build_info.__dict__()
+    assert build_info == expected_build_info
 
 
 def test_load_build_info_release(git_repo: Repo, readinessprobe_version: str,
@@ -271,4 +271,4 @@ def test_load_build_info_release(git_repo: Repo, readinessprobe_version: str,
 
     build_info = load_build_info(BuildScenario.RELEASE, git_repo.working_dir)
 
-    assert build_info.__dict__() == expected_build_info.__dict__()
+    assert build_info == expected_build_info

scripts/release/pipeline_main.py

@@ -84,7 +84,10 @@ def image_build_config_from_args(args) -> ImageBuildConfiguration:
     build_scenario = get_scenario_from_arg(args.scenario) or BuildScenario.infer_scenario_from_environment()
 
     build_info = load_build_info(build_scenario)
+    logger.info(f"image is {image}")
+    logger.info(f"images are {build_info.images}")
     image_build_info = build_info.images.get(image)
+    logger.info(f"image_build_info is {image_build_info}")
     if not image_build_info:
         raise ValueError(f"Image '{image}' is not defined in the build info for scenario '{build_scenario}'")
 

scripts/release/release_info_test.py

@@ -13,22 +13,22 @@ def test_create_release_info_json(
 
     expected_json = {
         "images": {
-            "mongodbOperator": {
+            "operator": {
                 "repository": "quay.io/mongodb/mongodb-kubernetes",
                 "platforms": ["linux/arm64", "linux/amd64"],
                 "version": "1.2.0",
             },
-            "initDatabase": {
+            "init-database": {
                 "repository": "quay.io/mongodb/mongodb-kubernetes-init-database",
                 "platforms": ["linux/arm64", "linux/amd64"],
                 "version": "1.2.0",
             },
-            "initAppDb": {
+            "init-appdb": {
                 "repository": "quay.io/mongodb/mongodb-kubernetes-init-appdb",
                 "platforms": ["linux/arm64", "linux/amd64"],
                 "version": "1.2.0",
             },
-            "initOpsManager": {
+            "init-ops-manager": {
                 "repository": "quay.io/mongodb/mongodb-kubernetes-init-ops-manager",
                 "platforms": ["linux/arm64", "linux/amd64"],
                 "version": "1.2.0",
@@ -38,12 +38,12 @@ def test_create_release_info_json(
                 "platforms": ["linux/arm64", "linux/amd64"],
                 "version": "1.2.0",
             },
-            "readinessprobe": {
+            "readiness-probe": {
                 "repository": "quay.io/mongodb/mongodb-kubernetes-readinessprobe",
                 "platforms": ["linux/arm64", "linux/amd64"],
                 "version": readinessprobe_version,
             },
-            "operator-version-upgrade-post-start-hook": {
+            "upgrade-hook": {
                 "repository": "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook",
                 "platforms": ["linux/arm64", "linux/amd64"],
                 "version": operator_version_upgrade_post_start_hook_version,