fix: adapt customizations to match AWS CLI command reference

cmd/carapace-aws/cmd/botocore/aws.bedrock-agent-runtime.yaml

@@ -2,24 +2,6 @@
 name: bedrock-agent-runtime
 description: Agents for Amazon Bedrock Runtime
 commands:
-    - name: agentic-retrieve-stream
-      description: Retrieves information from one or more knowledge bases using an agentic approach.
-      flags:
-        --agentic-retrieve-configuration=!: Configuration settings for the agentic retrieval operation.
-        --cli-input-json=: Read arguments from the JSON string provided.
-        --cli-input-yaml=: Read arguments from the YAML string provided.
-        --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
-        --generate-response: Whether to generate a response based on the retrieved results.
-        --messages=!:
-            description: The list of messages for the agentic retrieval conversation.
-            nargs: -1
-        --next-token=: Opaque continuation token for paginated results.
-        --no-generate-response: Whether to generate a response based on the retrieved results.
-        --policy-configuration=: Policy configuration for guardrails and content filtering.
-        --retrievers=!:
-            description: The list of retrievers to use for agentic retrieval.
-            nargs: -1
-        --user-context=: Contains information about the user making the request.
     - name: create-invocation
       description: Creates a new invocation within a session.
       flags:

cmd/carapace-aws/cmd/botocore/aws.emr.yaml

@@ -92,6 +92,7 @@ commands:
         --no-auto-terminate: Specifies whether the cluster should terminate after completing all the steps
         --no-enable-debugging: Specifies that the debugging tool is enabled for the cluster
         --no-extended-support: Reserved
+        --no-session-enabled: Indicates whether Spark Connect sessions are enabled on the cluster
         --no-termination-protected: Specifies whether to lock the cluster to prevent the Amazon EC2 instances from being terminated by API call
         --no-unhealthy-node-replacement: Unhealthy node replacement for an Amazon EMR cluster
         --no-visible-to-all-users: Specifies whether the cluster is visible to all IAM users
@@ -105,6 +106,7 @@ commands:
         --scale-down-behavior=: Specifies the way that individual Amazon EC2 instances terminate
         --security-configuration=: Specifies the name of a security configuration to use for the cluster
         --service-role=: Specifies an IAM service role, which Amazon EMR requires to call other AWS services
+        --session-enabled: Indicates whether Spark Connect sessions are enabled on the cluster
         --step-concurrency-level=: This command specifies the step concurrency level of the cluster
         --step-execution-role-arn=: The IAM role ARN that will be used to execute steps on the cluster
         --steps=:
@@ -297,6 +299,7 @@ commands:
         --dest=: Destination file path on your machine
         --key-pair-file=!: Private key file to use for login
         --src=!: Source file path on remote host
+        --ssh-options=: Additional SSH options passed directly to the ssh/scp command
       completion:
         flag:
             dest:
@@ -615,6 +618,7 @@ commands:
         --dest=: Destination file path on remote host
         --key-pair-file=!: Private key file to use for login
         --src=!: Source file path on local machine
+        --ssh-options=: Additional SSH options passed directly to the ssh/scp command
       completion:
         flag:
             key-pair-file:
@@ -716,6 +720,7 @@ commands:
       flags:
         --cluster-id=!: Cluster Id of cluster you want to ssh into
         --key-pair-file=!: Private key file to use for login
+        --ssh-options=: Additional SSH options passed directly to the ssh/scp command
       completion:
         flag:
             key-pair-file:
@@ -726,6 +731,7 @@ commands:
         --cluster-id=!: Cluster Id of cluster you want to ssh into
         --command=: Command to execute on Master Node
         --key-pair-file=!: Private key file to use for login
+        --ssh-options=: Additional SSH options passed directly to the ssh/scp command
     - name: start-notebook-execution
       description: Starts a notebook execution.
       flags:

cmd/carapace-aws/cmd/botocore/aws.odb.yaml

@@ -41,7 +41,7 @@ commands:
         --customer-contacts-to-send-to-oci=:
             description: The list of customer contacts to receive operational notifications from Oracle Cloud Infrastructure (OCI) for the Autonomous Database.
             nargs: -1
-        --data-storage-size-in-g-bs=: The size, in gigabytes (GB), of the data volume to allocate for the Autonomous Database.
+        --data-storage-size-in-gbs=: The size, in gigabytes (GB), of the data volume to allocate for the Autonomous Database.
         --data-storage-size-in-tbs=: The size, in terabytes (TB), of the data volume to allocate for the Autonomous Database.
         --database-edition=: The Oracle Database edition to apply to the Autonomous Database.
         --db-name=: The name of the Autonomous Database.
