rename

risingwavelabs · May 9, 2024 · 5d7d4a1 · 5d7d4a1
1 parent 164e4a3
commit 5d7d4a1
Show file tree

Hide file tree

Showing 4 changed files with 212 additions and 84 deletions.
diff --git a/src/connector/src/connector_common/common.rs b/src/connector/src/connector_common/common.rs
@@ -61,16 +61,28 @@ use aws_types::SdkConfig;
 /// A flatten config map for aws auth.
 #[derive(Deserialize, Debug, Clone, WithOptions)]
 pub struct AwsAuthProps {
+    #[serde(rename = "aws.region", alias = "region")]
     pub region: Option<String>,
-    #[serde(alias = "endpoint_url")]
+
+    #[serde(
+        rename = "aws.endpoint_url",
+        alias = "endpoint_url",
+        alias = "endpoint"
+    )]
     pub endpoint: Option<String>,
+    #[serde(rename = "aws.credentials.access_key_id", alias = "access_key")]
     pub access_key: Option<String>,
+    #[serde(rename = "aws.credentials.secret_access_key", alias = "secret_key")]
     pub secret_key: Option<String>,
+    #[serde(rename = "aws.credentials.session_token", alias = "session_token")]
     pub session_token: Option<String>,
     /// IAM role
+    #[serde(rename = "aws.credentials.role.arn", alias = "arn")]
     pub arn: Option<String>,
     /// external ID in IAM role trust policy
+    #[serde(rename = "aws.credentials.role.external_id", alias = "external_id")]
     pub external_id: Option<String>,
+    #[serde(rename = "aws.region.profile", alias = "profile")]
     pub profile: Option<String>,
 }
 

diff --git a/src/connector/src/with_options_test.rs b/src/connector/src/with_options_test.rs
@@ -191,15 +191,15 @@ struct FieldInfo {
     #[serde(skip_serializing_if = "Option::is_none")]
     default: Option<String>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
-    alias: Option<String>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    alias: Vec<String>,
 }
 
 #[derive(Default)]
 struct SerdeProperties {
     default_func: Option<String>,
     rename: Option<String>,
-    alias: Option<String>,
+    alias: Vec<String>,
 }
 
 #[derive(Debug, Serialize, Default)]
