Remove usage of deprecated 'additionalJdbcProperties (#3055)

rli · web-flow · commit fb4ad38f9e09 · 2022-03-09T15:26:15.000-08:00
diff --git a/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/DatagripUtils.kt b/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/DatagripUtils.kt
@@ -29,13 +29,13 @@ val RequireSsl = DataSourceSslConfiguration("", "", "", true, SslMode.REQUIRE)
 
 fun ProtoConnection.getAwsConnectionSettings(): ConnectionSettings {
     val credentialManager = CredentialManager.getInstance()
-    val regionId = connectionPoint.additionalJdbcProperties[REGION_ID_PROPERTY]
+    val regionId = connectionPoint.additionalProperties[REGION_ID_PROPERTY]
         ?: throw IllegalArgumentException(message("settings.regions.none_selected"))
     val region = AwsRegionProvider.getInstance().allRegions()[regionId]
         ?: throw IllegalArgumentException(
             message("datagrip.validation.invalid_region_specified", regionId)
         )
-    val credentialId = connectionPoint.additionalJdbcProperties[CREDENTIAL_ID_PROPERTY]
+    val credentialId = connectionPoint.additionalProperties[CREDENTIAL_ID_PROPERTY]
         ?: throw IllegalArgumentException(message("settings.credentials.none_selected"))
     val credentials = credentialManager.getCredentialIdentifierById(credentialId)?.let {
         credentialManager.getAwsCredentialProvider(it, region)
diff --git a/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuth.kt b/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuth.kt
@@ -61,7 +61,7 @@ class SecretsManagerAuth : DatabaseAuthProviderCompatabilityAdapter {
                 val dbSecret = getDbSecret(connectionSettings)
                 if (
                     connection.connectionPoint.dataSource.sshConfiguration?.isEnabled != true &&
-                    connection.connectionPoint.additionalJdbcProperties[GET_URL_FROM_SECRET]?.toBoolean() == true
+                    connection.connectionPoint.additionalProperties[GET_URL_FROM_SECRET]?.toBoolean() == true
                 ) {
                     dbSecret.host ?: throw IllegalArgumentException(message("datagrip.secretsmanager.validation.no_host", connectionSettings.secretId))
                     dbSecret.port ?: throw IllegalArgumentException(message("datagrip.secretsmanager.validation.no_port", connectionSettings.secretId))
@@ -93,7 +93,7 @@ class SecretsManagerAuth : DatabaseAuthProviderCompatabilityAdapter {
 
     private fun getConfiguration(connection: ProtoConnection): SecretsManagerConfiguration {
         val connectionSettings = connection.getAwsConnectionSettings()
-        val secretId = connection.connectionPoint.additionalJdbcProperties[SECRET_ID_PROPERTY]
+        val secretId = connection.connectionPoint.additionalProperties[SECRET_ID_PROPERTY]
             ?: throw IllegalArgumentException(message("datagrip.secretsmanager.validation.no_secret"))
         return SecretsManagerConfiguration(
             connectionSettings,
diff --git a/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuthWidget.kt b/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuthWidget.kt
@@ -42,24 +42,24 @@ class SecretsManagerAuthWidget : AwsAuthWidget(userFieldEnabled = false) {
         super.save(dataSource, copyCredentials)
 
         DataSourceUiUtil.putOrRemove(
-            dataSource.additionalJdbcProperties,
+            dataSource.additionalProperties,
             SECRET_ID_PROPERTY,
             secretIdSelector.text.nullize()
         )
 
         DataSourceUiUtil.putOrRemove(
-            dataSource.additionalJdbcProperties,
+            dataSource.additionalProperties,
             GET_URL_FROM_SECRET,
             urlFromSecret.isSelected.toString()
         )
     }
 
     override fun reset(dataSource: LocalDataSource, resetCredentials: Boolean) {
         super.reset(dataSource, resetCredentials)
-        dataSource.additionalJdbcProperties[SECRET_ID_PROPERTY]?.nullize()?.let {
+        dataSource.additionalProperties[SECRET_ID_PROPERTY]?.nullize()?.let {
             secretIdSelector.text = it
         }
-        dataSource.additionalJdbcProperties[GET_URL_FROM_SECRET]?.nullize()?.let {
+        dataSource.additionalProperties[GET_URL_FROM_SECRET]?.nullize()?.let {
             urlFromSecret.isSelected = it.toBoolean()
         }
     }
diff --git a/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/auth/IamAuth.kt b/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/auth/IamAuth.kt
@@ -70,10 +70,10 @@ class IamAuth : DatabaseAuthProviderCompatabilityAdapter {
 
     internal fun getAuthInformation(connection: ProtoConnection): RdsAuth {
         validateIamConfiguration(connection)
-        val signingUrl = connection.connectionPoint.additionalJdbcProperties[RDS_SIGNING_HOST_PROPERTY]
+        val signingUrl = connection.connectionPoint.additionalProperties[RDS_SIGNING_HOST_PROPERTY]
             ?: connection.connectionPoint.url.hostFromJdbcString()
             ?: throw IllegalArgumentException(message("rds.validation.no_instance_host"))
-        val signingPort = connection.connectionPoint.additionalJdbcProperties[RDS_SIGNING_PORT_PROPERTY]?.toIntOrNull()
+        val signingPort = connection.connectionPoint.additionalProperties[RDS_SIGNING_PORT_PROPERTY]?.toIntOrNull()
             ?: connection.connectionPoint.url.portFromJdbcString()?.toIntOrNull()
             ?: throw IllegalArgumentException(message("rds.validation.no_instance_port"))
         val user = connection.connectionPoint.dataSource.username
diff --git a/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthWidget.kt b/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthWidget.kt
@@ -47,7 +47,7 @@ class IamAuthWidget : AwsAuthWidget() {
             rdsSigningHostField.text
         }
         DataSourceUiUtil.putOrRemove(
-            dataSource.additionalJdbcProperties,
+            dataSource.additionalProperties,
             RDS_SIGNING_HOST_PROPERTY,
             host
         )
@@ -58,16 +58,16 @@ class IamAuthWidget : AwsAuthWidget() {
             rdsSigningPortField.text
         }
         DataSourceUiUtil.putOrRemove(
-            dataSource.additionalJdbcProperties,
+            dataSource.additionalProperties,
             RDS_SIGNING_PORT_PROPERTY,
             port
         )
     }
 
     override fun reset(dataSource: LocalDataSource, resetCredentials: Boolean) {
         super.reset(dataSource, resetCredentials)
-        rdsSigningHostField.text = dataSource.additionalJdbcProperties[RDS_SIGNING_HOST_PROPERTY]
-        rdsSigningPortField.text = dataSource.additionalJdbcProperties[RDS_SIGNING_PORT_PROPERTY]
+        rdsSigningHostField.text = dataSource.additionalProperties[RDS_SIGNING_HOST_PROPERTY]
+        rdsSigningPortField.text = dataSource.additionalProperties[RDS_SIGNING_PORT_PROPERTY]
     }
 
     override fun updateFromUrl(holder: ParametersHolder) {
diff --git a/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuth.kt b/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuth.kt
@@ -63,7 +63,7 @@ class IamAuth : DatabaseAuthProviderCompatabilityAdapter {
 
     internal fun validateConnection(connection: ProtoConnection): RedshiftSettings {
         val auth = connection.getAwsConnectionSettings()
-        val clusterIdentifier = connection.connectionPoint.additionalJdbcProperties[CLUSTER_ID_PROPERTY]
+        val clusterIdentifier = connection.connectionPoint.additionalProperties[CLUSTER_ID_PROPERTY]
             ?: throw IllegalArgumentException(message("redshift.validation.no_cluster_id"))
         val username = connection.connectionPoint.dataSource.username
         if (username.isEmpty()) {
diff --git a/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuthWidget.kt b/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuthWidget.kt
@@ -38,15 +38,15 @@ class IamAuthWidget : AwsAuthWidget() {
         super.save(dataSource, copyCredentials)
 
         DataSourceUiUtil.putOrRemove(
-            dataSource.additionalJdbcProperties,
+            dataSource.additionalProperties,
             CLUSTER_ID_PROPERTY,
             clusterIdSelector.text
         )
     }
 
     override fun reset(dataSource: LocalDataSource, resetCredentials: Boolean) {
         super.reset(dataSource, resetCredentials)
-        clusterIdSelector.text = dataSource.additionalJdbcProperties[CLUSTER_ID_PROPERTY]
+        clusterIdSelector.text = dataSource.additionalProperties[CLUSTER_ID_PROPERTY]
     }
 
     override fun updateFromUrl(holder: ParametersHolder) {
diff --git a/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/ui/AwsAuthWidget.kt b/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/ui/AwsAuthWidget.kt
@@ -56,12 +56,12 @@ abstract class AwsAuthWidget(private val userFieldEnabled: Boolean = true) : JBD
         super.save(dataSource, copyCredentials)
 
         DataSourceUiUtil.putOrRemove(
-            dataSource.additionalJdbcProperties,
+            dataSource.additionalProperties,
             CREDENTIAL_ID_PROPERTY,
             credentialSelector.getSelectedCredentialsProvider()
         )
         DataSourceUiUtil.putOrRemove(
-            dataSource.additionalJdbcProperties,
+            dataSource.additionalProperties,
             REGION_ID_PROPERTY,
             regionSelector.selectedRegion?.id
         )
@@ -73,7 +73,7 @@ abstract class AwsAuthWidget(private val userFieldEnabled: Boolean = true) : JBD
         val regionProvider = AwsRegionProvider.getInstance()
         val allRegions = regionProvider.allRegionsForService(serviceId)
         regionSelector.setRegions(allRegions.values.toMutableList())
-        val regionId = dataSource.additionalJdbcProperties[REGION_ID_PROPERTY]?.nullize()
+        val regionId = dataSource.additionalProperties[REGION_ID_PROPERTY]?.nullize()
         regionId?.let {
             allRegions[regionId]?.let {
                 regionSelector.selectedRegion = it
@@ -82,7 +82,7 @@ abstract class AwsAuthWidget(private val userFieldEnabled: Boolean = true) : JBD
 
         val credentialManager = CredentialManager.getInstance()
         credentialSelector.setCredentialsProviders(credentialManager.getCredentialIdentifiers())
-        val credentialId = dataSource.additionalJdbcProperties[CREDENTIAL_ID_PROPERTY]?.nullize()
+        val credentialId = dataSource.additionalProperties[CREDENTIAL_ID_PROPERTY]?.nullize()
         if (credentialId != null) {
             val credentialIdentifierById = credentialManager.getCredentialIdentifierById(credentialId)
             if (credentialIdentifierById != null) {
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/DatagripUtilsTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/DatagripUtilsTest.kt
@@ -82,7 +82,7 @@ class DatagripUtilsTest {
     ): DatabaseConnectionInterceptor.ProtoConnection = mock {
         on { connectionPoint } doAnswer {
             mock {
-                on { additionalJdbcProperties } doAnswer {
+                on { additionalProperties } doAnswer {
                     val m = mutableMapOf<String, String?>()
                     m[CREDENTIAL_ID_PROPERTY] = credentials
                     m[REGION_ID_PROPERTY] = region
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/actions/AddSecretsManagerConnectionTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/actions/AddSecretsManagerConnectionTest.kt
@@ -55,9 +55,9 @@ class AddSecretsManagerConnectionTest {
             assertThat(it.isTemporary).isFalse()
             assertThat(it.sslCfg?.myEnabled).isTrue()
             assertThat(it.url).isEqualTo("jdbc:adapter://$address:$port")
-            assertThat(it.additionalJdbcProperties[CREDENTIAL_ID_PROPERTY]).isEqualTo(credentialProvider.identifier.id)
-            assertThat(it.additionalJdbcProperties[REGION_ID_PROPERTY]).isEqualTo(region.id)
-            assertThat(it.additionalJdbcProperties[SECRET_ID_PROPERTY]).isEqualTo(secretArn)
+            assertThat(it.additionalProperties[CREDENTIAL_ID_PROPERTY]).isEqualTo(credentialProvider.identifier.id)
+            assertThat(it.additionalProperties[REGION_ID_PROPERTY]).isEqualTo(region.id)
+            assertThat(it.additionalProperties[SECRET_ID_PROPERTY]).isEqualTo(secretArn)
             assertThat(it.authProviderId).isEqualTo(SecretsManagerAuth.providerId)
         }
     }
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuthTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuthTest.kt
@@ -211,7 +211,7 @@ class SecretsManagerAuthTest {
             }
         }
         val dbConnectionPoint = mock<DatabaseConnectionPoint> {
-            on { additionalJdbcProperties } doAnswer {
+            on { additionalProperties } doAnswer {
                 val m = mutableMapOf<String, String>()
                 if (hasCredentials) {
                     m[CREDENTIAL_ID_PROPERTY] = credentialId
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuthWidgetTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuthWidgetTest.kt
@@ -97,7 +97,7 @@ class SecretsManagerAuthWidgetTest {
     }
 
     private fun buildDataSource(hasSecret: Boolean = true, getUrlFromSecret: Boolean = false): LocalDataSource = mock {
-        on { additionalJdbcProperties } doAnswer {
+        on { additionalProperties } doAnswer {
             mutableMapOf<String, String>().also {
                 it[CREDENTIAL_ID_PROPERTY] = credentialId
                 it[REGION_ID_PROPERTY] = defaultRegion
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/actions/CreateConfigurationActionTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/actions/CreateConfigurationActionTest.kt
@@ -123,8 +123,8 @@ class CreateConfigurationActionTest {
             assertThat(it.isTemporary).isFalse()
             assertThat(it.url).contains(port.toString())
             assertThat(it.url).contains(address)
-            assertThat(it.additionalJdbcProperties[CREDENTIAL_ID_PROPERTY]).isEqualTo(credentialIdentifier.displayName)
-            assertThat(it.additionalJdbcProperties[REGION_ID_PROPERTY]).isEqualTo(region.id)
+            assertThat(it.additionalProperties[CREDENTIAL_ID_PROPERTY]).isEqualTo(credentialIdentifier.displayName)
+            assertThat(it.additionalProperties[REGION_ID_PROPERTY]).isEqualTo(region.id)
             assertThat(it.authProviderId).isEqualTo(IamAuth.providerId)
         }
     }
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthTest.kt
@@ -177,7 +177,7 @@ class IamAuthTest {
         }
         val dbConnectionPoint = mock<DatabaseConnectionPoint> {
             on { url } doAnswer { if (hasBadHost) null else "jdbc:postgresql://$dbHost:$connectionPort/dev" }
-            on { additionalJdbcProperties } doAnswer {
+            on { additionalProperties } doAnswer {
                 val m = mutableMapOf<String, String>()
                 if (hasCredentials) {
                     m[CREDENTIAL_ID_PROPERTY] = credentialId
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthWidgetTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthWidgetTest.kt
@@ -94,17 +94,17 @@ class IamAuthWidgetTest {
 
     @Test
     fun `Save saves set signing host and port if set`() {
-        widget.reset(mock { on { additionalJdbcProperties } doReturn mapOf(RDS_SIGNING_HOST_PROPERTY to "host", RDS_SIGNING_PORT_PROPERTY to "port") }, false)
+        widget.reset(mock { on { additionalProperties } doReturn mapOf(RDS_SIGNING_HOST_PROPERTY to "host", RDS_SIGNING_PORT_PROPERTY to "port") }, false)
         val m = mutableMapOf<String, String>()
-        widget.save(mock { on { additionalJdbcProperties } doReturn m }, false)
+        widget.save(mock { on { additionalProperties } doReturn m }, false)
         assertThat(m[RDS_SIGNING_HOST_PROPERTY]).isEqualTo("host")
         assertThat(m[RDS_SIGNING_PORT_PROPERTY]).isEqualTo("port")
     }
 
     @Test
     fun `Save saves null signing host and port if not set`() {
         val m = mutableMapOf<String, String>()
-        widget.save(mock { on { additionalJdbcProperties } doReturn m }, false)
+        widget.save(mock { on { additionalProperties } doReturn m }, false)
         assertThat(m[RDS_SIGNING_HOST_PROPERTY]).isNull()
         assertThat(m[RDS_SIGNING_PORT_PROPERTY]).isNull()
     }
@@ -113,7 +113,7 @@ class IamAuthWidgetTest {
         hasCredentials: Boolean = true,
         hasRegion: Boolean = true
     ): LocalDataSource = mock {
-        on { additionalJdbcProperties } doAnswer {
+        on { additionalProperties } doAnswer {
             val m = mutableMapOf<String, String>()
             if (hasCredentials) {
                 m[CREDENTIAL_ID_PROPERTY] = credentialId
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/actions/CreateDataSourceActionTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/actions/CreateDataSourceActionTest.kt
@@ -57,9 +57,9 @@ class CreateDataSourceActionTest {
             assertThat(it.isTemporary).isFalse()
             assertThat(it.sslCfg?.myEnabled).isTrue()
             assertThat(it.url).isEqualTo("jdbc:redshift://$address:$port/$dbName")
-            assertThat(it.additionalJdbcProperties[CREDENTIAL_ID_PROPERTY]).isEqualTo(credentialProvider.id)
-            assertThat(it.additionalJdbcProperties[REGION_ID_PROPERTY]).isEqualTo(region.id)
-            assertThat(it.additionalJdbcProperties[CLUSTER_ID_PROPERTY]).isEqualTo(address)
+            assertThat(it.additionalProperties[CREDENTIAL_ID_PROPERTY]).isEqualTo(credentialProvider.id)
+            assertThat(it.additionalProperties[REGION_ID_PROPERTY]).isEqualTo(region.id)
+            assertThat(it.additionalProperties[CLUSTER_ID_PROPERTY]).isEqualTo(address)
             assertThat(it.authProviderId).isEqualTo(IamAuth.providerId)
         }
     }
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuthTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuthTest.kt
@@ -188,7 +188,7 @@ class IamAuthTest {
             on { username } doReturn if (hasUsername) username else ""
         }
         val dbConnectionPoint = mock<DatabaseConnectionPoint> {
-            on { additionalJdbcProperties } doAnswer {
+            on { additionalProperties } doAnswer {
                 val m = mutableMapOf<String, String>()
                 if (hasCredentials) {
                     m[CREDENTIAL_ID_PROPERTY] = credentialId
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuthWidgetTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuthWidgetTest.kt
@@ -73,7 +73,7 @@ class IamAuthWidgetTest {
     }
 
     private fun buildDataSource(hasCluster: Boolean = true): LocalDataSource = mock {
-        on { additionalJdbcProperties } doAnswer {
+        on { additionalProperties } doAnswer {
             mutableMapOf<String, String>().also {
                 it[CREDENTIAL_ID_PROPERTY] = credentialId
                 it[REGION_ID_PROPERTY] = defaultRegion

Original file line number	Diff line number	Diff line change
`@@ -42,24 +42,24 @@ class SecretsManagerAuthWidget : AwsAuthWidget(userFieldEnabled = false) {`
`42`	`42`	`super.save(dataSource, copyCredentials)`
`43`	`43`
`44`	`44`	`DataSourceUiUtil.putOrRemove(`
`45`		`- dataSource.additionalJdbcProperties,`
	`45`	`+ dataSource.additionalProperties,`
`46`	`46`	`SECRET_ID_PROPERTY,`
`47`	`47`	`secretIdSelector.text.nullize()`
`48`	`48`	`)`
`49`	`49`
`50`	`50`	`DataSourceUiUtil.putOrRemove(`
`51`		`- dataSource.additionalJdbcProperties,`
	`51`	`+ dataSource.additionalProperties,`
`52`	`52`	`GET_URL_FROM_SECRET,`
`53`	`53`	`urlFromSecret.isSelected.toString()`
`54`	`54`	`)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`override fun reset(dataSource: LocalDataSource, resetCredentials: Boolean) {`
`58`	`58`	`super.reset(dataSource, resetCredentials)`
`59`		`- dataSource.additionalJdbcProperties[SECRET_ID_PROPERTY]?.nullize()?.let {`
	`59`	`+ dataSource.additionalProperties[SECRET_ID_PROPERTY]?.nullize()?.let {`
`60`	`60`	`secretIdSelector.text = it`
`61`	`61`	`}`
`62`		`- dataSource.additionalJdbcProperties[GET_URL_FROM_SECRET]?.nullize()?.let {`
	`62`	`+ dataSource.additionalProperties[GET_URL_FROM_SECRET]?.nullize()?.let {`
`63`	`63`	`urlFromSecret.isSelected = it.toBoolean()`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class IamAuthWidget : AwsAuthWidget() {`
`47`	`47`	`rdsSigningHostField.text`
`48`	`48`	`}`
`49`	`49`	`DataSourceUiUtil.putOrRemove(`
`50`		`- dataSource.additionalJdbcProperties,`
	`50`	`+ dataSource.additionalProperties,`
`51`	`51`	`RDS_SIGNING_HOST_PROPERTY,`
`52`	`52`	`host`
`53`	`53`	`)`
`@@ -58,16 +58,16 @@ class IamAuthWidget : AwsAuthWidget() {`
`58`	`58`	`rdsSigningPortField.text`
`59`	`59`	`}`
`60`	`60`	`DataSourceUiUtil.putOrRemove(`
`61`		`- dataSource.additionalJdbcProperties,`
	`61`	`+ dataSource.additionalProperties,`
`62`	`62`	`RDS_SIGNING_PORT_PROPERTY,`
`63`	`63`	`port`
`64`	`64`	`)`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`override fun reset(dataSource: LocalDataSource, resetCredentials: Boolean) {`
`68`	`68`	`super.reset(dataSource, resetCredentials)`
`69`		`- rdsSigningHostField.text = dataSource.additionalJdbcProperties[RDS_SIGNING_HOST_PROPERTY]`
`70`		`- rdsSigningPortField.text = dataSource.additionalJdbcProperties[RDS_SIGNING_PORT_PROPERTY]`
	`69`	`+ rdsSigningHostField.text = dataSource.additionalProperties[RDS_SIGNING_HOST_PROPERTY]`
	`70`	`+ rdsSigningPortField.text = dataSource.additionalProperties[RDS_SIGNING_PORT_PROPERTY]`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`override fun updateFromUrl(holder: ParametersHolder) {`
Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,15 @@ class IamAuthWidget : AwsAuthWidget() {`
`38`	`38`	`super.save(dataSource, copyCredentials)`
`39`	`39`
`40`	`40`	`DataSourceUiUtil.putOrRemove(`
`41`		`- dataSource.additionalJdbcProperties,`
	`41`	`+ dataSource.additionalProperties,`
`42`	`42`	`CLUSTER_ID_PROPERTY,`
`43`	`43`	`clusterIdSelector.text`
`44`	`44`	`)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`override fun reset(dataSource: LocalDataSource, resetCredentials: Boolean) {`
`48`	`48`	`super.reset(dataSource, resetCredentials)`
`49`		`- clusterIdSelector.text = dataSource.additionalJdbcProperties[CLUSTER_ID_PROPERTY]`
	`49`	`+ clusterIdSelector.text = dataSource.additionalProperties[CLUSTER_ID_PROPERTY]`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`override fun updateFromUrl(holder: ParametersHolder) {`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,9 @@ class AddSecretsManagerConnectionTest {`
`55`	`55`	`assertThat(it.isTemporary).isFalse()`
`56`	`56`	`assertThat(it.sslCfg?.myEnabled).isTrue()`
`57`	`57`	`assertThat(it.url).isEqualTo("jdbc:adapter://$address:$port")`
`58`		`- assertThat(it.additionalJdbcProperties[CREDENTIAL_ID_PROPERTY]).isEqualTo(credentialProvider.identifier.id)`
`59`		`- assertThat(it.additionalJdbcProperties[REGION_ID_PROPERTY]).isEqualTo(region.id)`
`60`		`- assertThat(it.additionalJdbcProperties[SECRET_ID_PROPERTY]).isEqualTo(secretArn)`
	`58`	`+ assertThat(it.additionalProperties[CREDENTIAL_ID_PROPERTY]).isEqualTo(credentialProvider.identifier.id)`
	`59`	`+ assertThat(it.additionalProperties[REGION_ID_PROPERTY]).isEqualTo(region.id)`
	`60`	`+ assertThat(it.additionalProperties[SECRET_ID_PROPERTY]).isEqualTo(secretArn)`
`61`	`61`	`assertThat(it.authProviderId).isEqualTo(SecretsManagerAuth.providerId)`
`62`	`62`	`}`
`63`	`63`	`}`