From b25e4bfa8bb528e2ae8bf21ccfbf093039c9b23d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Fri, 27 Jan 2023 10:21:11 +0100 Subject: [PATCH] osbuild: rework Ignition stage inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rework the stage to not reimplement `FilesInput` as `IgnitionStageInput`, but instead use the one common `FilesInput` implementation and its supported references. Signed-off-by: Tomáš Hozza --- internal/osbuild/ignition_stage.go | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/internal/osbuild/ignition_stage.go b/internal/osbuild/ignition_stage.go index 32af0b678..e21c689d3 100644 --- a/internal/osbuild/ignition_stage.go +++ b/internal/osbuild/ignition_stage.go @@ -18,24 +18,14 @@ func NewIgnitionStage(options *IgnitionStageOptions) *Stage { } type IgnitionStageInputInline struct { - InlineFile IgnitionStageInput `json:"inlinefile"` + InlineFile *FilesInput `json:"inlinefile"` } func (IgnitionStageInputInline) isStageInputs() {} -type IgnitionStageInput struct { - inputCommon - References IgnitionStageReferences `json:"references"` -} - -type IgnitionStageReferences []string - -func (IgnitionStageReferences) isReferences() {} - func NewIgnitionInlineInput(embeddedData string) Inputs { - inputs := new(IgnitionStageInputInline) - inputs.InlineFile.Type = "org.osbuild.files" - inputs.InlineFile.Origin = "org.osbuild.source" - inputs.InlineFile.References = IgnitionStageReferences{fmt.Sprintf("sha256:%x", sha256.Sum256([]byte(embeddedData)))} - return inputs + input := NewFilesInput(NewFilesInputSourcePlainRef([]string{ + fmt.Sprintf("%x", sha256.Sum256([]byte(embeddedData))), + })) + return &IgnitionStageInputInline{InlineFile: input} }