Use utilruntime.Must to check for errors (#453)

Signed-off-by: Tamal Saha <tamal@appscode.com>
kubedb · Oct 8, 2019 · fc97357 · fc97357
1 parent bac255d
commit fc97357
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 56 deletions.
diff --git a/Makefile b/Makefile
@@ -287,7 +287,7 @@ lint: $(BUILD_DIRS)
 	    --env GO111MODULE=on                                    \
 	    --env GOFLAGS="-mod=vendor"                             \
 	    $(BUILD_IMAGE)                                          \
-	    golangci-lint run --enable $(ADDTL_LINTERS) --skip-dirs-use-default --skip-dirs=client
+	    golangci-lint run --enable $(ADDTL_LINTERS) --skip-dirs-use-default --deadline=10m
 
 $(BUILD_DIRS):
 	@mkdir -p $@

diff --git a/hack/gencrd/main.go b/hack/gencrd/main.go
@@ -5,64 +5,19 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/appscode/go/log"
 	gort "github.com/appscode/go/runtime"
 	"github.com/go-openapi/spec"
 	"github.com/golang/glog"
-	crd_api "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/kube-openapi/pkg/common"
-	crdutils "kmodules.xyz/client-go/apiextensions/v1beta1"
 	"kmodules.xyz/client-go/openapi"
-	"kubedb.dev/apimachinery/apis"
 	cataloginstall "kubedb.dev/apimachinery/apis/catalog/install"
 	catalogv1alpha1 "kubedb.dev/apimachinery/apis/catalog/v1alpha1"
 	kubedbinstall "kubedb.dev/apimachinery/apis/kubedb/install"
 	kubedbv1alpha1 "kubedb.dev/apimachinery/apis/kubedb/v1alpha1"
 )
 
-func generateCRDDefinitions() {
-	apis.EnableStatusSubresource = true
-
-	filename := gort.GOPath() + "/src/kubedb.dev/apimachinery/apis/kubedb/v1alpha1/crds.yaml"
-	os.Remove(filename)
-
-	err := os.MkdirAll(filepath.Join(gort.GOPath(), "/src/kubedb.dev/apimachinery/api/crds"), 0755)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	crds := []*crd_api.CustomResourceDefinition{
-		kubedbv1alpha1.DormantDatabase{}.CustomResourceDefinition(),
-		kubedbv1alpha1.Elasticsearch{}.CustomResourceDefinition(),
-		kubedbv1alpha1.Etcd{}.CustomResourceDefinition(),
-		kubedbv1alpha1.Memcached{}.CustomResourceDefinition(),
-		kubedbv1alpha1.MongoDB{}.CustomResourceDefinition(),
-		kubedbv1alpha1.MySQL{}.CustomResourceDefinition(),
-		kubedbv1alpha1.Postgres{}.CustomResourceDefinition(),
-		kubedbv1alpha1.Redis{}.CustomResourceDefinition(),
-		kubedbv1alpha1.Snapshot{}.CustomResourceDefinition(),
-
-		catalogv1alpha1.ElasticsearchVersion{}.CustomResourceDefinition(),
-		catalogv1alpha1.EtcdVersion{}.CustomResourceDefinition(),
-		catalogv1alpha1.MemcachedVersion{}.CustomResourceDefinition(),
-		catalogv1alpha1.MongoDBVersion{}.CustomResourceDefinition(),
-		catalogv1alpha1.MySQLVersion{}.CustomResourceDefinition(),
-		catalogv1alpha1.PostgresVersion{}.CustomResourceDefinition(),
-		catalogv1alpha1.RedisVersion{}.CustomResourceDefinition(),
-	}
-	for _, crd := range crds {
-		filename := filepath.Join(gort.GOPath(), "/src/kubedb.dev/apimachinery/api/crds", crd.Spec.Names.Singular+".yaml")
-		f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-		if err != nil {
-			log.Fatal(err)
-		}
-		crdutils.MarshallCrd(f, crd, "yaml")
-		f.Close()
-	}
-}
-
 func generateSwaggerJson() {
 	var (
 		Scheme = runtime.NewScheme()
@@ -92,6 +47,7 @@ func generateSwaggerJson() {
 			kubedbv1alpha1.GetOpenAPIDefinitions,
 			catalogv1alpha1.GetOpenAPIDefinitions,
 		},
+		//nolint:govet
 		Resources: []openapi.TypeInfo{
 			{kubedbv1alpha1.SchemeGroupVersion, kubedbv1alpha1.ResourcePluralDormantDatabase, kubedbv1alpha1.ResourceKindDormantDatabase, true},
 			{kubedbv1alpha1.SchemeGroupVersion, kubedbv1alpha1.ResourcePluralElasticsearch, kubedbv1alpha1.ResourceKindElasticsearch, true},
@@ -134,6 +90,5 @@ func generateSwaggerJson() {
 }
 
 func main() {
-	// generateCRDDefinitions()
 	generateSwaggerJson()
 }
diff --git a/pkg/admission/dormantdatabase/admission_test.go b/pkg/admission/dormantdatabase/admission_test.go
@@ -9,6 +9,7 @@ import (
 	kerr "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	fake_dynamic "k8s.io/client-go/dynamic/fake"
 	"k8s.io/client-go/kubernetes/fake"
 	clientsetscheme "k8s.io/client-go/kubernetes/scheme"
@@ -19,9 +20,7 @@ import (
 )
 
 func init() {
-	if err := scheme.AddToScheme(clientsetscheme.Scheme); err != nil {
-		panic(err)
-	}
+	utilruntime.Must(scheme.AddToScheme(clientsetscheme.Scheme))
 }
 
 var requestKind = metav1.GroupVersionKind{

diff --git a/pkg/admission/namespace/admission_test.go b/pkg/admission/namespace/admission_test.go
@@ -10,6 +10,7 @@ import (
 	kerr "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	fake_dynamic "k8s.io/client-go/dynamic/fake"
 	clientsetscheme "k8s.io/client-go/kubernetes/scheme"
 	"kmodules.xyz/client-go/meta"
@@ -18,9 +19,7 @@ import (
 )
 
 func init() {
-	if err := scheme.AddToScheme(clientsetscheme.Scheme); err != nil {
-		panic(err)
-	}
+	utilruntime.Must(scheme.AddToScheme(clientsetscheme.Scheme))
 }
 
 var requestKind = metav1.GroupVersionKind{

diff --git a/pkg/admission/snapshot/admission_test.go b/pkg/admission/snapshot/admission_test.go
@@ -12,6 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/kubernetes/fake"
 	clientsetscheme "k8s.io/client-go/kubernetes/scheme"
 	"kmodules.xyz/client-go/meta"
@@ -22,9 +23,7 @@ import (
 )
 
 func init() {
-	if err := scheme.AddToScheme(clientsetscheme.Scheme); err != nil {
-		panic(err)
-	}
+	utilruntime.Must(scheme.AddToScheme(clientsetscheme.Scheme))
 }
 
 var requestKind = metaV1.GroupVersionKind{