Skip to content

Commit faa42a2

Browse files
committed
Merge branch 'release/v0.17.1'
2 parents 58d0726 + 5ab77c2 commit faa42a2

File tree

4 files changed

+73
-10
lines changed

4 files changed

+73
-10
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@ require (
7070
golang.org/x/net v0.0.0-20220811182439-13a9a731de15 // indirect
7171
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
7272
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
73-
golang.org/x/text v0.3.7 // indirect
73+
golang.org/x/text v0.4.0 // indirect
7474
gopkg.in/yaml.v3 v3.0.1 // indirect
7575
)

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,10 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
507507
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
508508
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
509509
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
510+
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
511+
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
512+
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
513+
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
510514
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
511515
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
512516
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

import-script/policies.json

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,44 @@
3030
}
3131
},
3232
{
33-
"id": "dp-interactives-importer",
33+
"id": "interactives-updater",
3434
"entities": [
3535
"users/dp-interactives-importer"
3636
],
37-
"role": "dp-interactives-importer",
37+
"role": "interactives-update",
38+
"condition": {}
39+
},
40+
{
41+
"id": "interactives-reader",
42+
"entities": [
43+
"users/dp-frontend-interactives-controller"
44+
],
45+
"role": "interactives-read",
46+
"condition": {}
47+
},
48+
{
49+
"id": "files-admin",
50+
"entities": [
51+
"users/dp-upload-service"
52+
],
53+
"role": "files-admin",
54+
"condition": {}
55+
},
56+
{
57+
"id": "files-updater",
58+
"entities": [
59+
"users/dp-static-file-publisher",
60+
"users/dp-interactives-api"
61+
],
62+
"role": "files-updater",
63+
"condition": {}
64+
},
65+
{
66+
"id": "files-reader",
67+
"entities": [
68+
"users/dp-download-service"
69+
],
70+
"role": "files-reader",
3871
"condition": {}
3972
}
40-
]
73+
]

import-script/roles.json

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
[
2-
{
3-
"name": "dp-interactives-importer",
4-
"permissions": [
5-
"interactives:update"
6-
]
7-
},
82
{
93
"name": "collection-previewer",
104
"permissions": [
@@ -75,5 +69,37 @@
7569
"static-files:read",
7670
"static-files:update"
7771
]
72+
},
73+
{
74+
"name": "interactives-update",
75+
"permissions": [
76+
"interactives:update"
77+
]
78+
},
79+
{
80+
"name": "interactives-read",
81+
"permissions": [
82+
"interactives:read"
83+
]
84+
},
85+
{
86+
"name": "files-admin",
87+
"permissions": [
88+
"static-files:create",
89+
"static-files:read",
90+
"static-files:update"
91+
]
92+
},
93+
{
94+
"name": "files-updater",
95+
"permissions": [
96+
"static-files:update"
97+
]
98+
},
99+
{
100+
"name": "files-reader",
101+
"permissions": [
102+
"static-files:read"
103+
]
78104
}
79105
]

0 commit comments

Comments
 (0)