dr: Rename methods

pkg/devicerepository/grpc_test.go

@@ -116,7 +116,7 @@ func (s *mockStore) GetProvisioningInfo(req store.GetProvisioningInfoRequest) (*
 	return s.provisioningInfo, s.err
 }
 
-func (s *mockStore) GetEndDeviceProfilesV2(req store.GetEndDeviceProfilesV2Request) (*store.GetEndDeviceProfilesV2Response, error) {
+func (s *mockStore) GetEndDeviceProfileIdentifiers(req store.GetEndDeviceProfileIdentifiersRequest) (*store.GetEndDeviceProfileIdentifiersResponse, error) {
 	return nil, nil //nolint:nilnil
 }
 

pkg/devicerepository/store/bleve/init.go

@@ -215,15 +215,15 @@ func (c Config) Initialize(ctx context.Context, lorawanDevicesPath string, overw
 		}
 
 		// Add the end device provisioning info to the index.
-		endDeviceProfiles, err := s.GetEndDeviceProfilesV2(store.GetEndDeviceProfilesV2Request{BrandID: b.BrandID})
+		endDeviceProfiles, err := s.GetEndDeviceProfileIdentifiers(store.GetEndDeviceProfileIdentifiersRequest{BrandID: b.BrandID})
 		if err != nil && !errors.IsNotFound(err) {
 			return err
 		}
 		if errors.IsNotFound(err) {
 			continue
 		}
 
-		for _, endDeviceProfile := range endDeviceProfiles.EndDeviceProfiles {
+		for _, endDeviceProfile := range endDeviceProfiles.EndDeviceProfileIdentifiers {
 			vendorProfileID, err := strconv.ParseUint(endDeviceProfile.VendorProfileID, 10, 32)
 			if err != nil {
 				return err

pkg/devicerepository/store/bleve/store.go

@@ -287,8 +287,8 @@ func (s *bleveStore) GetProvisioningInfo(req store.GetProvisioningInfoRequest) (
 	}, nil
 }
 
-func (s *bleveStore) GetEndDeviceProfilesV2(req store.GetEndDeviceProfilesV2Request) (*store.GetEndDeviceProfilesV2Response, error) {
-	return s.store.GetEndDeviceProfilesV2(req)
+func (s *bleveStore) GetEndDeviceProfileIdentifiers(req store.GetEndDeviceProfileIdentifiersRequest) (*store.GetEndDeviceProfileIdentifiersResponse, error) {
+	return s.store.GetEndDeviceProfileIdentifiers(req)
 }
 
 // GetUplinkDecoder retrieves the codec for decoding uplink messages.

pkg/devicerepository/store/interface.go

@@ -90,12 +90,12 @@ type GetProvisioningInfoResponse struct {
 	ProvisioningInfo *ttnpb.GetEndDeviceProvisioningInfoResponse
 }
 
-type GetEndDeviceProfilesV2Request struct {
+type GetEndDeviceProfileIdentifiersRequest struct {
 	BrandID string
 }
 
-type GetEndDeviceProfilesV2Response struct {
-	EndDeviceProfiles []*EndDeviceProfileV2
+type GetEndDeviceProfileIdentifiersResponse struct {
+	EndDeviceProfileIdentifiers []*EndDeviceProfileIdentifiers
 }
 
 // Store contains end device definitions.
@@ -106,9 +106,9 @@ type Store interface {
 	GetModels(GetModelsRequest) (*GetModelsResponse, error)
 	// GetEndDeviceProfiles lists available LoRaWAN end device profile definitions.
 	GetEndDeviceProfiles(GetEndDeviceProfilesRequest) (*GetEndDeviceProfilesResponse, error)
-	// GetEndDeviceProfilesV2 retrieves end device profiles from the vendor index file, instead
-	// of the profiles embedded in the end device model.
-	GetEndDeviceProfilesV2(GetEndDeviceProfilesV2Request) (*GetEndDeviceProfilesV2Response, error)
+	// GetEndDeviceProfileIdentifiers retrieves end device profile identifiers from
+	// the vendor index file.
+	GetEndDeviceProfileIdentifiers(GetEndDeviceProfileIdentifiersRequest) (*GetEndDeviceProfileIdentifiersResponse, error)
 	// GetTemplate retrieves an end device template for an end device definition.
 	GetTemplate(*ttnpb.GetTemplateRequest, *EndDeviceProfile) (*ttnpb.EndDeviceTemplate, error)
 	// GetProvisioningInfo retrieves end device information by vendor ID and vendor profile ID.

pkg/devicerepository/store/profiles.go

@@ -64,18 +64,18 @@ type EndDeviceProfile struct {
 	Supports32BitFCnt         bool                  `yaml:"supports32bitFCnt" json:"supports_32_bit_f_cnt"`
 }
 
-// EndDeviceProfileV2 is the profile of a LoRaWAN end device that is mentioned in the vendor index file
-// instead of being embedded in the end device profile.
-type EndDeviceProfileV2 struct {
+// EndDeviceProfileIdentifiers contains the profile identifiers of a LoRaWAN end device that
+// is mentioned in the vendor index file (not embedded in the device model).
+type EndDeviceProfileIdentifiers struct {
 	VendorProfileID string `yaml:"vendorProfileID"`
 	// First profile format.
 	EndDeviceID     string `yaml:"endDeviceID"`
 	FirmwareVersion string `yaml:"firmwareVersion"`
 	HardwareVersion string `yaml:"hardwareVersion"`
 	Region          string `yaml:"region"`
 	// Second profile format.
-	ID    string `yaml:"id"`
-	Codec string `yaml:"codec"`
+	ProfileID string `yaml:"id"`
+	Codec     string `yaml:"codec"`
 }
 
 // pingSlotPeriodToPB maps LoRaWAN schema ping slot period to ttnpb.PingSlotPeriod enum values.

pkg/devicerepository/store/remote/remote.go

@@ -325,13 +325,13 @@ func (s *remoteStore) GetProvisioningInfo(req store.GetProvisioningInfoRequest)
 		return nil, errBrandNotFound.WithAttributes("vendor_id", req.VendorID)
 	}
 
-	endDeviceProfiles, err := s.GetEndDeviceProfilesV2(store.GetEndDeviceProfilesV2Request{BrandID: brandID})
+	endDeviceProfiles, err := s.GetEndDeviceProfileIdentifiers(store.GetEndDeviceProfileIdentifiersRequest{BrandID: brandID})
 	if err != nil {
 		return nil, err
 	}
 
 	vendorProfileID := strconv.Itoa(int(req.VendorProfileID))
-	for _, endDeviceProfile := range endDeviceProfiles.EndDeviceProfiles {
+	for _, endDeviceProfile := range endDeviceProfiles.EndDeviceProfileIdentifiers {
 		if endDeviceProfile.VendorProfileID != vendorProfileID {
 			continue
 		}
@@ -384,7 +384,7 @@ func (s *remoteStore) getBrandIDByVendorID(vendorID uint32) (string, error) {
 	return "", errBrandNotFound.WithAttributes("vendor_id", vendorID)
 }
 
-func (s *remoteStore) GetEndDeviceProfilesV2(req store.GetEndDeviceProfilesV2Request) (*store.GetEndDeviceProfilesV2Response, error) {
+func (s *remoteStore) GetEndDeviceProfileIdentifiers(req store.GetEndDeviceProfileIdentifiersRequest) (*store.GetEndDeviceProfileIdentifiersResponse, error) {
 	b, err := s.fetcher.File("vendor", req.BrandID, "index.yaml")
 	if err != nil {
 		return nil, errBrandNotFound.WithAttributes("brand_id", req.BrandID)
@@ -395,13 +395,13 @@ func (s *remoteStore) GetEndDeviceProfilesV2(req store.GetEndDeviceProfilesV2Req
 		return nil, err
 	}
 
-	vendorProfiles := make([]*store.EndDeviceProfileV2, 0, len(index.ProfileIDs))
+	vendorProfiles := make([]*store.EndDeviceProfileIdentifiers, 0, len(index.ProfileIDs))
 	for profileID, profile := range index.ProfileIDs {
 		if profile.EndDeviceID == "" {
 			continue
 		}
 
-		vendorProfiles = append(vendorProfiles, &store.EndDeviceProfileV2{
+		vendorProfiles = append(vendorProfiles, &store.EndDeviceProfileIdentifiers{
 			VendorProfileID: profileID,
 			EndDeviceID:     profile.EndDeviceID,
 			FirmwareVersion: profile.FirmwareVersion,
@@ -410,8 +410,8 @@ func (s *remoteStore) GetEndDeviceProfilesV2(req store.GetEndDeviceProfilesV2Req
 		})
 	}
 
-	return &store.GetEndDeviceProfilesV2Response{
-		EndDeviceProfiles: vendorProfiles,
+	return &store.GetEndDeviceProfileIdentifiersResponse{
+		EndDeviceProfileIdentifiers: vendorProfiles,
 	}, nil
 }
 

pkg/devicerepository/store/remote/schema.go

@@ -61,8 +61,8 @@ type VendorsIndex struct {
 
 // VendorEndDevicesIndex is the format of the `vendor/<vendor-id>/index.yaml` file.
 type VendorEndDevicesIndex struct {
-	EndDevices []string                            `yaml:"endDevices"`
-	ProfileIDs map[string]store.EndDeviceProfileV2 `yaml:"profileIDs,omitempty"`
+	EndDevices []string                                     `yaml:"endDevices"`
+	ProfileIDs map[string]store.EndDeviceProfileIdentifiers `yaml:"profileIDs,omitempty"`
 }
 
 // EndDeviceModel is the format of the `vendor/<vendor-id>/<model-id>.yaml` file.