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

feat(internal/postprocessor): make OwlBot postprocessor #7202

Merged
merged 81 commits into from
Jan 9, 2023
Merged

feat(internal/postprocessor): make OwlBot postprocessor #7202

Show file tree
Hide file tree
Changes from 78 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
222759e
deleted all changes other than postprocessor take 2
adrianajg Oct 20, 2022
5a7c3f5
refactor
adrianajg Oct 21, 2022
1211045
address issues in code review
adrianajg Oct 21, 2022
ca74a92
refactor code
adrianajg Oct 24, 2022
7ef9aa2
Run ModTidyAll from postprocessor after copying files
adrianajg Oct 25, 2022
979fc14
Implement execv Vet command
adrianajg Oct 26, 2022
4a4eef1
Make edits according to code review
adrianajg Oct 26, 2022
20f57d2
removing .OwlBot files from GitHub
adrianajg Oct 26, 2022
c6ae219
re-added .OwlBot files locally
adrianajg Oct 26, 2022
f9762d0
Merge pull request #1 from adrianajg/OwlBot
adrianajg Oct 26, 2022
4ec20e4
move gensnippets to internal
adrianajg Oct 28, 2022
913adbb
fix build errors
adrianajg Oct 28, 2022
4b350ee
resetting changes to fix build issues
adrianajg Oct 31, 2022
bee6ebe
Generate snippets from postprocessor
adrianajg Nov 1, 2022
6f4e8e1
gensnippet.Generate function being called when running postprocessor
adrianajg Nov 2, 2022
9e863db
Fix flags for local testing without Docker build. Fix regenSnippets o…
adrianajg Nov 4, 2022
6528c51
Testing only copies accessapproval library from owl-bot-staging to cl…
adrianajg Nov 4, 2022
09edb81
Using local test flag generates gensnippets for accessapproval library
adrianajg Nov 4, 2022
db7fbbf
Call to built postprocessor container generates snippets for all modules
adrianajg Nov 4, 2022
852bf44
Refactor code
adrianajg Nov 4, 2022
f785afe
Merge pull request #3 from adrianajg/OwlBot3
adrianajg Nov 4, 2022
85a0e8d
Remove bigquery/reservation entry in internal/gapicgen/generator/conf…
adrianajg Nov 11, 2022
9dd2fb1
reverted gensnippets.Generate function to set rootDir to '.' instead …
adrianajg Nov 11, 2022
8595a7c
Change dstPrefix flag default value to '/repo'
adrianajg Nov 11, 2022
809f730
Do not clone if testing flag set to True
adrianajg Nov 11, 2022
4ec16c2
Remove unecessary if testing in run()
adrianajg Nov 11, 2022
c5e9543
refactoring in progress
adrianajg Nov 14, 2022
cbd760f
Merge branch 'main' of github.com:googleapis/google-cloud-go into Pos…
adrianajg Nov 14, 2022
eebcfa0
Merge branch 'Postprocessor' of github.com:adrianajg/google-cloud-go …
adrianajg Nov 14, 2022
0515e02
merged
adrianajg Nov 14, 2022
47d5a39
merged
adrianajg Nov 14, 2022
1a0728a
merge part2
adrianajg Nov 14, 2022
4afa083
Create new GenerateSnippetsPath function in internal/gensnippets to o…
adrianajg Nov 14, 2022
5e23997
Adjust gensnippets.Generate func to skip root dir when running getMod…
adrianajg Nov 15, 2022
ef3d7fd
clean up
adrianajg Nov 15, 2022
06168e1
metadata in progress
adrianajg Nov 15, 2022
fb115ed
generate metadata file
adrianajg Nov 15, 2022
9a20495
gensnippets getModuleVersion does not operate when root is /repo
adrianajg Nov 15, 2022
33fc08f
clean up
adrianajg Nov 15, 2022
ac105f1
GenerateSnippetsDirs takes in a slice of dirs
adrianajg Nov 15, 2022
c3d0436
remove unwanted diffs for PR
adrianajg Nov 15, 2022
6d2ba7e
remove further diffs
adrianajg Nov 15, 2022
6b3f2a0
replace testing flag with directories flag
adrianajg Nov 16, 2022
ad1be13
Resolve requested changes in PR
adrianajg Nov 18, 2022
25efbd2
run all directories sets config modules field to nil rather than empt…
adrianajg Nov 18, 2022
13d2652
clean up
adrianajg Nov 18, 2022
8b0ff4a
address PR requested changes
adrianajg Nov 22, 2022
abf1d94
Merge pull request #4 from adrianajg/OwlBot3
adrianajg Nov 23, 2022
a86395a
write collectPRBody function
adrianajg Nov 23, 2022
6593e16
TESTING
adrianajg Nov 23, 2022
8a3d5ba
amendPRDescription finds open PR, title, and body
adrianajg Nov 28, 2022
431a4be
removed access token
adrianajg Nov 28, 2022
c365dc7
getChangedPackageNames function identifies modules changed in commit
adrianajg Nov 28, 2022
fc5de2b
getScopeFromGoogleapisCommitHash returns a slice of scopes, as of yet…
adrianajg Nov 29, 2022
aa45c2d
Scope(s) found using commit hash by iterating through generator.Micro…
adrianajg Nov 30, 2022
e15b8c5
PR title text is amended with scope, (not pushed back to PR)
adrianajg Nov 30, 2022
56bfd9f
cleaned up
adrianajg Dec 2, 2022
c7d3e25
added test and PR title is updated to include scope
adrianajg Dec 5, 2022
34affe7
main_test pass for title update
adrianajg Dec 5, 2022
4535523
main_test.go passing
adrianajg Dec 6, 2022
9ae3139
scope outside of gapicgen/generator/config.go returns title with no s…
adrianajg Dec 7, 2022
740c9e5
regex expression for extracting parts of commit title, add owl-bot-st…
adrianajg Dec 7, 2022
8e59b26
clean up in progress
adrianajg Dec 7, 2022
0a74f7c
in progress
adrianajg Dec 7, 2022
cb2af9a
clean up
adrianajg Dec 7, 2022
7cdc324
Test run on accessapproval with full postprocessor script worked
adrianajg Dec 7, 2022
ee53795
reset branchPrefix flag to default of 'owl-bot-copy-'
adrianajg Dec 7, 2022
37caa90
restructure and resolve review issues
adrianajg Dec 12, 2022
c713d11
Resolve changes 2
adrianajg Dec 14, 2022
059d10b
addressing further requested changes
adrianajg Dec 19, 2022
f85d4fd
trying to pass vet check
adrianajg Dec 19, 2022
986587e
Merge pull request #6 from adrianajg/CommitMessages
adrianajg Dec 19, 2022
4bce4d5
Merge branch 'main' of github.com:googleapis/google-cloud-go into Pos…
adrianajg Jan 3, 2023
4d69e8e
format
adrianajg Jan 3, 2023
e7d42bd
Address requested changes
adrianajg Jan 6, 2023
4dbe3d0
Merge branch 'main' of github.com:googleapis/google-cloud-go into Pos…
adrianajg Jan 6, 2023
4e9426e
removed unecessary import
adrianajg Jan 6, 2023
e8a0fc2
Further requested changes
adrianajg Jan 6, 2023
3b545c0
formatting
adrianajg Jan 6, 2023
0db44cf
Merge branch 'main' into Postprocessor
codyoss Jan 6, 2023
662577d
Merge branch 'main' into Postprocessor
codyoss Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/gapicgen/generator/gapics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

