Fix ELB panic on deletion

Signed-off-by: Vince Prignano <vincepri@vmware.com>

pkg/cloud/aws/services/elb/BUILD.bazel

@@ -24,13 +24,20 @@ go_library(
 
 go_test(
     name = "go_default_test",
-    srcs = ["service_test.go"],
+    srcs = [
+        "loadbalancer_test.go",
+        "service_test.go",
+    ],
     embed = [":go_default_library"],
     deps = [
+        "//pkg/apis/awsprovider/v1alpha1:go_default_library",
         "//pkg/cloud/aws/actuators:go_default_library",
         "//pkg/cloud/aws/services/ec2/mock_ec2iface:go_default_library",
         "//pkg/cloud/aws/services/elb/mock_elbiface:go_default_library",
+        "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library",
+        "//vendor/github.com/aws/aws-sdk-go/service/elb:go_default_library",
         "//vendor/github.com/golang/mock/gomock:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1:go_default_library",
     ],
 )

pkg/cloud/aws/services/elb/loadbalancer.go

@@ -81,19 +81,18 @@ func (s *Service) GetAPIServerDNSName() (string, error) {
 func (s *Service) DeleteLoadbalancers() error {
 	s.scope.V(2).Info("Deleting load balancers")
 
-	// Get default api server spec
-	spec := s.getAPIServerClassicELBSpec()
+	// Get default api server name.
+	elbName := GenerateELBName(s.scope.Name(), v1alpha1.APIServerRoleTagValue)
 
-	// Describe or create.
-	apiELB, err := s.describeClassicELB(spec.Name)
-	if IsNotFound(err) {
-		return nil
-	}
-	if err != nil {
+	// Describe and delete if exists.
+	if _, err := s.describeClassicELB(elbName); err != nil {
+		if IsNotFound(err) {
+			return nil
+		}
 		return err
 	}
 
-	if err := s.deleteClassicELBAndWait(apiELB.Name); err != nil {
+	if err := s.deleteClassicELBAndWait(elbName); err != nil {
 		return err
 	}
 
@@ -137,7 +136,6 @@ func GenerateELBName(clusterName string, elbName string) string {
 }
 
 func (s *Service) getAPIServerClassicELBSpec() *v1alpha1.ClassicELB {
-
 	res := &v1alpha1.ClassicELB{
 		Name:   GenerateELBName(s.scope.Name(), v1alpha1.APIServerRoleTagValue),
 		Scheme: v1alpha1.ClassicELBSchemeInternetFacing,

pkg/cloud/aws/services/elb/loadbalancer_test.go

@@ -0,0 +1,100 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package elb
+
+import (
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/elb"
+	"github.com/golang/mock/gomock"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsprovider/v1alpha1"
+	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/actuators"
+	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/services/ec2/mock_ec2iface"
+	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/services/elb/mock_elbiface"
+	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
+)
+
+func TestDeleteLoadBalancers(t *testing.T) {
+	mockCtrl := gomock.NewController(t)
+	defer mockCtrl.Finish()
+
+	testCases := []struct {
+		name   string
+		expect func(m *mock_elbiface.MockELBAPIMockRecorder)
+	}{
+		{
+			name: "elb exists, it deletes it",
+			expect: func(m *mock_elbiface.MockELBAPIMockRecorder) {
+				m.DescribeLoadBalancers(gomock.Any()).Return(&elb.DescribeLoadBalancersOutput{
+					LoadBalancerDescriptions: []*elb.LoadBalancerDescription{
+						{
+							LoadBalancerName: aws.String("test-cluster-apiserver"),
+							VPCId:            aws.String("test-vpc"),
+							Scheme:           aws.String(string(v1alpha1.ClassicELBSchemeInternetFacing)),
+						},
+					},
+				}, nil)
+
+				m.DescribeLoadBalancerAttributes(gomock.Any()).Return(&elb.DescribeLoadBalancerAttributesOutput{
+					LoadBalancerAttributes: &elb.LoadBalancerAttributes{},
+				}, nil)
+
+				m.DeleteLoadBalancer(&elb.DeleteLoadBalancerInput{
+					LoadBalancerName: aws.String("test-cluster-apiserver"),
+				})
+
+				m.DescribeLoadBalancers(gomock.Any()).Return(&elb.DescribeLoadBalancersOutput{}, nil)
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			ec2Mock := mock_ec2iface.NewMockEC2API(mockCtrl)
+			elbMock := mock_elbiface.NewMockELBAPI(mockCtrl)
+
+			scope, err := actuators.NewScope(actuators.ScopeParams{
+				Cluster: &clusterv1.Cluster{
+					ObjectMeta: metav1.ObjectMeta{Name: "test-cluster"},
+				},
+				AWSClients: actuators.AWSClients{
+					EC2: ec2Mock,
+					ELB: elbMock,
+				},
+			})
+
+			scope.ClusterConfig = &v1alpha1.AWSClusterProviderSpec{
+				NetworkSpec: v1alpha1.NetworkSpec{
+					VPC: v1alpha1.VPCSpec{
+						ID: "test-vpc",
+					},
+				},
+			}
+			if err != nil {
+				t.Fatalf("Failed to create test context: %v", err)
+			}
+
+			tc.expect(elbMock.EXPECT())
+			s := NewService(scope)
+			if err := s.DeleteLoadbalancers(); err != nil {
+				t.Fatalf("got an unexpected error: %v", err)
+			}
+		})
+	}
+}