Merge branch 'embeddedui' into 'master'

feat: embedUI -> embeddedUI

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

Author: NikolayS

cmd/database-lab/main.go

@@ -21,7 +21,7 @@ import (
 	"github.com/pkg/errors"
 
 	"gitlab.com/postgres-ai/database-lab/v3/internal/cloning"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/embedui"
+	"gitlab.com/postgres-ai/database-lab/v3/internal/embeddedui"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/estimator"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/observer"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/platform"
@@ -152,11 +152,11 @@ func main() {
 		Restore:       retrievalSvc.CollectRestoreTelemetry(),
 	})
 
-	embedUI := embedui.New(cfg.EmbedUI, engProps, runner, docker)
+	embeddedUI := embeddedui.New(cfg.EmbeddedUI, engProps, runner, docker)
 	server := srv.NewServer(&cfg.Server, &cfg.Global, engProps, docker, cloningSvc, provisioner, retrievalSvc, platformSvc, obs, est, pm, tm)
 	shutdownCh := setShutdownListener()
 
-	go setReloadListener(ctx, provisioner, tm, retrievalSvc, pm, cloningSvc, platformSvc, est, embedUI, server)
+	go setReloadListener(ctx, provisioner, tm, retrievalSvc, pm, cloningSvc, platformSvc, est, embeddedUI, server)
 
 	server.InitHandlers()
 
@@ -166,10 +166,10 @@ func main() {
 		}
 	}()
 
