Make accountDefaultsJSON a private config member

config/config.go

@@ -69,8 +69,8 @@ type Configuration struct {
 	// AccountDefaults defines default settings for valid accounts that are partially defined
 	// and provides a way to set global settings that can be overridden at account level.
 	AccountDefaults Account `mapstructure:"account_defaults"`
-	// AccountDefaultsJSON is the serialized form of AccountDefaults used for json merge
-	AccountDefaultsJSON json.RawMessage
+	// accountDefaultsJSON is the internal serialized form of AccountDefaults used for json merge
+	accountDefaultsJSON json.RawMessage
 	// Local private file containing SSL certificates
 	PemCertsFile string `mapstructure:"certificates_file"`
 	// Custom headers to handle request timeouts from queueing infrastructure
@@ -597,9 +597,8 @@ func New(v *viper.Viper) (*Configuration, error) {
 
 	// Update account defaults and generate base json for patch
 	c.AccountDefaults.CacheTTL = c.CacheURL.DefaultTTLs // comment this out to set explicitly in config
-	var err error
-	if c.AccountDefaultsJSON, err = json.Marshal(c.AccountDefaults); err != nil {
-		glog.Warningf("converting account_defaults to json: %v", err)
+	if err := c.MarshalAccountDefaults(); err != nil {
+		return nil, err
 	}
 
 	// To look for a request's publisher_id in the NonStandardPublishers list in
@@ -632,6 +631,20 @@ func New(v *viper.Viper) (*Configuration, error) {
 	return &c, nil
 }
 
+// MarshalAccountDefaults compiles AccountDefaults into the JSON format used for merge patch
+func (cfg *Configuration) MarshalAccountDefaults() error {
+	var err error
+	if cfg.accountDefaultsJSON, err = json.Marshal(cfg.AccountDefaults); err != nil {
+		glog.Warningf("converting %+v to json: %v", cfg.AccountDefaults, err)
+	}
+	return err
+}
+
+// GetAccountDefaultsJSON returns the precompiled JSON form of account_defaults
+func (cfg *Configuration) GetAccountDefaultsJSON() json.RawMessage {
+	return cfg.accountDefaultsJSON
+}
+
 //Allows for protocol relative URL if scheme is empty
 func (cfg *Cache) GetBaseURL() string {
 	cfg.Scheme = strings.ToLower(cfg.Scheme)

endpoints/openrtb2/auction.go

@@ -1318,7 +1318,7 @@ func (deps *endpointDeps) getAccount(ctx context.Context, pubID string) (account
 	} else {
 		// pubID resolved to a valid account, merge with AccountDefaults for a complete config
 		account = &config.Account{}
-		completeJSON, err := jsonpatch.MergePatch(deps.cfg.AccountDefaultsJSON, accountJSON)
+		completeJSON, err := jsonpatch.MergePatch(deps.cfg.GetAccountDefaultsJSON(), accountJSON)
 		if err == nil {
 			err = json.Unmarshal(completeJSON, account)
 		}

endpoints/openrtb2/auction_test.go

@@ -378,7 +378,7 @@ func (gr *getResponseFromDirectory) doRequest(t *testing.T, requestData []byte)
 		AccountRequired:    gr.accountReq,
 		AccountDefaults:    config.Account{Disabled: gr.accountDefaultDisabled},
 	}
-	cfg.AccountDefaultsJSON, _ = json.Marshal(cfg.AccountDefaults)
+	assert.NoError(t, cfg.MarshalAccountDefaults())
 	endpoint, _ := NewEndpoint(
 		&nobidExchange{},
 		newParamsValidator(t),