Skip to content

Commit f9ee4dc

Browse files
authored
fix: use errors method to check equivalence (#377)
Signed-off-by: Chris Gianelloni <[email protected]>
1 parent 11b9932 commit f9ee4dc

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

pkgmgr/docker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ func (d *DockerService) Logs(
267267
}
268268
defer logsOut.Close()
269269
if _, err := stdcopy.StdCopy(stdoutWriter, stderrWriter, logsOut); err != nil {
270-
if err != io.EOF {
270+
if !errors.Is(err, io.EOF) {
271271
return err
272272
}
273273
}

pkgmgr/package.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ func (p *PackageInstallStepDocker) preflight(cfg Config, pkgName string) error {
686686
}
687687
containerName := fmt.Sprintf("%s-%s", pkgName, p.ContainerName)
688688
if _, err := NewDockerServiceFromContainerName(containerName, cfg.Logger); err != nil {
689-
if err == ErrContainerNotExists {
689+
if errors.Is(err, ErrContainerNotExists) {
690690
// Container does not exist (we want this)
691691
return nil
692692
} else {
@@ -795,7 +795,7 @@ func (p *PackageInstallStepDocker) uninstall(
795795
containerName := fmt.Sprintf("%s-%s", pkgName, p.ContainerName)
796796
svc, err := NewDockerServiceFromContainerName(containerName, cfg.Logger)
797797
if err != nil {
798-
if err == ErrContainerNotExists {
798+
if errors.Is(err, ErrContainerNotExists) {
799799
cfg.Logger.Debug(
800800
"container missing on uninstall: " + containerName,
801801
)

pkgmgr/pkgmgr.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (p *PackageManager) loadPackageRegistry(validate bool) error {
8686
var retErr error
8787
registryPkgs, err := registryPackages(p.config, validate)
8888
if err != nil {
89-
if err == ErrValidationFailed {
89+
if errors.Is(err, ErrValidationFailed) {
9090
// We want to pass along the validation error, but only after we record the packages
9191
retErr = err
9292
} else {
@@ -682,7 +682,7 @@ func (p *PackageManager) ValidatePackages() error {
682682
foundError := false
683683
if len(p.availablePackages) == 0 {
684684
if err := p.loadPackageRegistry(true); err != nil {
685-
if err == ErrValidationFailed {
685+
if errors.Is(err, ErrValidationFailed) {
686686
// Record error for later failure
687687
// The error(s) will have already been output to the console
688688
foundError = true

0 commit comments

Comments
 (0)