particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild2: rename RPMStageReferenes to RPMStageSourceOptions

Browse source 
Matches the equivalent object reference in the osbuild schema:
org.osbuild.files/definitions/source-options
This commit is contained in:
Achilleas Koutsou 2022-04-21 19:46:36 +02:00 • committed by Tomáš Hozza
parent 0a695b21a1
commit b277d88d93
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/osbuild2/rpm_stage.go
View file

@ -61,9 +61,9 @@ type RPMStageReferenceMetadata struct {
CheckGPG bool `json:"rpm.check_gpg,omitempty"`
}
// RPMStageReference holds the metadata/options for a single RPM package to be
// RPMStageSourceOptions holds the metadata/options for a single RPM package to be
// installed.
type RPMStageReference struct {
type RPMStageSourceOptions struct {
Metadata *RPMStageReferenceMetadata `json:"metadata,omitempty"`
}
@ -80,7 +80,7 @@ type RPMStageReference struct {
// }
// }
// ...
type RPMStageReferences map[string]*RPMStageReference
type RPMStageReferences map[string]*RPMStageSourceOptions
func (RPMStageReferences) isReferences() {}
@ -156,7 +156,7 @@ func NewRpmStageSourceFilesInputs(specs []rpmmd.PackageSpec) *RPMStageInputs {
func pkgRefs(specs []rpmmd.PackageSpec) RPMStageReferences {
refs := make(RPMStageReferences, len(specs))
for _, pkg := range specs {
refs[pkg.Checksum] = &RPMStageReference{}
refs[pkg.Checksum] = &RPMStageSourceOptions{}
if pkg.CheckGPG {
refs[pkg.Checksum].Metadata = &RPMStageReferenceMetadata{
CheckGPG: pkg.CheckGPG,

4
internal/osbuild2/stage_test.go
View file

@ -818,8 +818,8 @@ func TestStageV2_UnmarshalJSON(t *testing.T) {
Inputs: &RPMStageInputs{
Packages: &RPMStageInput{
References: RPMStageReferences{
"checksum1": &RPMStageReference{},
"checksum2": &RPMStageReference{
"checksum1": &RPMStageSourceOptions{},
"checksum2": &RPMStageSourceOptions{
Metadata: &RPMStageReferenceMetadata{
CheckGPG: true,
},