From f43161f6e6159bb2dec97725c82a7129c81f138c Mon Sep 17 00:00:00 2001 From: Ron <38083777+roneli@users.noreply.github.com> Date: Thu, 22 Apr 2021 14:38:25 +0300 Subject: [PATCH] Reduce long table names test on pg 11 (#38) * Reduce long table names test on pg 11 * upgrade sdk 0.1.6 --- .github/workflows/test.yml | 2 +- go.mod | 4 ++-- go.sum | 12 ++++++------ resources/ec2_instances.go | 6 +++--- resources/ec2_security_groups.go | 10 +++++----- resources/elasticbeanstalk_environments.go | 6 +++--- resources/elbv2_load_balancers.go | 8 ++++---- resources/redshift_clusters.go | 6 +++--- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 12723fac3..7626c7ee9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: postgres: strategy: matrix: - dbversion: ['postgres:latest'] + dbversion: ['postgres:latest', 'postgres:12', 'postgres:11'] go: ['1.15'] platform: [ubuntu-latest] # can not run in macOS and widnowsOS runs-on: ${{ matrix.platform }} diff --git a/go.mod b/go.mod index e73285fd0..104e0ee9d 100644 --- a/go.mod +++ b/go.mod @@ -29,10 +29,10 @@ require ( github.com/aws/aws-sdk-go-v2/service/sns v1.1.2 github.com/aws/aws-sdk-go-v2/service/sts v1.1.2 github.com/aws/smithy-go v1.3.0 - github.com/cloudquery/cq-provider-sdk v0.1.4 + github.com/cloudquery/cq-provider-sdk v0.1.6 github.com/cloudquery/faker/v3 v3.7.4 github.com/golang/mock v1.5.0 - github.com/hashicorp/go-hclog v0.15.0 + github.com/hashicorp/go-hclog v0.16.0 github.com/jackc/pgx/v4 v4.10.1 github.com/spf13/cast v1.3.0 github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 246c0ffc3..7ac598ae8 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ github.com/aws/smithy-go v1.3.0 h1:awbB2OJBZ/Txj+c4q+qhDQs3Ob0sRhBuIIkOD4Aq8yc= github.com/aws/smithy-go v1.3.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/cq-provider-sdk v0.1.4 h1:3vEgR6vMXu9pUL2tLnKHygTT9pmvMLrBpZlWid11kzc= -github.com/cloudquery/cq-provider-sdk v0.1.4/go.mod h1:hM0STflFLkkoFk3lJnnjw03DyAkukvA2/LvjCG6wLD8= +github.com/cloudquery/cq-provider-sdk v0.1.6 h1:CCmSItk6XRT7I4KZs5ZuQWLoHUw9uLEEddMwpinCZaQ= +github.com/cloudquery/cq-provider-sdk v0.1.6/go.mod h1:m+HC+CM4Yx+8dR03Dc8qNQWEZjAiVKU2kVRy/xEYPig= github.com/cloudquery/faker/v3 v3.7.4 h1:cCcU3r0yHpS0gqKj9rRKAGS0/hY33fBxbqCNFtDD4ec= github.com/cloudquery/faker/v3 v3.7.4/go.mod h1:1b8WVG9Gh0T2hVo1a8dWeXfu0AhqSB6J/mmJaesqOeo= github.com/cloudquery/go-funk v0.8.2-0.20210404151606-aacdb5e7797f h1:3cGpvb8FXWyW/u33zmilsLAPBcQ/GQNyba/GUjnmThk= @@ -137,10 +137,10 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.15.0 h1:qMuK0wxsoW4D0ddCCYwPSTm4KQv1X1ke3WmPWZ0Mvsk= -github.com/hashicorp/go-hclog v0.15.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-plugin v1.4.0 h1:b0O7rs5uiJ99Iu9HugEzsM67afboErkHUWddUSpUO3A= -github.com/hashicorp/go-plugin v1.4.0/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= +github.com/hashicorp/go-hclog v0.16.0 h1:uCeOEwSWGMwhJUdpUjk+1cVKIEfGu2/1nFXukimi2MU= +github.com/hashicorp/go-hclog v0.16.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-plugin v1.4.1 h1:6UltRQlLN9iZO513VveELp5xyaFxVD2+1OVylE+2E+w= +github.com/hashicorp/go-plugin v1.4.1/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= diff --git a/resources/ec2_instances.go b/resources/ec2_instances.go index 91dc857aa..0287d68e2 100644 --- a/resources/ec2_instances.go +++ b/resources/ec2_instances.go @@ -529,8 +529,8 @@ func Ec2Instances() *schema.Table { }, }, { - Name: "aws_ec2_instance_network_interface_instance_private_ip_addresses", - Resolver: fetchEc2InstanceNetworkInterfaceInstancePrivateIpAddresses, + Name: "aws_ec2_instance_network_interface_private_ip_addresses", + Resolver: fetchEc2InstanceNetworkInterfacePrivateIpAddresses, Columns: []schema.Column{ { Name: "instance_network_interface_id", @@ -701,7 +701,7 @@ func fetchEc2InstanceNetworkInterfaceIpv6Addresses(_ context.Context, _ schema.C res <- instanceNetworkInterface.Ipv6Addresses return nil } -func fetchEc2InstanceNetworkInterfaceInstancePrivateIpAddresses(__ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { +func fetchEc2InstanceNetworkInterfacePrivateIpAddresses(__ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { instanceNetworkInterface, ok := parent.Item.(types.InstanceNetworkInterface) if !ok { return fmt.Errorf("not ec2 instance network interface") diff --git a/resources/ec2_security_groups.go b/resources/ec2_security_groups.go index 41a837994..d5dc53a82 100644 --- a/resources/ec2_security_groups.go +++ b/resources/ec2_security_groups.go @@ -204,7 +204,7 @@ func Ec2SecurityGroups() *schema.Table { Resolver: fetchEc2SecurityGroupIpPermissionsEgressIpRanges, Columns: []schema.Column{ { - Name: "security_groupip_permissions_egress_id", + Name: "security_group_ip_permissions_egress_id", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, }, @@ -223,7 +223,7 @@ func Ec2SecurityGroups() *schema.Table { Resolver: fetchEc2SecurityGroupIpPermissionsEgressIpv6Ranges, Columns: []schema.Column{ { - Name: "security_groupip_permissions_egress_id", + Name: "security_group_ip_permissions_egress_id", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, }, @@ -242,7 +242,7 @@ func Ec2SecurityGroups() *schema.Table { Resolver: fetchEc2SecurityGroupIpPermissionsEgressPrefixListIds, Columns: []schema.Column{ { - Name: "security_groupip_permissions_egress_id", + Name: "security_group_ip_permissions_egress_id", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, }, @@ -257,11 +257,11 @@ func Ec2SecurityGroups() *schema.Table { }, }, { - Name: "aws_ec2_security_group_ip_permissions_egress_user_id_group_pairs", + Name: "aws_ec2_security_group_ip_permissions_egress_user_group_pairs", Resolver: fetchEc2SecurityGroupIpPermissionsEgressUserIdGroupPairs, Columns: []schema.Column{ { - Name: "security_groupip_permissions_egress_id", + Name: "security_group_ip_permissions_egress_id", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, }, diff --git a/resources/elasticbeanstalk_environments.go b/resources/elasticbeanstalk_environments.go index f450720b4..795d749df 100644 --- a/resources/elasticbeanstalk_environments.go +++ b/resources/elasticbeanstalk_environments.go @@ -149,8 +149,8 @@ func ElasticbeanstalkEnvironments() *schema.Table { }, }, { - Name: "aws_elasticbeanstalk_environment_resources_load_balancer_listeners", - Resolver: fetchElasticbeanstalkEnvironmentResourcesLoadBalancerListeners, + Name: "aws_elasticbeanstalk_env_resources_load_balancer_listeners", + Resolver: fetchElasticbeanstalkEnvResourcesLoadBalancerListeners, Columns: []schema.Column{ { Name: "environment_id", @@ -198,7 +198,7 @@ func fetchElasticbeanstalkEnvironmentLinks(ctx context.Context, meta schema.Clie res <- p.EnvironmentLinks return nil } -func fetchElasticbeanstalkEnvironmentResourcesLoadBalancerListeners(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { +func fetchElasticbeanstalkEnvResourcesLoadBalancerListeners(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { p := parent.Item.(types.EnvironmentDescription) res <- p.Resources.LoadBalancer.Listeners return nil diff --git a/resources/elbv2_load_balancers.go b/resources/elbv2_load_balancers.go index 7947d39e4..349989304 100644 --- a/resources/elbv2_load_balancers.go +++ b/resources/elbv2_load_balancers.go @@ -109,11 +109,11 @@ func Elbv2LoadBalancers() *schema.Table { }, Relations: []*schema.Table{ { - Name: "aws_elbv2_load_balancer_availability_zone_load_balancer_addresses", - Resolver: fetchElbv2LoadBalancerAvailabilityZoneLoadBalancerAddresses, + Name: "aws_elbv2_load_balancer_availability_zone_addresses", + Resolver: fetchElbv2LoadBalancerAvailabilityZoneAddresses, Columns: []schema.Column{ { - Name: "load_balanceravailability_zone_id", + Name: "load_balancer_availability_zone_id", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, }, @@ -170,7 +170,7 @@ func fetchElbv2LoadBalancerAvailabilityZones(ctx context.Context, meta schema.Cl res <- p.AvailabilityZones return nil } -func fetchElbv2LoadBalancerAvailabilityZoneLoadBalancerAddresses(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { +func fetchElbv2LoadBalancerAvailabilityZoneAddresses(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { p := parent.Item.(types.AvailabilityZone) res <- p.LoadBalancerAddresses return nil diff --git a/resources/redshift_clusters.go b/resources/redshift_clusters.go index c74a0e8c2..0c63574e4 100644 --- a/resources/redshift_clusters.go +++ b/resources/redshift_clusters.go @@ -398,8 +398,8 @@ func RedshiftClusters() *schema.Table { }, Relations: []*schema.Table{ { - Name: "aws_redshift_cluster_parameter_group_cluster_parameter_status_lists", - Resolver: fetchRedshiftClusterParameterGroupClusterParameterStatusLists, + Name: "aws_redshift_cluster_parameter_group_status_lists", + Resolver: fetchRedshiftClusterParameterGroupStatusLists, Columns: []schema.Column{ { Name: "cluster_parameter_group_id", @@ -601,7 +601,7 @@ func fetchRedshiftClusterParameterGroups(_ context.Context, _ schema.ClientMeta, res <- cluster.ClusterParameterGroups return nil } -func fetchRedshiftClusterParameterGroupClusterParameterStatusLists(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { +func fetchRedshiftClusterParameterGroupStatusLists(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { parameterGroup, ok := parent.Item.(types.ClusterParameterGroupStatus) if !ok { return fmt.Errorf("not redshift cluster parameter group")