(fleet) move the installer run path to /var/run/datadog/installer (#2…

…5509)

Co-authored-by: BaptisteFoy <baptiste.foy@datadoghq.com>

cmd/installer/subcommands/daemon/run.go

@@ -65,7 +65,7 @@ func runFxWrapper(global *command.GlobalParams) error {
 		core.Bundle(),
 		fx.Supply(&rcservice.Params{
 			Options: []service.Option{
-				service.WithDatabaseFileName("remote-config-updater.db"),
+				service.WithDatabaseFileName("remote-config-installer.db"),
 			},
 		}),
 		rctelemetryreporterimpl.Module(),

omnibus/config/software/installer.rb

@@ -32,7 +32,7 @@
   env = with_embedded_path(env)
 
   if linux_target?
-    command "invoke installer.build --rebuild --install-path=#{install_dir}", env: env
+    command "invoke installer.build --rebuild --run-path=/var/run/datadog/installer --install-path=#{install_dir}", env: env
     mkdir "#{install_dir}/bin"
     mkdir "#{install_dir}/run/"
     mkdir "#{install_dir}/systemd/"

omnibus/package-scripts/installer-deb/postrm

@@ -6,17 +6,17 @@
 
 PACKAGES_DIR=/opt/datadog-packages
 INSTALL_DIR=/opt/datadog-installer
-PACKAGES_LOCK_DIR=/var/run/datadog-packages
+RUN_DIR=/var/run/datadog/installer
 
 set -e
 
 case "$1" in
     remove | purge)
         datadog-installer purge || true
         rm -f "/usr/bin/datadog-bootstrap"
-        echo "Force-deleting $INSTALL_DIR $PACKAGES_DIR $PACKAGES_LOCK_DIR"
+        echo "Force-deleting $INSTALL_DIR $PACKAGES_DIR $RUN_DIR"
         rm -rf $PACKAGES_DIR
-        rm -rf $PACKAGES_LOCK_DIR
+        rm -rf $RUN_DIR
         rm -rf $INSTALL_DIR
     ;;
     *)

omnibus/package-scripts/installer-rpm/postrm

@@ -6,7 +6,7 @@
 
 PACKAGES_DIR=/opt/datadog-packages
 INSTALL_DIR=/opt/datadog-installer
-PACKAGES_LOCK_DIR=/var/run/datadog-packages
+RUN_DIR=/var/run/datadog/installer
 
 set -e
 
@@ -17,9 +17,9 @@ fi
 
 datadog-installer purge || true
 rm -f "/usr/bin/datadog-bootstrap"
-echo "Force-deleting $INSTALL_DIR $PACKAGES_DIR $PACKAGES_LOCK_DIR"
+echo "Force-deleting $INSTALL_DIR $PACKAGES_DIR $RUN_DIR"
 rm -rf $PACKAGES_DIR
-rm -rf $PACKAGES_LOCK_DIR
+rm -rf $RUN_DIR
 rm -rf $INSTALL_DIR
 
 exit 0

pkg/fleet/installer/installer.go

