Merge pull request #220 from opendevstack/experiment/parallel-diff

Export resources and process templates concurrently

Author: Michael Sauter

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f
 	golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac
+	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
 	golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 // indirect
 	gopkg.in/yaml.v2 v2.2.1 // indirect
 )

go.sum

@@ -25,6 +25,8 @@ github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac h1:7d7lG9fHOLdL6jZPtnV4LpI41SbohIJ1Atq7U991dMg=
 golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 h1:4y9KwBHBgBNwDbtu44R5o1fdOCQUEXhbk/P4A9WmJq0=
 golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

pkg/commands/diff.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/opendevstack/tailor/pkg/cli"
 	"github.com/opendevstack/tailor/pkg/openshift"
+	"golang.org/x/sync/errgroup"
 )
 
 // Diff prints the drift between desired and current state to STDOUT.
@@ -57,17 +58,31 @@ func calculateChangeset(w io.Writer, compareOptions *cli.CompareOptions, ocClien
 		return updateRequired, &openshift.Changeset{}, err
 	}
 
-	templateBasedList, err := assembleTemplateBasedResourceList(
-		filter,
-		compareOptions,
-		ocClient,
-	)
-	if err != nil {
-		return updateRequired, &openshift.Changeset{}, err
-	}
+	var templateBasedList *openshift.ResourceList
+	var platformBasedList *openshift.ResourceList
 
-	platformBasedList, err := assemblePlatformBasedResourceList(filter, compareOptions, ocClient)
-	if err != nil {
+	eg := new(errgroup.Group)
+	eg.Go(func() error {
+		l, err := assembleTemplateBasedResourceList(
+			filter,
+			compareOptions,
+			ocClient,
+		)
+		if err != nil {
+			return err
+		}
+		templateBasedList = l
+		return nil
+	})
+	eg.Go(func() error {
+		l, err := assemblePlatformBasedResourceList(filter, compareOptions, ocClient)
+		if err != nil {
+			return err
+		}
+		platformBasedList = l
+		return nil
+	})
+	if err := eg.Wait(); err != nil {
 		return updateRequired, &openshift.Changeset{}, err
 	}