-	if cfg.EmbedUI.Enabled {
+	if cfg.EmbeddedUI.Enabled {
 		go func() {
-			if err := embedUI.Run(ctx); err != nil {
-				log.Err("Failed to start Embed UI container:", err.Error())
+			if err := embeddedUI.Run(ctx); err != nil {
+				log.Err("Failed to start embedded UI container:", err.Error())
 				return
 			}
 		}()
@@ -223,7 +223,7 @@ func getEngineProperties(ctx context.Context, dockerCLI *client.Client, cfg *con
 }
 
 func reloadConfig(ctx context.Context, provisionSvc *provision.Provisioner, tm *telemetry.Agent, retrievalSvc *retrieval.Retrieval,
-	pm *pool.Manager, cloningSvc *cloning.Base, platformSvc *platform.Service, est *estimator.Estimator, embedUI *embedui.UIManager,
+	pm *pool.Manager, cloningSvc *cloning.Base, platformSvc *platform.Service, est *estimator.Estimator, embeddedUI *embeddedui.UIManager,
 	server *srv.Server) error {
 	cfg, err := config.LoadConfiguration()
 	if err != nil {
@@ -247,7 +247,7 @@ func reloadConfig(ctx context.Context, provisionSvc *provision.Provisioner, tm *
 		return err
 	}
 
-	if err := embedUI.Reload(ctx, cfg.EmbedUI); err != nil {
+	if err := embeddedUI.Reload(ctx, cfg.EmbeddedUI); err != nil {
 		return err
 	}
 
@@ -268,15 +268,15 @@ func reloadConfig(ctx context.Context, provisionSvc *provision.Provisioner, tm *
 }
 
 func setReloadListener(ctx context.Context, provisionSvc *provision.Provisioner, tm *telemetry.Agent, retrievalSvc *retrieval.Retrieval,
-	pm *pool.Manager, cloningSvc *cloning.Base, platformSvc *platform.Service, est *estimator.Estimator, embedUI *embedui.UIManager,
+	pm *pool.Manager, cloningSvc *cloning.Base, platformSvc *platform.Service, est *estimator.Estimator, embeddedUI *embeddedui.UIManager,
 	server *srv.Server) {
 	reloadCh := make(chan os.Signal, 1)
 	signal.Notify(reloadCh, syscall.SIGHUP)
 
 	for range reloadCh {
 		log.Msg("Reloading configuration")
 
-		if err := reloadConfig(ctx, provisionSvc, tm, retrievalSvc, pm, cloningSvc, platformSvc, est, embedUI, server); err != nil {
+		if err := reloadConfig(ctx, provisionSvc, tm, retrievalSvc, pm, cloningSvc, platformSvc, est, embeddedUI, server); err != nil {
 			log.Err("Failed to reload configuration", err)
 		}
 

configs/config.example.logical_generic.yml

@@ -23,14 +23,14 @@ server:
   # HTTP server port. Default: 2345.
   port: 2345
 
-# Embed UI. Controls the application to provide a user interface to DLE API.
-embedUI:
+# Embedded UI. Controls the application to provide a user interface to DLE API.
+embeddedUI:
   enabled: true
 
   # Docker image of the UI application.
   dockerImage: "postgresai/ce-ui:latest"
 
-  # Host or IP address, from which the Embed UI container accepts HTTP connections.
+  # Host or IP address, from which the embedded UI container accepts HTTP connections.
   # By default, use a loop-back to accept only local connections.
   # The empty string means "all available addresses".
   host: "127.0.0.1"

configs/config.example.logical_rds_iam.yml

@@ -23,14 +23,14 @@ server:
   # HTTP server port. Default: 2345.
   port: 2345
 
-# Embed UI. Controls the application to provide a user interface to DLE API.
-embedUI:
+# Embedded UI. Controls the application to provide a user interface to DLE API.
+embeddedUI:
   enabled: true
 
   # Docker image of the UI application.
   dockerImage: "postgresai/ce-ui:latest"
 
-  # Host or IP address, from which the Embed UI container accepts HTTP connections.
+  # Host or IP address, from which the embedded UI container accepts HTTP connections.
   # By default, use a loop-back to accept only local connections.
   # The empty string means "all available addresses".
   host: "127.0.0.1"

configs/config.example.physical_generic.yml

@@ -23,14 +23,14 @@ server:
   # HTTP server port. Default: 2345.
   port: 2345
 
-# Embed UI. Controls the application to provide a user interface to DLE API.
-embedUI:
+# Embedded UI. Controls the application to provide a user interface to DLE API.
+embeddedUI:
   enabled: true
 
   # Docker image of the UI application.
   dockerImage: "postgresai/ce-ui:latest"
 
-  # Host or IP address, from which the Embed UI container accepts HTTP connections.
+  # Host or IP address, from which the embedded UI container accepts HTTP connections.
   # By default, use a loop-back to accept only local connections.
   # The empty string means "all available addresses".
   host: "127.0.0.1"

configs/config.example.physical_walg.yml

@@ -23,14 +23,14 @@ server:
   # HTTP server port. Default: 2345.
   port: 2345
 
-# Embed UI. Controls the application to provide a user interface to DLE API.
-embedUI:
+# Embedded UI. Controls the application to provide a user interface to DLE API.
+embeddedUI:
   enabled: true
 
   # Docker image of the UI application.
   dockerImage: "postgresai/ce-ui:latest"
 
-  # Host or IP address, from which the Embed UI container accepts HTTP connections.
+  # Host or IP address, from which the embedded UI container accepts HTTP connections.
   # By default, use a loop-back to accept only local connections.
   # The empty string means "all available addresses".
   host: "127.0.0.1"

internal/embedui/embed_ui.go renamed to internal/embeddedui/embedded_ui.go

@@ -2,8 +2,8 @@
 2021 © Postgres.ai
 */
 
-// Package embedui manages Embed UI container.
-package embedui
+// Package embeddedui manages embedded UI container.
+package embeddedui
 
 import (
 	"context"
@@ -40,15 +40,15 @@ const (
 	healthCheckRetries  = 5
 )
 
-// Config defines configs for a Embed UI container.
+// Config defines configs for a embedded UI container.
 type Config struct {
 	Enabled     bool   `yaml:"enabled"`
 	DockerImage string `yaml:"dockerImage"`
 	Host        string `yaml:"host"`
 	Port        int    `yaml:"port"`
 }
 
-// UIManager manages Embed UI container.
+// UIManager manages embedded UI container.
 type UIManager struct {
 	runner   runners.Runner
 	docker   *client.Client
@@ -89,16 +89,16 @@ func (ui *UIManager) isConfigChanged(cfg Config) bool {
 		ui.cfg.Port != cfg.Port
 }
 
-// Run creates a new Embed UI container.
+// Run creates a new embedded UI container.
 func (ui *UIManager) Run(ctx context.Context) error {
 	if err := docker.PrepareImage(ui.runner, ui.cfg.DockerImage); err != nil {
 		return fmt.Errorf("failed to prepare Docker image: %w", err)
 	}
 
-	embedUI, err := ui.docker.ContainerCreate(ctx,
+	embeddedUI, err := ui.docker.ContainerCreate(ctx,
 		&container.Config{
 			Labels: map[string]string{
-				cont.DBLabSatelliteLabel:  cont.DBLabEmbedUILabel,
+				cont.DBLabSatelliteLabel:  cont.DBLabEmbeddedUILabel,
 				cont.DBLabInstanceIDLabel: ui.engProps.InstanceID,
 				cont.DBLabEngineNameLabel: ui.engProps.ContainerName,
 			},
@@ -125,27 +125,27 @@ func (ui *UIManager) Run(ctx context.Context) error {
 		},
 		&network.NetworkingConfig{},
 		nil,
-		getEmbedUIName(ui.engProps.InstanceID),
+		getEmbeddedUIName(ui.engProps.InstanceID),
 	)
 
 	if err != nil {
-		return fmt.Errorf("failed to prepare Docker image for Embed UI: %w", err)
+		return fmt.Errorf("failed to prepare Docker image for embedded UI: %w", err)
 	}
 
-	if err := networks.Connect(ctx, ui.docker, ui.engProps.InstanceID, embedUI.ID); err != nil {
+	if err := networks.Connect(ctx, ui.docker, ui.engProps.InstanceID, embeddedUI.ID); err != nil {
 		return fmt.Errorf("failed to connect UI container to the internal Docker network: %w", err)
 	}
 
-	if err := ui.docker.ContainerStart(ctx, embedUI.ID, types.ContainerStartOptions{}); err != nil {
-		return fmt.Errorf("failed to start container %q: %w", embedUI.ID, err)
+	if err := ui.docker.ContainerStart(ctx, embeddedUI.ID, types.ContainerStartOptions{}); err != nil {
+		return fmt.Errorf("failed to start container %q: %w", embeddedUI.ID, err)
 	}
 
 	reportLaunching(ui.cfg)
 
 	return nil
 }
 
-// Restart destroys and creates a new Embed UI container.
+// Restart destroys and creates a new embedded UI container.
 func (ui *UIManager) Restart(ctx context.Context) error {
 	ui.Stop(ctx)
 
@@ -156,22 +156,22 @@ func (ui *UIManager) Restart(ctx context.Context) error {
 	return nil
 }
 
-// Stop removes a Embed UI container.
+// Stop removes a embedded UI container.
 func (ui *UIManager) Stop(ctx context.Context) {
-	tools.RemoveContainer(ctx, ui.docker, getEmbedUIName(ui.engProps.InstanceID), cont.StopTimeout)
+	tools.RemoveContainer(ctx, ui.docker, getEmbeddedUIName(ui.engProps.InstanceID), cont.StopTimeout)
 }
 
-func getEmbedUIName(instanceID string) string {
-	return cont.DBLabEmbedUILabel + "_" + instanceID
+func getEmbeddedUIName(instanceID string) string {
+	return cont.DBLabEmbeddedUILabel + "_" + instanceID
 }
 
-// reportLaunching reports the launch of the Embed UI container.
+// reportLaunching reports the launch of the embedded UI container.
 func reportLaunching(cfg Config) {
 	host := engine.DefaultListenerHost
 
 	if cfg.Host != "" {
 		host = cfg.Host
 	}
 
-	log.Msg(fmt.Sprintf("Embed UI has started successfully on %s:%d.", host, cfg.Port))
+	log.Msg(fmt.Sprintf("Embedded UI has started successfully on %s:%d.", host, cfg.Port))
 }

internal/retrieval/engine/postgres/tools/cont/container.go

@@ -53,8 +53,8 @@ const (
 	DBLabDumpLabel = "dblab_dump"
 	// DBLabRestoreLabel defines a label value for restore containers.
 	DBLabRestoreLabel = "dblab_restore"
-	// DBLabEmbedUILabel defines a label value for embed UI containers.
-	DBLabEmbedUILabel = "dblab_embed_ui"
+	// DBLabEmbeddedUILabel defines a label value for embedded UI containers.
+	DBLabEmbeddedUILabel = "dblab_embedded_ui"
 
 	// DBLabRunner defines a label to mark runner containers.
 	DBLabRunner = "dblab_runner"

pkg/config/config.go

@@ -15,7 +15,7 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"gitlab.com/postgres-ai/database-lab/v3/internal/cloning"
-	"gitlab.com/postgres-ai/database-lab/v3/internal/embedui"
+	"gitlab.com/postgres-ai/database-lab/v3/internal/embeddedui"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/estimator"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/observer"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/platform"
@@ -35,16 +35,16 @@ const (
 
 // Config contains a common database-lab configuration.
 type Config struct {
-	Server      srvCfg.Config    `yaml:"server"`
-	Provision   provision.Config `yaml:"provision"`
-	Cloning     cloning.Config   `yaml:"cloning"`
-	Platform    platform.Config  `yaml:"platform"`
-	Global      global.Config    `yaml:"global"`
-	Retrieval   retConfig.Config `yaml:"retrieval"`
-	Observer    observer.Config  `yaml:"observer"`
-	Estimator   estimator.Config `yaml:"estimator"`
-	PoolManager pool.Config      `yaml:"poolManager"`
-	EmbedUI     embedui.Config   `yaml:"embedUI"`
+	Server      srvCfg.Config     `yaml:"server"`
+	Provision   provision.Config  `yaml:"provision"`
+	Cloning     cloning.Config    `yaml:"cloning"`
+	Platform    platform.Config   `yaml:"platform"`
+	Global      global.Config     `yaml:"global"`
+	Retrieval   retConfig.Config  `yaml:"retrieval"`
+	Observer    observer.Config   `yaml:"observer"`
+	Estimator   estimator.Config  `yaml:"estimator"`
+	PoolManager pool.Config       `yaml:"poolManager"`
+	EmbeddedUI  embeddedui.Config `yaml:"embeddedUI"`
 }
 
 // LoadConfiguration instances a new application configuration.

test/1.synthetic.sh

@@ -81,7 +81,7 @@ curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${CI_COMMIT_BRANCH:-mast
 yq eval -i '
   .global.debug = true |
   .global.telemetry.enabled = false |
-  .embedUI.enabled = false |
+  .embeddedUI.enabled = false |
   .server.port = env(DLE_SERVER_PORT) |
   .provision.portPool.from = env(DLE_PORT_POOL_FROM) |
   .provision.portPool.to = env(DLE_PORT_POOL_TO) |

test/2.logical_generic.sh

@@ -87,7 +87,7 @@ curl https://gitlab.com/postgres-ai/database-lab/-/raw/"${CI_COMMIT_BRANCH:-mast
 yq eval -i '
   .global.debug = true |
   .global.telemetry.enabled = false |
-  .embedUI.enabled = false |
+  .embeddedUI.enabled = false |
   .server.port = env(DLE_SERVER_PORT) |
   .poolManager.mountDir = env(DLE_TEST_MOUNT_DIR) |
   .provision.portPool.from = env(DLE_PORT_POOL_FROM) |