Merge pull request #116 from Keyfactor/release-2.4

Release 2.4.4 to main

Author: fiddlermikey

CHANGELOG.md

@@ -1,3 +1,7 @@
+2.4.4
+* Fix an issue with WinRM parameters when migrating Legacy IIS Stores to the WinCert type
+* Fix an issue with "Delete" script in the Legacy IIS Migration that did not remove some records from dependent tables
+
 2.4.3
 * Adding Legacy IIS Migration scripting and Readme guide
 

Migration-Scripts/Legacy-IIS/CreateWinCertStoreType.sql

@@ -139,8 +139,8 @@ BEGIN TRY
 		VALUES	
 		(
 			@current_storetype_id, -- StoreTypeId
-			'WinRm Protocol',	-- Name
-			'WinRm Protocol',	-- DisplayName
+			'WinRM Protocol',	-- Name
+			'WinRM Protocol',	-- DisplayName
 			2,					-- Type
 			1,					-- Required
 			NULL,				-- DependsOn
@@ -160,8 +160,8 @@ BEGIN TRY
 		VALUES	
 		(
 			@current_storetype_id, -- StoreTypeId
-			'WinRm Port',	-- Name
-			'WinRm Port',	-- DisplayName
+			'WinRM Port',	-- Name
+			'WinRM Port',	-- DisplayName
 			0,				-- Type
 			1,				-- Required
 			NULL,			-- DependsOn

Migration-Scripts/Legacy-IIS/DeleteIISStores.sql

@@ -27,41 +27,59 @@ BEGIN TRY
 		INNER JOIN [cms_agents].[CertStores] [cs] ON [csii].[CertStoreId] = [cs].[Id]
 		INNER JOIN @IISStoreTypeIds [sti] ON [sti].[Id] = [cs].[CertStoreType];
 
+	DELETE [csmj]
+	FROM [cms_agents].[CertStoreManagementJobs] [csmj]
+		INNER JOIN [cms_agents].[AgentSchedules] [as] ON [csmj].[JobId] = [as].[JobId]
+		INNER JOIN @IISJobTypeIds [jti] ON [jti].[Id] = [as].[JobTypeId];
+
+	DELETE [csms]
+	FROM [dbo].[CertStoreManagementStaging] [csms]
+		INNER JOIN [cms_agents].[CertStores] [cs] ON [csms].[CertStoreId] = [cs].[Id]
+		INNER JOIN @IISStoreTypeIds [sti] ON [sti].[Id] = [cs].[CertStoreType];
+
+	DELETE [csmjs]
+	FROM [cms_agents].[CertStoreManagementJobStaging] [csmjs]
+		INNER JOIN [cms_agents].[CertStores] [cs] ON [csmjs].[StoreId] = [cs].[Id]
+		INNER JOIN @IISStoreTypeIds [st] ON [st].[Id] = [cs].[CertStoreType];
+
+	DELETE [csrj]
+	FROM [cms_agents].[CertStoreReenrollmentJobs] [csrj]
+		INNER JOIN [cms_agents].[AgentSchedules] [as] ON [csrj].[JobId] = [as].[JobId]
+		INNER JOIN @IISJobTypeIds [jti] ON [jti].[Id] = [as].[JobTypeId];
+
 	DELETE [cs]
 	FROM [cms_agents].[CertStores] [cs]
 		INNER JOIN @IISStoreTypeIds [st] ON [cs].[CertStoreType] = [st].[Id];
 
 	DELETE [csc]
 	FROM [cms_agents].[CertStoreContainers] [csc]
-		INNER JOIN @IISStoreTypeIds [st] ON [csc].[CertStoreType] = [st].[Id];
+		INNER JOIN @IISStoreTypeIds [st] ON [csc].[CertStoreType] = [st].[Id];	
 
 	DELETE [csij]
 	FROM [cms_agents].[CertStoreInventoryJobs] [csij]
 		INNER JOIN [cms_agents].[AgentSchedules] [as] ON [csij].[JobId] = [as].[JobId]
 		INNER JOIN @IISJobTypeIds [jti] ON [jti].[Id] = [as].[JobTypeId];
 
-	DELETE [csrj]
-	FROM [cms_agents].[CertStoreReenrollmentJobs] [csrj]
-		INNER JOIN [cms_agents].[AgentSchedules] [as] ON [csrj].[JobId] = [as].[JobId]
-		INNER JOIN @IISJobTypeIds [jti] ON [jti].[Id] = [as].[JobTypeId];
-
-	DELETE [csmj]
-	FROM [cms_agents].[CertStoreManagementJobs] [csmj]
-		INNER JOIN [cms_agents].[AgentSchedules] [as] ON [csmj].[JobId] = [as].[JobId]
-		INNER JOIN @IISJobTypeIds [jti] ON [jti].[Id] = [as].[JobTypeId];
-
 	DELETE [as]
 	FROM [cms_agents].[AgentSchedules] [as]
 		INNER JOIN @IISJobTypeIds [jt] ON [jt].[Id] = [as].[JobTypeId];
 
 	DELETE [cstp]
 	FROM [cms_agents].[CertStoreTypeProperties] [cstp]
-		INNER JOIN @IISStoreTypeIds [st] ON [cstp].[StoreTypeId] = [st].[id];
+		INNER JOIN @IISStoreTypeIds [st] ON [cstp].[StoreTypeId] = [st].[Id];
+
+	DELETE [cstep]
+	FROM [cms_agents].[CertStoreTypeEntryParameters] [cstep]
+		INNER JOIN @IISStoreTypeIds [st] ON [cstep].[StoreTypeId] = [st].[Id];
 
 	DELETE [cst]
 	FROM [cms_agents].[CertStoreTypes] [cst]
 		INNER JOIN @IISStoreTypeIds [st] ON [cst].[StoreType] = [st].[id];
 
+	DELETE [arg]
+	FROM [cms_agents].[AgentRegistrationGroups] [arg]
+		INNER JOIN @IISJobTypeIds [jt] ON [arg].[JobTypeId] = [jt].[Id];
+
 	DELETE [ars]
 	FROM [cms_agents].[AgentRegistrationSettings] [ars]
 		INNER JOIN @IISJobTypeIds [jt] ON [ars].[JobTypeId] = [jt].[Id];
@@ -70,6 +88,10 @@ BEGIN TRY
 	FROM [cms_agents].[AgentCapabilities] [ac]
 		INNER JOIN @IISJobTypeIds [jt] ON [ac].[JobTypeId] = [jt].[Id];
 
+	DELETE [jtf]
+	FROM [cms_agents].[JobTypeFields] [jtf]
+		INNER JOIN @IISJobTypeIds [jt] ON [jtf].[JobTypeId] = [jt].[Id];
+
 	DELETE [jt]
 	FROM [cms_agents].[JobTypes] [jt]
 		INNER JOIN @IISJobTypeIds [jti] ON [jt].[Id] = [jti].[Id];

Migration-Scripts/Legacy-IIS/UpgradeIISPersonalToWinCert.sql

@@ -204,7 +204,7 @@ BEGIN TRY
 		@win_cert_store_type_id,
 		[psd].[StoreApproved],
 		0,
-		'{"WinRm Protocol":"'+@winrm_protocol+'","WinRm Port":"'+CONVERT(NVARCHAR(10),@winrm_port)+'","spnwithport":"'+@spnwithport+'","ServerUsername":"'+CONVERT(NVARCHAR(36),NEWID())+'","ServerPassword":"'+CONVERT(NVARCHAR(36),NEWID())+'","ServerUseSsl":"true"}',
+		'{"WinRM Protocol":"'+@winrm_protocol+'","WinRM Port":"'+CONVERT(NVARCHAR(10),@winrm_port)+'","spnwithport":"'+@spnwithport+'","ServerUsername":"'+CONVERT(NVARCHAR(36),NEWID())+'","ServerPassword":"'+CONVERT(NVARCHAR(36),NEWID())+'","ServerUseSsl":"true"}',
 		[psd].[AgentId]
 	FROM @iis_store_data [psd];
 

Migration-Scripts/Legacy-IIS/UpgradeIISRevokedAndRootsToWinCert.sql

@@ -159,7 +159,7 @@ BEGIN TRY
 		@win_cert_store_type_id,
 		[psd].[StoreApproved],
 		0,
-		''{"WinRm Protocol":"''+@winrm_protocol+''","WinRm Port":"''+CONVERT(NVARCHAR(10),@winrm_port)+''","spnwithport":"''+@spnwithport+''","ServerUsername":"''+CONVERT(NVARCHAR(36),NEWID())+''","ServerPassword":"''+CONVERT(NVARCHAR(36),NEWID())+''","ServerUseSsl":"true"}'',
+		''{"WinRM Protocol":"''+@winrm_protocol+''","WinRM Port":"''+CONVERT(NVARCHAR(10),@winrm_port)+''","spnwithport":"''+@spnwithport+''","ServerUsername":"''+CONVERT(NVARCHAR(36),NEWID())+''","ServerPassword":"''+CONVERT(NVARCHAR(36),NEWID())+''","ServerUseSsl":"true"}'',
 		[psd].[AgentId]
 	FROM @iis_store_data [psd];'