diff options
author | Niranjana <niranjana.y60@wipro.com> | 2021-02-24 14:19:20 +0000 |
---|---|---|
committer | Niranjana Y <niranjana.y60@wipro.com> | 2021-04-16 06:56:29 +0000 |
commit | 4f438a4c4c753e3cd49e4dbaa68ee7f72628b548 (patch) | |
tree | 092cf0499bcf10a6410aa2305bc8deef6f867713 /components/datalake-handler/feeder/src/assembly/init_db/scripts | |
parent | 835ad818323544acb8b030a4f274de14496d7b02 (diff) |
Use non-root user to access datalake-feeder database and
update the base image to align with ONAP
Issue-ID: DCAEGEN2-2329
Issue-ID: DCAEGEN2-2420
Signed-off-by: Niranjana <niranjana.y60@wipro.com>
Change-Id: I26da297dcc4563a25d3cd6f558cc92627b17647b
Diffstat (limited to 'components/datalake-handler/feeder/src/assembly/init_db/scripts')
4 files changed, 6 insertions, 77 deletions
diff --git a/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/10_check-db-exist b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/10_check-db-exist deleted file mode 100644 index 4b2130a3..00000000 --- a/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/10_check-db-exist +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START========================================== -# =================================================================== -# Copyright © 2020 QCT Property. All rights reserved. -# =================================================================== -# 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. -# ============LICENSE_END============================================ -# - -result=`mysql -uroot -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT -e "USE 'datalake'"` - -if [ $? == 0 ] ; -then - echo "DATABASE ALREADY EXISTS" - touch /tmp/db_exist - exit 1 -else - echo "DATABASE DOES NOT EXIST" - exit 0 -fi diff --git a/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/11_create-database b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/11_create-database index a43b0cf2..f69f1ab1 100644 --- a/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/11_create-database +++ b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/11_create-database @@ -2,7 +2,8 @@ # # ============LICENSE_START========================================== # =================================================================== -# Copyright © 2020 QCT Property. All rights reserved. +# Copyright © 2020 China Mobile. All rights reserved. +# Copyright (C) 2021 Wipro Limited. # =================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,8 +19,4 @@ # ============LICENSE_END============================================ # -if [ -f "/tmp/db_exist" ]; then - exit 0 -fi - -cat /home/datalake/init_db.sql | mysql -uroot -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT || exit 1 +psql -h $PG_HOST -U $PG_USER -d $PG_DB -f /home/datalake/init_db.sql diff --git a/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/15_db-adduser b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/15_db-adduser deleted file mode 100644 index c691751c..00000000 --- a/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/15_db-adduser +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START========================================== -# =================================================================== -# Copyright © 2020 QCT Property. All rights reserved. -# =================================================================== -# 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. -# ============LICENSE_END============================================ -# - -if [ -f "/tmp/db_exist" ]; then - exit 0 -fi - -echo "Creating datalake user" 1>/tmp/mariadb-datalake-user.log 2>&1 - -mysql -uroot -p$MYSQL_ROOT_PASSWORD -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT << 'EOF' || exit 1 -CREATE USER IF NOT EXISTS 'dl'; -GRANT USAGE ON *.* TO 'dl'@'%' IDENTIFIED BY 'dl1234'; -GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE, SHOW VIEW ON `datalake`.* TO 'dl'@'%'; -FLUSH PRIVILEGES; -EOF - -echo "Created so user . . ." 1>>/tmp/mariadb-datalake-user.log 2>&1 diff --git a/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/20_db-initdb b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/20_db-initdb index ad8f6f89..32986cda 100644 --- a/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/20_db-initdb +++ b/components/datalake-handler/feeder/src/assembly/init_db/scripts/db_init/20_db-initdb @@ -2,7 +2,8 @@ # # ============LICENSE_START========================================== # =================================================================== -# Copyright © 2020 QCT Property. All rights reserved. +# Copyright © 2020 China Mobile. All rights reserved. +# Copyright (C) 2021 Wipro Limited. # =================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,8 +19,4 @@ # ============LICENSE_END============================================ # -if [ -f "/tmp/db_exist" ]; then - exit 0 -fi - -cat /home/datalake/init_db_data.sql | mysql -uroot -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT || exit 1 +psql -h $PG_HOST -U $PG_USER -d $PG_DB -f /home/datalake/init_db_data.sql |