Merge pull request #348 from carapace-sh/fix/customizations-30153423491

fix: adapt customizations for AWS CLI 2.36.8

Author: rsteube

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

@@ -240,7 +240,10 @@ commands:
     - name: describe-cluster
       description: Provides cluster-level details including status, hardware and software configuration, VPC settings, and so on.
       flags:
+        --cli-input-json=: Read arguments from the JSON string provided.
+        --cli-input-yaml=: Read arguments from the YAML string provided.
         --cluster-id=!: The identifier of the cluster to describe.
+        --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
     - name: describe-notebook-execution
       description: Provides details of a notebook execution.
       flags:
@@ -831,11 +834,17 @@ commands:
         - name: cluster-running
           description: Provides cluster-level details including status, hardware and software configuration, VPC settings, and so on.
           flags:
+            --cli-input-json=: Read arguments from the JSON string provided.
+            --cli-input-yaml=: Read arguments from the YAML string provided.
             --cluster-id=!: The identifier of the cluster to describe.
+            --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
         - name: cluster-terminated
           description: Provides cluster-level details including status, hardware and software configuration, VPC settings, and so on.
           flags:
+            --cli-input-json=: Read arguments from the JSON string provided.
+            --cli-input-yaml=: Read arguments from the YAML string provided.
             --cluster-id=!: The identifier of the cluster to describe.
+            --generate-cli-skeleton: Prints a JSON skeleton to standard output without sending an API request.
         - name: step-complete
           description: Provides more detail about the cluster step.
           flags:

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

@@ -2488,7 +2488,6 @@ 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.
         --image-name=!: The name of the image.
-        --version-number=: The version of the image.
     - name: describe-inference-component
       description: Returns information about an inference component.
       flags:
@@ -6734,7 +6733,6 @@ 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.
             --image-name=!: The name of the image.
-            --version-number=: The version of the image.
         - name: image-version-deleted
           description: Describes a version of a SageMaker AI image.
           flags:
@@ -6743,7 +6741,6 @@ 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.
             --image-name=!: The name of the image.
-            --version-number=: The version of the image.
         - name: notebook-instance-deleted
           description: Returns information about a notebook instance.
           flags:

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

@@ -73,6 +73,31 @@ func init() {
 			}
 			cmd.Commands = append(cmd.Commands, specCommand)
 		}
+		for i := range cmd.Commands {
+			if cmd.Commands[i].Name != "wait" {
+				continue
+			}
+			for j := range cmd.Commands[i].Commands {
+				waitSubCmd := &cmd.Commands[i].Commands[j]
+				if waitSubCmd.Name != "cluster-running" && waitSubCmd.Name != "cluster-terminated" {
+					continue
+				}
+				waitSubCmd.AddFlag(command.Flag{
+					Longhand:    "cli-input-json",
+					Description: "Read arguments from the JSON string provided.",
+					Value:       true,
+				})
+				waitSubCmd.AddFlag(command.Flag{
+					Longhand:    "cli-input-yaml",
+					Description: "Read arguments from the YAML string provided.",
+					Value:       true,
+				})
+				waitSubCmd.AddFlag(command.Flag{
+					Longhand:    "generate-cli-skeleton",
+					Description: "Prints a JSON skeleton to standard output without sending an API request.",
+				})
+			}
+		}
 		return nil
 	}
 

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

@@ -0,0 +1,23 @@
+package customizations
+
+import (
+	"github.com/carapace-sh/carapace-spec/pkg/command"
+)
+
+func init() {
+	customizations["sagemaker"] = func(cmd *command.Command) error {
+		for i := range cmd.Commands {
+			if cmd.Commands[i].Name != "wait" {
+				continue
+			}
+			for j := range cmd.Commands[i].Commands {
+				waitSubCmd := &cmd.Commands[i].Commands[j]
+				if waitSubCmd.Name != "image-version-created" && waitSubCmd.Name != "image-version-deleted" {
+					continue
+				}
+				delete(waitSubCmd.Flags, "--version-number=")
+			}
+		}
+		return nil
+	}
+}