From 63aef44af9a4e6bf56eff2edd9f849f7ef88b5b0 Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Fri, 6 May 2022 15:40:09 +0200 Subject: [PATCH] Add Studio URL whitelist entry Properly compute the environment variable name for arrays. --- .../cmcc/cmccoperator/components/corba/CAEComponent.java | 3 ++- .../cmcc/cmccoperator/utils/SpringProperties.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/tsystemsmms/cmcc/cmccoperator/components/corba/CAEComponent.java b/src/main/java/com/tsystemsmms/cmcc/cmccoperator/components/corba/CAEComponent.java index f7be694..818b138 100644 --- a/src/main/java/com/tsystemsmms/cmcc/cmccoperator/components/corba/CAEComponent.java +++ b/src/main/java/com/tsystemsmms/cmcc/cmccoperator/components/corba/CAEComponent.java @@ -121,7 +121,8 @@ public Map getSpringBootProperties() { "server.tomcat.accesslog.file-date-format", "", "server.tomcat.accesslog.pattern", "[ACCESS] %l %t %D %F %B %S", "server.tomcat.accesslog.rotate", "false", - "com.coremedia.transform.blobCache.basePath", "/coremedia/persistent-cache/transformed-blob" + "com.coremedia.transform.blobCache.basePath", "/coremedia/persistent-cache/transformed-blob", + "cae.preview.pbe.studio-url-whitelist[0]", "https://" + getTargetState().getStudioHostname() )); if (getComponentSpec().getKind().equals(KIND_LIVE)) { diff --git a/src/main/java/com/tsystemsmms/cmcc/cmccoperator/utils/SpringProperties.java b/src/main/java/com/tsystemsmms/cmcc/cmccoperator/utils/SpringProperties.java index 7910d48..6d03af2 100644 --- a/src/main/java/com/tsystemsmms/cmcc/cmccoperator/utils/SpringProperties.java +++ b/src/main/java/com/tsystemsmms/cmcc/cmccoperator/utils/SpringProperties.java @@ -87,7 +87,10 @@ public List toEnvVars() { private EnvVar entryToEnvVar(Map.Entry e) { EnvVar env = new EnvVar(); - env.setName(e.getKey().replaceAll("[^A-Za-z0-9]+", "_").toUpperCase(Locale.ROOT)); + env.setName(e.getKey() + .replaceAll("[^A-Za-z0-9]+", "_") + .replaceAll("_$", "") + .toUpperCase(Locale.ROOT)); env.setValue(e.getValue()); return env; }