Skip to content

Commit dd50b2c

Browse files
guzalvguzalv
committed
Change naming from .*ip to .*addr
1 parent 2c3a614 commit dd50b2c

File tree

5 files changed

+32
-35
lines changed

5 files changed

+32
-35
lines changed

‎ice_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
type iceAuthTestCase struct {
3434
name string
3535
config []*stnrv1.StunnerConfig
36-
envPublicIp string
36+
envPublicAddr string
3737
params string
3838
status int
3939
tester func(t *testing.T, iceAuth *types.IceConfig, authHandler a12n.AuthHandler)
@@ -492,7 +492,7 @@ var iceAuthTestCases = []iceAuthTestCase{
492492
{
493493
name: "static - public IP set via env var",
494494
config: []*stnrv1.StunnerConfig{&staticAuthConfig},
495-
envPublicIp: "2.4.6.8",
495+
envPublicAddr: "2.4.6.8",
496496
params: "service=turn",
497497
status: 200,
498498
tester: func(t *testing.T, iceConfig *types.IceConfig, authHandler a12n.AuthHandler) {
@@ -518,7 +518,7 @@ var iceAuthTestCases = []iceAuthTestCase{
518518
{
519519
name: "static - public IP set via URL parameter takes precedence over env var",
520520
config: []*stnrv1.StunnerConfig{&staticAuthConfig},
521-
envPublicIp: "2.4.6.8",
521+
envPublicAddr: "2.4.6.8",
522522
params: "service=turn&public-ip=1.3.5.7",
523523
status: 200,
524524
tester: func(t *testing.T, iceConfig *types.IceConfig, authHandler a12n.AuthHandler) {
@@ -578,10 +578,10 @@ func testICE(t *testing.T, tests []iceAuthTestCase) {
578578
t.Run(testCase.name, func(t *testing.T) {
579579
log.Info(fmt.Sprintf("---------------- Test: %s ----------------", testCase.name))
580580

581-
if testCase.envPublicIp != "" {
582-
oldPublicIp := config.PublicIp
583-
config.PublicIp = testCase.envPublicIp
584-
t.Cleanup(func() { config.PublicIp = oldPublicIp })
581+
if testCase.envPublicAddr != "" {
582+
oldPublicAddr := config.PublicAddr
583+
config.PublicAddr = testCase.envPublicAddr
584+
t.Cleanup(func() { config.PublicAddr = oldPublicAddr })
585585
}
586586

587587
log.Info("storing config")
@@ -686,10 +686,10 @@ func testICECDS(t *testing.T, tests []iceAuthTestCase) {
686686
t.Run(testCase.name, func(t *testing.T) {
687687
log.Info(fmt.Sprintf("---------------- Test: %s ----------------", testCase.name))
688688

689-
if testCase.envPublicIp != "" {
690-
oldPublicIp := config.PublicIp
691-
config.PublicIp = testCase.envPublicIp
692-
t.Cleanup(func() { config.PublicIp = oldPublicIp })
689+
if testCase.envPublicAddr != "" {
690+
oldPublicAddr := config.PublicAddr
691+
config.PublicAddr = testCase.envPublicAddr
692+
t.Cleanup(func() { config.PublicAddr = oldPublicAddr })
693693
}
694694

695695
log.Info("storing config")

‎internal/config/defs.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
package config
22

3-
import (
4-
"os"
5-
"time"
6-
)
3+
import "time"
74

85
const (
96
// DefaultTimeout is the default TURN credential timeout. Default is one day, in seconds.
107
DefaultTimeout = 24 * time.Hour
118
)
129

13-
var PublicIp string
14-
15-
func init() {
16-
envPublicIp, present := os.LookupEnv("STUNNER_PUBLIC_IP"); if present {
17-
PublicIp = envPublicIp
18-
}
19-
}
10+
var PublicAddr string

‎internal/handler/ice.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ func (h *Handler) getIceServerConfForStunnerConf(params types.GetIceAuthParams,
120120
if params.PublicIp != nil {
121121
l.PublicAddr = *params.PublicIp
122122
h.log.Debugf("Using public address from request: %s", l.PublicAddr)
123-
} else if config.PublicIp != "" {
124-
l.PublicAddr = config.PublicIp
123+
} else if config.PublicAddr != "" {
124+
l.PublicAddr = config.PublicAddr
125125
h.log.Debugf("Using public address from environment: %s", l.PublicAddr)
126126
}
127127

‎main.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
cdsclient "github.com/l7mp/stunner/pkg/config/client"
1818
"github.com/l7mp/stunner/pkg/logger"
1919

20+
"github.com/l7mp/stunner-auth-service/internal/config"
2021
"github.com/l7mp/stunner-auth-service/internal/handler"
2122
"github.com/l7mp/stunner-auth-service/pkg/server"
2223
)
@@ -59,6 +60,11 @@ func main() {
5960
loggerFactory := logger.NewLoggerFactory(logLevel)
6061
log := loggerFactory.NewLogger("authd")
6162

63+
if envPublicAddr, present := os.LookupEnv("STUNNER_PUBLIC_ADDR"); present {
64+
config.PublicAddr = envPublicAddr
65+
log.Infof("Using STUNner public address from environment: %s", envPublicAddr)
66+
}
67+
6268
conf := make(chan *stnrv1.StunnerConfig, 10)
6369
defer close(conf)
6470

‎turnauth_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
type turnAuthTestCase struct {
3434
name string
3535
config []*stnrv1.StunnerConfig
36-
envPublicIp string
36+
envPublicAddr string
3737
params string
3838
status int
3939
tester func(t *testing.T, turnAuth *types.TurnAuthenticationToken, authHandler a12n.AuthHandler)
@@ -399,7 +399,7 @@ var turnAuthTestCases = []turnAuthTestCase{
399399
{
400400
name: "static - public IP set via env var",
401401
config: []*stnrv1.StunnerConfig{&staticAuthConfig},
402-
envPublicIp: "2.4.6.8",
402+
envPublicAddr: "2.4.6.8",
403403
params: "service=turn",
404404
status: 200,
405405
tester: func(t *testing.T, turnAuthToken *types.TurnAuthenticationToken, authHandler a12n.AuthHandler) {
@@ -420,7 +420,7 @@ var turnAuthTestCases = []turnAuthTestCase{
420420
{
421421
name: "static - public IP set via URL parameter takes precedence over env var",
422422
config: []*stnrv1.StunnerConfig{&staticAuthConfig},
423-
envPublicIp: "2.4.6.8",
423+
envPublicAddr: "2.4.6.8",
424424
params: "service=turn&public-ip=1.3.5.7",
425425
status: 200,
426426
tester: func(t *testing.T, turnAuthToken *types.TurnAuthenticationToken, authHandler a12n.AuthHandler) {
@@ -475,10 +475,10 @@ func testTURNAuth(t *testing.T, tests []turnAuthTestCase) {
475475
t.Run(testCase.name, func(t *testing.T) {
476476
log.Info(fmt.Sprintf("---------------- Test: %s ----------------", testCase.name))
477477

478-
if testCase.envPublicIp != "" {
479-
oldPublicIp := config.PublicIp
480-
config.PublicIp = testCase.envPublicIp
481-
t.Cleanup(func() { config.PublicIp = oldPublicIp })
478+
if testCase.envPublicAddr != "" {
479+
oldPublicAddr := config.PublicAddr
480+
config.PublicAddr = testCase.envPublicAddr
481+
t.Cleanup(func() { config.PublicAddr = oldPublicAddr })
482482
}
483483

484484
log.Info("storing config")
@@ -583,10 +583,10 @@ func testTurnAuthCDS(t *testing.T, tests []turnAuthTestCase) {
583583
t.Run(testCase.name, func(t *testing.T) {
584584
log.Info(fmt.Sprintf("---------------- Test: %s ----------------", testCase.name))
585585

586-
if testCase.envPublicIp != "" {
587-
oldPublicIp := config.PublicIp
588-
config.PublicIp = testCase.envPublicIp
589-
t.Cleanup(func() { config.PublicIp = oldPublicIp })
586+
if testCase.envPublicAddr != "" {
587+
oldPublicAddr := config.PublicAddr
588+
config.PublicAddr = testCase.envPublicAddr
589+
t.Cleanup(func() { config.PublicAddr = oldPublicAddr })
590590
}
591591

592592
log.Info("storing config")

0 commit comments

Comments
 (0)