Bump open api generator version (#81)

* Update open api generator version to 7.0.0 for every language and fix the related template patches

Author: mirkokurt

config/config.yaml

@@ -1,5 +1,5 @@
 container_opts:
-  image: datadog/apigentools:1.1.0
+  image: datadog/apigentools:1.6.5
 languages:
   go:
     generation:
@@ -19,7 +19,7 @@ languages:
         templates:
           source:
             type: openapi-git
-            git_committish: "v4.3.1" # git committish to checkout before extracting the templates
+            git_committish: "v7.0.0" # git committish to checkout before extracting the templates
             templates_dir: go # directory with templates for this language
             system: true
     downstream_templates:
@@ -40,14 +40,11 @@ languages:
         templates:
           patches:
             - template-patches/html2-arduino-css.patch
-            - template-patches/html2-set-package-name.patch
-            - template-patches/html2-unused-languages.patch
-            - template-patches/html2-create-api-token.patch
-            - template-patches/html2-auth-reference-links.patch
-            - template-patches/html2-rate-limiting-error.patch
+            - template-patches/html2-index.patch
+            - template-patches/html2-sample-js.patch
           source:
             type: openapi-git
-            git_committish: "v4.3.1" # git committish to checkout before extracting the templates
+            git_committish: "v7.0.0" # git committish to checkout before extracting the templates
             templates_dir: htmlDocs2 # directory with templates for this language
             system: true
     github_org_name: arduino
@@ -76,8 +73,8 @@ languages:
             - template-patches/javascript-api-client.patch
           source:
             type: openapi-git
-            git_committish: "v4.3.1" # git committish to checkout before extracting the templates
-            templates_dir: Javascript/es6 # directory with templates for this language
+            git_committish: "v7.0.0" # git committish to checkout before extracting the templates
+            templates_dir: Javascript # directory with templates for this language
             system: true
     downstream_templates:
       downstream-templates/javascript/README.md: README.md
@@ -105,7 +102,7 @@ languages:
             - template-patches/python-configuration.patch
           source:
             type: openapi-git
-            git_committish: "v4.3.1" # git committish to checkout before extracting the templates
+            git_committish: "v7.0.0" # git committish to checkout before extracting the templates
             templates_dir: python # directory with templates for this language
             system: true
     downstream_templates:

config/languages/go_v2.json

@@ -3,6 +3,6 @@
     "gitRepoId": "iot-client-go",
     "isGoSubmodule": false,
     "packageName": "iot",
-    "packageVersion": "1.4.5",
+    "packageVersion": "1.5.0",
     "withGoCodegenComment": true
 }

config/languages/html2_v2.json

@@ -1,5 +1,5 @@
 {
     "packageName": "iot",
-    "packageVersion": "1.4.5",
+    "packageVersion": "1.5.0",
     "usePromises": true
 }

config/languages/javascript_v2.json

