Merge pull request #107 from turkenh/tiny-fix

Fix linter errors

Author: turkenh

.github/workflows/ci.yml

@@ -67,14 +67,22 @@ jobs:
       - name: Vendor Dependencies
         run: make vendor vendor.check
 
-      # This action uses its own setup-go, which always seems to use the latest
-      # stable version of Go. We could run 'make lint' to ensure our desired Go
-      # version, but we prefer this action because it leaves 'annotations' (i.e.
-      # it comments on PRs to point out linter violations).
+      # Go version coming with golangci-lint-action may not be our desired
+      # go version. We deploy our desired go version and then skip go
+      # installation in golangci-lint-action in the next step as suggested
+      # in https://github.com/golangci/golangci-lint-action/issues/183
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      # We could run 'make lint' to ensure our desired Go version, but we
+      # prefer this action because it leaves 'annotations' (i.e. it comments
+      # on PRs to point out linter violations).
       - name: Lint
         uses: golangci/golangci-lint-action@v2
         with:
           version: ${{ env.GOLANGCI_VERSION }}
+          skip-go-installation: true
+          args: --timeout 10m0s
 
   check-diff:
     runs-on: ubuntu-18.04

.golangci.yml

@@ -1,5 +1,5 @@
 run:
-  deadline: 2m
+  deadline: 10m
 
   skip-files:
   - "zz_\\..+\\.go$"

config/rds/config.go

@@ -17,8 +17,9 @@ limitations under the License.
 package rds
 
 import (
-	"github.com/crossplane-contrib/provider-tf-aws/config/common"
 	"github.com/crossplane-contrib/terrajet/pkg/config"
+
+	"github.com/crossplane-contrib/provider-tf-aws/config/common"
 )
 
 const (