IAM: Move resource definitions to apps/iam step 1 (#107389)
* wip * Use serviceaccount model from /apps/iam * revert version update * Add tembinding, userteam, other improvements * Change serviceaccounttoken spec * Revert the change of ServiceAccountToken * Revert the change of UserTeam * Clean up * Remove files that are not needed for now * Lint * Update sql query's integration tests * Fix tests * update openapi spec * Move LastSeenAt to the annotations * Updte openapi_snapshots * Change lastSeenAt annotation name
This commit is contained in:
@@ -67,7 +67,8 @@ func TestIntegrationIdentity(t *testing.T) {
|
||||
"spec": {
|
||||
"email": "staff@Org1",
|
||||
"title": "staff"
|
||||
}
|
||||
},
|
||||
"status": {}
|
||||
}
|
||||
]
|
||||
}`, found)
|
||||
@@ -84,20 +85,40 @@ func TestIntegrationIdentity(t *testing.T) {
|
||||
found = teamClient.SpecJSON(rsp)
|
||||
require.JSONEq(t, `[
|
||||
{
|
||||
"disabled": false,
|
||||
"email": "admin@localhost",
|
||||
"login": "admin"
|
||||
"emailVerified": false,
|
||||
"grafanaAdmin": true,
|
||||
"login": "admin",
|
||||
"name": "",
|
||||
"provisioned": false
|
||||
},
|
||||
{
|
||||
"disabled": false,
|
||||
"email": "admin2-1",
|
||||
"login": "admin2-1"
|
||||
"emailVerified": false,
|
||||
"grafanaAdmin": true,
|
||||
"login": "admin2-1",
|
||||
"name": "",
|
||||
"provisioned": false
|
||||
},
|
||||
{
|
||||
"disabled": false,
|
||||
"email": "editor-1",
|
||||
"login": "editor-1"
|
||||
"emailVerified": false,
|
||||
"grafanaAdmin": false,
|
||||
"login": "editor-1",
|
||||
"name": "",
|
||||
"provisioned": false
|
||||
},
|
||||
{
|
||||
"disabled": false,
|
||||
"email": "viewer-1",
|
||||
"login": "viewer-1"
|
||||
"emailVerified": false,
|
||||
"grafanaAdmin": false,
|
||||
"login": "viewer-1",
|
||||
"name": "",
|
||||
"provisioned": false
|
||||
}
|
||||
]`, found)
|
||||
|
||||
@@ -114,20 +135,40 @@ func TestIntegrationIdentity(t *testing.T) {
|
||||
found = teamClient.SpecJSON(rsp)
|
||||
require.JSONEq(t, `[
|
||||
{
|
||||
"disabled": false,
|
||||
"email": "admin2-1",
|
||||
"login": "admin2-1"
|
||||
"emailVerified": false,
|
||||
"grafanaAdmin": true,
|
||||
"login": "admin2-1",
|
||||
"name": "",
|
||||
"provisioned": false
|
||||
},
|
||||
{
|
||||
"disabled": false,
|
||||
"email": "admin2-2",
|
||||
"login": "admin2-2"
|
||||
"emailVerified": false,
|
||||
"grafanaAdmin": false,
|
||||
"login": "admin2-2",
|
||||
"name": "",
|
||||
"provisioned": false
|
||||
},
|
||||
{
|
||||
"disabled": false,
|
||||
"email": "editor-2",
|
||||
"login": "editor-2"
|
||||
"emailVerified": false,
|
||||
"grafanaAdmin": false,
|
||||
"login": "editor-2",
|
||||
"name": "",
|
||||
"provisioned": false
|
||||
},
|
||||
{
|
||||
"disabled": false,
|
||||
"email": "viewer-2",
|
||||
"login": "viewer-2"
|
||||
"emailVerified": false,
|
||||
"grafanaAdmin": false,
|
||||
"login": "viewer-2",
|
||||
"name": "",
|
||||
"provisioned": false
|
||||
}
|
||||
]`, found)
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user