Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split BuildTarget into BuildTarget and BuildTargetSnapshot classes #4245

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 36 additions & 16 deletions src/build_workflow/build_target.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class BuildTarget:
platform: str
architecture: str
distribution: str
snapshot: bool
snapshot: bool = False # default to False
output_dir: str

def __init__(
Expand All @@ -32,7 +32,6 @@ def __init__(
architecture: str = None,
distribution: str = None,
name: str = None,
snapshot: bool = True,
build_id: str = None,
output_dir: str = "artifacts",
) -> None:
Expand All @@ -41,43 +40,39 @@ def __init__(
self.version = version
self.qualifier = qualifier
self.patches = patches
self.snapshot = snapshot
self.architecture = architecture or current_architecture()
self.distribution = distribution
self.platform = platform or current_platform()
self.output_dir = output_dir

@property
def opensearch_version(self) -> str:
return BuildTarget.__qualify_version(
return self.__qualify_version(
self.version,
self.qualifier,
self.snapshot
self.qualifier
)

@property
def compatible_min_versions(self) -> List[str]:
return (
[BuildTarget.__qualify_version(self.version, self.qualifier, self.snapshot)]
[self.__qualify_version(self.version, self.qualifier)]
+ self.patches
+ list(map(lambda version: BuildTarget.__qualify_version(version, self.qualifier, True), self.patches))
+ list(map(lambda version: self.__qualify_version(version, self.qualifier), self.patches))
)

@property
def component_version(self) -> str:
# BUG: the 4th digit is dictated by the component, it's not .0, this will break for 1.1.0.1
return BuildTarget.__qualify_version(
self.version + ".0",
self.qualifier,
self.snapshot
self.qualifier
)

@property
def compatible_component_versions(self) -> List[str]:
return (
[BuildTarget.__qualify_version(self.version + ".0", self.qualifier, self.snapshot)]
+ list(map(lambda version: BuildTarget.__qualify_version(version + ".0", self.qualifier, False), self.patches))
+ list(map(lambda version: BuildTarget.__qualify_version(version + ".0", self.qualifier, True), self.patches))
[self.__qualify_version(self.version + ".0", self.qualifier)]
+ list(map(lambda version: self.__qualify_version(version + ".0", self.qualifier), self.patches))
)

@property
Expand All @@ -87,10 +82,35 @@ def compatible_versions(self) -> List[str]:
return versions

@classmethod
def __qualify_version(cls, unqualified_version: str, qualifier: str = None, snapshot: bool = False) -> str:
def __qualify_version(cls, unqualified_version: str, qualifier: str = None) -> str:
version = unqualified_version
if qualifier:
version += f"-{qualifier}"
if snapshot:
version += "-SNAPSHOT"
return version


class BuildTargetSnapshot(BuildTarget):
snapshot: bool = True

@property
def opensearch_version(self) -> str:
return super().opensearch_version + "-SNAPSHOT"

@property
def compatible_min_versions(self) -> List[str]:
return (
[super().opensearch_version + "-SNAPSHOT"]
+ self.patches
+ list(map(lambda version: self.__qualify_version(version, self.qualifier) + "-SNAPSHOT", self.patches))
)

@property
def component_version(self) -> str:
return super().component_version + "-SNAPSHOT"

@property
def compatible_component_versions(self) -> List[str]:
return (
[super().component_version + "-SNAPSHOT"]
+ list(map(lambda version: self.__qualify_version(version + ".0", self.qualifier) + "-SNAPSHOT", self.patches))
)