From 86cffcd168415f92a452b3e275679c36f0fd00ef Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Fri, 10 Dec 2021 17:20:15 +0300
Subject: [PATCH] Pull request: all: upd go, minor imp

Merge in DNS/adguard-home from minor-imp to master

Squashed commit of the following:

commit c5b9e2a15290760b2782acc0c08df3fe57356500
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 10 14:23:28 2021 +0300

    all: upd go, minor imp
---
 bamboo-specs/release.yaml         | 6 +++---
 bamboo-specs/test.yaml            | 2 +-
 internal/aghos/os.go              | 4 ++--
 internal/dnsforward/dnsforward.go | 2 +-
 internal/filtering/filtering.go   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml
index 86b3f0aa..325705ae 100644
--- a/bamboo-specs/release.yaml
+++ b/bamboo-specs/release.yaml
@@ -7,7 +7,7 @@
 # Make sure to sync any changes with the branch overrides below.
 'variables':
   'channel': 'edge'
-  'dockerGo': 'adguard/golang-ubuntu:3.6'
+  'dockerGo': 'adguard/golang-ubuntu:3.8'
 
 'stages':
 - 'Make release':
@@ -266,7 +266,7 @@
     # need to build a few of these.
     'variables':
       'channel': 'beta'
-      'dockerGo': 'adguard/golang-ubuntu:3.6'
+      'dockerGo': 'adguard/golang-ubuntu:3.8'
 # release-vX.Y.Z branches are the branches from which the actual final release
 # is built.
 - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -276,4 +276,4 @@
     # are the ones that actually get released.
     'variables':
       'channel': 'release'
-      'dockerGo': 'adguard/golang-ubuntu:3.6'
+      'dockerGo': 'adguard/golang-ubuntu:3.8'
diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
index e34a1a09..9b427e5a 100644
--- a/bamboo-specs/test.yaml
+++ b/bamboo-specs/test.yaml
@@ -5,7 +5,7 @@
   'key': 'AHBRTSPECS'
   'name': 'AdGuard Home - Build and run tests'
 'variables':
-  'dockerGo': 'adguard/golang-ubuntu:3.6'
+  'dockerGo': 'adguard/golang-ubuntu:3.8'
 
 'stages':
 - 'Tests':
diff --git a/internal/aghos/os.go b/internal/aghos/os.go
index 5adb65b1..29eb1afc 100644
--- a/internal/aghos/os.go
+++ b/internal/aghos/os.go
@@ -118,8 +118,8 @@ func PIDByCommand(command string, except ...int) (pid int, err error) {
 }
 
 // parsePSOutput scans the output of ps searching the largest PID of the process
-// associated with cmdName ignoring PIDs from ignore.  Valid r's line shoud be
-// like:
+// associated with cmdName ignoring PIDs from ignore.  A valid line from
+// r should look like these:
 //
 //    123 ./example-cmd
 //   1230 some/base/path/example-cmd
diff --git a/internal/dnsforward/dnsforward.go b/internal/dnsforward/dnsforward.go
index e4547307..ab2d8a82 100644
--- a/internal/dnsforward/dnsforward.go
+++ b/internal/dnsforward/dnsforward.go
@@ -559,7 +559,7 @@ func (s *Server) IsRunning() bool {
 	return s.isRunning
 }
 
-// srvClosedErr is returned when the method can't complete without unacessible
+// srvClosedErr is returned when the method can't complete without inacessible
 // data from the closing server.
 const srvClosedErr errors.Error = "server is closed"
 
diff --git a/internal/filtering/filtering.go b/internal/filtering/filtering.go
index ab0c427a..0e0bb0ab 100644
--- a/internal/filtering/filtering.go
+++ b/internal/filtering/filtering.go
@@ -651,7 +651,7 @@ func newRuleStorage(filters []Filter) (rs *filterlist.RuleStorage, err error) {
 
 	rs, err = filterlist.NewRuleStorage(lists)
 	if err != nil {
-		return nil, fmt.Errorf("creating rule stroage: %w", err)
+		return nil, fmt.Errorf("creating rule storage: %w", err)
 	}
 
 	return rs, nil