Skip to content

Commit

Permalink
google-api-go-generator: correctly report Go version of runtime
Browse files Browse the repository at this point in the history 
The Go version of the generator was reported in the x-goog-api-client
header, rather than the version of the Go runtime that made the request.

Change-Id: Ib0f00e84293460a2c938f7e12b36a5741aef5eea
Reviewed-on: https://code-review.googlesource.com/c/google-api-go-client/+/52414
Reviewed-by: Chris Broadfoot <cbro@google.com>
  • Loading branch information
@broady
broady committed Feb 26, 2020
1 parent b8123c5 commit 062a97f
Show file tree
Hide file tree
Showing 16 changed files with 163 additions and 161 deletions.
3 changes: 1 addition & 2 deletions google-api-go-generator/gen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (

const (
googleDiscoveryURL = "https://www.googleapis.com/discovery/v1/apis"
generatorVersion = "2018018"
)

var (
Expand Down Expand Up @@ -1937,7 +1936,7 @@ func (meth *Method) generateCode() {

pn("\nfunc (c *%s) doRequest(alt string) (*http.Response, error) {", callName)
pn(`reqHeaders := make(http.Header)`)
pn(`reqHeaders.Set("x-goog-api-client", "gl-go/%s gdcl/%s")`, version.Go(), version.Repo)
pn(`reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/%s")`, version.Repo)
pn("for k, v := range c.header_ {")
pn(" reqHeaders[k] = v")
pn("}")
Expand Down
10 changes: 4 additions & 6 deletions google-api-go-generator/gen_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ func TestAPIs(t *testing.T) {
}
goldenFile := filepath.Join("testdata", name+".want")
if *updateGolden {
clean := strings.Replace(string(clean), fmt.Sprintf("gl-go/%s", version.Go()), "gl-go/1.12.5", -1)
clean = strings.Replace(clean, fmt.Sprintf("gdcl/%s", version.Repo), "gdcl/00000000", -1)
clean := strings.Replace(string(clean), fmt.Sprintf("gdcl/%s", version.Repo), "gdcl/00000000", -1)
if err := ioutil.WriteFile(goldenFile, []byte(clean), 0644); err != nil {
t.Fatal(err)
}
Expand All @@ -69,17 +68,16 @@ func TestAPIs(t *testing.T) {
if err != nil {
t.Fatal(err)
}
wantStr := strings.Replace(string(want), "gl-go/1.12.5", fmt.Sprintf("gl-go/%s", version.Go()), -1)
wantStr = strings.Replace(wantStr, "gdcl/00000000", fmt.Sprintf("gdcl/%s", version.Repo), -1)
want = []byte(wantStr)
if !bytes.Equal(want, clean) {
wantStr := strings.Replace(string(want), "gdcl/00000000", fmt.Sprintf("gdcl/%s", version.Repo), -1)
if !bytes.Equal([]byte(wantStr), clean) {
tf, _ := ioutil.TempFile("", "api-"+name+"-got-json.")
if _, err := tf.Write(clean); err != nil {
t.Fatal(err)
}
if err := tf.Close(); err != nil {
t.Fatal(err)
}
// NOTE: update golden files with `go test -update_golden`
t.Errorf("Output for API %s differs: diff -u %s %s", name, goldenFile, tf.Name())
}
})
Expand Down
30 changes: 15 additions & 15 deletions google-api-go-generator/testdata/any.want
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ func (c *ProjectsLogServicesListCall) Header() http.Header {

func (c *ProjectsLogServicesListCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -1088,7 +1088,7 @@ func (c *ProjectsLogServicesIndexesListCall) Header() http.Header {

func (c *ProjectsLogServicesIndexesListCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -1279,7 +1279,7 @@ func (c *ProjectsLogServicesSinksCreateCall) Header() http.Header {

func (c *ProjectsLogServicesSinksCreateCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -1427,7 +1427,7 @@ func (c *ProjectsLogServicesSinksDeleteCall) Header() http.Header {

func (c *ProjectsLogServicesSinksDeleteCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -1586,7 +1586,7 @@ func (c *ProjectsLogServicesSinksGetCall) Header() http.Header {

func (c *ProjectsLogServicesSinksGetCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -1746,7 +1746,7 @@ func (c *ProjectsLogServicesSinksListCall) Header() http.Header {

func (c *ProjectsLogServicesSinksListCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -1891,7 +1891,7 @@ func (c *ProjectsLogServicesSinksUpdateCall) Header() http.Header {

func (c *ProjectsLogServicesSinksUpdateCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -2046,7 +2046,7 @@ func (c *ProjectsLogsDeleteCall) Header() http.Header {

func (c *ProjectsLogsDeleteCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -2234,7 +2234,7 @@ func (c *ProjectsLogsListCall) Header() http.Header {

func (c *ProjectsLogsListCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -2418,7 +2418,7 @@ func (c *ProjectsLogsEntriesWriteCall) Header() http.Header {

func (c *ProjectsLogsEntriesWriteCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -2566,7 +2566,7 @@ func (c *ProjectsLogsSinksCreateCall) Header() http.Header {

func (c *ProjectsLogsSinksCreateCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -2714,7 +2714,7 @@ func (c *ProjectsLogsSinksDeleteCall) Header() http.Header {

func (c *ProjectsLogsSinksDeleteCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -2873,7 +2873,7 @@ func (c *ProjectsLogsSinksGetCall) Header() http.Header {

func (c *ProjectsLogsSinksGetCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -3033,7 +3033,7 @@ func (c *ProjectsLogsSinksListCall) Header() http.Header {

func (c *ProjectsLogsSinksListCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down Expand Up @@ -3178,7 +3178,7 @@ func (c *ProjectsLogsSinksUpdateCall) Header() http.Header {

func (c *ProjectsLogsSinksUpdateCall) doRequest(alt string) (*http.Response, error) {
reqHeaders := make(http.Header)
reqHeaders.Set("x-goog-api-client", "gl-go/1.12.5 gdcl/00000000")
reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/00000000")
for k, v := range c.header_ {
reqHeaders[k] = v
}
Expand Down
Loading

0 comments on commit 062a97f

Please sign in to comment.