Skip to content

feat: add extra-identity-to-resource #149

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

Merged
Skarlso merged 1 commit into from
May 13, 2025
Merged

feat: add extra-identity-to-resource #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions shared/oci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ const (
)

type Resource struct {
Name string
Version string
Data string
Type string
Name string
Version string
Data string
Type string
ExtraIdentity map[string]string
}

type ComponentRef struct {
Expand Down Expand Up @@ -66,8 +67,9 @@ func BlobResource(resource Resource) ComponentModification {
return compvers.SetResourceBlob(
&compdesc.ResourceMeta{
ElementMeta: compdesc.ElementMeta{
Name: resource.Name,
Version: resource.Version,
Name: resource.Name,
Version: resource.Version,
ExtraIdentity: resource.ExtraIdentity,
},
Type: resource.Type,
Relation: ocmmetav1.LocalRelation,
Expand All @@ -83,8 +85,9 @@ func ImageRefResource(ref string, resource Resource) ComponentModification {
return func(compvers ocm.ComponentVersionAccess) error {
return compvers.SetResource(&compdesc.ResourceMeta{
ElementMeta: compdesc.ElementMeta{
Name: resource.Name,
Version: resource.Version,
Name: resource.Name,
Version: resource.Version,
ExtraIdentity: resource.ExtraIdentity,
},
Type: resource.Type,
Relation: ocmmetav1.ExternalRelation,
Expand Down
2 changes: 1 addition & 1 deletion shared/steps/setup/add_file_to_git_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func AddFilesToGitRepository(files ...File) features.Func {
Content: base64.StdEncoding.EncodeToString(data),
})
if err != nil {
t.Fatal(fmt.Errorf("failed to add file to repository: %w", err))
t.Fatal(fmt.Errorf("failed to add file to repository %s: %w", file, err))
}

t.Logf("successfully added %s to repository %s", file.DestFilepath, file.RepoName)
Expand Down
9 changes: 8 additions & 1 deletion shared/steps/teardown/dump_repository_content.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@ func DumpRepositoryContent(owner, repo string) features.Func {
t.Fatal(fmt.Errorf("failed to create gitea client: %w", err))
}

r, _, err := gclient.GetTrees(owner, repo, "main", true)
r, _, err := gclient.GetTrees(owner, repo, gitea.ListTreeOptions{
ListOptions: gitea.ListOptions{
PageSize: 100,
Page: 0,
},
Ref: "main",
Recursive: true,
})
if err != nil {
t.Fatal(fmt.Errorf("failed to find repo for %s/%s: %w", owner, repo, err))
}
Expand Down
Loading