From 2aeeede180b1516fb6fbc3be236b41a1aa87879f Mon Sep 17 00:00:00 2001
From: Ethan Wood-Thomas <ethan.woodthomas@datadoghq.com>
Date: Thu, 26 Sep 2024 13:48:36 -0400
Subject: [PATCH 1/2] Send host tags in first 30 minutes

---
 .../datadog/apps/fips/images/fips-server/go.mod      |  6 ++++++
 .../datadog/apps/fips/images/fips-server/go.sum      |  7 +++++++
 scenarios/aws/kindvm/run.go                          |  3 +++
 test-infra-definitions.iml                           | 12 ++++++++++++
 4 files changed, 28 insertions(+)
 create mode 100644 components/datadog/apps/fips/images/fips-server/go.sum
 create mode 100644 test-infra-definitions.iml

diff --git a/components/datadog/apps/fips/images/fips-server/go.mod b/components/datadog/apps/fips/images/fips-server/go.mod
index fe81103c9..8092cd0df 100644
--- a/components/datadog/apps/fips/images/fips-server/go.mod
+++ b/components/datadog/apps/fips/images/fips-server/go.mod
@@ -1,8 +1,14 @@
 module e2e_server
 
+go 1.22.5
+
 require github.com/spf13/cobra v1.8.1
 
 require (
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/components/datadog/apps/fips/images/fips-server/go.sum b/components/datadog/apps/fips/images/fips-server/go.sum
new file mode 100644
index 000000000..3e41cc411
--- /dev/null
+++ b/components/datadog/apps/fips/images/fips-server/go.sum
@@ -0,0 +1,7 @@
+github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/scenarios/aws/kindvm/run.go b/scenarios/aws/kindvm/run.go
index 67cfa1e37..41e03127f 100644
--- a/scenarios/aws/kindvm/run.go
+++ b/scenarios/aws/kindvm/run.go
@@ -92,6 +92,9 @@ datadog:
   kubelet:
     tlsVerify: false
   clusterName: "%s"
+  env:
+    - name: DD_EXPECTED_TAGS_DURATION
+      value: 30m
 agents:
   useHostNetwork: true
 `, kindClusterName)
diff --git a/test-infra-definitions.iml b/test-infra-definitions.iml
new file mode 100644
index 000000000..4c83cacf2
--- /dev/null
+++ b/test-infra-definitions.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/components/datadog/apps/jmxfetch/images/jmx-test-app" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

From f91570d7df1657f4e39ec88335da96c27920c304 Mon Sep 17 00:00:00 2001
From: Ethan Wood-Thomas <ethan.woodthomas@datadoghq.com>
Date: Thu, 26 Sep 2024 13:59:36 -0400
Subject: [PATCH 2/2] removed file

---
 test-infra-definitions.iml | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 test-infra-definitions.iml

diff --git a/test-infra-definitions.iml b/test-infra-definitions.iml
deleted file mode 100644
index 4c83cacf2..000000000
--- a/test-infra-definitions.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/components/datadog/apps/jmxfetch/images/jmx-test-app" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file