Skip to content

Commit 7b045dc

Browse files
erezrokaherezrokah
authored
Merge branch 'main' into crowdstrike
2 parents 95ae202 + 8122416 commit 7b045dc

11 files changed

Lines changed: 320 additions & 269 deletions

File tree

‎plugins/source/aws/codegen/recipes/ssoadmin.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package recipes
22

33
import (
44
types "github.com/aws/aws-sdk-go-v2/service/ssoadmin/types"
5+
"github.com/cloudquery/plugin-sdk/codegen"
6+
"github.com/cloudquery/plugin-sdk/schema"
57
)
68

79
func SSOAdminResources() []*Resource {
@@ -19,6 +21,13 @@ func SSOAdminResources() []*Resource {
1921
Struct: &types.PermissionSet{},
2022
Description: "https://docs.aws.amazon.com/singlesignon/latest/APIReference/API_PermissionSet.html",
2123
PreResourceResolver: "getSsoadminPermissionSet",
24+
ExtraColumns: []codegen.ColumnDefinition{
25+
{
26+
Name: "inline_policy",
27+
Type: schema.TypeJSON,
28+
Resolver: "getSsoadminPermissionSetInlinePolicy",
29+
},
30+
},
2231
Relations: []string{
2332
"AccountAssignments()",
2433
},

‎plugins/source/aws/docs/tables/aws_ssoadmin_permission_sets.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ The following tables depend on aws_ssoadmin_permission_sets:
1717
|_cq_sync_time|Timestamp|
1818
|_cq_id (PK)|UUID|
1919
|_cq_parent_id|UUID|
20+
|inline_policy|JSON|
2021
|created_date|Timestamp|
2122
|description|String|
2223
|name|String|

‎plugins/source/aws/go.mod‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,53 @@ module github.com/cloudquery/cloudquery/plugins/source/aws
33
go 1.19
44

55
require (
6-
github.com/aws/aws-sdk-go-v2 v1.17.1
7-
github.com/aws/aws-sdk-go-v2/config v1.18.3
8-
github.com/aws/aws-sdk-go-v2/credentials v1.13.3
9-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.42
10-
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.18.0
11-
github.com/aws/aws-sdk-go-v2/service/account v1.7.11
12-
github.com/aws/aws-sdk-go-v2/service/acm v1.16.3
13-
github.com/aws/aws-sdk-go-v2/service/apigateway v1.15.25
14-
github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.23
15-
github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.15.23
16-
github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.0
17-
github.com/aws/aws-sdk-go-v2/service/appstream v1.18.0
6+
github.com/aws/aws-sdk-go-v2 v1.17.2
7+
github.com/aws/aws-sdk-go-v2/config v1.18.4
8+
github.com/aws/aws-sdk-go-v2/credentials v1.13.4
9+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.43
10+
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.18.1
11+
github.com/aws/aws-sdk-go-v2/service/account v1.7.12
12+
github.com/aws/aws-sdk-go-v2/service/acm v1.16.4
13+
github.com/aws/aws-sdk-go-v2/service/apigateway v1.15.26
14+
github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.12.24
15+
github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.15.24
16+
github.com/aws/aws-sdk-go-v2/service/apprunner v1.15.1
17+
github.com/aws/aws-sdk-go-v2/service/appstream v1.18.1
1818
github.com/aws/aws-sdk-go-v2/service/appsync v1.16.0
1919
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.24.3
20-
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.24.1
21-
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.21.0
22-
github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.13.21
23-
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.20.3
24-
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.22.0
25-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.17.0
26-
github.com/aws/aws-sdk-go-v2/service/codebuild v1.19.19
27-
github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.19
28-
github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.14.3
29-
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.1
30-
github.com/aws/aws-sdk-go-v2/service/configservice v1.28.0
31-
github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.1
32-
github.com/aws/aws-sdk-go-v2/service/dax v1.11.19
33-
github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.23
34-
github.com/aws/aws-sdk-go-v2/service/docdb v1.19.16
35-
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.7
36-
github.com/aws/aws-sdk-go-v2/service/ec2 v1.74.0
37-
github.com/aws/aws-sdk-go-v2/service/ecr v1.17.23
38-
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.20
39-
github.com/aws/aws-sdk-go-v2/service/ecs v1.20.0
40-
github.com/aws/aws-sdk-go-v2/service/efs v1.18.0
41-
github.com/aws/aws-sdk-go-v2/service/eks v1.24.0
42-
github.com/aws/aws-sdk-go-v2/service/elasticache v1.24.1
43-
github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.14.20
44-
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.23
45-
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.26
46-
github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.17.2
47-
github.com/aws/aws-sdk-go-v2/service/emr v1.20.16
48-
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.16.20
49-
github.com/aws/aws-sdk-go-v2/service/firehose v1.15.0
50-
github.com/aws/aws-sdk-go-v2/service/frauddetector v1.20.12
51-
github.com/aws/aws-sdk-go-v2/service/fsx v1.26.0
52-
github.com/aws/aws-sdk-go-v2/service/glacier v1.13.19
20+
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.24.2
21+
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.21.1
22+
github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.13.22
23+
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.20.4
24+
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.22.1
25+
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.17.1
26+
github.com/aws/aws-sdk-go-v2/service/codebuild v1.19.20
27+
github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.20
28+
github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.14.4
29+
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.21.2
30+
github.com/aws/aws-sdk-go-v2/service/configservice v1.28.1
31+
github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.22.2
32+
github.com/aws/aws-sdk-go-v2/service/dax v1.11.20
33+
github.com/aws/aws-sdk-go-v2/service/directconnect v1.17.24
34+
github.com/aws/aws-sdk-go-v2/service/docdb v1.19.17
35+
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.8
36+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.74.1
37+
github.com/aws/aws-sdk-go-v2/service/ecr v1.17.24
38+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.21
39+
github.com/aws/aws-sdk-go-v2/service/ecs v1.20.1
40+
github.com/aws/aws-sdk-go-v2/service/efs v1.18.1
41+
github.com/aws/aws-sdk-go-v2/service/eks v1.24.1
42+
github.com/aws/aws-sdk-go-v2/service/elasticache v1.24.2
43+
github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.14.21
44+
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.24
45+
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.27
46+
github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.17.3
47+
github.com/aws/aws-sdk-go-v2/service/emr v1.20.17
48+
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.16.21
49+
github.com/aws/aws-sdk-go-v2/service/firehose v1.15.1
50+
github.com/aws/aws-sdk-go-v2/service/frauddetector v1.20.13
51+
github.com/aws/aws-sdk-go-v2/service/fsx v1.26.1
52+
github.com/aws/aws-sdk-go-v2/service/glacier v1.13.20
5353
github.com/aws/aws-sdk-go-v2/service/guardduty v1.16.2
5454
github.com/aws/aws-sdk-go-v2/service/iam v1.18.23
5555
github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.7
@@ -73,7 +73,7 @@ require (
7373
github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.12.21
7474
github.com/aws/aws-sdk-go-v2/service/route53 v1.25.0
7575
github.com/aws/aws-sdk-go-v2/service/route53domains v1.12.19
76-
github.com/aws/aws-sdk-go-v2/service/s3 v1.29.4
76+
github.com/aws/aws-sdk-go-v2/service/s3 v1.29.5
7777
github.com/aws/aws-sdk-go-v2/service/s3control v1.28.0
7878
github.com/aws/aws-sdk-go-v2/service/sagemaker v1.56.0
7979
github.com/aws/aws-sdk-go-v2/service/scheduler v1.0.1
@@ -87,13 +87,13 @@ require (
8787
github.com/aws/aws-sdk-go-v2/service/sqs v1.19.15
8888
github.com/aws/aws-sdk-go-v2/service/ssm v1.33.1
8989
github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.15.13
90-
github.com/aws/aws-sdk-go-v2/service/sts v1.17.5
90+
github.com/aws/aws-sdk-go-v2/service/sts v1.17.6
9191
github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.14.6
9292
github.com/aws/aws-sdk-go-v2/service/waf v1.11.19
9393
github.com/aws/aws-sdk-go-v2/service/wafv2 v1.23.1
9494
github.com/aws/aws-sdk-go-v2/service/workspaces v1.27.0
9595
github.com/aws/aws-sdk-go-v2/service/xray v1.15.1
96-
github.com/aws/smithy-go v1.13.4
96+
github.com/aws/smithy-go v1.13.5
9797
github.com/basgys/goxml2json v1.1.0
9898
github.com/cloudquery/plugin-sdk v1.10.0
9999
github.com/gocarina/gocsv v0.0.0-20221105105431-c8ef78125b99
@@ -107,9 +107,9 @@ require (
107107
)
108108

109109
require (
110-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.16 // indirect
111-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.20 // indirect
112-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.8 // indirect
110+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.17 // indirect
111+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.21 // indirect
112+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.9 // indirect
113113
github.com/bitly/go-simplejson v0.5.0 // indirect
114114
github.com/getsentry/sentry-go v0.15.0 // indirect
115115
github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.3 // indirect
@@ -122,20 +122,20 @@ require (
122122
)
123123

124124
require (
125-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.9 // indirect
126-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.19 // indirect
127-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.25 // indirect
128-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.19 // indirect
129-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.26 // indirect
130-
github.com/aws/aws-sdk-go-v2/service/athena v1.20.0
131-
github.com/aws/aws-sdk-go-v2/service/backup v1.18.0
125+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
126+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.20 // indirect
127+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.26 // indirect
128+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.20 // indirect
129+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.27 // indirect
130+
github.com/aws/aws-sdk-go-v2/service/athena v1.20.1
131+
github.com/aws/aws-sdk-go-v2/service/backup v1.18.1
132132
github.com/aws/aws-sdk-go-v2/service/glue v1.37.0
133-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.10 // indirect
134-
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.19 // indirect
135-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.19 // indirect
136-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.19 // indirect
133+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
134+
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.20 // indirect
135+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.20 // indirect
136+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.20 // indirect
137137
github.com/aws/aws-sdk-go-v2/service/shield v1.17.11
138-
github.com/aws/aws-sdk-go-v2/service/sso v1.11.25 // indirect
138+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.26 // indirect
139139
github.com/aws/aws-sdk-go-v2/service/transfer v1.25.0
140140
github.com/aws/aws-sdk-go-v2/service/wafregional v1.12.20
141141
github.com/davecgh/go-spew v1.1.1 // indirect

0 commit comments

Comments
 (0)