fix tests

risingwavelabs · Jan 24, 2024 · 3cd5f06 · 3cd5f06
1 parent 0c3ac42
commit 3cd5f06
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/src/connector/src/source/common.rs b/src/connector/src/source/common.rs
@@ -77,30 +77,26 @@ pub(crate) async fn into_chunk_stream(
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, with_options::WithOptions)]
-pub struct SecretString {
-    inner: redact::Secret<String>,
-}
+#[derive(Clone, Debug, Deserialize, PartialEq)]
+pub struct SecretString(redact::Secret<String>);
 
 impl Serialize for SecretString {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,
     {
-        format!("{:?}", self.inner).serialize(serializer)
+        format!("{:?}", self.0).serialize(serializer)
     }
 }
 
-impl WithOptions for redact::Secret<String> {}
+impl WithOptions for SecretString {}
 
 impl SecretString {
     pub fn expose_secret(&self) -> &String {
-        self.inner.expose_secret()
+        self.0.expose_secret()
     }
 
     pub fn new(s: impl Into<String>) -> Self {
-        Self {
-            inner: redact::Secret::new(s.into()),
-        }
+        Self(redact::Secret::new(s.into()))
     }
 }
diff --git a/src/connector/with_options_sink.yaml b/src/connector/with_options_sink.yaml
@@ -28,7 +28,7 @@ BigQueryConfig:
     field_type: String
     required: false
   - name: secret_key
-    field_type: String
+    field_type: SecretString
     required: false
   - name: session_token
     field_type: String
@@ -324,7 +324,7 @@ KinesisSinkConfig:
     required: false
     alias: kinesis.credentials.access
   - name: aws.credentials.secret_access_key
-    field_type: String
+    field_type: SecretString
     required: false
     alias: kinesis.credentials.secret
   - name: aws.credentials.session_token
@@ -424,7 +424,7 @@ PulsarConfig:
     field_type: String
     required: false
   - name: secret_key
-    field_type: String
+    field_type: SecretString
     required: false
   - name: session_token
     field_type: String

diff --git a/src/connector/with_options_source.yaml b/src/connector/with_options_source.yaml
@@ -195,7 +195,7 @@ KinesisProperties:
     required: false
     alias: kinesis.credentials.access
   - name: aws.credentials.secret_access_key
-    field_type: String
+    field_type: SecretString
     required: false
     alias: kinesis.credentials.secret
   - name: aws.credentials.session_token
@@ -447,7 +447,7 @@ OpendalS3Properties:
     required: false
     default: Default::default
   - name: s3.credentials.secret
-    field_type: String
+    field_type: SecretString
     required: false
     default: Default::default
   - name: s3.endpoint_url
@@ -535,7 +535,7 @@ PulsarProperties:
     field_type: String
     required: false
   - name: secret_key
-    field_type: String
+    field_type: SecretString
     required: false
   - name: session_token
     field_type: String
@@ -574,7 +574,7 @@ S3Properties:
     required: false
     default: Default::default
   - name: s3.credentials.secret
-    field_type: String
+    field_type: SecretString
     required: false
     default: Default::default
   - name: s3.endpoint_url