mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-20 15:26:04 +08:00
go mod tidy and conver azure tenant to env/conf var
This commit is contained in:
parent
d45d41769d
commit
76a75fb984
|
@ -5,7 +5,6 @@ import (
|
|||
"fmt"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"os"
|
||||
|
||||
"github.com/gravitl/netmaker/logger"
|
||||
"github.com/gravitl/netmaker/logic"
|
||||
|
@ -36,7 +35,7 @@ func initAzureAD(redirectURL string, clientID string, clientSecret string) {
|
|||
ClientID: clientID,
|
||||
ClientSecret: clientSecret,
|
||||
Scopes: []string{"User.Read"},
|
||||
Endpoint: microsoft.AzureADEndpoint(os.Getenv("AZURE_TENANT")),
|
||||
Endpoint: microsoft.AzureADEndpoint(servercfg.GetAzureTenant()),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -68,6 +68,7 @@ type ServerConfig struct {
|
|||
ClientSecret string `yaml:"clientsecret"`
|
||||
FrontendURL string `yaml:"frontendurl"`
|
||||
DisplayKeys string `yaml:"displaykeys"`
|
||||
AzureTenant string `yaml:"azuretenant"`
|
||||
}
|
||||
|
||||
// Generic SQL Config
|
||||
|
|
1
go.mod
1
go.mod
|
@ -31,6 +31,7 @@ require (
|
|||
require (
|
||||
cloud.google.com/go v0.34.0 // indirect
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/felixge/httpsnoop v1.0.1 // indirect
|
||||
github.com/go-playground/locales v0.14.0 // indirect
|
||||
github.com/go-playground/universal-translator v0.18.0 // indirect
|
||||
|
|
|
@ -502,6 +502,17 @@ func GetAuthProviderInfo() []string {
|
|||
return []string{"", "", ""}
|
||||
}
|
||||
|
||||
// GetAzureTenant - retrieve the azure tenant ID from env variable or config file
|
||||
func GetAzureTenant() string {
|
||||
var azureTenant = ""
|
||||
if os.Getenv("AZURE_TENANT") != "" {
|
||||
azureTenant = os.Getenv("AZURE_TENANT")
|
||||
} else if config.Config.Server.AzureTenant != "" {
|
||||
azureTenant = config.Config.Server.AzureTenant
|
||||
}
|
||||
return azureTenant
|
||||
}
|
||||
|
||||
// GetMacAddr - get's mac address
|
||||
func getMacAddr() string {
|
||||
ifas, err := net.Interfaces()
|
||||
|
|
Loading…
Reference in a new issue