Skip to content

Commit

Permalink
align json schema with spec
Browse files Browse the repository at this point in the history
  • Loading branch information
mandelsoft committed Jan 17, 2023
1 parent cf21447 commit c7b27a7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions cmds/ocm/commands/ocmcmds/common/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (
"encoding/json"
"fmt"

_ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types"

"github.com/mandelsoft/vfs/pkg/vfs"
"github.com/spf13/pflag"
"golang.org/x/text/cases"
"golang.org/x/text/language"

_ "github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types"

"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/addhdlrs"
"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/dryrunoption"
Expand Down
1 change: 1 addition & 0 deletions docs/ocm/model.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ A component descriptor describes:
- a history of [Repository Contexts](#repository-contexts) describing
former repository locations of the component version along a transportation
chain
- an optional creation timestamp (RFC3339) rounded to seconds.
- a set of [Labels](#labels) to assign arbitrary kinds of information to the
component version, which is not formally defined by the Open Component Model
- an optional set of [Sources](#sources), that were used to generate the
Expand Down
4 changes: 4 additions & 0 deletions hack/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ go-bindata:
$(GOPATH)/bin/goimports:
go install -v golang.org/x/tools/cmd/goimports@latest

Linux_jq:
$(info -> jq is missing)
$(info - sudo apt-get install jq / sudo dnf install jq / sudo zypper install jq / sudo pacman -S jq)

Darwin_sed: Darwin
$(info -> GNU sed is missing)
$(info - brew install gnu-sed)
Expand Down
2 changes: 1 addition & 1 deletion resources/component-descriptor-ocm-v3-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ definitions:
value: {}
version:
pattern: '^v[0-9]+$'
signature:
signing:
type: 'boolean'
additionalProperties: false

Expand Down
4 changes: 2 additions & 2 deletions resources/component-descriptor-v2-schema.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$id: 'https://gardener.cloud/schemas/component-descriptor-v2'
$schema: 'https://json-schema.org/draft/2020-12/schema'
description: 'Gardener Component Descriptor v2 schema'
description: 'Open Component Model v2 schema'
definitions:
meta:
type: 'object'
Expand All @@ -22,7 +22,7 @@ definitions:
value: {}
version:
pattern: '^v[0-9]+$'
signature:
signing:
type: 'boolean'

componentName:
Expand Down

0 comments on commit c7b27a7

Please sign in to comment.