Skip to content

Commit 87f32f7

Browse files
committed
fix: make users org members
1 parent 35d77f8 commit 87f32f7

File tree

1 file changed

+46
-0
lines changed

1 file changed

+46
-0
lines changed

influxdb/users.sls

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,53 @@ create_user_{{ name }}:
3838
- onfail:
3939
- http: get_user_{{ name }}
4040
41+
{%- set orgID = salt['cmd.shell']("curl -s -f -H'Authorization: Token " ~ influxdb['user']['admin']['token'] ~ "' '" ~ base_url ~ "/api/v2/orgs' | jq -r '.orgs[0].id'") %}
4142
{%- set id = salt['cmd.shell']("curl -s -f -H'Authorization: Token " ~ influxdb['user']['admin']['token'] ~ "' '" ~ base_url ~ "/api/v2/users?name=" ~ name ~ "' | jq -r '.users[0].id'") %}
43+
{%- if "admin" in config and config["admin"] == True %}
44+
check_{{ name }}_admin_in_org:
45+
http.query:
46+
- name: '{{ base_url }}/api/v2/orgs/{{ orgID }}/owners'
47+
- status: 200
48+
- method: GET
49+
- match: '"{{ name }}"'
50+
- match_type: string
51+
- header_dict:
52+
Authorization: Token {{ influxdb['user']['admin']['token'] }}
53+
54+
make_{{ name }}_admin_in_org:
55+
http.query:
56+
- name: '{{ base_url }}/api/v2/orgs/{{ orgID }}/owners'
57+
- status: 201
58+
- method: POST
59+
- data: '{"name": "{{ name }}", "id": "{{ id }}"}'
60+
- header_dict:
61+
Authorization: Token {{ influxdb['user']['admin']['token'] }}
62+
- onfail:
63+
- http: check_{{ name }}_admin_in_org
64+
{% else %}
65+
check_{{ name }}_member_in_org:
66+
http.query:
67+
- name: '{{ base_url }}/api/v2/orgs/{{ orgID }}/members'
68+
- status: 200
69+
- method: GET
70+
- match: '"{{ name }}"'
71+
- match_type: string
72+
- header_dict:
73+
Authorization: Token {{ influxdb['user']['admin']['token'] }}
74+
75+
make_{{ name }}_member_in_org:
76+
http.query:
77+
- name: '{{ base_url }}/api/v2/orgs/{{ orgID }}/members'
78+
- status: 201
79+
- method: POST
80+
- data: '{"name": "{{ name }}", "id": "{{ id }}"}'
81+
- header_dict:
82+
Authorization: Token {{ influxdb['user']['admin']['token'] }}
83+
- onfail:
84+
- http: check_{{ name }}_member_in_org
85+
{% endif %}
86+
87+
4288
{% if "password" in config %}
4389
set_password_{{ name }}:
4490
http.query:

0 commit comments

Comments
 (0)