[PR #1477] [MERGED] Code reorg part 3 #2141

Closed
opened 2025-12-29 03:19:57 +01:00 by adam · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/1477
Author: @kradalby
Created: 5/26/2023
Status: Merged
Merged: 6/8/2023
Merged by: @kradalby

Base: mainHead: corereorg-p3


📝 Commits (10+)

  • ae26815 introduce mapper package
  • bcc3684 Map route into machine
  • 71e97c0 remove DB dependency of tailNode conversion, add test
  • 04be427 Remove complicated testcase obsoleated by tailNode test
  • a4f130d Add initial test for mapresponse
  • 9923ce0 Remove variables and leftovers of pregenerated ACL content
  • af825e9 Fix IPv6 in ACLs
  • 3cd915c move Config definitions into types
  • 86c22f9 move derp.go to derp module
  • 139dc90 move derp_server to derp server module

📊 Changes

42 files changed (+2361 additions, -1968 deletions)

View changed files

📝 cmd/headscale/cli/root.go (+5 -5)
📝 cmd/headscale/cli/utils.go (+3 -2)
📝 cmd/headscale/headscale_test.go (+7 -7)
📝 flake.nix (+151 -156)
hscontrol/api_common.go (+0 -115)
📝 hscontrol/app.go (+57 -70)
📝 hscontrol/auth.go (+29 -112)
📝 hscontrol/auth_legacy.go (+2 -2)
📝 hscontrol/auth_noise.go (+1 -1)
📝 hscontrol/db/db.go (+4 -7)
📝 hscontrol/db/machine.go (+53 -262)
📝 hscontrol/db/machine_test.go (+3 -3)
📝 hscontrol/db/routes_test.go (+0 -140)
📝 hscontrol/db/suite_test.go (+0 -1)
📝 hscontrol/db/users.go (+0 -31)
📝 hscontrol/db/users_test.go (+0 -148)
📝 hscontrol/derp/derp.go (+5 -28)
📝 hscontrol/derp/server/derp_server.go (+65 -53)
hscontrol/dns.go (+0 -220)
hscontrol/dns_test.go (+0 -404)

...and 22 more files

📄 Description

  1. Split and potentially rewrite hscontrol into packages (this might change) (#1477)
  • mapper, all code related to generating MapResponses (the map clients need to find their peers)
  • api, the code that implements our gRPC interface (For now, leave grpc in root)
  • derp, derp related code
  • dns, related code

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/juanfont/headscale/pull/1477 **Author:** [@kradalby](https://github.com/kradalby) **Created:** 5/26/2023 **Status:** ✅ Merged **Merged:** 6/8/2023 **Merged by:** [@kradalby](https://github.com/kradalby) **Base:** `main` ← **Head:** `corereorg-p3` --- ### 📝 Commits (10+) - [`ae26815`](https://github.com/juanfont/headscale/commit/ae268154af0cea9e3289fc336438408273e4b365) introduce mapper package - [`bcc3684`](https://github.com/juanfont/headscale/commit/bcc368481d82a7d6436c5c203092611f2971ea33) Map route into machine - [`71e97c0`](https://github.com/juanfont/headscale/commit/71e97c05f8819cdf6efdcffd2199a1bf117da8c2) remove DB dependency of tailNode conversion, add test - [`04be427`](https://github.com/juanfont/headscale/commit/04be42706b2550dde742d26208d971d15575ab53) Remove complicated testcase obsoleated by tailNode test - [`a4f130d`](https://github.com/juanfont/headscale/commit/a4f130dae0331825b1053f3833c96f53d0dfcdcd) Add initial test for mapresponse - [`9923ce0`](https://github.com/juanfont/headscale/commit/9923ce06111919bdc77eabb40e2c16261927b7e2) Remove variables and leftovers of pregenerated ACL content - [`af825e9`](https://github.com/juanfont/headscale/commit/af825e92896df67d67cdff422c17411d39747d69) Fix IPv6 in ACLs - [`3cd915c`](https://github.com/juanfont/headscale/commit/3cd915ccda554544a54cb808266b1db7031c231c) move Config definitions into types - [`86c22f9`](https://github.com/juanfont/headscale/commit/86c22f94eee8bb9c8271d26be87cf0c4812e8170) move derp.go to derp module - [`139dc90`](https://github.com/juanfont/headscale/commit/139dc90eedd2caef5cba1c105d7f4ce0725c3d32) move derp_server to derp server module ### 📊 Changes **42 files changed** (+2361 additions, -1968 deletions) <details> <summary>View changed files</summary> 📝 `cmd/headscale/cli/root.go` (+5 -5) 📝 `cmd/headscale/cli/utils.go` (+3 -2) 📝 `cmd/headscale/headscale_test.go` (+7 -7) 📝 `flake.nix` (+151 -156) ➖ `hscontrol/api_common.go` (+0 -115) 📝 `hscontrol/app.go` (+57 -70) 📝 `hscontrol/auth.go` (+29 -112) 📝 `hscontrol/auth_legacy.go` (+2 -2) 📝 `hscontrol/auth_noise.go` (+1 -1) 📝 `hscontrol/db/db.go` (+4 -7) 📝 `hscontrol/db/machine.go` (+53 -262) 📝 `hscontrol/db/machine_test.go` (+3 -3) 📝 `hscontrol/db/routes_test.go` (+0 -140) 📝 `hscontrol/db/suite_test.go` (+0 -1) 📝 `hscontrol/db/users.go` (+0 -31) 📝 `hscontrol/db/users_test.go` (+0 -148) 📝 `hscontrol/derp/derp.go` (+5 -28) 📝 `hscontrol/derp/server/derp_server.go` (+65 -53) ➖ `hscontrol/dns.go` (+0 -220) ➖ `hscontrol/dns_test.go` (+0 -404) _...and 22 more files_ </details> ### 📄 Description 3. Split and potentially rewrite hscontrol into packages (this might change) (#1477) - `mapper`, all code related to generating MapResponses (the map clients need to find their peers) - ~`api`, the code that implements our gRPC interface~ (For now, leave grpc in root) - `derp`, derp related code - `dns`, related code --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-29 03:19:57 +01:00
adam closed this issue 2025-12-29 03:19:57 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/headscale#2141