Skip to content

Commit

Permalink
Update CLI docs (#354)
Browse files Browse the repository at this point in the history
Update OCM CLI documentation for new release

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
github-actions[bot] authored Nov 25, 2024
1 parent 1fe7984 commit f9b38b2
Show file tree
Hide file tree
Showing 8 changed files with 98 additions and 93 deletions.
2 changes: 1 addition & 1 deletion config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title = "Open Component Model"
description = ""
leader = "An open standard to describe software artifact delivery."
leader_open_source_text = "Open-Source Apache-2.0 licensed."
latest_version = "v0.17.0"
latest_version = "v0.18.0"
images = ["logo-image.png"]

# mainSections
Expand Down
2 changes: 1 addition & 1 deletion content/docs/cli-reference/add/add_componentversions.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ocm add componentversions [<options>] [--version <version>] [<ctf archive>] {<co
-s, --settings stringArray settings file with variable settings (yaml)
--templater string templater to use (go, none, spiff, subst) (default "subst")
-t, --type string archive format (directory, tar, tgz) (default "directory")
--uploader <name>=<value> repository uploader (<name>[:<artifact type>[:<media type>]]=<JSON target config) (default [])
--uploader <name>=<value> repository uploader (<name>[:<artifact type>[:<media type>[:<priority>]]]=<JSON target config>) (default [])
-v, --version string default version for components
```

Expand Down
2 changes: 1 addition & 1 deletion content/docs/cli-reference/download/download_resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ocm download resources [<options>] <component> {<name> { <key>=<value> }}
--check-verified enable verification store
-c, --constraints constraints version constraint
-d, --download-handlers use download handler if possible
--downloader <name>=<value> artifact downloader (<name>[:<artifact type>[:<media type>]]=<JSON target config) (default [])
--downloader <name>=<value> artifact downloader (<name>[:<artifact type>[:<media type>[:<priority>]]]=<JSON target config>) (default [])
-x, --executable download executable for local platform
-h, --help help for resources
--latest restrict component versions to latest
Expand Down
14 changes: 9 additions & 5 deletions content/docs/cli-reference/help/configfile.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,18 @@ The following configuration types are supported:
</pre>
- <code>downloader.ocm.config.ocm.software</code>
The config type <code>downloader.ocm.config.ocm.software</code> can be used to define a list
of preconfigured download handler registrations (see [ocm ocm-downloadhandlers](/docs/cli-reference/help/ocm-downloadhandlers/)):
of preconfigured download handler registrations (see [ocm ocm-downloadhandlers](/docs/cli-reference/help/ocm-downloadhandlers/)),
the default priority is 200:

<pre>
type: downloader.ocm.config.ocm.software
description: "my standard download handler configuration"
handlers:
registrations:
- name: oci/artifact
artifactType: ociImage
mimeType:
mimeType: ...
description: ...
priority: ...
config: ...
...
</pre>
Expand Down Expand Up @@ -321,12 +324,13 @@ The following configuration types are supported:
</pre>
- <code>uploader.ocm.config.ocm.software</code>
The config type <code>uploader.ocm.config.ocm.software</code> can be used to define a list
of preconfigured upload handler registrations (see [ocm ocm-uploadhandlers](/docs/cli-reference/help/ocm-uploadhandlers/)):
of preconfigured upload handler registrations (see [ocm ocm-uploadhandlers](/docs/cli-reference/help/ocm-uploadhandlers/)),
the default priority is 200:

<pre>
type: uploader.ocm.config.ocm.software
description: "my standard upload handler configuration"
handlers:
registrations:
- name: oci/artifact
artifactType: ociImage
config:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ocm transfer commontransportarchive [<options>] <ctf> <target>
-s, --scriptFile string filename of transfer handler script
-E, --stop-on-existing stop on existing component version in target repository
-t, --type string archive format (directory, tar, tgz) (default "directory")
--uploader <name>=<value> repository uploader (<name>[:<artifact type>[:<media type>]]=<JSON target config) (default [])
--uploader <name>=<value> repository uploader (<name>[:<artifact type>[:<media type>[:<priority>]]]=<JSON target config>) (default [])
```

### Description
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ocm transfer componentversions [<options>] {<component-reference>} <target>
-s, --scriptFile string filename of transfer handler script
-E, --stop-on-existing stop on existing component version in target repository
-t, --type string archive format (directory, tar, tgz) (default "directory")
--uploader <name>=<value> repository uploader (<name>[:<artifact type>[:<media type>]]=<JSON target config) (default [])
--uploader <name>=<value> repository uploader (<name>[:<artifact type>[:<media type>[:<priority>]]]=<JSON target config>) (default [])
```

### Description
Expand Down
52 changes: 26 additions & 26 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.23.2

require (
github.com/spf13/cobra v1.8.1
ocm.software/ocm v0.17.0
ocm.software/ocm v0.18.0
)

require (
Expand Down Expand Up @@ -45,26 +45,26 @@ require (
github.com/alibabacloud-go/tea-xml v1.1.3 // indirect
github.com/aliyun/credentials-go v1.3.10 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go-v2 v1.32.2 // indirect
github.com/aws/aws-sdk-go-v2 v1.32.3 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
github.com/aws/aws-sdk-go-v2/config v1.28.0 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.41 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.33 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.21 // indirect
github.com/aws/aws-sdk-go-v2/config v1.28.1 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.42 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.35 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.21 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.36.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.36.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.27.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.66.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.32.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 // indirect
github.com/aws/smithy-go v1.22.0 // indirect
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20241009180534-e718692eec62 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -83,7 +83,7 @@ require (
github.com/cloudflare/circl v1.5.0 // indirect
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
github.com/containerd/containerd v1.7.23 // indirect
github.com/containerd/errdefs v0.3.0 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
Expand Down Expand Up @@ -144,7 +144,7 @@ require (
github.com/goccy/go-json v0.10.3 // indirect
github.com/goccy/go-yaml v1.12.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
Expand Down Expand Up @@ -317,18 +317,18 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
helm.sh/helm/v3 v3.16.2 // indirect
k8s.io/api v0.31.1 // indirect
k8s.io/apiextensions-apiserver v0.31.1 // indirect
k8s.io/apimachinery v0.31.1 // indirect
k8s.io/cli-runtime v0.31.1 // indirect
k8s.io/client-go v0.31.1 // indirect
k8s.io/component-base v0.31.1 // indirect
k8s.io/api v0.31.2 // indirect
k8s.io/apiextensions-apiserver v0.31.2 // indirect
k8s.io/apimachinery v0.31.2 // indirect
k8s.io/cli-runtime v0.31.2 // indirect
k8s.io/client-go v0.31.2 // indirect
k8s.io/component-base v0.31.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 // indirect
k8s.io/kubectl v0.31.1 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
oras.land/oras-go v1.2.6 // indirect
sigs.k8s.io/controller-runtime v0.19.0 // indirect
sigs.k8s.io/controller-runtime v0.19.1 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/kustomize/api v0.18.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
Expand Down
Loading

0 comments on commit f9b38b2

Please sign in to comment.