feat(msi): add fips support

SumoLogic · Apr 3, 2024 · 5cece39 · 5cece39
1 parent 4c26139
commit 5cece39
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/msi/SumoLogic.wixext/SumoLogicTests/TestData/with-extensions-block.yaml b/msi/SumoLogic.wixext/SumoLogicTests/TestData/with-extensions-block.yaml
@@ -67,8 +67,8 @@ processors:
   ## Configuration for Sumo Logic Schema Processor
   ## The Sumo Logic Schema processor modifies the metadata on logs, metrics and traces sent to Sumo Logic
   ## so that the Sumo Logic apps can make full use of the ingested data.
-  ## ref: https://github.com/SumoLogic/sumologic-otel-collector/tree/main/pkg/processor/sumologicschemaprocessor
-  sumologic_schema:
+  ## ref: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/sumologicprocessor
+  sumologic:
 
 service:
   extensions:
@@ -82,7 +82,7 @@ service:
       processors:
         - memory_limiter
         - batch
-        - sumologic_schema
+        - sumologic
       exporters:
         - sumologic
     logs/default:
@@ -91,7 +91,7 @@ service:
       processors:
         - memory_limiter
         - batch
-        - sumologic_schema
+        - sumologic
       exporters:
         - sumologic
     traces/default:
@@ -100,6 +100,6 @@ service:
       processors:
         - memory_limiter
         - batch
-        - sumologic_schema
+        - sumologic
       exporters:
         - sumologic
diff --git a/msi/SumoLogic.wixext/SumoLogicTests/TestData/without-extensions-block.yaml b/msi/SumoLogic.wixext/SumoLogicTests/TestData/without-extensions-block.yaml
@@ -48,8 +48,8 @@ processors:
   ## Configuration for Sumo Logic Schema Processor
   ## The Sumo Logic Schema processor modifies the metadata on logs, metrics and traces sent to Sumo Logic
   ## so that the Sumo Logic apps can make full use of the ingested data.
-  ## ref: https://github.com/SumoLogic/sumologic-otel-collector/tree/main/pkg/processor/sumologicschemaprocessor
-  sumologic_schema:
+  ## ref: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/sumologicprocessor
+  sumologic:
 
 service:
   extensions:
@@ -63,7 +63,7 @@ service:
       processors:
         - memory_limiter
         - batch
-        - sumologic_schema
+        - sumologic
       exporters:
         - sumologic
     logs/default:
@@ -72,7 +72,7 @@ service:
       processors:
         - memory_limiter
         - batch
-        - sumologic_schema
+        - sumologic
       exporters:
         - sumologic
     traces/default:
@@ -81,6 +81,6 @@ service:
       processors:
         - memory_limiter
         - batch
-        - sumologic_schema
+        - sumologic
       exporters:
         - sumologic
diff --git a/msi/wix/assets/common.yaml b/msi/wix/assets/common.yaml
@@ -0,0 +1,3 @@
+extensions:
+  sumologic:
+    installation_token:
diff --git a/msi/wix/otelcol-sumo.wixproj b/msi/wix/otelcol-sumo.wixproj
@@ -7,18 +7,26 @@
     <Cultures>en-US</Cultures>
     <DebugType>none</DebugType>
     <RepoRoot>$([System.IO.Path]::GetFullPath('..\..'))</RepoRoot>
+    <FIPSEnabled>false</FIPSEnabled>
   </PropertyGroup>
 
   <PropertyGroup>
     <SuppressIces>ICE61</SuppressIces>
   </PropertyGroup>
 
   <PropertyGroup>
-    <OutputName>otelcol-sumo_$(ProductVersion)_en-US.$(Platform)</OutputName>
     <OutputPath>bin\$(Platform)\</OutputPath>
     <IntermediateOutputPath>obj\$(Platform)\</IntermediateOutputPath>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(FIPSEnabled)' == 'false'">
+    <OutputName>otelcol-sumo_$(ProductVersion)_en-US.$(Platform)</OutputName>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(FIPSEnabled)' == 'true'">
+    <OutputName>otelcol-sumo_$(ProductVersion)_en-US.$(Platform)-fips</OutputName>
+  </PropertyGroup>
+
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);ProductVersion=$(ProductVersion)</DefineConstants>
     <DefineConstants>$(DefineConstants);UpgradeCode=$(UpgradeCode)</DefineConstants>