cmd/initContainer: Unbreak application of CDI hooks for NVIDIA

NVIDIA Container Toolkit 0.16.0 changed the hook arguments in the
Container Device Interface specification generated by it [1].

Fallout from 649d02f

[1] NVIDIA Container Toolkit commit 179d8655f9b5fce6
    NVIDIA/nvidia-container-toolkit@179d8655f9b5fce6
    NVIDIA/nvidia-container-toolkit#435

Author: debarshiray

src/cmd/initContainer.go

@@ -474,10 +474,9 @@ func applyCDISpecForNvidia(spec *specs.Spec) error {
 			continue
 		}
 
-		if len(hook.Args) < 3 ||
-			hook.Args[0] != "nvidia-ctk" ||
-			hook.Args[1] != "hook" ||
-			hook.Args[2] != "update-ldcache" {
+		if len(hook.Args) < 2 ||
+			hook.Args[0] != "nvidia-cdi-hook" ||
+			hook.Args[1] != "update-ldcache" {
 			logrus.Debug("Applying Container Device Interface for NVIDIA: unknown hook arguments:")
 			for _, arg := range hook.Args {
 				logrus.Debugf("%s", arg)
@@ -488,7 +487,7 @@ func applyCDISpecForNvidia(spec *specs.Spec) error {
 
 		var folderFlag bool
 		var folders []string
-		hookArgs := hook.Args[3:]
+		hookArgs := hook.Args[2:]
 
 		for _, hookArg := range hookArgs {
 			if hookArg == "--folder" {

test/system/230-cdi.bats

@@ -280,7 +280,7 @@ teardown() {
   assert [ ${#stderr_lines[@]} -eq 0 ]
 }
 
-@test "cdi: Try hook with unknown args (a)" {
+@test "cdi: Try hook with unknown args" {
   local toolbx_runtime_directory="$XDG_RUNTIME_DIR/toolbox"
 
   create_default_container
@@ -309,35 +309,6 @@ teardown() {
   assert [ ${#stderr_lines[@]} -eq 0 ]
 }
 
-@test "cdi: Try hook with unknown args (b)" {
-  local toolbx_runtime_directory="$XDG_RUNTIME_DIR/toolbox"
-
-  create_default_container
-
-  # shellcheck disable=SC2174
-  mkdir --mode 700 --parents "$toolbx_runtime_directory"
-
-  cp "$BATS_TEST_DIRNAME/data/cdi-hooks-13.json" "$toolbx_runtime_directory/cdi-nvidia.json"
-  chmod 644 "$toolbx_runtime_directory/cdi-nvidia.json"
-
-  run --keep-empty-lines --separate-stderr "$TOOLBX" run \
-    test /etc/ld.so.cache -ot "$toolbx_runtime_directory/cdi-nvidia.json"
-
-  if ! cmp --silent "$BATS_TEST_DIRNAME/data/cdi-hooks-13.json" "$toolbx_runtime_directory/cdi-nvidia.json"; then
-    skip "found NVIDIA hardware"
-  fi
-
-  assert_success
-  assert [ ${#lines[@]} -eq 0 ]
-  assert [ ${#stderr_lines[@]} -eq 0 ]
-
-  run --keep-empty-lines --separate-stderr "$TOOLBX" run test -e /etc/ld.so.conf.d/toolbx-nvidia.conf
-
-  assert_failure
-  assert [ ${#lines[@]} -eq 0 ]
-  assert [ ${#stderr_lines[@]} -eq 0 ]
-}
-
 @test "cdi: Try hook with invalid name" {
   local toolbx_runtime_directory="$XDG_RUNTIME_DIR/toolbox"
 

test/system/data/cdi-hooks-00.json

@@ -3,12 +3,11 @@
     "hooks": [
       {
         "args": [
-          "nvidia-ctk",
-          "hook",
+          "nvidia-cdi-hook",
           "update-ldcache"
         ],
         "hookName": "createContainer",
-        "path": "/usr/bin/nvidia-ctk"
+        "path": "/usr/bin/nvidia-cdi-hook"
       }
     ]
   }

test/system/data/cdi-hooks-01.json

@@ -3,14 +3,13 @@
     "hooks": [
       {
         "args": [
-          "nvidia-ctk",
-          "hook",
+          "nvidia-cdi-hook",
           "update-ldcache",
           "--folder",
           "/usr/lib64"
         ],
         "hookName": "createContainer",
-        "path": "/usr/bin/nvidia-ctk"
+        "path": "/usr/bin/nvidia-cdi-hook"
       }
     ]
   }

test/system/data/cdi-hooks-02.json

@@ -3,16 +3,15 @@
     "hooks": [
       {
         "args": [
-          "nvidia-ctk",
-          "hook",
+          "nvidia-cdi-hook",
           "update-ldcache",
           "--folder",
           "/usr/lib",
           "--folder",
           "/usr/lib64"
         ],
         "hookName": "createContainer",
-        "path": "/usr/bin/nvidia-ctk"
+        "path": "/usr/bin/nvidia-cdi-hook"
       }
     ]
   }

test/system/data/cdi-hooks-10.json

@@ -3,8 +3,7 @@
     "hooks": [
       {
         "args": [
-          "nvidia-ctk",
-          "hook",
+          "nvidia-cdi-hook",
           "update-ldcache"
         ],
         "hookName": "createContainer",

test/system/data/cdi-hooks-11.json

@@ -4,7 +4,6 @@
       {
         "args": [
           "unknown",
-          "hook",
           "update-ldcache"
         ],
         "hookName": "createContainer",

test/system/data/cdi-hooks-12.json

@@ -3,12 +3,11 @@
     "hooks": [
       {
         "args": [
-          "nvidia-ctk",
-          "unknown",
-          "update-ldcache"
+          "nvidia-cdi-hook",
+          "unknown"
         ],
         "hookName": "createContainer",
-        "path": "/usr/bin/nvidia-ctk"
+        "path": "/usr/bin/nvidia-cdi-hook"
       }
     ]
   }

test/system/data/cdi-hooks-13.json

@@ -3,12 +3,11 @@
     "hooks": [
       {
         "args": [
-          "nvidia-ctk",
-          "hook",
+          "nvidia-cdi-hook",
           "update-ldcache"
         ],
         "hookName": "invalid",
-        "path": "/usr/bin/nvidia-ctk"
+        "path": "/usr/bin/nvidia-cdi-hook"
       }
     ]
   }