@scaleway/sdk 2.0.0-alpha.16 → 2.0.0-alpha.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -358,13 +358,13 @@ const marshalCreateServerRequest = (request, defaults) => ({
358
358
  option_ids: request.optionIds,
359
359
  tags: request.tags,
360
360
  ...resolveOneOf([{
361
- default: defaults.defaultOrganizationId,
362
- param: 'organization_id',
363
- value: request.organizationId
364
- }, {
365
361
  default: defaults.defaultProjectId,
366
362
  param: 'project_id',
367
363
  value: request.projectId
364
+ }, {
365
+ default: defaults.defaultOrganizationId,
366
+ param: 'organization_id',
367
+ value: request.organizationId
368
368
  }])
369
369
  });
370
370
  const marshalInstallServerRequest = (request, defaults) => ({
@@ -322,7 +322,6 @@ const marshalRuleSpecs = (request, defaults) => ({
322
322
  param: 'project_ids',
323
323
  value: request.projectIds
324
324
  }, {
325
- default: defaults.defaultOrganizationId,
326
325
  param: 'organization_id',
327
326
  value: request.organizationId
328
327
  }])
@@ -331,7 +330,7 @@ const marshalCreatePolicyRequest = (request, defaults) => ({
331
330
  description: request.description,
332
331
  name: request.name || randomName('pol'),
333
332
  organization_id: request.organizationId ?? defaults.defaultOrganizationId,
334
- rules: request.rules !== undefined ? request.rules.map(elt => marshalRuleSpecs(elt, defaults)) : undefined,
333
+ rules: request.rules !== undefined ? request.rules.map(elt => marshalRuleSpecs(elt)) : undefined,
335
334
  ...resolveOneOf([{
336
335
  param: 'user_id',
337
336
  value: request.userId
@@ -370,7 +369,7 @@ const marshalSetGroupMembersRequest = (request, defaults) => ({
370
369
  });
371
370
  const marshalSetRulesRequest = (request, defaults) => ({
372
371
  policy_id: request.policyId,
373
- rules: request.rules.map(elt => marshalRuleSpecs(elt, defaults))
372
+ rules: request.rules.map(elt => marshalRuleSpecs(elt))
374
373
  });
375
374
  const marshalUpdateAPIKeyRequest = (request, defaults) => ({
376
375
  default_project_id: request.defaultProjectId,
@@ -913,13 +913,11 @@ const marshalVolumeTemplate = (request, defaults) => ({
913
913
  size: request.size,
914
914
  volume_type: request.volumeType,
915
915
  ...resolveOneOf([{
916
- default: defaults.defaultOrganizationId,
917
- param: 'organization',
918
- value: request.organization
919
- }, {
920
- default: defaults.defaultProjectId,
921
916
  param: 'project',
922
917
  value: request.project
918
+ }, {
919
+ param: 'organization',
920
+ value: request.organization
923
921
  }])
924
922
  });
925
923
  const marshalCreateImageRequest = (request, defaults) => ({
@@ -929,7 +927,7 @@ const marshalCreateImageRequest = (request, defaults) => ({
929
927
  let [key, value] = _ref;
930
928
  return {
931
929
  ...acc,
932
- [key]: marshalVolumeTemplate(value, defaults)
930
+ [key]: marshalVolumeTemplate(value)
933
931
  };
934
932
  }, {}) : undefined,
935
933
  name: request.name || randomName('img'),
@@ -937,13 +935,13 @@ const marshalCreateImageRequest = (request, defaults) => ({
937
935
  root_volume: request.rootVolume,
938
936
  tags: request.tags,
939
937
  ...resolveOneOf([{
940
- default: defaults.defaultOrganizationId,
941
- param: 'organization',
942
- value: request.organization
943
- }, {
944
938
  default: defaults.defaultProjectId,
945
939
  param: 'project',
946
940
  value: request.project
941
+ }, {
942
+ default: defaults.defaultOrganizationId,
943
+ param: 'organization',
944
+ value: request.organization
947
945
  }])
948
946
  });
949
947
  const marshalCreateIpRequest = (request, defaults) => ({
@@ -951,13 +949,13 @@ const marshalCreateIpRequest = (request, defaults) => ({
951
949
  tags: request.tags,
952
950
  type: request.type,
953
951
  ...resolveOneOf([{
954
- default: defaults.defaultOrganizationId,
955
- param: 'organization',
956
- value: request.organization
957
- }, {
958
952
  default: defaults.defaultProjectId,
959
953
  param: 'project',
960
954
  value: request.project
955
+ }, {
956
+ default: defaults.defaultOrganizationId,
957
+ param: 'organization',
958
+ value: request.organization
961
959
  }])
962
960
  });
963
961
  const marshalCreatePlacementGroupRequest = (request, defaults) => ({
@@ -966,13 +964,13 @@ const marshalCreatePlacementGroupRequest = (request, defaults) => ({
966
964
  policy_type: request.policyType,
967
965
  tags: request.tags,
968
966
  ...resolveOneOf([{
969
- default: defaults.defaultOrganizationId,
970
- param: 'organization',
971
- value: request.organization
972
- }, {
973
967
  default: defaults.defaultProjectId,
974
968
  param: 'project',
975
969
  value: request.project
970
+ }, {
971
+ default: defaults.defaultOrganizationId,
972
+ param: 'organization',
973
+ value: request.organization
976
974
  }])
977
975
  });
978
976
  const marshalCreatePrivateNICRequest = (request, defaults) => ({
@@ -989,13 +987,13 @@ const marshalCreateSecurityGroupRequest = (request, defaults) => ({
989
987
  stateful: request.stateful,
990
988
  tags: request.tags,
991
989
  ...resolveOneOf([{
992
- default: defaults.defaultOrganizationId,
993
- param: 'organization',
994
- value: request.organization
995
- }, {
996
990
  default: defaults.defaultProjectId,
997
991
  param: 'project',
998
992
  value: request.project
993
+ }, {
994
+ default: defaults.defaultOrganizationId,
995
+ param: 'organization',
996
+ value: request.organization
999
997
  }]),
1000
998
  ...resolveOneOf([{
1001
999
  param: 'organization_default',
@@ -1020,8 +1018,8 @@ const marshalVolumeServerTemplate = (request, defaults) => ({
1020
1018
  boot: request.boot,
1021
1019
  id: request.id,
1022
1020
  name: request.name,
1023
- organization: request.organization ?? defaults.defaultOrganizationId,
1024
- project: request.project ?? defaults.defaultProjectId,
1021
+ organization: request.organization,
1022
+ project: request.project,
1025
1023
  size: request.size,
1026
1024
  volume_type: request.volumeType
1027
1025
  });
@@ -1043,17 +1041,17 @@ const marshalCreateServerRequest = (request, defaults) => ({
1043
1041
  let [key, value] = _ref2;
1044
1042
  return {
1045
1043
  ...acc,
1046
- [key]: marshalVolumeServerTemplate(value, defaults)
1044
+ [key]: marshalVolumeServerTemplate(value)
1047
1045
  };
1048
1046
  }, {}) : undefined,
1049
1047
  ...resolveOneOf([{
1050
- default: defaults.defaultOrganizationId,
1051
- param: 'organization',
1052
- value: request.organization
1053
- }, {
1054
1048
  default: defaults.defaultProjectId,
1055
1049
  param: 'project',
1056
1050
  value: request.project
1051
+ }, {
1052
+ default: defaults.defaultOrganizationId,
1053
+ param: 'organization',
1054
+ value: request.organization
1057
1055
  }])
1058
1056
  });
1059
1057
  const marshalCreateSnapshotRequest = (request, defaults) => ({
@@ -1065,13 +1063,13 @@ const marshalCreateSnapshotRequest = (request, defaults) => ({
1065
1063
  volume_id: request.volumeId,
1066
1064
  volume_type: request.volumeType,
1067
1065
  ...resolveOneOf([{
1068
- default: defaults.defaultOrganizationId,
1069
- param: 'organization',
1070
- value: request.organization
1071
- }, {
1072
1066
  default: defaults.defaultProjectId,
1073
1067
  param: 'project',
1074
1068
  value: request.project
1069
+ }, {
1070
+ default: defaults.defaultOrganizationId,
1071
+ param: 'organization',
1072
+ value: request.organization
1075
1073
  }])
1076
1074
  });
1077
1075
  const marshalCreateVolumeRequest = (request, defaults) => ({
@@ -1079,13 +1077,13 @@ const marshalCreateVolumeRequest = (request, defaults) => ({
1079
1077
  tags: request.tags,
1080
1078
  volume_type: request.volumeType,
1081
1079
  ...resolveOneOf([{
1082
- default: defaults.defaultOrganizationId,
1083
- param: 'organization',
1084
- value: request.organization
1085
- }, {
1086
1080
  default: defaults.defaultProjectId,
1087
1081
  param: 'project',
1088
1082
  value: request.project
1083
+ }, {
1084
+ default: defaults.defaultOrganizationId,
1085
+ param: 'organization',
1086
+ value: request.organization
1089
1087
  }]),
1090
1088
  ...resolveOneOf([{
1091
1089
  param: 'size',
@@ -1233,10 +1231,10 @@ const marshalSetSecurityGroupRulesRequestRule = (request, defaults) => ({
1233
1231
  ip_range: request.ipRange,
1234
1232
  position: request.position,
1235
1233
  protocol: request.protocol,
1236
- zone: request.zone ?? defaults.defaultZone
1234
+ zone: request.zone
1237
1235
  });
1238
1236
  const marshalSetSecurityGroupRulesRequest = (request, defaults) => ({
1239
- rules: request.rules !== undefined ? request.rules.map(elt => marshalSetSecurityGroupRulesRequestRule(elt, defaults)) : undefined
1237
+ rules: request.rules !== undefined ? request.rules.map(elt => marshalSetSecurityGroupRulesRequestRule(elt)) : undefined
1240
1238
  });
1241
1239
  const marshalImage = (request, defaults) => ({
1242
1240
  arch: request.arch,
@@ -1404,7 +1402,7 @@ const marshalUpdateServerRequest = (request, defaults) => ({
1404
1402
  let [key, value] = _ref7;
1405
1403
  return {
1406
1404
  ...acc,
1407
- [key]: marshalVolumeServerTemplate(value, defaults)
1405
+ [key]: marshalVolumeServerTemplate(value)
1408
1406
  };
1409
1407
  }, {}) : undefined
1410
1408
  });
@@ -0,0 +1,2 @@
1
+ import * as index_gen from './v1alpha1/index.gen.js';
2
+ export { index_gen as v1alpha1 };
@@ -0,0 +1,111 @@
1
+ import { API as API$1 } from '../../../scw/api.js';
2
+ import { unmarshalServiceInfo } from '../../../scw/custom-marshalling.js';
3
+ import { enrichForPagination } from '../../../scw/fetch/resource-paginator.js';
4
+ import { validatePathParam, urlParams } from '../../../helpers/marshalling.js';
5
+ import { marshalCreateJobDefinitionRequest, unmarshalJobDefinition, unmarshalListJobDefinitionsResponse, marshalUpdateJobDefinitionRequest, unmarshalJobRun, unmarshalListJobRunsResponse } from './marshalling.gen.js';
6
+
7
+ // This file was automatically generated. DO NOT EDIT.
8
+ // If you have any remark or suggestion do not hesitate to open an issue.
9
+ const jsonContentHeaders = {
10
+ 'Content-Type': 'application/json; charset=utf-8'
11
+ };
12
+
13
+ /** Serverless Jobs API. */
14
+ class API extends API$1 {
15
+ /** Lists the available regions of the API. */
16
+ static LOCALITIES = ['fr-par', 'nl-ams', 'pl-waw'];
17
+ getServiceInfo = (() => {
18
+ var _this = this;
19
+ return function (request) {
20
+ if (request === void 0) {
21
+ request = {};
22
+ }
23
+ return _this.client.fetch({
24
+ method: 'GET',
25
+ path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? _this.client.settings.defaultRegion)}`
26
+ }, unmarshalServiceInfo);
27
+ };
28
+ })();
29
+ createJobDefinition = request => this.client.fetch({
30
+ body: JSON.stringify(marshalCreateJobDefinitionRequest(request, this.client.settings)),
31
+ headers: jsonContentHeaders,
32
+ method: 'POST',
33
+ path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-definitions`
34
+ }, unmarshalJobDefinition);
35
+ getJobDefinition = request => this.client.fetch({
36
+ method: 'GET',
37
+ path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-definitions/${validatePathParam('jobDefinitionId', request.jobDefinitionId)}`
38
+ }, unmarshalJobDefinition);
39
+ pageOfListJobDefinitions = (() => {
40
+ var _this2 = this;
41
+ return function (request) {
42
+ if (request === void 0) {
43
+ request = {};
44
+ }
45
+ return _this2.client.fetch({
46
+ method: 'GET',
47
+ path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? _this2.client.settings.defaultRegion)}/job-definitions`,
48
+ urlParams: urlParams(['order_by', request.orderBy], ['page', request.page], ['page_size', request.pageSize ?? _this2.client.settings.defaultPageSize], ['project_id', request.projectId])
49
+ }, unmarshalListJobDefinitionsResponse);
50
+ };
51
+ })();
52
+ listJobDefinitions = (() => {
53
+ var _this3 = this;
54
+ return function (request) {
55
+ if (request === void 0) {
56
+ request = {};
57
+ }
58
+ return enrichForPagination('jobDefinitions', _this3.pageOfListJobDefinitions, request);
59
+ };
60
+ })();
61
+ updateJobDefinition = request => this.client.fetch({
62
+ body: JSON.stringify(marshalUpdateJobDefinitionRequest(request, this.client.settings)),
63
+ headers: jsonContentHeaders,
64
+ method: 'PATCH',
65
+ path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-definitions/${validatePathParam('jobDefinitionId', request.jobDefinitionId)}`
66
+ }, unmarshalJobDefinition);
67
+ deleteJobDefinition = request => this.client.fetch({
68
+ method: 'DELETE',
69
+ path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-definitions/${validatePathParam('jobDefinitionId', request.jobDefinitionId)}`
70
+ });
71
+ startJobDefinition = request => this.client.fetch({
72
+ body: '{}',
73
+ headers: jsonContentHeaders,
74
+ method: 'POST',
75
+ path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-definitions/${validatePathParam('jobDefinitionId', request.jobDefinitionId)}/start`
76
+ }, unmarshalJobRun);
77
+ getJobRun = request => this.client.fetch({
78
+ method: 'GET',
79
+ path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-runs/${validatePathParam('jobRunId', request.jobRunId)}`
80
+ }, unmarshalJobRun);
81
+ stopJobRun = request => this.client.fetch({
82
+ body: '{}',
83
+ headers: jsonContentHeaders,
84
+ method: 'POST',
85
+ path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/job-runs/${validatePathParam('jobRunId', request.jobRunId)}/stop`
86
+ }, unmarshalJobRun);
87
+ pageOfListJobRuns = (() => {
88
+ var _this4 = this;
89
+ return function (request) {
90
+ if (request === void 0) {
91
+ request = {};
92
+ }
93
+ return _this4.client.fetch({
94
+ method: 'GET',
95
+ path: `/serverless-jobs/v1alpha1/regions/${validatePathParam('region', request.region ?? _this4.client.settings.defaultRegion)}/job-runs`,
96
+ urlParams: urlParams(['job_definition_id', request.jobDefinitionId], ['order_by', request.orderBy], ['page', request.page], ['page_size', request.pageSize ?? _this4.client.settings.defaultPageSize], ['project_id', request.projectId])
97
+ }, unmarshalListJobRunsResponse);
98
+ };
99
+ })();
100
+ listJobRuns = (() => {
101
+ var _this5 = this;
102
+ return function (request) {
103
+ if (request === void 0) {
104
+ request = {};
105
+ }
106
+ return enrichForPagination('jobRuns', _this5.pageOfListJobRuns, request);
107
+ };
108
+ })();
109
+ }
110
+
111
+ export { API };
@@ -0,0 +1,7 @@
1
+ // This file was automatically generated. DO NOT EDIT.
2
+ // If you have any remark or suggestion do not hesitate to open an issue.
3
+
4
+ /** Lists transient statutes of the enum {@link JobRunState}. */
5
+ const JOB_RUN_TRANSIENT_STATUSES = ['queued', 'scheduled', 'running'];
6
+
7
+ export { JOB_RUN_TRANSIENT_STATUSES };
@@ -0,0 +1,7 @@
1
+ export { API } from './api.gen.js';
2
+ export { JOB_RUN_TRANSIENT_STATUSES } from './content.gen.js';
3
+ import * as validationRules_gen from './validation-rules.gen.js';
4
+ export { validationRules_gen as ValidationRules };
5
+
6
+ // This file was automatically generated. DO NOT EDIT.
7
+ // If you have any remark or suggestion do not hesitate to open an issue.
@@ -0,0 +1,84 @@
1
+ import randomName from '../../../node_modules/.pnpm/@scaleway_random-name@4.0.2/node_modules/@scaleway/random-name/dist/index.js';
2
+ import { isJSONObject } from '../../../helpers/json.js';
3
+ import { unmarshalDate, unmarshalArrayOfObject } from '../../../helpers/marshalling.js';
4
+
5
+ // This file was automatically generated. DO NOT EDIT.
6
+ // If you have any remark or suggestion do not hesitate to open an issue.
7
+ const unmarshalJobDefinition = data => {
8
+ if (!isJSONObject(data)) {
9
+ throw new TypeError(`Unmarshalling the type 'JobDefinition' failed as data isn't a dictionary.`);
10
+ }
11
+ return {
12
+ command: data.command,
13
+ cpuLimit: data.cpu_limit,
14
+ createdAt: unmarshalDate(data.created_at),
15
+ description: data.description,
16
+ environmentVariables: data.environment_variables,
17
+ imageUri: data.image_uri,
18
+ jobDefinitionId: data.job_definition_id,
19
+ jobTimeout: data.job_timeout,
20
+ memoryLimit: data.memory_limit,
21
+ name: data.name,
22
+ projectId: data.project_id,
23
+ region: data.region,
24
+ updatedAt: unmarshalDate(data.updated_at)
25
+ };
26
+ };
27
+ const unmarshalJobRun = data => {
28
+ if (!isJSONObject(data)) {
29
+ throw new TypeError(`Unmarshalling the type 'JobRun' failed as data isn't a dictionary.`);
30
+ }
31
+ return {
32
+ createdAt: unmarshalDate(data.created_at),
33
+ errorMessage: data.error_message,
34
+ exitCode: data.exit_code,
35
+ jobDefinitionId: data.job_definition_id,
36
+ jobRunId: data.job_run_id,
37
+ region: data.region,
38
+ runDuration: data.run_duration,
39
+ state: data.state,
40
+ terminatedAt: unmarshalDate(data.terminated_at),
41
+ updatedAt: unmarshalDate(data.updated_at)
42
+ };
43
+ };
44
+ const unmarshalListJobDefinitionsResponse = data => {
45
+ if (!isJSONObject(data)) {
46
+ throw new TypeError(`Unmarshalling the type 'ListJobDefinitionsResponse' failed as data isn't a dictionary.`);
47
+ }
48
+ return {
49
+ jobDefinitions: unmarshalArrayOfObject(data.job_definitions, unmarshalJobDefinition),
50
+ totalCount: data.total_count
51
+ };
52
+ };
53
+ const unmarshalListJobRunsResponse = data => {
54
+ if (!isJSONObject(data)) {
55
+ throw new TypeError(`Unmarshalling the type 'ListJobRunsResponse' failed as data isn't a dictionary.`);
56
+ }
57
+ return {
58
+ jobRuns: unmarshalArrayOfObject(data.job_runs, unmarshalJobRun),
59
+ totalCount: data.total_count
60
+ };
61
+ };
62
+ const marshalCreateJobDefinitionRequest = (request, defaults) => ({
63
+ command: request.command,
64
+ cpu_limit: request.cpuLimit,
65
+ description: request.description,
66
+ environment_variables: request.environmentVariables !== undefined ? request.environmentVariables : undefined,
67
+ image_uri: request.imageUri,
68
+ job_timeout: request.jobTimeout,
69
+ memory_limit: request.memoryLimit,
70
+ name: request.name || randomName('job'),
71
+ project_id: request.projectId ?? defaults.defaultProjectId
72
+ });
73
+ const marshalUpdateJobDefinitionRequest = (request, defaults) => ({
74
+ command: request.command,
75
+ cpu_limit: request.cpuLimit,
76
+ description: request.description,
77
+ environment_variables: request.environmentVariables,
78
+ image_uri: request.imageUri,
79
+ job_timeout: request.jobTimeout,
80
+ memory_limit: request.memoryLimit,
81
+ name: request.name
82
+ });
83
+
84
+ export { marshalCreateJobDefinitionRequest, marshalUpdateJobDefinitionRequest, unmarshalJobDefinition, unmarshalJobRun, unmarshalListJobDefinitionsResponse, unmarshalListJobRunsResponse };
@@ -0,0 +1,45 @@
1
+ // This file was automatically generated. DO NOT EDIT.
2
+ // If you have any remark or suggestion do not hesitate to open an issue.
3
+
4
+ const CreateJobDefinitionRequest = {
5
+ cpuLimit: {
6
+ greaterThan: 0
7
+ },
8
+ memoryLimit: {
9
+ greaterThan: 0
10
+ },
11
+ name: {
12
+ minLength: 3
13
+ }
14
+ };
15
+ const ListJobDefinitionsRequest = {
16
+ page: {
17
+ greaterThanOrEqual: 1
18
+ },
19
+ pageSize: {
20
+ greaterThanOrEqual: 1,
21
+ lessThanOrEqual: 1000
22
+ }
23
+ };
24
+ const ListJobRunsRequest = {
25
+ page: {
26
+ greaterThanOrEqual: 1
27
+ },
28
+ pageSize: {
29
+ greaterThanOrEqual: 1,
30
+ lessThanOrEqual: 1000
31
+ }
32
+ };
33
+ const UpdateJobDefinitionRequest = {
34
+ cpuLimit: {
35
+ greaterThan: 0
36
+ },
37
+ memoryLimit: {
38
+ greaterThan: 0
39
+ },
40
+ name: {
41
+ minLength: 3
42
+ }
43
+ };
44
+
45
+ export { CreateJobDefinitionRequest, ListJobDefinitionsRequest, ListJobRunsRequest, UpdateJobDefinitionRequest };
@@ -321,13 +321,13 @@ const marshalCreateClusterRequest = (request, defaults) => ({
321
321
  type: request.type,
322
322
  version: request.version,
323
323
  ...resolveOneOf([{
324
- default: defaults.defaultOrganizationId,
325
- param: 'organization_id',
326
- value: request.organizationId
327
- }, {
328
324
  default: defaults.defaultProjectId,
329
325
  param: 'project_id',
330
326
  value: request.projectId
327
+ }, {
328
+ default: defaults.defaultOrganizationId,
329
+ param: 'organization_id',
330
+ value: request.organizationId
331
331
  }])
332
332
  });
333
333
  const marshalCreatePoolRequestUpgradePolicy = (request, defaults) => ({
@@ -631,13 +631,13 @@ const marshalCreateFrontendRequest = (request, defaults) => ({
631
631
  const marshalCreateIpRequest = (request, defaults) => ({
632
632
  reverse: request.reverse,
633
633
  ...resolveOneOf([{
634
- default: defaults.defaultOrganizationId,
635
- param: 'organization_id',
636
- value: request.organizationId
637
- }, {
638
634
  default: defaults.defaultProjectId,
639
635
  param: 'project_id',
640
636
  value: request.projectId
637
+ }, {
638
+ default: defaults.defaultOrganizationId,
639
+ param: 'organization_id',
640
+ value: request.organizationId
641
641
  }])
642
642
  });
643
643
  const marshalCreateLbRequest = (request, defaults) => ({
@@ -649,13 +649,13 @@ const marshalCreateLbRequest = (request, defaults) => ({
649
649
  tags: request.tags,
650
650
  type: request.type,
651
651
  ...resolveOneOf([{
652
- default: defaults.defaultOrganizationId,
653
- param: 'organization_id',
654
- value: request.organizationId
655
- }, {
656
652
  default: defaults.defaultProjectId,
657
653
  param: 'project_id',
658
654
  value: request.projectId
655
+ }, {
656
+ default: defaults.defaultOrganizationId,
657
+ param: 'organization_id',
658
+ value: request.organizationId
659
659
  }])
660
660
  });
661
661
  const marshalRouteMatch = (request, defaults) => ({
@@ -681,13 +681,13 @@ const marshalSubscriberWebhookConfig = (request, defaults) => ({
681
681
  const marshalCreateSubscriberRequest = (request, defaults) => ({
682
682
  name: request.name,
683
683
  ...resolveOneOf([{
684
- default: defaults.defaultOrganizationId,
685
- param: 'organization_id',
686
- value: request.organizationId
687
- }, {
688
684
  default: defaults.defaultProjectId,
689
685
  param: 'project_id',
690
686
  value: request.projectId
687
+ }, {
688
+ default: defaults.defaultOrganizationId,
689
+ param: 'organization_id',
690
+ value: request.organizationId
691
691
  }]),
692
692
  ...resolveOneOf([{
693
693
  param: 'email_config',
@@ -869,13 +869,13 @@ const marshalZonedApiCreateFrontendRequest = (request, defaults) => ({
869
869
  const marshalZonedApiCreateIpRequest = (request, defaults) => ({
870
870
  reverse: request.reverse,
871
871
  ...resolveOneOf([{
872
- default: defaults.defaultOrganizationId,
873
- param: 'organization_id',
874
- value: request.organizationId
875
- }, {
876
872
  default: defaults.defaultProjectId,
877
873
  param: 'project_id',
878
874
  value: request.projectId
875
+ }, {
876
+ default: defaults.defaultOrganizationId,
877
+ param: 'organization_id',
878
+ value: request.organizationId
879
879
  }])
880
880
  });
881
881
  const marshalZonedApiCreateLbRequest = (request, defaults) => ({
@@ -887,13 +887,13 @@ const marshalZonedApiCreateLbRequest = (request, defaults) => ({
887
887
  tags: request.tags,
888
888
  type: request.type,
889
889
  ...resolveOneOf([{
890
- default: defaults.defaultOrganizationId,
891
- param: 'organization_id',
892
- value: request.organizationId
893
- }, {
894
890
  default: defaults.defaultProjectId,
895
891
  param: 'project_id',
896
892
  value: request.projectId
893
+ }, {
894
+ default: defaults.defaultOrganizationId,
895
+ param: 'organization_id',
896
+ value: request.organizationId
897
897
  }])
898
898
  });
899
899
  const marshalZonedApiCreateRouteRequest = (request, defaults) => ({
@@ -904,13 +904,13 @@ const marshalZonedApiCreateRouteRequest = (request, defaults) => ({
904
904
  const marshalZonedApiCreateSubscriberRequest = (request, defaults) => ({
905
905
  name: request.name,
906
906
  ...resolveOneOf([{
907
- default: defaults.defaultOrganizationId,
908
- param: 'organization_id',
909
- value: request.organizationId
910
- }, {
911
907
  default: defaults.defaultProjectId,
912
908
  param: 'project_id',
913
909
  value: request.projectId
910
+ }, {
911
+ default: defaults.defaultOrganizationId,
912
+ param: 'organization_id',
913
+ value: request.organizationId
914
914
  }]),
915
915
  ...resolveOneOf([{
916
916
  param: 'email_config',
@@ -568,13 +568,13 @@ const marshalCreateInstanceRequest = (request, defaults) => ({
568
568
  volume_size: request.volumeSize,
569
569
  volume_type: request.volumeType,
570
570
  ...resolveOneOf([{
571
- default: defaults.defaultOrganizationId,
572
- param: 'organization_id',
573
- value: request.organizationId
574
- }, {
575
571
  default: defaults.defaultProjectId,
576
572
  param: 'project_id',
577
573
  value: request.projectId
574
+ }, {
575
+ default: defaults.defaultOrganizationId,
576
+ param: 'organization_id',
577
+ value: request.organizationId
578
578
  }])
579
579
  });
580
580
  const marshalReadReplicaEndpointSpecPrivateNetworkIpamConfig = (request, defaults) => ({});
@@ -88,13 +88,13 @@ const marshalCreateNamespaceRequest = (request, defaults) => ({
88
88
  is_public: request.isPublic,
89
89
  name: request.name || randomName('ns'),
90
90
  ...resolveOneOf([{
91
- default: defaults.defaultOrganizationId,
92
- param: 'organization_id',
93
- value: request.organizationId
94
- }, {
95
91
  default: defaults.defaultProjectId,
96
92
  param: 'project_id',
97
93
  value: request.projectId
94
+ }, {
95
+ default: defaults.defaultOrganizationId,
96
+ param: 'organization_id',
97
+ value: request.organizationId
98
98
  }])
99
99
  });
100
100
  const marshalUpdateImageRequest = (request, defaults) => ({
@@ -12,7 +12,8 @@ const unmarshalFolder = data => {
12
12
  id: data.id,
13
13
  name: data.name,
14
14
  path: data.path,
15
- projectId: data.project_id
15
+ projectId: data.project_id,
16
+ region: data.region
16
17
  };
17
18
  };
18
19
  const unmarshalSecretVersion = data => {