stage(skopeo): rename destination and ctor

Rename the destination type and constructor for introduction of the alternative destination type.
osbuild · Dec 15, 2023 · a94b711 · a94b711
1 parent b9961d9
commit a94b711
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/manifest/os.go b/pkg/manifest/os.go
@@ -417,7 +417,7 @@ func (p *OS) serialize() osbuild.Pipeline {
 		}
 
 		manifests := osbuild.NewFilesInputForManifestLists(p.containerSpecs)
-		skopeo := osbuild.NewSkopeoStage(storagePath, images, manifests)
+		skopeo := osbuild.NewSkopeoStageWithContainersStorage(storagePath, images, manifests)
 		pipeline.AddStage(skopeo)
 	}
 

diff --git a/pkg/osbuild/skopeo_stage.go b/pkg/osbuild/skopeo_stage.go
@@ -1,13 +1,13 @@
 package osbuild
 
-type SkopeoDestination struct {
+type SkopeoDestinationContainersStorage struct {
 	Type          string `json:"type"`
 	StoragePath   string `json:"storage-path,omitempty"`
 	StorageDriver string `json:"storage-driver,omitempty"`
 }
 
 type SkopeoStageOptions struct {
-	Destination SkopeoDestination `json:"destination"`
+	DestinationContainersStorage SkopeoDestinationContainersStorage `json:"destination"`
 }
 
 func (o SkopeoStageOptions) isStageOptions() {}
@@ -19,7 +19,7 @@ type SkopeoStageInputs struct {
 
 func (SkopeoStageInputs) isStageInputs() {}
 
-func NewSkopeoStage(path string, images ContainersInput, manifests *FilesInput) *Stage {
+func NewSkopeoStageWithContainersStorage(path string, images ContainersInput, manifests *FilesInput) *Stage {
 
 	inputs := SkopeoStageInputs{
 		Images:        images,
@@ -29,7 +29,7 @@ func NewSkopeoStage(path string, images ContainersInput, manifests *FilesInput)
 	return &Stage{
 		Type: "org.osbuild.skopeo",
 		Options: &SkopeoStageOptions{
-			Destination: SkopeoDestination{
+			DestinationContainersStorage: SkopeoDestinationContainersStorage{
 				Type:        "containers-storage",
 				StoragePath: path,
 			},