-
Notifications
You must be signed in to change notification settings - Fork 71
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: bump avsc and i18n example files #126
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
77fca31
feat: bump avsc and i18n example files
JimMoen 5b08c23
docs: improve README.md
JimMoen bec3c93
chore: bump vsn for rebar plugin `emqx_plugrel`
JimMoen 7e288a3
ci: bump builder image vsn
JimMoen e2f9f86
build: get different rebar3 based on different OTP versions
JimMoen 4333ab5
fix: config.hocon.enterprise.example for plugin and bump template file
JimMoen 6dc8567
chore: bump emqx_plugrel vsn to 0.5.0
JimMoen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| ## The Official Releases using OTP 26 since EMQX v5.5.0 | ||
| ## See also | ||
| ## https://github.com/emqx/emqx/releases/tag/v5.5.0 | ||
| # erlang 26.2.1-2 | ||
| # elixir 1.15.7-otp-26 | ||
|
|
||
| ## Keep using OTP 25.3.2 for docker image | ||
| ## see also | ||
| ## https://github.com/emqx/emqx/blob/v5.6.0/build#L400-L401 | ||
| erlang 25.3.2-2 | ||
| elixir 1.15.7-otp-25 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| ## This is a demo config in HOCON format | ||
| ## The same format used by EMQX since 5.0 | ||
|
|
||
| hostname = "localhost" | ||
| port = 3306 | ||
|
|
||
| connectionOptions = [ | ||
| { | ||
| optionName = "autoReconnect" | ||
| optionType = "string" | ||
| optionValue = "true" | ||
| } | ||
| ] | ||
|
|
||
| auth { | ||
| username = "admin" | ||
| password { | ||
| string = "Public123" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| { | ||
| "$hostname_label": { | ||
| "zh": "主机名", | ||
| "en": "Hostname" | ||
| }, | ||
| "$hostname_desc": { | ||
| "zh": "主机名是一个标识符，用于识别网络上的设备。主机名通常是一个域名，例如：www.example.com。", | ||
| "en": "The hostname is an identifier used to identify devices on a network. The hostname is usually a domain name, such as www.example.com." | ||
| }, | ||
| "$hostname_validate": { | ||
| "zh": "主机名必须是一个有效的域名。", | ||
| "en": "The hostname must be a valid domain name." | ||
| }, | ||
| "$port_label": { | ||
| "zh": "端口", | ||
| "en": "Port" | ||
| }, | ||
| "$port_desc": { | ||
| "zh": "端口是一个数字，用于标识网络上的服务。常见的端口有：80（HTTP）、443（HTTPS）、21（FTP）。", | ||
| "en": "The port is a number used to identify services on a network. Common ports include: 80 (HTTP), 443 (HTTPS), 21 (FTP)." | ||
| }, | ||
| "$port_range_validate": { | ||
| "zh": "端口必须在 1 到 65535 之间。", | ||
| "en": "The port must be between 1 and 65535." | ||
| }, | ||
| "$connection_options_label": { | ||
| "en": "Connection Options", | ||
| "zh": "连接选项" | ||
| }, | ||
| "$connection_options_desc": { | ||
| "en": "A list of additional options for the database connection.", | ||
| "zh": "数据库连接的附加选项列表。" | ||
| }, | ||
| "$username_label": { | ||
| "en": "Username", | ||
| "zh": "用户名" | ||
| }, | ||
| "$username_desc": { | ||
| "zh": "连接数据库的用户名", | ||
| "en": "The username used to connect to the database." | ||
| }, | ||
| "$password_label": { | ||
| "en": "Password", | ||
| "zh": "密码" | ||
| }, | ||
| "$password_desc": { | ||
| "en": "The password used to connect to the database.", | ||
| "zh": "连接数据库的密码。" | ||
| }, | ||
| "$password_length_validate": { | ||
| "en": "The password must be at least 8 characters long.", | ||
| "zh": "密码长度必须至少为 8 个字符。" | ||
| }, | ||
| "$password_validate": { | ||
| "en": "The password must contain at least one uppercase letter, one lowercase letter, one number, and one special character.", | ||
| "zh": "密码必须包含至少一个大写字母、一个小写字母、一个数字和一个特殊字符。" | ||
| }, | ||
| "$option_name_label": { | ||
| "en": "Option Name", | ||
| "zh": "选项名称" | ||
| }, | ||
| "$option_name_desc": { | ||
| "en": "The name of the connection option.", | ||
| "zh": "连接选项的名称。" | ||
| }, | ||
| "$option_value_label": { | ||
| "en": "Option Value", | ||
| "zh": "选项值" | ||
| }, | ||
| "$option_value_desc": { | ||
| "en": "The value of the connection option.", | ||
| "zh": "连接选项的值。" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| { | ||
| "type": "record", | ||
| "name": "ExtendedConfig", | ||
| "fields": [ | ||
| { | ||
| "name": "hostname", | ||
| "type": "string", | ||
| "default": "localhost", | ||
| "$ui": { | ||
| "component": "input", | ||
| "flex": 12, | ||
| "required": true, | ||
| "label": "$hostname_label", | ||
| "description": "$hostname_desc", | ||
| "rules": [ | ||
| { | ||
| "type": "pattern", | ||
| "pattern": "^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])(\\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9]))*$", | ||
| "message": "$hostname_validate" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "name": "port", | ||
| "type": "int", | ||
| "default": 3306, | ||
| "$ui": { | ||
| "component": "input-number", | ||
| "flex": 12, | ||
| "required": true, | ||
| "label": "$port_label", | ||
| "description": "$port_desc", | ||
| "rules": [ | ||
| { | ||
| "type": "range", | ||
| "min": 1, | ||
| "max": 65535, | ||
| "message": "$port_range_validate" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "name": "connectionOptions", | ||
| "type": { | ||
| "type": "array", | ||
| "items": { | ||
| "type": "record", | ||
| "name": "ConnectionOption", | ||
| "fields": [ | ||
| { | ||
| "name": "optionName", | ||
| "type": "string" | ||
| }, | ||
| { | ||
| "name": "optionValue", | ||
| "type": "string" | ||
| }, | ||
| { | ||
| "name": "optionType", | ||
| "type": "string" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "default": [ | ||
| { | ||
| "optionName": "autoReconnect", | ||
| "optionValue": "true", | ||
| "optionType": "boolean" | ||
| } | ||
| ], | ||
| "$ui": { | ||
| "component": "maps-editor", | ||
| "flex": 24, | ||
| "items": { | ||
| "optionName": { | ||
| "label": "$option_name_label", | ||
| "description": "$option_name_desc", | ||
| "type": "string" | ||
| }, | ||
| "optionValue": { | ||
| "label": "$option_value_label", | ||
| "description": "$option_value_desc", | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "label": "$connection_options_label", | ||
| "description": "$connection_options_desc" | ||
| } | ||
| }, | ||
| { | ||
| "name": "auth", | ||
| "type": { | ||
| "type": "record", | ||
| "name": "authConfigs", | ||
| "fields": [ | ||
| { | ||
| "name": "username", | ||
| "type": "string", | ||
| "$ui": { | ||
| "component": "input", | ||
| "flex": 12, | ||
| "required": true, | ||
| "label": "$username_label", | ||
| "description": "$username_desc" | ||
| } | ||
| }, | ||
| { | ||
| "name": "password", | ||
| "type": [ | ||
| "null", | ||
| "string" | ||
| ], | ||
| "default": null, | ||
| "$ui": { | ||
| "component": "input-password", | ||
| "flex": 12, | ||
| "label": "$password_label", | ||
| "description": "$password_desc", | ||
| "rules": [ | ||
| { | ||
| "type": "length", | ||
| "minLength": 8, | ||
| "maxLength": 128, | ||
| "message": "$password_length_validate" | ||
| }, | ||
| { | ||
| "type": "pattern", | ||
| "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[a-zA-Z\\d]*$", | ||
| "message": "$password_validate" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will be updated when v5.7.0 released