chore: run codegen

Signed-off-by: Hidde Beydals <[email protected]>
akuity · Dec 11, 2024 · ffc480b · ffc480b
1 parent dd30bb1
commit ffc480b
Show file tree

Hide file tree

Showing 13 changed files with 564 additions and 249 deletions.
diff --git a/api/v1alpha1/generated.pb.go b/api/v1alpha1/generated.pb.go
diff --git a/api/v1alpha1/generated.proto b/api/v1alpha1/generated.proto
diff --git a/api/v1alpha1/promotion_types.go b/api/v1alpha1/promotion_types.go
@@ -216,7 +216,7 @@ type PromotionStep struct {
 	// When a PromotionStep is inflated from a PromotionTask, the inputs
 	// specified in the PromotionTask are set based on the inputs specified
 	// in the Config of the PromotionStep that references the PromotionTask.
-	Inputs map[string]string `json:"inputs,omitempty" protobuf:"bytes,6,rep,name=inputs"`
+	Inputs map[string]string `json:"inputs,omitempty" protobuf:"bytes,6,rep,name=inputs" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// Config is opaque configuration for the PromotionStep that is understood
 	// only by each PromotionStep's implementation. It is legal to utilize
 	// expressions in defining values at any level of this block.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/kargo/resources/crds/kargo.akuity.io_clusterpromotiontasks.yaml b/charts/kargo/resources/crds/kargo.akuity.io_clusterpromotiontasks.yaml
@@ -95,6 +95,17 @@ spec:
                         expressions in defining values at any level of this block.
                         See https://docs.kargo.io/references/expression-language for details.
                       x-kubernetes-preserve-unknown-fields: true
+                    inputs:
+                      additionalProperties:
+                        type: string
+                      description: |-
+                        Inputs is a map of inputs that can used to parameterize the execution
+                        of the PromotionStep and can be referenced by expressions in the Config.
+
+                        When a PromotionStep is inflated from a PromotionTask, the inputs
+                        specified in the PromotionTask are set based on the inputs specified
+                        in the Config of the PromotionStep that references the PromotionTask.
+                      type: object
                     retry:
                       description: Retry is the retry policy for this step.
                       properties:
@@ -171,6 +182,10 @@ spec:
                   - message: PromotionTask step must have uses set and must not reference
                       another task
                     rule: has(self.uses) && !has(self.task)
+                  - message: PromotionTask step must not have inputs set
+                    rule: self.inputs.size() == 0
+                  - message: inputs must not be set when task is set
+                    rule: '!(has(self.task) && self.inputs.size() > 0)'
                 minItems: 1
                 type: array
             required:

diff --git a/charts/kargo/resources/crds/kargo.akuity.io_promotions.yaml b/charts/kargo/resources/crds/kargo.akuity.io_promotions.yaml
@@ -98,6 +98,17 @@ spec:
                         expressions in defining values at any level of this block.
                         See https://docs.kargo.io/references/expression-language for details.
                       x-kubernetes-preserve-unknown-fields: true
+                    inputs:
+                      additionalProperties:
+                        type: string
+                      description: |-
+                        Inputs is a map of inputs that can used to parameterize the execution
+                        of the PromotionStep and can be referenced by expressions in the Config.
+
+                        When a PromotionStep is inflated from a PromotionTask, the inputs
+                        specified in the PromotionTask are set based on the inputs specified
+                        in the Config of the PromotionStep that references the PromotionTask.
+                      type: object
                     retry:
                       description: Retry is the retry policy for this step.
                       properties:
@@ -174,6 +185,8 @@ spec:
                   - message: Promotion step must have uses set and must not reference
                       a task
                     rule: has(self.uses) && !has(self.task)
+                  - message: inputs must not be set when task is set
+                    rule: '!(has(self.task) && self.inputs.size() > 0)'
                 minItems: 1
                 type: array
               vars:

diff --git a/charts/kargo/resources/crds/kargo.akuity.io_promotiontasks.yaml b/charts/kargo/resources/crds/kargo.akuity.io_promotiontasks.yaml
@@ -95,6 +95,17 @@ spec:
                         expressions in defining values at any level of this block.
                         See https://docs.kargo.io/references/expression-language for details.
                       x-kubernetes-preserve-unknown-fields: true
+                    inputs:
+                      additionalProperties:
+                        type: string
+                      description: |-
+                        Inputs is a map of inputs that can used to parameterize the execution
+                        of the PromotionStep and can be referenced by expressions in the Config.
+
+                        When a PromotionStep is inflated from a PromotionTask, the inputs
+                        specified in the PromotionTask are set based on the inputs specified
+                        in the Config of the PromotionStep that references the PromotionTask.
+                      type: object
                     retry:
                       description: Retry is the retry policy for this step.
                       properties:
@@ -171,6 +182,10 @@ spec:
                   - message: PromotionTask step must have uses set and must not reference
                       another task
                     rule: has(self.uses) && !has(self.task)
+                  - message: PromotionTask step must not have inputs set
+                    rule: self.inputs.size() == 0
+                  - message: inputs must not be set when task is set
+                    rule: '!(has(self.task) && self.inputs.size() > 0)'
                 minItems: 1
                 type: array
             required:

diff --git a/charts/kargo/resources/crds/kargo.akuity.io_stages.yaml b/charts/kargo/resources/crds/kargo.akuity.io_stages.yaml
@@ -88,6 +88,17 @@ spec:
                                 expressions in defining values at any level of this block.
                                 See https://docs.kargo.io/references/expression-language for details.
                               x-kubernetes-preserve-unknown-fields: true
+                            inputs:
+                              additionalProperties:
+                                type: string
+                              description: |-
+                                Inputs is a map of inputs that can used to parameterize the execution
+                                of the PromotionStep and can be referenced by expressions in the Config.
+
+                                When a PromotionStep is inflated from a PromotionTask, the inputs
+                                specified in the PromotionTask are set based on the inputs specified
+                                in the Config of the PromotionStep that references the PromotionTask.
+                              type: object
                             retry:
                               description: Retry is the retry policy for this step.
                               properties:
@@ -164,6 +175,8 @@ spec:
                           - message: PromotionTemplate step must have exactly one
                               of uses or task set
                             rule: '(has(self.uses) ? !has(self.task) : has(self.task))'
+                          - message: inputs must not be set when task is set
+                            rule: '!(has(self.task) && self.inputs.size() > 0)'
                         minItems: 1
                         type: array
                       vars:

diff --git a/ui/src/gen/schema/clusterpromotiontasks.kargo.akuity.io_v1alpha1.json b/ui/src/gen/schema/clusterpromotiontasks.kargo.akuity.io_v1alpha1.json
@@ -50,6 +50,13 @@
                 "description": "Config is opaque configuration for the PromotionStep that is understood\nonly by each PromotionStep's implementation. It is legal to utilize\nexpressions in defining values at any level of this block.\nSee https://docs.kargo.io/references/expression-language for details.",
                 "x-kubernetes-preserve-unknown-fields": true
               },
+              "inputs": {
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "description": "Inputs is a map of inputs that can used to parameterize the execution\nof the PromotionStep and can be referenced by expressions in the Config.\n\nWhen a PromotionStep is inflated from a PromotionTask, the inputs\nspecified in the PromotionTask are set based on the inputs specified\nin the Config of the PromotionStep that references the PromotionTask.",
+                "type": "object"
+              },
               "retry": {
                 "description": "Retry is the retry policy for this step.",
                 "properties": {
@@ -102,6 +109,14 @@
               {
                 "message": "PromotionTask step must have uses set and must not reference another task",
                 "rule": "has(self.uses) && !has(self.task)"
+              },
+              {
+                "message": "PromotionTask step must not have inputs set",
+                "rule": "self.inputs.size() == 0"
+              },
+              {
+                "message": "inputs must not be set when task is set",
+                "rule": "!(has(self.task) && self.inputs.size() > 0)"
               }
             ]
           },

diff --git a/ui/src/gen/schema/promotions.kargo.akuity.io_v1alpha1.json b/ui/src/gen/schema/promotions.kargo.akuity.io_v1alpha1.json
@@ -43,6 +43,13 @@
                 "description": "Config is opaque configuration for the PromotionStep that is understood\nonly by each PromotionStep's implementation. It is legal to utilize\nexpressions in defining values at any level of this block.\nSee https://docs.kargo.io/references/expression-language for details.",
                 "x-kubernetes-preserve-unknown-fields": true
               },
+              "inputs": {
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "description": "Inputs is a map of inputs that can used to parameterize the execution\nof the PromotionStep and can be referenced by expressions in the Config.\n\nWhen a PromotionStep is inflated from a PromotionTask, the inputs\nspecified in the PromotionTask are set based on the inputs specified\nin the Config of the PromotionStep that references the PromotionTask.",
+                "type": "object"
+              },
               "retry": {
                 "description": "Retry is the retry policy for this step.",
                 "properties": {
@@ -95,6 +102,10 @@
               {
                 "message": "Promotion step must have uses set and must not reference a task",
                 "rule": "has(self.uses) && !has(self.task)"
+              },
+              {
+                "message": "inputs must not be set when task is set",
+                "rule": "!(has(self.task) && self.inputs.size() > 0)"
               }
             ]
           },

diff --git a/ui/src/gen/schema/promotiontasks.kargo.akuity.io_v1alpha1.json b/ui/src/gen/schema/promotiontasks.kargo.akuity.io_v1alpha1.json
@@ -50,6 +50,13 @@
                 "description": "Config is opaque configuration for the PromotionStep that is understood\nonly by each PromotionStep's implementation. It is legal to utilize\nexpressions in defining values at any level of this block.\nSee https://docs.kargo.io/references/expression-language for details.",
                 "x-kubernetes-preserve-unknown-fields": true
               },
+              "inputs": {
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "description": "Inputs is a map of inputs that can used to parameterize the execution\nof the PromotionStep and can be referenced by expressions in the Config.\n\nWhen a PromotionStep is inflated from a PromotionTask, the inputs\nspecified in the PromotionTask are set based on the inputs specified\nin the Config of the PromotionStep that references the PromotionTask.",
+                "type": "object"
+              },
               "retry": {
                 "description": "Retry is the retry policy for this step.",
                 "properties": {
@@ -102,6 +109,14 @@
               {
                 "message": "PromotionTask step must have uses set and must not reference another task",
                 "rule": "has(self.uses) && !has(self.task)"
+              },
+              {
+                "message": "PromotionTask step must not have inputs set",
+                "rule": "self.inputs.size() == 0"
+              },
+              {
+                "message": "inputs must not be set when task is set",
+                "rule": "!(has(self.task) && self.inputs.size() > 0)"
               }
             ]
           },

diff --git a/ui/src/gen/schema/stages.kargo.akuity.io_v1alpha1.json b/ui/src/gen/schema/stages.kargo.akuity.io_v1alpha1.json
@@ -35,6 +35,13 @@
                         "description": "Config is opaque configuration for the PromotionStep that is understood\nonly by each PromotionStep's implementation. It is legal to utilize\nexpressions in defining values at any level of this block.\nSee https://docs.kargo.io/references/expression-language for details.",
                         "x-kubernetes-preserve-unknown-fields": true
                       },
+                      "inputs": {
+                        "additionalProperties": {
+                          "type": "string"
+                        },
+                        "description": "Inputs is a map of inputs that can used to parameterize the execution\nof the PromotionStep and can be referenced by expressions in the Config.\n\nWhen a PromotionStep is inflated from a PromotionTask, the inputs\nspecified in the PromotionTask are set based on the inputs specified\nin the Config of the PromotionStep that references the PromotionTask.",
+                        "type": "object"
+                      },
                       "retry": {
                         "description": "Retry is the retry policy for this step.",
                         "properties": {
@@ -87,6 +94,10 @@
                       {
                         "message": "PromotionTemplate step must have exactly one of uses or task set",
                         "rule": "(has(self.uses) ? !has(self.task) : has(self.task))"
+                      },
+                      {
+                        "message": "inputs must not be set when task is set",
+                        "rule": "!(has(self.task) && self.inputs.size() > 0)"
                       }
                     ]
                   },

diff --git a/ui/src/gen/v1alpha1/generated_pb.ts b/ui/src/gen/v1alpha1/generated_pb.ts
@@ -2925,6 +2925,8 @@ export class PromotionStatus extends Message<PromotionStatus> {
 /**
  * PromotionStep describes a directive to be executed as part of a Promotion.
  *
+ * +kubebuilder:validation:XValidation:message="inputs must not be set when task is set",rule="!(has(self.task) && self.inputs.size() > 0)"
+ *
  * @generated from message github.com.akuity.kargo.api.v1alpha1.PromotionStep
  */
 export class PromotionStep extends Message<PromotionStep> {
@@ -2960,6 +2962,18 @@ export class PromotionStep extends Message<PromotionStep> {
    */
   retry?: PromotionStepRetry;
 
+  /**
+   * Inputs is a map of inputs that can used to parameterize the execution
+   * of the PromotionStep and can be referenced by expressions in the Config.
+   *
+   * When a PromotionStep is inflated from a PromotionTask, the inputs
+   * specified in the PromotionTask are set based on the inputs specified
+   * in the Config of the PromotionStep that references the PromotionTask.
+   *
+   * @generated from field: map<string, string> inputs = 6;
+   */
+  inputs: { [key: string]: string } = {};
+
   /**
    * Config is opaque configuration for the PromotionStep that is understood
    * only by each PromotionStep's implementation. It is legal to utilize
@@ -2982,6 +2996,7 @@ export class PromotionStep extends Message<PromotionStep> {
     { no: 5, name: "task", kind: "message", T: PromotionTaskReference, opt: true },
     { no: 2, name: "as", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 4, name: "retry", kind: "message", T: PromotionStepRetry, opt: true },
+    { no: 6, name: "inputs", kind: "map", K: 9 /* ScalarType.STRING */, V: {kind: "scalar", T: 9 /* ScalarType.STRING */} },
     { no: 3, name: "config", kind: "message", T: JSON, opt: true },
   ]);
 
@@ -3315,6 +3330,7 @@ export class PromotionTaskSpec extends Message<PromotionTaskSpec> {
    * +kubebuilder:validation:Required
    * +kubebuilder:validation:MinItems=1
    * +kubebuilder:validation:items:XValidation:message="PromotionTask step must have uses set and must not reference another task",rule="has(self.uses) && !has(self.task)"
+   * +kubebuilder:validation:items:XValidation:message="PromotionTask step must not have inputs set",rule="self.inputs.size() == 0"
    *
    * @generated from field: repeated github.com.akuity.kargo.api.v1alpha1.PromotionStep steps = 2;
    */