fix: add missing PermissionResource types from Cloud definition (#35)

influxdata · Feb 3, 2022 · c22aa71 · c22aa71
1 parent ffb88c5
commit c22aa71
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 11,885 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,7 @@ test-results
 *.js_
 *.js.deps
 *.js.map
+scripts/cloud.yml
+scripts/oss.yml
 scripts/generated
+scripts/influxdb-clients-apigen
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ### Features
 1. [#33](https://github.com/influxdata/influxdb-client-dart/pull/33): Add support for Parameterized Queries
 
+### Bug Fixes
+1. [#35](https://github.com/influxdata/influxdb-client-dart/pull/35): Add missing PermissionResources from Cloud API definition
+
 ### Documentation
 1. [#33](https://github.com/influxdata/influxdb-client-dart/pull/33): Add Parameterized Queries example
 

diff --git a/lib/model/resource.dart b/lib/model/resource.dart
@@ -162,6 +162,8 @@ class ResourceTypeEnum {
   static const annotations = ResourceTypeEnum._(r'annotations');
   static const remotes = ResourceTypeEnum._(r'remotes');
   static const replications = ResourceTypeEnum._(r'replications');
+  static const flows = ResourceTypeEnum._(r'flows');
+  static const functions = ResourceTypeEnum._(r'functions');
 
   /// List of all possible values in this [enum][ResourceTypeEnum].
   static const values = <ResourceTypeEnum>[
@@ -187,6 +189,8 @@ class ResourceTypeEnum {
     annotations,
     remotes,
     replications,
+    flows,
+    functions,
   ];
 
   static ResourceTypeEnum? fromJson(dynamic value) =>
@@ -271,6 +275,10 @@ class ResourceTypeEnumTypeTransformer {
           return ResourceTypeEnum.remotes;
         case r'replications':
           return ResourceTypeEnum.replications;
+        case r'flows':
+          return ResourceTypeEnum.flows;
+        case r'functions':
+          return ResourceTypeEnum.functions;
         default:
           return ResourceTypeEnum._(data.toString());
       }

diff --git a/scripts/generate-sources.sh b/scripts/generate-sources.sh
@@ -4,6 +4,15 @@ SCRIPT_PATH="$( cd "$(dirname "$0")" || exit ; pwd -P )"
 
 rm -rf "${SCRIPT_PATH}"/generated
 
+# Download and merge OSS and Cloud definition
+rm -rf "${SCRIPT_PATH}"/oss.yml || true
+rm -rf "${SCRIPT_PATH}"/cloud.yml || true
+rm -rf "${SCRIPT_PATH}"/influxdb-clients-apigen || true
+wget https://raw.githubusercontent.com/influxdata/openapi/master/contracts/oss.yml -O "${SCRIPT_PATH}/oss.yml"
+wget https://raw.githubusercontent.com/influxdata/openapi/master/contracts/cloud.yml -O "${SCRIPT_PATH}/cloud.yml"
+git clone --single-branch --branch master https://github.com/bonitoo-io/influxdb-clients-apigen "${SCRIPT_PATH}/influxdb-clients-apigen"
+mvn -f "$SCRIPT_PATH"/influxdb-clients-apigen/openapi-generator/pom.xml compile exec:java -Dexec.mainClass="com.influxdb.AppendCloudDefinitions" -Dexec.args="$SCRIPT_PATH/oss.yml $SCRIPT_PATH/cloud.yml"
+
 # Generate client
 cd "${SCRIPT_PATH}"/ || exit
 mvn -U -Dskip-validate-spec org.openapitools:openapi-generator-maven-plugin:generate

diff --git a/scripts/pom.xml b/scripts/pom.xml
@@ -15,9 +15,7 @@ http://maven.apache.org/POM/4.0.0 ">
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <version>5.3.0</version>
                 <configuration>
-                    <inputSpec>
-                        https://raw.githubusercontent.com/influxdata/openapi/master/contracts/oss.yml
-                    </inputSpec>
+					<inputSpec>./oss.yml</inputSpec>
                     <generatorName>dart</generatorName>
                     <configOptions>
                         <projectName>InfluxDB2</projectName>