Merge pull request #94 from lhhyung/main

Move files to separate Cloud Service Types for MySQLServers and PostgreSQLServers

README.md

@@ -35,11 +35,11 @@ Please contact us if you need any further information.
 | Instance           | [KeyVaults](#key-vaults)                                    |
 | Instance           | [Load Balancers](#load-balancers)                           |
 | Server             | [MySQL Servers](#mysql-servers---deprecated)                |
-| Flexible Server    | [MySQL Flexible Servers](#mysql-flexible-servers)           |
+| Server             | [MySQL Flexible Servers](#mysql-flexible-servers)           |
 | Instance           | [NAT Gateways](#nat-gateways)                               |
 | Instance           | [Network Security Groups](#network-security-groups)         |
 | Server             | [PostgreSQL Servers](#postgresql-servers---deprecated)      |
-| Flexible Server    | [PostgreSQL Flexible Servers](#postgresql-flexible-servers) |
+| Server             | [PostgreSQL Flexible Servers](#postgresql-flexible-servers) |
 | IPAddress          | [Public IP Addresses](#public-ip-addresses)                 |
 | Instance           | [Snapshots](#snapshots)                                     |
 | Server             | [SQL Servers](#sql-servers)                                 |
@@ -702,7 +702,7 @@ For information on creating custom roles in Azure, see the [Microsoft custom rol
       ```
 
 
-#### ~~[MySQL Servers](https://learn.microsoft.com/ko-kr/python/api/azure-mgmt-rdbms/azure.mgmt.rdbms.mysql.mysqlmanagementclient?view=azure-python)~~ - Deprecated
+#### ~~[MySQL Servers](https://learn.microsoft.com/ko-kr/python/api/azure-mgmt-rdbms/azure.mgmt.rdbms.mysql.mysqlmanagementclient?view=azure-python)~~ (Deprecated)
 - MySQL Servers
     - Scope 
         - https://docs.microsoft.com/en-us/rest/api/storagerp/storage-accounts/list
@@ -748,7 +748,7 @@ For information on creating custom roles in Azure, see the [Microsoft custom rol
         ```
 
 
-#### ~~[PostgreSQL Servers](https://docs.microsoft.com/en-us/rest/api/postgresql/flexibleserver(preview)/servers/list)~~ - Deprecated
+#### ~~[PostgreSQL Servers](https://docs.microsoft.com/en-us/rest/api/postgresql/flexibleserver(preview)/servers/list)~~ (Deprecated)
 - PostgreSQL Servers
     - Scope
         - https://docs.microsoft.com/en-us/rest/api/postgresql/flexibleserver(preview)/servers/list

src/plugin/manager/__init__.py

@@ -13,7 +13,10 @@
 from .load_balancers import *
 from .cosmos_db import *
 from .postgre_sql_servers import *
+from .postgre_sql_flexible_servers import *
 from .web_pub_sub_service import *
 from .key_vaults import *
 from .my_sql_servers import *
+from .mysql_sql_flexible_servers import *
 from .virtual_machines import *
+

src/plugin/manager/my_sql_servers/__init__.py

@@ -1,2 +1 @@
 from .server_manager import MySQLServersManager
-from .flexible_server_manager import MySQLFlexibleServersManager

src/plugin/manager/mysql_sql_flexible_servers/__init__.py

@@ -0,0 +1 @@
+from .server_manager import MySQLFlexibleServersManager

src/plugin/manager/my_sql_servers/flexible_server_manager.py → src/plugin/manager/mysql_sql_flexible_servers/server_manager.py

@@ -3,16 +3,16 @@
 from spaceone.inventory.plugin.collector.lib import *
 
 from plugin.conf.cloud_service_conf import ICON_URL
-from plugin.connector.my_sql_servers.mysql_flexible_servers_connector import MySQLFlexibleServersConnector
+from plugin.connector.mysql_sql_flexible_servers.mysql_flexible_servers_connector import MySQLFlexibleServersConnector
 from plugin.connector.subscriptions.subscriptions_connector import SubscriptionsConnector
 from plugin.manager.base import AzureBaseManager
 
 _LOGGER = logging.getLogger(__name__)
 
 
 class MySQLFlexibleServersManager(AzureBaseManager):
-    cloud_service_group = "MySQLServers"
-    cloud_service_type = "FlexibleServer"
+    cloud_service_group = "MySQLFlexibleServers"
+    cloud_service_type = "Server"
     service_code = "/Microsoft.DBforMySQL/flexibleServers"
 
     def create_cloud_service_type(self):

src/plugin/manager/postgre_sql_flexible_servers/__init__.py

@@ -0,0 +1 @@
+from .server_manager import PostgreSQLFlexibleServersManager

src/plugin/manager/postgre_sql_servers/flexible_server_manager.py → src/plugin/manager/postgre_sql_flexible_servers/server_manager.py

@@ -3,16 +3,16 @@
 from spaceone.inventory.plugin.collector.lib import *
 
 from plugin.conf.cloud_service_conf import ICON_URL
-from plugin.connector.postgre_sql_servers.postgresql_flexible_servers_connector import PostgreSQLFlexibleServersConnector
+from plugin.connector.postgre_sql_flexible_servers.postgresql_flexible_servers_connector import PostgreSQLFlexibleServersConnector
 from plugin.connector.subscriptions.subscriptions_connector import SubscriptionsConnector
 from plugin.manager.base import AzureBaseManager
 
 _LOGGER = logging.getLogger(__name__)
 
 
 class PostgreSQLFlexibleServersManager(AzureBaseManager):
-    cloud_service_group = "PostgreSQLServers"
-    cloud_service_type = "FlexibleServer"
+    cloud_service_group = "PostgreSQLFlexibleServers"
+    cloud_service_type = "Server"
     service_code = "/Microsoft.DBforPostgreSQL/flexibleServers"
 
     def create_cloud_service_type(self):

src/plugin/manager/postgre_sql_servers/__init__.py

@@ -1,2 +1 @@
 from .server_manager import PostgreSQLServersManager
-from .flexible_server_manager import PostgreSQLFlexibleServersManager