Skip to content

Commit

Permalink
fix: Use ParentResourceFieldResolver instead of ParentIDResolver (#2125)
Browse files Browse the repository at this point in the history

#### Summary

Fixes Azure plugin to get the parent ID from the `id` column of the parent instead of using the CQ ID of the parent 

<!--
  • Loading branch information
erezrokah committed Sep 29, 2022
1 parent 9f06971 commit 5039788
Show file tree
Hide file tree
Showing 52 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion plugins/source/azure/codegen/recipes/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func initColumns(table *codegen.TableDefinition, definition resourceDefinition)
columns = append(columns, codegen.ColumnDefinition{
Name: definition.parent,
Type: schema.TypeUUID,
Resolver: "schema.ParentIDResolver",
Resolver: `schema.ParentResourceFieldResolver("id")`,
})
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func customDomains() *schema.Table {
{
Name: "cdn_endpoint_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "host_name",
Expand Down
2 changes: 1 addition & 1 deletion plugins/source/azure/resources/services/cdn/endpoints.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func endpoints() *schema.Table {
{
Name: "cdn_profile_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "host_name",
Expand Down
2 changes: 1 addition & 1 deletion plugins/source/azure/resources/services/cdn/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func routes() *schema.Table {
{
Name: "cdn_endpoint_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "custom_domains",
Expand Down
2 changes: 1 addition & 1 deletion plugins/source/azure/resources/services/cdn/rule_sets.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func ruleSets() *schema.Table {
{
Name: "cdn_profile_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "provisioning_state",
Expand Down
2 changes: 1 addition & 1 deletion plugins/source/azure/resources/services/cdn/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func rules() *schema.Table {
{
Name: "cdn_rule_set_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "order",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func securityPolicies() *schema.Table {
{
Name: "cdn_profile_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "provisioning_state",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func instanceViews() *schema.Table {
{
Name: "compute_virtual_machine_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "platform_update_domain",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func virtualMachineExtensions() *schema.Table {
{
Name: "compute_virtual_machine_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "force_update_tag",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func replications() *schema.Table {
{
Name: "container_registry_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "provisioning_state",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func mongoDBDatabases() *schema.Table {
{
Name: "cosmosdb_account_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "resource",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func sQLDatabases() *schema.Table {
{
Name: "cosmosdb_account_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "resource",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func networkRuleSets() *schema.Table {
{
Name: "eventhub_namespace_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "trusted_service_access_enabled",
Expand Down
2 changes: 1 addition & 1 deletion plugins/source/azure/resources/services/keyvault/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func keys() *schema.Table {
{
Name: "keyvault_vault_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "kid",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func secrets() *schema.Table {
{
Name: "keyvault_vault_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "id",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func diagnosticSettings() *schema.Table {
{
Name: "logic_workflow_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "storage_account_id",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func configurations() *schema.Table {
{
Name: "mariadb_server_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "value",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func diagnosticSettings() *schema.Table {
{
Name: "monitor_resource_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "storage_account_id",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func configurations() *schema.Table {
{
Name: "mysql_server_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "value",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func flowLogs() *schema.Table {
{
Name: "network_watcher_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "target_resource_id",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func virtualNetworkGatewayConnections() *schema.Table {
{
Name: "network_virtual_network_gateway_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "authorization_key",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func virtualNetworkGateways() *schema.Table {
{
Name: "network_virtual_network_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "extended_location",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func configurations() *schema.Table {
{
Name: "postgresql_server_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "value",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func firewallRules() *schema.Table {
{
Name: "postgresql_server_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "start_ip_address",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func accessKeys() *schema.Table {
{
Name: "servicebus_authorization_rule_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "primary_connection_string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func authorizationRules() *schema.Table {
{
Name: "servicebus_topic_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "rights",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func topics() *schema.Table {
{
Name: "servicebus_namespace_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "size_in_bytes",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func backupLongTermRetentionPolicies() *schema.Table {
{
Name: "sql_database_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "weekly_retention",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func databaseBlobAuditingPolicies() *schema.Table {
{
Name: "sql_database_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "kind",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func databaseThreatDetectionPolicies() *schema.Table {
{
Name: "sql_database_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "location",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func databaseVulnerabilityAssessmentScans() *schema.Table {
{
Name: "sql_database_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "scan_id",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func databaseVulnerabilityAssessments() *schema.Table {
{
Name: "sql_database_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "storage_container_path",
Expand Down
2 changes: 1 addition & 1 deletion plugins/source/azure/resources/services/sql/databases.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func databases() *schema.Table {
{
Name: "sql_server_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "sku",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func encryptionProtectors() *schema.Table {
{
Name: "sql_server_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "kind",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func firewallRules() *schema.Table {
{
Name: "sql_server_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "kind",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func managedDatabaseVulnerabilityAssessmentScans() *schema.Table {
{
Name: "sql_managed_database_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "scan_id",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func managedDatabaseVulnerabilityAssessments() *schema.Table {
{
Name: "sql_managed_database_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "storage_container_path",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func managedDatabases() *schema.Table {
{
Name: "sql_managed_instance_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "collation",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func managedInstanceEncryptionProtectors() *schema.Table {
{
Name: "sql_managed_instance_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "kind",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func managedInstanceVulnerabilityAssessments() *schema.Table {
{
Name: "sql_managed_instance_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "storage_container_path",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func serverAdmins() *schema.Table {
{
Name: "sql_server_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "administrator_type",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func serverBlobAuditingPolicies() *schema.Table {
{
Name: "sql_server_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "state",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func serverDevOpsAuditingSettings() *schema.Table {
{
Name: "sql_server_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "system_data",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func serverSecurityAlertPolicies() *schema.Table {
{
Name: "sql_server_id",
Type: schema.TypeUUID,
Resolver: schema.ParentIDResolver,
Resolver: schema.ParentResourceFieldResolver("id"),
},
{
Name: "state",
Expand Down

0 comments on commit 5039788

Please sign in to comment.