Skip to content

Commit 5607cb6

Browse files
authored
Merge branch 'master' into remove-glossary
2 parents 64e432f + db97f61 commit 5607cb6

File tree

67 files changed

+10495
-12032
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+10495
-12032
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/sources/legal/ @mnmkng
66

77
# Academy
8-
/sources/academy/ @honzajavorek
8+
/sources/academy/ @honzajavorek @TC-MO
99

1010
# OpenAPI spec
1111
/apify-api/ @janbuchar @fnesveda

apify-api/openapi/components/schemas/actor-runs/Run.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ required:
1515
- defaultRequestQueueId
1616
- buildNumber
1717
- containerUrl
18+
- generalAccess
1819
type: object
1920
properties:
2021
id:
@@ -66,6 +67,8 @@ properties:
6667
type: number
6768
nullable: true
6869
example: 0
70+
generalAccess:
71+
$ref: ../common/GeneralAccessEnum.yaml
6972
defaultKeyValueStoreId:
7073
type: string
7174
example: eJNzqsbPiopwJcgGQ

apify-api/openapi/components/schemas/actor-runs/UpdateRunRequest.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
title: UpdateRunRequest
2-
required:
3-
- runId
4-
- statusMessage
52
type: object
63
properties:
74
runId:
@@ -13,3 +10,5 @@ properties:
1310
isStatusMessageTerminal:
1411
type: boolean
1512
example: true
13+
generalAccess:
14+
$ref: ../common/GeneralAccessEnum.yaml

apify-api/openapi/components/schemas/actors/Actor.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ properties:
3636
isPublic:
3737
type: boolean
3838
example: false
39+
actorPermissionLevel:
40+
$ref: ./ActorPermissionLevel.yaml
3941
createdAt:
4042
type: string
4143
example: '2019-07-08T11:27:57.401Z'

apify-api/openapi/components/schemas/actors/ActorDefinition.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ properties:
4242
dataset:
4343
type: object
4444
description: Defines the schema of items in your dataset, the full specification can be found in [Apify docs](https://docs.apify.com/platform/actors/development/actor-definition/dataset-schema)
45+
defaultMemoryMbytes:
46+
oneOf:
47+
- type: string
48+
example: get(input, 'startUrls.length', 1) * 1024
49+
- type: integer
50+
example: 1024
51+
description: Specifies the default amount of memory in megabytes to be used when the Actor is started. Can be an integer or a [dynamic memory expression](/platform/actors/development/actor-definition/dynamic-actor-memory).
4552
minMemoryMbytes:
4653
type: integer
4754
minimum: 256
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
type: string
2+
description: >
3+
Determines permissions that the Actor requires to run.
4+
For more information, see the [Actor permissions documentation](https://docs.apify.com/platform/actors/development/permissions).
5+
enum:
6+
- LIMITED_PERMISSIONS
7+
- FULL_PERMISSIONS
8+
example: LIMITED_PERMISSIONS

apify-api/openapi/components/schemas/actors/UpdateActorRequest.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ properties:
1111
isPublic:
1212
type: boolean
1313
example: false
14+
actorPermissionLevel:
15+
nullable: true
16+
$ref: ./ActorPermissionLevel.yaml
1417
seoTitle:
1518
type: string
1619
nullable: true
@@ -102,4 +105,3 @@ required:
102105
- name
103106
- isPublic
104107
- versions
105-
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
type: string
2+
enum:
3+
- RESTRICTED
4+
- ANYONE_WITH_ID_CAN_READ
5+
- FOLLOW_USER_SETTING
6+
example: RESTRICTED
7+
description: Defines the general access level for the resource.

apify-api/openapi/components/schemas/datasets/Dataset.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,7 @@ properties:
7777
type: string
7878
description: "A secret key for generating signed public URLs. It is only provided to clients with WRITE permission for the dataset."
7979
nullable: true
80+
generalAccess:
81+
$ref: ../common/GeneralAccessEnum.yaml
8082
stats:
8183
$ref: ./DatasetStats.yaml
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
title: UpdateDatasetRequest
2-
required:
3-
- name
42
type: object
53
properties:
64
name:
75
type: string
6+
generalAccess:
7+
$ref: ../common/GeneralAccessEnum.yaml
88
example:
99
name: new-dataset-name
10+
generalAccess: RESTRICTED

0 commit comments

Comments
 (0)