Fix windows installer package (#54)

newrelic · Oct 16, 2019 · 7535fdf · 7535fdf
1 parent 5e13895
commit 7535fdf
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 _obj
 _test
 bin
+obj
 
 # Architecture specific extensions/prefixes
 *.[568vq]
@@ -24,7 +25,10 @@ _testmain.go
 *.test
 *.prof
 *.DS_STORE
+*.syso
+*.wxs
 
+versioninfo.json
 /integrations/*/bin/
 coverage.xml
 target/
@@ -38,5 +42,8 @@ Session.vim
 # VSCode
 .vscode
 debug
+conf.yaml
+Makefile-deploy.mk
+
  #GoLand
 .idea 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.1.1 - 2019-10-16
+### Fixed
+- Windows installer GUIDs
+
 ## 4.1.0 - 2019-06-19
 ### Added
 - Windows build

diff --git a/pkg/windows/nri-386-installer/Product.wxs.template b/pkg/windows/nri-386-installer/Product.wxs.template
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <?define Version = "{IntegrationVersion}" ?>
     <?define ProductId = "*" ?>
-    <?define UpgradeCode = "{f42aa489-e590-429d-a1c2-4ebd97cf8c3e}" ?>
+    <?define UpgradeCode = "{59bf8deb-66d6-4a6f-a520-6cd60de9c399}" ?>
 
     <Product Id="$(var.ProductId)"
              Name="New Relic Infrastructure Integration, nri-{IntegrationName}"
@@ -67,14 +67,14 @@
 
     <Fragment>
         <ComponentGroup Id="CustomPluginsBinComponent" Directory="CustomPluginsBinFolder">
-            <Component Id="CMP_NRI_{IntegrationName}_EXE" Guid="c57aeed1-f045-4202-8daa-d806db2e29e4" Win64="no">
+            <Component Id="CMP_NRI_{IntegrationName}_EXE" Guid="832ef605-2ed2-4a58-a2d0-d32652b2c326" Win64="no">
                 <File Id="FILE_NRI_{IntegrationName}_EXE"
                       Source="$(var.BinariesPath){IntegrationExe}"
                       KeyPath="yes"/>
             </Component>
         </ComponentGroup>
         <ComponentGroup Id="CustomPluginsComponent" Directory="CustomPluginsFolder">
-            <Component Id="CMP_NRI_{IntegrationName}_DEFINITION_YML" Guid="35c84fd9-7b1a-4871-a706-390ea19252b1" Win64="no"
+            <Component Id="CMP_NRI_{IntegrationName}_DEFINITION_YML" Guid="710063f8-0ea1-469c-8dde-a1130de9b1fd" Win64="no"
                        NeverOverwrite="yes" Permanent="yes">
                 <File Id="FILE_NRI_{IntegrationName}_DEFINITION_YML"
                       Name="{IntegrationName}-definition.yml"
@@ -83,7 +83,7 @@
             </Component>
         </ComponentGroup>
         <ComponentGroup Id="PluginConfigsComponent" Directory="PluginConfigsFolder">
-            <Component Id="CMP_NRI_{IntegrationName}_CONFIG_YML" Guid="ae131e4c-7ec5-42c5-b21b-b454979f28ee" Win64="no"
+            <Component Id="CMP_NRI_{IntegrationName}_CONFIG_YML" Guid="0851305b-d012-418d-b977-a9a2a1c508cc" Win64="no"
                        NeverOverwrite="yes" Permanent="yes">
                 <File Id="FILE_NRI_{IntegrationName}_CONFIG_YML"
                       Name="{IntegrationName}-config.yml.sample"

diff --git a/pkg/windows/nri-386-installer/nri-installer.wixproj b/pkg/windows/nri-386-installer/nri-installer.wixproj
@@ -4,7 +4,7 @@
         <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
         <ProductVersion>3.10</ProductVersion>
-        <ProjectGuid>89a5d3bd-73d7-4ebb-8f3c-75a7c09e67a4</ProjectGuid>
+        <ProjectGuid>cf4185cc-55ff-40f3-91d8-3147c69530ef</ProjectGuid>
         <SchemaVersion>2.0</SchemaVersion>
         <OutputName>$(integration)-386</OutputName>
         <OutputType>Package</OutputType>

diff --git a/pkg/windows/nri-amd64-installer/Product.wxs.template b/pkg/windows/nri-amd64-installer/Product.wxs.template
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <?define Version = "{IntegrationVersion}" ?>
     <?define ProductId = "*" ?>
-    <?define UpgradeCode = "{f42aa489-e590-429d-a1c2-4ebd97cf8c3e}" ?>
+    <?define UpgradeCode = "{59bf8deb-66d6-4a6f-a520-6cd60de9c399}" ?>
 
     <Product Id="$(var.ProductId)"
              Name="New Relic Infrastructure Integration, nri-{IntegrationName}"
@@ -67,14 +67,14 @@
 
     <Fragment>
         <ComponentGroup Id="CustomPluginsBinComponent" Directory="CustomPluginsBinFolder">
-            <Component Id="CMP_NRI_{IntegrationName}_EXE" Guid="eea30c6e-7a14-4cc5-97c5-88a742041643" Win64="yes">
+            <Component Id="CMP_NRI_{IntegrationName}_EXE" Guid="832ef605-2ed2-4a58-a2d0-d32652b2c326" Win64="yes">
                 <File Id="FILE_NRI_{IntegrationName}_EXE"
                       Source="$(var.BinariesPath){IntegrationExe}"
                       KeyPath="yes"/>
             </Component>
         </ComponentGroup>
         <ComponentGroup Id="CustomPluginsComponent" Directory="CustomPluginsFolder">
-            <Component Id="CMP_NRI_{IntegrationName}_DEFINITION_YML" Guid="35c84fd9-7b1a-4871-a706-390ea19252b1" Win64="yes"
+            <Component Id="CMP_NRI_{IntegrationName}_DEFINITION_YML" Guid="710063f8-0ea1-469c-8dde-a1130de9b1fd" Win64="yes"
                        NeverOverwrite="yes" Permanent="yes">
                 <File Id="FILE_NRI_{IntegrationName}_DEFINITION_YML"
                       Name="{IntegrationName}-definition.yml"
@@ -83,7 +83,7 @@
             </Component>
         </ComponentGroup>
         <ComponentGroup Id="PluginConfigsComponent" Directory="PluginConfigsFolder">
-            <Component Id="CMP_NRI_{IntegrationName}_CONFIG_YML" Guid="ae131e4c-7ec5-42c5-b21b-b454979f28ee" Win64="yes"
+            <Component Id="CMP_NRI_{IntegrationName}_CONFIG_YML" Guid="0851305b-d012-418d-b977-a9a2a1c508cc" Win64="yes"
                        NeverOverwrite="yes" Permanent="yes">
                 <File Id="FILE_NRI_{IntegrationName}_CONFIG_YML"
                       Name="{IntegrationName}-config.yml.sample"

diff --git a/pkg/windows/nri-amd64-installer/nri-installer.wixproj b/pkg/windows/nri-amd64-installer/nri-installer.wixproj
@@ -4,7 +4,7 @@
         <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
         <ProductVersion>3.10</ProductVersion>
-        <ProjectGuid>89a5d3bd-73d7-4ebb-8f3c-75a7c09e67a4</ProjectGuid>
+        <ProjectGuid>cf4185cc-55ff-40f3-91d8-3147c69530ef</ProjectGuid>
         <SchemaVersion>2.0</SchemaVersion>
         <OutputName>$(integration)-amd64</OutputName>
         <OutputType>Package</OutputType>

diff --git a/src/elasticsearch.go b/src/elasticsearch.go
@@ -29,7 +29,7 @@ type argumentList struct {
 
 const (
 	integrationName    = "com.newrelic.elasticsearch"
-	integrationVersion = "4.1.0"
+	integrationVersion = "4.1.1"
 )
 
 var (
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ type argumentList struct { @@
     const (
     	integrationName    = "com.newrelic.elasticsearch"
-    	integrationVersion = "4.1.0"
+    	integrationVersion = "4.1.1"
     )
     var (
@@ Expand Down @@