Continue improvement to main

Author: Julien-Ben

scripts/release/build_configuration.py

@@ -18,7 +18,4 @@ class BuildConfiguration:
  debug: bool = True
 
  def is_release_step_executed(self) -> bool:
- """
- Determines whether release steps should be executed based on build scenario
- """
  return self.scenario == BuildScenario.RELEASE

scripts/release/build_context.py

@@ -40,16 +40,7 @@ def infer_scenario_from_environment() -> BuildScenario:
 
 @dataclass
 class BuildContext:
- """Holds the context of the current build, detected from the environment."""
-
- ECR_BASE_URL = "268558157000.dkr.ecr.us-east-1.amazonaws.com"
- 
- REGISTRY_MAP = {
- BuildScenario.RELEASE: f"{ECR_BASE_URL}/julienben/staging-temp", # TODO: replace with real staging repo
- BuildScenario.MASTER: f"{ECR_BASE_URL}/dev",
- BuildScenario.PATCH: f"{ECR_BASE_URL}/dev",
- BuildScenario.DEVELOPMENT: os.environ.get("BASE_REPO_URL"),
- }
+ """Define build parameters based on the build scenario."""
 
  scenario: BuildScenario
  git_tag: Optional[str] = None
@@ -72,26 +63,19 @@ def from_scenario(cls, scenario: BuildScenario) -> "BuildContext":
  signing_enabled=signing_enabled,
  version=git_tag or patch_id,
  )
-
- @classmethod
- def from_environment(cls) -> "BuildContext":
- """Auto-detect build context from environment variables."""
- scenario = infer_scenario_from_environment()
- return cls.from_scenario(scenario)
 
  def get_version(self) -> str:
- """Gets the primary version string for the current build."""
+ """Gets the version that will be used to tag the images."""
  if self.scenario == BuildScenario.RELEASE:
  return self.git_tag
  if self.patch_id:
  return self.patch_id
  return "latest"
 
  def get_base_registry(self) -> str:
- """Get the base registry URL for the current build scenario."""
- registry = self.REGISTRY_MAP.get(self.scenario)
- if not registry:
- raise ValueError(f"No registry defined for scenario {self.scenario}")
- logger.info(f"Using registry: {registry}")
- return registry
+ """Get the base registry URL for the current scenario."""
+ if self.scenario == BuildScenario.RELEASE:
+ return os.environ.get("STAGING_REPO_URL")
+ else:
+ return os.environ.get("BASE_REPO_URL")
 

scripts/release/main.py

@@ -40,6 +40,12 @@
  BuildScenario,
 )
 
+"""
+The goal of main.py, build_configuration.py and build_context.py is to provide a single source of truth for the build 
+configuration. All parameters that depend on the the build environment (local dev, evg, etc) should be resolved here and
+not in the pipeline.
+"""
+
 
 def get_builder_function_for_image_name() -> Dict[str, Callable]:
  """Returns a dictionary of image names that can be built."""
@@ -148,6 +154,14 @@ def main():
 
  args = parser.parse_args()
 
+ build_config = build_config_from_args(args)
+ logger.info(f"Building image: {args.image}")
+ logger.info(f"Build configuration: {build_config}")
+
+ build_image(args.image, build_config)
+
+
+def build_config_from_args(args):
  # Validate that the image name is supported
  supported_images = get_builder_function_for_image_name().keys()
  if args.image not in supported_images:
@@ -172,7 +186,7 @@ def main():
  sign = args.sign or build_context.signing_enabled
  all_agents = args.all_agents or bool(os.environ.get("all_agents", False))
 
- build_configuration = BuildConfiguration(
+ return BuildConfiguration(
  scenario=scenario,
  version=version,
  base_registry=registry,
@@ -184,11 +198,6 @@ def main():
  parallel_factor=args.parallel_factor,
  )
 
- logger.info(f"Building image: {args.image}")
- logger.info(f"Build configuration: {build_configuration}")
-
- build_image(args.image, build_configuration)
-
 
 if __name__ == "__main__":
  main()