feat(aws): Add inline_policy field to permission_sets table by jhudson10x · Pull Request #5280 · cloudquery/cloudquery

jhudson10x · 2022-12-01T16:14:24Z

Summary

Add inline_policy to the SSOAdmin permission_sets

jhudson10x · 2022-12-01T16:17:08Z

Whoops - TypeString needs to be TypeJSON.

bbernays · 2022-12-01T16:17:18Z

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

+			ExtraColumns: []codegen.ColumnDefinition{
+				{
+					Name:     "inline_policy",
+					Type:     schema.TypeString,


If i recall correctly this polict is actually valid JSON... so I think the type should be schema.TypeJSON

hermanschaaf

Thanks for adding this change! Looks good if we change the column type to JSON. I added one or two more thoughts as well

plugins/source/aws/resources/services/ssoadmin/permission_sets_fetch.go

hermanschaaf · 2022-12-01T16:21:33Z

plugins/source/aws/resources/services/ssoadmin/instances_mock_test.go

 	im := types.InstanceMetadata{}
 	ps := types.PermissionSet{}
 	as := types.AccountAssignment{}
+	ip := ""


I think this will need to be valid JSON if the column type is to be JSON, and faking &ip lower down with a string object will probably lead to a random string (not valid JSON).

Any valid JSON should do for the purposes of this test though, so maybe just instantiate this variable as {"key": "value} or similar

Co-authored-by: Herman Schaaf <hermanschaaf@gmail.com>

hermanschaaf

Great stuff, thanks for the contribution @jhudson10x! 👍

Approving, but I'll give @bbernays a chance to take another look as well.

plugins/source/aws/resources/services/ssoadmin/instances_mock_test.go

…test.go Co-authored-by: Herman Schaaf <hermanschaaf@gmail.com>

bbernays

Other than 1 change it looks good!

plugins/source/aws/resources/services/ssoadmin/permission_sets_fetch.go

Co-authored-by: bbernays <ben@bernays.me>

plugins/source/aws/resources/services/ssoadmin/permission_sets_fetch.go

🤖 I have created a release *beep* *boop* --- ## [7.3.0](plugins-source-aws-v7.2.3...plugins-source-aws-v7.3.0) (2022-12-06) ### Features * **aws:** Add inline_policy field to permission_sets table ([#5280](#5280)) ([bce8bb7](bce8bb7)) * **website:** Add plugins tables ([#5259](#5259)) ([c336f4e](c336f4e)) ### Bug Fixes * AWS Endpoint Generation ([#5268](#5268)) ([9cf87c4](9cf87c4)) * **aws:** Unused EIP policy - check associations not instance_ids ([#5378](#5378)) ([79907db](79907db)) * **deps:** Update github.com/gocarina/gocsv digest to c8ef781 ([#5199](#5199)) ([9a4249c](9a4249c)) * **deps:** Update module github.com/aws/aws-sdk-go-v2 to v1.17.2 ([#5297](#5297)) ([001999e](001999e)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/config to v1.18.4 ([#5298](#5298)) ([550558b](550558b)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/feature/s3/manager to v1.11.43 ([#5300](#5300)) ([934d3a2](934d3a2)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/accessanalyzer to v1.18.0 ([#5214](#5214)) ([a2a1636](a2a1636)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/accessanalyzer to v1.18.1 ([#5301](#5301)) ([f2ff665](f2ff665)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/account to v1.7.12 ([#5302](#5302)) ([3c4b649](3c4b649)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/acm to v1.16.4 ([#5303](#5303)) ([33373a8](33373a8)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/apigateway to v1.15.26 ([#5304](#5304)) ([99928c3](99928c3)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/apigatewayv2 to v1.12.24 ([#5305](#5305)) ([5ad584c](5ad584c)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/applicationautoscaling to v1.15.24 ([#5306](#5306)) ([d30723b](d30723b)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/apprunner to v1.15.1 ([#5307](#5307)) ([28aadc7](28aadc7)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/appstream to v1.18.1 ([#5308](#5308)) ([8ec0779](8ec0779)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/appsync to v1.17.0 ([#5411](#5411)) ([5453ffa](5453ffa)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/athena to v1.20.0 ([#5215](#5215)) ([fcecd6e](fcecd6e)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/athena to v1.20.1 ([#5309](#5309)) ([69fdaef](69fdaef)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/autoscaling to v1.24.4 ([#5310](#5310)) ([62ef3e9](62ef3e9)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/backup to v1.18.1 ([#5311](#5311)) ([4bbbfb5](4bbbfb5)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudformation to v1.24.2 ([#5312](#5312)) ([661bb44](661bb44)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudfront to v1.21.1 ([#5313](#5313)) ([8399d58](8399d58)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 to v1.13.22 ([#5314](#5314)) ([bcdeb31](bcdeb31)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudtrail to v1.20.4 ([#5315](#5315)) ([645c497](645c497)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudwatch to v1.22.1 ([#5316](#5316)) ([268d434](268d434)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs to v1.17.1 ([#5317](#5317)) ([73cd9a8](73cd9a8)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/codebuild to v1.19.20 ([#5318](#5318)) ([fa38434](fa38434)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/codepipeline to v1.13.20 ([#5319](#5319)) ([bb672ae](bb672ae)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cognitoidentity to v1.14.4 ([#5320](#5320)) ([d4b5f0d](d4b5f0d)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider to v1.21.2 ([#5321](#5321)) ([f0f2eaf](f0f2eaf)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/configservice to v1.28.1 ([#5322](#5322)) ([aa4a29f](aa4a29f)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/databasemigrationservice to v1.22.2 ([#5323](#5323)) ([cdc9021](cdc9021)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/dax to v1.11.20 ([#5324](#5324)) ([6cc4eb0](6cc4eb0)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/directconnect to v1.17.24 ([#5325](#5325)) ([6444aa9](6444aa9)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/docdb to v1.19.17 ([#5326](#5326)) ([3d3bf10](3d3bf10)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/dynamodb to v1.17.8 ([#5327](#5327)) ([7f6cd8a](7f6cd8a)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ec2 to v1.74.1 ([#5328](#5328)) ([190ffff](190ffff)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ec2 to v1.75.0 ([#5412](#5412)) ([a652b73](a652b73)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ecr to v1.17.24 ([#5329](#5329)) ([0c208f2](0c208f2)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ecrpublic to v1.13.20 ([#5203](#5203)) ([b3ed262](b3ed262)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ecrpublic to v1.13.21 ([#5330](#5330)) ([15a24bc](15a24bc)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ecs to v1.20.1 ([#5331](#5331)) ([79da6fc](79da6fc)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/efs to v1.18.1 ([#5332](#5332)) ([ed58abb](ed58abb)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/eks to v1.24.1 ([#5333](#5333)) ([e085850](e085850)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticache to v1.24.2 ([#5334](#5334)) ([eab93ed](eab93ed)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk to v1.14.21 ([#5335](#5335)) ([60d3eb6](60d3eb6)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing to v1.14.24 ([#5336](#5336)) ([b28fa9d](b28fa9d)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 to v1.18.27 ([#5337](#5337)) ([9c774bb](9c774bb)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/elasticsearchservice to v1.17.3 ([#5338](#5338)) ([11aca3b](11aca3b)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/emr to v1.20.17 ([#5339](#5339)) ([127add0](127add0)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/eventbridge to v1.16.21 ([#5340](#5340)) ([d68e79e](d68e79e)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/firehose to v1.15.1 ([#5341](#5341)) ([c6f13d0](c6f13d0)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/frauddetector to v1.20.13 ([#5342](#5342)) ([63f5e5f](63f5e5f)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/fsx to v1.26.1 ([#5343](#5343)) ([f4e012a](f4e012a)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/glacier to v1.13.20 ([#5344](#5344)) ([8122416](8122416)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/glue to v1.37.0 ([#5216](#5216)) ([a2f9b30](a2f9b30)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/glue to v1.37.1 ([#5351](#5351)) ([a2916c6](a2916c6)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/guardduty to v1.16.3 ([#5352](#5352)) ([0020cfb](0020cfb)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/iam to v1.18.24 ([#5353](#5353)) ([566d7c6](566d7c6)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/identitystore to v1.15.8 ([#5354](#5354)) ([055b345](055b345)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/inspector to v1.12.20 ([#5355](#5355)) ([8861d4b](8861d4b)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/inspector2 to v1.9.1 ([#5356](#5356)) ([c0dda14](c0dda14)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/iot to v1.32.1 ([#5357](#5357)) ([7c5d74e](7c5d74e)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/kafka to v1.18.1 ([#5358](#5358)) ([3aaa284](3aaa284)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/kinesis to v1.15.25 ([#5359](#5359)) ([f6ddc88](f6ddc88)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/kms to v1.19.1 ([#5360](#5360)) ([7868d85](7868d85)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/lambda to v1.26.1 ([#5361](#5361)) ([2d7b3f7](2d7b3f7)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/lightsail to v1.24.1 ([#5362](#5362)) ([af28155](af28155)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/mq to v1.13.16 ([#5363](#5363)) ([6369466](6369466)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/mwaa to v1.13.13 ([#5364](#5364)) ([ffd29a4](ffd29a4)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/neptune to v1.18.4 ([#5365](#5365)) ([898a0f5](898a0f5)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/organizations to v1.17.1 ([#5366](#5366)) ([99b1514](99b1514)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/qldb to v1.14.21 ([#5367](#5367)) ([84bc23c](84bc23c)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/quicksight to v1.28.1 ([#5368](#5368)) ([4a16c77](4a16c77)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ram to v1.16.25 ([#5369](#5369)) ([eb02411](eb02411)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/rds to v1.31.1 ([#5370](#5370)) ([beb6bc2](beb6bc2)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/rds to v1.32.0 ([#5413](#5413)) ([159ab4d](159ab4d)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/redshift to v1.26.17 ([#5371](#5371)) ([af9f487](af9f487)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/resourcegroups to v1.12.22 ([#5372](#5372)) ([81c224d](81c224d)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/route53 to v1.25.1 ([#5373](#5373)) ([fb15bcd](fb15bcd)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/route53domains to v1.12.20 ([#5374](#5374)) ([bb1d6fb](bb1d6fb)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/s3control to v1.28.0 ([#5217](#5217)) ([d6412aa](d6412aa)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/s3control to v1.28.1 ([#5390](#5390)) ([e72a2d7](e72a2d7)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sagemaker to v1.56.0 ([#5218](#5218)) ([1c9755d](1c9755d)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sagemaker to v1.56.1 ([#5391](#5391)) ([d82c2dc](d82c2dc)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/scheduler to v1.0.2 ([#5392](#5392)) ([50ac42f](50ac42f)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/secretsmanager to v1.16.9 ([#5393](#5393)) ([6e305bf](6e305bf)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/servicecatalog to v1.15.1 ([#5394](#5394)) ([730ea19](730ea19)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry to v1.15.1 ([#5395](#5395)) ([c0b3a84](c0b3a84)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/servicequotas to v1.13.21 ([#5396](#5396)) ([e2ae614](e2ae614)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sesv2 to v1.15.2 ([#5397](#5397)) ([26af6cc](26af6cc)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sfn to v1.16.0 ([#5284](#5284)) ([7cc803b](7cc803b)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sfn to v1.16.1 ([#5398](#5398)) ([17d0a70](17d0a70)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/shield to v1.17.12 ([#5399](#5399)) ([816ceb8](816ceb8)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sns to v1.18.7 ([#5400](#5400)) ([d11461d](d11461d)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/sqs to v1.19.16 ([#5401](#5401)) ([771e3d9](771e3d9)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ssm to v1.33.2 ([#5402](#5402)) ([ce6b440](ce6b440)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/ssoadmin to v1.15.14 ([#5403](#5403)) ([ed7475a](ed7475a)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/timestreamwrite to v1.14.7 ([#5404](#5404)) ([0133015](0133015)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/transfer to v1.25.1 ([#5405](#5405)) ([4131a6e](4131a6e)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/waf to v1.11.20 ([#5406](#5406)) ([33f2a2c](33f2a2c)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/wafregional to v1.12.21 ([#5407](#5407)) ([e725946](e725946)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/wafv2 to v1.23.2 ([#5408](#5408)) ([e11e087](e11e087)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/workspaces to v1.27.1 ([#5409](#5409)) ([3a2c24b](3a2c24b)) * **deps:** Update module github.com/aws/aws-sdk-go-v2/service/xray to v1.15.2 ([#5410](#5410)) ([6d0be25](6d0be25)) * **deps:** Update module github.com/cloudquery/plugin-sdk to v1.11.0 ([#5416](#5416)) ([2e7ca35](2e7ca35)) * Update endpoints ([#5283](#5283)) ([5bc7bb8](5bc7bb8)) * Update endpoints ([#5384](#5384)) ([b3850cf](b3850cf)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

Add inline_policy field to permission_sets table

46b7d5d

jhudson10x requested review from hermanschaaf and yevgenypats as code owners December 1, 2022 16:14

jhudson10x changed the title ~~Add inline_policy field to permission_sets table~~ feat(aws): Add inline_policy field to permission_sets table Dec 1, 2022

Merge branch 'main' into add_inline_policy_for_permission_sets

a7bed3f

cq-bot added the aws label Dec 1, 2022

vercel bot deployed to Preview December 1, 2022 16:15 View deployment

bbernays reviewed Dec 1, 2022

View reviewed changes

hermanschaaf suggested changes Dec 1, 2022

View reviewed changes

jhudson10x and others added 5 commits December 1, 2022 11:33

Apply suggestions from code review

3827f63

Co-authored-by: Herman Schaaf <hermanschaaf@gmail.com>

Incorporate PR feedback

26bc99a

Merge branch 'main' into add_inline_policy_for_permission_sets

c4ffd71

Revert this change

617bb4b

Unmarshal the JSON before setting the column

e2db80e

hermanschaaf approved these changes Dec 1, 2022

View reviewed changes

Merge branch 'main' into add_inline_policy_for_permission_sets

9d67f11

hermanschaaf reviewed Dec 1, 2022

View reviewed changes

plugins/source/aws/resources/services/ssoadmin/instances_mock_test.go Outdated Show resolved Hide resolved

Update plugins/source/aws/resources/services/ssoadmin/instances_mock_…

c16bf2f

…test.go Co-authored-by: Herman Schaaf <hermanschaaf@gmail.com>

bbernays requested changes Dec 1, 2022

View reviewed changes

plugins/source/aws/resources/services/ssoadmin/permission_sets_fetch.go Outdated Show resolved Hide resolved

jhudson10x and others added 2 commits December 2, 2022 13:15

Apply suggestions from code review

0e27b4e

Co-authored-by: bbernays <ben@bernays.me>

Merge branch 'main' into add_inline_policy_for_permission_sets

efb44e9

vercel bot deployed to Preview December 2, 2022 18:16 View deployment

bbernays reviewed Dec 2, 2022

View reviewed changes

plugins/source/aws/resources/services/ssoadmin/permission_sets_fetch.go Outdated Show resolved Hide resolved

Fix reference

3518c85

bbernays approved these changes Dec 2, 2022

View reviewed changes

bbernays added the automerge Automatically merge once required checks pass label Dec 2, 2022

kodiakhq bot merged commit bce8bb7 into cloudquery:main Dec 2, 2022

cq-bot mentioned this pull request Dec 2, 2022

chore(main): Release plugins-source-aws v7.3.0 #5219

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(aws): Add inline_policy field to permission_sets table#5280

feat(aws): Add inline_policy field to permission_sets table#5280
kodiakhq[bot] merged 12 commits intocloudquery:mainfrom
jhudson10x:add_inline_policy_for_permission_sets

jhudson10x commented Dec 1, 2022

Uh oh!

jhudson10x commented Dec 1, 2022

Uh oh!

bbernays Dec 1, 2022

Uh oh!

hermanschaaf left a comment

Uh oh!

Uh oh!

Uh oh!

hermanschaaf Dec 1, 2022

Uh oh!

hermanschaaf left a comment

Uh oh!

Uh oh!

bbernays left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

jhudson10x commented Dec 1, 2022

Summary

Uh oh!

jhudson10x commented Dec 1, 2022

Uh oh!

bbernays Dec 1, 2022

Choose a reason for hiding this comment

Uh oh!

hermanschaaf left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

hermanschaaf Dec 1, 2022

Choose a reason for hiding this comment

Uh oh!

hermanschaaf left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bbernays left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants