Switch config to pointer

This commit is contained in:
Kristoffer Dalby 2022-06-05 17:47:26 +02:00
parent af891808f6
commit 78ed610b50
3 changed files with 9 additions and 9 deletions

4
app.go
View File

@ -71,7 +71,7 @@ const (
// Headscale represents the base app of the service.
type Headscale struct {
cfg Config
cfg *Config
db *gorm.DB
dbString string
dbType string
@ -115,7 +115,7 @@ func LookupTLSClientAuthMode(mode string) (tls.ClientAuthType, bool) {
}
}
func NewHeadscale(cfg Config) (*Headscale, error) {
func NewHeadscale(cfg *Config) (*Headscale, error) {
privKey, err := readOrCreatePrivateKey(cfg.PrivateKeyPath)
if err != nil {
return nil, fmt.Errorf("failed to read or create private key: %w", err)

View File

@ -46,7 +46,7 @@ func (s *Suite) ResetDB(c *check.C) {
}
app = Headscale{
cfg: cfg,
cfg: &cfg,
dbType: "sqlite3",
dbString: tmpDir + "/headscale_test.db",
}

View File

@ -821,7 +821,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{
name: "simple machine name generation",
h: &Headscale{
cfg: Config{
cfg: &Config{
OIDC: OIDCConfig{
StripEmaildomain: true,
},
@ -836,7 +836,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{
name: "machine name with 53 chars",
h: &Headscale{
cfg: Config{
cfg: &Config{
OIDC: OIDCConfig{
StripEmaildomain: true,
},
@ -851,7 +851,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{
name: "machine name with 60 chars",
h: &Headscale{
cfg: Config{
cfg: &Config{
OIDC: OIDCConfig{
StripEmaildomain: true,
},
@ -866,7 +866,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{
name: "machine name with 63 chars",
h: &Headscale{
cfg: Config{
cfg: &Config{
OIDC: OIDCConfig{
StripEmaildomain: true,
},
@ -881,7 +881,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{
name: "machine name with 64 chars",
h: &Headscale{
cfg: Config{
cfg: &Config{
OIDC: OIDCConfig{
StripEmaildomain: true,
},
@ -896,7 +896,7 @@ func TestHeadscale_GenerateGivenName(t *testing.T) {
{
name: "machine name with 73 chars",
h: &Headscale{
cfg: Config{
cfg: &Config{
OIDC: OIDCConfig{
StripEmaildomain: true,
},