Merge branch '309-instance-id-location' into 'master'

feat: move the instance_id file to the metadata directory (#309)

Closes #309

See merge request postgres-ai/database-lab!396

Author: agneum

cmd/database-lab/main.go

@@ -208,7 +208,7 @@ func getEngineProperties(ctx context.Context, dockerCLI *client.Client, cfg *con
 		return global.EngineProps{}, fmt.Errorf("failed to inspect DLE container: %w", err)
 	}
 
-	instanceID, err := config.LoadInstanceID(cfg.PoolManager.MountDir)
+	instanceID, err := config.LoadInstanceID()
 	if err != nil {
 		return global.EngineProps{}, fmt.Errorf("failed to load instance ID: %w", err)
 	}

pkg/config/config.go

@@ -8,7 +8,7 @@ package config
 import (
 	"fmt"
 	"os"
-	"path/filepath"
+	"path"
 
 	"github.com/pkg/errors"
 	"github.com/rs/xid"
@@ -61,16 +61,24 @@ func LoadConfiguration() (*Config, error) {
 }
 
 // LoadInstanceID tries to make instance ID persistent across runs and load its value after restart
-func LoadInstanceID(mountDir string) (string, error) {
+func LoadInstanceID() (string, error) {
 	instanceID := ""
-	idFilepath := filepath.Join(mountDir, instanceIDFile)
+
+	idFilepath, err := util.GetMetaPath(instanceIDFile)
+	if err != nil {
+		return "", fmt.Errorf("failed to get path of the instanceID file: %w", err)
+	}
 
 	data, err := os.ReadFile(idFilepath)
 	if err != nil {
 		if os.IsNotExist(err) {
 			instanceID = xid.New().String()
 			log.Dbg("no instance_id file was found, generate new instance ID", instanceID)
 
+			if err := os.MkdirAll(path.Dir(idFilepath), 0755); err != nil {
+				return "", fmt.Errorf("failed to make directory meta: %w", err)
+			}
+
 			return instanceID, os.WriteFile(idFilepath, []byte(instanceID), 0544)
 		}
 

pkg/config/config_test.go

@@ -3,12 +3,15 @@ package config
 import (
 	"bytes"
 	"os"
+	"path"
 	"path/filepath"
 	"testing"
 
 	"github.com/rs/xid"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+
+	"gitlab.com/postgres-ai/database-lab/v3/pkg/util"
 )
 
 func TestLoadConfig(t *testing.T) {
@@ -59,22 +62,28 @@ func (s *ConfigSuite) TearDownTest() {
 }
 
 func (s *ConfigSuite) TestGenerateNewID() {
-	instanceID, err := LoadInstanceID(s.mountDir)
+	instanceID, err := LoadInstanceID()
 	s.Require().NoError(err)
 	s.NotEmpty(instanceID)
 
-	data, err := os.ReadFile(filepath.Join(s.mountDir, "instance_id"))
-	s.NoError(err)
+	instanceIDPath, err := util.GetMetaPath("instance_id")
+	s.Require().NoError(err)
+	data, err := os.ReadFile(instanceIDPath)
+	s.Require().NoError(err)
 	s.Equal(instanceID, string(data))
 }
 
 func (s *ConfigSuite) TestLoadInstanceID() {
 	instanceID := xid.New().String()
 
-	err := os.WriteFile(filepath.Join(s.mountDir, "instance_id"), []byte(instanceID), 0600)
+	instanceIDPath, err := util.GetMetaPath("instance_id")
+	s.Require().NoError(err)
+	err = os.MkdirAll(path.Dir(instanceIDPath), 0755)
+	s.Require().NoError(err)
+	err = os.WriteFile(instanceIDPath, []byte(instanceID), 0600)
 	s.Require().NoError(err)
 
-	instanceID, err = LoadInstanceID(s.mountDir)
-	s.NoError(err)
+	instanceID, err = LoadInstanceID()
+	s.Require().NoError(err)
 	s.Equal(instanceID, instanceID)
 }