Skip to content

Commit

Permalink
fix: space proto memory 1
Browse files Browse the repository at this point in the history
  • Loading branch information
l-loic committed Jun 17, 2024
1 parent 3e9ccf1 commit 72a0d8c
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions go/github.com/jupyter-naas/naas-models/go/space/space.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions protos/space.proto
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ message Container {
ignore_empty: false;
}];
optional string memory = 6 [(validate.rules).string = {
pattern: "^[0-9]+(Mi|Gi|Ki)$";
pattern: "^[1-9]+(Mi|Gi|Ki)$";
ignore_empty: false;
}];
}
Expand All @@ -50,7 +50,7 @@ message ContainerUpdate {
ignore_empty: false;
}];
optional string memory = 6 [(validate.rules).string = {
pattern: "^[0-9]+(Mi|Gi|Ki)$";
pattern: "^[1-9]+(Mi|Gi|Ki)$";
ignore_empty: false;
}];
}
Expand All @@ -74,7 +74,7 @@ message ContainerUpdate {
// ignore_empty: false;
// }];
// optional string memory = 6 [(validate.rules).string = {
// pattern: "^[0-9]+Mi$";
// pattern: "^[1-9]+Mi$";
// ignore_empty: false;
// }];
// }
Expand Down
4 changes: 2 additions & 2 deletions python/naas_models/pydantic/space_p2p.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ class Container(BaseModel):
env: typing.Dict[str, str] = Field(default_factory=dict)
port: typing.Optional[int] = Field(default=0, ge=0, le=65535)
cpu: typing.Optional[str] = Field(default="", pattern="^[1-9]+(.[1-9]+)?[m]?$")
memory: typing.Optional[str] = Field(default="", pattern="^[0-9]+(Mi|Gi|Ki)$")
memory: typing.Optional[str] = Field(default="", pattern="^[1-9]+(Mi|Gi|Ki)$")

class ContainerUpdate(BaseModel):
name: typing.Optional[str] = Field(default="", min_length=1, max_length=63, pattern="^([A-Za-z0-9-]+)$")
image: typing.Optional[str] = Field(default="", min_length=1, pattern="^[a-zA-Z0-9\\.\\/-]+([:][a-zA-Z0-9\\.\\/-]*)?$")
env: typing.Dict[str, str] = Field(default_factory=dict)
port: typing.Optional[int] = Field(default=0, ge=0, le=65535)
cpu: typing.Optional[str] = Field(default="", pattern="^[1-9]+(.[1-9]+)?[m]?$")
memory: typing.Optional[str] = Field(default="", pattern="^[0-9]+(Mi|Gi|Ki)$")
memory: typing.Optional[str] = Field(default="", pattern="^[1-9]+(Mi|Gi|Ki)$")

class Space(BaseModel):
name: typing.Optional[str] = Field(default="", min_length=1, max_length=63, pattern="^([A-Za-z0-9]+(-[A-Za-z0-9]+)+)$")
Expand Down
6 changes: 3 additions & 3 deletions python/naas_models/space_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 72a0d8c

Please sign in to comment.