From 0bd0f5723184566b39dc69f0542984853c9d11be Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Wed, 16 Feb 2022 10:14:36 +0100 Subject: [PATCH] Move `qemuStageInputs()` from distros to `osbuild2` Move the `qemuStageInputs()` function duplicated in most distro definitions to the `osbuild2` package as `NewQemuStagePipelineFilesInputs()`. Signed-off-by: Tomas Hozza --- internal/distro/rhel85/pipelines.go | 2 +- internal/distro/rhel85/stage_inputs.go | 14 -------------- internal/distro/rhel86/pipelines.go | 2 +- internal/distro/rhel86/stage_inputs.go | 14 -------------- internal/distro/rhel90/pipelines.go | 2 +- internal/distro/rhel90/stage_inputs.go | 14 -------------- internal/distro/rhel90beta/pipelines.go | 2 +- internal/distro/rhel90beta/stage_inputs.go | 14 -------------- internal/osbuild2/qemu_stage.go | 14 ++++++++++++++ 9 files changed, 18 insertions(+), 60 deletions(-) diff --git a/internal/distro/rhel85/pipelines.go b/internal/distro/rhel85/pipelines.go index b15dac713..c1cd2df38 100644 --- a/internal/distro/rhel85/pipelines.go +++ b/internal/distro/rhel85/pipelines.go @@ -1316,7 +1316,7 @@ func qemuPipeline(inputPipelineName, inputFilename, outputFilename, format, qcow p.Name = format p.Build = "name:build" - qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), qemuStageInputs(inputPipelineName, inputFilename)) + qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), osbuild.NewQemuStagePipelineFilesInputs(inputPipelineName, inputFilename)) p.AddStage(qemuStage) return p } diff --git a/internal/distro/rhel85/stage_inputs.go b/internal/distro/rhel85/stage_inputs.go index c199a14c0..f3c79e32b 100644 --- a/internal/distro/rhel85/stage_inputs.go +++ b/internal/distro/rhel85/stage_inputs.go @@ -41,17 +41,3 @@ func ostreePullStageInputs(origin, source, commitRef string) *osbuild.OSTreePull pullStageInput.References = inputRefs return &osbuild.OSTreePullStageInputs{Commits: pullStageInput} } - -func qemuStageInputs(stage, file string) *osbuild.QEMUStageInputs { - stageKey := "name:" + stage - ref := map[string]osbuild.QEMUFile{ - stageKey: { - File: file, - }, - } - input := new(osbuild.QEMUStageInput) - input.Type = "org.osbuild.files" - input.Origin = "org.osbuild.pipeline" - input.References = ref - return &osbuild.QEMUStageInputs{Image: input} -} diff --git a/internal/distro/rhel86/pipelines.go b/internal/distro/rhel86/pipelines.go index 54009da19..39868df9e 100644 --- a/internal/distro/rhel86/pipelines.go +++ b/internal/distro/rhel86/pipelines.go @@ -1039,7 +1039,7 @@ func qemuPipeline(inputPipelineName, inputFilename, outputFilename, format, qcow p.Name = format p.Build = "name:build" - qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), qemuStageInputs(inputPipelineName, inputFilename)) + qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), osbuild.NewQemuStagePipelineFilesInputs(inputPipelineName, inputFilename)) p.AddStage(qemuStage) return p } diff --git a/internal/distro/rhel86/stage_inputs.go b/internal/distro/rhel86/stage_inputs.go index 58e7ca0b9..21216741c 100644 --- a/internal/distro/rhel86/stage_inputs.go +++ b/internal/distro/rhel86/stage_inputs.go @@ -41,17 +41,3 @@ func ostreePullStageInputs(origin, source, commitRef string) *osbuild.OSTreePull pullStageInput.References = inputRefs return &osbuild.OSTreePullStageInputs{Commits: pullStageInput} } - -func qemuStageInputs(stage, file string) *osbuild.QEMUStageInputs { - stageKey := "name:" + stage - ref := map[string]osbuild.QEMUFile{ - stageKey: { - File: file, - }, - } - input := new(osbuild.QEMUStageInput) - input.Type = "org.osbuild.files" - input.Origin = "org.osbuild.pipeline" - input.References = ref - return &osbuild.QEMUStageInputs{Image: input} -} diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go index 9f86dcd33..fd31678ff 100644 --- a/internal/distro/rhel90/pipelines.go +++ b/internal/distro/rhel90/pipelines.go @@ -1036,7 +1036,7 @@ func qemuPipeline(inputPipelineName, inputFilename, outputFilename, format, qcow p.Name = format p.Build = "name:build" - qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), qemuStageInputs(inputPipelineName, inputFilename)) + qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), osbuild.NewQemuStagePipelineFilesInputs(inputPipelineName, inputFilename)) p.AddStage(qemuStage) return p } diff --git a/internal/distro/rhel90/stage_inputs.go b/internal/distro/rhel90/stage_inputs.go index 21a37aac4..e6a3f3b00 100644 --- a/internal/distro/rhel90/stage_inputs.go +++ b/internal/distro/rhel90/stage_inputs.go @@ -41,17 +41,3 @@ func ostreePullStageInputs(origin, source, commitRef string) *osbuild.OSTreePull pullStageInput.References = inputRefs return &osbuild.OSTreePullStageInputs{Commits: pullStageInput} } - -func qemuStageInputs(stage, file string) *osbuild.QEMUStageInputs { - stageKey := "name:" + stage - ref := map[string]osbuild.QEMUFile{ - stageKey: { - File: file, - }, - } - input := new(osbuild.QEMUStageInput) - input.Type = "org.osbuild.files" - input.Origin = "org.osbuild.pipeline" - input.References = ref - return &osbuild.QEMUStageInputs{Image: input} -} diff --git a/internal/distro/rhel90beta/pipelines.go b/internal/distro/rhel90beta/pipelines.go index b5bf5db4f..cdb8da428 100644 --- a/internal/distro/rhel90beta/pipelines.go +++ b/internal/distro/rhel90beta/pipelines.go @@ -1126,7 +1126,7 @@ func qemuPipeline(inputPipelineName, inputFilename, outputFilename, format, qcow p.Name = format p.Build = "name:build" - qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), qemuStageInputs(inputPipelineName, inputFilename)) + qemuStage := osbuild.NewQEMUStage(qemuStageOptions(outputFilename, format, qcow2Compat), osbuild.NewQemuStagePipelineFilesInputs(inputPipelineName, inputFilename)) p.AddStage(qemuStage) return p } diff --git a/internal/distro/rhel90beta/stage_inputs.go b/internal/distro/rhel90beta/stage_inputs.go index c8d5f8366..b74eb77c5 100644 --- a/internal/distro/rhel90beta/stage_inputs.go +++ b/internal/distro/rhel90beta/stage_inputs.go @@ -41,17 +41,3 @@ func ostreePullStageInputs(origin, source, commitRef string) *osbuild.OSTreePull pullStageInput.References = inputRefs return &osbuild.OSTreePullStageInputs{Commits: pullStageInput} } - -func qemuStageInputs(stage, file string) *osbuild.QEMUStageInputs { - stageKey := "name:" + stage - ref := map[string]osbuild.QEMUFile{ - stageKey: { - File: file, - }, - } - input := new(osbuild.QEMUStageInput) - input.Type = "org.osbuild.files" - input.Origin = "org.osbuild.pipeline" - input.References = ref - return &osbuild.QEMUStageInputs{Image: input} -} diff --git a/internal/osbuild2/qemu_stage.go b/internal/osbuild2/qemu_stage.go index be863cdbe..8093babe5 100644 --- a/internal/osbuild2/qemu_stage.go +++ b/internal/osbuild2/qemu_stage.go @@ -105,3 +105,17 @@ func (options QEMUStageOptions) MarshalJSON() ([]byte, error) { return json.Marshal(qemuStageOptions(options)) } + +func NewQemuStagePipelineFilesInputs(stage, file string) *QEMUStageInputs { + stageKey := "name:" + stage + ref := map[string]QEMUFile{ + stageKey: { + File: file, + }, + } + input := new(QEMUStageInput) + input.Type = "org.osbuild.files" + input.Origin = "org.osbuild.pipeline" + input.References = ref + return &QEMUStageInputs{Image: input} +}