Skip to content

Commit c7ec761

Browse files
hjaraujofhjaraujof
authored
Merge pull request #16 from cloudgraphdev/fix/CG-1083
fix: Ensure that all currently supported Azure services allow filtering using subscriptionId and region if possible
2 parents 2cbc064 + 25ed119 commit c7ec761

File tree

8 files changed

+33
-6
lines changed

8 files changed

+33
-6
lines changed

‎src/services/adServicePrincipal/data.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const serviceName = 'ADServicePrincipal'
1313

1414
export interface RawAzureADServicePrincipal
1515
extends Omit<ServicePrincipal, 'tags' | 'location'> {
16+
region: string
1617
Tags: TagMap
1718
}
1819

‎src/services/adServicePrincipal/format.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export default ({
1111
}): AzureAdServicePrincipal => {
1212
const {
1313
id,
14+
region,
1415
deletedDateTime,
1516
accountEnabled,
1617
alternativeNames,
@@ -42,6 +43,7 @@ export default ({
4243
} = service
4344
return {
4445
id: id || cuid(),
46+
region,
4547
deletedDateTime,
4648
accountEnabled,
4749
alternativeNames,

‎src/services/adServicePrincipal/schema.graphql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ type azureADServicePrincipal
2121
mutation: { add: true, delete: false }
2222
) {
2323
id: String! @id @search(by: [hash, regexp])
24+
region: String @search(by: [hash, regexp])
2425
deletedDateTime: String @search(by: [hash, regexp])
2526
accountEnabled: Boolean @search
2627
alternativeNames: [String] @search(by: [hash, regexp])

‎src/services/cdnCustomDomains/schema.graphql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,15 @@ type azureCdnCustomDomainHttpsParametersUnion
2727
certificateSourceParameters: azureCdnCertificateSourceParameters
2828
}
2929

30-
type azureCdnCustomDomain implements azureResource
30+
type azureCdnCustomDomain implements azureBaseResource
3131
@generate(
3232
query: { get: true, query: true, aggregate: true }
3333
mutation: { add: true, delete: false }
3434
)
3535
@key(fields: "id") {
36+
subscriptionId: String @search(by: [hash, regexp])
37+
region: String @search(by: [hash, regexp])
38+
resourceGroupId: String @search(by: [hash, regexp])
3639
createdBy: String @search(by: [hash, regexp])
3740
createdByType: String @search(by: [hash, regexp])
3841
createdAt: String @search(by: [hash, regexp])

‎src/services/cdnOriginGroups/schema.graphql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,15 @@ type azureCdnResponseBasedOriginErrorDetectionParameters
3232
httpErrorRanges: [azureCdnHttpErrorRangeParameters]
3333
}
3434

35-
type azureCdnOriginGroup implements azureResource
35+
type azureCdnOriginGroup implements azureBaseResource
3636
@generate(
3737
query: { get: true, query: true, aggregate: true }
3838
mutation: { add: true, delete: false }
3939
)
4040
@key(fields: "id") {
41+
subscriptionId: String @search(by: [hash, regexp])
42+
region: String @search(by: [hash, regexp])
43+
resourceGroupId: String @search(by: [hash, regexp])
4144
createdBy: String @search(by: [hash, regexp])
4245
createdByType: String @search(by: [hash, regexp])
4346
createdAt: String @search(by: [hash, regexp])

‎src/services/cdnOrigins/schema.graphql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
type azureCdnOrigin implements azureResource
1+
type azureCdnOrigin implements azureBaseResource
22
@generate(
33
query: { get: true, query: true, aggregate: true }
44
mutation: { add: true, delete: false }
55
)
66
@key(fields: "id") {
7+
subscriptionId: String @search(by: [hash, regexp])
8+
region: String @search(by: [hash, regexp])
9+
resourceGroupId: String @search(by: [hash, regexp])
710
createdBy: String @search(by: [hash, regexp])
811
createdByType: String @search(by: [hash, regexp])
912
createdAt: String @search(by: [hash, regexp])

‎src/services/tag/schema.graphql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ type azureTag @key(fields: "id") {
3636
mySqlServers: [azureMySqlServer]
3737
networkInterfaces: [azureNetworkInterface]
3838
postgreSqlServers: [azurePostgreSqlServer]
39+
privateDns: [azurePrivateDnsZone]
3940
publicIps: [azurePublicIp]
4041
recoveryVaults: [azureRecoveryVault]
4142
redisCaches: [azureRedisCache]
@@ -49,6 +50,7 @@ type azureTag @key(fields: "id") {
4950
synapseWorkspaces: [azureSynapseWorkspace]
5051
trafficManagerProfiles: [azureTrafficManagerProfile]
5152
virtualMachines: [azureVirtualMachine]
53+
virtualMachineScaleSets: [azureVirtualMachineScaleSet]
5254
virtualNetworks: [azureVirtualNetwork]
5355
}
5456

‎src/types/generated.ts‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ export type AzureAdServicePrincipal = {
150150
notes?: Maybe<Scalars['String']>;
151151
notificationEmailAddresses?: Maybe<Array<Maybe<Scalars['String']>>>;
152152
preferredSingleSignOnMode?: Maybe<Scalars['String']>;
153+
region?: Maybe<Scalars['String']>;
153154
replyUrls?: Maybe<Array<Maybe<Scalars['String']>>>;
154155
servicePrincipalNames?: Maybe<Array<Maybe<Scalars['String']>>>;
155156
servicePrincipalType?: Maybe<Scalars['String']>;
@@ -1278,7 +1279,7 @@ export type AzureCdnCertificateSourceParameters = {
12781279
vaultName?: Maybe<Scalars['String']>;
12791280
};
12801281

1281-
export type AzureCdnCustomDomain = AzureResource & {
1282+
export type AzureCdnCustomDomain = AzureBaseResource & {
12821283
cdnEndpoints?: Maybe<Array<Maybe<AzureCdnEndpoint>>>;
12831284
createdAt?: Maybe<Scalars['String']>;
12841285
createdBy?: Maybe<Scalars['String']>;
@@ -1291,8 +1292,11 @@ export type AzureCdnCustomDomain = AzureResource & {
12911292
lastModifiedBy?: Maybe<Scalars['String']>;
12921293
lastModifiedByType?: Maybe<Scalars['String']>;
12931294
provisioningState?: Maybe<Scalars['String']>;
1295+
region?: Maybe<Scalars['String']>;
12941296
resourceGroup?: Maybe<Array<Maybe<AzureResourceGroup>>>;
1297+
resourceGroupId?: Maybe<Scalars['String']>;
12951298
resourceState?: Maybe<Scalars['String']>;
1299+
subscriptionId?: Maybe<Scalars['String']>;
12961300
validationData?: Maybe<Scalars['String']>;
12971301
};
12981302

@@ -1415,7 +1419,7 @@ export type AzureCdnKeyVaultSigningKeyParameters = {
14151419
vaultName?: Maybe<Scalars['String']>;
14161420
};
14171421

1418-
export type AzureCdnOrigin = AzureResource & {
1422+
export type AzureCdnOrigin = AzureBaseResource & {
14191423
cdnEndpoints?: Maybe<Array<Maybe<AzureCdnEndpoint>>>;
14201424
cdnOriginGroups?: Maybe<Array<Maybe<AzureCdnOriginGroup>>>;
14211425
createdAt?: Maybe<Scalars['String']>;
@@ -1436,12 +1440,15 @@ export type AzureCdnOrigin = AzureResource & {
14361440
privateLinkLocation?: Maybe<Scalars['String']>;
14371441
privateLinkResourceId?: Maybe<Scalars['String']>;
14381442
provisioningState?: Maybe<Scalars['String']>;
1443+
region?: Maybe<Scalars['String']>;
14391444
resourceGroup?: Maybe<Array<Maybe<AzureResourceGroup>>>;
1445+
resourceGroupId?: Maybe<Scalars['String']>;
14401446
resourceState?: Maybe<Scalars['String']>;
1447+
subscriptionId?: Maybe<Scalars['String']>;
14411448
weight?: Maybe<Scalars['Int']>;
14421449
};
14431450

1444-
export type AzureCdnOriginGroup = AzureResource & {
1451+
export type AzureCdnOriginGroup = AzureBaseResource & {
14451452
cdnEndpoints?: Maybe<Array<Maybe<AzureCdnEndpoint>>>;
14461453
cdnOrigins?: Maybe<Array<Maybe<AzureCdnOrigin>>>;
14471454
createdAt?: Maybe<Scalars['String']>;
@@ -1452,9 +1459,12 @@ export type AzureCdnOriginGroup = AzureResource & {
14521459
lastModifiedBy?: Maybe<Scalars['String']>;
14531460
lastModifiedByType?: Maybe<Scalars['String']>;
14541461
provisioningState?: Maybe<Scalars['String']>;
1462+
region?: Maybe<Scalars['String']>;
14551463
resourceGroup?: Maybe<Array<Maybe<AzureResourceGroup>>>;
1464+
resourceGroupId?: Maybe<Scalars['String']>;
14561465
resourceState?: Maybe<Scalars['String']>;
14571466
responseBasedOriginErrorDetectionSettings?: Maybe<AzureCdnResponseBasedOriginErrorDetectionParameters>;
1467+
subscriptionId?: Maybe<Scalars['String']>;
14581468
trafficRestorationTimeToHealedOrNewEndpointsInMinutes?: Maybe<Scalars['Int']>;
14591469
};
14601470

@@ -4847,6 +4857,7 @@ export type AzureTag = {
48474857
mySqlServers?: Maybe<Array<Maybe<AzureMySqlServer>>>;
48484858
networkInterfaces?: Maybe<Array<Maybe<AzureNetworkInterface>>>;
48494859
postgreSqlServers?: Maybe<Array<Maybe<AzurePostgreSqlServer>>>;
4860+
privateDns?: Maybe<Array<Maybe<AzurePrivateDnsZone>>>;
48504861
publicIps?: Maybe<Array<Maybe<AzurePublicIp>>>;
48514862
recoveryVaults?: Maybe<Array<Maybe<AzureRecoveryVault>>>;
48524863
redisCaches?: Maybe<Array<Maybe<AzureRedisCache>>>;
@@ -4860,6 +4871,7 @@ export type AzureTag = {
48604871
synapseWorkspaces?: Maybe<Array<Maybe<AzureSynapseWorkspace>>>;
48614872
trafficManagerProfiles?: Maybe<Array<Maybe<AzureTrafficManagerProfile>>>;
48624873
value: Scalars['String'];
4874+
virtualMachineScaleSets?: Maybe<Array<Maybe<AzureVirtualMachineScaleSet>>>;
48634875
virtualMachines?: Maybe<Array<Maybe<AzureVirtualMachine>>>;
48644876
virtualNetworks?: Maybe<Array<Maybe<AzureVirtualNetwork>>>;
48654877
};

0 commit comments

Comments
 (0)