Script to convert legacy config files to values (NR-183332) (#333)

* Script to convert legacy config files to values.
* Go releaser adding both binaries (#339)

Author: alvarocabanas

.goreleaser.yml

@@ -1,6 +1,6 @@
 project_name: newrelic-super-agent
 builds:
-  -
+  - id: newrelic-super-agent
     main: ./build/dummy.go
     goarch:
       - arm64
@@ -10,21 +10,43 @@ builds:
     binary: newrelic-super-agent
     hooks:
       post:
-        - cmd: sh ./build/scripts/build_super_agent.sh
+        - cmd: sh ./build/scripts/build_binary.sh
           env:
             - ARCH={{ .Arch }}
             - BUILD_FEATURE=onhost
+            - BIN=newrelic-super-agent
         - cmd: sh ./build/scripts/replace_go_with_rust.sh
           env:
             - ARCH={{ .Arch }}
+            - BIN=newrelic-super-agent
         - cmd: sh ./build/scripts/download_embedded.sh
           env:
             - ARCH={{ .Arch }}
+  - id: newrelic-config-migrate
+    main: ./build/dummy.go
+    goarch:
+      - arm64
+      - amd64
+    goos:
+      - linux
+    binary: newrelic-config-migrate
+    hooks:
+      post:
+        - cmd: sh ./build/scripts/build_binary.sh
+          env:
+            - ARCH={{ .Arch }}
+            - BUILD_FEATURE=onhost
+            - BIN=newrelic-config-migrate
+        - cmd: sh ./build/scripts/replace_go_with_rust.sh
+          env:
+            - ARCH={{ .Arch }}
+            - BIN=newrelic-config-migrate
 archives:
   - format: tar.gz
     name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
     builds:
       - newrelic-super-agent
+      - newrelic-config-migrate
 
 nfpms:
   - package_name: newrelic-super-agent

Cargo.lock

@@ -1,10 +1,11 @@
 [package]
 name = "newrelic_super_agent"
 description = "New Relic Super Agent Limited Preview"
-version = "0.5.3"
+version = "0.6.1"
 edition = "2021"
 authors = ["The New Relic Core Agent & Open Standards (CAOS) Team"]
 publish = false
+default-run = "newrelic-super-agent"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -73,7 +74,11 @@ required-features = ["onhost"]
 
 [[bin]]
 name = "newrelic-super-agent"
-path = "src/bin/main.rs"
+path = "src/bin/newrelic-super-agent.rs"
+
+[[bin]]
+name = "newrelic-config-migrate"
+path = "src/bin/newrelic-config-migrate.rs"
 
 
 [features]

Cargo.toml

@@ -37,7 +37,12 @@ BUILD_MODE ?= release
 # Cross-compilation only works from amd64 host.
 build-super-agent:
 	@echo "Building with mode: $(BUILD_MODE) and arch: $(ARCH)"
-	ARCH=$(ARCH) BUILD_MODE=$(BUILD_MODE) ./build/scripts/build_super_agent.sh
+	ARCH=$(ARCH) BUILD_MODE=$(BUILD_MODE) BIN="newrelic-super-agent" ./build/scripts/build_binary.sh
+
+# Cross-compilation only works from amd64 host.
+build-config-migrate:
+	@echo "Building with mode: $(BUILD_MODE) and arch: $(ARCH)"
+	ARCH=$(ARCH) BUILD_MODE=$(BUILD_MODE) BIN="newrelic-config-migrate" ./build/scripts/build_binary.sh
 
 .PHONY: build-dev-image
 build-dev-image:

Makefile

@@ -29,12 +29,16 @@ ARG BUILD_MODE
 ENV BUILD_MODE_ENV=${BUILD_MODE}
 ARG BUILD_FEATURE
 ENV BUILD_FEATURE_ENV=${BUILD_FEATURE}
+ARG BUILD_BIN
+ENV BUILD_BIN_ENV=${BUILD_BIN}
 
 # Execute the command dynamically at runtime
 CMD [ "sh", "-c", "\
      CMD_STRING='cargo build'; \
      [ \"$BUILD_MODE_ENV\" != 'debug' ] && CMD_STRING='cargo build --release'; \
      CMD_STRING=\"$CMD_STRING --features $BUILD_FEATURE_ENV\"; \
      CMD_STRING=\"$CMD_STRING --target $ARCH_NAME-unknown-linux-gnu\"; \
+     CMD_STRING=\"$CMD_STRING --bin $BUILD_BIN_ENV\"; \
+     CMD_STRING=\"$CMD_STRING --target-dir target-$BUILD_BIN_ENV\"; \
      $CMD_STRING \
 "]

build/rust.Dockerfile

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+set -e
+
+RUST_VERSION="1.71.1"
+
+# compile production version of rust agent
+
+if [ "$ARCH" = "arm64" ];then
+  ARCH_NAME="aarch64"
+fi
+
+if [ "$ARCH" = "amd64" ];then
+  ARCH_NAME="x86_64"
+fi
+
+: "${BUILD_MODE:=release}" # Default to release if not specified
+
+if [ -z "${BIN}" ]; then
+    BIN="newrelic-super-agent"
+    echo "BIN not provided; defaulting to 'newrelic-super-agent'."
+fi
+
+
+if [ -z "${BUILD_FEATURE}" ]; then
+    BUILD_FEATURE="onhost"
+    echo "BUILD_FEATURE not provided; defaulting to 'onhost'."
+fi
+
+docker build -t "rust-cross-${ARCH_NAME}-${BIN}" -f ./build/rust.Dockerfile --build-arg ARCH_NAME="${ARCH_NAME}" --build-arg BUILD_MODE="${BUILD_MODE}" --build-arg BUILD_FEATURE="${BUILD_FEATURE}" --build-arg BUILD_BIN="${BIN}" .
+
+CARGO_HOME=/tmp/.cargo cargo fetch
+docker run --rm --user "$(id -u)":"$(id -g)" -v "$PWD":/usr/src/app -v /tmp/.cargo:/usr/src/app/.cargo "rust-cross-${ARCH_NAME}-${BIN}"
+
+mkdir -p "bin"
+
+cp "./target-${BIN}/${ARCH_NAME}-unknown-linux-gnu/${BUILD_MODE}/${BIN}" "./bin/${BIN}-${ARCH}"

build/scripts/build_binary.sh

@@ -2,16 +2,15 @@
 set -e
 
 if [ "$ARCH" = "arm64" ];then
-  BINARY_PATH="./dist/newrelic-super-agent_linux_${ARCH}/newrelic-super-agent"
+  BINARY_PATH="./dist/${BIN}_linux_${ARCH}/${BIN}"
 fi
 
 if [ "$ARCH" = "amd64" ];then
-  BINARY_PATH="./dist/newrelic-super-agent_linux_${ARCH}_v1/newrelic-super-agent"
+  BINARY_PATH="./dist/${BIN}_linux_${ARCH}_v1/${BIN}"
 fi
 
 # move rust compiled files into goreleaser generated locations
-cp "./bin/newrelic-super-agent-${ARCH}" "${BINARY_PATH}"
+cp "./bin/${BIN}-${ARCH}" "${BINARY_PATH}"
 
 # validate
 docker run --rm -v "$PWD":/usr/src/app -w /usr/src/app ubuntu /bin/bash -c "apt-get update && apt-get install tree -y && tree ./"
-

build/scripts/build_super_agent.sh

@@ -0,0 +1,77 @@
+use log::{error, info};
+use newrelic_super_agent::config::store::{SuperAgentConfigLoader, SuperAgentConfigStoreFile};
+use newrelic_super_agent::config::super_agent_configs::{AgentID, AgentTypeFQN};
+use newrelic_super_agent::config_migrate::config::MigrationConfig;
+use newrelic_super_agent::config_migrate::converter::ConfigConverter;
+use newrelic_super_agent::config_migrate::defaults::{
+    DEFAULT_AGENT_ID, NEWRELIC_INFRA_AGENT_TYPE_CONFIG_MAPPING,
+};
+use newrelic_super_agent::config_migrate::legacy_config_renamer::LegacyConfigRenamer;
+use newrelic_super_agent::config_migrate::values_persister_file::ValuesPersisterFile;
+use newrelic_super_agent::logging::Logging;
+use std::error::Error;
+use std::path::PathBuf;
+const DEFAULT_CFG_PATH: &str = "/etc/newrelic-super-agent/config.yaml";
+
+fn main() -> Result<(), Box<dyn Error>> {
+    // init logging singleton
+    Logging::try_init()?;
+
+    info!("Starting conversion tool...");
+
+    let config: MigrationConfig = serde_yaml::from_str(NEWRELIC_INFRA_AGENT_TYPE_CONFIG_MAPPING)?;
+
+    let config_converter = ConfigConverter::default();
+    let values_persister = ValuesPersisterFile::default();
+    let legacy_config_renamer = LegacyConfigRenamer::default();
+
+    for cfg in config.configs {
+        let Ok(agent_type) = get_current_agent_type().map_err(|e| {
+            error!("Error finding newrelic-super-agent config: {}", e);
+        }) else {
+            return Ok(());
+        };
+
+        if cfg.agent_type_fqn != agent_type {
+            error!("This script requires a config file and nr_infra_agent agent_type 0.0.2");
+            return Ok(());
+        }
+
+        match config_converter.convert(&cfg) {
+            Ok(agent_variables) => {
+                let values_content = serde_yaml::to_string(&agent_variables)?;
+                values_persister.persist_values_file(
+                    &AgentID::new(DEFAULT_AGENT_ID)?,
+                    values_content.as_str(),
+                )?;
+                for (_, dir_path) in cfg.dirs_map {
+                    legacy_config_renamer.rename_path(dir_path.as_str())?;
+                }
+                for (_, file_path) in cfg.files_map {
+                    legacy_config_renamer.rename_path(file_path.as_str())?;
+                }
+                info!("Config files successfully converted");
+            }
+            Err(e) => {
+                error!(
+                    "Conversion failed, old files or paths are renamed or not present: {}",
+                    e
+                );
+            }
+        };
+    }
+
+    Ok(())
+}
+
+// TODO : Add tests for getting this agent_type and check the agent_type by namespace instead of name DEFAULT_AGENT_ID
+fn get_current_agent_type() -> Result<AgentTypeFQN, Box<dyn Error>> {
+    let local_config_path = PathBuf::from(DEFAULT_CFG_PATH.to_string());
+    let super_agent_config_storer =
+        SuperAgentConfigStoreFile::new(&local_config_path).with_remote()?;
+    let agents = super_agent_config_storer.load()?.agents;
+    Ok(agents
+        .get(&AgentID::new(DEFAULT_AGENT_ID)?)
+        .cloned()?
+        .agent_type)
+}