Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

codegen: Update SDK modeled endpoints #791

Merged
merged 3 commits into from
Oct 3, 2020
Merged

codegen: Update SDK modeled endpoints #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43ecc12
codegen: Add utility to sync endpoint model from v1 SDK
jasdel Oct 2, 2020
4a9a3f0
update endpoint models
jasdel Oct 2, 2020
d1b906e
regenerate API clients and protocol tests
jasdel Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 19 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ SDK_ALL_PKGS=${SDK_COMPA_PKGS} ${SDK_EXAMPLES_PKGS}
RUN_NONE=-run '^$$'
RUN_INTEG=-run '^TestInteg_'

CODEGEN_RESOURCES_PATH=$(shell pwd)/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen
ENDPOINTS_JSON=${CODEGEN_RESOURCES_PATH}/endpoints.json
ENDPOINT_PREFIX_JSON=${CODEGEN_RESOURCES_PATH}/endpoint-prefix.json

LICENSE_FILE=$(shell pwd)/LICENSE.txt

all: generate unit
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should all call sync-endpoint-models?

Copy link
Contributor Author

@jasdel jasdel Oct 2, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure, how we wanted to do that since this really is a prep for releasing a update. I erred on the side of caution to not make it get the v1 SDK when unneeded. If the SDK had a similar location it could sync the Smithy API models from I'd vote it be included with that set of tasks.

Expand Down Expand Up @@ -74,6 +78,21 @@ add-module-license-files:
go run . -skip-root \
"cp $(LICENSE_FILE) ."

sync-endpoint-models: clone-v1-models sync-endpoints.json gen-endpoint-prefix.json

clone-v1-models:
rm -rf /tmp/aws-sdk-go-model-sync
git clone https://github.com/aws/aws-sdk-go.git --depth 1 /tmp/aws-sdk-go-model-sync

sync-endpoints.json:
cp /tmp/aws-sdk-go-model-sync/models/endpoints/endpoints.json ${ENDPOINTS_JSON}

gen-endpoint-prefix.json:
cd internal/repotools/cmd/endpointPrefix && \
go run . \
-m '/tmp/aws-sdk-go-model-sync/models/apis/*/*/api-2.json' \
-o ${ENDPOINT_PREFIX_JSON}


