projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18657-passenger-binstub' refs #18657
[arvados.git]
/
lib
/
controller
/
federation
/
generate.go
diff --git
a/lib/controller/federation/generate.go
b/lib/controller/federation/generate.go
index 1f37df858ccb008b4f3744264b00a9fb72817279..8af61315643708aaa96466286275452d3c242edb 100644
(file)
--- a/
lib/controller/federation/generate.go
+++ b/
lib/controller/federation/generate.go
@@
-2,6
+2,7
@@
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
+//go:build ignore
// +build ignore
package main
// +build ignore
package main
@@
-31,7
+32,7
@@
func main() {
if err != nil {
panic(err)
}
if err != nil {
panic(err)
}
- orig := regexp.MustCompile(`(?ms)\nfunc [^\n]*CollectionList\(.*?\n}\n`).Find(buf)
+ orig := regexp.MustCompile(`(?ms)\nfunc [^\n]*
generated_
CollectionList\(.*?\n}\n`).Find(buf)
if len(orig) == 0 {
panic("can't find CollectionList func")
}
if len(orig) == 0 {
panic("can't find CollectionList func")
}
@@
-49,18
+50,15
@@
func main() {
panic(err)
}
go func() {
panic(err)
}
go func() {
+ defer out.Close()
out.Write(regexp.MustCompile(`(?ms)^.*package .*?import.*?\n\)\n`).Find(buf))
io.WriteString(out, "//\n// -- this file is auto-generated -- do not edit -- edit list.go and run \"go generate\" instead --\n//\n\n")
out.Write(regexp.MustCompile(`(?ms)^.*package .*?import.*?\n\)\n`).Find(buf))
io.WriteString(out, "//\n// -- this file is auto-generated -- do not edit -- edit list.go and run \"go generate\" instead --\n//\n\n")
- for _, t := range []string{"Container", "
Specime
n"} {
+ for _, t := range []string{"Container", "
ContainerRequest", "Group", "Specimen", "User", "Link", "APIClientAuthorizatio
n"} {
_, err := out.Write(bytes.ReplaceAll(orig, []byte("Collection"), []byte(t)))
if err != nil {
panic(err)
}
}
_, err := out.Write(bytes.ReplaceAll(orig, []byte("Collection"), []byte(t)))
if err != nil {
panic(err)
}
}
- err = out.Close()
- if err != nil {
- panic(err)
- }
}()
err = gofmt.Run()
if err != nil {
}()
err = gofmt.Run()
if err != nil {