enable fips for windows

Author: s-alad

.gitlab/deploy/container_build/docker_windows.yml

@@ -23,8 +23,7 @@
     # Omnibus uses a slightly different path than the actual install
     # TODO: This overwrites an extra agent.exe, we should also remove it from the zip
     - mv "Datadog Agent\bin\agent\agent.exe" "Datadog Agent\bin\agent.exe" -Force
-    # TODO(AGENTCFG-XXX): SGC is not supported in FIPS mode
-    - if (Test-Path "Datadog Agent\bin\agent\secret-generic-connector.exe") { mv "Datadog Agent\bin\agent\secret-generic-connector.exe" "Datadog Agent\bin\secret-generic-connector.exe" -Force }
+    - mv "Datadog Agent\bin\agent\secret-generic-connector.exe" "Datadog Agent\bin\secret-generic-connector.exe" -Force
     - popd
 
     - get-childitem ${BUILD_CONTEXT}

omnibus/config/projects/agent.rb

@@ -323,10 +323,7 @@
     "#{install_dir}\\datadog-installer.exe"
   ]
 
-  if not fips_mode?
-    # TODO(AGENTCFG-XXX): SGC is not supported in FIPS mode
-    GO_BINARIES << "#{install_dir}\\bin\\agent\\secret-generic-connector.exe"
-  end
+  GO_BINARIES << "#{install_dir}\\bin\\agent\\secret-generic-connector.exe"
 
   if not windows_arch_i386? and ENV['WINDOWS_DDPROCMON_DRIVER'] and not ENV['WINDOWS_DDPROCMON_DRIVER'].empty?
     GO_BINARIES << "#{install_dir}\\bin\\agent\\security-agent.exe"

tools/windows/DatadogAgentInstaller/WixSetup/Datadog Agent/AgentInstaller.cs

@@ -645,10 +645,9 @@ private Dir CreateBinFolder()
                 ),
                 scriptsBinDir
             );
-            // TODO(AGENTCFG-XXX): SGC is not supported in FIPS mode
+            targetBinFolder.AddFile(new WixSharp.File(_agentBinaries.SecretGenericConnector));
             if (_agentFlavor.FlavorName != Constants.FipsFlavor)
             {
-                targetBinFolder.AddFile(new WixSharp.File(_agentBinaries.SecretGenericConnector));
                 targetBinFolder.AddFile(new WixSharp.File(_agentBinaries.DdCompilePolicy));
             }