fix: swagger examples for PostgreSQL, Matrix and Timescale

apps/emqx_bridge_matrix/src/emqx_bridge_matrix.erl

@@ -81,7 +81,7 @@ connector_examples(Method) ->
         #{
             <<"matrix">> => #{
                 summary => <<"Matrix Connector">>,
-                value => emqx_postgresql_connector_schema:values({Method, connector})
+                value => emqx_postgresql_connector_schema:values({Method, <<"matrix">>})
             }
         }
     ].

apps/emqx_bridge_pgsql/src/emqx_bridge_pgsql.erl

@@ -18,7 +18,6 @@
     roots/0,
     fields/1,
     desc/1,
-    values/2,
     fields/2
 ]).
 
@@ -133,8 +132,8 @@ bridge_v2_examples(Method) ->
     [
         #{
             <<"pgsql">> => #{
-                summary => <<"PostgreSQL Producer Action">>,
-                value => values({Method, bridge_v2_producer})
+                summary => <<"PostgreSQL Action">>,
+                value => values({Method, pgsql})
             }
         }
     ].
@@ -143,7 +142,7 @@ conn_bridge_examples(Method) ->
     [
         #{
             <<"pgsql">> => #{
-                summary => <<"PostgreSQL Producer Bridge">>,
+                summary => <<"PostgreSQL Bridge">>,
                 value => values_conn_bridge_examples(Method, pgsql)
             }
         }
@@ -160,21 +159,17 @@ values({get, PostgreSQLType}) ->
                 }
             ]
         },
-        values({post, PostgreSQLType})
-    );
-values({post, PostgreSQLType}) ->
-    maps:merge(
-        #{
-            name => <<"my_pgsql_action">>,
-            type => PostgreSQLType
-        },
         values({put, PostgreSQLType})
     );
+values({post, PostgreSQLType}) ->
+    values({put, PostgreSQLType});
 values({put, PostgreSQLType}) ->
     maps:merge(
         #{
+            name => <<"my_action">>,
+            type => PostgreSQLType,
             enable => true,
-            connector => <<"my_pgsql_connector">>,
+            connector => <<"my_connector">>,
             resource_opts => #{
                 batch_size => 1,
                 batch_time => <<"50ms">>,
@@ -184,9 +179,9 @@ values({put, PostgreSQLType}) ->
                 worker_pool_size => 16
             }
         },
-        values({producer, PostgreSQLType})
+        values(parameters)
     );
-values({producer, _PostgreSQLType}) ->
+values(parameters) ->
     #{
         <<"parameters">> => #{
             <<"sql">> =>
@@ -201,6 +196,19 @@ values({producer, _PostgreSQLType}) ->
         }
     }.
 
+values_conn_bridge_examples(get, Type) ->
+    maps:merge(
+        #{
+            status => <<"connected">>,
+            node_status => [
+                #{
+                    node => <<"emqx@localhost">>,
+                    status => <<"connected">>
+                }
+            ]
+        },
+        values_conn_bridge_examples(post, Type)
+    );
 values_conn_bridge_examples(_Method, Type) ->
     #{
         enable => true,
@@ -222,6 +230,3 @@ values_conn_bridge_examples(_Method, Type) ->
             max_buffer_bytes => ?DEFAULT_BUFFER_BYTES
         }
     }.
-
-values(Method, Type) ->
-    values_conn_bridge_examples(Method, Type).

apps/emqx_bridge_timescale/src/emqx_bridge_timescale.erl

@@ -81,7 +81,7 @@ connector_examples(Method) ->
         #{
             <<"timescale">> => #{
                 summary => <<"Timescale Connector">>,
-                value => emqx_postgresql_connector_schema:values({Method, connector})
+                value => emqx_postgresql_connector_schema:values({Method, <<"timescale">>})
             }
         }
     ].

apps/emqx_postgresql/src/schema/emqx_postgresql_connector_schema.erl

