From 298f1234923f9e7a3d7e2bd913f89bd003fe3064 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Sun, 28 Feb 2021 23:42:00 +0300 Subject: [PATCH] extract variables to dedicated file Signed-off-by: Vasiliy Tolstov --- util.go | 20 ++------------------ variables.go | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 variables.go diff --git a/util.go b/util.go index 2648d1b..24c41ca 100644 --- a/util.go +++ b/util.go @@ -10,22 +10,6 @@ import ( "google.golang.org/protobuf/proto" ) -var ( - reflectPackage = protogen.GoImportPath("reflect") - stringsPackage = protogen.GoImportPath("strings") - fmtPackage = protogen.GoImportPath("fmt") - contextPackage = protogen.GoImportPath("context") - httpPackage = protogen.GoImportPath("net/http") - gorillaMuxPackage = protogen.GoImportPath("github.com/gorilla/mux") - chiPackage = protogen.GoImportPath("github.com/go-chi/chi/v4") - chiMiddlewarePackage = protogen.GoImportPath("github.com/go-chi/chi/v4/middleware") - microApiPackage = protogen.GoImportPath("github.com/unistack-org/micro/v3/api") - microClientPackage = protogen.GoImportPath("github.com/unistack-org/micro/v3/client") - microServerPackage = protogen.GoImportPath("github.com/unistack-org/micro/v3/server") - microClientHttpPackage = protogen.GoImportPath("github.com/unistack-org/micro-client-http/v3") - deprecationComment = "// Deprecated: Do not use." -) - func unexport(s string) string { return strings.ToLower(s[:1]) + s[1:] } @@ -85,7 +69,7 @@ func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protog } if rule, ok := getMicroApiMethod(method); ok { if rule.Timeout > 0 { - gfile.P("opts = append(opts, ", microClientPackage.Ident("WithRequestTimeout"), "(time.Second*", rule.Timeout, "))") + gfile.P("opts = append(opts, ", microClientPackage.Ident("WithRequestTimeout"), "(", timePackage.Ident("Second"), "*", rule.Timeout, "))") } } @@ -188,7 +172,7 @@ func generateServiceServerMethods(gfile *protogen.GeneratedFile, service *protog if rule, ok := getMicroApiMethod(method); ok { if rule.Timeout > 0 { gfile.P("var cancel ", contextPackage.Ident("CancelFunc")) - gfile.P("ctx, cancel = ", contextPackage.Ident("WithTimeout"), "(ctx, time.Second*", rule.Timeout, ")") + gfile.P("ctx, cancel = ", contextPackage.Ident("WithTimeout"), "(ctx, ", timePackage.Ident("Second"), "*", rule.Timeout, ")") gfile.P("defer cancel()") } } diff --git a/variables.go b/variables.go new file mode 100644 index 0000000..02b674c --- /dev/null +++ b/variables.go @@ -0,0 +1,20 @@ +package main + +import "google.golang.org/protobuf/compiler/protogen" + +var ( + reflectPackage = protogen.GoImportPath("reflect") + stringsPackage = protogen.GoImportPath("strings") + fmtPackage = protogen.GoImportPath("fmt") + contextPackage = protogen.GoImportPath("context") + httpPackage = protogen.GoImportPath("net/http") + gorillaMuxPackage = protogen.GoImportPath("github.com/gorilla/mux") + chiPackage = protogen.GoImportPath("github.com/go-chi/chi/v5") + chiMiddlewarePackage = protogen.GoImportPath("github.com/go-chi/chi/v5/middleware") + microApiPackage = protogen.GoImportPath("github.com/unistack-org/micro/v3/api") + microClientPackage = protogen.GoImportPath("github.com/unistack-org/micro/v3/client") + microServerPackage = protogen.GoImportPath("github.com/unistack-org/micro/v3/server") + microClientHttpPackage = protogen.GoImportPath("github.com/unistack-org/micro-client-http/v3") + timePackage = protogen.GoImportPath("time") + deprecationComment = "// Deprecated: Do not use." +)