@@ -1,8 +1,8 @@
 {
     "projectName": "@arduino/arduino-iot-client",
     "moduleName": "ArduinoIotClient",
-    "projectVersion": "1.4.5",
-    "packageVersion": "1.4.5",
+    "projectVersion": "1.5.0",
+    "packageVersion": "1.5.0",
     "usePromises": true,
     "licenseName":"GPLv3",
     "generateSourceCodeOnly": true

config/languages/python_v2.json

@@ -1,6 +1,6 @@
 {
     "packageName": "iot_api_client",
     "projectName": "arduino-iot-client",
-    "packageVersion": "1.4.5",
+    "packageVersion": "1.5.0",
     "generateSourceCodeOnly": true
 }

spec/v2/swagger.yaml

@@ -1313,7 +1313,7 @@ components:
         wifi_fw_version:
           description: The version of the NINA/WIFI101 firmware running on the device
           maxLength: 10
-          pattern: ^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
+          pattern: ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
           type: string
       required:
       - type
@@ -1530,7 +1530,7 @@ components:
         wifi_fw_version:
           description: The version of the NINA/WIFI101 firmware running on the device
           maxLength: 10
-          pattern: ^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
+          pattern: ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
           type: string
       title: devicev2
       type: object

template-patches/html2-auth-reference-links.patch

@@ -1,17 +1,62 @@
 diff --git a/htmlDocs2/index.mustache b/htmlDocs2/index.mustache
-index 02571cd..6acb879 100644
+index 65c210b..e09cc2e 100644
 --- a/htmlDocs2/index.mustache
 +++ b/htmlDocs2/index.mustache
-@@ -268,17 +268,17 @@ You have reached maximum request limit.
+@@ -206,6 +206,41 @@
+             <div id="app-description" class="app-desc">
+                 {{{appDescription}}}
+             </div>
++            <div id="create-auth-token" class="app-desc">
++              <h2 id="create-auth-token">Create Auth Token</h2>
++              <pre class="prettyprint"><code class="language-bsh">
++curl --request POST \
++  --url 'https://api2.arduino.cc/iot/v1/clients/token' \
++  --header 'content-type: application/x-www-form-urlencoded' \
++  --data 'grant_type=client_credentials' \
++  --data 'client_id=YOUR_CLIENT_ID' \
++  --data 'client_secret=YOUR_SECRET_ID' \
++  --data 'audience=https://api2.arduino.cc/iot'
++              </code></pre>
++            </div>
++            <div id="app-description" class="app-desc">
++              <p>Token generation code for supported clients are available at the following links:</p>
++                <ul>
++                  <li>
++                    <p><a href="https://github.com/arduino/iot-client-js#authentication">Javascript Client</a></p>
++                  </li>
++                  <li>
++                    <p><a href="https://github.com/arduino/iot-client-py#authentication">Python Client</a></p>
++                  </li>
++                <li>
++                  <p><a href="https://github.com/arduino/iot-client-go#getting-started">Golang Client</a></p>
++                </li>
++              </ul>
++            </div>
++            <div id="create-auth-token" class="app-desc">
++              <h2 id="create-auth-token">Rate Limiting</h2>
++              <p>Arduino IoT APIs are rate limited, authenticated clients limit is up to 10req/s.</p>
++              <p>The following code and message are returned from the Arduino servers in case of rate limit error:</p>
++              <p><b>Status: 429 - Too Many Requests</b></p>
++              <pre>
++You have reached maximum request limit.
++              </pre>
++            </div>
+           </div>
+         </div>
+         <div id="sections">
+@@ -233,18 +268,18 @@
                          </p>
                          <ul class="nav nav-tabs nav-tabs-examples">
                            <li class="active"><a href="#examples-{{baseName}}-{{nickname}}-0-curl">Curl</a></li>
 -                          <li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-java">Java</a></li>
+-                          <li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-dart">Dart</a></li>
 -                          <li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-android">Android</a></li>
+-                          <!--<li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-groovy">Groovy</a></li>-->
+-                          <li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-objc">Obj-C</a></li>
 +                          <!--<li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-java">Java</a></li>-->
++                          <!--<li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-dart">Dart</a></li>-->
 +                          <!--<li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-android">Android</a></li>-->
-                           <!--<li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-groovy">Groovy</a></li>-->
--                          <li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-objc">Obj-C</a></li>
++                          <!--<!--<li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-groovy">Groovy</a></li>-->
 +                          <!--<li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-objc">Obj-C</a></li>-->
                            <li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-javascript">JavaScript</a></li>
                            <!--<li class=""><a href="#examples-{{baseName}}-{{nickname}}-0-angular">Angular</a></li>-->
@@ -28,3 +73,6 @@ index 02571cd..6acb879 100644
                          </ul>
 
                          <div class="tab-content">
+-- 
+2.34.1
+

template-patches/html2-create-api-token.patch

@@ -1,5 +1,5 @@
 diff --git a/htmlDocs2/sample_js.mustache b/htmlDocs2/sample_js.mustache
-index 362400aaaa..18a49755e4 100644
+index 5100cda..4beb704 100644
 --- a/htmlDocs2/sample_js.mustache
 +++ b/htmlDocs2/sample_js.mustache
 @@ -1,6 +1,6 @@
@@ -8,15 +8,18 @@ index 362400aaaa..18a49755e4 100644
  {{#hasAuthMethods}}
 -var defaultClient = {{{jsModuleName}}}.ApiClient.instance;
 +var defaultClient = ArduinoIotClient.ApiClient.instance;
- {{#authMethods}}{{#isBasic}}
+ {{#authMethods}}{{#isBasicBasic}}
  // Configure HTTP basic authorization: {{{name}}}
  var {{{name}}} = defaultClient.authentications['{{{name}}}'];
-@@ -17,7 +17,7 @@ var {{{name}}} = defaultClient.authentications['{{{name}}}'];
- {{/authMethods}}
+@@ -21,7 +21,7 @@ var {{{name}}} = defaultClient.authentications['{{{name}}}'];
  {{/hasAuthMethods}}
 
+ // Create an instance of the API class
 -var api = new {{{jsModuleName}}}.{{{classname}}}(){{#hasParams}}
 +var api = new ArduinoIotClient.{{{classname}}}(){{#hasParams}}
  {{#hasRequiredParams}}
  {{#requiredParams}}
  var {{{paramName}}} = {{{example}}}; // {{=< >=}}{<&dataType>}<={{ }}=> {{{unescapedDescription}}}
+-- 
+2.34.1
+

template-patches/html2-unused-languages.patch renamed to template-patches/html2-index.patch

@@ -1,8 +1,8 @@
-diff --git a/Javascript/es6/ApiClient.mustache b/Javascript/es6/ApiClient.mustache
+diff --git a/Javascript/libraries/javascript/ApiClient.mustache b/Javascript/libraries/javascript/ApiClient.mustache
 index fcb92377e1..20c1aaee78 100644
---- a/Javascript/es6/ApiClient.mustache
-+++ b/Javascript/es6/ApiClient.mustache
-@@ -358,7 +358,7 @@ class ApiClient {
+--- a/Javascript/libraries/javascript/ApiClient.mustache
++++ b/Javascript/libraries/javascript/ApiClient.mustache
+@@ -370,7 +370,7 @@ class ApiClient {
          var data = response.body;
          if (data == null || (typeof data === 'object' && typeof data.length === 'undefined' && !Object.keys(data).length)) {
              // SuperAgent does not always produce a body; use the unparsed response as a fallback

template-patches/html2-rate-limiting-error.patch

@@ -1,16 +1,16 @@
 diff --git a/python/configuration.mustache b/python/configuration.mustache
-index dceab63..b2d56ab 100644
+index ac51800..2511102 100644
 --- a/python/configuration.mustache
 +++ b/python/configuration.mustache
-@@ -259,7 +259,7 @@ conf = {{{packageName}}}.Configuration(
+@@ -265,7 +265,7 @@ conf = {{{packageName}}}.Configuration(
          """Adding retries to override urllib3 default value 3
          """
-         # Disable client side validation
+-        # Enable client side validation
 -        self.client_side_validation = True
++        # Disable client side validation
 +        self.client_side_validation = False
 
-     def __deepcopy__(self, memo):
-         cls = self.__class__
+         self.socket_options = None
+         """Options to pass down to the underlying urllib3 socket
 -- 
-2.17.1