From 0f9fc6a4657ffcaed61573f6fbc41897be3f3e76 Mon Sep 17 00:00:00 2001 From: Fabian Burth Date: Tue, 19 Nov 2024 16:34:02 +0100 Subject: [PATCH] Add options to distinguish between component and processing data --- cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go | 7 ++++++- .../add/testdata/component-constructor-skip.yaml | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go b/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go index c51fa9d12e..d1e04fa27c 100644 --- a/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go +++ b/cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go @@ -102,7 +102,7 @@ func (h *ResourceSpecHandler) Set(v ocm.ComponentVersionAccess, r addhdlrs.Eleme SourceRefs: compdescv2.ConvertSourcerefsTo(spec.SourceRefs), } opts := h.getModOpts() - if spec.SkipDigestGeneration { + if spec.Options.SkipDigestGeneration { opts = append(opts, ocm.SkipDigest()) //nolint:staticcheck // skip digest still used for tests } /* @@ -133,11 +133,16 @@ type ResourceSpec struct { addhdlrs.ResourceInput `json:",inline"` // additional process related options + Options Options `json:"options"` // SkipDigestGeneration omits the digest generation. SkipDigestGeneration bool `json:"skipDigestGeneration,omitempty"` } +type Options struct { + SkipDigestGeneration bool `json:"skipDigestGeneration,omitempty"` +} + var _ addhdlrs.ElementSpec = (*ResourceSpec)(nil) func (r *ResourceSpec) GetType() string { diff --git a/cmds/ocm/commands/ocmcmds/components/add/testdata/component-constructor-skip.yaml b/cmds/ocm/commands/ocmcmds/components/add/testdata/component-constructor-skip.yaml index bd8c88c4dd..86787ddb43 100644 --- a/cmds/ocm/commands/ocmcmds/components/add/testdata/component-constructor-skip.yaml +++ b/cmds/ocm/commands/ocmcmds/components/add/testdata/component-constructor-skip.yaml @@ -12,7 +12,6 @@ labels: resources: - name: text type: PlainText - skipDigestGeneration: true labels: - name: city value: Karlsruhe @@ -20,6 +19,8 @@ resources: algorithm: default config: overwrite: inbound + options: + skipDigestGeneration: true input: type: file path: testdata