diff --git a/.github/workflows/upgrade_test.yaml b/.github/workflows/upgrade_test.yaml index e9947440..00ee77ff 100644 --- a/.github/workflows/upgrade_test.yaml +++ b/.github/workflows/upgrade_test.yaml @@ -1,10 +1,16 @@ -name: Upgrade functionality test +name: Fission CI upgrade -on: [workflow_dispatch] +on: + push: + branches: + - master + pull_request: + branches: + - master + workflow_dispatch: jobs: - - upgrade-functionality-test: + upgrade-test: runs-on: ubuntu-latest steps: - name: Checkout action sources @@ -24,13 +30,13 @@ jobs: uses: engineerd/setup-kind@v0.5.0 with: config: kind.yaml - + - name: Setup kubectl & fetch node information run: | kubectl cluster-info --context kind-kind kind get kubeconfig --internal >$HOME/.kube/config kubectl get nodes - + - name: Dump system info run: | source ./test/upgrade_test/fission_objects.sh dump_system_info diff --git a/.golangci.yaml b/.golangci.yaml new file mode 100644 index 00000000..58f3efc2 --- /dev/null +++ b/.golangci.yaml @@ -0,0 +1,7 @@ +linters-settings: + errcheck: + ignore: go.uber.org/zap:Sync + goimports: + # put imports beginning with prefix after 3rd-party packages; + # it's a comma-separated list of prefixes + local-prefixes: github.com/trussworks/my-cli-tool \ No newline at end of file diff --git a/cmd/builder/main.go b/cmd/builder/main.go index 765b16b2..865de011 100644 --- a/cmd/builder/main.go +++ b/cmd/builder/main.go @@ -34,12 +34,7 @@ func main() { if err != nil { log.Fatalf("can't initialize zap logger: %v", err) } - defer func() { - err := logger.Sync() - if err != nil { - log.Fatal(err) - } - }() + defer logger.Sync() shareVolume := os.Args[1] if _, err := os.Stat(shareVolume); err != nil { diff --git a/cmd/fetcher/main.go b/cmd/fetcher/main.go index fc9bacfe..fbc16e64 100644 --- a/cmd/fetcher/main.go +++ b/cmd/fetcher/main.go @@ -33,11 +33,6 @@ func main() { if err != nil { log.Fatalf("can't initialize zap logger: %v", err) } - defer func() { - err := logger.Sync() - if err != nil { - log.Fatal(err) - } - }() + defer logger.Sync() app.Run(logger) } diff --git a/cmd/fission-bundle/main.go b/cmd/fission-bundle/main.go index fb01c016..b0363e7f 100644 --- a/cmd/fission-bundle/main.go +++ b/cmd/fission-bundle/main.go @@ -255,12 +255,7 @@ Options: if err != nil { log.Fatalf("I can't initialize zap logger: %v", err) } - defer func() { - err := logger.Sync() - if err != nil { - log.Fatal(err) - } - }() + defer logger.Sync() version := fmt.Sprintf("Fission Bundle Version: %v", info.BuildInfo().String()) arguments, err := docopt.ParseArgs(usage, nil, version) if err != nil { diff --git a/cmd/preupgradechecks/main.go b/cmd/preupgradechecks/main.go index b2ee2d22..4471fd3e 100644 --- a/cmd/preupgradechecks/main.go +++ b/cmd/preupgradechecks/main.go @@ -42,12 +42,7 @@ func main() { if err != nil { log.Fatalf("can't initialize zap logger: %v", err) } - defer func() { - err := logger.Sync() - if err != nil { - log.Fatal(err) - } - }() + defer logger.Sync() usage := `Package to perform operations needed prior to fission installation Usage: diff --git a/demos/declarative-specs/hello.go b/demos/declarative-specs/hello.go index 92f3ba18..22a8b4bc 100644 --- a/demos/declarative-specs/hello.go +++ b/demos/declarative-specs/hello.go @@ -6,7 +6,7 @@ import ( ) // Handler is the entry point for this fission function -func Handler(w http.ResponseWriter, r *http.Request) { //nolint: deadcode +func Handler(w http.ResponseWriter, r *http.Request) { //nolint:golint,unused,deadcode msg := "Hello, CNCF Webinar!\n" _, err := w.Write([]byte(msg)) if err != nil { diff --git a/pkg/controller/client/v1/canaryconfig.go b/pkg/controller/client/v1/canaryconfig.go index eac719c3..189bf3d4 100644 --- a/pkg/controller/client/v1/canaryconfig.go +++ b/pkg/controller/client/v1/canaryconfig.go @@ -19,6 +19,7 @@ package v1 import ( "encoding/json" "fmt" + "github.com/fission/fission/pkg/controller/client/rest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/client/v1/environment.go b/pkg/controller/client/v1/environment.go index 528c759d..d766502e 100644 --- a/pkg/controller/client/v1/environment.go +++ b/pkg/controller/client/v1/environment.go @@ -19,6 +19,7 @@ package v1 import ( "encoding/json" "fmt" + "github.com/fission/fission/pkg/controller/client/rest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/client/v1/fake/fake_misc.go b/pkg/controller/client/v1/fake/fake_misc.go index e780bf24..987bae4f 100644 --- a/pkg/controller/client/v1/fake/fake_misc.go +++ b/pkg/controller/client/v1/fake/fake_misc.go @@ -18,6 +18,7 @@ package fake import ( "io" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "github.com/fission/fission/pkg/controller/client/v1" diff --git a/pkg/controller/client/v1/httptrigger.go b/pkg/controller/client/v1/httptrigger.go index afa59ecc..ae1e3f74 100644 --- a/pkg/controller/client/v1/httptrigger.go +++ b/pkg/controller/client/v1/httptrigger.go @@ -19,6 +19,7 @@ package v1 import ( "encoding/json" "fmt" + "github.com/fission/fission/pkg/controller/client/rest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/client/v1/mqtrigger.go b/pkg/controller/client/v1/mqtrigger.go index bba52d2b..538c7158 100644 --- a/pkg/controller/client/v1/mqtrigger.go +++ b/pkg/controller/client/v1/mqtrigger.go @@ -19,6 +19,7 @@ package v1 import ( "encoding/json" "fmt" + "github.com/fission/fission/pkg/controller/client/rest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/client/v1/package.go b/pkg/controller/client/v1/package.go index e2a9cc9f..509646cb 100644 --- a/pkg/controller/client/v1/package.go +++ b/pkg/controller/client/v1/package.go @@ -19,6 +19,7 @@ package v1 import ( "encoding/json" "fmt" + "github.com/fission/fission/pkg/controller/client/rest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/client/v1/timetrigger.go b/pkg/controller/client/v1/timetrigger.go index c4fc6b56..23688617 100644 --- a/pkg/controller/client/v1/timetrigger.go +++ b/pkg/controller/client/v1/timetrigger.go @@ -19,6 +19,7 @@ package v1 import ( "encoding/json" "fmt" + "github.com/fission/fission/pkg/controller/client/rest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/fission-cli/cmd/timetrigger/create.go b/pkg/fission-cli/cmd/timetrigger/create.go index fca3a863..8482e5fd 100644 --- a/pkg/fission-cli/cmd/timetrigger/create.go +++ b/pkg/fission-cli/cmd/timetrigger/create.go @@ -18,9 +18,10 @@ package timetrigger import ( "fmt" - "github.com/fission/fission/pkg/fission-cli/cmd" "time" + "github.com/fission/fission/pkg/fission-cli/cmd" + "github.com/pkg/errors" "github.com/robfig/cron" uuid "github.com/satori/go.uuid" diff --git a/pkg/generator/encoder/encoder.go b/pkg/generator/encoder/encoder.go index 6093f9bc..be4bf924 100644 --- a/pkg/generator/encoder/encoder.go +++ b/pkg/generator/encoder/encoder.go @@ -18,6 +18,7 @@ package encoder import ( "encoding/json" + "github.com/ghodss/yaml" ) diff --git a/test/tests/test_huge_response/hello.go b/test/tests/test_huge_response/hello.go index d35d8021..77b896c0 100644 --- a/test/tests/test_huge_response/hello.go +++ b/test/tests/test_huge_response/hello.go @@ -7,7 +7,7 @@ import ( ) // Handler is the entry point for this fission function -func Handler(w http.ResponseWriter, r *http.Request) { //nolint: deadcode +func Handler(w http.ResponseWriter, r *http.Request) { //nolint:golint,unused,deadcode bytes, err := ioutil.ReadAll(r.Body) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError)