Skip to content

Commit

Permalink
fix go.mod and refactor old tests
Browse files Browse the repository at this point in the history
  • Loading branch information
dbadura committed Aug 11, 2020
1 parent 554f715 commit b35461b
Show file tree
Hide file tree
Showing 19 changed files with 637 additions and 495 deletions.
30 changes: 16 additions & 14 deletions tests/function-controller/go.mod
Expand Up @@ -3,40 +3,42 @@ module github.com/kyma-project/kyma/tests/function-controller
go 1.14

require (
github.com/Azure/go-autorest/autorest v0.9.3 // indirect
github.com/Azure/go-autorest/autorest/adal v0.8.1 // indirect
github.com/avast/retry-go v2.6.0+incompatible
github.com/golang/protobuf v1.4.0 // indirect
github.com/hashicorp/errwrap v1.0.0
github.com/hashicorp/go-multierror v1.1.0
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.9 // indirect
github.com/json-iterator/go v1.1.9 // indirect
github.com/kubernetes-incubator/service-catalog v0.2.2
github.com/kubernetes-sigs/service-catalog v0.2.2 // indirect
github.com/kyma-project/helm-broker v1.0.0
github.com/kyma-project/kyma/components/function-controller v0.0.0-20200507074609-9796320d6479
github.com/kyma-project/kyma/tests/end-to-end/external-solution-integration v0.5.0
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a // indirect
github.com/onsi/gomega v1.9.0
github.com/pkg/errors v0.9.1
github.com/robfig/cron v1.2.0 // indirect
github.com/sirupsen/logrus v1.4.2
github.com/spf13/pflag v1.0.5
github.com/vrischmann/envconfig v1.2.0
golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 // indirect
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed // indirect
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.17.8
honnef.co/go/tools v0.0.1-2020.1.5 // indirect
k8s.io/api v0.17.4
k8s.io/apiextensions-apiserver v0.17.4 // indirect
k8s.io/apimachinery v0.17.8
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/apimachinery v0.17.4
k8s.io/client-go v0.17.4
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 // indirect
knative.dev/eventing v0.12.0
knative.dev/pkg v0.0.0-20200306230727-a56a6ea3fa56
sigs.k8s.io/controller-runtime v0.5.2
)

replace golang.org/x/text => golang.org/x/text v0.3.3

replace k8s.io/client-go => k8s.io/client-go v0.17.4

replace github.com/kyma-project/kyma/tests/end-to-end/external-solution-integration => ../end-to-end/external-solution-integration

replace github.com/kyma-project/kyma/components/function-controller => ../../components/function-controller

// mismatch among fun-controller, knative enevting and knative serving...
// try to delete it after update of eventing/serving
replace knative.dev/pkg => knative.dev/pkg v0.0.0-20200113182502-b8dc5fbc6d2f

replace github.com/kyma-project/kyma/components/function-controller => github.com/dbadura/kyma/components/function-controller v0.0.0-20200810074315-6471ba49a2df
317 changes: 29 additions & 288 deletions tests/function-controller/go.sum

Large diffs are not rendered by default.

103 changes: 0 additions & 103 deletions tests/function-controller/internal/teststep/check.go

This file was deleted.

97 changes: 47 additions & 50 deletions tests/function-controller/main_test.go
@@ -1,11 +1,8 @@
package main