@@ -270,7 +270,7 @@ fn extract_serde_properties(field: &Field) -> SerdeProperties {
                                 }
                             } else if path.is_ident("alias") {
                                 if let Lit::Str(lit_str) = lit {
-                                    serde_props.alias = Some(lit_str.value());
+                                    serde_props.alias.push(lit_str.value());
                                 }
                             } else if path.is_ident("default") {
                                 if let Lit::Str(lit_str) = lit {

diff --git a/src/connector/with_options_sink.yaml b/src/connector/with_options_sink.yaml
@@ -21,33 +21,49 @@ BigQueryConfig:
     field_type: usize
     required: false
     default: '1024'
-  - name: region
+  - name: aws.region
     field_type: String
     required: false
-  - name: endpoint
+    alias:
+    - region
+  - name: aws.endpoint_url
     field_type: String
     required: false
-    alias: endpoint_url
-  - name: access_key
+    alias:
+    - endpoint_url
+    - endpoint
+  - name: aws.credentials.access_key_id
     field_type: String
     required: false
-  - name: secret_key
+    alias:
+    - access_key
+  - name: aws.credentials.secret_access_key
     field_type: String
     required: false
-  - name: session_token
+    alias:
+    - secret_key
+  - name: aws.credentials.session_token
     field_type: String
     required: false
-  - name: arn
+    alias:
+    - session_token
+  - name: aws.credentials.role.arn
     field_type: String
     comments: IAM role
     required: false
-  - name: external_id
+    alias:
+    - arn
+  - name: aws.credentials.role.external_id
     field_type: String
     comments: external ID in IAM role trust policy
     required: false
-  - name: profile
+    alias:
+    - external_id
+  - name: aws.region.profile
     field_type: String
     required: false
+    alias:
+    - profile
   - name: r#type
     field_type: String
     required: true
@@ -197,11 +213,13 @@ KafkaConfig:
   - name: properties.bootstrap.server
     field_type: String
     required: true
-    alias: kafka.brokers
+    alias:
+    - kafka.brokers
   - name: topic
     field_type: String
     required: true
-    alias: kafka.topic
+    alias:
+    - kafka.topic
   - name: properties.sync.call.timeout
     field_type: Duration
     required: false
@@ -352,67 +370,91 @@ KafkaConfig:
     field_type: HashMap<String,String>
     comments: This is generated from `private_link_targets` and `private_link_endpoint` in frontend, instead of given by users.
     required: false
-  - name: region
+  - name: aws.region
     field_type: String
     required: false
-  - name: endpoint
+    alias:
+    - region
+  - name: aws.endpoint_url
     field_type: String
     required: false
-    alias: endpoint_url
-  - name: access_key
+    alias:
+    - endpoint_url
+    - endpoint
+  - name: aws.credentials.access_key_id
     field_type: String
     required: false
-  - name: secret_key
+    alias:
+    - access_key
+  - name: aws.credentials.secret_access_key
     field_type: String
     required: false
-  - name: session_token
+    alias:
+    - secret_key
+  - name: aws.credentials.session_token
     field_type: String
     required: false
-  - name: arn
+    alias:
+    - session_token
+  - name: aws.credentials.role.arn
     field_type: String
     comments: IAM role
     required: false
-  - name: external_id
+    alias:
+    - arn
+  - name: aws.credentials.role.external_id
     field_type: String
     comments: external ID in IAM role trust policy
     required: false
-  - name: profile
+    alias:
+    - external_id
+  - name: aws.region.profile
     field_type: String
     required: false
+    alias:
+    - profile
 KinesisSinkConfig:
   fields:
   - name: stream
     field_type: String
     required: true
-    alias: kinesis.stream.name
+    alias:
+    - kinesis.stream.name
   - name: aws.region
     field_type: String
     required: true
-    alias: kinesis.stream.region
+    alias:
+    - kinesis.stream.region
   - name: endpoint
     field_type: String
     required: false
-    alias: kinesis.endpoint
+    alias:
+    - kinesis.endpoint
   - name: aws.credentials.access_key_id
     field_type: String
     required: false
-    alias: kinesis.credentials.access
+    alias:
+    - kinesis.credentials.access
   - name: aws.credentials.secret_access_key
     field_type: String
     required: false
-    alias: kinesis.credentials.secret
+    alias:
+    - kinesis.credentials.secret
   - name: aws.credentials.session_token
     field_type: String
     required: false
-    alias: kinesis.credentials.session_token
+    alias:
+    - kinesis.credentials.session_token
   - name: aws.credentials.role.arn
     field_type: String
     required: false
-    alias: kinesis.assumerole.arn
+    alias:
+    - kinesis.assumerole.arn
   - name: aws.credentials.role.external_id
     field_type: String
     required: false
-    alias: kinesis.assumerole.external_id
+    alias:
+    - kinesis.assumerole.external_id
 MqttConfig:
   fields:
   - name: url
@@ -525,11 +567,13 @@ PulsarConfig:
   - name: topic
     field_type: String
     required: true
-    alias: pulsar.topic
+    alias:
+    - pulsar.topic
   - name: service.url
     field_type: String
     required: true
-    alias: pulsar.service.url
+    alias:
+    - pulsar.service.url
   - name: auth.token
     field_type: String
     required: false
@@ -545,33 +589,49 @@ PulsarConfig:
   - name: oauth.scope
     field_type: String
     required: false
-  - name: region
+  - name: aws.region
     field_type: String
     required: false
-  - name: endpoint
+    alias:
+    - region
+  - name: aws.endpoint_url
     field_type: String
     required: false
-    alias: endpoint_url
-  - name: access_key
+    alias:
+    - endpoint_url
+    - endpoint
+  - name: aws.credentials.access_key_id
     field_type: String
     required: false
-  - name: secret_key
+    alias:
+    - access_key
+  - name: aws.credentials.secret_access_key
     field_type: String
     required: false
-  - name: session_token
+    alias:
+    - secret_key
+  - name: aws.credentials.session_token
     field_type: String
     required: false
-  - name: arn
+    alias:
+    - session_token
+  - name: aws.credentials.role.arn
     field_type: String
     comments: IAM role
     required: false
-  - name: external_id
+    alias:
+    - arn
+  - name: aws.credentials.role.external_id
     field_type: String
     comments: external ID in IAM role trust policy
     required: false
-  - name: profile
+    alias:
+    - external_id
+  - name: aws.region.profile
     field_type: String
     required: false
+    alias:
+    - profile
   - name: properties.batch.size
     field_type: u32
     required: false
@@ -645,12 +705,14 @@ StarrocksConfig:
     field_type: String
     comments: The port to the MySQL server of `StarRocks` FE.
     required: true
-    alias: starrocks.query_port
+    alias:
+    - starrocks.query_port
   - name: starrocks.httpport
     field_type: String
     comments: The port to the HTTP server of `StarRocks` FE.
     required: true
-    alias: starrocks.http_port
+    alias:
+    - starrocks.http_port
   - name: starrocks.user
     field_type: String
     comments: The user name used to access the `StarRocks` database.