Skip to content

Dev/t feadeaga/user error classification #59

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

Open
FeyiAdeaga wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Dev/t feadeaga/user error classification #59

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
85f2277
user error clarification
Jul 1, 2025
6bc54a6
test changes
Jul 15, 2025
c22e1f0
test changes
Jul 15, 2025
3d4b01a
test chage
Jul 15, 2025
d56c66e
test cahnges
Jul 15, 2025
838da08
action pkan update
Jul 16, 2025
c17dc19
Tracking error classification
Jul 16, 2025
05f9309
error clarification
Jul 16, 2025
0132917
build failure
Jul 17, 2025
af6ab0e
test changes
Jul 17, 2025
6078490
syntax modification
Jul 22, 2025
fd81d3b
test cases
Jul 22, 2025
eab13b6
pr resolution
Aug 8, 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
29 changes: 19 additions & 10 deletions internal/actionplan/actionplan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/Azure/azure-extension-platform/pkg/extensionevents"
"github.com/Azure/azure-extension-platform/pkg/handlerenv"
"github.com/Azure/azure-extension-platform/pkg/logging"
vmextensionhelper "github.com/Azure/azure-extension-platform/vmextension"
)

type action struct {
Expand Down Expand Up @@ -117,14 +118,19 @@ func updateFailDeploymentError(failDeploymentError *failedDeploymentError, act *
}

type ExecuteError struct {
failedDeploymentErr *failedDeploymentError
combinedExecuteErrors error
failedDeploymentErr *failedDeploymentError
combinedExecuteErrors error
errorWithClarification vmextensionhelper.ErrorWithClarification
}

func (executeError *ExecuteError) GetCombinedExecuteError() error {
return executeError.combinedExecuteErrors
}

func (executeError *ExecuteError) GetErrorWithClarification() vmextensionhelper.ErrorWithClarification {
return executeError.errorWithClarification
}

func (executeError *ExecuteError) SetFailedDeploymentErr(err *failedDeploymentError) {
executeError.failedDeploymentErr = err
}
Expand All @@ -133,9 +139,12 @@ func (executeError *ExecuteError) SetCombinedExecuteErrors(errs error) {
executeError.combinedExecuteErrors = errs
}

func (exeucuteError *ExecuteError) update(act *action, singleExecutionError error) {
func (exeucuteError *ExecuteError) update(act *action, singleExecutionError error, code ...vmextensionhelper.ErrorWithClarification) {
exeucuteError.failedDeploymentErr = updateFailDeploymentError(exeucuteError.failedDeploymentErr, act, singleExecutionError)
exeucuteError.combinedExecuteErrors = extensionerrors.CombineErrors(exeucuteError.combinedExecuteErrors, singleExecutionError)
if len(code) != 0 {
exeucuteError.errorWithClarification = vmextensionhelper.NewErrorWithClarification(code[0].ErrorCode, code[0].Err)
}
}

func (exeucuteError *ExecuteError) GetErrorIfDeploymentFailed() error {
Expand Down Expand Up @@ -233,7 +242,7 @@ func (actionPlan *ActionPlan) insertOperation(order *int, dependentActions1 ...*
}

func (actionPlan *ActionPlan) Execute(registryHandler packageregistry.IPackageRegistry, eem *extensionevents.ExtensionEventManager, commandHandler commandhandler.ICommandHandler) (*ExecuteError, IResult) {
var executeError *ExecuteError = &ExecuteError{failedDeploymentErr: nil, combinedExecuteErrors: nil}
var executeError *ExecuteError = &ExecuteError{failedDeploymentErr: nil, combinedExecuteErrors: nil, errorWithClarification: vmextensionhelper.ErrorWithClarification{}}
// registry will be mutated and written to disk so that we can keep track of all the actions that have happened
registry, err := registryHandler.GetExistingPackages()
if err != nil {
Expand All @@ -243,9 +252,9 @@ func (actionPlan *ActionPlan) Execute(registryHandler packageregistry.IPackageRe

// handle unordered implicit uninstalls
for _, act := range actionPlan.unorderedImplicitUninstalls {
newError := actionPlan.executeHelper(registryHandler, commandHandler, registry, act, eem)
ewc, newError := actionPlan.executeHelper(registryHandler, commandHandler, registry, act, eem)
appendExecutionResult(&executionResult, act, newError)
executeError.update(act, newError)
executeError.update(act, newError, ewc)
}

// handle ordered operations
Expand Down Expand Up @@ -274,8 +283,8 @@ func (actionPlan *ActionPlan) Execute(registryHandler packageregistry.IPackageRe
break
}

newError := actionPlan.executeHelper(registryHandler, commandHandler, registry, act, eem)
executeError.update(act, newError)
ewc, newError := actionPlan.executeHelper(registryHandler, commandHandler, registry, act, eem)
executeError.update(act, newError, ewc)
appendExecutionResult(&executionResult, act, newError)

if newError != nil {
Expand All @@ -292,8 +301,8 @@ func (actionPlan *ActionPlan) Execute(registryHandler packageregistry.IPackageRe
// handle remaining unordered operations
for _, depActions := range actionPlan.unorderedOperations {
for _, act := range depActions {
newError := actionPlan.executeHelper(registryHandler, commandHandler, registry, act, eem)
executeError.update(act, newError)
ewc, newError := actionPlan.executeHelper(registryHandler, commandHandler, registry, act, eem)
executeError.update(act, newError, ewc)
appendExecutionResult(&executionResult, act, newError)

if newError != nil {
Expand Down
Loading