chore: remove organization_id suffix from org_member roles in database (#13473)

Organization member's table is already scoped to an organization.
Rolename should avoid having the org_id appended.

Wipes all existing organization role assignments, which should not be used anyway.
This commit is contained in:
Steven Masley
2024-06-05 11:25:02 -05:00
committed by GitHub
parent fade8ba759
commit 8f62311f00
38 changed files with 200 additions and 118 deletions
+2 -1
View File
@@ -68,7 +68,8 @@ curl -X GET http://coder-server:8080/api/v2/audit?limit=0 \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
+5 -2
View File
@@ -1600,7 +1600,8 @@ curl -X PATCH http://coder-server:8080/api/v2/scim/v2/Users/{id} \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -1655,7 +1656,8 @@ curl -X GET http://coder-server:8080/api/v2/templates/{template}/acl \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -1690,6 +1692,7 @@ Status Code **200**
| `» roles` | array | false | | |
| `»» display_name` | string | false | | |
| `»» name` | string | false | | |
| `»» organization_id` | string | false | | |
| `» status` | [codersdk.UserStatus](schemas.md#codersdkuserstatus) | false | | |
| `» theme_preference` | string | false | | |
| `» username` | string | true | | |
+2 -1
View File
@@ -289,7 +289,8 @@ curl -X PUT http://coder-server:8080/api/v2/organizations/{organization}/members
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"updated_at": "2019-08-24T14:15:22Z",
+19 -11
View File
@@ -966,7 +966,8 @@
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -1045,7 +1046,8 @@
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -2972,7 +2974,8 @@ CreateWorkspaceRequest provides options for creating a new workspace. Only one o
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -3616,7 +3619,8 @@ CreateWorkspaceRequest provides options for creating a new workspace. Only one o
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"updated_at": "2019-08-24T14:15:22Z",
@@ -4452,16 +4456,18 @@ CreateWorkspaceRequest provides options for creating a new workspace. Only one o
```json
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
```
### Properties
| Name | Type | Required | Restrictions | Description |
| -------------- | ------ | -------- | ------------ | ----------- |
| `display_name` | string | false | | |
| `name` | string | false | | |
| Name | Type | Required | Restrictions | Description |
| ----------------- | ------ | -------- | ------------ | ----------- |
| `display_name` | string | false | | |
| `name` | string | false | | |
| `organization_id` | string | false | | |
## codersdk.SupportConfig
@@ -5002,7 +5008,8 @@ CreateWorkspaceRequest provides options for creating a new workspace. Only one o
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -5607,7 +5614,8 @@ If the schedule is empty, the user will be updated to use the default schedule.|
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
+20 -10
View File
@@ -42,7 +42,8 @@ curl -X GET http://coder-server:8080/api/v2/users \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -111,7 +112,8 @@ curl -X POST http://coder-server:8080/api/v2/users \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -381,7 +383,8 @@ curl -X GET http://coder-server:8080/api/v2/users/{user} \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -434,7 +437,8 @@ curl -X DELETE http://coder-server:8080/api/v2/users/{user} \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -497,7 +501,8 @@ curl -X PUT http://coder-server:8080/api/v2/users/{user}/appearance \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -1148,7 +1153,8 @@ curl -X PUT http://coder-server:8080/api/v2/users/{user}/profile \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -1201,7 +1207,8 @@ curl -X GET http://coder-server:8080/api/v2/users/{user}/roles \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -1264,7 +1271,8 @@ curl -X PUT http://coder-server:8080/api/v2/users/{user}/roles \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -1317,7 +1325,8 @@ curl -X PUT http://coder-server:8080/api/v2/users/{user}/status/activate \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",
@@ -1370,7 +1379,8 @@ curl -X PUT http://coder-server:8080/api/v2/users/{user}/status/suspend \
"roles": [
{
"display_name": "string",
"name": "string"
"name": "string",
"organization_id": "string"
}
],
"status": "active",