################
# Unit Testing #
Expand Down
91 changes: 52 additions & 39 deletions ...-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoint-prefix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
{
"AccessAnalyzer": "access-analyzer",
"ACM": "acm",
"ACM PCA": "acm-pca",
"API Gateway": "apigateway",
"AccessAnalyzer": "access-analyzer",
"Alexa For Business": "a4b",
"Amplify": "amplify",
"API Gateway": "apigateway",
"ApiGatewayManagementApi": "execute-api",
"ApiGatewayV2": "apigateway",
"App Mesh": "appmesh",
"AppConfig": "appconfig",
"AppStream": "appstream2",
"AppSync": "appsync",
"Appflow": "appflow",
"Application Auto Scaling": "application-autoscaling",
"Application Discovery Service": "discovery",
"Application Insights": "applicationinsights",
"AppStream": "appstream2",
"AppSync": "appsync",
"Athena": "athena",
"Auto Scaling": "autoscaling",
"Auto Scaling Plans": "autoscaling-plans",
"Backup": "backup",
"Batch": "batch",
"Braket": "braket",
"Budgets": "budgets",
"Chime": "chime",
"Cloud9": "cloud9",
Expand All @@ -40,8 +42,9 @@
"CodeGuruProfiler": "codeguru-profiler",
"CodePipeline": "codepipeline",
"CodeStar": "codestar",
"CodeStar connections": "codestar-connections",
"codestar notifications": "codestar-notifications",
"CodeStar Connections": "codestar-connections",
"Codeartifact": "codeartifact",
"Codestar Notifications": "codestar-notifications",
"Cognito Identity": "cognito-identity",
"Cognito Identity Provider": "cognito-idp",
"Cognito Sync": "cognito-sync",
Expand All @@ -51,18 +54,18 @@
"Config Service": "config",
"Connect": "connect",
"ConnectParticipant": "participant.connect",
"Cost and Usage Report Service": "cur",
"Cost And Usage Report Service": "cur",
"Cost Explorer": "ce",
"DAX": "dax",
"DLM": "dlm",
"Data Pipeline": "datapipeline",
"Database Migration Service": "dms",
"DataExchange": "dataexchange",
"DataSync": "datasync",
"DAX": "dax",
"Database Migration Service": "dms",
"Detective": "api.detective",
"Device Farm": "devicefarm",
"Direct Connect": "directconnect",
"Directory Service": "ds",
"DLM": "dlm",
"DocDB": "rds",
"DynamoDB": "dynamodb",
"DynamoDB Streams": "streams.dynamodb",
Expand All @@ -73,21 +76,21 @@
"ECS": "ecs",
"EFS": "elasticfilesystem",
"EKS": "eks",
"EMR": "elasticmapreduce",
"ElastiCache": "elasticache",
"Elastic Beanstalk": "elasticbeanstalk",
"Elastic Inference": "api.elastic-inference",
"Elastic Load Balancing": "elasticloadbalancing",
"Elastic Load Balancing v2": "elasticloadbalancing",
"Elastic Load Balancing V2": "elasticloadbalancing",
"Elastic Transcoder": "elastictranscoder",
"ElastiCache": "elasticache",
"Elasticsearch Service": "es",
"EMR": "elasticmapreduce",
"EventBridge": "events",
"Firehose": "firehose",
"FMS": "fms",
"forecast": "forecast",
"forecastquery": "forecastquery",
"FraudDetector": "frauddetector",
"FSx": "fsx",
"Firehose": "firehose",
"Forecast": "forecast",
"Forecastquery": "forecastquery",
"FraudDetector": "frauddetector",
"GameLift": "gamelift",
"Glacier": "glacier",
"Global Accelerator": "globalaccelerator",
Expand All @@ -96,9 +99,10 @@
"GroundStation": "groundstation",
"GuardDuty": "guardduty",
"Health": "health",
"Honeycode": "honeycode",
"IAM": "iam",
"imagebuilder": "imagebuilder",
"ImportExport": "importexport",
"Identitystore": "identitystore",
"Imagebuilder": "imagebuilder",
"Inspector": "inspector",
"IoT": "iot",
"IoT 1Click Devices Service": "devices.iot1click",
Expand All @@ -109,25 +113,29 @@
"IoT Jobs Data Plane": "data.jobs.iot",
"IoTAnalytics": "iotanalytics",
"IoTSecureTunneling": "api.tunneling.iot",
"IoTSiteWise": "iotsitewise",
"IoTThingsGraph": "iotthingsgraph",
"Ivs": "ivs",
"KMS": "kms",
"Kafka": "kafka",
"kendra": "kendra",
"Kendra": "kendra",
"Kinesis": "kinesis",
"Kinesis Analytics": "kinesisanalytics",
"Kinesis Analytics V2": "kinesisanalytics",
"Kinesis Video": "kinesisvideo",
"Kinesis Video Archived Media": "kinesisvideo",
"Kinesis Video Media": "kinesisvideo",
"Kinesis Video Signaling": "kinesisvideo",
"KMS": "kms",
"LakeFormation": "lakeformation",
"Lambda": "lambda",
"Lex Model Building Service": "models.lex",
"Lex Runtime Service": "runtime.lex",
"License Manager": "license-manager",
"Lightsail": "lightsail",
"MTurk": "mturk-requester",
"Machine Learning": "machinelearning",
"Macie": "macie",
"Macie2": "macie2",
"ManagedBlockchain": "managedblockchain",
"Marketplace Catalog": "catalog.marketplace",
"Marketplace Commerce Analytics": "marketplacecommerceanalytics",
Expand All @@ -144,18 +152,18 @@
"Migration Hub": "mgh",
"MigrationHub Config": "migrationhub-config",
"Mobile": "mobile",
"mq": "mq",
"MTurk": "mturk-requester",
"Mobile Analytics": "mobileanalytics",
"Mq": "mq",
"Neptune": "rds",
"NetworkManager": "networkmanager",
"OpsWorks": "opsworks",
"OpsWorksCM": "opsworks-cm",
"Organizations": "organizations",
"Outposts": "outposts",
"PI": "pi",
"Personalize": "personalize",
"Personalize Events": "personalize-events",
"Personalize Runtime": "personalize-runtime",
"PI": "pi",
"Pinpoint": "pinpoint",
"Pinpoint Email": "email",
"Pinpoint SMS Voice": "sms-voice.pinpoint",
Expand All @@ -168,6 +176,7 @@
"RDS": "rds",
"RDS Data": "rds-data",
"Redshift": "redshift",
"Redshift Data": "redshift-data",
"Rekognition": "rekognition",
"Resource Groups": "resource-groups",
"Resource Groups Tagging API": "tagging",
Expand All @@ -177,35 +186,39 @@
"Route53Resolver": "route53resolver",
"S3": "s3",
"S3 Control": "s3-control",
"S3Outposts": "s3-outposts",
"SES": "email",
"SESv2": "email",
"SFN": "states",
"SMS": "sms",
"SNS": "sns",
"SQS": "sqs",
"SSM": "ssm",
"SSO": "portal.sso",
"SSO Admin": "sso",
"SSO OIDC": "oidc",
"STS": "sts",
"SWF": "swf",
"SageMaker": "api.sagemaker",
"SageMaker A2I Runtime": "a2i-runtime.sagemaker",
"SageMaker Runtime": "runtime.sagemaker",
"savingsplans": "savingsplans",
"schemas": "schemas",
"Savingsplans": "savingsplans",
"Schemas": "schemas",
"Secrets Manager": "secretsmanager",
"SecurityHub": "securityhub",
"ServerlessApplicationRepository": "serverlessrepo",
"Service Catalog": "servicecatalog",
"Service Quotas": "servicequotas",
"ServiceDiscovery": "servicediscovery",
"SES": "email",
"SESv2": "email",
"SFN": "states",
"Shield": "shield",
"signer": "signer",
"SimpleDB": "sdb",
"SMS": "sms",
"Signer": "signer",
"Snowball": "snowball",
"SNS": "sns",
"SQS": "sqs",
"SSM": "ssm",
"SSO": "portal.sso",
"SSO OIDC": "oidc",
"Storage Gateway": "storagegateway",
"STS": "sts",
"Support": "support",
"SWF": "swf",
"Synthetics": "synthetics",
"Textract": "textract",
"Timestream Query": "query.timestream",
"Timestream Write": "ingest.timestream",
"Transcribe": "transcribe",
"Transcribe Streaming": "transcribestreaming",
"Transfer": "transfer",
Expand Down