Skip to content

Remove Update Install Source Custom Action #42114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 21, 2025
Merged

Remove Update Install Source Custom Action #42114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a59f14
removing update install source custom action
mrafi97 Oct 17, 2025
89e3b88
removing old changelog
mrafi97 Oct 20, 2025
630879c
Merge branch 'main' into mrafi/remove-update-install-source
mrafi97 Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions releasenotes/notes/fleet-automation-msi-update-install-source-edbfaccf24bece0f.yaml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions test/new-e2e/tests/installer/windows/suites/agent-package/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,7 @@ func (s *testAgentUpgradeSuite) TestUpgradeWithLocalSystemUser() {

// TestDowngradeWithMissingInstallSource tests that a downgrade will succeed even if the original install source is missing
func (s *testAgentUpgradeSuite) TestDowngradeWithMissingInstallSource() {
s.T().Skip("Skipping test due to removal of update install source custom action")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ question: ‏ Do we want to keep the test?

// Arrange
s.setAgentConfig()
s.installCurrentAgentVersion()
Expand Down
6 changes: 0 additions & 6 deletions tools/windows/DatadogAgentInstaller/AgentCustomActions/CustomAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@ public static ActionResult SetupInstaller(Session session)
return Datadog.CustomActions.SetupInstallerCustomAction.SetupInstaller(session);
}

[CustomAction]
public static ActionResult UpdateInstallSource(Session session)
{
return Datadog.CustomActions.UpdateInstallSourceCustomAction.UpdateInstallSource(session);
}

[CustomAction]
public static ActionResult ReportFailure(Session session)
{
Expand Down
1 change: 0 additions & 1 deletion tools/windows/DatadogAgentInstaller/CustomActions.Tests/CustomActions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="APM\ApmConfigTests.cs" />
<Compile Include="InstallSource\InstallSourceTests.cs" />
<Compile Include="InstallState\InstallStateTests.cs" />
<Compile Include="InstallState\InstallStateTestSetup.cs" />
<Compile Include="ProcessUserCustomActions\BaseProcessUserCustomActionsDomainTests.cs" />
Expand Down
56 changes: 0 additions & 56 deletions tools/windows/DatadogAgentInstaller/CustomActions.Tests/InstallSource/InstallSourceTests.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tools/windows/DatadogAgentInstaller/CustomActions/CustomActions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@
<Compile Include="ServiceCustomAction.cs" />
<Compile Include="PatchInstallerCustomAction.cs" />
<Compile Include="SetupInstallerCustomAction.cs" />
<Compile Include="UpdateInstallSourceCustomAction.cs" />
<Compile Include="PythonDistributionCustomAction.cs" />
<Compile Include="Extensions\SessionExtensions.cs" />
<Compile Include="Interfaces\ISession.cs" />
Expand Down
71 changes: 0 additions & 71 deletions tools/windows/DatadogAgentInstaller/CustomActions/UpdateInstallSourceCustomAction.cs
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions tools/windows/DatadogAgentInstaller/WixSetup/Datadog Agent/AgentCustomActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ public class AgentCustomActions

public ManagedAction SetupInstaller { get; set; }

public ManagedAction UpdateInstallSource { get; set; }

public ManagedAction EnsureGeneratedFilesRemoved { get; }

public ManagedAction WriteConfig { get; }
Expand Down Expand Up @@ -322,23 +320,6 @@ public AgentCustomActions()
.SetProperties(
"PROJECTLOCATION=[PROJECTLOCATION], FLEET_INSTALL=[FLEET_INSTALL], DATABASE=[DATABASE]");

UpdateInstallSource = new CustomAction<CustomActions>(
new Id(nameof(UpdateInstallSource)),
CustomActions.UpdateInstallSource,
Return.check,
// The built-in RegisterProduct action normally sets the install source,
// so our action must come after it to take effect.
When.Before,
Step.InstallFinalize,
Conditions.FirstInstall | Conditions.Upgrading
)
{
Execute = Execute.deferred,
Impersonate = false
}
.SetProperties(
"PROJECTLOCATION=[PROJECTLOCATION], FLEET_INSTALL=[FLEET_INSTALL], DATABASE=[DATABASE], AgentFlavor=[AgentFlavor]");

// Cleanup leftover files on uninstall
CleanupOnUninstall = new CustomAction<CustomActions>(
new Id(nameof(CleanupOnUninstall)),
Expand Down
Loading