From a60ddc864bc1a0d667b44e7e76728f981db88cfc Mon Sep 17 00:00:00 2001 From: Chuntao Lu Date: Tue, 28 Jul 2020 19:57:41 -0700 Subject: [PATCH] Check in generated files --- codegen/template_bundle/template_files.go | 24 +++++++++---------- .../mock-service/mock_init.go | 6 ++--- .../services/selective-gateway/module/init.go | 6 ++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go index d6fcfcfde..cde2915fd 100644 --- a/codegen/template_bundle/template_files.go +++ b/codegen/template_bundle/template_files.go @@ -1873,7 +1873,7 @@ import ( _ "go.uber.org/automaxprocs" "github.com/uber/zanzibar/config" - "github.com/uber/zanzibar/runtime" + zanzibar "github.com/uber/zanzibar/runtime" app "{{$instance.PackageInfo.PackageRoot}}" service "{{$instance.PackageInfo.GeneratedPackagePath}}" @@ -1965,7 +1965,7 @@ func mainTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "main.tmpl", size: 1795, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "main.tmpl", size: 1804, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1987,7 +1987,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/uber/zanzibar/runtime" + zanzibar "github.com/uber/zanzibar/runtime" module "{{$instance.PackageInfo.ModulePackagePath}}" ) @@ -2061,7 +2061,7 @@ func main_testTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "main_test.tmpl", size: 1348, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "main_test.tmpl", size: 1357, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2418,7 +2418,7 @@ import ( "path/filepath" "go.uber.org/zap" - "github.com/uber/zanzibar/runtime" + zanzibar "github.com/uber/zanzibar/runtime" module "{{$instance.PackageInfo.ModulePackagePath}}" ) @@ -2472,7 +2472,7 @@ func serviceTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "service.tmpl", size: 1436, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "service.tmpl", size: 1445, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2498,7 +2498,7 @@ import ( "github.com/golang/mock/gomock" "github.com/uber/zanzibar/config" - "github.com/uber/zanzibar/runtime" + zanzibar "github.com/uber/zanzibar/runtime" service "{{$instance.PackageInfo.GeneratedPackagePath}}" ) @@ -2688,7 +2688,7 @@ func service_mockTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "service_mock.tmpl", size: 5394, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "service_mock.tmpl", size: 5403, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -2702,7 +2702,7 @@ import ( "runtime" "path/filepath" - "github.com/uber/zanzibar/runtime" + zanzibar "github.com/uber/zanzibar/runtime" {{range $idx, $pkg := .Spec.IncludedPackages -}} {{$pkg.AliasName}} "{{$pkg.PackageName}}" {{end}} @@ -2724,7 +2724,7 @@ func structsTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "structs.tmpl", size: 436, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "structs.tmpl", size: 445, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -3071,7 +3071,7 @@ import ( "errors" "time" - "github.com/uber/zanzibar/runtime" + zanzibar "github.com/uber/zanzibar/runtime" "go.uber.org/thriftrw/wire" {{range $idx, $pkg := .IncludedPackages -}} @@ -3176,7 +3176,7 @@ func tchannel_client_test_serverTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "tchannel_client_test_server.tmpl", size: 3014, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "tchannel_client_test_server.tmpl", size: 3023, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/examples/selective-gateway/build/services/selective-gateway/mock-service/mock_init.go b/examples/selective-gateway/build/services/selective-gateway/mock-service/mock_init.go index e2e2f6fbc..ec9409500 100644 --- a/examples/selective-gateway/build/services/selective-gateway/mock-service/mock_init.go +++ b/examples/selective-gateway/build/services/selective-gateway/mock-service/mock_init.go @@ -37,8 +37,8 @@ import ( // MockClientNodes contains mock client dependencies type MockClientNodes struct { - Echo *echoclientgenerated.MockClientWithFixture Mirror *mirrorclientgenerated.MockClient + Echo *echoclientgenerated.MockClientWithFixture } // InitializeDependenciesMock fully initializes all dependencies in the dep tree @@ -63,13 +63,13 @@ func InitializeDependenciesMock( } mockClientNodes := &MockClientNodes{ - Echo: echoclientgenerated.New(ctrl, fixtureechoclientgenerated.Fixture), Mirror: mirrorclientgenerated.NewMockClient(ctrl), + Echo: echoclientgenerated.New(ctrl, fixtureechoclientgenerated.Fixture), } initializedClientDependencies := &module.ClientDependenciesNodes{} tree.Client = initializedClientDependencies - initializedClientDependencies.Echo = mockClientNodes.Echo initializedClientDependencies.Mirror = mockClientNodes.Mirror + initializedClientDependencies.Echo = mockClientNodes.Echo initializedEndpointDependencies := &module.EndpointDependenciesNodes{} tree.Endpoint = initializedEndpointDependencies diff --git a/examples/selective-gateway/build/services/selective-gateway/module/init.go b/examples/selective-gateway/build/services/selective-gateway/module/init.go index a039c3e4a..2efc9ece4 100644 --- a/examples/selective-gateway/build/services/selective-gateway/module/init.go +++ b/examples/selective-gateway/build/services/selective-gateway/module/init.go @@ -42,8 +42,8 @@ type DependenciesTree struct { // ClientDependenciesNodes contains client dependencies type ClientDependenciesNodes struct { - Echo echoclientgenerated.Client Mirror mirrorclientgenerated.Client + Echo echoclientgenerated.Client } // EndpointDependenciesNodes contains endpoint dependencies @@ -74,10 +74,10 @@ func InitializeDependencies( initializedClientDependencies := &ClientDependenciesNodes{} tree.Client = initializedClientDependencies - initializedClientDependencies.Echo = echoclientgenerated.NewClient(&echoclientmodule.Dependencies{ + initializedClientDependencies.Mirror = mirrorclientgenerated.NewClient(&mirrorclientmodule.Dependencies{ Default: initializedDefaultDependencies, }) - initializedClientDependencies.Mirror = mirrorclientgenerated.NewClient(&mirrorclientmodule.Dependencies{ + initializedClientDependencies.Echo = echoclientgenerated.NewClient(&echoclientmodule.Dependencies{ Default: initializedDefaultDependencies, })