Skip to content

Commit e142da0

Browse files
tas50claude
tas50
and
claude
committed
Fix inconsistent spacing between discovery blocks
Add blank lines before SecurityGroups, KeyVaults, and CosmosDb discovery blocks to match the spacing pattern used by all other blocks in the Discover() function. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 7a487e3 commit e142da0

File tree

4 files changed

+319
-9
lines changed

4 files changed

+319
-9
lines changed

‎providers/azure/resources/azure.lr.versions‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,22 +146,50 @@ azure.subscription.cacheService 11.4.4
146146
azure.subscription.cacheService.redis 11.4.28
147147
azure.subscription.cacheService.redisInstance 11.4.4
148148
azure.subscription.cacheService.redisInstance.enableNonSslPort 11.4.4
149+
azure.subscription.cacheService.redisInstance.firewallRule 11.4.32
150+
azure.subscription.cacheService.redisInstance.firewallRule.endIpAddress 11.4.32
151+
azure.subscription.cacheService.redisInstance.firewallRule.id 11.4.32
152+
azure.subscription.cacheService.redisInstance.firewallRule.name 11.4.32
153+
azure.subscription.cacheService.redisInstance.firewallRule.startIpAddress 11.4.32
154+
azure.subscription.cacheService.redisInstance.firewallRule.type 11.4.32
155+
azure.subscription.cacheService.redisInstance.firewallRules 11.4.32
149156
azure.subscription.cacheService.redisInstance.hostName 11.4.4
150157
azure.subscription.cacheService.redisInstance.id 11.4.4
158+
azure.subscription.cacheService.redisInstance.identity 11.4.32
151159
azure.subscription.cacheService.redisInstance.location 11.4.4
152160
azure.subscription.cacheService.redisInstance.minimumTlsVersion 11.4.4
153161
azure.subscription.cacheService.redisInstance.name 11.4.4
162+
azure.subscription.cacheService.redisInstance.patchSchedule 11.4.32
163+
azure.subscription.cacheService.redisInstance.patchSchedule.entries 11.4.32
164+
azure.subscription.cacheService.redisInstance.patchSchedule.id 11.4.32
165+
azure.subscription.cacheService.redisInstance.patchSchedule.location 11.4.32
166+
azure.subscription.cacheService.redisInstance.patchSchedule.name 11.4.32
167+
azure.subscription.cacheService.redisInstance.patchSchedules 11.4.32
154168
azure.subscription.cacheService.redisInstance.port 11.4.4
169+
azure.subscription.cacheService.redisInstance.privateEndpointConnection 11.4.32
170+
azure.subscription.cacheService.redisInstance.privateEndpointConnection.description 11.4.32
171+
azure.subscription.cacheService.redisInstance.privateEndpointConnection.id 11.4.32
172+
azure.subscription.cacheService.redisInstance.privateEndpointConnection.name 11.4.32
173+
azure.subscription.cacheService.redisInstance.privateEndpointConnection.privateEndpointId 11.4.32
174+
azure.subscription.cacheService.redisInstance.privateEndpointConnection.provisioningState 11.4.32
175+
azure.subscription.cacheService.redisInstance.privateEndpointConnection.status 11.4.32
176+
azure.subscription.cacheService.redisInstance.privateEndpointConnection.type 11.4.32
177+
azure.subscription.cacheService.redisInstance.privateEndpointConnections 11.4.32
155178
azure.subscription.cacheService.redisInstance.properties 11.4.4
156179
azure.subscription.cacheService.redisInstance.provisioningState 11.4.4
157180
azure.subscription.cacheService.redisInstance.publicNetworkAccess 11.4.4
181+
azure.subscription.cacheService.redisInstance.redisConfiguration 11.4.32
158182
azure.subscription.cacheService.redisInstance.redisVersion 11.4.4
159183
azure.subscription.cacheService.redisInstance.replicasPerMaster 11.4.4
160184
azure.subscription.cacheService.redisInstance.replicasPerPrimary 11.4.4
185+
azure.subscription.cacheService.redisInstance.shardCount 11.4.32
161186
azure.subscription.cacheService.redisInstance.sku 11.4.4
162187
azure.subscription.cacheService.redisInstance.sslPort 11.4.4
188+
azure.subscription.cacheService.redisInstance.staticIp 11.4.32
189+
azure.subscription.cacheService.redisInstance.subnetId 11.4.32
163190
azure.subscription.cacheService.redisInstance.tags 11.4.4
164191
azure.subscription.cacheService.redisInstance.type 11.4.4
192+
azure.subscription.cacheService.redisInstance.zones 11.4.32
165193
azure.subscription.cacheService.subscriptionId 11.4.4
166194
azure.subscription.cloudDefender 9.0.0
167195
azure.subscription.cloudDefenderService 9.0.1
@@ -1095,6 +1123,23 @@ azure.subscription.webService.appRuntimeStack.minorVersion 11.3.52
10951123
azure.subscription.webService.appRuntimeStack.name 11.3.52
10961124
azure.subscription.webService.appRuntimeStack.preferredOs 11.3.52
10971125
azure.subscription.webService.appRuntimeStack.runtimeVersion 11.3.52
1126+
azure.subscription.webService.appServicePlan 11.4.32
1127+
azure.subscription.webService.appServicePlan.elasticScaleEnabled 11.4.32
1128+
azure.subscription.webService.appServicePlan.geoRegion 11.4.32
1129+
azure.subscription.webService.appServicePlan.id 11.4.32
1130+
azure.subscription.webService.appServicePlan.kind 11.4.32
1131+
azure.subscription.webService.appServicePlan.location 11.4.32
1132+
azure.subscription.webService.appServicePlan.maximumNumberOfWorkers 11.4.32
1133+
azure.subscription.webService.appServicePlan.name 11.4.32
1134+
azure.subscription.webService.appServicePlan.numberOfSites 11.4.32
1135+
azure.subscription.webService.appServicePlan.perSiteScaling 11.4.32
1136+
azure.subscription.webService.appServicePlan.properties 11.4.32
1137+
azure.subscription.webService.appServicePlan.reserved 11.4.32
1138+
azure.subscription.webService.appServicePlan.sku 11.4.32
1139+
azure.subscription.webService.appServicePlan.status 11.4.32
1140+
azure.subscription.webService.appServicePlan.tags 11.4.32
1141+
azure.subscription.webService.appServicePlan.zoneRedundant 11.4.32
1142+
azure.subscription.webService.appServicePlans 11.4.32
10981143
azure.subscription.webService.apps 9.0.1
10991144
azure.subscription.webService.appsite 9.0.1
11001145
azure.subscription.webService.appsite.applicationSettings 9.0.1
@@ -1112,6 +1157,14 @@ azure.subscription.webService.appsite.diagnosticSettings 11.3.0
11121157
azure.subscription.webService.appsite.enabled 11.4.28
11131158
azure.subscription.webService.appsite.ftp 11.3.31
11141159
azure.subscription.webService.appsite.functions 11.3.3
1160+
azure.subscription.webService.appsite.hostNameBinding 11.4.32
1161+
azure.subscription.webService.appsite.hostNameBinding.hostNameType 11.4.32
1162+
azure.subscription.webService.appsite.hostNameBinding.id 11.4.32
1163+
azure.subscription.webService.appsite.hostNameBinding.name 11.4.32
1164+
azure.subscription.webService.appsite.hostNameBinding.sslState 11.4.32
1165+
azure.subscription.webService.appsite.hostNameBinding.thumbprint 11.4.32
1166+
azure.subscription.webService.appsite.hostNameBinding.virtualIP 11.4.32
1167+
azure.subscription.webService.appsite.hostNameBindings 11.4.32
11151168
azure.subscription.webService.appsite.httpsOnly 11.4.28
11161169
azure.subscription.webService.appsite.id 9.0.1
11171170
azure.subscription.webService.appsite.identity 9.0.1
@@ -1127,6 +1180,13 @@ azure.subscription.webService.appsite.stack 9.0.1
11271180
azure.subscription.webService.appsite.state 11.4.28
11281181
azure.subscription.webService.appsite.tags 9.0.1
11291182
azure.subscription.webService.appsite.type 9.0.1
1183+
azure.subscription.webService.appsite.virtualNetworkConnection 11.4.32
1184+
azure.subscription.webService.appsite.virtualNetworkConnection.id 11.4.32
1185+
azure.subscription.webService.appsite.virtualNetworkConnection.isSwift 11.4.32
1186+
azure.subscription.webService.appsite.virtualNetworkConnection.name 11.4.32
1187+
azure.subscription.webService.appsite.virtualNetworkConnection.resyncRequired 11.4.32
1188+
azure.subscription.webService.appsite.virtualNetworkConnection.vnetResourceId 11.4.32
1189+
azure.subscription.webService.appsite.virtualNetworkConnections 11.4.32
11301190
azure.subscription.webService.appsiteauthsettings 9.0.1
11311191
azure.subscription.webService.appsiteauthsettings.id 9.0.1
11321192
azure.subscription.webService.appsiteauthsettings.kind 9.0.1
@@ -1165,6 +1225,20 @@ azure.subscription.webService.appslot.stack 11.3.85
11651225
azure.subscription.webService.appslot.tags 11.3.85
11661226
azure.subscription.webService.appslot.type 11.3.85
11671227
azure.subscription.webService.availableRuntimes 9.0.1
1228+
azure.subscription.webService.certificate 11.4.32
1229+
azure.subscription.webService.certificate.expirationDate 11.4.32
1230+
azure.subscription.webService.certificate.hostNames 11.4.32
1231+
azure.subscription.webService.certificate.id 11.4.32
1232+
azure.subscription.webService.certificate.issueDate 11.4.32
1233+
azure.subscription.webService.certificate.issuer 11.4.32
1234+
azure.subscription.webService.certificate.location 11.4.32
1235+
azure.subscription.webService.certificate.name 11.4.32
1236+
azure.subscription.webService.certificate.properties 11.4.32
1237+
azure.subscription.webService.certificate.subjectName 11.4.32
1238+
azure.subscription.webService.certificate.tags 11.4.32
1239+
azure.subscription.webService.certificate.thumbprint 11.4.32
1240+
azure.subscription.webService.certificate.valid 11.4.32
1241+
azure.subscription.webService.certificates 11.4.32
11681242
azure.subscription.webService.function 11.3.3
11691243
azure.subscription.webService.function.id 11.3.3
11701244
azure.subscription.webService.function.kind 11.3.3

