Skip to content
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

Jump to bottom

chore: argo status updater tests #163

Merged
merged 11 commits into from
Jul 26, 2023
Merged

chore: argo status updater tests #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
36e2159
add documentation on development dependencies
bozerkins Jul 21, 2023
2a96221
create basic status updater test
bozerkins Jul 21, 2023
cd158e0
docs on how to run tests
bozerkins Jul 21, 2023
88987c5
test coverage for status updater
bozerkins Jul 23, 2023
98a92a2
improvements to server/client start code
bozerkins Jul 23, 2023
ee31c16
add retry testing
bozerkins Jul 23, 2023
c3d6c18
Merge branch 'main' into more_unit_tests
shini4i Jul 25, 2023
6ecfad4
fix: migration from gomock to go.uber.org/mock
shini4i Jul 25, 2023
9f30ef5
generating addinitional commit to unstuck PR
shini4i Jul 25, 2023
fecca5c
remove unnecessary comment
bozerkins Jul 26, 2023
9c9a26d
update developers docs about mocks installation
bozerkins Jul 26, 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
13 changes: 9 additions & 4 deletions cmd/argo-watcher/argo_status_updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"strings"
"time"

"github.com/avast/retry-go/v4"
"github.com/rs/zerolog/log"
Expand All @@ -16,12 +17,14 @@ const defaultErrorMessage string = "could not retrieve details"
type ArgoStatusUpdater struct {
argo Argo
retryAttempts uint
retryDelay time.Duration
registryProxyUrl string
}

func (updater *ArgoStatusUpdater) Init(argo Argo, retryAttempts uint, registryProxyUrl string) {
func (updater *ArgoStatusUpdater) Init(argo Argo, retryAttempts uint, retryDelay time.Duration, registryProxyUrl string) {
updater.argo = argo
updater.retryAttempts = retryAttempts
updater.retryDelay = retryDelay
updater.registryProxyUrl = registryProxyUrl
}

Expand Down Expand Up @@ -130,6 +133,8 @@ func (updater *ArgoStatusUpdater) checkWithRetry(task models.Task) (int, error)
log.Debug().Str("app", task.App).Str("id", task.Id).Msgf("%s is not available yet", expected)
lastStatus = ArgoAppNotAvailable
return errorArgoPlannedRetry
} else {
log.Debug().Str("app", task.App).Str("id", task.Id).Msgf("Expected image is in the app summary")
}
}

Expand All @@ -149,7 +154,7 @@ func (updater *ArgoStatusUpdater) checkWithRetry(task models.Task) (int, error)
return nil
},
retry.DelayType(retry.FixedDelay),
retry.Delay(argoSyncRetryDelay),
retry.Delay(updater.retryDelay),
retry.Attempts(updater.retryAttempts),
retry.RetryIf(func(err error) bool {
return errors.Is(err, errorArgoPlannedRetry)
Expand Down Expand Up @@ -186,7 +191,7 @@ func (updater *ArgoStatusUpdater) handleAppNotFound(task models.Task, err error)
func (updater *ArgoStatusUpdater) handleArgoUnavailable(task models.Task, err error) {
log.Error().Str("id", task.Id).Msg("ArgoCD is not available. Aborting.")
reason := fmt.Sprintf(ArgoAPIErrorTemplate, err.Error())
updater.argo.state.SetTaskStatus(task.Id, "aborted", reason)
updater.argo.state.SetTaskStatus(task.Id, models.StatusAborted, reason)
}

func (updater *ArgoStatusUpdater) handleDeploymentFailed(task models.Task, err error) {
Expand All @@ -199,7 +204,7 @@ func (updater *ArgoStatusUpdater) handleDeploymentFailed(task models.Task, err e
func (updater *ArgoStatusUpdater) handleDeploymentSuccess(task models.Task) {
log.Info().Str("id", task.Id).Msg("App is running on the excepted version.")
updater.argo.metrics.ResetFailedDeployment(task.App)
updater.argo.state.SetTaskStatus(task.Id, "deployed", "")
updater.argo.state.SetTaskStatus(task.Id, models.StatusDeployedMessage, "")
}

func (updater *ArgoStatusUpdater) handleAppNotAvailable(task models.Task, err error) {
Expand Down
Loading
Loading