Skip to content

Commit

Permalink
Update API model
Browse files Browse the repository at this point in the history
  • Loading branch information
AWS SDK for Go v2 automation user committed Sep 23, 2024
1 parent 2f44586 commit 5e6ce06
Show file tree
Hide file tree
Showing 8 changed files with 639 additions and 66 deletions.
2 changes: 1 addition & 1 deletion codegen/sdk-codegen/aws-models/api-gateway.json
Original file line number Diff line number Diff line change
Expand Up @@ -4877,7 +4877,7 @@
"certificateUploadDate": {
"target": "com.amazonaws.apigateway#Timestamp",
"traits": {
"smithy.api#documentation": "<p>The timestamp when the certificate that was used by edge-optimized endpoint for this domain name was uploaded.</p>"
"smithy.api#documentation": "<p>The timestamp when the certificate that was used by edge-optimized endpoint for this domain name was uploaded. API Gateway doesn't change this value if you update the certificate.</p>"
}
},
"regionalDomainName": {
Expand Down
306 changes: 300 additions & 6 deletions codegen/sdk-codegen/aws-models/athena.json

Large diffs are not rendered by default.

24 changes: 17 additions & 7 deletions codegen/sdk-codegen/aws-models/bedrock-agent.json
Original file line number Diff line number Diff line change
Expand Up @@ -2617,7 +2617,7 @@
"foundationModel": {
"target": "com.amazonaws.bedrockagent#ModelIdentifier",
"traits": {
"smithy.api#documentation": "<p>The foundation model to be used for orchestration by the agent you create.</p>"
"smithy.api#documentation": "<p>The Amazon Resource Name (ARN) of the foundation model to be used for orchestration by the agent you create.</p>"
}
},
"description": {
Expand Down Expand Up @@ -8104,9 +8104,9 @@
}
},
"modelId": {
"target": "com.amazonaws.bedrockagent#ModelIdentifier",
"target": "com.amazonaws.bedrockagent#KnowledgeBaseModelIdentifier",
"traits": {
"smithy.api#documentation": "<p>The unique identifier of the model to use to generate a response from the query results. Omit this field if you want to return the retrieved results as an array.</p>"
"smithy.api#documentation": "<p>The unique identifier of the model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a> to use to generate a response from the query results. Omit this field if you want to return the retrieved results as an array.</p>"
}
}
},
Expand All @@ -8123,6 +8123,16 @@
"smithy.api#pattern": "^[0-9a-zA-Z]+$"
}
},
"com.amazonaws.bedrockagent#KnowledgeBaseModelIdentifier": {
"type": "string",
"traits": {
"smithy.api#length": {
"min": 1,
"max": 2048
},
"smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(model-gateway|inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)$"
}
},
"com.amazonaws.bedrockagent#KnowledgeBaseResource": {
"type": "resource",
"operations": [
Expand Down Expand Up @@ -10405,7 +10415,7 @@
"modelId": {
"target": "com.amazonaws.bedrockagent#PromptModelIdentifier",
"traits": {
"smithy.api#documentation": "<p>The unique identifier of the model to run inference with.</p>",
"smithy.api#documentation": "<p>The unique identifier of the model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a> to run inference with.</p>",
"smithy.api#required": {}
}
},
Expand Down Expand Up @@ -10577,7 +10587,7 @@
"min": 1,
"max": 2048
},
"smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)$"
"smithy.api#pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(model-gateway|inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)$"
}
},
"com.amazonaws.bedrockagent#PromptModelInferenceConfiguration": {
Expand Down Expand Up @@ -10637,7 +10647,7 @@
"overrideLambda": {
"target": "com.amazonaws.bedrockagent#LambdaArn",
"traits": {
"smithy.api#documentation": "<p>The ARN of the Lambda function to use when parsing the raw foundation model output in parts of the agent sequence. If you specify this field, at least one of the <code>promptConfigurations</code> must contain a <code>parserMode</code> value that is set to <code>OVERRIDDEN</code>. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/lambda-parser.html\">Parser Lambda function in Agents for Amazon Bedrock</a>.</p>"
"smithy.api#documentation": "<p>The ARN of the Lambda function to use when parsing the raw foundation model output in parts of the agent sequence. If you specify this field, at least one of the <code>promptConfigurations</code> must contain a <code>parserMode</code> value that is set to <code>OVERRIDDEN</code>. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/lambda-parser.html\">Parser Lambda function in Amazon Bedrock Agents</a>.</p>"
}
}
},
Expand Down Expand Up @@ -10843,7 +10853,7 @@
"modelId": {
"target": "com.amazonaws.bedrockagent#PromptModelIdentifier",
"traits": {
"smithy.api#documentation": "<p>The unique identifier of the model with which to run inference on the prompt.</p>"
"smithy.api#documentation": "<p>The unique identifier of the model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a> with which to run inference on the prompt.</p>"
}
},
"inferenceConfiguration": {
Expand Down
81 changes: 70 additions & 11 deletions codegen/sdk-codegen/aws-models/ec2.json
Original file line number Diff line number Diff line change
Expand Up @@ -9923,7 +9923,7 @@
"target": "smithy.api#Unit"
},
"traits": {
"smithy.api#documentation": "<p>Cancels an active conversion task. The task can be the import of an instance or volume. The action removes all\n artifacts of the conversion, including a partially uploaded volume or instance. If the conversion is complete or is\n in the process of transferring the final disk image, the command fails and returns an exception.</p>\n <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/CommandLineReference/ec2-cli-vmimport-export.html\">Importing a Virtual Machine Using the Amazon\n EC2 CLI</a>.</p>"
"smithy.api#documentation": "<p>Cancels an active conversion task. The task can be the import of an instance or volume. The action removes all\n artifacts of the conversion, including a partially uploaded volume or instance. If the conversion is complete or is\n in the process of transferring the final disk image, the command fails and returns an exception.</p>"
}
},
"com.amazonaws.ec2#CancelExportTask": {
Expand Down Expand Up @@ -23533,7 +23533,7 @@
"type": "structure",
"members": {
"KeyName": {
"target": "com.amazonaws.ec2#KeyPairName",
"target": "com.amazonaws.ec2#KeyPairNameWithResolver",
"traits": {
"smithy.api#documentation": "<p>The name of the key pair.</p>"
}
Expand Down Expand Up @@ -27910,17 +27910,13 @@
"InstanceType": {
"target": "com.amazonaws.ec2#String",
"traits": {
"smithy.api#clientOptional": {},
"smithy.api#documentation": "<p>The type of instance for which the Capacity Block offering reserves capacity.</p>",
"smithy.api#required": {}
"smithy.api#documentation": "<p>The type of instance for which the Capacity Block offering reserves capacity.</p>"
}
},
"InstanceCount": {
"target": "com.amazonaws.ec2#Integer",
"traits": {
"smithy.api#clientOptional": {},
"smithy.api#documentation": "<p>The number of instances for which to reserve capacity.</p>",
"smithy.api#required": {}
"smithy.api#documentation": "<p>The number of instances for which to reserve capacity.</p>"
}
},
"StartDateRange": {
Expand Down Expand Up @@ -49970,6 +49966,18 @@
"traits": {
"smithy.api#enumValue": "use-capacity-reservations-first"
}
},
"USE_CAPACITY_RESERVATIONS_ONLY": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "use-capacity-reservations-only"
}
},
"NONE": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "none"
}
}
}
},
Expand Down Expand Up @@ -57597,7 +57605,7 @@
"target": "com.amazonaws.ec2#ImportInstanceResult"
},
"traits": {
"smithy.api#documentation": "<note>\n <p>We recommend that you use the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportImage.html\">\n <code>ImportImage</code>\n </a>\n API. For more information, see <a href=\"https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html\">Importing a VM as an image using VM\n Import/Export</a> in the <i>VM Import/Export User Guide</i>.</p>\n </note>\n <p>Creates an import instance task using metadata from the specified disk image.</p>\n <p>This API action is not supported by the Command Line Interface (CLI). For\n information about using the Amazon EC2 CLI, which is deprecated, see <a href=\"https://awsdocs.s3.amazonaws.com/EC2/ec2-clt.pdf#UsingVirtualMachinesinAmazonEC2\">Importing\n a VM to Amazon EC2</a> in the <i>Amazon EC2 CLI Reference</i> PDF file.</p>\n <p>This API action supports only single-volume VMs. To import multi-volume VMs, use <a>ImportImage</a>\n instead.</p>\n <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p>"
"smithy.api#documentation": "<note>\n <p>We recommend that you use the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportImage.html\">\n <code>ImportImage</code>\n </a>\n API instead. For more information, see <a href=\"https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html\">Importing a VM as an image using VM\n Import/Export</a> in the <i>VM Import/Export User Guide</i>.</p>\n </note>\n <p>Creates an import instance task using metadata from the specified disk image.</p>\n <p>This API action supports only single-volume VMs. To import multi-volume VMs, use <a>ImportImage</a>\n instead.</p>\n <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p>\n <p>This API action is not supported by the Command Line Interface (CLI).</p>"
}
},
"com.amazonaws.ec2#ImportInstanceLaunchSpecification": {
Expand Down Expand Up @@ -58171,7 +58179,7 @@
"target": "com.amazonaws.ec2#ImportVolumeResult"
},
"traits": {
"smithy.api#documentation": "<p>Creates an import volume task using metadata from the specified disk image.</p>\n <p>This API action supports only single-volume VMs. To import multi-volume VMs, use \n <a>ImportImage</a> instead. To import a disk to a snapshot, use\n <a>ImportSnapshot</a> instead.</p>\n <p>This API action is not supported by the Command Line Interface (CLI). For \n information about using the Amazon EC2 CLI, which is deprecated, see <a href=\"https://awsdocs.s3.amazonaws.com/EC2/ec2-clt.pdf#importing-your-volumes-into-amazon-ebs\">Importing Disks to Amazon EBS</a> in the <i>Amazon EC2 CLI Reference</i> PDF file.</p>\n <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p>"
"smithy.api#documentation": "<note>\n <p>This API action supports only single-volume VMs. To import multi-volume VMs, use \n <a>ImportImage</a> instead. To import a disk to a snapshot, use\n <a>ImportSnapshot</a> instead.</p>\n </note>\n <p>Creates an import volume task using metadata from the specified disk image.</p>\n <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p>\n <p>This API action is not supported by the Command Line Interface (CLI).</p>"
}
},
"com.amazonaws.ec2#ImportVolumeRequest": {
Expand Down Expand Up @@ -66673,6 +66681,54 @@
"traits": {
"smithy.api#enumValue": "mac2-m1ultra.metal"
}
},
"g6e_xlarge": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "g6e.xlarge"
}
},
"g6e_2xlarge": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "g6e.2xlarge"
}
},
"g6e_4xlarge": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "g6e.4xlarge"
}
},
"g6e_8xlarge": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "g6e.8xlarge"
}
},
"g6e_12xlarge": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "g6e.12xlarge"
}
},
"g6e_16xlarge": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "g6e.16xlarge"
}
},
"g6e_24xlarge": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "g6e.24xlarge"
}
},
"g6e_48xlarge": {
"target": "smithy.api#Unit",
"traits": {
"smithy.api#enumValue": "g6e.48xlarge"
}
}
}
},
Expand Down Expand Up @@ -70737,6 +70793,9 @@
"com.amazonaws.ec2#KeyPairName": {
"type": "string"
},
"com.amazonaws.ec2#KeyPairNameWithResolver": {
"type": "string"
},
"com.amazonaws.ec2#KeyType": {
"type": "enum",
"members": {
Expand Down Expand Up @@ -96168,7 +96227,7 @@
"target": "com.amazonaws.ec2#String",
"traits": {
"aws.protocols#ec2QueryName": "Description",
"smithy.api#documentation": "<p>The description of the snapshot.</p>",
"smithy.api#documentation": "<p>The description of the disk image being imported.</p>",
"smithy.api#xmlName": "description"
}
},
Expand Down
Loading

0 comments on commit 5e6ce06

Please sign in to comment.