Skip to content

Commit

Permalink
Fix optional fields in SLSA v1.0 provenance
Browse files Browse the repository at this point in the history
Signed-off-by: Facundo Tuesca <[email protected]>
  • Loading branch information
facutuesca committed Sep 13, 2024
1 parent 344cdd8 commit 08f172c
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions sigstore/dsse/_predicate.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
SUPPORTED_PREDICATE_TYPES = [PREDICATE_TYPE_SLSA_v0_2, PREDICATE_TYPE_SLSA_v1_0]

# Common models

DigestSetSource = RootModel[Dict[Union[Digest, Literal["sha1"]], str]]
SourceDigest= Union[Literal["sha1"], Literal["gitCommit"]]
DigestSetSource = RootModel[Dict[Union[Digest, SourceDigest], str]]
"""
Same as `dsse.DigestSet` but with `sha1` added.
Expand Down Expand Up @@ -149,9 +149,9 @@ class ResourceDescriptor(_SLSAConfigBase):
The ResourceDescriptor object defined defined by the in-toto attestations spec
"""

name: Optional[StrictStr]
uri: Optional[StrictStr]
digest: DigestSetSource
name: Optional[StrictStr] = None
uri: Optional[StrictStr] = None
digest: Optional[DigestSetSource] = None
content: Optional[StrictBytes] = None
download_location: Optional[StrictStr] = None
media_type: Optional[StrictStr] = None
Expand All @@ -176,20 +176,18 @@ class BuilderV1_0(_SLSAConfigBase):
"""

id: StrictStr
builder_dependencies: List[ResourceDescriptor] = Field(
..., alias="builderDependencies"
)
version: Dict[StrictStr, StrictStr]
builder_dependencies: Optional[List[ResourceDescriptor]] = None
version: Optional[Dict[StrictStr, StrictStr]] = None


class BuildMetadata(_SLSAConfigBase):
"""
The BuildMetadata object used by RunDetails
"""

invocation_id: StrictStr
started_on: StrictStr
finished_on: StrictStr
invocation_id: Optional[StrictStr] = None
started_on: Optional[StrictStr] = None
finished_on: Optional[StrictStr] = None


class RunDetails(_SLSAConfigBase):
Expand All @@ -198,8 +196,8 @@ class RunDetails(_SLSAConfigBase):
"""

builder: BuilderV1_0
metadata: BuildMetadata
byproducts: List[ResourceDescriptor]
metadata: Optional[BuildMetadata] = None
byproducts: Optional[List[ResourceDescriptor]] = None


class BuildDefinition(_SLSAConfigBase):
Expand All @@ -209,8 +207,8 @@ class BuildDefinition(_SLSAConfigBase):

build_type: StrictStr
external_parameters: Dict[StrictStr, Any]
internal_parameters: Dict[str, Any]
resolved_dependencies: List[ResourceDescriptor]
internal_parameters: Optional[Dict[str, Any]] = None
resolved_dependencies: Optional[List[ResourceDescriptor]] = None


class SLSAPredicateV1_0(Predicate, _SLSAConfigBase):
Expand Down

0 comments on commit 08f172c

Please sign in to comment.