‎providers/azure/resources/batch.go‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func (a *mqlAzureSubscriptionBatchService) accounts() ([]any, error) {
116116
return res, nil
117117
}
118118

119-
func batchAccountToMql(runtime *plugin.Runtime, account *armbatch.Account) (*mqlAzureSubscriptionBatchServiceAccount, error) {
119+
func createBatchAccountRawData(account *armbatch.Account) (map[string]*llx.RawData, error) {
120120
identityData := llx.NilData
121121
if account.Identity != nil {
122122
identity, err := convert.JsonToDict(account.Identity)
@@ -258,7 +258,7 @@ func batchAccountToMql(runtime *plugin.Runtime, account *armbatch.Account) (*mql
258258
}
259259
}
260260

261-
res, err := CreateResource(runtime, ResourceAzureSubscriptionBatchServiceAccount, map[string]*llx.RawData{
261+
return map[string]*llx.RawData{
262262
"id": llx.StringDataPtr(account.ID),
263263
"name": llx.StringDataPtr(account.Name),
264264
"location": llx.StringDataPtr(account.Location),
@@ -283,7 +283,16 @@ func batchAccountToMql(runtime *plugin.Runtime, account *armbatch.Account) (*mql
283283
"keyVaultReference": keyVaultReference,
284284
"networkProfile": networkProfile,
285285
"privateEndpointConnections": privateEndpointConnections,
286-
})
286+
}, nil
287+
}
288+
289+
func batchAccountToMql(runtime *plugin.Runtime, account *armbatch.Account) (*mqlAzureSubscriptionBatchServiceAccount, error) {
290+
rawData, err := createBatchAccountRawData(account)
291+
if err != nil {
292+
return nil, err
293+
}
294+
295+
res, err := CreateResource(runtime, ResourceAzureSubscriptionBatchServiceAccount, rawData)
287296
if err != nil {
288297
return nil, err
289298
}
@@ -349,7 +358,7 @@ func (a *mqlAzureSubscriptionBatchServiceAccount) diagnosticSettings() ([]any, e
349358
return getDiagnosticSettings(a.Id.Data, a.MqlRuntime, conn)
350359
}
351360

352-
func batchPoolToMql(runtime *plugin.Runtime, pool *armbatch.Pool) (*mqlAzureSubscriptionBatchServiceAccountPool, error) {
361+
func createBatchPoolRawData(pool *armbatch.Pool) (map[string]*llx.RawData, error) {
353362
identityData := llx.NilData
354363
if pool.Identity != nil {
355364
if dict, err := convert.JsonToDict(pool.Identity); err != nil {
@@ -399,20 +408,27 @@ func batchPoolToMql(runtime *plugin.Runtime, pool *armbatch.Pool) (*mqlAzureSubs
399408
}
400409
}
401410

402-
etagData := llx.StringDataPtr(pool.Etag)
403-
404-
resource, err := CreateResource(runtime, ResourceAzureSubscriptionBatchServiceAccountPool, map[string]*llx.RawData{
411+
return map[string]*llx.RawData{
405412
"id": llx.StringDataPtr(pool.ID),
406413
"name": llx.StringDataPtr(pool.Name),
407414
"type": llx.StringDataPtr(pool.Type),
408-
"etag": etagData,
415+
"etag": llx.StringDataPtr(pool.Etag),
409416
"identity": identityData,
410417
"properties": propertiesData,
411418
"deploymentConfiguration": deploymentConfigurationData,
412419
"virtualMachineConfiguration": virtualMachineConfigurationData,
413420
"vmSize": vmSizeData,
414421
"provisioningState": provisioningStateData,
415-
})
422+
}, nil
423+
}
424+
425+
func batchPoolToMql(runtime *plugin.Runtime, pool *armbatch.Pool) (*mqlAzureSubscriptionBatchServiceAccountPool, error) {
426+
rawData, err := createBatchPoolRawData(pool)
427+
if err != nil {
428+
return nil, err
429+
}
430+
431+
resource, err := CreateResource(runtime, ResourceAzureSubscriptionBatchServiceAccountPool, rawData)
416432
if err != nil {
417433
return nil, err
418434
}

0 commit comments

Comments
 (0)