From 500650565268d36e5202f4a46ad4c6a8f87246a9 Mon Sep 17 00:00:00 2001 From: barnettZQG Date: Mon, 24 Oct 2022 11:55:36 +0800 Subject: [PATCH] Fix: change the schema Signed-off-by: barnettZQG --- .../component-uischema-alibaba-rds.yaml | 21 +++++++++++++++++++ ...=> config-uischema-terraform-alibaba.yaml} | 0 .../component-uischema-terraform-aws.yaml | 2 -- .../config-uischema-terraform-aws.yaml | 12 +++++++++++ .../component-uischema-terraform-azure.yaml | 2 -- .../config-uischema-terraform-azure.yaml | 13 ++++++++++++ .../component-uischema-terraform-baidu.yaml | 2 -- .../config-uischema-terraform-baidu.yaml | 11 ++++++++++ .../schemas/config-uischema-ec-provider.yaml | 5 +++++ .../component-uischema-terraform-gcp.yaml | 2 -- .../config-uischema-terraform-gcp.yaml | 9 ++++++++ .../component-uischema-terraform-tencent.yaml | 2 -- .../config-uischema-terraform-tencent.yaml | 10 +++++++++ .../component-uischema-terraform-ucloud.yaml | 2 -- .../config-uischema-terraform-ucloud.yaml | 12 +++++++++++ 15 files changed, 93 insertions(+), 12 deletions(-) rename addons/terraform-alibaba/schemas/{config-uischema-terraform-provider-alibaba.yaml => config-uischema-terraform-alibaba.yaml} (100%) delete mode 100644 addons/terraform-aws/schemas/component-uischema-terraform-aws.yaml create mode 100644 addons/terraform-aws/schemas/config-uischema-terraform-aws.yaml delete mode 100644 addons/terraform-azure/schemas/component-uischema-terraform-azure.yaml create mode 100644 addons/terraform-azure/schemas/config-uischema-terraform-azure.yaml delete mode 100644 addons/terraform-baidu/schemas/component-uischema-terraform-baidu.yaml create mode 100644 addons/terraform-baidu/schemas/config-uischema-terraform-baidu.yaml create mode 100644 addons/terraform-ec/schemas/config-uischema-ec-provider.yaml delete mode 100644 addons/terraform-gcp/schemas/component-uischema-terraform-gcp.yaml create mode 100644 addons/terraform-gcp/schemas/config-uischema-terraform-gcp.yaml delete mode 100644 addons/terraform-tencent/schemas/component-uischema-terraform-tencent.yaml create mode 100644 addons/terraform-tencent/schemas/config-uischema-terraform-tencent.yaml delete mode 100644 addons/terraform-ucloud/schemas/component-uischema-terraform-ucloud.yaml create mode 100644 addons/terraform-ucloud/schemas/config-uischema-terraform-ucloud.yaml diff --git a/addons/terraform-alibaba/schemas/component-uischema-alibaba-rds.yaml b/addons/terraform-alibaba/schemas/component-uischema-alibaba-rds.yaml index 91a49278..fbb79bec 100644 --- a/addons/terraform-alibaba/schemas/component-uischema-alibaba-rds.yaml +++ b/addons/terraform-alibaba/schemas/component-uischema-alibaba-rds.yaml @@ -8,14 +8,35 @@ - jsonKey: instance_name label: InstanceName sort: 1 + validate: + required: true + style: + colSpan: 12 - jsonKey: database_name label: DatabaseName + validate: + required: true sort: 2 + style: + colSpan: 12 - jsonKey: account_name label: AccountName + validate: + required: true sort: 3 + style: + colSpan: 12 - jsonKey: password + uiType: Password + description: Account password. Uppercase, lowercase, numbers, and special characters account for three types, with a length of 8-32 digits; sort: 4 + style: + colSpan: 12 + validate: + required: true + minLength: 8 + maxLength: 32 + pattern: ^(?![A-Za-z]+$)(?![A-Z\d]+$)(?![A-Z\W]+$)(?![a-z\d]+$)(?![a-z\W]+$)(?![\d\W]+$)\S{8,32}$ - jsonKey: allocate_public_connection label: AllocatePublicConnection sort: 5 diff --git a/addons/terraform-alibaba/schemas/config-uischema-terraform-provider-alibaba.yaml b/addons/terraform-alibaba/schemas/config-uischema-terraform-alibaba.yaml similarity index 100% rename from addons/terraform-alibaba/schemas/config-uischema-terraform-provider-alibaba.yaml rename to addons/terraform-alibaba/schemas/config-uischema-terraform-alibaba.yaml diff --git a/addons/terraform-aws/schemas/component-uischema-terraform-aws.yaml b/addons/terraform-aws/schemas/component-uischema-terraform-aws.yaml deleted file mode 100644 index 1a1280c6..00000000 --- a/addons/terraform-aws/schemas/component-uischema-terraform-aws.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- jsonKey: name - disable: true diff --git a/addons/terraform-aws/schemas/config-uischema-terraform-aws.yaml b/addons/terraform-aws/schemas/config-uischema-terraform-aws.yaml new file mode 100644 index 00000000..c11eaf44 --- /dev/null +++ b/addons/terraform-aws/schemas/config-uischema-terraform-aws.yaml @@ -0,0 +1,12 @@ +- jsonKey: name + sort: 10 + +- jsonKey: AWS_DEFAULT_REGION + sort: 20 + +- jsonKey: AWS_ACCESS_KEY_ID + sort: 30 + uiType: Password +- jsonKey: AWS_SECRET_ACCESS_KEY + sort: 40 + uiType: Password \ No newline at end of file diff --git a/addons/terraform-azure/schemas/component-uischema-terraform-azure.yaml b/addons/terraform-azure/schemas/component-uischema-terraform-azure.yaml deleted file mode 100644 index 1a1280c6..00000000 --- a/addons/terraform-azure/schemas/component-uischema-terraform-azure.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- jsonKey: name - disable: true diff --git a/addons/terraform-azure/schemas/config-uischema-terraform-azure.yaml b/addons/terraform-azure/schemas/config-uischema-terraform-azure.yaml new file mode 100644 index 00000000..824eb2c8 --- /dev/null +++ b/addons/terraform-azure/schemas/config-uischema-terraform-azure.yaml @@ -0,0 +1,13 @@ +- jsonKey: name + sort: 10 +- jsonKey: ARM_SUBSCRIPTION_ID + sort: 20 +- jsonKey: ARM_TENANT_ID + sort: 30 +- jsonKey: ARM_CLIENT_ID + sort: 40 + uiType: Password +- jsonKey: ARM_CLIENT_SECRET + sort: 50 + uiType: Password + diff --git a/addons/terraform-baidu/schemas/component-uischema-terraform-baidu.yaml b/addons/terraform-baidu/schemas/component-uischema-terraform-baidu.yaml deleted file mode 100644 index 1a1280c6..00000000 --- a/addons/terraform-baidu/schemas/component-uischema-terraform-baidu.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- jsonKey: name - disable: true diff --git a/addons/terraform-baidu/schemas/config-uischema-terraform-baidu.yaml b/addons/terraform-baidu/schemas/config-uischema-terraform-baidu.yaml new file mode 100644 index 00000000..c6619dfc --- /dev/null +++ b/addons/terraform-baidu/schemas/config-uischema-terraform-baidu.yaml @@ -0,0 +1,11 @@ +- jsonKey: name + sort: 10 +- jsonKey: BAIDUCLOUD_REGION + sort: 20 +- jsonKey: BAIDUCLOUD_ACCESS_KEY + sort: 30 + uiType: Password +- jsonKey: BAIDUCLOUD_SECRET_KEY + sort: 40 + uiType: Password + diff --git a/addons/terraform-ec/schemas/config-uischema-ec-provider.yaml b/addons/terraform-ec/schemas/config-uischema-ec-provider.yaml new file mode 100644 index 00000000..d037e4b3 --- /dev/null +++ b/addons/terraform-ec/schemas/config-uischema-ec-provider.yaml @@ -0,0 +1,5 @@ +- jsonKey: name + sort: 10 +- jsonKey: EC_API_KEY + sort: 20 + uiType: Password \ No newline at end of file diff --git a/addons/terraform-gcp/schemas/component-uischema-terraform-gcp.yaml b/addons/terraform-gcp/schemas/component-uischema-terraform-gcp.yaml deleted file mode 100644 index 1a1280c6..00000000 --- a/addons/terraform-gcp/schemas/component-uischema-terraform-gcp.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- jsonKey: name - disable: true diff --git a/addons/terraform-gcp/schemas/config-uischema-terraform-gcp.yaml b/addons/terraform-gcp/schemas/config-uischema-terraform-gcp.yaml new file mode 100644 index 00000000..f6979884 --- /dev/null +++ b/addons/terraform-gcp/schemas/config-uischema-terraform-gcp.yaml @@ -0,0 +1,9 @@ +- jsonKey: name + sort: 10 +- jsonKey: GOOGLE_REGION + sort: 20 +- jsonKey: GOOGLE_PROJECT + sort: 30 +- jsonKey: GOOGLE_CREDENTIALS + sort: 40 + uiType: Password diff --git a/addons/terraform-tencent/schemas/component-uischema-terraform-tencent.yaml b/addons/terraform-tencent/schemas/component-uischema-terraform-tencent.yaml deleted file mode 100644 index 1a1280c6..00000000 --- a/addons/terraform-tencent/schemas/component-uischema-terraform-tencent.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- jsonKey: name - disable: true diff --git a/addons/terraform-tencent/schemas/config-uischema-terraform-tencent.yaml b/addons/terraform-tencent/schemas/config-uischema-terraform-tencent.yaml new file mode 100644 index 00000000..a448aa7d --- /dev/null +++ b/addons/terraform-tencent/schemas/config-uischema-terraform-tencent.yaml @@ -0,0 +1,10 @@ +- jsonKey: name + sort: 10 +- jsonKey: TENCENTCLOUD_REGION + sort: 20 +- jsonKey: TENCENTCLOUD_SECRET_ID + sort: 30 + uiType: Password +- jsonKey: TENCENTCLOUD_SECRET_KEY + sort: 40 + uiType: Password diff --git a/addons/terraform-ucloud/schemas/component-uischema-terraform-ucloud.yaml b/addons/terraform-ucloud/schemas/component-uischema-terraform-ucloud.yaml deleted file mode 100644 index 1a1280c6..00000000 --- a/addons/terraform-ucloud/schemas/component-uischema-terraform-ucloud.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- jsonKey: name - disable: true diff --git a/addons/terraform-ucloud/schemas/config-uischema-terraform-ucloud.yaml b/addons/terraform-ucloud/schemas/config-uischema-terraform-ucloud.yaml new file mode 100644 index 00000000..9b3d3307 --- /dev/null +++ b/addons/terraform-ucloud/schemas/config-uischema-terraform-ucloud.yaml @@ -0,0 +1,12 @@ +- jsonKey: name + sort: 10 +- jsonKey: UCLOUD_PROJECT_ID + sort: 20 +- jsonKey: UCLOUD_REGION + sort: 30 +- jsonKey: UCLOUD_PUBLIC_KEY + sort: 40 + uiType: Password +- jsonKey: UCLOUD_PRIVATE_KEY + sort: 50 + uiType: Password