addressing pr feedback

Azure · Apr 28, 2020 · f0f32c3 · f0f32c3
1 parent a2759c7
commit f0f32c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/api/v1alpha1/cosmosdb_types.go b/api/v1alpha1/cosmosdb_types.go
@@ -69,7 +69,7 @@ const (
 
 // CosmosDBLocation defines one or more locations for geo-redundancy and high availability
 type CosmosDBLocation struct {
-	LocationName     string `json:"locationName,omitempty"`
+	LocationName     string `json:"locationName"`
 	FailoverPriority int32  `json:"failoverPriority"`
 	IsZoneRedundant  bool   `json:"isZoneRedundant,omitempty"`
 }

diff --git a/pkg/resourcemanager/cosmosdbs/cosmosdb_reconcile.go b/pkg/resourcemanager/cosmosdbs/cosmosdb_reconcile.go
@@ -199,15 +199,17 @@ func (m *AzureCosmosDBManager) Delete(ctx context.Context, obj runtime.Object, o
 			errhelp.ResourceGroupNotFoundErrorCode,
 		}
 		if helpers.ContainsString(notFound, azerr.Type) {
-			return false, m.deleteSecret(ctx, instance)
+			_ = m.deleteSecret(ctx, instance)
+			return false, nil
 		}
 
 		// unhandled error
 		instance.Status.Message = azerr.Error()
 		return false, err
 	}
 
-	return false, m.deleteSecret(ctx, instance)
+	_ = m.deleteSecret(ctx, instance)
+	return false, nil
 }
 
 // GetParents returns the parents of cosmosdb