From 62c8126b0a41674d015521f8d48bc5c0a2d21848 Mon Sep 17 00:00:00 2001
From: Giovanni Toraldo <71768+gionn@users.noreply.github.com>
Date: Wed, 17 Jan 2024 09:25:54 +0100
Subject: [PATCH] OPSEXP-2291 Bump alfresco-search to 3.0.0-alpha.0 (#1071)

---
 helm/alfresco-content-services/Chart.lock     |  6 ++---
 helm/alfresco-content-services/Chart.yaml     |  2 +-
 helm/alfresco-content-services/README.md      |  2 +-
 .../templates/_helpers-search.tpl             | 24 -------------------
 .../templates/config-infrastructure.yaml      |  3 +--
 .../templates/secret-search.yaml              |  2 --
 .../tests/config-infra_test.yaml              |  4 ++--
 .../tests/search_test.yaml                    |  4 ++--
 8 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock
index 8dd97d73c..5e42306c4 100644
--- a/helm/alfresco-content-services/Chart.lock
+++ b/helm/alfresco-content-services/Chart.lock
@@ -25,7 +25,7 @@ dependencies:
   version: 1.0.0-alpha.2
 - name: alfresco-search-service
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 2.0.0
+  version: 3.0.0-alpha.0
 - name: alfresco-sync-service
   repository: https://alfresco.github.io/alfresco-helm-charts/
   version: 5.0.0-alpha.2
@@ -47,5 +47,5 @@ dependencies:
 - name: elasticsearch
   repository: https://helm.elastic.co
   version: 7.17.3
-digest: sha256:72c9b1031796f50ab28e14b2b23440a79b6e8ec644ecf91e95cec151e14deac4
-generated: "2024-01-12T16:02:06.93509+01:00"
+digest: sha256:add0aeea25d25f49d0ceed4a037aa34d1a8797cb6033841a2323380650032e6b
+generated: "2024-01-12T16:58:53.556503+01:00"
diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml
index 157ec090b..d1696a240 100644
--- a/helm/alfresco-content-services/Chart.yaml
+++ b/helm/alfresco-content-services/Chart.yaml
@@ -54,7 +54,7 @@ dependencies:
   - name: alfresco-search-service
     alias: alfresco-search
     repository: https://alfresco.github.io/alfresco-helm-charts/
-    version: 2.0.0
+    version: 3.0.0-alpha.0
     condition: alfresco-search.enabled
   - name: alfresco-sync-service
     repository: https://alfresco.github.io/alfresco-helm-charts/
diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
index 1de1e5cd8..26e82bbd9 100644
--- a/helm/alfresco-content-services/README.md
+++ b/helm/alfresco-content-services/README.md
@@ -25,7 +25,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.2.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.1.2 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 3.1.0-alpha.1 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 2.0.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 3.0.0-alpha.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 0.3.0 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 5.0.0-alpha.2 |
 | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 1.0.0-alpha.2 |
diff --git a/helm/alfresco-content-services/templates/_helpers-search.tpl b/helm/alfresco-content-services/templates/_helpers-search.tpl
index 17025ede5..98f915164 100644
--- a/helm/alfresco-content-services/templates/_helpers-search.tpl
+++ b/helm/alfresco-content-services/templates/_helpers-search.tpl
@@ -1,27 +1,3 @@
-{{/*
-Compute the search URL
-
-Usage: include "alfresco-content-services.search.url" $
-
-*/}}
-{{- define "alfresco-content-services.search.url" -}}
-{{- with .Values }}
-  {{- if .global.search.url }}
-    {{- .global.search.url }}
-  {{- else if and (index . "alfresco-search-enterprise" "enabled")  (index . "alfresco-search-enterprise" "elasticsearch" "enabled") }}
-    {{- with (index . "alfresco-search-enterprise") }}
-      {{/* DRY needs a named template in subchart */}}
-      {{- printf "%s://%s-%s:%s" .elasticsearch.protocol .elasticsearch.clusterName .elasticsearch.nodeGroup .elasticsearch.httpPort }}
-    {{- end }}
-  {{- else if (index . "alfresco-search" "enabled") }}
-      {{/* DEPRECATE use chart.fullname with built ctx instead */}}
-    {{- template "alfresco-search-service.fullname" . }}-solr
-  {{- else }}
-    {{- fail "You must either set search.url, alfresco-search-enterprise.enabled or alfresco-search.enabled" }}
-  {{- end }}
-{{- end }}
-{{- end -}}
-
 {{/*
 Compute the search "flavor"
 
diff --git a/helm/alfresco-content-services/templates/config-infrastructure.yaml b/helm/alfresco-content-services/templates/config-infrastructure.yaml
index a73908aa6..44f3af2d9 100644
--- a/helm/alfresco-content-services/templates/config-infrastructure.yaml
+++ b/helm/alfresco-content-services/templates/config-infrastructure.yaml
@@ -26,8 +26,7 @@ data:
     {{- if .Values.global.search.url }}
       {{- $search_url = .Values.global.search.url }}
     {{- else if eq "solr6" $search_flavor }}
-      {{- $searchCtx := dict "Values" (index .Values "alfresco-search") "Chart" .Chart "Release" .Release }}
-      {{- $search_url = printf "http://%s-solr/solr" (include "alfresco-search-service.fullname" $searchCtx) }}
+      {{- $search_url = printf "http://%s/solr" (include "alfresco-search-service.deployment.name" .) }}
     {{- else if eq "elasticsearch" $search_flavor }}
       {{- with .Values.elasticsearch }}
       {{- if .enabled }}
diff --git a/helm/alfresco-content-services/templates/secret-search.yaml b/helm/alfresco-content-services/templates/secret-search.yaml
index 7fb6cd699..66df3843f 100644
--- a/helm/alfresco-content-services/templates/secret-search.yaml
+++ b/helm/alfresco-content-services/templates/secret-search.yaml
@@ -9,9 +9,7 @@ metadata:
     {{- include "alfresco-content-services.labels" $ | nindent 4 }}
 type: Opaque
 data:
-{{- if eq "secret" .securecomms }}
   SOLR_SECRET: {{ .sharedSecret | default "" | b64enc | quote }}
-{{- end }}
 {{- if eq "elasticsearch" (include "alfresco-content-services.search.flavor" $) }}
   SEARCH_USERNAME: {{ .username | default "" | b64enc | quote }}
   SEARCH_PASSWORD: {{ .password | default "" | b64enc | quote }}
diff --git a/helm/alfresco-content-services/tests/config-infra_test.yaml b/helm/alfresco-content-services/tests/config-infra_test.yaml
index 4417b17dc..be536d7ee 100644
--- a/helm/alfresco-content-services/tests/config-infra_test.yaml
+++ b/helm/alfresco-content-services/tests/config-infra_test.yaml
@@ -46,13 +46,13 @@ tests:
           value: secret
       - equal:
           path: data.SEARCH_HOST
-          value: RELEASE-NAME-alfresco-search-solr
+          value: RELEASE-NAME-solr
       - equal:
           path: data.SEARCH_PORT
           value: "80"
       - equal:
           path: data.SEARCH_URL
-          value: http://RELEASE-NAME-alfresco-search-solr/solr
+          value: http://RELEASE-NAME-solr/solr
       - equal:
           path: data.SOLR_BASE_URL
           value: /solr
diff --git a/helm/alfresco-content-services/tests/search_test.yaml b/helm/alfresco-content-services/tests/search_test.yaml
index 272309bfd..98a2d3ff8 100644
--- a/helm/alfresco-content-services/tests/search_test.yaml
+++ b/helm/alfresco-content-services/tests/search_test.yaml
@@ -18,10 +18,10 @@ tests:
           value: secret
       - equal:
           path: data.SEARCH_URL
-          value: http://RELEASE-NAME-alfresco-search-solr/solr
+          value: http://RELEASE-NAME-solr/solr
       - equal:
           path: data.SEARCH_HOST
-          value: RELEASE-NAME-alfresco-search-solr
+          value: RELEASE-NAME-solr
       - equal:
           path: data.SEARCH_PORT
           value: "80"