Skip to content

Commit 1f9b3bb

Browse files
authored
Upgrade Role Strategy plugin to latest (#2357)
1 parent 2a8481e commit 1f9b3bb

4 files changed

Lines changed: 31 additions & 32 deletions

File tree

integrations/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,6 @@
361361
<dependency>
362362
<groupId>org.jenkins-ci.plugins</groupId>
363363
<artifactId>role-strategy</artifactId>
364-
<version>587.588.v850a_20a_30162</version>
365364
<scope>test</scope>
366365
</dependency>
367366
<dependency>

integrations/src/test/resources/io/jenkins/plugins/casc/RoleStrategy1.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ jenkins:
77
description: "Jenkins administrators"
88
permissions:
99
- "Overall/Administer"
10-
assignments:
11-
- "admin"
10+
entries:
11+
- user: "admin"
1212
- name: "readonly"
1313
description: "Read-only users"
1414
permissions:
1515
- "Overall/Read"
1616
- "Job/Read"
17-
assignments:
18-
- "authenticated"
17+
entries:
18+
- group: "authenticated"
1919
items:
2020
- name: "FolderA"
2121
description: "Jobs in Folder A, but not the folder itself"
@@ -24,25 +24,25 @@ jenkins:
2424
- "Job/Configure"
2525
- "Job/Build"
2626
- "Job/Delete"
27-
assignments:
28-
- "user1"
29-
- "user2"
27+
entries:
28+
- user: "user1"
29+
- user: "user2"
3030
- name: "FolderB"
3131
description: "Jobs in Folder B, but not the folder itself"
3232
pattern: "B.*"
3333
permissions:
3434
- "Job/Configure"
3535
- "Job/Build"
36-
assignments:
37-
- "user2"
36+
entries:
37+
- user: "user2"
3838
agents:
3939
- name: "Agent1"
4040
description: "Agent 1"
4141
pattern: "agent1"
4242
permissions:
4343
- "Agent/Build"
44-
assignments:
45-
- "user1"
44+
entries:
45+
- user: "user1"
4646

4747
# System for test
4848
securityRealm:

integrations/src/test/resources/io/jenkins/plugins/casc/RoleStrategy1Expected.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
roleBased:
22
roles:
33
agents:
4-
- assignments:
5-
- "user1"
6-
description: "Agent 1"
4+
- description: "Agent 1"
5+
entries:
6+
- user: "user1"
77
name: "Agent1"
88
pattern: "agent1"
99
permissions:
1010
- "Agent/Build"
1111
global:
12-
- assignments:
13-
- "admin"
14-
description: "Jenkins administrators"
12+
- description: "Jenkins administrators"
13+
entries:
14+
- user: "admin"
1515
name: "admin"
1616
pattern: ".*"
1717
permissions:
1818
- "Overall/Administer"
19-
- assignments:
20-
- "authenticated"
21-
description: "Read-only users"
19+
- description: "Read-only users"
20+
entries:
21+
- group: "authenticated"
2222
name: "readonly"
2323
pattern: ".*"
2424
permissions:
2525
- "Overall/Read"
2626
- "Job/Read"
2727
items:
28-
- assignments:
29-
- "user1"
30-
- "user2"
31-
description: "Jobs in Folder A, but not the folder itself"
28+
- description: "Jobs in Folder A, but not the folder itself"
29+
entries:
30+
- user: "user1"
31+
- user: "user2"
3232
name: "FolderA"
3333
pattern: "A/.*"
3434
permissions:
3535
- "Job/Build"
3636
- "Job/Delete"
3737
- "Job/Configure"
38-
- assignments:
39-
- "user2"
40-
description: "Jobs in Folder B, but not the folder itself"
38+
- description: "Jobs in Folder B, but not the folder itself"
39+
entries:
40+
- user: "user2"
4141
name: "FolderB"
4242
pattern: "B.*"
4343
permissions:

integrations/src/test/resources/io/jenkins/plugins/casc/RoleStrategy2.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ jenkins:
77
description: "Jenkins administrators"
88
permissions:
99
- "Overall/Administer"
10-
assignments:
11-
- "admin"
10+
entries:
11+
- user: "admin"
1212
- name: "readonly"
1313
description: "Read-only users"
1414
permissions:
1515
- "Overall/Read"
1616
- "Job/Read"
17-
assignments:
18-
- "authenticated"
17+
entries:
18+
- group: "authenticated"
1919

2020
# System for test
2121
securityRealm:

0 commit comments

Comments
 (0)