@@ -31,7 +31,7 @@ const (
 	// TmpDirPath is the path to the temporary directory used for package installation.
 	TmpDirPath = "/opt/datadog-packages"
 	// LocksPack is the path to the locks directory.
-	LocksPack = "/var/run/datadog-packages"
+	LocksPack = "/var/run/datadog/installer/locks"
 
 	defaultConfigsDir = "/etc"
 

pkg/fleet/installer/service/datadog_installer.go

@@ -67,22 +67,30 @@ func SetupInstaller(ctx context.Context) (err error) {
 	if err != nil {
 		return fmt.Errorf("error creating /var/log/datadog: %w", err)
 	}
-	err = os.MkdirAll("/var/run/datadog-packages", 0777)
+	err = os.MkdirAll("/var/run/datadog/installer", 0755)
 	if err != nil {
-		return fmt.Errorf("error creating /var/run/datadog-packages: %w", err)
+		return fmt.Errorf("error creating /var/run/datadog/installer: %w", err)
+	}
+	err = os.MkdirAll("/var/run/datadog/installer/locks", 0777)
+	if err != nil {
+		return fmt.Errorf("error creating /var/run/datadog/installer/locks: %w", err)
 	}
 	// Locks directory can already be created by a package install
-	err = os.Chmod("/var/run/datadog-packages", 0777)
+	err = os.Chmod("/var/run/datadog/installer/locks", 0777)
 	if err != nil {
-		return fmt.Errorf("error changing permissions of /var/run/datadog-packages: %w", err)
+		return fmt.Errorf("error changing permissions of /var/run/datadog/installer/locks: %w", err)
 	}
 	err = os.Chown("/var/log/datadog", ddAgentUID, ddAgentGID)
 	if err != nil {
 		return fmt.Errorf("error changing owner of /var/log/datadog: %w", err)
 	}
-	err = os.Chown("/opt/datadog-packages/datadog-installer/stable/run", ddAgentUID, ddAgentGID)
+	err = os.Chown("/var/run/datadog", ddAgentUID, ddAgentGID)
+	if err != nil {
+		return fmt.Errorf("error changing owner of /var/run/datadog: %w", err)
+	}
+	err = os.Chown("/var/run/datadog/installer", ddAgentUID, ddAgentGID)
 	if err != nil {
-		return fmt.Errorf("error changing owner of /opt/datadog-packages/datadog-installer/stable/run: %w", err)
+		return fmt.Errorf("error changing owner of /var/run/datadog/installer: %w", err)
 	}
 
 	// Create installer path symlink

tasks/installer.py

@@ -19,6 +19,7 @@ def build(
     rebuild=False,
     race=False,
     install_path=None,
+    run_path=None,
     build_include=None,
     build_exclude=None,
     arch="x64",
@@ -28,7 +29,9 @@ def build(
     Build the updater.
     """
 
-    ldflags, gcflags, env = get_build_flags(ctx, major_version=MAJOR_VERSION, install_path=install_path)
+    ldflags, gcflags, env = get_build_flags(
+        ctx, major_version=MAJOR_VERSION, install_path=install_path, run_path=run_path
+    )
 
     build_include = (
         get_default_build_tags(

tasks/libs/common/utils.py

@@ -164,6 +164,7 @@ def get_build_flags(
     static=False,
     prefix=None,
     install_path=None,
+    run_path=None,
     embedded_path=None,
     rtloader_root=None,
     python_home_2=None,
@@ -201,6 +202,10 @@ def get_build_flags(
     if sys.platform.startswith('linux') and install_path:
         ldflags += f"-X {REPO_PATH}/pkg/config/setup.InstallPath={install_path} "
 
+    # setting the run path
+    if sys.platform.startswith('linux') and run_path:
+        ldflags += f"-X {REPO_PATH}/pkg/config/setup.defaultRunPath={run_path} "
+
     # setting python homes in the code
     if python_home_2:
         ldflags += f"-X {REPO_PATH}/pkg/collector/python.pythonHome2={python_home_2} "

test/new-e2e/tests/installer/package_installer_test.go

@@ -35,12 +35,13 @@ func (s *packageInstallerSuite) TestInstall() {
 	state.AssertUserHasGroup("dd-agent", "dd-agent")
 
 	state.AssertDirExists("/var/log/datadog", 0755, "dd-agent", "dd-agent")
-	state.AssertDirExists("/var/run/datadog-packages", 0777, "root", "root")
+	state.AssertDirExists("/var/run/datadog", 0755, "dd-agent", "dd-agent")
+	state.AssertDirExists("/var/run/datadog/installer", 0755, "dd-agent", "dd-agent")
+	state.AssertDirExists("/var/run/datadog/installer/locks", 0777, "root", "root")
 
 	state.AssertDirExists("/opt/datadog-installer", 0755, "root", "root")
 	state.AssertDirExists("/opt/datadog-packages", 0755, "root", "root")
 	state.AssertDirExists("/opt/datadog-packages/datadog-installer", 0755, "root", "root")
-	state.AssertDirExists("/opt/datadog-packages/datadog-installer/stable/run", 0755, "dd-agent", "dd-agent")
 
 	state.AssertSymlinkExists("/usr/bin/datadog-bootstrap", "/opt/datadog-installer/bin/installer/installer", "root", "root")
 	state.AssertSymlinkExists("/usr/bin/datadog-installer", "/opt/datadog-packages/datadog-installer/stable/bin/installer/installer", "root", "root")
@@ -60,10 +61,11 @@ func (s *packageInstallerSuite) TestUninstall() {
 	state.AssertUserHasGroup("dd-agent", "dd-agent")
 
 	state.AssertDirExists("/var/log/datadog", 0755, "dd-agent", "dd-agent")
+	state.AssertDirExists("/var/run/datadog", 0755, "dd-agent", "dd-agent")
 
 	// state that should get removed
 	state.AssertPathDoesNotExist("/opt/datadog-installer")
-	state.AssertPathDoesNotExist("/var/run/datadog-packages")
+	state.AssertPathDoesNotExist("/var/run/datadog/installer")
 	state.AssertPathDoesNotExist("/opt/datadog-packages")
 
 	state.AssertPathDoesNotExist("/usr/bin/datadog-bootstrap")