From 9204fcd2732eeda9ea4d25f65996bacf85e059d2 Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Mon, 7 Dec 2020 09:50:07 +0100 Subject: Remove code on master branch As code has been moved to main repo, we remove the code here and add a README explaining Issue-ID: OOM-2513 Signed-off-by: Sylvain Desbureaux Change-Id: Id2b728722a91b71240394110bf5815d9394f6d07 --- .../resources/config/analysis-config.json | 32 ---- .../resources/config/auth/search_policy.json | 18 -- .../resources/config/auth/tomcat_keystore | Bin 3844 -> 0 bytes .../resources/config/dynamic-custom-template.json | 12 -- .../resources/config/elastic-search.properties | 25 --- .../resources/config/es-payload-translation.json | 17 -- .../resources/config/filter-config.json | 7 - .../resources/config/log/logback.xml | 193 --------------------- .../resources/fproxy/config/fproxy.properties | 2 - .../resources/fproxy/config/logback-spring.xml | 48 ----- .../resources/fproxy/config/readme.txt | 1 - .../rproxy/config/auth/uri-authorization.json | 11 -- .../resources/rproxy/config/cadi.properties | 39 ----- .../rproxy/config/forward-proxy.properties | 4 - .../resources/rproxy/config/logback-spring.xml | 48 ----- .../rproxy/config/primary-service.properties | 3 - .../resources/rproxy/config/readme.txt | 1 - .../rproxy/config/reverse-proxy.properties | 1 - 18 files changed, 462 deletions(-) delete mode 100644 components/aai-search-data/resources/config/analysis-config.json delete mode 100644 components/aai-search-data/resources/config/auth/search_policy.json delete mode 100644 components/aai-search-data/resources/config/auth/tomcat_keystore delete mode 100644 components/aai-search-data/resources/config/dynamic-custom-template.json delete mode 100644 components/aai-search-data/resources/config/elastic-search.properties delete mode 100644 components/aai-search-data/resources/config/es-payload-translation.json delete mode 100644 components/aai-search-data/resources/config/filter-config.json delete mode 100644 components/aai-search-data/resources/config/log/logback.xml delete mode 100644 components/aai-search-data/resources/fproxy/config/fproxy.properties delete mode 100644 components/aai-search-data/resources/fproxy/config/logback-spring.xml delete mode 100644 components/aai-search-data/resources/fproxy/config/readme.txt delete mode 100644 components/aai-search-data/resources/rproxy/config/auth/uri-authorization.json delete mode 100644 components/aai-search-data/resources/rproxy/config/cadi.properties delete mode 100644 components/aai-search-data/resources/rproxy/config/forward-proxy.properties delete mode 100644 components/aai-search-data/resources/rproxy/config/logback-spring.xml delete mode 100644 components/aai-search-data/resources/rproxy/config/primary-service.properties delete mode 100644 components/aai-search-data/resources/rproxy/config/readme.txt delete mode 100644 components/aai-search-data/resources/rproxy/config/reverse-proxy.properties (limited to 'components/aai-search-data/resources') diff --git a/components/aai-search-data/resources/config/analysis-config.json b/components/aai-search-data/resources/config/analysis-config.json deleted file mode 100644 index 5fc135d..0000000 --- a/components/aai-search-data/resources/config/analysis-config.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "name": "whitespace_analyzer", - "description": "A standard whitespace analyzer.", - "behaviours": [ - "Tokenize the text using white space characters as delimeters.", - "Convert all characters to lower case.", - "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents." - ], - "tokenizer": "whitespace", - "filters": [ - "lowercase", - "asciifolding" - ] - }, - { - "name": "ngram_analyzer", - "description": "An analyzer which performs ngram filtering on the data stream.", - "behaviours": [ - "Tokenize the text using white space characters as delimeters.", - "Convert all characters to lower case.", - "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents.", - "Apply ngram filtering using the following values for minimum and maximum size in codepoints of a single n-gram: minimum = 1, maximum = 2." - ], - "tokenizer": "whitespace", - "filters": [ - "lowercase", - "asciifolding", - "ngram_filter" - ] - } -] \ No newline at end of file diff --git a/components/aai-search-data/resources/config/auth/search_policy.json b/components/aai-search-data/resources/config/auth/search_policy.json deleted file mode 100644 index bbbe52f..0000000 --- a/components/aai-search-data/resources/config/auth/search_policy.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "roles": [ - { - "name": "admin", - "functions": [ - { - "name": "search", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ] - } - ], - - "users": [ - { - "username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA" - } - ] - } - ] -} diff --git a/components/aai-search-data/resources/config/auth/tomcat_keystore b/components/aai-search-data/resources/config/auth/tomcat_keystore deleted file mode 100644 index e280b31..0000000 Binary files a/components/aai-search-data/resources/config/auth/tomcat_keystore and /dev/null differ diff --git a/components/aai-search-data/resources/config/dynamic-custom-template.json b/components/aai-search-data/resources/config/dynamic-custom-template.json deleted file mode 100644 index 2dac8f7..0000000 --- a/components/aai-search-data/resources/config/dynamic-custom-template.json +++ /dev/null @@ -1,12 +0,0 @@ -"dynamic_templates":[ - { - "strings":{ - "match_mapping_type":"string", - "match": "*", - "mapping":{ - "type":"text", - "fielddata":true - } - } - } -], diff --git a/components/aai-search-data/resources/config/elastic-search.properties b/components/aai-search-data/resources/config/elastic-search.properties deleted file mode 100644 index 65de20d..0000000 --- a/components/aai-search-data/resources/config/elastic-search.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# ElasticSearch Configuration - -es.cluster-name=ES_AAI -es.ip-address=aai-elasticsearch.{{.Release.Namespace}} -es.http-port={{ .Values.config.elasticsearchHttpPort }} -es.uri-scheme=http -es.auth-user=admin -es.auth-password=OBF:1u2a1toa1w8v1tok1u30 -es.trust-store=auth/tomcat_keystore -es.trust-store-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - diff --git a/components/aai-search-data/resources/config/es-payload-translation.json b/components/aai-search-data/resources/config/es-payload-translation.json deleted file mode 100644 index 8a29863..0000000 --- a/components/aai-search-data/resources/config/es-payload-translation.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "attr-translations": [ - { - "query": "$..[?(@.type=='string' && @.index=='analyzed')]", - "update": {"type": "text", "index": true, "fielddata": true} - }, - { - "query": "$..[?(@.type=='string' && @.index=='not_analyzed')]", - "update": {"type": "keyword", "index": true} - }, - { - "query": "$..[?(@.type=='string' && !@.index)]", - "update": {"type": "text", "fielddata": true} - } - ] -} - diff --git a/components/aai-search-data/resources/config/filter-config.json b/components/aai-search-data/resources/config/filter-config.json deleted file mode 100644 index a27f75b..0000000 --- a/components/aai-search-data/resources/config/filter-config.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "name": "ngram_filter", - "description": "Custom NGram Filter.", - "configuration": " \"type\": \"nGram\", \"min_gram\": 1, \"max_gram\": 50, \"token_chars\": [ \"letter\", \"digit\", \"punctuation\", \"symbol\" ]" - } -] \ No newline at end of file diff --git a/components/aai-search-data/resources/config/log/logback.xml b/components/aai-search-data/resources/config/log/logback.xml deleted file mode 100644 index adfed4a..0000000 --- a/components/aai-search-data/resources/config/log/logback.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ${errorLogPattern} - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${errorLogPattern} - - - - - - INFO - - 256 - - - - - - - - ${logDirectory}/${auditLogName}.log - - ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${auditMetricPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - - ${auditMetricPattern} - - - - - - 256 - - - - - ${logDirectory}/${debugLogName}.log - - ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${errorLogPattern} - - - - - 256 - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/aai-search-data/resources/fproxy/config/fproxy.properties b/components/aai-search-data/resources/fproxy/config/fproxy.properties deleted file mode 100644 index f512fb7..0000000 --- a/components/aai-search-data/resources/fproxy/config/fproxy.properties +++ /dev/null @@ -1,2 +0,0 @@ -credential.cache.timeout.ms=180000 -transactionid.header.name=X-TransactionId \ No newline at end of file diff --git a/components/aai-search-data/resources/fproxy/config/logback-spring.xml b/components/aai-search-data/resources/fproxy/config/logback-spring.xml deleted file mode 100644 index edac199..0000000 --- a/components/aai-search-data/resources/fproxy/config/logback-spring.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable - - - - - - ${LOGS}/${FILEPREFIX}.log - - %d %p %C{1.} [%t] %m%n - - - - - ${LOGS}/archived/${FILEPREFIX}-%d{yyyy-MM-dd}.%i.log - - - 10MB - - - - - - - - - - - - - - - - - diff --git a/components/aai-search-data/resources/fproxy/config/readme.txt b/components/aai-search-data/resources/fproxy/config/readme.txt deleted file mode 100644 index 79cf29e..0000000 --- a/components/aai-search-data/resources/fproxy/config/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Relevant configuration files need to be copied here to successfully run this service locally. \ No newline at end of file diff --git a/components/aai-search-data/resources/rproxy/config/auth/uri-authorization.json b/components/aai-search-data/resources/rproxy/config/auth/uri-authorization.json deleted file mode 100644 index 595d484..0000000 --- a/components/aai-search-data/resources/rproxy/config/auth/uri-authorization.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "uri": "\/services\/search-data-service\/.*", - "method": "GET|PUT|POST|DELETE", - "permissions": [ - "org\\.onap\\.aai\\.resources\\|\\*\\|.*" - ] - } - - -] diff --git a/components/aai-search-data/resources/rproxy/config/cadi.properties b/components/aai-search-data/resources/rproxy/config/cadi.properties deleted file mode 100644 index 4980071..0000000 --- a/components/aai-search-data/resources/rproxy/config/cadi.properties +++ /dev/null @@ -1,39 +0,0 @@ -# This is a normal Java Properties File -# Comments are with Pound Signs at beginning of lines, -# and multi-line expression of properties can be obtained by backslash at end of line - -#hostname is used for local testing where you may have to set your hostname to **.att.com or **.sbc.com. The example given below -#will allow for an ATT cross domain cookie to be used for GLO. If you are running on Windows corp machine, your machine name -#may be used automatically by cadi. However, if it is not, you will need to use hostname=mywebserver.att.com and add mywebserver.att.com -#to your hosts file on your machine. -#hostname=test.aic.cip.att.com - -cadi_loglevel=DEBUG - -# OAuth2 -aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token -aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect - -cadi_latitude=37.78187 -cadi_longitude=-122.26147 - -# Locate URL (which AAF Env) -aaf_locate_url=https://aaf-locate.{{.Release.Namespace}}:8095 - -# AAF URL -aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1 - -cadi_keyfile=/opt/app/rproxy/config/security/keyfile -cadi_keystore=/opt/app/rproxy/config/auth/org.onap.aai.p12 -cadi_keystore_password=enc:383RDJRFA6yQz9AOxUxC1iIg3xTJXityw05MswnpnEtelRQy2D4r5INQjrea7GTV -cadi_alias=aai@aai.onap.org -cadi_truststore=/opt/app/rproxy/config/auth/tomcat_keystore -cadi_truststore_password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - -aaf_env=DEV - -aaf_id=demo@people.osaaf.org -aaf_password=enc:92w4px0y_rrm265LXLpw58QnNPgDXykyA1YTrflbAKz - -# This is a colon separated list of client cert issuers -cadi_x509_issuers=CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA diff --git a/components/aai-search-data/resources/rproxy/config/forward-proxy.properties b/components/aai-search-data/resources/rproxy/config/forward-proxy.properties deleted file mode 100644 index 55a9b48..0000000 --- a/components/aai-search-data/resources/rproxy/config/forward-proxy.properties +++ /dev/null @@ -1,4 +0,0 @@ -forward-proxy.protocol = https -forward-proxy.host = localhost -forward-proxy.port = 10680 -forward-proxy.cacheurl = /credential-cache diff --git a/components/aai-search-data/resources/rproxy/config/logback-spring.xml b/components/aai-search-data/resources/rproxy/config/logback-spring.xml deleted file mode 100644 index 289fe75..0000000 --- a/components/aai-search-data/resources/rproxy/config/logback-spring.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable - - - - - - ${LOGS}/${FILEPREFIX}.log - - %d %p %C{1.} [%t] %m%n - - - - - ${LOGS}/archived/${FILEPREFIX}-%d{yyyy-MM-dd}.%i.log - - - 10MB - - - - - - - - - - - - - - - - - diff --git a/components/aai-search-data/resources/rproxy/config/primary-service.properties b/components/aai-search-data/resources/rproxy/config/primary-service.properties deleted file mode 100644 index 5fddcb2..0000000 --- a/components/aai-search-data/resources/rproxy/config/primary-service.properties +++ /dev/null @@ -1,3 +0,0 @@ -primary-service.protocol = https -primary-service.host = localhost -primary-service.port = 9509 diff --git a/components/aai-search-data/resources/rproxy/config/readme.txt b/components/aai-search-data/resources/rproxy/config/readme.txt deleted file mode 100644 index 79cf29e..0000000 --- a/components/aai-search-data/resources/rproxy/config/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Relevant configuration files need to be copied here to successfully run this service locally. \ No newline at end of file diff --git a/components/aai-search-data/resources/rproxy/config/reverse-proxy.properties b/components/aai-search-data/resources/rproxy/config/reverse-proxy.properties deleted file mode 100644 index 8d46e1f..0000000 --- a/components/aai-search-data/resources/rproxy/config/reverse-proxy.properties +++ /dev/null @@ -1 +0,0 @@ -transactionid.header.name=X-TransactionId \ No newline at end of file -- cgit 1.2.3-korg