From beabf65653edb08fff31c056e8645a4fdba75c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20M=C3=B6ller?= Date: Fri, 8 Nov 2024 11:34:02 +0100 Subject: [PATCH 1/3] chore: force bump to 0.18.0-dev (#1061) #### What this PR does / why we need it this is necessary because https://github.com/open-component-model/ocm/commit/6a27140afa7084d45032341c94ce2cdb975f1d53 landed in releases/v0.17.0 after a broken github action #### Which issue(s) this PR fixes --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a0073758b8..498b6fb3d5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.17.0-dev +0.18.0-dev From 2ea69c7ecca1e8be7e9d9f94dfdcac6090f1c69d Mon Sep 17 00:00:00 2001 From: Gerald Morrison <67469729+morri-son@users.noreply.github.com> Date: Fri, 8 Nov 2024 12:28:01 +0100 Subject: [PATCH 2/3] change short text for help topic (#1058) #### What this PR does / why we need it Improve short text for help topic --------- Co-authored-by: Hilmar Falkenberg --- api/oci/ref_test.go | 44 ++++++++++++------- .../download/config/registration_test.go | 5 +-- cmds/ocm/commands/verbs/install/cmd.go | 2 +- docs/reference/ocm.md | 2 +- docs/reference/ocm_install.md | 2 +- docs/reference/ocm_install_plugins.md | 2 +- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/api/oci/ref_test.go b/api/oci/ref_test.go index f0d27516c5..c95850ef03 100644 --- a/api/oci/ref_test.go +++ b/api/oci/ref_test.go @@ -3,11 +3,11 @@ package oci_test import ( "strings" - "github.com/mandelsoft/goutils/generics" . "github.com/mandelsoft/goutils/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/mandelsoft/goutils/generics" godigest "github.com/opencontainers/go-digest" "ocm.software/ocm/api/oci" @@ -255,8 +255,10 @@ var _ = Describe("ref parsing", func() { }, ArtSpec: oci.ArtSpec{ Repository: r, - ArtVersion: oci.ArtVersion{Tag: Pointer([]byte(uv)), - Digest: Dig([]byte(ud))}, + ArtVersion: oci.ArtVersion{ + Tag: Pointer([]byte(uv)), + Digest: Dig([]byte(ud)), + }, }, }) }) @@ -293,8 +295,10 @@ var _ = Describe("ref parsing", func() { }, ArtSpec: oci.ArtSpec{ Repository: r, - ArtVersion: oci.ArtVersion{Tag: Pointer([]byte(uv)), - Digest: Dig([]byte(ud))}, + ArtVersion: oci.ArtVersion{ + Tag: Pointer([]byte(uv)), + Digest: Dig([]byte(ud)), + }, }, }) }) @@ -343,8 +347,10 @@ var _ = Describe("ref parsing", func() { }, ArtSpec: oci.ArtSpec{ Repository: r, - ArtVersion: oci.ArtVersion{Tag: Pointer([]byte(uv)), - Digest: Dig([]byte(ud))}, + ArtVersion: oci.ArtVersion{ + Tag: Pointer([]byte(uv)), + Digest: Dig([]byte(ud)), + }, }, }) }) @@ -382,8 +388,10 @@ var _ = Describe("ref parsing", func() { }, ArtSpec: oci.ArtSpec{ Repository: "library/" + r, - ArtVersion: oci.ArtVersion{Tag: Pointer([]byte(uv)), - Digest: Dig([]byte(ud))}, + ArtVersion: oci.ArtVersion{ + Tag: Pointer([]byte(uv)), + Digest: Dig([]byte(ud)), + }, }, }) }) @@ -418,8 +426,10 @@ var _ = Describe("ref parsing", func() { }, ArtSpec: oci.ArtSpec{ Repository: r, - ArtVersion: oci.ArtVersion{Tag: Pointer([]byte(uv)), - Digest: Dig([]byte(ud))}, + ArtVersion: oci.ArtVersion{ + Tag: Pointer([]byte(uv)), + Digest: Dig([]byte(ud)), + }, }, }) }) @@ -596,8 +606,10 @@ var _ = Describe("ref parsing", func() { }, ArtSpec: oci.ArtSpec{ Repository: "repo/repo", - ArtVersion: oci.ArtVersion{Tag: &tag, - Digest: &digest}, + ArtVersion: oci.ArtVersion{ + Tag: &tag, + Digest: &digest, + }, }, }) CheckRef("http://127.0.0.1:443/repo/repo:v1@"+digest.String(), &oci.RefSpec{ @@ -609,8 +621,10 @@ var _ = Describe("ref parsing", func() { }, ArtSpec: oci.ArtSpec{ Repository: "repo/repo", - ArtVersion: oci.ArtVersion{Tag: &tag, - Digest: &digest}, + ArtVersion: oci.ArtVersion{ + Tag: &tag, + Digest: &digest, + }, }, }) CheckRef("directory::a/b", &oci.RefSpec{ diff --git a/api/ocm/extensions/download/config/registration_test.go b/api/ocm/extensions/download/config/registration_test.go index e2f81a3f40..f68f6efb41 100644 --- a/api/ocm/extensions/download/config/registration_test.go +++ b/api/ocm/extensions/download/config/registration_test.go @@ -6,17 +6,16 @@ import ( . "github.com/mandelsoft/goutils/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "ocm.software/ocm/api/ocm" "ocm.software/ocm/api/ocm/extensions/download" + me "ocm.software/ocm/api/ocm/extensions/download/config" "ocm.software/ocm/api/ocm/ocmutils" "ocm.software/ocm/api/tech/helm" - - me "ocm.software/ocm/api/ocm/extensions/download/config" ) var _ = Describe("Download Handler regigistration", func() { It("register by ocm config", func() { - ctx := ocm.New() cfg := me.New() diff --git a/cmds/ocm/commands/verbs/install/cmd.go b/cmds/ocm/commands/verbs/install/cmd.go index ea1ca8661f..87cbb3dbb3 100644 --- a/cmds/ocm/commands/verbs/install/cmd.go +++ b/cmds/ocm/commands/verbs/install/cmd.go @@ -12,7 +12,7 @@ import ( // NewCommand creates a new command. func NewCommand(ctx clictx.Context) *cobra.Command { cmd := utils.MassageCommand(&cobra.Command{ - Short: "Install elements.", + Short: "Install new OCM CLI components ", }, verbs.Install) cmd.AddCommand(plugins.NewCommand(ctx)) return cmd diff --git a/docs/reference/ocm.md b/docs/reference/ocm.md index c88be56806..f99a049602 100644 --- a/docs/reference/ocm.md +++ b/docs/reference/ocm.md @@ -369,7 +369,7 @@ by a certificate delivered with the signature. * [ocm execute](ocm_execute.md) — Execute an element. * [ocm get](ocm_get.md) — Get information about artifacts and components * [ocm hash](ocm_hash.md) — Hash and normalization operations -* [ocm install](ocm_install.md) — Install elements. +* [ocm install](ocm_install.md) — Install new OCM CLI components * [ocm list](ocm_list.md) — List information about components * [ocm set](ocm_set.md) — Set information about OCM repositories * [ocm show](ocm_show.md) — Show tags or versions diff --git a/docs/reference/ocm_install.md b/docs/reference/ocm_install.md index fc01db3356..3646334332 100644 --- a/docs/reference/ocm_install.md +++ b/docs/reference/ocm_install.md @@ -1,4 +1,4 @@ -## ocm install — Install Elements. +## ocm install — Install New OCM CLI Components ### Synopsis diff --git a/docs/reference/ocm_install_plugins.md b/docs/reference/ocm_install_plugins.md index 9e501520c0..9c20720c97 100644 --- a/docs/reference/ocm_install_plugins.md +++ b/docs/reference/ocm_install_plugins.md @@ -87,6 +87,6 @@ $ ocm install plugin -r demo #### Parents -* [ocm install](ocm_install.md) — Install elements. +* [ocm install](ocm_install.md) — Install new OCM CLI components * [ocm](ocm.md) — Open Component Model command line client From b711f7eae82c8b17bca71166ea5a066b6061573c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20M=C3=B6ller?= Date: Fri, 8 Nov 2024 20:50:14 +0100 Subject: [PATCH 3/3] chore: change guide for 0.18.0 (#1066) this will be (hopefully) the last bump before we create an automatically generated PR after a release which bumps this generation or we decide to stop updating the tour with the latest release #### What this PR does / why we need it #### Which issue(s) this PR fixes --- examples/lib/tour/01-getting-started/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/lib/tour/01-getting-started/README.md b/examples/lib/tour/01-getting-started/README.md index 1c0b22d69e..5ec9f956ad 100644 --- a/examples/lib/tour/01-getting-started/README.md +++ b/examples/lib/tour/01-getting-started/README.md @@ -168,32 +168,32 @@ differ, because the code always describes the latest version): ```text resources of the latest version: - version: 0.17.0 + version: 0.18.0-rc.1 provider: ocm.software 1: name: ocmcli extra identity: "architecture"="amd64","os"="linux" resource type: executable - access: Local blob sha256:03a45dcde67ba565fe806cb5db67da3387f772f7c50af711a0edd6f802570c04[] + access: Local blob sha256:74fdf71c5467cacd1cb09d15d6ad4944d60cc8efa1d704a91c337e54dcd03fbc[] 2: name: ocmcli extra identity: "architecture"="arm64","os"="linux" resource type: executable - access: Local blob sha256:5a622634ae43cf03eac91079389d83266891d1f9b2d8a3884cef6fe639180324[] + access: Local blob sha256:d0022850cce685d48ca589b3b59913ecbc3572f7f5082bca5c086a4bf2b47c5a[] 3: name: ocmcli extra identity: "architecture"="arm64","os"="darwin" resource type: executable - access: Local blob sha256:1482fe5b764e3a86cf96704d7a839ad7e53dcbfd4f5fce5405abffb1962153dd[] + access: Local blob sha256:1161fc38d0fe78ba3be97783f8676a46afa2baf57c199f937798f791cc4961d3[] 4: name: ocmcli extra identity: "architecture"="amd64","os"="darwin" resource type: executable - access: Local blob sha256:805f181aff48511eea12c699ed1bbcee8bdc4c5168924e81058aff8715946875[] + access: Local blob sha256:33074ce5cc079ea4fc1dbcc7bd54c27cc93f0e188d9ad8c56ba642c4ba6744af[] 5: name: ocmcli extra identity: "architecture"="amd64","os"="windows" resource type: executable - access: Local blob sha256:20839c68bf0c4cf99444d78ebb93f53358fa9e95fe806f186220bd21d520efa7[] + access: Local blob sha256:2fbac39d7772ae1cf209aca5bb5efdbb6b91e83aede9464c52304c3ccebb4f67[] 6: name: ocmcli-image extra identity: resource type: ociImage - access: OCI artifact ghcr.io/open-component-model/ocm/ocm.software/ocmcli/ocmcli-image:0.17.0@sha256:16fb52a1cb11c867bd058f4124dea53fbab94229842cc14b52653c2e80b1cede + access: OCI artifact ghcr.io/open-component-model/ocm/ocm.software/ocmcli/ocmcli-image:0.18.0-rc.1@sha256:3ba3e8c075f7f91e851ec3ce53da2347fe464b3ac33c6d65cf89a459193bb5cb ``` Resources have some metadata, like their identity and a resource type.