import (
"github.com/kyma-project/kyma/tests/end-to-end/external-solution-integration/pkg/step"
"github.com/kyma-project/kyma/tests/function-controller/internal/scenarios"
"github.com/sirupsen/logrus"
"k8s.io/client-go/dynamic"
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
"github.com/kyma-project/kyma/tests/function-controller/pkg/step"
"github.com/kyma-project/kyma/tests/function-controller/testsuite/scenarios"
"math/rand"
"testing"
"time"
Expand All @@ -22,51 +19,51 @@ type config struct {
KubeconfigPath string `envconfig:"optional"`
Test testsuite.Config
}

func TestFunctionController(t *testing.T) {
rand.Seed(time.Now().UnixNano())

g := gomega.NewGomegaWithT(t)

cfg, err := loadConfig("APP")
failOnError(g, err)

restConfig := controllerruntime.GetConfigOrDie()
failOnError(g, err)

testSuite, err := testsuite.New(restConfig, cfg.Test, t, g)
failOnError(g, err)

defer testSuite.Cleanup()
defer testSuite.LogResources()
testSuite.Run()
}

func TestRefactored(t *testing.T) {
logger := logrus.New()
logrus.SetOutput(logger.Writer())

logger.Infof("Logrus pisze: %s", "Lubie cie")
restConfig := controllerruntime.GetConfigOrDie()
coreCli := corev1.NewForConfigOrDie(restConfig)

dynamicCli, err := dynamic.NewForConfig(restConfig)

g := gomega.NewGomegaWithT(t)

config := &scenarios.Config{
Log: t,
CoreCli: coreCli,
DynamicCLI: dynamicCli,
}

steps := scenarios.Steps(config)

runner := step.NewRunner(step.WithCleanupDefault(step.CleanupModeNo))

err = runner.Execute(steps)
failOnError(g, err)
}
//
//func TestFunctionController(t *testing.T) {
// rand.Seed(time.Now().UnixNano())
//
// g := gomega.NewGomegaWithT(t)
//
// cfg, err := loadConfig("APP")
// failOnError(g, err)
//
// restConfig := controllerruntime.GetConfigOrDie()
// failOnError(g, err)
//
// testSuite, err := testsuite.New(restConfig, cfg.Test, t, g)
// failOnError(g, err)
//
// defer testSuite.Cleanup()
// defer testSuite.LogResources()
// testSuite.Run()
//}
//
//func TestRefactored(t *testing.T) {
// logger := logrus.New()
// logrus.SetOutput(logger.Writer())
//
// logger.Infof("Logrus pisze: %s", "Lubie cie")
// restConfig := controllerruntime.GetConfigOrDie()
// coreCli := corev1.NewForConfigOrDie(restConfig)
//
// dynamicCli, err := dynamic.NewForConfig(restConfig)
//
// g := gomega.NewGomegaWithT(t)
//
// config := &scenarios.Config{
// Log: t,
// CoreCli: coreCli,
// DynamicCLI: dynamicCli,
// }
//
// steps := scenarios.Steps(config)
//
// runner := step.NewRunner(step.WithCleanupDefault(step.CleanupModeNo))
//
// err = runner.Execute(steps)
// failOnError(g, err)
//}

func TestDifferentRuntimes(t *testing.T) {
rand.Seed(time.Now().UnixNano())
Expand Down
66 changes: 66 additions & 0 deletions tests/function-controller/pkg/step/cli.go
@@ -0,0 +1,66 @@
package step

import (
"github.com/pkg/errors"
"github.com/spf13/pflag"
)

// Execute behavior is based on chose cleanup method. It is intended to be used with AddFlags
func (r *Runner) Execute(steps []Step) error {
r.log.Infof("Cleanup mode: %s", r.cleanup)
var err error
switch r.cleanup {
case CleanupModeNo:
err = r.Run(steps, true)
case CleanupModeOnly:
r.Cleanup(steps)
case CleanupModeYes:
err = r.Run(steps, false)
case CleanupModeOnErrorOnly:
err = r.Run(steps, true)
if err != nil {
r.Cleanup(steps)
}
}
return err
}

// AddFlags add CLI flags so user may control runner behaviour easily
func (r *Runner) AddFlags(set *pflag.FlagSet) {
set.Var(&r.cleanup, "cleanup", "Cleanup mode. Allowed values: yes/no/only")
}

// CleanupMode says how runner should execute cleanup
type CleanupMode string

const (
// CleanupModeNo - Don't execute cleanup
CleanupModeNo CleanupMode = "no"
// CleanupModeOnly - Don't run steps, only cleanup
CleanupModeOnly CleanupMode = "only"
// Execute both steps and cleanup
CleanupModeYes CleanupMode = "yes"
// Execute steps. If steps fail then run cleanup. Keep resources in case of success
CleanupModeOnErrorOnly CleanupMode = "onerroronly"
)

// String implements pflag.Value.String
func (m CleanupMode) String() string {
return string(m)
}

// Set implements pflag.Value.Set
func (m *CleanupMode) Set(v string) error {
switch CleanupMode(v) {
case CleanupModeNo, CleanupModeYes, CleanupModeOnly, CleanupModeOnErrorOnly:
default:
return errors.Errorf("invalid cleanup value: %s", v)
}
*m = CleanupMode(v)
return nil
}

// Type implements pflag.Value.Type
func (m CleanupMode) Type() string {
return "runner mode"
}

0 comments on commit b35461b

Please sign in to comment.