Merge pull request #1224 from CecileRobertMichon/backport-rg-fix

[backport-release-0.4] Do not add tags to managed resource group if err occurs

Author: k8s-ci-robot

cloud/services/groups/groups.go

@@ -58,7 +58,10 @@ func (s *Service) Reconcile(ctx context.Context) error {
 	if _, err := s.client.Get(ctx, s.Scope.ResourceGroup()); err == nil {
 		// resource group already exists, skip creation
 		return nil
+	} else if !azure.ResourceNotFound(err) {
+		return errors.Wrapf(err, "failed to get resource group %s", s.Scope.ResourceGroup())
 	}
+
 	s.Scope.V(2).Info("creating resource group", "resource group", s.Scope.ResourceGroup())
 	group := resources.Group{
 		Location: to.StringPtr(s.Scope.Location()),

cloud/services/groups/groups_test.go

@@ -49,6 +49,18 @@ func TestReconcileGroups(t *testing.T) {
 				m.Get(gomockinternal.AContext(), "my-rg").Return(resources.Group{}, nil)
 			},
 		},
+		{
+			name:          "return error when querying a resource group",
+			expectedError: "failed to get resource group my-rg: #: Internal Server Error: StatusCode=500",
+			expect: func(s *mock_groups.MockGroupScopeMockRecorder, m *mock_groups.MockclientMockRecorder) {
+				s.V(gomock.AssignableToTypeOf(2)).AnyTimes().Return(klogr.New())
+				s.ResourceGroup().AnyTimes().Return("my-rg")
+				s.Location().AnyTimes().Return("fake-location")
+				s.ClusterName().AnyTimes().Return("fake-cluster")
+				m.Get(gomockinternal.AContext(), "my-rg").Return(resources.Group{}, autorest.NewErrorWithResponse("", "", &http.Response{StatusCode: 500}, "Internal Server Error"))
+			},
+		},
+
 		{
 			name:          "create a resource group",
 			expectedError: "",