Merge branch '203-clone-config-overriding' into 'master'

agneum · agneum · commit d53718f8b3f4 · 2020-11-18T08:40:14.000Z
* do not override user-defined configs in clones * apply only additional configs when creating a clone * manually created snapshots should contain appropriate logs configuration (https://gitlab.com/postgres-ai/database-lab/-/blob/master/configs/postgres/postgresql.conf). Closes #203 See merge request postgres-ai/database-lab!208
diff --git a/pkg/services/provision/databases/postgres/configuration/configuration.go b/pkg/services/provision/databases/postgres/configuration/configuration.go
@@ -14,6 +14,7 @@ import (
 	"github.com/pkg/errors"
 
 	"gitlab.com/postgres-ai/database-lab/pkg/log"
+	"gitlab.com/postgres-ai/database-lab/pkg/retrieval/engine/postgres/tools/fs"
 	"gitlab.com/postgres-ai/database-lab/pkg/util"
 )
 
@@ -109,10 +110,6 @@ func (c Corrector) Run(dataDir string) error {
 		}
 	}
 
-	for configKey, configValue := range c.ExtraConfig {
-		pgConfDstLines = append(pgConfDstLines, fmt.Sprintf("%s = '%s'", configKey, configValue))
-	}
-
 	output := strings.Join(pgConfDstLines, "\n")
 
 	if err := ioutil.WriteFile(pgConfDst, []byte(output), 0644); err != nil {
@@ -121,3 +118,23 @@ func (c Corrector) Run(dataDir string) error {
 
 	return nil
 }
+
+// ApplyExtraConf applies extra configuration to the provided Postgres directory.
+func (c Corrector) ApplyExtraConf(dataDir string) error {
+	log.Dbg("Applying extra configuration")
+
+	pgConf := path.Join(dataDir, pgConfName)
+	pgConfLines := make([]string, 0, len(c.ExtraConfig))
+
+	for configKey, configValue := range c.ExtraConfig {
+		pgConfLines = append(pgConfLines, fmt.Sprintf("%s = '%s'", configKey, configValue))
+	}
+
+	output := strings.Join(pgConfLines, "\n")
+
+	if err := fs.AppendFile(pgConf, []byte(output)); err != nil {
+		return errors.Wrapf(err, "cannot write extra configuration to %s", pgConf)
+	}
+
+	return nil
+}
diff --git a/pkg/services/provision/databases/postgres/postgres.go b/pkg/services/provision/databases/postgres/postgres.go
@@ -40,8 +40,10 @@ const (
 func Start(r runners.Runner, c *resources.AppConfig) error {
 	log.Dbg("Starting Postgres container...")
 
-	if err := configuration.NewCorrectorWithExtraConfig(c.ExtraConf()).Run(c.DataDir()); err != nil {
-		return errors.Wrap(err, "cannot update configs")
+	if extraConf := c.ExtraConf(); len(extraConf) > 0 {
+		if err := configuration.NewCorrectorWithExtraConfig(extraConf).ApplyExtraConf(c.DataDir()); err != nil {
+			return errors.Wrap(err, "cannot update configs")
+		}
 	}
 
 	if _, err := docker.RunContainer(r, c); err != nil {
