Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Bump ocm library to v0.6.0 #1934

Merged
merged 10 commits into from
Feb 6, 2024
Merged

chore: Bump ocm library to v0.6.0 #1934

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d67f5ce
Bump ocm to 0.6.0
Tomasz-Smelcerz-SAP Jan 29, 2024
a74a3b8
Add modification option
Tomasz-Smelcerz-SAP Jan 30, 2024
9675d07
Fix lint
Tomasz-Smelcerz-SAP Jan 30, 2024
979f7dc
Debugging
Tomasz-Smelcerz-SAP Jan 31, 2024
5bc9a5a
Debug
Tomasz-Smelcerz-SAP Feb 1, 2024
1d755dd
enhance equality check
Tomasz-Smelcerz-SAP Feb 2, 2024
8988b8d
cleanup
Tomasz-Smelcerz-SAP Feb 2, 2024
ff03817
cleanup
Tomasz-Smelcerz-SAP Feb 2, 2024
9ffd690
lint fix
Tomasz-Smelcerz-SAP Feb 2, 2024
66c384f
Review fix
Tomasz-Smelcerz-SAP Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ require (
github.com/mandelsoft/vfs v0.4.0
github.com/onsi/ginkgo/v2 v2.15.0
github.com/onsi/gomega v1.31.1
github.com/open-component-model/ocm v0.4.0
github.com/open-component-model/ocm v0.6.0
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0-rc6
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
Expand Down Expand Up @@ -178,6 +178,7 @@ require (
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-openapi/validate v0.22.3 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/go-test/deep v1.1.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
Expand Down Expand Up @@ -208,7 +209,10 @@ require (
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/hashicorp/vault-client-go v0.4.2 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/iancoleman/orderedmap v0.2.0 // indirect
github.com/iancoleman/strcase v0.2.0 // indirect
Expand Down Expand Up @@ -284,6 +288,7 @@ require (
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rubenv/sql-migrate v1.5.2 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sassoftware/relic v7.2.1+incompatible // indirect
Expand Down
10 changes: 8 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/DataDog/gostackparse v0.7.0 h1:i7dLkXHvYzHV308hnkvVGDL3BR4FWl7IsXNPz/IGQh4=
github.com/DataDog/gostackparse v0.7.0/go.mod h1:lTfqcJKqS9KnXQGnyQMCugq3u1FP6UZMfWR0aitKFMM=
github.com/InfiniteLoopSpace/go_S-MIME v0.0.0-20181221134359-3f58f9a4b2b6 h1:TkEaE2dfSBN9onWsQ1pC9EVMmVDJqkYWNUwS6+EYxlM=
github.com/InfiniteLoopSpace/go_S-MIME v0.0.0-20181221134359-3f58f9a4b2b6/go.mod h1:yhh4MGRGdTpTET5RhSJx4XNCEkJljP3k8MxTTB3joQA=
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
Expand Down Expand Up @@ -1139,6 +1143,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
github.com/hashicorp/vault-client-go v0.4.2 h1:XeUXb5jnDuCUhC8HRpkdGPLh1XtzXmiOnF0mXEbARxI=
github.com/hashicorp/vault-client-go v0.4.2/go.mod h1:4tDw7Uhq5XOxS1fO+oMtotHL7j4sB9cp0T7U6m4FzDY=
github.com/hashicorp/vault/api v1.10.0 h1:/US7sIjWN6Imp4o/Rj1Ce2Nr5bki/AXi9vAW3p2tOJQ=
github.com/hashicorp/vault/api v1.10.0/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef h1:A9HsByNhogrvm9cWb28sjiS3i7tcKCkflWFEkHfuAgM=
Expand Down Expand Up @@ -1531,8 +1537,8 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl
github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0=
github.com/open-component-model/ocm v0.4.0 h1:S+rPJGoDnSvxhBn3QS2HXURxugTjCM4XWEJLZSaH6Ek=
github.com/open-component-model/ocm v0.4.0/go.mod h1:7RAqaUMmA4BlwW5ZEUBm8amWIb1TL9FhNigNXQ6wiu0=
github.com/open-component-model/ocm v0.6.0 h1:R8TQthzSddiU5i/NEJv5EziSSSqO9FAnO7WhqOcUEXA=
github.com/open-component-model/ocm v0.6.0/go.mod h1:rqMOD7puXAcLb7YMG2Zt2KH0vfBL/yhn9+uO6e0wLJg=
github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
Expand Down
4 changes: 4 additions & 0 deletions pkg/module/blob/blob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ func (o *Output) Digest() digest.Digest {
return digest.FromString(o.digest)
}

func (o *Output) Dup() (accessio.BlobAccess, error) {
return o, nil
}

type InputType string

const (
Expand Down
42 changes: 35 additions & 7 deletions pkg/module/oci_repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package module

import (
"fmt"
"reflect"

"github.com/open-component-model/ocm/pkg/common"
"github.com/open-component-model/ocm/pkg/contexts/ocm"
Expand All @@ -25,14 +26,14 @@ type OciRepoAccess interface {
type OciRepo struct{}

func (r *OciRepo) ComponentVersionExists(archive *comparch.ComponentArchive, repo cpi.Repository) (bool, error) {
return repo.ExistsComponentVersion(archive.ComponentVersionAccess.GetName(),
archive.ComponentVersionAccess.GetVersion())
return repo.ExistsComponentVersion(archive.GetName(),
archive.GetVersion())
}

func (r *OciRepo) GetComponentVersion(archive *comparch.ComponentArchive,
repo cpi.Repository) (ocm.ComponentVersionAccess, error) {
return repo.LookupComponentVersion(archive.ComponentVersionAccess.GetName(),
archive.ComponentVersionAccess.GetVersion())
return repo.LookupComponentVersion(archive.GetName(),
archive.GetVersion())
}

func (r *OciRepo) PushComponentVersion(archive *comparch.ComponentArchive, repo cpi.Repository, overwrite bool) error {
Expand All @@ -42,7 +43,7 @@ func (r *OciRepo) PushComponentVersion(archive *comparch.ComponentArchive, repo
}

if err = transfer.TransferVersion(
common.NewLoggingPrinter(archive.GetContext().Logger()), nil, archive.ComponentVersionAccess, repo,
common.NewLoggingPrinter(archive.GetContext().Logger()), nil, archive, repo,
&customTransferHandler{transferHandler},
); err != nil {
return fmt.Errorf("could not finish component transfer: %w", err)
Expand All @@ -63,7 +64,8 @@ func (r *OciRepo) DescriptorResourcesAreEquivalent(archive *comparch.ComponentAr
localResourcesMap[res.Name] = res
}

for _, res := range remoteResources {
for i := range remoteResources {
res := remoteResources[i]
localResource := localResourcesMap[res.Name]
if res.Name == RawManifestLayerName {
remoteAccess, ok := res.Access.(*runtime.UnstructuredVersionedTypedObject)
Expand All @@ -88,10 +90,36 @@ func (r *OciRepo) DescriptorResourcesAreEquivalent(archive *comparch.ComponentAr
if remoteAccessLocalReference[7:] != localAccessObject.LocalReference[7:] {
return false
}
} else if !res.IsEquivalent(&localResource) {
} else if !isEquivalent(&res, &localResource) {
return false
}
}

return true
}

func isEquivalent(r *compdesc.Resource, e compdesc.ElementMetaAccessor) bool {
// Paranoid sanity checks
if r == nil && e == nil {
return true
}
if r == nil && e != nil || r != nil && e == nil {
return false
}

// Taken from OCM@v0.4.0 because the implementation in v0.6.0 looks flawed
o, ok := e.(*compdesc.Resource)
if !ok {
return false
}
if !reflect.DeepEqual(&r.ElementMeta, &o.ElementMeta) {
return false
}
if !reflect.DeepEqual(&r.Access, &o.Access) {
return false
}
return r.Type == o.Type &&
r.Relation == o.Relation &&
reflect.DeepEqual(r.SourceRef, o.SourceRef)

}
2 changes: 1 addition & 1 deletion pkg/module/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func (r *Remote) ShouldPushArchive(repo cpi.Repository, archive *comparch.Compon
}
return false, fmt.Errorf("version %s already exists with different content, please use "+
"--module-archive-version-overwrite flag to overwrite it",
archive.ComponentVersionAccess.GetVersion())
archive.GetVersion())
}
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/module/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/open-component-model/ocm/pkg/common/accessobj"
"github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
ocmv1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
"github.com/open-component-model/ocm/pkg/contexts/ocm/cpi"
"github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
"github.com/pkg/errors"
"go.uber.org/zap"
Expand Down Expand Up @@ -117,7 +118,7 @@ func addBlob(fs vfs.FileSystem, archive *comparch.ComponentArchive, resource *Re
return err
}

return archive.SetResource(&resource.ResourceMeta, blobAccess)
return archive.SetResource(&resource.ResourceMeta, blobAccess, cpi.ModifyResource(true))
ruanxin marked this conversation as resolved.
Show resolved Hide resolved
}

func (rd ResourceDescriptor) String() string {
Expand Down
4 changes: 2 additions & 2 deletions pkg/module/security_scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"strings"

"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociimage"
itociartifact "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/ociartifact"
"github.com/open-component-model/ocm/pkg/contexts/ocm/accessmethods/ociartifact"
ocm "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
ocmv1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
Expand Down Expand Up @@ -97,7 +97,7 @@ func appendProtecodeImagesLayers(descriptor *ocm.ComponentDescriptor, config *Se
Labels: []ocmv1.Label{*imageTypeLabel},
Version: imageTag,
},
Type: ociimage.TYPE,
Type: itociartifact.LEGACY_TYPE, //#561
ruanxin marked this conversation as resolved.
Show resolved Hide resolved
Relation: ocmv1.ExternalRelation,
},
Access: access,
Expand Down
5 changes: 3 additions & 2 deletions pkg/module/sign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/open-component-model/ocm/pkg/signing"
"github.com/open-component-model/ocm/pkg/signing/handlers/rsa"
"github.com/open-component-model/ocm/pkg/signing/hasher/sha512"
"github.com/open-component-model/ocm/pkg/signing/signutils"
"github.com/pkg/errors"
)

Expand Down Expand Up @@ -112,7 +113,7 @@ func privateKey(pathToPrivateKey string) (interface{}, error) {
return nil, fmt.Errorf("unable to open key file: %w", err)
}

key, err := signing.ParsePrivateKey(privateKeyFile)
key, err := signutils.ParsePublicKey(privateKeyFile)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
key, err := signutils.ParsePublicKey(privateKeyFile)
key, err := signutils.ParsePrivateKey(privateKeyFile)

Copy link
Member Author

@Tomasz-Smelcerz-SAP Tomasz-Smelcerz-SAP Feb 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching! I chose a wrong option from auto-completion dialog, bummer!
On the other hand - it wasn't catched by any tests. Maybe we should improve our tests with respect to that?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, this signing feature is not used by anyone atm, we should consider removing this code completely. I'll create a followup issue for it

if err != nil {
return nil, fmt.Errorf("unable to parse private key: %w", err)
}
Expand All @@ -125,7 +126,7 @@ func publicKey(pathToPublicKey string) (interface{}, error) {
return nil, fmt.Errorf("unable to open key file: %w", err)
}

key, err := signing.ParsePublicKey(publicKeyFile)
key, err := signutils.ParsePublicKey(publicKeyFile)
if err != nil {
return nil, fmt.Errorf("unable to parse public key: %w", err)
}
Expand Down
Loading