clowder-common-ruby 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e5767791bccbe0f77d953de067609ecb60e5a21330f7dbbd15ea76d7dfc8f93
-  data.tar.gz: b8b1dcde02ca8bc832f2ac2ef052fad1f4197c490bf0c28dcc546587bf74991b
+  metadata.gz: d168646c5d5d8cade020019e0a92c9abbf784aee38e000bb09e7385eb7bdcd33
+  data.tar.gz: d9bfd039f488a90bbea2d5174812f7d7c26129cf4f9618f03cf8e8c2b56499ca
 SHA512:
-  metadata.gz: 50f962168c4d9118a836f173a4f83966a045d0f4656c3793485d641b4569078e92ea747a07f46e618f63d914186fc04374630fbdfe50078591cbcbecfc8734f8
-  data.tar.gz: 166f2b4204f869f5849e68d63f40ebc80d23ad4d8c7d059310eca988435b7780a84f5b9723d9f8ef7a2926c04f4256c33dbc4e4b908c0efe5f6ba88a3ae2f49f
+  metadata.gz: 6084c009bf2b0dd7d04b65d186d96d1f0e3c26f1a3a332e39a2278696d0fdb110ae290ccdf9d7ac42c25a5dc69952e493960a1fa77a8966f1417982d2fbb8643
+  data.tar.gz: 1c834382855bcb9d0844715225b271b2f179f9d852790a6c96cfde2f2e4124a41c876cd2778eb95bc3a13460565480d50913339ed3a8d96a7334aaf10044a944

data/bin/schema.json

@@ -20,6 +20,10 @@
                     "description": "Deprecated: Use 'publicPort' instead.",
                     "type": "integer"
                 },
+                "tlsCAPath": {
+                    "description": "Defines the port CA path",
+                    "type": "string"
+                },
                 "metricsPort": {
                     "description": "Defines the metrics port that the app should be configured to listen on for metric traffic.",
                     "type": "integer"
@@ -62,8 +66,15 @@
                     "items": {
                         "$ref": "#/definitions/PrivateDependencyEndpoint"
                     }
+                },
+                "BOPURL": {
+                    "description": "Defines the path to the BOPURL.",
+                    "type": "string"
+                },
+                "hashCache": {
+                    "description": "A set of config/secret hashes",
+                    "type": "string"
                 }
