From d0611ad32beecef7f568a0e0ea7a5737009a87d4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 10:47:10 -0500 Subject: [PATCH 001/133] generate/servicepackage: Require type annotation value for 'FrameworkResource'. --- internal/generate/servicepackage/main.go | 49 ++++++++++++++++-------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/internal/generate/servicepackage/main.go b/internal/generate/servicepackage/main.go index aa3381b19cf..988f5e99140 100644 --- a/internal/generate/servicepackage/main.go +++ b/internal/generate/servicepackage/main.go @@ -244,35 +244,48 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) { switch annotationName := m[1]; annotationName { case "EphemeralResource": + if len(args.Positional) == 0 { + v.errs = append(v.errs, fmt.Errorf("no type name: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) + continue + } + + if d.Name == "" { + v.errs = append(v.errs, fmt.Errorf("no friendly name: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) + continue + } + if slices.ContainsFunc(v.ephemeralResources, func(d ResourceDatum) bool { return d.FactoryName == v.functionName }) { v.errs = append(v.errs, fmt.Errorf("duplicate Ephemeral Resource: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) } else { v.ephemeralResources = append(v.ephemeralResources, d) } - + case "FrameworkDataSource": if d.Name == "" { - v.g.Errorf("%s missing name: %s.%s", annotationName, v.packageName, v.functionName) + v.errs = append(v.errs, fmt.Errorf("no friendly name: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) + continue } - case "FrameworkDataSource": + if slices.ContainsFunc(v.frameworkDataSources, func(d ResourceDatum) bool { return d.FactoryName == v.functionName }) { v.errs = append(v.errs, fmt.Errorf("duplicate Framework Data Source: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) } else { v.frameworkDataSources = append(v.frameworkDataSources, d) } + case "FrameworkResource": + if len(args.Positional) == 0 { + v.errs = append(v.errs, fmt.Errorf("no type name: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) + continue + } if d.Name == "" { - v.g.Errorf("%s missing name: %s.%s", annotationName, v.packageName, v.functionName) + v.errs = append(v.errs, fmt.Errorf("no friendly name: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) + continue } - case "FrameworkResource": + if slices.ContainsFunc(v.frameworkResources, func(d ResourceDatum) bool { return d.FactoryName == v.functionName }) { v.errs = append(v.errs, fmt.Errorf("duplicate Framework Resource: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) } else { v.frameworkResources = append(v.frameworkResources, d) } - - if d.Name == "" { - v.g.Errorf("%s missing name: %s.%s", annotationName, v.packageName, v.functionName) - } case "SDKDataSource": if len(args.Positional) == 0 { v.errs = append(v.errs, fmt.Errorf("no type name: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) @@ -281,15 +294,16 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) { typeName := args.Positional[0] + if d.Name == "" { + v.errs = append(v.errs, fmt.Errorf("no friendly name: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) + continue + } + if _, ok := v.sdkDataSources[typeName]; ok { v.errs = append(v.errs, fmt.Errorf("duplicate SDK Data Source (%s): %s", typeName, fmt.Sprintf("%s.%s", v.packageName, v.functionName))) } else { v.sdkDataSources[typeName] = d } - - if d.Name == "" { - v.g.Errorf("%s missing name: %s/%s", annotationName, v.packageName, typeName) - } case "SDKResource": if len(args.Positional) == 0 { v.errs = append(v.errs, fmt.Errorf("no type name: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) @@ -298,15 +312,16 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) { typeName := args.Positional[0] + if d.Name == "" { + v.errs = append(v.errs, fmt.Errorf("no friendly name: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) + continue + } + if _, ok := v.sdkResources[typeName]; ok { v.errs = append(v.errs, fmt.Errorf("duplicate SDK Resource (%s): %s", typeName, fmt.Sprintf("%s.%s", v.packageName, v.functionName))) } else { v.sdkResources[typeName] = d } - - if d.Name == "" { - v.g.Errorf("%s missing name: %s/%s", annotationName, v.packageName, typeName) - } case "Tags": // Handled above. case "Testing": From f6334e720ae59ffb995a49ac750cb5299f1452e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:48 -0500 Subject: [PATCH 002/133] Adding type annotation values for 'FrameworkResource' - auditmanager. --- internal/service/auditmanager/assessment.go | 2 +- internal/service/auditmanager/control.go | 2 +- internal/service/auditmanager/framework.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/auditmanager/assessment.go b/internal/service/auditmanager/assessment.go index 459438b54d6..ff75a96aa57 100644 --- a/internal/service/auditmanager/assessment.go +++ b/internal/service/auditmanager/assessment.go @@ -36,7 +36,7 @@ import ( const iamPropagationTimeout = 2 * time.Minute -// @FrameworkResource(name="Assessment") +// @FrameworkResource("aws_auditmanager_assessment", name="Assessment") // @Tags(identifierAttribute="arn") func newResourceAssessment(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceAssessment{}, nil diff --git a/internal/service/auditmanager/control.go b/internal/service/auditmanager/control.go index 2204efea5ab..1e8dee50714 100644 --- a/internal/service/auditmanager/control.go +++ b/internal/service/auditmanager/control.go @@ -31,7 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Control") +// @FrameworkResource("aws_auditmanager_control", name="Control") // @Tags(identifierAttribute="arn") func newResourceControl(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceControl{}, nil diff --git a/internal/service/auditmanager/framework.go b/internal/service/auditmanager/framework.go index bd15eca4358..cf3de94d80a 100644 --- a/internal/service/auditmanager/framework.go +++ b/internal/service/auditmanager/framework.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Framework") +// @FrameworkResource("aws_auditmanager_framework", name="Framework") // @Tags(identifierAttribute="arn") func newResourceFramework(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceFramework{}, nil From 88251cb706678ab80356776e73857a27cad7d843 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:49 -0500 Subject: [PATCH 003/133] Adding type annotation values for 'FrameworkResource' - bedrockagent. --- internal/service/bedrockagent/agent.go | 2 +- internal/service/bedrockagent/agent_action_group.go | 2 +- internal/service/bedrockagent/agent_alias.go | 2 +- .../service/bedrockagent/agent_knowledge_base_association.go | 2 +- internal/service/bedrockagent/data_source.go | 2 +- internal/service/bedrockagent/knowledge_base.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/bedrockagent/agent.go b/internal/service/bedrockagent/agent.go index 723a946fd55..e74f1b13047 100644 --- a/internal/service/bedrockagent/agent.go +++ b/internal/service/bedrockagent/agent.go @@ -43,7 +43,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Agent") +// @FrameworkResource("aws_bedrockagent_agent", name="Agent") // @Tags(identifierAttribute="agent_arn") func newAgentResource(context.Context) (resource.ResourceWithConfigure, error) { r := &agentResource{} diff --git a/internal/service/bedrockagent/agent_action_group.go b/internal/service/bedrockagent/agent_action_group.go index e0d63746805..4bf5164a51a 100644 --- a/internal/service/bedrockagent/agent_action_group.go +++ b/internal/service/bedrockagent/agent_action_group.go @@ -36,7 +36,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Agent Action Group") +// @FrameworkResource("aws_bedrockagent_agent_action_group", name="Agent Action Group") func newAgentActionGroupResource(context.Context) (resource.ResourceWithConfigure, error) { r := &agentActionGroupResource{} diff --git a/internal/service/bedrockagent/agent_alias.go b/internal/service/bedrockagent/agent_alias.go index 2572b9419c9..1cf0f1f63b5 100644 --- a/internal/service/bedrockagent/agent_alias.go +++ b/internal/service/bedrockagent/agent_alias.go @@ -36,7 +36,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Agent Alias") +// @FrameworkResource("aws_bedrockagent_agent_alias", name="Agent Alias") // @Tags(identifierAttribute="agent_alias_arn") func newAgentAliasResource(context.Context) (resource.ResourceWithConfigure, error) { r := &agentAliasResource{} diff --git a/internal/service/bedrockagent/agent_knowledge_base_association.go b/internal/service/bedrockagent/agent_knowledge_base_association.go index 61e23081829..3f44f74de3f 100644 --- a/internal/service/bedrockagent/agent_knowledge_base_association.go +++ b/internal/service/bedrockagent/agent_knowledge_base_association.go @@ -31,7 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Agent Knowledge Base Association") +// @FrameworkResource("aws_bedrockagent_agent_knowledge_base_association", name="Agent Knowledge Base Association") func newAgentKnowledgeBaseAssociationResource(context.Context) (resource.ResourceWithConfigure, error) { r := &agentKnowledgeBaseAssociationResource{} diff --git a/internal/service/bedrockagent/data_source.go b/internal/service/bedrockagent/data_source.go index e03ba47c332..adc1c16767b 100644 --- a/internal/service/bedrockagent/data_source.go +++ b/internal/service/bedrockagent/data_source.go @@ -50,7 +50,7 @@ const ( semanticBreakpointPercentileThresholdMax = 99 ) -// @FrameworkResource(name="Data Source") +// @FrameworkResource("aws_bedrockagent_data_source", name="Data Source") func newDataSourceResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &dataSourceResource{} diff --git a/internal/service/bedrockagent/knowledge_base.go b/internal/service/bedrockagent/knowledge_base.go index b243a08bca4..8cff6125c2d 100644 --- a/internal/service/bedrockagent/knowledge_base.go +++ b/internal/service/bedrockagent/knowledge_base.go @@ -36,7 +36,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Knowledge Base") +// @FrameworkResource("aws_bedrockagent_knowledge_base", name="Knowledge Base") // @Tags(identifierAttribute="arn") func newKnowledgeBaseResource(context.Context) (resource.ResourceWithConfigure, error) { r := &knowledgeBaseResource{} From 372e4c5243a48943e5ff5f772c3801fb95c91feb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:49 -0500 Subject: [PATCH 004/133] Adding type annotation values for 'FrameworkResource' - chatbot. --- internal/service/chatbot/slack_channel_configuration.go | 2 +- internal/service/chatbot/teams_channel_configuration.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/chatbot/slack_channel_configuration.go b/internal/service/chatbot/slack_channel_configuration.go index a878965774f..3ea27136bcf 100644 --- a/internal/service/chatbot/slack_channel_configuration.go +++ b/internal/service/chatbot/slack_channel_configuration.go @@ -36,7 +36,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Slack Channel Configuration") +// @FrameworkResource("aws_chatbot_slack_channel_configuration", name="Slack Channel Configuration") // @Tags(identifierAttribute="chat_configuration_arn") func newSlackChannelConfigurationResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &slackChannelConfigurationResource{} diff --git a/internal/service/chatbot/teams_channel_configuration.go b/internal/service/chatbot/teams_channel_configuration.go index c472864a124..16c81c206e0 100644 --- a/internal/service/chatbot/teams_channel_configuration.go +++ b/internal/service/chatbot/teams_channel_configuration.go @@ -35,7 +35,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Teams Channel Configuration") +// @FrameworkResource("aws_chatbot_teams_channel_configuration", name="Teams Channel Configuration") // @Tags(identifierAttribute="chat_configuration_arn") func newTeamsChannelConfigurationResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &teamsChannelConfigurationResource{} From 30a1ae823bf56e40726adc219026014e84cb3781 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:50 -0500 Subject: [PATCH 005/133] Adding type annotation values for 'FrameworkResource' - cloudfront. --- internal/service/cloudfront/continuous_deployment_policy.go | 2 +- internal/service/cloudfront/key_value_store.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/cloudfront/continuous_deployment_policy.go b/internal/service/cloudfront/continuous_deployment_policy.go index 0a31a320dea..8984da7cb2a 100644 --- a/internal/service/cloudfront/continuous_deployment_policy.go +++ b/internal/service/cloudfront/continuous_deployment_policy.go @@ -26,7 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Continuous Deployment Policy") +// @FrameworkResource("aws_cloudfront_continuous_deployment_policy", name="Continuous Deployment Policy") func newContinuousDeploymentPolicyResource(context.Context) (resource.ResourceWithConfigure, error) { return &continuousDeploymentPolicyResource{}, nil } diff --git a/internal/service/cloudfront/key_value_store.go b/internal/service/cloudfront/key_value_store.go index 43bc3f56bd6..ce9ad49f204 100644 --- a/internal/service/cloudfront/key_value_store.go +++ b/internal/service/cloudfront/key_value_store.go @@ -31,7 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Key Value Store") +// @FrameworkResource("aws_cloudfront_key_value_store", name="Key Value Store") func newKeyValueStoreResource(context.Context) (resource.ResourceWithConfigure, error) { r := &keyValueStoreResource{} From 0d0666f22b454b1cf56899e61fd5f4e3c0eb7443 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:50 -0500 Subject: [PATCH 006/133] Adding type annotation values for 'FrameworkResource' - cloudfrontkeyvaluestore. --- internal/service/cloudfrontkeyvaluestore/key.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/cloudfrontkeyvaluestore/key.go b/internal/service/cloudfrontkeyvaluestore/key.go index 6518d20a0b8..6f0b4ff0bf8 100644 --- a/internal/service/cloudfrontkeyvaluestore/key.go +++ b/internal/service/cloudfrontkeyvaluestore/key.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Key") +// @FrameworkResource("aws_cloudfrontkeyvaluestore_key", name="Key") func newKeyResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &keyResource{} From 0d7791a5682a686d4f76393539cb6d11ca1a305a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:51 -0500 Subject: [PATCH 007/133] Adding type annotation values for 'FrameworkResource' - codeconnections. --- internal/service/codeconnections/connection.go | 3 +-- internal/service/codeconnections/host.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/service/codeconnections/connection.go b/internal/service/codeconnections/connection.go index 1beba6fd2c3..d232de6a8da 100644 --- a/internal/service/codeconnections/connection.go +++ b/internal/service/codeconnections/connection.go @@ -33,8 +33,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// Function annotations are used for resource registration to the Provider. DO NOT EDIT. -// @FrameworkResource(name="Connection") +// @FrameworkResource("aws_codeconnections_connection", name="Connection") // @Tags(identifierAttribute="arn") func newConnectionResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &connectionResource{} diff --git a/internal/service/codeconnections/host.go b/internal/service/codeconnections/host.go index 2f086c0465b..4a86607bdc0 100644 --- a/internal/service/codeconnections/host.go +++ b/internal/service/codeconnections/host.go @@ -32,8 +32,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// Function annotations are used for resource registration to the Provider. DO NOT EDIT. -// @FrameworkResource(name="Host") +// @FrameworkResource("aws_codeconnections_host", name="Host") // @Tags(identifierAttribute="arn") func newHostResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &hostResource{} From 0e08cc89b1dbb9ee40908a11c4b1c4cbfc21910c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:51 -0500 Subject: [PATCH 008/133] Adding type annotation values for 'FrameworkResource' - codeguruprofiler. --- internal/service/codeguruprofiler/profiling_group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/codeguruprofiler/profiling_group.go b/internal/service/codeguruprofiler/profiling_group.go index 6e8d8de302c..d50d423d655 100644 --- a/internal/service/codeguruprofiler/profiling_group.go +++ b/internal/service/codeguruprofiler/profiling_group.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Profiling Group") +// @FrameworkResource("aws_codeguruprofiler_profiling_group", name="Profiling Group") // @Tags(identifierAttribute="arn") func newResourceProfilingGroup(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceProfilingGroup{} From cb89b6986bffe10b3da412ef1d079b206bc28ccf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:52 -0500 Subject: [PATCH 009/133] Adding type annotation values for 'FrameworkResource' - computeoptimizer. --- internal/service/computeoptimizer/enrollment_status.go | 2 +- internal/service/computeoptimizer/recommendation_preferences.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/computeoptimizer/enrollment_status.go b/internal/service/computeoptimizer/enrollment_status.go index 8c8d79e6f04..68f4ca274fa 100644 --- a/internal/service/computeoptimizer/enrollment_status.go +++ b/internal/service/computeoptimizer/enrollment_status.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Enrollment Status") +// @FrameworkResource("aws_computeoptimizer_enrollment_status", name="Enrollment Status") func newEnrollmentStatusResource(context.Context) (resource.ResourceWithConfigure, error) { r := &enrollmentStatusResource{} diff --git a/internal/service/computeoptimizer/recommendation_preferences.go b/internal/service/computeoptimizer/recommendation_preferences.go index dc1d71dfd45..2ae57f676ab 100644 --- a/internal/service/computeoptimizer/recommendation_preferences.go +++ b/internal/service/computeoptimizer/recommendation_preferences.go @@ -35,7 +35,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Recommendation Preferences") +// @FrameworkResource("aws_computeoptimizer_recommendation_preferences", name="Recommendation Preferences") func newRecommendationPreferencesResource(context.Context) (resource.ResourceWithConfigure, error) { r := &recommendationPreferencesResource{} From b2f80ef7e3bdc1a0099e2c884b112cc9a301ab22 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:52 -0500 Subject: [PATCH 010/133] Adding type annotation values for 'FrameworkResource' - configservice. --- internal/service/configservice/retention_configuration.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/configservice/retention_configuration.go b/internal/service/configservice/retention_configuration.go index 4b4110816dd..1955c26ef6e 100644 --- a/internal/service/configservice/retention_configuration.go +++ b/internal/service/configservice/retention_configuration.go @@ -26,7 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Retention Configuration") +// @FrameworkResource("aws_config_retention_configuration", name="Retention Configuration") func newRetentionConfigurationResource(context.Context) (resource.ResourceWithConfigure, error) { return &retentionConfigurationResource{}, nil } From 5e3f06cce7c1cff4d92e4206264d480282faa861 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:53 -0500 Subject: [PATCH 011/133] Adding type annotation values for 'FrameworkResource' - costoptimizationhub. --- internal/service/costoptimizationhub/enrollment_status.go | 2 +- internal/service/costoptimizationhub/preferences.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/costoptimizationhub/enrollment_status.go b/internal/service/costoptimizationhub/enrollment_status.go index 656fb729dc4..39ceebd174f 100644 --- a/internal/service/costoptimizationhub/enrollment_status.go +++ b/internal/service/costoptimizationhub/enrollment_status.go @@ -25,7 +25,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Enrollment Status") +// @FrameworkResource("aws_costoptimizationhub_enrollment_status", name="Enrollment Status") func newResourceEnrollmentStatus(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceEnrollmentStatus{} diff --git a/internal/service/costoptimizationhub/preferences.go b/internal/service/costoptimizationhub/preferences.go index 738c236ebe3..d529b93066d 100644 --- a/internal/service/costoptimizationhub/preferences.go +++ b/internal/service/costoptimizationhub/preferences.go @@ -26,7 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Preferences") +// @FrameworkResource("aws_costoptimizationhub_preferences", name="Preferences") func newResourcePreferences(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourcePreferences{} From 7d341fa442e663a9e8f4b7faa745d5776a64c683 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:54 -0500 Subject: [PATCH 012/133] Adding type annotation values for 'FrameworkResource' - datazone. --- internal/service/datazone/domain.go | 3 +-- .../service/datazone/environment_blueprint_configuration.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/service/datazone/domain.go b/internal/service/datazone/domain.go index 4331ce43967..44090d39806 100644 --- a/internal/service/datazone/domain.go +++ b/internal/service/datazone/domain.go @@ -37,8 +37,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// Function annotations are used for resource registration to the Provider. DO NOT EDIT. -// @FrameworkResource(name="Domain") +// @FrameworkResource( "aws_datazone_domain", name="Domain") // @Tags(identifierAttribute="arn") func newResourceDomain(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceDomain{} diff --git a/internal/service/datazone/environment_blueprint_configuration.go b/internal/service/datazone/environment_blueprint_configuration.go index 5b92a6b240e..41b7b4e138e 100644 --- a/internal/service/datazone/environment_blueprint_configuration.go +++ b/internal/service/datazone/environment_blueprint_configuration.go @@ -29,7 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Environment Blueprint Configuration") +// @FrameworkResource("aws_datazone_environment_blueprint_configuration", name="Environment Blueprint Configuration") func newResourceEnvironmentBlueprintConfiguration(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceEnvironmentBlueprintConfiguration{} return r, nil From 3fda2a04389d6399f25c53e5df01c91c1d542e53 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:54 -0500 Subject: [PATCH 013/133] Adding type annotation values for 'FrameworkResource' - devopsguru. --- internal/service/devopsguru/event_sources_config.go | 2 +- internal/service/devopsguru/notification_channel.go | 2 +- internal/service/devopsguru/resource_collection.go | 2 +- internal/service/devopsguru/service_integration.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/devopsguru/event_sources_config.go b/internal/service/devopsguru/event_sources_config.go index e459d608b71..40187a2b185 100644 --- a/internal/service/devopsguru/event_sources_config.go +++ b/internal/service/devopsguru/event_sources_config.go @@ -24,7 +24,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Event Sources Config") +// @FrameworkResource("aws_devopsguru_event_sources_config", name="Event Sources Config") func newResourceEventSourcesConfig(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceEventSourcesConfig{}, nil } diff --git a/internal/service/devopsguru/notification_channel.go b/internal/service/devopsguru/notification_channel.go index a5962a19641..f48a5457c85 100644 --- a/internal/service/devopsguru/notification_channel.go +++ b/internal/service/devopsguru/notification_channel.go @@ -31,7 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Notification Channel") +// @FrameworkResource("aws_devopsguru_notification_channel", name="Notification Channel") func newResourceNotificationChannel(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceNotificationChannel{}, nil } diff --git a/internal/service/devopsguru/resource_collection.go b/internal/service/devopsguru/resource_collection.go index d9edffd7680..0e31f0ec398 100644 --- a/internal/service/devopsguru/resource_collection.go +++ b/internal/service/devopsguru/resource_collection.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Resource Collection") +// @FrameworkResource("aws_devopsguru_resource_collection", name="Resource Collection") func newResourceResourceCollection(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceResourceCollection{}, nil } diff --git a/internal/service/devopsguru/service_integration.go b/internal/service/devopsguru/service_integration.go index 0fb4711a346..bfa01c3f1c2 100644 --- a/internal/service/devopsguru/service_integration.go +++ b/internal/service/devopsguru/service_integration.go @@ -25,7 +25,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Service Integration") +// @FrameworkResource("aws_devopsguru_service_integration", name="Service Integration") func newResourceServiceIntegration(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceServiceIntegration{}, nil } From 94b50eace592c80c7ffa4385656bec0fe88d6eda Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:55 -0500 Subject: [PATCH 014/133] Adding type annotation values for 'FrameworkResource' - docdbelastic. --- internal/service/docdbelastic/cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/docdbelastic/cluster.go b/internal/service/docdbelastic/cluster.go index a8cdeec386a..6e2ee93589a 100644 --- a/internal/service/docdbelastic/cluster.go +++ b/internal/service/docdbelastic/cluster.go @@ -37,7 +37,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Cluster") +// @FrameworkResource("aws_docdbelastic_cluster", name="Cluster") // @Tags(identifierAttribute="arn") func newResourceCluster(context.Context) (resource.ResourceWithConfigure, error) { r := &resourceCluster{} From f730eb3f76c9853caecf79f925559b5551db48ac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:55 -0500 Subject: [PATCH 015/133] Adding type annotation values for 'FrameworkResource' - ds. --- internal/service/ds/trust.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ds/trust.go b/internal/service/ds/trust.go index f591b6947aa..1b0ccb295bf 100644 --- a/internal/service/ds/trust.go +++ b/internal/service/ds/trust.go @@ -38,7 +38,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Trust") +// @FrameworkResource("aws_directory_service_trust", name="Trust") func newTrustResource(_ context.Context) (resource.ResourceWithConfigure, error) { return &trustResource{}, nil } From dbda3e0df0d28f963c0e78590d8b1efa39573698 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:56 -0500 Subject: [PATCH 016/133] Adding type annotation values for 'FrameworkResource' - eks. --- internal/service/eks/pod_identity_association.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/eks/pod_identity_association.go b/internal/service/eks/pod_identity_association.go index ce583fa5c40..4e3b7c17436 100644 --- a/internal/service/eks/pod_identity_association.go +++ b/internal/service/eks/pod_identity_association.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Pod Identity Association") +// @FrameworkResource("aws_eks_pod_identity_association", name="Pod Identity Association") // @Tags(identifierAttribute="association_arn") func newPodIdentityAssociationResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &podIdentityAssociationResource{} From 977dda96ddc6056db6a436c2d27cab128d5f651f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:56 -0500 Subject: [PATCH 017/133] Adding type annotation values for 'FrameworkResource' - elasticache. --- internal/service/elasticache/serverless_cache.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elasticache/serverless_cache.go b/internal/service/elasticache/serverless_cache.go index bb7f36bf1ea..c1ffa7b5d09 100644 --- a/internal/service/elasticache/serverless_cache.go +++ b/internal/service/elasticache/serverless_cache.go @@ -37,7 +37,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Serverless Cache") +// @FrameworkResource("aws_elasticache_serverless_cache", name="Serverless Cache") // @Tags(identifierAttribute="arn") func newServerlessCacheResource(context.Context) (resource.ResourceWithConfigure, error) { r := &serverlessCacheResource{} From 195c6db7594c484f848ede362b681675bf57d781 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:58 -0500 Subject: [PATCH 018/133] Adding type annotation values for 'FrameworkResource' - globalaccelerator. --- internal/service/globalaccelerator/cross_account_attachment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/globalaccelerator/cross_account_attachment.go b/internal/service/globalaccelerator/cross_account_attachment.go index 2f9aef10f49..a921900f114 100644 --- a/internal/service/globalaccelerator/cross_account_attachment.go +++ b/internal/service/globalaccelerator/cross_account_attachment.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Cross-account Attachment") +// @FrameworkResource("aws_globalaccelerator_cross_account_attachment", name="Cross-account Attachment") // @Tags(identifierAttribute="id") func newCrossAccountAttachmentResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &crossAccountAttachmentResource{} From dd9c09a328c26ec2c89f037911895893bb9ff861 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:58 -0500 Subject: [PATCH 019/133] Adding type annotation values for 'FrameworkResource' - guardduty. --- internal/service/guardduty/malware_protection_plan.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/guardduty/malware_protection_plan.go b/internal/service/guardduty/malware_protection_plan.go index f7b9d00088a..2ab60027ddf 100644 --- a/internal/service/guardduty/malware_protection_plan.go +++ b/internal/service/guardduty/malware_protection_plan.go @@ -33,7 +33,7 @@ import ( const iamPropagationTimeout = 2 * time.Minute -// @FrameworkResource(name="Malware Protection Plan") +// @FrameworkResource("aws_guardduty_malware_protection_plan", name="Malware Protection Plan") // @Tags(identifierAttribute="arn") func newResourceMalwareProtectionPlan(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceMalwareProtectionPlan{} From 8ad54244be4c992ac3a9e504a5af07c8e7ee9763 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:33:59 -0500 Subject: [PATCH 020/133] Adding type annotation values for 'FrameworkResource' - imagebuilder. --- internal/service/imagebuilder/lifecycle_policy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/imagebuilder/lifecycle_policy.go b/internal/service/imagebuilder/lifecycle_policy.go index de77993cb4f..16a7ab6edc6 100644 --- a/internal/service/imagebuilder/lifecycle_policy.go +++ b/internal/service/imagebuilder/lifecycle_policy.go @@ -34,7 +34,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Lifecycle Policy") +// @FrameworkResource("aws_imagebuilder_lifecycle_policy", name="Lifecycle Policy") // @Tags(identifierAttribute="id") func newLifecyclePolicyResource(_ context.Context) (resource.ResourceWithConfigure, error) { return &lifecyclePolicyResource{}, nil From eb5399e83b840b1b64ae7d927ff6559cfca04332 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:00 -0500 Subject: [PATCH 021/133] Adding type annotation values for 'FrameworkResource' - kafka. --- internal/service/kafka/single_scram_secret_association.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/kafka/single_scram_secret_association.go b/internal/service/kafka/single_scram_secret_association.go index 964db817708..ad49d648c1f 100644 --- a/internal/service/kafka/single_scram_secret_association.go +++ b/internal/service/kafka/single_scram_secret_association.go @@ -25,7 +25,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Single SCRAM Secret Association") +// @FrameworkResource("aws_msk_single_scram_secret_association", name="Single SCRAM Secret Association") func newSingleSCRAMSecretAssociationResource(context.Context) (resource.ResourceWithConfigure, error) { r := &singleSCRAMSecretAssociationResource{} From 5c573cd0f39ba7f0584526e9fe8d6ef0d795a8ce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:00 -0500 Subject: [PATCH 022/133] Adding type annotation values for 'FrameworkResource' - kinesis. --- internal/service/kinesis/resource_policy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/kinesis/resource_policy.go b/internal/service/kinesis/resource_policy.go index 0e701950622..f9f3a2fb939 100644 --- a/internal/service/kinesis/resource_policy.go +++ b/internal/service/kinesis/resource_policy.go @@ -26,7 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Resource Policy") +// @FrameworkResource("aws_kinesis_resource_policy", name="Resource Policy") func newResourcePolicyResource(context.Context) (resource.ResourceWithConfigure, error) { r := &resourcePolicyResource{} From 12e57f2214a24e7840ff6f36f7239eb90dd5e2b5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:01 -0500 Subject: [PATCH 023/133] Adding type annotation values for 'FrameworkResource' - lakeformation. --- internal/service/lakeformation/data_cells_filter.go | 2 +- internal/service/lakeformation/resource_lf_tag.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/lakeformation/data_cells_filter.go b/internal/service/lakeformation/data_cells_filter.go index e558f352a40..7d4b526ec9a 100644 --- a/internal/service/lakeformation/data_cells_filter.go +++ b/internal/service/lakeformation/data_cells_filter.go @@ -34,7 +34,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Data Cells Filter") +// @FrameworkResource("aws_lakeformation_data_cells_filter", name="Data Cells Filter") func newResourceDataCellsFilter(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceDataCellsFilter{} r.SetDefaultCreateTimeout(2 * time.Minute) diff --git a/internal/service/lakeformation/resource_lf_tag.go b/internal/service/lakeformation/resource_lf_tag.go index 53d8022b97d..21ec9f28694 100644 --- a/internal/service/lakeformation/resource_lf_tag.go +++ b/internal/service/lakeformation/resource_lf_tag.go @@ -42,7 +42,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Resource LF Tag") +// @FrameworkResource("aws_lakeformation_resource_lf_tag", name="Resource LF Tag") func newResourceResourceLFTag(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceResourceLFTag{} r.SetDefaultCreateTimeout(20 * time.Minute) From 447577f272a8edd0e297550da18fde04aad8a443 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:01 -0500 Subject: [PATCH 024/133] Adding type annotation values for 'FrameworkResource' - lexv2models. --- internal/service/lexv2models/bot.go | 2 +- internal/service/lexv2models/bot_locale.go | 2 +- internal/service/lexv2models/bot_version.go | 2 +- internal/service/lexv2models/intent.go | 2 +- internal/service/lexv2models/slot.go | 2 +- internal/service/lexv2models/slot_type.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lexv2models/bot.go b/internal/service/lexv2models/bot.go index 75e5b7f1b9e..6df78b45d4b 100644 --- a/internal/service/lexv2models/bot.go +++ b/internal/service/lexv2models/bot.go @@ -35,7 +35,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Bot") +// @FrameworkResource("aws_lexv2models_bot", name="Bot") // @Tags(identifierAttribute="arn") func newResourceBot(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceBot{} diff --git a/internal/service/lexv2models/bot_locale.go b/internal/service/lexv2models/bot_locale.go index 21940b1b8c9..29b2e7bd9c4 100644 --- a/internal/service/lexv2models/bot_locale.go +++ b/internal/service/lexv2models/bot_locale.go @@ -33,7 +33,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Bot Locale") +// @FrameworkResource("aws_lexv2models_bot_locale", name="Bot Locale") func newResourceBotLocale(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceBotLocale{} diff --git a/internal/service/lexv2models/bot_version.go b/internal/service/lexv2models/bot_version.go index 06f58cc73ba..415e76045e3 100644 --- a/internal/service/lexv2models/bot_version.go +++ b/internal/service/lexv2models/bot_version.go @@ -31,7 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Bot Version") +// @FrameworkResource("aws_lexv2models_bot_version", name="Bot Version") func newResourceBotVersion(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceBotVersion{} diff --git a/internal/service/lexv2models/intent.go b/internal/service/lexv2models/intent.go index 87630293a72..6fab5695a06 100644 --- a/internal/service/lexv2models/intent.go +++ b/internal/service/lexv2models/intent.go @@ -36,7 +36,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Intent") +// @FrameworkResource("aws_lexv2models_intent", name="Intent") func newResourceIntent(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceIntent{} diff --git a/internal/service/lexv2models/slot.go b/internal/service/lexv2models/slot.go index 1bd3b539cf5..891aca65fb6 100644 --- a/internal/service/lexv2models/slot.go +++ b/internal/service/lexv2models/slot.go @@ -35,7 +35,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Slot") +// @FrameworkResource("aws_lexv2models_slot", name="Slot") func newResourceSlot(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceSlot{} diff --git a/internal/service/lexv2models/slot_type.go b/internal/service/lexv2models/slot_type.go index e420d1b6993..14fa0254d6a 100644 --- a/internal/service/lexv2models/slot_type.go +++ b/internal/service/lexv2models/slot_type.go @@ -31,7 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Slot Type") +// @FrameworkResource("aws_lexv2models_slot_type", name="Slot Type") func newResourceSlotType(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceSlotType{} From cc00c226f889a3a7ad10b26a155f066254bc3eb2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:03 -0500 Subject: [PATCH 025/133] Adding type annotation values for 'FrameworkResource' - networkfirewall. --- .../service/networkfirewall/tls_inspection_configuration.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/networkfirewall/tls_inspection_configuration.go b/internal/service/networkfirewall/tls_inspection_configuration.go index 713684155c5..182d9491bc7 100644 --- a/internal/service/networkfirewall/tls_inspection_configuration.go +++ b/internal/service/networkfirewall/tls_inspection_configuration.go @@ -40,7 +40,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="TLS Inspection Configuration") +// @FrameworkResource("aws_networkfirewall_tls_inspection_configuration", name="TLS Inspection Configuration") // @Tags(identifierAttribute="arn") func newTLSInspectionConfigurationResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &tlsInspectionConfigurationResource{} From adfc369c2f42b43af78b1939d1e38a3b98d6837d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:04 -0500 Subject: [PATCH 026/133] Adding type annotation values for 'FrameworkResource' - networkmanager. --- internal/service/networkmanager/dx_gateway_attachment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/networkmanager/dx_gateway_attachment.go b/internal/service/networkmanager/dx_gateway_attachment.go index 508ce646c35..b22748f2d96 100644 --- a/internal/service/networkmanager/dx_gateway_attachment.go +++ b/internal/service/networkmanager/dx_gateway_attachment.go @@ -32,7 +32,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Direct Connect Gateway Attachment") +// @FrameworkResource("aws_networkmanager_dx_gateway_attachment", name="Direct Connect Gateway Attachment") // @Tags(identifierAttribute="arn") func newDirectConnectGatewayAttachmentResource(context.Context) (resource.ResourceWithConfigure, error) { r := &directConnectGatewayAttachmentResource{} From a17b96cb013dd4ef53f40b5c0adb304e62ada12e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:04 -0500 Subject: [PATCH 027/133] Adding type annotation values for 'FrameworkResource' - opensearchserverless. --- internal/service/opensearchserverless/access_policy.go | 2 +- internal/service/opensearchserverless/collection.go | 2 +- internal/service/opensearchserverless/lifecycle_policy.go | 2 +- internal/service/opensearchserverless/security_config.go | 2 +- internal/service/opensearchserverless/security_policy.go | 2 +- internal/service/opensearchserverless/vpc_endpoint.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/opensearchserverless/access_policy.go b/internal/service/opensearchserverless/access_policy.go index cbe2eba04ca..9617de3624a 100644 --- a/internal/service/opensearchserverless/access_policy.go +++ b/internal/service/opensearchserverless/access_policy.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Access Policy) +// @FrameworkResource("aws_opensearchserverless_access_policy", name="Access Policy) func newResourceAccessPolicy(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceAccessPolicy{}, nil } diff --git a/internal/service/opensearchserverless/collection.go b/internal/service/opensearchserverless/collection.go index e2dfcda3c8e..6903b3ade4a 100644 --- a/internal/service/opensearchserverless/collection.go +++ b/internal/service/opensearchserverless/collection.go @@ -34,7 +34,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Collection") +// @FrameworkResource("aws_opensearchserverless_collection", name="Collection") // @Tags(identifierAttribute="arn") func newResourceCollection(_ context.Context) (resource.ResourceWithConfigure, error) { r := resourceCollection{} diff --git a/internal/service/opensearchserverless/lifecycle_policy.go b/internal/service/opensearchserverless/lifecycle_policy.go index dd8cf9dda58..f08a9dc6a4b 100644 --- a/internal/service/opensearchserverless/lifecycle_policy.go +++ b/internal/service/opensearchserverless/lifecycle_policy.go @@ -31,7 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Lifecycle Policy") +// @FrameworkResource("aws_opensearchserverless_lifecycle_policy", name="Lifecycle Policy") func newResourceLifecyclePolicy(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceLifecyclePolicy{}, nil } diff --git a/internal/service/opensearchserverless/security_config.go b/internal/service/opensearchserverless/security_config.go index d99319d7346..57536847d7e 100644 --- a/internal/service/opensearchserverless/security_config.go +++ b/internal/service/opensearchserverless/security_config.go @@ -34,7 +34,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Security Config") +// @FrameworkResource("aws_opensearchserverless_security_config", name="Security Config") func newResourceSecurityConfig(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceSecurityConfig{}, nil } diff --git a/internal/service/opensearchserverless/security_policy.go b/internal/service/opensearchserverless/security_policy.go index 5d54982bcd2..d655e6c2f11 100644 --- a/internal/service/opensearchserverless/security_policy.go +++ b/internal/service/opensearchserverless/security_policy.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Security Policy") +// @FrameworkResource("aws_opensearchserverless_security_policy", name="Security Policy") func newResourceSecurityPolicy(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceSecurityPolicy{}, nil } diff --git a/internal/service/opensearchserverless/vpc_endpoint.go b/internal/service/opensearchserverless/vpc_endpoint.go index a91a4c1b5c7..5417bf4c8da 100644 --- a/internal/service/opensearchserverless/vpc_endpoint.go +++ b/internal/service/opensearchserverless/vpc_endpoint.go @@ -35,7 +35,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="VPC Endpoint") +// @FrameworkResource("aws_opensearchserverless_vpc_endpoint", name="VPC Endpoint") func newVPCEndpointResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := vpcEndpointResource{} From 7311f4626e1473f488e5f84a77247ee92a3a1ebb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:04 -0500 Subject: [PATCH 028/133] Adding type annotation values for 'FrameworkResource' - osis. --- internal/service/osis/pipeline.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/osis/pipeline.go b/internal/service/osis/pipeline.go index 38c3e79eeed..a2d9a7c721b 100644 --- a/internal/service/osis/pipeline.go +++ b/internal/service/osis/pipeline.go @@ -37,7 +37,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Pipeline") +// @FrameworkResource("aws_osis_pipeline", name="Pipeline") // @Tags(identifierAttribute="pipeline_arn") func newPipelineResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &pipelineResource{} From 2b8e42dd914f3d0367a2188a8bf8177802672935 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:06 -0500 Subject: [PATCH 029/133] Adding type annotation values for 'FrameworkResource' - redshift. --- internal/service/redshift/data_share_authorization.go | 2 +- internal/service/redshift/data_share_consumer_association.go | 2 +- internal/service/redshift/logging.go | 2 +- internal/service/redshift/snapshot_copy.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/redshift/data_share_authorization.go b/internal/service/redshift/data_share_authorization.go index ac2f13a9062..c9a1b5a7632 100644 --- a/internal/service/redshift/data_share_authorization.go +++ b/internal/service/redshift/data_share_authorization.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Data Share Authorization") +// @FrameworkResource("aws_redshift_data_share_authorization", name="Data Share Authorization") func newResourceDataShareAuthorization(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceDataShareAuthorization{}, nil } diff --git a/internal/service/redshift/data_share_consumer_association.go b/internal/service/redshift/data_share_consumer_association.go index 0b924d417f8..f6ccb08bade 100644 --- a/internal/service/redshift/data_share_consumer_association.go +++ b/internal/service/redshift/data_share_consumer_association.go @@ -31,7 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Data Share Consumer Association") +// @FrameworkResource("aws_redshift_data_share_consumer_association", name="Data Share Consumer Association") func newResourceDataShareConsumerAssociation(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceDataShareConsumerAssociation{}, nil } diff --git a/internal/service/redshift/logging.go b/internal/service/redshift/logging.go index dbb94a28ba4..c4c5e555477 100644 --- a/internal/service/redshift/logging.go +++ b/internal/service/redshift/logging.go @@ -29,7 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Logging") +// @FrameworkResource("aws_redshift_logging", name="Logging") func newResourceLogging(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceLogging{}, nil } diff --git a/internal/service/redshift/snapshot_copy.go b/internal/service/redshift/snapshot_copy.go index b15583d375c..22e44ec978d 100644 --- a/internal/service/redshift/snapshot_copy.go +++ b/internal/service/redshift/snapshot_copy.go @@ -26,7 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Snapshot Copy") +// @FrameworkResource("aws_redshift_snapshot_copy", name="Snapshot Copy") func newResourceSnapshotCopy(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceSnapshotCopy{}, nil } From 1663bb7ab18bc110aa7ead47f6c47ecbc3967a0a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:06 -0500 Subject: [PATCH 030/133] Adding type annotation values for 'FrameworkResource' - redshiftserverless. --- .../service/redshiftserverless/custom_domain_association.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/redshiftserverless/custom_domain_association.go b/internal/service/redshiftserverless/custom_domain_association.go index 0b8d5a7715d..4e3334a570a 100644 --- a/internal/service/redshiftserverless/custom_domain_association.go +++ b/internal/service/redshiftserverless/custom_domain_association.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Custom Domain Association") +// @FrameworkResource("aws_redshiftserverless_custom_domain_association", name="Custom Domain Association") func newCustomDomainAssociationResource(context.Context) (resource.ResourceWithConfigure, error) { r := &customDomainAssociationResource{} From b7e728ba1f81f2ff05ff9b329758f3388ebbfa7d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:06 -0500 Subject: [PATCH 031/133] Adding type annotation values for 'FrameworkResource' - rekognition. --- internal/service/rekognition/collection.go | 2 +- internal/service/rekognition/project.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/rekognition/collection.go b/internal/service/rekognition/collection.go index a9bb3bb3278..b1a2600287b 100644 --- a/internal/service/rekognition/collection.go +++ b/internal/service/rekognition/collection.go @@ -29,7 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Collection") +// @FrameworkResource("aws_rekognition_collection", name="Collection") // @Tags(identifierAttribute="arn") func newResourceCollection(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceCollection{} diff --git a/internal/service/rekognition/project.go b/internal/service/rekognition/project.go index ef9fd0d3482..8c9e55d8ed6 100644 --- a/internal/service/rekognition/project.go +++ b/internal/service/rekognition/project.go @@ -27,7 +27,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Project") +// @FrameworkResource("aws_rekognition_project", name="Project") func newResourceProject(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceProject{} From 4b687b1e5f1bb7e703a94be9bf46f61b772d6f28 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:06 -0500 Subject: [PATCH 032/133] Adding type annotation values for 'FrameworkResource' - resourceexplorer2. --- internal/service/resourceexplorer2/index.go | 2 +- internal/service/resourceexplorer2/view.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/resourceexplorer2/index.go b/internal/service/resourceexplorer2/index.go index ff89093f18d..e02aa6a5e37 100644 --- a/internal/service/resourceexplorer2/index.go +++ b/internal/service/resourceexplorer2/index.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Index") +// @FrameworkResource("aws_resourceexplorer2_index", name="Index") // @Tags(identifierAttribute="id") func newIndexResource(context.Context) (resource.ResourceWithConfigure, error) { r := &indexResource{} diff --git a/internal/service/resourceexplorer2/view.go b/internal/service/resourceexplorer2/view.go index 414ac271d1c..3f65cc8e80e 100644 --- a/internal/service/resourceexplorer2/view.go +++ b/internal/service/resourceexplorer2/view.go @@ -36,7 +36,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="View") +// @FrameworkResource("aws_resourceexplorer2_view", name="View") // @Tags(identifierAttribute="id") func newViewResource(context.Context) (resource.ResourceWithConfigure, error) { return &viewResource{}, nil From f0857228d3f81332c1924280825858d888ef4f56 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:07 -0500 Subject: [PATCH 033/133] Adding type annotation values for 'FrameworkResource' - route53domains. --- internal/service/route53domains/delegation_signer_record.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/route53domains/delegation_signer_record.go b/internal/service/route53domains/delegation_signer_record.go index 11f84cdfb04..2f25f48ed29 100644 --- a/internal/service/route53domains/delegation_signer_record.go +++ b/internal/service/route53domains/delegation_signer_record.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Delegation Signer Record") +// @FrameworkResource("aws_route53domains_delegation_signer_record", name="Delegation Signer Record") func newDelegationSignerRecordResource(context.Context) (resource.ResourceWithConfigure, error) { r := &delegationSignerRecordResource{} From febf34c1aef9765ea011a795f7e00c01ea57ca64 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:08 -0500 Subject: [PATCH 034/133] Adding type annotation values for 'FrameworkResource' - s3control. --- internal/service/s3control/access_grant.go | 2 +- internal/service/s3control/access_grants_instance.go | 2 +- .../service/s3control/access_grants_instance_resource_policy.go | 2 +- internal/service/s3control/access_grants_location.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/s3control/access_grant.go b/internal/service/s3control/access_grant.go index 4f7e38caed8..061835462dd 100644 --- a/internal/service/s3control/access_grant.go +++ b/internal/service/s3control/access_grant.go @@ -32,7 +32,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Access Grant") +// @FrameworkResource("aws_s3control_access_grant", name="Access Grant") // @Tags func newAccessGrantResource(context.Context) (resource.ResourceWithConfigure, error) { r := &accessGrantResource{} diff --git a/internal/service/s3control/access_grants_instance.go b/internal/service/s3control/access_grants_instance.go index 24ce989902a..422fec72979 100644 --- a/internal/service/s3control/access_grants_instance.go +++ b/internal/service/s3control/access_grants_instance.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Access Grants Instance") +// @FrameworkResource("aws_s3control_access_grants_instance", name="Access Grants Instance") // @Tags func newAccessGrantsInstanceResource(context.Context) (resource.ResourceWithConfigure, error) { r := &accessGrantsInstanceResource{} diff --git a/internal/service/s3control/access_grants_instance_resource_policy.go b/internal/service/s3control/access_grants_instance_resource_policy.go index abc90bc3ddb..ac9b37348bb 100644 --- a/internal/service/s3control/access_grants_instance_resource_policy.go +++ b/internal/service/s3control/access_grants_instance_resource_policy.go @@ -27,7 +27,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Access Grants Instance Resource Policy") +// @FrameworkResource("aws_s3control_access_grants_instance_resource_policy", name="Access Grants Instance Resource Policy") func newAccessGrantsInstanceResourcePolicyResource(context.Context) (resource.ResourceWithConfigure, error) { r := &accessGrantsInstanceResourcePolicyResource{} diff --git a/internal/service/s3control/access_grants_location.go b/internal/service/s3control/access_grants_location.go index e29fdacea73..5b54e6d7438 100644 --- a/internal/service/s3control/access_grants_location.go +++ b/internal/service/s3control/access_grants_location.go @@ -29,7 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Access Grants Location") +// @FrameworkResource("aws_s3control_access_grants_location", name="Access Grants Location") // @Tags func newAccessGrantsLocationResource(context.Context) (resource.ResourceWithConfigure, error) { r := &accessGrantsLocationResource{} From 370e18d713d2f80e61e9b9c0edffe4a3a2adf7e7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:08 -0500 Subject: [PATCH 035/133] Adding type annotation values for 'FrameworkResource' - securityhub. --- internal/service/securityhub/automation_rule.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/securityhub/automation_rule.go b/internal/service/securityhub/automation_rule.go index 979de8b5bd9..81c6e43539f 100644 --- a/internal/service/securityhub/automation_rule.go +++ b/internal/service/securityhub/automation_rule.go @@ -32,7 +32,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Automation Rule") +// @FrameworkResource("aws_securityhub_automation_rule", name="Automation Rule") // @Tags(identifierAttribute="arn") func newAutomationRuleResource(_ context.Context) (resource.ResourceWithConfigure, error) { return &automationRuleResource{}, nil From 1adda256c2513cdcdde2e39d9a171a0b27a852f1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:08 -0500 Subject: [PATCH 036/133] Adding type annotation values for 'FrameworkResource' - securitylake. --- internal/service/securitylake/aws_log_source.go | 2 +- internal/service/securitylake/custom_log_source.go | 2 +- internal/service/securitylake/data_lake.go | 2 +- internal/service/securitylake/subscriber.go | 3 +-- internal/service/securitylake/subscriber_notification.go | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/internal/service/securitylake/aws_log_source.go b/internal/service/securitylake/aws_log_source.go index 8ff8103e89b..c705a26494b 100644 --- a/internal/service/securitylake/aws_log_source.go +++ b/internal/service/securitylake/aws_log_source.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="AWS Log Source") +// @FrameworkResource("aws_securitylake_aws_log_source", name="AWS Log Source") func newAWSLogSourceResource(context.Context) (resource.ResourceWithConfigure, error) { r := &awsLogSourceResource{} diff --git a/internal/service/securitylake/custom_log_source.go b/internal/service/securitylake/custom_log_source.go index ee59d06918e..b11c5231d02 100644 --- a/internal/service/securitylake/custom_log_source.go +++ b/internal/service/securitylake/custom_log_source.go @@ -31,7 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Custom Log Source") +// @FrameworkResource("aws_securitylake_custom_log_source", name="Custom Log Source") func newCustomLogSourceResource(context.Context) (resource.ResourceWithConfigure, error) { r := &customLogSourceResource{} diff --git a/internal/service/securitylake/data_lake.go b/internal/service/securitylake/data_lake.go index 43fdbadef0f..9a818dd6451 100644 --- a/internal/service/securitylake/data_lake.go +++ b/internal/service/securitylake/data_lake.go @@ -39,7 +39,7 @@ import ( const dataLakeMutexKey = "aws_securitylake_data_lake" -// @FrameworkResource(name="Data Lake") +// @FrameworkResource("aws_securitylake_data_lake", name="Data Lake") // @Tags(identifierAttribute="arn") func newDataLakeResource(context.Context) (resource.ResourceWithConfigure, error) { r := &dataLakeResource{} diff --git a/internal/service/securitylake/subscriber.go b/internal/service/securitylake/subscriber.go index a1bbedb7ebc..7390c88b582 100644 --- a/internal/service/securitylake/subscriber.go +++ b/internal/service/securitylake/subscriber.go @@ -39,8 +39,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// Function annotations are used for resource registration to the Provider. DO NOT EDIT. -// @FrameworkResource(name="Subscriber") +// @FrameworkResource("aws_securitylake_subscriber", name="Subscriber") // @Tags(identifierAttribute="arn") func newSubscriberResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &subscriberResource{} diff --git a/internal/service/securitylake/subscriber_notification.go b/internal/service/securitylake/subscriber_notification.go index 14c7f045c91..ed3e870e794 100644 --- a/internal/service/securitylake/subscriber_notification.go +++ b/internal/service/securitylake/subscriber_notification.go @@ -31,7 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Subscriber Notification") +// @FrameworkResource("aws_securitylake_subscriber_notification", name="Subscriber Notification") func newSubscriberNotificationResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &subscriberNotificationResource{} From 04c6428baf8067be47318c50f191d5f03b9877af Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:09 -0500 Subject: [PATCH 037/133] Adding type annotation values for 'FrameworkResource' - servicequotas. --- internal/service/servicequotas/template.go | 2 +- internal/service/servicequotas/template_association.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/servicequotas/template.go b/internal/service/servicequotas/template.go index c41eeedf831..39dbaae321d 100644 --- a/internal/service/servicequotas/template.go +++ b/internal/service/servicequotas/template.go @@ -27,7 +27,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Template") +// @FrameworkResource("aws_servicequotas_template", name="Template") func newResourceTemplate(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceTemplate{}, nil } diff --git a/internal/service/servicequotas/template_association.go b/internal/service/servicequotas/template_association.go index e62f15cd890..e1ee96d298d 100644 --- a/internal/service/servicequotas/template_association.go +++ b/internal/service/servicequotas/template_association.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Template Association") +// @FrameworkResource("aws_servicequotas_template_association", name="Template Association") func newResourceTemplateAssociation(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceTemplateAssociation{}, nil } From ff3b50883b59d417f56b2da89eaf4307987e6f39 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:09 -0500 Subject: [PATCH 038/133] Adding type annotation values for 'FrameworkResource' - shield. --- internal/service/shield/application_layer_automatic_response.go | 2 +- internal/service/shield/drt_access_log_bucket_association.go | 2 +- internal/service/shield/drt_access_role_arn_association.go | 2 +- internal/service/shield/proactive_engagement.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/shield/application_layer_automatic_response.go b/internal/service/shield/application_layer_automatic_response.go index c75c2e88e92..69b2b9c2393 100644 --- a/internal/service/shield/application_layer_automatic_response.go +++ b/internal/service/shield/application_layer_automatic_response.go @@ -42,7 +42,7 @@ func (applicationLayerAutomaticResponseAction) Values() []applicationLayerAutoma } } -// @FrameworkResource(name="Application Layer Automatic Response") +// @FrameworkResource("aws_shield_application_layer_automatic_response", name="Application Layer Automatic Response") func newApplicationLayerAutomaticResponseResource(context.Context) (resource.ResourceWithConfigure, error) { r := &applicationLayerAutomaticResponseResource{} diff --git a/internal/service/shield/drt_access_log_bucket_association.go b/internal/service/shield/drt_access_log_bucket_association.go index 872893e6224..b0213288db9 100644 --- a/internal/service/shield/drt_access_log_bucket_association.go +++ b/internal/service/shield/drt_access_log_bucket_association.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="DRT Log Bucket Association") +// @FrameworkResource("aws_shield_drt_access_log_bucket_association", name="DRT Log Bucket Association") func newDRTAccessLogBucketAssociationResource(context.Context) (resource.ResourceWithConfigure, error) { r := &drtAccessLogBucketAssociationResource{} diff --git a/internal/service/shield/drt_access_role_arn_association.go b/internal/service/shield/drt_access_role_arn_association.go index 17315a9fb5c..ff65a024e95 100644 --- a/internal/service/shield/drt_access_role_arn_association.go +++ b/internal/service/shield/drt_access_role_arn_association.go @@ -24,7 +24,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="DRT Role ARN Association") +// @FrameworkResource("aws_shield_drt_access_role_arn_association", name="DRT Role ARN Association") func newDRTAccessRoleARNAssociationResource(context.Context) (resource.ResourceWithConfigure, error) { r := &resourceDRTAccessRoleARNAssociation{} diff --git a/internal/service/shield/proactive_engagement.go b/internal/service/shield/proactive_engagement.go index 3e796bd539a..4e90ca94877 100644 --- a/internal/service/shield/proactive_engagement.go +++ b/internal/service/shield/proactive_engagement.go @@ -27,7 +27,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Proactive Engagement") +// @FrameworkResource("aws_shield_proactive_engagement", name="Proactive Engagement") func newProactiveEngagementResource(context.Context) (resource.ResourceWithConfigure, error) { return &proactiveEngagementResource{}, nil } From 49b624275d79e150557e16dfbc1ebf06fcd6d6e9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:11 -0500 Subject: [PATCH 039/133] Adding type annotation values for 'FrameworkResource' - ssoadmin. --- internal/service/ssoadmin/application.go | 2 +- internal/service/ssoadmin/application_access_scope.go | 2 +- internal/service/ssoadmin/application_assignment.go | 2 +- .../service/ssoadmin/application_assignment_configuration.go | 2 +- internal/service/ssoadmin/trusted_token_issuer.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/ssoadmin/application.go b/internal/service/ssoadmin/application.go index 63a02f6ed6b..5c2b3440a40 100644 --- a/internal/service/ssoadmin/application.go +++ b/internal/service/ssoadmin/application.go @@ -33,7 +33,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Application") +// @FrameworkResource("aws_ssoadmin_application", name="Application") // @Tags func newResourceApplication(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceApplication{}, nil diff --git a/internal/service/ssoadmin/application_access_scope.go b/internal/service/ssoadmin/application_access_scope.go index 18b8e754806..24c19d78024 100644 --- a/internal/service/ssoadmin/application_access_scope.go +++ b/internal/service/ssoadmin/application_access_scope.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Application Access Scope") +// @FrameworkResource("aws_ssoadmin_application_access_scope", name="Application Access Scope") func newResourceApplicationAccessScope(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceApplicationAccessScope{}, nil } diff --git a/internal/service/ssoadmin/application_assignment.go b/internal/service/ssoadmin/application_assignment.go index 32428a54080..ca95615f82c 100644 --- a/internal/service/ssoadmin/application_assignment.go +++ b/internal/service/ssoadmin/application_assignment.go @@ -27,7 +27,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Application Assignment") +// @FrameworkResource("aws_ssoadmin_application_assignment", name="Application Assignment") func newResourceApplicationAssignment(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceApplicationAssignment{}, nil } diff --git a/internal/service/ssoadmin/application_assignment_configuration.go b/internal/service/ssoadmin/application_assignment_configuration.go index 190ab5c1531..48332b69f5f 100644 --- a/internal/service/ssoadmin/application_assignment_configuration.go +++ b/internal/service/ssoadmin/application_assignment_configuration.go @@ -24,7 +24,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Application Assignment Configuration") +// @FrameworkResource("aws_ssoadmin_application_assignment_configuration", name="Application Assignment Configuration") func newResourceApplicationAssignmentConfiguration(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceApplicationAssignmentConfiguration{}, nil } diff --git a/internal/service/ssoadmin/trusted_token_issuer.go b/internal/service/ssoadmin/trusted_token_issuer.go index 2d53c30eb35..59ead1def51 100644 --- a/internal/service/ssoadmin/trusted_token_issuer.go +++ b/internal/service/ssoadmin/trusted_token_issuer.go @@ -36,7 +36,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Trusted Token Issuer") +// @FrameworkResource("aws_ssoadmin_trusted_token_issuer", name="Trusted Token Issuer") // @Tags func newResourceTrustedTokenIssuer(_ context.Context) (resource.ResourceWithConfigure, error) { return &resourceTrustedTokenIssuer{}, nil From 0eb2effa3f150378d3b8f1189d7ec3b1091f864d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:12 -0500 Subject: [PATCH 040/133] Adding type annotation values for 'FrameworkResource' - verifiedpermissions. --- internal/service/verifiedpermissions/identity_source.go | 2 +- internal/service/verifiedpermissions/policy_store.go | 2 +- internal/service/verifiedpermissions/policy_template.go | 2 +- internal/service/verifiedpermissions/schema.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/verifiedpermissions/identity_source.go b/internal/service/verifiedpermissions/identity_source.go index f2ba13ab0e4..a50127e0559 100644 --- a/internal/service/verifiedpermissions/identity_source.go +++ b/internal/service/verifiedpermissions/identity_source.go @@ -43,7 +43,7 @@ const ( updateOperation operationTypeCtxValue = "UPDATE" ) -// @FrameworkResource(name="Identity Source") +// @FrameworkResource("aws_verifiedpermissions_identity_source", name="Identity Source") func newResourceIdentitySource(context.Context) (resource.ResourceWithConfigure, error) { r := &resourceIdentitySource{} diff --git a/internal/service/verifiedpermissions/policy_store.go b/internal/service/verifiedpermissions/policy_store.go index c5a92328fbc..e5758f8328a 100644 --- a/internal/service/verifiedpermissions/policy_store.go +++ b/internal/service/verifiedpermissions/policy_store.go @@ -29,7 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Policy Store") +// @FrameworkResource("aws_verifiedpermissions_policy_store", name="Policy Store") func newResourcePolicyStore(context.Context) (resource.ResourceWithConfigure, error) { r := &resourcePolicyStore{} diff --git a/internal/service/verifiedpermissions/policy_template.go b/internal/service/verifiedpermissions/policy_template.go index 26795e8c016..37fbc998612 100644 --- a/internal/service/verifiedpermissions/policy_template.go +++ b/internal/service/verifiedpermissions/policy_template.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Policy Template") +// @FrameworkResource("aws_verifiedpermissions_policy_template", name="Policy Template") func newResourcePolicyTemplate(context.Context) (resource.ResourceWithConfigure, error) { r := &resourcePolicyTemplate{} diff --git a/internal/service/verifiedpermissions/schema.go b/internal/service/verifiedpermissions/schema.go index e55cc1c9aef..2b79d85cbc9 100644 --- a/internal/service/verifiedpermissions/schema.go +++ b/internal/service/verifiedpermissions/schema.go @@ -29,7 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Schema") +// @FrameworkResource("aws_verifiedpermissions_schema", name="Schema") func newResourceSchema(context.Context) (resource.ResourceWithConfigure, error) { r := &resourceSchema{} From f89787630618bb40a7b251525760d913106ca7ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:34:12 -0500 Subject: [PATCH 041/133] Adding type annotation values for 'FrameworkResource' - workspaces. --- internal/service/workspaces/connection_alias.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/workspaces/connection_alias.go b/internal/service/workspaces/connection_alias.go index 789e3748850..4f1ba470125 100644 --- a/internal/service/workspaces/connection_alias.go +++ b/internal/service/workspaces/connection_alias.go @@ -27,7 +27,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @FrameworkResource(name="Connection Alias") +// @FrameworkResource("aws_workspaces_connection_alias", name="Connection Alias") // @Tags(identifierAttribute="id") func newConnectionAliasResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &connectionAliasResource{} From 6deb342d86995615c35d85b13867e7f7a3d4846b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 12:55:18 -0500 Subject: [PATCH 042/133] generate/servicepackage: Emit type name for '@EphemeralResource' and '@FrameworkResource'. --- internal/generate/servicepackage/file.gtpl | 22 ++++++--------- internal/generate/servicepackage/main.go | 31 +++++++++++----------- internal/types/service_package.go | 12 +++++---- 3 files changed, 31 insertions(+), 34 deletions(-) diff --git a/internal/generate/servicepackage/file.gtpl b/internal/generate/servicepackage/file.gtpl index 7c7e9eb1052..9cf44e48505 100644 --- a/internal/generate/servicepackage/file.gtpl +++ b/internal/generate/servicepackage/file.gtpl @@ -21,12 +21,11 @@ type servicePackage struct {} {{- if .EphemeralResources }} func (p *servicePackage) EphemeralResources(ctx context.Context) []*types.ServicePackageEphemeralResource { return []*types.ServicePackageEphemeralResource { -{{- range .EphemeralResources }} +{{- range $key, $value := .EphemeralResources }} { - Factory: {{ .FactoryName }}, - {{- if ne .Name "" }} - Name: "{{ .Name }}", - {{- end }} + Factory: {{ $value.FactoryName }}, + TypeName: "{{ $key }}", + Name: "{{ $value.Name }}", }, {{- end }} } @@ -58,12 +57,11 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource { -{{- range .FrameworkResources }} +{{- range $key, $value := .FrameworkResources }} { - Factory: {{ .FactoryName }}, - {{- if ne .Name "" }} - Name: "{{ .Name }}", - {{- end }} + Factory: {{ $value.FactoryName }}, + TypeName: "{{ $key }}", + Name: "{{ $value.Name }}", {{- if .TransparentTagging }} Tags: &types.ServicePackageResourceTags { {{- if ne .TagsIdentifierAttribute "" }} @@ -85,9 +83,7 @@ func (p *servicePackage) SDKDataSources(ctx context.Context) []*types.ServicePac { Factory: {{ $value.FactoryName }}, TypeName: "{{ $key }}", - {{- if ne $value.Name "" }} Name: "{{ $value.Name }}", - {{- end }} {{- if $value.TransparentTagging }} Tags: &types.ServicePackageResourceTags { {{- if ne $value.TagsIdentifierAttribute "" }} @@ -109,9 +105,7 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePacka { Factory: {{ $value.FactoryName }}, TypeName: "{{ $key }}", - {{- if ne $value.Name "" }} Name: "{{ $value.Name }}", - {{- end }} {{- if $value.TransparentTagging }} Tags: &types.ServicePackageResourceTags { {{- if ne $value.TagsIdentifierAttribute "" }} diff --git a/internal/generate/servicepackage/main.go b/internal/generate/servicepackage/main.go index 988f5e99140..900317b93d6 100644 --- a/internal/generate/servicepackage/main.go +++ b/internal/generate/servicepackage/main.go @@ -58,9 +58,9 @@ func main() { v := &visitor{ g: g, - ephemeralResources: make([]ResourceDatum, 0), + ephemeralResources: make(map[string]ResourceDatum, 0), frameworkDataSources: make([]ResourceDatum, 0), - frameworkResources: make([]ResourceDatum, 0), + frameworkResources: make(map[string]ResourceDatum, 0), sdkDataSources: make(map[string]ResourceDatum), sdkResources: make(map[string]ResourceDatum), } @@ -87,9 +87,6 @@ func main() { slices.SortStableFunc(s.FrameworkDataSources, func(a, b ResourceDatum) int { return cmp.Compare(a.FactoryName, b.FactoryName) }) - slices.SortStableFunc(s.FrameworkResources, func(a, b ResourceDatum) int { - return cmp.Compare(a.FactoryName, b.FactoryName) - }) d := g.NewGoFileDestination(filename) @@ -133,9 +130,9 @@ type ServiceDatum struct { GoV2Package string // AWS SDK for Go v2 package name ProviderPackage string ProviderNameUpper string - EphemeralResources []ResourceDatum + EphemeralResources map[string]ResourceDatum FrameworkDataSources []ResourceDatum - FrameworkResources []ResourceDatum + FrameworkResources map[string]ResourceDatum SDKDataSources map[string]ResourceDatum SDKResources map[string]ResourceDatum } @@ -159,9 +156,9 @@ type visitor struct { functionName string packageName string - ephemeralResources []ResourceDatum + ephemeralResources map[string]ResourceDatum frameworkDataSources []ResourceDatum - frameworkResources []ResourceDatum + frameworkResources map[string]ResourceDatum sdkDataSources map[string]ResourceDatum sdkResources map[string]ResourceDatum } @@ -249,15 +246,17 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) { continue } + typeName := args.Positional[0] + if d.Name == "" { v.errs = append(v.errs, fmt.Errorf("no friendly name: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) continue } - if slices.ContainsFunc(v.ephemeralResources, func(d ResourceDatum) bool { return d.FactoryName == v.functionName }) { - v.errs = append(v.errs, fmt.Errorf("duplicate Ephemeral Resource: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) + if _, ok := v.ephemeralResources[typeName]; ok { + v.errs = append(v.errs, fmt.Errorf("duplicate Ephemeral Resource (%s): %s", typeName, fmt.Sprintf("%s.%s", v.packageName, v.functionName))) } else { - v.ephemeralResources = append(v.ephemeralResources, d) + v.ephemeralResources[typeName] = d } case "FrameworkDataSource": if d.Name == "" { @@ -276,15 +275,17 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) { continue } + typeName := args.Positional[0] + if d.Name == "" { v.errs = append(v.errs, fmt.Errorf("no friendly name: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) continue } - if slices.ContainsFunc(v.frameworkResources, func(d ResourceDatum) bool { return d.FactoryName == v.functionName }) { - v.errs = append(v.errs, fmt.Errorf("duplicate Framework Resource: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName))) + if _, ok := v.frameworkResources[typeName]; ok { + v.errs = append(v.errs, fmt.Errorf("duplicate Framework Resource (%s): %s", typeName, fmt.Sprintf("%s.%s", v.packageName, v.functionName))) } else { - v.frameworkResources = append(v.frameworkResources, d) + v.frameworkResources[typeName] = d } case "SDKDataSource": if len(args.Positional) == 0 { diff --git a/internal/types/service_package.go b/internal/types/service_package.go index 2af97a7f62b..b41f383bc49 100644 --- a/internal/types/service_package.go +++ b/internal/types/service_package.go @@ -21,8 +21,9 @@ type ServicePackageResourceTags struct { // ServicePackageEphemeralResource represents a Terraform Plugin Framework ephemeral resource // implemented by a service package. type ServicePackageEphemeralResource struct { - Factory func(context.Context) (ephemeral.EphemeralResourceWithConfigure, error) - Name string + Factory func(context.Context) (ephemeral.EphemeralResourceWithConfigure, error) + TypeName string + Name string } // ServicePackageFrameworkDataSource represents a Terraform Plugin Framework data source @@ -36,9 +37,10 @@ type ServicePackageFrameworkDataSource struct { // ServicePackageFrameworkResource represents a Terraform Plugin Framework resource // implemented by a service package. type ServicePackageFrameworkResource struct { - Factory func(context.Context) (resource.ResourceWithConfigure, error) - Name string - Tags *ServicePackageResourceTags + Factory func(context.Context) (resource.ResourceWithConfigure, error) + TypeName string + Name string + Tags *ServicePackageResourceTags } // ServicePackageSDKDataSource represents a Terraform Plugin SDK data source From 919527d02f9fbde987ed09a3937fab340a5dab74 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:55 -0500 Subject: [PATCH 043/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - amp. --- internal/service/amp/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/amp/service_package_gen.go b/internal/service/amp/service_package_gen.go index 5c926df82eb..67f2bc19474 100644 --- a/internal/service/amp/service_package_gen.go +++ b/internal/service/amp/service_package_gen.go @@ -26,8 +26,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newScraperResource, - Name: "Scraper", + Factory: newScraperResource, + TypeName: "aws_prometheus_scraper", + Name: "Scraper", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 09de8563c5d83f09fa211e8b496eccb17bb095a9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:55 -0500 Subject: [PATCH 044/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - apigateway. --- internal/service/apigateway/service_package_gen.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/internal/service/apigateway/service_package_gen.go b/internal/service/apigateway/service_package_gen.go index 2e8c51bdfd9..f3c57fde37e 100644 --- a/internal/service/apigateway/service_package_gen.go +++ b/internal/service/apigateway/service_package_gen.go @@ -19,16 +19,18 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newDomainNameAccessAssociationResource, - Name: "Domain Name Access Association", + Factory: newResourceAccount, + TypeName: "aws_api_gateway_account", + Name: "Account", + }, + { + Factory: newDomainNameAccessAssociationResource, + TypeName: "aws_api_gateway_domain_name_access_association", + Name: "Domain Name Access Association", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, - { - Factory: newResourceAccount, - Name: "Account", - }, } } From c907aca8638390b939b72fe68b81c9ecc0eacfd0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:55 -0500 Subject: [PATCH 045/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - appconfig. --- internal/service/appconfig/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/appconfig/service_package_gen.go b/internal/service/appconfig/service_package_gen.go index 833df877922..1a6c1efa5b3 100644 --- a/internal/service/appconfig/service_package_gen.go +++ b/internal/service/appconfig/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceEnvironment, - Name: "Environment", + Factory: newResourceEnvironment, + TypeName: "aws_appconfig_environment", + Name: "Environment", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 2e3658d773a0be6db0a36cc61c5a8d58f2c071ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:55 -0500 Subject: [PATCH 046/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - appfabric. --- .../service/appfabric/service_package_gen.go | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/internal/service/appfabric/service_package_gen.go b/internal/service/appfabric/service_package_gen.go index 09abc7fb232..b62d41bff21 100644 --- a/internal/service/appfabric/service_package_gen.go +++ b/internal/service/appfabric/service_package_gen.go @@ -21,33 +21,38 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newAppAuthorizationConnectionResource, - Name: "App Authorization Connection", - }, - { - Factory: newAppAuthorizationResource, - Name: "App Authorization", + Factory: newAppAuthorizationResource, + TypeName: "aws_appfabric_app_authorization", + Name: "App Authorization", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newAppBundleResource, - Name: "App Bundle", + Factory: newAppAuthorizationConnectionResource, + TypeName: "aws_appfabric_app_authorization_connection", + Name: "App Authorization Connection", + }, + { + Factory: newAppBundleResource, + TypeName: "aws_appfabric_app_bundle", + Name: "App Bundle", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }, }, { - Factory: newIngestionDestinationResource, - Name: "Ingestion Destination", + Factory: newIngestionResource, + TypeName: "aws_appfabric_ingestion", + Name: "Ingestion", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newIngestionResource, - Name: "Ingestion", + Factory: newIngestionDestinationResource, + TypeName: "aws_appfabric_ingestion_destination", + Name: "Ingestion Destination", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 2e92704453c2d216afc8d1f0b8872987b3188485 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:56 -0500 Subject: [PATCH 047/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - apprunner. --- internal/service/apprunner/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/apprunner/service_package_gen.go b/internal/service/apprunner/service_package_gen.go index 2e5cda74c30..975ac1ec2fd 100644 --- a/internal/service/apprunner/service_package_gen.go +++ b/internal/service/apprunner/service_package_gen.go @@ -26,12 +26,14 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newDeploymentResource, - Name: "Deployment", + Factory: newResourceDefaultAutoScalingConfigurationVersion, + TypeName: "aws_apprunner_default_auto_scaling_configuration_version", + Name: "Default AutoScaling Configuration Version", }, { - Factory: newResourceDefaultAutoScalingConfigurationVersion, - Name: "Default AutoScaling Configuration Version", + Factory: newDeploymentResource, + TypeName: "aws_apprunner_deployment", + Name: "Deployment", }, } } From 32eaacebfb24e19b785627ea77d34595e1152415 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:56 -0500 Subject: [PATCH 048/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - appsync. --- internal/service/appsync/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index 48a4a7f5082..fd1a83592fa 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -19,8 +19,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newSourceAPIAssociationResource, - Name: "Source API Association", + Factory: newSourceAPIAssociationResource, + TypeName: "aws_appsync_source_api_association", + Name: "Source API Association", }, } } From e4d6d0d682f9ad04c35db97517dd08971f4d8372 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:56 -0500 Subject: [PATCH 049/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - auditmanager. --- .../auditmanager/service_package_gen.go | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/internal/service/auditmanager/service_package_gen.go b/internal/service/auditmanager/service_package_gen.go index 95783acd5a5..669225b19be 100644 --- a/internal/service/auditmanager/service_package_gen.go +++ b/internal/service/auditmanager/service_package_gen.go @@ -30,45 +30,53 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceAccountRegistration, - Name: "Account Registration", + Factory: newResourceAccountRegistration, + TypeName: "aws_auditmanager_account_registration", + Name: "Account Registration", }, { - Factory: newResourceAssessment, - Name: "Assessment", + Factory: newResourceAssessment, + TypeName: "aws_auditmanager_assessment", + Name: "Assessment", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceAssessmentDelegation, - Name: "Assessment Delegation", + Factory: newResourceAssessmentDelegation, + TypeName: "aws_auditmanager_assessment_delegation", + Name: "Assessment Delegation", }, { - Factory: newResourceAssessmentReport, - Name: "Assessment Report", + Factory: newResourceAssessmentReport, + TypeName: "aws_auditmanager_assessment_report", + Name: "Assessment Report", }, { - Factory: newResourceControl, - Name: "Control", + Factory: newResourceControl, + TypeName: "aws_auditmanager_control", + Name: "Control", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceFramework, - Name: "Framework", + Factory: newResourceFramework, + TypeName: "aws_auditmanager_framework", + Name: "Framework", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceFrameworkShare, - Name: "Framework Share", + Factory: newResourceFrameworkShare, + TypeName: "aws_auditmanager_framework_share", + Name: "Framework Share", }, { - Factory: newResourceOrganizationAdminAccountRegistration, - Name: "Organization Admin Account Registration", + Factory: newResourceOrganizationAdminAccountRegistration, + TypeName: "aws_auditmanager_organization_admin_account_registration", + Name: "Organization Admin Account Registration", }, } } From 7e9be6d695661831fa4ad61fea6ada659b16726d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:57 -0500 Subject: [PATCH 050/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - backup. --- internal/service/backup/service_package_gen.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/service/backup/service_package_gen.go b/internal/service/backup/service_package_gen.go index 08508d1b2e1..bc35b9d1b0c 100644 --- a/internal/service/backup/service_package_gen.go +++ b/internal/service/backup/service_package_gen.go @@ -21,22 +21,25 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newLogicallyAirGappedVaultResource, - Name: "Logically Air Gapped Vault", + Factory: newLogicallyAirGappedVaultResource, + TypeName: "aws_backup_logically_air_gapped_vault", + Name: "Logically Air Gapped Vault", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newRestoreTestingPlanResource, - Name: "Restore Testing Plan", + Factory: newRestoreTestingPlanResource, + TypeName: "aws_backup_restore_testing_plan", + Name: "Restore Testing Plan", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newRestoreTestingSelectionResource, - Name: "Restore Testing Plan Selection", + Factory: newRestoreTestingSelectionResource, + TypeName: "aws_backup_restore_testing_selection", + Name: "Restore Testing Plan Selection", }, } } From 99e41c3eba53e949e2c931656143187da1755e09 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:57 -0500 Subject: [PATCH 051/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - batch. --- internal/service/batch/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/batch/service_package_gen.go b/internal/service/batch/service_package_gen.go index 5227fcf3666..b6d77ed4c73 100644 --- a/internal/service/batch/service_package_gen.go +++ b/internal/service/batch/service_package_gen.go @@ -27,8 +27,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newJobQueueResource, - Name: "Job Queue", + Factory: newJobQueueResource, + TypeName: "aws_batch_job_queue", + Name: "Job Queue", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 50860e0c8e096bf9e355970481577686afb19bd4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:57 -0500 Subject: [PATCH 052/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - bcmdataexports. --- internal/service/bcmdataexports/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/bcmdataexports/service_package_gen.go b/internal/service/bcmdataexports/service_package_gen.go index 7d1c63aa14b..b57e3b288e8 100644 --- a/internal/service/bcmdataexports/service_package_gen.go +++ b/internal/service/bcmdataexports/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceExport, - Name: "Export", + Factory: newResourceExport, + TypeName: "aws_bcmdataexports_export", + Name: "Export", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }, From 31aee80536e455f51a2e147f302d91381cfe8d3c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:57 -0500 Subject: [PATCH 053/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - bedrock. --- .../service/bedrock/service_package_gen.go | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/internal/service/bedrock/service_package_gen.go b/internal/service/bedrock/service_package_gen.go index 0c148a21d50..d254f00a2af 100644 --- a/internal/service/bedrock/service_package_gen.go +++ b/internal/service/bedrock/service_package_gen.go @@ -46,39 +46,45 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newCustomModelResource, - Name: "Custom Model", + Factory: newCustomModelResource, + TypeName: "aws_bedrock_custom_model", + Name: "Custom Model", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: "job_arn", }, }, { - Factory: newGuardrailVersionResource, - Name: "Guardrail Version", + Factory: newResourceGuardrail, + TypeName: "aws_bedrock_guardrail", + Name: "Guardrail", + Tags: &types.ServicePackageResourceTags{ + IdentifierAttribute: "guardrail_arn", + }, }, { - Factory: newModelInvocationLoggingConfigurationResource, - Name: "Model Invocation Logging Configuration", + Factory: newGuardrailVersionResource, + TypeName: "aws_bedrock_guardrail_version", + Name: "Guardrail Version", }, { - Factory: newProvisionedModelThroughputResource, - Name: "Provisioned Model Throughput", + Factory: newResourceInferenceProfile, + TypeName: "aws_bedrock_inference_profile", + Name: "Inference Profile", Tags: &types.ServicePackageResourceTags{ - IdentifierAttribute: "provisioned_model_arn", + IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceGuardrail, - Name: "Guardrail", - Tags: &types.ServicePackageResourceTags{ - IdentifierAttribute: "guardrail_arn", - }, + Factory: newModelInvocationLoggingConfigurationResource, + TypeName: "aws_bedrock_model_invocation_logging_configuration", + Name: "Model Invocation Logging Configuration", }, { - Factory: newResourceInferenceProfile, - Name: "Inference Profile", + Factory: newProvisionedModelThroughputResource, + TypeName: "aws_bedrock_provisioned_model_throughput", + Name: "Provisioned Model Throughput", Tags: &types.ServicePackageResourceTags{ - IdentifierAttribute: names.AttrARN, + IdentifierAttribute: "provisioned_model_arn", }, }, } From 66b80c47dc358fd4dfbac5f9ac44f985a5189930 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:57 -0500 Subject: [PATCH 054/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - bedrockagent. --- .../bedrockagent/service_package_gen.go | 45 +++++++++++-------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/internal/service/bedrockagent/service_package_gen.go b/internal/service/bedrockagent/service_package_gen.go index a5ffe7e1697..aeb36e5bb00 100644 --- a/internal/service/bedrockagent/service_package_gen.go +++ b/internal/service/bedrockagent/service_package_gen.go @@ -26,38 +26,45 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newAgentActionGroupResource, - Name: "Agent Action Group", + Factory: newAgentResource, + TypeName: "aws_bedrockagent_agent", + Name: "Agent", + Tags: &types.ServicePackageResourceTags{ + IdentifierAttribute: "agent_arn", + }, + }, + { + Factory: newAgentActionGroupResource, + TypeName: "aws_bedrockagent_agent_action_group", + Name: "Agent Action Group", }, { - Factory: newAgentAliasResource, - Name: "Agent Alias", + Factory: newAgentAliasResource, + TypeName: "aws_bedrockagent_agent_alias", + Name: "Agent Alias", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: "agent_alias_arn", }, }, { - Factory: newAgentCollaboratorResource, - Name: "Agent Collaborator", + Factory: newAgentCollaboratorResource, + TypeName: "aws_bedrockagent_agent_collaborator", + Name: "Agent Collaborator", }, { - Factory: newAgentKnowledgeBaseAssociationResource, - Name: "Agent Knowledge Base Association", - }, - { - Factory: newAgentResource, - Name: "Agent", - Tags: &types.ServicePackageResourceTags{ - IdentifierAttribute: "agent_arn", - }, + Factory: newAgentKnowledgeBaseAssociationResource, + TypeName: "aws_bedrockagent_agent_knowledge_base_association", + Name: "Agent Knowledge Base Association", }, { - Factory: newDataSourceResource, - Name: "Data Source", + Factory: newDataSourceResource, + TypeName: "aws_bedrockagent_data_source", + Name: "Data Source", }, { - Factory: newKnowledgeBaseResource, - Name: "Knowledge Base", + Factory: newKnowledgeBaseResource, + TypeName: "aws_bedrockagent_knowledge_base", + Name: "Knowledge Base", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 0f58dd1b728084a6c9debd8fa5208a76bd61feac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:57 -0500 Subject: [PATCH 055/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - chatbot. --- internal/service/chatbot/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/chatbot/service_package_gen.go b/internal/service/chatbot/service_package_gen.go index 3a935f3594e..cfc10803d57 100644 --- a/internal/service/chatbot/service_package_gen.go +++ b/internal/service/chatbot/service_package_gen.go @@ -24,15 +24,17 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newSlackChannelConfigurationResource, - Name: "Slack Channel Configuration", + Factory: newSlackChannelConfigurationResource, + TypeName: "aws_chatbot_slack_channel_configuration", + Name: "Slack Channel Configuration", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: "chat_configuration_arn", }, }, { - Factory: newTeamsChannelConfigurationResource, - Name: "Teams Channel Configuration", + Factory: newTeamsChannelConfigurationResource, + TypeName: "aws_chatbot_teams_channel_configuration", + Name: "Teams Channel Configuration", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: "chat_configuration_arn", }, From 6f78c971b3e38daad27ed4f889469d940b5f7a2b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:58 -0500 Subject: [PATCH 056/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - cleanrooms. --- internal/service/cleanrooms/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/cleanrooms/service_package_gen.go b/internal/service/cleanrooms/service_package_gen.go index 456ee4b90ac..dbde41077da 100644 --- a/internal/service/cleanrooms/service_package_gen.go +++ b/internal/service/cleanrooms/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceMembership, - Name: "Membership", + Factory: newResourceMembership, + TypeName: "aws_cleanrooms_membership", + Name: "Membership", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From bdaf493ccd1f0350964085c436aaf399d15da7c6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:58 -0500 Subject: [PATCH 057/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - cloudfront. --- .../service/cloudfront/service_package_gen.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudfront/service_package_gen.go b/internal/service/cloudfront/service_package_gen.go index 083f0179d03..42d44f3bf08 100644 --- a/internal/service/cloudfront/service_package_gen.go +++ b/internal/service/cloudfront/service_package_gen.go @@ -26,16 +26,19 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newContinuousDeploymentPolicyResource, - Name: "Continuous Deployment Policy", + Factory: newContinuousDeploymentPolicyResource, + TypeName: "aws_cloudfront_continuous_deployment_policy", + Name: "Continuous Deployment Policy", }, { - Factory: newKeyValueStoreResource, - Name: "Key Value Store", + Factory: newKeyValueStoreResource, + TypeName: "aws_cloudfront_key_value_store", + Name: "Key Value Store", }, { - Factory: newVPCOriginResource, - Name: "VPC Origin", + Factory: newVPCOriginResource, + TypeName: "aws_cloudfront_vpc_origin", + Name: "VPC Origin", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 1c8070b139b2f4b38e051d049c09d0a152dbcef3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:58 -0500 Subject: [PATCH 058/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - cloudfrontkeyvaluestore. --- .../service/cloudfrontkeyvaluestore/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/cloudfrontkeyvaluestore/service_package_gen.go b/internal/service/cloudfrontkeyvaluestore/service_package_gen.go index ae78942fa7a..f470e60be63 100644 --- a/internal/service/cloudfrontkeyvaluestore/service_package_gen.go +++ b/internal/service/cloudfrontkeyvaluestore/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newKeyResource, - Name: "Key", + Factory: newKeyResource, + TypeName: "aws_cloudfrontkeyvaluestore_key", + Name: "Key", }, } } From 54d112586efec022908abd0f8a562a57e3bca104 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:58 -0500 Subject: [PATCH 059/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - cloudtrail. --- internal/service/cloudtrail/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/cloudtrail/service_package_gen.go b/internal/service/cloudtrail/service_package_gen.go index b8a0d8abbc4..2539834f80e 100644 --- a/internal/service/cloudtrail/service_package_gen.go +++ b/internal/service/cloudtrail/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newOrganizationDelegatedAdminAccountResource, - Name: "Organization Delegated Admin Account", + Factory: newOrganizationDelegatedAdminAccountResource, + TypeName: "aws_cloudtrail_organization_delegated_admin_account", + Name: "Organization Delegated Admin Account", }, } } From 1e55c2e87f8ba988d13ac7a485e68dc29129d773 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:59 -0500 Subject: [PATCH 060/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - codeconnections. --- .../service/codeconnections/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/codeconnections/service_package_gen.go b/internal/service/codeconnections/service_package_gen.go index 14916d07307..075769595f9 100644 --- a/internal/service/codeconnections/service_package_gen.go +++ b/internal/service/codeconnections/service_package_gen.go @@ -21,15 +21,17 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newConnectionResource, - Name: "Connection", + Factory: newConnectionResource, + TypeName: "aws_codeconnections_connection", + Name: "Connection", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newHostResource, - Name: "Host", + Factory: newHostResource, + TypeName: "aws_codeconnections_host", + Name: "Host", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From a66430e803c293262bdcb4163b605984f325c355 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:15:59 -0500 Subject: [PATCH 061/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - codeguruprofiler. --- internal/service/codeguruprofiler/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/codeguruprofiler/service_package_gen.go b/internal/service/codeguruprofiler/service_package_gen.go index 6d4493fb63b..a15d8e5c97c 100644 --- a/internal/service/codeguruprofiler/service_package_gen.go +++ b/internal/service/codeguruprofiler/service_package_gen.go @@ -26,8 +26,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceProfilingGroup, - Name: "Profiling Group", + Factory: newResourceProfilingGroup, + TypeName: "aws_codeguruprofiler_profiling_group", + Name: "Profiling Group", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 96e591e6c7eadf0239a32c7530ade33a90753900 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:00 -0500 Subject: [PATCH 062/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - cognitoidentity. --- internal/service/cognitoidentity/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/cognitoidentity/service_package_gen.go b/internal/service/cognitoidentity/service_package_gen.go index 82f6d7fde4c..1fd3481550a 100644 --- a/internal/service/cognitoidentity/service_package_gen.go +++ b/internal/service/cognitoidentity/service_package_gen.go @@ -17,8 +17,9 @@ type servicePackage struct{} func (p *servicePackage) EphemeralResources(ctx context.Context) []*types.ServicePackageEphemeralResource { return []*types.ServicePackageEphemeralResource{ { - Factory: newOpenIDTokenForDeveloperIdentityEphemeralResource, - Name: "Open ID Connect Token For Developer Identity", + Factory: newOpenIDTokenForDeveloperIdentityEphemeralResource, + TypeName: "aws_cognito_identity_openid_token_for_developer_identity", + Name: "Open ID Connect Token For Developer Identity", }, } } From f065aafe69600d56f0a132a3f6aadb449fca3ba6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:00 -0500 Subject: [PATCH 063/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - cognitoidp. --- internal/service/cognitoidp/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/cognitoidp/service_package_gen.go b/internal/service/cognitoidp/service_package_gen.go index e3b426218a6..91a50097eee 100644 --- a/internal/service/cognitoidp/service_package_gen.go +++ b/internal/service/cognitoidp/service_package_gen.go @@ -34,12 +34,14 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newManagedUserPoolClientResource, - Name: "Managed User Pool Client", + Factory: newManagedUserPoolClientResource, + TypeName: "aws_cognito_managed_user_pool_client", + Name: "Managed User Pool Client", }, { - Factory: newUserPoolClientResource, - Name: "User Pool Client", + Factory: newUserPoolClientResource, + TypeName: "aws_cognito_user_pool_client", + Name: "User Pool Client", }, } } From 2434d98da7d7252c0dc92d554d11822f0b534bc2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:00 -0500 Subject: [PATCH 064/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - computeoptimizer. --- .../service/computeoptimizer/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/computeoptimizer/service_package_gen.go b/internal/service/computeoptimizer/service_package_gen.go index 594947f7085..40dbeae4f74 100644 --- a/internal/service/computeoptimizer/service_package_gen.go +++ b/internal/service/computeoptimizer/service_package_gen.go @@ -21,12 +21,14 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newEnrollmentStatusResource, - Name: "Enrollment Status", + Factory: newEnrollmentStatusResource, + TypeName: "aws_computeoptimizer_enrollment_status", + Name: "Enrollment Status", }, { - Factory: newRecommendationPreferencesResource, - Name: "Recommendation Preferences", + Factory: newRecommendationPreferencesResource, + TypeName: "aws_computeoptimizer_recommendation_preferences", + Name: "Recommendation Preferences", }, } } From 5b3a78af0faf81e0f0cb034befcdb225be09480a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:00 -0500 Subject: [PATCH 065/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - configservice. --- internal/service/configservice/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/configservice/service_package_gen.go b/internal/service/configservice/service_package_gen.go index e132f46aeaa..f8df252c794 100644 --- a/internal/service/configservice/service_package_gen.go +++ b/internal/service/configservice/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newRetentionConfigurationResource, - Name: "Retention Configuration", + Factory: newRetentionConfigurationResource, + TypeName: "aws_config_retention_configuration", + Name: "Retention Configuration", }, } } From 665eaabdbfc732f2f87798f77a9fd5f0a098f8a8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:00 -0500 Subject: [PATCH 066/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - costoptimizationhub. --- .../service/costoptimizationhub/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/costoptimizationhub/service_package_gen.go b/internal/service/costoptimizationhub/service_package_gen.go index dc5559c3fa2..85e50b50186 100644 --- a/internal/service/costoptimizationhub/service_package_gen.go +++ b/internal/service/costoptimizationhub/service_package_gen.go @@ -19,12 +19,14 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceEnrollmentStatus, - Name: "Enrollment Status", + Factory: newResourceEnrollmentStatus, + TypeName: "aws_costoptimizationhub_enrollment_status", + Name: "Enrollment Status", }, { - Factory: newResourcePreferences, - Name: "Preferences", + Factory: newResourcePreferences, + TypeName: "aws_costoptimizationhub_preferences", + Name: "Preferences", }, } } From c070c3979ac807e004cb623e02977ba92840bbdb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:01 -0500 Subject: [PATCH 067/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - datazone. --- .../service/datazone/service_package_gen.go | 50 +++++++++++-------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/internal/service/datazone/service_package_gen.go b/internal/service/datazone/service_package_gen.go index f9b98ad43f8..aa003b32c6e 100644 --- a/internal/service/datazone/service_package_gen.go +++ b/internal/service/datazone/service_package_gen.go @@ -26,47 +26,57 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceAssetType, - Name: "Asset Type", + Factory: newResourceAssetType, + TypeName: "aws_datazone_asset_type", + Name: "Asset Type", }, { - Factory: newResourceDomain, - Name: "Domain", + Factory: newResourceDomain, + TypeName: "aws_datazone_domain", + Name: "Domain", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceEnvironment, - Name: "Environment", + Factory: newResourceEnvironment, + TypeName: "aws_datazone_environment", + Name: "Environment", }, { - Factory: newResourceEnvironmentBlueprintConfiguration, - Name: "Environment Blueprint Configuration", + Factory: newResourceEnvironmentBlueprintConfiguration, + TypeName: "aws_datazone_environment_blueprint_configuration", + Name: "Environment Blueprint Configuration", }, { - Factory: newResourceEnvironmentProfile, - Name: "Environment Profile", + Factory: newResourceEnvironmentProfile, + TypeName: "aws_datazone_environment_profile", + Name: "Environment Profile", }, { - Factory: newResourceFormType, - Name: "Form Type", + Factory: newResourceFormType, + TypeName: "aws_datazone_form_type", + Name: "Form Type", }, { - Factory: newResourceGlossary, - Name: "Glossary", + Factory: newResourceGlossary, + TypeName: "aws_datazone_glossary", + Name: "Glossary", }, { - Factory: newResourceGlossaryTerm, - Name: "Glossary Term", + Factory: newResourceGlossaryTerm, + TypeName: "aws_datazone_glossary_term", + Name: "Glossary Term", }, { - Factory: newResourceProject, - Name: "Project", + Factory: newResourceProject, + TypeName: "aws_datazone_project", + Name: "Project", }, { - Factory: newResourceUserProfile, - Name: "User Profile", + Factory: newResourceUserProfile, + TypeName: "aws_datazone_user_profile", + Name: "User Profile", }, } } From 010a41d614c765b498012715f4abaf9c51beafe2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:02 -0500 Subject: [PATCH 068/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - devopsguru. --- .../service/devopsguru/service_package_gen.go | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/internal/service/devopsguru/service_package_gen.go b/internal/service/devopsguru/service_package_gen.go index ff41666f99f..2dc2820cd4f 100644 --- a/internal/service/devopsguru/service_package_gen.go +++ b/internal/service/devopsguru/service_package_gen.go @@ -30,20 +30,24 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceEventSourcesConfig, - Name: "Event Sources Config", + Factory: newResourceEventSourcesConfig, + TypeName: "aws_devopsguru_event_sources_config", + Name: "Event Sources Config", }, { - Factory: newResourceNotificationChannel, - Name: "Notification Channel", + Factory: newResourceNotificationChannel, + TypeName: "aws_devopsguru_notification_channel", + Name: "Notification Channel", }, { - Factory: newResourceResourceCollection, - Name: "Resource Collection", + Factory: newResourceResourceCollection, + TypeName: "aws_devopsguru_resource_collection", + Name: "Resource Collection", }, { - Factory: newResourceServiceIntegration, - Name: "Service Integration", + Factory: newResourceServiceIntegration, + TypeName: "aws_devopsguru_service_integration", + Name: "Service Integration", }, } } From 76d11033eab448d0e3c130d2fee6070b486aeff6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:02 -0500 Subject: [PATCH 069/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - docdbelastic. --- internal/service/docdbelastic/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/docdbelastic/service_package_gen.go b/internal/service/docdbelastic/service_package_gen.go index 864f4157222..1479f788fc1 100644 --- a/internal/service/docdbelastic/service_package_gen.go +++ b/internal/service/docdbelastic/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceCluster, - Name: "Cluster", + Factory: newResourceCluster, + TypeName: "aws_docdbelastic_cluster", + Name: "Cluster", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From e45efca03fe1d24b5309499c89916f76900e13d4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:02 -0500 Subject: [PATCH 070/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - drs. --- internal/service/drs/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/drs/service_package_gen.go b/internal/service/drs/service_package_gen.go index f8a5561b03e..56804abb509 100644 --- a/internal/service/drs/service_package_gen.go +++ b/internal/service/drs/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newReplicationConfigurationTemplateResource, - Name: "Replication Configuration Template", + Factory: newReplicationConfigurationTemplateResource, + TypeName: "aws_drs_replication_configuration_template", + Name: "Replication Configuration Template", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 19626762a437dc12e171abe13978b156898041f3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:02 -0500 Subject: [PATCH 071/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - ds. --- internal/service/ds/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/ds/service_package_gen.go b/internal/service/ds/service_package_gen.go index b139c7270f6..ab313077bbc 100644 --- a/internal/service/ds/service_package_gen.go +++ b/internal/service/ds/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newTrustResource, - Name: "Trust", + Factory: newTrustResource, + TypeName: "aws_directory_service_trust", + Name: "Trust", }, } } From 82980ee2d45be88a598bcd3b52cd073791d57c91 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:02 -0500 Subject: [PATCH 072/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - dynamodb. --- internal/service/dynamodb/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/dynamodb/service_package_gen.go b/internal/service/dynamodb/service_package_gen.go index 8df052f7e76..089f394d781 100644 --- a/internal/service/dynamodb/service_package_gen.go +++ b/internal/service/dynamodb/service_package_gen.go @@ -19,8 +19,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourcePolicyResource, - Name: "Resource Policy", + Factory: newResourcePolicyResource, + TypeName: "aws_dynamodb_resource_policy", + Name: "Resource Policy", }, } } From 53ca9efcd2abdd686303a40ef3b71c7ad964d4e9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:02 -0500 Subject: [PATCH 073/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - ec2. --- internal/service/ec2/service_package_gen.go | 86 ++++++++++++--------- 1 file changed, 50 insertions(+), 36 deletions(-) diff --git a/internal/service/ec2/service_package_gen.go b/internal/service/ec2/service_package_gen.go index ae531506453..2f0b754ffb0 100644 --- a/internal/service/ec2/service_package_gen.go +++ b/internal/service/ec2/service_package_gen.go @@ -36,75 +36,89 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newCapacityBlockReservationResource, - Name: "Capacity Block Reservation", + Factory: newEBSFastSnapshotRestoreResource, + TypeName: "aws_ebs_fast_snapshot_restore", + Name: "EBS Fast Snapshot Restore", + }, + { + Factory: newCapacityBlockReservationResource, + TypeName: "aws_ec2_capacity_block_reservation", + Name: "Capacity Block Reservation", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }, }, { - Factory: newEBSFastSnapshotRestoreResource, - Name: "EBS Fast Snapshot Restore", + Factory: newInstanceConnectEndpointResource, + TypeName: "aws_ec2_instance_connect_endpoint", + Name: "Instance Connect Endpoint", + Tags: &types.ServicePackageResourceTags{ + IdentifierAttribute: names.AttrID, + }, }, { - Factory: newEIPDomainNameResource, - Name: "EIP Domain Name", + Factory: newInstanceMetadataDefaultsResource, + TypeName: "aws_ec2_instance_metadata_defaults", + Name: "Instance Metadata Defaults", }, { - Factory: newInstanceConnectEndpointResource, - Name: "Instance Connect Endpoint", - Tags: &types.ServicePackageResourceTags{ - IdentifierAttribute: names.AttrID, - }, + Factory: newTransitGatewayDefaultRouteTableAssociationResource, + TypeName: "aws_ec2_transit_gateway_default_route_table_association", + Name: "Transit Gateway Default Route Table Association", }, { - Factory: newInstanceMetadataDefaultsResource, - Name: "Instance Metadata Defaults", + Factory: newTransitGatewayDefaultRouteTablePropagationResource, + TypeName: "aws_ec2_transit_gateway_default_route_table_propagation", + Name: "Transit Gateway Default Route Table Propagation", }, { - Factory: newResourceSecurityGroupVPCAssociation, - Name: "Security Group VPC Association", + Factory: newEIPDomainNameResource, + TypeName: "aws_eip_domain_name", + Name: "EIP Domain Name", }, { - Factory: newSecurityGroupEgressRuleResource, - Name: "Security Group Egress Rule", + Factory: newVPCBlockPublicAccessExclusionResource, + TypeName: "aws_vpc_block_public_access_exclusion", + Name: "VPC Block Public Access Exclusion", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }, }, { - Factory: newSecurityGroupIngressRuleResource, - Name: "Security Group Ingress Rule", - Tags: &types.ServicePackageResourceTags{ - IdentifierAttribute: names.AttrID, - }, + Factory: newVPCBlockPublicAccessOptionsResource, + TypeName: "aws_vpc_block_public_access_options", + Name: "VPC Block Public Access Options", }, { - Factory: newTransitGatewayDefaultRouteTableAssociationResource, - Name: "Transit Gateway Default Route Table Association", + Factory: newVPCEndpointPrivateDNSResource, + TypeName: "aws_vpc_endpoint_private_dns", + Name: "VPC Endpoint Private DNS", }, { - Factory: newTransitGatewayDefaultRouteTablePropagationResource, - Name: "Transit Gateway Default Route Table Propagation", + Factory: newVPCEndpointServicePrivateDNSVerificationResource, + TypeName: "aws_vpc_endpoint_service_private_dns_verification", + Name: "VPC Endpoint Service Private DNS Verification", }, { - Factory: newVPCBlockPublicAccessExclusionResource, - Name: "VPC Block Public Access Exclusion", + Factory: newSecurityGroupEgressRuleResource, + TypeName: "aws_vpc_security_group_egress_rule", + Name: "Security Group Egress Rule", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }, }, { - Factory: newVPCBlockPublicAccessOptionsResource, - Name: "VPC Block Public Access Options", - }, - { - Factory: newVPCEndpointPrivateDNSResource, - Name: "VPC Endpoint Private DNS", + Factory: newSecurityGroupIngressRuleResource, + TypeName: "aws_vpc_security_group_ingress_rule", + Name: "Security Group Ingress Rule", + Tags: &types.ServicePackageResourceTags{ + IdentifierAttribute: names.AttrID, + }, }, { - Factory: newVPCEndpointServicePrivateDNSVerificationResource, - Name: "VPC Endpoint Service Private DNS Verification", + Factory: newResourceSecurityGroupVPCAssociation, + TypeName: "aws_vpc_security_group_vpc_association", + Name: "Security Group VPC Association", }, } } From 22af55418aa802dc2a28ac39b63b4a435d2f057f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:02 -0500 Subject: [PATCH 074/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - ecr. --- internal/service/ecr/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/ecr/service_package_gen.go b/internal/service/ecr/service_package_gen.go index 2341e018460..b383d089637 100644 --- a/internal/service/ecr/service_package_gen.go +++ b/internal/service/ecr/service_package_gen.go @@ -30,8 +30,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newAccountSettingResource, - Name: "Account Setting", + Factory: newAccountSettingResource, + TypeName: "aws_ecr_account_setting", + Name: "Account Setting", }, } } From 5676ff8c33f94876724b1f2467f96609e87cb1a8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:03 -0500 Subject: [PATCH 075/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - eks. --- internal/service/eks/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/eks/service_package_gen.go b/internal/service/eks/service_package_gen.go index 657018b3be5..2977af2133e 100644 --- a/internal/service/eks/service_package_gen.go +++ b/internal/service/eks/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newPodIdentityAssociationResource, - Name: "Pod Identity Association", + Factory: newPodIdentityAssociationResource, + TypeName: "aws_eks_pod_identity_association", + Name: "Pod Identity Association", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: "association_arn", }, From 18520af907ef59a1a298863ab0bb1c30b15cc1bb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:03 -0500 Subject: [PATCH 076/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - elasticache. --- internal/service/elasticache/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/elasticache/service_package_gen.go b/internal/service/elasticache/service_package_gen.go index 9e51dbbca7f..b8648d8d1bc 100644 --- a/internal/service/elasticache/service_package_gen.go +++ b/internal/service/elasticache/service_package_gen.go @@ -30,15 +30,17 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceReservedCacheNode, - Name: "Reserved Cache Node", + Factory: newResourceReservedCacheNode, + TypeName: "aws_elasticache_reserved_cache_node", + Name: "Reserved Cache Node", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newServerlessCacheResource, - Name: "Serverless Cache", + Factory: newServerlessCacheResource, + TypeName: "aws_elasticache_serverless_cache", + Name: "Serverless Cache", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 8cdf486a1824f60ae7f1facfc4ea65fa75048e5a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:04 -0500 Subject: [PATCH 077/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - fms. --- internal/service/fms/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/fms/service_package_gen.go b/internal/service/fms/service_package_gen.go index d63cf2f91a1..240874fcffd 100644 --- a/internal/service/fms/service_package_gen.go +++ b/internal/service/fms/service_package_gen.go @@ -19,8 +19,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceResourceSet, - Name: "Resource Set", + Factory: newResourceResourceSet, + TypeName: "aws_fms_resource_set", + Name: "Resource Set", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 0cb3fb221c568b9355ba10f837cb4193a4fa402c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:05 -0500 Subject: [PATCH 078/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - globalaccelerator. --- internal/service/globalaccelerator/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/globalaccelerator/service_package_gen.go b/internal/service/globalaccelerator/service_package_gen.go index 2818d999b3d..570e0ef3c9e 100644 --- a/internal/service/globalaccelerator/service_package_gen.go +++ b/internal/service/globalaccelerator/service_package_gen.go @@ -24,8 +24,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newCrossAccountAttachmentResource, - Name: "Cross-account Attachment", + Factory: newCrossAccountAttachmentResource, + TypeName: "aws_globalaccelerator_cross_account_attachment", + Name: "Cross-account Attachment", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }, From e70c8c8f4dbb4552ed6277229f271914ab185d6e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:05 -0500 Subject: [PATCH 079/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - glue. --- internal/service/glue/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/glue/service_package_gen.go b/internal/service/glue/service_package_gen.go index 72c1efccc73..2eb895e6e11 100644 --- a/internal/service/glue/service_package_gen.go +++ b/internal/service/glue/service_package_gen.go @@ -26,8 +26,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceCatalogTableOptimizer, - Name: "Catalog Table Optimizer", + Factory: newResourceCatalogTableOptimizer, + TypeName: "aws_glue_catalog_table_optimizer", + Name: "Catalog Table Optimizer", }, } } From ac4edbf58540fc757d67d4f1dbdd91e5d8d99882 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:05 -0500 Subject: [PATCH 080/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - grafana. --- internal/service/grafana/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/grafana/service_package_gen.go b/internal/service/grafana/service_package_gen.go index 9a9ac3e8588..93f1f389373 100644 --- a/internal/service/grafana/service_package_gen.go +++ b/internal/service/grafana/service_package_gen.go @@ -21,12 +21,14 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newWorkspaceServiceAccountResource, - Name: "Workspace Service Account", + Factory: newWorkspaceServiceAccountResource, + TypeName: "aws_grafana_workspace_service_account", + Name: "Workspace Service Account", }, { - Factory: newWorkspaceServiceAccountTokenResource, - Name: "Workspace Service Account Token", + Factory: newWorkspaceServiceAccountTokenResource, + TypeName: "aws_grafana_workspace_service_account_token", + Name: "Workspace Service Account Token", }, } } From 980a464fd16a4fc0cf69aab13a1b2eefe0aa23c5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:05 -0500 Subject: [PATCH 081/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - guardduty. --- internal/service/guardduty/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/guardduty/service_package_gen.go b/internal/service/guardduty/service_package_gen.go index f4c45445f96..37b68adff47 100644 --- a/internal/service/guardduty/service_package_gen.go +++ b/internal/service/guardduty/service_package_gen.go @@ -26,8 +26,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceMalwareProtectionPlan, - Name: "Malware Protection Plan", + Factory: newResourceMalwareProtectionPlan, + TypeName: "aws_guardduty_malware_protection_plan", + Name: "Malware Protection Plan", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 326c0bbf01ac3df09c180aa29261b0b4482eb641 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:05 -0500 Subject: [PATCH 082/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - iam. --- internal/service/iam/service_package_gen.go | 35 ++++++++++++--------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/internal/service/iam/service_package_gen.go b/internal/service/iam/service_package_gen.go index d16f91c483a..220e457d582 100644 --- a/internal/service/iam/service_package_gen.go +++ b/internal/service/iam/service_package_gen.go @@ -21,32 +21,39 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newOrganizationsFeaturesResource, - Name: "Organizations Features", + Factory: newResourceGroupPoliciesExclusive, + TypeName: "aws_iam_group_policies_exclusive", + Name: "Group Policies Exclusive", }, { - Factory: newResourceGroupPoliciesExclusive, - Name: "Group Policies Exclusive", + Factory: newResourceGroupPolicyAttachmentsExclusive, + TypeName: "aws_iam_group_policy_attachments_exclusive", + Name: "Group Policy Attachments Exclusive", }, { - Factory: newResourceGroupPolicyAttachmentsExclusive, - Name: "Group Policy Attachments Exclusive", + Factory: newOrganizationsFeaturesResource, + TypeName: "aws_iam_organizations_features", + Name: "Organizations Features", }, { - Factory: newResourceRolePoliciesExclusive, - Name: "Role Policies Exclusive", + Factory: newResourceRolePoliciesExclusive, + TypeName: "aws_iam_role_policies_exclusive", + Name: "Role Policies Exclusive", }, { - Factory: newResourceRolePolicyAttachmentsExclusive, - Name: "Role Policy Attachments Exclusive", + Factory: newResourceRolePolicyAttachmentsExclusive, + TypeName: "aws_iam_role_policy_attachments_exclusive", + Name: "Role Policy Attachments Exclusive", }, { - Factory: newResourceUserPoliciesExclusive, - Name: "User Policies Exclusive", + Factory: newResourceUserPoliciesExclusive, + TypeName: "aws_iam_user_policies_exclusive", + Name: "User Policies Exclusive", }, { - Factory: newResourceUserPolicyAttachmentsExclusive, - Name: "User Policy Attachments Exclusive", + Factory: newResourceUserPolicyAttachmentsExclusive, + TypeName: "aws_iam_user_policy_attachments_exclusive", + Name: "User Policy Attachments Exclusive", }, } } From b5e09dd41efcebb76be6865f1c8ac04e69e9c194 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:06 -0500 Subject: [PATCH 083/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - imagebuilder. --- internal/service/imagebuilder/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/imagebuilder/service_package_gen.go b/internal/service/imagebuilder/service_package_gen.go index b0ff4aa328a..efc93ff0086 100644 --- a/internal/service/imagebuilder/service_package_gen.go +++ b/internal/service/imagebuilder/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newLifecyclePolicyResource, - Name: "Lifecycle Policy", + Factory: newLifecyclePolicyResource, + TypeName: "aws_imagebuilder_lifecycle_policy", + Name: "Lifecycle Policy", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }, From 3ebe1e02cd1d78cccfe0a0d0b58e0e7256f3d42f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:06 -0500 Subject: [PATCH 084/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - iot. --- internal/service/iot/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/iot/service_package_gen.go b/internal/service/iot/service_package_gen.go index a0a7ee07320..6cefe7101ff 100644 --- a/internal/service/iot/service_package_gen.go +++ b/internal/service/iot/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceBillingGroup, - Name: "Billing Group", + Factory: newResourceBillingGroup, + TypeName: "aws_iot_billing_group", + Name: "Billing Group", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 73118fa47d76e851929fea0a139d38ef662a51aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:07 -0500 Subject: [PATCH 085/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - kafka. --- internal/service/kafka/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/kafka/service_package_gen.go b/internal/service/kafka/service_package_gen.go index 41bc95b230c..60cf8cdf270 100644 --- a/internal/service/kafka/service_package_gen.go +++ b/internal/service/kafka/service_package_gen.go @@ -19,8 +19,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newSingleSCRAMSecretAssociationResource, - Name: "Single SCRAM Secret Association", + Factory: newSingleSCRAMSecretAssociationResource, + TypeName: "aws_msk_single_scram_secret_association", + Name: "Single SCRAM Secret Association", }, } } From f3ab269e9dc16533b037f5819240d9812991e42b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:07 -0500 Subject: [PATCH 086/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - kinesis. --- internal/service/kinesis/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/kinesis/service_package_gen.go b/internal/service/kinesis/service_package_gen.go index 4093c210c83..9049c928515 100644 --- a/internal/service/kinesis/service_package_gen.go +++ b/internal/service/kinesis/service_package_gen.go @@ -19,8 +19,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourcePolicyResource, - Name: "Resource Policy", + Factory: newResourcePolicyResource, + TypeName: "aws_kinesis_resource_policy", + Name: "Resource Policy", }, } } From f9e288d47c92d4017b78f0ba0265c4e92131433a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:07 -0500 Subject: [PATCH 087/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - kms. --- internal/service/kms/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/kms/service_package_gen.go b/internal/service/kms/service_package_gen.go index 93ac73a333a..735ddb754de 100644 --- a/internal/service/kms/service_package_gen.go +++ b/internal/service/kms/service_package_gen.go @@ -17,8 +17,9 @@ type servicePackage struct{} func (p *servicePackage) EphemeralResources(ctx context.Context) []*types.ServicePackageEphemeralResource { return []*types.ServicePackageEphemeralResource{ { - Factory: newEphemeralSecrets, - Name: "Secrets", + Factory: newEphemeralSecrets, + TypeName: "aws_kms_secrets", + Name: "Secrets", }, } } From 2b1446179b65640bb922206971d023255d9eeb4d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:08 -0500 Subject: [PATCH 088/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - lakeformation. --- internal/service/lakeformation/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/lakeformation/service_package_gen.go b/internal/service/lakeformation/service_package_gen.go index 54a06ba7b67..6011f335f93 100644 --- a/internal/service/lakeformation/service_package_gen.go +++ b/internal/service/lakeformation/service_package_gen.go @@ -21,12 +21,14 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceDataCellsFilter, - Name: "Data Cells Filter", + Factory: newResourceDataCellsFilter, + TypeName: "aws_lakeformation_data_cells_filter", + Name: "Data Cells Filter", }, { - Factory: newResourceResourceLFTag, - Name: "Resource LF Tag", + Factory: newResourceResourceLFTag, + TypeName: "aws_lakeformation_resource_lf_tag", + Name: "Resource LF Tag", }, } } From 3bca023fd8cdf52348c95ac2aa93a04a5f27630f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:08 -0500 Subject: [PATCH 089/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - lambda. --- internal/service/lambda/service_package_gen.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go index 5a365e1aec2..df09e007726 100644 --- a/internal/service/lambda/service_package_gen.go +++ b/internal/service/lambda/service_package_gen.go @@ -17,8 +17,9 @@ type servicePackage struct{} func (p *servicePackage) EphemeralResources(ctx context.Context) []*types.ServicePackageEphemeralResource { return []*types.ServicePackageEphemeralResource{ { - Factory: newEphemeralInvocation, - Name: "Invocation", + Factory: newEphemeralInvocation, + TypeName: "aws_lambda_invocation", + Name: "Invocation", }, } } @@ -30,12 +31,14 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceFunctionRecursionConfig, - Name: "Function Recursion Config", + Factory: newResourceFunctionRecursionConfig, + TypeName: "aws_lambda_function_recursion_config", + Name: "Function Recursion Config", }, { - Factory: newResourceRuntimeManagementConfig, - Name: "Runtime Management Config", + Factory: newResourceRuntimeManagementConfig, + TypeName: "aws_lambda_runtime_management_config", + Name: "Runtime Management Config", }, } } From f9b6cadab41a697e7474dd94cd0797cf5d8a6b3d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:08 -0500 Subject: [PATCH 090/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - lexv2models. --- .../lexv2models/service_package_gen.go | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/internal/service/lexv2models/service_package_gen.go b/internal/service/lexv2models/service_package_gen.go index b4cd15d1335..5e125cfb0f6 100644 --- a/internal/service/lexv2models/service_package_gen.go +++ b/internal/service/lexv2models/service_package_gen.go @@ -21,31 +21,37 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceBot, - Name: "Bot", + Factory: newResourceBot, + TypeName: "aws_lexv2models_bot", + Name: "Bot", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceBotLocale, - Name: "Bot Locale", + Factory: newResourceBotLocale, + TypeName: "aws_lexv2models_bot_locale", + Name: "Bot Locale", }, { - Factory: newResourceBotVersion, - Name: "Bot Version", + Factory: newResourceBotVersion, + TypeName: "aws_lexv2models_bot_version", + Name: "Bot Version", }, { - Factory: newResourceIntent, - Name: "Intent", + Factory: newResourceIntent, + TypeName: "aws_lexv2models_intent", + Name: "Intent", }, { - Factory: newResourceSlot, - Name: "Slot", + Factory: newResourceSlot, + TypeName: "aws_lexv2models_slot", + Name: "Slot", }, { - Factory: newResourceSlotType, - Name: "Slot Type", + Factory: newResourceSlotType, + TypeName: "aws_lexv2models_slot_type", + Name: "Slot Type", }, } } From 1c032d07233cecaf54d25325bc216e821f4e28f7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:08 -0500 Subject: [PATCH 091/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - logs. --- internal/service/logs/service_package_gen.go | 34 ++++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/internal/service/logs/service_package_gen.go b/internal/service/logs/service_package_gen.go index a4c45b063f2..a26708ef3be 100644 --- a/internal/service/logs/service_package_gen.go +++ b/internal/service/logs/service_package_gen.go @@ -21,40 +21,46 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newAnomalyDetectorResource, - Name: "Anomaly Detector", + Factory: newAnomalyDetectorResource, + TypeName: "aws_cloudwatch_log_anomaly_detector", + Name: "Anomaly Detector", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newDeliveryDestinationPolicyResource, - Name: "Delivery Destination Policy", - }, - { - Factory: newDeliveryDestinationResource, - Name: "Delivery Destination", + Factory: newDeliveryResource, + TypeName: "aws_cloudwatch_log_delivery", + Name: "Delivery", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newDeliveryResource, - Name: "Delivery", + Factory: newDeliveryDestinationResource, + TypeName: "aws_cloudwatch_log_delivery_destination", + Name: "Delivery Destination", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newDeliverySourceResource, - Name: "Delivery Source", + Factory: newDeliveryDestinationPolicyResource, + TypeName: "aws_cloudwatch_log_delivery_destination_policy", + Name: "Delivery Destination Policy", + }, + { + Factory: newDeliverySourceResource, + TypeName: "aws_cloudwatch_log_delivery_source", + Name: "Delivery Source", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newIndexPolicyResource, - Name: "Index Policy", + Factory: newIndexPolicyResource, + TypeName: "aws_cloudwatch_log_index_policy", + Name: "Index Policy", }, } } From 80c6ae3450350051bc3cf7c65ba95ff39e46b832 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:08 -0500 Subject: [PATCH 092/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - m2. --- internal/service/m2/service_package_gen.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/service/m2/service_package_gen.go b/internal/service/m2/service_package_gen.go index 22b74491e94..7975be7e729 100644 --- a/internal/service/m2/service_package_gen.go +++ b/internal/service/m2/service_package_gen.go @@ -21,19 +21,22 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newApplicationResource, - Name: "Application", + Factory: newApplicationResource, + TypeName: "aws_m2_application", + Name: "Application", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newDeploymentResource, - Name: "Deployment", + Factory: newDeploymentResource, + TypeName: "aws_m2_deployment", + Name: "Deployment", }, { - Factory: newEnvironmentResource, - Name: "Environment", + Factory: newEnvironmentResource, + TypeName: "aws_m2_environment", + Name: "Environment", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From ec8cce844c2535757e2e0f17dc3d41f4ad3c9537 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:09 -0500 Subject: [PATCH 093/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - medialive. --- internal/service/medialive/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/medialive/service_package_gen.go b/internal/service/medialive/service_package_gen.go index 7d69b7b55cd..ff507922a84 100644 --- a/internal/service/medialive/service_package_gen.go +++ b/internal/service/medialive/service_package_gen.go @@ -27,8 +27,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceMultiplexProgram, - Name: "Multiplex Program", + Factory: newResourceMultiplexProgram, + TypeName: "aws_medialive_multiplex_program", + Name: "Multiplex Program", }, } } From affa8cc26acbf4849035496d8372abec90b1429d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:09 -0500 Subject: [PATCH 094/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - mediapackagev2. --- internal/service/mediapackagev2/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/mediapackagev2/service_package_gen.go b/internal/service/mediapackagev2/service_package_gen.go index 2202e92f75f..229540d89f0 100644 --- a/internal/service/mediapackagev2/service_package_gen.go +++ b/internal/service/mediapackagev2/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceChannelGroup, - Name: "Channel Group", + Factory: newResourceChannelGroup, + TypeName: "aws_media_packagev2_channel_group", + Name: "Channel Group", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From fb737148cedcbbd1c347b9b142c636969d6570bc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:09 -0500 Subject: [PATCH 095/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - memorydb. --- internal/service/memorydb/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/memorydb/service_package_gen.go b/internal/service/memorydb/service_package_gen.go index 013bde84e80..d263c225ccd 100644 --- a/internal/service/memorydb/service_package_gen.go +++ b/internal/service/memorydb/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newMultiRegionClusterResource, - Name: "Multi Region Cluster", + Factory: newMultiRegionClusterResource, + TypeName: "aws_memorydb_multi_region_cluster", + Name: "Multi Region Cluster", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 33c4e37c673559e558f60f3c57b92e4bde4dead7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:10 -0500 Subject: [PATCH 096/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - networkfirewall. --- internal/service/networkfirewall/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/networkfirewall/service_package_gen.go b/internal/service/networkfirewall/service_package_gen.go index 7b74ba0a883..c8be4b23b28 100644 --- a/internal/service/networkfirewall/service_package_gen.go +++ b/internal/service/networkfirewall/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newTLSInspectionConfigurationResource, - Name: "TLS Inspection Configuration", + Factory: newTLSInspectionConfigurationResource, + TypeName: "aws_networkfirewall_tls_inspection_configuration", + Name: "TLS Inspection Configuration", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From ffc6f18b32eddfadf87cd4866183b4b69ee8c56b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:10 -0500 Subject: [PATCH 097/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - networkmanager. --- internal/service/networkmanager/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/networkmanager/service_package_gen.go b/internal/service/networkmanager/service_package_gen.go index 1ff32c0ac3d..e1ef0b80f1e 100644 --- a/internal/service/networkmanager/service_package_gen.go +++ b/internal/service/networkmanager/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newDirectConnectGatewayAttachmentResource, - Name: "Direct Connect Gateway Attachment", + Factory: newDirectConnectGatewayAttachmentResource, + TypeName: "aws_networkmanager_dx_gateway_attachment", + Name: "Direct Connect Gateway Attachment", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From b5350b19365985fc3ead772592acb675c6c8eed9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:10 -0500 Subject: [PATCH 098/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - networkmonitor. --- internal/service/networkmonitor/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/networkmonitor/service_package_gen.go b/internal/service/networkmonitor/service_package_gen.go index 77505ac4bb0..35b3a5bdb8f 100644 --- a/internal/service/networkmonitor/service_package_gen.go +++ b/internal/service/networkmonitor/service_package_gen.go @@ -21,15 +21,17 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newMonitorResource, - Name: "Monitor", + Factory: newMonitorResource, + TypeName: "aws_networkmonitor_monitor", + Name: "Monitor", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newProbeResource, - Name: "Probe", + Factory: newProbeResource, + TypeName: "aws_networkmonitor_probe", + Name: "Probe", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 535d02a74836ff91eee86cfeb28b790683a07843 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:10 -0500 Subject: [PATCH 099/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - opensearch. --- internal/service/opensearch/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/opensearch/service_package_gen.go b/internal/service/opensearch/service_package_gen.go index 3888c61ed64..7efdf5b3926 100644 --- a/internal/service/opensearch/service_package_gen.go +++ b/internal/service/opensearch/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceAuthorizeVPCEndpointAccess, - Name: "Authorize VPC Endpoint Access", + Factory: newResourceAuthorizeVPCEndpointAccess, + TypeName: "aws_opensearch_authorize_vpc_endpoint_access", + Name: "Authorize VPC Endpoint Access", }, } } From 0969fde3f42a4ca90db11902a5a69853f3a8c94c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:10 -0500 Subject: [PATCH 100/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - opensearchserverless. --- .../service_package_gen.go | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/internal/service/opensearchserverless/service_package_gen.go b/internal/service/opensearchserverless/service_package_gen.go index 29817943b2e..cd21cad0914 100644 --- a/internal/service/opensearchserverless/service_package_gen.go +++ b/internal/service/opensearchserverless/service_package_gen.go @@ -38,31 +38,37 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceAccessPolicy, - Name: "Access Policy", + Factory: newResourceAccessPolicy, + TypeName: "aws_opensearchserverless_access_policy", + Name: "Access Policy", }, { - Factory: newResourceCollection, - Name: "Collection", + Factory: newResourceCollection, + TypeName: "aws_opensearchserverless_collection", + Name: "Collection", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceLifecyclePolicy, - Name: "Lifecycle Policy", + Factory: newResourceLifecyclePolicy, + TypeName: "aws_opensearchserverless_lifecycle_policy", + Name: "Lifecycle Policy", }, { - Factory: newResourceSecurityConfig, - Name: "Security Config", + Factory: newResourceSecurityConfig, + TypeName: "aws_opensearchserverless_security_config", + Name: "Security Config", }, { - Factory: newResourceSecurityPolicy, - Name: "Security Policy", + Factory: newResourceSecurityPolicy, + TypeName: "aws_opensearchserverless_security_policy", + Name: "Security Policy", }, { - Factory: newVPCEndpointResource, - Name: "VPC Endpoint", + Factory: newVPCEndpointResource, + TypeName: "aws_opensearchserverless_vpc_endpoint", + Name: "VPC Endpoint", }, } } From b446350c5e6e67de8db3c847efde374d19bd1c27 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:11 -0500 Subject: [PATCH 101/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - osis. --- internal/service/osis/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/osis/service_package_gen.go b/internal/service/osis/service_package_gen.go index a254af32061..0170ba20609 100644 --- a/internal/service/osis/service_package_gen.go +++ b/internal/service/osis/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newPipelineResource, - Name: "Pipeline", + Factory: newPipelineResource, + TypeName: "aws_osis_pipeline", + Name: "Pipeline", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: "pipeline_arn", }, From de79513b61d60f52872c18bbb467bc5eec483bc5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:11 -0500 Subject: [PATCH 102/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - paymentcryptography. --- .../service/paymentcryptography/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/paymentcryptography/service_package_gen.go b/internal/service/paymentcryptography/service_package_gen.go index dcd333da567..6013f79fce2 100644 --- a/internal/service/paymentcryptography/service_package_gen.go +++ b/internal/service/paymentcryptography/service_package_gen.go @@ -21,15 +21,17 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceKey, - Name: "Key", + Factory: newResourceKey, + TypeName: "aws_paymentcryptography_key", + Name: "Key", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceKeyAlias, - Name: "Key Alias", + Factory: newResourceKeyAlias, + TypeName: "aws_paymentcryptography_key_alias", + Name: "Key Alias", }, } } From bf02fa2ec0763264dc79916a4d8399853303253a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:11 -0500 Subject: [PATCH 103/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - pinpoint. --- internal/service/pinpoint/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/pinpoint/service_package_gen.go b/internal/service/pinpoint/service_package_gen.go index 99915cbda9c..24dbe8dfaab 100644 --- a/internal/service/pinpoint/service_package_gen.go +++ b/internal/service/pinpoint/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceEmailTemplate, - Name: "Email Template", + Factory: newResourceEmailTemplate, + TypeName: "aws_pinpoint_email_template", + Name: "Email Template", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From c1242c3ba0fba7f830737106131fac175ec974b7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:11 -0500 Subject: [PATCH 104/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - pinpointsmsvoicev2. --- .../pinpointsmsvoicev2/service_package_gen.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/service/pinpointsmsvoicev2/service_package_gen.go b/internal/service/pinpointsmsvoicev2/service_package_gen.go index fb69f9d27cb..222dd5b7293 100644 --- a/internal/service/pinpointsmsvoicev2/service_package_gen.go +++ b/internal/service/pinpointsmsvoicev2/service_package_gen.go @@ -21,22 +21,25 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newConfigurationSetResource, - Name: "Configuration Set", + Factory: newConfigurationSetResource, + TypeName: "aws_pinpointsmsvoicev2_configuration_set", + Name: "Configuration Set", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newOptOutListResource, - Name: "Opt-out List", + Factory: newOptOutListResource, + TypeName: "aws_pinpointsmsvoicev2_opt_out_list", + Name: "Opt-out List", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newPhoneNumberResource, - Name: "Phone Number", + Factory: newPhoneNumberResource, + TypeName: "aws_pinpointsmsvoicev2_phone_number", + Name: "Phone Number", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From c076b15cf189fcb211cbfc32b45a73a1447a0105 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:12 -0500 Subject: [PATCH 105/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - quicksight. --- .../service/quicksight/service_package_gen.go | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/internal/service/quicksight/service_package_gen.go b/internal/service/quicksight/service_package_gen.go index 7215f4ace01..bf9dbfd1354 100644 --- a/internal/service/quicksight/service_package_gen.go +++ b/internal/service/quicksight/service_package_gen.go @@ -21,35 +21,42 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newFolderMembershipResource, - Name: "Folder Membership", + Factory: newFolderMembershipResource, + TypeName: "aws_quicksight_folder_membership", + Name: "Folder Membership", }, { - Factory: newIAMPolicyAssignmentResource, - Name: "IAM Policy Assignment", + Factory: newIAMPolicyAssignmentResource, + TypeName: "aws_quicksight_iam_policy_assignment", + Name: "IAM Policy Assignment", }, { - Factory: newIngestionResource, - Name: "Ingestion", + Factory: newIngestionResource, + TypeName: "aws_quicksight_ingestion", + Name: "Ingestion", }, { - Factory: newNamespaceResource, - Name: "Namespace", + Factory: newNamespaceResource, + TypeName: "aws_quicksight_namespace", + Name: "Namespace", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newRefreshScheduleResource, - Name: "Refresh Schedule", + Factory: newRefreshScheduleResource, + TypeName: "aws_quicksight_refresh_schedule", + Name: "Refresh Schedule", }, { - Factory: newTemplateAliasResource, - Name: "Template Alias", + Factory: newTemplateAliasResource, + TypeName: "aws_quicksight_template_alias", + Name: "Template Alias", }, { - Factory: newVPCConnectionResource, - Name: "VPC Connection", + Factory: newVPCConnectionResource, + TypeName: "aws_quicksight_vpc_connection", + Name: "VPC Connection", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 6fde61899e598201586d681efca9ebc1ef5618c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:12 -0500 Subject: [PATCH 106/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - rds. --- internal/service/rds/service_package_gen.go | 28 ++++++++++++--------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/internal/service/rds/service_package_gen.go b/internal/service/rds/service_package_gen.go index 641586ee6db..fe48526034c 100644 --- a/internal/service/rds/service_package_gen.go +++ b/internal/service/rds/service_package_gen.go @@ -26,26 +26,30 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newIntegrationResource, - Name: "Integration", + Factory: newResourceClusterSnapshotCopy, + TypeName: "aws_rds_cluster_snapshot_copy", + Name: "Cluster Snapshot Copy", Tags: &types.ServicePackageResourceTags{ - IdentifierAttribute: names.AttrARN, + IdentifierAttribute: "db_cluster_snapshot_arn", }, }, { - Factory: newResourceClusterSnapshotCopy, - Name: "Cluster Snapshot Copy", - Tags: &types.ServicePackageResourceTags{ - IdentifierAttribute: "db_cluster_snapshot_arn", - }, + Factory: newResourceExportTask, + TypeName: "aws_rds_export_task", + Name: "Export Task", }, { - Factory: newResourceExportTask, - Name: "Export Task", + Factory: newResourceInstanceState, + TypeName: "aws_rds_instance_state", + Name: "Instance State", }, { - Factory: newResourceInstanceState, - Name: "Instance State", + Factory: newIntegrationResource, + TypeName: "aws_rds_integration", + Name: "Integration", + Tags: &types.ServicePackageResourceTags{ + IdentifierAttribute: names.AttrARN, + }, }, } } From ff117b8f1913b8cdd0d7bad89c2bd7fe53f11909 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:12 -0500 Subject: [PATCH 107/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - redshift. --- .../service/redshift/service_package_gen.go | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/internal/service/redshift/service_package_gen.go b/internal/service/redshift/service_package_gen.go index eaf48a85d0f..17ec5ba2c35 100644 --- a/internal/service/redshift/service_package_gen.go +++ b/internal/service/redshift/service_package_gen.go @@ -30,20 +30,24 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceDataShareAuthorization, - Name: "Data Share Authorization", + Factory: newResourceDataShareAuthorization, + TypeName: "aws_redshift_data_share_authorization", + Name: "Data Share Authorization", }, { - Factory: newResourceDataShareConsumerAssociation, - Name: "Data Share Consumer Association", + Factory: newResourceDataShareConsumerAssociation, + TypeName: "aws_redshift_data_share_consumer_association", + Name: "Data Share Consumer Association", }, { - Factory: newResourceLogging, - Name: "Logging", + Factory: newResourceLogging, + TypeName: "aws_redshift_logging", + Name: "Logging", }, { - Factory: newResourceSnapshotCopy, - Name: "Snapshot Copy", + Factory: newResourceSnapshotCopy, + TypeName: "aws_redshift_snapshot_copy", + Name: "Snapshot Copy", }, } } From 5857802c60ed65fa83801f694d55a82265939ac0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:12 -0500 Subject: [PATCH 108/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - redshiftserverless. --- internal/service/redshiftserverless/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/redshiftserverless/service_package_gen.go b/internal/service/redshiftserverless/service_package_gen.go index d2ddac41150..609777d8cfc 100644 --- a/internal/service/redshiftserverless/service_package_gen.go +++ b/internal/service/redshiftserverless/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newCustomDomainAssociationResource, - Name: "Custom Domain Association", + Factory: newCustomDomainAssociationResource, + TypeName: "aws_redshiftserverless_custom_domain_association", + Name: "Custom Domain Association", }, } } From d7158f0a71687b6a5f8773727ea13cce04beafee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:13 -0500 Subject: [PATCH 109/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - rekognition. --- .../service/rekognition/service_package_gen.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/service/rekognition/service_package_gen.go b/internal/service/rekognition/service_package_gen.go index c41ca1a544a..58b5f48d4b6 100644 --- a/internal/service/rekognition/service_package_gen.go +++ b/internal/service/rekognition/service_package_gen.go @@ -21,19 +21,22 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceCollection, - Name: "Collection", + Factory: newResourceCollection, + TypeName: "aws_rekognition_collection", + Name: "Collection", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceProject, - Name: "Project", + Factory: newResourceProject, + TypeName: "aws_rekognition_project", + Name: "Project", }, { - Factory: newResourceStreamProcessor, - Name: "Stream Processor", + Factory: newResourceStreamProcessor, + TypeName: "aws_rekognition_stream_processor", + Name: "Stream Processor", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: "stream_processor_arn", }, From 6d88e080075063721582ff6db07f7f9f73556080 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:13 -0500 Subject: [PATCH 110/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - resiliencehub. --- internal/service/resiliencehub/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/resiliencehub/service_package_gen.go b/internal/service/resiliencehub/service_package_gen.go index d551d2e14c1..927e9d4043f 100644 --- a/internal/service/resiliencehub/service_package_gen.go +++ b/internal/service/resiliencehub/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceResiliencyPolicy, - Name: "Resiliency Policy", + Factory: newResourceResiliencyPolicy, + TypeName: "aws_resiliencehub_resiliency_policy", + Name: "Resiliency Policy", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 7105d7431a62536d434334dbea8298634402b1a6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:13 -0500 Subject: [PATCH 111/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - resourceexplorer2. --- .../service/resourceexplorer2/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/resourceexplorer2/service_package_gen.go b/internal/service/resourceexplorer2/service_package_gen.go index 94974560e57..d5805458c67 100644 --- a/internal/service/resourceexplorer2/service_package_gen.go +++ b/internal/service/resourceexplorer2/service_package_gen.go @@ -26,15 +26,17 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newIndexResource, - Name: "Index", + Factory: newIndexResource, + TypeName: "aws_resourceexplorer2_index", + Name: "Index", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }, }, { - Factory: newViewResource, - Name: "View", + Factory: newViewResource, + TypeName: "aws_resourceexplorer2_view", + Name: "View", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }, From fcf03d78bd9030e76a9446657e5ab9ae263ebcb7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:13 -0500 Subject: [PATCH 112/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - route53. --- internal/service/route53/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/route53/service_package_gen.go b/internal/service/route53/service_package_gen.go index 1fa6c0ee856..e6027234296 100644 --- a/internal/service/route53/service_package_gen.go +++ b/internal/service/route53/service_package_gen.go @@ -28,12 +28,14 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newCIDRCollectionResource, - Name: "CIDR Collection", + Factory: newCIDRCollectionResource, + TypeName: "aws_route53_cidr_collection", + Name: "CIDR Collection", }, { - Factory: newCIDRLocationResource, - Name: "CIDR Location", + Factory: newCIDRLocationResource, + TypeName: "aws_route53_cidr_location", + Name: "CIDR Location", }, } } From af3377fbcbeba57db5c992b38aeae533fcb22f94 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:13 -0500 Subject: [PATCH 113/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - route53domains. --- internal/service/route53domains/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/route53domains/service_package_gen.go b/internal/service/route53domains/service_package_gen.go index 46cefd6eb86..d614030330a 100644 --- a/internal/service/route53domains/service_package_gen.go +++ b/internal/service/route53domains/service_package_gen.go @@ -19,8 +19,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newDelegationSignerRecordResource, - Name: "Delegation Signer Record", + Factory: newDelegationSignerRecordResource, + TypeName: "aws_route53domains_delegation_signer_record", + Name: "Delegation Signer Record", }, } } From f1ed13060ba27311f4dfcbf143cb381fd94324fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:13 -0500 Subject: [PATCH 114/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - route53profiles. --- .../route53profiles/service_package_gen.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/service/route53profiles/service_package_gen.go b/internal/service/route53profiles/service_package_gen.go index 1eb644948a0..86bc329c68d 100644 --- a/internal/service/route53profiles/service_package_gen.go +++ b/internal/service/route53profiles/service_package_gen.go @@ -26,22 +26,25 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceAssociation, - Name: "Association", + Factory: newResourceAssociation, + TypeName: "aws_route53profiles_association", + Name: "Association", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceProfile, - Name: "Profile", + Factory: newResourceProfile, + TypeName: "aws_route53profiles_profile", + Name: "Profile", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceResourceAssociation, - Name: "ResourceAssociation", + Factory: newResourceResourceAssociation, + TypeName: "aws_route53profiles_resource_association", + Name: "ResourceAssociation", }, } } From 03d4dd6bbac0687a13b68c6c14ab573360e27384 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:14 -0500 Subject: [PATCH 115/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - s3. --- internal/service/s3/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index ce97c095153..14f8a6a8ff9 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -24,8 +24,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newDirectoryBucketResource, - Name: "Directory Bucket", + Factory: newDirectoryBucketResource, + TypeName: "aws_s3_directory_bucket", + Name: "Directory Bucket", }, } } From 2f8f21d2590fab061da23beb6f38a35e199d96c4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:14 -0500 Subject: [PATCH 116/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - s3control. --- .../service/s3control/service_package_gen.go | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/internal/service/s3control/service_package_gen.go b/internal/service/s3control/service_package_gen.go index e670f0b397c..15052079dfc 100644 --- a/internal/service/s3control/service_package_gen.go +++ b/internal/service/s3control/service_package_gen.go @@ -21,23 +21,27 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newAccessGrantResource, - Name: "Access Grant", - Tags: &types.ServicePackageResourceTags{}, + Factory: newAccessGrantResource, + TypeName: "aws_s3control_access_grant", + Name: "Access Grant", + Tags: &types.ServicePackageResourceTags{}, }, { - Factory: newAccessGrantsInstanceResource, - Name: "Access Grants Instance", - Tags: &types.ServicePackageResourceTags{}, + Factory: newAccessGrantsInstanceResource, + TypeName: "aws_s3control_access_grants_instance", + Name: "Access Grants Instance", + Tags: &types.ServicePackageResourceTags{}, }, { - Factory: newAccessGrantsInstanceResourcePolicyResource, - Name: "Access Grants Instance Resource Policy", + Factory: newAccessGrantsInstanceResourcePolicyResource, + TypeName: "aws_s3control_access_grants_instance_resource_policy", + Name: "Access Grants Instance Resource Policy", }, { - Factory: newAccessGrantsLocationResource, - Name: "Access Grants Location", - Tags: &types.ServicePackageResourceTags{}, + Factory: newAccessGrantsLocationResource, + TypeName: "aws_s3control_access_grants_location", + Name: "Access Grants Location", + Tags: &types.ServicePackageResourceTags{}, }, } } From 9d88dde29ac0925d680d57c2d7d85a287885474c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:14 -0500 Subject: [PATCH 117/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - s3tables. --- .../service/s3tables/service_package_gen.go | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/internal/service/s3tables/service_package_gen.go b/internal/service/s3tables/service_package_gen.go index 24e03012b5b..e3855716d2e 100644 --- a/internal/service/s3tables/service_package_gen.go +++ b/internal/service/s3tables/service_package_gen.go @@ -21,24 +21,29 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceNamespace, - Name: "Namespace", + Factory: newResourceNamespace, + TypeName: "aws_s3tables_namespace", + Name: "Namespace", }, { - Factory: newResourceTable, - Name: "Table", + Factory: newResourceTable, + TypeName: "aws_s3tables_table", + Name: "Table", }, { - Factory: newResourceTableBucket, - Name: "Table Bucket", + Factory: newResourceTableBucket, + TypeName: "aws_s3tables_table_bucket", + Name: "Table Bucket", }, { - Factory: newResourceTableBucketPolicy, - Name: "Table Bucket Policy", + Factory: newResourceTableBucketPolicy, + TypeName: "aws_s3tables_table_bucket_policy", + Name: "Table Bucket Policy", }, { - Factory: newResourceTablePolicy, - Name: "Table Policy", + Factory: newResourceTablePolicy, + TypeName: "aws_s3tables_table_policy", + Name: "Table Policy", }, } } From 36e8d1735651c667a6ce843f18f8b141aec574f7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:14 -0500 Subject: [PATCH 118/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - secretsmanager. --- internal/service/secretsmanager/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/secretsmanager/service_package_gen.go b/internal/service/secretsmanager/service_package_gen.go index 87073019924..9d67f06291e 100644 --- a/internal/service/secretsmanager/service_package_gen.go +++ b/internal/service/secretsmanager/service_package_gen.go @@ -17,8 +17,9 @@ type servicePackage struct{} func (p *servicePackage) EphemeralResources(ctx context.Context) []*types.ServicePackageEphemeralResource { return []*types.ServicePackageEphemeralResource{ { - Factory: newEphemeralSecretVersion, - Name: "Secret Version", + Factory: newEphemeralSecretVersion, + TypeName: "aws_secretsmanager_secret_version", + Name: "Secret Version", }, } } From 36f1f2474954b66df64ab3b3c37d78da3de10d1b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:15 -0500 Subject: [PATCH 119/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - securityhub. --- internal/service/securityhub/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/securityhub/service_package_gen.go b/internal/service/securityhub/service_package_gen.go index 34b6c8ba799..3126c4154ec 100644 --- a/internal/service/securityhub/service_package_gen.go +++ b/internal/service/securityhub/service_package_gen.go @@ -26,15 +26,17 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newAutomationRuleResource, - Name: "Automation Rule", + Factory: newAutomationRuleResource, + TypeName: "aws_securityhub_automation_rule", + Name: "Automation Rule", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newStandardsControlAssociationResource, - Name: "Standards Control Association", + Factory: newStandardsControlAssociationResource, + TypeName: "aws_securityhub_standards_control_association", + Name: "Standards Control Association", }, } } From 7d14bb181025c7ff062c8f91e75df0d11f5d4ad3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:15 -0500 Subject: [PATCH 120/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - securitylake. --- .../securitylake/service_package_gen.go | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/internal/service/securitylake/service_package_gen.go b/internal/service/securitylake/service_package_gen.go index 7fd10deca17..d1c210e860d 100644 --- a/internal/service/securitylake/service_package_gen.go +++ b/internal/service/securitylake/service_package_gen.go @@ -21,31 +21,36 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newAWSLogSourceResource, - Name: "AWS Log Source", + Factory: newAWSLogSourceResource, + TypeName: "aws_securitylake_aws_log_source", + Name: "AWS Log Source", }, { - Factory: newCustomLogSourceResource, - Name: "Custom Log Source", + Factory: newCustomLogSourceResource, + TypeName: "aws_securitylake_custom_log_source", + Name: "Custom Log Source", }, { - Factory: newDataLakeResource, - Name: "Data Lake", + Factory: newDataLakeResource, + TypeName: "aws_securitylake_data_lake", + Name: "Data Lake", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newSubscriberNotificationResource, - Name: "Subscriber Notification", - }, - { - Factory: newSubscriberResource, - Name: "Subscriber", + Factory: newSubscriberResource, + TypeName: "aws_securitylake_subscriber", + Name: "Subscriber", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, + { + Factory: newSubscriberNotificationResource, + TypeName: "aws_securitylake_subscriber_notification", + Name: "Subscriber Notification", + }, } } From b2a9f7597d1fe3a4e40d7d7fee0d8aa4d2a02328 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:15 -0500 Subject: [PATCH 121/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - servicecatalogappregistry. --- .../service_package_gen.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/service/servicecatalogappregistry/service_package_gen.go b/internal/service/servicecatalogappregistry/service_package_gen.go index 037e6d95ae2..48619174098 100644 --- a/internal/service/servicecatalogappregistry/service_package_gen.go +++ b/internal/service/servicecatalogappregistry/service_package_gen.go @@ -40,22 +40,25 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceApplication, - Name: "Application", + Factory: newResourceApplication, + TypeName: "aws_servicecatalogappregistry_application", + Name: "Application", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceAttributeGroup, - Name: "Attribute Group", + Factory: newResourceAttributeGroup, + TypeName: "aws_servicecatalogappregistry_attribute_group", + Name: "Attribute Group", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, }, { - Factory: newResourceAttributeGroupAssociation, - Name: "Attribute Group Association", + Factory: newResourceAttributeGroupAssociation, + TypeName: "aws_servicecatalogappregistry_attribute_group_association", + Name: "Attribute Group Association", }, } } From 1d7c4c181b8c4b5d56ac9810395bf93a19a06987 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:15 -0500 Subject: [PATCH 122/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - servicequotas. --- internal/service/servicequotas/service_package_gen.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/servicequotas/service_package_gen.go b/internal/service/servicequotas/service_package_gen.go index d310ba2be1a..b6e33f5beeb 100644 --- a/internal/service/servicequotas/service_package_gen.go +++ b/internal/service/servicequotas/service_package_gen.go @@ -26,12 +26,14 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceTemplate, - Name: "Template", + Factory: newResourceTemplate, + TypeName: "aws_servicequotas_template", + Name: "Template", }, { - Factory: newResourceTemplateAssociation, - Name: "Template Association", + Factory: newResourceTemplateAssociation, + TypeName: "aws_servicequotas_template_association", + Name: "Template Association", }, } } From ac6e2ec9a41b99d340f4ae120e275dd862670b28 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:15 -0500 Subject: [PATCH 123/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - sesv2. --- internal/service/sesv2/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/sesv2/service_package_gen.go b/internal/service/sesv2/service_package_gen.go index 055a446a204..68f4d014b1b 100644 --- a/internal/service/sesv2/service_package_gen.go +++ b/internal/service/sesv2/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newAccountSuppressionAttributesResource, - Name: "Account Suppression Attributes", + Factory: newAccountSuppressionAttributesResource, + TypeName: "aws_sesv2_account_suppression_attributes", + Name: "Account Suppression Attributes", }, } } From e90c87fa66bf55c3aca8a58f331b21ed98372ec4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:15 -0500 Subject: [PATCH 124/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - shield. --- .../service/shield/service_package_gen.go | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/internal/service/shield/service_package_gen.go b/internal/service/shield/service_package_gen.go index 9ecf50df8b1..a8207d1281d 100644 --- a/internal/service/shield/service_package_gen.go +++ b/internal/service/shield/service_package_gen.go @@ -24,24 +24,29 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newApplicationLayerAutomaticResponseResource, - Name: "Application Layer Automatic Response", + Factory: newApplicationLayerAutomaticResponseResource, + TypeName: "aws_shield_application_layer_automatic_response", + Name: "Application Layer Automatic Response", }, { - Factory: newDRTAccessLogBucketAssociationResource, - Name: "DRT Log Bucket Association", + Factory: newDRTAccessLogBucketAssociationResource, + TypeName: "aws_shield_drt_access_log_bucket_association", + Name: "DRT Log Bucket Association", }, { - Factory: newDRTAccessRoleARNAssociationResource, - Name: "DRT Role ARN Association", + Factory: newDRTAccessRoleARNAssociationResource, + TypeName: "aws_shield_drt_access_role_arn_association", + Name: "DRT Role ARN Association", }, { - Factory: newProactiveEngagementResource, - Name: "Proactive Engagement", + Factory: newProactiveEngagementResource, + TypeName: "aws_shield_proactive_engagement", + Name: "Proactive Engagement", }, { - Factory: newResourceSubscription, - Name: "Subscription", + Factory: newResourceSubscription, + TypeName: "aws_shield_subscription", + Name: "Subscription", }, } } From 1e9890295a1cf31ae4ba38a6d64fba8b375f41b6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:16 -0500 Subject: [PATCH 125/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - simpledb. --- internal/service/simpledb/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/simpledb/service_package_gen.go b/internal/service/simpledb/service_package_gen.go index b5ed35176fb..e8e78c4972d 100644 --- a/internal/service/simpledb/service_package_gen.go +++ b/internal/service/simpledb/service_package_gen.go @@ -19,8 +19,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newDomainResource, - Name: "Domain", + Factory: newDomainResource, + TypeName: "aws_simpledb_domain", + Name: "Domain", }, } } From 79ad56c4632f792313e2d0965ff9650382854a10 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:16 -0500 Subject: [PATCH 126/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - ssm. --- internal/service/ssm/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/ssm/service_package_gen.go b/internal/service/ssm/service_package_gen.go index c5fb3134a8e..b19b615c53f 100644 --- a/internal/service/ssm/service_package_gen.go +++ b/internal/service/ssm/service_package_gen.go @@ -17,8 +17,9 @@ type servicePackage struct{} func (p *servicePackage) EphemeralResources(ctx context.Context) []*types.ServicePackageEphemeralResource { return []*types.ServicePackageEphemeralResource{ { - Factory: newEphemeralParameter, - Name: "Parameter", + Factory: newEphemeralParameter, + TypeName: "aws_ssm_parameter", + Name: "Parameter", }, } } From b40e099d6d83f099aaf2004352eba572ecaf613c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:16 -0500 Subject: [PATCH 127/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - ssmcontacts. --- internal/service/ssmcontacts/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/ssmcontacts/service_package_gen.go b/internal/service/ssmcontacts/service_package_gen.go index 5d7e59e1c4c..36c45f73aff 100644 --- a/internal/service/ssmcontacts/service_package_gen.go +++ b/internal/service/ssmcontacts/service_package_gen.go @@ -29,8 +29,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceRotation, - Name: "Rotation", + Factory: newResourceRotation, + TypeName: "aws_ssmcontacts_rotation", + Name: "Rotation", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 72d0dc649eece200400d2d40a74b60cdb18521ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:16 -0500 Subject: [PATCH 128/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - ssmquicksetup. --- internal/service/ssmquicksetup/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/ssmquicksetup/service_package_gen.go b/internal/service/ssmquicksetup/service_package_gen.go index a45637a6984..363d9c0fafe 100644 --- a/internal/service/ssmquicksetup/service_package_gen.go +++ b/internal/service/ssmquicksetup/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceConfigurationManager, - Name: "Configuration Manager", + Factory: newResourceConfigurationManager, + TypeName: "aws_ssmquicksetup_configuration_manager", + Name: "Configuration Manager", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: "manager_arn", }, From 2bccd1369392b962b0311af5aeead7e3ebcc00c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:17 -0500 Subject: [PATCH 129/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - ssoadmin. --- .../service/ssoadmin/service_package_gen.go | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/internal/service/ssoadmin/service_package_gen.go b/internal/service/ssoadmin/service_package_gen.go index 456f1ab0b8b..b04a781efa7 100644 --- a/internal/service/ssoadmin/service_package_gen.go +++ b/internal/service/ssoadmin/service_package_gen.go @@ -40,26 +40,31 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceApplication, - Name: "Application", - Tags: &types.ServicePackageResourceTags{}, + Factory: newResourceApplication, + TypeName: "aws_ssoadmin_application", + Name: "Application", + Tags: &types.ServicePackageResourceTags{}, }, { - Factory: newResourceApplicationAccessScope, - Name: "Application Access Scope", + Factory: newResourceApplicationAccessScope, + TypeName: "aws_ssoadmin_application_access_scope", + Name: "Application Access Scope", }, { - Factory: newResourceApplicationAssignment, - Name: "Application Assignment", + Factory: newResourceApplicationAssignment, + TypeName: "aws_ssoadmin_application_assignment", + Name: "Application Assignment", }, { - Factory: newResourceApplicationAssignmentConfiguration, - Name: "Application Assignment Configuration", + Factory: newResourceApplicationAssignmentConfiguration, + TypeName: "aws_ssoadmin_application_assignment_configuration", + Name: "Application Assignment Configuration", }, { - Factory: newResourceTrustedTokenIssuer, - Name: "Trusted Token Issuer", - Tags: &types.ServicePackageResourceTags{}, + Factory: newResourceTrustedTokenIssuer, + TypeName: "aws_ssoadmin_trusted_token_issuer", + Name: "Trusted Token Issuer", + Tags: &types.ServicePackageResourceTags{}, }, } } From fbba0c76c59365cf9abd2646d7df0f7eae7b010c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:17 -0500 Subject: [PATCH 130/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - timestreaminfluxdb. --- internal/service/timestreaminfluxdb/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/timestreaminfluxdb/service_package_gen.go b/internal/service/timestreaminfluxdb/service_package_gen.go index a2e1ba818bb..59a9ac6fc86 100644 --- a/internal/service/timestreaminfluxdb/service_package_gen.go +++ b/internal/service/timestreaminfluxdb/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceDBInstance, - Name: "DB Instance", + Factory: newResourceDBInstance, + TypeName: "aws_timestreaminfluxdb_db_instance", + Name: "DB Instance", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 123af1226b7f1cb70a31d8f7e1589b3909321fe8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:18 -0500 Subject: [PATCH 131/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - verifiedpermissions. --- .../service_package_gen.go | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/internal/service/verifiedpermissions/service_package_gen.go b/internal/service/verifiedpermissions/service_package_gen.go index ce18b04e163..0016722f37f 100644 --- a/internal/service/verifiedpermissions/service_package_gen.go +++ b/internal/service/verifiedpermissions/service_package_gen.go @@ -26,24 +26,29 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceIdentitySource, - Name: "Identity Source", + Factory: newResourceIdentitySource, + TypeName: "aws_verifiedpermissions_identity_source", + Name: "Identity Source", }, { - Factory: newResourcePolicy, - Name: "Policy", + Factory: newResourcePolicy, + TypeName: "aws_verifiedpermissions_policy", + Name: "Policy", }, { - Factory: newResourcePolicyStore, - Name: "Policy Store", + Factory: newResourcePolicyStore, + TypeName: "aws_verifiedpermissions_policy_store", + Name: "Policy Store", }, { - Factory: newResourcePolicyTemplate, - Name: "Policy Template", + Factory: newResourcePolicyTemplate, + TypeName: "aws_verifiedpermissions_policy_template", + Name: "Policy Template", }, { - Factory: newResourceSchema, - Name: "Schema", + Factory: newResourceSchema, + TypeName: "aws_verifiedpermissions_schema", + Name: "Schema", }, } } From d8ac215de1f32934f2ba6f98e417cedb075eb392 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:18 -0500 Subject: [PATCH 132/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - vpclattice. --- internal/service/vpclattice/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/vpclattice/service_package_gen.go b/internal/service/vpclattice/service_package_gen.go index c0711021385..931e49d72f4 100644 --- a/internal/service/vpclattice/service_package_gen.go +++ b/internal/service/vpclattice/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newResourceGatewayResource, - Name: "Resource Gateway", + Factory: newResourceGatewayResource, + TypeName: "aws_vpclattice_resource_gateway", + Name: "Resource Gateway", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }, From 0d53198a5ad15e72bfcca917e46ae9dcb2f7254c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 15 Jan 2025 13:16:18 -0500 Subject: [PATCH 133/133] Emit type name values for 'EphemeralResource' and 'FrameworkResource' - workspaces. --- internal/service/workspaces/service_package_gen.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/workspaces/service_package_gen.go b/internal/service/workspaces/service_package_gen.go index 0b436e16392..a02c71a3479 100644 --- a/internal/service/workspaces/service_package_gen.go +++ b/internal/service/workspaces/service_package_gen.go @@ -21,8 +21,9 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ { - Factory: newConnectionAliasResource, - Name: "Connection Alias", + Factory: newConnectionAliasResource, + TypeName: "aws_workspaces_connection_alias", + Name: "Connection Alias", Tags: &types.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, },