Check CNAB for action before call inspect

Checks the CNAB for the docker app inspect action before attempting to
call inspect. If the action is not defined then inspect the CNAB bundle
directly.

Refactors the `hasAction` func to just check for the key instead of
looping through the map.

Signed-off-by: Nick Adcock <nick.adcock@docker.com>

Author: zappy-shu

internal/commands/image/inspect.go

@@ -69,33 +69,35 @@ func runInspect(dockerCli command.Cli, appname string, opts inspectOptions) erro
 	if err != nil {
 		return err
 	}
-	installation, err := appstore.NewInstallation("custom-action", ref.String(), bndl)
-	if err != nil {
-		return err
-	}
-	driverImpl, errBuf, err := cnab.SetupDriver(installation, dockerCli, opts.InstallerContextOptions, os.Stdout)
-	if err != nil {
-		return err
-	}
-	a := &action.RunCustom{
-		Action: internal.ActionInspectName,
-		Driver: driverImpl,
-	}
 
 	format := "json"
 	if opts.pretty {
 		format = "pretty"
 	}
 
-	installation.SetParameter(internal.ParameterInspectFormatName, format)
-
-	err = a.Run(&installation.Claim, nil)
-	if err == action.ErrUndefinedAction {
-		err = inspect.ImageInspectCNAB(os.Stdout, bndl.Bundle, format)
+	installation, err := appstore.NewInstallation("custom-action", ref.String(), bndl)
+	if err != nil {
+		return err
 	}
 
-	if err != nil {
-		return fmt.Errorf("inspect failed: %s\n%s", err, errBuf)
+	if _, hasAction := installation.Bundle.Actions[internal.ActionInspectName]; hasAction {
+		driverImpl, errBuf, err := cnab.SetupDriver(installation, dockerCli, opts.InstallerContextOptions, os.Stdout)
+		if err != nil {
+			return err
+		}
+		a := &action.RunCustom{
+			Action: internal.ActionInspectName,
+			Driver: driverImpl,
+		}
+
+		installation.SetParameter(internal.ParameterInspectFormatName, format)
+		if err = a.Run(&installation.Claim, nil); err != nil {
+			return fmt.Errorf("inspect failed: %s\n%s", err, errBuf)
+		}
+	} else {
+		if err = inspect.ImageInspectCNAB(os.Stdout, bndl.Bundle, format); err != nil {
+			return fmt.Errorf("inspect failed: %s", err)
+		}
 	}
 	return nil
 }

internal/commands/inspect.go

@@ -132,10 +132,6 @@ func getContextOrchestrator(dockerCli command.Cli, orchestratorFlag string) (com
 }
 
 func hasAction(bndl *bundle.Bundle, actionName string) bool {
-	for key := range bndl.Actions {
-		if key == actionName {
-			return true
-		}
-	}
-	return false
+	_, ok := bndl.Actions[actionName]
+	return ok
 }