feat: merge files and directories

Author: DavSanchez

agent-control/agent-type-registry/newrelic/com.newrelic.infrastructure-0.1.0.yaml

@@ -114,26 +114,19 @@ deployment:
       args: --version
       regex: \d+\.\d+\.\d+
     filesystem:
-      files:
-        config:
-          path: newrelic-infra.yaml
-          content: |
-            ${nr-var:config_agent}
-      directories:
-        integrations:
-          path: integrations.d
-          items: ${nr-var:config_integrations}
-        logging:
-          path: logging.d
-          items: ${nr-var:config_logging}
+      config:
+        newrelic-infra.yaml: |
+          ${nr-var:config_agent}
+      integrations.d: ${nr-var:config_integrations}
+      logging.d: ${nr-var:config_logging}
     executables:
       - id: newrelic-infra
         path: /usr/bin/newrelic-infra
         args: >-
-          --config=${nr-sub:autogenerated_agent_dir}/files/newrelic-infra.yaml
+          --config=${nr-sub:autogenerated_agent_dir}/config/newrelic-infra.yaml
         env:
-          NRIA_PLUGIN_DIR: "${nr-sub:autogenerated_agent_dir}/directories/integrations.d"
-          NRIA_LOGGING_CONFIGS_DIR: "${nr-sub:autogenerated_agent_dir}/directories/logging.d"
+          NRIA_PLUGIN_DIR: "${nr-sub:autogenerated_agent_dir}/integrations.d"
+          NRIA_LOGGING_CONFIGS_DIR: "${nr-sub:autogenerated_agent_dir}/logging.d"
           NRIA_STATUS_SERVER_ENABLED: true
           NRIA_STATUS_SERVER_PORT: "${nr-var:health_port}"
           NR_HOST_ID: "${nr-ac:host_id}"

agent-control/agent-type-registry/newrelic/io.opentelemetry.collector-0.1.0.yaml

@@ -81,17 +81,15 @@ deployment:
       args: -v
       regex: \d+\.\d+\.\d+
     filesystem:
-      files:
-        otel-config:
-          path: config.yaml
-          content: |
-            ${nr-var:config}
+      otel-config:
+        config.yaml: |
+          ${nr-var:config}
     executables:
       - # Important to note the binary name is nrdot-collector-host matching the new nrdot binary
         id: nrdot-collector-host
         path: /usr/bin/nrdot-collector-host
         args: >-
-          --config=${nr-sub:autogenerated_agent_dir}/files/config.yaml
+          --config=${nr-sub:autogenerated_agent_dir}/otel-config/config.yaml
           --feature-gates=-pkg.translator.prometheus.NormalizeName
         env:
           # sets the otel-collector "env" source resource detector