Skip to content

Fix Auto DevOps check domain is blank

Dylan Griffith requested to merge 57798-fix-auto-devops-empty-str-check into master

What does this MR do?

It appears the old logic was setting the KUBE_INGRESS_DOMAIN to be an empty string when it was previously unset and as such the next check to see if it was set was resulting in us assuming it had been set.

# BEFORE

$ unset KUBE_INGRESS_BASE_DOMAIN

$ unset AUTO_DEVOPS_DOMAIN

$ if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ]; then
>   export KUBE_INGRESS_BASE_DOMAIN=$AUTO_DEVOPS_DOMAIN
> fi

$ echo ${KUBE_INGRESS_BASE_DOMAIN+x}
x

# AFTER

$ unset KUBE_INGRESS_BASE_DOMAIN

$ unset AUTO_DEVOPS_DOMAIN

$ if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ] && [ -n "$AUTO_DEVOPS_DOMAIN" ] ; then
>   export KUBE_INGRESS_BASE_DOMAIN=$AUTO_DEVOPS_DOMAIN
> fi

$ echo ${KUBE_INGRESS_BASE_DOMAIN+x}

This is another good case for https://gitlab.com/gitlab-org/gitlab-ce/issues/55165 so we can actually unit test this stuff.

What are the relevant issue numbers?

Does this MR meet the acceptance criteria?

Closes #57798 (closed)

Edited by 🤖 GitLab Bot 🤖

Merge request reports