Merge pull request #347 from carapace-sh/fix/customizations-30128881863

fix: adapt customizations for AWS CLI 2.36.8

Author: rsteube

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

@@ -188,10 +188,14 @@ commands:
     - name: credential-helper
       description: Provide a SigV4 compatible user name and password for git smart HTTP.
       commands:
+        - name: erase
+          description: Erase is a no-op.
         - name: get
           description: Get a username SigV4 credential pair based on protocol, host and path provided from standard in.
           flags:
             --ignore-host-check: Generate credentials regardless of whether the domain is an Amazon domain.
+        - name: store
+          description: Store is a no-op.
     - name: delete-approval-rule-template
       description: Deletes a specified approval rule template.
       flags:

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

@@ -15113,7 +15113,6 @@ commands:
             --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
             --instance-id=!: The ID of the Windows instance.
             --no-dry-run: Checks whether you have the required permissions for the operation, without actually making the request, and provides an error response.
-            --priv-launch-key=: The file that contains the private key used to launch the instance
         - name: secondary-network-create-complete
           description: Describes one or more secondary networks.
           flags:

cmd/carapace-aws/cmd/root.go

@@ -94,6 +94,7 @@ func init() {
 		"history",
 		"login",
 		"logout",
+		"update",
 	} {
 		subCmd := &cobra.Command{
 			Use:                extension,

cmd/carapace-spec-botocore/cmd/customizations/codecommit/aws.codecommit.credential-helper.yaml

@@ -9,6 +9,8 @@ documentation:
     Get is operation to generate credentials to authenticate AWS CodeCommit.
     Run “aws codecommit credential-helper help” for details
 commands:
+  - name: erase
+    description: Erase is a no-op.
   - name: get
     description: Get a username SigV4 credential pair based on protocol, host and path provided from standard in.
     flags:
@@ -17,4 +19,6 @@ commands:
       command: |
         Get a username SigV4 credential pair based on protocol, host and path provided from standard in.
         This is primarily called by git to generate credentials to authenticate against AWS CodeCommit
+  - name: store
+    description: Store is a no-op.
 

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

@@ -7,6 +7,25 @@ import (
 )
 
 func init() {
+	customizations["ec2"] = func(cmd *command.Command) error {
+		for i := range cmd.Commands {
+			if cmd.Commands[i].Name == "wait" {
+				for j := range cmd.Commands[i].Commands {
+					if cmd.Commands[i].Commands[j].Name == "password-data-available" {
+						flags := make(command.FlagSet)
+						for k, v := range cmd.Commands[i].Commands[j].Flags {
+							if k != "--priv-launch-key=" {
+								flags[k] = v
+							}
+						}
+						cmd.Commands[i].Commands[j].Flags = flags
+					}
+				}
+			}
+		}
+		return nil
+	}
+
 	customizations["ec2.modify-instance-attribute"] = func(cmd *command.Command) error {
 		delete(cmd.Flags, "--enable-api-termination") // TODO should be this but seems awscli is missing the rename here
 		cmd.AddFlag(command.Flag{