Get Binding Endpoint (#1262)

* Initial Test and Implementation * Added Missing Instance ID in Get Binding Method * Removed Unnecessary Field * Added Missing Instance ID in Get Binding Method * Get Binding Implementation Correction * Insert Binding in Bind Create Endpoint * Removed Unnecessary Field * Added Missing Instance ID in Get Binding Method * Added Missing Instance ID in Get Binding Method * Get Binding Memory Implementation * Missing Not Found Response * Get Endpoint Test * Linter and Missing Error Check * Reverted Invalid Test Change * Corrected Kubeconfig Assignment & Test Correction * Removed TODO * Linter * Review Correction #1262 (comment) * Review Corrections #1262 (comment) * Code Review #1262 (comment) * Update internal/broker/bind_create.go Co-authored-by: Jarosław Pieszka <[email protected]> * Review Remarks #1262 (comment) * Review Remarks #1262 (comment) * Review Remarks #1262 (comment) * Review Remarks #1262 (comment) * Review Remarks #1262 (comment) #1262 (comment) * Review Remarks #1262 (comment) * Review Remarks #1262 (comment) * Review Remarks #1262 (comment) * Mock DB Correction * Review Remarks - Additional Test Case #1262 (comment) * Linter * Review Remarks * Linter * Review Remarks * Linter * Assertions Corrections * Assertions Corrections * Assertion Corrections * Review Remarks * Incorporate DB in Binding Selection E2E Test --------- Co-authored-by: Jarosław Pieszka <[email protected]>
kyma-project · Oct 10, 2024 · b75f66b · b75f66b
1 parent f8cb6dd
commit b75f66b
Show file tree

Hide file tree

Showing 15 changed files with 348 additions and 97 deletions.
diff --git a/cmd/broker/main.go b/cmd/broker/main.go
@@ -445,9 +445,9 @@ func createAPI(router *mux.Router, servicesConfig broker.ServicesConfig, planVal
 			planDefaults, logs, cfg.KymaDashboardConfig, kcBuilder, convergedCloudRegionProvider, kcpK8sClient),
 		GetInstanceEndpoint:          broker.NewGetInstance(cfg.Broker, db.Instances(), db.Operations(), kcBuilder, logs),
 		LastOperationEndpoint:        broker.NewLastOperation(db.Operations(), db.InstancesArchived(), logs),
-		BindEndpoint:                 broker.NewBind(cfg.Broker.Binding, db.Instances(), logs, clientProvider, kubeconfigProvider, gardenerClient),
+		BindEndpoint:                 broker.NewBind(cfg.Broker.Binding, db.Instances(), db.Bindings(), logs, clientProvider, kubeconfigProvider, gardenerClient),
 		UnbindEndpoint:               broker.NewUnbind(logs),
-		GetBindingEndpoint:           broker.NewGetBinding(logs),
+		GetBindingEndpoint:           broker.NewGetBinding(logs, db.Bindings()),
 		LastBindingOperationEndpoint: broker.NewLastBindingOperation(logs),
 	}
 

diff --git a/internal/broker/bind_create.go b/internal/broker/bind_create.go
@@ -7,7 +7,9 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
+	"time"
 
+	"github.com/kyma-project/kyma-environment-broker/internal"
 	broker "github.com/kyma-project/kyma-environment-broker/internal/broker/bindings"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage"
 	"github.com/kyma-project/kyma-environment-broker/internal/storage/dberr"
@@ -29,6 +31,7 @@ type BindingConfig struct {
 type BindEndpoint struct {
 	config           BindingConfig
 	instancesStorage storage.Instances
+	bindingsStorage  storage.Bindings
 
 	serviceAccountBindingManager broker.BindingsManager
 	gardenerBindingsManager      broker.BindingsManager
@@ -45,8 +48,11 @@ type Credentials struct {
 	Kubeconfig string `json:"kubeconfig"`
 }
 
-func NewBind(cfg BindingConfig, instanceStorage storage.Instances, log logrus.FieldLogger, clientProvider broker.ClientProvider, kubeconfigProvider broker.KubeconfigProvider, gardenerClient client.Client) *BindEndpoint {
-	return &BindEndpoint{config: cfg, instancesStorage: instanceStorage, log: log.WithField("service", "BindEndpoint"),
+func NewBind(cfg BindingConfig, instanceStorage storage.Instances, bindingsStorage storage.Bindings, log logrus.FieldLogger, clientProvider broker.ClientProvider, kubeconfigProvider broker.KubeconfigProvider, gardenerClient client.Client) *BindEndpoint {
+	return &BindEndpoint{config: cfg,
+		instancesStorage:             instanceStorage,
+		bindingsStorage:              bindingsStorage,
+		log:                          log.WithField("service", "BindEndpoint"),
 		serviceAccountBindingManager: broker.NewServiceAccountBindingsManager(clientProvider, kubeconfigProvider),
 		gardenerBindingsManager:      broker.NewGardenerBindingManager(gardenerClient),
 	}
@@ -112,19 +118,39 @@ func (b *BindEndpoint) Bind(ctx context.Context, instanceID, bindingID string, d
 	}
 
 	var kubeconfig string
+	binding := &internal.Binding{
+		ID:         bindingID,
+		InstanceID: instanceID,
+
+		CreatedAt: time.Now(),
+		UpdatedAt: time.Now(),
+
+		ExpirationSeconds: int64(expirationSeconds),
+	}
 	if parameters.ServiceAccount {
 		// get kubeconfig for the instance
 		kubeconfig, err = b.serviceAccountBindingManager.Create(ctx, instance, bindingID, expirationSeconds)
 		if err != nil {
-			message := fmt.Sprintf("failed to create kyma binding for service account using token request: %s", err)
+			message := fmt.Sprintf("failed to create a Kyma binding using service account's kubeconfig: %s", err)
 			return domain.Binding{}, apiresponses.NewFailureResponse(fmt.Errorf(message), http.StatusBadRequest, message)
 		}
+		binding.BindingType = internal.BINDING_TYPE_SERVICE_ACCOUNT
 	} else {
 		kubeconfig, err = b.gardenerBindingsManager.Create(ctx, instance, bindingID, expirationSeconds)
 		if err != nil {
-			message := fmt.Sprintf("failed to create kyma binding using adminkubeconfig gardener subresource: %s", err)
+			message := fmt.Sprintf("failed to create a Kyma binding using adminkubeconfig gardener subresource: %s", err)
 			return domain.Binding{}, apiresponses.NewFailureResponse(fmt.Errorf(message), http.StatusBadRequest, message)
 		}
+		binding.BindingType = internal.BINDING_TYPE_ADMIN_KUBECONFIG
+	}
+
+	binding.Kubeconfig = kubeconfig
+
+	err = b.bindingsStorage.Insert(binding)
+	if err != nil {
+		message := fmt.Sprintf("failed to insert Kyma binding into storage: %s", err)
+		return domain.Binding{}, apiresponses.NewFailureResponse(fmt.Errorf(message), http.StatusInternalServerError, message)
+
 	}
 
 	return domain.Binding{