@@ -799,7 +799,7 @@ commands:
         --customer-contacts-to-send-to-oci=:
             description: The list of customer contacts to receive operational notifications from OCI for the Autonomous Database.
             nargs: -1
-        --data-storage-size-in-g-bs=: The size, in gigabytes (GB), of the data volume to allocate for the Autonomous Database.
+        --data-storage-size-in-gbs=: The size, in gigabytes (GB), of the data volume to allocate for the Autonomous Database.
         --data-storage-size-in-tbs=: The size, in terabytes (TB), of the data volume to allocate for the Autonomous Database.
         --database-edition=: The Oracle Database edition to apply to the Autonomous Database.
         --db-name=: The new name of the Autonomous Database.

cmd/carapace-aws/cmd/botocore/aws.signin.yaml

@@ -2,14 +2,14 @@
 name: signin
 description: AWS Sign-In Service
 commands:
-    - name: create-o-auth2-token
+    - name: create-oauth2-token
       description: CreateOAuth2Token API
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.
         --cli-input-yaml=: Read arguments from the YAML string provided.
         --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
         --token-input=!: Flattened token operation inputs The specific operation is determined by grant\_type in the request body
-    - name: create-o-auth2-token-with-iam
+    - name: create-oauth2-token-with-iam
       description: Grants permission to exchange client credentials for an OAuth 2.0 access token scoped to a resource that can be used to access AWS services from applications
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.
@@ -45,7 +45,7 @@ commands:
         --cli-input-json=: Read arguments from the JSON string provided.
         --cli-input-yaml=: Read arguments from the YAML string provided.
         --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
-    - name: introspect-o-auth2-token-with-iam
+    - name: introspect-oauth2-token-with-iam
       description: Grants permission to inspect the metadata and state of an OAuth 2.0 access token or refresh token
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.
@@ -85,7 +85,7 @@ commands:
         --source-ip=: Source IP address
         --source-vpc=: VPC identifier to restrict console access
         --vpc-source-ip=: Source IP address within VPC
-    - name: revoke-o-auth2-token-with-iam
+    - name: revoke-oauth2-token-with-iam
       description: Grants permission to revoke an OAuth 2.0 refresh token and its associated refresh tokens
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.

cmd/carapace-aws/cmd/botocore/aws.socialmessaging.yaml

@@ -10,7 +10,7 @@ commands:
         --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
         --setup-finalization=: A JSON object that contains the phone numbers and WhatsApp Business Account to link to your account.
         --signup-callback=: Contains the callback access token.
-    - name: create-whats-app-flow
+    - name: create-whatsapp-flow
       description: Creates a new WhatsApp Flow.
       flags:
         --categories=!:
@@ -49,7 +49,7 @@ commands:
         --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
         --id=!: The ID of the WhatsApp Business Account associated with this media upload.
         --source-s3-file=: ""
-    - name: delete-whats-app-flow
+    - name: delete-whatsapp-flow
       description: Deletes a WhatsApp Flow permanently.
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.
@@ -76,7 +76,7 @@ commands:
         --meta-template-id=: The numeric ID of the template assigned by Meta.
         --no-delete-all-languages: If true, deletes all language versions of the template.
         --template-name=!: The name of the template to delete.
-    - name: deprecate-whats-app-flow
+    - name: deprecate-whatsapp-flow
       description: Deprecates a published WhatsApp Flow, marking it as no longer recommended for use.
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.
@@ -105,15 +105,15 @@ commands:
         --cli-input-yaml=: Read arguments from the YAML string provided.
         --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
         --id=!: The unique identifier of the phone number.
-    - name: get-whats-app-flow
+    - name: get-whatsapp-flow
       description: Retrieves the metadata and status of a WhatsApp Flow, including validation errors, preview information, and health status.
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.
         --cli-input-yaml=: Read arguments from the YAML string provided.
         --flow-id=!: The unique identifier of the Flow to retrieve.
         --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
         --id=!: The ID of the WhatsApp Business Account associated with this Flow.
-    - name: get-whats-app-flow-preview
+    - name: get-whatsapp-flow-preview
       description: Generates a web preview URL for testing a WhatsApp Flow before publishing.
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.
@@ -163,7 +163,7 @@ commands:
         --cli-input-yaml=: Read arguments from the YAML string provided.
         --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
         --resource-arn=!: The Amazon Resource Name (ARN) of the resource to retrieve the tags from.
