Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Fix onefuzz repro bug - Remove managed identity from CustomScriptExtension #2920

Merged
merged 12 commits into from
Mar 10, 2023
Merged

Fix onefuzz repro bug - Remove managed identity from CustomScriptExtension #2920

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
70f2adf
Adding potential repro fix.
nharper285 Mar 8, 2023
613d73d
Removing managed identity.
nharper285 Mar 9, 2023
683aa63
Remove return statement.
nharper285 Mar 9, 2023
4f11741
reverting changes.
nharper285 Mar 9, 2023
0abf07e
Merge branch 'main' into user/noharper/repro-fix
nharper285 Mar 9, 2023
eb6c55f
removing logging.
nharper285 Mar 9, 2023
4d47640
Merge branch 'user/noharper/repro-fix' of https://github.com/nharper2…
nharper285 Mar 9, 2023
7c4533e
Reverting changes.
nharper285 Mar 9, 2023
bb16de8
Adding back trace.
nharper285 Mar 9, 2023
a1639bb
Removing protected settings.
nharper285 Mar 9, 2023
57943a2
Removing managed identited.
nharper285 Mar 9, 2023
ab3a4fc
Conditionally setting protected settings.
nharper285 Mar 9, 2023
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
2 changes: 1 addition & 1 deletion src/ApiService/ApiService/onefuzzlib/Extension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public async Async.Task<VMExtensionWrapper> AgentConfig(AzureLocation region, Os
TypeHandlerVersion = "1.9",
AutoUpgradeMinorVersion = true,
Settings = new BinaryData(JsonSerializer.Serialize(new { commandToExecute = toExecuteCmd, fileUris = urlsUpdated }, _extensionSerializerOptions)),
ProtectedSettings = new BinaryData(managedIdentity)
ProtectedSettings = null
};
return extension;
} else if (vmOs == Os.Linux) {
Expand Down
1 change: 0 additions & 1 deletion src/ApiService/ApiService/onefuzzlib/ReproOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ public async Async.Task<Repro> ExtensionsLaunch(Repro repro) {
ErrorCode.VM_CREATE_FAILED,
new string[] { "failed before launching extensions" }));
}

if (vmData.ProvisioningState == "Failed") {
var failedVmData = await _context.VmOperations.GetVmWithInstanceView(vm.Name);
if (failedVmData is null) {
Expand Down
2 changes: 0 additions & 2 deletions src/ApiService/ApiService/onefuzzlib/VmOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ public async System.Threading.Tasks.Task DeleteVm(string name) {
return;
}


public async Task<OneFuzzResult<bool>> AddExtensions(Vm vm, Dictionary<string, VirtualMachineExtensionData> extensions) {
var statuses = new List<(string extName, string state)>();
var toCreate = new List<KeyValuePair<string, VirtualMachineExtensionData>>();
Expand Down Expand Up @@ -212,7 +211,6 @@ public async Task<OneFuzzResultVoid> Create(Vm vm) {
var vm = await _context.Creds.GetResourceGroupResource().GetVirtualMachineAsync(
vmName
);

return (await vm.Value.GetVirtualMachineExtensionAsync(extensionName)).Value.Data;
} catch (RequestFailedException ex) {
_logTracer.Info($"extension does not exist {ex.Message:Tag:Error}");
Expand Down