Add options to distinguish between component and processing data

open-component-model · Nov 19, 2024 · 0f9fc6a · 0f9fc6a
1 parent 43c9c16
commit 0f9fc6a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -12,14 +12,15 @@ labels:
 resources:
   - name: text
     type: PlainText
-    skipDigestGeneration: true
     labels:
       - name: city
         value: Karlsruhe
         merge:
           algorithm: default
           config:
             overwrite: inbound
+    options:
+      skipDigestGeneration: true
     input:
       type: file
       path: testdata