Fix terminate error (#8)

* check error message instead of code for instance not found

* fix test

Author: kianjones4

controllers/rollingupgrade_controller.go

@@ -230,9 +230,11 @@ func (r *RollingUpgradeReconciler) TerminateNode(ruObj *upgrademgrv1alpha1.Rolli
 	result, err := svc.TerminateInstanceInAutoScalingGroup(input)
 	if err != nil {
 		if aerr, ok := err.(awserr.Error); ok {
-			switch aerr.Code() {
-			case "InvalidInstanceID.NotFound":
+			if strings.Contains(aerr.Message(), "not found") {
 				log.Printf("Instance %s not found. Moving on\n", instanceID)
+				return nil
+			}
+			switch aerr.Code() {
 			case autoscaling.ErrCodeScalingActivityInProgressFault:
 				log.Println(autoscaling.ErrCodeScalingActivityInProgressFault, aerr.Error())
 			case autoscaling.ErrCodeResourceContentionFault:
@@ -637,7 +639,7 @@ func (r *RollingUpgradeReconciler) RandomUpdate(ctx *context.Context, ruObj *upg
 
 	value, ok := r.ruObjNameToASG.Load(ruObj.Name)
 	if !ok {
-		msg := "Failed to find rollup name in map."
+		msg := "Failed to find rollingUpgrade name in map."
 		log.Printf(msg)
 		return 0, errors.New(msg)
 	}

controllers/rollingupgrade_controller_test.go

@@ -322,7 +322,7 @@ func TestTerminateNodeErrorNotFound(t *testing.T) {
 	ruObj := &upgrademgrv1alpha1.RollingUpgrade{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default"}}
 	rcRollingUpgrade := &RollingUpgradeReconciler{ClusterState: NewClusterState()}
 	mockAutoscalingGroup := MockAutoscalingGroup{errorFlag: true, awsErr: awserr.New("InvalidInstanceID.NotFound",
-		"some message",
+		"ValidationError: Instance Id not found - No managed instance found for instance ID i-0bba",
 		nil)}
 
 	err := rcRollingUpgrade.TerminateNode(ruObj, mockNode, mockAutoscalingGroup)