Skip to content

pkg/cdi: name cdi specs-go imports consistently. #228

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
merged 1 commit into from
Aug 30, 2024
Merged

pkg/cdi: name cdi specs-go imports consistently. #228

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
16 changes: 8 additions & 8 deletions pkg/cdi/container-edits.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

oci "github.com/opencontainers/runtime-spec/specs-go"
ocigen "github.com/opencontainers/runtime-tools/generate"
"tags.cncf.io/container-device-interface/specs-go"
cdi "tags.cncf.io/container-device-interface/specs-go"
)

const (
Expand Down Expand Up @@ -64,7 +64,7 @@ var (
// to all OCI Specs where at least one devices from the CDI Spec
// is injected.
type ContainerEdits struct {
*specs.ContainerEdits
*cdi.ContainerEdits
}

// Apply edits to the given OCI Spec. Updates the OCI Spec in place.
Expand Down Expand Up @@ -205,7 +205,7 @@ func (e *ContainerEdits) Append(o *ContainerEdits) *ContainerEdits {
e = &ContainerEdits{}
}
if e.ContainerEdits == nil {
e.ContainerEdits = &specs.ContainerEdits{}
e.ContainerEdits = &cdi.ContainerEdits{}
}

e.Env = append(e.Env, o.Env...)
Expand Down Expand Up @@ -259,7 +259,7 @@ func ValidateEnv(env []string) error {

// DeviceNode is a CDI Spec DeviceNode wrapper, used for validating DeviceNodes.
type DeviceNode struct {
*specs.DeviceNode
*cdi.DeviceNode
}

// Validate a CDI Spec DeviceNode.
Expand Down Expand Up @@ -289,7 +289,7 @@ func (d *DeviceNode) Validate() error {

// Hook is a CDI Spec Hook wrapper, used for validating hooks.
type Hook struct {
*specs.Hook
*cdi.Hook
}

// Validate a hook.
Expand All @@ -308,7 +308,7 @@ func (h *Hook) Validate() error {

// Mount is a CDI Mount wrapper, used for validating mounts.
type Mount struct {
*specs.Mount
*cdi.Mount
}

// Validate a mount.
Expand All @@ -325,13 +325,13 @@ func (m *Mount) Validate() error {
// IntelRdt is a CDI IntelRdt wrapper.
// This is used for validation and conversion to OCI specifications.
type IntelRdt struct {
*specs.IntelRdt
*cdi.IntelRdt
}

// ValidateIntelRdt validates the IntelRdt configuration.
//
// Deprecated: ValidateIntelRdt is deprecated use IntelRdt.Validate() instead.
func ValidateIntelRdt(i *specs.IntelRdt) error {
func ValidateIntelRdt(i *cdi.IntelRdt) error {
return (&IntelRdt{i}).Validate()
}

Expand Down
12 changes: 6 additions & 6 deletions pkg/cdi/validate/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package validate

import (
"tags.cncf.io/container-device-interface/schema"
raw "tags.cncf.io/container-device-interface/specs-go"
cdi "tags.cncf.io/container-device-interface/specs-go"
)

const (
Expand All @@ -27,29 +27,29 @@ const (
)

// WithSchema returns a CDI Spec validator that uses the given Schema.
func WithSchema(s *schema.Schema) func(*raw.Spec) error {
func WithSchema(s *schema.Schema) func(*cdi.Spec) error {
if s == nil {
return func(*raw.Spec) error {
return func(*cdi.Spec) error {
return nil
}
}
return func(spec *raw.Spec) error {
return func(spec *cdi.Spec) error {
return s.ValidateType(spec)
}
}

// WithNamedSchema loads the named JSON schema and returns a CDI Spec
// validator for it. If loading the schema fails a dummy validator is
// returned.
func WithNamedSchema(name string) func(*raw.Spec) error {
func WithNamedSchema(name string) func(*cdi.Spec) error {
s, _ := schema.Load(name)
return WithSchema(s)
}

// WithDefaultSchema returns a CDI Spec validator that uses the default
// external JSON schema, or the default builtin one if the external one
// fails to load.
func WithDefaultSchema() func(*raw.Spec) error {
func WithDefaultSchema() func(*cdi.Spec) error {
s, err := schema.Load(DefaultExternalSchema)
if err == nil {
return WithSchema(s)
Expand Down