auxolotl/buildbot-nix
26
1
Fork 0
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

fix linter errros

Browse source
This commit is contained in:
Jörg Thalheim 2024-07-24 17:10:05 +02:00 committed by mergify[bot]
parent 6e8e735628
commit eb6fae3100
1 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
buildbot_nix/models.py
View file

@ -1,23 +1,26 @@
from enum import Enum from enum import Enum
from pathlib import Path from pathlib import Path
from pydantic import BaseModel, Field, field_serializer, field_validator, ConfigDict from buildbot.plugins import steps, util
from buildbot.plugins import util, steps from pydantic import BaseModel, ConfigDict, Field
from .secrets import read_secret_file from .secrets import read_secret_file
class InternalIssue(Exception):
class InternalError(Exception):
pass pass
def exclude_fields(fields: list[str]) -> dict[str, dict[str, bool]]: def exclude_fields(fields: list[str]) -> dict[str, dict[str, bool]]:
return dict(map(lambda k: (k, {"exclude": True}), fields)) return {k: {"exclude": True} for k in fields}
class AuthBackendConfig(str, Enum): class AuthBackendConfig(str, Enum):
github = "github" github = "github"
gitea = "gitea" gitea = "gitea"
none = "none" none = "none"
class CachixConfig(BaseModel): class CachixConfig(BaseModel):
name: str name: str
@ -27,13 +30,13 @@ class CachixConfig(BaseModel):
@property @property
def signing_key(self) -> str: def signing_key(self) -> str:
if self.signing_key_file is None: if self.signing_key_file is None:
raise InternalIssue raise InternalError
return read_secret_file(self.signing_key_file) return read_secret_file(self.signing_key_file)
@property @property
def auth_token(self) -> str: def auth_token(self) -> str:
if self.auth_token_file is None: if self.auth_token_file is None:
raise InternalIssue raise InternalError
return read_secret_file(self.auth_token_file) return read_secret_file(self.auth_token_file)
# TODO why did the original implementation return an empty env if both files were missing? # TODO why did the original implementation return an empty env if both files were missing?
@ -47,6 +50,7 @@ class CachixConfig(BaseModel):
class Config: class Config:
fields = exclude_fields(["singing_key", "auth_token"]) fields = exclude_fields(["singing_key", "auth_token"])
class GiteaConfig(BaseModel): class GiteaConfig(BaseModel):
instance_url: str instance_url: str
topic: str | None topic: str | None
@ -69,12 +73,13 @@ class GiteaConfig(BaseModel):
@property @property
def oauth_secret(self) -> str: def oauth_secret(self) -> str:
if self.oauth_secret_file is None: if self.oauth_secret_file is None:
raise InternalIssue raise InternalError
return read_secret_file(self.oauth_secret_file) return read_secret_file(self.oauth_secret_file)
class Config: class Config:
fields = exclude_fields(["token", "webhook_secret", "oauth_secret"]) fields = exclude_fields(["token", "webhook_secret", "oauth_secret"])
class GitHubLegacyConfig(BaseModel): class GitHubLegacyConfig(BaseModel):
token_file: Path token_file: Path
@ -85,19 +90,18 @@ class GitHubLegacyConfig(BaseModel):
class Config: class Config:
fields = exclude_fields(["token"]) fields = exclude_fields(["token"])
class GitHubAppConfig(BaseModel): class GitHubAppConfig(BaseModel):
id: int id: int
secret_key_file: Path secret_key_file: Path
installation_token_map_file: Path = Field(default = Path( installation_token_map_file: Path = Field(
"github-app-installation-token-map.json" default=Path("github-app-installation-token-map.json")
)) )
project_id_map_file: Path = Field(default = Path( project_id_map_file: Path = Field(
"github-app-project-id-map-name.json" default=Path("github-app-project-id-map-name.json")
)) )
jwt_token_map: Path = Field(default = Path( jwt_token_map: Path = Field(default=Path("github-app-jwt-token"))
"github-app-jwt-token"
))
@property @property
def secret_key(self) -> str: def secret_key(self) -> str:
@ -106,6 +110,7 @@ class GitHubAppConfig(BaseModel):
class Config: class Config:
fields = exclude_fields(["secret_key"]) fields = exclude_fields(["secret_key"])
class GitHubConfig(BaseModel): class GitHubConfig(BaseModel):
auth_type: GitHubLegacyConfig | GitHubAppConfig auth_type: GitHubLegacyConfig | GitHubAppConfig
topic: str | None topic: str | None
@ -123,9 +128,10 @@ class GitHubConfig(BaseModel):
@property @property
def oauth_secret(self) -> str: def oauth_secret(self) -> str:
if self.oauth_secret_file is None: if self.oauth_secret_file is None:
raise InternalIssue raise InternalError
return read_secret_file(self.oauth_secret_file) return read_secret_file(self.oauth_secret_file)
# note that serialization isn't correct, as there is no way to *rename* the field `nix_type` to `_type`, # note that serialization isn't correct, as there is no way to *rename* the field `nix_type` to `_type`,
# one must always specify `by_alias = True`, such as `model_dump(by_alias = True)`, relevant issue: # one must always specify `by_alias = True`, such as `model_dump(by_alias = True)`, relevant issue:
# https://github.com/pydantic/pydantic/issues/8379 # https://github.com/pydantic/pydantic/issues/8379
@ -149,14 +155,11 @@ class PostBuildStep(BaseModel):
return steps.ShellCommand( return steps.ShellCommand(
name=self.name, name=self.name,
env = { env={k: maybe_interpolate(k) for k in self.environment},
k: maybe_interpolate(k) for k in self.environment command=[maybe_interpolate(x) for x in self.command],
},
command = [
maybe_interpolate(x) for x in self.command
]
) )
class BuildbotNixConfig(BaseModel): class BuildbotNixConfig(BaseModel):
db_url: str db_url: str
auth_backend: AuthBackendConfig auth_backend: AuthBackendConfig