Skip to content

feat(gms): support basic auth header when connecting to elasticSearch #2701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shirshanka merged 2 commits into from
Jun 16, 2021
Merged

feat(gms): support basic auth header when connecting to elasticSearch #2701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61becb7
feat(gms): support basic auth header when connecting to elasticSearch
Jun 15, 2021
f023195
Merge branch 'linkedin:master' into master
JeffSkinner Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion docker/datahub-gms/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,16 @@ fi
if [[ -z $ELASTICSEARCH_USERNAME ]]; then
ELASTICSEARCH_HOST_URL=$ELASTICSEARCH_HOST
else
if [[ -z $ELASTICSEARCH_AUTH_HEADER ]]; then
ELASTICSEARCH_HOST_URL=$ELASTICSEARCH_USERNAME:$ELASTICSEARCH_PASSWORD@$ELASTICSEARCH_HOST
else
ELASTICSEARCH_HOST_URL=$ELASTICSEARCH_HOST
fi
fi

# Add default header if needed
if [[ -z $ELASTICSEARCH_AUTH_HEADER ]]; then
ELASTICSEARCH_AUTH_HEADER="Accept: */*"
fi

if [[ $ELASTICSEARCH_USE_SSL == true ]]; then
Expand All @@ -20,7 +29,7 @@ fi
dockerize \
-wait tcp://$EBEAN_DATASOURCE_HOST \
-wait tcp://$(echo $KAFKA_BOOTSTRAP_SERVER | sed 's/,/ -wait tcp:\/\//g') \
-wait $ELASTICSEARCH_PROTOCOL://$ELASTICSEARCH_HOST_URL:$ELASTICSEARCH_PORT \
-wait $ELASTICSEARCH_PROTOCOL://$ELASTICSEARCH_HOST_URL:$ELASTICSEARCH_PORT -wait-http-header "$ELASTICSEARCH_AUTH_HEADER" \
Copy link
Contributor

@dexter-mh-lee dexter-mh-lee Jun 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this okay when ELASTICSEARCH_AUTH_HEADER is empty?

Copy link
Contributor Author

@JeffSkinner JeffSkinner Jun 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ELASTICSEARCH_AUTH_HEADER is set as "Accept: /" if it is empty

-wait $NEO4J_HOST \
-timeout 240s \
java $JAVA_OPTS $JMX_OPTS \
Expand Down
11 changes: 10 additions & 1 deletion docker/datahub-mae-consumer/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,16 @@ fi
if [[ -z $ELASTICSEARCH_USERNAME ]]; then
ELASTICSEARCH_HOST_URL=$ELASTICSEARCH_HOST
else
if [[ -z $ELASTICSEARCH_AUTH_HEADER ]]; then
ELASTICSEARCH_HOST_URL=$ELASTICSEARCH_USERNAME:$ELASTICSEARCH_PASSWORD@$ELASTICSEARCH_HOST
else
ELASTICSEARCH_HOST_URL=$ELASTICSEARCH_HOST
fi
fi

# Add default header if needed
if [[ -z $ELASTICSEARCH_AUTH_HEADER ]]; then
ELASTICSEARCH_AUTH_HEADER="Accept: */*"
fi

if [[ $ELASTICSEARCH_USE_SSL == true ]]; then
Expand All @@ -19,7 +28,7 @@ fi

dockerize \
-wait tcp://$(echo $KAFKA_BOOTSTRAP_SERVER | sed 's/,/ -wait tcp:\/\//g') \
-wait $ELASTICSEARCH_PROTOCOL://$ELASTICSEARCH_HOST_URL:$ELASTICSEARCH_PORT \
-wait $ELASTICSEARCH_PROTOCOL://$ELASTICSEARCH_HOST_URL:$ELASTICSEARCH_PORT -wait-http-header "$ELASTICSEARCH_AUTH_HEADER" \
-wait $NEO4J_HOST \
-timeout 240s \
java $JAVA_OPTS $JMX_OPTS -jar /datahub/datahub-mae-consumer/bin/mae-consumer-job.jar