From 30ddb3402b718930fd09b528267b953cd6a78e72 Mon Sep 17 00:00:00 2001 From: Ved misra <47312748+misraved@users.noreply.github.com> Date: Wed, 15 Mar 2023 00:11:39 +0530 Subject: [PATCH] Recompile plugin with steampipe-plugin-sdk v5.2.0 (#574) Co-authored-by: ParthaI --- azure/common_columns.go | 6 +- azure/connection_config.go | 4 +- azure/errors.go | 2 +- azure/monitoring_metric.go | 6 +- azure/plugin.go | 4 +- azure/service.go | 2 +- azure/table_azure_ad_group.go | 6 +- azure/table_azure_ad_service_principal.go | 6 +- azure/table_azure_ad_user.go | 6 +- azure/table_azure_api_management.go | 14 +- azure/table_azure_app_configuration.go | 10 +- azure/table_azure_app_service_environment.go | 14 +- azure/table_azure_app_service_function_app.go | 14 +- azure/table_azure_app_service_plan.go | 14 +- azure/table_azure_app_service_web_app.go | 14 +- azure/table_azure_application_gateway.go | 10 +- .../table_azure_application_security_group.go | 14 +- azure/table_azure_automation_account.go | 14 +- azure/table_azure_automation_variable.go | 16 +- azure/table_azure_batch_account.go | 14 +- azure/table_azure_cognitive_account.go | 10 +- azure/table_azure_compute_availability_set.go | 14 +- azure/table_azure_compute_disk.go | 14 +- azure/table_azure_compute_disk_access.go | 10 +- ...table_azure_compute_disk_encryption_set.go | 14 +- ...able_azure_compute_disk_metric_read_ops.go | 6 +- ...zure_compute_disk_metric_read_ops_daily.go | 6 +- ...ure_compute_disk_metric_read_ops_hourly.go | 6 +- ...ble_azure_compute_disk_metric_write_ops.go | 6 +- ...ure_compute_disk_metric_write_ops_daily.go | 6 +- ...re_compute_disk_metric_write_ops_hourly.go | 6 +- azure/table_azure_compute_image.go | 14 +- azure/table_azure_compute_resource_sku.go | 10 +- azure/table_azure_compute_snapshot.go | 14 +- azure/table_azure_compute_ssh_key.go | 14 +- azure/table_azure_compute_virtual_machine.go | 14 +- ..._virtual_machine_metric_cpu_utilization.go | 6 +- ...al_machine_metric_cpu_utilization_daily.go | 6 +- ...l_machine_metric_cpu_utilization_hourly.go | 6 +- ...azure_compute_virtual_machine_scale_set.go | 10 +- ...ual_machine_scale_set_network_interface.go | 6 +- ...re_compute_virtual_machine_scale_set_vm.go | 12 +- azure/table_azure_container_registry.go | 14 +- azure/table_azure_cosmosdb_account.go | 12 +- azure/table_azure_cosmosdb_mongo_database.go | 14 +- azure/table_azure_cosmosdb_sql_database.go | 14 +- azure/table_azure_data_factory.go | 14 +- azure/table_azure_data_factory_dataset.go | 16 +- azure/table_azure_data_factory_pipeline.go | 16 +- ...table_azure_data_lake_analytics_account.go | 14 +- azure/table_azure_data_lake_store.go | 14 +- azure/table_azure_databox_edge_device.go | 10 +- azure/table_azure_diagnostic_setting.go | 10 +- azure/table_azure_eventgrid_domain.go | 10 +- azure/table_azure_eventgrid_topic.go | 10 +- azure/table_azure_eventhub_namespace.go | 10 +- azure/table_azure_express_route_circuit.go | 14 +- azure/table_azure_firewall.go | 14 +- azure/table_azure_frontdoor.go | 10 +- azure/table_azure_hdinsight_cluster.go | 10 +- azure/table_azure_healthcare_service.go | 10 +- azure/table_azure_hpc_cache.go | 10 +- azure/table_azure_hybrid_compute_machine.go | 10 +- ...ure_hybrid_kubernetes_connected_cluster.go | 10 +- azure/table_azure_iothub.go | 14 +- azure/table_azure_iothub_dps.go | 10 +- azure/table_azure_key_vault.go | 14 +- azure/table_azure_key_vault_deleted_vault.go | 14 +- azure/table_azure_key_vault_key.go | 16 +- azure/table_azure_key_vault_key_version.go | 10 +- ..._vault_managed_hardware_security_module.go | 14 +- azure/table_azure_key_vault_secret.go | 14 +- azure/table_azure_kubernetes_cluster.go | 14 +- azure/table_azure_kusto_cluster.go | 10 +- azure/table_azure_lb.go | 14 +- azure/table_azure_lb_backend_address_pool.go | 16 +- azure/table_azure_lb_nat_rule.go | 16 +- azure/table_azure_lb_outbound_rule.go | 16 +- azure/table_azure_lb_probe.go | 16 +- azure/table_azure_lb_rule.go | 16 +- azure/table_azure_location.go | 8 +- azure/table_azure_log_alert.go | 12 +- azure/table_azure_log_profile.go | 10 +- azure/table_azure_logic_app_workflow.go | 14 +- .../table_azure_machine_learning_workspace.go | 10 +- azure/table_azure_management_group.go | 8 +- azure/table_azure_management_lock.go | 14 +- azure/table_azure_mariadb_server.go | 12 +- azure/table_azure_mssql_elasticpool.go | 14 +- azure/table_azure_mssql_managed_instance.go | 14 +- azure/table_azure_mssql_virtual_machine.go | 10 +- azure/table_azure_mysql_flexible_server.go | 14 +- azure/table_azure_mysql_server.go | 12 +- azure/table_azure_nat_gateway.go | 14 +- azure/table_azure_network_interface.go | 14 +- azure/table_azure_network_security_group.go | 14 +- azure/table_azure_network_watcher.go | 12 +- azure/table_azure_network_watcher_flow_log.go | 16 +- azure/table_azure_policy_assignment.go | 12 +- azure/table_azure_policy_definition.go | 10 +- azure/table_azure_postgresql_server.go | 12 +- azure/table_azure_provider.go | 12 +- azure/table_azure_public_ip.go | 14 +- azure/table_azure_recovery_services_vault.go | 14 +- azure/table_azure_redis_cache.go | 14 +- azure/table_azure_resource_group.go | 12 +- azure/table_azure_resource_link.go | 12 +- azure/table_azure_role_assignment.go | 16 +- azure/table_azure_role_definition.go | 12 +- azure/table_azure_route_table.go | 14 +- azure/table_azure_search_service.go | 14 +- ...azure_security_center_auto_provisioning.go | 12 +- .../table_azure_security_center_automation.go | 14 +- azure/table_azure_security_center_contact.go | 12 +- ...curity_center_jit_network_access_policy.go | 10 +- azure/table_azure_security_center_setting.go | 12 +- ...le_azure_security_center_sub_assessment.go | 10 +- ...re_security_center_subscription_pricing.go | 10 +- azure/table_azure_service_fabric_cluster.go | 10 +- azure/table_azure_servicebus_namespace.go | 14 +- azure/table_azure_signalr_service.go | 10 +- azure/table_azure_spring_cloud_service.go | 10 +- azure/table_azure_sql_database.go | 14 +- azure/table_azure_sql_server.go | 14 +- azure/table_azure_storage_account.go | 14 +- azure/table_azure_storage_blob.go | 12 +- azure/table_azure_storage_blob_service.go | 12 +- azure/table_azure_storage_container.go | 16 +- azure/table_azure_storage_queue.go | 16 +- azure/table_azure_storage_share_file.go | 16 +- azure/table_azure_storage_sync.go | 10 +- azure/table_azure_storage_table.go | 16 +- azure/table_azure_storage_table_service.go | 12 +- azure/table_azure_stream_analytics_job.go | 14 +- azure/table_azure_subnet.go | 16 +- azure/table_azure_subscription.go | 6 +- azure/table_azure_synapse_workspace.go | 10 +- azure/table_azure_tenant.go | 6 +- azure/table_azure_virtual_network.go | 14 +- azure/table_azure_virtual_network_gateway.go | 14 +- azure/utils.go | 2 +- go.mod | 83 ++++-- go.sum | 259 ++++++++---------- main.go | 2 +- 144 files changed, 989 insertions(+), 993 deletions(-) diff --git a/azure/common_columns.go b/azure/common_columns.go index 7cd1968d..f48326a6 100644 --- a/azure/common_columns.go +++ b/azure/common_columns.go @@ -3,9 +3,9 @@ package azure import ( "context" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) // column definitions for the common columns diff --git a/azure/connection_config.go b/azure/connection_config.go index 08311830..2e984e4d 100644 --- a/azure/connection_config.go +++ b/azure/connection_config.go @@ -1,8 +1,8 @@ package azure import ( - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/schema" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/schema" ) type azureConfig struct { diff --git a/azure/errors.go b/azure/errors.go index 9a79d7c2..3150da07 100644 --- a/azure/errors.go +++ b/azure/errors.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) // isNotFoundError:: function which returns an ErrorPredicate for Azure API calls diff --git a/azure/monitoring_metric.go b/azure/monitoring_metric.go index 8062ae93..61465f91 100644 --- a/azure/monitoring_metric.go +++ b/azure/monitoring_metric.go @@ -6,9 +6,9 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2021-04-01-preview/insights" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) type monitoringMetric struct { diff --git a/azure/plugin.go b/azure/plugin.go index 33773d0a..5dceebbf 100644 --- a/azure/plugin.go +++ b/azure/plugin.go @@ -3,8 +3,8 @@ package azure import ( "context" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) const pluginName = "steampipe-plugin-azure" diff --git a/azure/service.go b/azure/service.go index bb600fb8..8ba06dea 100644 --- a/azure/service.go +++ b/azure/service.go @@ -17,7 +17,7 @@ import ( "github.com/Azure/go-autorest/autorest/azure/auth" "github.com/Azure/go-autorest/autorest/azure/cli" "github.com/turbot/go-kit/types" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) // Session info diff --git a/azure/table_azure_ad_group.go b/azure/table_azure_ad_group.go index 3d2897ce..bfd6507e 100644 --- a/azure/table_azure_ad_group.go +++ b/azure/table_azure_ad_group.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION diff --git a/azure/table_azure_ad_service_principal.go b/azure/table_azure_ad_service_principal.go index c4496766..dd0f0db3 100644 --- a/azure/table_azure_ad_service_principal.go +++ b/azure/table_azure_ad_service_principal.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION diff --git a/azure/table_azure_ad_user.go b/azure/table_azure_ad_user.go index 6ccbe117..bb73cbb2 100644 --- a/azure/table_azure_ad_user.go +++ b/azure/table_azure_ad_user.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION diff --git a/azure/table_azure_api_management.go b/azure/table_azure_api_management.go index d4472e94..b5325393 100644 --- a/azure/table_azure_api_management.go +++ b/azure/table_azure_api_management.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -314,7 +314,7 @@ func listAPIManagements(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr d.StreamListItem(ctx, apiManagement) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -330,7 +330,7 @@ func listAPIManagements(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr d.StreamListItem(ctx, apiManagement) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -344,8 +344,8 @@ func listAPIManagements(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr func getAPIManagement(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAPIManagement") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // resourceGroupName can't be empty // Error: pq: rpc error: code = Unknown desc = apimanagement.ServiceClient#Get: Invalid input: autorest/validation: validation failed: parameter=serviceName diff --git a/azure/table_azure_app_configuration.go b/azure/table_azure_app_configuration.go index 8d7ec1ca..609863dc 100644 --- a/azure/table_azure_app_configuration.go +++ b/azure/table_azure_app_configuration.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/appconfiguration/mgmt/2020-06-01/appconfiguration" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -178,8 +178,8 @@ func listAppConfigurations(ctx context.Context, d *plugin.QueryData, _ *plugin.H func getAppConfiguration(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAppConfiguration") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_app_service_environment.go b/azure/table_azure_app_service_environment.go index 590910fe..ebe5811c 100644 --- a/azure/table_azure_app_service_environment.go +++ b/azure/table_azure_app_service_environment.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2020-06-01/web" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -187,7 +187,7 @@ func listAppServiceEnvironments(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, environment) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -202,7 +202,7 @@ func listAppServiceEnvironments(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, environment) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -216,8 +216,8 @@ func listAppServiceEnvironments(ctx context.Context, d *plugin.QueryData, _ *plu func getAppServiceEnvironment(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAppServiceEnvironment") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // resourceGroupName can't be empty // Error: pq: rpc error: code = Unknown desc = web.AppServiceEnvironmentsClient#Get: Invalid input: autorest/validation: validation failed: parameter=resourceGroupName diff --git a/azure/table_azure_app_service_function_app.go b/azure/table_azure_app_service_function_app.go index 2577f32d..ef66e007 100644 --- a/azure/table_azure_app_service_function_app.go +++ b/azure/table_azure_app_service_function_app.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2020-06-01/web" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -194,7 +194,7 @@ func listAppServiceFunctionApps(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, functionApp) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -212,7 +212,7 @@ func listAppServiceFunctionApps(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, functionApp) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -227,8 +227,8 @@ func listAppServiceFunctionApps(ctx context.Context, d *plugin.QueryData, _ *plu func getAppServiceFunctionApp(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAppServiceFunctionApp") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Error: pq: rpc error: code = Unknown desc = web.AppsClient#Get: Invalid input: autorest/validation: validation failed: parameter=resourceGroupName // constraint=MinLength value="" details: value length must be greater than or equal to 1 diff --git a/azure/table_azure_app_service_plan.go b/azure/table_azure_app_service_plan.go index a95b3453..ee4ee937 100644 --- a/azure/table_azure_app_service_plan.go +++ b/azure/table_azure_app_service_plan.go @@ -6,10 +6,10 @@ import ( "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2020-06-01/web" "github.com/turbot/go-kit/types" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -203,7 +203,7 @@ func listAppServicePlans(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd d.StreamListItem(ctx, servicePlan) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -218,7 +218,7 @@ func listAppServicePlans(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd d.StreamListItem(ctx, servicePlan) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -231,8 +231,8 @@ func listAppServicePlans(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd func getAppServicePlan(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAppServicePlan") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // resourceGroupName can't be empty // Error: pq: rpc error: code = Unknown desc = web.AppServicePlansClient#Get: Invalid input: autorest/validation: validation failed: parameter=resourceGroupName diff --git a/azure/table_azure_app_service_web_app.go b/azure/table_azure_app_service_web_app.go index 923b9d77..a1c860cb 100644 --- a/azure/table_azure_app_service_web_app.go +++ b/azure/table_azure_app_service_web_app.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2020-06-01/web" "github.com/turbot/go-kit/types" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -221,7 +221,7 @@ func listAppServiceWebApps(ctx context.Context, d *plugin.QueryData, _ *plugin.H } // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -239,7 +239,7 @@ func listAppServiceWebApps(ctx context.Context, d *plugin.QueryData, _ *plugin.H } // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -252,8 +252,8 @@ func listAppServiceWebApps(ctx context.Context, d *plugin.QueryData, _ *plugin.H func getAppServiceWebApp(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAppServiceWebApp") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Error: pq: rpc error: code = Unknown desc = web.AppsClient#Get: Invalid input: autorest/validation: validation failed: parameter=resourceGroupName // constraint=MinLength value="" details: value length must be greater than or equal to 1 diff --git a/azure/table_azure_application_gateway.go b/azure/table_azure_application_gateway.go index 050bc829..ff6b3648 100644 --- a/azure/table_azure_application_gateway.go +++ b/azure/table_azure_application_gateway.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -332,8 +332,8 @@ func listApplicationGateways(ctx context.Context, d *plugin.QueryData, _ *plugin func getApplicationGateway(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getApplicationGateway") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_application_security_group.go b/azure/table_azure_application_security_group.go index 0d3e5af0..3db3dd0e 100644 --- a/azure/table_azure_application_security_group.go +++ b/azure/table_azure_application_security_group.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -118,7 +118,7 @@ func listApplicationSecurityGroups(ctx context.Context, d *plugin.QueryData, _ * d.StreamListItem(ctx, applicationSecurityGroup) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -133,7 +133,7 @@ func listApplicationSecurityGroups(ctx context.Context, d *plugin.QueryData, _ * d.StreamListItem(ctx, applicationSecurityGroup) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -146,8 +146,8 @@ func listApplicationSecurityGroups(ctx context.Context, d *plugin.QueryData, _ * func getApplicationSecurityGroup(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getApplicationSecurityGroup") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_automation_account.go b/azure/table_azure_automation_account.go index 593aa715..d70c79c7 100644 --- a/azure/table_azure_automation_account.go +++ b/azure/table_azure_automation_account.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2019-06-01/automation" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -156,7 +156,7 @@ func listAutomationAccounts(ctx context.Context, d *plugin.QueryData, _ *plugin. d.StreamListItem(ctx, account) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -172,7 +172,7 @@ func listAutomationAccounts(ctx context.Context, d *plugin.QueryData, _ *plugin. d.StreamListItem(ctx, account) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -184,8 +184,8 @@ func listAutomationAccounts(ctx context.Context, d *plugin.QueryData, _ *plugin. func getAutomationAccount(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_automation_variable.go b/azure/table_azure_automation_variable.go index 7a4802c7..194d2370 100644 --- a/azure/table_azure_automation_variable.go +++ b/azure/table_azure_automation_variable.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2019-06-01/automation" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -144,7 +144,7 @@ func listAutomationVariables(ctx context.Context, d *plugin.QueryData, h *plugin d.StreamListItem(ctx, &VariableDetails{*accountName, variable}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -160,7 +160,7 @@ func listAutomationVariables(ctx context.Context, d *plugin.QueryData, h *plugin d.StreamListItem(ctx, &VariableDetails{*accountName, variable}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -172,9 +172,9 @@ func listAutomationVariables(ctx context.Context, d *plugin.QueryData, h *plugin func getAutomationVariable(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { - accountName := d.KeyColumnQuals["account_name"].GetStringValue() - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + accountName := d.EqualsQuals["account_name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_batch_account.go b/azure/table_azure_batch_account.go index 4115b5ee..c69ab12c 100644 --- a/azure/table_azure_batch_account.go +++ b/azure/table_azure_batch_account.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2020-09-01/batch" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -197,7 +197,7 @@ func listBatchAccounts(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra d.StreamListItem(ctx, account) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -211,7 +211,7 @@ func listBatchAccounts(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra d.StreamListItem(ctx, account) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -235,8 +235,8 @@ func getBatchAccount(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrate batchAccountClient := batch.NewAccountClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) batchAccountClient.Authorizer = session.Authorizer - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provide if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_cognitive_account.go b/azure/table_azure_cognitive_account.go index a029cbe8..f40aa143 100644 --- a/azure/table_azure_cognitive_account.go +++ b/azure/table_azure_cognitive_account.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/mgmt/2021-04-30/cognitiveservices" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -297,8 +297,8 @@ func listCognitiveAccounts(ctx context.Context, d *plugin.QueryData, _ *plugin.H func getCognitiveAccount(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getCognitiveAccount") - accountName := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + accountName := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if accountName == "" || resourceGroup == "" { diff --git a/azure/table_azure_compute_availability_set.go b/azure/table_azure_compute_availability_set.go index a4c5bea6..eb7a649a 100644 --- a/azure/table_azure_compute_availability_set.go +++ b/azure/table_azure_compute_availability_set.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION //// @@ -148,7 +148,7 @@ func listAzureComputeAvailabilitySets(ctx context.Context, d *plugin.QueryData, d.StreamListItem(ctx, availabilitySet) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -163,7 +163,7 @@ func listAzureComputeAvailabilitySets(ctx context.Context, d *plugin.QueryData, d.StreamListItem(ctx, availabilitySet) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -177,8 +177,8 @@ func listAzureComputeAvailabilitySets(ctx context.Context, d *plugin.QueryData, func getAzureComputeAvailabilitySet(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAzureComputeAvailabilitySet") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_compute_disk.go b/azure/table_azure_compute_disk.go index 4e9f9618..cfdfda13 100644 --- a/azure/table_azure_compute_disk.go +++ b/azure/table_azure_compute_disk.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION //// @@ -314,7 +314,7 @@ func listAzureComputeDisks(ctx context.Context, d *plugin.QueryData, _ *plugin.H d.StreamListItem(ctx, disk) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -329,7 +329,7 @@ func listAzureComputeDisks(ctx context.Context, d *plugin.QueryData, _ *plugin.H d.StreamListItem(ctx, disk) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -343,8 +343,8 @@ func listAzureComputeDisks(ctx context.Context, d *plugin.QueryData, _ *plugin.H func getAzureComputeDisk(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAzureComputeDisk") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_compute_disk_access.go b/azure/table_azure_compute_disk_access.go index d6041a99..44215214 100644 --- a/azure/table_azure_compute_disk_access.go +++ b/azure/table_azure_compute_disk_access.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -154,8 +154,8 @@ func listAzureComputeDiskAccesses(ctx context.Context, d *plugin.QueryData, _ *p func getAzureComputeDiskAccess(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAzureComputeDiskAccess") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provide if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_compute_disk_encryption_set.go b/azure/table_azure_compute_disk_encryption_set.go index 40330cde..79cf442e 100644 --- a/azure/table_azure_compute_disk_encryption_set.go +++ b/azure/table_azure_compute_disk_encryption_set.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION //// @@ -148,7 +148,7 @@ func listAzureComputeDiskEncryptionSets(ctx context.Context, d *plugin.QueryData d.StreamListItem(ctx, diskEncryptionSet) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -163,7 +163,7 @@ func listAzureComputeDiskEncryptionSets(ctx context.Context, d *plugin.QueryData d.StreamListItem(ctx, diskEncryptionSet) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -177,8 +177,8 @@ func listAzureComputeDiskEncryptionSets(ctx context.Context, d *plugin.QueryData func getAzureComputeDiskEncryptionSet(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAzureComputeDiskEncryptionSet") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_compute_disk_metric_read_ops.go b/azure/table_azure_compute_disk_metric_read_ops.go index cbcaf351..5ff4d250 100644 --- a/azure/table_azure_compute_disk_metric_read_ops.go +++ b/azure/table_azure_compute_disk_metric_read_ops.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION diff --git a/azure/table_azure_compute_disk_metric_read_ops_daily.go b/azure/table_azure_compute_disk_metric_read_ops_daily.go index 75e84a8a..5f359ffb 100644 --- a/azure/table_azure_compute_disk_metric_read_ops_daily.go +++ b/azure/table_azure_compute_disk_metric_read_ops_daily.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION diff --git a/azure/table_azure_compute_disk_metric_read_ops_hourly.go b/azure/table_azure_compute_disk_metric_read_ops_hourly.go index 53a69458..4a18617e 100644 --- a/azure/table_azure_compute_disk_metric_read_ops_hourly.go +++ b/azure/table_azure_compute_disk_metric_read_ops_hourly.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION diff --git a/azure/table_azure_compute_disk_metric_write_ops.go b/azure/table_azure_compute_disk_metric_write_ops.go index b48708d6..da040dc8 100644 --- a/azure/table_azure_compute_disk_metric_write_ops.go +++ b/azure/table_azure_compute_disk_metric_write_ops.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION diff --git a/azure/table_azure_compute_disk_metric_write_ops_daily.go b/azure/table_azure_compute_disk_metric_write_ops_daily.go index 662f975c..0eb1ddb9 100644 --- a/azure/table_azure_compute_disk_metric_write_ops_daily.go +++ b/azure/table_azure_compute_disk_metric_write_ops_daily.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION diff --git a/azure/table_azure_compute_disk_metric_write_ops_hourly.go b/azure/table_azure_compute_disk_metric_write_ops_hourly.go index 2f6a0210..20edf0c3 100644 --- a/azure/table_azure_compute_disk_metric_write_ops_hourly.go +++ b/azure/table_azure_compute_disk_metric_write_ops_hourly.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION diff --git a/azure/table_azure_compute_image.go b/azure/table_azure_compute_image.go index 393ebceb..f51d56ed 100644 --- a/azure/table_azure_compute_image.go +++ b/azure/table_azure_compute_image.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -187,7 +187,7 @@ func listComputeImages(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra d.StreamListItem(ctx, image) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -202,7 +202,7 @@ func listComputeImages(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra d.StreamListItem(ctx, image) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -216,8 +216,8 @@ func listComputeImages(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra func getComputeImage(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getComputeImage") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_compute_resource_sku.go b/azure/table_azure_compute_resource_sku.go index 41a5e24e..0dd1cd1f 100644 --- a/azure/table_azure_compute_resource_sku.go +++ b/azure/table_azure_compute_resource_sku.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-09-01/skus" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -165,7 +165,7 @@ func listResourceSkus(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrat d.StreamListItem(ctx, &skuInfo{subscriptionID, sku}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -180,7 +180,7 @@ func listResourceSkus(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrat d.StreamListItem(ctx, &skuInfo{subscriptionID, sku}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } diff --git a/azure/table_azure_compute_snapshot.go b/azure/table_azure_compute_snapshot.go index ab166fbd..07f2d862 100644 --- a/azure/table_azure_compute_snapshot.go +++ b/azure/table_azure_compute_snapshot.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION //// @@ -267,7 +267,7 @@ func listAzureComputeSnapshots(ctx context.Context, d *plugin.QueryData, _ *plug d.StreamListItem(ctx, snapshot) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -282,7 +282,7 @@ func listAzureComputeSnapshots(ctx context.Context, d *plugin.QueryData, _ *plug d.StreamListItem(ctx, snapshot) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -296,8 +296,8 @@ func listAzureComputeSnapshots(ctx context.Context, d *plugin.QueryData, _ *plug func getAzureComputeSnapshot(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAzureComputeSnapshot") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_compute_ssh_key.go b/azure/table_azure_compute_ssh_key.go index 60b9aee5..491feca6 100644 --- a/azure/table_azure_compute_ssh_key.go +++ b/azure/table_azure_compute_ssh_key.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION //// @@ -108,7 +108,7 @@ func listAzureComputeSshKeys(ctx context.Context, d *plugin.QueryData, _ *plugin d.StreamListItem(ctx, key) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -123,7 +123,7 @@ func listAzureComputeSshKeys(ctx context.Context, d *plugin.QueryData, _ *plugin d.StreamListItem(ctx, key) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -137,8 +137,8 @@ func listAzureComputeSshKeys(ctx context.Context, d *plugin.QueryData, _ *plugin func getAzureComputeSshKey(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAzureComputeSshKey") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQualString("name") + resourceGroup := d.EqualsQualString("resource_group") session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_compute_virtual_machine.go b/azure/table_azure_compute_virtual_machine.go index c96529a3..8501a4c3 100644 --- a/azure/table_azure_compute_virtual_machine.go +++ b/azure/table_azure_compute_virtual_machine.go @@ -10,9 +10,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" "github.com/turbot/go-kit/types" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION //// @@ -410,7 +410,7 @@ func listComputeVirtualMachines(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, virtualMachine) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -425,7 +425,7 @@ func listComputeVirtualMachines(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, virtualMachine) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -439,8 +439,8 @@ func listComputeVirtualMachines(ctx context.Context, d *plugin.QueryData, _ *plu func getComputeVirtualMachine(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAzureComputeVirtualMachine") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_compute_virtual_machine_metric_cpu_utilization.go b/azure/table_azure_compute_virtual_machine_metric_cpu_utilization.go index c0b3d729..e74d06b7 100644 --- a/azure/table_azure_compute_virtual_machine_metric_cpu_utilization.go +++ b/azure/table_azure_compute_virtual_machine_metric_cpu_utilization.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION diff --git a/azure/table_azure_compute_virtual_machine_metric_cpu_utilization_daily.go b/azure/table_azure_compute_virtual_machine_metric_cpu_utilization_daily.go index 122746aa..05057988 100644 --- a/azure/table_azure_compute_virtual_machine_metric_cpu_utilization_daily.go +++ b/azure/table_azure_compute_virtual_machine_metric_cpu_utilization_daily.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION diff --git a/azure/table_azure_compute_virtual_machine_metric_cpu_utilization_hourly.go b/azure/table_azure_compute_virtual_machine_metric_cpu_utilization_hourly.go index ffe745a2..9fe1c941 100644 --- a/azure/table_azure_compute_virtual_machine_metric_cpu_utilization_hourly.go +++ b/azure/table_azure_compute_virtual_machine_metric_cpu_utilization_hourly.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION diff --git a/azure/table_azure_compute_virtual_machine_scale_set.go b/azure/table_azure_compute_virtual_machine_scale_set.go index dddb8395..9a2596f3 100644 --- a/azure/table_azure_compute_virtual_machine_scale_set.go +++ b/azure/table_azure_compute_virtual_machine_scale_set.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -253,8 +253,8 @@ func listAzureComputeVirtualMachineScaleSets(ctx context.Context, d *plugin.Quer func getAzureComputeVirtualMachineScaleSet(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAzureComputeVirtualMachineScaleSet") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() if name == "" || resourceGroup == "" { return nil, nil diff --git a/azure/table_azure_compute_virtual_machine_scale_set_network_interface.go b/azure/table_azure_compute_virtual_machine_scale_set_network_interface.go index c880aa2b..b21e867b 100644 --- a/azure/table_azure_compute_virtual_machine_scale_set_network_interface.go +++ b/azure/table_azure_compute_virtual_machine_scale_set_network_interface.go @@ -7,9 +7,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" "github.com/turbot/go-kit/types" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION diff --git a/azure/table_azure_compute_virtual_machine_scale_set_vm.go b/azure/table_azure_compute_virtual_machine_scale_set_vm.go index e46b0523..6bf60295 100644 --- a/azure/table_azure_compute_virtual_machine_scale_set_vm.go +++ b/azure/table_azure_compute_virtual_machine_scale_set_vm.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -279,9 +279,9 @@ func listAzureComputeVirtualMachineScaleSetVms(ctx context.Context, d *plugin.Qu func getAzureComputeVirtualMachineScaleSetVm(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAzureComputeVirtualMachineScaleSetVm") - scaleSetName := d.KeyColumnQuals["scale_set_name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - instanceId := d.KeyColumnQuals["instance_id"].GetStringValue() + scaleSetName := d.EqualsQuals["scale_set_name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + instanceId := d.EqualsQuals["instance_id"].GetStringValue() if scaleSetName == "" || resourceGroup == "" || instanceId == "" { return nil, nil diff --git a/azure/table_azure_container_registry.go b/azure/table_azure_container_registry.go index a6e8dd73..5cf0a103 100644 --- a/azure/table_azure_container_registry.go +++ b/azure/table_azure_container_registry.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/preview/containerregistry/mgmt/2020-11-01-preview/containerregistry" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -241,7 +241,7 @@ func listContainerRegistries(ctx context.Context, d *plugin.QueryData, _ *plugin d.StreamListItem(ctx, registry) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -256,7 +256,7 @@ func listContainerRegistries(ctx context.Context, d *plugin.QueryData, _ *plugin d.StreamListItem(ctx, registry) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -270,8 +270,8 @@ func listContainerRegistries(ctx context.Context, d *plugin.QueryData, _ *plugin func getContainerRegistry(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getContainerRegistry") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provided if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_cosmosdb_account.go b/azure/table_azure_cosmosdb_account.go index e57ab5b5..48b829c1 100644 --- a/azure/table_azure_cosmosdb_account.go +++ b/azure/table_azure_cosmosdb_account.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/preview/cosmos-db/mgmt/2020-04-01-preview/documentdb" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) type databaseAccountInfo = struct { @@ -280,7 +280,7 @@ func listCosmosDBAccounts(ctx context.Context, d *plugin.QueryData, _ *plugin.Hy d.StreamListItem(ctx, databaseAccountInfo{account, account.Name, resourceGroup}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -298,8 +298,8 @@ func getCosmosDBAccount(ctx context.Context, d *plugin.QueryData, h *plugin.Hydr return nil, err } subscriptionID := session.SubscriptionID - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() documentDBClient := documentdb.NewDatabaseAccountsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) documentDBClient.Authorizer = session.Authorizer diff --git a/azure/table_azure_cosmosdb_mongo_database.go b/azure/table_azure_cosmosdb_mongo_database.go index 8ce49d2f..f2992f2a 100644 --- a/azure/table_azure_cosmosdb_mongo_database.go +++ b/azure/table_azure_cosmosdb_mongo_database.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/preview/cosmos-db/mgmt/2020-04-01-preview/documentdb" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) type mongoDatabaseInfo = struct { @@ -159,7 +159,7 @@ func listCosmosDBMongoDatabases(ctx context.Context, d *plugin.QueryData, h *plu d.StreamLeafListItem(ctx, mongoDatabaseInfo{mongoDatabase, account.Name, mongoDatabase.Name, resourceGroup, account.DatabaseAccount.Location}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -172,9 +172,9 @@ func listCosmosDBMongoDatabases(ctx context.Context, d *plugin.QueryData, h *plu func getCosmosDBMongoDatabase(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getCosmosDBMongoDatabase") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - accountName := d.KeyColumnQuals["account_name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + accountName := d.EqualsQuals["account_name"].GetStringValue() // Length of Account name must be greater than, or equal to 3 // Error: pq: rpc error: code = Unknown desc = documentdb.DatabaseAccountsClient#Get: Invalid input: autorest/validation: validation failed: parameter=accountName diff --git a/azure/table_azure_cosmosdb_sql_database.go b/azure/table_azure_cosmosdb_sql_database.go index f6c9caae..6bc2208c 100644 --- a/azure/table_azure_cosmosdb_sql_database.go +++ b/azure/table_azure_cosmosdb_sql_database.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/preview/cosmos-db/mgmt/2020-04-01-preview/documentdb" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) type sqlDatabaseInfo = struct { @@ -171,7 +171,7 @@ func listCosmosDBSQLDatabases(ctx context.Context, d *plugin.QueryData, h *plugi d.StreamLeafListItem(ctx, sqlDatabaseInfo{sqlDatabase, account.Name, sqlDatabase.Name, resourceGroup, account.DatabaseAccount.Location}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -190,9 +190,9 @@ func getCosmosDBSQLDatabase(ctx context.Context, d *plugin.QueryData, h *plugin. } subscriptionID := session.SubscriptionID - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - accountName := d.KeyColumnQuals["account_name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + accountName := d.EqualsQuals["account_name"].GetStringValue() databaseAccountClient := documentdb.NewDatabaseAccountsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) databaseAccountClient.Authorizer = session.Authorizer diff --git a/azure/table_azure_data_factory.go b/azure/table_azure_data_factory.go index 6954042b..0d4b0345 100644 --- a/azure/table_azure_data_factory.go +++ b/azure/table_azure_data_factory.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/datafactory/mgmt/2018-06-01/datafactory" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -166,7 +166,7 @@ func listDataFactories(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra d.StreamListItem(ctx, factory) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -180,7 +180,7 @@ func listDataFactories(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra d.StreamListItem(ctx, factory) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -204,8 +204,8 @@ func getDataFactory(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateD factoryClient := datafactory.NewFactoriesClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) factoryClient.Authorizer = session.Authorizer - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provide if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_data_factory_dataset.go b/azure/table_azure_data_factory_dataset.go index 6679c79f..7db03dcc 100644 --- a/azure/table_azure_data_factory_dataset.go +++ b/azure/table_azure_data_factory_dataset.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/datafactory/mgmt/2018-06-01/datafactory" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -115,7 +115,7 @@ func listDataFactoryDatasets(ctx context.Context, d *plugin.QueryData, h *plugin d.StreamListItem(ctx, DatasetInfo{dataset, *factoryInfo.Name}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -129,7 +129,7 @@ func listDataFactoryDatasets(ctx context.Context, d *plugin.QueryData, h *plugin d.StreamListItem(ctx, DatasetInfo{dataset, *factoryInfo.Name}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -152,9 +152,9 @@ func getDataFactoryDataset(ctx context.Context, d *plugin.QueryData, _ *plugin.H datasetClient := datafactory.NewDatasetsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) datasetClient.Authorizer = session.Authorizer - datasetName := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - factoryName := d.KeyColumnQuals["factory_name"].GetStringValue() + datasetName := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + factoryName := d.EqualsQuals["factory_name"].GetStringValue() // Return nil, of no input provided if datasetName == "" || resourceGroup == "" || factoryName == "" { diff --git a/azure/table_azure_data_factory_pipeline.go b/azure/table_azure_data_factory_pipeline.go index 91f6ec73..53598f74 100644 --- a/azure/table_azure_data_factory_pipeline.go +++ b/azure/table_azure_data_factory_pipeline.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/datafactory/mgmt/2018-06-01/datafactory" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -164,7 +164,7 @@ func listDataFactoryPipelines(ctx context.Context, d *plugin.QueryData, h *plugi d.StreamListItem(ctx, pipelineInfo{pipeline, *factoryInfo.Name}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -178,7 +178,7 @@ func listDataFactoryPipelines(ctx context.Context, d *plugin.QueryData, h *plugi d.StreamListItem(ctx, pipelineInfo{pipeline, *factoryInfo.Name}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -201,9 +201,9 @@ func getDataFactoryPipeline(ctx context.Context, d *plugin.QueryData, h *plugin. pipelineClient := datafactory.NewPipelinesClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) pipelineClient.Authorizer = session.Authorizer - pipelineName := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - factoryName := d.KeyColumnQuals["factory_name"].GetStringValue() + pipelineName := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + factoryName := d.EqualsQuals["factory_name"].GetStringValue() // Return nil, if no input provided if pipelineName == "" || resourceGroup == "" || factoryName == "" { diff --git a/azure/table_azure_data_lake_analytics_account.go b/azure/table_azure_data_lake_analytics_account.go index b77cb315..084019e7 100644 --- a/azure/table_azure_data_lake_analytics_account.go +++ b/azure/table_azure_data_lake_analytics_account.go @@ -6,10 +6,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/datalake/analytics/mgmt/2016-11-01/account" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -257,7 +257,7 @@ func listDataLakeAnalyticsAccounts(ctx context.Context, d *plugin.QueryData, _ * d.StreamListItem(ctx, account) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -271,7 +271,7 @@ func listDataLakeAnalyticsAccounts(ctx context.Context, d *plugin.QueryData, _ * d.StreamListItem(ctx, account) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -302,8 +302,8 @@ func getDataLakeAnalyticsAccount(ctx context.Context, d *plugin.QueryData, h *pl name = *data.Name resourceGroup = splitID[4] } else { - name = d.KeyColumnQuals["name"].GetStringValue() - resourceGroup = d.KeyColumnQuals["resource_group"].GetStringValue() + name = d.EqualsQuals["name"].GetStringValue() + resourceGroup = d.EqualsQuals["resource_group"].GetStringValue() } // Return nil, if no input provide diff --git a/azure/table_azure_data_lake_store.go b/azure/table_azure_data_lake_store.go index bb5b4f24..ae22a969 100644 --- a/azure/table_azure_data_lake_store.go +++ b/azure/table_azure_data_lake_store.go @@ -6,10 +6,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -235,7 +235,7 @@ func listDataLakeStores(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr d.StreamListItem(ctx, account) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -249,7 +249,7 @@ func listDataLakeStores(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr d.StreamListItem(ctx, account) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -280,8 +280,8 @@ func getDataLakeStore(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrat name = *data.Name resourceGroup = splitID[4] } else { - name = d.KeyColumnQuals["name"].GetStringValue() - resourceGroup = d.KeyColumnQuals["resource_group"].GetStringValue() + name = d.EqualsQuals["name"].GetStringValue() + resourceGroup = d.EqualsQuals["resource_group"].GetStringValue() } // Return nil, if no input provide diff --git a/azure/table_azure_databox_edge_device.go b/azure/table_azure_databox_edge_device.go index a3e87eb6..520eaa18 100644 --- a/azure/table_azure_databox_edge_device.go +++ b/azure/table_azure_databox_edge_device.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/databoxedge/mgmt/2019-07-01/databoxedge" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -227,8 +227,8 @@ func listDataBoxEdgeDevices(ctx context.Context, d *plugin.QueryData, _ *plugin. func getDataBoxEdgeDevice(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getDataBoxEdgeDevice") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provide if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_diagnostic_setting.go b/azure/table_azure_diagnostic_setting.go index 86d5a3cb..15f82cf5 100644 --- a/azure/table_azure_diagnostic_setting.go +++ b/azure/table_azure_diagnostic_setting.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -140,7 +140,7 @@ func listDiagnosticSettings(ctx context.Context, d *plugin.QueryData, _ *plugin. d.StreamListItem(ctx, diagnosticSetting) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -153,7 +153,7 @@ func listDiagnosticSettings(ctx context.Context, d *plugin.QueryData, _ *plugin. func getDiagnosticSetting(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getDiagnosticSetting") - name := d.KeyColumnQuals["name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_eventgrid_domain.go b/azure/table_azure_eventgrid_domain.go index 5d258e88..42715bfd 100644 --- a/azure/table_azure_eventgrid_domain.go +++ b/azure/table_azure_eventgrid_domain.go @@ -5,9 +5,9 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2021-06-01-preview/eventgrid" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -255,8 +255,8 @@ func listEventGridDomains(ctx context.Context, d *plugin.QueryData, _ *plugin.Hy func getEventGridDomain(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getEventGridDomain") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provided if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_eventgrid_topic.go b/azure/table_azure_eventgrid_topic.go index 94b726a4..41735468 100644 --- a/azure/table_azure_eventgrid_topic.go +++ b/azure/table_azure_eventgrid_topic.go @@ -5,9 +5,9 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2021-06-01-preview/eventgrid" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -243,8 +243,8 @@ func listEventGridTopics(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd func getEventGridTopic(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getEventGridTopic") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provided if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_eventhub_namespace.go b/azure/table_azure_eventhub_namespace.go index ff3c76a5..38a19b5d 100644 --- a/azure/table_azure_eventhub_namespace.go +++ b/azure/table_azure_eventhub_namespace.go @@ -6,9 +6,9 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/preview/eventhub/mgmt/2018-01-01-preview/eventhub" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -236,8 +236,8 @@ func listEventHubNamespaces(ctx context.Context, d *plugin.QueryData, _ *plugin. func getEventHubNamespace(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getEventHubNamespace") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provided if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_express_route_circuit.go b/azure/table_azure_express_route_circuit.go index 53b2bb19..9d48a9f1 100644 --- a/azure/table_azure_express_route_circuit.go +++ b/azure/table_azure_express_route_circuit.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -189,7 +189,7 @@ func listExpressRouteCircuits(ctx context.Context, d *plugin.QueryData, _ *plugi d.StreamListItem(ctx, routeCircuit) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -203,7 +203,7 @@ func listExpressRouteCircuits(ctx context.Context, d *plugin.QueryData, _ *plugi d.StreamListItem(ctx, routeCircuit) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -224,8 +224,8 @@ func getExpressRouteCircuit(ctx context.Context, d *plugin.QueryData, h *plugin. } subscriptionID := session.SubscriptionID - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_firewall.go b/azure/table_azure_firewall.go index cbf604e7..26f45002 100644 --- a/azure/table_azure_firewall.go +++ b/azure/table_azure_firewall.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-07-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -201,7 +201,7 @@ func listFirewalls(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa d.StreamListItem(ctx, firewall) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -216,7 +216,7 @@ func listFirewalls(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa d.StreamListItem(ctx, firewall) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -229,8 +229,8 @@ func listFirewalls(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa func getFirewall(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getFirewall") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_frontdoor.go b/azure/table_azure_frontdoor.go index 1d9e581d..dc40cc63 100644 --- a/azure/table_azure_frontdoor.go +++ b/azure/table_azure_frontdoor.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/frontdoor/mgmt/2020-05-01/frontdoor" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -207,8 +207,8 @@ func listFrontDoors(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateD func getFrontDoor(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getFrontDoor") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_hdinsight_cluster.go b/azure/table_azure_hdinsight_cluster.go index 6cc09c26..5e79104d 100644 --- a/azure/table_azure_hdinsight_cluster.go +++ b/azure/table_azure_hdinsight_cluster.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/hdinsight/mgmt/2018-06-01/hdinsight" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -271,8 +271,8 @@ func listHDInsightClusters(ctx context.Context, d *plugin.QueryData, _ *plugin.H func getHDInsightCluster(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getHDInsightCluster") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_healthcare_service.go b/azure/table_azure_healthcare_service.go index 931823e4..e4ee9fff 100644 --- a/azure/table_azure_healthcare_service.go +++ b/azure/table_azure_healthcare_service.go @@ -7,10 +7,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/profiles/latest/healthcareapis/mgmt/healthcareapis" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -218,8 +218,8 @@ func listHealthcareServices(ctx context.Context, d *plugin.QueryData, _ *plugin. func getHealthcareService(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getHealthcareService") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Empty check for param if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_hpc_cache.go b/azure/table_azure_hpc_cache.go index 8f8c9b26..29342fc9 100644 --- a/azure/table_azure_hpc_cache.go +++ b/azure/table_azure_hpc_cache.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/services/storagecache/mgmt/2021-05-01/storagecache" "github.com/Azure/go-autorest/autorest/date" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -214,8 +214,8 @@ func listHPCCaches(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa func getHPCCache(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getHPCCache") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_hybrid_compute_machine.go b/azure/table_azure_hybrid_compute_machine.go index c85eacb3..ff950e3f 100644 --- a/azure/table_azure_hybrid_compute_machine.go +++ b/azure/table_azure_hybrid_compute_machine.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/profiles/latest/hybridcompute/mgmt/hybridcompute" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -249,8 +249,8 @@ func listHybridComputeMachines(ctx context.Context, d *plugin.QueryData, h *plug func getHybridComputeMachine(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getHybridComputeMachine") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_hybrid_kubernetes_connected_cluster.go b/azure/table_azure_hybrid_kubernetes_connected_cluster.go index 21074a95..a59dec1a 100644 --- a/azure/table_azure_hybrid_kubernetes_connected_cluster.go +++ b/azure/table_azure_hybrid_kubernetes_connected_cluster.go @@ -6,10 +6,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/latest/hybridkubernetes/mgmt/hybridkubernetes" "github.com/Azure/azure-sdk-for-go/profiles/preview/preview/kubernetesconfiguration/mgmt/kubernetesconfiguration" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -249,8 +249,8 @@ func listHybridKubernetesConnectedClusters(ctx context.Context, d *plugin.QueryD func getHybridKubernetesConnectedCluster(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getHybridKubernetesConnectedCluster") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_iothub.go b/azure/table_azure_iothub.go index c4e0dc4e..aea12224 100644 --- a/azure/table_azure_iothub.go +++ b/azure/table_azure_iothub.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2020-03-01/devices" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -232,7 +232,7 @@ func listIotHubs(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData d.StreamListItem(ctx, iotHubDescription) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -246,7 +246,7 @@ func listIotHubs(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData d.StreamListItem(ctx, iotHubDescription) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -269,8 +269,8 @@ func getIotHub(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) iotHubClient := devices.NewIotHubResourceClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) iotHubClient.Authorizer = session.Authorizer - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provide if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_iothub_dps.go b/azure/table_azure_iothub_dps.go index 74c9b832..ec22b805 100644 --- a/azure/table_azure_iothub_dps.go +++ b/azure/table_azure_iothub_dps.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/profiles/latest/provisioningservices/mgmt/iothub" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -207,8 +207,8 @@ func getIotHubDps(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateDat iotDpsClient := iothub.NewIotDpsResourceClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) iotDpsClient.Authorizer = session.Authorizer - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provide if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_key_vault.go b/azure/table_azure_key_vault.go index 783f9051..b39ad9fa 100644 --- a/azure/table_azure_key_vault.go +++ b/azure/table_azure_key_vault.go @@ -6,10 +6,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2019-09-01/keyvault" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -230,7 +230,7 @@ func listKeyVaults(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa d.StreamListItem(ctx, vault) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -244,7 +244,7 @@ func listKeyVaults(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa d.StreamListItem(ctx, vault) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -272,8 +272,8 @@ func getKeyVault(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData name = *data.Name resourceGroup = strings.Split(*data.ID, "/")[4] } else { - name = d.KeyColumnQuals["name"].GetStringValue() - resourceGroup = d.KeyColumnQuals["resource_group"].GetStringValue() + name = d.EqualsQuals["name"].GetStringValue() + resourceGroup = d.EqualsQuals["resource_group"].GetStringValue() } client := keyvault.NewVaultsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) diff --git a/azure/table_azure_key_vault_deleted_vault.go b/azure/table_azure_key_vault_deleted_vault.go index 3b1011b8..efa998c3 100644 --- a/azure/table_azure_key_vault_deleted_vault.go +++ b/azure/table_azure_key_vault_deleted_vault.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2019-09-01/keyvault" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -119,7 +119,7 @@ func listKeyVaultDeletedVaults(ctx context.Context, d *plugin.QueryData, _ *plug d.StreamListItem(ctx, deletedVault) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -133,7 +133,7 @@ func listKeyVaultDeletedVaults(ctx context.Context, d *plugin.QueryData, _ *plug d.StreamListItem(ctx, deletedVault) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -155,8 +155,8 @@ func getKeyVaultDeletedVault(ctx context.Context, d *plugin.QueryData, h *plugin } subscriptionID := session.SubscriptionID - name := d.KeyColumnQuals["name"].GetStringValue() - region := d.KeyColumnQuals["region"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + region := d.EqualsQuals["region"].GetStringValue() // Return nil, if no input provide if name == "" || region == "" { diff --git a/azure/table_azure_key_vault_key.go b/azure/table_azure_key_vault_key.go index 164db7a1..102e7bb7 100644 --- a/azure/table_azure_key_vault_key.go +++ b/azure/table_azure_key_vault_key.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2019-09-01/keyvault" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -194,7 +194,7 @@ func listKeyVaultKeys(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrat d.StreamListItem(ctx, key) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -209,7 +209,7 @@ func listKeyVaultKeys(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrat d.StreamListItem(ctx, key) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -231,9 +231,9 @@ func getKeyVaultKey(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateD name = *data.Name resourceGroup = splitID[4] } else { - vaultName = d.KeyColumnQuals["vault_name"].GetStringValue() - name = d.KeyColumnQuals["name"].GetStringValue() - resourceGroup = d.KeyColumnQuals["resource_group"].GetStringValue() + vaultName = d.EqualsQuals["vault_name"].GetStringValue() + name = d.EqualsQuals["name"].GetStringValue() + resourceGroup = d.EqualsQuals["resource_group"].GetStringValue() } // Create session diff --git a/azure/table_azure_key_vault_key_version.go b/azure/table_azure_key_vault_key_version.go index 06ea5ff0..8029cd96 100644 --- a/azure/table_azure_key_vault_key_version.go +++ b/azure/table_azure_key_vault_key_version.go @@ -6,10 +6,10 @@ import ( "sync" "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2019-09-01/keyvault" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -241,7 +241,7 @@ func listKeyVaultKeyVersions(ctx context.Context, d *plugin.QueryData, h *plugin d.StreamLeafListItem(ctx, data) // Context may get cancelled due to manual cancellation or if the limit has been reached - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -263,7 +263,7 @@ func getRowDataForKeyVersionAsync(ctx context.Context, d *plugin.QueryData, h *p func getRowDataForKeyVersion(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData, key keyvault.Key) ([]keyvault.Key, error) { vault := h.Item.(keyvault.Resource) - keyName := d.KeyColumnQuals["key_name"].GetStringValue() + keyName := d.EqualsQuals["key_name"].GetStringValue() var items []keyvault.Key if keyName != "" && keyName != *key.Name { diff --git a/azure/table_azure_key_vault_managed_hardware_security_module.go b/azure/table_azure_key_vault_managed_hardware_security_module.go index f5f16154..2d22173e 100644 --- a/azure/table_azure_key_vault_managed_hardware_security_module.go +++ b/azure/table_azure_key_vault_managed_hardware_security_module.go @@ -6,10 +6,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/preview/keyvault/mgmt/2020-04-01-preview/keyvault" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -170,7 +170,7 @@ func listKeyVaultManagedHardwareSecurityModules(ctx context.Context, d *plugin.Q d.StreamListItem(ctx, vault) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -184,7 +184,7 @@ func listKeyVaultManagedHardwareSecurityModules(ctx context.Context, d *plugin.Q d.StreamListItem(ctx, vault) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -212,8 +212,8 @@ func getKeyVaultManagedHardwareSecurityModule(ctx context.Context, d *plugin.Que name = *data.Name resourceGroup = strings.Split(*data.ID, "/")[4] } else { - name = d.KeyColumnQuals["name"].GetStringValue() - resourceGroup = d.KeyColumnQuals["resource_group"].GetStringValue() + name = d.EqualsQuals["name"].GetStringValue() + resourceGroup = d.EqualsQuals["resource_group"].GetStringValue() } if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_key_vault_secret.go b/azure/table_azure_key_vault_secret.go index 945bca10..0cd0456e 100644 --- a/azure/table_azure_key_vault_secret.go +++ b/azure/table_azure_key_vault_secret.go @@ -6,10 +6,10 @@ import ( "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2019-09-01/keyvault" secret "github.com/Azure/azure-sdk-for-go/services/keyvault/v7.1/keyvault" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -177,7 +177,7 @@ func listKeyVaultSecrets(ctx context.Context, d *plugin.QueryData, h *plugin.Hyd d.StreamLeafListItem(ctx, secret) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -192,7 +192,7 @@ func listKeyVaultSecrets(ctx context.Context, d *plugin.QueryData, h *plugin.Hyd d.StreamLeafListItem(ctx, secret) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -218,8 +218,8 @@ func getKeyVaultSecret(ctx context.Context, d *plugin.QueryData, h *plugin.Hydra return nil, nil } } else { - vaultName = d.KeyColumnQuals["vault_name"].GetStringValue() - name = d.KeyColumnQuals["name"].GetStringValue() + vaultName = d.EqualsQuals["vault_name"].GetStringValue() + name = d.EqualsQuals["name"].GetStringValue() } // Create session diff --git a/azure/table_azure_kubernetes_cluster.go b/azure/table_azure_kubernetes_cluster.go index c2dd0239..0cd1a830 100644 --- a/azure/table_azure_kubernetes_cluster.go +++ b/azure/table_azure_kubernetes_cluster.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2021-02-01/containerservice" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -262,7 +262,7 @@ func listKubernetesClusters(ctx context.Context, d *plugin.QueryData, _ *plugin. d.StreamListItem(ctx, cluster) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -277,7 +277,7 @@ func listKubernetesClusters(ctx context.Context, d *plugin.QueryData, _ *plugin. d.StreamListItem(ctx, cluster) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -300,8 +300,8 @@ func getKubernetesCluster(ctx context.Context, d *plugin.QueryData, _ *plugin.Hy client := containerservice.NewManagedClustersClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) client.Authorizer = session.Authorizer - resourceName := d.KeyColumnQuals["name"].GetStringValue() - resourceGroupName := d.KeyColumnQuals["resource_group"].GetStringValue() + resourceName := d.EqualsQuals["name"].GetStringValue() + resourceGroupName := d.EqualsQuals["resource_group"].GetStringValue() op, err := client.Get(ctx, resourceGroupName, resourceName) if err != nil { diff --git a/azure/table_azure_kusto_cluster.go b/azure/table_azure_kusto_cluster.go index ee89aad4..cf920609 100644 --- a/azure/table_azure_kusto_cluster.go +++ b/azure/table_azure_kusto_cluster.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/kusto/mgmt/2021-01-01/kusto" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -229,8 +229,8 @@ func listKustoClusters(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra func getKustoCluster(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getKustoCluster") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provide if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_lb.go b/azure/table_azure_lb.go index 432def41..5ca51ee3 100644 --- a/azure/table_azure_lb.go +++ b/azure/table_azure_lb.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -192,7 +192,7 @@ func listLoadBalancers(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra d.StreamListItem(ctx, loadBalancer) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -206,7 +206,7 @@ func listLoadBalancers(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra d.StreamListItem(ctx, loadBalancer) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -220,8 +220,8 @@ func listLoadBalancers(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra func getLoadBalancer(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getLoadBalancer") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_lb_backend_address_pool.go b/azure/table_azure_lb_backend_address_pool.go index a35327de..30aa405c 100644 --- a/azure/table_azure_lb_backend_address_pool.go +++ b/azure/table_azure_lb_backend_address_pool.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -149,7 +149,7 @@ func listBackendAddressPools(ctx context.Context, d *plugin.QueryData, h *plugin d.StreamListItem(ctx, backendAddressPool) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -163,7 +163,7 @@ func listBackendAddressPools(ctx context.Context, d *plugin.QueryData, h *plugin d.StreamListItem(ctx, backendAddressPool) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -177,9 +177,9 @@ func listBackendAddressPools(ctx context.Context, d *plugin.QueryData, h *plugin func getBackendAddressPool(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getBackendAddressPool") - loadBalancerName := d.KeyColumnQuals["load_balancer_name"].GetStringValue() - backendAddressPoolName := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + loadBalancerName := d.EqualsQuals["load_balancer_name"].GetStringValue() + backendAddressPoolName := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty loadBalancerName, backendAddressPoolName or resourceGroup if loadBalancerName == "" || backendAddressPoolName == "" || resourceGroup == "" { diff --git a/azure/table_azure_lb_nat_rule.go b/azure/table_azure_lb_nat_rule.go index 24f2c0f6..b144e63d 100644 --- a/azure/table_azure_lb_nat_rule.go +++ b/azure/table_azure_lb_nat_rule.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -167,7 +167,7 @@ func listLoadBalancerNatRules(ctx context.Context, d *plugin.QueryData, h *plugi d.StreamListItem(ctx, LoadBalancerNatRulesInfo{rule, *loadBalancer.Name}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -181,7 +181,7 @@ func listLoadBalancerNatRules(ctx context.Context, d *plugin.QueryData, h *plugi d.StreamListItem(ctx, LoadBalancerNatRulesInfo{rule, *loadBalancer.Name}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -195,9 +195,9 @@ func listLoadBalancerNatRules(ctx context.Context, d *plugin.QueryData, h *plugi func getLoadBalancerNatRule(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getLoadBalancerNatRule") - loadBalancerName := d.KeyColumnQuals["load_balancer_name"].GetStringValue() - loadBalancerOutboundRuleName := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + loadBalancerName := d.EqualsQuals["load_balancer_name"].GetStringValue() + loadBalancerOutboundRuleName := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty check if loadBalancerName == "" || loadBalancerOutboundRuleName == "" || resourceGroup == "" { diff --git a/azure/table_azure_lb_outbound_rule.go b/azure/table_azure_lb_outbound_rule.go index fb81c2c6..9e24b5d6 100644 --- a/azure/table_azure_lb_outbound_rule.go +++ b/azure/table_azure_lb_outbound_rule.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -154,7 +154,7 @@ func listLoadBalancerOutboundRules(ctx context.Context, d *plugin.QueryData, h * d.StreamListItem(ctx, LoadBalancerOutboundRulesInfo{rule, *loadBalancer.Name}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -168,7 +168,7 @@ func listLoadBalancerOutboundRules(ctx context.Context, d *plugin.QueryData, h * d.StreamListItem(ctx, LoadBalancerOutboundRulesInfo{rule, *loadBalancer.Name}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -182,9 +182,9 @@ func listLoadBalancerOutboundRules(ctx context.Context, d *plugin.QueryData, h * func getLoadBalancerOutboundRule(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getLoadBalancerOutboundRule") - loadBalancerName := d.KeyColumnQuals["load_balancer_name"].GetStringValue() - loadBalancerOutboundRuleName := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + loadBalancerName := d.EqualsQuals["load_balancer_name"].GetStringValue() + loadBalancerOutboundRuleName := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty check if loadBalancerName == "" || loadBalancerOutboundRuleName == "" || resourceGroup == "" { diff --git a/azure/table_azure_lb_probe.go b/azure/table_azure_lb_probe.go index 5d5bcf64..3df9b17b 100644 --- a/azure/table_azure_lb_probe.go +++ b/azure/table_azure_lb_probe.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -149,7 +149,7 @@ func listLoadBalancerProbes(ctx context.Context, d *plugin.QueryData, h *plugin. d.StreamListItem(ctx, probe) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -163,7 +163,7 @@ func listLoadBalancerProbes(ctx context.Context, d *plugin.QueryData, h *plugin. d.StreamListItem(ctx, probe) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -177,9 +177,9 @@ func listLoadBalancerProbes(ctx context.Context, d *plugin.QueryData, h *plugin. func getLoadBalancerProbe(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getLoadBalancerProbe") - loadBalancerName := d.KeyColumnQuals["load_balancer_name"].GetStringValue() - probeName := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + loadBalancerName := d.EqualsQuals["load_balancer_name"].GetStringValue() + probeName := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty loadBalancerName, probeName or resourceGroup if loadBalancerName == "" || probeName == "" || resourceGroup == "" { diff --git a/azure/table_azure_lb_rule.go b/azure/table_azure_lb_rule.go index 3535a31a..48648292 100644 --- a/azure/table_azure_lb_rule.go +++ b/azure/table_azure_lb_rule.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -188,7 +188,7 @@ func listLoadBalancerRules(ctx context.Context, d *plugin.QueryData, h *plugin.H d.StreamListItem(ctx, rule) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -202,7 +202,7 @@ func listLoadBalancerRules(ctx context.Context, d *plugin.QueryData, h *plugin.H d.StreamListItem(ctx, rule) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -216,9 +216,9 @@ func listLoadBalancerRules(ctx context.Context, d *plugin.QueryData, h *plugin.H func getLoadBalancerRule(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getLoadBalancerRule") - loadBalancerName := d.KeyColumnQuals["load_balancer_name"].GetStringValue() - loadBalancerRuleName := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + loadBalancerName := d.EqualsQuals["load_balancer_name"].GetStringValue() + loadBalancerRuleName := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty loadBalancerName, loadBalancerRuleName or resourceGroup if loadBalancerName == "" || loadBalancerRuleName == "" || resourceGroup == "" { diff --git a/azure/table_azure_location.go b/azure/table_azure_location.go index 42b47cda..69d565af 100644 --- a/azure/table_azure_location.go +++ b/azure/table_azure_location.go @@ -4,10 +4,10 @@ import ( "context" sub "github.com/Azure/azure-sdk-for-go/profiles/latest/subscription/mgmt/subscription" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -85,7 +85,7 @@ func listLocations(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa d.StreamListItem(ctx, location) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } diff --git a/azure/table_azure_log_alert.go b/azure/table_azure_log_alert.go index a9b2df25..4713ce90 100644 --- a/azure/table_azure_log_alert.go +++ b/azure/table_azure_log_alert.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -136,7 +136,7 @@ func listLogAlerts(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa d.StreamListItem(ctx, alertLog) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -149,8 +149,8 @@ func listLogAlerts(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa func getLogAlert(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getLogAlert") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_log_profile.go b/azure/table_azure_log_profile.go index 1f576c5e..7669b7b8 100644 --- a/azure/table_azure_log_profile.go +++ b/azure/table_azure_log_profile.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -136,7 +136,7 @@ func listLogProfiles(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrate d.StreamListItem(ctx, logProfile) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -149,7 +149,7 @@ func listLogProfiles(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrate func getLogProfile(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getLogProfile") - name := d.KeyColumnQuals["name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_logic_app_workflow.go b/azure/table_azure_logic_app_workflow.go index a621192f..a343ea5c 100644 --- a/azure/table_azure_logic_app_workflow.go +++ b/azure/table_azure_logic_app_workflow.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -191,7 +191,7 @@ func listLogicAppWorkflows(ctx context.Context, d *plugin.QueryData, _ *plugin.H d.StreamListItem(ctx, workflow) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -205,7 +205,7 @@ func listLogicAppWorkflows(ctx context.Context, d *plugin.QueryData, _ *plugin.H d.StreamListItem(ctx, workflow) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -228,8 +228,8 @@ func getLogicAppWorkflow(ctx context.Context, d *plugin.QueryData, h *plugin.Hyd workflowClient := logic.NewWorkflowsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) workflowClient.Authorizer = session.Authorizer - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provide if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_machine_learning_workspace.go b/azure/table_azure_machine_learning_workspace.go index 582ce6a0..044039e8 100644 --- a/azure/table_azure_machine_learning_workspace.go +++ b/azure/table_azure_machine_learning_workspace.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/preview/machinelearningservices/mgmt/2020-02-18-preview/machinelearningservices" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -239,8 +239,8 @@ func getMachineLearningWorkspace(ctx context.Context, d *plugin.QueryData, h *pl workspaceClient := machinelearningservices.NewWorkspacesClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) workspaceClient.Authorizer = session.Authorizer - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provide if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_management_group.go b/azure/table_azure_management_group.go index c07786cb..7494a85f 100644 --- a/azure/table_azure_management_group.go +++ b/azure/table_azure_management_group.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/managementgroups" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -147,7 +147,7 @@ func getManagementGroup(ctx context.Context, d *plugin.QueryData, h *plugin.Hydr if h.Item != nil { name = *h.Item.(managementgroups.Info).Name } else { - name = d.KeyColumnQuals["name"].GetStringValue() + name = d.EqualsQuals["name"].GetStringValue() } // check if name is empty diff --git a/azure/table_azure_management_lock.go b/azure/table_azure_management_lock.go index 268f2ab7..0f9f287a 100644 --- a/azure/table_azure_management_lock.go +++ b/azure/table_azure_management_lock.go @@ -6,10 +6,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) type managementLockInfo = struct { @@ -123,7 +123,7 @@ func listManagementLocks(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd d.StreamListItem(ctx, managementLockInfo{managementLock, managementLock.Name, resourceGroup}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -139,7 +139,7 @@ func listManagementLocks(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd d.StreamListItem(ctx, managementLockInfo{managementLock, managementLock.Name, resourceGroup}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -158,8 +158,8 @@ func getManagementLock(ctx context.Context, d *plugin.QueryData, h *plugin.Hydra return nil, err } subscriptionID := session.SubscriptionID - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() locksClient := locks.NewManagementLocksClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) locksClient.Authorizer = session.Authorizer diff --git a/azure/table_azure_mariadb_server.go b/azure/table_azure_mariadb_server.go index d46a0eb3..669453bb 100644 --- a/azure/table_azure_mariadb_server.go +++ b/azure/table_azure_mariadb_server.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/mariadb/mgmt/2020-01-01/mariadb" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -221,7 +221,7 @@ func listMariaDBServers(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr d.StreamListItem(ctx, server) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -234,8 +234,8 @@ func listMariaDBServers(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr func getMariaDBServer(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getMariaDBServer") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provided if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_mssql_elasticpool.go b/azure/table_azure_mssql_elasticpool.go index 3892b3f7..d79c9c33 100644 --- a/azure/table_azure_mssql_elasticpool.go +++ b/azure/table_azure_mssql_elasticpool.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2017-03-01-preview/sql" sqlv3 "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/v3.0/sql" @@ -165,7 +165,7 @@ func listMSSQLElasticPools(ctx context.Context, d *plugin.QueryData, h *plugin.H d.StreamListItem(ctx, elasticPool) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -178,9 +178,9 @@ func listMSSQLElasticPools(ctx context.Context, d *plugin.QueryData, h *plugin.H func getMSSQLElasticPool(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getMSSQLElasticPool") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - serverName := d.KeyColumnQuals["server_name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + serverName := d.EqualsQuals["server_name"].GetStringValue() // Return nil, of no input provided if name == "" || resourceGroup == "" || serverName == "" { diff --git a/azure/table_azure_mssql_managed_instance.go b/azure/table_azure_mssql_managed_instance.go index 6f8655e2..c83a9f2c 100644 --- a/azure/table_azure_mssql_managed_instance.go +++ b/azure/table_azure_mssql_managed_instance.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/v5.0/sql" ) @@ -252,7 +252,7 @@ func listMSSQLManagedInstances(ctx context.Context, d *plugin.QueryData, _ *plug d.StreamListItem(ctx, managedInstance) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -267,7 +267,7 @@ func listMSSQLManagedInstances(ctx context.Context, d *plugin.QueryData, _ *plug d.StreamListItem(ctx, managedInstance) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -280,8 +280,8 @@ func listMSSQLManagedInstances(ctx context.Context, d *plugin.QueryData, _ *plug func getMSSQLManagedInstance(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getMSSQLManagedInstance") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, of no input provided if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_mssql_virtual_machine.go b/azure/table_azure_mssql_virtual_machine.go index ead9f8e0..884a8ae1 100644 --- a/azure/table_azure_mssql_virtual_machine.go +++ b/azure/table_azure_mssql_virtual_machine.go @@ -3,9 +3,9 @@ package azure import ( "context" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" "github.com/Azure/azure-sdk-for-go/services/preview/sqlvirtualmachine/mgmt/2017-03-01-preview/sqlvirtualmachine" ) @@ -204,8 +204,8 @@ func listMSSQLVirtualMachines(ctx context.Context, d *plugin.QueryData, _ *plugi func getMSSQLVirtualMachine(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getMSSQLVirtualMachine") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_mysql_flexible_server.go b/azure/table_azure_mysql_flexible_server.go index 8cbe964f..48cca411 100644 --- a/azure/table_azure_mysql_flexible_server.go +++ b/azure/table_azure_mysql_flexible_server.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" "github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/resources" "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2021-05-01/mysqlflexibleservers" @@ -262,7 +262,7 @@ func listMySQLFlexibleServers(ctx context.Context, d *plugin.QueryData, h *plugi d.StreamListItem(ctx, server) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -276,7 +276,7 @@ func listMySQLFlexibleServers(ctx context.Context, d *plugin.QueryData, h *plugi d.StreamListItem(ctx, server) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -290,8 +290,8 @@ func listMySQLFlexibleServers(ctx context.Context, d *plugin.QueryData, h *plugi func getMySQLFlexibleServer(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getMySQLFlexibleServer") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // check if name or resourceGroup is empty if resourceGroup == "" || name == "" { diff --git a/azure/table_azure_mysql_server.go b/azure/table_azure_mysql_server.go index bbaf638d..1b94d88a 100644 --- a/azure/table_azure_mysql_server.go +++ b/azure/table_azure_mysql_server.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2020-01-01/mysql" ) @@ -274,7 +274,7 @@ func listMySQLServers(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrat d.StreamListItem(ctx, server) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -287,8 +287,8 @@ func listMySQLServers(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrat func getMySQLServer(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getMySQLServer") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Error: mysql.ServersClient#Get: Invalid input: autorest/validation: validation failed: parameter=resourceGroupName // constraint=MinLength value="" details: value length must be greater than or equal to 1 diff --git a/azure/table_azure_nat_gateway.go b/azure/table_azure_nat_gateway.go index bd25c387..3d4dc9dd 100644 --- a/azure/table_azure_nat_gateway.go +++ b/azure/table_azure_nat_gateway.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-03-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -155,7 +155,7 @@ func listNatGateways(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrate d.StreamListItem(ctx, natGateway) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -170,7 +170,7 @@ func listNatGateways(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrate d.StreamListItem(ctx, natGateWay) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -181,8 +181,8 @@ func listNatGateways(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrate //// HYDRATE FUNCTIONS //// func getNatGateway(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_network_interface.go b/azure/table_azure_network_interface.go index e50249c9..9391a939 100644 --- a/azure/table_azure_network_interface.go +++ b/azure/table_azure_network_interface.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -202,7 +202,7 @@ func listNetworkInterfaces(ctx context.Context, d *plugin.QueryData, _ *plugin.H d.StreamListItem(ctx, networkInterface) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -217,7 +217,7 @@ func listNetworkInterfaces(ctx context.Context, d *plugin.QueryData, _ *plugin.H d.StreamListItem(ctx, networkInterface) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -230,8 +230,8 @@ func listNetworkInterfaces(ctx context.Context, d *plugin.QueryData, _ *plugin.H func getNetworkInterface(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getNetworkInterface") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_network_security_group.go b/azure/table_azure_network_security_group.go index c1be5ed9..c4efa605 100644 --- a/azure/table_azure_network_security_group.go +++ b/azure/table_azure_network_security_group.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -155,7 +155,7 @@ func listNetworkSecurityGroups(ctx context.Context, d *plugin.QueryData, _ *plug d.StreamListItem(ctx, networkSecurityGroup) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -170,7 +170,7 @@ func listNetworkSecurityGroups(ctx context.Context, d *plugin.QueryData, _ *plug d.StreamListItem(ctx, networkSecurityGroup) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -183,8 +183,8 @@ func listNetworkSecurityGroups(ctx context.Context, d *plugin.QueryData, _ *plug func getNetworkSecurityGroup(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getNetworkSecurityGroup") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_network_watcher.go b/azure/table_azure_network_watcher.go index 6dde88ef..85077a39 100644 --- a/azure/table_azure_network_watcher.go +++ b/azure/table_azure_network_watcher.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -112,7 +112,7 @@ func listNetworkWatchers(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd d.StreamListItem(ctx, networkWatcher) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -125,8 +125,8 @@ func listNetworkWatchers(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd func getNetworkWatcher(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getNetworkWatcher") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_network_watcher_flow_log.go b/azure/table_azure_network_watcher_flow_log.go index 935b06ed..ec7333a0 100644 --- a/azure/table_azure_network_watcher_flow_log.go +++ b/azure/table_azure_network_watcher_flow_log.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) type flowLogInfo = struct { @@ -182,7 +182,7 @@ func listNetworkWatcherFlowLogs(ctx context.Context, d *plugin.QueryData, h *plu d.StreamListItem(ctx, flowLogInfo{flowLog, *networkWatcherDetails.Name}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -197,7 +197,7 @@ func listNetworkWatcherFlowLogs(ctx context.Context, d *plugin.QueryData, h *plu d.StreamListItem(ctx, flowLogInfo{flowLog, *networkWatcherDetails.Name}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -211,9 +211,9 @@ func listNetworkWatcherFlowLogs(ctx context.Context, d *plugin.QueryData, h *plu func getNetworkWatcherFlowLog(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getNetworkWatcherFlowLog") - networkWatcherName := d.KeyColumnQuals["network_watcher_name"].GetStringValue() - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + networkWatcherName := d.EqualsQuals["network_watcher_name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_policy_assignment.go b/azure/table_azure_policy_assignment.go index 51e88fca..e11d7e66 100644 --- a/azure/table_azure_policy_assignment.go +++ b/azure/table_azure_policy_assignment.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/policy" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -144,7 +144,7 @@ func listPolicyAssignments(ctx context.Context, d *plugin.QueryData, _ *plugin.H d.StreamListItem(ctx, policy) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -159,7 +159,7 @@ func listPolicyAssignments(ctx context.Context, d *plugin.QueryData, _ *plugin.H d.StreamListItem(ctx, policy) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -175,7 +175,7 @@ func getPolicyAssignment(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd if err != nil { return nil, err } - id := d.KeyColumnQuals["id"].GetStringValue() + id := d.EqualsQuals["id"].GetStringValue() subscriptionID := session.SubscriptionID PolicyClient := policy.NewAssignmentsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) diff --git a/azure/table_azure_policy_definition.go b/azure/table_azure_policy_definition.go index 06fcdff5..5cdbf776 100644 --- a/azure/table_azure_policy_definition.go +++ b/azure/table_azure_policy_definition.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-09-01/policy" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -124,7 +124,7 @@ func listPolicyDefintions(ctx context.Context, d *plugin.QueryData, _ *plugin.Hy d.StreamListItem(ctx, policy) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -139,7 +139,7 @@ func listPolicyDefintions(ctx context.Context, d *plugin.QueryData, _ *plugin.Hy d.StreamListItem(ctx, policy) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } diff --git a/azure/table_azure_postgresql_server.go b/azure/table_azure_postgresql_server.go index 9a3508ca..ba2e29b6 100644 --- a/azure/table_azure_postgresql_server.go +++ b/azure/table_azure_postgresql_server.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2020-01-01/postgresql" "github.com/Azure/go-autorest/autorest/date" @@ -283,7 +283,7 @@ func listPostgreSqlServers(ctx context.Context, d *plugin.QueryData, _ *plugin.H d.StreamListItem(ctx, server) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -295,8 +295,8 @@ func listPostgreSqlServers(ctx context.Context, d *plugin.QueryData, _ *plugin.H func getPostgreSqlServer(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getPostgreSqlServer") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Error: postgresql.ServersClient#Get: Invalid input: autorest/validation: validation failed: parameter=resourceGroupName constraint=MinLength // value="" details: value length must be greater than or equal to 1 diff --git a/azure/table_azure_provider.go b/azure/table_azure_provider.go index 1e8d64c8..ad0bfdbc 100644 --- a/azure/table_azure_provider.go +++ b/azure/table_azure_provider.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-05-01/resources" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -85,7 +85,7 @@ func listProviders(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa d.StreamListItem(ctx, provider) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -100,7 +100,7 @@ func listProviders(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa d.StreamListItem(ctx, provider) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -119,7 +119,7 @@ func getProvider(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData return nil, err } subscriptionID := session.SubscriptionID - namespace := d.KeyColumnQuals["namespace"].GetStringValue() + namespace := d.EqualsQuals["namespace"].GetStringValue() resourcesClient := resources.NewProvidersClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) resourcesClient.Authorizer = session.Authorizer diff --git a/azure/table_azure_public_ip.go b/azure/table_azure_public_ip.go index 0f931dfd..7036e3f1 100644 --- a/azure/table_azure_public_ip.go +++ b/azure/table_azure_public_ip.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/resources" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -211,7 +211,7 @@ func listPublicIPs(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateDa d.StreamListItem(ctx, publicIP) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -226,7 +226,7 @@ func listPublicIPs(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateDa d.StreamListItem(ctx, publicIP) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -239,8 +239,8 @@ func listPublicIPs(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateDa func getPublicIP(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getPublicIP") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_recovery_services_vault.go b/azure/table_azure_recovery_services_vault.go index 7f7b613e..76651894 100644 --- a/azure/table_azure_recovery_services_vault.go +++ b/azure/table_azure_recovery_services_vault.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/profiles/latest/recoveryservices/mgmt/recoveryservices" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -153,7 +153,7 @@ func listRecoveryServicesVaults(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, vault) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -167,7 +167,7 @@ func listRecoveryServicesVaults(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, vault) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -190,8 +190,8 @@ func getRecoveryServicesVault(ctx context.Context, d *plugin.QueryData, h *plugi recoveryServicesVaultClient := recoveryservices.NewVaultsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) recoveryServicesVaultClient.Authorizer = session.Authorizer - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provide if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_redis_cache.go b/azure/table_azure_redis_cache.go index 309fcbd5..16fd1ad6 100644 --- a/azure/table_azure_redis_cache.go +++ b/azure/table_azure_redis_cache.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2020-06-01/redis" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -232,7 +232,7 @@ func listRedisCaches(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrate d.StreamListItem(ctx, cache) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -247,7 +247,7 @@ func listRedisCaches(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrate d.StreamListItem(ctx, cache) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -261,8 +261,8 @@ func listRedisCaches(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrate func getRedisCache(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getRedisCache") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provided if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_resource_group.go b/azure/table_azure_resource_group.go index 5d0b16ae..2e811ec3 100644 --- a/azure/table_azure_resource_group.go +++ b/azure/table_azure_resource_group.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/resources" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -104,7 +104,7 @@ func listResourceGroups(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr d.StreamListItem(ctx, resourceGroup) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -118,7 +118,7 @@ func listResourceGroups(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr d.StreamListItem(ctx, resourceGroup) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -137,7 +137,7 @@ func getResourceGroup(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrat return nil, err } subscriptionID := session.SubscriptionID - name := d.KeyColumnQuals["name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() resourceGroupClient := resources.NewGroupsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) resourceGroupClient.Authorizer = session.Authorizer diff --git a/azure/table_azure_resource_link.go b/azure/table_azure_resource_link.go index 11698182..879364f1 100644 --- a/azure/table_azure_resource_link.go +++ b/azure/table_azure_resource_link.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/links" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITON @@ -105,7 +105,7 @@ func listResourceLinks(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra d.StreamListItem(ctx, resourceLink) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -119,7 +119,7 @@ func listResourceLinks(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydra d.StreamListItem(ctx, resourceLink) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -138,7 +138,7 @@ func getResourceLink(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrate return nil, err } subscriptionID := session.SubscriptionID - linkID := d.KeyColumnQuals["id"].GetStringValue() + linkID := d.EqualsQuals["id"].GetStringValue() if linkID == "" { return nil, nil } diff --git a/azure/table_azure_role_assignment.go b/azure/table_azure_role_assignment.go index 3e735d89..a1fd4c5b 100644 --- a/azure/table_azure_role_assignment.go +++ b/azure/table_azure_role_assignment.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-09-01-preview/authorization" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -103,8 +103,8 @@ func listIamRoleAssignments(ctx context.Context, d *plugin.QueryData, _ *plugin. authorizationClient.Authorizer = session.Authorizer var filter string - if d.KeyColumnQuals["principal_id"] != nil { - filter = fmt.Sprintf("principalId eq '%s'", d.KeyColumnQuals["principal_id"].GetStringValue()) + if d.EqualsQuals["principal_id"] != nil { + filter = fmt.Sprintf("principalId eq '%s'", d.EqualsQuals["principal_id"].GetStringValue()) } result, err := authorizationClient.List(ctx, filter) @@ -115,7 +115,7 @@ func listIamRoleAssignments(ctx context.Context, d *plugin.QueryData, _ *plugin. d.StreamListItem(ctx, roleAssignment) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -129,7 +129,7 @@ func listIamRoleAssignments(ctx context.Context, d *plugin.QueryData, _ *plugin. d.StreamListItem(ctx, roleAssignment) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -148,7 +148,7 @@ func getIamRoleAssignment(ctx context.Context, d *plugin.QueryData, h *plugin.Hy return nil, err } subscriptionID := session.SubscriptionID - roleAssignmentID := d.KeyColumnQuals["id"].GetStringValue() + roleAssignmentID := d.EqualsQuals["id"].GetStringValue() authorizationClient := authorization.NewRoleAssignmentsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) authorizationClient.Authorizer = session.Authorizer diff --git a/azure/table_azure_role_definition.go b/azure/table_azure_role_definition.go index 68d71ecb..fc2f0f5a 100644 --- a/azure/table_azure_role_definition.go +++ b/azure/table_azure_role_definition.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-09-01-preview/authorization" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -107,7 +107,7 @@ func listIamRoleDefinitions(ctx context.Context, d *plugin.QueryData, _ *plugin. d.StreamListItem(ctx, roleDefinition) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -122,7 +122,7 @@ func listIamRoleDefinitions(ctx context.Context, d *plugin.QueryData, _ *plugin. d.StreamListItem(ctx, roleDefinition) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -141,7 +141,7 @@ func getIamRoleDefinition(ctx context.Context, d *plugin.QueryData, h *plugin.Hy return nil, err } subscriptionID := session.SubscriptionID - name := d.KeyColumnQuals["name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() authorizationClient := authorization.NewRoleDefinitionsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) authorizationClient.Authorizer = session.Authorizer diff --git a/azure/table_azure_route_table.go b/azure/table_azure_route_table.go index 95d37696..d351c053 100644 --- a/azure/table_azure_route_table.go +++ b/azure/table_azure_route_table.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -128,7 +128,7 @@ func listRouteTables(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrate d.StreamListItem(ctx, routeTable) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -143,7 +143,7 @@ func listRouteTables(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrate d.StreamListItem(ctx, routeTable) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -157,8 +157,8 @@ func listRouteTables(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydrate func getRouteTable(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getRouteTable") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_search_service.go b/azure/table_azure_search_service.go index daf0e5b2..a750c9f7 100644 --- a/azure/table_azure_search_service.go +++ b/azure/table_azure_search_service.go @@ -5,9 +5,9 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/search/mgmt/2020-08-01/search" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -178,7 +178,7 @@ func listSearchServices(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr d.StreamListItem(ctx, service) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -192,7 +192,7 @@ func listSearchServices(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr d.StreamListItem(ctx, service) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -206,8 +206,8 @@ func listSearchServices(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr func getSearchService(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getSearchService") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() if name == "" || resourceGroup == "" { return nil, nil diff --git a/azure/table_azure_security_center_auto_provisioning.go b/azure/table_azure_security_center_auto_provisioning.go index 8453e967..56e0a0af 100644 --- a/azure/table_azure_security_center_auto_provisioning.go +++ b/azure/table_azure_security_center_auto_provisioning.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v1.0/security" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -85,7 +85,7 @@ func listSecurityCenterAutoProvisioning(ctx context.Context, d *plugin.QueryData d.StreamListItem(ctx, autoProvisioning) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -99,7 +99,7 @@ func listSecurityCenterAutoProvisioning(ctx context.Context, d *plugin.QueryData d.StreamListItem(ctx, contact) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -115,7 +115,7 @@ func getSecurityCenterAutoProvisioning(ctx context.Context, d *plugin.QueryData, if err != nil { return nil, err } - name := d.KeyColumnQuals["name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() subscriptionID := session.SubscriptionID autoProvisioningClient := security.NewAutoProvisioningSettingsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID, "") diff --git a/azure/table_azure_security_center_automation.go b/azure/table_azure_security_center_automation.go index fdc2bc70..b0ac164b 100644 --- a/azure/table_azure_security_center_automation.go +++ b/azure/table_azure_security_center_automation.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v3.0/security" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -138,7 +138,7 @@ func listSecurityCenterAutomations(ctx context.Context, d *plugin.QueryData, _ * d.StreamListItem(ctx, automation) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -153,7 +153,7 @@ func listSecurityCenterAutomations(ctx context.Context, d *plugin.QueryData, _ * d.StreamListItem(ctx, automation) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -169,8 +169,8 @@ func getSecurityCenterAutomation(ctx context.Context, d *plugin.QueryData, _ *pl if err != nil { return nil, err } - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - name := d.KeyColumnQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() subscriptionID := session.SubscriptionID automationClient := security.NewAutomationsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID, "") diff --git a/azure/table_azure_security_center_contact.go b/azure/table_azure_security_center_contact.go index d4796d21..91a0f296 100644 --- a/azure/table_azure_security_center_contact.go +++ b/azure/table_azure_security_center_contact.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v1.0/security" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -103,7 +103,7 @@ func listSecurityCenterContacts(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, contact) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -117,7 +117,7 @@ func listSecurityCenterContacts(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, contact) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -133,7 +133,7 @@ func getSecurityCenterContact(ctx context.Context, d *plugin.QueryData, _ *plugi if err != nil { return nil, err } - name := d.KeyColumnQuals["name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() subscriptionID := session.SubscriptionID contactClient := security.NewContactsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID, "") diff --git a/azure/table_azure_security_center_jit_network_access_policy.go b/azure/table_azure_security_center_jit_network_access_policy.go index bc933912..30cbd05f 100644 --- a/azure/table_azure_security_center_jit_network_access_policy.go +++ b/azure/table_azure_security_center_jit_network_access_policy.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v1.0/security" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -92,7 +92,7 @@ func listSecurityCenterJITNetworkAccessPolicies(ctx context.Context, d *plugin.Q d.StreamListItem(ctx, jitNetworkAccessPolicy) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -106,7 +106,7 @@ func listSecurityCenterJITNetworkAccessPolicies(ctx context.Context, d *plugin.Q d.StreamListItem(ctx, jitNetworkAccessPolicy) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } diff --git a/azure/table_azure_security_center_setting.go b/azure/table_azure_security_center_setting.go index cbf1d81b..9b998246 100644 --- a/azure/table_azure_security_center_setting.go +++ b/azure/table_azure_security_center_setting.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v3.0/security" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -90,7 +90,7 @@ func listSecurityCenterSettings(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, setting) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -104,7 +104,7 @@ func listSecurityCenterSettings(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, setting) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -120,7 +120,7 @@ func getSecurityCenterSetting(ctx context.Context, d *plugin.QueryData, _ *plugi if err != nil { return nil, err } - name := d.KeyColumnQuals["name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() subscriptionID := session.SubscriptionID settingClient := security.NewSettingsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID, "") diff --git a/azure/table_azure_security_center_sub_assessment.go b/azure/table_azure_security_center_sub_assessment.go index 3754ff10..1bf807b1 100644 --- a/azure/table_azure_security_center_sub_assessment.go +++ b/azure/table_azure_security_center_sub_assessment.go @@ -8,10 +8,10 @@ import ( "github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v1.0/security" "github.com/turbot/go-kit/types" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -169,7 +169,7 @@ func listSecurityCenterSubAssessments(ctx context.Context, d *plugin.QueryData, d.StreamListItem(ctx, subAssessments) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -184,7 +184,7 @@ func listSecurityCenterSubAssessments(ctx context.Context, d *plugin.QueryData, d.StreamListItem(ctx, subAssessments) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } diff --git a/azure/table_azure_security_center_subscription_pricing.go b/azure/table_azure_security_center_subscription_pricing.go index 10f85c3d..e181d244 100644 --- a/azure/table_azure_security_center_subscription_pricing.go +++ b/azure/table_azure_security_center_subscription_pricing.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v3.0/security" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -93,7 +93,7 @@ func listSecurityCenterPricings(ctx context.Context, d *plugin.QueryData, _ *plu d.StreamListItem(ctx, pricing) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -108,7 +108,7 @@ func getSecurityCenterPricing(ctx context.Context, d *plugin.QueryData, _ *plugi if err != nil { return nil, err } - name := d.KeyColumnQuals["name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() // Handle empty input for get call if name == "" { diff --git a/azure/table_azure_service_fabric_cluster.go b/azure/table_azure_service_fabric_cluster.go index 3dd61079..b74cf62b 100644 --- a/azure/table_azure_service_fabric_cluster.go +++ b/azure/table_azure_service_fabric_cluster.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/servicefabric/mgmt/2019-03-01/servicefabric" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -256,8 +256,8 @@ func listServiceFabricClusters(ctx context.Context, d *plugin.QueryData, _ *plug func getServiceFabricCluster(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getServiceFabricCluster") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_servicebus_namespace.go b/azure/table_azure_servicebus_namespace.go index f2aafe3a..52b7b22b 100644 --- a/azure/table_azure_servicebus_namespace.go +++ b/azure/table_azure_servicebus_namespace.go @@ -6,9 +6,9 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -186,7 +186,7 @@ func listServiceBusNamespaces(ctx context.Context, d *plugin.QueryData, _ *plugi d.StreamListItem(ctx, namespace) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -201,7 +201,7 @@ func listServiceBusNamespaces(ctx context.Context, d *plugin.QueryData, _ *plugi d.StreamListItem(ctx, namespace) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -215,8 +215,8 @@ func listServiceBusNamespaces(ctx context.Context, d *plugin.QueryData, _ *plugi func getServiceBusNamespace(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getServiceBusNamespace") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provided if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_signalr_service.go b/azure/table_azure_signalr_service.go index 7ef232e5..5108dc8a 100644 --- a/azure/table_azure_signalr_service.go +++ b/azure/table_azure_signalr_service.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/signalr/mgmt/2020-05-01/signalr" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -220,8 +220,8 @@ func listSignalRServices(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd func getSignalRService(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getSignalRService") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_spring_cloud_service.go b/azure/table_azure_spring_cloud_service.go index 70f7af84..540188ea 100644 --- a/azure/table_azure_spring_cloud_service.go +++ b/azure/table_azure_spring_cloud_service.go @@ -6,10 +6,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/resources" "github.com/Azure/azure-sdk-for-go/services/appplatform/mgmt/2020-07-01/appplatform" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -189,8 +189,8 @@ func listSpringCloudServices(ctx context.Context, d *plugin.QueryData, h *plugin func getSpringCloudService(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getSpringCloudService") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_sql_database.go b/azure/table_azure_sql_database.go index 6118b65f..86353fc1 100644 --- a/azure/table_azure_sql_database.go +++ b/azure/table_azure_sql_database.go @@ -7,10 +7,10 @@ import ( "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2017-03-01-preview/sql" sqlv3 "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/v3.0/sql" sqlV5 "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/v5.0/sql" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -321,7 +321,7 @@ func listSqlDatabases(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrat d.StreamLeafListItem(ctx, database) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -341,9 +341,9 @@ func getSqlDatabase(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateD databaseName = *database.Name resourceGroupName = strings.Split(string(*database.ID), "/")[4] } else { - serverName = d.KeyColumnQuals["server_name"].GetStringValue() - databaseName = d.KeyColumnQuals["name"].GetStringValue() - resourceGroupName = d.KeyColumnQuals["resource_group"].GetStringValue() + serverName = d.EqualsQuals["server_name"].GetStringValue() + databaseName = d.EqualsQuals["name"].GetStringValue() + resourceGroupName = d.EqualsQuals["resource_group"].GetStringValue() } session, err := GetNewSession(ctx, d, "MANAGEMENT") diff --git a/azure/table_azure_sql_server.go b/azure/table_azure_sql_server.go index b136e460..6e8c802f 100644 --- a/azure/table_azure_sql_server.go +++ b/azure/table_azure_sql_server.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2017-03-01-preview/sql" sqlv3 "github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/v3.0/sql" @@ -226,7 +226,7 @@ func listSQLServer(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa d.StreamListItem(ctx, server) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -240,7 +240,7 @@ func listSQLServer(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa d.StreamListItem(ctx, server) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -253,8 +253,8 @@ func listSQLServer(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateDa func getSQLServer(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getSQLServer") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_storage_account.go b/azure/table_azure_storage_account.go index 441204c5..a6f5aa8d 100644 --- a/azure/table_azure_storage_account.go +++ b/azure/table_azure_storage_account.go @@ -9,10 +9,10 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/queue/queues" "github.com/tombuildsstuff/giovanni/storage/2019-12-12/blob/accounts" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) type storageAccountInfo = struct { @@ -449,7 +449,7 @@ func listStorageAccounts(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd d.StreamListItem(ctx, &storageAccountInfo{account, account.Name, resourceGroup}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -465,7 +465,7 @@ func listStorageAccounts(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd d.StreamListItem(ctx, &storageAccountInfo{account, account.Name, resourceGroup}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -484,8 +484,8 @@ func getStorageAccount(ctx context.Context, d *plugin.QueryData, h *plugin.Hydra return nil, err } subscriptionID := session.SubscriptionID - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() storageClient := storage.NewAccountsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) storageClient.Authorizer = session.Authorizer diff --git a/azure/table_azure_storage_blob.go b/azure/table_azure_storage_blob.go index 5412b267..d386a9f5 100644 --- a/azure/table_azure_storage_blob.go +++ b/azure/table_azure_storage_blob.go @@ -7,9 +7,9 @@ import ( "strings" "sync" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage" "github.com/Azure/azure-storage-blob-go/azblob" @@ -338,8 +338,8 @@ func listStorageBlobs(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrat } subscriptionID := session.SubscriptionID - accountName := d.KeyColumnQuals["storage_account_name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + accountName := d.EqualsQuals["storage_account_name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() if accountName == "" || resourceGroup == "" { return nil, nil @@ -416,7 +416,7 @@ func listStorageBlobs(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrat d.StreamListItem(ctx, &blobInfo{data.Blob, data.Name, accountName, data.Container, resourceGroup, &subscriptionID, region, data.IsSnapshot}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } diff --git a/azure/table_azure_storage_blob_service.go b/azure/table_azure_storage_blob_service.go index 52b9c508..2c0f3cc9 100644 --- a/azure/table_azure_storage_blob_service.go +++ b/azure/table_azure_storage_blob_service.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) type blobServiceInfo = struct { @@ -183,7 +183,7 @@ func listStorageBlobServices(ctx context.Context, d *plugin.QueryData, h *plugin d.StreamListItem(ctx, &blobServiceInfo{blobService, account.Name, account.ResourceGroup, account.Account.Location}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -196,8 +196,8 @@ func listStorageBlobServices(ctx context.Context, d *plugin.QueryData, h *plugin func getStorageBlobService(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getStorageBlobService") - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - accountName := d.KeyColumnQuals["storage_account_name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + accountName := d.EqualsQuals["storage_account_name"].GetStringValue() // length of the AccountName must be greater than, or equal to 3, and // length of the ResourceGroupName must be greater than 1 diff --git a/azure/table_azure_storage_container.go b/azure/table_azure_storage_container.go index eb1f19a0..3681470e 100644 --- a/azure/table_azure_storage_container.go +++ b/azure/table_azure_storage_container.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/turbot/go-kit/types" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage" ) @@ -204,7 +204,7 @@ func listStorageContainers(ctx context.Context, d *plugin.QueryData, h *plugin.H d.StreamListItem(ctx, container) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -218,7 +218,7 @@ func listStorageContainers(ctx context.Context, d *plugin.QueryData, h *plugin.H d.StreamListItem(ctx, container) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -239,9 +239,9 @@ func getStorageContainer(ctx context.Context, d *plugin.QueryData, h *plugin.Hyd } subscriptionID := session.SubscriptionID - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - accountName := d.KeyColumnQuals["account_name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + accountName := d.EqualsQuals["account_name"].GetStringValue() client := storage.NewBlobContainersClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) client.Authorizer = session.Authorizer diff --git a/azure/table_azure_storage_queue.go b/azure/table_azure_storage_queue.go index 6849a3b1..960dc67a 100644 --- a/azure/table_azure_storage_queue.go +++ b/azure/table_azure_storage_queue.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) type queueInfo = struct { @@ -135,7 +135,7 @@ func listStorageQueues(ctx context.Context, d *plugin.QueryData, h *plugin.Hydra d.StreamListItem(ctx, &queueInfo{queue, account.Name, queue.Name, account.ResourceGroup, account.Account.Location}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -149,7 +149,7 @@ func listStorageQueues(ctx context.Context, d *plugin.QueryData, h *plugin.Hydra d.StreamListItem(ctx, queue) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -169,9 +169,9 @@ func getStorageQueue(ctx context.Context, d *plugin.QueryData, h *plugin.Hydrate } subscriptionID := session.SubscriptionID - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - accountName := d.KeyColumnQuals["storage_account_name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + accountName := d.EqualsQuals["storage_account_name"].GetStringValue() storageClient := storage.NewAccountsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) storageClient.Authorizer = session.Authorizer diff --git a/azure/table_azure_storage_share_file.go b/azure/table_azure_storage_share_file.go index 0214e2df..ae805b20 100644 --- a/azure/table_azure_storage_share_file.go +++ b/azure/table_azure_storage_share_file.go @@ -6,10 +6,10 @@ import ( "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage" "github.com/turbot/go-kit/types" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -217,7 +217,7 @@ func listStorageAccountsFileShares(ctx context.Context, d *plugin.QueryData, h * // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -240,7 +240,7 @@ func listStorageAccountsFileShares(ctx context.Context, d *plugin.QueryData, h * // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -261,9 +261,9 @@ func getStorageAccountsFileShare(ctx context.Context, d *plugin.QueryData, h *pl return nil, err } - resourceGroup := d.KeyColumnQualString("resource_group") - storageAccountName := d.KeyColumnQualString("storage_account_name") - name := d.KeyColumnQualString("name") + resourceGroup := d.EqualsQualString("resource_group") + storageAccountName := d.EqualsQualString("storage_account_name") + name := d.EqualsQualString("name") if strings.Trim(name, " ") == "" || strings.Trim(resourceGroup, " ") == "" || strings.Trim(storageAccountName, " ") == "" { return nil, nil diff --git a/azure/table_azure_storage_sync.go b/azure/table_azure_storage_sync.go index d518b960..25a3eba3 100644 --- a/azure/table_azure_storage_sync.go +++ b/azure/table_azure_storage_sync.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/storagesync/mgmt/2020-03-01/storagesync" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -162,8 +162,8 @@ func listAzureStorageSyncs(ctx context.Context, d *plugin.QueryData, _ *plugin.H func getAzureStorageSync(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getAzureStorageSync") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_storage_table.go b/azure/table_azure_storage_table.go index ac8106f0..83d0be98 100644 --- a/azure/table_azure_storage_table.go +++ b/azure/table_azure_storage_table.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) type tableInfo = struct { @@ -129,7 +129,7 @@ func listStorageTables(ctx context.Context, d *plugin.QueryData, h *plugin.Hydra d.StreamListItem(ctx, &tableInfo{table, account.Name, table.Name, account.ResourceGroup, account.Account.Location}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -143,7 +143,7 @@ func listStorageTables(ctx context.Context, d *plugin.QueryData, h *plugin.Hydra d.StreamListItem(ctx, table) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -157,9 +157,9 @@ func listStorageTables(ctx context.Context, d *plugin.QueryData, h *plugin.Hydra func getStorageTable(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getStorageTable") - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - accountName := d.KeyColumnQuals["storage_account_name"].GetStringValue() - name := d.KeyColumnQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + accountName := d.EqualsQuals["storage_account_name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() // length of the AccountName must be greater than, or equal to 3, and // length of the ResourceGroupName must be greater than 1, and diff --git a/azure/table_azure_storage_table_service.go b/azure/table_azure_storage_table_service.go index 9c88d93b..74f71d43 100644 --- a/azure/table_azure_storage_table_service.go +++ b/azure/table_azure_storage_table_service.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) type tableServiceInfo = struct { @@ -126,7 +126,7 @@ func listStorageTableServices(ctx context.Context, d *plugin.QueryData, h *plugi d.StreamListItem(ctx, &tableServiceInfo{tableService, account.Name, tableService.Name, account.ResourceGroup, account.Account.Location}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -139,8 +139,8 @@ func listStorageTableServices(ctx context.Context, d *plugin.QueryData, h *plugi func getStorageTableService(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getStorageTableService") - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - accountName := d.KeyColumnQuals["storage_account_name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + accountName := d.EqualsQuals["storage_account_name"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_stream_analytics_job.go b/azure/table_azure_stream_analytics_job.go index be74c806..518c067b 100644 --- a/azure/table_azure_stream_analytics_job.go +++ b/azure/table_azure_stream_analytics_job.go @@ -5,10 +5,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/streamanalytics/mgmt/2016-03-01/streamanalytics" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -222,7 +222,7 @@ func listStreamAnalyticsJobs(ctx context.Context, d *plugin.QueryData, _ *plugin d.StreamListItem(ctx, streamingJob) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -236,7 +236,7 @@ func listStreamAnalyticsJobs(ctx context.Context, d *plugin.QueryData, _ *plugin d.StreamListItem(ctx, streamingJob) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -260,8 +260,8 @@ func getStreamAnalyticsJob(ctx context.Context, d *plugin.QueryData, h *plugin.H streamingJobsClient := streamanalytics.NewStreamingJobsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) streamingJobsClient.Authorizer = session.Authorizer - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Return nil, if no input provide if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_subnet.go b/azure/table_azure_subnet.go index 41e3dfea..dd9fc470 100644 --- a/azure/table_azure_subnet.go +++ b/azure/table_azure_subnet.go @@ -6,10 +6,10 @@ import ( "sync" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) type subnetInfo = struct { @@ -180,7 +180,7 @@ func listSubnets(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData d.StreamListItem(ctx, subnetInfo{subnet, subnet.Name, virtualNetwork.Name, resourceGroupName}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -194,7 +194,7 @@ func listSubnets(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData d.StreamListItem(ctx, subnetInfo{subnet, subnet.Name, virtualNetwork.Name, resourceGroupName}) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -216,9 +216,9 @@ func getSubnet(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) subnetClient := network.NewSubnetsClientWithBaseURI(session.ResourceManagerEndpoint, subscriptionID) subnetClient.Authorizer = session.Authorizer - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() - virtualNetwork := d.KeyColumnQuals["virtual_network_name"].GetStringValue() - name := d.KeyColumnQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() + virtualNetwork := d.EqualsQuals["virtual_network_name"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() op, err := subnetClient.Get(ctx, resourceGroup, virtualNetwork, name, "") if err != nil { diff --git a/azure/table_azure_subscription.go b/azure/table_azure_subscription.go index 4b61df89..efa4e822 100644 --- a/azure/table_azure_subscription.go +++ b/azure/table_azure_subscription.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-06-01/subscriptions" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION diff --git a/azure/table_azure_synapse_workspace.go b/azure/table_azure_synapse_workspace.go index c389cce9..8cb8197e 100644 --- a/azure/table_azure_synapse_workspace.go +++ b/azure/table_azure_synapse_workspace.go @@ -6,10 +6,10 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/2020-09-01/monitor/mgmt/insights" "github.com/Azure/azure-sdk-for-go/services/synapse/mgmt/2021-03-01/synapse" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION @@ -251,8 +251,8 @@ func listSynapseWorkspaces(ctx context.Context, d *plugin.QueryData, _ *plugin.H func getSynapseWorkspace(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getSynapseWorkspace") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/table_azure_tenant.go b/azure/table_azure_tenant.go index 7cbacacf..d0cea84a 100644 --- a/azure/table_azure_tenant.go +++ b/azure/table_azure_tenant.go @@ -4,9 +4,9 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-06-01/subscriptions" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION diff --git a/azure/table_azure_virtual_network.go b/azure/table_azure_virtual_network.go index 8ac3a2d4..4d66406c 100644 --- a/azure/table_azure_virtual_network.go +++ b/azure/table_azure_virtual_network.go @@ -4,10 +4,10 @@ import ( "context" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) //// TABLE DEFINITION //// @@ -146,7 +146,7 @@ func listVirtualNetworks(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd d.StreamListItem(ctx, network) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -161,7 +161,7 @@ func listVirtualNetworks(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd d.StreamListItem(ctx, network) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -176,8 +176,8 @@ func listVirtualNetworks(ctx context.Context, d *plugin.QueryData, _ *plugin.Hyd func getVirtualNetwork(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { plugin.Logger(ctx).Trace("getVirtualNetwork") - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() session, err := GetNewSession(ctx, d, "MANAGEMENT") if err != nil { diff --git a/azure/table_azure_virtual_network_gateway.go b/azure/table_azure_virtual_network_gateway.go index 904f9e20..747cdbd0 100644 --- a/azure/table_azure_virtual_network_gateway.go +++ b/azure/table_azure_virtual_network_gateway.go @@ -6,9 +6,9 @@ import ( "github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/resources" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-05-01/network" - "github.com/turbot/steampipe-plugin-sdk/v4/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TABLE DEFINITION @@ -224,7 +224,7 @@ func listVirtualNetworkGateways(ctx context.Context, d *plugin.QueryData, h *plu d.StreamListItem(ctx, networkGateway) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -239,7 +239,7 @@ func listVirtualNetworkGateways(ctx context.Context, d *plugin.QueryData, h *plu d.StreamListItem(ctx, networkGateway) // Check if context has been cancelled or if the limit has been hit (if specified) // if there is a limit, it will return the number of rows required to reach this limit - if d.QueryStatus.RowsRemaining(ctx) == 0 { + if d.RowsRemaining(ctx) == 0 { return nil, nil } } @@ -260,8 +260,8 @@ func getVirtualNetworkGateway(ctx context.Context, d *plugin.QueryData, h *plugi } subscriptionID := session.SubscriptionID - name := d.KeyColumnQuals["name"].GetStringValue() - resourceGroup := d.KeyColumnQuals["resource_group"].GetStringValue() + name := d.EqualsQuals["name"].GetStringValue() + resourceGroup := d.EqualsQuals["resource_group"].GetStringValue() // Handle empty name or resourceGroup if name == "" || resourceGroup == "" { diff --git a/azure/utils.go b/azure/utils.go index bfa82723..e4c09d9c 100644 --- a/azure/utils.go +++ b/azure/utils.go @@ -7,7 +7,7 @@ import ( "github.com/Azure/go-autorest/autorest/date" "github.com/turbot/go-kit/types" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin/transform" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform" ) //// TRANSFORM FUNCTIONS diff --git a/go.mod b/go.mod index 7df8110e..bab475a0 100644 --- a/go.mod +++ b/go.mod @@ -10,11 +10,13 @@ require ( github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 github.com/Azure/go-autorest/autorest/date v0.3.0 github.com/tombuildsstuff/giovanni v0.15.1 - github.com/turbot/go-kit v0.4.0 - github.com/turbot/steampipe-plugin-sdk/v4 v4.1.12 + github.com/turbot/go-kit v0.5.0 + github.com/turbot/steampipe-plugin-sdk/v5 v5.2.0 ) require ( + cloud.google.com/go v0.65.0 // indirect + cloud.google.com/go/storage v1.10.0 // indirect github.com/Azure/azure-pipeline-go v0.2.3 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest/adal v0.9.10 // indirect @@ -25,20 +27,24 @@ require ( github.com/XiaoMi/pegasus-go-client v0.0.0-20210427083443-f3b6b08bc4c2 // indirect github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect github.com/agext/levenshtein v1.2.2 // indirect - github.com/allegro/bigcache/v3 v3.0.2 // indirect + github.com/allegro/bigcache/v3 v3.1.0 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/aws/aws-sdk-go v1.15.78 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822 // indirect github.com/btubbs/datetime v0.1.1 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/dgraph-io/ristretto v0.1.0 // indirect + github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect + github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/dimchansky/utfbom v1.1.1 // indirect github.com/dustin/go-humanize v1.0.0 // indirect - github.com/eko/gocache/v3 v3.1.1 // indirect + github.com/eko/gocache/v3 v3.1.2 // indirect github.com/fatih/color v1.13.0 // indirect github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/gertd/go-pluralize v0.2.1 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/go-logr/logr v1.2.3 // indirect @@ -46,40 +52,51 @@ require ( github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/gofrs/uuid v4.0.0+incompatible // indirect github.com/golang/glog v1.0.0 // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.8 // indirect github.com/google/uuid v1.1.2 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect - github.com/hashicorp/go-hclog v1.2.2 // indirect - github.com/hashicorp/go-plugin v1.4.4 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-getter v1.6.2 // indirect + github.com/hashicorp/go-hclog v1.4.0 // indirect + github.com/hashicorp/go-plugin v1.4.8 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect - github.com/hashicorp/hcl/v2 v2.12.0 // indirect + github.com/hashicorp/hcl/v2 v2.15.0 // indirect github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect github.com/iancoleman/strcase v0.2.0 // indirect + github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 // indirect + github.com/jstemmer/go-junit-report v0.9.1 // indirect + github.com/klauspost/compress v1.11.2 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-ieproxy v0.0.1 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.0.0 // indirect github.com/mitchellh/go-wordwrap v1.0.0 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/oklog/run v1.0.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/pegasus-kv/thrift v0.13.0 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/prometheus/client_golang v1.12.2 // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.33.0 // indirect - github.com/prometheus/procfs v0.7.3 // indirect + github.com/prometheus/client_golang v1.14.0 // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.37.0 // indirect + github.com/prometheus/procfs v0.8.0 // indirect github.com/rivo/uniseg v0.2.0 // indirect - github.com/sethvargo/go-retry v0.1.0 // indirect - github.com/sirupsen/logrus v1.8.1 // indirect + github.com/sethvargo/go-retry v0.2.4 // indirect + github.com/sirupsen/logrus v1.9.0 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/stevenle/topsort v0.0.0-20130922064739-8130c1d7596b // indirect - github.com/tkrajina/go-reflector v0.5.4 // indirect - github.com/zclconf/go-cty v1.10.0 // indirect - go.opentelemetry.io/otel v1.7.0 // indirect + github.com/tkrajina/go-reflector v0.5.6 // indirect + github.com/ulikunitz/xz v0.5.8 // indirect + github.com/zclconf/go-cty v1.12.1 // indirect + go.opencensus.io v0.22.4 // indirect + go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.30.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.30.0 // indirect @@ -88,19 +105,25 @@ require ( go.opentelemetry.io/otel/metric v0.30.0 // indirect go.opentelemetry.io/otel/sdk v1.7.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.30.0 // indirect - go.opentelemetry.io/otel/trace v1.7.0 // indirect + go.opentelemetry.io/otel/trace v1.10.0 // indirect go.opentelemetry.io/proto/otlp v0.16.0 // indirect - golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect - golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf // indirect - golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/crypto v0.1.0 // indirect + golang.org/x/exp v0.0.0-20221110155412-d0897a79cd37 // indirect + golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect + golang.org/x/mod v0.6.0 // indirect + golang.org/x/net v0.2.0 // indirect + golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect + golang.org/x/sync v0.1.0 // indirect + golang.org/x/sys v0.2.0 // indirect + golang.org/x/text v0.4.0 // indirect + golang.org/x/tools v0.2.0 // indirect + google.golang.org/api v0.30.0 // indirect + google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect - google.golang.org/grpc v1.48.0 // indirect - google.golang.org/protobuf v1.28.0 // indirect + google.golang.org/grpc v1.51.0 // indirect + google.golang.org/protobuf v1.28.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apimachinery v0.23.5 // indirect + k8s.io/apimachinery v0.25.3 // indirect ) diff --git a/go.sum b/go.sum index 6c047a55..e9b4b28c 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,7 @@ cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bP cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0 h1:Dg9iHVQfrhq82rUNu9ZxUDrJLaxFUe/HlCVaLyRruq8= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= @@ -29,6 +30,7 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= @@ -74,14 +76,11 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/XiaoMi/pegasus-go-client v0.0.0-20210427083443-f3b6b08bc4c2 h1:pami0oPhVosjOu/qRHepRmdjD6hGILF7DBr+qQZeP10= github.com/XiaoMi/pegasus-go-client v0.0.0-20210427083443-f3b6b08bc4c2/go.mod h1:jNIx5ykW1MroBuaTja9+VpglmaJOUzezumfhLlER3oY= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= -github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -89,23 +88,24 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/allegro/bigcache/v3 v3.0.2 h1:AKZCw+5eAaVyNTBmI2fgyPVJhHkdWder3O9IrprcQfI= -github.com/allegro/bigcache/v3 v3.0.2/go.mod h1:aPyh7jEvrog9zAwx5N7+JUQX5dZTSGpxF1LAR4dr35I= +github.com/allegro/bigcache/v3 v3.1.0 h1:H2Vp8VOvxcrB91o86fUSVJFqeuz8kpyyB02eH3bSzwk= +github.com/allegro/bigcache/v3 v3.1.0/go.mod h1:aPyh7jEvrog9zAwx5N7+JUQX5dZTSGpxF1LAR4dr35I= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3 h1:ZSTrOEhiM5J5RFxEaFvMZVEAM1KvT1YzbEOwB2EAGjA= -github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= -github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/aws/aws-sdk-go v1.15.78 h1:LaXy6lWR0YK7LKyuU0QWy2ws/LWTPfYV/UgfiBu4tvY= +github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw= -github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= +github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= +github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= +github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822 h1:hjXJeBcAMS1WGENGqDpzvmgS43oECTx8UXq31UBu0Jw= +github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/btubbs/datetime v0.1.1 h1:KuV+F9tyq/hEnezmKZNGk8dzqMVsId6EpFVrQCfA3To= github.com/btubbs/datetime v0.1.1/go.mod h1:n2BZ/2ltnRzNiz27aE3wUb2onNttQdC+WFxAoks5jJM= github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= @@ -116,6 +116,7 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -128,15 +129,15 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/coocood/freecache v1.2.1 h1:/v1CqMq45NFH9mp/Pt142reundeBM0dVUD3osQBeu/U= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/coocood/freecache v1.2.3 h1:lcBwpZrwBZRZyLk/8EMyQVXRiFl663cCuMOrjCALeto= +github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ= github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= -github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= +github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= +github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= @@ -146,13 +147,11 @@ github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQ github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U= github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eko/gocache/v3 v3.1.1 h1:r3CBwLnqPkcK56h9Do2CWw1kZ4TeKK0wDE1Oo/YZnhs= -github.com/eko/gocache/v3 v3.1.1/go.mod h1:UpP/LyHAioP/a/dizgl0MpgZ3A3CkS4NbG/mWkGTQ9M= +github.com/eko/gocache/v3 v3.1.2 h1:tBAn5kBScEmRXWHJl0iJgJU7TsMeOjySwHDZ/92riqg= +github.com/eko/gocache/v3 v3.1.2/go.mod h1:92prWCVTLxRkRlZuxDkLkwwUfitZ60zKNi6kn3qiDNU= github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -163,7 +162,7 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= @@ -172,11 +171,10 @@ github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/gertd/go-pluralize v0.2.1 h1:M3uASbVjMnTsPb0PNqg+E/24Vwigyo/tvyMTtAlLgiA= github.com/gertd/go-pluralize v0.2.1/go.mod h1:rbYaKDbsXxmRfr8uygAEKhOWsjyrrqrkHVpZvoOp8zk= -github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -192,37 +190,30 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= -github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= -github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -233,7 +224,6 @@ github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -263,12 +253,14 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0 h1:pMen7vLs8nvgEYhywH3KDWJIJTeEr2ULsVWHWYHQyBs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -282,13 +274,10 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= -github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= -github.com/gopherjs/gopherjs v0.0.0-20220410123724-9e86199038b0 h1:fWY+zXdWhvWndXqnMj4SyC/vi8sK508OjhGCtMzsA9M= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 h1:BZHcxBETFHIdVyhyEfOvn/RdU/QGdLI4y34qQGjGWO0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= @@ -296,18 +285,25 @@ github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/U github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-azure-helpers v0.12.0 h1:7D0mFSyP3EfHu1ySubserIsnUWY87HMzzTWOB7ASwRU= github.com/hashicorp/go-azure-helpers v0.12.0/go.mod h1:Zc3v4DNeX6PDdy7NljlYpnrdac1++qNW0I4U+ofGwpg= -github.com/hashicorp/go-hclog v1.2.2 h1:ihRI7YFwcZdiSD7SIenIhHfQH3OuDvWerAUBZbeQS3M= -github.com/hashicorp/go-hclog v1.2.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-getter v1.6.2 h1:7jX7xcB+uVCliddZgeKyNxv0xoT7qL5KDtH7rU4IqIk= +github.com/hashicorp/go-getter v1.6.2/go.mod h1:IZCrswsZPeWv9IkVnLElzRU/gz/QPi6pZHn4tv6vbwA= +github.com/hashicorp/go-hclog v1.4.0 h1:ctuWFGrhFha8BnnzxqeRGidlEcQkDyL5u8J8t5eA11I= +github.com/hashicorp/go-hclog v1.4.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-plugin v1.4.4 h1:NVdrSdFRt3SkZtNckJ6tog7gbpRrcbOjQi/rgF7JYWQ= -github.com/hashicorp/go-plugin v1.4.4/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s= +github.com/hashicorp/go-plugin v1.4.8 h1:CHGwpxYDOttQOY7HOWgETU9dyVjOXzniXDqJcYJE1zM= +github.com/hashicorp/go-plugin v1.4.8/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s= +github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= +github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= +github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl/v2 v2.12.0 h1:PsYxySWpMD4KPaoJLnsHwtK5Qptvj/4Q6s0t4sUxZf4= -github.com/hashicorp/hcl/v2 v2.12.0/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg= +github.com/hashicorp/hcl/v2 v2.15.0 h1:CPDXO6+uORPjKflkWCCwoWc9uRp+zSIPcCQ+BrxV7m8= +github.com/hashicorp/hcl/v2 v2.15.0/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -315,6 +311,8 @@ github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHL github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -323,53 +321,51 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.11.2 h1:MiK62aErc3gIiVEtyzKfeOHgW7atJb5g/KNX5m3c2nQ= +github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= -github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI= github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -380,9 +376,7 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= @@ -391,14 +385,10 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= +github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/pegasus-kv/thrift v0.13.0 h1:4ESwaNoHImfbHa9RUGJiJZ4hrxorihZHk5aarYwY8d4= github.com/pegasus-kv/thrift v0.13.0/go.mod h1:Gl9NT/WHG6ABm6NsrbfE8LiJN0sAyneCrvB4qN4NPqQ= @@ -414,50 +404,49 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= -github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.33.0 h1:rHgav/0a6+uYgGdNt3jwz8FNSesO/Hsang3O0T9A5SE= -github.com/prometheus/common v0.33.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE= +github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sethvargo/go-retry v0.1.0 h1:8sPqlWannzcReEcYjHSNw9becsiYudcwTD7CasGjQaI= -github.com/sethvargo/go-retry v0.1.0/go.mod h1:JzIOdZqQDNpPkQDmcqgtteAcxFLtYpNF/zJCM1ysDg8= +github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= +github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08Ocec= +github.com/sethvargo/go-retry v0.2.4/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v1.13.0 h1:Dx1kYM01xsSqKPno3aqLnrwac2LetPvN23diwyr69Qs= github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stevenle/topsort v0.0.0-20130922064739-8130c1d7596b h1:wJSBFlabo96ySlmSX0a02WAPyGxagzTo9c5sk3sHP3E= github.com/stevenle/topsort v0.0.0-20130922064739-8130c1d7596b/go.mod h1:YIyOMT17IKD8FbLO8RfCJZd2qAZiOnIfuYePIeESwWc= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -465,39 +454,35 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= -github.com/tkrajina/go-reflector v0.5.4 h1:dS9aJEa/eYNQU/fwsb5CSiATOxcNyA/gG/A7a582D5s= -github.com/tkrajina/go-reflector v0.5.4/go.mod h1:9PyLgEOzc78ey/JmQQHbW8cQJ1oucLlNQsg8yFvkVk8= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/tkrajina/go-reflector v0.5.6 h1:hKQ0gyocG7vgMD2M3dRlYN6WBBOmdoOzJ6njQSepKdE= +github.com/tkrajina/go-reflector v0.5.6/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4= github.com/tombuildsstuff/giovanni v0.15.1 h1:CVRaLOJ7C/eercCrKIsarfJ4SZoGMdBL9Q2deFDUXco= github.com/tombuildsstuff/giovanni v0.15.1/go.mod h1:0TZugJPEtqzPlMpuJHYfXY6Dq2uLPrXf98D2XQSxNbA= -github.com/turbot/go-kit v0.4.0 h1:EdD7Bf2EGAjvHRGQxRiWpDawzZSk3T+eghqbj74qiSc= -github.com/turbot/go-kit v0.4.0/go.mod h1:SBdPRngbEfYubiR81iAVtO43oPkg1+ASr+XxvgbH7/k= -github.com/turbot/steampipe-plugin-sdk/v4 v4.1.12 h1:QyCAEidsYOSbH1lHADmo1ia5EZuXBX/zvgnXJPWqvLk= -github.com/turbot/steampipe-plugin-sdk/v4 v4.1.12/go.mod h1:t1uwq6KylUr2CzIinxeTafoktJvX8yWmhaoWCJJc4YI= -github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= -github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= -github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= +github.com/turbot/go-kit v0.5.0 h1:bulbpYGyOQWt4/qFAULPBdrLis//sf3VFz5mTZelv0k= +github.com/turbot/go-kit v0.5.0/go.mod h1:oP9gLk6bETL4nkEuujZZbOlcv9jnHQlf7DYcI/+Ke8Q= +github.com/turbot/steampipe-plugin-sdk/v5 v5.2.0 h1:0ZtmYd4Tfiamt8h/33+dWyz2MqbxIMZo9YiHzNgeQnk= +github.com/turbot/steampipe-plugin-sdk/v5 v5.2.0/go.mod h1:bfvdKaLwemr13EPOMbnr7/hOQOO7m4oM7HnVMdNotgY= +github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ= +github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= -github.com/zclconf/go-cty v1.8.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= -github.com/zclconf/go-cty v1.10.0 h1:mp9ZXQeIcN8kAwuqorjH+Q+njbJKjLrvB2yIh4q7U+0= -github.com/zclconf/go-cty v1.10.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= -github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= +github.com/zclconf/go-cty v1.12.1 h1:PcupnljUm9EIvbgSHQnHhUr3fO6oFmkOrvs2BAFNXXY= +github.com/zclconf/go-cty v1.12.1/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= +go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= +go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 h1:7Yxsak1q4XrJ5y7XBnNwqWx9amMZvoidCctv62XOQ6Y= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0/go.mod h1:M1hVZHNxcbkAlcvrOMlpQ4YOO3Awf+4N2dxkZL3xm04= go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.30.0 h1:Os0ds8fJp2AUa9DNraFWIycgUzevz47i6UvnSh+8LQ0= @@ -514,8 +499,9 @@ go.opentelemetry.io/otel/sdk v1.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1 go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU= go.opentelemetry.io/otel/sdk/metric v0.30.0 h1:XTqQ4y3erR2Oj8xSAOL5ovO5011ch2ELg51z4fVkpME= go.opentelemetry.io/otel/sdk/metric v0.30.0/go.mod h1:8AKFRi5HyvTR0RRty3paN1aMC9HMT+NzcEhw/BLkLX8= -go.opentelemetry.io/otel/trace v1.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o= go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= +go.opentelemetry.io/otel/trace v1.10.0 h1:npQMbR8o7mum8uF95yFbOEJffhs1sbCOfDh8zAJiH5E= +go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/AzrK+kxfGqySM= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.16.0 h1:WHzDWdXUvbc5bG2ObdrGfaNpQz7ft7QN9HHmJlbiB1E= go.opentelemetry.io/proto/otlp v0.16.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= @@ -523,15 +509,15 @@ go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -542,8 +528,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf h1:oXVg4h2qJDd9htKxb5SCpFBHLipW6hXmL3qpUixS2jw= -golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf/go.mod h1:yh0Ynu2b5ZUe3MQfp2nM0ecK7wsgouWTDN0FNeJuIys= +golang.org/x/exp v0.0.0-20221110155412-d0897a79cd37 h1:wKMvZzBFHbOCGvF2OmxR5Fqv/jDlkt7slnPz5ejEU8A= +golang.org/x/exp v0.0.0-20221110155412-d0897a79cd37/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -555,6 +541,7 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -565,9 +552,10 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -582,7 +570,6 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191105084925-a882066a44e0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -596,7 +583,6 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -604,11 +590,10 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4= -golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -616,6 +601,7 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -625,10 +611,10 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -639,19 +625,15 @@ golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -667,7 +649,6 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -684,13 +665,16 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -702,8 +686,9 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -743,20 +728,18 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -773,6 +756,7 @@ google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0 h1:yfrXXP61wVuLb0vBcG6qaOoIoqYEzOQS8jum51jkv2w= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -780,6 +764,8 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -810,7 +796,6 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac h1:qSNTkEN+L2mvWcLgJOR+8bdHX9rN/IdU3A1Ghpfb1Rg= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= @@ -832,8 +817,8 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= -google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= +google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -847,14 +832,16 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= @@ -869,13 +856,10 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -886,25 +870,14 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/apimachinery v0.0.0-20191123233150-4c4803ed55e3/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= -k8s.io/apimachinery v0.23.5 h1:Va7dwhp8wgkUPWsEXk6XglXWU4IKYLKNlv8VkX7SDM0= -k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= +k8s.io/apimachinery v0.25.3 h1:7o9ium4uyUOM76t6aunP0nZuex7gDf8VGwkR5RcJnQc= +k8s.io/apimachinery v0.25.3/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= -k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/main.go b/main.go index 395febfd..d0204838 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "github.com/turbot/steampipe-plugin-azure/azure" - "github.com/turbot/steampipe-plugin-sdk/v4/plugin" + "github.com/turbot/steampipe-plugin-sdk/v5/plugin" ) func main() {