Merge pull request #6096 from microsoft/andy-postgre-link-store

Fix the bug: cannot persist postgre service link.

Author: andxu

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-database/src/main/java/com/microsoft/azure/toolkit/intellij/connector/database/DatabaseResource.java

@@ -125,6 +125,11 @@ public void navigate(AnActionEvent event) {
         }
     }
 
+    @Override
+    public String toString() {
+        return String.format("%s[%s]", this.getDefinition().title, this.getName());
+    }
+
     @Getter
     @RequiredArgsConstructor
     public enum Definition implements SpringSupported<Database> {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-database/src/main/java/com/microsoft/azure/toolkit/intellij/database/postgre/connection/PostgreSqlDatabaseResource.java

@@ -47,6 +47,13 @@ public PostgreSqlDatabaseResource(PostgreSqlDatabase database, @Nonnull String u
         this.database.setUsername(username);
     }
 
+    public PostgreSqlDatabaseResource(String id, @Nonnull String username, @Nonnull Definition<PostgreSqlDatabase> definition) {
+        super(id, definition);
+        ResourceId resourceId = ResourceId.fromString(id);
+        this.database = new Database(resourceId.parent().id(), resourceId.name());
+        this.database.setUsername(username);
+    }
+
     public String loadPassword() {
         Password password = getPassword();
         if (Objects.nonNull(password) && password.saveType() == Password.SaveType.NEVER) {
@@ -78,7 +85,7 @@ public String inputPassword(@Nonnull final Project project) {
             if (dialog.showAndGet()) {
                 final Password password = dialog.getValue();
                 this.database.getPassword().saveType(password.saveType());
-                PasswordStore.savePassword(this.getName(),
+                PasswordStore.savePassword(PostgreSqlResourceDefinition.INSTANCE.getName(),
                         this.getDataId(), this.database.getUsername(), password.password(), password.saveType());
                 passwordRef.set(password);
             }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-database/src/main/java/com/microsoft/azure/toolkit/intellij/database/postgre/connection/PostgreSqlResourceDefinition.java

@@ -84,7 +84,7 @@ public Resource<PostgreSqlDatabase> read(@Nonnull Element resourceEle) {
         if (StringUtils.isBlank(dataId)) {
             throw new AzureToolkitRuntimeException("Missing required dataId for postgre SQL database in service link.");
         }
-        PostgreSqlDatabaseResource resource = new PostgreSqlDatabaseResource(getResource(dataId), resourceEle.getChildTextTrim("username"), this);
+        final PostgreSqlDatabaseResource resource = new PostgreSqlDatabaseResource(dataId, resourceEle.getChildTextTrim("username"), this);
 
         final String defName = this.getName();
         resource.setJdbcUrl(JdbcUrl.from(resourceEle.getChildTextTrim("url")));
@@ -107,7 +107,7 @@ public Resource<PostgreSqlDatabase> define(PostgreSqlDatabase resource) {
 
     @Override
     public Resource<PostgreSqlDatabase> define(String dataId) {
-        throw new UnsupportedOperationException("xx");
+        return new AzureServiceResource<>(getResource(dataId), this);
     }
 
     @Override

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/resources/bundles/com/microsoft/azure/toolkit/operation.properties

@@ -15,7 +15,7 @@ postgre|server.restart=restart Postgre server({0})
 postgre|server.delete=delete Postgre server({0})
 postgre.list.subscription=list PostgreSQL servers of subscription({0})
 postgre.get.name|rg|sid=get PostgreSQL server({0}) in resource group({1})
-postgre|server.open_by_database_tools=open PostgreSQL Server({0}) by Database Tools plugin.
+postgre|server.open_by_database_tools=open PostgreSQL Server({0}) by Database Tools plugin
 
 sqlserver|server.create=create SQL server({0})
 sqlserver|server.delete=delete SQL server({0})