Mark etag as required in AgentConfiguration type

elastic · May 16, 2022 · 57a3627 · 57a3627
1 parent 74bd08c
commit 57a3627
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/x-pack/plugins/apm/common/agent_configuration/configuration_types.d.ts b/x-pack/plugins/apm/common/agent_configuration/configuration_types.d.ts
@@ -15,6 +15,6 @@ export type AgentConfigurationIntake = t.TypeOf<
 export type AgentConfiguration = {
   '@timestamp': number;
   applied_by_agent?: boolean;
-  etag?: string;
+  etag: string;
   agent_name?: string;
 } & AgentConfigurationIntake;
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts
@@ -60,7 +60,6 @@ export async function findExactConfiguration({
     ...convertConfigSettingsToString(hit)._source,
     applied_by_agent:
       hit._source.applied_by_agent ||
-      (hit._source.etag !== undefined &&
-        configsAppliedToAgentsThroughFleet.hasOwnProperty(hit._source.etag)),
+      configsAppliedToAgentsThroughFleet.hasOwnProperty(hit._source.etag),
   };
 }
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/list_configurations.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration/list_configurations.ts
@@ -31,8 +31,7 @@ export async function listConfigurations({ setup }: { setup: Setup }) {
       ...hit._source,
       applied_by_agent:
         hit._source.applied_by_agent ||
-        (hit._source.etag !== undefined &&
-          configsAppliedToAgentsThroughFleet.hasOwnProperty(hit._source.etag)),
+        configsAppliedToAgentsThroughFleet.hasOwnProperty(hit._source.etag),
     };
   });
 }
diff --git a/...k/test/apm_api_integration/tests/settings/agent_configuration/agent_configuration.spec.ts b/...k/test/apm_api_integration/tests/settings/agent_configuration/agent_configuration.spec.ts
@@ -312,7 +312,7 @@ export default function agentConfigurationTests({ getService }: FtrProviderConte
           service: { name: 'myservice', environment: 'production' },
           settings: { transaction_sample_rate: '0.9' },
         };
-        let etag: string | undefined;
+        let etag: string;
 
         before(async () => {
           log.debug('creating agent configuration');