Merge pull request #18 from manifoldco/jelmer-go-manifold-integrations

Use go-manifold integration package for integrations.

Gopkg.toml

@@ -4,4 +4,4 @@
 
 [[constraint]]
   name = "github.com/manifoldco/go-manifold"
-  version = "0.8.5"
+  version = "v0.9.0"

manifold/client.go

@@ -2,12 +2,12 @@ package manifold
 
 import (
 	manifold "github.com/manifoldco/go-manifold"
-	"github.com/manifoldco/kubernetes-credentials/helpers/client"
+	"github.com/manifoldco/go-manifold/integrations"
 )
 
-func newWrapper(team string, cfgs ...manifold.ConfigFunc) (*client.Client, error) {
+func newWrapper(team string, cfgs ...manifold.ConfigFunc) (*integrations.Client, error) {
 	cl := manifold.New(cfgs...)
-	kube, err := client.New(cl, func(s string) *string { return &s }(team))
+	kube, err := integrations.NewClient(cl, func(s string) *string { return &s }(team))
 	if err != nil {
 		return nil, err
 	}

manifold/data_source_manifold_project.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/manifoldco/kubernetes-credentials/helpers/client"
+	"github.com/manifoldco/go-manifold/integrations"
 )
 
 func dataSourceManifoldProject() *schema.Resource {
@@ -70,7 +70,7 @@ func dataSourceManifoldProject() *schema.Resource {
 }
 
 func dataSourceManifoldProjectRead(d *schema.ResourceData, meta interface{}) error {
-	cl := meta.(*client.Client)
+	cl := meta.(*integrations.Client)
 	ctx := context.Background()
 
 	projectLabel, projectID, err := getProjectInformation(cl, d.Get("project").(string), true)
@@ -79,14 +79,14 @@ func dataSourceManifoldProjectRead(d *schema.ResourceData, meta interface{}) err
 	}
 
 	resourceList := d.Get("resource").(*schema.Set).List()
-	filteredResources := resourceSpecsFromList(resourceList)
+	filteredResources := resourcesFromList(resourceList)
 
 	cv, err := cl.GetResourcesCredentialValues(ctx, projectLabel, filteredResources)
 	if err != nil {
 		return err
 	}
 
-	credMap, err := client.FlattenResourcesCredentialValues(cv)
+	credMap, err := integrations.FlattenResourcesCredentialValues(cv)
 	if err != nil {
 		return err
 	}

manifold/data_source_manifold_resource.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/manifoldco/kubernetes-credentials/helpers/client"
-	"github.com/manifoldco/kubernetes-credentials/primitives"
+	"github.com/manifoldco/go-manifold/integrations"
+	"github.com/manifoldco/go-manifold/integrations/primitives"
 )
 
 func dataSourceManifoldResource() *schema.Resource {
@@ -62,17 +62,17 @@ func dataSourceManifoldResource() *schema.Resource {
 }
 
 func dataSourceManifoldResourceRead(d *schema.ResourceData, meta interface{}) error {
-	cl := meta.(*client.Client)
+	cl := meta.(*integrations.Client)
 	ctx := context.Background()
 
 	projectLabel, _, err := getProjectInformation(cl, d.Get("project").(string), false)
 	if err != nil {
 		return err
 	}
 
-	rs := &primitives.ResourceSpec{
+	rs := &primitives.Resource{
 		Name:        d.Get("resource").(string),
-		Credentials: credentialSpecsFromList(d.Get("credential").(*schema.Set).List()),
+		Credentials: credentialsFromList(d.Get("credential").(*schema.Set).List()),
 	}
 	resource, err := cl.GetResource(ctx, projectLabel, rs)
 	if err != nil {
@@ -84,7 +84,7 @@ func dataSourceManifoldResourceRead(d *schema.ResourceData, meta interface{}) er
 		return err
 	}
 
-	credMap, err := client.FlattenResourceCredentialValues(cv)
+	credMap, err := integrations.FlattenResourceCredentialValues(cv)
 	if err != nil {
 		return err
 	}