"cloud.google.com/go/internal/gapicgen/execv"
"cloud.google.com/go/internal/gapicgen/execv/gocmd"
"cloud.google.com/go/internal/gapicgen/gensnippets"
"cloud.google.com/go/internal/gensnippets"
"gopkg.in/yaml.v2"
)

Expand Down
8 changes: 7 additions & 1 deletion internal/gapicgen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.19
require (
cloud.google.com/go/internal/aliasfix v0.0.0
cloud.google.com/go/internal/aliasgen v0.0.0-20221206175018-61617a45bf4b
cloud.google.com/go/internal/godocfx v0.0.0-20221206175018-61617a45bf4b
cloud.google.com/go/internal/gensnippets v0.0.0-00010101000000-000000000000
github.com/google/go-github/v35 v35.3.0
github.com/shurcooL/githubv4 v0.0.0-20221203213311-70889c5dac07
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
Expand All @@ -19,6 +19,7 @@ require (
)

require (
cloud.google.com/go/internal/godocfx v0.0.0-20221206175018-61617a45bf4b // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-querystring v1.0.0 // indirect
Expand All @@ -32,12 +33,17 @@ require (
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.3.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/tools v0.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)

replace cloud.google.com/go/internal/aliasfix => ../aliasfix

replace cloud.google.com/go/internal/aliasgen => ../aliasgen

replace cloud.google.com/go/internal/gensnippets => ../gensnippets
2 changes: 1 addition & 1 deletion internal/gapicgen/cmd/gensnippets/main.go → internal/gensnippets/cmd/gensnippets/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"log"

"cloud.google.com/go/internal/gapicgen/generator"
"cloud.google.com/go/internal/gapicgen/gensnippets"
"cloud.google.com/go/internal/gensnippets"
)

func main() {
Expand Down
53 changes: 32 additions & 21 deletions internal/gapicgen/gensnippets/gensnippets.go → internal/gensnippets/gensnippets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package gensnippets

import (
"bytes"
"errors"
"fmt"
"go/ast"
"go/doc"
Expand All @@ -42,44 +43,56 @@ import (

// Generate reads all modules in rootDir and outputs their examples in outDir.
func Generate(rootDir, outDir string, apiShortnames map[string]string) error {
return GenerateSnippetsDirs(rootDir, outDir, apiShortnames, nil)
}

// GenerateSnippetsDirs takes in specified modules in rootDir and outputs their examples in outDir.
// If a single directory is passed in that is the root directory, all modules will be run.
func GenerateSnippetsDirs(rootDir, outDir string, apiShortNames map[string]string, dirs []string) error {
if rootDir == "" {
rootDir = "."
}
if outDir == "" {
outDir = "internal/generated/snippets"
}

// Find all modules in rootDir.
dirs := []string{}
filepath.WalkDir(rootDir, func(path string, d fs.DirEntry, err error) error {
if err != nil {
return err
}
if d.Name() == "internal" {
return filepath.SkipDir
}
if d.Name() == "go.mod" {
dirs = append(dirs, filepath.Dir(path))
}
return nil
})
if dirs == nil {
// Find all modules in rootDir.
filepath.WalkDir(rootDir, func(path string, d fs.DirEntry, err error) error {
if err != nil {
return err
}
if d.Name() == "internal" {
return filepath.SkipDir
}
if d.Name() == "go.mod" {
dirs = append(dirs, filepath.Dir(path))
}
return nil
})
}

log.Printf("Processing examples in %v directories: %q\n", len(dirs), dirs)

trimPrefix := "cloud.google.com/go"
errs := []error{}
for _, dir := range dirs {
// If running locally ignores root directory
version, err := getModuleVersion(dir)
if errors.Is(err, fs.ErrNotExist) {
log.Println("Skipping", dir)
continue
} else if err != nil {
return err
}
// Load does not look at nested modules.
pis, err := pkgload.Load("./...", dir, nil)
if err != nil {
return fmt.Errorf("failed to load packages: %v", err)
}
version, err := getModuleVersion(dir)
if err != nil {
return err
}

for _, pi := range pis {
if eErrs := processExamples(pi.Doc, pi.Fset, trimPrefix, rootDir, outDir, apiShortnames, version); len(eErrs) > 0 {
if eErrs := processExamples(pi.Doc, pi.Fset, trimPrefix, rootDir, outDir, apiShortNames, version); len(eErrs) > 0 {
errs = append(errs, fmt.Errorf("%v", eErrs))
}
}
Expand Down Expand Up @@ -145,7 +158,6 @@ func processExamples(pkg *doc.Package, fset *token.FileSet, trimPrefix, rootDir,
return nil
}
outDir = filepath.Join(outDir, trimmed)

// Note: only process methods because they correspond to RPCs.

var errs []error
Expand Down Expand Up @@ -358,7 +370,6 @@ func writeExamples(outDir string, exs []*doc.Example, fset *token.FileSet, regio
if err := os.MkdirAll(dir, 0755); err != nil {
return err
}

f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
if err != nil {
return err
Expand Down
41 changes: 41 additions & 0 deletions internal/gensnippets/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
module cloud.google.com/go/internal/gensnippets

go 1.19

require (
cloud.google.com/go/internal/gapicgen v0.0.0-20221028182014-434b407f4ba6
cloud.google.com/go/internal/godocfx v0.0.0-20221028182014-434b407f4ba6
golang.org/x/sys v0.1.0
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e
google.golang.org/protobuf v1.28.1
)

require (
cloud.google.com/go/internal/aliasfix v0.0.0 // indirect
cloud.google.com/go/internal/aliasgen v0.0.0-20221014201223-53a0f9dc7e78 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-github/v35 v35.3.0 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/sergi/go-diff v1.0.0 // indirect
github.com/shurcooL/githubv4 v0.0.0-20220922232305-70b4d362a8cb // indirect
github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect
github.com/src-d/gcfg v1.4.0 // indirect
github.com/xanzy/ssh-agent v0.2.1 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/net v0.1.0 // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 // indirect
golang.org/x/tools v0.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

replace cloud.google.com/go/internal/aliasfix => ../aliasfix
124 changes: 124 additions & 0 deletions internal/gensnippets/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
cloud.google.com/go/internal/aliasgen v0.0.0-20221014201223-53a0f9dc7e78 h1:E22e7by7T0mUY8airoylFomgkcIhnVR6IwppxYr4nfw=
cloud.google.com/go/internal/aliasgen v0.0.0-20221014201223-53a0f9dc7e78/go.mod h1:m8z1gNSEk09tnPqJCiAVArULRQcfH591pMZ8f3mjxOo=
cloud.google.com/go/internal/gapicgen v0.0.0-20221028182014-434b407f4ba6 h1:wuI9wQu3jrC9dwatlR8QQRsTWaqV6pspoTRK44Nlzg8=
cloud.google.com/go/internal/gapicgen v0.0.0-20221028182014-434b407f4ba6/go.mod h1:AU0p/wTq+hspyjt9+IwAKj76QB4mE9qRWgSwNlwEzUE=
cloud.google.com/go/internal/godocfx v0.0.0-20221028182014-434b407f4ba6 h1:4OXW/jOE5SOHCRf2lmWg4CH6XrMKmze7xyzuH7WVKEs=
cloud.google.com/go/internal/godocfx v0.0.0-20221028182014-434b407f4ba6/go.mod h1:fUIX2uGJ32bfWkJFzKEIklml7Lg9OAoO1MRnxEtX0KY=
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-github/v35 v35.3.0 h1:fU+WBzuukn0VssbayTT+Zo3/ESKX9JYWjbZTLOTEyho=
github.com/google/go-github/v35 v35.3.0/go.mod h1:yWB7uCcVWaUbUP74Aq3whuMySRMatyRmq5U9FTNlbio=
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/shurcooL/githubv4 v0.0.0-20220922232305-70b4d362a8cb h1:Ptg7eUGaD22iZMracv+h7ghDJkGaeQ1FQ9BnkRB6DOo=
github.com/shurcooL/githubv4 v0.0.0-20220922232305-70b4d362a8cb/go.mod h1:hAF0iLZy4td2EX+/8Tw+4nodhlMrwN3HupfaXj3zkGo=
github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a h1:KikTa6HtAK8cS1qjvUvvq4QO21QnwC+EfvB+OAuZ/ZU=
github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a/go.mod h1:AuYgA5Kyo4c7HfUmvRGs/6rGlMMV/6B1bVnB9JxJEEg=
github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 h1:cu5kTvlzcw1Q5S9f5ip1/cpiB4nXvw1XYzFPGgzLUOY=
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y=
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg=
gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE=
gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
0 ...icgen/gensnippets/metadata/metadata.pb.go → internal/gensnippets/metadata/metadata.pb.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...icgen/gensnippets/metadata/metadata.proto → internal/gensnippets/metadata/metadata.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package google.cloud.tools.snippetgen.snippetindex.v1;
option csharp_namespace = "Google.Cloud.Tools.SnippetGen.SnippetIndex.V1";
option php_namespace = "Google\\Cloud\\Tools\\SnippetGen\\SnippetIndex\\V1";
option ruby_package = "Google::Cloud::Tools::SnippetGen::SnippetIndex::V1";
option go_package = "cloud.google.com/go/internal/gapicgen/gensnippets/metadata;metadata";
option go_package = "cloud.google.com/go/internal/gensnippets/metadata;metadata";

// The snippet index for a single client library.
message Index {
Expand Down
2 changes: 1 addition & 1 deletion internal/gapicgen/gensnippets/model.go → internal/gensnippets/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"sort"
"strings"

"cloud.google.com/go/internal/gapicgen/gensnippets/metadata"
"cloud.google.com/go/internal/gensnippets/metadata"
)

type apiInfo struct {
Expand Down
Loading