Skip to content

Commit

Permalink
Merge pull request #734 from uber/lu.import
Browse files Browse the repository at this point in the history
Set explicit import alias for zanzibar runtime package in templates
  • Loading branch information
skiptomylu authored Jul 29, 2020
2 parents cfa3fad + d54fdba commit 05b204c
Showing 8 changed files with 20 additions and 19 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
24 changes: 12 additions & 12 deletions codegen/template_bundle/template_files.go

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
Original file line number Diff line number Diff line change
@@ -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}}"
2 changes: 1 addition & 1 deletion codegen/templates/main_test.tmpl
Original file line number Diff line number Diff line change
@@ -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}}"
)
2 changes: 1 addition & 1 deletion codegen/templates/service.tmpl
Original file line number Diff line number Diff line change
@@ -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}}"
)
2 changes: 1 addition & 1 deletion codegen/templates/service_mock.tmpl
Original file line number Diff line number Diff line change
@@ -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}}"
)
2 changes: 1 addition & 1 deletion codegen/templates/structs.tmpl
Original file line number Diff line number Diff line change
@@ -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}}
2 changes: 1 addition & 1 deletion codegen/templates/tchannel_client_test_server.tmpl
Original file line number Diff line number Diff line change
@@ -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 -}}

0 comments on commit 05b204c

Please sign in to comment.