Feature pmks gcp 20221206 yhnoh

cloud-control-manager/cloud-driver/drivers/gcp/GCPDriver.go

@@ -25,6 +25,7 @@ import (
 	goo "golang.org/x/oauth2/google"
 
 	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/container/v1"
 )
 
 type GCPDriver struct {
@@ -46,6 +47,9 @@ func (GCPDriver) GetDriverCapability() idrv.DriverCapabilityInfo {
 	drvCapabilityInfo.VMHandler = true
 	drvCapabilityInfo.VMSpecHandler = true
 	drvCapabilityInfo.VPCHandler = true
+	drvCapabilityInfo.DiskHandler = false
+	drvCapabilityInfo.MyImageHandler = false
+	drvCapabilityInfo.ClusterHandler = true
 
 	return drvCapabilityInfo
 }
@@ -66,6 +70,14 @@ func (driver *GCPDriver) ConnectCloud(connectionInfo idrv.ConnectionInfo) (icon.
 	if err != nil {
 		return nil, err
 	}
+	//Ctx2, containerClient, err := getContainerClient(connectionInfo.CredentialInfo)
+	_, containerClient, err := getContainerClient(connectionInfo.CredentialInfo)
+	fmt.Println("################## getContainerClient ##################")
+	fmt.Println("getContainerClient")
+	fmt.Println("################## getContainerClient ##################")
+	if err != nil {
+		return nil, err
+	}
 
 	iConn := gcpcon.GCPCloudConnection{
 		Region:      connectionInfo.RegionInfo,
@@ -77,9 +89,10 @@ func (driver *GCPDriver) ConnectCloud(connectionInfo idrv.ConnectionInfo) (icon.
 		SecurityGroupClient: VMClient,
 		// VNetClient:          VMClient,
 		// VNicClient:          VMClient,
-		SubnetClient:  VMClient,
-		VMSpecHandler: VMClient,
-		VPCHandler:    VMClient,
+		SubnetClient:    VMClient,
+		VMSpecHandler:   VMClient,
+		VPCHandler:      VMClient,
+		ContainerClient: containerClient,
 	}
 
 	//fmt.Println("################## resource ConnectionInfo ##################")
@@ -88,6 +101,11 @@ func (driver *GCPDriver) ConnectCloud(connectionInfo idrv.ConnectionInfo) (icon.
 	return &iConn, nil
 }
 
+// authorization scopes : https://developers.google.com/identity/protocols/oauth2/scopes
+// cloud-platform, cloud-platform.read-only, compute, compute.readonly
+
+// auth scope : compute
+// 아래에서 cloud-platform을 사용하는데 vmClient 대체가 되는지 확인 필요.
 func getVMClient(credential idrv.CredentialInfo) (context.Context, *compute.Service, error) {
 
 	// GCP 는  ClientSecret에
@@ -121,3 +139,38 @@ func getVMClient(credential idrv.CredentialInfo) (context.Context, *compute.Serv
 
 	return ctx, vmClient, nil
 }
+
+// auth scope : cloud-platform
+func getContainerClient(credential idrv.CredentialInfo) (context.Context, *container.Service, error) {
+
+	// GCP 는  ClientSecret에
+	gcpType := "service_account"
+	data := make(map[string]string)
+
+	data["type"] = gcpType
+	data["private_key"] = credential.PrivateKey
+	data["client_email"] = credential.ClientEmail
+
+	fmt.Println("################## data ##################")
+	//fmt.Println("data to json : ", data)
+	fmt.Println("################## data ##################")
+
+	res, _ := json.Marshal(data)
+	authURL := "https://www.googleapis.com/auth/cloud-platform"
+
+	conf, err := goo.JWTConfigFromJSON(res, authURL)
+
+	if err != nil {
+
+		return nil, nil, err
+	}
+
+	client := conf.Client(o2.NoContext)
+
+	containerClient, err := container.New(client)
+
+	ctx := context.Background()
+
+	return ctx, containerClient, nil
+}
+

cloud-control-manager/cloud-driver/drivers/gcp/connect/GCP_CloudConnection.go

@@ -20,6 +20,7 @@ import (
 	irs "github.com/cloud-barista/cb-spider/cloud-control-manager/cloud-driver/interfaces/resources"
 	"github.com/sirupsen/logrus"
 	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/container/v1"
 )
 
 var cblogger *logrus.Logger
@@ -42,6 +43,7 @@ type GCPCloudConnection struct {
 	SubnetClient        *compute.Service
 	VMSpecHandler       *compute.Service
 	VPCHandler          *compute.Service
+	ContainerClient     *container.Service
 }
 
 // func (cloudConn *GCPCloudConnection) CreateVNetworkHandler() (irs.VNetworkHandler, error) {
@@ -125,12 +127,11 @@ func (cloudConn *GCPCloudConnection) CreateMyImageHandler() (irs.MyImageHandler,
 }
 
 func (cloudConn *GCPCloudConnection) CreateClusterHandler() (irs.ClusterHandler, error) {
-	return nil, errors.New("GCP Driver: not implemented")
+	cblogger.Info("GCP Cloud Driver: called CreateClusterHandler()!")
+	clusterHandler := gcprs.GCPClusterHandler{Region: cloudConn.Region, Ctx: cloudConn.Ctx, Client: cloudConn.VMClient, ContainerClient: cloudConn.ContainerClient, Credential: cloudConn.Credential}
+	return &clusterHandler, nil
 }
 
-
-
 func (cloudConn *GCPCloudConnection) CreateAnyCallHandler() (irs.AnyCallHandler, error) {
 	return nil, errors.New("GCP Driver: not implemented")
 }
-