Skip to content

Commit 4a07684

Browse files
feat: remove compref package from cli (open-component-model#1941)
<!-- markdownlint-disable MD041 --> #### What this PR does / why we need it Follow up for: open-component-model#1908. Removes compref from cli. ##### Verification - [x] I have tested the changes locally by running `task test` <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Refactor** * Component reference handling moved to the public OCI bindings, consolidating parsing/resolution into a shared implementation. * Legacy internal reference parser and its option surface were removed; CLI commands use the unified binding with no functional change. * Tests updated to the new bindings; some legacy internal tests were removed. <!-- end of auto-generated comment: release notes by coderabbit.ai --> Signed-off-by: Christoph Bleyer <christoph.bleyer@sap.com>
1 parent ef6c073 commit 4a07684

File tree

17 files changed

+14
-1262
lines changed

17 files changed

+14
-1262
lines changed

cli/cmd/add/component-version/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
syncdag "ocm.software/open-component-model/bindings/go/dag/sync"
2424
descriptor "ocm.software/open-component-model/bindings/go/descriptor/runtime"
2525
descriptorv2 "ocm.software/open-component-model/bindings/go/descriptor/v2"
26+
"ocm.software/open-component-model/bindings/go/oci/compref"
2627
ctfv1 "ocm.software/open-component-model/bindings/go/oci/spec/repository/v1/ctf"
2728
ociv1 "ocm.software/open-component-model/bindings/go/oci/spec/repository/v1/oci"
2829
"ocm.software/open-component-model/bindings/go/plugin/manager"
@@ -35,7 +36,6 @@ import (
3536
"ocm.software/open-component-model/cli/internal/flags/enum"
3637
"ocm.software/open-component-model/cli/internal/flags/file"
3738
"ocm.software/open-component-model/cli/internal/flags/log"
38-
"ocm.software/open-component-model/cli/internal/reference/compref"
3939
"ocm.software/open-component-model/cli/internal/render"
4040
"ocm.software/open-component-model/cli/internal/render/graph/list"
4141
"ocm.software/open-component-model/cli/internal/render/graph/tree"

cli/cmd/cmd_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ import (
2525
"ocm.software/open-component-model/bindings/go/ctf"
2626
descriptor "ocm.software/open-component-model/bindings/go/descriptor/runtime"
2727
"ocm.software/open-component-model/bindings/go/oci"
28+
"ocm.software/open-component-model/bindings/go/oci/compref"
2829
ocictf "ocm.software/open-component-model/bindings/go/oci/ctf"
2930
ctfv1 "ocm.software/open-component-model/bindings/go/oci/spec/repository/v1/ctf"
3031
"ocm.software/open-component-model/bindings/go/runtime"
3132
componentversion "ocm.software/open-component-model/cli/cmd/add/component-version"
3233
"ocm.software/open-component-model/cli/cmd/internal/test"
3334
ocmctx "ocm.software/open-component-model/cli/internal/context"
34-
"ocm.software/open-component-model/cli/internal/reference/compref"
3535
)
3636

3737
// setupTestRepositoryWithDescriptorLibrary creates a test repository with the given component versions

cli/cmd/download/plugin/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
"sigs.k8s.io/yaml"
2121

2222
descriptor "ocm.software/open-component-model/bindings/go/descriptor/runtime"
23+
"ocm.software/open-component-model/bindings/go/oci/compref"
2324
"ocm.software/open-component-model/bindings/go/plugin/manager/types/spec"
2425
ocmruntime "ocm.software/open-component-model/bindings/go/runtime"
2526
"ocm.software/open-component-model/cli/cmd/download/shared"
2627
ocmctx "ocm.software/open-component-model/cli/internal/context"
2728
"ocm.software/open-component-model/cli/internal/flags/enum"
28-
"ocm.software/open-component-model/cli/internal/reference/compref"
2929
"ocm.software/open-component-model/cli/internal/repository/ocm"
3030
)
3131

cli/cmd/download/resource/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import (
1818
"ocm.software/open-component-model/bindings/go/blob"
1919
"ocm.software/open-component-model/bindings/go/blob/compression"
2020
descriptor "ocm.software/open-component-model/bindings/go/descriptor/runtime"
21+
"ocm.software/open-component-model/bindings/go/oci/compref"
2122
"ocm.software/open-component-model/bindings/go/oci/spec/layout"
2223
"ocm.software/open-component-model/bindings/go/runtime"
2324
"ocm.software/open-component-model/cli/cmd/download/shared"
2425
"ocm.software/open-component-model/cli/internal/flags/enum"
25-
"ocm.software/open-component-model/cli/internal/reference/compref"
2626
"ocm.software/open-component-model/cli/internal/repository/ocm"
2727
"ocm.software/open-component-model/cli/internal/transformers"
2828
)

cli/cmd/get/component-version/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ import (
1717
syncdag "ocm.software/open-component-model/bindings/go/dag/sync"
1818
descruntime "ocm.software/open-component-model/bindings/go/descriptor/runtime"
1919
descriptorv2 "ocm.software/open-component-model/bindings/go/descriptor/v2"
20+
"ocm.software/open-component-model/bindings/go/oci/compref"
2021
ctfv1 "ocm.software/open-component-model/bindings/go/oci/spec/repository/v1/ctf"
2122
ociv1 "ocm.software/open-component-model/bindings/go/oci/spec/repository/v1/oci"
2223
"ocm.software/open-component-model/bindings/go/plugin/manager"
2324
"ocm.software/open-component-model/bindings/go/repository/component/resolvers"
2425
"ocm.software/open-component-model/bindings/go/runtime"
2526
ocmctx "ocm.software/open-component-model/cli/internal/context"
2627
"ocm.software/open-component-model/cli/internal/flags/enum"
27-
"ocm.software/open-component-model/cli/internal/reference/compref"
2828
"ocm.software/open-component-model/cli/internal/render"
2929
"ocm.software/open-component-model/cli/internal/render/graph/list"
3030
"ocm.software/open-component-model/cli/internal/render/graph/tree"

cli/cmd/plugins/get/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import (
1414
"ocm.software/open-component-model/bindings/go/dag/sync"
1515
descruntime "ocm.software/open-component-model/bindings/go/descriptor/runtime"
1616
descriptorv2 "ocm.software/open-component-model/bindings/go/descriptor/v2"
17+
"ocm.software/open-component-model/bindings/go/oci/compref"
1718
"ocm.software/open-component-model/bindings/go/repository/component/resolvers"
1819
"ocm.software/open-component-model/cli/cmd/download/shared"
1920
"ocm.software/open-component-model/cli/cmd/plugins/list"
2021
ocmctx "ocm.software/open-component-model/cli/internal/context"
2122
"ocm.software/open-component-model/cli/internal/flags/enum"
22-
"ocm.software/open-component-model/cli/internal/reference/compref"
2323
"ocm.software/open-component-model/cli/internal/render"
2424
daglist "ocm.software/open-component-model/cli/internal/render/graph/list"
2525
"ocm.software/open-component-model/cli/internal/repository/ocm"

cli/cmd/plugins/list/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"ocm.software/open-component-model/bindings/go/dag"
1616
"ocm.software/open-component-model/bindings/go/dag/sync"
1717
descriptor "ocm.software/open-component-model/bindings/go/descriptor/runtime"
18+
"ocm.software/open-component-model/bindings/go/oci/compref"
1819
"ocm.software/open-component-model/cli/cmd/download/shared"
1920
ocmctx "ocm.software/open-component-model/cli/internal/context"
2021
"ocm.software/open-component-model/cli/internal/flags/enum"
21-
"ocm.software/open-component-model/cli/internal/reference/compref"
2222
"ocm.software/open-component-model/cli/internal/render"
2323
"ocm.software/open-component-model/cli/internal/render/graph/list"
2424
"ocm.software/open-component-model/cli/internal/repository/ocm"

cli/cmd/sign/component-version/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"ocm.software/open-component-model/bindings/go/credentials"
1818
"ocm.software/open-component-model/bindings/go/descriptor/normalisation/json/v4alpha1"
1919
descruntime "ocm.software/open-component-model/bindings/go/descriptor/runtime"
20+
"ocm.software/open-component-model/bindings/go/oci/compref"
2021
ctfv1 "ocm.software/open-component-model/bindings/go/oci/spec/repository/v1/ctf"
2122
ociv1 "ocm.software/open-component-model/bindings/go/oci/spec/repository/v1/oci"
2223
"ocm.software/open-component-model/bindings/go/rsa/signing/v1alpha1"
@@ -25,7 +26,6 @@ import (
2526
ocmctx "ocm.software/open-component-model/cli/internal/context"
2627
"ocm.software/open-component-model/cli/internal/flags/enum"
2728
"ocm.software/open-component-model/cli/internal/flags/log"
28-
"ocm.software/open-component-model/cli/internal/reference/compref"
2929
"ocm.software/open-component-model/cli/internal/render"
3030
"ocm.software/open-component-model/cli/internal/repository/ocm"
3131
)

cli/cmd/transfer/component-version/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"sigs.k8s.io/yaml"
1414

1515
"ocm.software/open-component-model/bindings/go/credentials"
16+
"ocm.software/open-component-model/bindings/go/oci/compref"
1617
ociaccess "ocm.software/open-component-model/bindings/go/oci/spec/access"
1718
ctfv1 "ocm.software/open-component-model/bindings/go/oci/spec/repository/v1/ctf"
1819
ociv1alpha1 "ocm.software/open-component-model/bindings/go/oci/spec/transformation/v1alpha1"
@@ -25,7 +26,6 @@ import (
2526
"ocm.software/open-component-model/cli/cmd/transfer/component-version/internal"
2627
ocmctx "ocm.software/open-component-model/cli/internal/context"
2728
"ocm.software/open-component-model/cli/internal/flags/enum"
28-
"ocm.software/open-component-model/cli/internal/reference/compref"
2929
"ocm.software/open-component-model/cli/internal/render"
3030
"ocm.software/open-component-model/cli/internal/repository/ocm"
3131
)

cli/cmd/transfer/component-version/cmd_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import (
1818
descriptor "ocm.software/open-component-model/bindings/go/descriptor/runtime"
1919
v2 "ocm.software/open-component-model/bindings/go/descriptor/v2"
2020
"ocm.software/open-component-model/bindings/go/oci"
21+
"ocm.software/open-component-model/bindings/go/oci/compref"
2122
ocictf "ocm.software/open-component-model/bindings/go/oci/ctf"
2223
ctfv1 "ocm.software/open-component-model/bindings/go/oci/spec/repository/v1/ctf"
2324
"ocm.software/open-component-model/bindings/go/signing"
2425
"ocm.software/open-component-model/cli/cmd/internal/test"
25-
"ocm.software/open-component-model/cli/internal/reference/compref"
2626
)
2727

2828
// setupTestRepositoryWithDescriptorLibrary creates a test repository with the given component versions

0 commit comments

Comments
 (0)