diff options
author | Tony Hansen <tony@att.com> | 2021-10-27 19:20:36 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2021-10-27 19:20:36 +0000 |
commit | c6f1b58aae6ecddeb4d2a615e017c625c7e29bfa (patch) | |
tree | 964fc26ae0dfa876d081871f00ce1d33b505e503 /mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java | |
parent | 9e930892d28fc4a3378fad8f942c9f91cffe4698 (diff) | |
parent | f98abd8de6b9457a7edcd3457e664bd9200de2bf (diff) |
Merge "Add cmpv2Certificate flag, removed hyphens from config under postgres and enhanced Readme file"
Diffstat (limited to 'mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java')
-rw-r--r-- | mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java b/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java index 9a9f8f1..82d70c8 100644 --- a/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java +++ b/mod2/helm-generator/helmchartgenerator-core/src/main/java/org/onap/dcaegen2/platform/helmchartgenerator/chartbuilder/ComponentSpecParser.java @@ -243,7 +243,8 @@ public class ComponentSpecParser { Map<String, Object> keystore = new LinkedHashMap<>(); Map<String, Object> passwordsSecretRef = new LinkedHashMap<>(); TlsInfo tlsInfo = cs.getAuxilary().getTlsInfo(); - String componentName = getComponentNameWithOmitFirstWord(cs); + String componentName = getComponentNameWithOmitFirstWordAndTrimHyphens(cs); + outerValues.put("useCmpv2Certificates", false); if(externalTlsExists(tlsInfo)) { String mountPath = tlsInfo.getCertDirectory(); if(tlsInfo.getUseExternalTls() != null && tlsInfo.getUseExternalTls()) { @@ -260,15 +261,16 @@ public class ComponentSpecParser { utils.putIfNotNull(certificate,"dnsNames", List.of(cs.getSelf().getName())); certificate.put("keystore", keystore); outerValues.put("certificates", List.of(certificate)); + outerValues.put("useCmpv2Certificates", true); } } - private String getComponentNameWithOmitFirstWord(ComponentSpec cs) { - return cs.getSelf().getName().substring(cs.getSelf().getName().indexOf("-") + 1); + private String getComponentNameWithOmitFirstWordAndTrimHyphens(ComponentSpec cs) { + return cs.getSelf().getName().substring(cs.getSelf().getName().indexOf("-") + 1).replaceAll("-",""); } private boolean externalTlsExists(TlsInfo tlsInfo) { - return tlsInfo != null && tlsInfo.getUseExternalTls() != null && tlsInfo.getUseExternalTls().equals(true); + return tlsInfo != null && tlsInfo.getUseExternalTls() != null && tlsInfo.getUseExternalTls(); } private void checkCertificateYamlExists(String chartTemplateLocation) { @@ -301,7 +303,7 @@ public class ComponentSpecParser { private void populatePostgresSection(Map<String, Object> outerValues, ComponentSpec cs) { if(cs.getAuxilary().getDatabases() != null) { String componentFullName = cs.getSelf().getName(); - String component = getComponentNameWithOmitFirstWord(cs); + String component = getComponentNameWithOmitFirstWordAndTrimHyphens(cs); Map<String, Object> postgres = new LinkedHashMap<>(); Map<String, Object> service = new LinkedHashMap<>(); Map<String, Object> container = new LinkedHashMap<>(); @@ -332,7 +334,7 @@ public class ComponentSpecParser { private void populateSecretsSection(Map<String, Object> outerValues, ComponentSpec cs) { if(cs.getAuxilary().getDatabases() != null) { - String component = getComponentNameWithOmitFirstWord(cs); + String component = getComponentNameWithOmitFirstWordAndTrimHyphens(cs); List<Object> secrets = new ArrayList<>(); Map<String, Object> secret = new LinkedHashMap<>(); secret.put("uid", "pg-user-creds"); |