GCP CCS command

cmd/ocm/create/cluster/cmd.go

@@ -17,15 +17,19 @@ limitations under the License.
 package cluster
 
 import (
+	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"net"
+	"os"
 	"time"
 
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	"github.com/openshift-online/ocm-cli/pkg/arguments"
+	"github.com/openshift-online/ocm-cli/pkg/cluster"
 	c "github.com/openshift-online/ocm-cli/pkg/cluster"
 	"github.com/openshift-online/ocm-cli/pkg/ocm"
 )
@@ -42,6 +46,7 @@ var args struct {
 	private           bool
 	multiAZ           bool
 	ccs               c.CCS
+	gcpServiceAccount arguments.FilePath
 
 	// Scaling options
 	computeMachineType string
@@ -75,6 +80,12 @@ func init() {
 
 	arguments.AddProviderFlag(fs, &args.provider)
 	arguments.AddCCSFlags(fs, &args.ccs)
+
+	fs.Var(
+		&args.gcpServiceAccount,
+		"service-account-file",
+		"GCP service account JSON file.",
+	)
 	fs.StringVar(
 		&args.region,
 		"region",
@@ -249,6 +260,13 @@ func run(cmd *cobra.Command, argv []string) error {
 		computeNodes = 9
 	}
 
+	if args.gcpServiceAccount != "" {
+		err = constructGCPCredentials(args.gcpServiceAccount, &args.ccs)
+		if err != nil {
+			return err
+		}
+	}
+
 	err = arguments.CheckIgnoredCCSFlags(args.ccs)
 	if err != nil {
 		return err
@@ -313,3 +331,19 @@ func fetchFlavours(client *cmv1.Client) (flavours []*cmv1.Flavour, err error) {
 	}
 	return
 }
+
+func constructGCPCredentials(filePath arguments.FilePath, value *cluster.CCS) error {
+	// Open our jsonFile
+	jsonFile, err := os.Open(filePath.String())
+	if err != nil {
+		return err
+	}
+	defer jsonFile.Close()
+	byteValue, _ := ioutil.ReadAll(jsonFile)
+	err = json.Unmarshal(byteValue, &value.GCP)
+	if err != nil {
+		return err
+	}
+	return nil
+
+}

pkg/arguments/arguments.go

@@ -26,14 +26,33 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/mattn/go-isatty"
+	isatty "github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty"
 	sdk "github.com/openshift-online/ocm-sdk-go"
 	"github.com/spf13/pflag"
 
 	"github.com/openshift-online/ocm-cli/pkg/cluster"
 	"github.com/openshift-online/ocm-cli/pkg/debug"
 )
 
+type FilePath string
+
+func (f *FilePath) String() string {
+	return string(*f)
+}
+
+func (f *FilePath) Set(v string) error {
+	_, err := os.Stat(v)
+	if err != nil {
+		return err
+	}
+	*f = FilePath(v)
+	return nil
+}
+
+func (f *FilePath) Type() string {
+	return "filepath"
+}
+
 // AddDebugFlag adds the '--debug' flag to the given set of command line flags.
 func AddDebugFlag(fs *pflag.FlagSet) {
 	debug.AddFlag(fs)

pkg/cluster/cluster.go

@@ -60,13 +60,27 @@ type Spec struct {
 type CCS struct {
 	Enabled bool
 	AWS     AWSCredentials
+	GCP     GCPCredentials
 }
 type AWSCredentials struct {
 	AccountID       string
 	AccessKeyID     string
 	SecretAccessKey string
 }
 
+type GCPCredentials struct {
+	Type                    string `json:"type"`
+	ProjectID               string `json:"project_id"`
+	PrivateKeyID            string `json:"private_key_id"`
+	PrivateKey              string `json:"private_key"`
+	ClientEmail             string `json:"client_email"`
+	ClientID                string `json:"client_id"`
+	AuthURI                 string `json:"auth_uri"`
+	TokenURI                string `json:"token_uri"`
+	AuthProviderX509CertURL string `json:"auth_provider_x509_cert_url"`
+	ClientX509CertURL       string `json:"client_x509_cert_url"`
+}
+
 type AddOnItem struct {
 	ID        string
 	Name      string
@@ -195,12 +209,30 @@ func CreateCluster(cmv1Client *cmv1.Client, config Spec, dryRun bool) (*cmv1.Clu
 
 	if config.CCS.Enabled {
 		clusterBuilder = clusterBuilder.CCS(cmv1.NewCCS().Enabled(true))
-		clusterBuilder = clusterBuilder.AWS(
-			cmv1.NewAWS().
-				AccountID(config.CCS.AWS.AccountID).
-				AccessKeyID(config.CCS.AWS.AccessKeyID).
-				SecretAccessKey(config.CCS.AWS.SecretAccessKey),
-		)
+		if config.Provider == "AWS" {
+			clusterBuilder = clusterBuilder.AWS(
+				cmv1.NewAWS().
+					AccountID(config.CCS.AWS.AccountID).
+					AccessKeyID(config.CCS.AWS.AccessKeyID).
+					SecretAccessKey(config.CCS.AWS.SecretAccessKey),
+			)
+		} else {
+			clusterBuilder =
+				clusterBuilder.GCP(
+					cmv1.NewGCP().
+						Type(config.CCS.GCP.Type).
+						ProjectID(config.CCS.GCP.ProjectID).
+						PrivateKeyID(config.CCS.GCP.PrivateKeyID).
+						PrivateKey(config.CCS.GCP.PrivateKey).
+						ClientEmail(config.CCS.GCP.ClientEmail).
+						ClientID(config.CCS.GCP.ClientID).
+						AuthURI(config.CCS.GCP.AuthURI).
+						TokenURI(config.CCS.GCP.TokenURI).
+						AuthProviderX509CertURL(config.CCS.GCP.AuthProviderX509CertURL).
+						ClientX509CertURL(config.CCS.GCP.ClientX509CertURL),
+				)
+
+		}
 	}
 
 	clusterSpec, err := clusterBuilder.Build()