hoelee/cloudflared
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflared.git synced 2025-07-28 00:29:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TUN-4927: Parameterize region in edge discovery code

Browse Source
This commit is contained in:
Areg Harutyunyan
2021-08-17 13:07:40 -05:00
parent 12ad264eb3
commit 3ef3e7a99a
6 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
edgediscovery/allregions/regions.go
View File

@@ -18,8 +18,8 @@ type Regions struct {
// ------------------------------------
// ResolveEdge resolves the Cloudflare edge, returning all regions discovered.
func ResolveEdge(log *zerolog.Logger) (*Regions, error) {
edgeAddrs, err := edgeDiscovery(log)
func ResolveEdge(log *zerolog.Logger, region string) (*Regions, error) {
edgeAddrs, err := edgeDiscovery(log, getRegionalServiceName(region))
if err != nil {
return nil, err
}
@@ -122,3 +122,12 @@ func (rs *Regions) GiveBack(addr *EdgeAddr) bool {
}
return rs.region2.GiveBack(addr)
}
// Return regionalized service name if `region` isn't empty, otherwise return the global service name for origintunneld
func getRegionalServiceName(region string) string {
if region != "" {
return region + "-" + srvService // Example: `us-origintunneld`
}
return srvService // Global service is just `origintunneld`
}