WIP: simple BC test only

Author: Jan Wozniak

pkg/oc/cli/cmd/newapp.go

@@ -20,7 +20,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -156,41 +155,33 @@ type NewAppOptions struct {
 	*ObjectGeneratorOptions
 }
 
-func checkResources(discoveryClient discovery.DiscoveryInterface, items []runtime.Object) error {
+func checkBuildEnabled(discoveryClient discovery.DiscoveryInterface, items []runtime.Object) error {
+	hasBC := false
+ItemsLoop:
+	for _, item := range items {
+		switch item.(type) {
+		case *buildapi.BuildConfig:
+			hasBC = true
+			break ItemsLoop
+		}
+	}
+	if !hasBC {
+		return nil
+	}
+
 	resources, err := discoveryClient.ServerResources()
 	if err != nil {
 		return fmt.Errorf("Unable to to get list of available resources: %v", err)
 	}
 
-	resourceMap := make(map[schema.GroupVersionKind]bool)
 	for _, resourceList := range resources {
 		for _, resource := range resourceList.APIResources {
-			gvk := schema.GroupVersionKind{
-				Group:   resource.Group,
-				Version: resource.Version,
-				Kind:    resource.Kind,
+			if resource.Kind == "BuildConfig" {
+				return nil
 			}
-			resourceMap[gvk] = true
 		}
 	}
-
-	declaredResources := make(map[schema.GroupVersionKind]bool)
-	for _, item := range items {
-		declaredResources[item.GetObjectKind().GroupVersionKind()] = true
-	}
-	missingResources := make([]string, 0)
-	for r, _ := range declaredResources {
-		if present := resourceMap[r]; !present {
-			missingResources = append(missingResources, r.String())
-		}
-	}
-
-	if len(missingResources) > 0 {
-		//TODO: ideally here it would have failed but iterating over items makes it to always fail
-		// with "error: Missing declared resources: /, Kind="
-		//return fmt.Errorf("Missing declared resources: %v", strings.Join(missingResources, `, `))
-	}
-	return nil
+	return fmt.Errorf("Missing BuildConfig, enable Build API")
 }
 
 //Complete sets all common default options for commands (new-app and new-build)
@@ -223,9 +214,7 @@ func (o *ObjectGeneratorOptions) Complete(baseName, commandName string, f kcmdut
 		return err
 	}
 
-	mapper, typer := f.Object()
-
-	discoveryClient, err := f.DiscoveryClient()
+	discoveryClient, err := discovery.NewDiscoveryClientForConfig(clientConfig)
 	if err != nil {
 		return fmt.Errorf("Unable to validate if required resources are available: %v", err)
 	}
@@ -354,7 +343,7 @@ func (o *NewAppOptions) RunNewApp() error {
 	if err := handleError(err, o.BaseName, o.CommandName, o.CommandPath, config, transformRunError); err != nil {
 		return err
 	}
-	if err := checkResources(config.DiscoveryClient, result.List.Items); err != nil {
+	if err := checkBuildEnabled(config.DiscoveryClient, result.List.Items); err != nil {
 		return err
 	}