OpsHelmInc · kylemcc · Oct 3, 2025 · Oct 2, 2025 · Oct 3, 2025
diff --git a/client/helpers.go b/client/helpers.go
@@ -53,6 +53,7 @@ const (
 	GlueService                 AWSService = "glue"
 	GuardDutyService            AWSService = "guardduty"
 	IamService                  AWSService = "iam"
+	IdentityStoreService        AWSService = "identitystore"
 	RedshiftService             AWSService = "redshift"
 	Route53Service              AWSService = "route53"
 	S3Service                   AWSService = "s3"

diff --git a/client/mocks/apigatewayv2.go b/client/mocks/apigatewayv2.go
diff --git a/client/mocks/backup.go b/client/mocks/backup.go
diff --git a/client/mocks/ec2.go b/client/mocks/ec2.go
diff --git a/client/mocks/s3.go b/client/mocks/s3.go
diff --git a/client/mocks/sagemaker.go b/client/mocks/sagemaker.go
diff --git a/client/services/apigatewayv2.go b/client/services/apigatewayv2.go
diff --git a/client/services/backup.go b/client/services/backup.go
diff --git a/client/services/ec2.go b/client/services/ec2.go
diff --git a/client/services/s3.go b/client/services/s3.go
diff --git a/client/services/sagemaker.go b/client/services/sagemaker.go
diff --git a/codegen/recipes/identitystore.go b/codegen/recipes/identitystore.go
@@ -2,18 +2,47 @@ package recipes
 
 import (
 	types "github.com/aws/aws-sdk-go-v2/service/identitystore/types"
+	"github.com/cloudquery/plugin-sdk/codegen"
+	"github.com/cloudquery/plugin-sdk/schema"
 )
 
 func IdentitystoreResources() []*Resource {
 	resources := []*Resource{
 		{
 			SubService: "groups",
 			Struct:     &types.Group{},
-			Relations:  []string{"GroupMemberships()"},
+			// Relations:  []string{"GroupMemberships()"},
+			PreResourceResolver: "getGroup",
+			ExtraColumns: []codegen.ColumnDefinition{
+				{
+					Name:     "arn",
+					Type:     schema.TypeString,
+					Resolver: `resolveIdentityStoreGroupArn`,
+					Options:  schema.ColumnCreationOptions{PrimaryKey: true},
+				},
+				{
+					Name:     ohResourceTypeColumn,
+					Type:     schema.TypeString,
+					Resolver: `client.StaticValueResolver("AWS::IdentityStore::Group")`,
+				},
+			},
 		},
 		{
 			SubService: "users",
 			Struct:     &types.User{},
+			ExtraColumns: []codegen.ColumnDefinition{
+				{
+					Name:     "arn",
+					Type:     schema.TypeString,
+					Resolver: `resolveIdentityStoreUserArn`,
+					Options:  schema.ColumnCreationOptions{PrimaryKey: true},
+				},
+				{
+					Name:     ohResourceTypeColumn,
+					Type:     schema.TypeString,
+					Resolver: `client.StaticValueResolver("AWS::IdentityStore::User")`,
+				},
+			},
 		},
 		{
 			SubService: "group_memberships",

diff --git a/docs/tables/README.md b/docs/tables/README.md
@@ -274,8 +274,8 @@
   - [aws_iam_user_policies](aws_iam_user_policies.md)
 - [aws_iam_virtual_mfa_devices](aws_iam_virtual_mfa_devices.md)
 - [aws_identitystore_groups](aws_identitystore_groups.md)
-  - [aws_identitystore_group_memberships](aws_identitystore_group_memberships.md)
 - [aws_identitystore_users](aws_identitystore_users.md)
+- [aws_identitystore_group_memberships](aws_identitystore_group_memberships.md)
 - [aws_inspector2_findings](aws_inspector2_findings.md)
 - [aws_inspector_findings](aws_inspector_findings.md)
 - [aws_iot_billing_groups](aws_iot_billing_groups.md)

diff --git a/docs/tables/aws_apigateway_domain_names.md b/docs/tables/aws_apigateway_domain_names.md
@@ -38,5 +38,6 @@ The following tables depend on aws_apigateway_domain_names:
 |regional_certificate_name|String|
 |regional_domain_name|String|
 |regional_hosted_zone_id|String|
+|routing_mode|String|
 |security_policy|String|
 |tags|JSON|
diff --git a/docs/tables/aws_apigatewayv2_domain_names.md b/docs/tables/aws_apigatewayv2_domain_names.md
@@ -21,6 +21,8 @@ The following tables depend on aws_apigatewayv2_domain_names:
 |arn|String|
 |domain_name|String|
 |api_mapping_selection_expression|String|
+|domain_name_arn|String|
 |domain_name_configurations|JSON|
 |mutual_tls_authentication|JSON|
+|routing_mode|String|
 |tags|JSON|
diff --git a/docs/tables/aws_athena_work_group_query_executions.md b/docs/tables/aws_athena_work_group_query_executions.md
@@ -20,6 +20,7 @@ This table depends on [aws_athena_work_groups](aws_athena_work_groups.md).
 |work_group_arn|String|
 |engine_version|JSON|
 |execution_parameters|StringArray|
+|managed_query_results_configuration|JSON|
 |query|String|
 |query_execution_context|JSON|
 |query_execution_id|String|

diff --git a/docs/tables/aws_backup_vault_recovery_points.md b/docs/tables/aws_backup_vault_recovery_points.md
@@ -32,6 +32,7 @@ This table depends on [aws_backup_vaults](aws_backup_vaults.md).
 |iam_role_arn|String|
 |index_status|String|
 |index_status_message|String|
+|initiation_date|Timestamp|
 |is_encrypted|Bool|
 |is_parent|Bool|
 |last_restore_time|Timestamp|

diff --git a/docs/tables/aws_dynamodb_tables.md b/docs/tables/aws_dynamodb_tables.md
@@ -28,6 +28,7 @@ The following tables depend on aws_dynamodb_tables:
 |deletion_protection_enabled|Bool|
 |global_secondary_indexes|JSON|
 |global_table_version|String|
+|global_table_witnesses|JSON|
 |item_count|Int|
 |key_schema|JSON|
 |latest_stream_arn|String|

diff --git a/docs/tables/aws_ec2_eips.md b/docs/tables/aws_ec2_eips.md
@@ -31,4 +31,5 @@ The primary key for this table is **_cq_id**.
 |public_ip|String|
 |public_ipv4_pool|String|
 |service_managed|String|
+|subnet_id|String|
 |tags|JSON|
diff --git a/docs/tables/aws_ec2_images.md b/docs/tables/aws_ec2_images.md
@@ -25,6 +25,7 @@ The primary key for this table is **arn**.
 |deregistration_protection|String|
 |description|String|
 |ena_support|Bool|
+|free_tier_eligible|Bool|
 |hypervisor|String|
 |image_allowed|Bool|
 |image_id|String|