all: move gensupport to internal
It's been marked internal for years (forever?), but predates the internal/
convention. This CL actually moves it to internal/.
A future CL will re-import all apiaries post-regeneration which will fix
the build failures this CL will cause.
Change-Id: Ibc53fadf2030533bd54fd10f6a3c1c2c2f1dd7f6
Reviewed-on: https://code-review.googlesource.com/c/google-api-go-client/+/45150
Reviewed-by: Tyler Bui-Palsulich <tbp@google.com>
diff --git a/google-api-go-generator/gen.go b/google-api-go-generator/gen.go
index 8d0221e..5c99001 100644
--- a/google-api-go-generator/gen.go
+++ b/google-api-go-generator/gen.go
@@ -51,7 +51,7 @@
baseURL = flag.String("base_url", "", "(optional) Override the default service API URL. If empty, the service's root URL will be used.")
headerPath = flag.String("header_path", "", "If non-empty, prepend the contents of this file to generated services.")
- gensupportPkg = flag.String("gensupport_pkg", "google.golang.org/api/gensupport", "Go package path of the 'api/gensupport' support package.")
+ gensupportPkg = flag.String("gensupport_pkg", "google.golang.org/api/internal/gensupport", "Go package path of the 'api/internal/gensupport' support package.")
googleapiPkg = flag.String("googleapi_pkg", "google.golang.org/api/googleapi", "Go package path of the 'api/googleapi' support package.")
optionPkg = flag.String("option_pkg", "google.golang.org/api/option", "Go package path of the 'api/option' support package.")
htransportPkg = flag.String("htransport_pkg", "google.golang.org/api/transport/http", "Go package path of the 'api/transport/http' support package.")
diff --git a/google-api-go-generator/testdata/any.want b/google-api-go-generator/testdata/any.want
index 8a7fa11..54de17c 100644
--- a/google-api-go-generator/testdata/any.want
+++ b/google-api-go-generator/testdata/any.want
@@ -49,7 +49,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/arrayofarray-1.want b/google-api-go-generator/testdata/arrayofarray-1.want
index 6d059a4..0a992fc 100644
--- a/google-api-go-generator/testdata/arrayofarray-1.want
+++ b/google-api-go-generator/testdata/arrayofarray-1.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/arrayofenum.want b/google-api-go-generator/testdata/arrayofenum.want
index 82e387c..dad8b2f 100644
--- a/google-api-go-generator/testdata/arrayofenum.want
+++ b/google-api-go-generator/testdata/arrayofenum.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/arrayofmapofobjects.want b/google-api-go-generator/testdata/arrayofmapofobjects.want
index b4de08e..5409443 100644
--- a/google-api-go-generator/testdata/arrayofmapofobjects.want
+++ b/google-api-go-generator/testdata/arrayofmapofobjects.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/arrayofmapofstrings.want b/google-api-go-generator/testdata/arrayofmapofstrings.want
index 0d13e62..045608d 100644
--- a/google-api-go-generator/testdata/arrayofmapofstrings.want
+++ b/google-api-go-generator/testdata/arrayofmapofstrings.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/blogger-3.want b/google-api-go-generator/testdata/blogger-3.want
index 823cd96..e3e1b9b 100644
--- a/google-api-go-generator/testdata/blogger-3.want
+++ b/google-api-go-generator/testdata/blogger-3.want
@@ -53,7 +53,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/floats.want b/google-api-go-generator/testdata/floats.want
index 3588f77..a86e2f2 100644
--- a/google-api-go-generator/testdata/floats.want
+++ b/google-api-go-generator/testdata/floats.want
@@ -49,7 +49,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/getwithoutbody.want b/google-api-go-generator/testdata/getwithoutbody.want
index 355fbdb..af5b956 100644
--- a/google-api-go-generator/testdata/getwithoutbody.want
+++ b/google-api-go-generator/testdata/getwithoutbody.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/http-body.want b/google-api-go-generator/testdata/http-body.want
index 0d0a4d2..88c30ee 100644
--- a/google-api-go-generator/testdata/http-body.want
+++ b/google-api-go-generator/testdata/http-body.want
@@ -49,7 +49,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/json-body.want b/google-api-go-generator/testdata/json-body.want
index 9aa45a7..7ed6050 100644
--- a/google-api-go-generator/testdata/json-body.want
+++ b/google-api-go-generator/testdata/json-body.want
@@ -49,7 +49,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/mapofany.want b/google-api-go-generator/testdata/mapofany.want
index 03044bd..7b253ce 100644
--- a/google-api-go-generator/testdata/mapofany.want
+++ b/google-api-go-generator/testdata/mapofany.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/mapofarrayofobjects.want b/google-api-go-generator/testdata/mapofarrayofobjects.want
index ca19a8a..17992f6 100644
--- a/google-api-go-generator/testdata/mapofarrayofobjects.want
+++ b/google-api-go-generator/testdata/mapofarrayofobjects.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/mapofint64strings.want b/google-api-go-generator/testdata/mapofint64strings.want
index 7c56a94..4bc5c7d 100644
--- a/google-api-go-generator/testdata/mapofint64strings.want
+++ b/google-api-go-generator/testdata/mapofint64strings.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/mapofobjects.want b/google-api-go-generator/testdata/mapofobjects.want
index 6b5707d..9656aca 100644
--- a/google-api-go-generator/testdata/mapofobjects.want
+++ b/google-api-go-generator/testdata/mapofobjects.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/mapofstrings-1.want b/google-api-go-generator/testdata/mapofstrings-1.want
index 3bf9407..237faee 100644
--- a/google-api-go-generator/testdata/mapofstrings-1.want
+++ b/google-api-go-generator/testdata/mapofstrings-1.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/param-rename.want b/google-api-go-generator/testdata/param-rename.want
index 98e6a53..343dccd 100644
--- a/google-api-go-generator/testdata/param-rename.want
+++ b/google-api-go-generator/testdata/param-rename.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/quotednum.want b/google-api-go-generator/testdata/quotednum.want
index 64d2aad..98eaea0 100644
--- a/google-api-go-generator/testdata/quotednum.want
+++ b/google-api-go-generator/testdata/quotednum.want
@@ -49,7 +49,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/repeated.want b/google-api-go-generator/testdata/repeated.want
index 17bd43e..c899d72 100644
--- a/google-api-go-generator/testdata/repeated.want
+++ b/google-api-go-generator/testdata/repeated.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/required-query.want b/google-api-go-generator/testdata/required-query.want
index 2411c81..b6a1aba 100644
--- a/google-api-go-generator/testdata/required-query.want
+++ b/google-api-go-generator/testdata/required-query.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/resource-named-service.want b/google-api-go-generator/testdata/resource-named-service.want
index 8f1779f..c5c71b1 100644
--- a/google-api-go-generator/testdata/resource-named-service.want
+++ b/google-api-go-generator/testdata/resource-named-service.want
@@ -49,7 +49,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/unfortunatedefaults.want b/google-api-go-generator/testdata/unfortunatedefaults.want
index bec4a6a..1d45ee8 100644
--- a/google-api-go-generator/testdata/unfortunatedefaults.want
+++ b/google-api-go-generator/testdata/unfortunatedefaults.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/variants.want b/google-api-go-generator/testdata/variants.want
index 795c802..40d03f0 100644
--- a/google-api-go-generator/testdata/variants.want
+++ b/google-api-go-generator/testdata/variants.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/google-api-go-generator/testdata/wrapnewlines.want b/google-api-go-generator/testdata/wrapnewlines.want
index f73c5e1..37ae104 100644
--- a/google-api-go-generator/testdata/wrapnewlines.want
+++ b/google-api-go-generator/testdata/wrapnewlines.want
@@ -47,7 +47,7 @@
"strconv"
"strings"
- gensupport "google.golang.org/api/gensupport"
+ gensupport "google.golang.org/api/internal/gensupport"
googleapi "google.golang.org/api/googleapi"
option "google.golang.org/api/option"
htransport "google.golang.org/api/transport/http"
diff --git a/gensupport/buffer.go b/internal/gensupport/buffer.go
similarity index 100%
rename from gensupport/buffer.go
rename to internal/gensupport/buffer.go
diff --git a/gensupport/buffer_test.go b/internal/gensupport/buffer_test.go
similarity index 100%
rename from gensupport/buffer_test.go
rename to internal/gensupport/buffer_test.go
diff --git a/gensupport/doc.go b/internal/gensupport/doc.go
similarity index 100%
rename from gensupport/doc.go
rename to internal/gensupport/doc.go
diff --git a/gensupport/json.go b/internal/gensupport/json.go
similarity index 100%
rename from gensupport/json.go
rename to internal/gensupport/json.go
diff --git a/gensupport/json_test.go b/internal/gensupport/json_test.go
similarity index 100%
rename from gensupport/json_test.go
rename to internal/gensupport/json_test.go
diff --git a/gensupport/jsonfloat.go b/internal/gensupport/jsonfloat.go
similarity index 100%
rename from gensupport/jsonfloat.go
rename to internal/gensupport/jsonfloat.go
diff --git a/gensupport/jsonfloat_test.go b/internal/gensupport/jsonfloat_test.go
similarity index 100%
rename from gensupport/jsonfloat_test.go
rename to internal/gensupport/jsonfloat_test.go
diff --git a/gensupport/media.go b/internal/gensupport/media.go
similarity index 100%
rename from gensupport/media.go
rename to internal/gensupport/media.go
diff --git a/gensupport/media_test.go b/internal/gensupport/media_test.go
similarity index 100%
rename from gensupport/media_test.go
rename to internal/gensupport/media_test.go
diff --git a/gensupport/params.go b/internal/gensupport/params.go
similarity index 100%
rename from gensupport/params.go
rename to internal/gensupport/params.go
diff --git a/gensupport/resumable.go b/internal/gensupport/resumable.go
similarity index 100%
rename from gensupport/resumable.go
rename to internal/gensupport/resumable.go
diff --git a/gensupport/resumable_test.go b/internal/gensupport/resumable_test.go
similarity index 100%
rename from gensupport/resumable_test.go
rename to internal/gensupport/resumable_test.go
diff --git a/gensupport/send.go b/internal/gensupport/send.go
similarity index 100%
rename from gensupport/send.go
rename to internal/gensupport/send.go
diff --git a/gensupport/send_test.go b/internal/gensupport/send_test.go
similarity index 100%
rename from gensupport/send_test.go
rename to internal/gensupport/send_test.go
diff --git a/gensupport/util_test.go b/internal/gensupport/util_test.go
similarity index 100%
rename from gensupport/util_test.go
rename to internal/gensupport/util_test.go
