Merge pull request #32 from menglingwei/feature/actuators-unit-tests

Feature/actuators unit tests

go.mod

@@ -16,6 +16,7 @@ require (
 	k8s.io/client-go v0.24.1
 	k8s.io/klog v1.0.0
 	k8s.io/klog/v2 v2.60.1
+	k8s.io/kubectl v0.24.1
 	sigs.k8s.io/controller-runtime v0.12.1
 	sigs.k8s.io/controller-tools v0.9.0
 	sigs.k8s.io/yaml v1.3.0
@@ -101,7 +102,6 @@ require (
 	k8s.io/cli-runtime v0.24.1 // indirect
 	k8s.io/component-base v0.24.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
-	k8s.io/kubectl v0.24.1 // indirect
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
 	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
 	sigs.k8s.io/kustomize/api v0.11.4 // indirect

pkg/actuators/machine/filter_test.go

@@ -0,0 +1,40 @@
+package machine
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
+)
+
+func TestClusterTagFilter(t *testing.T) {
+	var cases = []struct {
+		clusterId   string
+		machineName string
+		expected    []ecs.DescribeInstancesTag
+	}{
+		{
+			clusterId:   "testCluster",
+			machineName: "test-machine",
+			expected: []ecs.DescribeInstancesTag{
+				{
+					Key:   "kubernetes.io/cluster/testCluster",
+					Value: "owned",
+				},
+				{
+					Key:   "Name",
+					Value: "test-machine",
+				},
+			},
+		},
+	}
+
+	for i, c := range cases {
+		t.Run(c.machineName, func(t *testing.T) {
+			actual := clusterTagFilter(c.clusterId, c.machineName)
+			if !reflect.DeepEqual(c.expected, actual) {
+				t.Errorf("test #%d: expected %+v, got %+v", i, c.expected, actual)
+			}
+		})
+	}
+}

pkg/actuators/machine/instances.go

@@ -422,9 +422,9 @@ func getSecurityGroupIDByTags(machine runtimeclient.ObjectKey, machineProviderCo
 }
 
 func buildDescribeSecurityGroupsTag(tags []machinev1.Tag) *[]ecs.DescribeSecurityGroupsTag {
-	describeSecurityGroupsTag := make([]ecs.DescribeSecurityGroupsTag, len(tags))
-
-	for index, tag := range tags {
+	rawTagList := removeDuplicatedMachineTags(tags)
+	describeSecurityGroupsTag := make([]ecs.DescribeSecurityGroupsTag, len(rawTagList))
+	for index, tag := range rawTagList {
 		describeSecurityGroupsTag[index] = ecs.DescribeSecurityGroupsTag{
 			Key:   tag.Key,
 			Value: tag.Value,
@@ -478,9 +478,10 @@ func getVSwitchIDFromTags(machine runtimeclient.ObjectKey, mpc *machinev1.Alibab
 }
 
 func buildDescribeVSwitchesTag(tags []machinev1.Tag) *[]vpc.DescribeVSwitchesTag {
-	describeVSwitchesTag := make([]vpc.DescribeVSwitchesTag, len(tags))
+	rawTagList := removeDuplicatedMachineTags(tags)
+	describeVSwitchesTag := make([]vpc.DescribeVSwitchesTag, len(rawTagList))
 
-	for index, tag := range tags {
+	for index, tag := range rawTagList {
 		describeVSwitchesTag[index] = vpc.DescribeVSwitchesTag{
 			Key:   tag.Key,
 			Value: tag.Value,
@@ -490,6 +491,18 @@ func buildDescribeVSwitchesTag(tags []machinev1.Tag) *[]vpc.DescribeVSwitchesTag
 	return &describeVSwitchesTag
 }
 
+func removeDuplicatedMachineTags(machineTags []machinev1.Tag) []*machinev1.Tag {
+	rawTagList := make([]*machinev1.Tag, 0)
+	for _, tag := range machineTags {
+		rawTagList = append(rawTagList, &machinev1.Tag{
+			Key:   tag.Key,
+			Value: tag.Value,
+		})
+	}
+
+	return removeDuplicatedTags(rawTagList)
+}
+
 // buildTagList compile a list of ecs tags from machine provider spec and infrastructure object platform spec
 func buildTagList(machineName string, clusterID string, machineTags []machinev1.Tag) []*machinev1.Tag {
 	rawTagList := make([]*machinev1.Tag, 0)