fix: tree

Author: danielorihuela

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

@@ -51,17 +51,18 @@ variables:
             description: "Username for HTTP Basic authentication"
             type: string
             required: false
-            default: null
+            default: ""
           password:
             description: "Password for HTTP Basic authentication"
             type: string
             required: false
-            default: null
+            default: ""
         bearer:
-          description: "Bearer token for authentication"
-          type: string
-          required: false
-          default: null
+          token:
+            description: "Bearer token for authentication"
+            type: string
+            required: false
+            default: ""
     version:
       description: "Agent version"
       type: string
@@ -120,17 +121,18 @@ variables:
             description: "Username for HTTP Basic authentication"
             type: string
             required: false
-            default: null
+            default: ""
           password:
             description: "Password for HTTP Basic authentication"
             type: string
             required: false
-            default: null
+            default: ""
         bearer:
-          description: "Bearer token for authentication"
-          type: string
-          required: false
-          default: null
+          token:
+            description: "Bearer token for authentication"
+            type: string
+            required: false
+            default: ""
     version:
       description: "Agent version"
       type: string
@@ -224,7 +226,8 @@ deployment:
               basic:
                 username: ${nr-var:oci.auth.basic.username}
                 password: ${nr-var:oci.auth.basic.password}
-              bearer: ${nr-var:oci.auth.bearer}
+              bearer:
+                token: ${nr-var:oci.auth.bearer.token}
     version:
       path: ${nr-sub:packages.infra-agent.dir}\\newrelic-infra.exe
       args:
@@ -299,7 +302,8 @@ deployment:
               basic:
                 username: ${nr-var:oci.auth.basic.username}
                 password: ${nr-var:oci.auth.basic.password}
-              bearer: ${nr-var:oci.auth.bearer}
+              bearer:
+                token: ${nr-var:oci.auth.bearer.token}
     version:
       path: ${nr-sub:packages.infra-agent.dir}/newrelic-infra
       args:

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

@@ -55,17 +55,18 @@ variables:
             description: "Username for HTTP Basic authentication"
             type: string
             required: false
-            default: null
+            default: ""
           password:
             description: "Password for HTTP Basic authentication"
             type: string
             required: false
-            default: null
+            default: ""
         bearer:
-          description: "Bearer token for authentication"
-          type: string
-          required: false
-          default: null
+          token:
+            description: "Bearer token for authentication"
+            type: string
+            required: false
+            default: ""
     version:
       description: "Agent version"
       type: string
@@ -118,17 +119,18 @@ variables:
             description: "Username for HTTP Basic authentication"
             type: string
             required: false
-            default: null
+            default: ""
           password:
             description: "Password for HTTP Basic authentication"
             type: string
             required: false
-            default: null
+            default: ""
         bearer:
-          description: "Bearer token for authentication"
-          type: string
-          required: false
-          default: null
+          token:
+            description: "Bearer token for authentication"
+            type: string
+            required: false
+            default: ""
     version:
       description: "Agent version"
       type: string
@@ -195,7 +197,8 @@ deployment:
               basic:
                 username: ${nr-var:oci.auth.basic.username}
                 password: ${nr-var:oci.auth.basic.password}
-              bearer: ${nr-var:oci.auth.bearer}
+              bearer:
+                token: ${nr-var:oci.auth.bearer.token}
     version:
       path: ${nr-sub:packages.nrdot.dir}\\nrdot-collector.exe
       args:
@@ -233,7 +236,8 @@ deployment:
               basic:
                 username: ${nr-var:oci.auth.basic.username}
                 password: ${nr-var:oci.auth.basic.password}
-              bearer: ${nr-var:oci.auth.bearer}
+              bearer:
+                token: ${nr-var:oci.auth.bearer.token}
     health:
       interval: 30s
       initial_delay: 90s

agent-control/src/agent_type/runtime_config/on_host.rs

@@ -784,7 +784,7 @@ executables:
             Variable::new_final_string_variable(creds.password.to_string()),
         );
         vars.insert(
-            "nr-var:oci.auth.bearer".to_string(),
+            "nr-var:oci.auth.bearer.token".to_string(),
             Variable::new_final_string_variable(creds.bearer.to_string()),
         );
 
@@ -864,6 +864,7 @@ packages:
           basic:
             username: ${nr-var:oci.auth.basic.username}
             password: ${nr-var:oci.auth.basic.password}
-          bearer: ${nr-var:oci.auth.bearer}
+          bearer:
+            token: ${nr-var:oci.auth.bearer.token}
 "#;
 }

agent-control/src/agent_type/runtime_config/on_host/package.rs

@@ -42,7 +42,7 @@ pub struct Oci {
 #[derive(Debug, Deserialize, Default, Clone, PartialEq)]
 pub struct Auth {
     pub basic: BasicAuth,
-    pub bearer: TemplateableValue<String>,
+    pub bearer: BearerAuth,
 }
 
 #[derive(Debug, Deserialize, Default, Clone, PartialEq)]
@@ -51,6 +51,11 @@ pub struct BasicAuth {
     pub password: TemplateableValue<String>,
 }
 
+#[derive(Debug, Deserialize, Default, Clone, PartialEq)]
+pub struct BearerAuth {
+    pub token: TemplateableValue<String>,
+}
+
 impl Templateable for Package {
     type Output = rendered::Package;
     fn template_with(self, variables: &Variables) -> Result<Self::Output, AgentTypeError> {
@@ -120,7 +125,7 @@ impl Templateable for Auth {
             return Ok(RegistryAuth::Basic(username, password));
         }
 
-        let token = self.bearer.template_with(variables)?;
+        let token = self.bearer.token.template_with(variables)?;
         if !token.is_empty() {
             return Ok(RegistryAuth::Bearer(token));
         }
@@ -229,7 +234,7 @@ mod tests {
                     username: TemplateableValue::from_template("${nr-var:username}".to_string()),
                     password: TemplateableValue::from_template("${nr-var:password}".to_string()),
                 },
-                bearer: TemplateableValue::default(),
+                bearer: BearerAuth::default(),
             },
         };
 
@@ -255,7 +260,9 @@ mod tests {
             public_key_url: None,
             auth: Auth {
                 basic: BasicAuth::default(),
-                bearer: TemplateableValue::from_template("${nr-var:token}".to_string()),
+                bearer: BearerAuth {
+                    token: TemplateableValue::from_template("${nr-var:token}".to_string()),
+                },
             },
         };