add support for git source

Author: michaeljguarino

charts/console-rapid/charts/controller-0.0.157.tgz

@@ -426,7 +426,8 @@ spec:
                   when to use it, and any prerequisites or considerations.
                 type: string
               git:
-                description: Git location to source external files from.
+                description: Git location to source external files from.  If `creates.git`
+                  is also specified, the results will be merged.
                 properties:
                   files:
                     description: Optional files to add to the manifests for this service

charts/console/charts/controller-0.0.157.tgz

@@ -159,7 +159,7 @@ type PrAutomationSpec struct {
 	// +kubebuilder:validation:Optional
 	RepositoryRef *corev1.ObjectReference `json:"repositoryRef,omitempty"`
 
-	// Git location to source external files from.
+	// Git location to source external files from.  If `creates.git` is also specified, the results will be merged.
 	// +kubebuilder:validation:Optional
 	Git *GitRef `json:"git,omitempty"`
 

charts/console/charts/kas-0.3.0.tgz

@@ -426,7 +426,8 @@ spec:
                   when to use it, and any prerequisites or considerations.
                 type: string
               git:
-                description: Git location to source external files from.
+                description: Git location to source external files from.  If `creates.git`
+                  is also specified, the results will be merged.
                 properties:
                   files:
                     description: Optional files to add to the manifests for this service

charts/controller/crds/deployments.plural.sh_prautomations.yaml

@@ -1510,6 +1510,7 @@ _Appears in:_
 - [AiApprovalConfiguration](#aiapprovalconfiguration)
 - [InfrastructureStackSpec](#infrastructurestackspec)
 - [PrAutomationCreateConfiguration](#prautomationcreateconfiguration)
+- [PrAutomationSpec](#prautomationspec)
 - [SentinelCheckIntegrationTestConfiguration](#sentinelcheckintegrationtestconfiguration)
 - [SentinelSpec](#sentinelspec)
 - [ServiceHelm](#servicehelm)
@@ -3273,6 +3274,23 @@ _Appears in:_
 | `folders` _string array_ | Entire folders to delete. |  | Optional: \{\} <br /> |
 
 
+#### PrAutomationLuaConfiguration
+
+
+
+
+
+
+
+_Appears in:_
+- [PrAutomationSpec](#prautomationspec)
+
+| Field | Description | Default | Validation |
+| --- | --- | --- | --- |
+| `script` _string_ | File of a flat script to use |  | Optional: \{\} <br /> |
+| `folder` _string_ | Folder with lua library code and scripts to use |  | Optional: \{\} <br /> |
+
+
 #### PrAutomationSecretConfiguration
 
 
@@ -3338,6 +3356,7 @@ _Appears in:_
 | `clusterRef` _[ObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectreference-v1-core)_ | ClusterRef references a specific cluster that this PR operates on. |  | Optional: \{\} <br /> |
 | `scmConnectionRef` _[ObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectreference-v1-core)_ | ScmConnectionRef references the SCM connection to use for authentication when creating pull requests. |  | Required: \{\} <br /> |
 | `repositoryRef` _[ObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectreference-v1-core)_ | RepositoryRef references a Git repository resource this automation uses. |  | Optional: \{\} <br /> |
+| `git` _[GitRef](#gitref)_ | Git location to source external files from.  If `creates.git` is also specified, the results will be merged. |  | Optional: \{\} <br /> |
 | `serviceRef` _[ObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectreference-v1-core)_ | ServiceRef references a specific service that this PR automation acts upon. |  | Optional: \{\} <br /> |
 | `projectRef` _[ObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectreference-v1-core)_ | ProjectRef references the project this automation belongs to, enabling<br />project-scoped organization and access control. |  | Optional: \{\} <br /> |
 | `catalogRef` _[ObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectreference-v1-core)_ | CatalogRef references the catalog this automation belongs to for<br />organizational purposes and discoverability in the service catalog. |  | Optional: \{\} <br /> |
@@ -3348,6 +3367,7 @@ _Appears in:_
 | `creates` _[PrAutomationCreateConfiguration](#prautomationcreateconfiguration)_ | Creates defines specifications for generating new files from templates,<br />allowing the automation to add new configuration files to the repository. |  | Optional: \{\} <br /> |
 | `updates` _[PrAutomationUpdateConfiguration](#prautomationupdateconfiguration)_ | Updates specifies how to modify existing files using regex replacements<br />or YAML overlays, enabling precise changes to infrastructure code. |  | Optional: \{\} <br /> |
 | `deletes` _[PrAutomationDeleteConfiguration](#prautomationdeleteconfiguration)_ | Deletes specifies files and folders to remove from the repository as part<br />of the PR, useful for cleanup or migration scenarios. |  | Optional: \{\} <br /> |
+| `lua` _[PrAutomationLuaConfiguration](#prautomationluaconfiguration)_ | Lua specification to source lua scripts to preprocess the PR automation. |  | Optional: \{\} <br /> |
 | `reconciliation` _[Reconciliation](#reconciliation)_ | Reconciliation settings for this resource.<br />Controls drift detection and reconciliation intervals. |  | Optional: \{\} <br /> |
 | `labels` _string array_ | Labels to apply to all created PRs from this pr automation |  | Optional: \{\} <br /> |
 

go/controller/api/v1alpha1/prautomation_types.go

@@ -128,21 +128,42 @@ defmodule Console.Deployments.Pr.Dispatcher do
     impl.pr_info(url)
   end
 
+  defp external_git(%PrAutomation{repository: %GitRepository{} = git, git: %{ref: _, folder: _} = ref1, creates: %{git: %{ref: _, folder: _} = ref2}}),
+    do: external_git(git, [ref1, ref2])
   defp external_git(%PrAutomation{repository: %GitRepository{} = git, git: %{ref: _, folder: _} = ref}),
     do: external_git(git, ref)
   defp external_git(%PrAutomation{repository: %GitRepository{} = git, creates: %{git: %{ref: _, folder: _} = ref}}),
     do: external_git(git, ref)
   defp external_git(_), do: {:ok, nil}
 
-  defp external_git(%GitRepository{} = git, %{ref: _, folder: _} = ref) do
+  defp external_git(%GitRepository{} = git, ref) when is_map(ref) or is_list(ref) do
     with {:ok, dir} <- Briefly.create(directory: true),
-         {:ok, f} <- Discovery.fetch(git, ref),
-         {:ok, contents} <- Tar.tar_stream(f),
+         {:ok, contents} <- git_contents(git, ref),
          :ok <- Console.dump_folder(dir, contents),
       do: {:ok, dir}
   end
   defp external_git(_, _), do: {:ok, nil}
 
+  defp git_contents(%GitRepository{} = git, [_ | _] = refs) do
+    Enum.reduce_while(refs, %{}, fn ref, acc ->
+      with {:ok, f} <- Discovery.fetch(git, ref),
+           {:ok, contents} <- Tar.tar_stream(f) do
+        {:cont, Map.merge(acc, Map.new(contents))}
+      else
+        {:error, _} = err -> {:halt, err}
+      end
+    end)
+    |> case do
+      %{} = contents -> {:ok, contents}
+      {:error, _} = err -> err
+    end
+  end
+
+  defp git_contents(%GitRepository{} = git, %{ref: _, folder: _} = ref) do
+    with {:ok, f} <- Discovery.fetch(git, ref),
+      do: Tar.tar_stream(f)
+  end
+
   defp resolve_repo("mgmt") do
     case Settings.cached() do
       %DeploymentSettings{mgmt_repo: r} when is_binary(r) -> r

go/controller/config/crd/bases/deployments.plural.sh_prautomations.yaml

@@ -426,7 +426,8 @@ spec:
                   when to use it, and any prerequisites or considerations.
                 type: string
               git:
-                description: Git location to source external files from.
+                description: Git location to source external files from.  If `creates.git`
+                  is also specified, the results will be merged.
                 properties:
                   files:
                     description: Optional files to add to the manifests for this service