Skip to content

cmd/cdi: respect the --spec-dirs flag #325

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

Open
marquiz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

cmd/cdi: respect the --spec-dirs flag #325

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
3 changes: 1 addition & 2 deletions cmd/cdi/cmd/cdi-api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,13 @@ func cdiInjectDevices(format string, ociSpec *oci.Spec, patterns []string) error

func cdiResolveDevices(ociSpecFiles ...string) error {
var (
cache *cdi.Cache
cache = cdi.GetDefaultCache()
ociSpec *oci.Spec
devices []string
unresolved []string
err error
)

cache, _ = cdi.NewCache()

for _, ociSpecFile := range ociSpecFiles {
ociSpec, err = readOCISpec(ociSpecFile)
Expand Down
11 changes: 2 additions & 9 deletions cmd/cdi/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,8 @@ func initSpecDirs() {
cdi.SetSpecValidator(schema.WithSchema(s))

if len(specDirs) > 0 {
cache, err := cdi.NewCache(
cdi.WithSpecDirs(specDirs...),
)
if err != nil {
fmt.Printf("failed to create CDI cache: %v\n", err)
os.Exit(1)
}
if len(cache.GetErrors()) > 0 {
cdiPrintCacheErrors()
if err := cdi.Configure(cdi.WithSpecDirs(specDirs...)); err != nil {

@klihub klihub Jul 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we now still print any cache errors after this change ? If not then we should readd/do it here IMO (without bailing out on errors).

@marquiz marquiz Jul 16, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Depends on the sub-command. For validate, yes we do.

But the main idea I had is, work the same way independent whether we use the default spec dirs or user-specified spec dirs.

fmt.Printf("failed to configure CDI cache: %v\n", err)
os.Exit(1)
}
}
Expand Down
Loading