Externalize graph library

Author: soltysh

pkg/oc/lib/describe/chaindescriber.go

@@ -13,8 +13,8 @@ import (
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	buildclient "github.com/openshift/origin/pkg/build/generated/internalclientset/typed/build/internalversion"
-	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	imagev1 "github.com/openshift/api/image/v1"
+	buildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
 	buildedges "github.com/openshift/origin/pkg/oc/lib/graph/buildgraph"
 	buildanalysis "github.com/openshift/origin/pkg/oc/lib/graph/buildgraph/analysis"
 	buildgraph "github.com/openshift/origin/pkg/oc/lib/graph/buildgraph/nodes"
@@ -38,14 +38,14 @@ func (e NotFoundErr) Error() string {
 // ChainDescriber generates extended information about a chain of
 // dependencies of an image stream
 type ChainDescriber struct {
-	c            buildclient.BuildConfigsGetter
+	c            buildv1client.BuildConfigsGetter
 	namespaces   sets.String
 	outputFormat string
 	namer        osgraph.Namer
 }
 
 // NewChainDescriber returns a new ChainDescriber
-func NewChainDescriber(c buildclient.BuildConfigsGetter, namespaces sets.String, out string) *ChainDescriber {
+func NewChainDescriber(c buildv1client.BuildConfigsGetter, namespaces sets.String, out string) *ChainDescriber {
 	return &ChainDescriber{c: c, namespaces: namespaces, outputFormat: out, namer: namespacedFormatter{hideNamespace: true}}
 }
 
@@ -81,7 +81,7 @@ func (d *ChainDescriber) MakeGraph() (osgraph.Graph, error) {
 // image stream tag (name:tag) in namespace. Namespace is needed here
 // because image stream tags with the same name can be found across
 // different namespaces.
-func (d *ChainDescriber) Describe(ist *imageapi.ImageStreamTag, includeInputImages, reverse bool) (string, error) {
+func (d *ChainDescriber) Describe(ist *imagev1.ImageStreamTag, includeInputImages, reverse bool) (string, error) {
 	g, err := d.MakeGraph()
 	if err != nil {
 		return "", err

pkg/oc/lib/describe/chaindescriber_test.go

@@ -10,9 +10,9 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
-	buildfakeclient "github.com/openshift/origin/pkg/build/generated/internalclientset/fake"
+	fakebuildclient "github.com/openshift/client-go/build/clientset/versioned/fake"
+	fakebuildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1/fake"
 	buildclientscheme "github.com/openshift/origin/pkg/build/generated/internalclientset/scheme"
 	imagegraph "github.com/openshift/origin/pkg/oc/lib/graph/imagegraph/nodes"
 )
@@ -203,16 +203,16 @@ func TestChainDescriber(t *testing.T) {
 			objs := []runtime.Object{}
 			if len(test.path) > 0 {
 				var err error
-				objs, err = readObjectsFromPath(test.path, test.defaultNamespace, legacyscheme.Codecs.UniversalDecoder(), legacyscheme.Scheme)
+				objs, err = readObjectsFromPath(test.path, test.defaultNamespace)
 				if err != nil {
 					t.Fatal(err)
 				}
 			}
 			ist := imagegraph.MakeImageStreamTagObjectMeta(test.defaultNamespace, test.name, test.tag)
 
-			fakeClient := buildfakeclient.NewSimpleClientset(filterByScheme(buildclientscheme.Scheme, objs...)...)
+			fakeClient := &fakebuildv1client.FakeBuildV1{Fake: &(fakebuildclient.NewSimpleClientset(filterByScheme(buildclientscheme.Scheme, objs...)...).Fake)}
 
-			desc, err := NewChainDescriber(fakeClient.Build(), test.namespaces, test.output).Describe(ist, test.includeInputImg, test.reverse)
+			desc, err := NewChainDescriber(fakeClient, test.namespaces, test.output).Describe(ist, test.includeInputImg, test.reverse)
 			t.Logf("%s: output:\n%s\n\n", test.testName, desc)
 			if err != test.expectedErr {
 				t.Fatalf("%s: error mismatch: expected %v, got %v", test.testName, test.expectedErr, err)

pkg/oc/lib/describe/deployments.go

@@ -25,7 +25,6 @@ import (
 	appsv1 "github.com/openshift/api/apps/v1"
 	appstypedclient "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
 	"github.com/openshift/origin/pkg/api/legacy"
-	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	appsutil "github.com/openshift/origin/pkg/apps/util"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	appsedges "github.com/openshift/origin/pkg/oc/lib/graph/appsgraph"
@@ -494,19 +493,9 @@ func (d *LatestDeploymentsDescriber) Describe(namespace, name string) (string, e
 	}
 
 	g := genericgraph.New()
-	// TODO: Remove conversion when we move the appsgraph to external types
-	internalConfig := &appsapi.DeploymentConfig{}
-	if err := legacyscheme.Scheme.Convert(config, internalConfig, nil); err != nil {
-		return "", fmt.Errorf("conversion error: %v", err)
-	}
-	dcNode := appsgraph.EnsureDeploymentConfigNode(g, internalConfig)
+	dcNode := appsgraph.EnsureDeploymentConfigNode(g, config)
 	for i := range deployments {
-		// TODO: Remove when kubegraph use external types
-		internalDeployment := &kapi.ReplicationController{}
-		if err := legacyscheme.Scheme.Convert(&deployments[i], internalDeployment, nil); err != nil {
-			return "", fmt.Errorf("conversion error: %v", err)
-		}
-		kubegraph.EnsureReplicationControllerNode(g, internalDeployment)
+		kubegraph.EnsureReplicationControllerNode(g, &deployments[i])
 	}
 	appsedges.AddTriggerDeploymentConfigsEdges(g, dcNode)
 	appsedges.AddDeploymentConfigsDeploymentEdges(g, dcNode)