clowder-common-ruby 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eb27069341b3726423c02088d23f56a4dcb659044ead344028da876a7dfb01a
-  data.tar.gz: d816b9eb821d8bb5a6841c804168dad27ff2627596a91fd5fc172d97ebc7178a
+  metadata.gz: 61b61e259c602a080f9d48fb7e8cc882a26f44b417cbef0e87ef9221a8aeadd7
+  data.tar.gz: 8d96ffcc6aa8ca9c8bc1f3a8e08b024ea414245bee9ddd1cba601a260e060863
 SHA512:
-  metadata.gz: 591aaa8a7be6e2fbcc7119a74de0c94cb95d8dbce2555db27784d62d2245561824b77393d5b29028c43a6008165fa7eee8d572a5bc1adf017b0df776a36efa44
-  data.tar.gz: 1fcaf4ad4eefedd3cfbba5f00e2757a0d0c0a7fa47d3e0c53245d3ba50de8dea039363e72f72cceee30b68e5b3802e1681ca5ba24079e2739fbf3ba4027b76e8
+  metadata.gz: e587863b43ba08253de33f6afceae753303bcc0cb28acf825ab2b87d822250f388413f5c0541a2b1d6af6f9c6effb6449c5a1f1b309b328f90f4b24496288d3e
+  data.tar.gz: 0255e4bf01b4b83fb7a876e1d6264cbe7915543e2a871f36f3b08c75e6024c4d0f8d6af1f3273c6efc292b0c2261b24ae099fe8e3ae181f858bc0cb5144a31de

data/bin/ruby_class_converter.rb

@@ -82,11 +82,18 @@ class RubyClassConverter
     init_function << "\n"
     value.properties.each_pair do |k, v|
       if v.send(:type) == "array"
-        klass = v.items.send("$ref").rpartition('/').last
-        init_function << "      @#{k} = []\n"
-        init_function << "      attributes.fetch(:#{k.to_sym}, []).each do |attr|\n"
-        init_function << "        @#{k} << #{klass}.new(attr)\n"
-        init_function << "      end\n"
+        if v.items.send("$ref")
+          klass = v.items.send("$ref").rpartition('/').last
+          init_function << "      @#{k} = []\n"
+          init_function << "      attributes.fetch(:#{k.to_sym}, []).each do |attr|\n"
+          init_function << "        @#{k} << #{klass}.new(attr)\n"
+          init_function << "      end\n"
+        else
+          init_function << "      @#{k} = []\n"
+          init_function << "      attributes.fetch(:#{k.to_sym}, []).each do |attr|\n"
+          init_function << "        @#{k} << attr\n"
+          init_function << "      end\n"
+        end
       elsif v.send('$ref')
         klass = v.send('$ref').rpartition('/').last
         init_function << "      @#{k} = #{klass}.new(attributes.fetch(:#{k.to_sym}, {}))\n"

data/bin/schema.json

@@ -201,16 +201,19 @@
             "description": "SASL Configuration for Kafka",
             "properties": {
                 "username": {
+                    "description": "Broker SASL username",
                     "type": "string"
                 },
                 "password": {
+                    "description": "Broker SASL password",
                     "type": "string"
                 },
                 "securityProtocol": {
-                    "description": "Deprecated: Use the top level securityProtocol field instead",
+                    "description": "Broker security protocol, expect one of either: SASL_SSL, SSL. DEPRECATED, use the top level securityProtocol field instead",
                     "type": "string"
                 },
                 "saslMechanism": {
+                    "description": "Broker SASL mechanism, expect: SCRAM-SHA-512",
                     "type": "string"
                 }
             },
@@ -222,22 +225,26 @@
             "description": "Broker Configuration",
             "properties": {
                 "hostname": {
+                    "description": "Hostname of kafka broker",
                     "type": "string"
                 },
                 "port": {
+                    "description": "Port of kafka broker",
                     "type": "integer"
                 },
                 "cacert": {
+                    "description": "CA certificate trust list for broker in PEM format. If absent, client should use OS default trust list",
                     "type": "string"
                 },
                 "authtype": {
                     "type": "string",
-                    "enum": ["mtls", "sasl"]
+                    "enum": ["sasl"]
                 },
                 "sasl": {
                     "$ref": "#/definitions/KafkaSASLConfig"
                 },
                 "securityProtocol": {
+                    "description": "Broker security procotol, expect one of either: SASL_SSL, SSL",
                     "type": "string"
                 }
             },
@@ -482,7 +489,15 @@
                     "type": "integer"
                 },
                 "apiPath": {
-                    "description": "The top level api path that the app should serve from /api/<apiPath>"
+                    "description": "The top level api path that the app should serve from /api/<apiPath> (deprecated, use apiPaths)",
+                    "type": "string"
+                },
+                "apiPaths": {
+                    "description": "The list of API paths (each matching format: '/api/some-path/') that this app will serve requests from",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
                 }
             },
             "required": [

data/lib/clowder-common-ruby/types.rb

@@ -390,6 +390,7 @@ module ClowderCommonRuby
   end
 
   class DependencyEndpoint < OpenStruct
+    attr_accessor :apiPaths
 
     def initialize(attributes)
       super
@@ -400,6 +401,10 @@ module ClowderCommonRuby
         h[k.to_sym] = v
       end
 
+      @apiPaths = []
+      attributes.fetch(:apiPaths, []).each do |attr|
+        @apiPaths << attr
+      end
     end
 
     def valid_keys
@@ -410,6 +415,7 @@ module ClowderCommonRuby
         keys << :app
         keys << :tlsPort
         keys << :apiPath
+        keys << :apiPaths
       end
     end
   end

data/lib/clowder-common-ruby/version.rb

@@ -1,3 +1,3 @@
 module ClowderCommonRuby
-  VERSION = '0.5.1'.freeze # Patch version is being automatically bumped
+  VERSION = '0.5.3'.freeze # Patch version is being automatically bumped
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clowder-common-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Red Hat Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-11-03 00:00:00.000000000 Z
 dependencies: []
 description: This is a ruby interface for preparing Clowder variables.
 email: