Skip to content

Commit

Permalink
Fix certificate generating for mock hosts
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmitriy Lukiyanchuk committed Mar 6, 2024
1 parent f33f5ef commit 0af0805
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 269 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.bash_history
/tests
261 changes: 0 additions & 261 deletions dev/example/test/wiremock/.bash_history

This file was deleted.

2 changes: 2 additions & 0 deletions etc/nginx/http.d/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ log_format not_mocked
'warn: domain "$host" is not mocked'
' - [$time_local] $remote_addr "$http_user_agent" "$request" ';

server_names_hash_bucket_size 128;

server {
listen 80 default_server;
listen [::]:80 default_server;
Expand Down
4 changes: 2 additions & 2 deletions pkg/generators/certificates/domains.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var domains = []string{

var commonDomains = []string{
"localhost", "mock",
"grpc-wiremock", "*.local.sbermarket.tech",
"grpc-wiremock",
}

func (g *certsGen) collectDomains(commonDomains, domains []string) ([]string, error) {
Expand All @@ -41,7 +41,7 @@ func (g *certsGen) collectDomains(commonDomains, domains []string) ([]string, er

for _, domain := range targetDomains {
for _, ext := range domains {
certDomains = append(certDomains, fmt.Sprintf("%s.%s", domain, ext))
certDomains = append(certDomains, domain, fmt.Sprintf("%s.%s", domain, ext))
}
}

Expand Down
5 changes: 3 additions & 2 deletions scripts/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ sudo chown -R \
LOG="/var/log/wiremock"

## remove 'imklog' because no need to monitor kernel events.
if [ ! -f "/var/run/rsyslogd.pid" ]; then
sudo sed -i '/imklog/s/^/#/' /etc/rsyslog.conf && sudo rsyslogd

if [ "$(ps | grep '[r]syslogd')" == "" ]; then
sudo sed -i '/^module.*imklog/s/^/#/' /etc/rsyslog.conf && sudo rsyslogd
fi
sudo touch "${LOG}" && tail -f ${LOG} &

Expand Down
2 changes: 1 addition & 1 deletion scripts/mocks/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ if ! mockgen first-run \
--domains-path="${DOMAINS_PATH}" \
--wiremock-path="${GW_WIREMOCK_PATH}"; then

echo "Mocks autogen exited with an error. Skip"
echo "Mocks autogen failed. Skip"
fi
9 changes: 6 additions & 3 deletions scripts/routing/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
set -euo pipefail

if ! certgen | logger -t "${ROUTING_CERTS_GEN_HEADER}"; then
echo "Certificates generator exited with an error. Skip"
echo "Certificate initial generating failed. Skip"
fi

[ ! -f /var/run/nginx/nginx.pid ] && sudo nginx
[ "$(ps | grep '[n]ginx')" == "" ] && sudo nginx

if ! confgen | logger -t "${ROUTING_NGINX_GEN_HEADER}"; then
echo "Nginx configs generator exited with an error. Skip"
echo "Nginx configs generator failed. Skip"
fi

if ! certgen | logger -t "${ROUTING_CERTS_GEN_HEADER}"; then
echo "Certificate generating for mock hosts failed. Skip"
fi

0 comments on commit 0af0805

Please sign in to comment.