-    - name: list-whats-app-flow-assets
+    - name: list-whatsapp-flow-assets
       description: Lists the assets (Flow JSON definition) of a WhatsApp Flow with presigned download URLs.
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.
@@ -176,7 +176,7 @@ commands:
         --next-token=: The token for the next page of results.
         --page-size=: The size of each page to get in the AWS service call.
         --starting-token=: A token to specify where to start paginating.
-    - name: list-whats-app-flows
+    - name: list-whatsapp-flows
       description: Lists all WhatsApp Flows for a WhatsApp Business Account.
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.
@@ -222,7 +222,7 @@ commands:
         --origination-phone-number-id=!: The ID of the phone number to associate with the WhatsApp media file.
         --source-s3-file=: The source S3 url for the media file.
         --source-s3-presigned-url=: The source presign url of the media file.
-    - name: publish-whats-app-flow
+    - name: publish-whatsapp-flow
       description: Publishes a WhatsApp Flow, making it available for use in template messages.
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.
@@ -269,7 +269,7 @@ commands:
         --tag-keys=!:
             description: The keys of the tags to remove from the resource.
             nargs: -1
-    - name: update-whats-app-flow
+    - name: update-whatsapp-flow
       description: Updates the metadata of a WhatsApp Flow, such as its name or categories.
       flags:
         --categories=:
@@ -281,7 +281,7 @@ commands:
         --flow-name=: The updated name for the Flow.
         --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
         --id=!: The ID of the WhatsApp Business Account associated with this Flow.
-    - name: update-whats-app-flow-assets
+    - name: update-whatsapp-flow-assets
       description: Updates the Flow JSON definition (assets) of a WhatsApp Flow.
       flags:
         --cli-input-json=: Read arguments from the JSON string provided.

cmd/carapace-spec-botocore/cmd/customizations/emr/aws.emr.create-cluster.yaml

@@ -50,3 +50,5 @@ flags:
   --monitoring-configuration=: Monitoring configuration for an Amazon EMR cluster
   --extended-support: Reserved
   --no-extended-support: Reserved
+  --session-enabled: Indicates whether Spark Connect sessions are enabled on the cluster
+  --no-session-enabled: Indicates whether Spark Connect sessions are enabled on the cluster

cmd/carapace-spec-botocore/cmd/customizations/emr/aws.emr.get.yaml

@@ -6,6 +6,7 @@ flags:
   --key-pair-file=!: Private key file to use for login
   --src=!: Source file path on remote host
   --dest=: Destination file path on your machine
+  --ssh-options=: Additional SSH options passed directly to the ssh/scp command
 completion:
   flag:
     key-pair-file: ["$files"]

cmd/carapace-spec-botocore/cmd/customizations/emr/aws.emr.put.yaml

@@ -6,6 +6,7 @@ flags:
   --key-pair-file=!: Private key file to use for login
   --src=!: Source file path on local machine
   --dest=: Destination file path on remote host
+  --ssh-options=: Additional SSH options passed directly to the ssh/scp command
 completion:
   flag:
     key-pair-file: ["$files"]

cmd/carapace-spec-botocore/cmd/customizations/emr/aws.emr.socks.yaml

@@ -4,6 +4,7 @@ description: Create a socks tunnel on port 8157 from your machine to the master
 flags:
   --cluster-id=!: Cluster Id of cluster you want to ssh into
   --key-pair-file=!: Private key file to use for login
+  --ssh-options=: Additional SSH options passed directly to the ssh/scp command
 completion:
   flag:
     key-pair-file: ["$files"]

cmd/carapace-spec-botocore/cmd/customizations/emr/aws.emr.ssh.yaml

@@ -5,6 +5,7 @@ flags:
   --cluster-id=!: Cluster Id of cluster you want to ssh into
   --key-pair-file=!: Private key file to use for login
   --command=: Command to execute on Master Node
+  --ssh-options=: Additional SSH options passed directly to the ssh/scp command
 documentation:
   command: |
     SSH into master node of the cluster.

cmd/carapace-spec-botocore/cmd/customizations/removals.go

