Merge pull request #182 from zzxwill/e2e-enhance

Add more e2e tests

controllers/client/init.go

@@ -0,0 +1,15 @@
+package client
+
+import (
+	"k8s.io/client-go/kubernetes"
+	config2 "sigs.k8s.io/controller-runtime/pkg/client/config"
+)
+
+// InitClientSet initializes the Go client set
+func InitClientSet() (*kubernetes.Clientset, error) {
+	config, err := config2.GetConfig()
+	if err != nil {
+		return nil, err
+	}
+	return kubernetes.NewForConfig(config)
+}

controllers/terraform/logging.go

@@ -10,17 +10,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
-	config2 "sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
-func initClientSet() (*kubernetes.Clientset, error) {
-	config, err := config2.GetConfig()
-	if err != nil {
-		return nil, err
-	}
-	return kubernetes.NewForConfig(config)
-}
-
 func getPodLog(ctx context.Context, client *kubernetes.Clientset, namespace, jobName string) (string, error) {
 	label := fmt.Sprintf("job-name=%s", jobName)
 	pods, err := client.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{LabelSelector: label})

controllers/terraform/status.go

@@ -6,12 +6,14 @@ import (
 
 	"github.com/pkg/errors"
 	"k8s.io/klog/v2"
+
+	"github.com/oam-dev/terraform-controller/controllers/client"
 )
 
 // GetTerraformStatus will get Terraform execution status
 func GetTerraformStatus(ctx context.Context, namespace, jobName string) error {
 	klog.InfoS("checking Terraform execution status", "Namespace", namespace, "Job", jobName)
-	clientSet, err := initClientSet()
+	clientSet, err := client.InitClientSet()
 	if err != nil {
 		klog.ErrorS(err, "failed to init clientSet")
 		return err

e2e/configuration_test.go

@@ -0,0 +1,124 @@
+package e2e
+
+import (
+	"fmt"
+	"golang.org/x/net/context"
+	"gotest.tools/assert"
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/klog/v2"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/oam-dev/terraform-controller/controllers/client"
+)
+
+const backendSecretNamespace = "vela-system"
+
+func TestConfiguration(t *testing.T) {
+	clientSet, err := client.InitClientSet()
+	assert.NilError(t, err)
+	ctx := context.Background()
+
+	klog.Info("1. Applying Configuration")
+	pwd, _ := os.Getwd()
+	configuration := filepath.Join(pwd, "..", "examples/alibaba/eip/configuration_eip.yaml")
+	cmd := fmt.Sprintf("kubectl apply -f %s", configuration)
+	err = exec.Command("bash", "-c", cmd).Start()
+	assert.NilError(t, err)
+
+	klog.Info("2. Checking Configuration status")
+	for i := 0; i < 60; i++ {
+		var fields []string
+		output, err := exec.Command("bash", "-c", "kubectl get configuration").Output()
+		assert.NilError(t, err)
+
+		lines := strings.Split(string(output), "\n")
+		for i, line := range lines {
+			if i == 0 {
+				continue
+			}
+			fields = strings.Fields(line)
+			if len(fields) == 3 && fields[0] == "alibaba-eip" && fields[1] == "Available" {
+				goto continueCheck
+			}
+		}
+		if i == 59 {
+			t.Error("Configuration is not ready")
+		}
+		time.Sleep(time.Second * 5)
+	}
+
+continueCheck:
+	klog.Info("3. Checking Configuration status")
+
+	klog.Info("- Checking ConfigMap which stores .tf")
+	_, err = clientSet.CoreV1().ConfigMaps("default").Get(ctx, "tf-alibaba-eip", v1.GetOptions{})
+	assert.NilError(t, err)
+
+	klog.Info("- Checking Secret which stores Backend")
+	_, err = clientSet.CoreV1().Secrets(backendSecretNamespace).Get(ctx, "tfstate-default-alibaba-eip", v1.GetOptions{})
+	assert.NilError(t, err)
+
+	klog.Info("- Checking Secret which stores outputs")
+	_, err = clientSet.CoreV1().Secrets("default").Get(ctx, "eip-conn", v1.GetOptions{})
+	assert.NilError(t, err)
+
+	klog.Info("- Checking Secret which stores variables")
+	_, err = clientSet.CoreV1().Secrets("default").Get(ctx, "variable-alibaba-eip", v1.GetOptions{})
+	assert.NilError(t, err)
+
+	klog.Info("4. Deleting Configuration")
+	cmd = fmt.Sprintf("kubectl delete -f %s", configuration)
+	err = exec.Command("bash", "-c", cmd).Start()
+	assert.NilError(t, err)
+
+	klog.Info("5. Checking Configuration is deleted")
+	for i := 0; i < 60; i++ {
+		var (
+			fields  []string
+			existed bool
+		)
+		output, err := exec.Command("bash", "-c", "kubectl get configuration").Output()
+		assert.NilError(t, err)
+
+		lines := strings.Split(string(output), "\n")
+
+		for j, line := range lines {
+			if j == 0 {
+				continue
+			}
+			fields = strings.Fields(line)
+			if len(fields) == 3 && fields[0] == "alibaba-eip" {
+				existed = true
+			}
+		}
+		if existed {
+			if i == 59 {
+				t.Error("Configuration is not ready")
+			}
+
+			time.Sleep(time.Second * 5)
+			continue
+		} else {
+			break
+		}
+	}
+
+	klog.Info("6. Checking Secrets and ConfigMap which should all be deleted")
+	_, err = clientSet.CoreV1().Secrets("default").Get(ctx, "variable-alibaba-eip", v1.GetOptions{})
+	assert.Equal(t, kerrors.IsNotFound(err), true)
+
+	_, err = clientSet.CoreV1().Secrets("default").Get(ctx, "eip-conn", v1.GetOptions{})
+	assert.Equal(t, kerrors.IsNotFound(err), true)
+
+	_, err = clientSet.CoreV1().Secrets(backendSecretNamespace).Get(ctx, "tfstate-default-alibaba-eip", v1.GetOptions{})
+	assert.Equal(t, kerrors.IsNotFound(err), true)
+
+	_, err = clientSet.CoreV1().ConfigMaps("default").Get(ctx, "tf-alibaba-eip", v1.GetOptions{})
+	assert.Equal(t, kerrors.IsNotFound(err), true)
+}

e2e/cloud-providers/alibaba_test.go → e2e/configurations/alibaba_test.go

@@ -1,4 +1,4 @@
-package e2e
+package configurations
 
 import (
 	"fmt"
@@ -17,7 +17,6 @@ func TestConfiguration(t *testing.T) {
 	It("All Configurations should become `Available`", func() {
 		pwd, _ := os.Getwd()
 		configurations := []string{
-			"examples/alibaba/eip/configuration_eip.yaml",
 			"examples/alibaba/eip/configuration_eip_remote.yaml",
 			"examples/alibaba/eip/configuration_eip_remote_subdirectory.yaml",
 			"examples/alibaba/rds/configuration_hcl_rds.yaml",

e2e/cloud-providers/suite_test.go → e2e/configurations/suite_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e
+package configurations
 
 import (
 	"testing"

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/onsi/ginkgo v1.16.2
 	github.com/onsi/gomega v1.12.0
 	github.com/pkg/errors v0.9.1
+	golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
 	google.golang.org/appengine v1.6.5 // indirect
 	gotest.tools v2.2.0+incompatible
 	k8s.io/api v0.18.8