Merge branch 'main' into chore/remove-explicit-release-note-action

.github/config/labeler.yml

@@ -7,4 +7,8 @@ chore:
 dependencies:
 - any:
   - head-branch: 'dependencies/*'
-  - head-branch: 'dependabot/*'
+  - head-branch: 'dependabot/*'
+github-actions:
+- any:
+  - changed-files:
+    - '.github/**'

.github/workflows/pull-request.yaml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   branch-name-labeler:
-    name: Label PR based on branch name
+    name: Label PR based on Config
     permissions:
       contents: read
       pull-requests: write

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
 	}
 	/*
@@ -132,8 +132,16 @@ type ResourceSpec struct {
 
 	addhdlrs.ResourceInput `json:",inline"`
 
-	// additional process related options
+	// Options describes additional process related options
+	// see ResourceOptions for more details.
+	Options ResourceOptions `json:"options,omitempty"`
+}
 
+// ResourceOptions describes additional process related options
+// which reflect the handling of the resource without describing it directly.
+// Typical examples are any options that require specific changes in handling of the resource
+// but are not reflected in the resource itself (outside of side effects)
+type ResourceOptions struct {
 	// SkipDigestGeneration omits the digest generation.
 	SkipDigestGeneration bool `json:"skipDigestGeneration,omitempty"`
 }

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
@@ -23,6 +22,8 @@ resources:
     input:
       type: file
       path: testdata
+    options:
+      skipDigestGeneration: true
   - name: data
     type: PlainText
     input: