Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set explicit import alias for zanzibar runtime package in templates #734

Merged
merged 3 commits into from Jul 29, 2020
Merged

Set explicit import alias for zanzibar runtime package in templates #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0df69ed
Explicit import alias for zanzibar runtime in templates
Jul 29, 2020
429e7d1
Update changelog
Jul 29, 2020
d54fdba
Check in generated files
Jul 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Expand Up @@ -4,9 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.6.3 - 2020-07-27
## 0.6.4 - 2020-07-27
### Added
- Added support for fetching multiple header values. https://github.com/uber/zanzibar/pull/733.
- Set explicit import alias for github.com/uber/zanzibar/runtime in templates. https://github.com/uber/zanzibar/pull/734.

## 0.6.2 - 2020-07-17
### Added
Expand Down
24 changes: 12 additions & 12 deletions codegen/template_bundle/template_files.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codegen/templates/main.tmpl
View file
Open in desktop
Expand Up @@ -16,7 +16,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}}"
Expand Down
2 changes: 1 addition & 1 deletion codegen/templates/main_test.tmpl
View file
Open in desktop
Expand Up @@ -15,7 +15,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}}"
)
Expand Down
2 changes: 1 addition & 1 deletion codegen/templates/service.tmpl
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"

"go.uber.org/zap"
"github.com/uber/zanzibar/runtime"
zanzibar "github.com/uber/zanzibar/runtime"

module "{{$instance.PackageInfo.ModulePackagePath}}"
)
Expand Down
2 changes: 1 addition & 1 deletion codegen/templates/service_mock.tmpl
View file
Open in desktop
Expand Up @@ -19,7 +19,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}}"
)
Expand Down
2 changes: 1 addition & 1 deletion codegen/templates/structs.tmpl
View file
Open in desktop
Expand Up @@ -7,7 +7,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}}
Expand Down
2 changes: 1 addition & 1 deletion codegen/templates/tchannel_client_test_server.tmpl
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"time"

"github.com/uber/zanzibar/runtime"
zanzibar "github.com/uber/zanzibar/runtime"
"go.uber.org/thriftrw/wire"

{{range $idx, $pkg := .IncludedPackages -}}
Expand Down