From e1df90c68f1fe72a13f7724c0e6bd3ac9f8766bc Mon Sep 17 00:00:00 2001 From: Ross Light Date: Fri, 6 Jul 2018 12:49:48 -0700 Subject: [PATCH] wire: only apply wireinject build tag to generated package (google/go-cloud#176) --- .../testdata/BuildTagsMainOnly/bar/bar.go | 23 +++++++++++++++ .../BuildTagsMainOnly/bar/bar_inject.go | 22 +++++++++++++++ .../testdata/BuildTagsMainOnly/foo/foo.go | 21 ++++++++++++++ .../testdata/BuildTagsMainOnly/foo/wire.go | 28 +++++++++++++++++++ .../wire/testdata/BuildTagsMainOnly/out.txt | 1 + internal/wire/testdata/BuildTagsMainOnly/pkg | 1 + internal/wire/wire.go | 20 +++++++++---- 7 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 internal/wire/testdata/BuildTagsMainOnly/bar/bar.go create mode 100644 internal/wire/testdata/BuildTagsMainOnly/bar/bar_inject.go create mode 100644 internal/wire/testdata/BuildTagsMainOnly/foo/foo.go create mode 100644 internal/wire/testdata/BuildTagsMainOnly/foo/wire.go create mode 100644 internal/wire/testdata/BuildTagsMainOnly/out.txt create mode 100644 internal/wire/testdata/BuildTagsMainOnly/pkg diff --git a/internal/wire/testdata/BuildTagsMainOnly/bar/bar.go b/internal/wire/testdata/BuildTagsMainOnly/bar/bar.go new file mode 100644 index 0000000..3cd29fd --- /dev/null +++ b/internal/wire/testdata/BuildTagsMainOnly/bar/bar.go @@ -0,0 +1,23 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//+build !wireinject + +// Package bar includes both wireinject and non-wireinject variants. +package bar + +import "github.com/google/go-cloud/wire" + +// Set provides a friendly user greeting. +var Set = wire.NewSet(wire.Value("Hello, World!")) diff --git a/internal/wire/testdata/BuildTagsMainOnly/bar/bar_inject.go b/internal/wire/testdata/BuildTagsMainOnly/bar/bar_inject.go new file mode 100644 index 0000000..97c662b --- /dev/null +++ b/internal/wire/testdata/BuildTagsMainOnly/bar/bar_inject.go @@ -0,0 +1,22 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//+build wireinject + +package bar + +import "github.com/google/go-cloud/wire" + +// Set provides an unfriendly user greeting. +var Set = wire.NewSet(wire.Value("Bah humbug! This is the wrong variant!")) diff --git a/internal/wire/testdata/BuildTagsMainOnly/foo/foo.go b/internal/wire/testdata/BuildTagsMainOnly/foo/foo.go new file mode 100644 index 0000000..f8216df --- /dev/null +++ b/internal/wire/testdata/BuildTagsMainOnly/foo/foo.go @@ -0,0 +1,21 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import "fmt" + +func main() { + fmt.Println(injectedMessage()) +} diff --git a/internal/wire/testdata/BuildTagsMainOnly/foo/wire.go b/internal/wire/testdata/BuildTagsMainOnly/foo/wire.go new file mode 100644 index 0000000..3e08683 --- /dev/null +++ b/internal/wire/testdata/BuildTagsMainOnly/foo/wire.go @@ -0,0 +1,28 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//+build wireinject + +package main + +import ( + "bar" + + "github.com/google/go-cloud/wire" +) + +func injectedMessage() string { + wire.Build(bar.Set) + return "" +} diff --git a/internal/wire/testdata/BuildTagsMainOnly/out.txt b/internal/wire/testdata/BuildTagsMainOnly/out.txt new file mode 100644 index 0000000..8ab686e --- /dev/null +++ b/internal/wire/testdata/BuildTagsMainOnly/out.txt @@ -0,0 +1 @@ +Hello, World! diff --git a/internal/wire/testdata/BuildTagsMainOnly/pkg b/internal/wire/testdata/BuildTagsMainOnly/pkg new file mode 100644 index 0000000..257cc56 --- /dev/null +++ b/internal/wire/testdata/BuildTagsMainOnly/pkg @@ -0,0 +1 @@ +foo diff --git a/internal/wire/wire.go b/internal/wire/wire.go index 327d6b5..7dd49b6 100644 --- a/internal/wire/wire.go +++ b/internal/wire/wire.go @@ -45,16 +45,26 @@ func Generate(bctx *build.Context, wd string, pkg string) ([]byte, []error) { } // TODO(light): Stop errors from printing to stderr. conf := &loader.Config{ - Build: new(build.Context), + Build: bctx, Cwd: wd, TypeCheckFuncBodies: func(path string) bool { return path == mainPkg.ImportPath }, + FindPackage: func(bctx *build.Context, importPath, fromDir string, mode build.ImportMode) (*build.Package, error) { + if importPath == mainPkg.ImportPath { + // Load in the generated package with the wireinject build tag + // to pick up the injector template. The imported packages + // should be imported as normal. Since the *build.Context is + // shared between calls to FindPackage, this uses a copy. + bctx2 := new(build.Context) + *bctx2 = *bctx + n := len(bctx2.BuildTags) + bctx2.BuildTags = append(bctx2.BuildTags[:n:n], "wireinject") + bctx = bctx2 + } + return bctx.Import(importPath, fromDir, mode) + }, } - *conf.Build = *bctx - n := len(conf.Build.BuildTags) - // TODO(light): Only apply wireinject build tag on main package. - conf.Build.BuildTags = append(conf.Build.BuildTags[:n:n], "wireinject") conf.Import(pkg) prog, err := conf.Load()