Merge pull request #88 from richardcase/interfaces

Use AWS Service interfaces

pkg/eks/api.go

@@ -13,9 +13,13 @@ import (
 	"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/cloudformation"
+	"github.com/aws/aws-sdk-go/service/cloudformation/cloudformationiface"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/aws/aws-sdk-go/service/eks"
+	"github.com/aws/aws-sdk-go/service/eks/eksiface"
 	"github.com/aws/aws-sdk-go/service/sts"
+	"github.com/aws/aws-sdk-go/service/sts/stsiface"
 
 	"github.com/kubicorn/kubicorn/pkg/logger"
 )
@@ -31,10 +35,10 @@ type ClusterProvider struct {
 }
 
 type providerServices struct {
-	cfn *cloudformation.CloudFormation
-	eks *eks.EKS
-	ec2 *ec2.EC2
-	sts *sts.STS
+	cfn cloudformationiface.CloudFormationAPI
+	eks eksiface.EKSAPI
+	ec2 ec2iface.EC2API
+	sts stsiface.STSAPI
 	arn string
 }
 

pkg/eks/auth.go

@@ -11,6 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/sts"
+	"github.com/aws/aws-sdk-go/service/sts/stsiface"
 
 	"github.com/heptio/authenticator/pkg/token"
 	"github.com/kubicorn/kubicorn/pkg/logger"
@@ -79,7 +80,7 @@ type ClientConfig struct {
 	Client  *clientcmdapi.Config
 	Cluster *ClusterConfig
 	roleARN string
-	sts     *sts.STS
+	sts     stsiface.STSAPI
 }
 
 // based on "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
@@ -144,7 +145,7 @@ func (c *ClientConfig) WithEmbeddedToken() (*ClientConfig, error) {
 		return nil, errors.Wrap(err, "could not get token generator")
 	}
 
-	tok, err := gen.GetWithSTS(c.Cluster.ClusterName, c.sts)
+	tok, err := gen.GetWithSTS(c.Cluster.ClusterName, c.sts.(*sts.STS))
 	if err != nil {
 		return nil, errors.Wrap(err, "could not get token")
 	}