-
             },
             "required": [
                 "metricsPort",
@@ -93,6 +104,14 @@
             "type": "object",
             "description": "Arbitrary metadata pertaining to the application application",
             "properties": {
+                "name": {
+                    "description": "Name of the ClowdApp",
+                    "type": "string"
+                },
+                "envName": {
+                    "description": "Name of the ClowdEnvironment this ClowdApp runs in",
+                    "type": "string"
+                },
                 "deployments": {
                     "description": "Metadata pertaining to an application's deployments",
                     "type": "array",
@@ -186,6 +205,13 @@
                 },
                 "password": {
                     "type": "string"
+                },
+                "securityProtocol": {
+                    "description": "Deprecated: Use the top level securityProtocol field instead",
+                    "type": "string"
+                },
+                "saslMechanism": {
+                    "type": "string"
                 }
             },
             "required": []
@@ -210,6 +236,9 @@
                 },
                 "sasl": {
                     "$ref": "#/definitions/KafkaSASLConfig"
+                },
+                "securityProtocol": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -435,6 +464,10 @@
                 "app": {
                     "description": "The app name of the ClowdApp hosting the service.",
                     "type": "string"
+                },
+                "tlsPort": {
+                    "description": "The TLS port of the dependent service.",
+                    "type": "integer"
                 }
             },
             "required": [
@@ -464,6 +497,10 @@
                 "app": {
                     "description": "The app name of the ClowdApp hosting the service.",
                     "type": "string"
+                },
+                "tlsPort": {
+                    "description": "The TLS port of the dependent service.",
+                    "type": "integer"
                 }
             },
             "required": [

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

@@ -44,6 +44,7 @@ module ClowderCommonRuby
         keys << :privatePort
         keys << :publicPort
         keys << :webPort
+        keys << :tlsCAPath
         keys << :metricsPort
         keys << :metricsPath
         keys << :logging
@@ -55,6 +56,8 @@ module ClowderCommonRuby
         keys << :featureFlags
         keys << :endpoints
         keys << :privateEndpoints
+        keys << :BOPURL
+        keys << :hashCache
       end
     end
   end
@@ -102,6 +105,8 @@ module ClowderCommonRuby
 
     def valid_keys
       [].tap do |keys|
+        keys << :name
+        keys << :envName
         keys << :deployments
       end
     end
@@ -199,6 +204,8 @@ module ClowderCommonRuby
       [].tap do |keys|
         keys << :username
         keys << :password
+        keys << :securityProtocol
+        keys << :saslMechanism
       end
     end
   end
@@ -225,6 +232,7 @@ module ClowderCommonRuby
         keys << :cacert
         keys << :authtype
         keys << :sasl
+        keys << :securityProtocol
       end
     end
   end
@@ -397,6 +405,7 @@ module ClowderCommonRuby
         keys << :hostname
         keys << :port
         keys << :app
+        keys << :tlsPort
       end
     end
   end
@@ -420,6 +429,7 @@ module ClowderCommonRuby
         keys << :hostname
         keys << :port
         keys << :app
+        keys << :tlsPort
       end
     end
   end

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

@@ -1,3 +1,3 @@
 module ClowderCommonRuby
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.6'.freeze
 end

data/test.json

@@ -2,6 +2,7 @@
     "publicPort": 8000,
     "metricsPort": 9000,
     "metricsPath": "/metrics",
+    "tlsCAPath": "/tlsCAPath",
     "logging": {
         "type": "cloudwatch",
         "cloudwatch": {
@@ -15,7 +16,8 @@
         "brokers": [
             {
                 "hostname": "broker-host",
-                "port": 27015
+                "port": 27015,
+                "cacert": "kafkaca"
             }
         ],
         "topics": [
@@ -62,13 +64,15 @@
             "name": "endpoint1",
             "app": "app1",
             "hostname": "endpoint1.svc",
-            "port": 8000
+            "port": 8000,
+            "tlsPort": 8001
         },
         {
             "name": "endpoint2",
             "app": "app2",
             "hostname": "endpoint2.svc",
-            "port": 8000
+            "port": 8000,
+            "tlsPort": 8001
         }
     ],
     "privateEndpoints": [
@@ -76,13 +80,15 @@
             "name": "endpoint1",
             "app": "app1",
             "hostname": "endpoint1.svc",
-            "port": 10000
+            "port": 10000,
+            "tlsPort": 10001
         },
         {
             "name": "endpoint2",
             "app": "app2",
             "hostname": "endpoint2.svc",
-            "port": 10000
+            "port": 10000,
+            "tlsPort": 10001
         }
     ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clowder-common-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Red Hat Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies: []
 description: This is a ruby interface for preparing Clowder variables.
 email:
@@ -20,7 +20,6 @@ files:
 - README.md
 - Rakefile
 - bin/json_schema_ruby
-- bin/output
 - bin/ruby_class_converter.rb
 - bin/schema.json
 - lib/clowder-common-ruby.rb
@@ -49,8 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Supporting files and libraries for Clowder environmental variables.

data/bin/output

@@ -1,134 +0,0 @@
-# This file is automatically generated by bin/json_schema_ruby
-require 'ostruct'
-
-module ClowderCommonRuby
-  class AppConfig < OpenStruct
-    attr_accessor :logging
-    attr_accessor :kafka
-    attr_accessor :database
-    attr_accessor :objectStore
-    attr_accessor :inMemoryDb
-    attr_accessor :featureFlags
-    attr_accessor :endpoints
-    attr_accessor :privateEndpoints
-
-    def initialize(attributes)
-      super
-      raise 'The input argument (attributes) must be a hash' if (!attributes || !attributes.is_a?(Hash))
-
-      attributes = attributes.each_with_object({}) do |(k, v), h|
-        raise "The input [#{k}] is invalid" unless valid_keys.include?(k.to_sym)
-        h[k.to_sym] = v
-      end
-
-      @logging = LoggingConfig.new(attributes.fetch(:logging, {}))
-      @kafka = KafkaConfig.new(attributes.fetch(:kafka, {}))
-      @database = DatabaseConfig.new(attributes.fetch(:database, {}))
-      @objectStore = ObjectStoreConfig.new(attributes.fetch(:objectStore, {}))
-      @inMemoryDb = InMemoryDBConfig.new(attributes.fetch(:inMemoryDb, {}))
-      @featureFlags = FeatureFlagsConfig.new(attributes.fetch(:featureFlags, {}))
-      @endpoints = []
-      attributes.fetch(:endpoints, []).each do |attr|
-        @endpoints << DependencyEndpoint.new(attr)
-      end
-      @privateEndpoints = []
-      attributes.fetch(:privateEndpoints, []).each do |attr|
-        @privateEndpoints << PrivateDependencyEndpoint.new(attr)
-      end
-    end
-
-    def valid_keys
-      [].tap do |keys|
-        keys << :privatePort
-        keys << :publicPort
-        keys << :webPort
-        keys << :metricsPort
-        keys << :metricsPath
-        keys << :logging
-        keys << :kafka
-        keys << :database
-        keys << :objectStore
-        keys << :inMemoryDb
-        keys << :featureFlags
-        keys << :endpoints
-        keys << :privateEndpoints
-      end
-    end
-  end
-
-  class LoggingConfig < OpenStruct
-    attr_accessor :cloudwatch
-
-    def initialize(attributes)
-      super
-      raise 'The input argument (attributes) must be a hash' if (!attributes || !attributes.is_a?(Hash))
-
-      attributes = attributes.each_with_object({}) do |(k, v), h|
-        raise "The input [#{k}] is invalid" unless valid_keys.include?(k.to_sym)
-        h[k.to_sym] = v
-      end
-
-      @cloudwatch = CloudWatchConfig.new(attributes.fetch(:cloudwatch, {}))
-    end
-
-    def valid_keys
-      [].tap do |keys|
-        keys << :type
-        keys << :cloudwatch
-      end
-    end
-  end
-
-  class CloudWatchConfig < OpenStruct
-
-    def initialize(attributes)
-      super
-      raise 'The input argument (attributes) must be a hash' if (!attributes || !attributes.is_a?(Hash))
-
-      attributes = attributes.each_with_object({}) do |(k, v), h|
-        raise "The input [#{k}] is invalid" unless valid_keys.include?(k.to_sym)
-        h[k.to_sym] = v
-      end
-
-    end
-
-    def valid_keys
-      [].tap do |keys|
-        keys << :accessKeyId
-        keys << :secretAccessKey
-        keys << :region
-        keys << :logGroup
-      end
-    end
-  end
-
-  class KafkaConfig < OpenStruct
-    attr_accessor :brokers
-    attr_accessor :topics
-
-    def initialize(attributes)
-      super
-      raise 'The input argument (attributes) must be a hash' if (!attributes || !attributes.is_a?(Hash))
-
-      attributes = attributes.each_with_object({}) do |(k, v), h|
-        raise "The input [#{k}] is invalid" unless valid_keys.include?(k.to_sym)
-        h[k.to_sym] = v
-      end
-
-      @brokers = []
-      attributes.fetch(:brokers, []).each do |attr|
-        @brokers << BrokerConfig.new(attr)
-      end
-      @topics = []
-      attributes.fetch(:topics, []).each do |attr|
-        @topics << TopicConfig.new(attr)
-      end
-    end
-
-    def valid_keys
-      [].tap do |keys|
-        keys << :brokers
-        keys << :topics
-      end
-    end
-  end