@@ -47,6 +47,7 @@ var removals = map[string][]string{
 		"invoke-inline-agent",
 		"optimize-prompt",
 		"retrieve-and-generate-stream",
+		"agentic-retrieve-stream",
 	},
 	"bedrock-agentcore": {
 		"invoke-code-interpreter",

cmd/carapace-spec-botocore/cmd/root.go

@@ -123,13 +123,19 @@ func CamelCaseToDash(s string) string {
 		"create-cachedi-scsi-volume":                         "create-cached-iscsi-volume",
 		"create-environment-e-c2":                            "create-environment-ec2",
 		"create-storedi-scsi-volume":                         "create-stored-iscsi-volume",
+		"create-o-auth2-token":                               "create-oauth2-token",
+		"create-o-auth2-token-with-iam":                      "create-oauth2-token-with-iam",
+		"create-whats-app-flow":                              "create-whatsapp-flow",
 		"create-whats-app-message-template":                  "create-whatsapp-message-template",
 		"create-whats-app-message-template-from-library":     "create-whatsapp-message-template-from-library",
 		"create-whats-app-message-template-media":            "create-whatsapp-message-template-media",
+		"data-storage-size-in-g-bs":                          "data-storage-size-in-gbs",
 		"data-storage-size-in-t-bs":                          "data-storage-size-in-tbs",
 		"db-node-storage-size-in-g-bs":                       "db-node-storage-size-in-gbs",
+		"delete-whats-app-flow":                              "delete-whatsapp-flow",
 		"delete-whats-app-message-media":                     "delete-whatsapp-message-media",
 		"delete-whats-app-message-template":                  "delete-whatsapp-message-template",
+		"deprecate-whats-app-flow":                           "deprecate-whatsapp-flow",
 		"describe-ac-ls":                                     "describe-acls",
 		"describe-cachedi-scsi-volumes":                      "describe-cached-iscsi-volumes",
 		"describe-e-c2-instance-limits":                      "describe-ec2-instance-limits",
@@ -152,8 +158,11 @@ func CamelCaseToDash(s string) string {
 		"get-linked-whats-app-business-account":              "get-linked-whatsapp-business-account",
 		"get-linked-whats-app-business-account-phone-number": "get-linked-whatsapp-business-account-phone-number",
 		"get-o-tel-enrichment":                               "get-otel-enrichment",
+		"get-whats-app-flow":                                 "get-whatsapp-flow",
+		"get-whats-app-flow-preview":                         "get-whatsapp-flow-preview",
 		"get-whats-app-message-media":                        "get-whatsapp-message-media",
 		"get-whats-app-message-template":                     "get-whatsapp-message-template",
+		"introspect-o-auth2-token-with-iam":                  "introspect-oauth2-token-with-iam",
 		"infer-ic-d10-cm":                                    "infer-icd10-cm",
 		"launch-configuration-template-i-ds":                 "launch-configuration-template-ids",
 		"list-hi-ts-for-qualification-type":                  "list-hits-for-qualification-type",
@@ -162,6 +171,8 @@ func CamelCaseToDash(s string) string {
 		"list-linked-whats-app-business-accounts":            "list-linked-whatsapp-business-accounts",
 		"list-reviewable-hi-ts":                              "list-reviewable-hits",
 		"list-web-ac-ls":                                     "list-web-acls",
+		"list-whats-app-flow-assets":                         "list-whatsapp-flow-assets",
+		"list-whats-app-flows":                               "list-whatsapp-flows",
 		"list-whats-app-message-templates":                   "list-whatsapp-message-templates",
 		"list-whats-app-template-library":                    "list-whatsapp-template-library",
 		"logout-ur-ls":                                       "logout-urls",
@@ -174,11 +185,13 @@ func CamelCaseToDash(s string) string {
 		"pool-ar-ns":                                         "pool-arns",
 		"post-whats-app-message-media":                       "post-whatsapp-message-media",
 		"provider-ar-ns":                                     "provider-arns",
+		"publish-whats-app-flow":                             "publish-whatsapp-flow",
 		"put-whats-app-business-account-event-destinations":  "put-whatsapp-business-account-event-destinations",
 		"recovery-instance-i-ds":                             "recovery-instance-ids",
 		"replication-configuration-template-i-ds":            "replication-configuration-template-ids",
 		"replication-servers-security-groups-i-ds":           "replication-servers-security-groups-ids",
 		"retrieve-a-zs":                                      "retrieve-azs",
+		"revoke-o-auth2-token-with-iam":                      "revoke-oauth2-token-with-iam",
 		"saml-provider-ar-ns":                                "saml-provider-arns",
 		"send-whats-app-message":                             "send-whatsapp-message",
 		"source-server-i-d":                                  "source-server-ids",
@@ -190,6 +203,8 @@ func CamelCaseToDash(s string) string {
 		"swap-environment-cnam-es":                           "swap-environment-cnames",
 		"tape-ar-ns":                                         "tape-arns",
 		"target-group-ar-ns":                                 "target-group-arns",
+		"update-whats-app-flow":                              "update-whatsapp-flow",
+		"update-whats-app-flow-assets":                       "update-whatsapp-flow-assets",
 		"update-whats-app-message-template":                  "update-whatsapp-message-template",
 		"volume-ar-ns":                                       "volume-arns",
 		"vtl-device-ar-ns":                                   "vtl-device-arns",