From 30eeb87ea98bb8cb5e5c240b446fa4274fdf0a3c Mon Sep 17 00:00:00 2001
From: Tom McCarthy <thommcc@amazon.com>
Date: Fri, 11 Oct 2019 23:50:57 +0200
Subject: [PATCH 1/3] feat: propagate tags set on function resources to
 generated iam roles

Update IAMRole resource to accept tags property
Update _construct_role method on SamFunction resource to pass tags to IAMRole
---
 samtranslator/model/iam.py           | 5 +++--
 samtranslator/model/sam_resources.py | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/samtranslator/model/iam.py b/samtranslator/model/iam.py
index fe39be9623..b1653a26e1 100644
--- a/samtranslator/model/iam.py
+++ b/samtranslator/model/iam.py
@@ -1,5 +1,5 @@
 from samtranslator.model import PropertyType, Resource
-from samtranslator.model.types import is_type, is_str
+from samtranslator.model.types import is_type, is_str, list_of
 from samtranslator.model.intrinsics import ref, fnGetAtt
 
 
@@ -10,7 +10,8 @@ class IAMRole(Resource):
             'ManagedPolicyArns': PropertyType(False, is_type(list)),
             'Path': PropertyType(False, is_str()),
             'Policies': PropertyType(False, is_type(list)),
