From 97220e63e604d130259d58687ba429dd0f63b88e Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 16 May 2022 09:32:12 +0200 Subject: [PATCH] check if cfg.Commons is nil --- .bingo/Variables.mk | 2 +- extensions/idm/pkg/config/defaults/defaultconfig.go | 2 +- extensions/settings/pkg/config/defaults/defaultconfig.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index 01e058ce9b..cd90d103da 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -3,7 +3,7 @@ BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST))) GOPATH ?= $(shell go env GOPATH) GOBIN ?= $(firstword $(subst :, ,${GOPATH}))/bin -GO ?= $(shell command -v go) +GO ?= $(shell which go) # Below generated variables ensure that every time a tool under each variable is invoked, the correct version # will be used; reinstalling only if needed. diff --git a/extensions/idm/pkg/config/defaults/defaultconfig.go b/extensions/idm/pkg/config/defaults/defaultconfig.go index 28386b95e2..99374a1f68 100644 --- a/extensions/idm/pkg/config/defaults/defaultconfig.go +++ b/extensions/idm/pkg/config/defaults/defaultconfig.go @@ -53,7 +53,7 @@ func EnsureDefaults(cfg *config.Config) { cfg.Tracing = &config.Tracing{} } - if cfg.AdminUserID == "" { + if cfg.AdminUserID == "" && cfg.Commons != nil { cfg.AdminUserID = cfg.Commons.AdminUserID } } diff --git a/extensions/settings/pkg/config/defaults/defaultconfig.go b/extensions/settings/pkg/config/defaults/defaultconfig.go index 58d2d1d709..6bffa9819e 100644 --- a/extensions/settings/pkg/config/defaults/defaultconfig.go +++ b/extensions/settings/pkg/config/defaults/defaultconfig.go @@ -97,7 +97,7 @@ func EnsureDefaults(cfg *config.Config) { cfg.Metadata.SystemUserID = cfg.Commons.SystemUserID } - if cfg.AdminUserID == "" { + if cfg.AdminUserID == "" && cfg.Commons != nil { cfg.AdminUserID = cfg.Commons.AdminUserID } }