Skip to content

Commit fd1131a

Browse files
committed
chore: fix breaking ocm api changes
1 parent 3c04946 commit fd1131a

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

shared/oci.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@ import (
99
"fmt"
1010
"net/url"
1111

12-
"ocm.software/ocm/api/utils/accessio"
1312
"ocm.software/ocm/api/ocm"
14-
"ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
15-
"ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
1613
"ocm.software/ocm/api/ocm/compdesc"
1714
ocmmetav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
15+
"ocm.software/ocm/api/ocm/extensions/accessmethods/ociartifact"
16+
"ocm.software/ocm/api/ocm/extensions/attrs/signingattr"
1817
ocmreg "ocm.software/ocm/api/ocm/extensions/repositories/ocireg"
18+
"ocm.software/ocm/api/ocm/resolvers"
1919
"ocm.software/ocm/api/ocm/tools/signing"
20-
"ocm.software/ocm/api/utils/mime"
2120
ocmsigning "ocm.software/ocm/api/tech/signing"
2221
"ocm.software/ocm/api/tech/signing/handlers/rsa"
22+
"ocm.software/ocm/api/utils/blobaccess"
23+
"ocm.software/ocm/api/utils/mime"
2324
)
2425

2526
const (
@@ -71,7 +72,7 @@ func BlobResource(resource Resource) ComponentModification {
7172
Type: resource.Type,
7273
Relation: ocmmetav1.LocalRelation,
7374
},
74-
accessio.BlobAccessForString(mime.MIME_TEXT, resource.Data),
75+
blobaccess.ForString(mime.MIME_TEXT, resource.Data),
7576
"", nil,
7677
)
7778
}
@@ -94,7 +95,7 @@ func ImageRefResource(ref string, resource Resource) ComponentModification {
9495
// ComponentVersionRef creates a component version reference for the given component version.
9596
func ComponentVersionRef(ref ComponentRef) ComponentModification {
9697
return func(compvers ocm.ComponentVersionAccess) error {
97-
return compvers.SetReference(&compdesc.ComponentReference{
98+
return compvers.SetReference(&compdesc.Reference{
9899
ElementMeta: compdesc.ElementMeta{
99100
Name: ref.Name,
100101
Version: ref.Version,
@@ -155,7 +156,7 @@ func AddComponentVersionToRepository(component Component, scheme string, compone
155156
}
156157

157158
if component.Sign != nil {
158-
resolver := ocm.NewCompoundResolver(target)
159+
resolver := resolvers.NewCompoundResolver(target)
159160
opts := signing.NewOptions(
160161
signing.Sign(ocmsigning.DefaultHandlerRegistry().GetSigner(SignAlgo), component.Sign.Name),
161162
signing.Resolver(resolver),

0 commit comments

Comments
 (0)