fix: review comments updates with names

Author: abhimanyu003

go/nautobotop/internal/nautobot/dcim/location.go

@@ -27,7 +27,7 @@ func (s *LocationService) Create(ctx context.Context, req nb.LocationRequest) (*
 		s.client.AddReport("createNewLocation", "failed to create", "model", req.Name, "error", err.Error(), "response_body", bodyString)
 		return nil, err
 	}
-	log.Info("CreateLocation", "created device type", locationType.Name)
+	log.Info("CreateLocation", "created location", locationType.Name)
 	return locationType, nil
 }
 
@@ -72,7 +72,7 @@ func (s *LocationService) Update(ctx context.Context, id string, req nb.Location
 		s.client.AddReport("UpdateLocation", "failed to update UpdateLocation", "id", id, "model", req.Name, "error", err.Error(), "response_body", bodyString)
 		return nil, err
 	}
-	log.Info("successfully updated device type", "id", id, "model", locationType.GetName())
+	log.Info("successfully updated location", "id", id, "model", locationType.GetName())
 	return locationType, nil
 }
 

go/nautobotop/internal/nautobot/sync/location.go

@@ -72,23 +72,24 @@ func (s *LocationSync) syncLocationRecursive(ctx context.Context, location model
 func (s *LocationSync) syncSingleLocation(ctx context.Context, location models.Location, parentID *string) (*string, error) {
 	existingLocation := s.locationSvc.GetByName(ctx, location.Name)
 
-	locationTypeRequest := nb.LocationRequest{
-		Name:         location.Name,
+	locationRequest := nb.LocationRequest{
+		Name: location.Name,
+
 		Description:  nb.PtrString(location.Description),
 		Parent:       buildParentReference(parentID),
 		LocationType: s.buildLocationTypeReference(ctx, location.LocationType),
 		Status:       s.buildStatusReference(ctx, location.Status),
 	}
 
 	if existingLocation.Id == nil {
-		return s.createLocation(ctx, locationTypeRequest)
+		return s.createLocation(ctx, locationRequest)
 	}
 
-	if !helpers.CompareJSONFields(existingLocation, locationTypeRequest) {
-		return s.updateLocationType(ctx, *existingLocation.Id, locationTypeRequest)
+	if !helpers.CompareJSONFields(existingLocation, locationRequest) {
+		return s.updateLocationType(ctx, *existingLocation.Id, locationRequest)
 	}
 
-	log.Info("location  unchanged, skipping update", "name", locationTypeRequest.Name)
+	log.Info("location  unchanged, skipping update", "name", locationRequest.Name)
 	return existingLocation.Id, nil
 }
 

go/nautobotop/internal/nautobot/sync/rackGroup.go

@@ -41,7 +41,7 @@ func (s *RackGroupSync) SyncAll(ctx context.Context, data map[string]string) err
 	}
 
 	for _, l := range rackGroups.RackGroup {
-		if err := s.syncLocationRecursive(ctx, l, nil); err != nil {
+		if err := s.syncRackGroupRecursive(ctx, l, nil); err != nil {
 			return err
 		}
 	}
@@ -50,15 +50,15 @@ func (s *RackGroupSync) SyncAll(ctx context.Context, data map[string]string) err
 	return nil
 }
 
-// syncLocationRecursive processes a location  and all its children recursively
-func (s *RackGroupSync) syncLocationRecursive(ctx context.Context, rackGroup models.RackGroup, parentID *string) error {
+// syncRackGroupRecursive processes a rackGroups and all its children recursively
+func (s *RackGroupSync) syncRackGroupRecursive(ctx context.Context, rackGroup models.RackGroup, parentID *string) error {
 	currentID, err := s.syncSingleRackGroup(ctx, rackGroup, parentID)
 	if err != nil {
 		return err
 	}
 
 	for _, child := range rackGroup.Children {
-		if err := s.syncLocationRecursive(ctx, child, currentID); err != nil {
+		if err := s.syncRackGroupRecursive(ctx, child, currentID); err != nil {
 			return err
 		}
 	}
@@ -85,7 +85,7 @@ func (s *RackGroupSync) syncSingleRackGroup(ctx context.Context, rackGroup model
 		return s.updateRackGroup(ctx, *existingRackGroup.Id, rackGroupRequest)
 	}
 
-	log.Info("location  unchanged, skipping update", "name", rackGroupRequest.Name)
+	log.Info("rackGroup is unchanged, skipping update", "name", rackGroupRequest.Name)
 	return rackGroupRequest.Id, nil
 }
 
@@ -95,21 +95,21 @@ func (s *RackGroupSync) createRackGroup(ctx context.Context, request nb.RackGrou
 	if err != nil || createdRackGroup == nil {
 		return nil, fmt.Errorf("failed to create rackgroup  %s: %w", request.Name, err)
 	}
-	log.Info("location  created", "name", request.Name)
+	log.Info("rackGroup created", "name", request.Name)
 	return createdRackGroup.Id, nil
 }
 
 // updateRackGroup updates an existing location  in Nautobot
 func (s *RackGroupSync) updateRackGroup(ctx context.Context, id string, request nb.RackGroupRequest) (*string, error) {
 	updatedRackGroup, err := s.rackGroupSvc.Update(ctx, id, request)
 	if err != nil || updatedRackGroup == nil {
-		return nil, fmt.Errorf("failed to update location  %s: %w", request.Name, err)
+		return nil, fmt.Errorf("failed to update rackGroup  %s: %w", request.Name, err)
 	}
-	log.Info("location  updated", "name", request.Name)
+	log.Info("rackGroup  updated", "name", request.Name)
 	return updatedRackGroup.Id, nil
 }
 
-// deleteObsoleteRackGroup removes location that are not defined in YAML
+// deleteObsoleteRackGroup removes rackGroup that are not defined in YAML
 func (s *RackGroupSync) deleteObsoleteRackGroup(ctx context.Context, rackGroups models.RackGroups) {
 	desiredRackGroups := make(map[string]models.RackGroup)
 	for _, rackGroup := range rackGroups.RackGroup {
@@ -123,19 +123,19 @@ func (s *RackGroupSync) deleteObsoleteRackGroup(ctx context.Context, rackGroups
 	}
 
 	obsoleteRackGroup := lo.OmitByKeys(existingMap, lo.Keys(desiredRackGroups))
-	s.deleteLocationWithDependencies(ctx, obsoleteRackGroup)
+	s.deleteRackGroupWithDependencies(ctx, obsoleteRackGroup)
 }
 
-// collectAllRackGroups recursively collects all location including nested children
+// collectAllRackGroups recursively collects all rackGroups including nested children
 func (s *RackGroupSync) collectAllRackGroups(rackGroup models.RackGroup, result map[string]models.RackGroup) {
 	result[rackGroup.Name] = rackGroup
 	for _, child := range rackGroup.Children {
 		s.collectAllRackGroups(child, result)
 	}
 }
 
-// deleteLocationWithDependencies deletes location in correct order
-func (s *RackGroupSync) deleteLocationWithDependencies(ctx context.Context, obsoleteRackGroup map[string]nb.RackGroup) {
+// deleteRackGroupWithDependencies deletes rackGroups in correct order
+func (s *RackGroupSync) deleteRackGroupWithDependencies(ctx context.Context, obsoleteRackGroup map[string]nb.RackGroup) {
 	idToName := make(map[string]string)
 	for name, rackGroup := range obsoleteRackGroup {
 		if rackGroup.Id != nil {
@@ -159,7 +159,7 @@ func (s *RackGroupSync) deleteLocationWithDependencies(ctx context.Context, obso
 	}
 }
 
-// deleteRackGroupRecursive deletes a location  and all its children recursively
+// deleteRackGroupRecursive deletes a rackGroup  and all its children recursively
 func (s *RackGroupSync) deleteRackGroupRecursive(ctx context.Context, name string, obsoleteRackGroup map[string]nb.RackGroup, childrenMap map[string][]string, deleted map[string]bool) {
 	if deleted[name] {
 		return