regenerate all APIs and CLIs (#357)

gen/admob1-cli/Cargo.toml

@@ -1,10 +1,10 @@
 # DO NOT EDIT !
-# This file was generated automatically from 'src/mako/Cargo.toml.mako'
+# This file was generated automatically from 'src/generator/templates/Cargo.toml.mako'
 # DO NOT EDIT !
 [package]
 
 name = "google-admob1-cli"
-version = "3.1.0+20220303"
+version = "4.0.1+20220303"
 authors = ["Sebastian Thiel <byronimo@gmail.com>"]
 description = "A complete library to interact with AdMob (protocol v1)"
 repository = "https://github.com/Byron/google-apis-rs/tree/main/gen/admob1-cli"
@@ -25,16 +25,18 @@ mime = "^ 0.2.0"
 serde = "^ 1.0"
 serde_json = "^ 1.0"
 serde_derive = "^ 1.0"
-yup-oauth2 = "^ 6.6"
+yup-oauth2 = "^ 7.0"
 itertools = "^ 0.10"
 strsim = "^0.5"
 clap = "^2.0"
+http = "^0.2"
 hyper = { version = "0.14", features = ["full"] }
 tokio = { version = "^ 1.0", features = ["full"] }
+tower-service = "^0.3.1"
 
 
 
 
 [dependencies.google-admob1]
 path = "../admob1"
-version = "3.1.0+20220303"
+version = "4.0.1+20220303"

gen/admob1-cli/LICENSE.md

@@ -1,6 +1,6 @@
 <!---
 DO NOT EDIT !
-This file was generated automatically from 'src/mako/LICENSE.md.mako'
+This file was generated automatically from 'src/generator/templates/LICENSE.md.mako'
 DO NOT EDIT !
 -->
 The MIT License (MIT)

gen/admob1-cli/README.md

@@ -1,6 +1,6 @@
 <!---
 DO NOT EDIT !
-This file was generated automatically from 'src/mako/cli/README.md.mako'
+This file was generated automatically from 'src/generator/templates/cli/README.md.mako'
 DO NOT EDIT !
 -->
 The `admob1` command-line interface *(CLI)* allows to use most features of the *Google AdMob* service from the comfort of your terminal.
@@ -25,7 +25,7 @@ Find the source code [on github](https://github.com/Byron/google-apis-rs/tree/ma
 
 # Usage
 
-This documentation was generated from the *AdMob* API at revision *20220303*. The CLI is at version *3.1.0*.
+This documentation was generated from the *AdMob* API at revision *20220303*. The CLI is at version *4.0.1*.
 
 ```bash
 admob1 [options]
@@ -107,4 +107,4 @@ You may consider redirecting standard error into a file for ease of use, e.g. `a
 [scopes]: https://developers.google.com/+/api/oauth#scopes
 [revoke-access]: http://webapps.stackexchange.com/a/30849
 [google-dev-console]: https://console.developers.google.com/
-[google-project-new]: https://developers.google.com/console/help/new/
+[google-project-new]: https://developers.google.com/console/help/new/

gen/admob1-cli/mkdocs.yml

@@ -1,4 +1,4 @@
-site_name: AdMob v3.1.0+20220303
+site_name: AdMob v4.0.1+20220303
 site_url: http://byron.github.io/google-apis-rs/google-admob1-cli
 site_description: A complete library to interact with AdMob (protocol v1)
 

gen/admob1-cli/src/main.rs

@@ -1,5 +1,5 @@
 // DO NOT EDIT !
-// This file was generated automatically from 'src/mako/cli/main.rs.mako'
+// This file was generated automatically from 'src/generator/templates/cli/main.rs.mako'
 // DO NOT EDIT !
 #![allow(unused_variables, unused_imports, dead_code, unused_mut)]
 
@@ -21,25 +21,36 @@ use client::{InvalidOptionsError, CLIError, arg_from_str, writer_from_opts, pars
           calltype_from_str, remove_json_null_values, ComplexType, JsonType, JsonTypeInfo};
 
 use std::default::Default;
+use std::error::Error as StdError;
 use std::str::FromStr;
 
 use serde_json as json;
 use clap::ArgMatches;
+use http::Uri;
+use hyper::client::connect;
+use tokio::io::{AsyncRead, AsyncWrite};
+use tower_service;
 
 enum DoitError {
     IoError(String, io::Error),
     ApiError(Error),
 }
 
-struct Engine<'n> {
+struct Engine<'n, S> {
     opt: ArgMatches<'n>,
-    hub: api::AdMob,
+    hub: api::AdMob<S>,
     gp: Vec<&'static str>,
     gpm: Vec<(&'static str, &'static str)>,
 }
 
 
-impl<'n> Engine<'n> {
+impl<'n, S> Engine<'n, S>
+where
+    S: tower_service::Service<Uri> + Clone + Send + Sync + 'static,
+    S::Response: hyper::client::connect::Connection + AsyncRead + AsyncWrite + Send + Unpin + 'static,
+    S::Future: Send + Unpin + 'static,
+    S::Error: Into<Box<dyn StdError + Send + Sync>>,
+{
     async fn _accounts_ad_units_list(&self, opt: &ArgMatches<'n>, dry_run: bool, err: &mut InvalidOptionsError)
                                                     -> Result<(), DoitError> {
         let mut call = self.hub.accounts().ad_units_list(opt.value_of("parent").unwrap_or(""));
@@ -509,7 +520,7 @@ impl<'n> Engine<'n> {
     }
 
     // Please note that this call will fail if any part of the opt can't be handled
-    async fn new(opt: ArgMatches<'n>) -> Result<Engine<'n>, InvalidOptionsError> {
+    async fn new(opt: ArgMatches<'n>, connector: S) -> Result<Engine<'n, S>, InvalidOptionsError> {
         let (config_dir, secret) = {
             let config_dir = match client::assure_config_dir_exists(opt.value_of("folder").unwrap_or("~/.google-service-cli")) {
                 Err(e) => return Err(InvalidOptionsError::single(e, 3)),
@@ -523,18 +534,14 @@ impl<'n> Engine<'n> {
             }
         };
 
-        let auth = oauth2::InstalledFlowAuthenticator::builder(
+        let client = hyper::Client::builder().build(connector);
+
+        let auth = oauth2::InstalledFlowAuthenticator::with_client(
             secret,
             oauth2::InstalledFlowReturnMethod::HTTPRedirect,
+            client.clone(),
         ).persist_tokens_to_disk(format!("{}/admob1", config_dir)).build().await.unwrap();
 
-        let client = hyper::Client::builder().build(
-            hyper_rustls::HttpsConnectorBuilder::new().with_native_roots()
-                .https_or_http()
-                .enable_http1()
-                .enable_http2()
-                .build()
-	);
         let engine = Engine {
             opt: opt,
             hub: api::AdMob::new(client, auth),
@@ -714,7 +721,7 @@ async fn main() {
     
     let mut app = App::new("admob1")
            .author("Sebastian Thiel <byronimo@gmail.com>")
-           .version("3.1.0+20220303")
+           .version("4.0.1+20220303")
            .about("The AdMob API allows publishers to programmatically get information about their AdMob account. ")
            .after_help("All documentation details can be found at http://byron.github.io/google-apis-rs/google_admob1_cli")
            .arg(Arg::with_name("url")
@@ -776,8 +783,14 @@ async fn main() {
            
         let matches = app.get_matches();
 
-    let debug = matches.is_present("debug");
-    match Engine::new(matches).await {
+    let debug = matches.is_present("adebug");
+    let connector = hyper_rustls::HttpsConnectorBuilder::new().with_native_roots()
+        .https_or_http()
+        .enable_http1()
+        .enable_http2()
+        .build();
+
+    match Engine::new(matches, connector).await {
         Err(err) => {
             exit_status = err.exit_code;
             writeln!(io::stderr(), "{}", err).ok();