@@ -13819,8 +13819,6 @@ _openshift_ex_diagnostics()

     flags+=("--context=")

     flags+=("--diaglevel=")

     two_word_flags+=("-l")

-    flags+=("--diagnostics=")

-    two_word_flags+=("-d")

     flags+=("--host")

     flags+=("--images=")

     flags+=("--latest-images")

@@ -27,7 +27,7 @@ This command validates that a configuration file intended to be used for a node

 	valiateNodeConfigExample = ` // Validate node configuration file

   $ %s openshift.local.config/master/node-config.yaml`

-	validateNodeConfigDeprecationMessage = `This command is deprecated and will be removed. Use 'openshift ex diagnostics NodeConfigCheck --node-config=<path/to/config.yaml' instead.`

+	validateNodeConfigDeprecationMessage = `This command is deprecated and will be removed. Use 'openshift ex diagnostics NodeConfigCheck --node-config=path/to/config.yaml' instead.`

 )

 type ValidateNodeConfigOptions struct {

@@ -29,7 +29,7 @@ func (o DiagnosticsOptions) buildClientDiagnostics(rawConfig *clientcmdapi.Confi

 	}

 	diagnostics := []types.Diagnostic{}

-	requestedDiagnostics := intersection(sets.NewString(o.RequestedDiagnostics...), available).List()

+	requestedDiagnostics := available.Intersection(sets.NewString(o.RequestedDiagnostics...)).List()

 	for _, diagnosticName := range requestedDiagnostics {

 		switch diagnosticName {

 		case clientdiags.ConfigContextsName:

@@ -26,7 +26,7 @@ var (

 // buildClusterDiagnostics builds cluster Diagnostic objects if a cluster-admin client can be extracted from the rawConfig passed in.

 // Returns the Diagnostics built, "ok" bool for whether to proceed or abort, and an error if any was encountered during the building of diagnostics.) {

 func (o DiagnosticsOptions) buildClusterDiagnostics(rawConfig *clientcmdapi.Config) ([]types.Diagnostic, bool, error) {

-	requestedDiagnostics := intersection(sets.NewString(o.RequestedDiagnostics...), availableClusterDiagnostics).List()

+	requestedDiagnostics := availableClusterDiagnostics.Intersection(sets.NewString(o.RequestedDiagnostics...)).List()

 	if len(requestedDiagnostics) == 0 { // no diagnostics to run here

 		return nil, true, nil // don't waste time on discovery

 	}

@@ -77,8 +77,8 @@ you will receive an error if they are not found. For example:

 * If a client config file is not found, client and cluster diagnostics

   are skipped.

-Diagnostics may be individually run with --diagnostics. The available

-diagnostic names are:

+Diagnostics may be individually run by passing diagnostic name as arguments.

+The available diagnostic names are:

 %[2]s

 NOTE: This is a beta version of diagnostics and may still evolve in a

@@ -96,9 +96,11 @@ func NewCommandDiagnostics(name string, fullName string, out io.Writer) *cobra.C

 	cmd := &cobra.Command{

 		Use:   name,

 		Short: "This utility helps you troubleshoot and diagnose.",

-		Long:  fmt.Sprintf(longDescription, fullName, strings.Join(availableDiagnostics().List(), ",")),

+		Long:  fmt.Sprintf(longDescription, fullName, strings.Join(availableDiagnostics().List(), " ")),

 		Run: func(c *cobra.Command, args []string) {

-			kcmdutil.CheckErr(o.Complete())

+			kcmdutil.CheckErr(o.Complete(args))

+

+			kcmdutil.CheckErr(o.Validate())

 			failed, err, warnCount, errorCount := o.RunDiagnostics()

 			o.Logger.Summary(warnCount, errorCount)

@@ -125,45 +127,48 @@ func NewCommandDiagnostics(name string, fullName string, out io.Writer) *cobra.C

 	cmd.Flags().BoolVar(&o.PreventModification, options.FlagPreventModificationName, false, "May be set to prevent diagnostics making any changes via the API")

 	flagtypes.GLog(cmd.Flags())

 	options.BindLoggerOptionFlags(cmd.Flags(), o.LogOptions, options.RecommendedLoggerOptionFlags())

-	options.BindDiagnosticFlag(cmd.Flags(), &o.RequestedDiagnostics, options.NewRecommendedDiagnosticFlag())

 	return cmd

 }

 // Complete fills in DiagnosticsOptions needed if the command is actually invoked.

-func (o *DiagnosticsOptions) Complete() error {

+func (o *DiagnosticsOptions) Complete(args []string) error {

 	var err error

 	o.Logger, err = o.LogOptions.NewLogger()

 	if err != nil {

 		return err

 	}

-	return nil

-}

+	// If not given master/client config file locations, check if the defaults exist

+	// and adjust the options accordingly:

+	if len(o.MasterConfigLocation) == 0 {

+		if _, err := os.Stat(StandardMasterConfigPath); !os.IsNotExist(err) {

+			o.MasterConfigLocation = StandardMasterConfigPath

+		}

+	}

+	if len(o.NodeConfigLocation) == 0 {

+		if _, err := os.Stat(StandardNodeConfigPath); !os.IsNotExist(err) {

+			o.NodeConfigLocation = StandardNodeConfigPath

+		}

+	}

-func availableDiagnostics() sets.String {

-	available := sets.NewString()

-	available.Insert(availableClientDiagnostics.List()...)

-	available.Insert(availableClusterDiagnostics.List()...)

-	available.Insert(availableHostDiagnostics.List()...)

-	return available

+	o.RequestedDiagnostics = append(o.RequestedDiagnostics, args...)

+	if len(o.RequestedDiagnostics) == 0 {

+		o.RequestedDiagnostics = availableDiagnostics().List()

+	}

+

+	return nil

 }

-// RunDiagnostics builds diagnostics based on the options and executes them, returning a summary.

-func (o DiagnosticsOptions) RunDiagnostics() (bool, error, int, int) {

-	failed := false

-	warnings := []error{}

-	errors := []error{}

-	diagnostics := []types.Diagnostic{}

+func (o *DiagnosticsOptions) Validate() error {

 	available := availableDiagnostics()

-	if len(o.RequestedDiagnostics) == 0 {

-		o.RequestedDiagnostics = available.List()

-	} else if common := intersection(sets.NewString(o.RequestedDiagnostics...), available); len(common) == 0 {

+

+	if common := available.Intersection(sets.NewString(o.RequestedDiagnostics...)); len(common) == 0 {

 		o.Logger.Error("CED3012", log.EvalTemplate("CED3012", "None of the requested diagnostics are available:\n  {{.requested}}\nPlease try from the following:\n  {{.available}}",

 			log.Hash{"requested": o.RequestedDiagnostics, "available": available.List()}))

-		return false, fmt.Errorf("No requested diagnostics available"), 0, 1

+		return fmt.Errorf("No requested diagnostics are available: requested=%s available=%s", strings.Join(o.RequestedDiagnostics, " "), strings.Join(available.List(), " "))

+

 	} else if len(common) < len(o.RequestedDiagnostics) {

-		errors = append(errors, fmt.Errorf("Not all requested diagnostics are available"))

 		o.Logger.Error("CED3013", log.EvalTemplate("CED3013", `

 Of the requested diagnostics:

     {{.requested}}

@@ -172,21 +177,31 @@ only these are available:

 The list of all possible is:

     {{.available}}

 		`, log.Hash{"requested": o.RequestedDiagnostics, "common": common.List(), "available": available.List()}))

-	}

-	// If not given master/client config file locations, check if the defaults exist

-	// and adjust the options accordingly:

-	if len(o.MasterConfigLocation) == 0 {

-		if _, err := os.Stat(StandardMasterConfigPath); !os.IsNotExist(err) {

-			o.MasterConfigLocation = StandardMasterConfigPath

-		}

-	}

-	if len(o.NodeConfigLocation) == 0 {

-		if _, err := os.Stat(StandardNodeConfigPath); !os.IsNotExist(err) {

-			o.NodeConfigLocation = StandardNodeConfigPath

-		}

+		return fmt.Errorf("Not all requested diagnostics are available: missing=%s requested=%s available=%s",

+			strings.Join(sets.NewString(o.RequestedDiagnostics...).Difference(available).List(), " "),

+			strings.Join(o.RequestedDiagnostics, " "),

+			strings.Join(available.List(), " "))

 	}

+	return nil

+}

+

+func availableDiagnostics() sets.String {

+	available := sets.NewString()

+	available.Insert(availableClientDiagnostics.List()...)

+	available.Insert(availableClusterDiagnostics.List()...)

+	available.Insert(availableHostDiagnostics.List()...)

+	return available

+}

+

+// RunDiagnostics builds diagnostics based on the options and executes them, returning a summary.

+func (o DiagnosticsOptions) RunDiagnostics() (bool, error, int, int) {

+	failed := false

+	warnings := []error{}

+	errors := []error{}

+	diagnostics := []types.Diagnostic{}

+

 	func() { // don't trust discovery/build of diagnostics; wrap panic nicely in case of developer error

 		defer func() {

 			if r := recover(); r != nil {

@@ -283,14 +298,3 @@ func (o DiagnosticsOptions) Run(diagnostics []types.Diagnostic) (bool, error, in

 	}

 	return errorCount > 0, nil, warnCount, errorCount

 }

-

-// TODO move upstream

-func intersection(s1 sets.String, s2 sets.String) sets.String {

-	result := sets.NewString()

-	for key := range s1 {

-		if s2.Has(key) {

-			result.Insert(key)

-		}

-	}

-	return result

-}

@@ -19,7 +19,7 @@ var (

 // buildHostDiagnostics builds host Diagnostic objects based on the host environment.

 // Returns the Diagnostics built, "ok" bool for whether to proceed or abort, and an error if any was encountered during the building of diagnostics.) {

 func (o DiagnosticsOptions) buildHostDiagnostics() ([]types.Diagnostic, bool, error) {

-	requestedDiagnostics := intersection(sets.NewString(o.RequestedDiagnostics...), availableHostDiagnostics).List()

+	requestedDiagnostics := availableHostDiagnostics.Intersection(sets.NewString(o.RequestedDiagnostics...)).List()

 	if len(requestedDiagnostics) == 0 { // no diagnostics to run here

 		return nil, true, nil // don't waste time on discovery

 	}

@@ -22,13 +22,3 @@ func RecommendedLoggerOptionFlags() LoggerOptionFlags {

 func BindLoggerOptionFlags(cmdFlags *pflag.FlagSet, loggerOptions *log.LoggerOptions, flags LoggerOptionFlags) {

 	flags.Level.BindIntFlag(cmdFlags, &loggerOptions.Level)

 }

-

-// NewRecommendedDiagnosticFlag provides default overrideable Diagnostic flag specifications to be bound to options.

-func NewRecommendedDiagnosticFlag() FlagInfo {

-	return FlagInfo{FlagDiagnosticsName, "d", "", `Comma-separated list of diagnostic names to run, e.g. "AnalyzeLogs"`}

-}

-

-// BindLoggerOptionFlags binds a flag on a diagnostics command per the flagInfo.

-func BindDiagnosticFlag(cmdFlags *pflag.FlagSet, diagnostics *[]string, flagInfo FlagInfo) {

-	flagInfo.BindListFlag(cmdFlags, diagnostics)

-}

@@ -48,7 +48,6 @@ const (

 	FlagMasterConfigName        = "master-config"

 	FlagNodeConfigName          = "node-config"

 	FlagClusterContextName      = "cluster-context"

-	FlagDiagnosticsName         = "diagnostics"

 	FlagLevelName               = "diaglevel"

 	FlagIsHostName              = "host"

 	FlagImageTemplateName       = "images"

@@ -53,7 +53,7 @@ func NewCommandPodDiagnostics(name string, out io.Writer) *cobra.Command {

 		Short: "Within a pod, run pod diagnostics",

 		Long:  fmt.Sprintf(longPodDiagDescription),

 		Run: func(c *cobra.Command, args []string) {

-			kcmdutil.CheckErr(o.Complete())

+			kcmdutil.CheckErr(o.Complete(args))

 			failed, err, warnCount, errorCount := o.BuildAndRunDiagnostics()

 			o.Logger.Summary(warnCount, errorCount)

@@ -68,19 +68,23 @@ func NewCommandPodDiagnostics(name string, out io.Writer) *cobra.Command {

 	cmd.SetOutput(out) // for output re: usage / help

 	options.BindLoggerOptionFlags(cmd.Flags(), o.LogOptions, options.RecommendedLoggerOptionFlags())

-	options.BindDiagnosticFlag(cmd.Flags(), &o.RequestedDiagnostics, options.NewRecommendedDiagnosticFlag())

 	return cmd

 }

 // Complete fills in PodDiagnosticsOptions needed if the command is actually invoked.

-func (o *PodDiagnosticsOptions) Complete() error {

+func (o *PodDiagnosticsOptions) Complete(args []string) error {

 	var err error

 	o.Logger, err = o.LogOptions.NewLogger()

 	if err != nil {

 		return err

 	}

+	o.RequestedDiagnostics = append(o.RequestedDiagnostics, args...)

+	if len(o.RequestedDiagnostics) == 0 {

+		o.RequestedDiagnostics = availablePodDiagnostics.List()

+	}

+

 	return nil

 }

@@ -196,7 +200,7 @@ func determineRequestedDiagnostics(available []string, requested []string, logge

 	diagnostics := []string{}

 	if len(requested) == 0 { // not specified, use the available list

 		diagnostics = available

-	} else if diagnostics = intersection(sets.NewString(requested...), sets.NewString(available...)).List(); len(diagnostics) == 0 {

+	} else if diagnostics = sets.NewString(requested...).Intersection(sets.NewString(available...)).List(); len(diagnostics) == 0 {

 		logger.Error("CED6001", log.EvalTemplate("CED6001", "None of the requested diagnostics are available:\n  {{.requested}}\nPlease try from the following:\n  {{.available}}",

 			log.Hash{"requested": requested, "available": available}))

 		return fmt.Errorf("No requested diagnostics available"), diagnostics

@@ -9,7 +9,7 @@ source "${OS_ROOT}/hack/util.sh"

 source "${OS_ROOT}/hack/cmd_util.sh"

 os::log::install_errexit

-# Cleanup cluster resources created by this test

+#Cleanup cluster resources created by this test

 (

   set +e

   oc delete project/example project/ui-test-project project/recreated-project

@@ -300,3 +300,8 @@ os::cmd::expect_success_and_not_text "oc get clusterrolebindings/cluster-admins

 os::cmd::expect_success_and_not_text "oc get rolebindings/cluster-admin         --output-version=v1 --template='{{.subjects}}' -n default" 'cascaded-group'

 os::cmd::expect_success_and_not_text "oc get scc/restricted                     --output-version=v1 --template='{{.groups}}'"              'cascaded-group'

 echo "user-group-cascade: ok"

+

+

+os::cmd::expect_failure_and_text 'openshift ex diagnostics FakeDiagnostic AlsoMissing' 'No requested diagnostics are available: requested=FakeDiagnostic AlsoMissing'

+os::cmd::expect_failure_and_text 'openshift ex diagnostics AnalyzeLogs AlsoMissing' 'Not all requested diagnostics are available: missing=AlsoMissing requested=AnalyzeLogs AlsoMissing available='

+echo "diagnostics: ok"