From 7a8b6f3e9141c1a7b3b3dfb700791b0010605223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Tue, 23 Apr 2024 13:31:57 +0200
Subject: [PATCH] fix

---
 share/gitea-tekton-org/auto-ci.tf  |  4 ++--
 share/gitea-tekton-org/listener.tf | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/share/gitea-tekton-org/auto-ci.tf b/share/gitea-tekton-org/auto-ci.tf
index 38faea3..783872a 100644
--- a/share/gitea-tekton-org/auto-ci.tf
+++ b/share/gitea-tekton-org/auto-ci.tf
@@ -94,7 +94,7 @@ resource "kubectl_manifest" "ci-trigger-push" {
       - name: git-default-branch
         value: "$(extensions.git-default-branch)"
       - name: generate-name
-        value: "$(extensions.project-name.replace('_','-').replace('/','-'))-push-$(extensions.branch-name.replace('_','-').replace('/','-'))"
+        value: "$(extensions.generate-name)"
       template:
         spec:
           params:
@@ -198,7 +198,7 @@ resource "kubectl_manifest" "ci-trigger-tag" {
       - name: tag-name
         value: $(extensions.tag-name)
       - name: generate-name
-        value: "$(extensions.project-name.replace('_','-').replace('/','-'))-tag-$(extensions.tag-name.replace('_','-').replace('/','-'))"
+        value: "$(extensions.generate-name)"
       template:
         spec:
           params:
diff --git a/share/gitea-tekton-org/listener.tf b/share/gitea-tekton-org/listener.tf
index d008c9d..369f5d5 100644
--- a/share/gitea-tekton-org/listener.tf
+++ b/share/gitea-tekton-org/listener.tf
@@ -34,6 +34,8 @@ resource "kubectl_manifest" "el" {
               value:
               - key: deploy-url
                 expression: "body.repository.ssh_url.replace([body.repository.name,'.git'].join(), 'deploy.git')"
+              - key: generate-name
+                expression: "'add-'+body.repository.name.replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -73,6 +75,8 @@ resource "kubectl_manifest" "el" {
                 expression: "body.repository.ssh_url"
               - key: git-default-branch
                 expression: "body.repository.default_branch"
+              - key: generate-name
+                expression: "'delete-'+body.repository.name.replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -109,6 +113,8 @@ resource "kubectl_manifest" "el" {
                 expression: "body.release.html_url"
               - key: tag-name
                 expression: "body.release.tag_name"
+              - key: generate-name
+                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-publish-'+body.release.tag_name.replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -145,6 +151,8 @@ resource "kubectl_manifest" "el" {
                 expression: "body.release.html_url"
               - key: tag-name
                 expression: "body.release.tag_name"
+              - key: generate-name
+                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-update-'+body.release.tag_name.replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -181,6 +189,8 @@ resource "kubectl_manifest" "el" {
                 expression: "body.release.html_url"
               - key: tag-name
                 expression: "body.release.tag_name"
+              - key: generate-name
+                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-delete-'+body.release.tag_name.replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -253,6 +263,8 @@ resource "kubectl_manifest" "el" {
                 expression: "body.repository.ssh_url"
               - key: tag-name
                 expression: "body.ref"
+              - key: generate-name
+                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-tag-new-'+body.ref.replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -284,6 +296,8 @@ resource "kubectl_manifest" "el" {
                 expression: "body.repository.ssh_url"
               - key: tag-name
                 expression: "body.ref"
+              - key: generate-name
+                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-tag-delete-'+body.ref.replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -318,6 +332,8 @@ resource "kubectl_manifest" "el" {
                 expression: "body.repository.default_branch"
               - key: branch-name
                 expression: "body.ref"
+              - key: generate-name
+                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-branch-new-'+body.ref.replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -354,6 +370,8 @@ resource "kubectl_manifest" "el" {
                 expression: "body.head_commit.id"
               - key: branch-name
                 expression: "body.ref.split('/')[2]"
+              - key: generate-name
+                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-push-'+body.ref.split('/')[2].replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels:
@@ -395,6 +413,8 @@ resource "kubectl_manifest" "el" {
                 expression: "body.head_commit.id"
               - key: tag-name
                 expression: "body.ref.split('/')[2]"
+              - key: generate-name
+                expression: "body.repository.name.replace('_','-').replace('/','-').lowerAscii()+'-tag-'+body.ref.split('/')[2].replace('_','-').replace('/','-').lowerAscii()"
         triggerSelector:
           labelSelector:
             matchLabels: