diff --git a/share/organisation/postconfig.tf b/share/organisation/postconfig.tf index 9fc903b..48a751a 100644 --- a/share/organisation/postconfig.tf +++ b/share/organisation/postconfig.tf @@ -34,15 +34,13 @@ resource "kubectl_manifest" "post_install_job_taiga" { args: - >- API='http://taiga-taiga.${var.namespace}.svc/api/v1'; - JSON="-sH 'Content-Type: application/json'"; - TOKEN=$(curl -X POST $JSON -d '{ "type": "normal", "username": "admin", "password": "'"$DJANGO_SUPERUSER_PASSWORD"'" }' "$API/auth" | jq -r '.auth_token'); - BEAR="-H 'Authorization: Bearer $TOKEN'"; - if ! curl $JSON $BEAR "$API/projects"|jq -r '.[].name' |grep -E '^${trimprefix(var.instance,"org-")}$'; then - curl -X POST $JSON $BEAR "http://taiga-taiga.${var.namespace}.svc/api/v1/projects" -d '{ "creation_template": 1, "description": "Organisation ${trimprefix(var.instance,"org-")} project", "is_backlog_activated": true, "is_issues_activated": true, "is_kanban_activated": true, "is_private": true, "is_wiki_activated": true, "name": "${trimprefix(var.instance,"org-")}", }'; + TOKEN=$(curl -X POST -sH "Content-Type: application/json" -d '{ "type": "normal", "username": "admin", "password": "'"$DJANGO_SUPERUSER_PASSWORD"'" }' "$API/auth" | jq -r '.auth_token'); + if ! curl -sH "Content-Type: application/json" -H "Authorization: Bearer $TOKEN" "$API/projects"|jq -r '.[].name' |grep -E '^${trimprefix(var.instance,"org-")}$'; then + curl -X POST -sH "Content-Type: application/json" -H "Authorization: Bearer $TOKEN" "http://taiga-taiga.${var.namespace}.svc/api/v1/projects" -d '{ "creation_template": 1, "description": "Organisation ${trimprefix(var.instance,"org-")} project", "is_backlog_activated": true, "is_issues_activated": true, "is_kanban_activated": true, "is_private": true, "is_wiki_activated": true, "name": "${trimprefix(var.instance,"org-")}", }'; fi env: - name: garbage - value: "xx" + value: "${jsonencode(var.install_owner)}" envFrom: - secretRef: name: taiga-taiga