[PR #1195] [MERGED] Various tailcfg type fixes, expiry hardening and integration test #1954

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

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/1195
Author: @kradalby
Created: 2/2/2023
Status: Merged
Merged: 2/3/2023
Merged by: @kradalby

Base: mainHead: expiry-hardening


📝 Commits (10+)

  • 61cc57c Send control time in map response
  • fb7d5e4 Add TODOs for only sending patch updates
  • c30a351 Do not collect services, we dont support it
  • a9aa41d Sort tailcfg.Node creation as upstream
  • e230a82 Populate the tags field on node
  • d2daee7 Use pingAll helper for all integration pinging
  • 626ebdb Stop using deprecated string function
  • 9a91cbd Remove unused components from old integration tests
  • ef50018 Update changelog
  • 36d10c0 Add node expiry test

📊 Changes

18 files changed (+416 additions, -217 deletions)

View changed files

.github/workflows/test-integration-v2-TestExpireNode.yaml (+57 -0)
📝 CHANGELOG.md (+2 -0)
📝 api_common.go (+39 -7)
📝 derp_server.go (+2 -2)
📝 flake.nix (+1 -1)
📝 go.mod (+1 -0)
📝 go.sum (+2 -0)
📝 integration/auth_oidc_test.go (+11 -20)
📝 integration/auth_web_flow_test.go (+19 -34)
📝 integration/general_test.go (+113 -47)
📝 integration/scenario.go (+24 -1)
📝 integration/tailscale.go (+2 -1)
📝 integration/tsic/tsic.go (+63 -9)
integration/utils.go (+48 -0)
📝 integration_cli_test.go (+0 -1)
📝 integration_common_test.go (+0 -75)
📝 integration_embedded_derp_test.go (+2 -2)
📝 machine.go (+30 -17)

📄 Description

See individual commits.
QoL improvements.

Signed-off-by: Kristoffer Dalby kristoffer@tailscale.com


🔄 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/1195 **Author:** [@kradalby](https://github.com/kradalby) **Created:** 2/2/2023 **Status:** ✅ Merged **Merged:** 2/3/2023 **Merged by:** [@kradalby](https://github.com/kradalby) **Base:** `main` ← **Head:** `expiry-hardening` --- ### 📝 Commits (10+) - [`61cc57c`](https://github.com/juanfont/headscale/commit/61cc57c39beb6fe8ddc98d2e0ed9d97fb88ab31f) Send control time in map response - [`fb7d5e4`](https://github.com/juanfont/headscale/commit/fb7d5e458889f55c7d194c9eca3b002852cca98c) Add TODOs for only sending patch updates - [`c30a351`](https://github.com/juanfont/headscale/commit/c30a351d988847fc919f30028c042099b4f188d3) Do not collect services, we dont support it - [`a9aa41d`](https://github.com/juanfont/headscale/commit/a9aa41d613b02eb1ed9129885731430811673571) Sort tailcfg.Node creation as upstream - [`e230a82`](https://github.com/juanfont/headscale/commit/e230a823d183a2c16e9ee73eaafe40c949e5ab41) Populate the tags field on node - [`d2daee7`](https://github.com/juanfont/headscale/commit/d2daee7c5070f353f628d1e414fa0c8cb7734209) Use pingAll helper for all integration pinging - [`626ebdb`](https://github.com/juanfont/headscale/commit/626ebdb0b60fbd0c66b9efd9fae389021395fe6f) Stop using deprecated string function - [`9a91cbd`](https://github.com/juanfont/headscale/commit/9a91cbd8bf011dafb72e1456cdd95cac8f2a8d6c) Remove unused components from old integration tests - [`ef50018`](https://github.com/juanfont/headscale/commit/ef50018ca32eb439762056f4a533423e59946941) Update changelog - [`36d10c0`](https://github.com/juanfont/headscale/commit/36d10c0c91dd6eac7d713ad4e39cf97745af9ef6) Add node expiry test ### 📊 Changes **18 files changed** (+416 additions, -217 deletions) <details> <summary>View changed files</summary> ➕ `.github/workflows/test-integration-v2-TestExpireNode.yaml` (+57 -0) 📝 `CHANGELOG.md` (+2 -0) 📝 `api_common.go` (+39 -7) 📝 `derp_server.go` (+2 -2) 📝 `flake.nix` (+1 -1) 📝 `go.mod` (+1 -0) 📝 `go.sum` (+2 -0) 📝 `integration/auth_oidc_test.go` (+11 -20) 📝 `integration/auth_web_flow_test.go` (+19 -34) 📝 `integration/general_test.go` (+113 -47) 📝 `integration/scenario.go` (+24 -1) 📝 `integration/tailscale.go` (+2 -1) 📝 `integration/tsic/tsic.go` (+63 -9) ➕ `integration/utils.go` (+48 -0) 📝 `integration_cli_test.go` (+0 -1) 📝 `integration_common_test.go` (+0 -75) 📝 `integration_embedded_derp_test.go` (+2 -2) 📝 `machine.go` (+30 -17) </details> ### 📄 Description See individual commits. QoL improvements. Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> --- <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:01 +01:00
adam closed this issue 2025-12-29 03:19:01 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/headscale#1954