new-app: verify if API has required resources enabled

Author: Jan Wozniak

Diff for: pkg/oc/cli/cmd/newapp.go

@@ -20,9 +20,11 @@ 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"
+	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
@@ -154,6 +156,50 @@ type NewAppOptions struct {
 	*ObjectGeneratorOptions
 }
 
+func nonEmpty(str string, def string) string {
+	if str == "" {
+		return def
+	}
+	return str
+}
+
+func checkResources(discoveryClient discovery.DiscoveryInterface, items []runtime.Object) error {
+	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 {
+			listGv, _ := schema.ParseGroupVersion(resourceList.GroupVersion)
+			gvk := schema.GroupVersionKind{
+				Group:   nonEmpty(resource.Group, listGv.Group),
+				Version: nonEmpty(resource.Version, listGv.Version),
+				Kind:    resource.Kind,
+			}
+			resourceMap[gvk] = true
+		}
+	}
+
+	declaredResources := make(map[schema.GroupVersionKind]bool)
+	for _, item := range items {
+		versioned := kcmdutil.AsDefaultVersionedOrOriginal(item, nil)
+		declaredResources[versioned.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 {
+		return fmt.Errorf("Missing declared resources: %v", strings.Join(missingResources, `, `))
+	}
+	return nil
+}
+
 //Complete sets all common default options for commands (new-app and new-build)
 func (o *ObjectGeneratorOptions) Complete(baseName, commandName string, f kcmdutil.Factory, c *cobra.Command, args []string, in io.Reader, out, errout io.Writer) error {
 	cmdutil.WarnAboutCommaSeparation(errout, o.Config.Environment, "--env")
@@ -184,6 +230,12 @@ func (o *ObjectGeneratorOptions) Complete(baseName, commandName string, f kcmdut
 		return err
 	}
 
+	discoveryClient, err := discovery.NewDiscoveryClientForConfig(clientConfig)
+	if err != nil {
+		return fmt.Errorf("Unable to validate if required resources are available: %v", err)
+	}
+	o.Config.DiscoveryClient = discoveryClient
+
 	o.Action.Out, o.Action.ErrOut = out, o.ErrOut
 	o.Action.Bulk.Scheme = legacyscheme.Scheme
 	o.Action.Bulk.Op = bulk.Creator{Client: dynamicClient, RESTMapper: mapper}.Create
@@ -307,6 +359,9 @@ 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 {
+		return err
+	}
 
 	// set labels explicitly supplied by the user on the command line
 	if err := setLabels(config.Labels, result); err != nil {

Diff for: pkg/oc/generate/cmd/newapp.go

@@ -18,6 +18,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	kutilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/client-go/discovery"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/apis/core/validation"
 	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -114,10 +115,11 @@ type AppConfig struct {
 	Out    io.Writer
 	ErrOut io.Writer
 
-	KubeClient     kclientset.Interface
-	ImageClient    imageclient.ImageInterface
-	RouteClient    routeclient.RouteInterface
-	TemplateClient templateclient.TemplateInterface
+	KubeClient      kclientset.Interface
+	ImageClient     imageclient.ImageInterface
+	RouteClient     routeclient.RouteInterface
+	TemplateClient  templateclient.TemplateInterface
+	DiscoveryClient discovery.DiscoveryInterface
 
 	Resolvers