Merge pull request #3277 from aws/release-v1.72.0

Release 1.72.0 (to main)
aws · Jul 29, 2023 · 0addbea · 0addbea
2 parents 6e34bbd + e65bc61
commit 0addbea
Show file tree

Hide file tree

Showing 177 changed files with 81,414 additions and 76,914 deletions.
diff --git a/Makefile b/Makefile
@@ -65,18 +65,13 @@ prepare-companion-stack:
 fetch-schema-data:
 	mkdir -p .tmp
 
-	rm -rf .tmp/aws-sam-developer-guide
-	git clone --branch main --depth 1 https://github.com/awsdocs/aws-sam-developer-guide.git .tmp/aws-sam-developer-guide
-
-	rm -rf .tmp/aws-cloudformation-user-guide
-	git clone --depth 1 https://github.com/awsdocs/aws-cloudformation-user-guide.git .tmp/aws-cloudformation-user-guide
+	curl -o .tmp/cfn-docs.json https://raw.githubusercontent.com/aws/aws-cdk/main/packages/%40aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json
 
 	curl -o .tmp/cloudformation.schema.json https://raw.githubusercontent.com/awslabs/goformation/master/schema/cloudformation.schema.json
 
 update-schema-data:
 	# Parse docs
-	bin/parse_docs.py .tmp/aws-sam-developer-guide/doc_source > samtranslator/internal/schema_source/sam-docs.json
-	bin/parse_docs.py --cfn .tmp/aws-cloudformation-user-guide/doc_source > schema_source/cloudformation-docs.json
+	bin/parse_cdk_cfn_docs.py < .tmp/cfn-docs.json > schema_source/cloudformation-docs.json
 
 	# Add CloudFormation docs to CloudFormation schema
 	python bin/add_docs_cfn_schema.py --schema .tmp/cloudformation.schema.json --docs schema_source/cloudformation-docs.json > schema_source/cloudformation.schema.json

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # AWS SAM transform
 
 [![Tests](https://github.com/aws/serverless-application-model/actions/workflows/build.yml/badge.svg)](https://github.com/aws/serverless-application-model/actions/workflows/build.yml)
+[![Update schema](https://github.com/aws/serverless-application-model/actions/workflows/schema.yml/badge.svg)](https://github.com/aws/serverless-application-model/actions/workflows/schema.yml)
 [![PyPI](https://img.shields.io/pypi/v/aws-sam-translator?label=PyPI)](https://pypi.org/project/aws-sam-translator/)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/aws-sam-translator?label=Python)](https://pypi.org/project/aws-sam-translator/)
 [![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/aws/serverless-application-model.git)

diff --git a/bin/parse_cdk_cfn_docs.py b/bin/parse_cdk_cfn_docs.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+"""
+Converts docs JSON from this format:
+  https://github.com/aws/aws-cdk/blob/ad89f0182e218eee01b0aef84b055a96556dda59/packages/%40aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json
+To this format:
+  https://github.com/aws/serverless-application-model/blob/237c7394c6e7ab61c1fad27f439a7b52bcd1b5af/schema_source/cloudformation-docs.json
+Originally used https://github.com/awsdocs/aws-cloudformation-user-guide, but switched since retired.
+See https://aws.amazon.com/blogs/aws/retiring-the-aws-documentation-on-github/
+Expects input from stdin; outputs to stdout.
+"""
+
+import json
+import sys
+from typing import Any, Dict
+
+
+def main() -> None:
+    obj = json.load(sys.stdin)
+
+    out: Dict[str, Any] = {"properties": {}}
+    for k, v in obj["Types"].items():
+        kk = k.replace(".", " ")
+        vv = v["properties"]
+        out["properties"][kk] = vv
+
+    print(json.dumps(out, indent=2, sort_keys=True))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/bin/parse_docs.py b/bin/parse_docs.py
diff --git a/docs/schema.md b/docs/schema.md
@@ -14,13 +14,11 @@ flowchart TD
     cfnschema(["CloudFormation schema"])
   end
   
-  subgraph repocfndocs["awsdocs/aws-cloudformation-user-guide"]
+  subgraph repocfndocs["aws/aws-cdk"]
     cfndocs(["CloudFormation documentation"])
   end
 
-  subgraph reposamdocs["awsdocs/aws-sam-developer-guide"]
-    samdocs(["SAM documentation"])
-  end
+  samdocs(["SAM documentation"])
   
   samschema(["SAM schema"])
   cfnschemadocs(["CloudFormation schema with documentation"])

diff --git a/integration/resources/templates/combination/graphqlapi_lambda_resolver.yaml b/integration/resources/templates/combination/graphqlapi_lambda_resolver.yaml
@@ -108,16 +108,10 @@ Resources:
       Resolvers:
         Mutation:
           addPost:
-            Runtime:
-              Name: APPSYNC_JS
-              Version: 1.0.0
             Pipeline:
             - lambdaInvoker
         Query:
           getPost:
-            Runtime:
-              Name: APPSYNC_JS
-              Version: 1.0.0
             Pipeline:
             - lambdaInvoker
 

diff --git a/integration/resources/templates/combination/graphqlapi_pipeline_resolver.yaml b/integration/resources/templates/combination/graphqlapi_pipeline_resolver.yaml
@@ -171,19 +171,13 @@ Resources:
       Resolvers:
         Mutation:
           addPost:
-            Runtime:
-              Name: APPSYNC_JS
-              Version: 1.0.0
             Pipeline:
             - formatPostLogItem
             - createPostLogItem
             - formatPostItem
             - createPostItem
         Query:
           getPost:
-            Runtime:
-              Name: APPSYNC_JS
-              Version: 1.0.0
             Pipeline:
             - getPostFromTable
 

diff --git a/samtranslator/__init__.py b/samtranslator/__init__.py
@@ -1 +1 @@
-__version__ = "1.71.0"
+__version__ = "1.72.0"
diff --git a/samtranslator/internal/data/aws_managed_policies.json b/samtranslator/internal/data/aws_managed_policies.json
@@ -1666,6 +1666,18 @@
     "AWSApplicationAutoscalingNeptuneClusterPolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AWSApplicationAutoscalingNeptuneClusterPolicy",
     "AWSApplicationAutoscalingRDSClusterPolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AWSApplicationAutoscalingRDSClusterPolicy",
     "AWSApplicationAutoscalingSageMakerEndpointPolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AWSApplicationAutoscalingSageMakerEndpointPolicy",
+    "AWSApplicationMigrationAgentInstallationPolicy": "arn:aws-us-gov:iam::aws:policy/AWSApplicationMigrationAgentInstallationPolicy",
+    "AWSApplicationMigrationAgentPolicy": "arn:aws-us-gov:iam::aws:policy/AWSApplicationMigrationAgentPolicy",
+    "AWSApplicationMigrationAgentPolicy_v2": "arn:aws-us-gov:iam::aws:policy/service-role/AWSApplicationMigrationAgentPolicy_v2",
+    "AWSApplicationMigrationConversionServerPolicy": "arn:aws-us-gov:iam::aws:policy/service-role/AWSApplicationMigrationConversionServerPolicy",
+    "AWSApplicationMigrationEC2Access": "arn:aws-us-gov:iam::aws:policy/AWSApplicationMigrationEC2Access",
+    "AWSApplicationMigrationFullAccess": "arn:aws-us-gov:iam::aws:policy/AWSApplicationMigrationFullAccess",
+    "AWSApplicationMigrationMGHAccess": "arn:aws-us-gov:iam::aws:policy/service-role/AWSApplicationMigrationMGHAccess",
+    "AWSApplicationMigrationReadOnlyAccess": "arn:aws-us-gov:iam::aws:policy/AWSApplicationMigrationReadOnlyAccess",
+    "AWSApplicationMigrationReplicationServerPolicy": "arn:aws-us-gov:iam::aws:policy/service-role/AWSApplicationMigrationReplicationServerPolicy",
+    "AWSApplicationMigrationSSMAccess": "arn:aws-us-gov:iam::aws:policy/AWSApplicationMigrationSSMAccess",
+    "AWSApplicationMigrationServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AWSApplicationMigrationServiceRolePolicy",
+    "AWSApplicationMigrationVCenterClientPolicy": "arn:aws-us-gov:iam::aws:policy/AWSApplicationMigrationVCenterClientPolicy",
     "AWSArtifactAccountSync": "arn:aws-us-gov:iam::aws:policy/service-role/AWSArtifactAccountSync",
     "AWSBackupAuditAccess": "arn:aws-us-gov:iam::aws:policy/AWSBackupAuditAccess",
     "AWSBackupDataTransferAccess": "arn:aws-us-gov:iam::aws:policy/AWSBackupDataTransferAccess",
@@ -1729,6 +1741,7 @@
     "AWSConfigRulesExecutionRole": "arn:aws-us-gov:iam::aws:policy/service-role/AWSConfigRulesExecutionRole",
     "AWSConfigServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AWSConfigServiceRolePolicy",
     "AWSConfigUserAccess": "arn:aws-us-gov:iam::aws:policy/AWSConfigUserAccess",
+    "AWSControlTowerAccountServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AWSControlTowerAccountServiceRolePolicy",
     "AWSControlTowerServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/service-role/AWSControlTowerServiceRolePolicy",
     "AWSDataExchangeFullAccess": "arn:aws-us-gov:iam::aws:policy/AWSDataExchangeFullAccess",
     "AWSDataExchangeProviderFullAccess": "arn:aws-us-gov:iam::aws:policy/AWSDataExchangeProviderFullAccess",
@@ -1748,6 +1761,7 @@
     "AWSDirectConnectServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AWSDirectConnectServiceRolePolicy",
     "AWSDirectoryServiceFullAccess": "arn:aws-us-gov:iam::aws:policy/AWSDirectoryServiceFullAccess",
     "AWSDirectoryServiceReadOnlyAccess": "arn:aws-us-gov:iam::aws:policy/AWSDirectoryServiceReadOnlyAccess",
+    "AWSEC2CapacityReservationFleetRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AWSEC2CapacityReservationFleetRolePolicy",
     "AWSEC2FleetServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AWSEC2FleetServiceRolePolicy",
     "AWSEC2SpotFleetServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AWSEC2SpotFleetServiceRolePolicy",
     "AWSElasticBeanstalkCustomPlatformforEC2Role": "arn:aws-us-gov:iam::aws:policy/AWSElasticBeanstalkCustomPlatformforEC2Role",
@@ -1950,6 +1964,7 @@
     "AccessAnalyzerServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AccessAnalyzerServiceRolePolicy",
     "AdministratorAccess": "arn:aws-us-gov:iam::aws:policy/AdministratorAccess",
     "AdministratorAccess-AWSElasticBeanstalk": "arn:aws-us-gov:iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk",
+    "AdministratorAccess-Amplify": "arn:aws-us-gov:iam::aws:policy/AdministratorAccess-Amplify",
     "AlexaForBusinessFullAccess": "arn:aws-us-gov:iam::aws:policy/AlexaForBusinessFullAccess",
     "AlexaForBusinessLifesizeDelegatedAccessPolicy": "arn:aws-us-gov:iam::aws:policy/AlexaForBusinessLifesizeDelegatedAccessPolicy",
     "AlexaForBusinessPolyDelegatedAccessPolicy": "arn:aws-us-gov:iam::aws:policy/AlexaForBusinessPolyDelegatedAccessPolicy",
@@ -2091,6 +2106,7 @@
     "AmazonPrometheusFullAccess": "arn:aws-us-gov:iam::aws:policy/AmazonPrometheusFullAccess",
     "AmazonPrometheusQueryAccess": "arn:aws-us-gov:iam::aws:policy/AmazonPrometheusQueryAccess",
     "AmazonPrometheusRemoteWriteAccess": "arn:aws-us-gov:iam::aws:policy/AmazonPrometheusRemoteWriteAccess",
+    "AmazonRDSCustomServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/AmazonRDSCustomServiceRolePolicy",
     "AmazonRDSDirectoryServiceAccess": "arn:aws-us-gov:iam::aws:policy/service-role/AmazonRDSDirectoryServiceAccess",
     "AmazonRDSEnhancedMonitoringRole": "arn:aws-us-gov:iam::aws:policy/service-role/AmazonRDSEnhancedMonitoringRole",
     "AmazonRDSFullAccess": "arn:aws-us-gov:iam::aws:policy/AmazonRDSFullAccess",
@@ -2256,6 +2272,8 @@
     "TranslateReadOnly": "arn:aws-us-gov:iam::aws:policy/TranslateReadOnly",
     "ViewOnlyAccess": "arn:aws-us-gov:iam::aws:policy/job-function/ViewOnlyAccess",
     "WAFRegionalLoggingServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/WAFRegionalLoggingServiceRolePolicy",
-    "WAFV2LoggingServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/WAFV2LoggingServiceRolePolicy"
+    "WAFV2LoggingServiceRolePolicy": "arn:aws-us-gov:iam::aws:policy/aws-service-role/WAFV2LoggingServiceRolePolicy",
+    "WellArchitectedConsoleFullAccess": "arn:aws-us-gov:iam::aws:policy/WellArchitectedConsoleFullAccess",
+    "WellArchitectedConsoleReadOnlyAccess": "arn:aws-us-gov:iam::aws:policy/WellArchitectedConsoleReadOnlyAccess"
   }
 }
diff --git a/samtranslator/internal/model/appsync.py b/samtranslator/internal/model/appsync.py
@@ -75,6 +75,13 @@ class AppSyncRuntimeType(TypedDict):
     RuntimeVersion: str
 
 
+# Runtime for the default generated resolver code (see APPSYNC_PIPELINE_RESOLVER_JS_CODE above)
+APPSYNC_PIPELINE_RESOLVER_JS_RUNTIME: AppSyncRuntimeType = {
+    "Name": "APPSYNC_JS",
+    "RuntimeVersion": "1.0.0",
+}
+
+
 class LambdaConflictHandlerConfigType(TypedDict):
     LambdaConflictHandlerArn: str
 

diff --git a/samtranslator/internal/schema_source/aws_serverless_graphqlapi.py b/samtranslator/internal/schema_source/aws_serverless_graphqlapi.py
@@ -57,21 +57,21 @@ class ApiKey(BaseModel):
 class Logging(BaseModel):
     CloudWatchLogsRoleArn: Optional[PassThroughProp]
     ExcludeVerboseContent: Optional[PassThroughProp]
-    FieldLogLevel: Optional[str]
+    FieldLogLevel: Optional[PassThroughProp]
 
 
 class DeltaSync(BaseModel):
-    BaseTableTTL: str
-    DeltaSyncTableName: str
-    DeltaSyncTableTTL: str
+    BaseTableTTL: PassThroughProp
+    DeltaSyncTableName: PassThroughProp
+    DeltaSyncTableTTL: PassThroughProp
 
 
 class DynamoDBDataSource(BaseModel):
     TableName: PassThroughProp
     ServiceRoleArn: Optional[PassThroughProp]
     TableArn: Optional[PassThroughProp]
     Permissions: Optional[PermissionsType]
-    Name: Optional[str]
+    Name: Optional[PassThroughProp]
     Description: Optional[PassThroughProp]
     Region: Optional[PassThroughProp]
     DeltaSync: Optional[DeltaSync]
@@ -82,7 +82,7 @@ class DynamoDBDataSource(BaseModel):
 class LambdaDataSource(BaseModel):
     FunctionArn: PassThroughProp
     ServiceRoleArn: Optional[PassThroughProp]
-    Name: Optional[str]
+    Name: Optional[PassThroughProp]
     Description: Optional[PassThroughProp]
 
 
@@ -153,7 +153,7 @@ class Cache(BaseModel):
 class Properties(BaseModel):
     Auth: Auth
     Tags: Optional[DictStrAny]
-    Name: Optional[str]
+    Name: Optional[PassThroughProp]
     XrayEnabled: Optional[bool]
     SchemaInline: Optional[PassThroughProp]
     SchemaUri: Optional[PassThroughProp]