Skip to content

Commit abd152e

Browse files
authored
[misc] Separate shared code dependencies (#4288)
* Separate shared code dependencies * Fix import * Test respective shared code * Update openapi ref * Fix test * Fix test path
1 parent 1d5e871 commit abd152e

File tree

150 files changed

+252
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+252
-191
lines changed
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Check License Dependencies
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
8+
jobs:
9+
check-dependencies:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Check for problematic license dependencies
16+
run: |
17+
echo "Checking for dependencies on management/, signal/, and relay/ packages..."
18+
19+
# Find all directories except the problematic ones and system dirs
20+
FOUND_ISSUES=0
21+
find . -maxdepth 1 -type d -not -name "." -not -name "management" -not -name "signal" -not -name "relay" -not -name ".git*" | sort | while read dir; do
22+
echo "=== Checking $dir ==="
23+
# Search for problematic imports, excluding test files
24+
RESULTS=$(grep -r "github.com/netbirdio/netbird/\(management\|signal\|relay\)" "$dir" --include="*.go" | grep -v "_test.go" | grep -v "test_" | grep -v "/test/" || true)
25+
if [ ! -z "$RESULTS" ]; then
26+
echo "❌ Found problematic dependencies:"
27+
echo "$RESULTS"
28+
FOUND_ISSUES=1
29+
else
30+
echo "✓ No problematic dependencies found"
31+
fi
32+
done
33+
if [ $FOUND_ISSUES -eq 1 ]; then
34+
echo ""
35+
echo "❌ Found dependencies on management/, signal/, or relay/ packages"
36+
echo "These packages will change license and should not be imported by client or shared code"
37+
exit 1
38+
else
39+
echo ""
40+
echo "✅ All license dependencies are clean"
41+
fi

.github/workflows/golang-test-linux.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ jobs:
259259
CGO_ENABLED=1 GOARCH=${{ matrix.arch }} \
260260
go test ${{ matrix.raceFlag }} \
261261
-exec 'sudo' \
262-
-timeout 10m ./relay/...
262+
-timeout 10m ./relay/... ./shared/relay/...
263263
264264
test_signal:
265265
name: "Signal / Unit"
@@ -309,7 +309,7 @@ jobs:
309309
CGO_ENABLED=1 GOARCH=${{ matrix.arch }} \
310310
go test \
311311
-exec 'sudo' \
312-
-timeout 10m ./signal/...
312+
-timeout 10m ./signal/... ./shared/signal/...
313313
314314
test_management:
315315
name: "Management / Unit"
@@ -369,7 +369,7 @@ jobs:
369369
CI=true \
370370
go test -tags=devcert \
371371
-exec "sudo --preserve-env=CI,NETBIRD_STORE_ENGINE" \
372-
-timeout 20m ./management/...
372+
-timeout 20m ./management/... ./shared/management/...
373373
374374
benchmark:
375375
name: "Management / Benchmark"
@@ -430,7 +430,7 @@ jobs:
430430
CI=true \
431431
go test -tags devcert -run=^$ -bench=. \
432432
-exec 'sudo --preserve-env=CI,NETBIRD_STORE_ENGINE' \
433-
-timeout 20m ./management/...
433+
-timeout 20m ./management/... ./shared/management/...
434434
435435
api_benchmark:
436436
name: "Management / Benchmark (API)"
@@ -521,7 +521,7 @@ jobs:
521521
-run=^$ \
522522
-bench=. \
523523
-exec 'sudo --preserve-env=CI,NETBIRD_STORE_ENGINE,GIT_BRANCH,GITHUB_RUN_ID' \
524-
-timeout 20m ./management/...
524+
-timeout 20m ./management/... ./shared/management/...
525525
526526
api_integration_test:
527527
name: "Management / Integration"
@@ -571,4 +571,4 @@ jobs:
571571
CI=true \
572572
go test -tags=integration \
573573
-exec 'sudo --preserve-env=CI,NETBIRD_STORE_ENGINE' \
574-
-timeout 20m ./management/...
574+
-timeout 20m ./management/... ./shared/management/...

.github/workflows/update-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
tags:
66
- 'v*'
77
paths:
8-
- 'management/server/http/api/openapi.yml'
8+
- 'shared/management/http/api/openapi.yml'
99

1010
jobs:
1111
trigger_docs_api_update:

client/internal/profilemanager/config.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
const (
2929
// managementLegacyPortString is the port that was used before by the Management gRPC server.
3030
// It is used for backward compatibility now.
31-
// NB: hardcoded from github.com/netbirdio/netbird/management/cmd to avoid import
3231
managementLegacyPortString = "33073"
3332
// DefaultManagementURL points to the NetBird's cloud management endpoint
3433
DefaultManagementURL = "https://api.netbird.io:443"

formatter/hook/hook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/sirupsen/logrus"
1111

12-
"github.com/netbirdio/netbird/management/server/context"
12+
"github.com/netbirdio/netbird/shared/context"
1313
)
1414

1515
type ExecutionContext string

management/server/account.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
"github.com/netbirdio/netbird/management/server/permissions/operations"
4141
"github.com/netbirdio/netbird/management/server/posture"
4242
"github.com/netbirdio/netbird/management/server/settings"
43-
"github.com/netbirdio/netbird/management/server/status"
43+
"github.com/netbirdio/netbird/shared/management/status"
4444
"github.com/netbirdio/netbird/management/server/store"
4545
"github.com/netbirdio/netbird/management/server/telemetry"
4646
"github.com/netbirdio/netbird/management/server/types"

management/server/context/keys.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package context
22

3+
import "github.com/netbirdio/netbird/shared/context"
4+
35
const (
4-
RequestIDKey = "requestID"
5-
AccountIDKey = "accountID"
6-
UserIDKey = "userID"
7-
PeerIDKey = "peerID"
6+
RequestIDKey = context.RequestIDKey
7+
AccountIDKey = context.AccountIDKey
8+
UserIDKey = context.UserIDKey
9+
PeerIDKey = context.PeerIDKey
810
)

management/server/dns.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/netbirdio/netbird/management/server/activity"
1313
"github.com/netbirdio/netbird/management/server/permissions/modules"
1414
"github.com/netbirdio/netbird/management/server/permissions/operations"
15-
"github.com/netbirdio/netbird/management/server/status"
15+
"github.com/netbirdio/netbird/shared/management/status"
1616
"github.com/netbirdio/netbird/management/server/store"
1717
"github.com/netbirdio/netbird/management/server/types"
1818
"github.com/netbirdio/netbird/management/server/util"

management/server/dns_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/netbirdio/netbird/dns"
2525
"github.com/netbirdio/netbird/management/server/activity"
2626
nbpeer "github.com/netbirdio/netbird/management/server/peer"
27-
"github.com/netbirdio/netbird/management/server/status"
27+
"github.com/netbirdio/netbird/shared/management/status"
2828
)
2929

3030
const (

management/server/event.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/netbirdio/netbird/management/server/activity"
1212
"github.com/netbirdio/netbird/management/server/permissions/modules"
1313
"github.com/netbirdio/netbird/management/server/permissions/operations"
14-
"github.com/netbirdio/netbird/management/server/status"
14+
"github.com/netbirdio/netbird/shared/management/status"
1515
"github.com/netbirdio/netbird/management/server/store"
1616
"github.com/netbirdio/netbird/management/server/types"
1717
)

0 commit comments

Comments
 (0)