fix nil exception

Signed-off-by: Ashutosh Kumar <[email protected]>
kubernetes-sigs · Mar 24, 2022 · 1ad6487 · 1ad6487
1 parent 2488e92
commit 1ad6487
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/azure/services/roleassignments/roleassignments.go b/azure/services/roleassignments/roleassignments.go
@@ -20,6 +20,7 @@ import (
 	"context"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-04-01/compute"
+	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/pkg/errors"
 	"sigs.k8s.io/cluster-api-provider-azure/azure"
 	"sigs.k8s.io/cluster-api-provider-azure/azure/services/async"
@@ -73,6 +74,12 @@ func (s *Service) Reconcile(ctx context.Context) error {
 	defer cancel()
 	log.V(2).Info("reconciling role assignment")
 
+	// Return early if there is no roleassignment spec to reconcile.
+	if len(s.Scope.RoleAssignmentSpecs(to.StringPtr(""))) < 1 {
+		log.V(2).Info("no role assignment spec to reconcile")
+		return nil
+	}
+
 	var principalID *string
 	resourceType := s.Scope.RoleAssignmentResourceType()
 	switch resourceType {

diff --git a/azure/services/roleassignments/roleassignments_test.go b/azure/services/roleassignments/roleassignments_test.go
@@ -72,7 +72,8 @@ func TestReconcileRoleAssignmentsVM(t *testing.T) {
 				s.ResourceGroup().Return("my-rg")
 				s.Name().Return(fakeRoleAssignment1.MachineName)
 				s.RoleAssignmentResourceType().Return("VirtualMachine")
-				s.RoleAssignmentSpecs(&fakePrincipalID).AnyTimes().Return(fakeRoleAssignmentSpecs[:1])
+				s.RoleAssignmentSpecs(to.StringPtr("")).Return(fakeRoleAssignmentSpecs[:1])
+				s.RoleAssignmentSpecs(&fakePrincipalID).Return(fakeRoleAssignmentSpecs[:1])
 				m.Get(gomockinternal.AContext(), &fakeVMSpec).Return(compute.VirtualMachine{
 					Identity: &compute.VirtualMachineIdentity{
 						PrincipalID: &fakePrincipalID,
@@ -91,7 +92,7 @@ func TestReconcileRoleAssignmentsVM(t *testing.T) {
 				s.ResourceGroup().Return("my-rg")
 				s.Name().Return(fakeRoleAssignment1.MachineName)
 				s.RoleAssignmentResourceType().Return("VirtualMachine")
-				s.RoleAssignmentSpecs(&fakePrincipalID).AnyTimes().Return(fakeRoleAssignmentSpecs[:1])
+				s.RoleAssignmentSpecs(to.StringPtr("")).Return(fakeRoleAssignmentSpecs[:1])
 				m.Get(gomockinternal.AContext(), &fakeVMSpec).Return(compute.VirtualMachine{}, autorest.NewErrorWithResponse("", "", &http.Response{StatusCode: 500}, "Internal Server Error"))
 			},
 		},
@@ -105,6 +106,7 @@ func TestReconcileRoleAssignmentsVM(t *testing.T) {
 				s.ResourceGroup().Return("my-rg")
 				s.Name().Return(fakeRoleAssignment1.MachineName)
 				s.RoleAssignmentResourceType().Return("VirtualMachine")
+				s.RoleAssignmentSpecs(to.StringPtr("")).Return(fakeRoleAssignmentSpecs[0:1])
 				s.RoleAssignmentSpecs(&fakePrincipalID).Return(fakeRoleAssignmentSpecs[0:1])
 				m.Get(gomockinternal.AContext(), &fakeVMSpec).Return(compute.VirtualMachine{
 					Identity: &compute.VirtualMachineIdentity{
@@ -160,6 +162,7 @@ func TestReconcileRoleAssignmentsVMSS(t *testing.T) {
 			expect: func(s *mock_roleassignments.MockRoleAssignmentScopeMockRecorder,
 				r *mock_async.MockReconcilerMockRecorder,
 				mvmss *mock_scalesets.MockClientMockRecorder) {
+				s.RoleAssignmentSpecs(to.StringPtr("")).Return(fakeRoleAssignmentSpecs[1:2])
 				s.RoleAssignmentSpecs(&fakePrincipalID).Return(fakeRoleAssignmentSpecs[1:2])
 				s.RoleAssignmentResourceType().Return(azure.VirtualMachineScaleSet)
 				s.ResourceGroup().Return("my-rg")
@@ -181,6 +184,7 @@ func TestReconcileRoleAssignmentsVMSS(t *testing.T) {
 				s.RoleAssignmentResourceType().Return(azure.VirtualMachineScaleSet)
 				s.ResourceGroup().Return("my-rg")
 				s.Name().Return("test-vmss")
+				s.RoleAssignmentSpecs(to.StringPtr("")).Return(fakeRoleAssignmentSpecs[1:2])
 				mvmss.Get(gomockinternal.AContext(), "my-rg", "test-vmss").Return(compute.VirtualMachineScaleSet{},
 					autorest.NewErrorWithResponse("", "", &http.Response{StatusCode: 500}, "Internal Server Error"))
 			},
@@ -191,6 +195,7 @@ func TestReconcileRoleAssignmentsVMSS(t *testing.T) {
 			expect: func(s *mock_roleassignments.MockRoleAssignmentScopeMockRecorder,
 				r *mock_async.MockReconcilerMockRecorder,
 				mvmss *mock_scalesets.MockClientMockRecorder) {
+				s.RoleAssignmentSpecs(to.StringPtr("")).Return(fakeRoleAssignmentSpecs[1:2])
 				s.RoleAssignmentSpecs(&fakePrincipalID).Return(fakeRoleAssignmentSpecs[1:2])
 				s.RoleAssignmentResourceType().Return(azure.VirtualMachineScaleSet)
 				s.ResourceGroup().Return("my-rg")