crossplane
/
crossplane-tools
mirror of https://github.com/crossplane/crossplane-tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support Go modules 

Write the generated files alongside the first Go file of the module, rather than
to its presumed path under GOPATH. This change assumes:

* Packages always have at least one Go source file.
* The Go files of a package are always within a single directory.

I believe the above are always true.

Signed-off-by: Nic Cope <negz@rk0n.org>
This commit is contained in:
Nic Cope 2019-10-07 12:15:33 -07:00
parent e252b93745
commit 53ff22ad7b
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -32,8 +32,6 @@ Generate a Crossplane method sets.
Flags: Flags:
--help Show context-sensitive help (also try --help-long and --help-man). --help Show context-sensitive help (also try --help-long and --help-man).
--base-dir=/Users/negz/control/go/src
Generated files are written to their package paths relative to this directory.
--header-file=HEADER-FILE The contents of this file will be added to the top of all generated files. --header-file=HEADER-FILE The contents of this file will be added to the top of all generated files.
--filename-managed="zz_generated.managed.go" --filename-managed="zz_generated.managed.go"
The filename of generated managed resource files. The filename of generated managed resource files.

33
cmd/angryjet/main.go
View File

@ -33,7 +33,7 @@ import (
const ( const (
// LoadMode used to load all packages. // LoadMode used to load all packages.
LoadMode = packages.NeedName | packages.NeedImports | packages.NeedDeps | packages.NeedTypes | packages.NeedSyntax LoadMode = packages.NeedName | packages.NeedFiles | packages.NeedImports | packages.NeedDeps | packages.NeedTypes | packages.NeedSyntax
// DisableMarker used to disable generation of managed resource methods for // DisableMarker used to disable generation of managed resource methods for
// a type that otherwise appears to be a managed resource that is missing a // a type that otherwise appears to be a managed resource that is missing a
@ -57,7 +57,6 @@ func main() {
app = kingpin.New(filepath.Base(os.Args[0]), "Generates Crossplane API type methods.").DefaultEnvars() app = kingpin.New(filepath.Base(os.Args[0]), "Generates Crossplane API type methods.").DefaultEnvars()
methodsets = app.Command("generate-methodsets", "Generate a Crossplane method sets.") methodsets = app.Command("generate-methodsets", "Generate a Crossplane method sets.")
base = methodsets.Flag("base-dir", "Generated files are written to their package paths relative to this directory.").Default(filepath.Join(os.Getenv("GOPATH"), "src")).ExistingDir()
headerFile = methodsets.Flag("header-file", "The contents of this file will be added to the top of all generated files.").ExistingFile() headerFile = methodsets.Flag("header-file", "The contents of this file will be added to the top of all generated files.").ExistingFile()
filenameManaged = methodsets.Flag("filename-managed", "The filename of generated managed resource files.").Default("zz_generated.managed.go").String() filenameManaged = methodsets.Flag("filename-managed", "The filename of generated managed resource files.").Default("zz_generated.managed.go").String()
filenameClaim = methodsets.Flag("filename-claim", "The filename of generated resource claim files.").Default("zz_generated.claim.go").String() filenameClaim = methodsets.Flag("filename-claim", "The filename of generated resource claim files.").Default("zz_generated.claim.go").String()
@ -82,16 +81,16 @@ func main() {
for _, err := range p.Errors { for _, err := range p.Errors {
kingpin.FatalIfError(err, "error loading packages using pattern %s", *pattern) kingpin.FatalIfError(err, "error loading packages using pattern %s", *pattern)
} }
kingpin.FatalIfError(GenerateManaged(*base, *filenameManaged, header, p), "cannot write managed resource method set for package %s", p.PkgPath) kingpin.FatalIfError(GenerateManaged(*filenameManaged, header, p), "cannot write managed resource method set for package %s", p.PkgPath)
kingpin.FatalIfError(GenerateClaim(*base, *filenameClaim, header, p), "cannot write resource claim method set for package %s", p.PkgPath) kingpin.FatalIfError(GenerateClaim(*filenameClaim, header, p), "cannot write resource claim method set for package %s", p.PkgPath)
kingpin.FatalIfError(GeneratePortableClass(*base, *filenamePortableClass, header, p), "cannot write portable class method set for package %s", p.PkgPath) kingpin.FatalIfError(GeneratePortableClass(*filenamePortableClass, header, p), "cannot write portable class method set for package %s", p.PkgPath)
kingpin.FatalIfError(GeneratePortableClassList(*base, *filenamePortableClassList, header, p), "cannot write portable class list method set for package %s", p.PkgPath) kingpin.FatalIfError(GeneratePortableClassList(*filenamePortableClassList, header, p), "cannot write portable class list method set for package %s", p.PkgPath)
kingpin.FatalIfError(GenerateNonPortableClass(*base, *filenameNonPortableClass, header, p), "cannot write non portable class method set for package %s", p.PkgPath) kingpin.FatalIfError(GenerateNonPortableClass(*filenameNonPortableClass, header, p), "cannot write non portable class method set for package %s", p.PkgPath)
} }
} }
// GenerateManaged generates the resource.Managed method set. // GenerateManaged generates the resource.Managed method set.
func GenerateManaged(base, filename, header string, p *packages.Package) error { func GenerateManaged(filename, header string, p *packages.Package) error {
receiver := "mg" receiver := "mg"
methods := method.Set{ methods := method.Set{
@ -108,7 +107,7 @@ func GenerateManaged(base, filename, header string, p *packages.Package) error {
"GetReclaimPolicy": method.NewGetReclaimPolicy(receiver, RuntimeImport, fields.NameSpec), "GetReclaimPolicy": method.NewGetReclaimPolicy(receiver, RuntimeImport, fields.NameSpec),
} }
err := generate.WriteMethods(p, methods, filepath.Join(base, p.PkgPath, filename), err := generate.WriteMethods(p, methods, filepath.Join(filepath.Dir(p.GoFiles[0]), filename),
generate.WithHeaders(header), generate.WithHeaders(header),
generate.WithImportAliases(map[string]string{ generate.WithImportAliases(map[string]string{
CoreImport: CoreAlias, CoreImport: CoreAlias,
@ -124,7 +123,7 @@ func GenerateManaged(base, filename, header string, p *packages.Package) error {
} }
// GenerateClaim generates the resource.Claim method set. // GenerateClaim generates the resource.Claim method set.
func GenerateClaim(base, filename, header string, p *packages.Package) error { func GenerateClaim(filename, header string, p *packages.Package) error {
receiver := "cm" receiver := "cm"
methods := method.Set{ methods := method.Set{
@ -139,7 +138,7 @@ func GenerateClaim(base, filename, header string, p *packages.Package) error {
"GetWriteConnectionSecretToReference": method.NewGetWriteConnectionSecretToReference(receiver, CoreImport), "GetWriteConnectionSecretToReference": method.NewGetWriteConnectionSecretToReference(receiver, CoreImport),
} }
err := generate.WriteMethods(p, methods, filepath.Join(base, p.PkgPath, filename), err := generate.WriteMethods(p, methods, filepath.Join(filepath.Dir(p.GoFiles[0]), filename),
generate.WithHeaders(header), generate.WithHeaders(header),
generate.WithImportAliases(map[string]string{ generate.WithImportAliases(map[string]string{
CoreImport: CoreAlias, CoreImport: CoreAlias,
@ -155,7 +154,7 @@ func GenerateClaim(base, filename, header string, p *packages.Package) error {
} }
// GeneratePortableClass generates the resource.PortableClass method set. // GeneratePortableClass generates the resource.PortableClass method set.
func GeneratePortableClass(base, filename, header string, p *packages.Package) error { func GeneratePortableClass(filename, header string, p *packages.Package) error {
receiver := "cs" receiver := "cs"
methods := method.Set{ methods := method.Set{
@ -163,7 +162,7 @@ func GeneratePortableClass(base, filename, header string, p *packages.Package) e
"GetNonPortableClassReference": method.NewGetNonPortableClassReference(receiver, CoreImport), "GetNonPortableClassReference": method.NewGetNonPortableClassReference(receiver, CoreImport),
} }
err := generate.WriteMethods(p, methods, filepath.Join(base, p.PkgPath, filename), err := generate.WriteMethods(p, methods, filepath.Join(filepath.Dir(p.GoFiles[0]), filename),
generate.WithHeaders(header), generate.WithHeaders(header),
generate.WithImportAliases(map[string]string{CoreImport: CoreAlias}), generate.WithImportAliases(map[string]string{CoreImport: CoreAlias}),
generate.WithMatcher(match.AllOf( generate.WithMatcher(match.AllOf(
@ -176,7 +175,7 @@ func GeneratePortableClass(base, filename, header string, p *packages.Package) e
} }
// GeneratePortableClassList generates the resource.PortableClassList method set. // GeneratePortableClassList generates the resource.PortableClassList method set.
func GeneratePortableClassList(base, filename, header string, p *packages.Package) error { func GeneratePortableClassList(filename, header string, p *packages.Package) error {
receiver := "csl" receiver := "csl"
methods := method.Set{ methods := method.Set{
@ -184,7 +183,7 @@ func GeneratePortableClassList(base, filename, header string, p *packages.Packag
"GetPortableClassItems": method.NewGetPortableClassItems(receiver, ResourceImport), "GetPortableClassItems": method.NewGetPortableClassItems(receiver, ResourceImport),
} }
err := generate.WriteMethods(p, methods, filepath.Join(base, p.PkgPath, filename), err := generate.WriteMethods(p, methods, filepath.Join(filepath.Dir(p.GoFiles[0]), filename),
generate.WithHeaders(header), generate.WithHeaders(header),
generate.WithMatcher(match.AllOf( generate.WithMatcher(match.AllOf(
match.PortableClassList(), match.PortableClassList(),
@ -196,7 +195,7 @@ func GeneratePortableClassList(base, filename, header string, p *packages.Packag
} }
// GenerateNonPortableClass generates the resource.NonPortableClass method set. // GenerateNonPortableClass generates the resource.NonPortableClass method set.
func GenerateNonPortableClass(base, filename, header string, p *packages.Package) error { func GenerateNonPortableClass(filename, header string, p *packages.Package) error {
receiver := "cs" receiver := "cs"
methods := method.Set{ methods := method.Set{
@ -204,7 +203,7 @@ func GenerateNonPortableClass(base, filename, header string, p *packages.Package
"GetReclaimPolicy": method.NewGetReclaimPolicy(receiver, RuntimeImport, fields.NameSpecTemplate), "GetReclaimPolicy": method.NewGetReclaimPolicy(receiver, RuntimeImport, fields.NameSpecTemplate),
} }
err := generate.WriteMethods(p, methods, filepath.Join(base, p.PkgPath, filename), err := generate.WriteMethods(p, methods, filepath.Join(filepath.Dir(p.GoFiles[0]), filename),
generate.WithHeaders(header), generate.WithHeaders(header),
generate.WithImportAliases(map[string]string{RuntimeImport: RuntimeAlias}), generate.WithImportAliases(map[string]string{RuntimeImport: RuntimeAlias}),
generate.WithMatcher(match.AllOf( generate.WithMatcher(match.AllOf(