pangolin_mirror/olm
1
0
Fork 0
mirror of https://github.com/fosrl/olm.git synced 2026-02-08 05:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove do not create client for now

Browse Source 
Because its always created when the user joins the org
This commit is contained in:
Owen
2025-11-08 16:54:35 -08:00
parent 29ed4fefbf
commit 8ebc678edb
3 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
config.go
View File

@@ -40,7 +40,7 @@ type OlmConfig struct {
// Advanced
Holepunch bool `json:"holepunch"`
TlsClientCert string `json:"tlsClientCert"`
DoNotCreateNewClient bool `json:"doNotCreateNewClient"`
// DoNotCreateNewClient bool `json:"doNotCreateNewClient"`
// Parsed values (not in JSON)
PingIntervalDuration time.Duration `json:"-"`
@@ -83,7 +83,7 @@ func DefaultConfig() *OlmConfig {
PingInterval: "3s",
PingTimeout: "5s",
Holepunch: false,
DoNotCreateNewClient: false,
// DoNotCreateNewClient: false,
sources: make(map[string]string),
}
@@ -98,7 +98,7 @@ func DefaultConfig() *OlmConfig {
config.sources["pingInterval"] = string(SourceDefault)
config.sources["pingTimeout"] = string(SourceDefault)
config.sources["holepunch"] = string(SourceDefault)
config.sources["doNotCreateNewClient"] = string(SourceDefault)
// config.sources["doNotCreateNewClient"] = string(SourceDefault)
return config
}
@@ -245,10 +245,10 @@ func loadConfigFromEnv(config *OlmConfig) {
config.Holepunch = true
config.sources["holepunch"] = string(SourceEnv)
}
if val := os.Getenv("DO_NOT_CREATE_NEW_CLIENT"); val == "true" {
config.DoNotCreateNewClient = true
config.sources["doNotCreateNewClient"] = string(SourceEnv)
}
// if val := os.Getenv("DO_NOT_CREATE_NEW_CLIENT"); val == "true" {
// config.DoNotCreateNewClient = true
// config.sources["doNotCreateNewClient"] = string(SourceEnv)
// }
}
// loadConfigFromCLI loads configuration from command-line arguments
@@ -272,7 +272,7 @@ func loadConfigFromCLI(config *OlmConfig, args []string) (bool, bool, error) {
"pingTimeout": config.PingTimeout,
"enableApi": config.EnableAPI,
"holepunch": config.Holepunch,
"doNotCreateNewClient": config.DoNotCreateNewClient,
// "doNotCreateNewClient": config.DoNotCreateNewClient,
}
// Define flags
@@ -291,7 +291,7 @@ func loadConfigFromCLI(config *OlmConfig, args []string) (bool, bool, error) {
serviceFlags.StringVar(&config.PingTimeout, "ping-timeout", config.PingTimeout, "Timeout for each ping")
serviceFlags.BoolVar(&config.EnableAPI, "enable-api", config.EnableAPI, "Enable API server for receiving connection requests")
serviceFlags.BoolVar(&config.Holepunch, "holepunch", config.Holepunch, "Enable hole punching")
serviceFlags.BoolVar(&config.DoNotCreateNewClient, "do-not-create-new-client", config.DoNotCreateNewClient, "Do not create new client")
// serviceFlags.BoolVar(&config.DoNotCreateNewClient, "do-not-create-new-client", config.DoNotCreateNewClient, "Do not create new client")
version := serviceFlags.Bool("version", false, "Print the version")
showConfig := serviceFlags.Bool("show-config", false, "Show configuration sources and exit")
@@ -347,9 +347,9 @@ func loadConfigFromCLI(config *OlmConfig, args []string) (bool, bool, error) {
if config.Holepunch != origValues["holepunch"].(bool) {
config.sources["holepunch"] = string(SourceCLI)
}
if config.DoNotCreateNewClient != origValues["doNotCreateNewClient"].(bool) {
config.sources["doNotCreateNewClient"] = string(SourceCLI)
}
// if config.DoNotCreateNewClient != origValues["doNotCreateNewClient"].(bool) {
// config.sources["doNotCreateNewClient"] = string(SourceCLI)
// }
return *version, *showConfig, nil
}
@@ -459,10 +459,10 @@ func mergeConfigs(dest, src *OlmConfig) {
dest.Holepunch = src.Holepunch
dest.sources["holepunch"] = string(SourceFile)
}
if src.DoNotCreateNewClient {
dest.DoNotCreateNewClient = src.DoNotCreateNewClient
dest.sources["doNotCreateNewClient"] = string(SourceFile)
}
// if src.DoNotCreateNewClient {
// dest.DoNotCreateNewClient = src.DoNotCreateNewClient
// dest.sources["doNotCreateNewClient"] = string(SourceFile)
// }
}
// SaveConfig saves the current configuration to the config file
@@ -546,7 +546,7 @@ func (c *OlmConfig) ShowConfig() {
// Advanced
fmt.Println("\nAdvanced:")
fmt.Printf(" holepunch = %v [%s]\n", c.Holepunch, getSource("holepunch"))
fmt.Printf(" do-not-create-new-client = %v [%s]\n", c.DoNotCreateNewClient, getSource("doNotCreateNewClient"))
// fmt.Printf(" do-not-create-new-client = %v [%s]\n", c.DoNotCreateNewClient, getSource("doNotCreateNewClient"))
if c.TlsClientCert != "" {
fmt.Printf(" tls-cert = %s [%s]\n", c.TlsClientCert, getSource("tlsClientCert"))
}

2
main.go
View File

@@ -209,7 +209,7 @@ func main() {
PingTimeoutDuration: config.PingTimeoutDuration,
Version: config.Version,
OrgID: config.OrgID,
DoNotCreateNewClient: config.DoNotCreateNewClient,
// DoNotCreateNewClient: config.DoNotCreateNewClient,
}
// Create a context that will be cancelled on interrupt signals

2
olm/olm.go
View File

@@ -753,7 +753,7 @@ func TunnelProcess(ctx context.Context, config Config, id string, secret string,
"relay": !config.Holepunch,
"olmVersion": config.Version,
"orgId": config.OrgID,
"doNotCreateNewClient": config.DoNotCreateNewClient,
// "doNotCreateNewClient": config.DoNotCreateNewClient,
}, 1*time.Second)
}