Skip to content

Commit

Permalink
test corrected
Browse files Browse the repository at this point in the history
assertion changed

test corrected
  • Loading branch information
jaroslaw-pieszka committed Jul 22, 2024
1 parent e3ab8a9 commit 059dca6
Show file tree
Hide file tree
Showing 5 changed files with 146 additions and 17 deletions.
4 changes: 4 additions & 0 deletions cmd/broker/broker_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import (
"testing"
"time"

imv1 "github.com/kyma-project/infrastructure-manager/api/v1"

"github.com/kyma-project/kyma-environment-broker/internal/kubeconfig"
"github.com/kyma-project/kyma-environment-broker/internal/metricsv2"
"github.com/prometheus/client_golang/prometheus/promhttp"
Expand Down Expand Up @@ -161,6 +163,8 @@ func NewBrokerSuiteTestWithConfig(t *testing.T, cfg *Config, version ...string)
sch := internal.NewSchemeForTests(t)
err := apiextensionsv1.AddToScheme(sch)
require.NoError(t, err)
err = imv1.AddToScheme(sch)
require.NoError(t, err)
additionalKymaVersions := []string{"1.19", "1.20", "main", "2.0"}
additionalKymaVersions = append(additionalKymaVersions, version...)
cli := fake.NewClientBuilder().WithScheme(sch).WithRuntimeObjects(fixK8sResources(defaultKymaVer, additionalKymaVersions)...).Build()
Expand Down
5 changes: 5 additions & 0 deletions cmd/broker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"sort"
"time"

imv1 "github.com/kyma-project/infrastructure-manager/api/v1"

"github.com/kyma-project/kyma-environment-broker/internal/expiration"
"github.com/kyma-project/kyma-environment-broker/internal/metricsv2"
"github.com/kyma-project/kyma-environment-broker/internal/whitelist"
Expand Down Expand Up @@ -204,6 +206,9 @@ func periodicProfile(logger lager.Logger, profiler ProfilerConfig) {
func main() {
err := apiextensionsv1.AddToScheme(scheme.Scheme)
panicOnError(err)
err = imv1.AddToScheme(scheme.Scheme)
panicOnError(err)

ctx, cancel := context.WithCancel(context.Background())
defer cancel()

Expand Down
2 changes: 1 addition & 1 deletion cmd/broker/provisioning.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func NewProvisioningProcessingQueue(ctx context.Context, provisionManager *proce
// postcondition: operation.KymaResourceName is set
{
stage: createRuntimeStageName,
step: provisioning.NewCreateRuntimeResourceStep(db.Operations(), db.RuntimeStates(), db.Instances(), cfg.Broker.KimConfig, cfg.Provisioner, trialRegionsMapping, cfg.Broker.UseSmallerMachineTypes),
step: provisioning.NewCreateRuntimeResourceStep(db.Operations(), db.RuntimeStates(), db.Instances(), cli, cfg.Broker.KimConfig, cfg.Provisioner, trialRegionsMapping, cfg.Broker.UseSmallerMachineTypes),

Check failure on line 101 in cmd/broker/provisioning.go

View workflow job for this annotation

GitHub Actions / run-govulncheck

too many arguments in call to provisioning.NewCreateRuntimeResourceStep
},
{
stage: createRuntimeStageName,
Expand Down
27 changes: 11 additions & 16 deletions internal/process/provisioning/create_runtime_resource_step.go
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package provisioning

import (
"context"
"fmt"
"time"

"sigs.k8s.io/controller-runtime/pkg/client"

gardener "github.com/gardener/gardener/pkg/apis/core/v1beta1"
"github.com/kyma-project/kyma-environment-broker/internal/process/input"
"github.com/kyma-project/kyma-environment-broker/internal/provider"
"k8s.io/apimachinery/pkg/util/intstr"

"github.com/kyma-project/kyma-environment-broker/internal/process/steps"

"sigs.k8s.io/yaml"

imv1 "github.com/kyma-project/infrastructure-manager/api/v1"
Expand All @@ -28,6 +29,7 @@ type CreateRuntimeResourceStep struct {
operationManager *process.OperationManager
instanceStorage storage.Instances
runtimeStateStorage storage.RuntimeStates
k8sClient client.Client
kimConfig kim.Config

config input.Config
Expand Down Expand Up @@ -79,11 +81,12 @@ func (s *CreateRuntimeResourceStep) Run(operation internal.Operation, log logrus
fmt.Println(yaml)
}
} else {
err := s.CreateResource(runtimeCR)
err := s.k8sClient.Create(context.Background(), runtimeCR)
if err != nil {
return s.operationManager.OperationFailed(operation, fmt.Sprintf("while creating Runtime CR resource: %s", err), err, log)
log.Error("unable to create Runtime resource: %s", err)
return s.operationManager.OperationFailed(operation, fmt.Sprintf("unable to Runtime resource: %s", err), err, log)
}
log.Info("Runtime CR creation process finished successfully")
log.Infof("Runtime CR %s creation process finished successfully", operation.RuntimeID)
}
return operation, 0, nil
}
Expand Down Expand Up @@ -146,17 +149,9 @@ func (s *CreateRuntimeResourceStep) createLabelsForRuntime(operation internal.Op
func (s *CreateRuntimeResourceStep) createSecurityConfiguration(operation internal.Operation) imv1.Security {
security := imv1.Security{}
security.Administrators = operation.ProvisioningParameters.Parameters.RuntimeAdministrators
//TODO: Networking
//networking:
//filter:
// # spec.security.networking.filter.egress.enabled is required
//egress:
//enabled: false
// # spec.security.networking.filter.ingress.enabled is optional (default=false), not implemented in the first KIM release
// ingress:
// enabled: true

logrus.Info("Creating Security Configuration - UNDER CONSTRUCTION")
security.Networking.Filter.Egress.Enabled = false
// Ingress is not supported yet, nevertheless we set it for completeness
security.Networking.Filter.Ingress = &imv1.Ingress{Enabled: false}
return security
}

Expand Down
125 changes: 125 additions & 0 deletions internal/process/provisioning/create_runtime_resource_step_test.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,35 @@
package provisioning

import (
"context"
"fmt"
"os"
"reflect"
"strings"
"testing"

imv1 "github.com/kyma-project/infrastructure-manager/api/v1"
"github.com/kyma-project/kyma-environment-broker/internal/broker"

"github.com/kyma-project/kyma-environment-broker/internal/process/input"

"github.com/kyma-project/kyma-environment-broker/internal"
"k8s.io/client-go/tools/clientcmd"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

"github.com/kyma-project/kyma-environment-broker/internal/fixture"
"github.com/kyma-project/kyma-environment-broker/internal/kim"

"github.com/kyma-project/kyma-environment-broker/internal/storage"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"

"k8s.io/client-go/kubernetes/scheme"
)

var expectedAdministrators = []string{"[email protected]", "[email protected]"}

func TestCreateRuntimeResourceStep_HappyPath_YamlOnly(t *testing.T) {
// given
log := logrus.New()
Expand All @@ -33,6 +50,47 @@ func TestCreateRuntimeResourceStep_HappyPath_YamlOnly(t *testing.T) {
}

step := NewCreateRuntimeResourceStep(memoryStorage.Operations(),
memoryStorage.RuntimeStates(), memoryStorage.Instances(), nil, kimConfig, input.Config{}, nil, false)

// when
entry := log.WithFields(logrus.Fields{"step": "TEST"})
_, repeat, err := step.Run(preOperation, entry)

// then
assert.NoError(t, err)
assert.Zero(t, repeat)

_, err = memoryStorage.Instances().GetByID(preOperation.InstanceID)
assert.NoError(t, err)

}

func TestCreateRuntimeResourceStep_HappyPath_ActualCreation(t *testing.T) {
// given
log := logrus.New()
memoryStorage := storage.NewMemoryStorage()

err := imv1.AddToScheme(scheme.Scheme)

instance := fixInstance()
preOperation := fixOperationForCreateRuntimeResource(instance.InstanceID)

err = memoryStorage.Operations().InsertOperation(preOperation)
assert.NoError(t, err)

err = memoryStorage.Instances().Insert(instance)
assert.NoError(t, err)

kimConfig := kim.Config{
Enabled: true,
Plans: []string{"azure"},
ViewOnly: false,
DryRun: false,
}

cli := getClientForTests(t)
inputConfig := input.Config{}
step := NewCreateRuntimeResourceStep(memoryStorage.Operations(), memoryStorage.RuntimeStates(), memoryStorage.Instances(), cli, kimConfig, inputConfig)
memoryStorage.RuntimeStates(), memoryStorage.Instances(), kimConfig, input.Config{}, nil, false)

Check failure on line 94 in internal/process/provisioning/create_runtime_resource_step_test.go

View workflow job for this annotation

GitHub Actions / run-go-linter

syntax error: unexpected ), expected := or = or comma

Check failure on line 94 in internal/process/provisioning/create_runtime_resource_step_test.go

View workflow job for this annotation

GitHub Actions / run-go-linter

syntax error: unexpected ), expected := or = or comma

Check failure on line 94 in internal/process/provisioning/create_runtime_resource_step_test.go

View workflow job for this annotation

GitHub Actions / run-go-linter

syntax error: unexpected ), expected := or = or comma

Check failure on line 94 in internal/process/provisioning/create_runtime_resource_step_test.go

View workflow job for this annotation

GitHub Actions / run-go-linter

syntax error: unexpected ), expected := or = or comma (typecheck)

Check failure on line 94 in internal/process/provisioning/create_runtime_resource_step_test.go

View workflow job for this annotation

GitHub Actions / run-go-tests / build

expected 1 expression

// when
Expand All @@ -43,7 +101,74 @@ func TestCreateRuntimeResourceStep_HappyPath_YamlOnly(t *testing.T) {
assert.NoError(t, err)
assert.Zero(t, repeat)

runtime := imv1.Runtime{}
err = cli.Get(context.Background(), client.ObjectKey{
Namespace: "kyma-system",
Name: preOperation.RuntimeID,
}, &runtime)
assert.NoError(t, err)
assert.Equal(t, preOperation.RuntimeID, runtime.Name)
assert.Equal(t, "runtime-58f8c703-1756-48ab-9299-a847974d1fee", runtime.Labels["operator.kyma-project.io/kyma-name"])

assertLabels(t, preOperation, runtime)
assertSecurity(t, runtime)

_, err = memoryStorage.Instances().GetByID(preOperation.InstanceID)
assert.NoError(t, err)

}

func assertSecurity(t *testing.T, runtime imv1.Runtime) {
assert.True(t, reflect.DeepEqual(runtime.Spec.Security.Administrators, expectedAdministrators))
assert.Equal(t, runtime.Spec.Security.Networking.Filter.Egress, imv1.Egress(imv1.Egress{Enabled: false}))
}

func assertLabels(t *testing.T, preOperation internal.Operation, runtime imv1.Runtime) {
assert.Equal(t, preOperation.InstanceID, runtime.Labels["kyma-project.io/instance-id"])
assert.Equal(t, preOperation.RuntimeID, runtime.Labels["kyma-project.io/runtime-id"])
assert.Equal(t, preOperation.ProvisioningParameters.PlanID, runtime.Labels["kyma-project.io/broker-plan-id"])
assert.Equal(t, broker.PlanNamesMapping[preOperation.ProvisioningParameters.PlanID], runtime.Labels["kyma-project.io/broker-plan-name"])
assert.Equal(t, preOperation.ProvisioningParameters.ErsContext.GlobalAccountID, runtime.Labels["kyma-project.io/global-account-id"])
assert.Equal(t, preOperation.ProvisioningParameters.ErsContext.SubAccountID, runtime.Labels["kyma-project.io/subaccount-id"])
assert.Equal(t, preOperation.ShootName, runtime.Labels["kyma-project.io/shoot-name"])
assert.Equal(t, *preOperation.ProvisioningParameters.Parameters.Region, runtime.Labels["kyma-project.io/region"])
}

func fixOperationForCreateRuntimeResource(instanceID string) internal.Operation {
operation := fixture.FixOperation("op-id", instanceID, internal.OperationTypeProvision)

operation.ProvisioningParameters.Parameters.RuntimeAdministrators = expectedAdministrators
operation.KymaTemplate = `
apiVersion: operator.kyma-project.io/v1beta2
kind: Kyma
metadata:
name: my-kyma
namespace: kyma-system
spec:
sync:
strategy: secret
channel: stable
modules: []
`
return operation
}

func getClientForTests(t *testing.T) client.Client {
var cli client.Client
if len(os.Getenv("KUBECONFIG")) > 0 && strings.ToLower(os.Getenv("USE_KUBECONFIG")) == "true" {
config, err := clientcmd.BuildConfigFromFlags("", os.Getenv("KUBECONFIG"))
if err != nil {
t.Fatal(err.Error())
}

cli, err = client.New(config, client.Options{})
if err != nil {
t.Fatal(err.Error())
}
fmt.Println("using kubeconfig")
} else {
fmt.Println("using fake client")
cli = fake.NewClientBuilder().Build()
}
return cli
}

0 comments on commit 059dca6

Please sign in to comment.