@@ -99,8 +99,8 @@ connector_examples(Method) ->
     [
         #{
             <<"pgsql">> => #{
-                summary => <<"PostgreSQL Producer Connector">>,
-                value => values({Method, connector})
+                summary => <<"PostgreSQL Connector">>,
+                value => values({Method, pgsql})
             }
         }
     ].
@@ -119,93 +119,35 @@ values({get, PostgreSQLType}) ->
         },
         values({post, PostgreSQLType})
     );
-values({post, connector}) ->
-    maps:merge(
-        #{
-            name => <<"my_pgsql_connector">>,
-            type => <<"pgsql">>
-        },
-        values(common_config)
-    );
 values({post, PostgreSQLType}) ->
-    maps:merge(
-        #{
-            name => <<"my_pgsql_action">>,
-            type => <<"pgsql">>
-        },
-        values({put, PostgreSQLType})
-    );
-values({put, bridge_v2_producer}) ->
-    values(bridge_v2_producer);
-values({put, connector}) ->
-    values(common_config);
+    values({put, PostgreSQLType});
 values({put, PostgreSQLType}) ->
-    maps:merge(values(common_config), values(PostgreSQLType));
-values(bridge_v2_producer) ->
     maps:merge(
         #{
-            enable => true,
-            connector => <<"my_pgsql_connector">>,
-            resource_opts => #{
-                health_check_interval => "32s"
-            }
+            name => <<"my_action">>,
+            type => PostgreSQLType
         },
-        values(producer)
+        values(common)
     );
-values(common_config) ->
-    #{
-        authentication => #{
-            mechanism => <<"plain">>,
-            username => <<"username">>,
-            password => <<"******">>
-        },
-        bootstrap_hosts => <<"localhost:9092">>,
-        connect_timeout => <<"5s">>,
-        enable => true,
-        metadata_request_timeout => <<"4s">>,
-        min_metadata_refresh_interval => <<"3s">>,
-        socket_opts => #{
-            sndbuf => <<"1024KB">>,
-            recbuf => <<"1024KB">>,
-            nodelay => true,
-            tcp_keepalive => <<"none">>
-        }
-    };
-values(producer) ->
+values(common) ->
     #{
-        kafka => #{
-            topic => <<"kafka-topic">>,
-            message => #{
-                key => <<"${.clientid}">>,
-                value => <<"${.}">>,
-                timestamp => <<"${.timestamp}">>
-            },
-            max_batch_bytes => <<"896KB">>,
-            compression => <<"no_compression">>,
-            partition_strategy => <<"random">>,
-            required_acks => <<"all_isr">>,
-            partition_count_refresh_interval => <<"60s">>,
-            kafka_headers => <<"${pub_props}">>,
-            kafka_ext_headers => [
-                #{
-                    kafka_ext_header_key => <<"clientid">>,
-                    kafka_ext_header_value => <<"${clientid}">>
-                },
-                #{
-                    kafka_ext_header_key => <<"topic">>,
-                    kafka_ext_header_value => <<"${topic}">>
-                }
-            ],
-            kafka_header_value_encode_mode => none,
-            max_inflight => 10,
-            buffer => #{
-                mode => <<"hybrid">>,
-                per_partition_limit => <<"2GB">>,
-                segment_bytes => <<"100MB">>,
-                memory_overload_protection => true
-            }
+        <<"database">> => <<"emqx_data">>,
+        <<"enable">> => true,
+        <<"password">> => <<"public">>,
+        <<"pool_size">> => 8,
+        <<"server">> => <<"127.0.0.1:5432">>,
+        <<"ssl">> => #{
+            <<"ciphers">> => [],
+            <<"depth">> => 10,
+            <<"enable">> => false,
+            <<"hibernate_after">> => <<"5s">>,
+            <<"log_level">> => <<"notice">>,
+            <<"reuse_sessions">> => true,
+            <<"secure_renegotiate">> => true,
+            <<"verify">> => <<"verify_peer">>,
+            <<"versions">> => [<<"tlsv1.3">>, <<"tlsv1.2">>]
         },
-        local_topic => <<"mqtt/local/topic">>
+        <<"username">> => <<"postgres">>
     }.
 
 desc("config_connector") ->