Skip to content

Commit 08ddfb1

Browse files
author
serverpod_cloud
committed
fix: 7a81e35441b040a311fa1eaca53462fc0e483ece
1 parent c77798e commit 08ddfb1

2 files changed

Lines changed: 18 additions & 24 deletions

File tree

ground_control_client/lib/src/protocol/domains/capsules/models/capsule_resource_config.dart

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ abstract class CapsuleResource implements _i1.SerializableModel {
2929
bool? computeScalingEnabled,
3030
int? computeScalingMinReplicas,
3131
int? computeScalingMaxReplicas,
32-
this.computeSize,
32+
required this.computeSize,
3333
}) : computeRequestCpu = computeRequestCpu ?? '250m',
3434
computeRequestMemory = computeRequestMemory ?? '256Mi',
3535
computeRequestEphemeralStorage = computeRequestEphemeralStorage ?? '1Gi',
@@ -53,7 +53,7 @@ abstract class CapsuleResource implements _i1.SerializableModel {
5353
bool? computeScalingEnabled,
5454
int? computeScalingMinReplicas,
5555
int? computeScalingMaxReplicas,
56-
_i3.ComputeSizeOption? computeSize,
56+
required _i3.ComputeSizeOption computeSize,
5757
}) = _CapsuleResourceImpl;
5858

5959
factory CapsuleResource.fromJson(Map<String, dynamic> jsonSerialization) {
@@ -78,11 +78,9 @@ abstract class CapsuleResource implements _i1.SerializableModel {
7878
jsonSerialization['computeScalingMinReplicas'] as int,
7979
computeScalingMaxReplicas:
8080
jsonSerialization['computeScalingMaxReplicas'] as int,
81-
computeSize: jsonSerialization['computeSize'] == null
82-
? null
83-
: _i3.ComputeSizeOption.fromJson(
84-
(jsonSerialization['computeSize'] as String),
85-
),
81+
computeSize: _i3.ComputeSizeOption.fromJson(
82+
(jsonSerialization['computeSize'] as String),
83+
),
8684
);
8785
}
8886

@@ -125,7 +123,7 @@ abstract class CapsuleResource implements _i1.SerializableModel {
125123
int computeScalingMaxReplicas;
126124

127125
/// The compute size of the capsule.
128-
_i3.ComputeSizeOption? computeSize;
126+
_i3.ComputeSizeOption computeSize;
129127

130128
/// Returns a shallow copy of this [CapsuleResource]
131129
/// with some or all fields replaced by the given arguments.
@@ -161,7 +159,7 @@ abstract class CapsuleResource implements _i1.SerializableModel {
161159
'computeScalingEnabled': computeScalingEnabled,
162160
'computeScalingMinReplicas': computeScalingMinReplicas,
163161
'computeScalingMaxReplicas': computeScalingMaxReplicas,
164-
if (computeSize != null) 'computeSize': computeSize?.toJson(),
162+
'computeSize': computeSize.toJson(),
165163
};
166164
}
167165

@@ -187,7 +185,7 @@ class _CapsuleResourceImpl extends CapsuleResource {
187185
bool? computeScalingEnabled,
188186
int? computeScalingMinReplicas,
189187
int? computeScalingMaxReplicas,
190-
_i3.ComputeSizeOption? computeSize,
188+
required _i3.ComputeSizeOption computeSize,
191189
}) : super._(
192190
id: id,
193191
cloudCapsuleId: cloudCapsuleId,
@@ -221,7 +219,7 @@ class _CapsuleResourceImpl extends CapsuleResource {
221219
bool? computeScalingEnabled,
222220
int? computeScalingMinReplicas,
223221
int? computeScalingMaxReplicas,
224-
Object? computeSize = _Undefined,
222+
_i3.ComputeSizeOption? computeSize,
225223
}) {
226224
return CapsuleResource(
227225
id: id is int? ? id : this.id,
@@ -241,9 +239,7 @@ class _CapsuleResourceImpl extends CapsuleResource {
241239
computeScalingMinReplicas ?? this.computeScalingMinReplicas,
242240
computeScalingMaxReplicas:
243241
computeScalingMaxReplicas ?? this.computeScalingMaxReplicas,
244-
computeSize: computeSize is _i3.ComputeSizeOption?
245-
? computeSize
246-
: this.computeSize,
242+
computeSize: computeSize ?? this.computeSize,
247243
);
248244
}
249245
}

ground_control_client/lib/src/protocol/features/capsules/models/compute_info.dart

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ import 'package:serverpod_client/serverpod_client.dart' as _i1;
1515
abstract class ComputeInfo implements _i1.SerializableModel {
1616
ComputeInfo._({
1717
required this.cloudCapsuleId,
18-
this.size,
18+
required this.size,
1919
required this.minInstances,
2020
required this.maxInstances,
2121
required this.memoryMb,
2222
});
2323

2424
factory ComputeInfo({
2525
required String cloudCapsuleId,
26-
String? size,
26+
required String size,
2727
required int minInstances,
2828
required int maxInstances,
2929
required int memoryMb,
@@ -32,7 +32,7 @@ abstract class ComputeInfo implements _i1.SerializableModel {
3232
factory ComputeInfo.fromJson(Map<String, dynamic> jsonSerialization) {
3333
return ComputeInfo(
3434
cloudCapsuleId: jsonSerialization['cloudCapsuleId'] as String,
35-
size: jsonSerialization['size'] as String?,
35+
size: jsonSerialization['size'] as String,
3636
minInstances: jsonSerialization['minInstances'] as int,
3737
maxInstances: jsonSerialization['maxInstances'] as int,
3838
memoryMb: jsonSerialization['memoryMb'] as int,
@@ -43,7 +43,7 @@ abstract class ComputeInfo implements _i1.SerializableModel {
4343
String cloudCapsuleId;
4444

4545
/// The size of the capsule compute. small, medium, large.
46-
String? size;
46+
String size;
4747

4848
/// The minimum number of instances the capsule can scale to.
4949
int minInstances;
@@ -69,7 +69,7 @@ abstract class ComputeInfo implements _i1.SerializableModel {
6969
return {
7070
'__className__': 'ComputeInfo',
7171
'cloudCapsuleId': cloudCapsuleId,
72-
if (size != null) 'size': size,
72+
'size': size,
7373
'minInstances': minInstances,
7474
'maxInstances': maxInstances,
7575
'memoryMb': memoryMb,
@@ -82,12 +82,10 @@ abstract class ComputeInfo implements _i1.SerializableModel {
8282
}
8383
}
8484

85-
class _Undefined {}
86-
8785
class _ComputeInfoImpl extends ComputeInfo {
8886
_ComputeInfoImpl({
8987
required String cloudCapsuleId,
90-
String? size,
88+
required String size,
9189
required int minInstances,
9290
required int maxInstances,
9391
required int memoryMb,
@@ -105,14 +103,14 @@ class _ComputeInfoImpl extends ComputeInfo {
105103
@override
106104
ComputeInfo copyWith({
107105
String? cloudCapsuleId,
108-
Object? size = _Undefined,
106+
String? size,
109107
int? minInstances,
110108
int? maxInstances,
111109
int? memoryMb,
112110
}) {
113111
return ComputeInfo(
114112
cloudCapsuleId: cloudCapsuleId ?? this.cloudCapsuleId,
115-
size: size is String? ? size : this.size,
113+
size: size ?? this.size,
116114
minInstances: minInstances ?? this.minInstances,
117115
maxInstances: maxInstances ?? this.maxInstances,
118116
memoryMb: memoryMb ?? this.memoryMb,

0 commit comments

Comments
 (0)