Last fixes before v0.10.33 (#1461)

pluralsh · Oct 11, 2024 · 842ae0a · 842ae0a
1 parent c2847c6
commit 842ae0a
Show file tree

Hide file tree

Showing 14 changed files with 148 additions and 13 deletions.
diff --git a/charts/controller/crds/deployments.plural.sh_catalogs.yaml b/charts/controller/crds/deployments.plural.sh_catalogs.yaml
@@ -103,10 +103,16 @@ spec:
                 type: object
               category:
                 type: string
+              darkIcon:
+                description: An darkmode icon url to annotate this pr automation
+                type: string
               description:
                 description: Description is a description of this Catalog.
                 example: my catalog description
                 type: string
+              icon:
+                description: An icon url to annotate this pr automation
+                type: string
               name:
                 type: string
               projectRef:

diff --git a/charts/controller/crds/deployments.plural.sh_prautomations.yaml b/charts/controller/crds/deployments.plural.sh_prautomations.yaml
@@ -250,6 +250,9 @@ spec:
                       type: object
                     type: array
                 type: object
+              darkIcon:
+                description: An darkmode icon url to annotate this pr automation
+                type: string
               deletes:
                 description: Spec for files and folders to be deleted
                 properties:
@@ -267,6 +270,9 @@ spec:
               documentation:
                 description: Documentation ...
                 type: string
+              icon:
+                description: An icon url to annotate this pr automation
+                type: string
               identifier:
                 description: Identifier is a string referencing the repository, i.e.
                   for GitHub it would be "<organization>/<repositoryName>"

diff --git a/go/controller/api/v1alpha1/catalog_types.go b/go/controller/api/v1alpha1/catalog_types.go
@@ -13,6 +13,15 @@ type CatalogSpec struct {
 	Name *string `json:"name,omitempty"`
 	// +kubebuilder:validation:Required
 	Author string `json:"author"`
+
+	// An icon url to annotate this pr automation
+	// +kubebuilder:validation:Optional
+	Icon *string `json:"icon,omitempty"`
+
+	// An darkmode icon url to annotate this pr automation
+	// +kubebuilder:validation:Optional
+	DarkIcon *string `json:"darkIcon,omitempty"`
+
 	// Description is a description of this Catalog.
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:Type:=string
@@ -89,6 +98,8 @@ func (c *Catalog) Attributes(projectID *string) *console.CatalogAttributes {
 		Author:      c.Spec.Author,
 		Description: c.Spec.Description,
 		Category:    c.Spec.Category,
+		Icon:        c.Spec.Icon,
+		DarkIcon:    c.Spec.DarkIcon,
 		ProjectID:   projectID,
 	}
 	if len(c.Spec.Tags) > 0 {

diff --git a/go/controller/api/v1alpha1/prautomation_types.go b/go/controller/api/v1alpha1/prautomation_types.go
@@ -75,6 +75,8 @@ func (in *PrAutomation) Attributes(clusterID, serviceID, connectionID, repositor
 		Title:         in.Spec.Title,
 		Message:       in.Spec.Message,
 		Branch:        in.Spec.Branch,
+		Icon:          in.Spec.Icon,
+		DarkIcon:      in.Spec.DarkIcon,
 		Updates:       in.Spec.Updates.Attributes(),
 		Creates:       in.Spec.Creates.Attributes(),
 		Deletes:       in.Spec.Deletes.Attributes(),
@@ -126,6 +128,14 @@ type PrAutomationSpec struct {
 	// +kubebuilder:validation:Optional
 	Branch *string `json:"branch,omitempty"`
 
+	// An icon url to annotate this pr automation
+	// +kubebuilder:validation:Optional
+	Icon *string `json:"icon,omitempty"`
+
+	// An darkmode icon url to annotate this pr automation
+	// +kubebuilder:validation:Optional
+	DarkIcon *string `json:"darkIcon,omitempty"`
+
 	// Documentation ...
 	// +kubebuilder:validation:Optional
 	Documentation *string `json:"documentation,omitempty"`

diff --git a/go/controller/api/v1alpha1/zz_generated.deepcopy.go b/go/controller/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/go/controller/config/crd/bases/deployments.plural.sh_catalogs.yaml b/go/controller/config/crd/bases/deployments.plural.sh_catalogs.yaml
@@ -103,10 +103,16 @@ spec:
                 type: object
               category:
                 type: string
+              darkIcon:
+                description: An darkmode icon url to annotate this pr automation
+                type: string
               description:
                 description: Description is a description of this Catalog.
                 example: my catalog description
                 type: string
+              icon:
+                description: An icon url to annotate this pr automation
+                type: string
               name:
                 type: string
               projectRef:

diff --git a/go/controller/config/crd/bases/deployments.plural.sh_prautomations.yaml b/go/controller/config/crd/bases/deployments.plural.sh_prautomations.yaml
@@ -250,6 +250,9 @@ spec:
                       type: object
                     type: array
                 type: object
+              darkIcon:
+                description: An darkmode icon url to annotate this pr automation
+                type: string
               deletes:
                 description: Spec for files and folders to be deleted
                 properties:
@@ -267,6 +270,9 @@ spec:
               documentation:
                 description: Documentation ...
                 type: string
+              icon:
+                description: An icon url to annotate this pr automation
+                type: string
               identifier:
                 description: Identifier is a string referencing the repository, i.e.
                   for GitHub it would be "<organization>/<repositoryName>"

diff --git a/go/controller/docs/api.md b/go/controller/docs/api.md
@@ -9,6 +9,7 @@
 Package v1alpha1 contains API Schema definitions for the deployments v1alpha1 API group
 
 ### Resource Types
+- [Catalog](#catalog)
 - [Cluster](#cluster)
 - [ClusterRestore](#clusterrestore)
 - [ClusterRestoreTrigger](#clusterrestoretrigger)
@@ -49,6 +50,7 @@ Binding ...
 
 _Appears in:_
 - [Bindings](#bindings)
+- [CatalogBindings](#catalogbindings)
 - [DeploymentSettingsBindings](#deploymentsettingsbindings)
 - [NotificationSinkSpec](#notificationsinkspec)
 - [PrAutomationBindings](#prautomationbindings)
@@ -75,6 +77,7 @@ to this resource for users/groups in the system.
 _Appears in:_
 - [ClusterSpec](#clusterspec)
 - [InfrastructureStackSpec](#infrastructurestackspec)
+- [PipelineSpec](#pipelinespec)
 - [ProjectSpec](#projectspec)
 - [ServiceSpec](#servicespec)
 
@@ -102,6 +105,66 @@ _Appears in:_
 | `delete` _boolean_ | Whether you want to delete owned resources in Plural and in the targeted k8s cluster |  | Optional: {} <br /> |
 
 
+#### Catalog
+
+
+
+Catalog is the Schema for the catalogs API
+
+
+
+
+
+| Field | Description | Default | Validation |
+| --- | --- | --- | --- |
+| `apiVersion` _string_ | `deployments.plural.sh/v1alpha1` | | |
+| `kind` _string_ | `Catalog` | | |
+| `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. |  |  |
+| `spec` _[CatalogSpec](#catalogspec)_ |  |  |  |
+
+
+#### CatalogBindings
+
+
+
+CatalogBindings ...
+
+
+
+_Appears in:_
+- [CatalogSpec](#catalogspec)
+
+| Field | Description | Default | Validation |
+| --- | --- | --- | --- |
+| `create` _[Binding](#binding) array_ | Create bindings. |  | Optional: {} <br /> |
+| `read` _[Binding](#binding) array_ | Read bindings. |  | Optional: {} <br /> |
+| `write` _[Binding](#binding) array_ | Write bindings. |  | Optional: {} <br /> |
+
+
+#### CatalogSpec
+
+
+
+CatalogSpec defines the desired state of Catalog
+
+
+
+_Appears in:_
+- [Catalog](#catalog)
+
+| Field | Description | Default | Validation |
+| --- | --- | --- | --- |
+| `name` _string_ |  |  | Optional: {} <br /> |
+| `author` _string_ |  |  | Required: {} <br /> |
+| `icon` _string_ | An icon url to annotate this pr automation |  | Optional: {} <br /> |
+| `darkIcon` _string_ | An darkmode icon url to annotate this pr automation |  | Optional: {} <br /> |
+| `description` _string_ | Description is a description of this Catalog. |  | Optional: {} <br />Type: string <br /> |
+| `category` _string_ |  |  | Optional: {} <br /> |
+| `projectRef` _[ObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectreference-v1-core)_ | ProjectRef owning project of the catalog, permissions will propagate down |  | Optional: {} <br /> |
+| `tags` _object (keys:string, values:string)_ |  |  | Optional: {} <br /> |
+| `bindings` _[CatalogBindings](#catalogbindings)_ | Bindings contain read and write policies of this Catalog. |  | Optional: {} <br /> |
+
+
 #### CloudProvider
 
 _Underlying type:_ _string_
@@ -1541,6 +1604,7 @@ _Appears in:_
 | `stages` _[PipelineStage](#pipelinestage) array_ | Stages of a pipeline. |  |  |
 | `edges` _[PipelineEdge](#pipelineedge) array_ | Edges of a pipeline. |  |  |
 | `projectRef` _[ObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectreference-v1-core)_ | ProjectRef references project this stack belongs to.<br />If not provided, it will use the default project. |  | Optional: {} <br /> |
+| `bindings` _[Bindings](#bindings)_ | Bindings contain read and write policies of this pipeline |  | Optional: {} <br /> |
 
 
 #### PipelineStage
@@ -1744,6 +1808,8 @@ _Appears in:_
 | `role` _[PrRole](#prrole)_ |  |  | Enum: [CLUSTER SERVICE PIPELINE UPDATE UPGRADE] <br />Optional: {} <br /> |
 | `addon` _string_ | Addon is a link to an addon name |  | Optional: {} <br /> |
 | `branch` _string_ | The base branch this pr will be based on (defaults to the repo's main branch) |  | Optional: {} <br /> |
+| `icon` _string_ | An icon url to annotate this pr automation |  | Optional: {} <br /> |
+| `darkIcon` _string_ | An darkmode icon url to annotate this pr automation |  | Optional: {} <br /> |
 | `documentation` _string_ | Documentation ... |  | Optional: {} <br /> |
 | `identifier` _string_ | Identifier is a string referencing the repository, i.e. for GitHub it would be "<organization>/<repositoryName>" |  | Optional: {} <br /> |
 | `message` _string_ | Message the commit message this pr will incorporate |  | Optional: {} <br /> |

diff --git a/go/controller/internal/test/mocks/ConsoleClient_mock.go b/go/controller/internal/test/mocks/ConsoleClient_mock.go
diff --git a/lib/console/plural/queries.ex b/lib/console/plural/queries.ex
@@ -248,8 +248,8 @@ defmodule Console.Plural.Queries do
   """
 
   @oidc_delete """
-    mutation Delete($id: ID!, $attributes: OidcAttributes!) {
-      deleteOidcProvider(id: $id, attributes: $attributes) {
+    mutation Delete($id: ID!) {
+      deleteOidcProvider(id: $id) {
         ...OIDCProviderFragment
       }
     }

diff --git a/plural/helm/console/crds/deployments.plural.sh_catalogs.yaml b/plural/helm/console/crds/deployments.plural.sh_catalogs.yaml
@@ -103,10 +103,16 @@ spec:
                 type: object
               category:
                 type: string
+              darkIcon:
+                description: An darkmode icon url to annotate this pr automation
+                type: string
               description:
                 description: Description is a description of this Catalog.
                 example: my catalog description
                 type: string
+              icon:
+                description: An icon url to annotate this pr automation
+                type: string
               name:
                 type: string
               projectRef:

diff --git a/plural/helm/console/crds/deployments.plural.sh_prautomations.yaml b/plural/helm/console/crds/deployments.plural.sh_prautomations.yaml
@@ -250,6 +250,9 @@ spec:
                       type: object
                     type: array
                 type: object
+              darkIcon:
+                description: An darkmode icon url to annotate this pr automation
+                type: string
               deletes:
                 description: Spec for files and folders to be deleted
                 properties:
@@ -267,6 +270,9 @@ spec:
               documentation:
                 description: Documentation ...
                 type: string
+              icon:
+                description: An icon url to annotate this pr automation
+                type: string
               identifier:
                 description: Identifier is a string referencing the repository, i.e.
                   for GitHub it would be "<organization>/<repositoryName>"

diff --git a/priv/notifications/slack/service.update.json.eex b/priv/notifications/slack/service.update.json.eex
@@ -34,11 +34,7 @@
 						},
 						{
 							"type": "text",
-							"text": ": "
-						},
-						{
-							"type": "link",
-							"url": "<%= @source.url %>\n"
+							"text": ": <%= @source.url %>\n"
 						},
 						{
 							"type": "text",

diff --git a/priv/notifications/slack/stack.run.json.eex b/priv/notifications/slack/stack.run.json.eex
@@ -39,11 +39,7 @@
 						},
 						{
 							"type": "text",
-							"text": ": "
-						},
-						{
-							"type": "link",
-							"url": "<%= @stack_run.git.ref %>\n"
+							"text": ": <%= @stack_run.git.ref %>\n"
 						},
 						{
 							"type": "text",