diff --git a/client/client.go b/client/client.go index 0debdc440..44cdc23d7 100644 --- a/client/client.go +++ b/client/client.go @@ -5,6 +5,8 @@ import ( "fmt" "time" + "github.com/hashicorp/go-hclog" + "github.com/aws/aws-sdk-go-v2/service/cloudfront" "github.com/aws/aws-sdk-go-v2/aws" @@ -36,7 +38,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sns" "github.com/aws/aws-sdk-go-v2/service/sts" "github.com/cloudquery/cq-provider-sdk/provider/schema" - "github.com/hashicorp/go-hclog" ) // Provider Client passed as meta to all table fetchers @@ -110,7 +111,7 @@ type Client struct { ReportUsers interface{} } -// This is needed because https://pkg.go.dev/github.com/aws/aws-sdk-go-v2/feature/s3/manager +// S3Manager This is needed because https://pkg.go.dev/github.com/aws/aws-sdk-go-v2/feature/s3/manager // has different structure then all other services (i.e no service but just a function) and we need // the ability to mock it. // Also we need to use s3 manager to be able to query the bucket-region https://github.com/aws/aws-sdk-go-v2/pull/1027#issuecomment-759818990 diff --git a/client/config.go b/client/config.go index 8e04b15ba..57d7bcc8d 100644 --- a/client/config.go +++ b/client/config.go @@ -1,86 +1,33 @@ package client -// Provider Configuration type Account struct { - ID string - RoleARN string `yaml:"role_arn"` + ID string `hcl:"label,optional"` + RoleARN string `hcl:"role_arn,optional"` } type Config struct { - Regions []string `yaml:"regions"` - Accounts []Account `yaml:"accounts"` - AWSDebug bool `yaml:"aws_debug"` - LogLevel *string `yaml:"log_level"` - MaxRetries int `yaml:"max_retries" default:"5"` - MaxBackoff int `yaml:"max_backoff" default:"30"` - Resources []Resource + Regions []string `hcl:"regions,optional"` + Accounts []Account `hcl:"accounts,block"` + AWSDebug bool `hcl:"aws_debug,optional"` + MaxRetries int `hcl:"max_retries,optional" default:"5"` + MaxBackoff int `hcl:"max_backoff,optional" default:"30"` } -type Resource struct { - Name string - Other map[string]interface{} `yaml:",inline"` +func (c Config) Example() string { + return `configuration { + // Optional. if you want to assume role to multiple account and fetch data from them + //accounts ""{ + // Optional. Role ARN we want to assume when accessing this account + // role_arn = + // } + // Optional. by default assumes all regions + // regions = ["us-east-1", "us-west-2"] + // Optional. Enable AWS SDK debug logging. + aws_debug = false + // The maximum number of times that a request will be retried for failures. Defaults to 5 retry attempts. + // max_retries = 5 + // The maximum back off delay between attempts. The backoff delays exponentially with a jitter based on the number of attempts. Defaults to 60 seconds. + // max_backoff = 30 +} +` } - -const DefaultConfigYaml = ` - - name: aws -# accounts: # Optional. if you want to assume role to multiple account and fetch data from them -# - role_arn: -# regions: # Optional. if commented out assumes all regions -# - us-east-1 -# - us-west-2 -# aws_debug: false # Optional. if commented out will enable AWS SDK debug logging. -# max_retries: 5 # Optional. The maximum number of times that a request will be retried for failures. Defaults to 5 retry attempts. -# max_backoff: 30 # Optional. The maximum back off delay between attempts. The backoff delays exponentially with a jitter based on the number of attempts. Defaults to 60 seconds. - resources: # You can comment resources your are not interested in for faster fetching. - - name: autoscaling.launch_configurations - - name: cloudfront.cache_policies - - name: cloudfront.distributions - - name: cloudtrail.trails - - name: cloudwatch.alarms - - name: cloudwatchlogs.filters - - name: directconnect.gateways - - name: directconnect.virtual_gateways - - name: directconnect.virtual_interfaces - - name: ec2.customer_gateways - - name: ec2.ebs_volumes - - name: ec2.flow_logs - - name: ec2.images - - name: ec2.instances - - name: ec2.internet_gateways - - name: ec2.nat_gateways - - name: ec2.network_acls - - name: ec2.route_tables - - name: ec2.security_groups - - name: ec2.subnets - - name: ec2.transit_gateways - - name: ec2.vpc_peering_connections - - name: ec2.vpcs - - name: ec2.vpc_endpoints - - name: ecs.clusters - - name: ecr.repositories - - name: efs.filesystems - - name: eks.clusters - - name: elasticbeanstalk.environments - - name: elbv2.load_balancers - - name: elbv2.target_groups - - name: emr.clusters - - name: fsx.backups - - name: iam.groups - - name: iam.password_policies - - name: iam.policies - - name: iam.roles - - name: iam.users - - name: iam.virtual_mfa_devices - - name: iam.openid_connect_identity_providers - - name: iam.saml_identity_providers - - name: kms.keys - - name: organizations.accounts - - name: rds.certificates - - name: rds.clusters - - name: rds.db_subnet_groups - - name: rds.instances - - name: redshift.clusters - - name: redshift.subnet_groups - - name: s3.buckets - - name: sns.subscriptions - - name: sns.topics` diff --git a/client/mocks/mock_test.go b/client/mocks/mock_test.go index 69b715f22..796ec415e 100644 --- a/client/mocks/mock_test.go +++ b/client/mocks/mock_test.go @@ -2,10 +2,11 @@ package mocks_test import ( "context" - "fmt" "os" "testing" + "github.com/cloudquery/cq-provider-sdk/provider/providertest" + "github.com/cloudquery/cq-provider-aws/client" "github.com/cloudquery/cq-provider-aws/resources" "github.com/cloudquery/cq-provider-sdk/logging" @@ -14,8 +15,6 @@ import ( "github.com/golang/mock/gomock" "github.com/hashicorp/go-hclog" "github.com/jackc/pgx/v4" - "github.com/stretchr/testify/assert" - "gopkg.in/yaml.v3" ) type TestResource struct { @@ -52,202 +51,169 @@ func TestResources(t *testing.T) { ctrl := gomock.NewController(t) testResourcesTable := []TestResource{ { - resource: "autoscaling.launch_configurations", - mockBuilder: buildAutoscalingLaunchConfigurationsMock, - mainTable: resources.AutoscalingLaunchConfigurations(), - verifyEmptyColumns: true, + resource: "autoscaling.launch_configurations", + mockBuilder: buildAutoscalingLaunchConfigurationsMock, + mainTable: resources.AutoscalingLaunchConfigurations(), }, { - resource: "cloudwatch.alarms", - mockBuilder: buildCloudWatchAlarmsMock, - mainTable: resources.CloudwatchAlarms(), - verifyEmptyColumns: true, + resource: "cloudwatch.alarms", + mockBuilder: buildCloudWatchAlarmsMock, + mainTable: resources.CloudwatchAlarms(), }, { - resource: "cloudtrail.trails", - mockBuilder: buildCloudtrailTrailsMock, - mainTable: resources.CloudtrailTrails(), - verifyEmptyColumns: true, + resource: "cloudtrail.trails", + mockBuilder: buildCloudtrailTrailsMock, + mainTable: resources.CloudtrailTrails(), }, { - resource: "cloudwatchlogs.filters", - mockBuilder: buildCloudwatchLogsFiltersMock, - mainTable: resources.CloudwatchlogsFilters(), - verifyEmptyColumns: true, + resource: "cloudwatchlogs.filters", + mockBuilder: buildCloudwatchLogsFiltersMock, + mainTable: resources.CloudwatchlogsFilters(), }, { - resource: "directconnect.gateways", - mockBuilder: buildDirectconnectGatewaysMock, - mainTable: resources.DirectconnectGateways(), - verifyEmptyColumns: true, + resource: "directconnect.gateways", + mockBuilder: buildDirectconnectGatewaysMock, + mainTable: resources.DirectconnectGateways(), }, { - resource: "ec2.byoip_cidrs", - mockBuilder: buildEc2ByoipCidrsMock, - mainTable: resources.Ec2ByoipCidrs(), - verifyEmptyColumns: true, + resource: "ec2.byoip_cidrs", + mockBuilder: buildEc2ByoipCidrsMock, + mainTable: resources.Ec2ByoipCidrs(), }, { - resource: "directconnect.virtual_gateways", - mockBuilder: buildDirectconnectVirtualGatewaysMock, - mainTable: resources.DirectconnectVirtualGateways(), - verifyEmptyColumns: true, + resource: "directconnect.virtual_gateways", + mockBuilder: buildDirectconnectVirtualGatewaysMock, + mainTable: resources.DirectconnectVirtualGateways(), }, { - resource: "directconnect.virtual_interfaces", - mockBuilder: buildDirectconnectVirtualInterfacesMock, - mainTable: resources.DirectconnectVirtualInterfaces(), - verifyEmptyColumns: true, + resource: "directconnect.virtual_interfaces", + mockBuilder: buildDirectconnectVirtualInterfacesMock, + mainTable: resources.DirectconnectVirtualInterfaces(), }, { - resource: "ec2.customer_gateways", - mockBuilder: buildEc2CustomerGateways, - mainTable: resources.Ec2CustomerGateways(), - verifyEmptyColumns: true, + resource: "ec2.customer_gateways", + mockBuilder: buildEc2CustomerGateways, + mainTable: resources.Ec2CustomerGateways(), }, { - resource: "ec2.ebs_volumes", - mockBuilder: buildEc2EbsVolumes, - mainTable: resources.Ec2EbsVolumes(), - verifyEmptyColumns: true, + resource: "ec2.ebs_volumes", + mockBuilder: buildEc2EbsVolumes, + mainTable: resources.Ec2EbsVolumes(), }, { - resource: "ec2.flow_logs", - mockBuilder: buildEc2FlowLogsMock, - mainTable: resources.Ec2FlowLogs(), - verifyEmptyColumns: true, + resource: "ec2.flow_logs", + mockBuilder: buildEc2FlowLogsMock, + mainTable: resources.Ec2FlowLogs(), }, { - resource: "ec2.internet_gateways", - mockBuilder: buildEc2InternetGateways, - mainTable: resources.Ec2InternetGateways(), - verifyEmptyColumns: true, + resource: "ec2.internet_gateways", + mockBuilder: buildEc2InternetGateways, + mainTable: resources.Ec2InternetGateways(), }, { - resource: "ec2.images", - mockBuilder: buildEc2ImagesMock, - mainTable: resources.Ec2Images(), - verifyEmptyColumns: true, + resource: "ec2.images", + mockBuilder: buildEc2ImagesMock, + mainTable: resources.Ec2Images(), }, { - resource: "ec2.nat_gateways", - mockBuilder: buildEc2NatGateways, - mainTable: resources.Ec2NatGateways(), - verifyEmptyColumns: true, + resource: "ec2.nat_gateways", + mockBuilder: buildEc2NatGateways, + mainTable: resources.Ec2NatGateways(), }, { - resource: "ec2.network_acls", - mockBuilder: buildEc2NetworkAcls, - mainTable: resources.Ec2NetworkAcls(), - verifyEmptyColumns: true, + resource: "ec2.network_acls", + mockBuilder: buildEc2NetworkAcls, + mainTable: resources.Ec2NetworkAcls(), }, { - resource: "ec2.route_tables", - mockBuilder: buildEc2RouteTables, - mainTable: resources.Ec2RouteTables(), - verifyEmptyColumns: true, + resource: "ec2.route_tables", + mockBuilder: buildEc2RouteTables, + mainTable: resources.Ec2RouteTables(), }, { - resource: "ec2.instances", - mockBuilder: buildEc2Instances, - mainTable: resources.Ec2Instances(), - verifyEmptyColumns: true, + resource: "ec2.instances", + mockBuilder: buildEc2Instances, + mainTable: resources.Ec2Instances(), }, { - resource: "ec2.security_groups", - mockBuilder: buildEc2SecurityGroups, - mainTable: resources.Ec2SecurityGroups(), - verifyEmptyColumns: true, + resource: "ec2.security_groups", + mockBuilder: buildEc2SecurityGroups, + mainTable: resources.Ec2SecurityGroups(), }, { - resource: "ec2.subnets", - mockBuilder: buildEc2Subnets, - mainTable: resources.Ec2Subnets(), - verifyEmptyColumns: true, + resource: "ec2.subnets", + mockBuilder: buildEc2Subnets, + mainTable: resources.Ec2Subnets(), }, { - resource: "ec2.transit_gateways", - mockBuilder: buildEc2TransitGateways, - mainTable: resources.Ec2TransitGateways(), - verifyEmptyColumns: true, + resource: "ec2.transit_gateways", + mockBuilder: buildEc2TransitGateways, + mainTable: resources.Ec2TransitGateways(), }, { - resource: "ec2.vpcs", - mockBuilder: buildEc2Vpcs, - mainTable: resources.Ec2Vpcs(), - verifyEmptyColumns: true, + resource: "ec2.vpcs", + mockBuilder: buildEc2Vpcs, + mainTable: resources.Ec2Vpcs(), }, { - resource: "ec2.vpc_peering_connections", - mockBuilder: buildEc2VpcsPeeringConnections, - mainTable: resources.Ec2VpcPeeringConnections(), - verifyEmptyColumns: true, + resource: "ec2.vpc_peering_connections", + mockBuilder: buildEc2VpcsPeeringConnections, + mainTable: resources.Ec2VpcPeeringConnections(), }, { - resource: "ecr.repositories", - mockBuilder: buildEcrRepositoriesMock, - mainTable: resources.EcrRepositories(), - verifyEmptyColumns: true, + resource: "ecr.repositories", + mockBuilder: buildEcrRepositoriesMock, + mainTable: resources.EcrRepositories(), }, { - resource: "efs.filesystems", - mockBuilder: buildEfsFilesystemsMock, - mainTable: resources.EfsFilesystems(), - verifyEmptyColumns: true, + resource: "efs.filesystems", + mockBuilder: buildEfsFilesystemsMock, + mainTable: resources.EfsFilesystems(), }, { - resource: "rds.certificates", - mockBuilder: buildRdsCertificates, - mainTable: resources.RdsCertificates(), - verifyEmptyColumns: true, + resource: "rds.certificates", + mockBuilder: buildRdsCertificates, + mainTable: resources.RdsCertificates(), }, { - resource: "rds.clusters", - mockBuilder: buildRdsDBClusters, - mainTable: resources.RdsClusters(), - verifyEmptyColumns: true, + resource: "rds.clusters", + mockBuilder: buildRdsDBClusters, + mainTable: resources.RdsClusters(), }, { - resource: "rds.instances", - mockBuilder: buildRdsDBInstances, - mainTable: resources.RdsInstances(), - verifyEmptyColumns: true, + resource: "rds.instances", + mockBuilder: buildRdsDBInstances, + mainTable: resources.RdsInstances(), }, { - resource: "rds.db_subnet_groups", - mockBuilder: buildRdsDBSubnetGroups, - mainTable: resources.RdsSubnetGroups(), - verifyEmptyColumns: true, + resource: "rds.db_subnet_groups", + mockBuilder: buildRdsDBSubnetGroups, + mainTable: resources.RdsSubnetGroups(), }, { - resource: "elasticbeanstalk.environments", - mockBuilder: buildElasticbeanstalkEnvironments, - mainTable: resources.ElasticbeanstalkEnvironments(), - verifyEmptyColumns: true, + resource: "elasticbeanstalk.environments", + mockBuilder: buildElasticbeanstalkEnvironments, + mainTable: resources.ElasticbeanstalkEnvironments(), }, { - resource: "elbv2.load_balancers", - mockBuilder: buildElbv2LoadBalancers, - mainTable: resources.Elbv2LoadBalancers(), - verifyEmptyColumns: true, + resource: "elbv2.load_balancers", + mockBuilder: buildElbv2LoadBalancers, + mainTable: resources.Elbv2LoadBalancers(), }, { - resource: "elbv2.target_groups", - mockBuilder: buildElbv2TargetGroups, - mainTable: resources.Elbv2TargetGroups(), - verifyEmptyColumns: true, + resource: "elbv2.target_groups", + mockBuilder: buildElbv2TargetGroups, + mainTable: resources.Elbv2TargetGroups(), }, { - resource: "emr.clusters", - mockBuilder: buildEmrClusters, - mainTable: resources.EmrClusters(), - verifyEmptyColumns: true, + resource: "emr.clusters", + mockBuilder: buildEmrClusters, + mainTable: resources.EmrClusters(), }, { - resource: "eks.clusters", - mockBuilder: buildEksClusters, - mainTable: resources.EksClusters(), - verifyEmptyColumns: true, + resource: "eks.clusters", + mockBuilder: buildEksClusters, + mainTable: resources.EksClusters(), }, // Infinite loop in faker //{ @@ -256,118 +222,99 @@ func TestResources(t *testing.T) { // tables: []string{"aws_fsx_backups"}, //}, { - resource: "sns.topics", - mockBuilder: buildSnsTopics, - mainTable: resources.SnsTopics(), - verifyEmptyColumns: true, + resource: "sns.topics", + mockBuilder: buildSnsTopics, + mainTable: resources.SnsTopics(), }, { - resource: "sns.subscriptions", - mockBuilder: buildSnsSubscriptions, - mainTable: resources.SnsSubscriptions(), - verifyEmptyColumns: true, + resource: "sns.subscriptions", + mockBuilder: buildSnsSubscriptions, + mainTable: resources.SnsSubscriptions(), }, { - resource: "iam.groups", - mainTable: resources.IamGroups(), - mockBuilder: buildIamGroups, - verifyEmptyColumns: true, + resource: "iam.groups", + mainTable: resources.IamGroups(), + mockBuilder: buildIamGroups, }, { - resource: "iam.policies", - mainTable: resources.IamPolicies(), - mockBuilder: buildIamPolicies, - verifyEmptyColumns: true, + resource: "iam.policies", + mainTable: resources.IamPolicies(), + mockBuilder: buildIamPolicies, }, { - resource: "iam.password_policies", - mainTable: resources.IamPasswordPolicies(), - mockBuilder: buildIamPasswordPolicies, - verifyEmptyColumns: true, + resource: "iam.password_policies", + mainTable: resources.IamPasswordPolicies(), + mockBuilder: buildIamPasswordPolicies, }, { - resource: "iam.roles", - mainTable: resources.IamRoles(), - mockBuilder: buildIamRoles, - verifyEmptyColumns: true, + resource: "iam.roles", + mainTable: resources.IamRoles(), + mockBuilder: buildIamRoles, }, { - resource: "iam.users", - mainTable: resources.IamUsers(), - mockBuilder: buildIamUsers, - verifyEmptyColumns: true, + resource: "iam.users", + mainTable: resources.IamUsers(), + mockBuilder: buildIamUsers, }, { - resource: "iam.virtual_mfa_devices", - mainTable: resources.IamVirtualMfaDevices(), - mockBuilder: buildIamVirtualMfaDevices, - verifyEmptyColumns: true, + resource: "iam.virtual_mfa_devices", + mainTable: resources.IamVirtualMfaDevices(), + mockBuilder: buildIamVirtualMfaDevices, }, { - resource: "iam.openid_connect_identity_providers", - mainTable: resources.IamOpenidConnectIdentityProviders(), - mockBuilder: buildIamOpenIDConnectProviders, - verifyEmptyColumns: true, + resource: "iam.openid_connect_identity_providers", + mainTable: resources.IamOpenidConnectIdentityProviders(), + mockBuilder: buildIamOpenIDConnectProviders, }, { - resource: "iam.saml_identity_providers", - mainTable: resources.IamSamlIdentityProviders(), - mockBuilder: buildIamSAMLProviders, - verifyEmptyColumns: true, + resource: "iam.saml_identity_providers", + mainTable: resources.IamSamlIdentityProviders(), + mockBuilder: buildIamSAMLProviders, }, { - resource: "kms.keys", - mainTable: resources.KmsKeys(), - mockBuilder: buildKmsKeys, - verifyEmptyColumns: true, + resource: "kms.keys", + mainTable: resources.KmsKeys(), + mockBuilder: buildKmsKeys, }, { - resource: "organizations.accounts", - mainTable: resources.OrganizationsAccounts(), - mockBuilder: buildOrganizationsAccounts, - verifyEmptyColumns: true, + resource: "organizations.accounts", + mainTable: resources.OrganizationsAccounts(), + mockBuilder: buildOrganizationsAccounts, }, { - resource: "s3.buckets", - mainTable: resources.S3Buckets(), - mockBuilder: buildS3Buckets, - verifyEmptyColumns: true, + resource: "s3.buckets", + mainTable: resources.S3Buckets(), + mockBuilder: buildS3Buckets, }, { - resource: "redshift.clusters", - mainTable: resources.RedshiftClusters(), - mockBuilder: buildRedshiftClustersMock, - verifyEmptyColumns: true, + resource: "redshift.clusters", + mainTable: resources.RedshiftClusters(), + mockBuilder: buildRedshiftClustersMock, }, { - resource: "redshift.subnet_groups", - mainTable: resources.RedshiftSubnetGroups(), - mockBuilder: buildRedshiftSubnetGroupsMock, - verifyEmptyColumns: true, + resource: "redshift.subnet_groups", + mainTable: resources.RedshiftSubnetGroups(), + mockBuilder: buildRedshiftSubnetGroupsMock, }, { - resource: "ecs.clusters", - mainTable: resources.EcsClusters(), - mockBuilder: buildEcsClusterMock, - verifyEmptyColumns: true, + resource: "ecs.clusters", + mainTable: resources.EcsClusters(), + mockBuilder: buildEcsClusterMock, }, { - resource: "cloudfront.distributions", - mainTable: resources.CloudfrontDistributions(), - mockBuilder: buildCloudfrontDistributionsMock, - verifyEmptyColumns: true, + resource: "cloudfront.distributions", + mainTable: resources.CloudfrontDistributions(), + mockBuilder: buildCloudfrontDistributionsMock, }, { - resource: "cloudfront.cache_policies", - mainTable: resources.CloudfrontCachePolicies(), - mockBuilder: buildCloudfrontCachePoliciesMock, - verifyEmptyColumns: true, + resource: "cloudfront.cache_policies", + mainTable: resources.CloudfrontCachePolicies(), + mockBuilder: buildCloudfrontCachePoliciesMock, }, { - resource: "ec2.vpc_endpoints", - mainTable: resources.Ec2VpcEndpoints(), - mockBuilder: buildEc2VpcEndpoints, - verifyEmptyColumns: true, + resource: "ec2.vpc_endpoints", + mainTable: resources.Ec2VpcEndpoints(), + mockBuilder: buildEc2VpcEndpoints, }, } for _, tc := range testResourcesTable { @@ -378,70 +325,19 @@ func TestResources(t *testing.T) { AWSDebug: false, MaxRetries: 3, MaxBackoff: 60, - Resources: []client.Resource{{ - Name: tc.resource, - }, - }, - } - testProvider := resources.Provider() - testProvider.Logger = logging.New(hclog.DefaultOptions) - testProvider.Configure = func(logger hclog.Logger, i interface{}) (schema.ClientMeta, error) { - client := client.NewAwsClient(logging.New(&hclog.LoggerOptions{ - Level: hclog.Warn, - }), []string{"test-1"}) - client.SetAccountServices("testAccount", tc.mockBuilder(t, ctrl)) - return &client, nil } - err := testProvider.Init("", "host=localhost user=postgres password=pass DB.name=postgres port=5432", false) - assert.Nil(t, err) - data, err := yaml.Marshal(cfg) - assert.Nil(t, err) - err = testProvider.Fetch(data) - assert.Nil(t, err) - if tc.verifyEmptyColumns { - verifyNoEmptyColumns(t, tc, conn) - } - }) - } -} - -func verifyNoEmptyColumns(t *testing.T, tc TestResource, conn *pgx.Conn) { - // Test that we don't have missing columns and have exactly one entry for each table - for _, table := range getTablesFromMainTable(tc.mainTable) { - - query := fmt.Sprintf("select * FROM %s ", table) - rows, err := conn.Query(context.Background(), query) - if err != nil { - t.Fatal(err) - } - count := 0 - for rows.Next() { - count += 1 - } - if count < 1 { - t.Fatalf("expected to have at least 1 entry at table %s got %d", table, count) - } - - query = fmt.Sprintf("select t.* FROM %s as t WHERE to_jsonb(t) = jsonb_strip_nulls(to_jsonb(t))", table) - rows, err = conn.Query(context.Background(), query) - if err != nil { - t.Fatal(err) - } - count = 0 - for rows.Next() { - count += 1 - } - if count < 1 { - t.Fatalf("row at table %s has an empty column", table) - } - } -} + providertest.TestResource(t, resources.Provider, providertest.ResourceTestData{ + Table: tc.mainTable, + Config: cfg, + Configure: func(logger hclog.Logger, i interface{}) (schema.ClientMeta, error) { + c := client.NewAwsClient(logging.New(&hclog.LoggerOptions{ + Level: hclog.Warn, + }), []string{"test-1"}) + c.SetAccountServices("testAccount", tc.mockBuilder(t, ctrl)) + return &c, nil + }, + }) -func getTablesFromMainTable(table *schema.Table) []string { - var res []string - res = append(res, table.Name) - for _, t := range table.Relations { - res = append(res, getTablesFromMainTable(t)...) + }) } - return res } diff --git a/client/resolvers.go b/client/resolvers.go index 78c1c563c..a527f7987 100644 --- a/client/resolvers.go +++ b/client/resolvers.go @@ -8,12 +8,10 @@ import ( func ResolveAWSAccount(_ context.Context, meta schema.ClientMeta, r *schema.Resource, _ schema.Column) error { client := meta.(*Client) - r.Set("account_id", client.AccountID) - return nil + return r.Set("account_id", client.AccountID) } func ResolveAWSRegion(_ context.Context, meta schema.ClientMeta, r *schema.Resource, _ schema.Column) error { client := meta.(*Client) - r.Set("region", client.Region) - return nil + return r.Set("region", client.Region) } diff --git a/go.mod b/go.mod index 19f1b7fa6..9a909a0eb 100644 --- a/go.mod +++ b/go.mod @@ -31,14 +31,10 @@ require ( github.com/aws/aws-sdk-go-v2/service/sns v1.1.2 github.com/aws/aws-sdk-go-v2/service/sts v1.3.0 github.com/aws/smithy-go v1.3.1 - github.com/cloudquery/cq-provider-sdk v0.1.7 + github.com/cloudquery/cq-provider-sdk v0.2.0 github.com/cloudquery/faker/v3 v3.7.4 github.com/golang/mock v1.5.0 - github.com/hashicorp/go-hclog v0.16.0 - github.com/jackc/pgx/v4 v4.10.1 + github.com/hashicorp/go-hclog v0.16.1 + github.com/jackc/pgx/v4 v4.11.0 github.com/spf13/cast v1.3.0 - github.com/stretchr/testify v1.7.0 - golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect - golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) diff --git a/go.sum b/go.sum index 3a7657cd2..087928256 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,36 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= +github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/squirrel v1.5.0 h1:JukIZisrUXadA9pl3rMkjhiamxiB0cXiu+HGp/Y8cY8= github.com/Masterminds/squirrel v1.5.0/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= +github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= +github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +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/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= +github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= +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/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.2.1/go.mod h1:hTQc/9pYq5bfFACIUY9tc/2SYWd9Vnmw+testmuQeRY= github.com/aws/aws-sdk-go-v2 v1.3.0/go.mod h1:hTQc/9pYq5bfFACIUY9tc/2SYWd9Vnmw+testmuQeRY= github.com/aws/aws-sdk-go-v2 v1.3.1/go.mod h1:5SmWRTjN6uTRFNCc7rR69xHsdcUJnthmaRHGDsYhpTE= @@ -75,48 +104,94 @@ github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAm github.com/aws/smithy-go v1.3.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.3.1 h1:xJFO4pK0y9J8fCl34uGsSJX5KNnGbdARDlA5BPhXnwE= github.com/aws/smithy-go v1.3.1/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +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/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudquery/cq-provider-sdk v0.1.7 h1:2jq93RngvyMfe1bLYE6lg3UHfT+vxd9tzxC5vH5XHC0= -github.com/cloudquery/cq-provider-sdk v0.1.7/go.mod h1:5v6sRGUC7wkFnOxtkryPZr4qx3ouS3hdue7dec/bnes= +github.com/cloudquery/cq-provider-sdk v0.2.0 h1:gzM/sAZ4lEB3ylG0EqTLBN5Mtz5LgjFBo/bm6kbK11w= +github.com/cloudquery/cq-provider-sdk v0.2.0/go.mod h1:cdn/dDr5A1zfmSFmW2qDmwD5J+8v/o33glMt2+u36KM= 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.3 h1:xXH0pyPmdj8NESvI+pdphyy8AJ7PhW7AJSrdHb7c9uk= -github.com/cloudquery/go-funk v0.8.3/go.mod h1:d8TwrmltY3K4mKFbay1pcyqTAz0s6yq+3VWYWg+2f50= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/cockroach-go/v2 v2.0.3 h1:ZA346ACHIZctef6trOTwBAEvPVm1k0uLm/bb2Atc+S8= github.com/cockroachdb/cockroach-go/v2 v2.0.3/go.mod h1:hAuDgiVgDVkfirP9JnhXEfcXEPRKBpYdGz+l7mvYSzw= +github.com/cockroachdb/cockroach-go/v2 v2.1.1 h1:3XzfSMuUT0wBe1a3o5C0eOTcArhmmFAg2Jzh/7hhKqo= +github.com/cockroachdb/cockroach-go/v2 v2.1.1/go.mod h1:7NtUnP6eK+l6k483WSYNrq3Kb23bWV10IRV1TyeSpwM= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creasty/defaults v1.5.1 h1:j8WexcS3d/t4ZmllX4GEkl4wIB/trOr035ajcLHCISM= github.com/creasty/defaults v1.5.1/go.mod h1:FPZ+Y0WNrbqOVw+c6av63eyHUAl6pMHZwqLPvXUZGfY= 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/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= 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= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/georgysavva/scany v0.2.7 h1:SBEuurTvWOUp7FnGBOjeSF9XWaWmVzc91h9baPo6y2s= -github.com/georgysavva/scany v0.2.7/go.mod h1:bcxPhzeQFQqAUmjlZVwTGlu6AnWFSOiHpalfBe0xQ6U= +github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/georgysavva/scany v0.2.8 h1:rhLWqLvQM9RPh5CjM3eOOFe429uSHd6Bfvfeoo+UANc= +github.com/georgysavva/scany v0.2.8/go.mod h1:guwpGaqxmVRdQK+th2eQxXKUwzd9bkCAWHfxx/MEaWU= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M= +github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= 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/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +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/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +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= @@ -130,6 +205,11 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -138,25 +218,65 @@ github.com/google/go-cmp v0.5.0/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 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -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-hclog v0.16.1 h1:IVQwpTGNRRIHafnTs2dQLIk4ENtneRIEEJWOVDqz99o= +github.com/hashicorp/go-hclog v0.16.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= 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/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +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.9.1/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg= +github.com/hashicorp/hcl/v2 v2.10.0 h1:1S1UnuhDGlv3gRFV4+0EdwB+znNP5HmcGbIqwnSCByg= +github.com/hashicorp/hcl/v2 v2.10.0/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= 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/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864 h1:Y4V+SFe7d3iH+9pJCoeWIOS5/xBJIFsltS7E+KJSsJY= +github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= -github.com/huandu/go-sqlbuilder v1.12.0 h1:QSmKkoIKaZTZBNROweq/c3wTxqXhuuAhbTWPtbpVsNA= -github.com/huandu/go-sqlbuilder v1.12.0/go.mod h1:LILlbQo0MOYjlIiGgOSR3UcWQpd5Y/oZ7HLNGyAUz0E= +github.com/huandu/go-sqlbuilder v1.12.1 h1:lkWJNfFYl7dHSlGOiokaiaJ8Om0hK4Jasy73jvIh4XY= +github.com/huandu/go-sqlbuilder v1.12.1/go.mod h1:LILlbQo0MOYjlIiGgOSR3UcWQpd5Y/oZ7HLNGyAUz0E= github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/iancoleman/strcase v0.1.2 h1:gnomlvw9tnV3ITTAxzKSgTF+8kFWcU/f+TgttpXGz1U= -github.com/iancoleman/strcase v0.1.2/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw= +github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= @@ -168,12 +288,18 @@ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsU github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.6.4/go.mod h1:w2pne1C2tZgP+TvjqLpOigGzNqjBgQW9dUw/4Chex78= +github.com/jackc/pgconn v1.7.0/go.mod h1:sF/lPpNEMEOp+IYhyQGdAvrG20gWf6A1tKlr0v7JMeA= github.com/jackc/pgconn v1.8.0 h1:FmjZ0rOyXTr1wfWs45i4a9vjnjWUAGpMuQLD9OSs+lw= github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= +github.com/jackc/pgconn v1.8.1 h1:ySBX7Q87vOMqKU2bbmKbUvtYhauDFclYbNDYIE1/h6s= +github.com/jackc/pgconn v1.8.1/go.mod h1:JV6m6b6jhjdmzchES0drzCcYcAHS1OPD5xu3OZ/lE2g= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= +github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd h1:eDErF6V/JPJON/B7s68BxwHgfmyOntHJQ8IOaz0x4R8= +github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= @@ -183,6 +309,8 @@ github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.0.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.0.5/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.0.7 h1:6Pwi1b3QdY65cuv6SyVO0FgPd5J3Bl7wf/nQQjinHMA= github.com/jackc/pgproto3/v2 v2.0.7/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= @@ -196,9 +324,11 @@ github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4 github.com/jackc/pgtype v1.3.0/go.mod h1:b0JqxHvPmljG+HQ5IsvQ0yqeSi4nGcDTVjFoiLDb0Ik= github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= -github.com/jackc/pgtype v1.3.1-0.20200612023650-09efc3839047/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig= +github.com/jackc/pgtype v1.4.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig= github.com/jackc/pgtype v1.6.2 h1:b3pDeuhbbzBYcg5kwNmNDun4pFUD/0AAr1kLXZLeNt8= github.com/jackc/pgtype v1.6.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig= +github.com/jackc/pgtype v1.7.0 h1:6f4kVsW01QftE38ufBYxKciO6gyioXSC0ABIRLcZrGs= +github.com/jackc/pgtype v1.7.0/go.mod h1:ZnHF+rMePVqDKaOfJVI4Q8IVvAQMryDlDkZnKOI75BE= github.com/jackc/pgx v3.6.2+incompatible h1:2zP5OD7kiyR3xzRYMhOcXVvkDZsImVXfj+yIyTQf3/o= github.com/jackc/pgx v3.6.2+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= @@ -208,33 +338,57 @@ github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXg github.com/jackc/pgx/v4 v4.6.0/go.mod h1:vPh43ZzxijXUVJ+t/EmXBtFmbFVO72cuneCT9oAlxAg= github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= +github.com/jackc/pgx/v4 v4.8.1/go.mod h1:4HOLxrl8wToZJReD04/yB20GDwf4KBYETvlHciCnwW0= github.com/jackc/pgx/v4 v4.10.1 h1:/6Q3ye4myIj6AaplUm+eRcz4OhK9HAvFf4ePsG40LJY= github.com/jackc/pgx/v4 v4.10.1/go.mod h1:QlrWebbs3kqEZPHCTGyxecvzG6tvIsYu+A5b1raylkA= +github.com/jackc/pgx/v4 v4.11.0 h1:J86tSWd3Y7nKjwT/43xZBvpi04keQWx8gNC2YkdJhZI= +github.com/jackc/pgx/v4 v4.11.0/go.mod h1:i62xJgdrtVDsnL3U8ekyrQXEwGNTRoG7/8r+CIdYfcc= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.2/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3 h1:JnPg/5Q9xVJGfjsO5CPUOjnJps1JaRUm8I9FXVCFK94= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= +github.com/jhump/protoreflect v1.8.2 h1:k2xE7wcUomeqwY0LDCYA16y4WWfyTcMx5mKhk0d4ua0= +github.com/jhump/protoreflect v1.8.2/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= +github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= 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.2/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 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= 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/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= @@ -245,13 +399,22 @@ github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.4.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg= -github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.1 h1:6VXZrLU0jHBYyAqrSPa+MgPfnSvTPuMgK+k0o5kVFWo= +github.com/lib/pq v1.10.1/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= @@ -259,116 +422,298 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 h1:7GoSOOW2jpsfkntVKaS2rAr1TJqfcxotyaUcuxoZSzg= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= +github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= +github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= +github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= +github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/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.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v0.0.0-20200419222939-1884f454f8ea h1:jaXWVFZ98/ihXniiDzqNXQgMSgklX4kjfDWZTE3ZtdU= github.com/shopspring/decimal v0.0.0-20200419222939-1884f454f8ea/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= 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/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= +github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= 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.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/thoas/go-funk v0.8.1-0.20210502090430-efae847b30ab h1:W5yVnnu2vo1LQFVBIGeqaWzctDVIu7EB1yhakQkWAgc= +github.com/thoas/go-funk v0.8.1-0.20210502090430-efae847b30ab/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ= +github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +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/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +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/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.8.1/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= +github.com/zclconf/go-cty v1.8.3 h1:48gwZXrdSADU2UW9eZKHprxAI7APZGW9XmExpJpSjT0= +github.com/zclconf/go-cty v1.8.3/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/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-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +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-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf h1:B2n+Zi5QeYRDAEodEu72OS36gmTWjgpXr2+cWcBW90o= +golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180530234432-1e491301e022/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-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 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/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= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/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 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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/sys v0.0.0-20180823144017-11551d06cbcc/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= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -377,6 +722,12 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e h1:aZzprAO9/8oim3qStq3wc1Xuxx4QmAGriC4VU4ojemQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -384,20 +735,35 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T 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.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= 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-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20210510173355-fb37daa5cd7a h1:tzkHckzMzgPr8SC4taTC3AldLr4+oJivSoq1xf/nhsc= +google.golang.org/genproto v0.0.0-20210510173355-fb37daa5cd7a/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.37.0 h1:uSZWeQJX5j11bIQ4AJoj+McDBo29cY1MCoC1wO3ts+c= google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -409,22 +775,43 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +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 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= 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-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/cheggaaa/pb.v1 v1.0.25/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/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= -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-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/postgres v1.0.8/go.mod h1:4eOzrI1MUfm6ObJU/UcmbXyiHSs8jSwH95G5P5dxcAg= +gorm.io/gorm v1.20.12/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +gorm.io/gorm v1.21.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/resources/cloudfront_distributions.go b/resources/cloudfront_distributions.go index 818988fc6..c91a91b1a 100644 --- a/resources/cloudfront_distributions.go +++ b/resources/cloudfront_distributions.go @@ -524,8 +524,7 @@ func resolveCloudfrontDistributionOriginCustomHeaders(_ context.Context, _ schem for _, t := range r.CustomHeaders.Items { tags[*t.HeaderName] = *t.HeaderValue } - resource.Set("custom_headers", tags) - return nil + return resource.Set("custom_headers", tags) } func fetchCloudfrontDistributionOrigins(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { @@ -568,8 +567,7 @@ func resolveCloudfrontDistributionOriginGroupMembers(_ context.Context, _ schema for _, t := range r.Members.Items { members = append(members, *t.OriginId) } - resource.Set("members_origin_ids", members) - return nil + return resource.Set("members_origin_ids", members) } func resolveFailoverCriteriaStatusCodeItems(_ context.Context, _ schema.ClientMeta, resource *schema.Resource, c schema.Column) error { @@ -581,8 +579,7 @@ func resolveFailoverCriteriaStatusCodeItems(_ context.Context, _ schema.ClientMe for _, item := range r.FailoverCriteria.StatusCodes.Items { members = append(members, int(item)) } - resource.Set(c.Name, members) - return nil + return resource.Set(c.Name, members) } func fetchCloudfrontDistributionDefaultCacheBehaviourLambdaFunctionAssociations(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { diff --git a/resources/cloudtrail_trails.go b/resources/cloudtrail_trails.go index 0eb4c43b9..802931a8e 100644 --- a/resources/cloudtrail_trails.go +++ b/resources/cloudtrail_trails.go @@ -199,7 +199,7 @@ func CloudtrailTrails() *schema.Table { // ==================================================================================================================== // Table Resolver Functions // ==================================================================================================================== -func fetchCloudtrailTrails(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { +func fetchCloudtrailTrails(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan interface{}) error { c := meta.(*client.Client) svc := c.Services().Cloudtrail response, err := svc.DescribeTrails(ctx, nil, func(options *cloudtrail.Options) { @@ -222,26 +222,28 @@ func postCloudtrailTrailResolver(ctx context.Context, meta schema.ClientMeta, re if err != nil { return err } - resource.Set("is_logging", response.IsLogging) - resource.Set("latest_cloudwatch_logs_delivery_error", response.LatestCloudWatchLogsDeliveryError) - resource.Set("latest_cloudwatch_logs_delivery_time", response.LatestCloudWatchLogsDeliveryTime) - resource.Set("latest_delivery_attempt_succeeded", response.LatestDeliveryAttemptSucceeded) - resource.Set("latest_delivery_attempt_time", response.LatestDeliveryAttemptTime) - resource.Set("latest_delivery_error", response.LatestDeliveryError) - resource.Set("latest_delivery_time", response.LatestDeliveryTime) - resource.Set("latest_digest_delivery_error", response.LatestDigestDeliveryError) - resource.Set("latest_digest_delivery_time", response.LatestDigestDeliveryTime) - resource.Set("latest_notification_attempt_succeeded", response.LatestNotificationAttemptSucceeded) - resource.Set("latest_notification_attempt_time", response.LatestNotificationAttemptTime) - resource.Set("latest_notification_error", response.LatestNotificationError) - resource.Set("latest_notification_time", response.LatestNotificationTime) - resource.Set("start_logging_time", response.StartLoggingTime) - resource.Set("stop_logging_time", response.StopLoggingTime) - resource.Set("time_logging_started", response.TimeLoggingStarted) - resource.Set("time_logging_stopped", response.TimeLoggingStopped) + if err := resource.Set("is_logging", response.IsLogging); err != nil { + return err + } + _ = resource.Set("latest_cloudwatch_logs_delivery_error", response.LatestCloudWatchLogsDeliveryError) + _ = resource.Set("latest_cloudwatch_logs_delivery_time", response.LatestCloudWatchLogsDeliveryTime) + _ = resource.Set("latest_delivery_attempt_succeeded", response.LatestDeliveryAttemptSucceeded) + _ = resource.Set("latest_delivery_attempt_time", response.LatestDeliveryAttemptTime) + _ = resource.Set("latest_delivery_error", response.LatestDeliveryError) + _ = resource.Set("latest_delivery_time", response.LatestDeliveryTime) + _ = resource.Set("latest_digest_delivery_error", response.LatestDigestDeliveryError) + _ = resource.Set("latest_digest_delivery_time", response.LatestDigestDeliveryTime) + _ = resource.Set("latest_notification_attempt_succeeded", response.LatestNotificationAttemptSucceeded) + _ = resource.Set("latest_notification_attempt_time", response.LatestNotificationAttemptTime) + _ = resource.Set("latest_notification_error", response.LatestNotificationError) + _ = resource.Set("latest_notification_time", response.LatestNotificationTime) + _ = resource.Set("start_logging_time", response.StartLoggingTime) + _ = resource.Set("stop_logging_time", response.StopLoggingTime) + _ = resource.Set("time_logging_started", response.TimeLoggingStarted) + _ = resource.Set("time_logging_stopped", response.TimeLoggingStopped) return nil } -func resolveCloudtrailTrailCloudwatchLogsLogGroupName(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { +func resolveCloudtrailTrailCloudwatchLogsLogGroupName(_ context.Context, meta schema.ClientMeta, resource *schema.Resource, _ schema.Column) error { groupName := "" log := meta.(*client.Client).Logger() trail := resource.Item.(types.Trail) @@ -256,8 +258,7 @@ func resolveCloudtrailTrailCloudwatchLogsLogGroupName(ctx context.Context, meta log.Info("CloudWatchLogsLogGroupARN is empty") } - resource.Set("cloudwatch_logs_log_group_name", groupName) - return nil + return resource.Set("cloudwatch_logs_log_group_name", groupName) } func fetchCloudtrailTrailEventSelectors(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { r := parent.Item.(types.Trail) diff --git a/resources/cloudwatch_alarms.go b/resources/cloudwatch_alarms.go index 2efdcc3c1..fc7d0dd3e 100644 --- a/resources/cloudwatch_alarms.go +++ b/resources/cloudwatch_alarms.go @@ -230,8 +230,7 @@ func resolveCloudwatchAlarmDimensions(ctx context.Context, meta schema.ClientMet for _, d := range alarm.Dimensions { dimensions[*d.Name] = d.Value } - resource.Set("dimensions", dimensions) - return nil + return resource.Set("dimensions", dimensions) } func fetchCloudwatchAlarmMetrics(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { alarm := parent.Item.(types.MetricAlarm) @@ -247,6 +246,5 @@ func resolveCloudwatchAlarmMetricMetricStatMetricDimensions(ctx context.Context, for _, d := range metric.MetricStat.Metric.Dimensions { dimensions[*d.Name] = d.Value } - resource.Set("metric_stat_metric_dimensions", dimensions) - return nil + return resource.Set("metric_stat_metric_dimensions", dimensions) } diff --git a/resources/directconnect_virtual_interfaces.go b/resources/directconnect_virtual_interfaces.go index 2b6a7ea85..b924e8863 100644 --- a/resources/directconnect_virtual_interfaces.go +++ b/resources/directconnect_virtual_interfaces.go @@ -177,8 +177,7 @@ func resolveVirtualInterfaceRouteFilterPrefixes(_ context.Context, _ schema.Clie for i, prefix := range r.RouteFilterPrefixes { routeFilterPrefixes[i] = prefix.Cidr } - resource.Set("route_filter_prefixes", routeFilterPrefixes) - return nil + return resource.Set("route_filter_prefixes", routeFilterPrefixes) } func fetchVirtualInterfaceBGPPeers(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { @@ -196,8 +195,7 @@ func resolveDirectconnectVirtualInterfaceTags(_ context.Context, _ schema.Client for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchDirectconnectVirtualInterfaces(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { diff --git a/resources/ec2_customer_gateways.go b/resources/ec2_customer_gateways.go index 5c6e5fe89..7a19fd7c6 100644 --- a/resources/ec2_customer_gateways.go +++ b/resources/ec2_customer_gateways.go @@ -86,6 +86,5 @@ func resolveEc2customerGatewayTags(ctx context.Context, meta schema.ClientMeta, for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } diff --git a/resources/ec2_ebs_volumes.go b/resources/ec2_ebs_volumes.go index 17ea6d68e..26c24f83b 100644 --- a/resources/ec2_ebs_volumes.go +++ b/resources/ec2_ebs_volumes.go @@ -154,8 +154,7 @@ func resolveEc2EbsVolumeTags(_ context.Context, _ schema.ClientMeta, resource *s for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchEc2EbsVolumeAttachments(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { volume, ok := parent.Item.(types.Volume) diff --git a/resources/ec2_flow_logs.go b/resources/ec2_flow_logs.go index f160ead57..cd0f7da27 100644 --- a/resources/ec2_flow_logs.go +++ b/resources/ec2_flow_logs.go @@ -117,6 +117,5 @@ func resolveEc2flowLogTags(ctx context.Context, meta schema.ClientMeta, resource for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } diff --git a/resources/ec2_images.go b/resources/ec2_images.go index 3eda5dc4c..2fa974e87 100644 --- a/resources/ec2_images.go +++ b/resources/ec2_images.go @@ -233,8 +233,7 @@ func resolveEc2imageProductCodes(ctx context.Context, meta schema.ClientMeta, re for _, t := range r.ProductCodes { productCodes[*t.ProductCodeId] = string(t.ProductCodeType) } - resource.Set("product_codes", productCodes) - return nil + return resource.Set("product_codes", productCodes) } func resolveEc2imageTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.Image) @@ -242,8 +241,7 @@ func resolveEc2imageTags(ctx context.Context, meta schema.ClientMeta, resource * for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchEc2ImageBlockDeviceMappings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { r := parent.Item.(types.Image) diff --git a/resources/ec2_instances.go b/resources/ec2_instances.go index abf4fc31d..1b2021fe4 100644 --- a/resources/ec2_instances.go +++ b/resources/ec2_instances.go @@ -642,8 +642,7 @@ func resolveEc2instanceTags(_ context.Context, _ schema.ClientMeta, resource *sc for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchEc2InstanceBlockDeviceMappings(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { instance, ok := parent.Item.(types.Instance) diff --git a/resources/ec2_internet_gateways.go b/resources/ec2_internet_gateways.go index e597eced0..4015b0e6b 100644 --- a/resources/ec2_internet_gateways.go +++ b/resources/ec2_internet_gateways.go @@ -94,8 +94,7 @@ func resolveEc2internetGatewayTags(ctx context.Context, meta schema.ClientMeta, for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchEc2InternetGatewayAttachments(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { r := parent.Item.(types.InternetGateway) diff --git a/resources/ec2_nat_gateways.go b/resources/ec2_nat_gateways.go index d8273b0d7..2b709a019 100644 --- a/resources/ec2_nat_gateways.go +++ b/resources/ec2_nat_gateways.go @@ -152,8 +152,7 @@ func resolveEc2natGatewayTags(ctx context.Context, meta schema.ClientMeta, resou for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchEc2NatGatewayAddresses(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { r := parent.Item.(types.NatGateway) diff --git a/resources/ec2_network_acls.go b/resources/ec2_network_acls.go index 42d60ece8..084508cad 100644 --- a/resources/ec2_network_acls.go +++ b/resources/ec2_network_acls.go @@ -157,8 +157,7 @@ func resolveEc2networkACLTags(ctx context.Context, meta schema.ClientMeta, resou for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchEc2NetworkAclAssociations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { r := parent.Item.(types.NetworkAcl) diff --git a/resources/ec2_route_tables.go b/resources/ec2_route_tables.go index b07083bff..469a8aeb9 100644 --- a/resources/ec2_route_tables.go +++ b/resources/ec2_route_tables.go @@ -203,8 +203,7 @@ func resolveEc2routeTableTags(ctx context.Context, meta schema.ClientMeta, resou for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchEc2RouteTableAssociations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { r := parent.Item.(types.RouteTable) diff --git a/resources/ec2_security_groups.go b/resources/ec2_security_groups.go index d5dc53a82..786d802f3 100644 --- a/resources/ec2_security_groups.go +++ b/resources/ec2_security_groups.go @@ -324,8 +324,7 @@ func resolveEc2securityGroupTags(_ context.Context, _ schema.ClientMeta, resourc for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchEc2SecurityGroupIpPermissions(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { securityGroup, ok := parent.Item.(types.SecurityGroup) diff --git a/resources/ec2_subnets.go b/resources/ec2_subnets.go index 893f6712f..a1fe70d0e 100644 --- a/resources/ec2_subnets.go +++ b/resources/ec2_subnets.go @@ -156,8 +156,7 @@ func resolveEc2subnetTags(ctx context.Context, meta schema.ClientMeta, resource for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchEc2SubnetIpv6CidrBlockAssociationSets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { r := parent.Item.(types.Subnet) diff --git a/resources/ec2_transit_gateways.go b/resources/ec2_transit_gateways.go index 540ed10dc..bfee2e4f4 100644 --- a/resources/ec2_transit_gateways.go +++ b/resources/ec2_transit_gateways.go @@ -498,8 +498,7 @@ func resolveEc2TransitGatewayTags(ctx context.Context, meta schema.ClientMeta, r for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func resolveEc2TransitGatewayAttachmentTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { @@ -508,8 +507,7 @@ func resolveEc2TransitGatewayAttachmentTags(ctx context.Context, meta schema.Cli for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func resolveEc2TransitGatewayRouteTableTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { @@ -518,8 +516,7 @@ func resolveEc2TransitGatewayRouteTableTags(ctx context.Context, meta schema.Cli for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func resolveEc2TransitGatewayVpcAttachmentTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { @@ -528,8 +525,7 @@ func resolveEc2TransitGatewayVpcAttachmentTags(ctx context.Context, meta schema. for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func resolveEc2TransitGatewayPeeringAttachmentTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { @@ -538,8 +534,7 @@ func resolveEc2TransitGatewayPeeringAttachmentTags(ctx context.Context, meta sch for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func resolveEc2TransitGatewayMulticastDomainTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { @@ -548,6 +543,5 @@ func resolveEc2TransitGatewayMulticastDomainTags(ctx context.Context, meta schem for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } diff --git a/resources/ec2_vpc_endpoints.go b/resources/ec2_vpc_endpoints.go index 0d51be1e0..eb8965325 100644 --- a/resources/ec2_vpc_endpoints.go +++ b/resources/ec2_vpc_endpoints.go @@ -168,8 +168,7 @@ func resolveEc2vpcEndpointTags(ctx context.Context, meta schema.ClientMeta, reso for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchEc2VpcEndpointDnsEntries(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { endpoint, ok := parent.Item.(types.VpcEndpoint) diff --git a/resources/ec2_vpc_peering_connections.go b/resources/ec2_vpc_peering_connections.go index 76c142e13..fe24413e9 100644 --- a/resources/ec2_vpc_peering_connections.go +++ b/resources/ec2_vpc_peering_connections.go @@ -173,8 +173,7 @@ func resolveEc2vpcPeeringConnectionAccepterCidrBlockSet(ctx context.Context, met for i, b := range r.AccepterVpcInfo.CidrBlockSet { blocks[i] = b.CidrBlock } - resource.Set("accepter_cidr_block_set", blocks) - return nil + return resource.Set("accepter_cidr_block_set", blocks) } func resolveEc2vpcPeeringConnectionAccepterIpv6CidrBlockSet(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.VpcPeeringConnection) @@ -182,8 +181,7 @@ func resolveEc2vpcPeeringConnectionAccepterIpv6CidrBlockSet(ctx context.Context, for i, b := range r.AccepterVpcInfo.Ipv6CidrBlockSet { blocks[i] = b.Ipv6CidrBlock } - resource.Set("accepter_ipv6_cidr_block_set", blocks) - return nil + return resource.Set("accepter_ipv6_cidr_block_set", blocks) } func resolveEc2vpcPeeringConnectionRequesterCidrBlockSet(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.VpcPeeringConnection) @@ -191,8 +189,7 @@ func resolveEc2vpcPeeringConnectionRequesterCidrBlockSet(ctx context.Context, me for i, b := range r.RequesterVpcInfo.CidrBlockSet { blocks[i] = b.CidrBlock } - resource.Set("requester_cidr_block_set", blocks) - return nil + return resource.Set("requester_cidr_block_set", blocks) } func resolveEc2vpcPeeringConnectionRequesterIpv6CidrBlockSet(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.VpcPeeringConnection) @@ -201,8 +198,7 @@ func resolveEc2vpcPeeringConnectionRequesterIpv6CidrBlockSet(ctx context.Context for i, b := range r.RequesterVpcInfo.Ipv6CidrBlockSet { blocks[i] = b.Ipv6CidrBlock } - resource.Set("requester_ipv6_cidr_block_set", blocks) - return nil + return resource.Set("requester_ipv6_cidr_block_set", blocks) } func resolveEc2vpcPeeringConnectionTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.VpcPeeringConnection) @@ -210,6 +206,5 @@ func resolveEc2vpcPeeringConnectionTags(ctx context.Context, meta schema.ClientM for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } diff --git a/resources/ec2_vpcs.go b/resources/ec2_vpcs.go index 885ed072c..02cfdbb75 100644 --- a/resources/ec2_vpcs.go +++ b/resources/ec2_vpcs.go @@ -161,8 +161,7 @@ func resolveEc2vpcTags(ctx context.Context, meta schema.ClientMeta, resource *sc for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchEc2VpcCidrBlockAssociationSets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { r := parent.Item.(types.Vpc) diff --git a/resources/ecs_clusters.go b/resources/ecs_clusters.go index e3111114a..4286351e9 100644 --- a/resources/ecs_clusters.go +++ b/resources/ecs_clusters.go @@ -206,8 +206,7 @@ func resolveEcsClusterSettings(_ context.Context, _ schema.ClientMeta, resource for _, s := range cluster.Settings { settings[string(s.Name)] = s.Value } - resource.Set("settings", settings) - return nil + return resource.Set("settings", settings) } func resolveEcsClusterStatistics(_ context.Context, _ schema.ClientMeta, resource *schema.Resource, _ schema.Column) error { cluster := resource.Item.(types.Cluster) @@ -215,8 +214,7 @@ func resolveEcsClusterStatistics(_ context.Context, _ schema.ClientMeta, resourc for _, s := range cluster.Statistics { stats[*s.Name] = s.Value } - resource.Set("statistics", stats) - return nil + return resource.Set("statistics", stats) } func resolveEcsClusterTags(_ context.Context, _ schema.ClientMeta, resource *schema.Resource, _ schema.Column) error { cluster := resource.Item.(types.Cluster) @@ -224,8 +222,7 @@ func resolveEcsClusterTags(_ context.Context, _ schema.ClientMeta, resource *sch for _, s := range cluster.Tags { stats[*s.Key] = s.Value } - resource.Set("tags", stats) - return nil + return resource.Set("tags", stats) } func fetchEcsClusterAttachments(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { cluster := parent.Item.(types.Cluster) @@ -238,8 +235,7 @@ func resolveEcsClusterAttachmentDetails(_ context.Context, _ schema.ClientMeta, for _, s := range attachment.Details { details[*s.Name] = s.Value } - resource.Set("details", details) - return nil + return resource.Set("details", details) } func fetchEcsClusterDefaultCapacityProviderStrategies(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { cluster := parent.Item.(types.Cluster) diff --git a/resources/efs_filesystems.go b/resources/efs_filesystems.go index 75fc50de1..cb7d895a9 100644 --- a/resources/efs_filesystems.go +++ b/resources/efs_filesystems.go @@ -145,6 +145,5 @@ func resolveEfsFilesystemTags(ctx context.Context, meta schema.ClientMeta, resou for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } diff --git a/resources/eks_clusters.go b/resources/eks_clusters.go index 493aff484..db401c425 100644 --- a/resources/eks_clusters.go +++ b/resources/eks_clusters.go @@ -210,6 +210,5 @@ func resolveEksClusterLoggingClusterLoggingsLogType(_ context.Context, _ schema. for i, l := range logSetup.Types { logTypes[i] = string(l) } - resource.Set("types", logTypes) - return nil + return resource.Set("types", logTypes) } diff --git a/resources/fsx_backups.go b/resources/fsx_backups.go index efd7b4235..4e5661ea7 100644 --- a/resources/fsx_backups.go +++ b/resources/fsx_backups.go @@ -109,6 +109,5 @@ func resolveFsxBackupTags(ctx context.Context, meta schema.ClientMeta, resource for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } diff --git a/resources/iam.users.go b/resources/iam.users.go index 0d768b8c5..7305f9645 100644 --- a/resources/iam.users.go +++ b/resources/iam.users.go @@ -321,8 +321,12 @@ func postIamUserAccessKeyResolver(ctx context.Context, meta schema.ClientMeta, r return err } if output.AccessKeyLastUsed != nil { - resource.Set("last_used", output.AccessKeyLastUsed.LastUsedDate) - resource.Set("last_used_service_name", output.AccessKeyLastUsed.ServiceName) + if err := resource.Set("last_used", output.AccessKeyLastUsed.LastUsedDate); err != nil { + return err + } + if err := resource.Set("last_used_service_name", output.AccessKeyLastUsed.ServiceName); err != nil { + return err + } } return nil } @@ -352,6 +356,5 @@ func resolveEc2UserTags(ctx context.Context, meta schema.ClientMeta, resource *s for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } diff --git a/resources/iam_groups.go b/resources/iam_groups.go index d8b2f4506..82c1ad41a 100644 --- a/resources/iam_groups.go +++ b/resources/iam_groups.go @@ -90,6 +90,5 @@ func resolveIamGroupPolicies(ctx context.Context, meta schema.ClientMeta, resour for _, p := range response.AttachedPolicies { policyMap[*p.PolicyArn] = p.PolicyName } - resource.Set("policies", policyMap) - return nil + return resource.Set("policies", policyMap) } diff --git a/resources/iam_openid_connect_identity_providers.go b/resources/iam_openid_connect_identity_providers.go index 6e5ddd8ac..6ba59fd8e 100644 --- a/resources/iam_openid_connect_identity_providers.go +++ b/resources/iam_openid_connect_identity_providers.go @@ -77,6 +77,5 @@ func resolveIamOpenidConnectIdentityProviderTags(ctx context.Context, meta schem response[*t.Key] = t.Value } - resource.Set(c.Name, response) - return nil + return resource.Set(c.Name, response) } diff --git a/resources/iam_policies.go b/resources/iam_policies.go index 472a6a8ae..be7c8b35b 100644 --- a/resources/iam_policies.go +++ b/resources/iam_policies.go @@ -138,7 +138,7 @@ func resolveIamPolicyVersionDocument(ctx context.Context, meta schema.ClientMeta if err != nil { return err } - resource.Set("document", decodedDocument) + return resource.Set("document", decodedDocument) } return nil } diff --git a/resources/iam_roles.go b/resources/iam_roles.go index 6a00c488e..c8301b567 100644 --- a/resources/iam_roles.go +++ b/resources/iam_roles.go @@ -130,8 +130,7 @@ func resolveIamRolePolicies(ctx context.Context, meta schema.ClientMeta, resourc } input.Marker = response.Marker } - resource.Set("policies", policies) - return nil + return resource.Set("policies", policies) } func resolveIamRoleAssumeRolePolicyDocument(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.Role) @@ -140,7 +139,7 @@ func resolveIamRoleAssumeRolePolicyDocument(ctx context.Context, meta schema.Cli if err != nil { return err } - resource.Set("assume_role_policy_document", decodedDocument) + return resource.Set("assume_role_policy_document", decodedDocument) } return nil } @@ -150,6 +149,5 @@ func resolveIamRoleTags(ctx context.Context, meta schema.ClientMeta, resource *s for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } diff --git a/resources/iam_saml_identity_providers.go b/resources/iam_saml_identity_providers.go index 6b47ee496..92ad63b16 100644 --- a/resources/iam_saml_identity_providers.go +++ b/resources/iam_saml_identity_providers.go @@ -73,6 +73,5 @@ func resolveIamSamlIdentityProviderTags(ctx context.Context, meta schema.ClientM response[*t.Key] = t.Value } - resource.Set(c.Name, response) - return nil + return resource.Set(c.Name, response) } diff --git a/resources/iam_virtual_mfa_devices.go b/resources/iam_virtual_mfa_devices.go index 90c92e9e4..269ad781f 100644 --- a/resources/iam_virtual_mfa_devices.go +++ b/resources/iam_virtual_mfa_devices.go @@ -125,8 +125,7 @@ func resolveIamVirtualMfaDeviceTags(ctx context.Context, meta schema.ClientMeta, for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func resolveIamVirtualMfaDeviceUserTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.VirtualMFADevice) @@ -137,6 +136,5 @@ func resolveIamVirtualMfaDeviceUserTags(ctx context.Context, meta schema.ClientM for _, t := range r.User.Tags { tags[*t.Key] = t.Value } - resource.Set("user_tags", tags) - return nil + return resource.Set("user_tags", tags) } diff --git a/resources/kms_keys.go b/resources/kms_keys.go index 42b363fe0..9517b16a9 100644 --- a/resources/kms_keys.go +++ b/resources/kms_keys.go @@ -138,31 +138,60 @@ func resolveKmsKey(ctx context.Context, meta schema.ClientMeta, resource *schema return err } if output.KeyMetadata != nil { - resource.Set("cloud_hsm_cluster_id", output.KeyMetadata.CloudHsmClusterId) - resource.Set("creation_date", output.KeyMetadata.CreationDate) - resource.Set("custom_key_store_id", output.KeyMetadata.CustomKeyStoreId) - resource.Set("customer_master_key_spec", output.KeyMetadata.CustomerMasterKeySpec) - resource.Set("deletion_date", output.KeyMetadata.DeletionDate) - resource.Set("description", output.KeyMetadata.Description) - resource.Set("enabled", output.KeyMetadata.Enabled) - resource.Set("expiration_model", output.KeyMetadata.ExpirationModel) - resource.Set("manager", output.KeyMetadata.KeyManager) - resource.Set("key_state", output.KeyMetadata.KeyState) - resource.Set("key_usage", output.KeyMetadata.KeyUsage) - resource.Set("origin", output.KeyMetadata.Origin) - resource.Set("valid_to", output.KeyMetadata.ValidTo) - + if err := resource.Set("cloud_hsm_cluster_id", output.KeyMetadata.CloudHsmClusterId); err != nil { + return err + } + if err := resource.Set("creation_date", output.KeyMetadata.CreationDate); err != nil { + return err + } + if err := resource.Set("custom_key_store_id", output.KeyMetadata.CustomKeyStoreId); err != nil { + return err + } + if err := resource.Set("customer_master_key_spec", output.KeyMetadata.CustomerMasterKeySpec); err != nil { + return err + } + if err := resource.Set("deletion_date", output.KeyMetadata.DeletionDate); err != nil { + return err + } + if err := resource.Set("description", output.KeyMetadata.Description); err != nil { + return err + } + if err := resource.Set("enabled", output.KeyMetadata.Enabled); err != nil { + return err + } + if err := resource.Set("expiration_model", output.KeyMetadata.ExpirationModel); err != nil { + return err + } + if err := resource.Set("manager", output.KeyMetadata.KeyManager); err != nil { + return err + } + if err := resource.Set("key_state", output.KeyMetadata.KeyState); err != nil { + return err + } + if err := resource.Set("key_usage", output.KeyMetadata.KeyUsage); err != nil { + return err + } + if err := resource.Set("origin", output.KeyMetadata.Origin); err != nil { + return err + } + if err := resource.Set("valid_to", output.KeyMetadata.ValidTo); err != nil { + return err + } var encryptionAlgorithms []string for _, algorithm := range output.KeyMetadata.EncryptionAlgorithms { encryptionAlgorithms = append(encryptionAlgorithms, string(algorithm)) } - resource.Set("encryption_algorithms", encryptionAlgorithms) + if err := resource.Set("encryption_algorithms", encryptionAlgorithms); err != nil { + return err + } var signingAlgorithms []string for _, algorithm := range output.KeyMetadata.SigningAlgorithms { signingAlgorithms = append(signingAlgorithms, string(algorithm)) } - resource.Set("signing_algorithms", signingAlgorithms) + if err := resource.Set("signing_algorithms", signingAlgorithms); err != nil { + return err + } } if string(output.KeyMetadata.Origin) != "EXTERNAL" { @@ -172,7 +201,9 @@ func resolveKmsKey(ctx context.Context, meta schema.ClientMeta, resource *schema if err != nil { return err } - resource.Set("rotation_enabled", output.KeyRotationEnabled) + if err := resource.Set("rotation_enabled", output.KeyRotationEnabled); err != nil { + return err + } } return nil } diff --git a/resources/provider.go b/resources/provider.go index c91094730..59e8e849b 100644 --- a/resources/provider.go +++ b/resources/provider.go @@ -65,12 +65,8 @@ func Provider() *provider.Provider { "redshift.clusters": RedshiftClusters(), "redshift.subnet_groups": RedshiftSubnetGroups(), }, - Config: func() interface{} { + Config: func() provider.Config { return &client.Config{} }, - DefaultConfigGenerator: func() (string, error) { - return client.DefaultConfigYaml, nil - }, } - } diff --git a/resources/rds_clusters.go b/resources/rds_clusters.go index 8125fd6b1..be9930d54 100644 --- a/resources/rds_clusters.go +++ b/resources/rds_clusters.go @@ -440,8 +440,7 @@ func resolveRdsClusterTags(_ context.Context, _ schema.ClientMeta, resource *sch for _, t := range r.TagList { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchRdsClusterAssociatedRoles(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { cluster, ok := parent.Item.(types.DBCluster) diff --git a/resources/rds_instances.go b/resources/rds_instances.go index b43d1da5a..b4fa469f1 100644 --- a/resources/rds_instances.go +++ b/resources/rds_instances.go @@ -628,8 +628,7 @@ func resolveRdsInstanceTags(_ context.Context, _ schema.ClientMeta, resource *sc for _, t := range r.TagList { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchRdsInstanceAssociatedRoles(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { instance, ok := parent.Item.(types.DBInstance) @@ -693,8 +692,7 @@ func resolveRdsInstancePendingModifiedValuesProcessorFeatures(_ context.Context, for _, t := range r.PendingModifiedValues.ProcessorFeatures { pendingProcessorFeatures[*t.Name] = t.Value } - resource.Set("aws_rds_instance_pending_modified_values_processor_features", pendingProcessorFeatures) - return nil + return resource.Set("aws_rds_instance_pending_modified_values_processor_features", pendingProcessorFeatures) } func resolveRdsInstanceProcessorFeatures(_ context.Context, _ schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.DBInstance) @@ -702,8 +700,7 @@ func resolveRdsInstanceProcessorFeatures(_ context.Context, _ schema.ClientMeta, for _, t := range r.ProcessorFeatures { processorFeatures[*t.Name] = t.Value } - resource.Set("aws_rds_instance_processor_features", processorFeatures) - return nil + return resource.Set("aws_rds_instance_processor_features", processorFeatures) } func fetchRdsInstanceStatusInfos(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { instance, ok := parent.Item.(types.DBInstance) diff --git a/resources/redshift_clusters.go b/resources/redshift_clusters.go index 0c63574e4..fe4936a34 100644 --- a/resources/redshift_clusters.go +++ b/resources/redshift_clusters.go @@ -582,8 +582,7 @@ func resolveRedshiftClusterTags(_ context.Context, _ schema.ClientMeta, resource for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchRedshiftClusterNodes(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { cluster, ok := parent.Item.(types.Cluster) diff --git a/resources/redshift_subnet_groups.go b/resources/redshift_subnet_groups.go index 8341a3a4e..982ccf50c 100644 --- a/resources/redshift_subnet_groups.go +++ b/resources/redshift_subnet_groups.go @@ -113,8 +113,7 @@ func resolveRedshiftSubnetGroupTags(_ context.Context, _ schema.ClientMeta, reso for _, t := range r.Tags { tags[*t.Key] = t.Value } - resource.Set("tags", tags) - return nil + return resource.Set("tags", tags) } func fetchRedshiftSubnetGroupSubnets(_ context.Context, _ schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { clusterSubnetGroup, ok := parent.Item.(types.ClusterSubnetGroup) @@ -130,6 +129,5 @@ func resolveRedshiftSubnetGroupSubnetSubnetAvailabilityZoneSupportedPlatforms(_ for i, p := range r.SubnetAvailabilityZone.SupportedPlatforms { platforms[i] = p.Name } - resource.Set("subnet_availability_zone_supported_platforms", platforms) - return nil + return resource.Set("subnet_availability_zone_supported_platforms", platforms) } diff --git a/resources/s3_buckets.go b/resources/s3_buckets.go index bf3130c95..186602167 100644 --- a/resources/s3_buckets.go +++ b/resources/s3_buckets.go @@ -163,7 +163,7 @@ func S3Buckets() *schema.Table { // ==================================================================================================================== // Table Resolver Functions // ==================================================================================================================== -func fetchS3Buckets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { +func fetchS3Buckets(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan interface{}) error { svc := meta.(*client.Client).Services().S3 response, err := svc.ListBuckets(ctx, nil) if err != nil { @@ -194,7 +194,9 @@ func resolveS3BucketsAttributes(ctx context.Context, meta schema.ClientMeta, res // This is a weird corner case by AWS API https://github.com/aws/aws-sdk-net/issues/323#issuecomment-196584538 bucketRegion = output } - resource.Set("region", bucketRegion) + if err := resource.Set("region", bucketRegion); err != nil { + return err + } loggingOutput, err := svc.GetBucketLogging(ctx, &s3.GetBucketLoggingInput{Bucket: r.Name}, func(options *s3.Options) { options.Region = bucketRegion @@ -203,8 +205,12 @@ func resolveS3BucketsAttributes(ctx context.Context, meta schema.ClientMeta, res return err } if loggingOutput.LoggingEnabled != nil { - resource.Set("logging_target_bucket", loggingOutput.LoggingEnabled.TargetBucket) - resource.Set("logging_target_prefix", loggingOutput.LoggingEnabled.TargetPrefix) + if err := resource.Set("logging_target_bucket", loggingOutput.LoggingEnabled.TargetBucket); err != nil { + return err + } + if err := resource.Set("logging_target_prefix", loggingOutput.LoggingEnabled.TargetPrefix); err != nil { + return err + } } policyOutput, err := svc.GetBucketPolicy(ctx, &s3.GetBucketPolicyInput{Bucket: r.Name}, func(options *s3.Options) { @@ -214,7 +220,9 @@ func resolveS3BucketsAttributes(ctx context.Context, meta schema.ClientMeta, res return err } if policyOutput != nil { - resource.Set("policy", policyOutput.Policy) + if err := resource.Set("policy", policyOutput.Policy); err != nil { + return err + } } versioningOutput, err := svc.GetBucketVersioning(ctx, &s3.GetBucketVersioningInput{Bucket: r.Name}, func(options *s3.Options) { @@ -223,9 +231,13 @@ func resolveS3BucketsAttributes(ctx context.Context, meta schema.ClientMeta, res if err != nil { return err } - resource.Set("versioning_status", versioningOutput.Status) - resource.Set("versioning_mfa_delete", versioningOutput.MFADelete) + if err := resource.Set("versioning_status", versioningOutput.Status); err != nil { + return err + } + if err := resource.Set("versioning_mfa_delete", versioningOutput.MFADelete); err != nil { + return err + } return nil } func fetchS3BucketGrants(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { diff --git a/resources/sns_topics.go b/resources/sns_topics.go index bdf487f25..65707d09d 100644 --- a/resources/sns_topics.go +++ b/resources/sns_topics.go @@ -120,21 +120,41 @@ func resolveTopicAttributes(ctx context.Context, meta schema.ClientMeta, resourc return err } // Set all attributes - resource.Set("subscriptions_confirmed", cast.ToInt(output.Attributes["SubscriptionsConfirmed"])) - resource.Set("subscriptions_deleted", cast.ToInt(output.Attributes["SubscriptionsDeleted"])) - resource.Set("subscriptions_pending", cast.ToInt(output.Attributes["SubscriptionsPending"])) - resource.Set("fifo_topic", cast.ToBool(output.Attributes["FifoTopic"])) - resource.Set("content_based_deduplication", cast.ToBool(output.Attributes["ContentBasedDeduplication"])) + if err := resource.Set("subscriptions_confirmed", cast.ToInt(output.Attributes["SubscriptionsConfirmed"])); err != nil { + return err + } + if err := resource.Set("subscriptions_deleted", cast.ToInt(output.Attributes["SubscriptionsDeleted"])); err != nil { + return err + } + if err := resource.Set("subscriptions_pending", cast.ToInt(output.Attributes["SubscriptionsPending"])); err != nil { + return err + } + if err := resource.Set("fifo_topic", cast.ToBool(output.Attributes["FifoTopic"])); err != nil { + return err + } + if err := resource.Set("content_based_deduplication", cast.ToBool(output.Attributes["ContentBasedDeduplication"])); err != nil { + return err + } if p, ok := output.Attributes["Policy"]; ok && p != "" { - resource.Set("policy", p) + if err := resource.Set("policy", p); err != nil { + return err + } } if p, ok := output.Attributes["DeliveryPolicy"]; ok && p != "" { - resource.Set("delivery_policy", p) + if err := resource.Set("delivery_policy", p); err != nil { + return err + } + } + if err := resource.Set("display_name", output.Attributes["DisplayName"]); err != nil { + return err + } + if err := resource.Set("owner", output.Attributes["Owner"]); err != nil { + return err } - resource.Set("display_name", output.Attributes["DisplayName"]) - resource.Set("owner", output.Attributes["Owner"]) if p, ok := output.Attributes["EffectiveDeliveryPolicy"]; ok && p != "" { - resource.Set("effective_delivery_policy", p) + if err := resource.Set("effective_delivery_policy", p); err != nil { + return err + } } return nil