fix: Restructure machine actuator for unittests, and add unittests (#145)

* fix: Restructure machine actuator for unittests, and add unittests

fix: Restructure machine actuator for unittests, and add unittests

Remove MachineRole its not used anywhere and used constants for Node and ControlPlane due to lint failure

* Add more tests, increasing overall coverage

Author: awesomenix

Gopkg.lock

@@ -34,13 +34,12 @@ type AzureMachineProviderSpec struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Roles         []MachineRole `json:"roles,omitempty"`
-	Location      string        `json:"location"`
-	VMSize        string        `json:"vmSize"`
-	Image         Image         `json:"image"`
-	OSDisk        OSDisk        `json:"osDisk"`
-	SSHPublicKey  string        `json:"sshPublicKey"`
-	SSHPrivateKey string        `json:"sshPrivateKey"`
+	Location      string `json:"location"`
+	VMSize        string `json:"vmSize"`
+	Image         Image  `json:"image"`
+	OSDisk        OSDisk `json:"osDisk"`
+	SSHPublicKey  string `json:"sshPublicKey"`
+	SSHPrivateKey string `json:"sshPrivateKey"`
 }
 
 // KubeadmConfiguration holds the various configurations that kubeadm uses.

pkg/apis/azureprovider/v1alpha1/azuremachineproviderconfig_types.go

@@ -65,12 +65,11 @@ type AzureMachineProviderCondition struct {
 	Message string `json:"message"`
 }
 
-type MachineRole string
-
 const (
-	// TODO: Change references to "controlplane", instead of "Master" and lowercase both roles.
-	Master MachineRole = "Master"
-	Node   MachineRole = "Node"
+	// ControlPlane machine label
+	ControlPlane string = "controlplane"
+	// Node machine label
+	Node string = "node"
 )
 
 // Network encapsulates Azure networking resources.
@@ -112,10 +111,10 @@ var (
 	SecurityGroupBastion = SecurityGroupRole("bastion")
 
 	// SecurityGroupNode defines a Kubernetes workload node role
-	SecurityGroupNode = SecurityGroupRole("node")
+	SecurityGroupNode = SecurityGroupRole(Node)
 
 	// SecurityGroupControlPlane defines a Kubernetes control plane node role
-	SecurityGroupControlPlane = SecurityGroupRole("controlplane")
+	SecurityGroupControlPlane = SecurityGroupRole(ControlPlane)
 )
 
 // SecurityGroup defines an Azure security group.

pkg/apis/azureprovider/v1alpha1/types.go

@@ -5,6 +5,7 @@ go_library(
     srcs = [
         "actuator.go",
         "annotations.go",
+        "reconciler.go",
     ],
     importpath = "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators/machine",
     visibility = ["//visibility:public"],
@@ -29,12 +30,25 @@ go_library(
         "//vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1:go_default_library",
         "//vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1:go_default_library",
         "//vendor/sigs.k8s.io/cluster-api/pkg/controller/error:go_default_library",
+        "//vendor/sigs.k8s.io/cluster-api/pkg/util:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
     srcs = ["actuator_test.go"],
     embed = [":go_default_library"],
-    deps = ["//vendor/sigs.k8s.io/cluster-api/pkg/controller/machine:go_default_library"],
+    deps = [
+        "//pkg/apis/azureprovider/v1alpha1:go_default_library",
+        "//pkg/cloud/azure:go_default_library",
+        "//pkg/cloud/azure/actuators:go_default_library",
+        "//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute:go_default_library",
+        "//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library",
+        "//vendor/github.com/ghodss/yaml:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
+        "//vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1:go_default_library",
+        "//vendor/sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/fake:go_default_library",
+        "//vendor/sigs.k8s.io/cluster-api/pkg/controller/machine:go_default_library",
+    ],
 )