Merge pull request #77 from cloudgraphdev/feature/EP-3223-add-missing-postgre-sql-server-services

feat(azure): Add missing postgreSql server services

Author: m-pizarro

src/services/postgreSqlServers/data.ts

@@ -3,6 +3,7 @@ import {
   FirewallRule,
   PostgreSQLManagementClient,
   Server,
+  VirtualNetworkRule,
 } from '@azure/arm-postgresql'
 import { PagedAsyncIterableIterator } from '@azure/core-paging'
 import CloudGraph from '@cloudgraph/sdk'
@@ -23,6 +24,7 @@ export interface RawAzurePostgreSqlServer
   Tags: TagMap
   configurations: Configuration[]
   firewallRules: FirewallRule[]
+  virtualNetworkRules: VirtualNetworkRule[]
 }
 
 export default async ({
@@ -100,13 +102,32 @@ export default async ({
               operation: `listByServer for ${name}`,
             }
           )
+          const virtualNetworkRules: VirtualNetworkRule[] = []
+          const virtualNetworkRulesIterable: PagedAsyncIterableIterator<VirtualNetworkRule> =
+            client.virtualNetworkRules.listByServer(resourceGroupId, name)
+          await tryCatchWrapper(
+            async () => {
+              for await (const virtualNetworkRule of virtualNetworkRulesIterable) {
+                if (virtualNetworkRule) {
+                  virtualNetworkRules.push(virtualNetworkRule)
+                }
+              }
+            },
+            {
+              service: serviceName,
+              client,
+              scope: 'virtualNetworkRules',
+              operation: `listByServer for ${name}`,
+            }
+          )
           result[region].push({
             name,
             region,
             ...rest,
             resourceGroupId,
             configurations,
             firewallRules,
+            virtualNetworkRules,
             Tags: tags || {},
           })
         }

src/services/postgreSqlServers/format.ts

@@ -1,6 +1,9 @@
 import { formatTagsFromMap } from '../../utils/format'
 import { RawAzurePostgreSqlServer } from './data'
-import { AzurePostgreSqlServer } from '../../types/generated'
+import {
+  AzurePostgreSqlServer,
+  AzurePostgreSqlServerVirtualNetworkRule,
+} from '../../types/generated'
 
 export default ({
   service,
@@ -33,8 +36,9 @@ export default ({
     privateEndpointConnections,
     resourceGroupId,
     Tags,
-    configurations,
-    firewallRules
+    configurations = [],
+    firewallRules = [],
+    virtualNetworkRules = [],
   } = service
 
   return {
@@ -93,14 +97,26 @@ export default ({
         name: confName,
         type: confType,
         startIpAddress,
-        endIpAddress
+        endIpAddress,
       }) => ({
         id: confId,
         name: confName,
         type: confType,
         startIpAddress,
-        endIpAddress
+        endIpAddress,
       })
     ),
+    virtualNetworkRules:
+      virtualNetworkRules?.map(
+        ({
+          id: virtualNetworkRuleId,
+          name: virtualNetworkRuleName,
+          type: virtualNetworkRuleType,
+        }): AzurePostgreSqlServerVirtualNetworkRule => ({
+          id: virtualNetworkRuleId,
+          name: virtualNetworkRuleName,
+          type: virtualNetworkRuleType,
+        })
+      ) ?? [],
   }
 }

src/services/postgreSqlServers/schema.graphql

@@ -21,6 +21,7 @@ type azurePostgreSqlServer implements azureResource
   publicNetworkAccess: String @search(by: [hash, regexp])
   configurations: [azurePostgreSqlServerConfiguration]
   firewallRules: [azurePostgreSqlServerFirewallRule]
+  virtualNetworkRules: [azurePostgreSqlServerVirtualNetworkRule]
   privateEndpointConnections: [azurePostgreSqlServerPrivateEndpointConnection]
   databasePostgreSql: [azureDatabasePostgreSql]
     @hasInverse(field: postgreSqlServer)
@@ -119,3 +120,15 @@ type azurePostgreSqlServerFirewallRule
   startIpAddress: String @search(by: [hash, regexp])
   endIpAddress: String @search(by: [hash, regexp])
 }
+
+type azurePostgreSqlServerVirtualNetworkRule
+  @generate(
+    query: { get: false, query: true, aggregate: false }
+    mutation: { add: false, delete: false }
+    subscription: false
+  )
+  @key(fields: "id") {
+  id: String! @id @search(by: [hash])
+  name: String @search(by: [hash, regexp])
+  type: String @search(by: [hash, regexp])
+}

src/types/generated.ts

@@ -4316,6 +4316,7 @@ export type AzurePostgreSqlServer = AzureResource & {
   storageProfile?: Maybe<AzurePostgreSqlServerStorageProfile>;
   userVisibleState?: Maybe<Scalars['String']>;
   version?: Maybe<Scalars['String']>;
+  virtualNetworkRules?: Maybe<Array<Maybe<AzurePostgreSqlServerVirtualNetworkRule>>>;
 };
 
 export type AzurePostgreSqlServerConfiguration = {
@@ -4372,6 +4373,12 @@ export type AzurePostgreSqlServerStorageProfile = {
   storageMB?: Maybe<Scalars['Int']>;
 };
 
+export type AzurePostgreSqlServerVirtualNetworkRule = {
+  id: Scalars['String'];
+  name?: Maybe<Scalars['String']>;
+  type?: Maybe<Scalars['String']>;
+};
+
 export type AzurePrivateDnsZone = AzureResource & {
   etag?: Maybe<Scalars['String']>;
   internalId?: Maybe<Scalars['String']>;