-            'PermissionsBoundary': PropertyType(False, is_str())
+            'PermissionsBoundary': PropertyType(False, is_str()),
+            'Tags': PropertyType(False, list_of(is_type(dict))),
     }
 
     runtime_attrs = {
diff --git a/samtranslator/model/sam_resources.py b/samtranslator/model/sam_resources.py
index 79423b5396..a4a371784d 100644
--- a/samtranslator/model/sam_resources.py
+++ b/samtranslator/model/sam_resources.py
@@ -269,6 +269,7 @@ def _construct_role(self, managed_policy_map):
         execution_role.ManagedPolicyArns = list(managed_policy_arns)
         execution_role.Policies = policy_documents or None
         execution_role.PermissionsBoundary = self.PermissionsBoundary
+        execution_role.Tags = self._construct_tag_list(self.Tags)
 
         return execution_role
 

From 44a4d8d6708a282aa85408d69d6794f2a5cceeb7 Mon Sep 17 00:00:00 2001
From: Tom McCarthy <thommcc@amazon.com>
Date: Fri, 11 Oct 2019 23:55:02 +0200
Subject: [PATCH 2/3] feat: propagate tags set on function resources to
 generated iam roles

Update translator tests outputs to expect "tags" on generated iam roles
---
 tests/translator/output/alexa_skill.json      |  8 ++-
 .../output/alexa_skill_with_skill_id.json     | 10 ++-
 .../output/all_policy_templates.json          |  6 ++
 tests/translator/output/api_cache.json        |  8 ++-
 .../output/api_endpoint_configuration.json    |  8 ++-
 .../translator/output/api_request_model.json  |  8 ++-
 .../output/api_request_model_openapi_3.json   |  8 ++-
 .../output/api_with_access_log_setting.json   |  6 ++
 .../api_with_apikey_default_override.json     | 30 ++++++--
 .../output/api_with_apikey_required.json      |  8 ++-
 .../api_with_apikey_required_openapi_3.json   |  8 ++-
 .../output/api_with_auth_all_maximum.json     |  8 ++-
 .../api_with_auth_all_maximum_openapi_3.json  |  8 ++-
 .../output/api_with_auth_all_minimum.json     | 16 ++++-
 .../api_with_auth_all_minimum_openapi.json    | 16 ++++-
 .../api_with_auth_and_conditions_all_max.json | 16 ++++-
 .../output/api_with_auth_no_default.json      | 16 ++++-
 .../api_with_aws_account_blacklist.json       |  8 ++-
 .../api_with_aws_account_whitelist.json       |  8 ++-
 .../api_with_aws_iam_auth_overrides.json      | 72 ++++++++++++++++---
 .../output/api_with_basic_custom_domain.json  |  8 ++-
 ...i_with_basic_custom_domain_intrinsics.json |  8 ++-
 .../output/api_with_binary_media_types.json   |  8 ++-
 .../output/api_with_canary_setting.json       |  6 ++
 tests/translator/output/api_with_cors.json    | 24 ++++++-
 ..._with_cors_and_auth_no_preflight_auth.json | 16 ++++-
 ...api_with_cors_and_auth_preflight_auth.json | 16 ++++-
 ...cors_and_conditions_no_definitionbody.json | 16 ++++-
 ..._with_cors_and_only_credentials_false.json |  8 ++-
 .../api_with_cors_and_only_headers.json       |  8 ++-
 .../output/api_with_cors_and_only_maxage.json |  8 ++-
 .../api_with_cors_and_only_methods.json       |  8 ++-
 .../api_with_cors_and_only_origins.json       |  8 ++-
 .../api_with_cors_no_definitionbody.json      |  6 ++
 .../output/api_with_cors_openapi_3.json       | 24 ++++++-
 .../api_with_custom_domain_route53.json       |  8 ++-
 .../output/api_with_default_aws_iam_auth.json |  6 ++
 ...efault_aws_iam_auth_and_no_auth_route.json |  6 ++
 .../output/api_with_gateway_responses.json    |  6 ++
 .../api_with_gateway_responses_all.json       |  6 ++
 ..._with_gateway_responses_all_openapi_3.json |  8 ++-
 .../api_with_gateway_responses_implicit.json  |  6 ++
 .../api_with_gateway_responses_minimal.json   |  6 ++
 ..._gateway_responses_string_status_code.json |  6 ++
 .../api_with_incompatible_stage_name.json     | 16 ++++-
 .../output/api_with_ip_range_blacklist.json   |  8 ++-
 .../output/api_with_ip_range_whitelist.json   |  8 ++-
 .../output/api_with_method_aws_iam_auth.json  |  6 ++
 .../output/api_with_method_settings.json      |  8 ++-
 .../api_with_minimum_compression_size.json    |  8 ++-
 .../output/api_with_open_api_version.json     |  8 ++-
 .../output/api_with_open_api_version_2.json   |  8 ++-
 ..._with_openapi_definition_body_no_flag.json |  8 ++-
 .../output/api_with_path_parameters.json      |  6 ++
 .../output/api_with_resource_policy.json      |  8 ++-
 .../api_with_resource_policy_global.json      |  8 ++-
 ..._with_resource_policy_global_implicit.json |  8 ++-
 .../output/api_with_resource_refs.json        |  8 ++-
 .../output/api_with_source_vpc_blacklist.json |  8 ++-
 .../output/api_with_source_vpc_whitelist.json |  8 ++-
 ...pi_with_swagger_and_openapi_with_auth.json |  8 ++-
 .../output/api_with_xray_tracing.json         |  6 ++
 .../translator/output/aws-cn/alexa_skill.json |  8 ++-
 .../aws-cn/alexa_skill_with_skill_id.json     |  8 ++-
 .../output/aws-cn/all_policy_templates.json   |  6 ++
 tests/translator/output/aws-cn/api_cache.json |  8 ++-
 .../aws-cn/api_endpoint_configuration.json    |  8 ++-
 .../output/aws-cn/api_request_model.json      |  8 ++-
 .../aws-cn/api_request_model_openapi_3.json   |  8 ++-
 .../aws-cn/api_with_access_log_setting.json   |  6 ++
 .../api_with_apikey_default_override.json     | 18 +++++
 .../aws-cn/api_with_apikey_required.json      |  6 ++
 .../api_with_apikey_required_openapi_3.json   |  8 ++-
 .../aws-cn/api_with_auth_all_maximum.json     |  8 ++-
 .../api_with_auth_all_maximum_openapi_3.json  |  8 ++-
 .../aws-cn/api_with_auth_all_minimum.json     | 16 ++++-
 .../api_with_auth_all_minimum_openapi.json    | 16 ++++-
 .../api_with_auth_and_conditions_all_max.json | 16 ++++-
 .../aws-cn/api_with_auth_no_default.json      | 16 ++++-
 .../api_with_aws_account_blacklist.json       |  8 ++-
 .../api_with_aws_account_whitelist.json       |  8 ++-
 .../api_with_aws_iam_auth_overrides.json      | 72 ++++++++++++++++---
 .../aws-cn/api_with_basic_custom_domain.json  |  8 ++-
 ...i_with_basic_custom_domain_intrinsics.json |  8 ++-
 .../aws-cn/api_with_binary_media_types.json   |  8 ++-
 .../aws-cn/api_with_canary_setting.json       |  6 ++
 .../output/aws-cn/api_with_cors.json          | 24 ++++++-
 ..._with_cors_and_auth_no_preflight_auth.json | 16 ++++-
 ...api_with_cors_and_auth_preflight_auth.json | 16 ++++-
 ...cors_and_conditions_no_definitionbody.json | 16 ++++-
 ..._with_cors_and_only_credentials_false.json |  8 ++-
 .../api_with_cors_and_only_headers.json       |  8 ++-
 .../aws-cn/api_with_cors_and_only_maxage.json |  8 ++-
 .../api_with_cors_and_only_methods.json       |  8 ++-
 .../api_with_cors_and_only_origins.json       |  8 ++-
 .../api_with_cors_no_definitionbody.json      |  6 ++
 .../aws-cn/api_with_cors_openapi_3.json       | 24 ++++++-
 .../api_with_custom_domain_route53.json       |  8 ++-
 .../aws-cn/api_with_default_aws_iam_auth.json |  6 ++
 ...efault_aws_iam_auth_and_no_auth_route.json |  6 ++
 .../aws-cn/api_with_gateway_responses.json    |  6 ++
 .../api_with_gateway_responses_all.json       |  6 ++
 ..._with_gateway_responses_all_openapi_3.json |  8 ++-
 .../api_with_gateway_responses_implicit.json  |  6 ++
 .../api_with_gateway_responses_minimal.json   |  6 ++
 ..._gateway_responses_string_status_code.json |  6 ++
 .../api_with_incompatible_stage_name.json     | 16 ++++-
 .../aws-cn/api_with_ip_range_blacklist.json   |  8 ++-
 .../aws-cn/api_with_ip_range_whitelist.json   |  8 ++-
 .../aws-cn/api_with_method_aws_iam_auth.json  |  6 ++
 .../aws-cn/api_with_method_settings.json      |  8 ++-
 .../api_with_minimum_compression_size.json    |  8 ++-
 .../aws-cn/api_with_open_api_version.json     |  8 ++-
 .../aws-cn/api_with_open_api_version_2.json   |  8 ++-
 ..._with_openapi_definition_body_no_flag.json |  8 ++-
 .../aws-cn/api_with_path_parameters.json      |  6 ++
 .../aws-cn/api_with_resource_policy.json      |  8 ++-
 .../api_with_resource_policy_global.json      |  8 ++-
 ..._with_resource_policy_global_implicit.json |  8 ++-
 .../output/aws-cn/api_with_resource_refs.json |  8 ++-
 .../aws-cn/api_with_source_vpc_blacklist.json |  8 ++-
 .../aws-cn/api_with_source_vpc_whitelist.json |  8 ++-
 ...pi_with_swagger_and_openapi_with_auth.json |  8 ++-
 .../output/aws-cn/api_with_xray_tracing.json  |  6 ++
 .../output/aws-cn/basic_function.json         | 54 +++++++++++---
 .../aws-cn/basic_function_with_tags.json      | 27 ++++++-
 .../aws-cn/cloudwatch_logs_with_ref.json      |  6 ++
 .../output/aws-cn/cloudwatchevent.json        | 16 ++++-
 .../cloudwatchevent_schedule_properties.json  | 16 ++++-
 .../output/aws-cn/cloudwatchlog.json          |  6 ++
 .../aws-cn/cognito_userpool_with_event.json   |  6 ++
 .../translator/output/aws-cn/depends_on.json  |  6 ++
 .../output/aws-cn/explicit_api.json           |  9 ++-
 .../output/aws-cn/explicit_api_openapi_3.json |  9 ++-
 ...plicit_api_with_invalid_events_config.json |  8 ++-
 .../output/aws-cn/function_concurrency.json   | 12 ++++
 .../aws-cn/function_event_conditions.json     | 14 +++-
 .../function_managed_inline_policy.json       |  8 ++-
 .../output/aws-cn/function_with_alias.json    |  8 ++-
 ...function_with_alias_and_event_sources.json |  8 ++-
 .../function_with_alias_intrinsics.json       |  8 ++-
 .../aws-cn/function_with_batch_window.json    |  6 ++
 .../aws-cn/function_with_condition.json       |  8 ++-
 ...ction_with_conditional_managed_policy.json |  6 ++
 ...ional_managed_policy_and_ref_no_value.json |  6 ++
 ...tion_with_conditional_policy_template.json |  6 ++
 ...onal_policy_template_and_ref_no_value.json |  6 ++
 ...stom_codedeploy_deployment_preference.json | 56 +++++++++++++--
 ...onal_codedeploy_deployment_preference.json |  8 ++-
 ...ction_with_deployment_and_custom_role.json |  8 ++-
 ...ction_with_deployment_no_service_role.json | 16 ++++-
 .../function_with_deployment_preference.json  |  8 ++-
 ..._deployment_preference_all_parameters.json | 24 ++++++-
 ...ment_preference_multiple_combinations.json | 40 +++++++++--
 ...n_with_disabled_deployment_preference.json |  8 ++-
 .../output/aws-cn/function_with_dlq.json      | 12 ++++
 .../aws-cn/function_with_global_layers.json   |  6 ++
 .../aws-cn/function_with_kmskeyarn.json       | 12 ++++
 .../output/aws-cn/function_with_layers.json   | 32 +++++++--
 .../aws-cn/function_with_many_layers.json     |  8 ++-
 .../function_with_permissions_boundary.json   |  8 ++-
 .../function_with_policy_templates.json       | 18 +++++
 .../function_with_request_parameters.json     | 12 ++++
 .../aws-cn/function_with_resource_refs.json   | 16 ++++-
 ..._with_sns_event_source_all_parameters.json |  6 ++
 .../global_handle_path_level_parameter.json   |  6 ++
 .../output/aws-cn/globals_for_api.json        |  8 ++-
 .../output/aws-cn/globals_for_function.json   | 28 +++++++-
 ...icit_and_explicit_api_with_conditions.json | 24 +++++++
 .../output/aws-cn/implicit_api.json           | 16 ++++-
 ...icit_api_with_auth_and_conditions_max.json | 36 ++++++++++
 .../implicit_api_with_many_conditions.json    | 66 +++++++++++++++++
 ...api_with_serverless_rest_api_resource.json | 16 ++++-
 .../output/aws-cn/intrinsic_functions.json    | 32 +++++++--
 tests/translator/output/aws-cn/iot_rule.json  |  8 ++-
 .../output/aws-cn/layers_all_properties.json  |  8 ++-
 ...api_with_serverless_rest_api_resource.json | 24 ++++++-
 tests/translator/output/aws-cn/s3.json        |  8 ++-
 .../output/aws-cn/s3_create_remove.json       |  8 ++-
 ...ing_lambda_notification_configuration.json |  8 ++-
 ...ting_other_notification_configuration.json |  8 ++-
 tests/translator/output/aws-cn/s3_filter.json |  8 ++-
 .../s3_multiple_events_same_bucket.json       |  8 ++-
 .../output/aws-cn/s3_multiple_functions.json  | 12 ++++
 .../output/aws-cn/s3_with_condition.json      |  8 ++-
 .../output/aws-cn/s3_with_dependsOn.json      |  8 ++-
 tests/translator/output/aws-cn/sns.json       |  8 ++-
 .../sns_existing_other_subscription.json      |  8 ++-
 tests/translator/output/aws-cn/sns_sqs.json   |  8 ++-
 .../aws-cn/sns_topic_outside_template.json    |  8 ++-
 tests/translator/output/aws-cn/sqs.json       |  6 ++
 tests/translator/output/aws-cn/streams.json   | 12 ++++
 .../output/aws-us-gov/alexa_skill.json        |  8 ++-
 .../aws-us-gov/alexa_skill_with_skill_id.json | 10 ++-
 .../aws-us-gov/all_policy_templates.json      |  6 ++
 .../output/aws-us-gov/api_cache.json          |  8 ++-
 .../api_endpoint_configuration.json           |  8 ++-
 .../output/aws-us-gov/api_request_model.json  |  8 ++-
 .../api_request_model_openapi_3.json          |  6 ++
 .../api_with_access_log_setting.json          |  6 ++
 .../api_with_apikey_default_override.json     | 18 +++++
 .../aws-us-gov/api_with_apikey_required.json  |  6 ++
 .../api_with_apikey_required_openapi_3.json   |  8 ++-
 .../aws-us-gov/api_with_auth_all_maximum.json |  8 ++-
 .../api_with_auth_all_maximum_openapi_3.json  |  8 ++-
 .../aws-us-gov/api_with_auth_all_minimum.json | 16 ++++-
 .../api_with_auth_all_minimum_openapi.json    | 16 ++++-
 .../api_with_auth_and_conditions_all_max.json | 16 ++++-
 .../aws-us-gov/api_with_auth_no_default.json  | 16 ++++-
 .../api_with_aws_account_blacklist.json       |  8 ++-
 .../api_with_aws_account_whitelist.json       |  8 ++-
 .../api_with_aws_iam_auth_overrides.json      | 72 ++++++++++++++++---
 .../api_with_basic_custom_domain.json         |  8 ++-
 ...i_with_basic_custom_domain_intrinsics.json |  8 ++-
 .../api_with_binary_media_types.json          |  8 ++-
 .../aws-us-gov/api_with_canary_setting.json   |  6 ++
 .../output/aws-us-gov/api_with_cors.json      | 24 ++++++-
 ..._with_cors_and_auth_no_preflight_auth.json | 16 ++++-
 ...api_with_cors_and_auth_preflight_auth.json | 16 ++++-
 ...cors_and_conditions_no_definitionbody.json | 16 ++++-
 ..._with_cors_and_only_credentials_false.json |  8 ++-
 .../api_with_cors_and_only_headers.json       |  8 ++-
 .../api_with_cors_and_only_maxage.json        |  8 ++-
 .../api_with_cors_and_only_methods.json       |  8 ++-
 .../api_with_cors_and_only_origins.json       |  8 ++-
 .../api_with_cors_no_definitionbody.json      |  6 ++
 .../aws-us-gov/api_with_cors_openapi_3.json   | 24 ++++++-
 .../api_with_custom_domain_route53.json       |  8 ++-
 .../api_with_default_aws_iam_auth.json        |  6 ++
 ...efault_aws_iam_auth_and_no_auth_route.json |  6 ++
 .../api_with_gateway_responses.json           |  6 ++
 .../api_with_gateway_responses_all.json       |  6 ++
 ..._with_gateway_responses_all_openapi_3.json |  8 ++-
 .../api_with_gateway_responses_implicit.json  |  6 ++
 .../api_with_gateway_responses_minimal.json   |  6 ++
 ..._gateway_responses_string_status_code.json |  6 ++
 .../api_with_incompatible_stage_name.json     | 16 ++++-
 .../api_with_ip_range_blacklist.json          |  8 ++-
 .../api_with_ip_range_whitelist.json          |  8 ++-
 .../api_with_method_aws_iam_auth.json         |  6 ++
 .../aws-us-gov/api_with_method_settings.json  |  8 ++-
 .../api_with_minimum_compression_size.json    |  8 ++-
 .../aws-us-gov/api_with_open_api_version.json |  8 ++-
 .../api_with_open_api_version_2.json          |  8 ++-
 ..._with_openapi_definition_body_no_flag.json |  8 ++-
 .../aws-us-gov/api_with_path_parameters.json  |  6 ++
 .../aws-us-gov/api_with_resource_policy.json  |  8 ++-
 .../api_with_resource_policy_global.json      |  8 ++-
 ..._with_resource_policy_global_implicit.json |  8 ++-
 .../aws-us-gov/api_with_resource_refs.json    |  8 ++-
 .../api_with_source_vpc_blacklist.json        |  8 ++-
 .../api_with_source_vpc_whitelist.json        |  8 ++-
 ...pi_with_swagger_and_openapi_with_auth.json |  8 ++-
 .../aws-us-gov/api_with_xray_tracing.json     |  6 ++
 .../output/aws-us-gov/basic_function.json     | 50 +++++++++++--
 .../aws-us-gov/basic_function_with_tags.json  | 26 ++++++-
 .../aws-us-gov/cloudwatch_logs_with_ref.json  |  6 ++
 .../output/aws-us-gov/cloudwatchevent.json    | 16 ++++-
 .../cloudwatchevent_schedule_properties.json  | 16 ++++-
 .../output/aws-us-gov/cloudwatchlog.json      |  6 ++
 .../cognito_userpool_with_event.json          |  6 ++
 .../output/aws-us-gov/depends_on.json         |  6 ++
 .../output/aws-us-gov/explicit_api.json       |  9 ++-
 .../aws-us-gov/explicit_api_openapi_3.json    |  9 ++-
 ...plicit_api_with_invalid_events_config.json |  8 ++-
 .../aws-us-gov/function_concurrency.json      | 12 ++++
 .../aws-us-gov/function_event_conditions.json | 14 +++-
 .../function_managed_inline_policy.json       |  8 ++-
 .../aws-us-gov/function_with_alias.json       |  8 ++-
 ...function_with_alias_and_event_sources.json |  8 ++-
 .../function_with_alias_intrinsics.json       |  8 ++-
 .../function_with_batch_window.json           |  6 ++
 .../aws-us-gov/function_with_condition.json   |  8 ++-
 ...ction_with_conditional_managed_policy.json |  6 ++
 ...ional_managed_policy_and_ref_no_value.json |  6 ++
 ...tion_with_conditional_policy_template.json |  6 ++
 ...onal_policy_template_and_ref_no_value.json |  6 ++
 ...stom_codedeploy_deployment_preference.json | 56 +++++++++++++--
 ...onal_codedeploy_deployment_preference.json |  8 ++-
 ...ction_with_deployment_and_custom_role.json |  8 ++-
 ...ction_with_deployment_no_service_role.json | 16 ++++-
 .../function_with_deployment_preference.json  |  8 ++-
 ..._deployment_preference_all_parameters.json | 24 ++++++-
 ...ment_preference_multiple_combinations.json | 40 +++++++++--
 ...n_with_disabled_deployment_preference.json |  8 ++-
 .../output/aws-us-gov/function_with_dlq.json  | 12 ++++
 .../function_with_global_layers.json          |  6 ++
 .../aws-us-gov/function_with_kmskeyarn.json   | 12 ++++
 .../aws-us-gov/function_with_layers.json      | 32 +++++++--
 .../aws-us-gov/function_with_many_layers.json |  8 ++-
 .../function_with_permissions_boundary.json   |  8 ++-
 .../function_with_policy_templates.json       | 18 +++++
 .../function_with_request_parameters.json     | 12 ++++
 .../function_with_resource_refs.json          | 16 ++++-
 ..._with_sns_event_source_all_parameters.json |  6 ++
 .../global_handle_path_level_parameter.json   |  6 ++
 .../output/aws-us-gov/globals_for_api.json    |  8 ++-
 .../aws-us-gov/globals_for_function.json      | 28 +++++++-
 ...icit_and_explicit_api_with_conditions.json | 24 +++++++
 .../output/aws-us-gov/implicit_api.json       | 18 ++++-
 ...icit_api_with_auth_and_conditions_max.json | 48 +++++++++++--
 .../implicit_api_with_many_conditions.json    | 66 +++++++++++++++++
 ...api_with_serverless_rest_api_resource.json | 16 ++++-
 .../aws-us-gov/intrinsic_functions.json       | 32 +++++++--
 .../output/aws-us-gov/iot_rule.json           |  8 ++-
 .../aws-us-gov/layers_all_properties.json     |  8 ++-
 ...api_with_serverless_rest_api_resource.json | 24 ++++++-
 tests/translator/output/aws-us-gov/s3.json    |  8 ++-
 .../output/aws-us-gov/s3_create_remove.json   |  8 ++-
 ...ing_lambda_notification_configuration.json |  8 ++-
 ...ting_other_notification_configuration.json |  8 ++-
 .../output/aws-us-gov/s3_filter.json          |  8 ++-
 .../s3_multiple_events_same_bucket.json       |  8 ++-
 .../aws-us-gov/s3_multiple_functions.json     | 12 ++++
 .../output/aws-us-gov/s3_with_condition.json  |  8 ++-
 .../output/aws-us-gov/s3_with_dependsOn.json  |  8 ++-
 tests/translator/output/aws-us-gov/sns.json   |  8 ++-
 .../sns_existing_other_subscription.json      |  8 ++-
 .../translator/output/aws-us-gov/sns_sqs.json |  6 ++
 .../sns_topic_outside_template.json           |  8 ++-
 tests/translator/output/aws-us-gov/sqs.json   |  6 ++
 .../translator/output/aws-us-gov/streams.json | 12 ++++
 tests/translator/output/basic_function.json   | 48 +++++++++++--
 .../output/basic_function_with_tags.json      | 26 ++++++-
 .../output/cloudwatch_logs_with_ref.json      |  6 ++
 tests/translator/output/cloudwatchevent.json  | 16 ++++-
 .../cloudwatchevent_schedule_properties.json  | 16 ++++-
 tests/translator/output/cloudwatchlog.json    |  6 ++
 .../output/cognito_userpool_with_event.json   |  6 ++
 tests/translator/output/depends_on.json       |  6 ++
 tests/translator/output/explicit_api.json     |  9 ++-
 .../output/explicit_api_openapi_3.json        |  9 ++-
 ...plicit_api_with_invalid_events_config.json |  8 ++-
 .../output/function_concurrency.json          | 12 ++++
 .../output/function_event_conditions.json     | 14 +++-
 .../function_managed_inline_policy.json       |  8 ++-
 .../output/function_with_alias.json           |  8 ++-
 ...function_with_alias_and_event_sources.json |  8 ++-
 .../function_with_alias_intrinsics.json       |  8 ++-
 .../output/function_with_batch_window.json    |  6 ++
 .../output/function_with_condition.json       |  8 ++-
 ...ction_with_conditional_managed_policy.json |  6 ++
 ...ional_managed_policy_and_ref_no_value.json |  6 ++
 ...tion_with_conditional_policy_template.json |  6 ++
 ...onal_policy_template_and_ref_no_value.json |  6 ++
 ...stom_codedeploy_deployment_preference.json | 56 +++++++++++++--
 ...onal_codedeploy_deployment_preference.json |  8 ++-
 ...ction_with_deployment_and_custom_role.json |  8 ++-
 ...ction_with_deployment_no_service_role.json | 16 ++++-
 .../function_with_deployment_preference.json  |  8 ++-
 ..._deployment_preference_all_parameters.json | 24 ++++++-
 ...ment_preference_multiple_combinations.json | 40 +++++++++--
 ...n_with_disabled_deployment_preference.json |  8 ++-
 .../translator/output/function_with_dlq.json  | 12 ++++
 .../output/function_with_global_layers.json   |  6 ++
 .../output/function_with_kmskeyarn.json       | 12 ++++
 .../output/function_with_layers.json          | 32 +++++++--
 .../output/function_with_many_layers.json     |  8 ++-
 .../function_with_permissions_boundary.json   |  8 ++-
 .../function_with_policy_templates.json       | 18 +++++
 .../function_with_request_parameters.json     | 12 ++++
 .../output/function_with_resource_refs.json   | 16 ++++-
 ..._with_sns_event_source_all_parameters.json |  6 ++
 .../global_handle_path_level_parameter.json   |  6 ++
 tests/translator/output/globals_for_api.json  |  8 ++-
 .../output/globals_for_function.json          | 28 +++++++-
 ...icit_and_explicit_api_with_conditions.json | 24 +++++++
 tests/translator/output/implicit_api.json     | 18 ++++-
 ...icit_api_with_auth_and_conditions_max.json | 36 ++++++++++
 .../implicit_api_with_many_conditions.json    | 66 +++++++++++++++++
 ...api_with_serverless_rest_api_resource.json | 16 ++++-
 .../output/intrinsic_functions.json           | 32 +++++++--
 tests/translator/output/iot_rule.json         |  8 ++-
 .../output/layers_all_properties.json         |  8 ++-
 ...api_with_serverless_rest_api_resource.json | 24 ++++++-
 tests/translator/output/s3.json               |  8 ++-
 tests/translator/output/s3_create_remove.json |  8 ++-
 ...ing_lambda_notification_configuration.json |  8 ++-
 ...ting_other_notification_configuration.json |  8 ++-
 tests/translator/output/s3_filter.json        |  8 ++-
 .../s3_multiple_events_same_bucket.json       |  8 ++-
 .../output/s3_multiple_functions.json         | 12 ++++
 .../translator/output/s3_with_condition.json  |  8 ++-
 .../translator/output/s3_with_dependsOn.json  |  8 ++-
 tests/translator/output/sns.json              |  8 ++-
 .../sns_existing_other_subscription.json      |  8 ++-
 tests/translator/output/sns_sqs.json          |  6 ++
 .../output/sns_topic_outside_template.json    |  8 ++-
 tests/translator/output/sqs.json              |  6 ++
 tests/translator/output/streams.json          | 12 ++++
 390 files changed, 4344 insertions(+), 445 deletions(-)

diff --git a/tests/translator/output/alexa_skill.json b/tests/translator/output/alexa_skill.json
index 1888b5a148..310f2347d0 100644
--- a/tests/translator/output/alexa_skill.json
+++ b/tests/translator/output/alexa_skill.json
@@ -7,7 +7,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/alexa_skill_with_skill_id.json b/tests/translator/output/alexa_skill_with_skill_id.json
index b630d62f7a..0522d21dd1 100644
--- a/tests/translator/output/alexa_skill_with_skill_id.json
+++ b/tests/translator/output/alexa_skill_with_skill_id.json
@@ -7,8 +7,14 @@
         "Properties": {
           "ManagedPolicyArns": [
             "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-          ], 
-          "AssumeRolePolicyDocument": {
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+        "AssumeRolePolicyDocument": {
             "Version": "2012-10-17", 
             "Statement": [
               {
diff --git a/tests/translator/output/all_policy_templates.json b/tests/translator/output/all_policy_templates.json
index ba1fd00f49..350ba3b4e0 100644
--- a/tests/translator/output/all_policy_templates.json
+++ b/tests/translator/output/all_policy_templates.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "KitchenSinkFunctionRolePolicy0",
diff --git a/tests/translator/output/api_cache.json b/tests/translator/output/api_cache.json
index 1f6594d956..aacef0fb5e 100644
--- a/tests/translator/output/api_cache.json
+++ b/tests/translator/output/api_cache.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_endpoint_configuration.json b/tests/translator/output/api_endpoint_configuration.json
index 0edf41ecd4..c3c291be11 100644
--- a/tests/translator/output/api_endpoint_configuration.json
+++ b/tests/translator/output/api_endpoint_configuration.json
@@ -33,7 +33,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_request_model.json b/tests/translator/output/api_request_model.json
index ecca5ff5ed..0c76e6ab3e 100644
--- a/tests/translator/output/api_request_model.json
+++ b/tests/translator/output/api_request_model.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_request_model_openapi_3.json b/tests/translator/output/api_request_model_openapi_3.json
index d26fac7092..b0cb087e98 100644
--- a/tests/translator/output/api_request_model_openapi_3.json
+++ b/tests/translator/output/api_request_model_openapi_3.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_access_log_setting.json b/tests/translator/output/api_with_access_log_setting.json
index 29a1fe735d..b95be5f4cb 100644
--- a/tests/translator/output/api_with_access_log_setting.json
+++ b/tests/translator/output/api_with_access_log_setting.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/api_with_apikey_default_override.json b/tests/translator/output/api_with_apikey_default_override.json
index aa6c0f9195..1e519e6267 100644
--- a/tests/translator/output/api_with_apikey_default_override.json
+++ b/tests/translator/output/api_with_apikey_default_override.json
@@ -159,8 +159,14 @@
         "Properties": {
           "ManagedPolicyArns": [
             "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-          ], 
-          "AssumeRolePolicyDocument": {
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+        "AssumeRolePolicyDocument": {
             "Version": "2012-10-17", 
             "Statement": [
               {
@@ -183,8 +189,14 @@
         "Properties": {
           "ManagedPolicyArns": [
             "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-          ], 
-          "AssumeRolePolicyDocument": {
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+        "AssumeRolePolicyDocument": {
             "Version": "2012-10-17", 
             "Statement": [
               {
@@ -207,8 +219,14 @@
         "Properties": {
           "ManagedPolicyArns": [
             "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-          ], 
-          "AssumeRolePolicyDocument": {
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+        "AssumeRolePolicyDocument": {
             "Version": "2012-10-17", 
             "Statement": [
               {
diff --git a/tests/translator/output/api_with_apikey_required.json b/tests/translator/output/api_with_apikey_required.json
index 909af947ab..7e51acae3a 100644
--- a/tests/translator/output/api_with_apikey_required.json
+++ b/tests/translator/output/api_with_apikey_required.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_apikey_required_openapi_3.json b/tests/translator/output/api_with_apikey_required_openapi_3.json
index 8a8c57f8ef..23702dced3 100644
--- a/tests/translator/output/api_with_apikey_required_openapi_3.json
+++ b/tests/translator/output/api_with_apikey_required_openapi_3.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_auth_all_maximum.json b/tests/translator/output/api_with_auth_all_maximum.json
index f0dbdd1f44..58a97705c6 100644
--- a/tests/translator/output/api_with_auth_all_maximum.json
+++ b/tests/translator/output/api_with_auth_all_maximum.json
@@ -88,7 +88,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_auth_all_maximum_openapi_3.json b/tests/translator/output/api_with_auth_all_maximum_openapi_3.json
index 6d3b9baf7a..a0d453fe0c 100644
--- a/tests/translator/output/api_with_auth_all_maximum_openapi_3.json
+++ b/tests/translator/output/api_with_auth_all_maximum_openapi_3.json
@@ -88,7 +88,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_auth_all_minimum.json b/tests/translator/output/api_with_auth_all_minimum.json
index 28e5dc8228..f85c0a0245 100644
--- a/tests/translator/output/api_with_auth_all_minimum.json
+++ b/tests/translator/output/api_with_auth_all_minimum.json
@@ -125,7 +125,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -368,7 +374,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_auth_all_minimum_openapi.json b/tests/translator/output/api_with_auth_all_minimum_openapi.json
index 750d534f0c..e8c2bf109c 100644
--- a/tests/translator/output/api_with_auth_all_minimum_openapi.json
+++ b/tests/translator/output/api_with_auth_all_minimum_openapi.json
@@ -117,7 +117,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -351,7 +357,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_auth_and_conditions_all_max.json b/tests/translator/output/api_with_auth_and_conditions_all_max.json
index d5f946aa9a..2a4195970d 100644
--- a/tests/translator/output/api_with_auth_and_conditions_all_max.json
+++ b/tests/translator/output/api_with_auth_and_conditions_all_max.json
@@ -392,7 +392,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -534,7 +540,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_auth_no_default.json b/tests/translator/output/api_with_auth_no_default.json
index 4c53420895..1e96879461 100644
--- a/tests/translator/output/api_with_auth_no_default.json
+++ b/tests/translator/output/api_with_auth_no_default.json
@@ -110,7 +110,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -358,7 +364,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_aws_account_blacklist.json b/tests/translator/output/api_with_aws_account_blacklist.json
index 1202e8818a..950c46174c 100644
--- a/tests/translator/output/api_with_aws_account_blacklist.json
+++ b/tests/translator/output/api_with_aws_account_blacklist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_aws_account_whitelist.json b/tests/translator/output/api_with_aws_account_whitelist.json
index 4cb4209e25..e6a91af8b1 100644
--- a/tests/translator/output/api_with_aws_account_whitelist.json
+++ b/tests/translator/output/api_with_aws_account_whitelist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_aws_iam_auth_overrides.json b/tests/translator/output/api_with_aws_iam_auth_overrides.json
index b814e40690..28486d1750 100644
--- a/tests/translator/output/api_with_aws_iam_auth_overrides.json
+++ b/tests/translator/output/api_with_aws_iam_auth_overrides.json
@@ -86,7 +86,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -274,7 +280,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -342,7 +354,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -366,7 +384,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -519,7 +543,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -543,7 +573,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -567,7 +603,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -591,7 +633,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -852,7 +900,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_basic_custom_domain.json b/tests/translator/output/api_with_basic_custom_domain.json
index 708cfa50de..562dbaaa45 100644
--- a/tests/translator/output/api_with_basic_custom_domain.json
+++ b/tests/translator/output/api_with_basic_custom_domain.json
@@ -173,7 +173,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_basic_custom_domain_intrinsics.json b/tests/translator/output/api_with_basic_custom_domain_intrinsics.json
index 4b7879e7d7..d72b92bcd9 100644
--- a/tests/translator/output/api_with_basic_custom_domain_intrinsics.json
+++ b/tests/translator/output/api_with_basic_custom_domain_intrinsics.json
@@ -122,7 +122,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_binary_media_types.json b/tests/translator/output/api_with_binary_media_types.json
index 2b10bb70c5..28489d636d 100644
--- a/tests/translator/output/api_with_binary_media_types.json
+++ b/tests/translator/output/api_with_binary_media_types.json
@@ -34,7 +34,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_canary_setting.json b/tests/translator/output/api_with_canary_setting.json
index e870f6bbbd..cd7fc482cc 100644
--- a/tests/translator/output/api_with_canary_setting.json
+++ b/tests/translator/output/api_with_canary_setting.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/api_with_cors.json b/tests/translator/output/api_with_cors.json
index 2e8475067c..1477d79ac3 100644
--- a/tests/translator/output/api_with_cors.json
+++ b/tests/translator/output/api_with_cors.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -209,7 +215,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -255,7 +267,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_cors_and_auth_no_preflight_auth.json b/tests/translator/output/api_with_cors_and_auth_no_preflight_auth.json
index 3e39eb8a46..b1610a0fdc 100644
--- a/tests/translator/output/api_with_cors_and_auth_no_preflight_auth.json
+++ b/tests/translator/output/api_with_cors_and_auth_no_preflight_auth.json
@@ -128,7 +128,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -252,7 +258,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_cors_and_auth_preflight_auth.json b/tests/translator/output/api_with_cors_and_auth_preflight_auth.json
index 466c04620f..949504cb0a 100644
--- a/tests/translator/output/api_with_cors_and_auth_preflight_auth.json
+++ b/tests/translator/output/api_with_cors_and_auth_preflight_auth.json
@@ -133,7 +133,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -257,7 +263,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_cors_and_conditions_no_definitionbody.json b/tests/translator/output/api_with_cors_and_conditions_no_definitionbody.json
index 44adface06..bbec68ab8f 100644
--- a/tests/translator/output/api_with_cors_and_conditions_no_definitionbody.json
+++ b/tests/translator/output/api_with_cors_and_conditions_no_definitionbody.json
@@ -38,7 +38,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -249,7 +255,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_cors_and_only_credentials_false.json b/tests/translator/output/api_with_cors_and_only_credentials_false.json
index fe7a5f4020..80753a9032 100644
--- a/tests/translator/output/api_with_cors_and_only_credentials_false.json
+++ b/tests/translator/output/api_with_cors_and_only_credentials_false.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_cors_and_only_headers.json b/tests/translator/output/api_with_cors_and_only_headers.json
index 5659aac16d..6ad4686880 100644
--- a/tests/translator/output/api_with_cors_and_only_headers.json
+++ b/tests/translator/output/api_with_cors_and_only_headers.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_cors_and_only_maxage.json b/tests/translator/output/api_with_cors_and_only_maxage.json
index a19fcdfdbf..26c2a83e29 100644
--- a/tests/translator/output/api_with_cors_and_only_maxage.json
+++ b/tests/translator/output/api_with_cors_and_only_maxage.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_cors_and_only_methods.json b/tests/translator/output/api_with_cors_and_only_methods.json
index 485c595893..3d91a1029c 100644
--- a/tests/translator/output/api_with_cors_and_only_methods.json
+++ b/tests/translator/output/api_with_cors_and_only_methods.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_cors_and_only_origins.json b/tests/translator/output/api_with_cors_and_only_origins.json
index 33894124e4..562600ab16 100644
--- a/tests/translator/output/api_with_cors_and_only_origins.json
+++ b/tests/translator/output/api_with_cors_and_only_origins.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_cors_no_definitionbody.json b/tests/translator/output/api_with_cors_no_definitionbody.json
index 17e266a957..c83d697d8f 100644
--- a/tests/translator/output/api_with_cors_no_definitionbody.json
+++ b/tests/translator/output/api_with_cors_no_definitionbody.json
@@ -28,6 +28,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{
diff --git a/tests/translator/output/api_with_cors_openapi_3.json b/tests/translator/output/api_with_cors_openapi_3.json
index addceb247e..1311ee899d 100644
--- a/tests/translator/output/api_with_cors_openapi_3.json
+++ b/tests/translator/output/api_with_cors_openapi_3.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -209,7 +215,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -257,7 +269,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_custom_domain_route53.json b/tests/translator/output/api_with_custom_domain_route53.json
index fca043de36..5681337dd0 100644
--- a/tests/translator/output/api_with_custom_domain_route53.json
+++ b/tests/translator/output/api_with_custom_domain_route53.json
@@ -189,7 +189,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_default_aws_iam_auth.json b/tests/translator/output/api_with_default_aws_iam_auth.json
index 7df93f7fc7..53b534a466 100644
--- a/tests/translator/output/api_with_default_aws_iam_auth.json
+++ b/tests/translator/output/api_with_default_aws_iam_auth.json
@@ -284,6 +284,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/api_with_default_aws_iam_auth_and_no_auth_route.json b/tests/translator/output/api_with_default_aws_iam_auth_and_no_auth_route.json
index 8f7e2baccb..2982334dfe 100644
--- a/tests/translator/output/api_with_default_aws_iam_auth_and_no_auth_route.json
+++ b/tests/translator/output/api_with_default_aws_iam_auth_and_no_auth_route.json
@@ -150,6 +150,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/api_with_gateway_responses.json b/tests/translator/output/api_with_gateway_responses.json
index cbf4e3fc4d..bb010a7a0a 100644
--- a/tests/translator/output/api_with_gateway_responses.json
+++ b/tests/translator/output/api_with_gateway_responses.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/api_with_gateway_responses_all.json b/tests/translator/output/api_with_gateway_responses_all.json
index 151dc86b20..e9eb1bb50e 100644
--- a/tests/translator/output/api_with_gateway_responses_all.json
+++ b/tests/translator/output/api_with_gateway_responses_all.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/api_with_gateway_responses_all_openapi_3.json b/tests/translator/output/api_with_gateway_responses_all_openapi_3.json
index a26edfad6f..20f76ec2b1 100644
--- a/tests/translator/output/api_with_gateway_responses_all_openapi_3.json
+++ b/tests/translator/output/api_with_gateway_responses_all_openapi_3.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_gateway_responses_implicit.json b/tests/translator/output/api_with_gateway_responses_implicit.json
index 7a38699dc5..a071d97d92 100644
--- a/tests/translator/output/api_with_gateway_responses_implicit.json
+++ b/tests/translator/output/api_with_gateway_responses_implicit.json
@@ -39,6 +39,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/api_with_gateway_responses_minimal.json b/tests/translator/output/api_with_gateway_responses_minimal.json
index 9280a2c73c..d718af9bc3 100644
--- a/tests/translator/output/api_with_gateway_responses_minimal.json
+++ b/tests/translator/output/api_with_gateway_responses_minimal.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/api_with_gateway_responses_string_status_code.json b/tests/translator/output/api_with_gateway_responses_string_status_code.json
index cbf4e3fc4d..bb010a7a0a 100644
--- a/tests/translator/output/api_with_gateway_responses_string_status_code.json
+++ b/tests/translator/output/api_with_gateway_responses_string_status_code.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/api_with_incompatible_stage_name.json b/tests/translator/output/api_with_incompatible_stage_name.json
index 0e5165c9b9..dd3abd9f80 100644
--- a/tests/translator/output/api_with_incompatible_stage_name.json
+++ b/tests/translator/output/api_with_incompatible_stage_name.json
@@ -75,7 +75,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -253,7 +259,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_ip_range_blacklist.json b/tests/translator/output/api_with_ip_range_blacklist.json
index 062ca60ea2..0b300f3fdd 100644
--- a/tests/translator/output/api_with_ip_range_blacklist.json
+++ b/tests/translator/output/api_with_ip_range_blacklist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_ip_range_whitelist.json b/tests/translator/output/api_with_ip_range_whitelist.json
index 375edb5dff..988db3598c 100644
--- a/tests/translator/output/api_with_ip_range_whitelist.json
+++ b/tests/translator/output/api_with_ip_range_whitelist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_method_aws_iam_auth.json b/tests/translator/output/api_with_method_aws_iam_auth.json
index cbf6c36c87..b0bb424c16 100644
--- a/tests/translator/output/api_with_method_aws_iam_auth.json
+++ b/tests/translator/output/api_with_method_aws_iam_auth.json
@@ -188,6 +188,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/api_with_method_settings.json b/tests/translator/output/api_with_method_settings.json
index da43cf30bc..ff59ac5923 100644
--- a/tests/translator/output/api_with_method_settings.json
+++ b/tests/translator/output/api_with_method_settings.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_minimum_compression_size.json b/tests/translator/output/api_with_minimum_compression_size.json
index 95c22b8f7e..a22c045aa7 100644
--- a/tests/translator/output/api_with_minimum_compression_size.json
+++ b/tests/translator/output/api_with_minimum_compression_size.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_open_api_version.json b/tests/translator/output/api_with_open_api_version.json
index 07784a30aa..4d1df1631a 100644
--- a/tests/translator/output/api_with_open_api_version.json
+++ b/tests/translator/output/api_with_open_api_version.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_open_api_version_2.json b/tests/translator/output/api_with_open_api_version_2.json
index fe7c09aec9..fdba0c2313 100644
--- a/tests/translator/output/api_with_open_api_version_2.json
+++ b/tests/translator/output/api_with_open_api_version_2.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_openapi_definition_body_no_flag.json b/tests/translator/output/api_with_openapi_definition_body_no_flag.json
index 186712d1e2..0133f7db8d 100644
--- a/tests/translator/output/api_with_openapi_definition_body_no_flag.json
+++ b/tests/translator/output/api_with_openapi_definition_body_no_flag.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_path_parameters.json b/tests/translator/output/api_with_path_parameters.json
index 4f03ba4a11..7e6fdffc8e 100644
--- a/tests/translator/output/api_with_path_parameters.json
+++ b/tests/translator/output/api_with_path_parameters.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/api_with_resource_policy.json b/tests/translator/output/api_with_resource_policy.json
index bc747d621d..1ccda59290 100644
--- a/tests/translator/output/api_with_resource_policy.json
+++ b/tests/translator/output/api_with_resource_policy.json
@@ -89,7 +89,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_resource_policy_global.json b/tests/translator/output/api_with_resource_policy_global.json
index fa907c1b21..189ebefd4c 100644
--- a/tests/translator/output/api_with_resource_policy_global.json
+++ b/tests/translator/output/api_with_resource_policy_global.json
@@ -79,7 +79,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_resource_policy_global_implicit.json b/tests/translator/output/api_with_resource_policy_global_implicit.json
index 20b49c897c..c2cdcc35e4 100644
--- a/tests/translator/output/api_with_resource_policy_global_implicit.json
+++ b/tests/translator/output/api_with_resource_policy_global_implicit.json
@@ -26,7 +26,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_resource_refs.json b/tests/translator/output/api_with_resource_refs.json
index 412a7856a2..87218b223f 100644
--- a/tests/translator/output/api_with_resource_refs.json
+++ b/tests/translator/output/api_with_resource_refs.json
@@ -115,7 +115,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_source_vpc_blacklist.json b/tests/translator/output/api_with_source_vpc_blacklist.json
index 643e87fc05..a3b1005f8d 100644
--- a/tests/translator/output/api_with_source_vpc_blacklist.json
+++ b/tests/translator/output/api_with_source_vpc_blacklist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_source_vpc_whitelist.json b/tests/translator/output/api_with_source_vpc_whitelist.json
index a71b0a4017..32e2a29e83 100644
--- a/tests/translator/output/api_with_source_vpc_whitelist.json
+++ b/tests/translator/output/api_with_source_vpc_whitelist.json
@@ -107,7 +107,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_swagger_and_openapi_with_auth.json b/tests/translator/output/api_with_swagger_and_openapi_with_auth.json
index 0998913455..d7b9cf7fc2 100644
--- a/tests/translator/output/api_with_swagger_and_openapi_with_auth.json
+++ b/tests/translator/output/api_with_swagger_and_openapi_with_auth.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/api_with_xray_tracing.json b/tests/translator/output/api_with_xray_tracing.json
index e0ba32313e..3de167b011 100644
--- a/tests/translator/output/api_with_xray_tracing.json
+++ b/tests/translator/output/api_with_xray_tracing.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/alexa_skill.json b/tests/translator/output/aws-cn/alexa_skill.json
index 411fa36ac3..048ebf3a9d 100644
--- a/tests/translator/output/aws-cn/alexa_skill.json
+++ b/tests/translator/output/aws-cn/alexa_skill.json
@@ -7,7 +7,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/alexa_skill_with_skill_id.json b/tests/translator/output/aws-cn/alexa_skill_with_skill_id.json
index 5a85f36d10..b867b140ed 100644
--- a/tests/translator/output/aws-cn/alexa_skill_with_skill_id.json
+++ b/tests/translator/output/aws-cn/alexa_skill_with_skill_id.json
@@ -7,7 +7,13 @@
         "Properties": {
           "ManagedPolicyArns": [
             "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-          ], 
+          ],
+          "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
           "AssumeRolePolicyDocument": {
             "Version": "2012-10-17", 
             "Statement": [
diff --git a/tests/translator/output/aws-cn/all_policy_templates.json b/tests/translator/output/aws-cn/all_policy_templates.json
index 36123aedfd..86324d2062 100644
--- a/tests/translator/output/aws-cn/all_policy_templates.json
+++ b/tests/translator/output/aws-cn/all_policy_templates.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "KitchenSinkFunctionRolePolicy0",
diff --git a/tests/translator/output/aws-cn/api_cache.json b/tests/translator/output/aws-cn/api_cache.json
index 6a019a53f8..2fd3292d15 100644
--- a/tests/translator/output/aws-cn/api_cache.json
+++ b/tests/translator/output/aws-cn/api_cache.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_endpoint_configuration.json b/tests/translator/output/aws-cn/api_endpoint_configuration.json
index d529e6a183..2ed7aa6322 100644
--- a/tests/translator/output/aws-cn/api_endpoint_configuration.json
+++ b/tests/translator/output/aws-cn/api_endpoint_configuration.json
@@ -33,7 +33,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_request_model.json b/tests/translator/output/aws-cn/api_request_model.json
index 5a823b048e..7e186e26ac 100644
--- a/tests/translator/output/aws-cn/api_request_model.json
+++ b/tests/translator/output/aws-cn/api_request_model.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_request_model_openapi_3.json b/tests/translator/output/aws-cn/api_request_model_openapi_3.json
index ac3da74ae2..50d11b684d 100644
--- a/tests/translator/output/aws-cn/api_request_model_openapi_3.json
+++ b/tests/translator/output/aws-cn/api_request_model_openapi_3.json
@@ -14,7 +14,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_access_log_setting.json b/tests/translator/output/aws-cn/api_with_access_log_setting.json
index 2d9b289f5f..1b321ac584 100644
--- a/tests/translator/output/aws-cn/api_with_access_log_setting.json
+++ b/tests/translator/output/aws-cn/api_with_access_log_setting.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_apikey_default_override.json b/tests/translator/output/aws-cn/api_with_apikey_default_override.json
index 0670bf6961..6eca06e768 100644
--- a/tests/translator/output/aws-cn/api_with_apikey_default_override.json
+++ b/tests/translator/output/aws-cn/api_with_apikey_default_override.json
@@ -160,6 +160,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -184,6 +190,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -208,6 +220,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_apikey_required.json b/tests/translator/output/aws-cn/api_with_apikey_required.json
index 808101d538..c5771123fc 100644
--- a/tests/translator/output/aws-cn/api_with_apikey_required.json
+++ b/tests/translator/output/aws-cn/api_with_apikey_required.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_apikey_required_openapi_3.json b/tests/translator/output/aws-cn/api_with_apikey_required_openapi_3.json
index 3afff3f2eb..41d76730da 100644
--- a/tests/translator/output/aws-cn/api_with_apikey_required_openapi_3.json
+++ b/tests/translator/output/aws-cn/api_with_apikey_required_openapi_3.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_auth_all_maximum.json b/tests/translator/output/aws-cn/api_with_auth_all_maximum.json
index f3a9ab69f7..737ad54912 100644
--- a/tests/translator/output/aws-cn/api_with_auth_all_maximum.json
+++ b/tests/translator/output/aws-cn/api_with_auth_all_maximum.json
@@ -88,7 +88,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_auth_all_maximum_openapi_3.json b/tests/translator/output/aws-cn/api_with_auth_all_maximum_openapi_3.json
index 9fd3d25757..25ea170b4d 100644
--- a/tests/translator/output/aws-cn/api_with_auth_all_maximum_openapi_3.json
+++ b/tests/translator/output/aws-cn/api_with_auth_all_maximum_openapi_3.json
@@ -88,7 +88,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_auth_all_minimum.json b/tests/translator/output/aws-cn/api_with_auth_all_minimum.json
index 3719ad7bf5..3cddd2da44 100644
--- a/tests/translator/output/aws-cn/api_with_auth_all_minimum.json
+++ b/tests/translator/output/aws-cn/api_with_auth_all_minimum.json
@@ -123,7 +123,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -384,7 +390,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_auth_all_minimum_openapi.json b/tests/translator/output/aws-cn/api_with_auth_all_minimum_openapi.json
index 4f4aead6ab..2a446b8a49 100644
--- a/tests/translator/output/aws-cn/api_with_auth_all_minimum_openapi.json
+++ b/tests/translator/output/aws-cn/api_with_auth_all_minimum_openapi.json
@@ -134,7 +134,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -385,7 +391,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_auth_and_conditions_all_max.json b/tests/translator/output/aws-cn/api_with_auth_and_conditions_all_max.json
index 008680cb04..9003795a94 100644
--- a/tests/translator/output/aws-cn/api_with_auth_and_conditions_all_max.json
+++ b/tests/translator/output/aws-cn/api_with_auth_and_conditions_all_max.json
@@ -410,7 +410,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -518,7 +524,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_auth_no_default.json b/tests/translator/output/aws-cn/api_with_auth_no_default.json
index 37e88ac07b..e4a208af68 100644
--- a/tests/translator/output/aws-cn/api_with_auth_no_default.json
+++ b/tests/translator/output/aws-cn/api_with_auth_no_default.json
@@ -149,7 +149,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -374,7 +380,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_aws_account_blacklist.json b/tests/translator/output/aws-cn/api_with_aws_account_blacklist.json
index bd01c1e50b..db2f74cf52 100644
--- a/tests/translator/output/aws-cn/api_with_aws_account_blacklist.json
+++ b/tests/translator/output/aws-cn/api_with_aws_account_blacklist.json
@@ -39,7 +39,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_aws_account_whitelist.json b/tests/translator/output/aws-cn/api_with_aws_account_whitelist.json
index 9cec5b40f2..a4e8e547df 100644
--- a/tests/translator/output/aws-cn/api_with_aws_account_whitelist.json
+++ b/tests/translator/output/aws-cn/api_with_aws_account_whitelist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_aws_iam_auth_overrides.json b/tests/translator/output/aws-cn/api_with_aws_iam_auth_overrides.json
index 0040da8f76..bcaeae6fbf 100644
--- a/tests/translator/output/aws-cn/api_with_aws_iam_auth_overrides.json
+++ b/tests/translator/output/aws-cn/api_with_aws_iam_auth_overrides.json
@@ -96,7 +96,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -302,7 +308,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -370,7 +382,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -394,7 +412,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -527,7 +551,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -551,7 +581,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -575,7 +611,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -599,7 +641,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -868,7 +916,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_basic_custom_domain.json b/tests/translator/output/aws-cn/api_with_basic_custom_domain.json
index 889f4512a6..81da54f16c 100644
--- a/tests/translator/output/aws-cn/api_with_basic_custom_domain.json
+++ b/tests/translator/output/aws-cn/api_with_basic_custom_domain.json
@@ -182,7 +182,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_basic_custom_domain_intrinsics.json b/tests/translator/output/aws-cn/api_with_basic_custom_domain_intrinsics.json
index f3efb64927..efc52f960d 100644
--- a/tests/translator/output/aws-cn/api_with_basic_custom_domain_intrinsics.json
+++ b/tests/translator/output/aws-cn/api_with_basic_custom_domain_intrinsics.json
@@ -118,7 +118,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_binary_media_types.json b/tests/translator/output/aws-cn/api_with_binary_media_types.json
index 255484837c..8857f0850c 100644
--- a/tests/translator/output/aws-cn/api_with_binary_media_types.json
+++ b/tests/translator/output/aws-cn/api_with_binary_media_types.json
@@ -34,7 +34,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_canary_setting.json b/tests/translator/output/aws-cn/api_with_canary_setting.json
index ef48c720a0..5ad2d2dd26 100644
--- a/tests/translator/output/aws-cn/api_with_canary_setting.json
+++ b/tests/translator/output/aws-cn/api_with_canary_setting.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_cors.json b/tests/translator/output/aws-cn/api_with_cors.json
index 391f492265..a935eed3ce 100644
--- a/tests/translator/output/aws-cn/api_with_cors.json
+++ b/tests/translator/output/aws-cn/api_with_cors.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -217,7 +223,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -265,7 +277,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_cors_and_auth_no_preflight_auth.json b/tests/translator/output/aws-cn/api_with_cors_and_auth_no_preflight_auth.json
index 3426626b97..f98f3150c1 100644
--- a/tests/translator/output/aws-cn/api_with_cors_and_auth_no_preflight_auth.json
+++ b/tests/translator/output/aws-cn/api_with_cors_and_auth_no_preflight_auth.json
@@ -136,7 +136,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -260,7 +266,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_cors_and_auth_preflight_auth.json b/tests/translator/output/aws-cn/api_with_cors_and_auth_preflight_auth.json
index d64b3aeec0..b2a41de868 100644
--- a/tests/translator/output/aws-cn/api_with_cors_and_auth_preflight_auth.json
+++ b/tests/translator/output/aws-cn/api_with_cors_and_auth_preflight_auth.json
@@ -131,7 +131,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -265,7 +271,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_cors_and_conditions_no_definitionbody.json b/tests/translator/output/aws-cn/api_with_cors_and_conditions_no_definitionbody.json
index eb8f777b76..1e0ba11af1 100644
--- a/tests/translator/output/aws-cn/api_with_cors_and_conditions_no_definitionbody.json
+++ b/tests/translator/output/aws-cn/api_with_cors_and_conditions_no_definitionbody.json
@@ -38,7 +38,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -245,7 +251,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_cors_and_only_credentials_false.json b/tests/translator/output/aws-cn/api_with_cors_and_only_credentials_false.json
index f486d52155..ebb5b8c5f0 100644
--- a/tests/translator/output/aws-cn/api_with_cors_and_only_credentials_false.json
+++ b/tests/translator/output/aws-cn/api_with_cors_and_only_credentials_false.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_cors_and_only_headers.json b/tests/translator/output/aws-cn/api_with_cors_and_only_headers.json
index 4fd81be393..b004e31482 100644
--- a/tests/translator/output/aws-cn/api_with_cors_and_only_headers.json
+++ b/tests/translator/output/aws-cn/api_with_cors_and_only_headers.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_cors_and_only_maxage.json b/tests/translator/output/aws-cn/api_with_cors_and_only_maxage.json
index 5a033f2694..7bd440a88a 100644
--- a/tests/translator/output/aws-cn/api_with_cors_and_only_maxage.json
+++ b/tests/translator/output/aws-cn/api_with_cors_and_only_maxage.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_cors_and_only_methods.json b/tests/translator/output/aws-cn/api_with_cors_and_only_methods.json
index a52a9552db..d8f6d5cb7d 100644
--- a/tests/translator/output/aws-cn/api_with_cors_and_only_methods.json
+++ b/tests/translator/output/aws-cn/api_with_cors_and_only_methods.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_cors_and_only_origins.json b/tests/translator/output/aws-cn/api_with_cors_and_only_origins.json
index 46d7155d70..1251634bef 100644
--- a/tests/translator/output/aws-cn/api_with_cors_and_only_origins.json
+++ b/tests/translator/output/aws-cn/api_with_cors_and_only_origins.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_cors_no_definitionbody.json b/tests/translator/output/aws-cn/api_with_cors_no_definitionbody.json
index a4b02d02b9..34a15e34bb 100644
--- a/tests/translator/output/aws-cn/api_with_cors_no_definitionbody.json
+++ b/tests/translator/output/aws-cn/api_with_cors_no_definitionbody.json
@@ -28,6 +28,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{
diff --git a/tests/translator/output/aws-cn/api_with_cors_openapi_3.json b/tests/translator/output/aws-cn/api_with_cors_openapi_3.json
index 99a5d51f4a..c7567ce1c2 100644
--- a/tests/translator/output/aws-cn/api_with_cors_openapi_3.json
+++ b/tests/translator/output/aws-cn/api_with_cors_openapi_3.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -226,7 +232,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -274,7 +286,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_custom_domain_route53.json b/tests/translator/output/aws-cn/api_with_custom_domain_route53.json
index 30113d4e37..9bb60c2678 100644
--- a/tests/translator/output/aws-cn/api_with_custom_domain_route53.json
+++ b/tests/translator/output/aws-cn/api_with_custom_domain_route53.json
@@ -189,7 +189,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_default_aws_iam_auth.json b/tests/translator/output/aws-cn/api_with_default_aws_iam_auth.json
index 521250949c..2331bbbced 100644
--- a/tests/translator/output/aws-cn/api_with_default_aws_iam_auth.json
+++ b/tests/translator/output/aws-cn/api_with_default_aws_iam_auth.json
@@ -308,6 +308,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_default_aws_iam_auth_and_no_auth_route.json b/tests/translator/output/aws-cn/api_with_default_aws_iam_auth_and_no_auth_route.json
index 35361d0585..e53268e7e5 100644
--- a/tests/translator/output/aws-cn/api_with_default_aws_iam_auth_and_no_auth_route.json
+++ b/tests/translator/output/aws-cn/api_with_default_aws_iam_auth_and_no_auth_route.json
@@ -158,6 +158,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_gateway_responses.json b/tests/translator/output/aws-cn/api_with_gateway_responses.json
index 411d44ac75..0ea9bfbbd0 100644
--- a/tests/translator/output/aws-cn/api_with_gateway_responses.json
+++ b/tests/translator/output/aws-cn/api_with_gateway_responses.json
@@ -39,6 +39,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_gateway_responses_all.json b/tests/translator/output/aws-cn/api_with_gateway_responses_all.json
index 8625ec0459..b745e747ba 100644
--- a/tests/translator/output/aws-cn/api_with_gateway_responses_all.json
+++ b/tests/translator/output/aws-cn/api_with_gateway_responses_all.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_gateway_responses_all_openapi_3.json b/tests/translator/output/aws-cn/api_with_gateway_responses_all_openapi_3.json
index e73dd8b5b6..b622533926 100644
--- a/tests/translator/output/aws-cn/api_with_gateway_responses_all_openapi_3.json
+++ b/tests/translator/output/aws-cn/api_with_gateway_responses_all_openapi_3.json
@@ -37,7 +37,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_gateway_responses_implicit.json b/tests/translator/output/aws-cn/api_with_gateway_responses_implicit.json
index ba3b9c3713..94e588ef1f 100644
--- a/tests/translator/output/aws-cn/api_with_gateway_responses_implicit.json
+++ b/tests/translator/output/aws-cn/api_with_gateway_responses_implicit.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_gateway_responses_minimal.json b/tests/translator/output/aws-cn/api_with_gateway_responses_minimal.json
index 53db31ad44..6f0c266975 100644
--- a/tests/translator/output/aws-cn/api_with_gateway_responses_minimal.json
+++ b/tests/translator/output/aws-cn/api_with_gateway_responses_minimal.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_gateway_responses_string_status_code.json b/tests/translator/output/aws-cn/api_with_gateway_responses_string_status_code.json
index 411d44ac75..0ea9bfbbd0 100644
--- a/tests/translator/output/aws-cn/api_with_gateway_responses_string_status_code.json
+++ b/tests/translator/output/aws-cn/api_with_gateway_responses_string_status_code.json
@@ -39,6 +39,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_incompatible_stage_name.json b/tests/translator/output/aws-cn/api_with_incompatible_stage_name.json
index 15910d3edb..e3e7f7d5bb 100644
--- a/tests/translator/output/aws-cn/api_with_incompatible_stage_name.json
+++ b/tests/translator/output/aws-cn/api_with_incompatible_stage_name.json
@@ -73,7 +73,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -269,7 +275,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_ip_range_blacklist.json b/tests/translator/output/aws-cn/api_with_ip_range_blacklist.json
index 64c3cbada0..a37880e0be 100644
--- a/tests/translator/output/aws-cn/api_with_ip_range_blacklist.json
+++ b/tests/translator/output/aws-cn/api_with_ip_range_blacklist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_ip_range_whitelist.json b/tests/translator/output/aws-cn/api_with_ip_range_whitelist.json
index 38fee31e54..e077e80b68 100644
--- a/tests/translator/output/aws-cn/api_with_ip_range_whitelist.json
+++ b/tests/translator/output/aws-cn/api_with_ip_range_whitelist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_method_aws_iam_auth.json b/tests/translator/output/aws-cn/api_with_method_aws_iam_auth.json
index a1a556dc83..113fdc0520 100644
--- a/tests/translator/output/aws-cn/api_with_method_aws_iam_auth.json
+++ b/tests/translator/output/aws-cn/api_with_method_aws_iam_auth.json
@@ -196,6 +196,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_method_settings.json b/tests/translator/output/aws-cn/api_with_method_settings.json
index 9b53950997..7cc7fb0e33 100644
--- a/tests/translator/output/aws-cn/api_with_method_settings.json
+++ b/tests/translator/output/aws-cn/api_with_method_settings.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_minimum_compression_size.json b/tests/translator/output/aws-cn/api_with_minimum_compression_size.json
index a347496543..7fe0ff33c8 100644
--- a/tests/translator/output/aws-cn/api_with_minimum_compression_size.json
+++ b/tests/translator/output/aws-cn/api_with_minimum_compression_size.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_open_api_version.json b/tests/translator/output/aws-cn/api_with_open_api_version.json
index 2cc5e82435..f0545c7fce 100644
--- a/tests/translator/output/aws-cn/api_with_open_api_version.json
+++ b/tests/translator/output/aws-cn/api_with_open_api_version.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_open_api_version_2.json b/tests/translator/output/aws-cn/api_with_open_api_version_2.json
index 2ac4180c1f..705f1a5738 100644
--- a/tests/translator/output/aws-cn/api_with_open_api_version_2.json
+++ b/tests/translator/output/aws-cn/api_with_open_api_version_2.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_openapi_definition_body_no_flag.json b/tests/translator/output/aws-cn/api_with_openapi_definition_body_no_flag.json
index 661be55921..aadee8fb2d 100644
--- a/tests/translator/output/aws-cn/api_with_openapi_definition_body_no_flag.json
+++ b/tests/translator/output/aws-cn/api_with_openapi_definition_body_no_flag.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_path_parameters.json b/tests/translator/output/aws-cn/api_with_path_parameters.json
index 530ed5e18c..8d33aa0646 100644
--- a/tests/translator/output/aws-cn/api_with_path_parameters.json
+++ b/tests/translator/output/aws-cn/api_with_path_parameters.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_resource_policy.json b/tests/translator/output/aws-cn/api_with_resource_policy.json
index 79effdaf55..fa584dcf82 100644
--- a/tests/translator/output/aws-cn/api_with_resource_policy.json
+++ b/tests/translator/output/aws-cn/api_with_resource_policy.json
@@ -87,7 +87,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_resource_policy_global.json b/tests/translator/output/aws-cn/api_with_resource_policy_global.json
index 2f756e0c46..462ac0a305 100644
--- a/tests/translator/output/aws-cn/api_with_resource_policy_global.json
+++ b/tests/translator/output/aws-cn/api_with_resource_policy_global.json
@@ -79,7 +79,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_resource_policy_global_implicit.json b/tests/translator/output/aws-cn/api_with_resource_policy_global_implicit.json
index 2c7e13e900..12cf8cb8a7 100644
--- a/tests/translator/output/aws-cn/api_with_resource_policy_global_implicit.json
+++ b/tests/translator/output/aws-cn/api_with_resource_policy_global_implicit.json
@@ -26,7 +26,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_resource_refs.json b/tests/translator/output/aws-cn/api_with_resource_refs.json
index 5ac04d491d..444f60141f 100644
--- a/tests/translator/output/aws-cn/api_with_resource_refs.json
+++ b/tests/translator/output/aws-cn/api_with_resource_refs.json
@@ -115,7 +115,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_source_vpc_blacklist.json b/tests/translator/output/aws-cn/api_with_source_vpc_blacklist.json
index eb6b17b7e6..4494493b8d 100644
--- a/tests/translator/output/aws-cn/api_with_source_vpc_blacklist.json
+++ b/tests/translator/output/aws-cn/api_with_source_vpc_blacklist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_source_vpc_whitelist.json b/tests/translator/output/aws-cn/api_with_source_vpc_whitelist.json
index 9637ff9fcc..07712739be 100644
--- a/tests/translator/output/aws-cn/api_with_source_vpc_whitelist.json
+++ b/tests/translator/output/aws-cn/api_with_source_vpc_whitelist.json
@@ -115,7 +115,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_swagger_and_openapi_with_auth.json b/tests/translator/output/aws-cn/api_with_swagger_and_openapi_with_auth.json
index 23e8fc7518..9125219b52 100644
--- a/tests/translator/output/aws-cn/api_with_swagger_and_openapi_with_auth.json
+++ b/tests/translator/output/aws-cn/api_with_swagger_and_openapi_with_auth.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/api_with_xray_tracing.json b/tests/translator/output/aws-cn/api_with_xray_tracing.json
index c68bdcc9e3..44bd6903ba 100644
--- a/tests/translator/output/aws-cn/api_with_xray_tracing.json
+++ b/tests/translator/output/aws-cn/api_with_xray_tracing.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/basic_function.json b/tests/translator/output/aws-cn/basic_function.json
index d96a640f0a..33857a45d8 100644
--- a/tests/translator/output/aws-cn/basic_function.json
+++ b/tests/translator/output/aws-cn/basic_function.json
@@ -40,7 +40,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -133,7 +139,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -259,9 +271,15 @@
       "Type": "AWS::IAM::Role", 
       "Properties": {
         "ManagedPolicyArns": [
-          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
+          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws-cn:iam::aws:policy/AmazonDynamoDBFullAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -284,9 +302,15 @@
       "Type": "AWS::IAM::Role", 
       "Properties": {
         "ManagedPolicyArns": [
-          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
+          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws-cn:iam::aws:policy/AWSXrayWriteOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -309,9 +333,15 @@
       "Type": "AWS::IAM::Role", 
       "Properties": {
         "ManagedPolicyArns": [
-          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
+          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws-cn:iam::aws:policy/AWSXrayWriteOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -384,7 +414,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "FunctionWithPolicyDocumentRolePolicy0", 
diff --git a/tests/translator/output/aws-cn/basic_function_with_tags.json b/tests/translator/output/aws-cn/basic_function_with_tags.json
index c3bd6c0eaa..b509783b4b 100644
--- a/tests/translator/output/aws-cn/basic_function_with_tags.json
+++ b/tests/translator/output/aws-cn/basic_function_with_tags.json
@@ -12,7 +12,32 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          },
+          {
+            "Value": "TagValue1",
+            "Key": "TagKey1"
+          },
+          {
+            "Value": "",
+            "Key": "TagKey2"
+          },
+          {
+            "Value": {
+              "Ref": "TagValueParam"
+            },
+            "Key": "TagKey3"
+          },
+          {
+            "Value": "123",
+            "Key": "TagKey4"
+          }
+        ],
+
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/cloudwatch_logs_with_ref.json b/tests/translator/output/aws-cn/cloudwatch_logs_with_ref.json
index 37e03b4b0d..350f35f270 100644
--- a/tests/translator/output/aws-cn/cloudwatch_logs_with_ref.json
+++ b/tests/translator/output/aws-cn/cloudwatch_logs_with_ref.json
@@ -61,6 +61,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/cloudwatchevent.json b/tests/translator/output/aws-cn/cloudwatchevent.json
index a4d9169f4d..a8c2feb5ac 100644
--- a/tests/translator/output/aws-cn/cloudwatchevent.json
+++ b/tests/translator/output/aws-cn/cloudwatchevent.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -133,7 +139,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/cloudwatchevent_schedule_properties.json b/tests/translator/output/aws-cn/cloudwatchevent_schedule_properties.json
index c947e4bc21..6f75ca22dc 100644
--- a/tests/translator/output/aws-cn/cloudwatchevent_schedule_properties.json
+++ b/tests/translator/output/aws-cn/cloudwatchevent_schedule_properties.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -132,7 +138,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/cloudwatchlog.json b/tests/translator/output/aws-cn/cloudwatchlog.json
index 0cb97f5aa6..89fac59aea 100644
--- a/tests/translator/output/aws-cn/cloudwatchlog.json
+++ b/tests/translator/output/aws-cn/cloudwatchlog.json
@@ -46,6 +46,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/cognito_userpool_with_event.json b/tests/translator/output/aws-cn/cognito_userpool_with_event.json
index 552490cb10..c7b514c16b 100644
--- a/tests/translator/output/aws-cn/cognito_userpool_with_event.json
+++ b/tests/translator/output/aws-cn/cognito_userpool_with_event.json
@@ -54,6 +54,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/depends_on.json b/tests/translator/output/aws-cn/depends_on.json
index ea12483148..c5c0a7ad67 100644
--- a/tests/translator/output/aws-cn/depends_on.json
+++ b/tests/translator/output/aws-cn/depends_on.json
@@ -116,6 +116,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/explicit_api.json b/tests/translator/output/aws-cn/explicit_api.json
index a51413cd77..2b40e4464a 100644
--- a/tests/translator/output/aws-cn/explicit_api.json
+++ b/tests/translator/output/aws-cn/explicit_api.json
@@ -63,7 +63,14 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/explicit_api_openapi_3.json b/tests/translator/output/aws-cn/explicit_api_openapi_3.json
index 2ad679e765..76fd80b9a9 100644
--- a/tests/translator/output/aws-cn/explicit_api_openapi_3.json
+++ b/tests/translator/output/aws-cn/explicit_api_openapi_3.json
@@ -72,7 +72,14 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/explicit_api_with_invalid_events_config.json b/tests/translator/output/aws-cn/explicit_api_with_invalid_events_config.json
index 4bba9eab85..cea2fb8f26 100644
--- a/tests/translator/output/aws-cn/explicit_api_with_invalid_events_config.json
+++ b/tests/translator/output/aws-cn/explicit_api_with_invalid_events_config.json
@@ -105,7 +105,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_concurrency.json b/tests/translator/output/aws-cn/function_concurrency.json
index 9ef9d8c98d..c7cdb002b9 100644
--- a/tests/translator/output/aws-cn/function_concurrency.json
+++ b/tests/translator/output/aws-cn/function_concurrency.json
@@ -11,6 +11,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -56,6 +62,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_event_conditions.json b/tests/translator/output/aws-cn/function_event_conditions.json
index 36e58e6a61..62522bc66e 100644
--- a/tests/translator/output/aws-cn/function_event_conditions.json
+++ b/tests/translator/output/aws-cn/function_event_conditions.json
@@ -206,7 +206,13 @@
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole", 
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -320,6 +326,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_managed_inline_policy.json b/tests/translator/output/aws-cn/function_managed_inline_policy.json
index 3e7979c7dc..af76c76210 100644
--- a/tests/translator/output/aws-cn/function_managed_inline_policy.json
+++ b/tests/translator/output/aws-cn/function_managed_inline_policy.json
@@ -40,7 +40,13 @@
             "Ref": "SomeManagedPolicyArn"
           }, 
           "arn:aws:iam::123456789012:policy/CustomerCreatedManagedPolicy"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "FunctionRolePolicy0", 
diff --git a/tests/translator/output/aws-cn/function_with_alias.json b/tests/translator/output/aws-cn/function_with_alias.json
index a64da65771..cf8953e96f 100644
--- a/tests/translator/output/aws-cn/function_with_alias.json
+++ b/tests/translator/output/aws-cn/function_with_alias.json
@@ -53,7 +53,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_alias_and_event_sources.json b/tests/translator/output/aws-cn/function_with_alias_and_event_sources.json
index 789094a82c..0d29ad2eaf 100644
--- a/tests/translator/output/aws-cn/function_with_alias_and_event_sources.json
+++ b/tests/translator/output/aws-cn/function_with_alias_and_event_sources.json
@@ -252,7 +252,13 @@
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole", 
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_alias_intrinsics.json b/tests/translator/output/aws-cn/function_with_alias_intrinsics.json
index 7ddf65168b..3fff52854b 100644
--- a/tests/translator/output/aws-cn/function_with_alias_intrinsics.json
+++ b/tests/translator/output/aws-cn/function_with_alias_intrinsics.json
@@ -58,7 +58,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_batch_window.json b/tests/translator/output/aws-cn/function_with_batch_window.json
index ae15765cd8..6bb3761374 100644
--- a/tests/translator/output/aws-cn/function_with_batch_window.json
+++ b/tests/translator/output/aws-cn/function_with_batch_window.json
@@ -32,6 +32,12 @@
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole",
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_condition.json b/tests/translator/output/aws-cn/function_with_condition.json
index 4f2d5ccb7b..4fbd2abf82 100644
--- a/tests/translator/output/aws-cn/function_with_condition.json
+++ b/tests/translator/output/aws-cn/function_with_condition.json
@@ -37,7 +37,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_conditional_managed_policy.json b/tests/translator/output/aws-cn/function_with_conditional_managed_policy.json
index f014353300..a71779ff91 100644
--- a/tests/translator/output/aws-cn/function_with_conditional_managed_policy.json
+++ b/tests/translator/output/aws-cn/function_with_conditional_managed_policy.json
@@ -49,6 +49,12 @@
             ]
           }
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_conditional_managed_policy_and_ref_no_value.json b/tests/translator/output/aws-cn/function_with_conditional_managed_policy_and_ref_no_value.json
index bcd345bf35..794ee731d8 100644
--- a/tests/translator/output/aws-cn/function_with_conditional_managed_policy_and_ref_no_value.json
+++ b/tests/translator/output/aws-cn/function_with_conditional_managed_policy_and_ref_no_value.json
@@ -49,6 +49,12 @@
             ]
           }
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_conditional_policy_template.json b/tests/translator/output/aws-cn/function_with_conditional_policy_template.json
index 6cb4ad3aae..9dc9f720a6 100644
--- a/tests/translator/output/aws-cn/function_with_conditional_policy_template.json
+++ b/tests/translator/output/aws-cn/function_with_conditional_policy_template.json
@@ -38,6 +38,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "Fn::If": [
diff --git a/tests/translator/output/aws-cn/function_with_conditional_policy_template_and_ref_no_value.json b/tests/translator/output/aws-cn/function_with_conditional_policy_template_and_ref_no_value.json
index 39be617ed1..109cf48195 100644
--- a/tests/translator/output/aws-cn/function_with_conditional_policy_template_and_ref_no_value.json
+++ b/tests/translator/output/aws-cn/function_with_conditional_policy_template_and_ref_no_value.json
@@ -38,6 +38,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "Fn::If": [
diff --git a/tests/translator/output/aws-cn/function_with_custom_codedeploy_deployment_preference.json b/tests/translator/output/aws-cn/function_with_custom_codedeploy_deployment_preference.json
index e3a9f705d9..f3d5e0510f 100644
--- a/tests/translator/output/aws-cn/function_with_custom_codedeploy_deployment_preference.json
+++ b/tests/translator/output/aws-cn/function_with_custom_codedeploy_deployment_preference.json
@@ -441,7 +441,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -465,7 +471,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -529,7 +541,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -610,7 +628,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -707,7 +731,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -756,7 +786,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -841,7 +877,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_custom_conditional_codedeploy_deployment_preference.json b/tests/translator/output/aws-cn/function_with_custom_conditional_codedeploy_deployment_preference.json
index e78aeb5bfc..1ee190cd8f 100644
--- a/tests/translator/output/aws-cn/function_with_custom_conditional_codedeploy_deployment_preference.json
+++ b/tests/translator/output/aws-cn/function_with_custom_conditional_codedeploy_deployment_preference.json
@@ -36,7 +36,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_deployment_and_custom_role.json b/tests/translator/output/aws-cn/function_with_deployment_and_custom_role.json
index fccf8a8a26..03a936a6df 100644
--- a/tests/translator/output/aws-cn/function_with_deployment_and_custom_role.json
+++ b/tests/translator/output/aws-cn/function_with_deployment_and_custom_role.json
@@ -51,7 +51,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_deployment_no_service_role.json b/tests/translator/output/aws-cn/function_with_deployment_no_service_role.json
index 9ffb7820ee..65d6a44832 100644
--- a/tests/translator/output/aws-cn/function_with_deployment_no_service_role.json
+++ b/tests/translator/output/aws-cn/function_with_deployment_no_service_role.json
@@ -59,7 +59,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -92,7 +98,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_deployment_preference.json b/tests/translator/output/aws-cn/function_with_deployment_preference.json
index d610572865..f6271fdb0c 100644
--- a/tests/translator/output/aws-cn/function_with_deployment_preference.json
+++ b/tests/translator/output/aws-cn/function_with_deployment_preference.json
@@ -39,7 +39,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_deployment_preference_all_parameters.json b/tests/translator/output/aws-cn/function_with_deployment_preference_all_parameters.json
index 9472e991c6..5831375ba3 100644
--- a/tests/translator/output/aws-cn/function_with_deployment_preference_all_parameters.json
+++ b/tests/translator/output/aws-cn/function_with_deployment_preference_all_parameters.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -52,7 +58,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -247,7 +259,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_deployment_preference_multiple_combinations.json b/tests/translator/output/aws-cn/function_with_deployment_preference_multiple_combinations.json
index 6fed70de79..7c9543aa57 100644
--- a/tests/translator/output/aws-cn/function_with_deployment_preference_multiple_combinations.json
+++ b/tests/translator/output/aws-cn/function_with_deployment_preference_multiple_combinations.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -75,7 +81,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -188,7 +200,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -212,7 +230,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -364,7 +388,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_disabled_deployment_preference.json b/tests/translator/output/aws-cn/function_with_disabled_deployment_preference.json
index 588842ae20..80337bcd2b 100644
--- a/tests/translator/output/aws-cn/function_with_disabled_deployment_preference.json
+++ b/tests/translator/output/aws-cn/function_with_disabled_deployment_preference.json
@@ -52,7 +52,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_dlq.json b/tests/translator/output/aws-cn/function_with_dlq.json
index 4d1bd64f18..3c006a0aff 100644
--- a/tests/translator/output/aws-cn/function_with_dlq.json
+++ b/tests/translator/output/aws-cn/function_with_dlq.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy",
@@ -45,6 +51,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy",
diff --git a/tests/translator/output/aws-cn/function_with_global_layers.json b/tests/translator/output/aws-cn/function_with_global_layers.json
index a958c11d89..e0fcdb520c 100644
--- a/tests/translator/output/aws-cn/function_with_global_layers.json
+++ b/tests/translator/output/aws-cn/function_with_global_layers.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_kmskeyarn.json b/tests/translator/output/aws-cn/function_with_kmskeyarn.json
index 4d7cc90616..c26fd25065 100644
--- a/tests/translator/output/aws-cn/function_with_kmskeyarn.json
+++ b/tests/translator/output/aws-cn/function_with_kmskeyarn.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -30,6 +36,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_layers.json b/tests/translator/output/aws-cn/function_with_layers.json
index 3f349ecfea..7c2004acff 100644
--- a/tests/translator/output/aws-cn/function_with_layers.json
+++ b/tests/translator/output/aws-cn/function_with_layers.json
@@ -70,7 +70,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -94,7 +100,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -175,7 +187,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -199,7 +217,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_many_layers.json b/tests/translator/output/aws-cn/function_with_many_layers.json
index d95a35d8e9..2bff7ff8fa 100644
--- a/tests/translator/output/aws-cn/function_with_many_layers.json
+++ b/tests/translator/output/aws-cn/function_with_many_layers.json
@@ -16,7 +16,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_permissions_boundary.json b/tests/translator/output/aws-cn/function_with_permissions_boundary.json
index 1adb21c16a..b71af4f7ba 100644
--- a/tests/translator/output/aws-cn/function_with_permissions_boundary.json
+++ b/tests/translator/output/aws-cn/function_with_permissions_boundary.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "PermissionsBoundary": "arn:aws:1234:iam:boundary/CustomerCreatedPermissionsBoundary", 
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
diff --git a/tests/translator/output/aws-cn/function_with_policy_templates.json b/tests/translator/output/aws-cn/function_with_policy_templates.json
index a8b0a453a9..d6e45817e8 100644
--- a/tests/translator/output/aws-cn/function_with_policy_templates.json
+++ b/tests/translator/output/aws-cn/function_with_policy_templates.json
@@ -57,6 +57,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "OnePolicyTemplateRolePolicy0",
@@ -116,6 +122,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "MultiplePolicyTemplatesRolePolicy0",
@@ -214,6 +226,12 @@
           "arn:aws-cn:iam::aws:policy/AmazonDynamoDBFullAccess",
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "AllCombinationsRolePolicy0",
diff --git a/tests/translator/output/aws-cn/function_with_request_parameters.json b/tests/translator/output/aws-cn/function_with_request_parameters.json
index 7202333096..a8d967912e 100644
--- a/tests/translator/output/aws-cn/function_with_request_parameters.json
+++ b/tests/translator/output/aws-cn/function_with_request_parameters.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -63,6 +69,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_resource_refs.json b/tests/translator/output/aws-cn/function_with_resource_refs.json
index 566193806b..89ab2a671c 100644
--- a/tests/translator/output/aws-cn/function_with_resource_refs.json
+++ b/tests/translator/output/aws-cn/function_with_resource_refs.json
@@ -79,7 +79,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -126,7 +132,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/function_with_sns_event_source_all_parameters.json b/tests/translator/output/aws-cn/function_with_sns_event_source_all_parameters.json
index cac15164c9..645a946a00 100644
--- a/tests/translator/output/aws-cn/function_with_sns_event_source_all_parameters.json
+++ b/tests/translator/output/aws-cn/function_with_sns_event_source_all_parameters.json
@@ -54,6 +54,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/global_handle_path_level_parameter.json b/tests/translator/output/aws-cn/global_handle_path_level_parameter.json
index 66a652eb32..c9213e54bb 100644
--- a/tests/translator/output/aws-cn/global_handle_path_level_parameter.json
+++ b/tests/translator/output/aws-cn/global_handle_path_level_parameter.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/globals_for_api.json b/tests/translator/output/aws-cn/globals_for_api.json
index 16a4611425..1256b5474f 100644
--- a/tests/translator/output/aws-cn/globals_for_api.json
+++ b/tests/translator/output/aws-cn/globals_for_api.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/globals_for_function.json b/tests/translator/output/aws-cn/globals_for_function.json
index 68cb93e88b..59bd1987a0 100644
--- a/tests/translator/output/aws-cn/globals_for_function.json
+++ b/tests/translator/output/aws-cn/globals_for_function.json
@@ -6,7 +6,21 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/AWSXrayWriteOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          },
+          {
+            "Value": "newvalue1",
+            "Key": "newtag1"
+          },
+          {
+            "Value": "value1",
+            "Key": "tag1"
+          }
+        ],
         "PermissionsBoundary": "arn:aws:1234:iam:boundary/OverridePermissionsBoundary", 
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
@@ -93,7 +107,17 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/AWSXrayWriteOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          },
+          {
+            "Value": "value1",
+            "Key": "tag1"
+          }
+        ],
         "PermissionsBoundary": "arn:aws:1234:iam:boundary/CustomerCreatedPermissionsBoundary", 
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
diff --git a/tests/translator/output/aws-cn/implicit_and_explicit_api_with_conditions.json b/tests/translator/output/aws-cn/implicit_and_explicit_api_with_conditions.json
index 5b58421bc9..4e6dbf082d 100644
--- a/tests/translator/output/aws-cn/implicit_and_explicit_api_with_conditions.json
+++ b/tests/translator/output/aws-cn/implicit_and_explicit_api_with_conditions.json
@@ -68,6 +68,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -154,6 +160,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -423,6 +435,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -545,6 +563,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/implicit_api.json b/tests/translator/output/aws-cn/implicit_api.json
index d34fa9a5cf..21209fd401 100644
--- a/tests/translator/output/aws-cn/implicit_api.json
+++ b/tests/translator/output/aws-cn/implicit_api.json
@@ -6,7 +6,13 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/AmazonDynamoDBFullAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -108,7 +114,13 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/implicit_api_with_auth_and_conditions_max.json b/tests/translator/output/aws-cn/implicit_api_with_auth_and_conditions_max.json
index 62289044f2..2f43d74db6 100644
--- a/tests/translator/output/aws-cn/implicit_api_with_auth_and_conditions_max.json
+++ b/tests/translator/output/aws-cn/implicit_api_with_auth_and_conditions_max.json
@@ -216,6 +216,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -241,6 +247,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -266,6 +278,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -315,6 +333,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -381,6 +405,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -512,6 +542,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/implicit_api_with_many_conditions.json b/tests/translator/output/aws-cn/implicit_api_with_many_conditions.json
index 76ea25af7f..754d1ea461 100644
--- a/tests/translator/output/aws-cn/implicit_api_with_many_conditions.json
+++ b/tests/translator/output/aws-cn/implicit_api_with_many_conditions.json
@@ -164,6 +164,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -239,6 +245,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -535,6 +547,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -582,6 +600,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -651,6 +675,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -676,6 +706,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -726,6 +762,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -823,6 +865,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -848,6 +896,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -873,6 +927,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -898,6 +958,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/implicit_api_with_serverless_rest_api_resource.json b/tests/translator/output/aws-cn/implicit_api_with_serverless_rest_api_resource.json
index d34fa9a5cf..eb153fbf67 100644
--- a/tests/translator/output/aws-cn/implicit_api_with_serverless_rest_api_resource.json
+++ b/tests/translator/output/aws-cn/implicit_api_with_serverless_rest_api_resource.json
@@ -6,7 +6,13 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/AmazonDynamoDBFullAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -108,7 +114,13 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/intrinsic_functions.json b/tests/translator/output/aws-cn/intrinsic_functions.json
index a246c15974..78737ae78c 100644
--- a/tests/translator/output/aws-cn/intrinsic_functions.json
+++ b/tests/translator/output/aws-cn/intrinsic_functions.json
@@ -169,7 +169,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy", 
@@ -269,7 +275,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -294,7 +306,13 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -448,7 +466,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy", 
diff --git a/tests/translator/output/aws-cn/iot_rule.json b/tests/translator/output/aws-cn/iot_rule.json
index 64464c74e0..fa16969a44 100644
--- a/tests/translator/output/aws-cn/iot_rule.json
+++ b/tests/translator/output/aws-cn/iot_rule.json
@@ -122,7 +122,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/layers_all_properties.json b/tests/translator/output/aws-cn/layers_all_properties.json
index 4cebed47b1..3520acb5bb 100644
--- a/tests/translator/output/aws-cn/layers_all_properties.json
+++ b/tests/translator/output/aws-cn/layers_all_properties.json
@@ -91,7 +91,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/no_implicit_api_with_serverless_rest_api_resource.json b/tests/translator/output/aws-cn/no_implicit_api_with_serverless_rest_api_resource.json
index 68e16942b2..583c346eeb 100644
--- a/tests/translator/output/aws-cn/no_implicit_api_with_serverless_rest_api_resource.json
+++ b/tests/translator/output/aws-cn/no_implicit_api_with_serverless_rest_api_resource.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -65,7 +71,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -112,7 +124,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/s3.json b/tests/translator/output/aws-cn/s3.json
index 36ed3e9691..c23456f980 100644
--- a/tests/translator/output/aws-cn/s3.json
+++ b/tests/translator/output/aws-cn/s3.json
@@ -24,7 +24,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/s3_create_remove.json b/tests/translator/output/aws-cn/s3_create_remove.json
index e71f2d1fda..2d4941f57a 100644
--- a/tests/translator/output/aws-cn/s3_create_remove.json
+++ b/tests/translator/output/aws-cn/s3_create_remove.json
@@ -41,7 +41,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/s3_existing_lambda_notification_configuration.json b/tests/translator/output/aws-cn/s3_existing_lambda_notification_configuration.json
index 36ed3e9691..c23456f980 100644
--- a/tests/translator/output/aws-cn/s3_existing_lambda_notification_configuration.json
+++ b/tests/translator/output/aws-cn/s3_existing_lambda_notification_configuration.json
@@ -24,7 +24,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/s3_existing_other_notification_configuration.json b/tests/translator/output/aws-cn/s3_existing_other_notification_configuration.json
index c8e2fe1fdf..945b98dd24 100644
--- a/tests/translator/output/aws-cn/s3_existing_other_notification_configuration.json
+++ b/tests/translator/output/aws-cn/s3_existing_other_notification_configuration.json
@@ -32,7 +32,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/s3_filter.json b/tests/translator/output/aws-cn/s3_filter.json
index 3c3e03dfe0..74e934eb41 100644
--- a/tests/translator/output/aws-cn/s3_filter.json
+++ b/tests/translator/output/aws-cn/s3_filter.json
@@ -34,7 +34,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/s3_multiple_events_same_bucket.json b/tests/translator/output/aws-cn/s3_multiple_events_same_bucket.json
index 43b4e3a002..7c3565c4b3 100644
--- a/tests/translator/output/aws-cn/s3_multiple_events_same_bucket.json
+++ b/tests/translator/output/aws-cn/s3_multiple_events_same_bucket.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/s3_multiple_functions.json b/tests/translator/output/aws-cn/s3_multiple_functions.json
index de4c96d187..5c273d727d 100644
--- a/tests/translator/output/aws-cn/s3_multiple_functions.json
+++ b/tests/translator/output/aws-cn/s3_multiple_functions.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -80,6 +86,12 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-cn/s3_with_condition.json b/tests/translator/output/aws-cn/s3_with_condition.json
index 6b8e7f8d98..769c396f14 100644
--- a/tests/translator/output/aws-cn/s3_with_condition.json
+++ b/tests/translator/output/aws-cn/s3_with_condition.json
@@ -53,7 +53,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/s3_with_dependsOn.json b/tests/translator/output/aws-cn/s3_with_dependsOn.json
index adb9b129f9..0d950b3797 100644
--- a/tests/translator/output/aws-cn/s3_with_dependsOn.json
+++ b/tests/translator/output/aws-cn/s3_with_dependsOn.json
@@ -30,7 +30,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/sns.json b/tests/translator/output/aws-cn/sns.json
index 231217f58e..06a7015664 100644
--- a/tests/translator/output/aws-cn/sns.json
+++ b/tests/translator/output/aws-cn/sns.json
@@ -8,7 +8,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/sns_existing_other_subscription.json b/tests/translator/output/aws-cn/sns_existing_other_subscription.json
index bae375bc39..09ca5669fa 100644
--- a/tests/translator/output/aws-cn/sns_existing_other_subscription.json
+++ b/tests/translator/output/aws-cn/sns_existing_other_subscription.json
@@ -16,7 +16,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/sns_sqs.json b/tests/translator/output/aws-cn/sns_sqs.json
index 6aaaacf62e..87afe98b0d 100644
--- a/tests/translator/output/aws-cn/sns_sqs.json
+++ b/tests/translator/output/aws-cn/sns_sqs.json
@@ -74,7 +74,13 @@
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaSQSQueueExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/sns_topic_outside_template.json b/tests/translator/output/aws-cn/sns_topic_outside_template.json
index 5ef957d25d..f503d2e4ae 100644
--- a/tests/translator/output/aws-cn/sns_topic_outside_template.json
+++ b/tests/translator/output/aws-cn/sns_topic_outside_template.json
@@ -25,7 +25,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-cn/sqs.json b/tests/translator/output/aws-cn/sqs.json
index b74b0623e4..cad7b2248b 100644
--- a/tests/translator/output/aws-cn/sqs.json
+++ b/tests/translator/output/aws-cn/sqs.json
@@ -7,6 +7,12 @@
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaSQSQueueExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{
diff --git a/tests/translator/output/aws-cn/streams.json b/tests/translator/output/aws-cn/streams.json
index 6e29b6bb4d..fd19ed8f73 100644
--- a/tests/translator/output/aws-cn/streams.json
+++ b/tests/translator/output/aws-cn/streams.json
@@ -60,6 +60,12 @@
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{
@@ -95,6 +101,12 @@
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{
diff --git a/tests/translator/output/aws-us-gov/alexa_skill.json b/tests/translator/output/aws-us-gov/alexa_skill.json
index 5fe8c8cddc..59c8ca7793 100644
--- a/tests/translator/output/aws-us-gov/alexa_skill.json
+++ b/tests/translator/output/aws-us-gov/alexa_skill.json
@@ -7,7 +7,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/alexa_skill_with_skill_id.json b/tests/translator/output/aws-us-gov/alexa_skill_with_skill_id.json
index 659f83c425..4feb3d89b2 100644
--- a/tests/translator/output/aws-us-gov/alexa_skill_with_skill_id.json
+++ b/tests/translator/output/aws-us-gov/alexa_skill_with_skill_id.json
@@ -7,8 +7,14 @@
         "Properties": {
           "ManagedPolicyArns": [
             "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-          ], 
-          "AssumeRolePolicyDocument": {
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+        "AssumeRolePolicyDocument": {
             "Version": "2012-10-17", 
             "Statement": [
               {
diff --git a/tests/translator/output/aws-us-gov/all_policy_templates.json b/tests/translator/output/aws-us-gov/all_policy_templates.json
index 256e76cc72..d2a3d265fa 100644
--- a/tests/translator/output/aws-us-gov/all_policy_templates.json
+++ b/tests/translator/output/aws-us-gov/all_policy_templates.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "KitchenSinkFunctionRolePolicy0",
diff --git a/tests/translator/output/aws-us-gov/api_cache.json b/tests/translator/output/aws-us-gov/api_cache.json
index 52af7238ce..6821189ffb 100644
--- a/tests/translator/output/aws-us-gov/api_cache.json
+++ b/tests/translator/output/aws-us-gov/api_cache.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_endpoint_configuration.json b/tests/translator/output/aws-us-gov/api_endpoint_configuration.json
index 067fc009df..ed665a2cd3 100644
--- a/tests/translator/output/aws-us-gov/api_endpoint_configuration.json
+++ b/tests/translator/output/aws-us-gov/api_endpoint_configuration.json
@@ -33,7 +33,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_request_model.json b/tests/translator/output/aws-us-gov/api_request_model.json
index a99dc03ad9..6b54cb7e85 100644
--- a/tests/translator/output/aws-us-gov/api_request_model.json
+++ b/tests/translator/output/aws-us-gov/api_request_model.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_request_model_openapi_3.json b/tests/translator/output/aws-us-gov/api_request_model_openapi_3.json
index 5c9aba6dbd..02c9ff1c63 100644
--- a/tests/translator/output/aws-us-gov/api_request_model_openapi_3.json
+++ b/tests/translator/output/aws-us-gov/api_request_model_openapi_3.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_access_log_setting.json b/tests/translator/output/aws-us-gov/api_with_access_log_setting.json
index bd3f69d057..8726754fed 100644
--- a/tests/translator/output/aws-us-gov/api_with_access_log_setting.json
+++ b/tests/translator/output/aws-us-gov/api_with_access_log_setting.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_apikey_default_override.json b/tests/translator/output/aws-us-gov/api_with_apikey_default_override.json
index 14b24ba9a6..cdaff1a496 100644
--- a/tests/translator/output/aws-us-gov/api_with_apikey_default_override.json
+++ b/tests/translator/output/aws-us-gov/api_with_apikey_default_override.json
@@ -160,6 +160,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -184,6 +190,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -208,6 +220,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_apikey_required.json b/tests/translator/output/aws-us-gov/api_with_apikey_required.json
index 311640f538..092bfe65c5 100644
--- a/tests/translator/output/aws-us-gov/api_with_apikey_required.json
+++ b/tests/translator/output/aws-us-gov/api_with_apikey_required.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_apikey_required_openapi_3.json b/tests/translator/output/aws-us-gov/api_with_apikey_required_openapi_3.json
index 2b081c12dd..8410f422a8 100644
--- a/tests/translator/output/aws-us-gov/api_with_apikey_required_openapi_3.json
+++ b/tests/translator/output/aws-us-gov/api_with_apikey_required_openapi_3.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_auth_all_maximum.json b/tests/translator/output/aws-us-gov/api_with_auth_all_maximum.json
index 17f8d4454f..4a8e7b8af3 100644
--- a/tests/translator/output/aws-us-gov/api_with_auth_all_maximum.json
+++ b/tests/translator/output/aws-us-gov/api_with_auth_all_maximum.json
@@ -98,7 +98,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_auth_all_maximum_openapi_3.json b/tests/translator/output/aws-us-gov/api_with_auth_all_maximum_openapi_3.json
index 51a647589c..07e15acea2 100644
--- a/tests/translator/output/aws-us-gov/api_with_auth_all_maximum_openapi_3.json
+++ b/tests/translator/output/aws-us-gov/api_with_auth_all_maximum_openapi_3.json
@@ -88,7 +88,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_auth_all_minimum.json b/tests/translator/output/aws-us-gov/api_with_auth_all_minimum.json
index 9db122986d..517fe47d75 100644
--- a/tests/translator/output/aws-us-gov/api_with_auth_all_minimum.json
+++ b/tests/translator/output/aws-us-gov/api_with_auth_all_minimum.json
@@ -133,7 +133,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -374,7 +380,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_auth_all_minimum_openapi.json b/tests/translator/output/aws-us-gov/api_with_auth_all_minimum_openapi.json
index f2829ec889..2839351eef 100644
--- a/tests/translator/output/aws-us-gov/api_with_auth_all_minimum_openapi.json
+++ b/tests/translator/output/aws-us-gov/api_with_auth_all_minimum_openapi.json
@@ -152,7 +152,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -385,7 +391,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_auth_and_conditions_all_max.json b/tests/translator/output/aws-us-gov/api_with_auth_and_conditions_all_max.json
index 622bb3742f..7ce6e4098b 100644
--- a/tests/translator/output/aws-us-gov/api_with_auth_and_conditions_all_max.json
+++ b/tests/translator/output/aws-us-gov/api_with_auth_and_conditions_all_max.json
@@ -410,7 +410,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -518,7 +524,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_auth_no_default.json b/tests/translator/output/aws-us-gov/api_with_auth_no_default.json
index 168867aa74..e3157a808f 100644
--- a/tests/translator/output/aws-us-gov/api_with_auth_no_default.json
+++ b/tests/translator/output/aws-us-gov/api_with_auth_no_default.json
@@ -118,7 +118,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -364,7 +370,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_aws_account_blacklist.json b/tests/translator/output/aws-us-gov/api_with_aws_account_blacklist.json
index bd70a3966f..fb87aea531 100644
--- a/tests/translator/output/aws-us-gov/api_with_aws_account_blacklist.json
+++ b/tests/translator/output/aws-us-gov/api_with_aws_account_blacklist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_aws_account_whitelist.json b/tests/translator/output/aws-us-gov/api_with_aws_account_whitelist.json
index 24d6b9af06..ca4f00b174 100644
--- a/tests/translator/output/aws-us-gov/api_with_aws_account_whitelist.json
+++ b/tests/translator/output/aws-us-gov/api_with_aws_account_whitelist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_aws_iam_auth_overrides.json b/tests/translator/output/aws-us-gov/api_with_aws_iam_auth_overrides.json
index 08bd46b1ef..82d742b181 100644
--- a/tests/translator/output/aws-us-gov/api_with_aws_iam_auth_overrides.json
+++ b/tests/translator/output/aws-us-gov/api_with_aws_iam_auth_overrides.json
@@ -86,7 +86,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -292,7 +298,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -360,7 +372,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -384,7 +402,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -517,7 +541,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -541,7 +571,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -565,7 +601,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -589,7 +631,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -868,7 +916,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_basic_custom_domain.json b/tests/translator/output/aws-us-gov/api_with_basic_custom_domain.json
index 2ba58f4ad5..f01713aa1f 100644
--- a/tests/translator/output/aws-us-gov/api_with_basic_custom_domain.json
+++ b/tests/translator/output/aws-us-gov/api_with_basic_custom_domain.json
@@ -173,7 +173,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_basic_custom_domain_intrinsics.json b/tests/translator/output/aws-us-gov/api_with_basic_custom_domain_intrinsics.json
index 217a892907..49f1e07ca1 100644
--- a/tests/translator/output/aws-us-gov/api_with_basic_custom_domain_intrinsics.json
+++ b/tests/translator/output/aws-us-gov/api_with_basic_custom_domain_intrinsics.json
@@ -107,7 +107,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_binary_media_types.json b/tests/translator/output/aws-us-gov/api_with_binary_media_types.json
index 729397a81d..b28ae6c7c1 100644
--- a/tests/translator/output/aws-us-gov/api_with_binary_media_types.json
+++ b/tests/translator/output/aws-us-gov/api_with_binary_media_types.json
@@ -34,7 +34,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_canary_setting.json b/tests/translator/output/aws-us-gov/api_with_canary_setting.json
index 3c137093df..d34fc26c61 100644
--- a/tests/translator/output/aws-us-gov/api_with_canary_setting.json
+++ b/tests/translator/output/aws-us-gov/api_with_canary_setting.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_cors.json b/tests/translator/output/aws-us-gov/api_with_cors.json
index 1b697129b6..a1112019fe 100644
--- a/tests/translator/output/aws-us-gov/api_with_cors.json
+++ b/tests/translator/output/aws-us-gov/api_with_cors.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -227,7 +233,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -275,7 +287,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_cors_and_auth_no_preflight_auth.json b/tests/translator/output/aws-us-gov/api_with_cors_and_auth_no_preflight_auth.json
index 6445a45e93..0c3b970252 100644
--- a/tests/translator/output/aws-us-gov/api_with_cors_and_auth_no_preflight_auth.json
+++ b/tests/translator/output/aws-us-gov/api_with_cors_and_auth_no_preflight_auth.json
@@ -126,7 +126,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -260,7 +266,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_cors_and_auth_preflight_auth.json b/tests/translator/output/aws-us-gov/api_with_cors_and_auth_preflight_auth.json
index 36efb85f20..f427119c84 100644
--- a/tests/translator/output/aws-us-gov/api_with_cors_and_auth_preflight_auth.json
+++ b/tests/translator/output/aws-us-gov/api_with_cors_and_auth_preflight_auth.json
@@ -131,7 +131,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -253,7 +259,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_cors_and_conditions_no_definitionbody.json b/tests/translator/output/aws-us-gov/api_with_cors_and_conditions_no_definitionbody.json
index 1f251eb602..da7fa9fd53 100644
--- a/tests/translator/output/aws-us-gov/api_with_cors_and_conditions_no_definitionbody.json
+++ b/tests/translator/output/aws-us-gov/api_with_cors_and_conditions_no_definitionbody.json
@@ -38,7 +38,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -257,7 +263,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_cors_and_only_credentials_false.json b/tests/translator/output/aws-us-gov/api_with_cors_and_only_credentials_false.json
index 61b81d0e0c..58b33731c2 100644
--- a/tests/translator/output/aws-us-gov/api_with_cors_and_only_credentials_false.json
+++ b/tests/translator/output/aws-us-gov/api_with_cors_and_only_credentials_false.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_cors_and_only_headers.json b/tests/translator/output/aws-us-gov/api_with_cors_and_only_headers.json
index 55b6dae2b7..93c1c9e023 100644
--- a/tests/translator/output/aws-us-gov/api_with_cors_and_only_headers.json
+++ b/tests/translator/output/aws-us-gov/api_with_cors_and_only_headers.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_cors_and_only_maxage.json b/tests/translator/output/aws-us-gov/api_with_cors_and_only_maxage.json
index e1d3268bf3..abf9671505 100644
--- a/tests/translator/output/aws-us-gov/api_with_cors_and_only_maxage.json
+++ b/tests/translator/output/aws-us-gov/api_with_cors_and_only_maxage.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_cors_and_only_methods.json b/tests/translator/output/aws-us-gov/api_with_cors_and_only_methods.json
index 0092ba6bc1..2e14e27b5a 100644
--- a/tests/translator/output/aws-us-gov/api_with_cors_and_only_methods.json
+++ b/tests/translator/output/aws-us-gov/api_with_cors_and_only_methods.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_cors_and_only_origins.json b/tests/translator/output/aws-us-gov/api_with_cors_and_only_origins.json
index 63e57916b6..9e07957551 100644
--- a/tests/translator/output/aws-us-gov/api_with_cors_and_only_origins.json
+++ b/tests/translator/output/aws-us-gov/api_with_cors_and_only_origins.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_cors_no_definitionbody.json b/tests/translator/output/aws-us-gov/api_with_cors_no_definitionbody.json
index ebc37e092a..b769487495 100644
--- a/tests/translator/output/aws-us-gov/api_with_cors_no_definitionbody.json
+++ b/tests/translator/output/aws-us-gov/api_with_cors_no_definitionbody.json
@@ -28,6 +28,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{
diff --git a/tests/translator/output/aws-us-gov/api_with_cors_openapi_3.json b/tests/translator/output/aws-us-gov/api_with_cors_openapi_3.json
index dfc5dc6d30..98328269b3 100644
--- a/tests/translator/output/aws-us-gov/api_with_cors_openapi_3.json
+++ b/tests/translator/output/aws-us-gov/api_with_cors_openapi_3.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -217,7 +223,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -265,7 +277,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_custom_domain_route53.json b/tests/translator/output/aws-us-gov/api_with_custom_domain_route53.json
index 860a1a2bf3..0ce6f46351 100644
--- a/tests/translator/output/aws-us-gov/api_with_custom_domain_route53.json
+++ b/tests/translator/output/aws-us-gov/api_with_custom_domain_route53.json
@@ -189,7 +189,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_default_aws_iam_auth.json b/tests/translator/output/aws-us-gov/api_with_default_aws_iam_auth.json
index d5b72bdb30..d9adae120e 100644
--- a/tests/translator/output/aws-us-gov/api_with_default_aws_iam_auth.json
+++ b/tests/translator/output/aws-us-gov/api_with_default_aws_iam_auth.json
@@ -308,6 +308,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_default_aws_iam_auth_and_no_auth_route.json b/tests/translator/output/aws-us-gov/api_with_default_aws_iam_auth_and_no_auth_route.json
index 499a3832f0..d81ac7f17e 100644
--- a/tests/translator/output/aws-us-gov/api_with_default_aws_iam_auth_and_no_auth_route.json
+++ b/tests/translator/output/aws-us-gov/api_with_default_aws_iam_auth_and_no_auth_route.json
@@ -158,6 +158,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_gateway_responses.json b/tests/translator/output/aws-us-gov/api_with_gateway_responses.json
index eb975d45e7..e16a96b55a 100644
--- a/tests/translator/output/aws-us-gov/api_with_gateway_responses.json
+++ b/tests/translator/output/aws-us-gov/api_with_gateway_responses.json
@@ -39,6 +39,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_gateway_responses_all.json b/tests/translator/output/aws-us-gov/api_with_gateway_responses_all.json
index 0105852ba1..c0a582899c 100644
--- a/tests/translator/output/aws-us-gov/api_with_gateway_responses_all.json
+++ b/tests/translator/output/aws-us-gov/api_with_gateway_responses_all.json
@@ -39,6 +39,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_gateway_responses_all_openapi_3.json b/tests/translator/output/aws-us-gov/api_with_gateway_responses_all_openapi_3.json
index e41c0b3b74..21be035892 100644
--- a/tests/translator/output/aws-us-gov/api_with_gateway_responses_all_openapi_3.json
+++ b/tests/translator/output/aws-us-gov/api_with_gateway_responses_all_openapi_3.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_gateway_responses_implicit.json b/tests/translator/output/aws-us-gov/api_with_gateway_responses_implicit.json
index de439a2aa4..99c3845557 100644
--- a/tests/translator/output/aws-us-gov/api_with_gateway_responses_implicit.json
+++ b/tests/translator/output/aws-us-gov/api_with_gateway_responses_implicit.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_gateway_responses_minimal.json b/tests/translator/output/aws-us-gov/api_with_gateway_responses_minimal.json
index 52370d99ab..71eefd4db5 100644
--- a/tests/translator/output/aws-us-gov/api_with_gateway_responses_minimal.json
+++ b/tests/translator/output/aws-us-gov/api_with_gateway_responses_minimal.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_gateway_responses_string_status_code.json b/tests/translator/output/aws-us-gov/api_with_gateway_responses_string_status_code.json
index eb975d45e7..e16a96b55a 100644
--- a/tests/translator/output/aws-us-gov/api_with_gateway_responses_string_status_code.json
+++ b/tests/translator/output/aws-us-gov/api_with_gateway_responses_string_status_code.json
@@ -39,6 +39,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_incompatible_stage_name.json b/tests/translator/output/aws-us-gov/api_with_incompatible_stage_name.json
index 5ffa7f92ca..6352d5cc5f 100644
--- a/tests/translator/output/aws-us-gov/api_with_incompatible_stage_name.json
+++ b/tests/translator/output/aws-us-gov/api_with_incompatible_stage_name.json
@@ -73,7 +73,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -269,7 +275,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_ip_range_blacklist.json b/tests/translator/output/aws-us-gov/api_with_ip_range_blacklist.json
index 7834b03fe1..c4b462c98b 100644
--- a/tests/translator/output/aws-us-gov/api_with_ip_range_blacklist.json
+++ b/tests/translator/output/aws-us-gov/api_with_ip_range_blacklist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_ip_range_whitelist.json b/tests/translator/output/aws-us-gov/api_with_ip_range_whitelist.json
index 111af14266..c0428615da 100644
--- a/tests/translator/output/aws-us-gov/api_with_ip_range_whitelist.json
+++ b/tests/translator/output/aws-us-gov/api_with_ip_range_whitelist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_method_aws_iam_auth.json b/tests/translator/output/aws-us-gov/api_with_method_aws_iam_auth.json
index 0efd815a32..e28c4cf7d9 100644
--- a/tests/translator/output/aws-us-gov/api_with_method_aws_iam_auth.json
+++ b/tests/translator/output/aws-us-gov/api_with_method_aws_iam_auth.json
@@ -196,6 +196,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_method_settings.json b/tests/translator/output/aws-us-gov/api_with_method_settings.json
index 7ce1291b27..0acbaac413 100644
--- a/tests/translator/output/aws-us-gov/api_with_method_settings.json
+++ b/tests/translator/output/aws-us-gov/api_with_method_settings.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_minimum_compression_size.json b/tests/translator/output/aws-us-gov/api_with_minimum_compression_size.json
index e79924396d..b02b0cafa6 100644
--- a/tests/translator/output/aws-us-gov/api_with_minimum_compression_size.json
+++ b/tests/translator/output/aws-us-gov/api_with_minimum_compression_size.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_open_api_version.json b/tests/translator/output/aws-us-gov/api_with_open_api_version.json
index fc4c3c2cc6..b6fd6e6283 100644
--- a/tests/translator/output/aws-us-gov/api_with_open_api_version.json
+++ b/tests/translator/output/aws-us-gov/api_with_open_api_version.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_open_api_version_2.json b/tests/translator/output/aws-us-gov/api_with_open_api_version_2.json
index 520c537d28..cca6716f67 100644
--- a/tests/translator/output/aws-us-gov/api_with_open_api_version_2.json
+++ b/tests/translator/output/aws-us-gov/api_with_open_api_version_2.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_openapi_definition_body_no_flag.json b/tests/translator/output/aws-us-gov/api_with_openapi_definition_body_no_flag.json
index ff7cd8a26d..65a0e5e8d6 100644
--- a/tests/translator/output/aws-us-gov/api_with_openapi_definition_body_no_flag.json
+++ b/tests/translator/output/aws-us-gov/api_with_openapi_definition_body_no_flag.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_path_parameters.json b/tests/translator/output/aws-us-gov/api_with_path_parameters.json
index c0fe04bdd2..4d8c8dffc1 100644
--- a/tests/translator/output/aws-us-gov/api_with_path_parameters.json
+++ b/tests/translator/output/aws-us-gov/api_with_path_parameters.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_resource_policy.json b/tests/translator/output/aws-us-gov/api_with_resource_policy.json
index 5a25e81532..d1e8eec099 100644
--- a/tests/translator/output/aws-us-gov/api_with_resource_policy.json
+++ b/tests/translator/output/aws-us-gov/api_with_resource_policy.json
@@ -97,7 +97,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_resource_policy_global.json b/tests/translator/output/aws-us-gov/api_with_resource_policy_global.json
index ee863bb51e..6b50357d7d 100644
--- a/tests/translator/output/aws-us-gov/api_with_resource_policy_global.json
+++ b/tests/translator/output/aws-us-gov/api_with_resource_policy_global.json
@@ -79,7 +79,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_resource_policy_global_implicit.json b/tests/translator/output/aws-us-gov/api_with_resource_policy_global_implicit.json
index 7b72c912a2..1fdfdc8dc4 100644
--- a/tests/translator/output/aws-us-gov/api_with_resource_policy_global_implicit.json
+++ b/tests/translator/output/aws-us-gov/api_with_resource_policy_global_implicit.json
@@ -26,7 +26,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_resource_refs.json b/tests/translator/output/aws-us-gov/api_with_resource_refs.json
index cda8e4cf10..f3a20075fd 100644
--- a/tests/translator/output/aws-us-gov/api_with_resource_refs.json
+++ b/tests/translator/output/aws-us-gov/api_with_resource_refs.json
@@ -115,7 +115,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_source_vpc_blacklist.json b/tests/translator/output/aws-us-gov/api_with_source_vpc_blacklist.json
index 62edf8febe..da773e426d 100644
--- a/tests/translator/output/aws-us-gov/api_with_source_vpc_blacklist.json
+++ b/tests/translator/output/aws-us-gov/api_with_source_vpc_blacklist.json
@@ -49,7 +49,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_source_vpc_whitelist.json b/tests/translator/output/aws-us-gov/api_with_source_vpc_whitelist.json
index 0f16c0ac6b..caf3a86db2 100644
--- a/tests/translator/output/aws-us-gov/api_with_source_vpc_whitelist.json
+++ b/tests/translator/output/aws-us-gov/api_with_source_vpc_whitelist.json
@@ -115,7 +115,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_swagger_and_openapi_with_auth.json b/tests/translator/output/aws-us-gov/api_with_swagger_and_openapi_with_auth.json
index a9116497b9..d7e94ea640 100644
--- a/tests/translator/output/aws-us-gov/api_with_swagger_and_openapi_with_auth.json
+++ b/tests/translator/output/aws-us-gov/api_with_swagger_and_openapi_with_auth.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/api_with_xray_tracing.json b/tests/translator/output/aws-us-gov/api_with_xray_tracing.json
index 9d5f890add..583e52207f 100644
--- a/tests/translator/output/aws-us-gov/api_with_xray_tracing.json
+++ b/tests/translator/output/aws-us-gov/api_with_xray_tracing.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/basic_function.json b/tests/translator/output/aws-us-gov/basic_function.json
index b386270b29..649009382a 100644
--- a/tests/translator/output/aws-us-gov/basic_function.json
+++ b/tests/translator/output/aws-us-gov/basic_function.json
@@ -40,7 +40,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -133,7 +139,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -200,7 +212,7 @@
         "VpcConfig": {
           "SubnetIds": [
             "subnet-9d4a7b6c", 
-            "subnet-65ea5f08", 
+            "subnet-65ea5f08",
             {
               "Ref": "SomeParameter"
             }, 
@@ -261,7 +273,13 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/AmazonDynamoDBFullAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -286,7 +304,13 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/AWSXrayWriteOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -311,7 +335,13 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/AWSXrayWriteOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -384,7 +414,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "FunctionWithPolicyDocumentRolePolicy0", 
diff --git a/tests/translator/output/aws-us-gov/basic_function_with_tags.json b/tests/translator/output/aws-us-gov/basic_function_with_tags.json
index c7e48394b3..211818e8cd 100644
--- a/tests/translator/output/aws-us-gov/basic_function_with_tags.json
+++ b/tests/translator/output/aws-us-gov/basic_function_with_tags.json
@@ -12,7 +12,31 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          },
+          {
+            "Value": "TagValue1",
+            "Key": "TagKey1"
+          },
+          {
+            "Value": "",
+            "Key": "TagKey2"
+          },
+          {
+            "Value": {
+              "Ref": "TagValueParam"
+            },
+            "Key": "TagKey3"
+          },
+          {
+            "Value": "123",
+            "Key": "TagKey4"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/cloudwatch_logs_with_ref.json b/tests/translator/output/aws-us-gov/cloudwatch_logs_with_ref.json
index 3ed0f3a649..1bb0be81bf 100644
--- a/tests/translator/output/aws-us-gov/cloudwatch_logs_with_ref.json
+++ b/tests/translator/output/aws-us-gov/cloudwatch_logs_with_ref.json
@@ -61,6 +61,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/cloudwatchevent.json b/tests/translator/output/aws-us-gov/cloudwatchevent.json
index 62456632fa..10e5b8285c 100644
--- a/tests/translator/output/aws-us-gov/cloudwatchevent.json
+++ b/tests/translator/output/aws-us-gov/cloudwatchevent.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -133,7 +139,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/cloudwatchevent_schedule_properties.json b/tests/translator/output/aws-us-gov/cloudwatchevent_schedule_properties.json
index 3913b5c724..19695157c1 100644
--- a/tests/translator/output/aws-us-gov/cloudwatchevent_schedule_properties.json
+++ b/tests/translator/output/aws-us-gov/cloudwatchevent_schedule_properties.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -132,7 +138,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/cloudwatchlog.json b/tests/translator/output/aws-us-gov/cloudwatchlog.json
index 771ae0f3e0..ab3706a09a 100644
--- a/tests/translator/output/aws-us-gov/cloudwatchlog.json
+++ b/tests/translator/output/aws-us-gov/cloudwatchlog.json
@@ -46,6 +46,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/cognito_userpool_with_event.json b/tests/translator/output/aws-us-gov/cognito_userpool_with_event.json
index 803c0162fe..3d6f0e4e56 100644
--- a/tests/translator/output/aws-us-gov/cognito_userpool_with_event.json
+++ b/tests/translator/output/aws-us-gov/cognito_userpool_with_event.json
@@ -54,6 +54,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/depends_on.json b/tests/translator/output/aws-us-gov/depends_on.json
index c8278cdeda..9126e365ef 100644
--- a/tests/translator/output/aws-us-gov/depends_on.json
+++ b/tests/translator/output/aws-us-gov/depends_on.json
@@ -116,6 +116,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/explicit_api.json b/tests/translator/output/aws-us-gov/explicit_api.json
index 04f02c380e..e32531df74 100644
--- a/tests/translator/output/aws-us-gov/explicit_api.json
+++ b/tests/translator/output/aws-us-gov/explicit_api.json
@@ -63,7 +63,14 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/explicit_api_openapi_3.json b/tests/translator/output/aws-us-gov/explicit_api_openapi_3.json
index ba9645a77e..31e9b38072 100644
--- a/tests/translator/output/aws-us-gov/explicit_api_openapi_3.json
+++ b/tests/translator/output/aws-us-gov/explicit_api_openapi_3.json
@@ -72,7 +72,14 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/explicit_api_with_invalid_events_config.json b/tests/translator/output/aws-us-gov/explicit_api_with_invalid_events_config.json
index e0a9d1abcb..3a9136e6d6 100644
--- a/tests/translator/output/aws-us-gov/explicit_api_with_invalid_events_config.json
+++ b/tests/translator/output/aws-us-gov/explicit_api_with_invalid_events_config.json
@@ -105,7 +105,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_concurrency.json b/tests/translator/output/aws-us-gov/function_concurrency.json
index 04b33c8a50..9eb5d9f576 100644
--- a/tests/translator/output/aws-us-gov/function_concurrency.json
+++ b/tests/translator/output/aws-us-gov/function_concurrency.json
@@ -11,6 +11,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -56,6 +62,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_event_conditions.json b/tests/translator/output/aws-us-gov/function_event_conditions.json
index c5873e96e0..cb1b9e7e20 100644
--- a/tests/translator/output/aws-us-gov/function_event_conditions.json
+++ b/tests/translator/output/aws-us-gov/function_event_conditions.json
@@ -206,7 +206,13 @@
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -320,6 +326,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_managed_inline_policy.json b/tests/translator/output/aws-us-gov/function_managed_inline_policy.json
index 57f79af682..ffbf7809d2 100644
--- a/tests/translator/output/aws-us-gov/function_managed_inline_policy.json
+++ b/tests/translator/output/aws-us-gov/function_managed_inline_policy.json
@@ -40,7 +40,13 @@
             "Ref": "SomeManagedPolicyArn"
           }, 
           "arn:aws:iam::123456789012:policy/CustomerCreatedManagedPolicy"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "FunctionRolePolicy0", 
diff --git a/tests/translator/output/aws-us-gov/function_with_alias.json b/tests/translator/output/aws-us-gov/function_with_alias.json
index f1dc1e6c4c..aae104be56 100644
--- a/tests/translator/output/aws-us-gov/function_with_alias.json
+++ b/tests/translator/output/aws-us-gov/function_with_alias.json
@@ -53,7 +53,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_alias_and_event_sources.json b/tests/translator/output/aws-us-gov/function_with_alias_and_event_sources.json
index 52a8585a93..3072839677 100644
--- a/tests/translator/output/aws-us-gov/function_with_alias_and_event_sources.json
+++ b/tests/translator/output/aws-us-gov/function_with_alias_and_event_sources.json
@@ -262,7 +262,13 @@
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_alias_intrinsics.json b/tests/translator/output/aws-us-gov/function_with_alias_intrinsics.json
index 9c5fb5b894..6844f0abb6 100644
--- a/tests/translator/output/aws-us-gov/function_with_alias_intrinsics.json
+++ b/tests/translator/output/aws-us-gov/function_with_alias_intrinsics.json
@@ -58,7 +58,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_batch_window.json b/tests/translator/output/aws-us-gov/function_with_batch_window.json
index 5dda34c670..c24eb1865c 100644
--- a/tests/translator/output/aws-us-gov/function_with_batch_window.json
+++ b/tests/translator/output/aws-us-gov/function_with_batch_window.json
@@ -32,6 +32,12 @@
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole",
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_condition.json b/tests/translator/output/aws-us-gov/function_with_condition.json
index b6acc14f88..55fc68469b 100644
--- a/tests/translator/output/aws-us-gov/function_with_condition.json
+++ b/tests/translator/output/aws-us-gov/function_with_condition.json
@@ -37,7 +37,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_conditional_managed_policy.json b/tests/translator/output/aws-us-gov/function_with_conditional_managed_policy.json
index 859c85a8a1..e2a0e8c5f7 100644
--- a/tests/translator/output/aws-us-gov/function_with_conditional_managed_policy.json
+++ b/tests/translator/output/aws-us-gov/function_with_conditional_managed_policy.json
@@ -49,6 +49,12 @@
             ]
           }
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_conditional_managed_policy_and_ref_no_value.json b/tests/translator/output/aws-us-gov/function_with_conditional_managed_policy_and_ref_no_value.json
index ddcf43ff1a..da893a16c6 100644
--- a/tests/translator/output/aws-us-gov/function_with_conditional_managed_policy_and_ref_no_value.json
+++ b/tests/translator/output/aws-us-gov/function_with_conditional_managed_policy_and_ref_no_value.json
@@ -49,6 +49,12 @@
             ]
           }
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_conditional_policy_template.json b/tests/translator/output/aws-us-gov/function_with_conditional_policy_template.json
index 7a9e12b898..18e2f72162 100644
--- a/tests/translator/output/aws-us-gov/function_with_conditional_policy_template.json
+++ b/tests/translator/output/aws-us-gov/function_with_conditional_policy_template.json
@@ -38,6 +38,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "Fn::If": [
diff --git a/tests/translator/output/aws-us-gov/function_with_conditional_policy_template_and_ref_no_value.json b/tests/translator/output/aws-us-gov/function_with_conditional_policy_template_and_ref_no_value.json
index f3d43297cb..08c9629f11 100644
--- a/tests/translator/output/aws-us-gov/function_with_conditional_policy_template_and_ref_no_value.json
+++ b/tests/translator/output/aws-us-gov/function_with_conditional_policy_template_and_ref_no_value.json
@@ -38,6 +38,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "Fn::If": [
diff --git a/tests/translator/output/aws-us-gov/function_with_custom_codedeploy_deployment_preference.json b/tests/translator/output/aws-us-gov/function_with_custom_codedeploy_deployment_preference.json
index 168fb53b4f..f601b9622d 100644
--- a/tests/translator/output/aws-us-gov/function_with_custom_codedeploy_deployment_preference.json
+++ b/tests/translator/output/aws-us-gov/function_with_custom_codedeploy_deployment_preference.json
@@ -441,7 +441,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -465,7 +471,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -529,7 +541,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -610,7 +628,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -707,7 +731,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -756,7 +786,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -841,7 +877,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_custom_conditional_codedeploy_deployment_preference.json b/tests/translator/output/aws-us-gov/function_with_custom_conditional_codedeploy_deployment_preference.json
index c2da9a1fda..672bcb4ee7 100644
--- a/tests/translator/output/aws-us-gov/function_with_custom_conditional_codedeploy_deployment_preference.json
+++ b/tests/translator/output/aws-us-gov/function_with_custom_conditional_codedeploy_deployment_preference.json
@@ -36,7 +36,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_deployment_and_custom_role.json b/tests/translator/output/aws-us-gov/function_with_deployment_and_custom_role.json
index 802967b9a0..68a5386069 100644
--- a/tests/translator/output/aws-us-gov/function_with_deployment_and_custom_role.json
+++ b/tests/translator/output/aws-us-gov/function_with_deployment_and_custom_role.json
@@ -51,7 +51,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_deployment_no_service_role.json b/tests/translator/output/aws-us-gov/function_with_deployment_no_service_role.json
index 94d09316b4..ca6cf4a1ee 100644
--- a/tests/translator/output/aws-us-gov/function_with_deployment_no_service_role.json
+++ b/tests/translator/output/aws-us-gov/function_with_deployment_no_service_role.json
@@ -59,7 +59,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -92,7 +98,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_deployment_preference.json b/tests/translator/output/aws-us-gov/function_with_deployment_preference.json
index a16ba0a1d8..acdb1a394e 100644
--- a/tests/translator/output/aws-us-gov/function_with_deployment_preference.json
+++ b/tests/translator/output/aws-us-gov/function_with_deployment_preference.json
@@ -39,7 +39,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_deployment_preference_all_parameters.json b/tests/translator/output/aws-us-gov/function_with_deployment_preference_all_parameters.json
index 1323d7c7c1..a5a742b3c9 100644
--- a/tests/translator/output/aws-us-gov/function_with_deployment_preference_all_parameters.json
+++ b/tests/translator/output/aws-us-gov/function_with_deployment_preference_all_parameters.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -52,7 +58,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -247,7 +259,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_deployment_preference_multiple_combinations.json b/tests/translator/output/aws-us-gov/function_with_deployment_preference_multiple_combinations.json
index ab1cdabb4e..2ad3524ecf 100644
--- a/tests/translator/output/aws-us-gov/function_with_deployment_preference_multiple_combinations.json
+++ b/tests/translator/output/aws-us-gov/function_with_deployment_preference_multiple_combinations.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -75,7 +81,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -188,7 +200,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -212,7 +230,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -364,7 +388,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_disabled_deployment_preference.json b/tests/translator/output/aws-us-gov/function_with_disabled_deployment_preference.json
index 6dadd40807..6057dd5f9c 100644
--- a/tests/translator/output/aws-us-gov/function_with_disabled_deployment_preference.json
+++ b/tests/translator/output/aws-us-gov/function_with_disabled_deployment_preference.json
@@ -52,7 +52,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_dlq.json b/tests/translator/output/aws-us-gov/function_with_dlq.json
index a21890ffe3..d72373ef24 100644
--- a/tests/translator/output/aws-us-gov/function_with_dlq.json
+++ b/tests/translator/output/aws-us-gov/function_with_dlq.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy",
@@ -45,6 +51,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy",
diff --git a/tests/translator/output/aws-us-gov/function_with_global_layers.json b/tests/translator/output/aws-us-gov/function_with_global_layers.json
index 7f9fea7e88..58bd6af51d 100644
--- a/tests/translator/output/aws-us-gov/function_with_global_layers.json
+++ b/tests/translator/output/aws-us-gov/function_with_global_layers.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_kmskeyarn.json b/tests/translator/output/aws-us-gov/function_with_kmskeyarn.json
index 2cf8eefbf3..7ff51981fa 100644
--- a/tests/translator/output/aws-us-gov/function_with_kmskeyarn.json
+++ b/tests/translator/output/aws-us-gov/function_with_kmskeyarn.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -30,6 +36,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_layers.json b/tests/translator/output/aws-us-gov/function_with_layers.json
index ecc80c5f73..9197f869c4 100644
--- a/tests/translator/output/aws-us-gov/function_with_layers.json
+++ b/tests/translator/output/aws-us-gov/function_with_layers.json
@@ -70,7 +70,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -94,7 +100,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -175,7 +187,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -199,7 +217,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_many_layers.json b/tests/translator/output/aws-us-gov/function_with_many_layers.json
index f6c15275ab..15389c0a61 100644
--- a/tests/translator/output/aws-us-gov/function_with_many_layers.json
+++ b/tests/translator/output/aws-us-gov/function_with_many_layers.json
@@ -16,7 +16,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_permissions_boundary.json b/tests/translator/output/aws-us-gov/function_with_permissions_boundary.json
index 510988482d..f4914ac7c3 100644
--- a/tests/translator/output/aws-us-gov/function_with_permissions_boundary.json
+++ b/tests/translator/output/aws-us-gov/function_with_permissions_boundary.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "PermissionsBoundary": "arn:aws:1234:iam:boundary/CustomerCreatedPermissionsBoundary", 
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
diff --git a/tests/translator/output/aws-us-gov/function_with_policy_templates.json b/tests/translator/output/aws-us-gov/function_with_policy_templates.json
index 72a70fb6b5..4ae24a6d45 100644
--- a/tests/translator/output/aws-us-gov/function_with_policy_templates.json
+++ b/tests/translator/output/aws-us-gov/function_with_policy_templates.json
@@ -57,6 +57,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "OnePolicyTemplateRolePolicy0",
@@ -116,6 +122,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "MultiplePolicyTemplatesRolePolicy0",
@@ -214,6 +226,12 @@
           "arn:aws-us-gov:iam::aws:policy/AmazonDynamoDBFullAccess",
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "AllCombinationsRolePolicy0",
diff --git a/tests/translator/output/aws-us-gov/function_with_request_parameters.json b/tests/translator/output/aws-us-gov/function_with_request_parameters.json
index 45eed3c154..79b9bee802 100644
--- a/tests/translator/output/aws-us-gov/function_with_request_parameters.json
+++ b/tests/translator/output/aws-us-gov/function_with_request_parameters.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -73,6 +79,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_resource_refs.json b/tests/translator/output/aws-us-gov/function_with_resource_refs.json
index ab8c746112..b548930542 100644
--- a/tests/translator/output/aws-us-gov/function_with_resource_refs.json
+++ b/tests/translator/output/aws-us-gov/function_with_resource_refs.json
@@ -79,7 +79,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -126,7 +132,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/function_with_sns_event_source_all_parameters.json b/tests/translator/output/aws-us-gov/function_with_sns_event_source_all_parameters.json
index 5ebf5d48e6..f2706dd509 100644
--- a/tests/translator/output/aws-us-gov/function_with_sns_event_source_all_parameters.json
+++ b/tests/translator/output/aws-us-gov/function_with_sns_event_source_all_parameters.json
@@ -54,6 +54,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/global_handle_path_level_parameter.json b/tests/translator/output/aws-us-gov/global_handle_path_level_parameter.json
index 8704aee60b..5d940ce786 100644
--- a/tests/translator/output/aws-us-gov/global_handle_path_level_parameter.json
+++ b/tests/translator/output/aws-us-gov/global_handle_path_level_parameter.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/globals_for_api.json b/tests/translator/output/aws-us-gov/globals_for_api.json
index 3b05d0e4f4..19ed0761f8 100644
--- a/tests/translator/output/aws-us-gov/globals_for_api.json
+++ b/tests/translator/output/aws-us-gov/globals_for_api.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/globals_for_function.json b/tests/translator/output/aws-us-gov/globals_for_function.json
index e087c7180e..01488e2506 100644
--- a/tests/translator/output/aws-us-gov/globals_for_function.json
+++ b/tests/translator/output/aws-us-gov/globals_for_function.json
@@ -7,7 +7,21 @@
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/AWSXrayWriteOnlyAccess"
         ], 
-        "PermissionsBoundary": "arn:aws:1234:iam:boundary/OverridePermissionsBoundary", 
+        "PermissionsBoundary": "arn:aws:1234:iam:boundary/OverridePermissionsBoundary",
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          },
+          {
+            "Value": "newvalue1",
+            "Key": "newtag1"
+          },
+          {
+            "Value": "value1",
+            "Key": "tag1"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -94,7 +108,17 @@
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/AWSXrayWriteOnlyAccess"
         ], 
-        "PermissionsBoundary": "arn:aws:1234:iam:boundary/CustomerCreatedPermissionsBoundary", 
+        "PermissionsBoundary": "arn:aws:1234:iam:boundary/CustomerCreatedPermissionsBoundary",
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          },
+          {
+            "Value": "value1",
+            "Key": "tag1"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/implicit_and_explicit_api_with_conditions.json b/tests/translator/output/aws-us-gov/implicit_and_explicit_api_with_conditions.json
index b80a66d71a..6899b2b40b 100644
--- a/tests/translator/output/aws-us-gov/implicit_and_explicit_api_with_conditions.json
+++ b/tests/translator/output/aws-us-gov/implicit_and_explicit_api_with_conditions.json
@@ -68,6 +68,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -143,6 +149,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -423,6 +435,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -545,6 +563,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/implicit_api.json b/tests/translator/output/aws-us-gov/implicit_api.json
index 8aca6a728e..4d9623e44f 100644
--- a/tests/translator/output/aws-us-gov/implicit_api.json
+++ b/tests/translator/output/aws-us-gov/implicit_api.json
@@ -6,7 +6,14 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/AmazonDynamoDBFullAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -118,7 +125,14 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/implicit_api_with_auth_and_conditions_max.json b/tests/translator/output/aws-us-gov/implicit_api_with_auth_and_conditions_max.json
index af123ff01b..2673ef10ce 100644
--- a/tests/translator/output/aws-us-gov/implicit_api_with_auth_and_conditions_max.json
+++ b/tests/translator/output/aws-us-gov/implicit_api_with_auth_and_conditions_max.json
@@ -215,7 +215,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -240,7 +246,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -265,7 +277,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -314,7 +332,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -380,7 +404,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -511,7 +541,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/implicit_api_with_many_conditions.json b/tests/translator/output/aws-us-gov/implicit_api_with_many_conditions.json
index c3582f44b4..f130848432 100644
--- a/tests/translator/output/aws-us-gov/implicit_api_with_many_conditions.json
+++ b/tests/translator/output/aws-us-gov/implicit_api_with_many_conditions.json
@@ -164,6 +164,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -239,6 +245,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -524,6 +536,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -571,6 +589,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -640,6 +664,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -665,6 +695,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -715,6 +751,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -823,6 +865,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -848,6 +896,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -873,6 +927,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -898,6 +958,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/implicit_api_with_serverless_rest_api_resource.json b/tests/translator/output/aws-us-gov/implicit_api_with_serverless_rest_api_resource.json
index 2a14f8c6fc..450fa61a0e 100644
--- a/tests/translator/output/aws-us-gov/implicit_api_with_serverless_rest_api_resource.json
+++ b/tests/translator/output/aws-us-gov/implicit_api_with_serverless_rest_api_resource.json
@@ -6,7 +6,13 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/AmazonDynamoDBFullAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -118,7 +124,13 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/intrinsic_functions.json b/tests/translator/output/aws-us-gov/intrinsic_functions.json
index b300c45034..956ddadb40 100644
--- a/tests/translator/output/aws-us-gov/intrinsic_functions.json
+++ b/tests/translator/output/aws-us-gov/intrinsic_functions.json
@@ -169,7 +169,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy", 
@@ -269,7 +275,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -294,7 +306,13 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -448,7 +466,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy", 
diff --git a/tests/translator/output/aws-us-gov/iot_rule.json b/tests/translator/output/aws-us-gov/iot_rule.json
index 808c2c04e6..d9b7332b76 100644
--- a/tests/translator/output/aws-us-gov/iot_rule.json
+++ b/tests/translator/output/aws-us-gov/iot_rule.json
@@ -122,7 +122,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/layers_all_properties.json b/tests/translator/output/aws-us-gov/layers_all_properties.json
index 0a625c83a0..066c5eaab8 100644
--- a/tests/translator/output/aws-us-gov/layers_all_properties.json
+++ b/tests/translator/output/aws-us-gov/layers_all_properties.json
@@ -91,7 +91,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/no_implicit_api_with_serverless_rest_api_resource.json b/tests/translator/output/aws-us-gov/no_implicit_api_with_serverless_rest_api_resource.json
index ffbb87e6b7..fc543060b4 100644
--- a/tests/translator/output/aws-us-gov/no_implicit_api_with_serverless_rest_api_resource.json
+++ b/tests/translator/output/aws-us-gov/no_implicit_api_with_serverless_rest_api_resource.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -65,7 +71,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -112,7 +124,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/s3.json b/tests/translator/output/aws-us-gov/s3.json
index 8cf54f93bc..b08f483e37 100644
--- a/tests/translator/output/aws-us-gov/s3.json
+++ b/tests/translator/output/aws-us-gov/s3.json
@@ -24,7 +24,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/s3_create_remove.json b/tests/translator/output/aws-us-gov/s3_create_remove.json
index dc4a017c8a..6dc2bd4ad8 100644
--- a/tests/translator/output/aws-us-gov/s3_create_remove.json
+++ b/tests/translator/output/aws-us-gov/s3_create_remove.json
@@ -41,7 +41,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/s3_existing_lambda_notification_configuration.json b/tests/translator/output/aws-us-gov/s3_existing_lambda_notification_configuration.json
index 8cf54f93bc..b08f483e37 100644
--- a/tests/translator/output/aws-us-gov/s3_existing_lambda_notification_configuration.json
+++ b/tests/translator/output/aws-us-gov/s3_existing_lambda_notification_configuration.json
@@ -24,7 +24,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/s3_existing_other_notification_configuration.json b/tests/translator/output/aws-us-gov/s3_existing_other_notification_configuration.json
index b0f782d570..97e4705475 100644
--- a/tests/translator/output/aws-us-gov/s3_existing_other_notification_configuration.json
+++ b/tests/translator/output/aws-us-gov/s3_existing_other_notification_configuration.json
@@ -32,7 +32,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/s3_filter.json b/tests/translator/output/aws-us-gov/s3_filter.json
index c1671e165a..e8e1a5ea35 100644
--- a/tests/translator/output/aws-us-gov/s3_filter.json
+++ b/tests/translator/output/aws-us-gov/s3_filter.json
@@ -34,7 +34,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/s3_multiple_events_same_bucket.json b/tests/translator/output/aws-us-gov/s3_multiple_events_same_bucket.json
index 30da757ede..3dc653ff79 100644
--- a/tests/translator/output/aws-us-gov/s3_multiple_events_same_bucket.json
+++ b/tests/translator/output/aws-us-gov/s3_multiple_events_same_bucket.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/s3_multiple_functions.json b/tests/translator/output/aws-us-gov/s3_multiple_functions.json
index 7dd7f0f970..80f8cf5941 100644
--- a/tests/translator/output/aws-us-gov/s3_multiple_functions.json
+++ b/tests/translator/output/aws-us-gov/s3_multiple_functions.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -80,6 +86,12 @@
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/s3_with_condition.json b/tests/translator/output/aws-us-gov/s3_with_condition.json
index 1604f0aff2..27519c08d0 100644
--- a/tests/translator/output/aws-us-gov/s3_with_condition.json
+++ b/tests/translator/output/aws-us-gov/s3_with_condition.json
@@ -53,7 +53,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/s3_with_dependsOn.json b/tests/translator/output/aws-us-gov/s3_with_dependsOn.json
index 2a4f26dd82..273e27d237 100644
--- a/tests/translator/output/aws-us-gov/s3_with_dependsOn.json
+++ b/tests/translator/output/aws-us-gov/s3_with_dependsOn.json
@@ -30,7 +30,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/sns.json b/tests/translator/output/aws-us-gov/sns.json
index bf953f46d9..7f2a449f2c 100644
--- a/tests/translator/output/aws-us-gov/sns.json
+++ b/tests/translator/output/aws-us-gov/sns.json
@@ -8,7 +8,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/sns_existing_other_subscription.json b/tests/translator/output/aws-us-gov/sns_existing_other_subscription.json
index 595466b0e6..f829f2a78b 100644
--- a/tests/translator/output/aws-us-gov/sns_existing_other_subscription.json
+++ b/tests/translator/output/aws-us-gov/sns_existing_other_subscription.json
@@ -16,7 +16,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/sns_sqs.json b/tests/translator/output/aws-us-gov/sns_sqs.json
index c42490f03c..81d2b1b331 100644
--- a/tests/translator/output/aws-us-gov/sns_sqs.json
+++ b/tests/translator/output/aws-us-gov/sns_sqs.json
@@ -75,6 +75,12 @@
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaSQSQueueExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/sns_topic_outside_template.json b/tests/translator/output/aws-us-gov/sns_topic_outside_template.json
index f7108a3901..7e499f203a 100644
--- a/tests/translator/output/aws-us-gov/sns_topic_outside_template.json
+++ b/tests/translator/output/aws-us-gov/sns_topic_outside_template.json
@@ -25,7 +25,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/aws-us-gov/sqs.json b/tests/translator/output/aws-us-gov/sqs.json
index 2c2fc9f8f8..0d80717ab2 100644
--- a/tests/translator/output/aws-us-gov/sqs.json
+++ b/tests/translator/output/aws-us-gov/sqs.json
@@ -7,6 +7,12 @@
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaSQSQueueExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{
diff --git a/tests/translator/output/aws-us-gov/streams.json b/tests/translator/output/aws-us-gov/streams.json
index d0bd19577f..c239a1f0eb 100644
--- a/tests/translator/output/aws-us-gov/streams.json
+++ b/tests/translator/output/aws-us-gov/streams.json
@@ -60,6 +60,12 @@
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{
@@ -95,6 +101,12 @@
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{
diff --git a/tests/translator/output/basic_function.json b/tests/translator/output/basic_function.json
index c1bd1e19cf..8b1e210f44 100644
--- a/tests/translator/output/basic_function.json
+++ b/tests/translator/output/basic_function.json
@@ -40,7 +40,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -133,7 +139,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -261,7 +273,13 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -286,7 +304,13 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/AWSXrayWriteOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -311,7 +335,13 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/AWSXrayWriteOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -384,7 +414,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "FunctionWithPolicyDocumentRolePolicy0", 
diff --git a/tests/translator/output/basic_function_with_tags.json b/tests/translator/output/basic_function_with_tags.json
index dffbcbb813..79f189bd68 100644
--- a/tests/translator/output/basic_function_with_tags.json
+++ b/tests/translator/output/basic_function_with_tags.json
@@ -12,7 +12,31 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          },
+          {
+            "Value": "TagValue1",
+            "Key": "TagKey1"
+          },
+          {
+            "Value": "",
+            "Key": "TagKey2"
+          },
+          {
+            "Value": {
+              "Ref": "TagValueParam"
+            },
+            "Key": "TagKey3"
+          },
+          {
+            "Value": "123",
+            "Key": "TagKey4"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/cloudwatch_logs_with_ref.json b/tests/translator/output/cloudwatch_logs_with_ref.json
index 15f5597513..6307954dd3 100644
--- a/tests/translator/output/cloudwatch_logs_with_ref.json
+++ b/tests/translator/output/cloudwatch_logs_with_ref.json
@@ -61,6 +61,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/cloudwatchevent.json b/tests/translator/output/cloudwatchevent.json
index 0def3b60a8..f566b680b0 100644
--- a/tests/translator/output/cloudwatchevent.json
+++ b/tests/translator/output/cloudwatchevent.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -133,7 +139,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/cloudwatchevent_schedule_properties.json b/tests/translator/output/cloudwatchevent_schedule_properties.json
index 5737fa5e69..06901ff022 100644
--- a/tests/translator/output/cloudwatchevent_schedule_properties.json
+++ b/tests/translator/output/cloudwatchevent_schedule_properties.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -132,7 +138,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/cloudwatchlog.json b/tests/translator/output/cloudwatchlog.json
index 7e4ab33cf2..de22a43aad 100644
--- a/tests/translator/output/cloudwatchlog.json
+++ b/tests/translator/output/cloudwatchlog.json
@@ -46,6 +46,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/cognito_userpool_with_event.json b/tests/translator/output/cognito_userpool_with_event.json
index fe3d293363..d0b001e48b 100644
--- a/tests/translator/output/cognito_userpool_with_event.json
+++ b/tests/translator/output/cognito_userpool_with_event.json
@@ -54,6 +54,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/depends_on.json b/tests/translator/output/depends_on.json
index ecc23cf6d3..4b1ef33427 100644
--- a/tests/translator/output/depends_on.json
+++ b/tests/translator/output/depends_on.json
@@ -108,6 +108,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/explicit_api.json b/tests/translator/output/explicit_api.json
index f3e698917f..7c2a9fdaa3 100644
--- a/tests/translator/output/explicit_api.json
+++ b/tests/translator/output/explicit_api.json
@@ -63,7 +63,14 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/explicit_api_openapi_3.json b/tests/translator/output/explicit_api_openapi_3.json
index 9b80313964..b0e2b9d2d3 100644
--- a/tests/translator/output/explicit_api_openapi_3.json
+++ b/tests/translator/output/explicit_api_openapi_3.json
@@ -72,7 +72,14 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/explicit_api_with_invalid_events_config.json b/tests/translator/output/explicit_api_with_invalid_events_config.json
index 3222d25386..8acbf9aa43 100644
--- a/tests/translator/output/explicit_api_with_invalid_events_config.json
+++ b/tests/translator/output/explicit_api_with_invalid_events_config.json
@@ -97,7 +97,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_concurrency.json b/tests/translator/output/function_concurrency.json
index 11bd893758..afd5f36c74 100644
--- a/tests/translator/output/function_concurrency.json
+++ b/tests/translator/output/function_concurrency.json
@@ -11,6 +11,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -56,6 +62,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/function_event_conditions.json b/tests/translator/output/function_event_conditions.json
index a86f8ff3b2..8de5fff080 100644
--- a/tests/translator/output/function_event_conditions.json
+++ b/tests/translator/output/function_event_conditions.json
@@ -206,7 +206,13 @@
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole", 
           "arn:aws:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -320,6 +326,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/function_managed_inline_policy.json b/tests/translator/output/function_managed_inline_policy.json
index 15911c5b7a..a05542ae83 100644
--- a/tests/translator/output/function_managed_inline_policy.json
+++ b/tests/translator/output/function_managed_inline_policy.json
@@ -40,7 +40,13 @@
             "Ref": "SomeManagedPolicyArn"
           }, 
           "arn:aws:iam::123456789012:policy/CustomerCreatedManagedPolicy"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "FunctionRolePolicy0", 
diff --git a/tests/translator/output/function_with_alias.json b/tests/translator/output/function_with_alias.json
index 16231d245d..306c5b3870 100644
--- a/tests/translator/output/function_with_alias.json
+++ b/tests/translator/output/function_with_alias.json
@@ -53,7 +53,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_alias_and_event_sources.json b/tests/translator/output/function_with_alias_and_event_sources.json
index d9cb33bf0b..c5755d9a1a 100644
--- a/tests/translator/output/function_with_alias_and_event_sources.json
+++ b/tests/translator/output/function_with_alias_and_event_sources.json
@@ -254,7 +254,13 @@
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole", 
           "arn:aws:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_alias_intrinsics.json b/tests/translator/output/function_with_alias_intrinsics.json
index b343d8075f..507f8af00b 100644
--- a/tests/translator/output/function_with_alias_intrinsics.json
+++ b/tests/translator/output/function_with_alias_intrinsics.json
@@ -58,7 +58,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_batch_window.json b/tests/translator/output/function_with_batch_window.json
index 1e6e928f01..cbdd428605 100644
--- a/tests/translator/output/function_with_batch_window.json
+++ b/tests/translator/output/function_with_batch_window.json
@@ -32,6 +32,12 @@
           "arn:aws:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole",
           "arn:aws:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/function_with_condition.json b/tests/translator/output/function_with_condition.json
index a73a160743..25e902d7bc 100644
--- a/tests/translator/output/function_with_condition.json
+++ b/tests/translator/output/function_with_condition.json
@@ -37,7 +37,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_conditional_managed_policy.json b/tests/translator/output/function_with_conditional_managed_policy.json
index a7aacc2839..db41f277c9 100644
--- a/tests/translator/output/function_with_conditional_managed_policy.json
+++ b/tests/translator/output/function_with_conditional_managed_policy.json
@@ -49,6 +49,12 @@
             ]
           }
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/function_with_conditional_managed_policy_and_ref_no_value.json b/tests/translator/output/function_with_conditional_managed_policy_and_ref_no_value.json
index 056fd49c55..2d64091de4 100644
--- a/tests/translator/output/function_with_conditional_managed_policy_and_ref_no_value.json
+++ b/tests/translator/output/function_with_conditional_managed_policy_and_ref_no_value.json
@@ -49,6 +49,12 @@
             ]
           }
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/function_with_conditional_policy_template.json b/tests/translator/output/function_with_conditional_policy_template.json
index dd145ce751..9bcd6123e0 100644
--- a/tests/translator/output/function_with_conditional_policy_template.json
+++ b/tests/translator/output/function_with_conditional_policy_template.json
@@ -38,6 +38,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "Fn::If": [
diff --git a/tests/translator/output/function_with_conditional_policy_template_and_ref_no_value.json b/tests/translator/output/function_with_conditional_policy_template_and_ref_no_value.json
index 2d6b987c25..40262859a5 100644
--- a/tests/translator/output/function_with_conditional_policy_template_and_ref_no_value.json
+++ b/tests/translator/output/function_with_conditional_policy_template_and_ref_no_value.json
@@ -38,6 +38,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "Fn::If": [
diff --git a/tests/translator/output/function_with_custom_codedeploy_deployment_preference.json b/tests/translator/output/function_with_custom_codedeploy_deployment_preference.json
index 8f628b9b1d..7f9d9822df 100644
--- a/tests/translator/output/function_with_custom_codedeploy_deployment_preference.json
+++ b/tests/translator/output/function_with_custom_codedeploy_deployment_preference.json
@@ -441,7 +441,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -465,7 +471,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -529,7 +541,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -610,7 +628,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -707,7 +731,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -756,7 +786,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -841,7 +877,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_custom_conditional_codedeploy_deployment_preference.json b/tests/translator/output/function_with_custom_conditional_codedeploy_deployment_preference.json
index 413b8913d4..455194683e 100644
--- a/tests/translator/output/function_with_custom_conditional_codedeploy_deployment_preference.json
+++ b/tests/translator/output/function_with_custom_conditional_codedeploy_deployment_preference.json
@@ -36,7 +36,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_deployment_and_custom_role.json b/tests/translator/output/function_with_deployment_and_custom_role.json
index 7a2dd87c9d..8ec847d9d0 100644
--- a/tests/translator/output/function_with_deployment_and_custom_role.json
+++ b/tests/translator/output/function_with_deployment_and_custom_role.json
@@ -51,7 +51,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_deployment_no_service_role.json b/tests/translator/output/function_with_deployment_no_service_role.json
index 706cf02e06..ef9ed4aa6c 100644
--- a/tests/translator/output/function_with_deployment_no_service_role.json
+++ b/tests/translator/output/function_with_deployment_no_service_role.json
@@ -59,7 +59,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -92,7 +98,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_deployment_preference.json b/tests/translator/output/function_with_deployment_preference.json
index 75ba695243..7748bac1af 100644
--- a/tests/translator/output/function_with_deployment_preference.json
+++ b/tests/translator/output/function_with_deployment_preference.json
@@ -39,7 +39,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_deployment_preference_all_parameters.json b/tests/translator/output/function_with_deployment_preference_all_parameters.json
index b8a44e7ff3..39d2f962fd 100644
--- a/tests/translator/output/function_with_deployment_preference_all_parameters.json
+++ b/tests/translator/output/function_with_deployment_preference_all_parameters.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -52,7 +58,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -247,7 +259,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_deployment_preference_multiple_combinations.json b/tests/translator/output/function_with_deployment_preference_multiple_combinations.json
index 774d481214..2ac0953734 100644
--- a/tests/translator/output/function_with_deployment_preference_multiple_combinations.json
+++ b/tests/translator/output/function_with_deployment_preference_multiple_combinations.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -75,7 +81,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -188,7 +200,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -212,7 +230,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -364,7 +388,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_disabled_deployment_preference.json b/tests/translator/output/function_with_disabled_deployment_preference.json
index e4ac30b6c3..47834b6e8f 100644
--- a/tests/translator/output/function_with_disabled_deployment_preference.json
+++ b/tests/translator/output/function_with_disabled_deployment_preference.json
@@ -52,7 +52,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_dlq.json b/tests/translator/output/function_with_dlq.json
index 33ed79e22a..599656cd92 100644
--- a/tests/translator/output/function_with_dlq.json
+++ b/tests/translator/output/function_with_dlq.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy",
@@ -45,6 +51,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy",
diff --git a/tests/translator/output/function_with_global_layers.json b/tests/translator/output/function_with_global_layers.json
index 745ddd0ccb..b40dcd644b 100644
--- a/tests/translator/output/function_with_global_layers.json
+++ b/tests/translator/output/function_with_global_layers.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/function_with_kmskeyarn.json b/tests/translator/output/function_with_kmskeyarn.json
index ea75c4696f..ef7a69f6cc 100644
--- a/tests/translator/output/function_with_kmskeyarn.json
+++ b/tests/translator/output/function_with_kmskeyarn.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -30,6 +36,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/function_with_layers.json b/tests/translator/output/function_with_layers.json
index a6b6e357a1..9d660ef494 100644
--- a/tests/translator/output/function_with_layers.json
+++ b/tests/translator/output/function_with_layers.json
@@ -70,7 +70,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -94,7 +100,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -175,7 +187,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -199,7 +217,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_many_layers.json b/tests/translator/output/function_with_many_layers.json
index 885be8351a..96e64d886a 100644
--- a/tests/translator/output/function_with_many_layers.json
+++ b/tests/translator/output/function_with_many_layers.json
@@ -16,7 +16,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_permissions_boundary.json b/tests/translator/output/function_with_permissions_boundary.json
index ecd3a1e0b8..9e77b87812 100644
--- a/tests/translator/output/function_with_permissions_boundary.json
+++ b/tests/translator/output/function_with_permissions_boundary.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "PermissionsBoundary": "arn:aws:1234:iam:boundary/CustomerCreatedPermissionsBoundary", 
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
diff --git a/tests/translator/output/function_with_policy_templates.json b/tests/translator/output/function_with_policy_templates.json
index c59ef2801d..05c9057cb3 100644
--- a/tests/translator/output/function_with_policy_templates.json
+++ b/tests/translator/output/function_with_policy_templates.json
@@ -57,6 +57,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "OnePolicyTemplateRolePolicy0",
@@ -116,6 +122,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "MultiplePolicyTemplatesRolePolicy0",
@@ -214,6 +226,12 @@
           "arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess",
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "AllCombinationsRolePolicy0",
diff --git a/tests/translator/output/function_with_request_parameters.json b/tests/translator/output/function_with_request_parameters.json
index 77dc1f50cf..80a7bc46c8 100644
--- a/tests/translator/output/function_with_request_parameters.json
+++ b/tests/translator/output/function_with_request_parameters.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -63,6 +69,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/function_with_resource_refs.json b/tests/translator/output/function_with_resource_refs.json
index e583d2819b..d331af50a4 100644
--- a/tests/translator/output/function_with_resource_refs.json
+++ b/tests/translator/output/function_with_resource_refs.json
@@ -79,7 +79,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -126,7 +132,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/function_with_sns_event_source_all_parameters.json b/tests/translator/output/function_with_sns_event_source_all_parameters.json
index 698eb00559..24ea11a44c 100644
--- a/tests/translator/output/function_with_sns_event_source_all_parameters.json
+++ b/tests/translator/output/function_with_sns_event_source_all_parameters.json
@@ -54,6 +54,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/global_handle_path_level_parameter.json b/tests/translator/output/global_handle_path_level_parameter.json
index 030a9087f2..9b81329c52 100644
--- a/tests/translator/output/global_handle_path_level_parameter.json
+++ b/tests/translator/output/global_handle_path_level_parameter.json
@@ -29,6 +29,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/globals_for_api.json b/tests/translator/output/globals_for_api.json
index 0e4af028eb..8edff26cdc 100644
--- a/tests/translator/output/globals_for_api.json
+++ b/tests/translator/output/globals_for_api.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/globals_for_function.json b/tests/translator/output/globals_for_function.json
index 0cf77bc37c..4c48fba384 100644
--- a/tests/translator/output/globals_for_function.json
+++ b/tests/translator/output/globals_for_function.json
@@ -7,7 +7,21 @@
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/AWSXrayWriteOnlyAccess"
         ], 
-        "PermissionsBoundary": "arn:aws:1234:iam:boundary/OverridePermissionsBoundary", 
+        "PermissionsBoundary": "arn:aws:1234:iam:boundary/OverridePermissionsBoundary",
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          },
+          {
+            "Value": "newvalue1",
+            "Key": "newtag1"
+          },
+          {
+            "Value": "value1",
+            "Key": "tag1"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -94,7 +108,17 @@
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/AWSXrayWriteOnlyAccess"
         ], 
-        "PermissionsBoundary": "arn:aws:1234:iam:boundary/CustomerCreatedPermissionsBoundary", 
+        "PermissionsBoundary": "arn:aws:1234:iam:boundary/CustomerCreatedPermissionsBoundary",
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          },
+          {
+            "Value": "value1",
+            "Key": "tag1"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/implicit_and_explicit_api_with_conditions.json b/tests/translator/output/implicit_and_explicit_api_with_conditions.json
index 85353572d4..ab1bee6cf0 100644
--- a/tests/translator/output/implicit_and_explicit_api_with_conditions.json
+++ b/tests/translator/output/implicit_and_explicit_api_with_conditions.json
@@ -68,6 +68,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -212,6 +218,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -405,6 +417,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -529,6 +547,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/implicit_api.json b/tests/translator/output/implicit_api.json
index 5d5930ec5c..6d4648698e 100644
--- a/tests/translator/output/implicit_api.json
+++ b/tests/translator/output/implicit_api.json
@@ -6,7 +6,14 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -108,7 +115,14 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
+
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/implicit_api_with_auth_and_conditions_max.json b/tests/translator/output/implicit_api_with_auth_and_conditions_max.json
index 3eb8f6e891..1336f01bad 100644
--- a/tests/translator/output/implicit_api_with_auth_and_conditions_max.json
+++ b/tests/translator/output/implicit_api_with_auth_and_conditions_max.json
@@ -216,6 +216,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -241,6 +247,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -277,6 +289,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -326,6 +344,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -392,6 +416,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -523,6 +553,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/implicit_api_with_many_conditions.json b/tests/translator/output/implicit_api_with_many_conditions.json
index 20043628d6..dbfd31912c 100644
--- a/tests/translator/output/implicit_api_with_many_conditions.json
+++ b/tests/translator/output/implicit_api_with_many_conditions.json
@@ -164,6 +164,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -239,6 +245,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -535,6 +547,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -582,6 +600,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -651,6 +675,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -676,6 +706,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -726,6 +762,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -823,6 +865,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -848,6 +896,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -873,6 +927,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -898,6 +958,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/implicit_api_with_serverless_rest_api_resource.json b/tests/translator/output/implicit_api_with_serverless_rest_api_resource.json
index 5d5930ec5c..14d978aac2 100644
--- a/tests/translator/output/implicit_api_with_serverless_rest_api_resource.json
+++ b/tests/translator/output/implicit_api_with_serverless_rest_api_resource.json
@@ -6,7 +6,13 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/AmazonDynamoDBFullAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -108,7 +114,13 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/AmazonDynamoDBReadOnlyAccess"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/intrinsic_functions.json b/tests/translator/output/intrinsic_functions.json
index 84ed45c37f..20431af849 100644
--- a/tests/translator/output/intrinsic_functions.json
+++ b/tests/translator/output/intrinsic_functions.json
@@ -153,7 +153,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy", 
@@ -253,7 +259,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -278,7 +290,13 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole", 
           "arn:aws:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -432,7 +450,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ],
         "Policies": [
           {
             "PolicyName": "DeadLetterQueuePolicy", 
diff --git a/tests/translator/output/iot_rule.json b/tests/translator/output/iot_rule.json
index b8e26cd311..abc96ccd93 100644
--- a/tests/translator/output/iot_rule.json
+++ b/tests/translator/output/iot_rule.json
@@ -122,7 +122,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/layers_all_properties.json b/tests/translator/output/layers_all_properties.json
index 2cb5221e07..a99809489d 100644
--- a/tests/translator/output/layers_all_properties.json
+++ b/tests/translator/output/layers_all_properties.json
@@ -91,7 +91,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/no_implicit_api_with_serverless_rest_api_resource.json b/tests/translator/output/no_implicit_api_with_serverless_rest_api_resource.json
index 1ffbb945e3..61b19f1735 100644
--- a/tests/translator/output/no_implicit_api_with_serverless_rest_api_resource.json
+++ b/tests/translator/output/no_implicit_api_with_serverless_rest_api_resource.json
@@ -28,7 +28,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -65,7 +71,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
@@ -112,7 +124,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/s3.json b/tests/translator/output/s3.json
index 29eb969018..6dd93d4481 100644
--- a/tests/translator/output/s3.json
+++ b/tests/translator/output/s3.json
@@ -24,7 +24,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/s3_create_remove.json b/tests/translator/output/s3_create_remove.json
index 353a44a83a..bcf2970f97 100644
--- a/tests/translator/output/s3_create_remove.json
+++ b/tests/translator/output/s3_create_remove.json
@@ -41,7 +41,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/s3_existing_lambda_notification_configuration.json b/tests/translator/output/s3_existing_lambda_notification_configuration.json
index 29eb969018..6dd93d4481 100644
--- a/tests/translator/output/s3_existing_lambda_notification_configuration.json
+++ b/tests/translator/output/s3_existing_lambda_notification_configuration.json
@@ -24,7 +24,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/s3_existing_other_notification_configuration.json b/tests/translator/output/s3_existing_other_notification_configuration.json
index 447f0a8f68..ed9e939b3d 100644
--- a/tests/translator/output/s3_existing_other_notification_configuration.json
+++ b/tests/translator/output/s3_existing_other_notification_configuration.json
@@ -32,7 +32,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/s3_filter.json b/tests/translator/output/s3_filter.json
index bcb5f7911f..7586def7f9 100644
--- a/tests/translator/output/s3_filter.json
+++ b/tests/translator/output/s3_filter.json
@@ -34,7 +34,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/s3_multiple_events_same_bucket.json b/tests/translator/output/s3_multiple_events_same_bucket.json
index b340b677cd..3e8c5d636d 100644
--- a/tests/translator/output/s3_multiple_events_same_bucket.json
+++ b/tests/translator/output/s3_multiple_events_same_bucket.json
@@ -5,7 +5,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/s3_multiple_functions.json b/tests/translator/output/s3_multiple_functions.json
index 9ede10c748..6a2f0fbc8e 100644
--- a/tests/translator/output/s3_multiple_functions.json
+++ b/tests/translator/output/s3_multiple_functions.json
@@ -6,6 +6,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -80,6 +86,12 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/s3_with_condition.json b/tests/translator/output/s3_with_condition.json
index b2397cc3ae..9a837a2cb0 100644
--- a/tests/translator/output/s3_with_condition.json
+++ b/tests/translator/output/s3_with_condition.json
@@ -53,7 +53,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/s3_with_dependsOn.json b/tests/translator/output/s3_with_dependsOn.json
index 2a68297521..d0c1b8842f 100644
--- a/tests/translator/output/s3_with_dependsOn.json
+++ b/tests/translator/output/s3_with_dependsOn.json
@@ -30,7 +30,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/sns.json b/tests/translator/output/sns.json
index 6b96af4074..153dff2b72 100644
--- a/tests/translator/output/sns.json
+++ b/tests/translator/output/sns.json
@@ -8,7 +8,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/sns_existing_other_subscription.json b/tests/translator/output/sns_existing_other_subscription.json
index 9fdb5b49b2..a59e32b483 100644
--- a/tests/translator/output/sns_existing_other_subscription.json
+++ b/tests/translator/output/sns_existing_other_subscription.json
@@ -16,7 +16,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/sns_sqs.json b/tests/translator/output/sns_sqs.json
index 79e641b77f..ad7d754736 100644
--- a/tests/translator/output/sns_sqs.json
+++ b/tests/translator/output/sns_sqs.json
@@ -75,6 +75,12 @@
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws:iam::aws:policy/service-role/AWSLambdaSQSQueueExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
diff --git a/tests/translator/output/sns_topic_outside_template.json b/tests/translator/output/sns_topic_outside_template.json
index 1c4f4831d3..dfaab1440c 100644
--- a/tests/translator/output/sns_topic_outside_template.json
+++ b/tests/translator/output/sns_topic_outside_template.json
@@ -25,7 +25,13 @@
       "Properties": {
         "ManagedPolicyArns": [
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ], 
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17", 
           "Statement": [
diff --git a/tests/translator/output/sqs.json b/tests/translator/output/sqs.json
index 0b1da5f6e0..36bcdb1aa7 100644
--- a/tests/translator/output/sqs.json
+++ b/tests/translator/output/sqs.json
@@ -7,6 +7,12 @@
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws:iam::aws:policy/service-role/AWSLambdaSQSQueueExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{
diff --git a/tests/translator/output/streams.json b/tests/translator/output/streams.json
index c9e7910631..3b54cd8534 100644
--- a/tests/translator/output/streams.json
+++ b/tests/translator/output/streams.json
@@ -60,6 +60,12 @@
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws:iam::aws:policy/service-role/AWSLambdaDynamoDBExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{
@@ -95,6 +101,12 @@
           "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
           "arn:aws:iam::aws:policy/service-role/AWSLambdaKinesisExecutionRole"
         ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [{

From f4d6a34156bf05e2452e906efb23ab170a5af654 Mon Sep 17 00:00:00 2001
From: Tom McCarthy <thommcc@amazon.com>
Date: Sat, 12 Oct 2019 00:14:09 +0200
Subject: [PATCH 3/3] feat: propagate tags set on function resources to
 generated iam roles

Documentation update to reflect changes
---
 versions/2016-10-31.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/2016-10-31.md b/versions/2016-10-31.md
index d00a6959c6..0f5c8dec9c 100644
--- a/versions/2016-10-31.md
+++ b/versions/2016-10-31.md
@@ -121,7 +121,7 @@ PermissionsBoundary | `string` | ARN of a permissions boundary to use for this f
 Environment | [Function environment object](#environment-object) | Configuration for the runtime environment.
 VpcConfig | [VPC config object](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html) | Configuration to enable this function to access private resources within your VPC.
 Events | Map of `string` to [Event source object](#event-source-object) | A map (string to [Event source object](#event-source-object)) that defines the events that trigger this function. Keys are limited to alphanumeric characters.
-Tags | Map of `string` to `string` | A map (string to string) that specifies the tags to be added to this function. Keys and values are limited to alphanumeric characters. Keys can be 1 to 127 Unicode characters in length and cannot be prefixed with `aws:`. Values can be 1 to 255 Unicode characters in length. When the stack is created, SAM will automatically add a `lambda:createdBy:SAM` tag to this Lambda function.
+Tags | Map of `string` to `string` | A map (string to string) that specifies the tags to be added to this function. Keys and values are limited to alphanumeric characters. Keys can be 1 to 127 Unicode characters in length and cannot be prefixed with `aws:`. Values can be 1 to 255 Unicode characters in length. When the stack is created, SAM will automatically add a `lambda:createdBy:SAM` tag to this Lambda function. Tags will also be applied to default roles generated by the function.
 Tracing | `string` | String that specifies the function's [X-Ray tracing mode](http://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html). Accepted values are `Active` and `PassThrough`
 KmsKeyArn | `string` | The Amazon Resource Name (ARN) of an AWS Key Management Service (AWS KMS) key that Lambda uses to encrypt and decrypt your function's environment variables.
 DeadLetterQueue | `map` <span>&#124;</span> [DeadLetterQueue Object](#deadletterqueue-object) | Configures SNS topic or SQS queue where Lambda sends events that it can't process.