Skip to content

Strip dev_addr from ids in TTS exporter #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vlasebian merged 4 commits into from
Apr 29, 2026
Merged

Strip dev_addr from ids in TTS exporter #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
211b110
tts: Strip ids.dev_addr from exported devices
vlasebian Apr 29, 2026
2c657fd
tts: Fix application mode in TTS iterator
vlasebian Apr 29, 2026
13d3af4
Ignore go vendor directory
vlasebian Apr 29, 2026
762abd8
Update changelog
vlasebian Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@

# macOS related
*.DS_store

# Go
**/vendor/*
5 changes: 2 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

### Fixed

- Strip ids.dev_addr from exported devices

## [v0.12.0] (2024-03-13)

### Added
Expand Down Expand Up @@ -145,6 +147,3 @@ NOTE: These links should respect backports. See https://github.com/TheThingsNetw
-->

[unreleased]: https://github.com/TheThingsNetwork/lorawan-stack-migrate/v0.7.0...master
[0.7.0]: https://github.com/TheThingsNetwork/lorawan-stack-migrate/compare/v0.6.0...v0.7.0
[0.6.0]: https://github.com/TheThingsNetwork/lorawan-stack-migrate/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/TheThingsNetwork/lorawan-stack-migrate/compare/v0.4.0...v0.5.0
12 changes: 10 additions & 2 deletions pkg/source/tts/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,15 @@ func (s Source) ExportDevice(devID string) (*ttnpb.EndDevice, error) {
if err := validateDeviceIds(dev.Ids, res.Ids); err != nil {
return nil, err
}
paths := ttnpb.AddFields(nsPaths, ttnpb.AddFields(asPaths, ttnpb.AddFields(jsPaths, "ids.dev_addr")...)...)
paths := ttnpb.AddFields(nsPaths, ttnpb.AddFields(asPaths, jsPaths...)...)
if err := dev.SetFields(res, paths...); err != nil {
return nil, err
}
// Clear ids.dev_addr (denormalized session state) so the export can be
// re-imported via the CLI; session.dev_addr remains the source of truth.
if dev.Ids != nil {
dev.Ids.DevAddr = nil
}
Comment thread
johanstokking marked this conversation as resolved.
// Clear all "{server}_address" fields from exported device
if err := dev.SetFields(nil, "application_server_address", "join_server_address", "network_server_address"); err != nil {
return nil, err
Expand Down Expand Up @@ -108,7 +113,10 @@ func (s Source) ExportDevice(devID string) (*ttnpb.EndDevice, error) {
}

// Iterator implements source.Source.
func (s Source) Iterator(bool) iterator.Iterator {
func (s Source) Iterator(isApplication bool) iterator.Iterator {
if isApplication && s.config.AppID != "" {
return iterator.NewListIterator([]string{s.config.AppID})
}
return iterator.NewReaderIterator(os.Stdin, '\n')
}

Expand Down
Loading