Cleanup lint warning

common/log/panic.go

@@ -34,16 +34,18 @@ var errDefaultPanic = fmt.Errorf("panic object is not error")
 // We have to use pointer is because in golang: "recover return nil if was not called directly by a deferred function."
 // And we have to set the returned error otherwise our handler will return nil as error which is incorrect
 func CapturePanic(logger Logger, retError *error) {
-	if errPanic := recover(); errPanic != nil {
-		err, ok := errPanic.(error)
-		if !ok {
-			err = errDefaultPanic
-		}
+	defer func() {
+		if errPanic := recover(); errPanic != nil {
+			err, ok := errPanic.(error)
+			if !ok {
+				err = errDefaultPanic
+			}
 
-		st := string(debug.Stack())
+			st := string(debug.Stack())
 
-		logger.Error("Panic is captured", tag.SysStackTrace(st), tag.Error(err))
+			logger.Error("Panic is captured", tag.SysStackTrace(st), tag.Error(err))
 
-		*retError = err
-	}
+			*retError = err
+		}
+	}()
 }

common/persistence/nosql/nosqlplugin/cassandra/gocql/client.go

@@ -30,7 +30,7 @@ import (
 )
 
 var (
-	registered Client = nil
+	registered Client
 )
 
 // NewClient gets a gocql client based registered object

common/persistence/nosql/nosqlplugin/cassandra/gocql/session.go

@@ -50,7 +50,7 @@ type (
 
 func NewSession(
 	config ClusterConfig,
-) (*session, error) {
+) (Session, error) {
 	gocqlSession, err := initSession(config)
 	if err != nil {
 		return nil, err

common/persistence/nosql/nosqlplugin/cassandra/tasks.go

@@ -417,7 +417,7 @@ func (db *cdb) SelectTasks(ctx context.Context, filter *nosqlplugin.TasksFilter)
 
 	iter := query.Iter()
 	if iter == nil {
-		return nil, fmt.Errorf("GetTasks operation failed.  Not able to create query iterator.")
+		return nil, fmt.Errorf("selectTasks operation failed.  Not able to create query iterator")
 	}
 
 	var response []*nosqlplugin.TaskRow

common/persistence/nosql/nosqlplugin/cassandra/workflowUtils.go

@@ -18,6 +18,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+
 package cassandra
 
 import (

common/persistence/persistence-tests/executionManagerTestForEventsV2.go

@@ -48,11 +48,13 @@ type (
 )
 
 func failOnPanic(t *testing.T) {
-	r := recover()
-	if r != nil {
-		t.Errorf("test panicked: %v %s", r, debug.Stack())
-		t.FailNow()
-	}
+	defer func() {
+		r := recover()
+		if r != nil {
+			t.Errorf("test panicked: %v %s", r, debug.Stack())
+			t.FailNow()
+		}
+	}()
 }
 
 // SetupSuite implementation

service/history/execution/cache.go

@@ -281,21 +281,23 @@ func (c *Cache) makeReleaseFunc(
 
 	status := cacheNotReleased
 	return func(err error) {
-		if atomic.CompareAndSwapInt32(&status, cacheNotReleased, cacheReleased) {
-			if rec := recover(); rec != nil {
-				context.Clear()
-				context.Unlock()
-				c.Release(key)
-				panic(rec)
-			} else {
-				if err != nil || forceClearContext {
-					// TODO see issue #668, there are certain type or errors which can bypass the clear
+		defer func() {
+			if atomic.CompareAndSwapInt32(&status, cacheNotReleased, cacheReleased) {
+				if rec := recover(); rec != nil {
 					context.Clear()
+					context.Unlock()
+					c.Release(key)
+					panic(rec)
+				} else {
+					if err != nil || forceClearContext {
+						// TODO see issue #668, there are certain type or errors which can bypass the clear
+						context.Clear()
+					}
+					context.Unlock()
+					c.Release(key)
 				}
-				context.Unlock()
-				c.Release(key)
 			}
-		}
+		}()
 	}
 }