Setting valid Kyma Resource Name in a new step

cmd/broker/provisioning.go

@@ -84,6 +84,13 @@ func NewProvisioningProcessingQueue(ctx context.Context, provisionManager *proce
 			stage:     createRuntimeStageName,
 			step:      provisioning.NewGenerateRuntimeIDStep(db.Operations(), db.RuntimeStates(), db.Instances()),
 		},
+		// postcondition: operation.RuntimeID is set
+		{
+			condition: provisioning.SkipForOwnClusterPlan,
+			stage:     createRuntimeStageName,
+			step:      provisioning.NewCreateKymaNameStep(db.Operations()),
+		},
+		// postcondition: operation.KymaResourceName is set
 		{
 			condition: provisioning.SkipForOwnClusterPlan,
 			stage:     createRuntimeStageName,

internal/process/provisioning/create_kyma_name_step.go

@@ -0,0 +1,46 @@
+package provisioning
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/kyma-project/kyma-environment-broker/internal/process/steps"
+
+	"github.com/kyma-project/kyma-environment-broker/internal"
+	"github.com/kyma-project/kyma-environment-broker/internal/process"
+	"github.com/kyma-project/kyma-environment-broker/internal/storage"
+	"github.com/sirupsen/logrus"
+)
+
+type CreateKymaNameStep struct {
+	operationManager *process.OperationManager
+}
+
+func NewCreateKymaNameStep(os storage.Operations) *CreateKymaNameStep {
+	return &CreateKymaNameStep{
+		operationManager: process.NewOperationManager(os),
+	}
+}
+
+func (s *CreateKymaNameStep) Name() string {
+	return "Create_Kyma_Name"
+}
+
+func (s *CreateKymaNameStep) Run(operation internal.Operation, log logrus.FieldLogger) (internal.Operation, time.Duration, error) {
+	if time.Since(operation.UpdatedAt) > CreateRuntimeTimeout {
+		log.Infof("operation has reached the time limit: updated operation time: %s", operation.UpdatedAt)
+		return s.operationManager.OperationFailed(operation, fmt.Sprintf("operation has reached the time limit: %s", CreateRuntimeTimeout), nil, log)
+	}
+
+	if operation.RuntimeID == "" {
+		return s.operationManager.OperationFailed(operation, fmt.Sprint("RuntimeID not set, cannot create Kyma name"), nil, log)
+	}
+
+	// could be simplified but this provides single source of truth for Kyma name
+	operation.KymaResourceName = ""
+	operation.KymaResourceName = steps.KymaName(operation)
+
+	return s.operationManager.UpdateOperation(operation, func(op *internal.Operation) {
+		op.RuntimeID = operation.RuntimeID
+	}, log)
+}

internal/process/provisioning/create_kyma_name_step_test.go

@@ -0,0 +1,65 @@
+package provisioning
+
+import (
+	"testing"
+
+	"github.com/kyma-project/kyma-environment-broker/internal/fixture"
+	"github.com/kyma-project/kyma-environment-broker/internal/storage"
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCreateKymaNameStep_HappyPath(t *testing.T) {
+	// given
+	log := logrus.New()
+	memoryStorage := storage.NewMemoryStorage()
+
+	preOperation := fixture.FixProvisioningOperation(operationID, instanceID)
+	err := memoryStorage.Operations().InsertOperation(preOperation)
+	assert.NoError(t, err)
+
+	err = memoryStorage.Instances().Insert(fixInstance())
+	assert.NoError(t, err)
+
+	step := NewCreateKymaNameStep(memoryStorage.Operations())
+
+	// when
+	entry := log.WithFields(logrus.Fields{"step": "TEST"})
+	postOperation, backoff, err := step.Run(preOperation, entry)
+
+	// then
+	assert.NoError(t, err)
+	assert.Zero(t, backoff)
+	assert.Equal(t, preOperation.RuntimeID, postOperation.RuntimeID)
+	assert.Equal(t, postOperation.KymaResourceName, preOperation.RuntimeID)
+	assert.Equal(t, postOperation.KymaResourceNamespace, "kyma-system")
+	_, err = memoryStorage.Instances().GetByID(preOperation.InstanceID)
+	assert.NoError(t, err)
+
+}
+
+func TestCreateKymaNameStep_NoRuntimeID(t *testing.T) {
+	// given
+	log := logrus.New()
+	memoryStorage := storage.NewMemoryStorage()
+
+	preOperation := fixture.FixProvisioningOperation(operationID, instanceID)
+
+	preOperation.RuntimeID = ""
+
+	err := memoryStorage.Operations().InsertOperation(preOperation)
+	assert.NoError(t, err)
+
+	err = memoryStorage.Instances().Insert(fixInstance())
+	assert.NoError(t, err)
+
+	step := NewCreateKymaNameStep(memoryStorage.Operations())
+
+	// when
+	entry := log.WithFields(logrus.Fields{"step": "TEST"})
+	_, backoff, err := step.Run(preOperation, entry)
+
+	// then
+	assert.ErrorContains(t, err, "RuntimeID not set, cannot create Kyma name")
+	assert.Zero(t, backoff)
+}

internal/process/steps/lifecycle_manager.go

@@ -54,6 +54,10 @@ func KymaName(operation internal.Operation) string {
 	return strings.ToLower(operation.RuntimeID)
 }
 
+func KymaRuntimeResourceName(operation internal.Operation) string {
+	return strings.ToLower(operation.RuntimeID)
+}
+
 func KymaNameFromInstance(instance *internal.Instance) string {
 	return strings.ToLower(instance.RuntimeID)
 }