diff --git a/api/ateapi/v1/ateapi.pb.go b/api/ateapi/v1/ateapi.pb.go index d63c010fb1..e590e0b81b 100644 --- a/api/ateapi/v1/ateapi.pb.go +++ b/api/ateapi/v1/ateapi.pb.go @@ -1117,9 +1117,9 @@ type ExternalVolumeStatus struct { // +k8s:update=NoUnset // +k8s:customValidation # no control characters StorageVolumeId string `protobuf:"bytes,2,opt,name=storage_volume_id,json=storageVolumeId,proto3" json:"storage_volume_id,omitempty"` - // Internal volume plugin name or CSI driver name, from the StorageClass - // provisioner. Must be a DNS subdomain, optionally prefixed with - // "substrate.io/" (per the CSI spec's driver-name syntax). + // Internal volume plugin name or CSI driver name, from the + // ExternalVolumeClass driver_name. Must be a DNS subdomain, optionally + // prefixed with "substrate.io/" (per the CSI spec's driver-name syntax). // // +k8s:required // +k8s:maxLength=253 @@ -1135,6 +1135,15 @@ type ExternalVolumeStatus struct { // +k8s:optional // +k8s:customValidation # at most 40 KiB in total, ten times the CSI limit for map fields VolumeContext map[string]string `protobuf:"bytes,4,rep,name=volume_context,json=volumeContext,proto3" json:"volume_context,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + // mount_options from the volume's class, passed to the CSI driver as + // VolumeCapability.Mount.MountFlags at mount time. + // + // +k8s:optional + // +k8s:maxItems=32 + // +k8s:listType=atomic + // +k8s:eachVal=+k8s:minLength=1 + // +k8s:eachVal=+k8s:maxLength=256 + MountOptions []string `protobuf:"bytes,5,rep,name=mount_options,json=mountOptions,proto3" json:"mount_options,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -1197,6 +1206,13 @@ func (x *ExternalVolumeStatus) GetVolumeContext() map[string]string { return nil } +func (x *ExternalVolumeStatus) GetMountOptions() []string { + if x != nil { + return x.MountOptions + } + return nil +} + type Actor struct { state protoimpl.MessageState `protogen:"open.v1"` // Common resource metadata: atespace, name, uid, version, timestamps. @@ -3993,14 +4009,20 @@ type ExternalVolumeTemplate struct { // +k8s:required // +k8s:minimum=1 CapacityBytes int64 `protobuf:"varint,1,opt,name=capacity_bytes,json=capacityBytes,proto3" json:"capacity_bytes,omitempty"` - // storage_class_name names the cluster-scoped Kubernetes StorageClass to - // create the volume from. Required. + // Deprecated: unsupported; use external_volume_class. // - // +k8s:required - // +k8s:format=k8s-long-name + // +k8s:beta(since: "0.0")=+k8s:forbidden # TODO: get rid of beta prefix + // + // Deprecated: Marked as deprecated in api/ateapi/v1/ateapi.proto. StorageClassName string `protobuf:"bytes,2,opt,name=storage_class_name,json=storageClassName,proto3" json:"storage_class_name,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + // external_volume_class names the ExternalVolumeClass to create the volume + // from. atespace must be empty. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ExternalVolumeClass *ObjectRef `protobuf:"bytes,3,opt,name=external_volume_class,json=externalVolumeClass,proto3" json:"external_volume_class,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ExternalVolumeTemplate) Reset() { @@ -4040,6 +4062,7 @@ func (x *ExternalVolumeTemplate) GetCapacityBytes() int64 { return 0 } +// Deprecated: Marked as deprecated in api/ateapi/v1/ateapi.proto. func (x *ExternalVolumeTemplate) GetStorageClassName() string { if x != nil { return x.StorageClassName @@ -4047,6 +4070,110 @@ func (x *ExternalVolumeTemplate) GetStorageClassName() string { return "" } +func (x *ExternalVolumeTemplate) GetExternalVolumeClass() *ObjectRef { + if x != nil { + return x.ExternalVolumeClass + } + return nil +} + +// ExternalVolumeClass names the CSI driver that provisions external volumes +// and the parameters for its CreateVolume call. Global-scoped and immutable: +// metadata.atespace must be empty. +type ExternalVolumeClass struct { + state protoimpl.MessageState `protogen:"open.v1"` + // Common resource metadata: name, uid, version, timestamps. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + Metadata *ResourceMetadata `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"` + // driver_name is the CSI driver that provisions the volumes, e.g. + // "nfs.csi.k8s.io". It is a DNS subdomain, optionally prefixed with + // "substrate.io/". + // + // +k8s:required + // +k8s:maxLength=63 + // +k8s:customValidation # optional "substrate.io/" prefix + DNS-1123 subdomain + DriverName string `protobuf:"bytes,2,opt,name=driver_name,json=driverName,proto3" json:"driver_name,omitempty"` + // parameters are passed unchanged to the driver's CreateVolume call. The + // driver defines their keys and values, so they are only bounded in size. + // + // +k8s:optional + // +k8s:maxProperties=32 + // +k8s:eachKey=+k8s:maxLength=128 + // +k8s:eachVal=+k8s:maxLength=256 + Parameters map[string]string `protobuf:"bytes,3,rep,name=parameters,proto3" json:"parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + // mount_options are passed to the CSI driver as + // VolumeCapability.Mount.MountFlags at mount time. + // + // +k8s:optional + // +k8s:maxItems=32 + // +k8s:listType=atomic + // +k8s:eachVal=+k8s:minLength=1 + // +k8s:eachVal=+k8s:maxLength=256 + MountOptions []string `protobuf:"bytes,4,rep,name=mount_options,json=mountOptions,proto3" json:"mount_options,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ExternalVolumeClass) Reset() { + *x = ExternalVolumeClass{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[44] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ExternalVolumeClass) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ExternalVolumeClass) ProtoMessage() {} + +func (x *ExternalVolumeClass) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[44] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ExternalVolumeClass.ProtoReflect.Descriptor instead. +func (*ExternalVolumeClass) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{44} +} + +func (x *ExternalVolumeClass) GetMetadata() *ResourceMetadata { + if x != nil { + return x.Metadata + } + return nil +} + +func (x *ExternalVolumeClass) GetDriverName() string { + if x != nil { + return x.DriverName + } + return "" +} + +func (x *ExternalVolumeClass) GetParameters() map[string]string { + if x != nil { + return x.Parameters + } + return nil +} + +func (x *ExternalVolumeClass) GetMountOptions() []string { + if x != nil { + return x.MountOptions + } + return nil +} + // SystemInfoVolumeSource is a read-only volume of substrate-generated // per-actor files (identity fields, projected trust bundles), regenerated by // atelet on every Run/Restore. @@ -4067,7 +4194,7 @@ type SystemInfoVolumeSource struct { func (x *SystemInfoVolumeSource) Reset() { *x = SystemInfoVolumeSource{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[44] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[45] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4079,7 +4206,7 @@ func (x *SystemInfoVolumeSource) String() string { func (*SystemInfoVolumeSource) ProtoMessage() {} func (x *SystemInfoVolumeSource) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[44] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[45] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4092,7 +4219,7 @@ func (x *SystemInfoVolumeSource) ProtoReflect() protoreflect.Message { // Deprecated: Use SystemInfoVolumeSource.ProtoReflect.Descriptor instead. func (*SystemInfoVolumeSource) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{44} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{45} } func (x *SystemInfoVolumeSource) GetDataSources() []*SystemInfoDataSource { @@ -4118,7 +4245,7 @@ type SystemInfoDataSource struct { func (x *SystemInfoDataSource) Reset() { *x = SystemInfoDataSource{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[45] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[46] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4130,7 +4257,7 @@ func (x *SystemInfoDataSource) String() string { func (*SystemInfoDataSource) ProtoMessage() {} func (x *SystemInfoDataSource) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[45] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[46] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4143,7 +4270,7 @@ func (x *SystemInfoDataSource) ProtoReflect() protoreflect.Message { // Deprecated: Use SystemInfoDataSource.ProtoReflect.Descriptor instead. func (*SystemInfoDataSource) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{45} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{46} } func (x *SystemInfoDataSource) GetActorMetadata() *ActorMetadataDataSource { @@ -4180,7 +4307,7 @@ type ActorMetadataDataSource struct { func (x *ActorMetadataDataSource) Reset() { *x = ActorMetadataDataSource{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[46] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[47] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4192,7 +4319,7 @@ func (x *ActorMetadataDataSource) String() string { func (*ActorMetadataDataSource) ProtoMessage() {} func (x *ActorMetadataDataSource) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[46] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[47] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4205,7 +4332,7 @@ func (x *ActorMetadataDataSource) ProtoReflect() protoreflect.Message { // Deprecated: Use ActorMetadataDataSource.ProtoReflect.Descriptor instead. func (*ActorMetadataDataSource) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{46} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{47} } func (x *ActorMetadataDataSource) GetItems() []*ActorMetadataItem { @@ -4237,7 +4364,7 @@ type ActorMetadataItem struct { func (x *ActorMetadataItem) Reset() { *x = ActorMetadataItem{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[47] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[48] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4249,7 +4376,7 @@ func (x *ActorMetadataItem) String() string { func (*ActorMetadataItem) ProtoMessage() {} func (x *ActorMetadataItem) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[47] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[48] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4262,7 +4389,7 @@ func (x *ActorMetadataItem) ProtoReflect() protoreflect.Message { // Deprecated: Use ActorMetadataItem.ProtoReflect.Descriptor instead. func (*ActorMetadataItem) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{47} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{48} } func (x *ActorMetadataItem) GetField() ActorMetadataField { @@ -4314,7 +4441,7 @@ type TrustBundleDataSource struct { func (x *TrustBundleDataSource) Reset() { *x = TrustBundleDataSource{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[48] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[49] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4326,7 +4453,7 @@ func (x *TrustBundleDataSource) String() string { func (*TrustBundleDataSource) ProtoMessage() {} func (x *TrustBundleDataSource) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[48] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[49] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4339,7 +4466,7 @@ func (x *TrustBundleDataSource) ProtoReflect() protoreflect.Message { // Deprecated: Use TrustBundleDataSource.ProtoReflect.Descriptor instead. func (*TrustBundleDataSource) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{48} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{49} } func (x *TrustBundleDataSource) GetNames() []string { @@ -4379,7 +4506,7 @@ type VolumeMount struct { func (x *VolumeMount) Reset() { *x = VolumeMount{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[49] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[50] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4391,7 +4518,7 @@ func (x *VolumeMount) String() string { func (*VolumeMount) ProtoMessage() {} func (x *VolumeMount) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[49] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[50] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4404,7 +4531,7 @@ func (x *VolumeMount) ProtoReflect() protoreflect.Message { // Deprecated: Use VolumeMount.ProtoReflect.Descriptor instead. func (*VolumeMount) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{49} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{50} } func (x *VolumeMount) GetName() string { @@ -4433,7 +4560,7 @@ type CreateAtespaceRequest struct { func (x *CreateAtespaceRequest) Reset() { *x = CreateAtespaceRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[50] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[51] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4445,7 +4572,7 @@ func (x *CreateAtespaceRequest) String() string { func (*CreateAtespaceRequest) ProtoMessage() {} func (x *CreateAtespaceRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[50] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[51] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4458,7 +4585,7 @@ func (x *CreateAtespaceRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateAtespaceRequest.ProtoReflect.Descriptor instead. func (*CreateAtespaceRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{50} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{51} } func (x *CreateAtespaceRequest) GetAtespace() *Atespace { @@ -4479,7 +4606,7 @@ type GetAtespaceRequest struct { func (x *GetAtespaceRequest) Reset() { *x = GetAtespaceRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[51] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[52] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4491,7 +4618,7 @@ func (x *GetAtespaceRequest) String() string { func (*GetAtespaceRequest) ProtoMessage() {} func (x *GetAtespaceRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[51] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[52] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4504,7 +4631,7 @@ func (x *GetAtespaceRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetAtespaceRequest.ProtoReflect.Descriptor instead. func (*GetAtespaceRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{51} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{52} } func (x *GetAtespaceRequest) GetAtespace() *ObjectRef { @@ -4526,7 +4653,7 @@ type ListAtespacesRequest struct { func (x *ListAtespacesRequest) Reset() { *x = ListAtespacesRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[52] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[53] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4538,7 +4665,7 @@ func (x *ListAtespacesRequest) String() string { func (*ListAtespacesRequest) ProtoMessage() {} func (x *ListAtespacesRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[52] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[53] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4551,7 +4678,7 @@ func (x *ListAtespacesRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListAtespacesRequest.ProtoReflect.Descriptor instead. func (*ListAtespacesRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{52} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{53} } func (x *ListAtespacesRequest) GetOptions() *ListOptions { @@ -4573,7 +4700,7 @@ type ListAtespacesResponse struct { func (x *ListAtespacesResponse) Reset() { *x = ListAtespacesResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[53] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[54] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4585,7 +4712,7 @@ func (x *ListAtespacesResponse) String() string { func (*ListAtespacesResponse) ProtoMessage() {} func (x *ListAtespacesResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[53] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[54] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4598,7 +4725,7 @@ func (x *ListAtespacesResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListAtespacesResponse.ProtoReflect.Descriptor instead. func (*ListAtespacesResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{53} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{54} } func (x *ListAtespacesResponse) GetAtespaces() []*Atespace { @@ -4630,7 +4757,7 @@ type DeleteAtespaceRequest struct { func (x *DeleteAtespaceRequest) Reset() { *x = DeleteAtespaceRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[54] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[55] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4642,7 +4769,7 @@ func (x *DeleteAtespaceRequest) String() string { func (*DeleteAtespaceRequest) ProtoMessage() {} func (x *DeleteAtespaceRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[54] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[55] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4655,7 +4782,7 @@ func (x *DeleteAtespaceRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteAtespaceRequest.ProtoReflect.Descriptor instead. func (*DeleteAtespaceRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{54} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{55} } func (x *DeleteAtespaceRequest) GetAtespace() *ObjectRef { @@ -4672,33 +4799,35 @@ func (x *DeleteAtespaceRequest) GetOptions() *DeleteOptions { return nil } -type CreateActorTemplateRequest struct { +// CreateExternalVolumeClassRequest creates an ExternalVolumeClass. +type CreateExternalVolumeClassRequest struct { state protoimpl.MessageState `protogen:"open.v1"` - // The actor template version to create. Server-assigned metadata (uid, - // version, timestamps) is ignored, as are the status fields. + // The class to create. metadata.name is required and metadata.atespace + // must be empty. // + // +ate:preview=ExternalVolumes + // +k8s:ifDisabled(ExternalVolumes)=+k8s:forbidden // +k8s:required - // +k8s:customValidation # volume_mounts must reference declared volumes; golden policy requires golden snapshots - ActorTemplate *ActorTemplate `protobuf:"bytes,1,opt,name=actor_template,json=actorTemplate,proto3" json:"actor_template,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + ExternalVolumeClass *ExternalVolumeClass `protobuf:"bytes,1,opt,name=external_volume_class,json=externalVolumeClass,proto3" json:"external_volume_class,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } -func (x *CreateActorTemplateRequest) Reset() { - *x = CreateActorTemplateRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[55] +func (x *CreateExternalVolumeClassRequest) Reset() { + *x = CreateExternalVolumeClassRequest{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[56] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *CreateActorTemplateRequest) String() string { +func (x *CreateExternalVolumeClassRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*CreateActorTemplateRequest) ProtoMessage() {} +func (*CreateExternalVolumeClassRequest) ProtoMessage() {} -func (x *CreateActorTemplateRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[55] +func (x *CreateExternalVolumeClassRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[56] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4709,42 +4838,45 @@ func (x *CreateActorTemplateRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use CreateActorTemplateRequest.ProtoReflect.Descriptor instead. -func (*CreateActorTemplateRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{55} +// Deprecated: Use CreateExternalVolumeClassRequest.ProtoReflect.Descriptor instead. +func (*CreateExternalVolumeClassRequest) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{56} } -func (x *CreateActorTemplateRequest) GetActorTemplate() *ActorTemplate { +func (x *CreateExternalVolumeClassRequest) GetExternalVolumeClass() *ExternalVolumeClass { if x != nil { - return x.ActorTemplate + return x.ExternalVolumeClass } return nil } -type GetActorTemplateRequest struct { +// GetExternalVolumeClassRequest identifies the ExternalVolumeClass to get. +type GetExternalVolumeClassRequest struct { state protoimpl.MessageState `protogen:"open.v1"` + // The class to get. atespace must be empty. + // // +k8s:required - // +k8s:subfield(atespace)=+k8s:required - ActorTemplate *ObjectRef `protobuf:"bytes,1,opt,name=actor_template,json=actorTemplate,proto3" json:"actor_template,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ExternalVolumeClass *ObjectRef `protobuf:"bytes,1,opt,name=external_volume_class,json=externalVolumeClass,proto3" json:"external_volume_class,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } -func (x *GetActorTemplateRequest) Reset() { - *x = GetActorTemplateRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[56] +func (x *GetExternalVolumeClassRequest) Reset() { + *x = GetExternalVolumeClassRequest{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[57] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *GetActorTemplateRequest) String() string { +func (x *GetExternalVolumeClassRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*GetActorTemplateRequest) ProtoMessage() {} +func (*GetExternalVolumeClassRequest) ProtoMessage() {} -func (x *GetActorTemplateRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[56] +func (x *GetExternalVolumeClassRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[57] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4755,49 +4887,44 @@ func (x *GetActorTemplateRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use GetActorTemplateRequest.ProtoReflect.Descriptor instead. -func (*GetActorTemplateRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{56} +// Deprecated: Use GetExternalVolumeClassRequest.ProtoReflect.Descriptor instead. +func (*GetExternalVolumeClassRequest) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{57} } -func (x *GetActorTemplateRequest) GetActorTemplate() *ObjectRef { +func (x *GetExternalVolumeClassRequest) GetExternalVolumeClass() *ObjectRef { if x != nil { - return x.ActorTemplate + return x.ExternalVolumeClass } return nil } -type ListActorTemplatesRequest struct { +// ListExternalVolumeClassesRequest asks for a page of ExternalVolumeClasses. +type ListExternalVolumeClassesRequest struct { state protoimpl.MessageState `protogen:"open.v1"` - // The atespace to list actor templates from. Empty lists across all - // atespaces. - // - // +k8s:optional - // +k8s:format=k8s-short-name - Atespace string `protobuf:"bytes,1,opt,name=atespace,proto3" json:"atespace,omitempty"` // Pagination controls. // // +k8s:optional - Options *ListOptions `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"` + Options *ListOptions `protobuf:"bytes,1,opt,name=options,proto3" json:"options,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } -func (x *ListActorTemplatesRequest) Reset() { - *x = ListActorTemplatesRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[57] +func (x *ListExternalVolumeClassesRequest) Reset() { + *x = ListExternalVolumeClassesRequest{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[58] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ListActorTemplatesRequest) String() string { +func (x *ListExternalVolumeClassesRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ListActorTemplatesRequest) ProtoMessage() {} +func (*ListExternalVolumeClassesRequest) ProtoMessage() {} -func (x *ListActorTemplatesRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[57] +func (x *ListExternalVolumeClassesRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[58] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4808,51 +4935,44 @@ func (x *ListActorTemplatesRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ListActorTemplatesRequest.ProtoReflect.Descriptor instead. -func (*ListActorTemplatesRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{57} -} - -func (x *ListActorTemplatesRequest) GetAtespace() string { - if x != nil { - return x.Atespace - } - return "" +// Deprecated: Use ListExternalVolumeClassesRequest.ProtoReflect.Descriptor instead. +func (*ListExternalVolumeClassesRequest) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{58} } -func (x *ListActorTemplatesRequest) GetOptions() *ListOptions { +func (x *ListExternalVolumeClassesRequest) GetOptions() *ListOptions { if x != nil { return x.Options } return nil } -type ListActorTemplatesResponse struct { +// ListExternalVolumeClassesResponse is one page of ExternalVolumeClasses. +type ListExternalVolumeClassesResponse struct { state protoimpl.MessageState `protogen:"open.v1"` - // The page of actor template versions. This list may be empty even if - // there are more results. - ActorTemplates []*ActorTemplate `protobuf:"bytes,1,rep,name=actor_templates,json=actorTemplates,proto3" json:"actor_templates,omitempty"` + // The page of classes. This list may be empty even if there are more results. + ExternalVolumeClasses []*ExternalVolumeClass `protobuf:"bytes,1,rep,name=external_volume_classes,json=externalVolumeClasses,proto3" json:"external_volume_classes,omitempty"` // Pagination token for the next page. Empty if this is the last page. NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } -func (x *ListActorTemplatesResponse) Reset() { - *x = ListActorTemplatesResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[58] +func (x *ListExternalVolumeClassesResponse) Reset() { + *x = ListExternalVolumeClassesResponse{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[59] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ListActorTemplatesResponse) String() string { +func (x *ListExternalVolumeClassesResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ListActorTemplatesResponse) ProtoMessage() {} +func (*ListExternalVolumeClassesResponse) ProtoMessage() {} -func (x *ListActorTemplatesResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[58] +func (x *ListExternalVolumeClassesResponse) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[59] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4863,26 +4983,296 @@ func (x *ListActorTemplatesResponse) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ListActorTemplatesResponse.ProtoReflect.Descriptor instead. -func (*ListActorTemplatesResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{58} +// Deprecated: Use ListExternalVolumeClassesResponse.ProtoReflect.Descriptor instead. +func (*ListExternalVolumeClassesResponse) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{59} } -func (x *ListActorTemplatesResponse) GetActorTemplates() []*ActorTemplate { +func (x *ListExternalVolumeClassesResponse) GetExternalVolumeClasses() []*ExternalVolumeClass { if x != nil { - return x.ActorTemplates + return x.ExternalVolumeClasses } return nil } -func (x *ListActorTemplatesResponse) GetNextPageToken() string { +func (x *ListExternalVolumeClassesResponse) GetNextPageToken() string { if x != nil { return x.NextPageToken } return "" } -type DeleteActorTemplateRequest struct { +// DeleteExternalVolumeClassRequest identifies the ExternalVolumeClass to delete. +type DeleteExternalVolumeClassRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // The class to delete. atespace must be empty. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ExternalVolumeClass *ObjectRef `protobuf:"bytes,1,opt,name=external_volume_class,json=externalVolumeClass,proto3" json:"external_volume_class,omitempty"` + // Optional per-delete preconditions. + // + // +k8s:optional + Options *DeleteOptions `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *DeleteExternalVolumeClassRequest) Reset() { + *x = DeleteExternalVolumeClassRequest{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[60] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DeleteExternalVolumeClassRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteExternalVolumeClassRequest) ProtoMessage() {} + +func (x *DeleteExternalVolumeClassRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[60] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteExternalVolumeClassRequest.ProtoReflect.Descriptor instead. +func (*DeleteExternalVolumeClassRequest) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{60} +} + +func (x *DeleteExternalVolumeClassRequest) GetExternalVolumeClass() *ObjectRef { + if x != nil { + return x.ExternalVolumeClass + } + return nil +} + +func (x *DeleteExternalVolumeClassRequest) GetOptions() *DeleteOptions { + if x != nil { + return x.Options + } + return nil +} + +type CreateActorTemplateRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // The actor template version to create. Server-assigned metadata (uid, + // version, timestamps) is ignored, as are the status fields. + // + // +k8s:required + // +k8s:customValidation # volume_mounts must reference declared volumes; golden policy requires golden snapshots + ActorTemplate *ActorTemplate `protobuf:"bytes,1,opt,name=actor_template,json=actorTemplate,proto3" json:"actor_template,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CreateActorTemplateRequest) Reset() { + *x = CreateActorTemplateRequest{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[61] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateActorTemplateRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateActorTemplateRequest) ProtoMessage() {} + +func (x *CreateActorTemplateRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[61] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateActorTemplateRequest.ProtoReflect.Descriptor instead. +func (*CreateActorTemplateRequest) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{61} +} + +func (x *CreateActorTemplateRequest) GetActorTemplate() *ActorTemplate { + if x != nil { + return x.ActorTemplate + } + return nil +} + +type GetActorTemplateRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // +k8s:required + // +k8s:subfield(atespace)=+k8s:required + ActorTemplate *ObjectRef `protobuf:"bytes,1,opt,name=actor_template,json=actorTemplate,proto3" json:"actor_template,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *GetActorTemplateRequest) Reset() { + *x = GetActorTemplateRequest{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[62] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *GetActorTemplateRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetActorTemplateRequest) ProtoMessage() {} + +func (x *GetActorTemplateRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[62] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetActorTemplateRequest.ProtoReflect.Descriptor instead. +func (*GetActorTemplateRequest) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{62} +} + +func (x *GetActorTemplateRequest) GetActorTemplate() *ObjectRef { + if x != nil { + return x.ActorTemplate + } + return nil +} + +type ListActorTemplatesRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // The atespace to list actor templates from. Empty lists across all + // atespaces. + // + // +k8s:optional + // +k8s:format=k8s-short-name + Atespace string `protobuf:"bytes,1,opt,name=atespace,proto3" json:"atespace,omitempty"` + // Pagination controls. + // + // +k8s:optional + Options *ListOptions `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ListActorTemplatesRequest) Reset() { + *x = ListActorTemplatesRequest{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[63] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListActorTemplatesRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListActorTemplatesRequest) ProtoMessage() {} + +func (x *ListActorTemplatesRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[63] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListActorTemplatesRequest.ProtoReflect.Descriptor instead. +func (*ListActorTemplatesRequest) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{63} +} + +func (x *ListActorTemplatesRequest) GetAtespace() string { + if x != nil { + return x.Atespace + } + return "" +} + +func (x *ListActorTemplatesRequest) GetOptions() *ListOptions { + if x != nil { + return x.Options + } + return nil +} + +type ListActorTemplatesResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + // The page of actor template versions. This list may be empty even if + // there are more results. + ActorTemplates []*ActorTemplate `protobuf:"bytes,1,rep,name=actor_templates,json=actorTemplates,proto3" json:"actor_templates,omitempty"` + // Pagination token for the next page. Empty if this is the last page. + NextPageToken string `protobuf:"bytes,2,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ListActorTemplatesResponse) Reset() { + *x = ListActorTemplatesResponse{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[64] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListActorTemplatesResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListActorTemplatesResponse) ProtoMessage() {} + +func (x *ListActorTemplatesResponse) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[64] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListActorTemplatesResponse.ProtoReflect.Descriptor instead. +func (*ListActorTemplatesResponse) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{64} +} + +func (x *ListActorTemplatesResponse) GetActorTemplates() []*ActorTemplate { + if x != nil { + return x.ActorTemplates + } + return nil +} + +func (x *ListActorTemplatesResponse) GetNextPageToken() string { + if x != nil { + return x.NextPageToken + } + return "" +} + +type DeleteActorTemplateRequest struct { state protoimpl.MessageState `protogen:"open.v1"` // +k8s:required // +k8s:subfield(atespace)=+k8s:required @@ -4897,7 +5287,7 @@ type DeleteActorTemplateRequest struct { func (x *DeleteActorTemplateRequest) Reset() { *x = DeleteActorTemplateRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[59] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[65] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4909,7 +5299,7 @@ func (x *DeleteActorTemplateRequest) String() string { func (*DeleteActorTemplateRequest) ProtoMessage() {} func (x *DeleteActorTemplateRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[59] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[65] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4922,7 +5312,7 @@ func (x *DeleteActorTemplateRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteActorTemplateRequest.ProtoReflect.Descriptor instead. func (*DeleteActorTemplateRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{59} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{65} } func (x *DeleteActorTemplateRequest) GetActorTemplate() *ObjectRef { @@ -4950,7 +5340,7 @@ type GetActorRequest struct { func (x *GetActorRequest) Reset() { *x = GetActorRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[60] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[66] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4962,7 +5352,7 @@ func (x *GetActorRequest) String() string { func (*GetActorRequest) ProtoMessage() {} func (x *GetActorRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[60] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[66] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4975,7 +5365,7 @@ func (x *GetActorRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetActorRequest.ProtoReflect.Descriptor instead. func (*GetActorRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{60} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{66} } func (x *GetActorRequest) GetActor() *ObjectRef { @@ -4998,7 +5388,7 @@ type CreateActorRequest struct { func (x *CreateActorRequest) Reset() { *x = CreateActorRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[61] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[67] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5010,7 +5400,7 @@ func (x *CreateActorRequest) String() string { func (*CreateActorRequest) ProtoMessage() {} func (x *CreateActorRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[61] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[67] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5023,7 +5413,7 @@ func (x *CreateActorRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateActorRequest.ProtoReflect.Descriptor instead. func (*CreateActorRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{61} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{67} } func (x *CreateActorRequest) GetActor() *Actor { @@ -5054,7 +5444,7 @@ type UpdateActorRequest struct { func (x *UpdateActorRequest) Reset() { *x = UpdateActorRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[62] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[68] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5066,7 +5456,7 @@ func (x *UpdateActorRequest) String() string { func (*UpdateActorRequest) ProtoMessage() {} func (x *UpdateActorRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[62] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[68] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5079,7 +5469,7 @@ func (x *UpdateActorRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateActorRequest.ProtoReflect.Descriptor instead. func (*UpdateActorRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{62} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{68} } func (x *UpdateActorRequest) GetActor() *Actor { @@ -5104,7 +5494,7 @@ type SuspendActorRequest struct { func (x *SuspendActorRequest) Reset() { *x = SuspendActorRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[63] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[69] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5116,7 +5506,7 @@ func (x *SuspendActorRequest) String() string { func (*SuspendActorRequest) ProtoMessage() {} func (x *SuspendActorRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[63] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[69] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5129,7 +5519,7 @@ func (x *SuspendActorRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SuspendActorRequest.ProtoReflect.Descriptor instead. func (*SuspendActorRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{63} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{69} } func (x *SuspendActorRequest) GetActor() *ObjectRef { @@ -5155,7 +5545,7 @@ type SuspendActorResponse struct { func (x *SuspendActorResponse) Reset() { *x = SuspendActorResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[64] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[70] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5167,7 +5557,7 @@ func (x *SuspendActorResponse) String() string { func (*SuspendActorResponse) ProtoMessage() {} func (x *SuspendActorResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[64] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[70] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5180,7 +5570,7 @@ func (x *SuspendActorResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use SuspendActorResponse.ProtoReflect.Descriptor instead. func (*SuspendActorResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{64} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{70} } func (x *SuspendActorResponse) GetActor() *Actor { @@ -5206,7 +5596,7 @@ type SuspendOptions struct { func (x *SuspendOptions) Reset() { *x = SuspendOptions{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[65] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[71] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5218,7 +5608,7 @@ func (x *SuspendOptions) String() string { func (*SuspendOptions) ProtoMessage() {} func (x *SuspendOptions) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[65] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[71] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5231,7 +5621,7 @@ func (x *SuspendOptions) ProtoReflect() protoreflect.Message { // Deprecated: Use SuspendOptions.ProtoReflect.Descriptor instead. func (*SuspendOptions) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{65} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{71} } func (x *SuspendOptions) GetMode() DurabilityMode { @@ -5252,7 +5642,7 @@ type ResumeActorRequest struct { func (x *ResumeActorRequest) Reset() { *x = ResumeActorRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[66] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[72] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5264,7 +5654,7 @@ func (x *ResumeActorRequest) String() string { func (*ResumeActorRequest) ProtoMessage() {} func (x *ResumeActorRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[66] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[72] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5277,7 +5667,7 @@ func (x *ResumeActorRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ResumeActorRequest.ProtoReflect.Descriptor instead. func (*ResumeActorRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{66} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{72} } func (x *ResumeActorRequest) GetActor() *ObjectRef { @@ -5299,7 +5689,7 @@ type ResumeActorResponse struct { func (x *ResumeActorResponse) Reset() { *x = ResumeActorResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[67] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[73] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5311,7 +5701,7 @@ func (x *ResumeActorResponse) String() string { func (*ResumeActorResponse) ProtoMessage() {} func (x *ResumeActorResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[67] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[73] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5324,7 +5714,7 @@ func (x *ResumeActorResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ResumeActorResponse.ProtoReflect.Descriptor instead. func (*ResumeActorResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{67} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{73} } func (x *ResumeActorResponse) GetActor() *Actor { @@ -5354,7 +5744,7 @@ type RevertActorRequest struct { func (x *RevertActorRequest) Reset() { *x = RevertActorRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[68] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[74] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5366,7 +5756,7 @@ func (x *RevertActorRequest) String() string { func (*RevertActorRequest) ProtoMessage() {} func (x *RevertActorRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[68] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[74] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5379,7 +5769,7 @@ func (x *RevertActorRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use RevertActorRequest.ProtoReflect.Descriptor instead. func (*RevertActorRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{68} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{74} } func (x *RevertActorRequest) GetActor() *ObjectRef { @@ -5401,7 +5791,7 @@ type RevertActorResponse struct { func (x *RevertActorResponse) Reset() { *x = RevertActorResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[69] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[75] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5413,7 +5803,7 @@ func (x *RevertActorResponse) String() string { func (*RevertActorResponse) ProtoMessage() {} func (x *RevertActorResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[69] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[75] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5426,7 +5816,7 @@ func (x *RevertActorResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use RevertActorResponse.ProtoReflect.Descriptor instead. func (*RevertActorResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{69} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{75} } func (x *RevertActorResponse) GetActor() *Actor { @@ -5451,7 +5841,7 @@ type DeleteActorRequest struct { func (x *DeleteActorRequest) Reset() { *x = DeleteActorRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[70] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[76] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5463,7 +5853,7 @@ func (x *DeleteActorRequest) String() string { func (*DeleteActorRequest) ProtoMessage() {} func (x *DeleteActorRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[70] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[76] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5476,7 +5866,7 @@ func (x *DeleteActorRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteActorRequest.ProtoReflect.Descriptor instead. func (*DeleteActorRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{70} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{76} } func (x *DeleteActorRequest) GetActor() *ObjectRef { @@ -5513,7 +5903,7 @@ type GetActorEgressPolicyRequest struct { func (x *GetActorEgressPolicyRequest) Reset() { *x = GetActorEgressPolicyRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[71] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[77] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5525,7 +5915,7 @@ func (x *GetActorEgressPolicyRequest) String() string { func (*GetActorEgressPolicyRequest) ProtoMessage() {} func (x *GetActorEgressPolicyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[71] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[77] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5538,7 +5928,7 @@ func (x *GetActorEgressPolicyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetActorEgressPolicyRequest.ProtoReflect.Descriptor instead. func (*GetActorEgressPolicyRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{71} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{77} } func (x *GetActorEgressPolicyRequest) GetActor() *ObjectRef { @@ -5576,7 +5966,7 @@ type CreateActorEgressPolicyRequest struct { func (x *CreateActorEgressPolicyRequest) Reset() { *x = CreateActorEgressPolicyRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[72] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[78] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5588,7 +5978,7 @@ func (x *CreateActorEgressPolicyRequest) String() string { func (*CreateActorEgressPolicyRequest) ProtoMessage() {} func (x *CreateActorEgressPolicyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[72] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[78] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5601,7 +5991,7 @@ func (x *CreateActorEgressPolicyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateActorEgressPolicyRequest.ProtoReflect.Descriptor instead. func (*CreateActorEgressPolicyRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{72} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{78} } func (x *CreateActorEgressPolicyRequest) GetActor() *ObjectRef { @@ -5639,7 +6029,7 @@ type UpdateActorEgressPolicyRequest struct { func (x *UpdateActorEgressPolicyRequest) Reset() { *x = UpdateActorEgressPolicyRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[73] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[79] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5651,7 +6041,7 @@ func (x *UpdateActorEgressPolicyRequest) String() string { func (*UpdateActorEgressPolicyRequest) ProtoMessage() {} func (x *UpdateActorEgressPolicyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[73] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[79] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5664,7 +6054,7 @@ func (x *UpdateActorEgressPolicyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateActorEgressPolicyRequest.ProtoReflect.Descriptor instead. func (*UpdateActorEgressPolicyRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{73} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{79} } func (x *UpdateActorEgressPolicyRequest) GetActor() *ObjectRef { @@ -5705,7 +6095,7 @@ type DeleteActorEgressPolicyRequest struct { func (x *DeleteActorEgressPolicyRequest) Reset() { *x = DeleteActorEgressPolicyRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[74] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[80] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5717,7 +6107,7 @@ func (x *DeleteActorEgressPolicyRequest) String() string { func (*DeleteActorEgressPolicyRequest) ProtoMessage() {} func (x *DeleteActorEgressPolicyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[74] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[80] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5730,7 +6120,7 @@ func (x *DeleteActorEgressPolicyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteActorEgressPolicyRequest.ProtoReflect.Descriptor instead. func (*DeleteActorEgressPolicyRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{74} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{80} } func (x *DeleteActorEgressPolicyRequest) GetActor() *ObjectRef { @@ -5765,7 +6155,7 @@ type GetTagRequest struct { func (x *GetTagRequest) Reset() { *x = GetTagRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[75] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[81] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5777,7 +6167,7 @@ func (x *GetTagRequest) String() string { func (*GetTagRequest) ProtoMessage() {} func (x *GetTagRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[75] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[81] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5790,7 +6180,7 @@ func (x *GetTagRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetTagRequest.ProtoReflect.Descriptor instead. func (*GetTagRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{75} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{81} } func (x *GetTagRequest) GetTag() *ObjectRef { @@ -5829,7 +6219,7 @@ type MintActorJwtRequest struct { func (x *MintActorJwtRequest) Reset() { *x = MintActorJwtRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[76] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[82] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5841,7 +6231,7 @@ func (x *MintActorJwtRequest) String() string { func (*MintActorJwtRequest) ProtoMessage() {} func (x *MintActorJwtRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[76] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[82] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5854,7 +6244,7 @@ func (x *MintActorJwtRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use MintActorJwtRequest.ProtoReflect.Descriptor instead. func (*MintActorJwtRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{76} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{82} } func (x *MintActorJwtRequest) GetActor() *ObjectRef { @@ -5909,7 +6299,7 @@ type MintActorJwtResponse struct { func (x *MintActorJwtResponse) Reset() { *x = MintActorJwtResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[77] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[83] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5921,7 +6311,7 @@ func (x *MintActorJwtResponse) String() string { func (*MintActorJwtResponse) ProtoMessage() {} func (x *MintActorJwtResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[77] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[83] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5934,7 +6324,7 @@ func (x *MintActorJwtResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MintActorJwtResponse.ProtoReflect.Descriptor instead. func (*MintActorJwtResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{77} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{83} } func (x *MintActorJwtResponse) GetActorJwt() string { @@ -5968,7 +6358,7 @@ type ListTagsRequest struct { func (x *ListTagsRequest) Reset() { *x = ListTagsRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[78] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[84] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5980,7 +6370,7 @@ func (x *ListTagsRequest) String() string { func (*ListTagsRequest) ProtoMessage() {} func (x *ListTagsRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[78] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[84] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5993,7 +6383,7 @@ func (x *ListTagsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListTagsRequest.ProtoReflect.Descriptor instead. func (*ListTagsRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{78} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{84} } func (x *ListTagsRequest) GetAtespace() string { @@ -6020,7 +6410,7 @@ type ListTagsResponse struct { func (x *ListTagsResponse) Reset() { *x = ListTagsResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[79] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[85] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6032,7 +6422,7 @@ func (x *ListTagsResponse) String() string { func (*ListTagsResponse) ProtoMessage() {} func (x *ListTagsResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[79] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[85] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6045,7 +6435,7 @@ func (x *ListTagsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListTagsResponse.ProtoReflect.Descriptor instead. func (*ListTagsResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{79} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{85} } func (x *ListTagsResponse) GetTags() []*Tag { @@ -6090,7 +6480,7 @@ type CreateTagRequest struct { func (x *CreateTagRequest) Reset() { *x = CreateTagRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[80] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[86] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6102,7 +6492,7 @@ func (x *CreateTagRequest) String() string { func (*CreateTagRequest) ProtoMessage() {} func (x *CreateTagRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[80] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[86] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6115,7 +6505,7 @@ func (x *CreateTagRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateTagRequest.ProtoReflect.Descriptor instead. func (*CreateTagRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{80} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{86} } func (x *CreateTagRequest) GetTag() *Tag { @@ -6145,7 +6535,7 @@ type UpdateTagRequest struct { func (x *UpdateTagRequest) Reset() { *x = UpdateTagRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[81] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[87] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6157,7 +6547,7 @@ func (x *UpdateTagRequest) String() string { func (*UpdateTagRequest) ProtoMessage() {} func (x *UpdateTagRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[81] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[87] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6170,7 +6560,7 @@ func (x *UpdateTagRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateTagRequest.ProtoReflect.Descriptor instead. func (*UpdateTagRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{81} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{87} } func (x *UpdateTagRequest) GetTag() *Tag { @@ -6195,7 +6585,7 @@ type DeleteTagRequest struct { func (x *DeleteTagRequest) Reset() { *x = DeleteTagRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[82] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[88] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6207,7 +6597,7 @@ func (x *DeleteTagRequest) String() string { func (*DeleteTagRequest) ProtoMessage() {} func (x *DeleteTagRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[82] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[88] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6220,7 +6610,7 @@ func (x *DeleteTagRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteTagRequest.ProtoReflect.Descriptor instead. func (*DeleteTagRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{82} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{88} } func (x *DeleteTagRequest) GetTag() *ObjectRef { @@ -6259,7 +6649,7 @@ type DeleteOptions struct { func (x *DeleteOptions) Reset() { *x = DeleteOptions{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[83] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[89] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6271,7 +6661,7 @@ func (x *DeleteOptions) String() string { func (*DeleteOptions) ProtoMessage() {} func (x *DeleteOptions) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[83] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[89] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6284,7 +6674,7 @@ func (x *DeleteOptions) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteOptions.ProtoReflect.Descriptor instead. func (*DeleteOptions) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{83} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{89} } func (x *DeleteOptions) GetVersion() int64 { @@ -6323,7 +6713,7 @@ type ListOptions struct { func (x *ListOptions) Reset() { *x = ListOptions{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[84] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[90] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6335,7 +6725,7 @@ func (x *ListOptions) String() string { func (*ListOptions) ProtoMessage() {} func (x *ListOptions) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[84] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[90] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6348,7 +6738,7 @@ func (x *ListOptions) ProtoReflect() protoreflect.Message { // Deprecated: Use ListOptions.ProtoReflect.Descriptor instead. func (*ListOptions) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{84} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{90} } func (x *ListOptions) GetPageSize() int32 { @@ -6384,7 +6774,7 @@ type ListWorkerActorAssignmentsRequest struct { func (x *ListWorkerActorAssignmentsRequest) Reset() { *x = ListWorkerActorAssignmentsRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[85] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[91] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6396,7 +6786,7 @@ func (x *ListWorkerActorAssignmentsRequest) String() string { func (*ListWorkerActorAssignmentsRequest) ProtoMessage() {} func (x *ListWorkerActorAssignmentsRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[85] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[91] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6409,7 +6799,7 @@ func (x *ListWorkerActorAssignmentsRequest) ProtoReflect() protoreflect.Message // Deprecated: Use ListWorkerActorAssignmentsRequest.ProtoReflect.Descriptor instead. func (*ListWorkerActorAssignmentsRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{85} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{91} } func (x *ListWorkerActorAssignmentsRequest) GetWorker() *ObjectRef { @@ -6439,7 +6829,7 @@ type ListWorkerActorAssignmentsResponse struct { func (x *ListWorkerActorAssignmentsResponse) Reset() { *x = ListWorkerActorAssignmentsResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[86] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[92] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6451,7 +6841,7 @@ func (x *ListWorkerActorAssignmentsResponse) String() string { func (*ListWorkerActorAssignmentsResponse) ProtoMessage() {} func (x *ListWorkerActorAssignmentsResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[86] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[92] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6464,7 +6854,7 @@ func (x *ListWorkerActorAssignmentsResponse) ProtoReflect() protoreflect.Message // Deprecated: Use ListWorkerActorAssignmentsResponse.ProtoReflect.Descriptor instead. func (*ListWorkerActorAssignmentsResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{86} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{92} } func (x *ListWorkerActorAssignmentsResponse) GetActorAssignments() []*ActorAssignment { @@ -6493,7 +6883,7 @@ type ListWorkersRequest struct { func (x *ListWorkersRequest) Reset() { *x = ListWorkersRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[87] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[93] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6505,7 +6895,7 @@ func (x *ListWorkersRequest) String() string { func (*ListWorkersRequest) ProtoMessage() {} func (x *ListWorkersRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[87] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[93] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6518,7 +6908,7 @@ func (x *ListWorkersRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListWorkersRequest.ProtoReflect.Descriptor instead. func (*ListWorkersRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{87} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{93} } func (x *ListWorkersRequest) GetOptions() *ListOptions { @@ -6540,7 +6930,7 @@ type ListWorkersResponse struct { func (x *ListWorkersResponse) Reset() { *x = ListWorkersResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[88] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[94] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6552,7 +6942,7 @@ func (x *ListWorkersResponse) String() string { func (*ListWorkersResponse) ProtoMessage() {} func (x *ListWorkersResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[88] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[94] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6565,7 +6955,7 @@ func (x *ListWorkersResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListWorkersResponse.ProtoReflect.Descriptor instead. func (*ListWorkersResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{88} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{94} } func (x *ListWorkersResponse) GetWorkers() []*Worker { @@ -6595,7 +6985,7 @@ type GetWorkerRequest struct { func (x *GetWorkerRequest) Reset() { *x = GetWorkerRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[89] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[95] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6607,7 +6997,7 @@ func (x *GetWorkerRequest) String() string { func (*GetWorkerRequest) ProtoMessage() {} func (x *GetWorkerRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[89] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[95] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6620,7 +7010,7 @@ func (x *GetWorkerRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetWorkerRequest.ProtoReflect.Descriptor instead. func (*GetWorkerRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{89} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{95} } func (x *GetWorkerRequest) GetWorker() *ObjectRef { @@ -6642,7 +7032,7 @@ type CreateWorkerRequest struct { func (x *CreateWorkerRequest) Reset() { *x = CreateWorkerRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[90] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[96] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6654,7 +7044,7 @@ func (x *CreateWorkerRequest) String() string { func (*CreateWorkerRequest) ProtoMessage() {} func (x *CreateWorkerRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[90] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[96] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6667,7 +7057,7 @@ func (x *CreateWorkerRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateWorkerRequest.ProtoReflect.Descriptor instead. func (*CreateWorkerRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{90} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{96} } func (x *CreateWorkerRequest) GetWorker() *Worker { @@ -6702,7 +7092,7 @@ type UpdateWorkerRequest struct { func (x *UpdateWorkerRequest) Reset() { *x = UpdateWorkerRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[91] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[97] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6714,7 +7104,7 @@ func (x *UpdateWorkerRequest) String() string { func (*UpdateWorkerRequest) ProtoMessage() {} func (x *UpdateWorkerRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[91] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[97] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6727,7 +7117,7 @@ func (x *UpdateWorkerRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateWorkerRequest.ProtoReflect.Descriptor instead. func (*UpdateWorkerRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{91} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{97} } func (x *UpdateWorkerRequest) GetWorker() *Worker { @@ -6754,7 +7144,7 @@ type DeleteWorkerRequest struct { func (x *DeleteWorkerRequest) Reset() { *x = DeleteWorkerRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[92] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[98] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6766,7 +7156,7 @@ func (x *DeleteWorkerRequest) String() string { func (*DeleteWorkerRequest) ProtoMessage() {} func (x *DeleteWorkerRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[92] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[98] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6779,7 +7169,7 @@ func (x *DeleteWorkerRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteWorkerRequest.ProtoReflect.Descriptor instead. func (*DeleteWorkerRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{92} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{98} } func (x *DeleteWorkerRequest) GetWorker() *ObjectRef { @@ -6809,7 +7199,7 @@ type DrainWorkerRequest struct { func (x *DrainWorkerRequest) Reset() { *x = DrainWorkerRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[93] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[99] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6821,7 +7211,7 @@ func (x *DrainWorkerRequest) String() string { func (*DrainWorkerRequest) ProtoMessage() {} func (x *DrainWorkerRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[93] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[99] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6834,7 +7224,7 @@ func (x *DrainWorkerRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DrainWorkerRequest.ProtoReflect.Descriptor instead. func (*DrainWorkerRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{93} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{99} } func (x *DrainWorkerRequest) GetWorker() *ObjectRef { @@ -6855,7 +7245,7 @@ type DrainWorkerResponse struct { func (x *DrainWorkerResponse) Reset() { *x = DrainWorkerResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[94] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[100] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6867,7 +7257,7 @@ func (x *DrainWorkerResponse) String() string { func (*DrainWorkerResponse) ProtoMessage() {} func (x *DrainWorkerResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[94] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[100] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6880,7 +7270,7 @@ func (x *DrainWorkerResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use DrainWorkerResponse.ProtoReflect.Descriptor instead. func (*DrainWorkerResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{94} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{100} } func (x *DrainWorkerResponse) GetWorker() *Worker { @@ -6904,7 +7294,7 @@ type MarkWorkerAvailableRequest struct { func (x *MarkWorkerAvailableRequest) Reset() { *x = MarkWorkerAvailableRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[95] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[101] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6916,7 +7306,7 @@ func (x *MarkWorkerAvailableRequest) String() string { func (*MarkWorkerAvailableRequest) ProtoMessage() {} func (x *MarkWorkerAvailableRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[95] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[101] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6929,7 +7319,7 @@ func (x *MarkWorkerAvailableRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use MarkWorkerAvailableRequest.ProtoReflect.Descriptor instead. func (*MarkWorkerAvailableRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{95} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{101} } func (x *MarkWorkerAvailableRequest) GetWorker() *ObjectRef { @@ -6950,7 +7340,7 @@ type MarkWorkerAvailableResponse struct { func (x *MarkWorkerAvailableResponse) Reset() { *x = MarkWorkerAvailableResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[96] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[102] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -6962,7 +7352,7 @@ func (x *MarkWorkerAvailableResponse) String() string { func (*MarkWorkerAvailableResponse) ProtoMessage() {} func (x *MarkWorkerAvailableResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[96] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[102] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6975,7 +7365,7 @@ func (x *MarkWorkerAvailableResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MarkWorkerAvailableResponse.ProtoReflect.Descriptor instead. func (*MarkWorkerAvailableResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{96} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{102} } func (x *MarkWorkerAvailableResponse) GetWorker() *Worker { @@ -6999,7 +7389,7 @@ type MarkWorkerUnavailableRequest struct { func (x *MarkWorkerUnavailableRequest) Reset() { *x = MarkWorkerUnavailableRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[97] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[103] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7011,7 +7401,7 @@ func (x *MarkWorkerUnavailableRequest) String() string { func (*MarkWorkerUnavailableRequest) ProtoMessage() {} func (x *MarkWorkerUnavailableRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[97] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[103] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7024,7 +7414,7 @@ func (x *MarkWorkerUnavailableRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use MarkWorkerUnavailableRequest.ProtoReflect.Descriptor instead. func (*MarkWorkerUnavailableRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{97} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{103} } func (x *MarkWorkerUnavailableRequest) GetWorker() *ObjectRef { @@ -7045,7 +7435,7 @@ type MarkWorkerUnavailableResponse struct { func (x *MarkWorkerUnavailableResponse) Reset() { *x = MarkWorkerUnavailableResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[98] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[104] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7057,7 +7447,7 @@ func (x *MarkWorkerUnavailableResponse) String() string { func (*MarkWorkerUnavailableResponse) ProtoMessage() {} func (x *MarkWorkerUnavailableResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[98] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[104] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7070,7 +7460,7 @@ func (x *MarkWorkerUnavailableResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MarkWorkerUnavailableResponse.ProtoReflect.Descriptor instead. func (*MarkWorkerUnavailableResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{98} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{104} } func (x *MarkWorkerUnavailableResponse) GetWorker() *Worker { @@ -7099,7 +7489,7 @@ type ListActorsRequest struct { func (x *ListActorsRequest) Reset() { *x = ListActorsRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[99] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[105] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7111,7 +7501,7 @@ func (x *ListActorsRequest) String() string { func (*ListActorsRequest) ProtoMessage() {} func (x *ListActorsRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[99] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[105] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7124,7 +7514,7 @@ func (x *ListActorsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListActorsRequest.ProtoReflect.Descriptor instead. func (*ListActorsRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{99} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{105} } func (x *ListActorsRequest) GetAtespace() string { @@ -7153,7 +7543,7 @@ type ListActorsResponse struct { func (x *ListActorsResponse) Reset() { *x = ListActorsResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[100] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[106] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7165,7 +7555,7 @@ func (x *ListActorsResponse) String() string { func (*ListActorsResponse) ProtoMessage() {} func (x *ListActorsResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[100] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[106] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7178,7 +7568,7 @@ func (x *ListActorsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListActorsResponse.ProtoReflect.Descriptor instead. func (*ListActorsResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{100} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{106} } func (x *ListActorsResponse) GetActors() []*Actor { @@ -7266,7 +7656,7 @@ type Worker struct { func (x *Worker) Reset() { *x = Worker{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[101] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[107] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7278,7 +7668,7 @@ func (x *Worker) String() string { func (*Worker) ProtoMessage() {} func (x *Worker) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[101] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[107] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7291,7 +7681,7 @@ func (x *Worker) ProtoReflect() protoreflect.Message { // Deprecated: Use Worker.ProtoReflect.Descriptor instead. func (*Worker) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{101} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{107} } func (x *Worker) GetMetadata() *ResourceMetadata { @@ -7433,7 +7823,7 @@ type WorkerStatus struct { func (x *WorkerStatus) Reset() { *x = WorkerStatus{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[102] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[108] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7445,7 +7835,7 @@ func (x *WorkerStatus) String() string { func (*WorkerStatus) ProtoMessage() {} func (x *WorkerStatus) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[102] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[108] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7458,7 +7848,7 @@ func (x *WorkerStatus) ProtoReflect() protoreflect.Message { // Deprecated: Use WorkerStatus.ProtoReflect.Descriptor instead. func (*WorkerStatus) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{102} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{108} } func (x *WorkerStatus) GetState() WorkerState { @@ -7546,7 +7936,7 @@ type WorkerSandboxClass struct { func (x *WorkerSandboxClass) Reset() { *x = WorkerSandboxClass{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[103] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[109] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7558,7 +7948,7 @@ func (x *WorkerSandboxClass) String() string { func (*WorkerSandboxClass) ProtoMessage() {} func (x *WorkerSandboxClass) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[103] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[109] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7571,7 +7961,7 @@ func (x *WorkerSandboxClass) ProtoReflect() protoreflect.Message { // Deprecated: Use WorkerSandboxClass.ProtoReflect.Descriptor instead. func (*WorkerSandboxClass) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{103} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{109} } func (x *WorkerSandboxClass) GetSandboxClass() string { @@ -7623,7 +8013,7 @@ type WorkerSandboxRuntime struct { func (x *WorkerSandboxRuntime) Reset() { *x = WorkerSandboxRuntime{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[104] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[110] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7635,7 +8025,7 @@ func (x *WorkerSandboxRuntime) String() string { func (*WorkerSandboxRuntime) ProtoMessage() {} func (x *WorkerSandboxRuntime) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[104] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[110] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7648,7 +8038,7 @@ func (x *WorkerSandboxRuntime) ProtoReflect() protoreflect.Message { // Deprecated: Use WorkerSandboxRuntime.ProtoReflect.Descriptor instead. func (*WorkerSandboxRuntime) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{104} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{110} } func (x *WorkerSandboxRuntime) GetVersion() *VersionedSandboxCompat { @@ -7689,7 +8079,7 @@ type RuntimeOverhead struct { func (x *RuntimeOverhead) Reset() { *x = RuntimeOverhead{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[105] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[111] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7701,7 +8091,7 @@ func (x *RuntimeOverhead) String() string { func (*RuntimeOverhead) ProtoMessage() {} func (x *RuntimeOverhead) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[105] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[111] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7714,7 +8104,7 @@ func (x *RuntimeOverhead) ProtoReflect() protoreflect.Message { // Deprecated: Use RuntimeOverhead.ProtoReflect.Descriptor instead. func (*RuntimeOverhead) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{105} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{111} } func (x *RuntimeOverhead) GetMemoryBytes() int64 { @@ -7753,7 +8143,7 @@ type ActorSandboxRuntime struct { func (x *ActorSandboxRuntime) Reset() { *x = ActorSandboxRuntime{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[106] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[112] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7765,7 +8155,7 @@ func (x *ActorSandboxRuntime) String() string { func (*ActorSandboxRuntime) ProtoMessage() {} func (x *ActorSandboxRuntime) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[106] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[112] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7778,7 +8168,7 @@ func (x *ActorSandboxRuntime) ProtoReflect() protoreflect.Message { // Deprecated: Use ActorSandboxRuntime.ProtoReflect.Descriptor instead. func (*ActorSandboxRuntime) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{106} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{112} } func (x *ActorSandboxRuntime) GetSandboxClass() string { @@ -7829,7 +8219,7 @@ type VersionedSandboxCompat struct { func (x *VersionedSandboxCompat) Reset() { *x = VersionedSandboxCompat{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[107] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[113] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7841,7 +8231,7 @@ func (x *VersionedSandboxCompat) String() string { func (*VersionedSandboxCompat) ProtoMessage() {} func (x *VersionedSandboxCompat) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[107] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[113] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7854,7 +8244,7 @@ func (x *VersionedSandboxCompat) ProtoReflect() protoreflect.Message { // Deprecated: Use VersionedSandboxCompat.ProtoReflect.Descriptor instead. func (*VersionedSandboxCompat) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{107} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{113} } func (x *VersionedSandboxCompat) GetSchemaVersion() string { @@ -7890,7 +8280,7 @@ type AttributeEntry struct { func (x *AttributeEntry) Reset() { *x = AttributeEntry{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[108] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[114] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7902,7 +8292,7 @@ func (x *AttributeEntry) String() string { func (*AttributeEntry) ProtoMessage() {} func (x *AttributeEntry) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[108] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[114] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7915,7 +8305,7 @@ func (x *AttributeEntry) ProtoReflect() protoreflect.Message { // Deprecated: Use AttributeEntry.ProtoReflect.Descriptor instead. func (*AttributeEntry) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{108} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{114} } func (x *AttributeEntry) GetKey() string { @@ -7962,7 +8352,7 @@ type WorkerResources struct { func (x *WorkerResources) Reset() { *x = WorkerResources{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[109] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[115] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -7974,7 +8364,7 @@ func (x *WorkerResources) String() string { func (*WorkerResources) ProtoMessage() {} func (x *WorkerResources) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[109] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[115] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7987,7 +8377,7 @@ func (x *WorkerResources) ProtoReflect() protoreflect.Message { // Deprecated: Use WorkerResources.ProtoReflect.Descriptor instead. func (*WorkerResources) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{109} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{115} } func (x *WorkerResources) GetCpuMillicores() int64 { @@ -8043,7 +8433,7 @@ type ActorAssignment struct { func (x *ActorAssignment) Reset() { *x = ActorAssignment{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[110] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[116] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8055,7 +8445,7 @@ func (x *ActorAssignment) String() string { func (*ActorAssignment) ProtoMessage() {} func (x *ActorAssignment) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[110] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[116] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8068,7 +8458,7 @@ func (x *ActorAssignment) ProtoReflect() protoreflect.Message { // Deprecated: Use ActorAssignment.ProtoReflect.Descriptor instead. func (*ActorAssignment) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{110} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{116} } func (x *ActorAssignment) GetMetadata() *ResourceMetadata { @@ -8113,7 +8503,7 @@ type AcquireWorkerEpochRequest struct { func (x *AcquireWorkerEpochRequest) Reset() { *x = AcquireWorkerEpochRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[111] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[117] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8125,7 +8515,7 @@ func (x *AcquireWorkerEpochRequest) String() string { func (*AcquireWorkerEpochRequest) ProtoMessage() {} func (x *AcquireWorkerEpochRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[111] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[117] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8138,7 +8528,7 @@ func (x *AcquireWorkerEpochRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AcquireWorkerEpochRequest.ProtoReflect.Descriptor instead. func (*AcquireWorkerEpochRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{111} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{117} } func (x *AcquireWorkerEpochRequest) GetWorker() *ObjectRef { @@ -8158,7 +8548,7 @@ type AcquireWorkerEpochResponse struct { func (x *AcquireWorkerEpochResponse) Reset() { *x = AcquireWorkerEpochResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[112] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[118] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8170,7 +8560,7 @@ func (x *AcquireWorkerEpochResponse) String() string { func (*AcquireWorkerEpochResponse) ProtoMessage() {} func (x *AcquireWorkerEpochResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[112] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[118] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8183,7 +8573,7 @@ func (x *AcquireWorkerEpochResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use AcquireWorkerEpochResponse.ProtoReflect.Descriptor instead. func (*AcquireWorkerEpochResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{112} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{118} } func (x *AcquireWorkerEpochResponse) GetEpoch() int64 { @@ -8226,7 +8616,7 @@ type RegisterWorkerRequest struct { func (x *RegisterWorkerRequest) Reset() { *x = RegisterWorkerRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[113] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[119] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8238,7 +8628,7 @@ func (x *RegisterWorkerRequest) String() string { func (*RegisterWorkerRequest) ProtoMessage() {} func (x *RegisterWorkerRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[113] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[119] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8251,7 +8641,7 @@ func (x *RegisterWorkerRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use RegisterWorkerRequest.ProtoReflect.Descriptor instead. func (*RegisterWorkerRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{113} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{119} } func (x *RegisterWorkerRequest) GetWorker() *ObjectRef { @@ -8292,7 +8682,7 @@ type RegisterWorkerResponse struct { func (x *RegisterWorkerResponse) Reset() { *x = RegisterWorkerResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[114] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[120] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8304,7 +8694,7 @@ func (x *RegisterWorkerResponse) String() string { func (*RegisterWorkerResponse) ProtoMessage() {} func (x *RegisterWorkerResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[114] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[120] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8317,7 +8707,7 @@ func (x *RegisterWorkerResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use RegisterWorkerResponse.ProtoReflect.Descriptor instead. func (*RegisterWorkerResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{114} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{120} } func (x *RegisterWorkerResponse) GetWorker() *Worker { @@ -8357,7 +8747,7 @@ type SetWorkerSandboxRuntimesRequest struct { func (x *SetWorkerSandboxRuntimesRequest) Reset() { *x = SetWorkerSandboxRuntimesRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[115] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[121] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8369,7 +8759,7 @@ func (x *SetWorkerSandboxRuntimesRequest) String() string { func (*SetWorkerSandboxRuntimesRequest) ProtoMessage() {} func (x *SetWorkerSandboxRuntimesRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[115] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[121] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8382,7 +8772,7 @@ func (x *SetWorkerSandboxRuntimesRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SetWorkerSandboxRuntimesRequest.ProtoReflect.Descriptor instead. func (*SetWorkerSandboxRuntimesRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{115} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{121} } func (x *SetWorkerSandboxRuntimesRequest) GetWorker() *ObjectRef { @@ -8416,7 +8806,7 @@ type SetWorkerSandboxRuntimesResponse struct { func (x *SetWorkerSandboxRuntimesResponse) Reset() { *x = SetWorkerSandboxRuntimesResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[116] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[122] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8428,7 +8818,7 @@ func (x *SetWorkerSandboxRuntimesResponse) String() string { func (*SetWorkerSandboxRuntimesResponse) ProtoMessage() {} func (x *SetWorkerSandboxRuntimesResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[116] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[122] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8441,7 +8831,7 @@ func (x *SetWorkerSandboxRuntimesResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use SetWorkerSandboxRuntimesResponse.ProtoReflect.Descriptor instead. func (*SetWorkerSandboxRuntimesResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{116} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{122} } func (x *SetWorkerSandboxRuntimesResponse) GetWorker() *Worker { @@ -8488,7 +8878,7 @@ type MintWorkerActorCertificateRequest struct { func (x *MintWorkerActorCertificateRequest) Reset() { *x = MintWorkerActorCertificateRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[117] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[123] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8500,7 +8890,7 @@ func (x *MintWorkerActorCertificateRequest) String() string { func (*MintWorkerActorCertificateRequest) ProtoMessage() {} func (x *MintWorkerActorCertificateRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[117] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[123] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8513,7 +8903,7 @@ func (x *MintWorkerActorCertificateRequest) ProtoReflect() protoreflect.Message // Deprecated: Use MintWorkerActorCertificateRequest.ProtoReflect.Descriptor instead. func (*MintWorkerActorCertificateRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{117} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{123} } func (x *MintWorkerActorCertificateRequest) GetActor() *ObjectRef { @@ -8557,7 +8947,7 @@ type MintWorkerActorCertificateResponse struct { func (x *MintWorkerActorCertificateResponse) Reset() { *x = MintWorkerActorCertificateResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[118] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[124] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8569,7 +8959,7 @@ func (x *MintWorkerActorCertificateResponse) String() string { func (*MintWorkerActorCertificateResponse) ProtoMessage() {} func (x *MintWorkerActorCertificateResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[118] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[124] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8582,7 +8972,7 @@ func (x *MintWorkerActorCertificateResponse) ProtoReflect() protoreflect.Message // Deprecated: Use MintWorkerActorCertificateResponse.ProtoReflect.Descriptor instead. func (*MintWorkerActorCertificateResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{118} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{124} } func (x *MintWorkerActorCertificateResponse) GetActorCertificates() [][]byte { @@ -8623,7 +9013,7 @@ type MintWorkerActorJwtRequest struct { func (x *MintWorkerActorJwtRequest) Reset() { *x = MintWorkerActorJwtRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[119] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[125] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8635,7 +9025,7 @@ func (x *MintWorkerActorJwtRequest) String() string { func (*MintWorkerActorJwtRequest) ProtoMessage() {} func (x *MintWorkerActorJwtRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[119] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[125] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8648,7 +9038,7 @@ func (x *MintWorkerActorJwtRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use MintWorkerActorJwtRequest.ProtoReflect.Descriptor instead. func (*MintWorkerActorJwtRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{119} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{125} } func (x *MintWorkerActorJwtRequest) GetActor() *ObjectRef { @@ -8696,7 +9086,7 @@ type MintWorkerActorJwtResponse struct { func (x *MintWorkerActorJwtResponse) Reset() { *x = MintWorkerActorJwtResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[120] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[126] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8708,7 +9098,7 @@ func (x *MintWorkerActorJwtResponse) String() string { func (*MintWorkerActorJwtResponse) ProtoMessage() {} func (x *MintWorkerActorJwtResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[120] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[126] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8721,7 +9111,7 @@ func (x *MintWorkerActorJwtResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use MintWorkerActorJwtResponse.ProtoReflect.Descriptor instead. func (*MintWorkerActorJwtResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{120} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{126} } func (x *MintWorkerActorJwtResponse) GetActorJwt() string { @@ -8772,7 +9162,7 @@ type RequestActorSuspendRequest struct { func (x *RequestActorSuspendRequest) Reset() { *x = RequestActorSuspendRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[121] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[127] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8784,7 +9174,7 @@ func (x *RequestActorSuspendRequest) String() string { func (*RequestActorSuspendRequest) ProtoMessage() {} func (x *RequestActorSuspendRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[121] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[127] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8797,7 +9187,7 @@ func (x *RequestActorSuspendRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use RequestActorSuspendRequest.ProtoReflect.Descriptor instead. func (*RequestActorSuspendRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{121} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{127} } func (x *RequestActorSuspendRequest) GetWorker() *ObjectRef { @@ -8831,7 +9221,7 @@ type RequestActorSuspendResponse struct { func (x *RequestActorSuspendResponse) Reset() { *x = RequestActorSuspendResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[122] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[128] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8843,7 +9233,7 @@ func (x *RequestActorSuspendResponse) String() string { func (*RequestActorSuspendResponse) ProtoMessage() {} func (x *RequestActorSuspendResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[122] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[128] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8856,7 +9246,7 @@ func (x *RequestActorSuspendResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use RequestActorSuspendResponse.ProtoReflect.Descriptor instead. func (*RequestActorSuspendResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{122} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{128} } func (x *RequestActorSuspendResponse) GetActor() *Actor { @@ -8896,7 +9286,7 @@ type ReportActorCrashedRequest struct { func (x *ReportActorCrashedRequest) Reset() { *x = ReportActorCrashedRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[123] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[129] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8908,7 +9298,7 @@ func (x *ReportActorCrashedRequest) String() string { func (*ReportActorCrashedRequest) ProtoMessage() {} func (x *ReportActorCrashedRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[123] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[129] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8921,7 +9311,7 @@ func (x *ReportActorCrashedRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ReportActorCrashedRequest.ProtoReflect.Descriptor instead. func (*ReportActorCrashedRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{123} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{129} } func (x *ReportActorCrashedRequest) GetWorker() *ObjectRef { @@ -8962,7 +9352,7 @@ type ReportActorCrashedResponse struct { func (x *ReportActorCrashedResponse) Reset() { *x = ReportActorCrashedResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[124] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[130] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -8974,7 +9364,7 @@ func (x *ReportActorCrashedResponse) String() string { func (*ReportActorCrashedResponse) ProtoMessage() {} func (x *ReportActorCrashedResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[124] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[130] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8987,7 +9377,7 @@ func (x *ReportActorCrashedResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ReportActorCrashedResponse.ProtoReflect.Descriptor instead. func (*ReportActorCrashedResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{124} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{130} } func (x *ReportActorCrashedResponse) GetActor() *Actor { @@ -9018,7 +9408,7 @@ type ReportActorSnapshotStateRequest struct { func (x *ReportActorSnapshotStateRequest) Reset() { *x = ReportActorSnapshotStateRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[125] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[131] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9030,7 +9420,7 @@ func (x *ReportActorSnapshotStateRequest) String() string { func (*ReportActorSnapshotStateRequest) ProtoMessage() {} func (x *ReportActorSnapshotStateRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[125] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[131] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9043,7 +9433,7 @@ func (x *ReportActorSnapshotStateRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ReportActorSnapshotStateRequest.ProtoReflect.Descriptor instead. func (*ReportActorSnapshotStateRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{125} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{131} } func (x *ReportActorSnapshotStateRequest) GetActor() *ObjectRef { @@ -9075,7 +9465,7 @@ type ReportActorSnapshotStateResponse struct { func (x *ReportActorSnapshotStateResponse) Reset() { *x = ReportActorSnapshotStateResponse{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[126] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[132] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9087,7 +9477,7 @@ func (x *ReportActorSnapshotStateResponse) String() string { func (*ReportActorSnapshotStateResponse) ProtoMessage() {} func (x *ReportActorSnapshotStateResponse) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[126] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[132] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9100,7 +9490,7 @@ func (x *ReportActorSnapshotStateResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ReportActorSnapshotStateResponse.ProtoReflect.Descriptor instead. func (*ReportActorSnapshotStateResponse) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{126} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{132} } // ActorSnapshotState is what atelet holds for one Actor on its node. It @@ -9134,7 +9524,7 @@ type ActorSnapshotState struct { func (x *ActorSnapshotState) Reset() { *x = ActorSnapshotState{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[127] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[133] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9146,7 +9536,7 @@ func (x *ActorSnapshotState) String() string { func (*ActorSnapshotState) ProtoMessage() {} func (x *ActorSnapshotState) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[127] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[133] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9159,7 +9549,7 @@ func (x *ActorSnapshotState) ProtoReflect() protoreflect.Message { // Deprecated: Use ActorSnapshotState.ProtoReflect.Descriptor instead. func (*ActorSnapshotState) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{127} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{133} } func (x *ActorSnapshotState) GetLatestLocal() *SnapshotReport { @@ -9231,7 +9621,7 @@ type SnapshotReport struct { func (x *SnapshotReport) Reset() { *x = SnapshotReport{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[128] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[134] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9243,7 +9633,7 @@ func (x *SnapshotReport) String() string { func (*SnapshotReport) ProtoMessage() {} func (x *SnapshotReport) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[128] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[134] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9256,7 +9646,7 @@ func (x *SnapshotReport) ProtoReflect() protoreflect.Message { // Deprecated: Use SnapshotReport.ProtoReflect.Descriptor instead. func (*SnapshotReport) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{128} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{134} } func (x *SnapshotReport) GetUuid() string { @@ -9307,9 +9697,9 @@ func (x *SnapshotReport) GetDurableCompleteTime() *timestamppb.Timestamp { type AccessPolicy struct { state protoimpl.MessageState `protogen:"open.v1"` // Standard resource metadata. Atespace must match the parent resource (empty - // for global-scoped parents like Global and Atespace) and name must be - // "default". Both are caller-specified on create and immutable. UID, version, - // create_time, and update_time are server-managed. + // for global-scoped parents like Global, Atespace, and ExternalVolumeClass) + // and name must be "default". Both are caller-specified on create and + // immutable. UID, version, create_time, and update_time are server-managed. // // +k8s:required // +k8s:customValidation # name must be "default" @@ -9326,7 +9716,7 @@ type AccessPolicy struct { func (x *AccessPolicy) Reset() { *x = AccessPolicy{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[129] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[135] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9338,7 +9728,7 @@ func (x *AccessPolicy) String() string { func (*AccessPolicy) ProtoMessage() {} func (x *AccessPolicy) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[129] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[135] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9351,7 +9741,7 @@ func (x *AccessPolicy) ProtoReflect() protoreflect.Message { // Deprecated: Use AccessPolicy.ProtoReflect.Descriptor instead. func (*AccessPolicy) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{129} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{135} } func (x *AccessPolicy) GetMetadata() *ResourceMetadata { @@ -9368,19 +9758,22 @@ func (x *AccessPolicy) GetBindings() []*Binding { return nil } -// Binding associates a list of principals (members) with a single role. +// Binding associates a list of members with a single role. type Binding struct { state protoimpl.MessageState `protogen:"open.v1"` // The role name for the parent resource type (e.g., "owner", "editor", - // "viewer"). + // "viewer", "allowed_atespace"). // // +k8s:required // +k8s:maxLength=64 Role string `protobuf:"bytes,1,opt,name=role,proto3" json:"role,omitempty"` - // Principal identities granted this role. + // Subjects granted this role: `user:` principals on Global ("owner", + // "viewer") and Atespace ("owner", "editor", "viewer") policies, or + // `atespace:` on ExternalVolumeClass ("allowed_atespace") policies. // Examples: // - "user:alice@example.com" // - "user:sa-ci-runner" + // - "atespace:team-a" // // +k8s:required // +k8s:listType=set @@ -9393,7 +9786,7 @@ type Binding struct { func (x *Binding) Reset() { *x = Binding{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[130] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[136] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9405,7 +9798,7 @@ func (x *Binding) String() string { func (*Binding) ProtoMessage() {} func (x *Binding) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[130] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[136] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9418,7 +9811,7 @@ func (x *Binding) ProtoReflect() protoreflect.Message { // Deprecated: Use Binding.ProtoReflect.Descriptor instead. func (*Binding) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{130} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{136} } func (x *Binding) GetRole() string { @@ -9450,7 +9843,7 @@ type GetGlobalAccessPolicyRequest struct { func (x *GetGlobalAccessPolicyRequest) Reset() { *x = GetGlobalAccessPolicyRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[131] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[137] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9462,7 +9855,7 @@ func (x *GetGlobalAccessPolicyRequest) String() string { func (*GetGlobalAccessPolicyRequest) ProtoMessage() {} func (x *GetGlobalAccessPolicyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[131] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[137] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9475,7 +9868,7 @@ func (x *GetGlobalAccessPolicyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetGlobalAccessPolicyRequest.ProtoReflect.Descriptor instead. func (*GetGlobalAccessPolicyRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{131} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{137} } func (x *GetGlobalAccessPolicyRequest) GetName() string { @@ -9499,7 +9892,7 @@ type CreateGlobalAccessPolicyRequest struct { func (x *CreateGlobalAccessPolicyRequest) Reset() { *x = CreateGlobalAccessPolicyRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[132] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[138] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9511,7 +9904,7 @@ func (x *CreateGlobalAccessPolicyRequest) String() string { func (*CreateGlobalAccessPolicyRequest) ProtoMessage() {} func (x *CreateGlobalAccessPolicyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[132] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[138] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9524,7 +9917,7 @@ func (x *CreateGlobalAccessPolicyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateGlobalAccessPolicyRequest.ProtoReflect.Descriptor instead. func (*CreateGlobalAccessPolicyRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{132} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{138} } func (x *CreateGlobalAccessPolicyRequest) GetAccessPolicy() *AccessPolicy { @@ -9548,7 +9941,7 @@ type UpdateGlobalAccessPolicyRequest struct { func (x *UpdateGlobalAccessPolicyRequest) Reset() { *x = UpdateGlobalAccessPolicyRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[133] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[139] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9560,7 +9953,7 @@ func (x *UpdateGlobalAccessPolicyRequest) String() string { func (*UpdateGlobalAccessPolicyRequest) ProtoMessage() {} func (x *UpdateGlobalAccessPolicyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[133] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[139] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9573,7 +9966,7 @@ func (x *UpdateGlobalAccessPolicyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateGlobalAccessPolicyRequest.ProtoReflect.Descriptor instead. func (*UpdateGlobalAccessPolicyRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{133} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{139} } func (x *UpdateGlobalAccessPolicyRequest) GetAccessPolicy() *AccessPolicy { @@ -9603,7 +9996,7 @@ type GetAtespaceAccessPolicyRequest struct { func (x *GetAtespaceAccessPolicyRequest) Reset() { *x = GetAtespaceAccessPolicyRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[134] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[140] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9615,7 +10008,7 @@ func (x *GetAtespaceAccessPolicyRequest) String() string { func (*GetAtespaceAccessPolicyRequest) ProtoMessage() {} func (x *GetAtespaceAccessPolicyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[134] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[140] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9628,7 +10021,7 @@ func (x *GetAtespaceAccessPolicyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetAtespaceAccessPolicyRequest.ProtoReflect.Descriptor instead. func (*GetAtespaceAccessPolicyRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{134} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{140} } func (x *GetAtespaceAccessPolicyRequest) GetAtespace() *ObjectRef { @@ -9664,7 +10057,7 @@ type CreateAtespaceAccessPolicyRequest struct { func (x *CreateAtespaceAccessPolicyRequest) Reset() { *x = CreateAtespaceAccessPolicyRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[135] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[141] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9676,7 +10069,7 @@ func (x *CreateAtespaceAccessPolicyRequest) String() string { func (*CreateAtespaceAccessPolicyRequest) ProtoMessage() {} func (x *CreateAtespaceAccessPolicyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[135] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[141] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9689,7 +10082,7 @@ func (x *CreateAtespaceAccessPolicyRequest) ProtoReflect() protoreflect.Message // Deprecated: Use CreateAtespaceAccessPolicyRequest.ProtoReflect.Descriptor instead. func (*CreateAtespaceAccessPolicyRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{135} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{141} } func (x *CreateAtespaceAccessPolicyRequest) GetAtespace() *ObjectRef { @@ -9725,7 +10118,7 @@ type UpdateAtespaceAccessPolicyRequest struct { func (x *UpdateAtespaceAccessPolicyRequest) Reset() { *x = UpdateAtespaceAccessPolicyRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[136] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[142] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9737,7 +10130,7 @@ func (x *UpdateAtespaceAccessPolicyRequest) String() string { func (*UpdateAtespaceAccessPolicyRequest) ProtoMessage() {} func (x *UpdateAtespaceAccessPolicyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[136] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[142] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9750,7 +10143,7 @@ func (x *UpdateAtespaceAccessPolicyRequest) ProtoReflect() protoreflect.Message // Deprecated: Use UpdateAtespaceAccessPolicyRequest.ProtoReflect.Descriptor instead. func (*UpdateAtespaceAccessPolicyRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{136} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{142} } func (x *UpdateAtespaceAccessPolicyRequest) GetAtespace() *ObjectRef { @@ -9791,7 +10184,7 @@ type DeleteAtespaceAccessPolicyRequest struct { func (x *DeleteAtespaceAccessPolicyRequest) Reset() { *x = DeleteAtespaceAccessPolicyRequest{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[137] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[143] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9803,7 +10196,7 @@ func (x *DeleteAtespaceAccessPolicyRequest) String() string { func (*DeleteAtespaceAccessPolicyRequest) ProtoMessage() {} func (x *DeleteAtespaceAccessPolicyRequest) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[137] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[143] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9816,7 +10209,7 @@ func (x *DeleteAtespaceAccessPolicyRequest) ProtoReflect() protoreflect.Message // Deprecated: Use DeleteAtespaceAccessPolicyRequest.ProtoReflect.Descriptor instead. func (*DeleteAtespaceAccessPolicyRequest) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{137} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{143} } func (x *DeleteAtespaceAccessPolicyRequest) GetAtespace() *ObjectRef { @@ -9840,6 +10233,267 @@ func (x *DeleteAtespaceAccessPolicyRequest) GetOptions() *DeleteOptions { return nil } +// GetExternalVolumeClassAccessPolicyRequest identifies an ExternalVolumeClass's access policy. +type GetExternalVolumeClassAccessPolicyRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // The parent ExternalVolumeClass of the access policy resource to retrieve. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ExternalVolumeClass *ObjectRef `protobuf:"bytes,1,opt,name=external_volume_class,json=externalVolumeClass,proto3" json:"external_volume_class,omitempty"` + // Name of the singleton access policy. Must be "default". + // + // +k8s:required + // +k8s:format=k8s-short-name + // +k8s:customValidation # must be "default" + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *GetExternalVolumeClassAccessPolicyRequest) Reset() { + *x = GetExternalVolumeClassAccessPolicyRequest{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[144] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *GetExternalVolumeClassAccessPolicyRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetExternalVolumeClassAccessPolicyRequest) ProtoMessage() {} + +func (x *GetExternalVolumeClassAccessPolicyRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[144] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetExternalVolumeClassAccessPolicyRequest.ProtoReflect.Descriptor instead. +func (*GetExternalVolumeClassAccessPolicyRequest) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{144} +} + +func (x *GetExternalVolumeClassAccessPolicyRequest) GetExternalVolumeClass() *ObjectRef { + if x != nil { + return x.ExternalVolumeClass + } + return nil +} + +func (x *GetExternalVolumeClassAccessPolicyRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +// CreateExternalVolumeClassAccessPolicyRequest creates an access policy for an ExternalVolumeClass. +type CreateExternalVolumeClassAccessPolicyRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // Parent ExternalVolumeClass under which to create the policy resource. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ExternalVolumeClass *ObjectRef `protobuf:"bytes,1,opt,name=external_volume_class,json=externalVolumeClass,proto3" json:"external_volume_class,omitempty"` + // The policy to create. metadata.name must be "default" and + // metadata.atespace must be empty. + // + // +ate:preview=ExternalVolumes + // +k8s:ifDisabled(ExternalVolumes)=+k8s:forbidden + // +k8s:required + AccessPolicy *AccessPolicy `protobuf:"bytes,2,opt,name=access_policy,json=accessPolicy,proto3" json:"access_policy,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CreateExternalVolumeClassAccessPolicyRequest) Reset() { + *x = CreateExternalVolumeClassAccessPolicyRequest{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[145] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CreateExternalVolumeClassAccessPolicyRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CreateExternalVolumeClassAccessPolicyRequest) ProtoMessage() {} + +func (x *CreateExternalVolumeClassAccessPolicyRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[145] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CreateExternalVolumeClassAccessPolicyRequest.ProtoReflect.Descriptor instead. +func (*CreateExternalVolumeClassAccessPolicyRequest) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{145} +} + +func (x *CreateExternalVolumeClassAccessPolicyRequest) GetExternalVolumeClass() *ObjectRef { + if x != nil { + return x.ExternalVolumeClass + } + return nil +} + +func (x *CreateExternalVolumeClassAccessPolicyRequest) GetAccessPolicy() *AccessPolicy { + if x != nil { + return x.AccessPolicy + } + return nil +} + +// UpdateExternalVolumeClassAccessPolicyRequest replaces an ExternalVolumeClass's access policy. +type UpdateExternalVolumeClassAccessPolicyRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // Parent ExternalVolumeClass under which to update the policy resource. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ExternalVolumeClass *ObjectRef `protobuf:"bytes,1,opt,name=external_volume_class,json=externalVolumeClass,proto3" json:"external_volume_class,omitempty"` + // Full replacement. Metadata UID and version are required preconditions; + // metadata.name must be "default" and metadata.atespace must be empty. + // + // +ate:preview=ExternalVolumes + // +k8s:ifDisabled(ExternalVolumes)=+k8s:forbidden + // +k8s:required + AccessPolicy *AccessPolicy `protobuf:"bytes,2,opt,name=access_policy,json=accessPolicy,proto3" json:"access_policy,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UpdateExternalVolumeClassAccessPolicyRequest) Reset() { + *x = UpdateExternalVolumeClassAccessPolicyRequest{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[146] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateExternalVolumeClassAccessPolicyRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateExternalVolumeClassAccessPolicyRequest) ProtoMessage() {} + +func (x *UpdateExternalVolumeClassAccessPolicyRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[146] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateExternalVolumeClassAccessPolicyRequest.ProtoReflect.Descriptor instead. +func (*UpdateExternalVolumeClassAccessPolicyRequest) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{146} +} + +func (x *UpdateExternalVolumeClassAccessPolicyRequest) GetExternalVolumeClass() *ObjectRef { + if x != nil { + return x.ExternalVolumeClass + } + return nil +} + +func (x *UpdateExternalVolumeClassAccessPolicyRequest) GetAccessPolicy() *AccessPolicy { + if x != nil { + return x.AccessPolicy + } + return nil +} + +// DeleteExternalVolumeClassAccessPolicyRequest identifies an ExternalVolumeClass's access policy. +type DeleteExternalVolumeClassAccessPolicyRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + // The parent ExternalVolumeClass of the access policy resource to delete. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ExternalVolumeClass *ObjectRef `protobuf:"bytes,1,opt,name=external_volume_class,json=externalVolumeClass,proto3" json:"external_volume_class,omitempty"` + // Name of the singleton access policy. Must be "default". + // + // +k8s:required + // +k8s:format=k8s-short-name + // +k8s:customValidation # must be "default" + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + // Optional per-delete preconditions. + // + // +k8s:optional + Options *DeleteOptions `protobuf:"bytes,3,opt,name=options,proto3" json:"options,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *DeleteExternalVolumeClassAccessPolicyRequest) Reset() { + *x = DeleteExternalVolumeClassAccessPolicyRequest{} + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[147] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DeleteExternalVolumeClassAccessPolicyRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteExternalVolumeClassAccessPolicyRequest) ProtoMessage() {} + +func (x *DeleteExternalVolumeClassAccessPolicyRequest) ProtoReflect() protoreflect.Message { + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[147] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteExternalVolumeClassAccessPolicyRequest.ProtoReflect.Descriptor instead. +func (*DeleteExternalVolumeClassAccessPolicyRequest) Descriptor() ([]byte, []int) { + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{147} +} + +func (x *DeleteExternalVolumeClassAccessPolicyRequest) GetExternalVolumeClass() *ObjectRef { + if x != nil { + return x.ExternalVolumeClass + } + return nil +} + +func (x *DeleteExternalVolumeClassAccessPolicyRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *DeleteExternalVolumeClassAccessPolicyRequest) GetOptions() *DeleteOptions { + if x != nil { + return x.Options + } + return nil +} + // ResourceAnnotation marks a message as an API resource. See // docs/resource-model.md. type ResourceAnnotation struct { @@ -9862,7 +10516,7 @@ type ResourceAnnotation struct { func (x *ResourceAnnotation) Reset() { *x = ResourceAnnotation{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[138] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[148] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9874,7 +10528,7 @@ func (x *ResourceAnnotation) String() string { func (*ResourceAnnotation) ProtoMessage() {} func (x *ResourceAnnotation) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[138] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[148] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9887,7 +10541,7 @@ func (x *ResourceAnnotation) ProtoReflect() protoreflect.Message { // Deprecated: Use ResourceAnnotation.ProtoReflect.Descriptor instead. func (*ResourceAnnotation) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{138} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{148} } func (x *ResourceAnnotation) GetParents() []string { @@ -9930,7 +10584,7 @@ type MethodAnnotation struct { func (x *MethodAnnotation) Reset() { *x = MethodAnnotation{} - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[139] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[149] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -9942,7 +10596,7 @@ func (x *MethodAnnotation) String() string { func (*MethodAnnotation) ProtoMessage() {} func (x *MethodAnnotation) ProtoReflect() protoreflect.Message { - mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[139] + mi := &file_api_ateapi_v1_ateapi_proto_msgTypes[149] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9955,7 +10609,7 @@ func (x *MethodAnnotation) ProtoReflect() protoreflect.Message { // Deprecated: Use MethodAnnotation.ProtoReflect.Descriptor instead. func (*MethodAnnotation) Descriptor() ([]byte, []int) { - return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{139} + return file_api_ateapi_v1_ateapi_proto_rawDescGZIP(), []int{149} } func (x *MethodAnnotation) GetResource() string { @@ -10034,13 +10688,14 @@ const file_api_ateapi_v1_ateapi_proto_rawDesc = "" + "\vdelete_time\x18\a \x01(\v2\x1a.google.protobuf.TimestampR\n" + "deleteTime\"V\n" + "\x0fExternalVolumes\x12C\n" + - "\avolumes\x18\x01 \x03(\v2).substrate.ateapi.v1.ExternalVolumeStatusR\avolumes\"\x9e\x02\n" + + "\avolumes\x18\x01 \x03(\v2).substrate.ateapi.v1.ExternalVolumeStatusR\avolumes\"\xc3\x02\n" + "\x14ExternalVolumeStatus\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12*\n" + "\x11storage_volume_id\x18\x02 \x01(\tR\x0fstorageVolumeId\x12\x1f\n" + "\vvolume_type\x18\x03 \x01(\tR\n" + "volumeType\x12c\n" + - "\x0evolume_context\x18\x04 \x03(\v2<.substrate.ateapi.v1.ExternalVolumeStatus.VolumeContextEntryR\rvolumeContext\x1a@\n" + + "\x0evolume_context\x18\x04 \x03(\v2<.substrate.ateapi.v1.ExternalVolumeStatus.VolumeContextEntryR\rvolumeContext\x12#\n" + + "\rmount_options\x18\x05 \x03(\tR\fmountOptions\x1a@\n" + "\x12VolumeContextEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xe2\x02\n" + @@ -10194,10 +10849,22 @@ const file_api_ateapi_v1_ateapi_proto_rawDesc = "" + "\btemplate\x18\x01 \x01(\v2+.substrate.ateapi.v1.ExternalVolumeTemplateR\btemplate\"1\n" + "\x11ImageVolumeSource\x12\x1c\n" + "\treference\x18\x01 \x01(\tR\treference\"\x18\n" + - "\x16DurableDirVolumeSource\"m\n" + + "\x16DurableDirVolumeSource\"\xc5\x01\n" + "\x16ExternalVolumeTemplate\x12%\n" + - "\x0ecapacity_bytes\x18\x01 \x01(\x03R\rcapacityBytes\x12,\n" + - "\x12storage_class_name\x18\x02 \x01(\tR\x10storageClassName\"f\n" + + "\x0ecapacity_bytes\x18\x01 \x01(\x03R\rcapacityBytes\x120\n" + + "\x12storage_class_name\x18\x02 \x01(\tB\x02\x18\x01R\x10storageClassName\x12R\n" + + "\x15external_volume_class\x18\x03 \x01(\v2\x1e.substrate.ateapi.v1.ObjectRefR\x13externalVolumeClass\"\xd6\x02\n" + + "\x13ExternalVolumeClass\x12A\n" + + "\bmetadata\x18\x01 \x01(\v2%.substrate.ateapi.v1.ResourceMetadataR\bmetadata\x12\x1f\n" + + "\vdriver_name\x18\x02 \x01(\tR\n" + + "driverName\x12X\n" + + "\n" + + "parameters\x18\x03 \x03(\v28.substrate.ateapi.v1.ExternalVolumeClass.ParametersEntryR\n" + + "parameters\x12#\n" + + "\rmount_options\x18\x04 \x03(\tR\fmountOptions\x1a=\n" + + "\x0fParametersEntry\x12\x10\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01:\x1d\x82\xb5\x18\x19\x18\x02\"\x15ExternalVolumeClasses\"f\n" + "\x16SystemInfoVolumeSource\x12L\n" + "\fdata_sources\x18\x01 \x03(\v2).substrate.ateapi.v1.SystemInfoDataSourceR\vdataSources\"\xba\x01\n" + "\x14SystemInfoDataSource\x12S\n" + @@ -10226,6 +10893,18 @@ const file_api_ateapi_v1_ateapi_proto_rawDesc = "" + "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\x91\x01\n" + "\x15DeleteAtespaceRequest\x12:\n" + "\batespace\x18\x01 \x01(\v2\x1e.substrate.ateapi.v1.ObjectRefR\batespace\x12<\n" + + "\aoptions\x18\x02 \x01(\v2\".substrate.ateapi.v1.DeleteOptionsR\aoptions\"\x80\x01\n" + + " CreateExternalVolumeClassRequest\x12\\\n" + + "\x15external_volume_class\x18\x01 \x01(\v2(.substrate.ateapi.v1.ExternalVolumeClassR\x13externalVolumeClass\"s\n" + + "\x1dGetExternalVolumeClassRequest\x12R\n" + + "\x15external_volume_class\x18\x01 \x01(\v2\x1e.substrate.ateapi.v1.ObjectRefR\x13externalVolumeClass\"^\n" + + " ListExternalVolumeClassesRequest\x12:\n" + + "\aoptions\x18\x01 \x01(\v2 .substrate.ateapi.v1.ListOptionsR\aoptions\"\xad\x01\n" + + "!ListExternalVolumeClassesResponse\x12`\n" + + "\x17external_volume_classes\x18\x01 \x03(\v2(.substrate.ateapi.v1.ExternalVolumeClassR\x15externalVolumeClasses\x12&\n" + + "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\xb4\x01\n" + + " DeleteExternalVolumeClassRequest\x12R\n" + + "\x15external_volume_class\x18\x01 \x01(\v2\x1e.substrate.ateapi.v1.ObjectRefR\x13externalVolumeClass\x12<\n" + "\aoptions\x18\x02 \x01(\v2\".substrate.ateapi.v1.DeleteOptionsR\aoptions\"g\n" + "\x1aCreateActorTemplateRequest\x12I\n" + "\x0eactor_template\x18\x01 \x01(\v2\".substrate.ateapi.v1.ActorTemplateR\ractorTemplate\"`\n" + @@ -10464,12 +11143,13 @@ const file_api_ateapi_v1_ateapi_proto_rawDesc = "" + "\bfidelity\x18\x03 \x01(\x0e2%.substrate.ateapi.v1.SnapshotFidelityR\bfidelity\x12;\n" + "\x06object\x18\x04 \x01(\v2#.substrate.ateapi.v1.ObjectSnapshotR\x06object\x12F\n" + "\x11local_commit_time\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\x0flocalCommitTime\x12N\n" + - "\x15durable_complete_time\x18\x06 \x01(\v2\x1a.google.protobuf.TimestampR\x13durableCompleteTime\"\xb5\x01\n" + + "\x15durable_complete_time\x18\x06 \x01(\v2\x1a.google.protobuf.TimestampR\x13durableCompleteTime\"\xca\x01\n" + "\fAccessPolicy\x12A\n" + "\bmetadata\x18\x01 \x01(\v2%.substrate.ateapi.v1.ResourceMetadataR\bmetadata\x128\n" + - "\bbindings\x18\x02 \x03(\v2\x1c.substrate.ateapi.v1.BindingR\bbindings:(\x82\xb5\x18$\n" + + "\bbindings\x18\x02 \x03(\v2\x1c.substrate.ateapi.v1.BindingR\bbindings:=\x82\xb5\x189\n" + "\x06Global\n" + - "\bAtespace\x10\x01\"\x0eAccessPolicies\"7\n" + + "\bAtespace\n" + + "\x13ExternalVolumeClass\x10\x01\"\x0eAccessPolicies\"7\n" + "\aBinding\x12\x12\n" + "\x04role\x18\x01 \x01(\tR\x04role\x12\x18\n" + "\amembers\x18\x02 \x03(\tR\amembers\"2\n" + @@ -10491,6 +11171,19 @@ const file_api_ateapi_v1_ateapi_proto_rawDesc = "" + "!DeleteAtespaceAccessPolicyRequest\x12:\n" + "\batespace\x18\x01 \x01(\v2\x1e.substrate.ateapi.v1.ObjectRefR\batespace\x12\x12\n" + "\x04name\x18\x02 \x01(\tR\x04name\x12<\n" + + "\aoptions\x18\x03 \x01(\v2\".substrate.ateapi.v1.DeleteOptionsR\aoptions\"\x93\x01\n" + + ")GetExternalVolumeClassAccessPolicyRequest\x12R\n" + + "\x15external_volume_class\x18\x01 \x01(\v2\x1e.substrate.ateapi.v1.ObjectRefR\x13externalVolumeClass\x12\x12\n" + + "\x04name\x18\x02 \x01(\tR\x04name\"\xca\x01\n" + + ",CreateExternalVolumeClassAccessPolicyRequest\x12R\n" + + "\x15external_volume_class\x18\x01 \x01(\v2\x1e.substrate.ateapi.v1.ObjectRefR\x13externalVolumeClass\x12F\n" + + "\raccess_policy\x18\x02 \x01(\v2!.substrate.ateapi.v1.AccessPolicyR\faccessPolicy\"\xca\x01\n" + + ",UpdateExternalVolumeClassAccessPolicyRequest\x12R\n" + + "\x15external_volume_class\x18\x01 \x01(\v2\x1e.substrate.ateapi.v1.ObjectRefR\x13externalVolumeClass\x12F\n" + + "\raccess_policy\x18\x02 \x01(\v2!.substrate.ateapi.v1.AccessPolicyR\faccessPolicy\"\xd4\x01\n" + + ",DeleteExternalVolumeClassAccessPolicyRequest\x12R\n" + + "\x15external_volume_class\x18\x01 \x01(\v2\x1e.substrate.ateapi.v1.ObjectRefR\x13externalVolumeClass\x12\x12\n" + + "\x04name\x18\x02 \x01(\tR\x04name\x12<\n" + "\aoptions\x18\x03 \x01(\v2\".substrate.ateapi.v1.DeleteOptionsR\aoptions\"\x96\x01\n" + "\x12ResourceAnnotation\x12\x18\n" + "\aparents\x18\x01 \x03(\tR\aparents\x12\x1c\n" + @@ -10547,7 +11240,7 @@ const file_api_ateapi_v1_ateapi_proto_rawDesc = "" + "\x05Scope\x12\x15\n" + "\x11SCOPE_UNSPECIFIED\x10\x00\x12\x12\n" + "\x0eSCOPE_ATESPACE\x10\x01\x12\x10\n" + - "\fSCOPE_GLOBAL\x10\x022\xca&\n" + + "\fSCOPE_GLOBAL\x10\x022\xc40\n" + "\aControl\x12Y\n" + "\bGetActor\x12$.substrate.ateapi.v1.GetActorRequest\x1a\x1a.substrate.ateapi.v1.Actor\"\v\x82\xb5\x18\a\n" + "\x05Actor\x12_\n" + @@ -10615,7 +11308,15 @@ const file_api_ateapi_v1_ateapi_proto_rawDesc = "" + "\bAtespace\x12k\n" + "\x0eDeleteAtespace\x12*.substrate.ateapi.v1.DeleteAtespaceRequest\x1a\x1d.substrate.ateapi.v1.Atespace\"\x0e\x82\xb5\x18\n" + "\n" + - "\bAtespace\x12\x7f\n" + + "\bAtespace\x12\x97\x01\n" + + "\x19CreateExternalVolumeClass\x125.substrate.ateapi.v1.CreateExternalVolumeClassRequest\x1a(.substrate.ateapi.v1.ExternalVolumeClass\"\x19\x82\xb5\x18\x15\n" + + "\x13ExternalVolumeClass\x12\x91\x01\n" + + "\x16GetExternalVolumeClass\x122.substrate.ateapi.v1.GetExternalVolumeClassRequest\x1a(.substrate.ateapi.v1.ExternalVolumeClass\"\x19\x82\xb5\x18\x15\n" + + "\x13ExternalVolumeClass\x12\xa5\x01\n" + + "\x19ListExternalVolumeClasses\x125.substrate.ateapi.v1.ListExternalVolumeClassesRequest\x1a6.substrate.ateapi.v1.ListExternalVolumeClassesResponse\"\x19\x82\xb5\x18\x15\n" + + "\x13ExternalVolumeClass\x12\x97\x01\n" + + "\x19DeleteExternalVolumeClass\x125.substrate.ateapi.v1.DeleteExternalVolumeClassRequest\x1a(.substrate.ateapi.v1.ExternalVolumeClass\"\x19\x82\xb5\x18\x15\n" + + "\x13ExternalVolumeClass\x12\x7f\n" + "\x13CreateActorTemplate\x12/.substrate.ateapi.v1.CreateActorTemplateRequest\x1a\".substrate.ateapi.v1.ActorTemplate\"\x13\x82\xb5\x18\x0f\n" + "\rActorTemplate\x12y\n" + "\x10GetActorTemplate\x12,.substrate.ateapi.v1.GetActorTemplateRequest\x1a\".substrate.ateapi.v1.ActorTemplate\"\x13\x82\xb5\x18\x0f\n" + @@ -10637,6 +11338,14 @@ const file_api_ateapi_v1_ateapi_proto_rawDesc = "" + "\x1aUpdateAtespaceAccessPolicy\x126.substrate.ateapi.v1.UpdateAtespaceAccessPolicyRequest\x1a!.substrate.ateapi.v1.AccessPolicy\"\x12\x82\xb5\x18\x0e\n" + "\fAccessPolicy\x12\x8b\x01\n" + "\x1aDeleteAtespaceAccessPolicy\x126.substrate.ateapi.v1.DeleteAtespaceAccessPolicyRequest\x1a!.substrate.ateapi.v1.AccessPolicy\"\x12\x82\xb5\x18\x0e\n" + + "\fAccessPolicy\x12\x9b\x01\n" + + "\"GetExternalVolumeClassAccessPolicy\x12>.substrate.ateapi.v1.GetExternalVolumeClassAccessPolicyRequest\x1a!.substrate.ateapi.v1.AccessPolicy\"\x12\x82\xb5\x18\x0e\n" + + "\fAccessPolicy\x12\xa1\x01\n" + + "%CreateExternalVolumeClassAccessPolicy\x12A.substrate.ateapi.v1.CreateExternalVolumeClassAccessPolicyRequest\x1a!.substrate.ateapi.v1.AccessPolicy\"\x12\x82\xb5\x18\x0e\n" + + "\fAccessPolicy\x12\xa1\x01\n" + + "%UpdateExternalVolumeClassAccessPolicy\x12A.substrate.ateapi.v1.UpdateExternalVolumeClassAccessPolicyRequest\x1a!.substrate.ateapi.v1.AccessPolicy\"\x12\x82\xb5\x18\x0e\n" + + "\fAccessPolicy\x12\xa1\x01\n" + + "%DeleteExternalVolumeClassAccessPolicy\x12A.substrate.ateapi.v1.DeleteExternalVolumeClassAccessPolicyRequest\x1a!.substrate.ateapi.v1.AccessPolicy\"\x12\x82\xb5\x18\x0e\n" + "\fAccessPolicy2\xfd\a\n" + "\rWorkerService\x12u\n" + "\x12AcquireWorkerEpoch\x12..substrate.ateapi.v1.AcquireWorkerEpochRequest\x1a/.substrate.ateapi.v1.AcquireWorkerEpochResponse\x12i\n" + @@ -10663,164 +11372,175 @@ func file_api_ateapi_v1_ateapi_proto_rawDescGZIP() []byte { } var file_api_ateapi_v1_ateapi_proto_enumTypes = make([]protoimpl.EnumInfo, 10) -var file_api_ateapi_v1_ateapi_proto_msgTypes = make([]protoimpl.MessageInfo, 143) +var file_api_ateapi_v1_ateapi_proto_msgTypes = make([]protoimpl.MessageInfo, 154) var file_api_ateapi_v1_ateapi_proto_goTypes = []any{ - (SnapshotOwner)(0), // 0: substrate.ateapi.v1.SnapshotOwner - (SnapshotStorageState)(0), // 1: substrate.ateapi.v1.SnapshotStorageState - (SnapshotFidelity)(0), // 2: substrate.ateapi.v1.SnapshotFidelity - (TagScope)(0), // 3: substrate.ateapi.v1.TagScope - (ActorState)(0), // 4: substrate.ateapi.v1.ActorState - (GoldenSnapshotMode)(0), // 5: substrate.ateapi.v1.GoldenSnapshotMode - (ActorMetadataField)(0), // 6: substrate.ateapi.v1.ActorMetadataField - (DurabilityMode)(0), // 7: substrate.ateapi.v1.DurabilityMode - (WorkerState)(0), // 8: substrate.ateapi.v1.WorkerState - (Scope)(0), // 9: substrate.ateapi.v1.Scope - (*ObjectSnapshot)(nil), // 10: substrate.ateapi.v1.ObjectSnapshot - (*SnapshotStorage)(nil), // 11: substrate.ateapi.v1.SnapshotStorage - (*Snapshot)(nil), // 12: substrate.ateapi.v1.Snapshot - (*Selector)(nil), // 13: substrate.ateapi.v1.Selector - (*ResourceMetadata)(nil), // 14: substrate.ateapi.v1.ResourceMetadata - (*ExternalVolumes)(nil), // 15: substrate.ateapi.v1.ExternalVolumes - (*ExternalVolumeStatus)(nil), // 16: substrate.ateapi.v1.ExternalVolumeStatus - (*Actor)(nil), // 17: substrate.ateapi.v1.Actor - (*EgressPolicy)(nil), // 18: substrate.ateapi.v1.EgressPolicy - (*EgressPolicyTemplate)(nil), // 19: substrate.ateapi.v1.EgressPolicyTemplate - (*EgressRule)(nil), // 20: substrate.ateapi.v1.EgressRule - (*HttpRule)(nil), // 21: substrate.ateapi.v1.HttpRule - (*HttpsRule)(nil), // 22: substrate.ateapi.v1.HttpsRule - (*TlsPassthroughRule)(nil), // 23: substrate.ateapi.v1.TlsPassthroughRule - (*Ports)(nil), // 24: substrate.ateapi.v1.Ports - (*AllPorts)(nil), // 25: substrate.ateapi.v1.AllPorts - (*HttpRuleEffects)(nil), // 26: substrate.ateapi.v1.HttpRuleEffects - (*CredentialHeader)(nil), // 27: substrate.ateapi.v1.CredentialHeader - (*ActorJwtSource)(nil), // 28: substrate.ateapi.v1.ActorJwtSource - (*ActorStatus)(nil), // 29: substrate.ateapi.v1.ActorStatus - (*ActorCrash)(nil), // 30: substrate.ateapi.v1.ActorCrash - (*WorkerAssignment)(nil), // 31: substrate.ateapi.v1.WorkerAssignment - (*TagStatus)(nil), // 32: substrate.ateapi.v1.TagStatus - (*Tag)(nil), // 33: substrate.ateapi.v1.Tag - (*Atespace)(nil), // 34: substrate.ateapi.v1.Atespace - (*ObjectRef)(nil), // 35: substrate.ateapi.v1.ObjectRef - (*ActorTemplate)(nil), // 36: substrate.ateapi.v1.ActorTemplate - (*ResourceRequirements)(nil), // 37: substrate.ateapi.v1.ResourceRequirements - (*Resources)(nil), // 38: substrate.ateapi.v1.Resources - (*GoldenSnapshotStatus)(nil), // 39: substrate.ateapi.v1.GoldenSnapshotStatus - (*ActorTemplateStatus)(nil), // 40: substrate.ateapi.v1.ActorTemplateStatus - (*SnapshotConfig)(nil), // 41: substrate.ateapi.v1.SnapshotConfig - (*GoldenSnapshotConfig)(nil), // 42: substrate.ateapi.v1.GoldenSnapshotConfig - (*Container)(nil), // 43: substrate.ateapi.v1.Container - (*SecurityContext)(nil), // 44: substrate.ateapi.v1.SecurityContext - (*Capabilities)(nil), // 45: substrate.ateapi.v1.Capabilities - (*EnvVar)(nil), // 46: substrate.ateapi.v1.EnvVar - (*WakeupProbe)(nil), // 47: substrate.ateapi.v1.WakeupProbe - (*HttpGetAction)(nil), // 48: substrate.ateapi.v1.HttpGetAction - (*Volume)(nil), // 49: substrate.ateapi.v1.Volume - (*ExternalVolumeSource)(nil), // 50: substrate.ateapi.v1.ExternalVolumeSource - (*ImageVolumeSource)(nil), // 51: substrate.ateapi.v1.ImageVolumeSource - (*DurableDirVolumeSource)(nil), // 52: substrate.ateapi.v1.DurableDirVolumeSource - (*ExternalVolumeTemplate)(nil), // 53: substrate.ateapi.v1.ExternalVolumeTemplate - (*SystemInfoVolumeSource)(nil), // 54: substrate.ateapi.v1.SystemInfoVolumeSource - (*SystemInfoDataSource)(nil), // 55: substrate.ateapi.v1.SystemInfoDataSource - (*ActorMetadataDataSource)(nil), // 56: substrate.ateapi.v1.ActorMetadataDataSource - (*ActorMetadataItem)(nil), // 57: substrate.ateapi.v1.ActorMetadataItem - (*TrustBundleDataSource)(nil), // 58: substrate.ateapi.v1.TrustBundleDataSource - (*VolumeMount)(nil), // 59: substrate.ateapi.v1.VolumeMount - (*CreateAtespaceRequest)(nil), // 60: substrate.ateapi.v1.CreateAtespaceRequest - (*GetAtespaceRequest)(nil), // 61: substrate.ateapi.v1.GetAtespaceRequest - (*ListAtespacesRequest)(nil), // 62: substrate.ateapi.v1.ListAtespacesRequest - (*ListAtespacesResponse)(nil), // 63: substrate.ateapi.v1.ListAtespacesResponse - (*DeleteAtespaceRequest)(nil), // 64: substrate.ateapi.v1.DeleteAtespaceRequest - (*CreateActorTemplateRequest)(nil), // 65: substrate.ateapi.v1.CreateActorTemplateRequest - (*GetActorTemplateRequest)(nil), // 66: substrate.ateapi.v1.GetActorTemplateRequest - (*ListActorTemplatesRequest)(nil), // 67: substrate.ateapi.v1.ListActorTemplatesRequest - (*ListActorTemplatesResponse)(nil), // 68: substrate.ateapi.v1.ListActorTemplatesResponse - (*DeleteActorTemplateRequest)(nil), // 69: substrate.ateapi.v1.DeleteActorTemplateRequest - (*GetActorRequest)(nil), // 70: substrate.ateapi.v1.GetActorRequest - (*CreateActorRequest)(nil), // 71: substrate.ateapi.v1.CreateActorRequest - (*UpdateActorRequest)(nil), // 72: substrate.ateapi.v1.UpdateActorRequest - (*SuspendActorRequest)(nil), // 73: substrate.ateapi.v1.SuspendActorRequest - (*SuspendActorResponse)(nil), // 74: substrate.ateapi.v1.SuspendActorResponse - (*SuspendOptions)(nil), // 75: substrate.ateapi.v1.SuspendOptions - (*ResumeActorRequest)(nil), // 76: substrate.ateapi.v1.ResumeActorRequest - (*ResumeActorResponse)(nil), // 77: substrate.ateapi.v1.ResumeActorResponse - (*RevertActorRequest)(nil), // 78: substrate.ateapi.v1.RevertActorRequest - (*RevertActorResponse)(nil), // 79: substrate.ateapi.v1.RevertActorResponse - (*DeleteActorRequest)(nil), // 80: substrate.ateapi.v1.DeleteActorRequest - (*GetActorEgressPolicyRequest)(nil), // 81: substrate.ateapi.v1.GetActorEgressPolicyRequest - (*CreateActorEgressPolicyRequest)(nil), // 82: substrate.ateapi.v1.CreateActorEgressPolicyRequest - (*UpdateActorEgressPolicyRequest)(nil), // 83: substrate.ateapi.v1.UpdateActorEgressPolicyRequest - (*DeleteActorEgressPolicyRequest)(nil), // 84: substrate.ateapi.v1.DeleteActorEgressPolicyRequest - (*GetTagRequest)(nil), // 85: substrate.ateapi.v1.GetTagRequest - (*MintActorJwtRequest)(nil), // 86: substrate.ateapi.v1.MintActorJwtRequest - (*MintActorJwtResponse)(nil), // 87: substrate.ateapi.v1.MintActorJwtResponse - (*ListTagsRequest)(nil), // 88: substrate.ateapi.v1.ListTagsRequest - (*ListTagsResponse)(nil), // 89: substrate.ateapi.v1.ListTagsResponse - (*CreateTagRequest)(nil), // 90: substrate.ateapi.v1.CreateTagRequest - (*UpdateTagRequest)(nil), // 91: substrate.ateapi.v1.UpdateTagRequest - (*DeleteTagRequest)(nil), // 92: substrate.ateapi.v1.DeleteTagRequest - (*DeleteOptions)(nil), // 93: substrate.ateapi.v1.DeleteOptions - (*ListOptions)(nil), // 94: substrate.ateapi.v1.ListOptions - (*ListWorkerActorAssignmentsRequest)(nil), // 95: substrate.ateapi.v1.ListWorkerActorAssignmentsRequest - (*ListWorkerActorAssignmentsResponse)(nil), // 96: substrate.ateapi.v1.ListWorkerActorAssignmentsResponse - (*ListWorkersRequest)(nil), // 97: substrate.ateapi.v1.ListWorkersRequest - (*ListWorkersResponse)(nil), // 98: substrate.ateapi.v1.ListWorkersResponse - (*GetWorkerRequest)(nil), // 99: substrate.ateapi.v1.GetWorkerRequest - (*CreateWorkerRequest)(nil), // 100: substrate.ateapi.v1.CreateWorkerRequest - (*UpdateWorkerRequest)(nil), // 101: substrate.ateapi.v1.UpdateWorkerRequest - (*DeleteWorkerRequest)(nil), // 102: substrate.ateapi.v1.DeleteWorkerRequest - (*DrainWorkerRequest)(nil), // 103: substrate.ateapi.v1.DrainWorkerRequest - (*DrainWorkerResponse)(nil), // 104: substrate.ateapi.v1.DrainWorkerResponse - (*MarkWorkerAvailableRequest)(nil), // 105: substrate.ateapi.v1.MarkWorkerAvailableRequest - (*MarkWorkerAvailableResponse)(nil), // 106: substrate.ateapi.v1.MarkWorkerAvailableResponse - (*MarkWorkerUnavailableRequest)(nil), // 107: substrate.ateapi.v1.MarkWorkerUnavailableRequest - (*MarkWorkerUnavailableResponse)(nil), // 108: substrate.ateapi.v1.MarkWorkerUnavailableResponse - (*ListActorsRequest)(nil), // 109: substrate.ateapi.v1.ListActorsRequest - (*ListActorsResponse)(nil), // 110: substrate.ateapi.v1.ListActorsResponse - (*Worker)(nil), // 111: substrate.ateapi.v1.Worker - (*WorkerStatus)(nil), // 112: substrate.ateapi.v1.WorkerStatus - (*WorkerSandboxClass)(nil), // 113: substrate.ateapi.v1.WorkerSandboxClass - (*WorkerSandboxRuntime)(nil), // 114: substrate.ateapi.v1.WorkerSandboxRuntime - (*RuntimeOverhead)(nil), // 115: substrate.ateapi.v1.RuntimeOverhead - (*ActorSandboxRuntime)(nil), // 116: substrate.ateapi.v1.ActorSandboxRuntime - (*VersionedSandboxCompat)(nil), // 117: substrate.ateapi.v1.VersionedSandboxCompat - (*AttributeEntry)(nil), // 118: substrate.ateapi.v1.AttributeEntry - (*WorkerResources)(nil), // 119: substrate.ateapi.v1.WorkerResources - (*ActorAssignment)(nil), // 120: substrate.ateapi.v1.ActorAssignment - (*AcquireWorkerEpochRequest)(nil), // 121: substrate.ateapi.v1.AcquireWorkerEpochRequest - (*AcquireWorkerEpochResponse)(nil), // 122: substrate.ateapi.v1.AcquireWorkerEpochResponse - (*RegisterWorkerRequest)(nil), // 123: substrate.ateapi.v1.RegisterWorkerRequest - (*RegisterWorkerResponse)(nil), // 124: substrate.ateapi.v1.RegisterWorkerResponse - (*SetWorkerSandboxRuntimesRequest)(nil), // 125: substrate.ateapi.v1.SetWorkerSandboxRuntimesRequest - (*SetWorkerSandboxRuntimesResponse)(nil), // 126: substrate.ateapi.v1.SetWorkerSandboxRuntimesResponse - (*MintWorkerActorCertificateRequest)(nil), // 127: substrate.ateapi.v1.MintWorkerActorCertificateRequest - (*MintWorkerActorCertificateResponse)(nil), // 128: substrate.ateapi.v1.MintWorkerActorCertificateResponse - (*MintWorkerActorJwtRequest)(nil), // 129: substrate.ateapi.v1.MintWorkerActorJwtRequest - (*MintWorkerActorJwtResponse)(nil), // 130: substrate.ateapi.v1.MintWorkerActorJwtResponse - (*RequestActorSuspendRequest)(nil), // 131: substrate.ateapi.v1.RequestActorSuspendRequest - (*RequestActorSuspendResponse)(nil), // 132: substrate.ateapi.v1.RequestActorSuspendResponse - (*ReportActorCrashedRequest)(nil), // 133: substrate.ateapi.v1.ReportActorCrashedRequest - (*ReportActorCrashedResponse)(nil), // 134: substrate.ateapi.v1.ReportActorCrashedResponse - (*ReportActorSnapshotStateRequest)(nil), // 135: substrate.ateapi.v1.ReportActorSnapshotStateRequest - (*ReportActorSnapshotStateResponse)(nil), // 136: substrate.ateapi.v1.ReportActorSnapshotStateResponse - (*ActorSnapshotState)(nil), // 137: substrate.ateapi.v1.ActorSnapshotState - (*SnapshotReport)(nil), // 138: substrate.ateapi.v1.SnapshotReport - (*AccessPolicy)(nil), // 139: substrate.ateapi.v1.AccessPolicy - (*Binding)(nil), // 140: substrate.ateapi.v1.Binding - (*GetGlobalAccessPolicyRequest)(nil), // 141: substrate.ateapi.v1.GetGlobalAccessPolicyRequest - (*CreateGlobalAccessPolicyRequest)(nil), // 142: substrate.ateapi.v1.CreateGlobalAccessPolicyRequest - (*UpdateGlobalAccessPolicyRequest)(nil), // 143: substrate.ateapi.v1.UpdateGlobalAccessPolicyRequest - (*GetAtespaceAccessPolicyRequest)(nil), // 144: substrate.ateapi.v1.GetAtespaceAccessPolicyRequest - (*CreateAtespaceAccessPolicyRequest)(nil), // 145: substrate.ateapi.v1.CreateAtespaceAccessPolicyRequest - (*UpdateAtespaceAccessPolicyRequest)(nil), // 146: substrate.ateapi.v1.UpdateAtespaceAccessPolicyRequest - (*DeleteAtespaceAccessPolicyRequest)(nil), // 147: substrate.ateapi.v1.DeleteAtespaceAccessPolicyRequest - (*ResourceAnnotation)(nil), // 148: substrate.ateapi.v1.ResourceAnnotation - (*MethodAnnotation)(nil), // 149: substrate.ateapi.v1.MethodAnnotation - nil, // 150: substrate.ateapi.v1.Selector.MatchLabelsEntry - nil, // 151: substrate.ateapi.v1.ExternalVolumeStatus.VolumeContextEntry - nil, // 152: substrate.ateapi.v1.Worker.LabelsEntry - (*timestamppb.Timestamp)(nil), // 153: google.protobuf.Timestamp - (*descriptorpb.MessageOptions)(nil), // 154: google.protobuf.MessageOptions - (*descriptorpb.MethodOptions)(nil), // 155: google.protobuf.MethodOptions + (SnapshotOwner)(0), // 0: substrate.ateapi.v1.SnapshotOwner + (SnapshotStorageState)(0), // 1: substrate.ateapi.v1.SnapshotStorageState + (SnapshotFidelity)(0), // 2: substrate.ateapi.v1.SnapshotFidelity + (TagScope)(0), // 3: substrate.ateapi.v1.TagScope + (ActorState)(0), // 4: substrate.ateapi.v1.ActorState + (GoldenSnapshotMode)(0), // 5: substrate.ateapi.v1.GoldenSnapshotMode + (ActorMetadataField)(0), // 6: substrate.ateapi.v1.ActorMetadataField + (DurabilityMode)(0), // 7: substrate.ateapi.v1.DurabilityMode + (WorkerState)(0), // 8: substrate.ateapi.v1.WorkerState + (Scope)(0), // 9: substrate.ateapi.v1.Scope + (*ObjectSnapshot)(nil), // 10: substrate.ateapi.v1.ObjectSnapshot + (*SnapshotStorage)(nil), // 11: substrate.ateapi.v1.SnapshotStorage + (*Snapshot)(nil), // 12: substrate.ateapi.v1.Snapshot + (*Selector)(nil), // 13: substrate.ateapi.v1.Selector + (*ResourceMetadata)(nil), // 14: substrate.ateapi.v1.ResourceMetadata + (*ExternalVolumes)(nil), // 15: substrate.ateapi.v1.ExternalVolumes + (*ExternalVolumeStatus)(nil), // 16: substrate.ateapi.v1.ExternalVolumeStatus + (*Actor)(nil), // 17: substrate.ateapi.v1.Actor + (*EgressPolicy)(nil), // 18: substrate.ateapi.v1.EgressPolicy + (*EgressPolicyTemplate)(nil), // 19: substrate.ateapi.v1.EgressPolicyTemplate + (*EgressRule)(nil), // 20: substrate.ateapi.v1.EgressRule + (*HttpRule)(nil), // 21: substrate.ateapi.v1.HttpRule + (*HttpsRule)(nil), // 22: substrate.ateapi.v1.HttpsRule + (*TlsPassthroughRule)(nil), // 23: substrate.ateapi.v1.TlsPassthroughRule + (*Ports)(nil), // 24: substrate.ateapi.v1.Ports + (*AllPorts)(nil), // 25: substrate.ateapi.v1.AllPorts + (*HttpRuleEffects)(nil), // 26: substrate.ateapi.v1.HttpRuleEffects + (*CredentialHeader)(nil), // 27: substrate.ateapi.v1.CredentialHeader + (*ActorJwtSource)(nil), // 28: substrate.ateapi.v1.ActorJwtSource + (*ActorStatus)(nil), // 29: substrate.ateapi.v1.ActorStatus + (*ActorCrash)(nil), // 30: substrate.ateapi.v1.ActorCrash + (*WorkerAssignment)(nil), // 31: substrate.ateapi.v1.WorkerAssignment + (*TagStatus)(nil), // 32: substrate.ateapi.v1.TagStatus + (*Tag)(nil), // 33: substrate.ateapi.v1.Tag + (*Atespace)(nil), // 34: substrate.ateapi.v1.Atespace + (*ObjectRef)(nil), // 35: substrate.ateapi.v1.ObjectRef + (*ActorTemplate)(nil), // 36: substrate.ateapi.v1.ActorTemplate + (*ResourceRequirements)(nil), // 37: substrate.ateapi.v1.ResourceRequirements + (*Resources)(nil), // 38: substrate.ateapi.v1.Resources + (*GoldenSnapshotStatus)(nil), // 39: substrate.ateapi.v1.GoldenSnapshotStatus + (*ActorTemplateStatus)(nil), // 40: substrate.ateapi.v1.ActorTemplateStatus + (*SnapshotConfig)(nil), // 41: substrate.ateapi.v1.SnapshotConfig + (*GoldenSnapshotConfig)(nil), // 42: substrate.ateapi.v1.GoldenSnapshotConfig + (*Container)(nil), // 43: substrate.ateapi.v1.Container + (*SecurityContext)(nil), // 44: substrate.ateapi.v1.SecurityContext + (*Capabilities)(nil), // 45: substrate.ateapi.v1.Capabilities + (*EnvVar)(nil), // 46: substrate.ateapi.v1.EnvVar + (*WakeupProbe)(nil), // 47: substrate.ateapi.v1.WakeupProbe + (*HttpGetAction)(nil), // 48: substrate.ateapi.v1.HttpGetAction + (*Volume)(nil), // 49: substrate.ateapi.v1.Volume + (*ExternalVolumeSource)(nil), // 50: substrate.ateapi.v1.ExternalVolumeSource + (*ImageVolumeSource)(nil), // 51: substrate.ateapi.v1.ImageVolumeSource + (*DurableDirVolumeSource)(nil), // 52: substrate.ateapi.v1.DurableDirVolumeSource + (*ExternalVolumeTemplate)(nil), // 53: substrate.ateapi.v1.ExternalVolumeTemplate + (*ExternalVolumeClass)(nil), // 54: substrate.ateapi.v1.ExternalVolumeClass + (*SystemInfoVolumeSource)(nil), // 55: substrate.ateapi.v1.SystemInfoVolumeSource + (*SystemInfoDataSource)(nil), // 56: substrate.ateapi.v1.SystemInfoDataSource + (*ActorMetadataDataSource)(nil), // 57: substrate.ateapi.v1.ActorMetadataDataSource + (*ActorMetadataItem)(nil), // 58: substrate.ateapi.v1.ActorMetadataItem + (*TrustBundleDataSource)(nil), // 59: substrate.ateapi.v1.TrustBundleDataSource + (*VolumeMount)(nil), // 60: substrate.ateapi.v1.VolumeMount + (*CreateAtespaceRequest)(nil), // 61: substrate.ateapi.v1.CreateAtespaceRequest + (*GetAtespaceRequest)(nil), // 62: substrate.ateapi.v1.GetAtespaceRequest + (*ListAtespacesRequest)(nil), // 63: substrate.ateapi.v1.ListAtespacesRequest + (*ListAtespacesResponse)(nil), // 64: substrate.ateapi.v1.ListAtespacesResponse + (*DeleteAtespaceRequest)(nil), // 65: substrate.ateapi.v1.DeleteAtespaceRequest + (*CreateExternalVolumeClassRequest)(nil), // 66: substrate.ateapi.v1.CreateExternalVolumeClassRequest + (*GetExternalVolumeClassRequest)(nil), // 67: substrate.ateapi.v1.GetExternalVolumeClassRequest + (*ListExternalVolumeClassesRequest)(nil), // 68: substrate.ateapi.v1.ListExternalVolumeClassesRequest + (*ListExternalVolumeClassesResponse)(nil), // 69: substrate.ateapi.v1.ListExternalVolumeClassesResponse + (*DeleteExternalVolumeClassRequest)(nil), // 70: substrate.ateapi.v1.DeleteExternalVolumeClassRequest + (*CreateActorTemplateRequest)(nil), // 71: substrate.ateapi.v1.CreateActorTemplateRequest + (*GetActorTemplateRequest)(nil), // 72: substrate.ateapi.v1.GetActorTemplateRequest + (*ListActorTemplatesRequest)(nil), // 73: substrate.ateapi.v1.ListActorTemplatesRequest + (*ListActorTemplatesResponse)(nil), // 74: substrate.ateapi.v1.ListActorTemplatesResponse + (*DeleteActorTemplateRequest)(nil), // 75: substrate.ateapi.v1.DeleteActorTemplateRequest + (*GetActorRequest)(nil), // 76: substrate.ateapi.v1.GetActorRequest + (*CreateActorRequest)(nil), // 77: substrate.ateapi.v1.CreateActorRequest + (*UpdateActorRequest)(nil), // 78: substrate.ateapi.v1.UpdateActorRequest + (*SuspendActorRequest)(nil), // 79: substrate.ateapi.v1.SuspendActorRequest + (*SuspendActorResponse)(nil), // 80: substrate.ateapi.v1.SuspendActorResponse + (*SuspendOptions)(nil), // 81: substrate.ateapi.v1.SuspendOptions + (*ResumeActorRequest)(nil), // 82: substrate.ateapi.v1.ResumeActorRequest + (*ResumeActorResponse)(nil), // 83: substrate.ateapi.v1.ResumeActorResponse + (*RevertActorRequest)(nil), // 84: substrate.ateapi.v1.RevertActorRequest + (*RevertActorResponse)(nil), // 85: substrate.ateapi.v1.RevertActorResponse + (*DeleteActorRequest)(nil), // 86: substrate.ateapi.v1.DeleteActorRequest + (*GetActorEgressPolicyRequest)(nil), // 87: substrate.ateapi.v1.GetActorEgressPolicyRequest + (*CreateActorEgressPolicyRequest)(nil), // 88: substrate.ateapi.v1.CreateActorEgressPolicyRequest + (*UpdateActorEgressPolicyRequest)(nil), // 89: substrate.ateapi.v1.UpdateActorEgressPolicyRequest + (*DeleteActorEgressPolicyRequest)(nil), // 90: substrate.ateapi.v1.DeleteActorEgressPolicyRequest + (*GetTagRequest)(nil), // 91: substrate.ateapi.v1.GetTagRequest + (*MintActorJwtRequest)(nil), // 92: substrate.ateapi.v1.MintActorJwtRequest + (*MintActorJwtResponse)(nil), // 93: substrate.ateapi.v1.MintActorJwtResponse + (*ListTagsRequest)(nil), // 94: substrate.ateapi.v1.ListTagsRequest + (*ListTagsResponse)(nil), // 95: substrate.ateapi.v1.ListTagsResponse + (*CreateTagRequest)(nil), // 96: substrate.ateapi.v1.CreateTagRequest + (*UpdateTagRequest)(nil), // 97: substrate.ateapi.v1.UpdateTagRequest + (*DeleteTagRequest)(nil), // 98: substrate.ateapi.v1.DeleteTagRequest + (*DeleteOptions)(nil), // 99: substrate.ateapi.v1.DeleteOptions + (*ListOptions)(nil), // 100: substrate.ateapi.v1.ListOptions + (*ListWorkerActorAssignmentsRequest)(nil), // 101: substrate.ateapi.v1.ListWorkerActorAssignmentsRequest + (*ListWorkerActorAssignmentsResponse)(nil), // 102: substrate.ateapi.v1.ListWorkerActorAssignmentsResponse + (*ListWorkersRequest)(nil), // 103: substrate.ateapi.v1.ListWorkersRequest + (*ListWorkersResponse)(nil), // 104: substrate.ateapi.v1.ListWorkersResponse + (*GetWorkerRequest)(nil), // 105: substrate.ateapi.v1.GetWorkerRequest + (*CreateWorkerRequest)(nil), // 106: substrate.ateapi.v1.CreateWorkerRequest + (*UpdateWorkerRequest)(nil), // 107: substrate.ateapi.v1.UpdateWorkerRequest + (*DeleteWorkerRequest)(nil), // 108: substrate.ateapi.v1.DeleteWorkerRequest + (*DrainWorkerRequest)(nil), // 109: substrate.ateapi.v1.DrainWorkerRequest + (*DrainWorkerResponse)(nil), // 110: substrate.ateapi.v1.DrainWorkerResponse + (*MarkWorkerAvailableRequest)(nil), // 111: substrate.ateapi.v1.MarkWorkerAvailableRequest + (*MarkWorkerAvailableResponse)(nil), // 112: substrate.ateapi.v1.MarkWorkerAvailableResponse + (*MarkWorkerUnavailableRequest)(nil), // 113: substrate.ateapi.v1.MarkWorkerUnavailableRequest + (*MarkWorkerUnavailableResponse)(nil), // 114: substrate.ateapi.v1.MarkWorkerUnavailableResponse + (*ListActorsRequest)(nil), // 115: substrate.ateapi.v1.ListActorsRequest + (*ListActorsResponse)(nil), // 116: substrate.ateapi.v1.ListActorsResponse + (*Worker)(nil), // 117: substrate.ateapi.v1.Worker + (*WorkerStatus)(nil), // 118: substrate.ateapi.v1.WorkerStatus + (*WorkerSandboxClass)(nil), // 119: substrate.ateapi.v1.WorkerSandboxClass + (*WorkerSandboxRuntime)(nil), // 120: substrate.ateapi.v1.WorkerSandboxRuntime + (*RuntimeOverhead)(nil), // 121: substrate.ateapi.v1.RuntimeOverhead + (*ActorSandboxRuntime)(nil), // 122: substrate.ateapi.v1.ActorSandboxRuntime + (*VersionedSandboxCompat)(nil), // 123: substrate.ateapi.v1.VersionedSandboxCompat + (*AttributeEntry)(nil), // 124: substrate.ateapi.v1.AttributeEntry + (*WorkerResources)(nil), // 125: substrate.ateapi.v1.WorkerResources + (*ActorAssignment)(nil), // 126: substrate.ateapi.v1.ActorAssignment + (*AcquireWorkerEpochRequest)(nil), // 127: substrate.ateapi.v1.AcquireWorkerEpochRequest + (*AcquireWorkerEpochResponse)(nil), // 128: substrate.ateapi.v1.AcquireWorkerEpochResponse + (*RegisterWorkerRequest)(nil), // 129: substrate.ateapi.v1.RegisterWorkerRequest + (*RegisterWorkerResponse)(nil), // 130: substrate.ateapi.v1.RegisterWorkerResponse + (*SetWorkerSandboxRuntimesRequest)(nil), // 131: substrate.ateapi.v1.SetWorkerSandboxRuntimesRequest + (*SetWorkerSandboxRuntimesResponse)(nil), // 132: substrate.ateapi.v1.SetWorkerSandboxRuntimesResponse + (*MintWorkerActorCertificateRequest)(nil), // 133: substrate.ateapi.v1.MintWorkerActorCertificateRequest + (*MintWorkerActorCertificateResponse)(nil), // 134: substrate.ateapi.v1.MintWorkerActorCertificateResponse + (*MintWorkerActorJwtRequest)(nil), // 135: substrate.ateapi.v1.MintWorkerActorJwtRequest + (*MintWorkerActorJwtResponse)(nil), // 136: substrate.ateapi.v1.MintWorkerActorJwtResponse + (*RequestActorSuspendRequest)(nil), // 137: substrate.ateapi.v1.RequestActorSuspendRequest + (*RequestActorSuspendResponse)(nil), // 138: substrate.ateapi.v1.RequestActorSuspendResponse + (*ReportActorCrashedRequest)(nil), // 139: substrate.ateapi.v1.ReportActorCrashedRequest + (*ReportActorCrashedResponse)(nil), // 140: substrate.ateapi.v1.ReportActorCrashedResponse + (*ReportActorSnapshotStateRequest)(nil), // 141: substrate.ateapi.v1.ReportActorSnapshotStateRequest + (*ReportActorSnapshotStateResponse)(nil), // 142: substrate.ateapi.v1.ReportActorSnapshotStateResponse + (*ActorSnapshotState)(nil), // 143: substrate.ateapi.v1.ActorSnapshotState + (*SnapshotReport)(nil), // 144: substrate.ateapi.v1.SnapshotReport + (*AccessPolicy)(nil), // 145: substrate.ateapi.v1.AccessPolicy + (*Binding)(nil), // 146: substrate.ateapi.v1.Binding + (*GetGlobalAccessPolicyRequest)(nil), // 147: substrate.ateapi.v1.GetGlobalAccessPolicyRequest + (*CreateGlobalAccessPolicyRequest)(nil), // 148: substrate.ateapi.v1.CreateGlobalAccessPolicyRequest + (*UpdateGlobalAccessPolicyRequest)(nil), // 149: substrate.ateapi.v1.UpdateGlobalAccessPolicyRequest + (*GetAtespaceAccessPolicyRequest)(nil), // 150: substrate.ateapi.v1.GetAtespaceAccessPolicyRequest + (*CreateAtespaceAccessPolicyRequest)(nil), // 151: substrate.ateapi.v1.CreateAtespaceAccessPolicyRequest + (*UpdateAtespaceAccessPolicyRequest)(nil), // 152: substrate.ateapi.v1.UpdateAtespaceAccessPolicyRequest + (*DeleteAtespaceAccessPolicyRequest)(nil), // 153: substrate.ateapi.v1.DeleteAtespaceAccessPolicyRequest + (*GetExternalVolumeClassAccessPolicyRequest)(nil), // 154: substrate.ateapi.v1.GetExternalVolumeClassAccessPolicyRequest + (*CreateExternalVolumeClassAccessPolicyRequest)(nil), // 155: substrate.ateapi.v1.CreateExternalVolumeClassAccessPolicyRequest + (*UpdateExternalVolumeClassAccessPolicyRequest)(nil), // 156: substrate.ateapi.v1.UpdateExternalVolumeClassAccessPolicyRequest + (*DeleteExternalVolumeClassAccessPolicyRequest)(nil), // 157: substrate.ateapi.v1.DeleteExternalVolumeClassAccessPolicyRequest + (*ResourceAnnotation)(nil), // 158: substrate.ateapi.v1.ResourceAnnotation + (*MethodAnnotation)(nil), // 159: substrate.ateapi.v1.MethodAnnotation + nil, // 160: substrate.ateapi.v1.Selector.MatchLabelsEntry + nil, // 161: substrate.ateapi.v1.ExternalVolumeStatus.VolumeContextEntry + nil, // 162: substrate.ateapi.v1.ExternalVolumeClass.ParametersEntry + nil, // 163: substrate.ateapi.v1.Worker.LabelsEntry + (*timestamppb.Timestamp)(nil), // 164: google.protobuf.Timestamp + (*descriptorpb.MessageOptions)(nil), // 165: google.protobuf.MessageOptions + (*descriptorpb.MethodOptions)(nil), // 166: google.protobuf.MethodOptions } var file_api_ateapi_v1_ateapi_proto_depIdxs = []int32{ 1, // 0: substrate.ateapi.v1.SnapshotStorage.state:type_name -> substrate.ateapi.v1.SnapshotStorageState @@ -10828,13 +11548,13 @@ var file_api_ateapi_v1_ateapi_proto_depIdxs = []int32{ 0, // 2: substrate.ateapi.v1.Snapshot.owner:type_name -> substrate.ateapi.v1.SnapshotOwner 2, // 3: substrate.ateapi.v1.Snapshot.fidelity:type_name -> substrate.ateapi.v1.SnapshotFidelity 11, // 4: substrate.ateapi.v1.Snapshot.durable_snapshot:type_name -> substrate.ateapi.v1.SnapshotStorage - 116, // 5: substrate.ateapi.v1.Snapshot.sandbox_runtime:type_name -> substrate.ateapi.v1.ActorSandboxRuntime - 150, // 6: substrate.ateapi.v1.Selector.match_labels:type_name -> substrate.ateapi.v1.Selector.MatchLabelsEntry - 153, // 7: substrate.ateapi.v1.ResourceMetadata.create_time:type_name -> google.protobuf.Timestamp - 153, // 8: substrate.ateapi.v1.ResourceMetadata.update_time:type_name -> google.protobuf.Timestamp - 153, // 9: substrate.ateapi.v1.ResourceMetadata.delete_time:type_name -> google.protobuf.Timestamp + 122, // 5: substrate.ateapi.v1.Snapshot.sandbox_runtime:type_name -> substrate.ateapi.v1.ActorSandboxRuntime + 160, // 6: substrate.ateapi.v1.Selector.match_labels:type_name -> substrate.ateapi.v1.Selector.MatchLabelsEntry + 164, // 7: substrate.ateapi.v1.ResourceMetadata.create_time:type_name -> google.protobuf.Timestamp + 164, // 8: substrate.ateapi.v1.ResourceMetadata.update_time:type_name -> google.protobuf.Timestamp + 164, // 9: substrate.ateapi.v1.ResourceMetadata.delete_time:type_name -> google.protobuf.Timestamp 16, // 10: substrate.ateapi.v1.ExternalVolumes.volumes:type_name -> substrate.ateapi.v1.ExternalVolumeStatus - 151, // 11: substrate.ateapi.v1.ExternalVolumeStatus.volume_context:type_name -> substrate.ateapi.v1.ExternalVolumeStatus.VolumeContextEntry + 161, // 11: substrate.ateapi.v1.ExternalVolumeStatus.volume_context:type_name -> substrate.ateapi.v1.ExternalVolumeStatus.VolumeContextEntry 14, // 12: substrate.ateapi.v1.Actor.metadata:type_name -> substrate.ateapi.v1.ResourceMetadata 35, // 13: substrate.ateapi.v1.Actor.actor_template:type_name -> substrate.ateapi.v1.ObjectRef 13, // 14: substrate.ateapi.v1.Actor.worker_selector:type_name -> substrate.ateapi.v1.Selector @@ -10859,9 +11579,9 @@ var file_api_ateapi_v1_ateapi_proto_depIdxs = []int32{ 15, // 33: substrate.ateapi.v1.ActorStatus.external_volumes:type_name -> substrate.ateapi.v1.ExternalVolumes 30, // 34: substrate.ateapi.v1.ActorStatus.crash:type_name -> substrate.ateapi.v1.ActorCrash 12, // 35: substrate.ateapi.v1.ActorStatus.snapshots:type_name -> substrate.ateapi.v1.Snapshot - 153, // 36: substrate.ateapi.v1.ActorCrash.crash_time:type_name -> google.protobuf.Timestamp + 164, // 36: substrate.ateapi.v1.ActorCrash.crash_time:type_name -> google.protobuf.Timestamp 35, // 37: substrate.ateapi.v1.WorkerAssignment.worker:type_name -> substrate.ateapi.v1.ObjectRef - 116, // 38: substrate.ateapi.v1.WorkerAssignment.sandbox_runtime:type_name -> substrate.ateapi.v1.ActorSandboxRuntime + 122, // 38: substrate.ateapi.v1.WorkerAssignment.sandbox_runtime:type_name -> substrate.ateapi.v1.ActorSandboxRuntime 12, // 39: substrate.ateapi.v1.TagStatus.snapshot:type_name -> substrate.ateapi.v1.Snapshot 14, // 40: substrate.ateapi.v1.Tag.metadata:type_name -> substrate.ateapi.v1.ResourceMetadata 32, // 41: substrate.ateapi.v1.Tag.status:type_name -> substrate.ateapi.v1.TagStatus @@ -10878,251 +11598,283 @@ var file_api_ateapi_v1_ateapi_proto_depIdxs = []int32{ 40, // 52: substrate.ateapi.v1.ActorTemplate.status:type_name -> substrate.ateapi.v1.ActorTemplateStatus 38, // 53: substrate.ateapi.v1.ResourceRequirements.limits:type_name -> substrate.ateapi.v1.Resources 35, // 54: substrate.ateapi.v1.GoldenSnapshotStatus.golden_tag:type_name -> substrate.ateapi.v1.ObjectRef - 153, // 55: substrate.ateapi.v1.GoldenSnapshotStatus.snapshot_time:type_name -> google.protobuf.Timestamp + 164, // 55: substrate.ateapi.v1.GoldenSnapshotStatus.snapshot_time:type_name -> google.protobuf.Timestamp 39, // 56: substrate.ateapi.v1.ActorTemplateStatus.golden_snapshot_status:type_name -> substrate.ateapi.v1.GoldenSnapshotStatus 2, // 57: substrate.ateapi.v1.SnapshotConfig.preferred_fidelity:type_name -> substrate.ateapi.v1.SnapshotFidelity 42, // 58: substrate.ateapi.v1.SnapshotConfig.golden_snapshot_config:type_name -> substrate.ateapi.v1.GoldenSnapshotConfig 5, // 59: substrate.ateapi.v1.GoldenSnapshotConfig.mode:type_name -> substrate.ateapi.v1.GoldenSnapshotMode 46, // 60: substrate.ateapi.v1.Container.env:type_name -> substrate.ateapi.v1.EnvVar 47, // 61: substrate.ateapi.v1.Container.wakeup_probe:type_name -> substrate.ateapi.v1.WakeupProbe - 59, // 62: substrate.ateapi.v1.Container.volume_mounts:type_name -> substrate.ateapi.v1.VolumeMount + 60, // 62: substrate.ateapi.v1.Container.volume_mounts:type_name -> substrate.ateapi.v1.VolumeMount 44, // 63: substrate.ateapi.v1.Container.security_context:type_name -> substrate.ateapi.v1.SecurityContext 37, // 64: substrate.ateapi.v1.Container.resources:type_name -> substrate.ateapi.v1.ResourceRequirements 45, // 65: substrate.ateapi.v1.SecurityContext.capabilities:type_name -> substrate.ateapi.v1.Capabilities 48, // 66: substrate.ateapi.v1.WakeupProbe.http_get:type_name -> substrate.ateapi.v1.HttpGetAction 52, // 67: substrate.ateapi.v1.Volume.durable_dir:type_name -> substrate.ateapi.v1.DurableDirVolumeSource 50, // 68: substrate.ateapi.v1.Volume.external:type_name -> substrate.ateapi.v1.ExternalVolumeSource - 54, // 69: substrate.ateapi.v1.Volume.system_info:type_name -> substrate.ateapi.v1.SystemInfoVolumeSource + 55, // 69: substrate.ateapi.v1.Volume.system_info:type_name -> substrate.ateapi.v1.SystemInfoVolumeSource 51, // 70: substrate.ateapi.v1.Volume.image:type_name -> substrate.ateapi.v1.ImageVolumeSource 53, // 71: substrate.ateapi.v1.ExternalVolumeSource.template:type_name -> substrate.ateapi.v1.ExternalVolumeTemplate - 55, // 72: substrate.ateapi.v1.SystemInfoVolumeSource.data_sources:type_name -> substrate.ateapi.v1.SystemInfoDataSource - 56, // 73: substrate.ateapi.v1.SystemInfoDataSource.actor_metadata:type_name -> substrate.ateapi.v1.ActorMetadataDataSource - 58, // 74: substrate.ateapi.v1.SystemInfoDataSource.trust_bundle:type_name -> substrate.ateapi.v1.TrustBundleDataSource - 57, // 75: substrate.ateapi.v1.ActorMetadataDataSource.items:type_name -> substrate.ateapi.v1.ActorMetadataItem - 6, // 76: substrate.ateapi.v1.ActorMetadataItem.field:type_name -> substrate.ateapi.v1.ActorMetadataField - 34, // 77: substrate.ateapi.v1.CreateAtespaceRequest.atespace:type_name -> substrate.ateapi.v1.Atespace - 35, // 78: substrate.ateapi.v1.GetAtespaceRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef - 94, // 79: substrate.ateapi.v1.ListAtespacesRequest.options:type_name -> substrate.ateapi.v1.ListOptions - 34, // 80: substrate.ateapi.v1.ListAtespacesResponse.atespaces:type_name -> substrate.ateapi.v1.Atespace - 35, // 81: substrate.ateapi.v1.DeleteAtespaceRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef - 93, // 82: substrate.ateapi.v1.DeleteAtespaceRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions - 36, // 83: substrate.ateapi.v1.CreateActorTemplateRequest.actor_template:type_name -> substrate.ateapi.v1.ActorTemplate - 35, // 84: substrate.ateapi.v1.GetActorTemplateRequest.actor_template:type_name -> substrate.ateapi.v1.ObjectRef - 94, // 85: substrate.ateapi.v1.ListActorTemplatesRequest.options:type_name -> substrate.ateapi.v1.ListOptions - 36, // 86: substrate.ateapi.v1.ListActorTemplatesResponse.actor_templates:type_name -> substrate.ateapi.v1.ActorTemplate - 35, // 87: substrate.ateapi.v1.DeleteActorTemplateRequest.actor_template:type_name -> substrate.ateapi.v1.ObjectRef - 93, // 88: substrate.ateapi.v1.DeleteActorTemplateRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions - 35, // 89: substrate.ateapi.v1.GetActorRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 17, // 90: substrate.ateapi.v1.CreateActorRequest.actor:type_name -> substrate.ateapi.v1.Actor - 17, // 91: substrate.ateapi.v1.UpdateActorRequest.actor:type_name -> substrate.ateapi.v1.Actor - 35, // 92: substrate.ateapi.v1.SuspendActorRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 75, // 93: substrate.ateapi.v1.SuspendActorRequest.options:type_name -> substrate.ateapi.v1.SuspendOptions - 17, // 94: substrate.ateapi.v1.SuspendActorResponse.actor:type_name -> substrate.ateapi.v1.Actor - 7, // 95: substrate.ateapi.v1.SuspendOptions.mode:type_name -> substrate.ateapi.v1.DurabilityMode - 35, // 96: substrate.ateapi.v1.ResumeActorRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 17, // 97: substrate.ateapi.v1.ResumeActorResponse.actor:type_name -> substrate.ateapi.v1.Actor - 35, // 98: substrate.ateapi.v1.RevertActorRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 17, // 99: substrate.ateapi.v1.RevertActorResponse.actor:type_name -> substrate.ateapi.v1.Actor - 35, // 100: substrate.ateapi.v1.DeleteActorRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 93, // 101: substrate.ateapi.v1.DeleteActorRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions - 35, // 102: substrate.ateapi.v1.GetActorEgressPolicyRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 35, // 103: substrate.ateapi.v1.CreateActorEgressPolicyRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 18, // 104: substrate.ateapi.v1.CreateActorEgressPolicyRequest.egress_policy:type_name -> substrate.ateapi.v1.EgressPolicy - 35, // 105: substrate.ateapi.v1.UpdateActorEgressPolicyRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 18, // 106: substrate.ateapi.v1.UpdateActorEgressPolicyRequest.egress_policy:type_name -> substrate.ateapi.v1.EgressPolicy - 35, // 107: substrate.ateapi.v1.DeleteActorEgressPolicyRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 93, // 108: substrate.ateapi.v1.DeleteActorEgressPolicyRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions - 35, // 109: substrate.ateapi.v1.GetTagRequest.tag:type_name -> substrate.ateapi.v1.ObjectRef - 35, // 110: substrate.ateapi.v1.MintActorJwtRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 153, // 111: substrate.ateapi.v1.MintActorJwtResponse.expire_time:type_name -> google.protobuf.Timestamp - 94, // 112: substrate.ateapi.v1.ListTagsRequest.options:type_name -> substrate.ateapi.v1.ListOptions - 33, // 113: substrate.ateapi.v1.ListTagsResponse.tags:type_name -> substrate.ateapi.v1.Tag - 33, // 114: substrate.ateapi.v1.CreateTagRequest.tag:type_name -> substrate.ateapi.v1.Tag - 33, // 115: substrate.ateapi.v1.UpdateTagRequest.tag:type_name -> substrate.ateapi.v1.Tag - 35, // 116: substrate.ateapi.v1.DeleteTagRequest.tag:type_name -> substrate.ateapi.v1.ObjectRef - 93, // 117: substrate.ateapi.v1.DeleteTagRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions - 35, // 118: substrate.ateapi.v1.ListWorkerActorAssignmentsRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 94, // 119: substrate.ateapi.v1.ListWorkerActorAssignmentsRequest.options:type_name -> substrate.ateapi.v1.ListOptions - 120, // 120: substrate.ateapi.v1.ListWorkerActorAssignmentsResponse.actor_assignments:type_name -> substrate.ateapi.v1.ActorAssignment - 94, // 121: substrate.ateapi.v1.ListWorkersRequest.options:type_name -> substrate.ateapi.v1.ListOptions - 111, // 122: substrate.ateapi.v1.ListWorkersResponse.workers:type_name -> substrate.ateapi.v1.Worker - 35, // 123: substrate.ateapi.v1.GetWorkerRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 111, // 124: substrate.ateapi.v1.CreateWorkerRequest.worker:type_name -> substrate.ateapi.v1.Worker - 111, // 125: substrate.ateapi.v1.UpdateWorkerRequest.worker:type_name -> substrate.ateapi.v1.Worker - 35, // 126: substrate.ateapi.v1.DeleteWorkerRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 93, // 127: substrate.ateapi.v1.DeleteWorkerRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions - 35, // 128: substrate.ateapi.v1.DrainWorkerRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 111, // 129: substrate.ateapi.v1.DrainWorkerResponse.worker:type_name -> substrate.ateapi.v1.Worker - 35, // 130: substrate.ateapi.v1.MarkWorkerAvailableRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 111, // 131: substrate.ateapi.v1.MarkWorkerAvailableResponse.worker:type_name -> substrate.ateapi.v1.Worker - 35, // 132: substrate.ateapi.v1.MarkWorkerUnavailableRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 111, // 133: substrate.ateapi.v1.MarkWorkerUnavailableResponse.worker:type_name -> substrate.ateapi.v1.Worker - 94, // 134: substrate.ateapi.v1.ListActorsRequest.options:type_name -> substrate.ateapi.v1.ListOptions - 17, // 135: substrate.ateapi.v1.ListActorsResponse.actors:type_name -> substrate.ateapi.v1.Actor - 14, // 136: substrate.ateapi.v1.Worker.metadata:type_name -> substrate.ateapi.v1.ResourceMetadata - 152, // 137: substrate.ateapi.v1.Worker.labels:type_name -> substrate.ateapi.v1.Worker.LabelsEntry - 112, // 138: substrate.ateapi.v1.Worker.status:type_name -> substrate.ateapi.v1.WorkerStatus - 8, // 139: substrate.ateapi.v1.WorkerStatus.state:type_name -> substrate.ateapi.v1.WorkerState - 119, // 140: substrate.ateapi.v1.WorkerStatus.capacity:type_name -> substrate.ateapi.v1.WorkerResources - 119, // 141: substrate.ateapi.v1.WorkerStatus.allocated:type_name -> substrate.ateapi.v1.WorkerResources - 113, // 142: substrate.ateapi.v1.WorkerStatus.sandbox_classes:type_name -> substrate.ateapi.v1.WorkerSandboxClass - 114, // 143: substrate.ateapi.v1.WorkerSandboxClass.default_runtime:type_name -> substrate.ateapi.v1.WorkerSandboxRuntime - 114, // 144: substrate.ateapi.v1.WorkerSandboxClass.restorable_runtimes:type_name -> substrate.ateapi.v1.WorkerSandboxRuntime - 117, // 145: substrate.ateapi.v1.WorkerSandboxRuntime.version:type_name -> substrate.ateapi.v1.VersionedSandboxCompat - 115, // 146: substrate.ateapi.v1.WorkerSandboxRuntime.actor_overhead:type_name -> substrate.ateapi.v1.RuntimeOverhead - 117, // 147: substrate.ateapi.v1.ActorSandboxRuntime.version:type_name -> substrate.ateapi.v1.VersionedSandboxCompat - 118, // 148: substrate.ateapi.v1.VersionedSandboxCompat.attributes:type_name -> substrate.ateapi.v1.AttributeEntry - 14, // 149: substrate.ateapi.v1.ActorAssignment.metadata:type_name -> substrate.ateapi.v1.ResourceMetadata - 35, // 150: substrate.ateapi.v1.ActorAssignment.actor:type_name -> substrate.ateapi.v1.ObjectRef - 38, // 151: substrate.ateapi.v1.ActorAssignment.resources:type_name -> substrate.ateapi.v1.Resources - 35, // 152: substrate.ateapi.v1.AcquireWorkerEpochRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 35, // 153: substrate.ateapi.v1.RegisterWorkerRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 119, // 154: substrate.ateapi.v1.RegisterWorkerRequest.capacity:type_name -> substrate.ateapi.v1.WorkerResources - 111, // 155: substrate.ateapi.v1.RegisterWorkerResponse.worker:type_name -> substrate.ateapi.v1.Worker - 35, // 156: substrate.ateapi.v1.SetWorkerSandboxRuntimesRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 113, // 157: substrate.ateapi.v1.SetWorkerSandboxRuntimesRequest.sandbox_classes:type_name -> substrate.ateapi.v1.WorkerSandboxClass - 111, // 158: substrate.ateapi.v1.SetWorkerSandboxRuntimesResponse.worker:type_name -> substrate.ateapi.v1.Worker - 35, // 159: substrate.ateapi.v1.MintWorkerActorCertificateRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 35, // 160: substrate.ateapi.v1.MintWorkerActorCertificateRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 35, // 161: substrate.ateapi.v1.MintWorkerActorJwtRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 153, // 162: substrate.ateapi.v1.MintWorkerActorJwtResponse.expire_time:type_name -> google.protobuf.Timestamp - 35, // 163: substrate.ateapi.v1.RequestActorSuspendRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 35, // 164: substrate.ateapi.v1.RequestActorSuspendRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 17, // 165: substrate.ateapi.v1.RequestActorSuspendResponse.actor:type_name -> substrate.ateapi.v1.Actor - 35, // 166: substrate.ateapi.v1.ReportActorCrashedRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef - 35, // 167: substrate.ateapi.v1.ReportActorCrashedRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 17, // 168: substrate.ateapi.v1.ReportActorCrashedResponse.actor:type_name -> substrate.ateapi.v1.Actor - 35, // 169: substrate.ateapi.v1.ReportActorSnapshotStateRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef - 137, // 170: substrate.ateapi.v1.ReportActorSnapshotStateRequest.state:type_name -> substrate.ateapi.v1.ActorSnapshotState - 138, // 171: substrate.ateapi.v1.ActorSnapshotState.latest_local:type_name -> substrate.ateapi.v1.SnapshotReport - 138, // 172: substrate.ateapi.v1.ActorSnapshotState.uploading:type_name -> substrate.ateapi.v1.SnapshotReport - 138, // 173: substrate.ateapi.v1.ActorSnapshotState.latest_durable:type_name -> substrate.ateapi.v1.SnapshotReport - 153, // 174: substrate.ateapi.v1.ActorSnapshotState.upload_due_time:type_name -> google.protobuf.Timestamp - 2, // 175: substrate.ateapi.v1.SnapshotReport.fidelity:type_name -> substrate.ateapi.v1.SnapshotFidelity - 10, // 176: substrate.ateapi.v1.SnapshotReport.object:type_name -> substrate.ateapi.v1.ObjectSnapshot - 153, // 177: substrate.ateapi.v1.SnapshotReport.local_commit_time:type_name -> google.protobuf.Timestamp - 153, // 178: substrate.ateapi.v1.SnapshotReport.durable_complete_time:type_name -> google.protobuf.Timestamp - 14, // 179: substrate.ateapi.v1.AccessPolicy.metadata:type_name -> substrate.ateapi.v1.ResourceMetadata - 140, // 180: substrate.ateapi.v1.AccessPolicy.bindings:type_name -> substrate.ateapi.v1.Binding - 139, // 181: substrate.ateapi.v1.CreateGlobalAccessPolicyRequest.access_policy:type_name -> substrate.ateapi.v1.AccessPolicy - 139, // 182: substrate.ateapi.v1.UpdateGlobalAccessPolicyRequest.access_policy:type_name -> substrate.ateapi.v1.AccessPolicy - 35, // 183: substrate.ateapi.v1.GetAtespaceAccessPolicyRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef - 35, // 184: substrate.ateapi.v1.CreateAtespaceAccessPolicyRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef - 139, // 185: substrate.ateapi.v1.CreateAtespaceAccessPolicyRequest.access_policy:type_name -> substrate.ateapi.v1.AccessPolicy - 35, // 186: substrate.ateapi.v1.UpdateAtespaceAccessPolicyRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef - 139, // 187: substrate.ateapi.v1.UpdateAtespaceAccessPolicyRequest.access_policy:type_name -> substrate.ateapi.v1.AccessPolicy - 35, // 188: substrate.ateapi.v1.DeleteAtespaceAccessPolicyRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef - 93, // 189: substrate.ateapi.v1.DeleteAtespaceAccessPolicyRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions - 9, // 190: substrate.ateapi.v1.ResourceAnnotation.scope:type_name -> substrate.ateapi.v1.Scope - 154, // 191: substrate.ateapi.v1.resource:extendee -> google.protobuf.MessageOptions - 155, // 192: substrate.ateapi.v1.method:extendee -> google.protobuf.MethodOptions - 148, // 193: substrate.ateapi.v1.resource:type_name -> substrate.ateapi.v1.ResourceAnnotation - 149, // 194: substrate.ateapi.v1.method:type_name -> substrate.ateapi.v1.MethodAnnotation - 70, // 195: substrate.ateapi.v1.Control.GetActor:input_type -> substrate.ateapi.v1.GetActorRequest - 71, // 196: substrate.ateapi.v1.Control.CreateActor:input_type -> substrate.ateapi.v1.CreateActorRequest - 72, // 197: substrate.ateapi.v1.Control.UpdateActor:input_type -> substrate.ateapi.v1.UpdateActorRequest - 73, // 198: substrate.ateapi.v1.Control.SuspendActor:input_type -> substrate.ateapi.v1.SuspendActorRequest - 76, // 199: substrate.ateapi.v1.Control.ResumeActor:input_type -> substrate.ateapi.v1.ResumeActorRequest - 78, // 200: substrate.ateapi.v1.Control.RevertActor:input_type -> substrate.ateapi.v1.RevertActorRequest - 80, // 201: substrate.ateapi.v1.Control.DeleteActor:input_type -> substrate.ateapi.v1.DeleteActorRequest - 81, // 202: substrate.ateapi.v1.Control.GetActorEgressPolicy:input_type -> substrate.ateapi.v1.GetActorEgressPolicyRequest - 82, // 203: substrate.ateapi.v1.Control.CreateActorEgressPolicy:input_type -> substrate.ateapi.v1.CreateActorEgressPolicyRequest - 83, // 204: substrate.ateapi.v1.Control.UpdateActorEgressPolicy:input_type -> substrate.ateapi.v1.UpdateActorEgressPolicyRequest - 84, // 205: substrate.ateapi.v1.Control.DeleteActorEgressPolicy:input_type -> substrate.ateapi.v1.DeleteActorEgressPolicyRequest - 86, // 206: substrate.ateapi.v1.Control.MintActorJwt:input_type -> substrate.ateapi.v1.MintActorJwtRequest - 90, // 207: substrate.ateapi.v1.Control.CreateTag:input_type -> substrate.ateapi.v1.CreateTagRequest - 85, // 208: substrate.ateapi.v1.Control.GetTag:input_type -> substrate.ateapi.v1.GetTagRequest - 88, // 209: substrate.ateapi.v1.Control.ListTags:input_type -> substrate.ateapi.v1.ListTagsRequest - 91, // 210: substrate.ateapi.v1.Control.UpdateTag:input_type -> substrate.ateapi.v1.UpdateTagRequest - 92, // 211: substrate.ateapi.v1.Control.DeleteTag:input_type -> substrate.ateapi.v1.DeleteTagRequest - 97, // 212: substrate.ateapi.v1.Control.ListWorkers:input_type -> substrate.ateapi.v1.ListWorkersRequest - 99, // 213: substrate.ateapi.v1.Control.GetWorker:input_type -> substrate.ateapi.v1.GetWorkerRequest - 100, // 214: substrate.ateapi.v1.Control.CreateWorker:input_type -> substrate.ateapi.v1.CreateWorkerRequest - 101, // 215: substrate.ateapi.v1.Control.UpdateWorker:input_type -> substrate.ateapi.v1.UpdateWorkerRequest - 102, // 216: substrate.ateapi.v1.Control.DeleteWorker:input_type -> substrate.ateapi.v1.DeleteWorkerRequest - 103, // 217: substrate.ateapi.v1.Control.DrainWorker:input_type -> substrate.ateapi.v1.DrainWorkerRequest - 105, // 218: substrate.ateapi.v1.Control.MarkWorkerAvailable:input_type -> substrate.ateapi.v1.MarkWorkerAvailableRequest - 107, // 219: substrate.ateapi.v1.Control.MarkWorkerUnavailable:input_type -> substrate.ateapi.v1.MarkWorkerUnavailableRequest - 95, // 220: substrate.ateapi.v1.Control.ListWorkerActorAssignments:input_type -> substrate.ateapi.v1.ListWorkerActorAssignmentsRequest - 109, // 221: substrate.ateapi.v1.Control.ListActors:input_type -> substrate.ateapi.v1.ListActorsRequest - 60, // 222: substrate.ateapi.v1.Control.CreateAtespace:input_type -> substrate.ateapi.v1.CreateAtespaceRequest - 61, // 223: substrate.ateapi.v1.Control.GetAtespace:input_type -> substrate.ateapi.v1.GetAtespaceRequest - 62, // 224: substrate.ateapi.v1.Control.ListAtespaces:input_type -> substrate.ateapi.v1.ListAtespacesRequest - 64, // 225: substrate.ateapi.v1.Control.DeleteAtespace:input_type -> substrate.ateapi.v1.DeleteAtespaceRequest - 65, // 226: substrate.ateapi.v1.Control.CreateActorTemplate:input_type -> substrate.ateapi.v1.CreateActorTemplateRequest - 66, // 227: substrate.ateapi.v1.Control.GetActorTemplate:input_type -> substrate.ateapi.v1.GetActorTemplateRequest - 67, // 228: substrate.ateapi.v1.Control.ListActorTemplates:input_type -> substrate.ateapi.v1.ListActorTemplatesRequest - 69, // 229: substrate.ateapi.v1.Control.DeleteActorTemplate:input_type -> substrate.ateapi.v1.DeleteActorTemplateRequest - 141, // 230: substrate.ateapi.v1.Control.GetGlobalAccessPolicy:input_type -> substrate.ateapi.v1.GetGlobalAccessPolicyRequest - 142, // 231: substrate.ateapi.v1.Control.CreateGlobalAccessPolicy:input_type -> substrate.ateapi.v1.CreateGlobalAccessPolicyRequest - 143, // 232: substrate.ateapi.v1.Control.UpdateGlobalAccessPolicy:input_type -> substrate.ateapi.v1.UpdateGlobalAccessPolicyRequest - 144, // 233: substrate.ateapi.v1.Control.GetAtespaceAccessPolicy:input_type -> substrate.ateapi.v1.GetAtespaceAccessPolicyRequest - 145, // 234: substrate.ateapi.v1.Control.CreateAtespaceAccessPolicy:input_type -> substrate.ateapi.v1.CreateAtespaceAccessPolicyRequest - 146, // 235: substrate.ateapi.v1.Control.UpdateAtespaceAccessPolicy:input_type -> substrate.ateapi.v1.UpdateAtespaceAccessPolicyRequest - 147, // 236: substrate.ateapi.v1.Control.DeleteAtespaceAccessPolicy:input_type -> substrate.ateapi.v1.DeleteAtespaceAccessPolicyRequest - 121, // 237: substrate.ateapi.v1.WorkerService.AcquireWorkerEpoch:input_type -> substrate.ateapi.v1.AcquireWorkerEpochRequest - 123, // 238: substrate.ateapi.v1.WorkerService.RegisterWorker:input_type -> substrate.ateapi.v1.RegisterWorkerRequest - 125, // 239: substrate.ateapi.v1.WorkerService.SetWorkerSandboxRuntimes:input_type -> substrate.ateapi.v1.SetWorkerSandboxRuntimesRequest - 127, // 240: substrate.ateapi.v1.WorkerService.MintWorkerActorCertificate:input_type -> substrate.ateapi.v1.MintWorkerActorCertificateRequest - 129, // 241: substrate.ateapi.v1.WorkerService.MintWorkerActorJwt:input_type -> substrate.ateapi.v1.MintWorkerActorJwtRequest - 131, // 242: substrate.ateapi.v1.WorkerService.RequestActorSuspend:input_type -> substrate.ateapi.v1.RequestActorSuspendRequest - 135, // 243: substrate.ateapi.v1.WorkerService.ReportActorSnapshotState:input_type -> substrate.ateapi.v1.ReportActorSnapshotStateRequest - 133, // 244: substrate.ateapi.v1.WorkerService.ReportActorCrashed:input_type -> substrate.ateapi.v1.ReportActorCrashedRequest - 17, // 245: substrate.ateapi.v1.Control.GetActor:output_type -> substrate.ateapi.v1.Actor - 17, // 246: substrate.ateapi.v1.Control.CreateActor:output_type -> substrate.ateapi.v1.Actor - 17, // 247: substrate.ateapi.v1.Control.UpdateActor:output_type -> substrate.ateapi.v1.Actor - 74, // 248: substrate.ateapi.v1.Control.SuspendActor:output_type -> substrate.ateapi.v1.SuspendActorResponse - 77, // 249: substrate.ateapi.v1.Control.ResumeActor:output_type -> substrate.ateapi.v1.ResumeActorResponse - 79, // 250: substrate.ateapi.v1.Control.RevertActor:output_type -> substrate.ateapi.v1.RevertActorResponse - 17, // 251: substrate.ateapi.v1.Control.DeleteActor:output_type -> substrate.ateapi.v1.Actor - 18, // 252: substrate.ateapi.v1.Control.GetActorEgressPolicy:output_type -> substrate.ateapi.v1.EgressPolicy - 18, // 253: substrate.ateapi.v1.Control.CreateActorEgressPolicy:output_type -> substrate.ateapi.v1.EgressPolicy - 18, // 254: substrate.ateapi.v1.Control.UpdateActorEgressPolicy:output_type -> substrate.ateapi.v1.EgressPolicy - 18, // 255: substrate.ateapi.v1.Control.DeleteActorEgressPolicy:output_type -> substrate.ateapi.v1.EgressPolicy - 87, // 256: substrate.ateapi.v1.Control.MintActorJwt:output_type -> substrate.ateapi.v1.MintActorJwtResponse - 33, // 257: substrate.ateapi.v1.Control.CreateTag:output_type -> substrate.ateapi.v1.Tag - 33, // 258: substrate.ateapi.v1.Control.GetTag:output_type -> substrate.ateapi.v1.Tag - 89, // 259: substrate.ateapi.v1.Control.ListTags:output_type -> substrate.ateapi.v1.ListTagsResponse - 33, // 260: substrate.ateapi.v1.Control.UpdateTag:output_type -> substrate.ateapi.v1.Tag - 33, // 261: substrate.ateapi.v1.Control.DeleteTag:output_type -> substrate.ateapi.v1.Tag - 98, // 262: substrate.ateapi.v1.Control.ListWorkers:output_type -> substrate.ateapi.v1.ListWorkersResponse - 111, // 263: substrate.ateapi.v1.Control.GetWorker:output_type -> substrate.ateapi.v1.Worker - 111, // 264: substrate.ateapi.v1.Control.CreateWorker:output_type -> substrate.ateapi.v1.Worker - 111, // 265: substrate.ateapi.v1.Control.UpdateWorker:output_type -> substrate.ateapi.v1.Worker - 111, // 266: substrate.ateapi.v1.Control.DeleteWorker:output_type -> substrate.ateapi.v1.Worker - 104, // 267: substrate.ateapi.v1.Control.DrainWorker:output_type -> substrate.ateapi.v1.DrainWorkerResponse - 106, // 268: substrate.ateapi.v1.Control.MarkWorkerAvailable:output_type -> substrate.ateapi.v1.MarkWorkerAvailableResponse - 108, // 269: substrate.ateapi.v1.Control.MarkWorkerUnavailable:output_type -> substrate.ateapi.v1.MarkWorkerUnavailableResponse - 96, // 270: substrate.ateapi.v1.Control.ListWorkerActorAssignments:output_type -> substrate.ateapi.v1.ListWorkerActorAssignmentsResponse - 110, // 271: substrate.ateapi.v1.Control.ListActors:output_type -> substrate.ateapi.v1.ListActorsResponse - 34, // 272: substrate.ateapi.v1.Control.CreateAtespace:output_type -> substrate.ateapi.v1.Atespace - 34, // 273: substrate.ateapi.v1.Control.GetAtespace:output_type -> substrate.ateapi.v1.Atespace - 63, // 274: substrate.ateapi.v1.Control.ListAtespaces:output_type -> substrate.ateapi.v1.ListAtespacesResponse - 34, // 275: substrate.ateapi.v1.Control.DeleteAtespace:output_type -> substrate.ateapi.v1.Atespace - 36, // 276: substrate.ateapi.v1.Control.CreateActorTemplate:output_type -> substrate.ateapi.v1.ActorTemplate - 36, // 277: substrate.ateapi.v1.Control.GetActorTemplate:output_type -> substrate.ateapi.v1.ActorTemplate - 68, // 278: substrate.ateapi.v1.Control.ListActorTemplates:output_type -> substrate.ateapi.v1.ListActorTemplatesResponse - 36, // 279: substrate.ateapi.v1.Control.DeleteActorTemplate:output_type -> substrate.ateapi.v1.ActorTemplate - 139, // 280: substrate.ateapi.v1.Control.GetGlobalAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy - 139, // 281: substrate.ateapi.v1.Control.CreateGlobalAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy - 139, // 282: substrate.ateapi.v1.Control.UpdateGlobalAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy - 139, // 283: substrate.ateapi.v1.Control.GetAtespaceAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy - 139, // 284: substrate.ateapi.v1.Control.CreateAtespaceAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy - 139, // 285: substrate.ateapi.v1.Control.UpdateAtespaceAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy - 139, // 286: substrate.ateapi.v1.Control.DeleteAtespaceAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy - 122, // 287: substrate.ateapi.v1.WorkerService.AcquireWorkerEpoch:output_type -> substrate.ateapi.v1.AcquireWorkerEpochResponse - 124, // 288: substrate.ateapi.v1.WorkerService.RegisterWorker:output_type -> substrate.ateapi.v1.RegisterWorkerResponse - 126, // 289: substrate.ateapi.v1.WorkerService.SetWorkerSandboxRuntimes:output_type -> substrate.ateapi.v1.SetWorkerSandboxRuntimesResponse - 128, // 290: substrate.ateapi.v1.WorkerService.MintWorkerActorCertificate:output_type -> substrate.ateapi.v1.MintWorkerActorCertificateResponse - 130, // 291: substrate.ateapi.v1.WorkerService.MintWorkerActorJwt:output_type -> substrate.ateapi.v1.MintWorkerActorJwtResponse - 132, // 292: substrate.ateapi.v1.WorkerService.RequestActorSuspend:output_type -> substrate.ateapi.v1.RequestActorSuspendResponse - 136, // 293: substrate.ateapi.v1.WorkerService.ReportActorSnapshotState:output_type -> substrate.ateapi.v1.ReportActorSnapshotStateResponse - 134, // 294: substrate.ateapi.v1.WorkerService.ReportActorCrashed:output_type -> substrate.ateapi.v1.ReportActorCrashedResponse - 245, // [245:295] is the sub-list for method output_type - 195, // [195:245] is the sub-list for method input_type - 193, // [193:195] is the sub-list for extension type_name - 191, // [191:193] is the sub-list for extension extendee - 0, // [0:191] is the sub-list for field type_name + 35, // 72: substrate.ateapi.v1.ExternalVolumeTemplate.external_volume_class:type_name -> substrate.ateapi.v1.ObjectRef + 14, // 73: substrate.ateapi.v1.ExternalVolumeClass.metadata:type_name -> substrate.ateapi.v1.ResourceMetadata + 162, // 74: substrate.ateapi.v1.ExternalVolumeClass.parameters:type_name -> substrate.ateapi.v1.ExternalVolumeClass.ParametersEntry + 56, // 75: substrate.ateapi.v1.SystemInfoVolumeSource.data_sources:type_name -> substrate.ateapi.v1.SystemInfoDataSource + 57, // 76: substrate.ateapi.v1.SystemInfoDataSource.actor_metadata:type_name -> substrate.ateapi.v1.ActorMetadataDataSource + 59, // 77: substrate.ateapi.v1.SystemInfoDataSource.trust_bundle:type_name -> substrate.ateapi.v1.TrustBundleDataSource + 58, // 78: substrate.ateapi.v1.ActorMetadataDataSource.items:type_name -> substrate.ateapi.v1.ActorMetadataItem + 6, // 79: substrate.ateapi.v1.ActorMetadataItem.field:type_name -> substrate.ateapi.v1.ActorMetadataField + 34, // 80: substrate.ateapi.v1.CreateAtespaceRequest.atespace:type_name -> substrate.ateapi.v1.Atespace + 35, // 81: substrate.ateapi.v1.GetAtespaceRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef + 100, // 82: substrate.ateapi.v1.ListAtespacesRequest.options:type_name -> substrate.ateapi.v1.ListOptions + 34, // 83: substrate.ateapi.v1.ListAtespacesResponse.atespaces:type_name -> substrate.ateapi.v1.Atespace + 35, // 84: substrate.ateapi.v1.DeleteAtespaceRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef + 99, // 85: substrate.ateapi.v1.DeleteAtespaceRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions + 54, // 86: substrate.ateapi.v1.CreateExternalVolumeClassRequest.external_volume_class:type_name -> substrate.ateapi.v1.ExternalVolumeClass + 35, // 87: substrate.ateapi.v1.GetExternalVolumeClassRequest.external_volume_class:type_name -> substrate.ateapi.v1.ObjectRef + 100, // 88: substrate.ateapi.v1.ListExternalVolumeClassesRequest.options:type_name -> substrate.ateapi.v1.ListOptions + 54, // 89: substrate.ateapi.v1.ListExternalVolumeClassesResponse.external_volume_classes:type_name -> substrate.ateapi.v1.ExternalVolumeClass + 35, // 90: substrate.ateapi.v1.DeleteExternalVolumeClassRequest.external_volume_class:type_name -> substrate.ateapi.v1.ObjectRef + 99, // 91: substrate.ateapi.v1.DeleteExternalVolumeClassRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions + 36, // 92: substrate.ateapi.v1.CreateActorTemplateRequest.actor_template:type_name -> substrate.ateapi.v1.ActorTemplate + 35, // 93: substrate.ateapi.v1.GetActorTemplateRequest.actor_template:type_name -> substrate.ateapi.v1.ObjectRef + 100, // 94: substrate.ateapi.v1.ListActorTemplatesRequest.options:type_name -> substrate.ateapi.v1.ListOptions + 36, // 95: substrate.ateapi.v1.ListActorTemplatesResponse.actor_templates:type_name -> substrate.ateapi.v1.ActorTemplate + 35, // 96: substrate.ateapi.v1.DeleteActorTemplateRequest.actor_template:type_name -> substrate.ateapi.v1.ObjectRef + 99, // 97: substrate.ateapi.v1.DeleteActorTemplateRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions + 35, // 98: substrate.ateapi.v1.GetActorRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 17, // 99: substrate.ateapi.v1.CreateActorRequest.actor:type_name -> substrate.ateapi.v1.Actor + 17, // 100: substrate.ateapi.v1.UpdateActorRequest.actor:type_name -> substrate.ateapi.v1.Actor + 35, // 101: substrate.ateapi.v1.SuspendActorRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 81, // 102: substrate.ateapi.v1.SuspendActorRequest.options:type_name -> substrate.ateapi.v1.SuspendOptions + 17, // 103: substrate.ateapi.v1.SuspendActorResponse.actor:type_name -> substrate.ateapi.v1.Actor + 7, // 104: substrate.ateapi.v1.SuspendOptions.mode:type_name -> substrate.ateapi.v1.DurabilityMode + 35, // 105: substrate.ateapi.v1.ResumeActorRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 17, // 106: substrate.ateapi.v1.ResumeActorResponse.actor:type_name -> substrate.ateapi.v1.Actor + 35, // 107: substrate.ateapi.v1.RevertActorRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 17, // 108: substrate.ateapi.v1.RevertActorResponse.actor:type_name -> substrate.ateapi.v1.Actor + 35, // 109: substrate.ateapi.v1.DeleteActorRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 99, // 110: substrate.ateapi.v1.DeleteActorRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions + 35, // 111: substrate.ateapi.v1.GetActorEgressPolicyRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 35, // 112: substrate.ateapi.v1.CreateActorEgressPolicyRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 18, // 113: substrate.ateapi.v1.CreateActorEgressPolicyRequest.egress_policy:type_name -> substrate.ateapi.v1.EgressPolicy + 35, // 114: substrate.ateapi.v1.UpdateActorEgressPolicyRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 18, // 115: substrate.ateapi.v1.UpdateActorEgressPolicyRequest.egress_policy:type_name -> substrate.ateapi.v1.EgressPolicy + 35, // 116: substrate.ateapi.v1.DeleteActorEgressPolicyRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 99, // 117: substrate.ateapi.v1.DeleteActorEgressPolicyRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions + 35, // 118: substrate.ateapi.v1.GetTagRequest.tag:type_name -> substrate.ateapi.v1.ObjectRef + 35, // 119: substrate.ateapi.v1.MintActorJwtRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 164, // 120: substrate.ateapi.v1.MintActorJwtResponse.expire_time:type_name -> google.protobuf.Timestamp + 100, // 121: substrate.ateapi.v1.ListTagsRequest.options:type_name -> substrate.ateapi.v1.ListOptions + 33, // 122: substrate.ateapi.v1.ListTagsResponse.tags:type_name -> substrate.ateapi.v1.Tag + 33, // 123: substrate.ateapi.v1.CreateTagRequest.tag:type_name -> substrate.ateapi.v1.Tag + 33, // 124: substrate.ateapi.v1.UpdateTagRequest.tag:type_name -> substrate.ateapi.v1.Tag + 35, // 125: substrate.ateapi.v1.DeleteTagRequest.tag:type_name -> substrate.ateapi.v1.ObjectRef + 99, // 126: substrate.ateapi.v1.DeleteTagRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions + 35, // 127: substrate.ateapi.v1.ListWorkerActorAssignmentsRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 100, // 128: substrate.ateapi.v1.ListWorkerActorAssignmentsRequest.options:type_name -> substrate.ateapi.v1.ListOptions + 126, // 129: substrate.ateapi.v1.ListWorkerActorAssignmentsResponse.actor_assignments:type_name -> substrate.ateapi.v1.ActorAssignment + 100, // 130: substrate.ateapi.v1.ListWorkersRequest.options:type_name -> substrate.ateapi.v1.ListOptions + 117, // 131: substrate.ateapi.v1.ListWorkersResponse.workers:type_name -> substrate.ateapi.v1.Worker + 35, // 132: substrate.ateapi.v1.GetWorkerRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 117, // 133: substrate.ateapi.v1.CreateWorkerRequest.worker:type_name -> substrate.ateapi.v1.Worker + 117, // 134: substrate.ateapi.v1.UpdateWorkerRequest.worker:type_name -> substrate.ateapi.v1.Worker + 35, // 135: substrate.ateapi.v1.DeleteWorkerRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 99, // 136: substrate.ateapi.v1.DeleteWorkerRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions + 35, // 137: substrate.ateapi.v1.DrainWorkerRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 117, // 138: substrate.ateapi.v1.DrainWorkerResponse.worker:type_name -> substrate.ateapi.v1.Worker + 35, // 139: substrate.ateapi.v1.MarkWorkerAvailableRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 117, // 140: substrate.ateapi.v1.MarkWorkerAvailableResponse.worker:type_name -> substrate.ateapi.v1.Worker + 35, // 141: substrate.ateapi.v1.MarkWorkerUnavailableRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 117, // 142: substrate.ateapi.v1.MarkWorkerUnavailableResponse.worker:type_name -> substrate.ateapi.v1.Worker + 100, // 143: substrate.ateapi.v1.ListActorsRequest.options:type_name -> substrate.ateapi.v1.ListOptions + 17, // 144: substrate.ateapi.v1.ListActorsResponse.actors:type_name -> substrate.ateapi.v1.Actor + 14, // 145: substrate.ateapi.v1.Worker.metadata:type_name -> substrate.ateapi.v1.ResourceMetadata + 163, // 146: substrate.ateapi.v1.Worker.labels:type_name -> substrate.ateapi.v1.Worker.LabelsEntry + 118, // 147: substrate.ateapi.v1.Worker.status:type_name -> substrate.ateapi.v1.WorkerStatus + 8, // 148: substrate.ateapi.v1.WorkerStatus.state:type_name -> substrate.ateapi.v1.WorkerState + 125, // 149: substrate.ateapi.v1.WorkerStatus.capacity:type_name -> substrate.ateapi.v1.WorkerResources + 125, // 150: substrate.ateapi.v1.WorkerStatus.allocated:type_name -> substrate.ateapi.v1.WorkerResources + 119, // 151: substrate.ateapi.v1.WorkerStatus.sandbox_classes:type_name -> substrate.ateapi.v1.WorkerSandboxClass + 120, // 152: substrate.ateapi.v1.WorkerSandboxClass.default_runtime:type_name -> substrate.ateapi.v1.WorkerSandboxRuntime + 120, // 153: substrate.ateapi.v1.WorkerSandboxClass.restorable_runtimes:type_name -> substrate.ateapi.v1.WorkerSandboxRuntime + 123, // 154: substrate.ateapi.v1.WorkerSandboxRuntime.version:type_name -> substrate.ateapi.v1.VersionedSandboxCompat + 121, // 155: substrate.ateapi.v1.WorkerSandboxRuntime.actor_overhead:type_name -> substrate.ateapi.v1.RuntimeOverhead + 123, // 156: substrate.ateapi.v1.ActorSandboxRuntime.version:type_name -> substrate.ateapi.v1.VersionedSandboxCompat + 124, // 157: substrate.ateapi.v1.VersionedSandboxCompat.attributes:type_name -> substrate.ateapi.v1.AttributeEntry + 14, // 158: substrate.ateapi.v1.ActorAssignment.metadata:type_name -> substrate.ateapi.v1.ResourceMetadata + 35, // 159: substrate.ateapi.v1.ActorAssignment.actor:type_name -> substrate.ateapi.v1.ObjectRef + 38, // 160: substrate.ateapi.v1.ActorAssignment.resources:type_name -> substrate.ateapi.v1.Resources + 35, // 161: substrate.ateapi.v1.AcquireWorkerEpochRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 35, // 162: substrate.ateapi.v1.RegisterWorkerRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 125, // 163: substrate.ateapi.v1.RegisterWorkerRequest.capacity:type_name -> substrate.ateapi.v1.WorkerResources + 117, // 164: substrate.ateapi.v1.RegisterWorkerResponse.worker:type_name -> substrate.ateapi.v1.Worker + 35, // 165: substrate.ateapi.v1.SetWorkerSandboxRuntimesRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 119, // 166: substrate.ateapi.v1.SetWorkerSandboxRuntimesRequest.sandbox_classes:type_name -> substrate.ateapi.v1.WorkerSandboxClass + 117, // 167: substrate.ateapi.v1.SetWorkerSandboxRuntimesResponse.worker:type_name -> substrate.ateapi.v1.Worker + 35, // 168: substrate.ateapi.v1.MintWorkerActorCertificateRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 35, // 169: substrate.ateapi.v1.MintWorkerActorCertificateRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 35, // 170: substrate.ateapi.v1.MintWorkerActorJwtRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 164, // 171: substrate.ateapi.v1.MintWorkerActorJwtResponse.expire_time:type_name -> google.protobuf.Timestamp + 35, // 172: substrate.ateapi.v1.RequestActorSuspendRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 35, // 173: substrate.ateapi.v1.RequestActorSuspendRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 17, // 174: substrate.ateapi.v1.RequestActorSuspendResponse.actor:type_name -> substrate.ateapi.v1.Actor + 35, // 175: substrate.ateapi.v1.ReportActorCrashedRequest.worker:type_name -> substrate.ateapi.v1.ObjectRef + 35, // 176: substrate.ateapi.v1.ReportActorCrashedRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 17, // 177: substrate.ateapi.v1.ReportActorCrashedResponse.actor:type_name -> substrate.ateapi.v1.Actor + 35, // 178: substrate.ateapi.v1.ReportActorSnapshotStateRequest.actor:type_name -> substrate.ateapi.v1.ObjectRef + 143, // 179: substrate.ateapi.v1.ReportActorSnapshotStateRequest.state:type_name -> substrate.ateapi.v1.ActorSnapshotState + 144, // 180: substrate.ateapi.v1.ActorSnapshotState.latest_local:type_name -> substrate.ateapi.v1.SnapshotReport + 144, // 181: substrate.ateapi.v1.ActorSnapshotState.uploading:type_name -> substrate.ateapi.v1.SnapshotReport + 144, // 182: substrate.ateapi.v1.ActorSnapshotState.latest_durable:type_name -> substrate.ateapi.v1.SnapshotReport + 164, // 183: substrate.ateapi.v1.ActorSnapshotState.upload_due_time:type_name -> google.protobuf.Timestamp + 2, // 184: substrate.ateapi.v1.SnapshotReport.fidelity:type_name -> substrate.ateapi.v1.SnapshotFidelity + 10, // 185: substrate.ateapi.v1.SnapshotReport.object:type_name -> substrate.ateapi.v1.ObjectSnapshot + 164, // 186: substrate.ateapi.v1.SnapshotReport.local_commit_time:type_name -> google.protobuf.Timestamp + 164, // 187: substrate.ateapi.v1.SnapshotReport.durable_complete_time:type_name -> google.protobuf.Timestamp + 14, // 188: substrate.ateapi.v1.AccessPolicy.metadata:type_name -> substrate.ateapi.v1.ResourceMetadata + 146, // 189: substrate.ateapi.v1.AccessPolicy.bindings:type_name -> substrate.ateapi.v1.Binding + 145, // 190: substrate.ateapi.v1.CreateGlobalAccessPolicyRequest.access_policy:type_name -> substrate.ateapi.v1.AccessPolicy + 145, // 191: substrate.ateapi.v1.UpdateGlobalAccessPolicyRequest.access_policy:type_name -> substrate.ateapi.v1.AccessPolicy + 35, // 192: substrate.ateapi.v1.GetAtespaceAccessPolicyRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef + 35, // 193: substrate.ateapi.v1.CreateAtespaceAccessPolicyRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef + 145, // 194: substrate.ateapi.v1.CreateAtespaceAccessPolicyRequest.access_policy:type_name -> substrate.ateapi.v1.AccessPolicy + 35, // 195: substrate.ateapi.v1.UpdateAtespaceAccessPolicyRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef + 145, // 196: substrate.ateapi.v1.UpdateAtespaceAccessPolicyRequest.access_policy:type_name -> substrate.ateapi.v1.AccessPolicy + 35, // 197: substrate.ateapi.v1.DeleteAtespaceAccessPolicyRequest.atespace:type_name -> substrate.ateapi.v1.ObjectRef + 99, // 198: substrate.ateapi.v1.DeleteAtespaceAccessPolicyRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions + 35, // 199: substrate.ateapi.v1.GetExternalVolumeClassAccessPolicyRequest.external_volume_class:type_name -> substrate.ateapi.v1.ObjectRef + 35, // 200: substrate.ateapi.v1.CreateExternalVolumeClassAccessPolicyRequest.external_volume_class:type_name -> substrate.ateapi.v1.ObjectRef + 145, // 201: substrate.ateapi.v1.CreateExternalVolumeClassAccessPolicyRequest.access_policy:type_name -> substrate.ateapi.v1.AccessPolicy + 35, // 202: substrate.ateapi.v1.UpdateExternalVolumeClassAccessPolicyRequest.external_volume_class:type_name -> substrate.ateapi.v1.ObjectRef + 145, // 203: substrate.ateapi.v1.UpdateExternalVolumeClassAccessPolicyRequest.access_policy:type_name -> substrate.ateapi.v1.AccessPolicy + 35, // 204: substrate.ateapi.v1.DeleteExternalVolumeClassAccessPolicyRequest.external_volume_class:type_name -> substrate.ateapi.v1.ObjectRef + 99, // 205: substrate.ateapi.v1.DeleteExternalVolumeClassAccessPolicyRequest.options:type_name -> substrate.ateapi.v1.DeleteOptions + 9, // 206: substrate.ateapi.v1.ResourceAnnotation.scope:type_name -> substrate.ateapi.v1.Scope + 165, // 207: substrate.ateapi.v1.resource:extendee -> google.protobuf.MessageOptions + 166, // 208: substrate.ateapi.v1.method:extendee -> google.protobuf.MethodOptions + 158, // 209: substrate.ateapi.v1.resource:type_name -> substrate.ateapi.v1.ResourceAnnotation + 159, // 210: substrate.ateapi.v1.method:type_name -> substrate.ateapi.v1.MethodAnnotation + 76, // 211: substrate.ateapi.v1.Control.GetActor:input_type -> substrate.ateapi.v1.GetActorRequest + 77, // 212: substrate.ateapi.v1.Control.CreateActor:input_type -> substrate.ateapi.v1.CreateActorRequest + 78, // 213: substrate.ateapi.v1.Control.UpdateActor:input_type -> substrate.ateapi.v1.UpdateActorRequest + 79, // 214: substrate.ateapi.v1.Control.SuspendActor:input_type -> substrate.ateapi.v1.SuspendActorRequest + 82, // 215: substrate.ateapi.v1.Control.ResumeActor:input_type -> substrate.ateapi.v1.ResumeActorRequest + 84, // 216: substrate.ateapi.v1.Control.RevertActor:input_type -> substrate.ateapi.v1.RevertActorRequest + 86, // 217: substrate.ateapi.v1.Control.DeleteActor:input_type -> substrate.ateapi.v1.DeleteActorRequest + 87, // 218: substrate.ateapi.v1.Control.GetActorEgressPolicy:input_type -> substrate.ateapi.v1.GetActorEgressPolicyRequest + 88, // 219: substrate.ateapi.v1.Control.CreateActorEgressPolicy:input_type -> substrate.ateapi.v1.CreateActorEgressPolicyRequest + 89, // 220: substrate.ateapi.v1.Control.UpdateActorEgressPolicy:input_type -> substrate.ateapi.v1.UpdateActorEgressPolicyRequest + 90, // 221: substrate.ateapi.v1.Control.DeleteActorEgressPolicy:input_type -> substrate.ateapi.v1.DeleteActorEgressPolicyRequest + 92, // 222: substrate.ateapi.v1.Control.MintActorJwt:input_type -> substrate.ateapi.v1.MintActorJwtRequest + 96, // 223: substrate.ateapi.v1.Control.CreateTag:input_type -> substrate.ateapi.v1.CreateTagRequest + 91, // 224: substrate.ateapi.v1.Control.GetTag:input_type -> substrate.ateapi.v1.GetTagRequest + 94, // 225: substrate.ateapi.v1.Control.ListTags:input_type -> substrate.ateapi.v1.ListTagsRequest + 97, // 226: substrate.ateapi.v1.Control.UpdateTag:input_type -> substrate.ateapi.v1.UpdateTagRequest + 98, // 227: substrate.ateapi.v1.Control.DeleteTag:input_type -> substrate.ateapi.v1.DeleteTagRequest + 103, // 228: substrate.ateapi.v1.Control.ListWorkers:input_type -> substrate.ateapi.v1.ListWorkersRequest + 105, // 229: substrate.ateapi.v1.Control.GetWorker:input_type -> substrate.ateapi.v1.GetWorkerRequest + 106, // 230: substrate.ateapi.v1.Control.CreateWorker:input_type -> substrate.ateapi.v1.CreateWorkerRequest + 107, // 231: substrate.ateapi.v1.Control.UpdateWorker:input_type -> substrate.ateapi.v1.UpdateWorkerRequest + 108, // 232: substrate.ateapi.v1.Control.DeleteWorker:input_type -> substrate.ateapi.v1.DeleteWorkerRequest + 109, // 233: substrate.ateapi.v1.Control.DrainWorker:input_type -> substrate.ateapi.v1.DrainWorkerRequest + 111, // 234: substrate.ateapi.v1.Control.MarkWorkerAvailable:input_type -> substrate.ateapi.v1.MarkWorkerAvailableRequest + 113, // 235: substrate.ateapi.v1.Control.MarkWorkerUnavailable:input_type -> substrate.ateapi.v1.MarkWorkerUnavailableRequest + 101, // 236: substrate.ateapi.v1.Control.ListWorkerActorAssignments:input_type -> substrate.ateapi.v1.ListWorkerActorAssignmentsRequest + 115, // 237: substrate.ateapi.v1.Control.ListActors:input_type -> substrate.ateapi.v1.ListActorsRequest + 61, // 238: substrate.ateapi.v1.Control.CreateAtespace:input_type -> substrate.ateapi.v1.CreateAtespaceRequest + 62, // 239: substrate.ateapi.v1.Control.GetAtespace:input_type -> substrate.ateapi.v1.GetAtespaceRequest + 63, // 240: substrate.ateapi.v1.Control.ListAtespaces:input_type -> substrate.ateapi.v1.ListAtespacesRequest + 65, // 241: substrate.ateapi.v1.Control.DeleteAtespace:input_type -> substrate.ateapi.v1.DeleteAtespaceRequest + 66, // 242: substrate.ateapi.v1.Control.CreateExternalVolumeClass:input_type -> substrate.ateapi.v1.CreateExternalVolumeClassRequest + 67, // 243: substrate.ateapi.v1.Control.GetExternalVolumeClass:input_type -> substrate.ateapi.v1.GetExternalVolumeClassRequest + 68, // 244: substrate.ateapi.v1.Control.ListExternalVolumeClasses:input_type -> substrate.ateapi.v1.ListExternalVolumeClassesRequest + 70, // 245: substrate.ateapi.v1.Control.DeleteExternalVolumeClass:input_type -> substrate.ateapi.v1.DeleteExternalVolumeClassRequest + 71, // 246: substrate.ateapi.v1.Control.CreateActorTemplate:input_type -> substrate.ateapi.v1.CreateActorTemplateRequest + 72, // 247: substrate.ateapi.v1.Control.GetActorTemplate:input_type -> substrate.ateapi.v1.GetActorTemplateRequest + 73, // 248: substrate.ateapi.v1.Control.ListActorTemplates:input_type -> substrate.ateapi.v1.ListActorTemplatesRequest + 75, // 249: substrate.ateapi.v1.Control.DeleteActorTemplate:input_type -> substrate.ateapi.v1.DeleteActorTemplateRequest + 147, // 250: substrate.ateapi.v1.Control.GetGlobalAccessPolicy:input_type -> substrate.ateapi.v1.GetGlobalAccessPolicyRequest + 148, // 251: substrate.ateapi.v1.Control.CreateGlobalAccessPolicy:input_type -> substrate.ateapi.v1.CreateGlobalAccessPolicyRequest + 149, // 252: substrate.ateapi.v1.Control.UpdateGlobalAccessPolicy:input_type -> substrate.ateapi.v1.UpdateGlobalAccessPolicyRequest + 150, // 253: substrate.ateapi.v1.Control.GetAtespaceAccessPolicy:input_type -> substrate.ateapi.v1.GetAtespaceAccessPolicyRequest + 151, // 254: substrate.ateapi.v1.Control.CreateAtespaceAccessPolicy:input_type -> substrate.ateapi.v1.CreateAtespaceAccessPolicyRequest + 152, // 255: substrate.ateapi.v1.Control.UpdateAtespaceAccessPolicy:input_type -> substrate.ateapi.v1.UpdateAtespaceAccessPolicyRequest + 153, // 256: substrate.ateapi.v1.Control.DeleteAtespaceAccessPolicy:input_type -> substrate.ateapi.v1.DeleteAtespaceAccessPolicyRequest + 154, // 257: substrate.ateapi.v1.Control.GetExternalVolumeClassAccessPolicy:input_type -> substrate.ateapi.v1.GetExternalVolumeClassAccessPolicyRequest + 155, // 258: substrate.ateapi.v1.Control.CreateExternalVolumeClassAccessPolicy:input_type -> substrate.ateapi.v1.CreateExternalVolumeClassAccessPolicyRequest + 156, // 259: substrate.ateapi.v1.Control.UpdateExternalVolumeClassAccessPolicy:input_type -> substrate.ateapi.v1.UpdateExternalVolumeClassAccessPolicyRequest + 157, // 260: substrate.ateapi.v1.Control.DeleteExternalVolumeClassAccessPolicy:input_type -> substrate.ateapi.v1.DeleteExternalVolumeClassAccessPolicyRequest + 127, // 261: substrate.ateapi.v1.WorkerService.AcquireWorkerEpoch:input_type -> substrate.ateapi.v1.AcquireWorkerEpochRequest + 129, // 262: substrate.ateapi.v1.WorkerService.RegisterWorker:input_type -> substrate.ateapi.v1.RegisterWorkerRequest + 131, // 263: substrate.ateapi.v1.WorkerService.SetWorkerSandboxRuntimes:input_type -> substrate.ateapi.v1.SetWorkerSandboxRuntimesRequest + 133, // 264: substrate.ateapi.v1.WorkerService.MintWorkerActorCertificate:input_type -> substrate.ateapi.v1.MintWorkerActorCertificateRequest + 135, // 265: substrate.ateapi.v1.WorkerService.MintWorkerActorJwt:input_type -> substrate.ateapi.v1.MintWorkerActorJwtRequest + 137, // 266: substrate.ateapi.v1.WorkerService.RequestActorSuspend:input_type -> substrate.ateapi.v1.RequestActorSuspendRequest + 141, // 267: substrate.ateapi.v1.WorkerService.ReportActorSnapshotState:input_type -> substrate.ateapi.v1.ReportActorSnapshotStateRequest + 139, // 268: substrate.ateapi.v1.WorkerService.ReportActorCrashed:input_type -> substrate.ateapi.v1.ReportActorCrashedRequest + 17, // 269: substrate.ateapi.v1.Control.GetActor:output_type -> substrate.ateapi.v1.Actor + 17, // 270: substrate.ateapi.v1.Control.CreateActor:output_type -> substrate.ateapi.v1.Actor + 17, // 271: substrate.ateapi.v1.Control.UpdateActor:output_type -> substrate.ateapi.v1.Actor + 80, // 272: substrate.ateapi.v1.Control.SuspendActor:output_type -> substrate.ateapi.v1.SuspendActorResponse + 83, // 273: substrate.ateapi.v1.Control.ResumeActor:output_type -> substrate.ateapi.v1.ResumeActorResponse + 85, // 274: substrate.ateapi.v1.Control.RevertActor:output_type -> substrate.ateapi.v1.RevertActorResponse + 17, // 275: substrate.ateapi.v1.Control.DeleteActor:output_type -> substrate.ateapi.v1.Actor + 18, // 276: substrate.ateapi.v1.Control.GetActorEgressPolicy:output_type -> substrate.ateapi.v1.EgressPolicy + 18, // 277: substrate.ateapi.v1.Control.CreateActorEgressPolicy:output_type -> substrate.ateapi.v1.EgressPolicy + 18, // 278: substrate.ateapi.v1.Control.UpdateActorEgressPolicy:output_type -> substrate.ateapi.v1.EgressPolicy + 18, // 279: substrate.ateapi.v1.Control.DeleteActorEgressPolicy:output_type -> substrate.ateapi.v1.EgressPolicy + 93, // 280: substrate.ateapi.v1.Control.MintActorJwt:output_type -> substrate.ateapi.v1.MintActorJwtResponse + 33, // 281: substrate.ateapi.v1.Control.CreateTag:output_type -> substrate.ateapi.v1.Tag + 33, // 282: substrate.ateapi.v1.Control.GetTag:output_type -> substrate.ateapi.v1.Tag + 95, // 283: substrate.ateapi.v1.Control.ListTags:output_type -> substrate.ateapi.v1.ListTagsResponse + 33, // 284: substrate.ateapi.v1.Control.UpdateTag:output_type -> substrate.ateapi.v1.Tag + 33, // 285: substrate.ateapi.v1.Control.DeleteTag:output_type -> substrate.ateapi.v1.Tag + 104, // 286: substrate.ateapi.v1.Control.ListWorkers:output_type -> substrate.ateapi.v1.ListWorkersResponse + 117, // 287: substrate.ateapi.v1.Control.GetWorker:output_type -> substrate.ateapi.v1.Worker + 117, // 288: substrate.ateapi.v1.Control.CreateWorker:output_type -> substrate.ateapi.v1.Worker + 117, // 289: substrate.ateapi.v1.Control.UpdateWorker:output_type -> substrate.ateapi.v1.Worker + 117, // 290: substrate.ateapi.v1.Control.DeleteWorker:output_type -> substrate.ateapi.v1.Worker + 110, // 291: substrate.ateapi.v1.Control.DrainWorker:output_type -> substrate.ateapi.v1.DrainWorkerResponse + 112, // 292: substrate.ateapi.v1.Control.MarkWorkerAvailable:output_type -> substrate.ateapi.v1.MarkWorkerAvailableResponse + 114, // 293: substrate.ateapi.v1.Control.MarkWorkerUnavailable:output_type -> substrate.ateapi.v1.MarkWorkerUnavailableResponse + 102, // 294: substrate.ateapi.v1.Control.ListWorkerActorAssignments:output_type -> substrate.ateapi.v1.ListWorkerActorAssignmentsResponse + 116, // 295: substrate.ateapi.v1.Control.ListActors:output_type -> substrate.ateapi.v1.ListActorsResponse + 34, // 296: substrate.ateapi.v1.Control.CreateAtespace:output_type -> substrate.ateapi.v1.Atespace + 34, // 297: substrate.ateapi.v1.Control.GetAtespace:output_type -> substrate.ateapi.v1.Atespace + 64, // 298: substrate.ateapi.v1.Control.ListAtespaces:output_type -> substrate.ateapi.v1.ListAtespacesResponse + 34, // 299: substrate.ateapi.v1.Control.DeleteAtespace:output_type -> substrate.ateapi.v1.Atespace + 54, // 300: substrate.ateapi.v1.Control.CreateExternalVolumeClass:output_type -> substrate.ateapi.v1.ExternalVolumeClass + 54, // 301: substrate.ateapi.v1.Control.GetExternalVolumeClass:output_type -> substrate.ateapi.v1.ExternalVolumeClass + 69, // 302: substrate.ateapi.v1.Control.ListExternalVolumeClasses:output_type -> substrate.ateapi.v1.ListExternalVolumeClassesResponse + 54, // 303: substrate.ateapi.v1.Control.DeleteExternalVolumeClass:output_type -> substrate.ateapi.v1.ExternalVolumeClass + 36, // 304: substrate.ateapi.v1.Control.CreateActorTemplate:output_type -> substrate.ateapi.v1.ActorTemplate + 36, // 305: substrate.ateapi.v1.Control.GetActorTemplate:output_type -> substrate.ateapi.v1.ActorTemplate + 74, // 306: substrate.ateapi.v1.Control.ListActorTemplates:output_type -> substrate.ateapi.v1.ListActorTemplatesResponse + 36, // 307: substrate.ateapi.v1.Control.DeleteActorTemplate:output_type -> substrate.ateapi.v1.ActorTemplate + 145, // 308: substrate.ateapi.v1.Control.GetGlobalAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy + 145, // 309: substrate.ateapi.v1.Control.CreateGlobalAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy + 145, // 310: substrate.ateapi.v1.Control.UpdateGlobalAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy + 145, // 311: substrate.ateapi.v1.Control.GetAtespaceAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy + 145, // 312: substrate.ateapi.v1.Control.CreateAtespaceAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy + 145, // 313: substrate.ateapi.v1.Control.UpdateAtespaceAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy + 145, // 314: substrate.ateapi.v1.Control.DeleteAtespaceAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy + 145, // 315: substrate.ateapi.v1.Control.GetExternalVolumeClassAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy + 145, // 316: substrate.ateapi.v1.Control.CreateExternalVolumeClassAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy + 145, // 317: substrate.ateapi.v1.Control.UpdateExternalVolumeClassAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy + 145, // 318: substrate.ateapi.v1.Control.DeleteExternalVolumeClassAccessPolicy:output_type -> substrate.ateapi.v1.AccessPolicy + 128, // 319: substrate.ateapi.v1.WorkerService.AcquireWorkerEpoch:output_type -> substrate.ateapi.v1.AcquireWorkerEpochResponse + 130, // 320: substrate.ateapi.v1.WorkerService.RegisterWorker:output_type -> substrate.ateapi.v1.RegisterWorkerResponse + 132, // 321: substrate.ateapi.v1.WorkerService.SetWorkerSandboxRuntimes:output_type -> substrate.ateapi.v1.SetWorkerSandboxRuntimesResponse + 134, // 322: substrate.ateapi.v1.WorkerService.MintWorkerActorCertificate:output_type -> substrate.ateapi.v1.MintWorkerActorCertificateResponse + 136, // 323: substrate.ateapi.v1.WorkerService.MintWorkerActorJwt:output_type -> substrate.ateapi.v1.MintWorkerActorJwtResponse + 138, // 324: substrate.ateapi.v1.WorkerService.RequestActorSuspend:output_type -> substrate.ateapi.v1.RequestActorSuspendResponse + 142, // 325: substrate.ateapi.v1.WorkerService.ReportActorSnapshotState:output_type -> substrate.ateapi.v1.ReportActorSnapshotStateResponse + 140, // 326: substrate.ateapi.v1.WorkerService.ReportActorCrashed:output_type -> substrate.ateapi.v1.ReportActorCrashedResponse + 269, // [269:327] is the sub-list for method output_type + 211, // [211:269] is the sub-list for method input_type + 209, // [209:211] is the sub-list for extension type_name + 207, // [207:209] is the sub-list for extension extendee + 0, // [0:207] is the sub-list for field type_name } func init() { file_api_ateapi_v1_ateapi_proto_init() } @@ -11136,7 +11888,7 @@ func file_api_ateapi_v1_ateapi_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_ateapi_v1_ateapi_proto_rawDesc), len(file_api_ateapi_v1_ateapi_proto_rawDesc)), NumEnums: 10, - NumMessages: 143, + NumMessages: 154, NumExtensions: 2, NumServices: 2, }, diff --git a/api/ateapi/v1/ateapi.proto b/api/ateapi/v1/ateapi.proto index 51ed7d1e32..455b9a6016 100644 --- a/api/ateapi/v1/ateapi.proto +++ b/api/ateapi/v1/ateapi.proto @@ -203,6 +203,28 @@ service Control { option (method).resource = "Atespace"; } + // Create an ExternalVolumeClass. + rpc CreateExternalVolumeClass(CreateExternalVolumeClassRequest) returns (ExternalVolumeClass) { + option (method).resource = "ExternalVolumeClass"; + } + + // Get an ExternalVolumeClass by name. + rpc GetExternalVolumeClass(GetExternalVolumeClassRequest) returns (ExternalVolumeClass) { + option (method).resource = "ExternalVolumeClass"; + } + + // List ExternalVolumeClasses. + rpc ListExternalVolumeClasses(ListExternalVolumeClassesRequest) returns (ListExternalVolumeClassesResponse) { + option (method).resource = "ExternalVolumeClass"; + } + + // Delete an ExternalVolumeClass. Delete does not check for ActorTemplates + // that still reference the class. Volumes from those templates then fail to + // provision. + rpc DeleteExternalVolumeClass(DeleteExternalVolumeClassRequest) returns (ExternalVolumeClass) { + option (method).resource = "ExternalVolumeClass"; + } + rpc CreateActorTemplate(CreateActorTemplateRequest) returns (ActorTemplate) { option (method).resource = "ActorTemplate"; } @@ -260,6 +282,26 @@ service Control { rpc DeleteAtespaceAccessPolicy(DeleteAtespaceAccessPolicyRequest) returns (AccessPolicy) { option (method).resource = "AccessPolicy"; } + + // Get the access policy resource nested under an ExternalVolumeClass. + rpc GetExternalVolumeClassAccessPolicy(GetExternalVolumeClassAccessPolicyRequest) returns (AccessPolicy) { + option (method).resource = "AccessPolicy"; + } + + // Create the access policy resource nested under an ExternalVolumeClass. + rpc CreateExternalVolumeClassAccessPolicy(CreateExternalVolumeClassAccessPolicyRequest) returns (AccessPolicy) { + option (method).resource = "AccessPolicy"; + } + + // Replace the access policy resource nested under an ExternalVolumeClass. + rpc UpdateExternalVolumeClassAccessPolicy(UpdateExternalVolumeClassAccessPolicyRequest) returns (AccessPolicy) { + option (method).resource = "AccessPolicy"; + } + + // Delete the access policy resource nested under an ExternalVolumeClass. + rpc DeleteExternalVolumeClassAccessPolicy(DeleteExternalVolumeClassAccessPolicyRequest) returns (AccessPolicy) { + option (method).resource = "AccessPolicy"; + } } // ObjectSnapshot addresses a snapshot held in object storage. @@ -514,9 +556,9 @@ message ExternalVolumeStatus { // +k8s:customValidation # no control characters string storage_volume_id = 2; - // Internal volume plugin name or CSI driver name, from the StorageClass - // provisioner. Must be a DNS subdomain, optionally prefixed with - // "substrate.io/" (per the CSI spec's driver-name syntax). + // Internal volume plugin name or CSI driver name, from the + // ExternalVolumeClass driver_name. Must be a DNS subdomain, optionally + // prefixed with "substrate.io/" (per the CSI spec's driver-name syntax). // // +k8s:required // +k8s:maxLength=253 @@ -533,6 +575,16 @@ message ExternalVolumeStatus { // +k8s:optional // +k8s:customValidation # at most 40 KiB in total, ten times the CSI limit for map fields map volume_context = 4; + + // mount_options from the volume's class, passed to the CSI driver as + // VolumeCapability.Mount.MountFlags at mount time. + // + // +k8s:optional + // +k8s:maxItems=32 + // +k8s:listType=atomic + // +k8s:eachVal=+k8s:minLength=1 + // +k8s:eachVal=+k8s:maxLength=256 + repeated string mount_options = 5; } message Actor { @@ -1553,12 +1605,61 @@ message ExternalVolumeTemplate { // +k8s:minimum=1 int64 capacity_bytes = 1; - // storage_class_name names the cluster-scoped Kubernetes StorageClass to - // create the volume from. Required. + // Deprecated: unsupported; use external_volume_class. + // + // +k8s:beta(since: "0.0")=+k8s:forbidden # TODO: get rid of beta prefix + string storage_class_name = 2 [ deprecated = true ]; + + // external_volume_class names the ExternalVolumeClass to create the volume + // from. atespace must be empty. // // +k8s:required - // +k8s:format=k8s-long-name - string storage_class_name = 2; + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ObjectRef external_volume_class = 3; +} + +// ExternalVolumeClass names the CSI driver that provisions external volumes +// and the parameters for its CreateVolume call. Global-scoped and immutable: +// metadata.atespace must be empty. +message ExternalVolumeClass { + option (resource) = { + scope : SCOPE_GLOBAL + plural : "ExternalVolumeClasses" + }; + + // Common resource metadata: name, uid, version, timestamps. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ResourceMetadata metadata = 1; + + // driver_name is the CSI driver that provisions the volumes, e.g. + // "nfs.csi.k8s.io". It is a DNS subdomain, optionally prefixed with + // "substrate.io/". + // + // +k8s:required + // +k8s:maxLength=63 + // +k8s:customValidation # optional "substrate.io/" prefix + DNS-1123 subdomain + string driver_name = 2; + + // parameters are passed unchanged to the driver's CreateVolume call. The + // driver defines their keys and values, so they are only bounded in size. + // + // +k8s:optional + // +k8s:maxProperties=32 + // +k8s:eachKey=+k8s:maxLength=128 + // +k8s:eachVal=+k8s:maxLength=256 + map parameters = 3; + + // mount_options are passed to the CSI driver as + // VolumeCapability.Mount.MountFlags at mount time. + // + // +k8s:optional + // +k8s:maxItems=32 + // +k8s:listType=atomic + // +k8s:eachVal=+k8s:minLength=1 + // +k8s:eachVal=+k8s:maxLength=256 + repeated string mount_options = 4; } // SystemInfoVolumeSource is a read-only volume of substrate-generated @@ -1719,6 +1820,57 @@ message DeleteAtespaceRequest { DeleteOptions options = 2; } +// CreateExternalVolumeClassRequest creates an ExternalVolumeClass. +message CreateExternalVolumeClassRequest { + // The class to create. metadata.name is required and metadata.atespace + // must be empty. + // + // +ate:preview=ExternalVolumes + // +k8s:ifDisabled(ExternalVolumes)=+k8s:forbidden + // +k8s:required + ExternalVolumeClass external_volume_class = 1; +} + +// GetExternalVolumeClassRequest identifies the ExternalVolumeClass to get. +message GetExternalVolumeClassRequest { + // The class to get. atespace must be empty. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ObjectRef external_volume_class = 1; +} + +// ListExternalVolumeClassesRequest asks for a page of ExternalVolumeClasses. +message ListExternalVolumeClassesRequest { + // Pagination controls. + // + // +k8s:optional + ListOptions options = 1; +} + +// ListExternalVolumeClassesResponse is one page of ExternalVolumeClasses. +message ListExternalVolumeClassesResponse { + // The page of classes. This list may be empty even if there are more results. + repeated ExternalVolumeClass external_volume_classes = 1; + + // Pagination token for the next page. Empty if this is the last page. + string next_page_token = 2; +} + +// DeleteExternalVolumeClassRequest identifies the ExternalVolumeClass to delete. +message DeleteExternalVolumeClassRequest { + // The class to delete. atespace must be empty. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ObjectRef external_volume_class = 1; + + // Optional per-delete preconditions. + // + // +k8s:optional + DeleteOptions options = 2; +} + message CreateActorTemplateRequest { // The actor template version to create. Server-assigned metadata (uid, // version, timestamps) is ignored, as are the status fields. @@ -3084,15 +3236,15 @@ message SnapshotReport { // access policy resource, named "default". message AccessPolicy { option (resource) = { - parents : [ "Global", "Atespace" ] + parents : [ "Global", "Atespace", "ExternalVolumeClass" ] singleton : true plural : "AccessPolicies" }; // Standard resource metadata. Atespace must match the parent resource (empty - // for global-scoped parents like Global and Atespace) and name must be - // "default". Both are caller-specified on create and immutable. UID, version, - // create_time, and update_time are server-managed. + // for global-scoped parents like Global, Atespace, and ExternalVolumeClass) + // and name must be "default". Both are caller-specified on create and + // immutable. UID, version, create_time, and update_time are server-managed. // // +k8s:required // +k8s:customValidation # name must be "default" @@ -3106,19 +3258,22 @@ message AccessPolicy { repeated Binding bindings = 2; } -// Binding associates a list of principals (members) with a single role. +// Binding associates a list of members with a single role. message Binding { // The role name for the parent resource type (e.g., "owner", "editor", - // "viewer"). + // "viewer", "allowed_atespace"). // // +k8s:required // +k8s:maxLength=64 string role = 1; - // Principal identities granted this role. + // Subjects granted this role: `user:` principals on Global ("owner", + // "viewer") and Atespace ("owner", "editor", "viewer") policies, or + // `atespace:` on ExternalVolumeClass ("allowed_atespace") policies. // Examples: // - "user:alice@example.com" // - "user:sa-ci-runner" + // - "atespace:team-a" // // +k8s:required // +k8s:listType=set @@ -3222,6 +3377,77 @@ message DeleteAtespaceAccessPolicyRequest { DeleteOptions options = 3; } +// GetExternalVolumeClassAccessPolicyRequest identifies an ExternalVolumeClass's access policy. +message GetExternalVolumeClassAccessPolicyRequest { + // The parent ExternalVolumeClass of the access policy resource to retrieve. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ObjectRef external_volume_class = 1; + + // Name of the singleton access policy. Must be "default". + // + // +k8s:required + // +k8s:format=k8s-short-name + // +k8s:customValidation # must be "default" + string name = 2; +} + +// CreateExternalVolumeClassAccessPolicyRequest creates an access policy for an ExternalVolumeClass. +message CreateExternalVolumeClassAccessPolicyRequest { + // Parent ExternalVolumeClass under which to create the policy resource. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ObjectRef external_volume_class = 1; + + // The policy to create. metadata.name must be "default" and + // metadata.atespace must be empty. + // + // +ate:preview=ExternalVolumes + // +k8s:ifDisabled(ExternalVolumes)=+k8s:forbidden + // +k8s:required + AccessPolicy access_policy = 2; +} + +// UpdateExternalVolumeClassAccessPolicyRequest replaces an ExternalVolumeClass's access policy. +message UpdateExternalVolumeClassAccessPolicyRequest { + // Parent ExternalVolumeClass under which to update the policy resource. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ObjectRef external_volume_class = 1; + + // Full replacement. Metadata UID and version are required preconditions; + // metadata.name must be "default" and metadata.atespace must be empty. + // + // +ate:preview=ExternalVolumes + // +k8s:ifDisabled(ExternalVolumes)=+k8s:forbidden + // +k8s:required + AccessPolicy access_policy = 2; +} + +// DeleteExternalVolumeClassAccessPolicyRequest identifies an ExternalVolumeClass's access policy. +message DeleteExternalVolumeClassAccessPolicyRequest { + // The parent ExternalVolumeClass of the access policy resource to delete. + // + // +k8s:required + // +k8s:beta(since: "0.0")=+k8s:subfield(atespace)=+k8s:forbidden # TODO: get rid of beta prefix + ObjectRef external_volume_class = 1; + + // Name of the singleton access policy. Must be "default". + // + // +k8s:required + // +k8s:format=k8s-short-name + // +k8s:customValidation # must be "default" + string name = 2; + + // Optional per-delete preconditions. + // + // +k8s:optional + DeleteOptions options = 3; +} + // ResourceAnnotation marks a message as an API resource. See // docs/resource-model.md. message ResourceAnnotation { diff --git a/api/ateapi/v1/ateapi_grpc.pb.go b/api/ateapi/v1/ateapi_grpc.pb.go index e54c306d67..35466cc7ce 100644 --- a/api/ateapi/v1/ateapi_grpc.pb.go +++ b/api/ateapi/v1/ateapi_grpc.pb.go @@ -33,48 +33,56 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - Control_GetActor_FullMethodName = "/substrate.ateapi.v1.Control/GetActor" - Control_CreateActor_FullMethodName = "/substrate.ateapi.v1.Control/CreateActor" - Control_UpdateActor_FullMethodName = "/substrate.ateapi.v1.Control/UpdateActor" - Control_SuspendActor_FullMethodName = "/substrate.ateapi.v1.Control/SuspendActor" - Control_ResumeActor_FullMethodName = "/substrate.ateapi.v1.Control/ResumeActor" - Control_RevertActor_FullMethodName = "/substrate.ateapi.v1.Control/RevertActor" - Control_DeleteActor_FullMethodName = "/substrate.ateapi.v1.Control/DeleteActor" - Control_GetActorEgressPolicy_FullMethodName = "/substrate.ateapi.v1.Control/GetActorEgressPolicy" - Control_CreateActorEgressPolicy_FullMethodName = "/substrate.ateapi.v1.Control/CreateActorEgressPolicy" - Control_UpdateActorEgressPolicy_FullMethodName = "/substrate.ateapi.v1.Control/UpdateActorEgressPolicy" - Control_DeleteActorEgressPolicy_FullMethodName = "/substrate.ateapi.v1.Control/DeleteActorEgressPolicy" - Control_MintActorJwt_FullMethodName = "/substrate.ateapi.v1.Control/MintActorJwt" - Control_CreateTag_FullMethodName = "/substrate.ateapi.v1.Control/CreateTag" - Control_GetTag_FullMethodName = "/substrate.ateapi.v1.Control/GetTag" - Control_ListTags_FullMethodName = "/substrate.ateapi.v1.Control/ListTags" - Control_UpdateTag_FullMethodName = "/substrate.ateapi.v1.Control/UpdateTag" - Control_DeleteTag_FullMethodName = "/substrate.ateapi.v1.Control/DeleteTag" - Control_ListWorkers_FullMethodName = "/substrate.ateapi.v1.Control/ListWorkers" - Control_GetWorker_FullMethodName = "/substrate.ateapi.v1.Control/GetWorker" - Control_CreateWorker_FullMethodName = "/substrate.ateapi.v1.Control/CreateWorker" - Control_UpdateWorker_FullMethodName = "/substrate.ateapi.v1.Control/UpdateWorker" - Control_DeleteWorker_FullMethodName = "/substrate.ateapi.v1.Control/DeleteWorker" - Control_DrainWorker_FullMethodName = "/substrate.ateapi.v1.Control/DrainWorker" - Control_MarkWorkerAvailable_FullMethodName = "/substrate.ateapi.v1.Control/MarkWorkerAvailable" - Control_MarkWorkerUnavailable_FullMethodName = "/substrate.ateapi.v1.Control/MarkWorkerUnavailable" - Control_ListWorkerActorAssignments_FullMethodName = "/substrate.ateapi.v1.Control/ListWorkerActorAssignments" - Control_ListActors_FullMethodName = "/substrate.ateapi.v1.Control/ListActors" - Control_CreateAtespace_FullMethodName = "/substrate.ateapi.v1.Control/CreateAtespace" - Control_GetAtespace_FullMethodName = "/substrate.ateapi.v1.Control/GetAtespace" - Control_ListAtespaces_FullMethodName = "/substrate.ateapi.v1.Control/ListAtespaces" - Control_DeleteAtespace_FullMethodName = "/substrate.ateapi.v1.Control/DeleteAtespace" - Control_CreateActorTemplate_FullMethodName = "/substrate.ateapi.v1.Control/CreateActorTemplate" - Control_GetActorTemplate_FullMethodName = "/substrate.ateapi.v1.Control/GetActorTemplate" - Control_ListActorTemplates_FullMethodName = "/substrate.ateapi.v1.Control/ListActorTemplates" - Control_DeleteActorTemplate_FullMethodName = "/substrate.ateapi.v1.Control/DeleteActorTemplate" - Control_GetGlobalAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/GetGlobalAccessPolicy" - Control_CreateGlobalAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/CreateGlobalAccessPolicy" - Control_UpdateGlobalAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/UpdateGlobalAccessPolicy" - Control_GetAtespaceAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/GetAtespaceAccessPolicy" - Control_CreateAtespaceAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/CreateAtespaceAccessPolicy" - Control_UpdateAtespaceAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/UpdateAtespaceAccessPolicy" - Control_DeleteAtespaceAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/DeleteAtespaceAccessPolicy" + Control_GetActor_FullMethodName = "/substrate.ateapi.v1.Control/GetActor" + Control_CreateActor_FullMethodName = "/substrate.ateapi.v1.Control/CreateActor" + Control_UpdateActor_FullMethodName = "/substrate.ateapi.v1.Control/UpdateActor" + Control_SuspendActor_FullMethodName = "/substrate.ateapi.v1.Control/SuspendActor" + Control_ResumeActor_FullMethodName = "/substrate.ateapi.v1.Control/ResumeActor" + Control_RevertActor_FullMethodName = "/substrate.ateapi.v1.Control/RevertActor" + Control_DeleteActor_FullMethodName = "/substrate.ateapi.v1.Control/DeleteActor" + Control_GetActorEgressPolicy_FullMethodName = "/substrate.ateapi.v1.Control/GetActorEgressPolicy" + Control_CreateActorEgressPolicy_FullMethodName = "/substrate.ateapi.v1.Control/CreateActorEgressPolicy" + Control_UpdateActorEgressPolicy_FullMethodName = "/substrate.ateapi.v1.Control/UpdateActorEgressPolicy" + Control_DeleteActorEgressPolicy_FullMethodName = "/substrate.ateapi.v1.Control/DeleteActorEgressPolicy" + Control_MintActorJwt_FullMethodName = "/substrate.ateapi.v1.Control/MintActorJwt" + Control_CreateTag_FullMethodName = "/substrate.ateapi.v1.Control/CreateTag" + Control_GetTag_FullMethodName = "/substrate.ateapi.v1.Control/GetTag" + Control_ListTags_FullMethodName = "/substrate.ateapi.v1.Control/ListTags" + Control_UpdateTag_FullMethodName = "/substrate.ateapi.v1.Control/UpdateTag" + Control_DeleteTag_FullMethodName = "/substrate.ateapi.v1.Control/DeleteTag" + Control_ListWorkers_FullMethodName = "/substrate.ateapi.v1.Control/ListWorkers" + Control_GetWorker_FullMethodName = "/substrate.ateapi.v1.Control/GetWorker" + Control_CreateWorker_FullMethodName = "/substrate.ateapi.v1.Control/CreateWorker" + Control_UpdateWorker_FullMethodName = "/substrate.ateapi.v1.Control/UpdateWorker" + Control_DeleteWorker_FullMethodName = "/substrate.ateapi.v1.Control/DeleteWorker" + Control_DrainWorker_FullMethodName = "/substrate.ateapi.v1.Control/DrainWorker" + Control_MarkWorkerAvailable_FullMethodName = "/substrate.ateapi.v1.Control/MarkWorkerAvailable" + Control_MarkWorkerUnavailable_FullMethodName = "/substrate.ateapi.v1.Control/MarkWorkerUnavailable" + Control_ListWorkerActorAssignments_FullMethodName = "/substrate.ateapi.v1.Control/ListWorkerActorAssignments" + Control_ListActors_FullMethodName = "/substrate.ateapi.v1.Control/ListActors" + Control_CreateAtespace_FullMethodName = "/substrate.ateapi.v1.Control/CreateAtespace" + Control_GetAtespace_FullMethodName = "/substrate.ateapi.v1.Control/GetAtespace" + Control_ListAtespaces_FullMethodName = "/substrate.ateapi.v1.Control/ListAtespaces" + Control_DeleteAtespace_FullMethodName = "/substrate.ateapi.v1.Control/DeleteAtespace" + Control_CreateExternalVolumeClass_FullMethodName = "/substrate.ateapi.v1.Control/CreateExternalVolumeClass" + Control_GetExternalVolumeClass_FullMethodName = "/substrate.ateapi.v1.Control/GetExternalVolumeClass" + Control_ListExternalVolumeClasses_FullMethodName = "/substrate.ateapi.v1.Control/ListExternalVolumeClasses" + Control_DeleteExternalVolumeClass_FullMethodName = "/substrate.ateapi.v1.Control/DeleteExternalVolumeClass" + Control_CreateActorTemplate_FullMethodName = "/substrate.ateapi.v1.Control/CreateActorTemplate" + Control_GetActorTemplate_FullMethodName = "/substrate.ateapi.v1.Control/GetActorTemplate" + Control_ListActorTemplates_FullMethodName = "/substrate.ateapi.v1.Control/ListActorTemplates" + Control_DeleteActorTemplate_FullMethodName = "/substrate.ateapi.v1.Control/DeleteActorTemplate" + Control_GetGlobalAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/GetGlobalAccessPolicy" + Control_CreateGlobalAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/CreateGlobalAccessPolicy" + Control_UpdateGlobalAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/UpdateGlobalAccessPolicy" + Control_GetAtespaceAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/GetAtespaceAccessPolicy" + Control_CreateAtespaceAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/CreateAtespaceAccessPolicy" + Control_UpdateAtespaceAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/UpdateAtespaceAccessPolicy" + Control_DeleteAtespaceAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/DeleteAtespaceAccessPolicy" + Control_GetExternalVolumeClassAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/GetExternalVolumeClassAccessPolicy" + Control_CreateExternalVolumeClassAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/CreateExternalVolumeClassAccessPolicy" + Control_UpdateExternalVolumeClassAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/UpdateExternalVolumeClassAccessPolicy" + Control_DeleteExternalVolumeClassAccessPolicy_FullMethodName = "/substrate.ateapi.v1.Control/DeleteExternalVolumeClassAccessPolicy" ) // ControlClient is the client API for Control service. @@ -170,6 +178,16 @@ type ControlClient interface { // Delete an empty Atespace. Rejects (FailedPrecondition) if any Actors or // Tags remain. DeleteAtespace(ctx context.Context, in *DeleteAtespaceRequest, opts ...grpc.CallOption) (*Atespace, error) + // Create an ExternalVolumeClass. + CreateExternalVolumeClass(ctx context.Context, in *CreateExternalVolumeClassRequest, opts ...grpc.CallOption) (*ExternalVolumeClass, error) + // Get an ExternalVolumeClass by name. + GetExternalVolumeClass(ctx context.Context, in *GetExternalVolumeClassRequest, opts ...grpc.CallOption) (*ExternalVolumeClass, error) + // List ExternalVolumeClasses. + ListExternalVolumeClasses(ctx context.Context, in *ListExternalVolumeClassesRequest, opts ...grpc.CallOption) (*ListExternalVolumeClassesResponse, error) + // Delete an ExternalVolumeClass. Delete does not check for ActorTemplates + // that still reference the class. Volumes from those templates then fail to + // provision. + DeleteExternalVolumeClass(ctx context.Context, in *DeleteExternalVolumeClassRequest, opts ...grpc.CallOption) (*ExternalVolumeClass, error) CreateActorTemplate(ctx context.Context, in *CreateActorTemplateRequest, opts ...grpc.CallOption) (*ActorTemplate, error) GetActorTemplate(ctx context.Context, in *GetActorTemplateRequest, opts ...grpc.CallOption) (*ActorTemplate, error) ListActorTemplates(ctx context.Context, in *ListActorTemplatesRequest, opts ...grpc.CallOption) (*ListActorTemplatesResponse, error) @@ -195,6 +213,14 @@ type ControlClient interface { UpdateAtespaceAccessPolicy(ctx context.Context, in *UpdateAtespaceAccessPolicyRequest, opts ...grpc.CallOption) (*AccessPolicy, error) // Delete the access policy resource nested under an Atespace. DeleteAtespaceAccessPolicy(ctx context.Context, in *DeleteAtespaceAccessPolicyRequest, opts ...grpc.CallOption) (*AccessPolicy, error) + // Get the access policy resource nested under an ExternalVolumeClass. + GetExternalVolumeClassAccessPolicy(ctx context.Context, in *GetExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*AccessPolicy, error) + // Create the access policy resource nested under an ExternalVolumeClass. + CreateExternalVolumeClassAccessPolicy(ctx context.Context, in *CreateExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*AccessPolicy, error) + // Replace the access policy resource nested under an ExternalVolumeClass. + UpdateExternalVolumeClassAccessPolicy(ctx context.Context, in *UpdateExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*AccessPolicy, error) + // Delete the access policy resource nested under an ExternalVolumeClass. + DeleteExternalVolumeClassAccessPolicy(ctx context.Context, in *DeleteExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*AccessPolicy, error) } type controlClient struct { @@ -515,6 +541,46 @@ func (c *controlClient) DeleteAtespace(ctx context.Context, in *DeleteAtespaceRe return out, nil } +func (c *controlClient) CreateExternalVolumeClass(ctx context.Context, in *CreateExternalVolumeClassRequest, opts ...grpc.CallOption) (*ExternalVolumeClass, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ExternalVolumeClass) + err := c.cc.Invoke(ctx, Control_CreateExternalVolumeClass_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *controlClient) GetExternalVolumeClass(ctx context.Context, in *GetExternalVolumeClassRequest, opts ...grpc.CallOption) (*ExternalVolumeClass, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ExternalVolumeClass) + err := c.cc.Invoke(ctx, Control_GetExternalVolumeClass_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *controlClient) ListExternalVolumeClasses(ctx context.Context, in *ListExternalVolumeClassesRequest, opts ...grpc.CallOption) (*ListExternalVolumeClassesResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ListExternalVolumeClassesResponse) + err := c.cc.Invoke(ctx, Control_ListExternalVolumeClasses_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *controlClient) DeleteExternalVolumeClass(ctx context.Context, in *DeleteExternalVolumeClassRequest, opts ...grpc.CallOption) (*ExternalVolumeClass, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ExternalVolumeClass) + err := c.cc.Invoke(ctx, Control_DeleteExternalVolumeClass_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *controlClient) CreateActorTemplate(ctx context.Context, in *CreateActorTemplateRequest, opts ...grpc.CallOption) (*ActorTemplate, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ActorTemplate) @@ -625,6 +691,46 @@ func (c *controlClient) DeleteAtespaceAccessPolicy(ctx context.Context, in *Dele return out, nil } +func (c *controlClient) GetExternalVolumeClassAccessPolicy(ctx context.Context, in *GetExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*AccessPolicy, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(AccessPolicy) + err := c.cc.Invoke(ctx, Control_GetExternalVolumeClassAccessPolicy_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *controlClient) CreateExternalVolumeClassAccessPolicy(ctx context.Context, in *CreateExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*AccessPolicy, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(AccessPolicy) + err := c.cc.Invoke(ctx, Control_CreateExternalVolumeClassAccessPolicy_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *controlClient) UpdateExternalVolumeClassAccessPolicy(ctx context.Context, in *UpdateExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*AccessPolicy, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(AccessPolicy) + err := c.cc.Invoke(ctx, Control_UpdateExternalVolumeClassAccessPolicy_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *controlClient) DeleteExternalVolumeClassAccessPolicy(ctx context.Context, in *DeleteExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*AccessPolicy, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(AccessPolicy) + err := c.cc.Invoke(ctx, Control_DeleteExternalVolumeClassAccessPolicy_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + // ControlServer is the server API for Control service. // All implementations must embed UnimplementedControlServer // for forward compatibility. @@ -718,6 +824,16 @@ type ControlServer interface { // Delete an empty Atespace. Rejects (FailedPrecondition) if any Actors or // Tags remain. DeleteAtespace(context.Context, *DeleteAtespaceRequest) (*Atespace, error) + // Create an ExternalVolumeClass. + CreateExternalVolumeClass(context.Context, *CreateExternalVolumeClassRequest) (*ExternalVolumeClass, error) + // Get an ExternalVolumeClass by name. + GetExternalVolumeClass(context.Context, *GetExternalVolumeClassRequest) (*ExternalVolumeClass, error) + // List ExternalVolumeClasses. + ListExternalVolumeClasses(context.Context, *ListExternalVolumeClassesRequest) (*ListExternalVolumeClassesResponse, error) + // Delete an ExternalVolumeClass. Delete does not check for ActorTemplates + // that still reference the class. Volumes from those templates then fail to + // provision. + DeleteExternalVolumeClass(context.Context, *DeleteExternalVolumeClassRequest) (*ExternalVolumeClass, error) CreateActorTemplate(context.Context, *CreateActorTemplateRequest) (*ActorTemplate, error) GetActorTemplate(context.Context, *GetActorTemplateRequest) (*ActorTemplate, error) ListActorTemplates(context.Context, *ListActorTemplatesRequest) (*ListActorTemplatesResponse, error) @@ -743,6 +859,14 @@ type ControlServer interface { UpdateAtespaceAccessPolicy(context.Context, *UpdateAtespaceAccessPolicyRequest) (*AccessPolicy, error) // Delete the access policy resource nested under an Atespace. DeleteAtespaceAccessPolicy(context.Context, *DeleteAtespaceAccessPolicyRequest) (*AccessPolicy, error) + // Get the access policy resource nested under an ExternalVolumeClass. + GetExternalVolumeClassAccessPolicy(context.Context, *GetExternalVolumeClassAccessPolicyRequest) (*AccessPolicy, error) + // Create the access policy resource nested under an ExternalVolumeClass. + CreateExternalVolumeClassAccessPolicy(context.Context, *CreateExternalVolumeClassAccessPolicyRequest) (*AccessPolicy, error) + // Replace the access policy resource nested under an ExternalVolumeClass. + UpdateExternalVolumeClassAccessPolicy(context.Context, *UpdateExternalVolumeClassAccessPolicyRequest) (*AccessPolicy, error) + // Delete the access policy resource nested under an ExternalVolumeClass. + DeleteExternalVolumeClassAccessPolicy(context.Context, *DeleteExternalVolumeClassAccessPolicyRequest) (*AccessPolicy, error) mustEmbedUnimplementedControlServer() } @@ -846,6 +970,18 @@ func (UnimplementedControlServer) ListAtespaces(context.Context, *ListAtespacesR func (UnimplementedControlServer) DeleteAtespace(context.Context, *DeleteAtespaceRequest) (*Atespace, error) { return nil, status.Error(codes.Unimplemented, "method DeleteAtespace not implemented") } +func (UnimplementedControlServer) CreateExternalVolumeClass(context.Context, *CreateExternalVolumeClassRequest) (*ExternalVolumeClass, error) { + return nil, status.Error(codes.Unimplemented, "method CreateExternalVolumeClass not implemented") +} +func (UnimplementedControlServer) GetExternalVolumeClass(context.Context, *GetExternalVolumeClassRequest) (*ExternalVolumeClass, error) { + return nil, status.Error(codes.Unimplemented, "method GetExternalVolumeClass not implemented") +} +func (UnimplementedControlServer) ListExternalVolumeClasses(context.Context, *ListExternalVolumeClassesRequest) (*ListExternalVolumeClassesResponse, error) { + return nil, status.Error(codes.Unimplemented, "method ListExternalVolumeClasses not implemented") +} +func (UnimplementedControlServer) DeleteExternalVolumeClass(context.Context, *DeleteExternalVolumeClassRequest) (*ExternalVolumeClass, error) { + return nil, status.Error(codes.Unimplemented, "method DeleteExternalVolumeClass not implemented") +} func (UnimplementedControlServer) CreateActorTemplate(context.Context, *CreateActorTemplateRequest) (*ActorTemplate, error) { return nil, status.Error(codes.Unimplemented, "method CreateActorTemplate not implemented") } @@ -879,6 +1015,18 @@ func (UnimplementedControlServer) UpdateAtespaceAccessPolicy(context.Context, *U func (UnimplementedControlServer) DeleteAtespaceAccessPolicy(context.Context, *DeleteAtespaceAccessPolicyRequest) (*AccessPolicy, error) { return nil, status.Error(codes.Unimplemented, "method DeleteAtespaceAccessPolicy not implemented") } +func (UnimplementedControlServer) GetExternalVolumeClassAccessPolicy(context.Context, *GetExternalVolumeClassAccessPolicyRequest) (*AccessPolicy, error) { + return nil, status.Error(codes.Unimplemented, "method GetExternalVolumeClassAccessPolicy not implemented") +} +func (UnimplementedControlServer) CreateExternalVolumeClassAccessPolicy(context.Context, *CreateExternalVolumeClassAccessPolicyRequest) (*AccessPolicy, error) { + return nil, status.Error(codes.Unimplemented, "method CreateExternalVolumeClassAccessPolicy not implemented") +} +func (UnimplementedControlServer) UpdateExternalVolumeClassAccessPolicy(context.Context, *UpdateExternalVolumeClassAccessPolicyRequest) (*AccessPolicy, error) { + return nil, status.Error(codes.Unimplemented, "method UpdateExternalVolumeClassAccessPolicy not implemented") +} +func (UnimplementedControlServer) DeleteExternalVolumeClassAccessPolicy(context.Context, *DeleteExternalVolumeClassAccessPolicyRequest) (*AccessPolicy, error) { + return nil, status.Error(codes.Unimplemented, "method DeleteExternalVolumeClassAccessPolicy not implemented") +} func (UnimplementedControlServer) mustEmbedUnimplementedControlServer() {} func (UnimplementedControlServer) testEmbeddedByValue() {} @@ -1458,6 +1606,78 @@ func _Control_DeleteAtespace_Handler(srv interface{}, ctx context.Context, dec f return interceptor(ctx, in, info, handler) } +func _Control_CreateExternalVolumeClass_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateExternalVolumeClassRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ControlServer).CreateExternalVolumeClass(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Control_CreateExternalVolumeClass_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ControlServer).CreateExternalVolumeClass(ctx, req.(*CreateExternalVolumeClassRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Control_GetExternalVolumeClass_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetExternalVolumeClassRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ControlServer).GetExternalVolumeClass(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Control_GetExternalVolumeClass_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ControlServer).GetExternalVolumeClass(ctx, req.(*GetExternalVolumeClassRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Control_ListExternalVolumeClasses_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListExternalVolumeClassesRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ControlServer).ListExternalVolumeClasses(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Control_ListExternalVolumeClasses_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ControlServer).ListExternalVolumeClasses(ctx, req.(*ListExternalVolumeClassesRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Control_DeleteExternalVolumeClass_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteExternalVolumeClassRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ControlServer).DeleteExternalVolumeClass(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Control_DeleteExternalVolumeClass_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ControlServer).DeleteExternalVolumeClass(ctx, req.(*DeleteExternalVolumeClassRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Control_CreateActorTemplate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(CreateActorTemplateRequest) if err := dec(in); err != nil { @@ -1656,6 +1876,78 @@ func _Control_DeleteAtespaceAccessPolicy_Handler(srv interface{}, ctx context.Co return interceptor(ctx, in, info, handler) } +func _Control_GetExternalVolumeClassAccessPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetExternalVolumeClassAccessPolicyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ControlServer).GetExternalVolumeClassAccessPolicy(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Control_GetExternalVolumeClassAccessPolicy_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ControlServer).GetExternalVolumeClassAccessPolicy(ctx, req.(*GetExternalVolumeClassAccessPolicyRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Control_CreateExternalVolumeClassAccessPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateExternalVolumeClassAccessPolicyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ControlServer).CreateExternalVolumeClassAccessPolicy(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Control_CreateExternalVolumeClassAccessPolicy_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ControlServer).CreateExternalVolumeClassAccessPolicy(ctx, req.(*CreateExternalVolumeClassAccessPolicyRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Control_UpdateExternalVolumeClassAccessPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateExternalVolumeClassAccessPolicyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ControlServer).UpdateExternalVolumeClassAccessPolicy(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Control_UpdateExternalVolumeClassAccessPolicy_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ControlServer).UpdateExternalVolumeClassAccessPolicy(ctx, req.(*UpdateExternalVolumeClassAccessPolicyRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Control_DeleteExternalVolumeClassAccessPolicy_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteExternalVolumeClassAccessPolicyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ControlServer).DeleteExternalVolumeClassAccessPolicy(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Control_DeleteExternalVolumeClassAccessPolicy_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ControlServer).DeleteExternalVolumeClassAccessPolicy(ctx, req.(*DeleteExternalVolumeClassAccessPolicyRequest)) + } + return interceptor(ctx, in, info, handler) +} + // Control_ServiceDesc is the grpc.ServiceDesc for Control service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -1787,6 +2079,22 @@ var Control_ServiceDesc = grpc.ServiceDesc{ MethodName: "DeleteAtespace", Handler: _Control_DeleteAtespace_Handler, }, + { + MethodName: "CreateExternalVolumeClass", + Handler: _Control_CreateExternalVolumeClass_Handler, + }, + { + MethodName: "GetExternalVolumeClass", + Handler: _Control_GetExternalVolumeClass_Handler, + }, + { + MethodName: "ListExternalVolumeClasses", + Handler: _Control_ListExternalVolumeClasses_Handler, + }, + { + MethodName: "DeleteExternalVolumeClass", + Handler: _Control_DeleteExternalVolumeClass_Handler, + }, { MethodName: "CreateActorTemplate", Handler: _Control_CreateActorTemplate_Handler, @@ -1831,6 +2139,22 @@ var Control_ServiceDesc = grpc.ServiceDesc{ MethodName: "DeleteAtespaceAccessPolicy", Handler: _Control_DeleteAtespaceAccessPolicy_Handler, }, + { + MethodName: "GetExternalVolumeClassAccessPolicy", + Handler: _Control_GetExternalVolumeClassAccessPolicy_Handler, + }, + { + MethodName: "CreateExternalVolumeClassAccessPolicy", + Handler: _Control_CreateExternalVolumeClassAccessPolicy_Handler, + }, + { + MethodName: "UpdateExternalVolumeClassAccessPolicy", + Handler: _Control_UpdateExternalVolumeClassAccessPolicy_Handler, + }, + { + MethodName: "DeleteExternalVolumeClassAccessPolicy", + Handler: _Control_DeleteExternalVolumeClassAccessPolicy_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "api/ateapi/v1/ateapi.proto", diff --git a/benchmarking/deploy_locust.sh b/benchmarking/deploy_locust.sh index bf207fa68c..9b9b60cbc5 100755 --- a/benchmarking/deploy_locust.sh +++ b/benchmarking/deploy_locust.sh @@ -35,7 +35,7 @@ ACTOR_MEMORY="" ACTOR_CPU="" # Empty leaves the WorkerPool pods unsized. WORKER_MEMORY="" -STORAGE_CLASS_NAME="" +EXTERNAL_VOLUME_CLASS="${EXTERNAL_VOLUME_CLASS:-}" WAIT_TIMEOUT_SECS="" usage() { @@ -54,8 +54,9 @@ usage() { echo " ActorTemplates (default: 1)." echo " --worker-memory SIZE Forwarded to workloads/deploy.sh. Memory request and limit" echo " for each WorkerPool pod (default: unset, the pod is unsized)." - echo " --storage-class-name S Forwarded to workloads/deploy.sh. StorageClass for the glutton-storage" - echo " external volume; setting it deploys glutton-storage." + echo " --external-volume-class S" + echo " Forwarded to workloads/deploy.sh. ExternalVolumeClass for the" + echo " glutton-storage external volume; setting it deploys glutton-storage." echo " --wait-timeout SECONDS Forwarded to workloads/deploy.sh. The timeout in seconds for" echo " waiting for the workers to be ready (default: 300)" echo " --skip-build Skip locust image build/push (use the existing :latest image)" @@ -88,8 +89,8 @@ while [[ "$#" -gt 0 ]]; do --actor-cpu=*) ACTOR_CPU="${1#*=}" ;; --worker-memory) shift; WORKER_MEMORY="$1" ;; --worker-memory=*) WORKER_MEMORY="${1#*=}" ;; - --storage-class-name) shift; STORAGE_CLASS_NAME="$1" ;; - --storage-class-name=*) STORAGE_CLASS_NAME="${1#*=}" ;; + --external-volume-class) shift; EXTERNAL_VOLUME_CLASS="$1" ;; + --external-volume-class=*) EXTERNAL_VOLUME_CLASS="${1#*=}" ;; --wait-timeout) shift; WAIT_TIMEOUT_SECS="$1" ;; --wait-timeout=*) WAIT_TIMEOUT_SECS="${1#*=}" ;; --skip-build) SKIP_BUILD=1 ;; @@ -134,8 +135,8 @@ if [[ "${action}" == "deploy" ]]; then if [[ -n "${WORKER_MEMORY}" ]]; then workload_args+=(--worker-memory "${WORKER_MEMORY}") fi - if [[ -n "${STORAGE_CLASS_NAME}" ]]; then - workload_args+=(--storage-class-name "${STORAGE_CLASS_NAME}") + if [[ -n "${EXTERNAL_VOLUME_CLASS}" ]]; then + workload_args+=(--external-volume-class "${EXTERNAL_VOLUME_CLASS}") fi if [[ -n "${WAIT_TIMEOUT_SECS}" ]]; then workload_args+=(--wait-timeout "${WAIT_TIMEOUT_SECS}") diff --git a/benchmarking/workloads/deploy.sh b/benchmarking/workloads/deploy.sh index 74b41ed589..039ad04d90 100755 --- a/benchmarking/workloads/deploy.sh +++ b/benchmarking/workloads/deploy.sh @@ -32,8 +32,8 @@ SWEPERF_TEMPLATE_DIR="${MANIFEST_DIR}/sweperf/generated" # read from SWEPERF_TEMPLATE_DIR, the rest from MANIFEST_DIR. WORKLOAD_TEMPLATES # overrides the default set — the usermem and kernelmem templates (for the # matching locust tests) are not deployed by default. The glutton-storage -# template is added when a StorageClass is set, because it needs a CSI driver -# that not every cluster has; ate-env is added when ATE_ENV_IMAGE is set. +# template is added when an ExternalVolumeClass is set, because it needs a CSI +# driver that not every cluster has; ate-env is added when ATE_ENV_IMAGE is set. read -r -a TEMPLATES <<<"${WORKLOAD_TEMPLATES:-sleep glutton glutton-durdir-data glutton-durdir-full}" # template_manifest prints the manifest path for ActorTemplate NAME. @@ -63,9 +63,9 @@ ACTOR_CPU="1" # and limit. Empty leaves the pod unsized. The limit, less what the worker # keeps for itself, is the memory it reports as its actor capacity. WORKER_MEMORY="" -# The StorageClass for the glutton-storage external volume. Empty means the -# template is not deployed. -STORAGE_CLASS_NAME="${STORAGE_CLASS_NAME:-}" +# The ExternalVolumeClass for the glutton-storage external volume. Empty means +# the template is not deployed. +EXTERNAL_VOLUME_CLASS="${EXTERNAL_VOLUME_CLASS:-}" # The image for the ate-env benchmark ActorTemplate. Empty means the # template is not deployed. ATE_ENV_IMAGE="${ATE_ENV_IMAGE:-}" @@ -92,8 +92,10 @@ usage() { echo " --actor-cpu CPU CPU limit for the benchmark ActorTemplates (default: 1)" echo " --worker-memory SIZE Memory request and limit for each WorkerPool pod" echo " (default: unset, the pod is unsized)" - echo " --storage-class-name NAME StorageClass for the glutton-storage external volume. Setting it" - echo " deploys glutton-storage (default: not deployed). Env: STORAGE_CLASS_NAME." + echo " --external-volume-class NAME" + echo " ExternalVolumeClass for the glutton-storage external volume. Setting" + echo " it deploys glutton-storage (default: not deployed)." + echo " Env: EXTERNAL_VOLUME_CLASS." echo " --otlp-endpoint URL The address to which an instrumented actor container" echo " sends telemetry (default: the endpoint in the" echo " ate-otel-config ConfigMap)" @@ -193,7 +195,7 @@ substitute() { -e "s|\${ACTOR_CPU_MILLICORES}|${ACTOR_CPU_MILLICORES}|g" \ -e "s|\${WORKER_RESOURCES}|${worker_resources}|g" \ -e "s|\${ATE_ENV_IMAGE}|${ATE_ENV_IMAGE:-}|g" \ - -e "s|\${STORAGE_CLASS_NAME}|${STORAGE_CLASS_NAME}|g" \ + -e "s|\${EXTERNAL_VOLUME_CLASS}|${EXTERNAL_VOLUME_CLASS}|g" \ "${manifest}" } @@ -302,7 +304,7 @@ deploy() { fi ACTOR_CPU_MILLICORES="$(cpu_millicores "${ACTOR_CPU}")" ACTOR_MEMORY_BYTES="$(memory_bytes "${ACTOR_MEMORY}")" - echo "Deploying workloads (worker_count=${WORKER_COUNT}, actor_memory=${ACTOR_MEMORY}, actor_cpu=${ACTOR_CPU}, worker_memory=${WORKER_MEMORY:-unset}, storage_class=${STORAGE_CLASS_NAME:-none}, otlp_endpoint=${OTLP_ENDPOINT})..." + echo "Deploying workloads (worker_count=${WORKER_COUNT}, actor_memory=${ACTOR_MEMORY}, actor_cpu=${ACTOR_CPU}, worker_memory=${WORKER_MEMORY:-unset}, external_volume_class=${EXTERNAL_VOLUME_CLASS:-none}, otlp_endpoint=${OTLP_ENDPOINT})..." substitute "${POOL_MANIFEST}" | hack/run-tool.sh ko apply -f - echo "Waiting for worker pool to be ready (timeout: ${WAIT_TIMEOUT_SECS}s)..." if fake_data_plane; then @@ -324,6 +326,11 @@ deploy() { run_kubectl_ate create atespace benchmark-workloads >/dev/null 2>&1 \ || run_kubectl_ate get atespace benchmark-workloads >/dev/null + if [[ -n "${EXTERNAL_VOLUME_CLASS}" ]]; then + run_kubectl_ate --preview update access-policy -c "${EXTERNAL_VOLUME_CLASS}" \ + --add-member atespace:benchmark-workloads + fi + # Actor templates are immutable (no update RPC). A value that changes for # each run — the OTLP endpoint or the sandbox class — needs the removal of # the old template first. This removal is safe, because the benchmark @@ -332,11 +339,15 @@ deploy() { for template in "${TEMPLATES[@]}"; do run_kubectl_ate delete actor-template "${template}" -a benchmark-workloads \ >/dev/null 2>&1 || true + local create_args=(create actor-template -f -) + if [[ "${template}" == "glutton-storage" ]]; then + create_args=(--preview "${create_args[@]}") + fi # ko resolve builds the ko:// image references and replaces them with # pushed digests before the manifest reaches kubectl-ate. substitute "$(template_manifest "${template}")" \ | hack/run-tool.sh ko resolve -f - \ - | run_kubectl_ate create actor-template -f - + | run_kubectl_ate "${create_args[@]}" done wait_templates_ready @@ -412,12 +423,12 @@ while [[ "$#" -gt 0 ]]; do --worker-memory=*) WORKER_MEMORY="${1#*=}" ;; - --storage-class-name) + --external-volume-class) shift - STORAGE_CLASS_NAME="$1" + EXTERNAL_VOLUME_CLASS="$1" ;; - --storage-class-name=*) - STORAGE_CLASS_NAME="${1#*=}" + --external-volume-class=*) + EXTERNAL_VOLUME_CLASS="${1#*=}" ;; --wait-timeout) shift @@ -459,11 +470,11 @@ if ! [[ "${WAIT_TIMEOUT_SECS}" =~ ^[0-9]+$ ]]; then exit 1 fi -# glutton-storage joins the default set only when it has a StorageClass. Delete -# always includes it, because deleting a template that does not exist is a -# no-op. +# glutton-storage joins the default set only when it has an ExternalVolumeClass. +# Delete always includes it, because deleting a template that does not exist is +# a no-op. if [[ -z "${WORKLOAD_TEMPLATES:-}" ]] \ - && { [[ -n "${STORAGE_CLASS_NAME}" ]] || [[ "${action}" == "delete" ]]; }; then + && { [[ -n "${EXTERNAL_VOLUME_CLASS}" ]] || [[ "${action}" == "delete" ]]; }; then TEMPLATES+=(glutton-storage) fi @@ -474,8 +485,8 @@ if [[ -z "${WORKLOAD_TEMPLATES:-}" ]] \ TEMPLATES+=(ate-env) fi -if [[ "${action}" == "deploy" && -z "${STORAGE_CLASS_NAME}" && " ${TEMPLATES[*]} " == *" glutton-storage "* ]]; then - echo "Error: the glutton-storage template needs --storage-class-name" >&2 +if [[ "${action}" == "deploy" && -z "${EXTERNAL_VOLUME_CLASS}" && " ${TEMPLATES[*]} " == *" glutton-storage "* ]]; then + echo "Error: the glutton-storage template needs --external-volume-class" >&2 exit 1 fi diff --git a/benchmarking/workloads/manifests/glutton-storage-template.yaml.tmpl b/benchmarking/workloads/manifests/glutton-storage-template.yaml.tmpl index 21a67243c2..eebbb8edc5 100644 --- a/benchmarking/workloads/manifests/glutton-storage-template.yaml.tmpl +++ b/benchmarking/workloads/manifests/glutton-storage-template.yaml.tmpl @@ -14,7 +14,7 @@ # ActorTemplate (protojson-shaped ateapi.ActorTemplate) for the glutton-storage # benchmark workload, created through the ate API by workloads/deploy.sh. -# Attaches an external volume backed by ${STORAGE_CLASS_NAME}. The DurDir load +# Attaches an external volume backed by ${EXTERNAL_VOLUME_CLASS}. The DurDir load # runs it with --durdir-template glutton-storage. metadata: atespace: benchmark-workloads @@ -27,7 +27,8 @@ volumes: external: template: capacityBytes: 1073741824 # 1Gi - storageClassName: ${STORAGE_CLASS_NAME} + externalVolumeClass: + name: ${EXTERNAL_VOLUME_CLASS} containers: - name: glutton-storage image: ko://go.ate.dev/substrate/cmd/benchmarking/glutton @@ -56,4 +57,4 @@ resources: cpuMillicores: "${ACTOR_CPU_MILLICORES}" memoryBytes: "${ACTOR_MEMORY_BYTES}" snapshotConfig: - onCommit: SNAPSHOT_CONTENT_SCOPE_FULL + preferredFidelity: SNAPSHOT_FIDELITY_MEMORY diff --git a/cmd/ate-setup/commands.md b/cmd/ate-setup/commands.md index 0b91ed1390..f1378ab8b1 100644 --- a/cmd/ate-setup/commands.md +++ b/cmd/ate-setup/commands.md @@ -173,6 +173,10 @@ Individual secrets and config that `deploy ate-system` creates automatically. `driver` is one of `nfs`, `hostpath`, `both`, or `none`, and defaults to `nfs`. The hostpath is for KIND clusters only. NFS has no such restriction, but it does need the `nfsd` kernel module loaded on the nodes. +When `ate-api-server` is deployed and `--preview=ExternalVolumes` (or `ATE_PREVIEW`) is set +for this command, `setup csi` also registers the matching `ExternalVolumeClass` (`csi-nfs`, +`csi-hostpath`). Run it after `deploy ate-system`, or pass `--setup-csi` to `deploy ate-system`. + ## Benchmarks @@ -196,7 +200,7 @@ is absent); the other two are flags of the benchmark commands. See | Command | Description | |---|---| | `deploy demo counter` | A counter actor exercising snapshot, resume, and atenet ingress | -| `deploy demo counter --with-external-volume [--storage-class NAME]` | The same, plus an external volume and a pre-seeded file to validate (requires `--preview=ExternalVolumes`). Run `setup csi` first and name the class it created, e.g. `csi-nfs-sc`; defaults to `standard` | +| `deploy demo counter --with-external-volume [--external-volume-class NAME]` | The same, plus an external volume and a pre-seeded file to validate (requires `--preview=ExternalVolumes`). Run `setup csi --preview=ExternalVolumes` first and name the class it registered, e.g. `csi-nfs`; defaults to `csi-nfs` | | `deploy demo counter-microvm` | The counter demo on microVM workers | | `deploy demo egress` | Egress policy enforcement through atenet; the actors trust the egress gateway's CA | | `deploy demo egress-microvm` | The same on microVM workers | diff --git a/cmd/ate-setup/internal/cmd/setup.go b/cmd/ate-setup/internal/cmd/setup.go index 43880987d8..125c8d8e26 100644 --- a/cmd/ate-setup/internal/cmd/setup.go +++ b/cmd/ate-setup/internal/cmd/setup.go @@ -34,7 +34,12 @@ Driver options: nfs (default), hostpath, both, none. Note that hostpath is single-node Kind only, while NFS is not restricted to Kind. Both drivers expose their controllers over TCP so atelet and ateapi can reach them. Re-running this removes -the previous deployment first, which clears stale mounts left behind by an earlier install.`, +the previous deployment first, which clears stale mounts left behind by an earlier install. + +When ate-api-server is deployed and --preview=ExternalVolumes (or ATE_PREVIEW) is set +for this command, this also registers the matching ExternalVolumeClass (csi-nfs, +csi-hostpath). Run "setup csi" after "deploy ate-system", or pass --setup-csi to +"deploy ate-system", so the classes are created.`, // Rejecting an unknown driver here rather than in the step means it costs // nothing: cobra validates arguments before the root command loads the // configuration and connects to a cluster. @@ -45,7 +50,11 @@ the previous deployment first, which clears stale mounts left behind by an earli return steps.ValidateCSIDriver(csiDriver(args)) }, RunE: func(cmd *cobra.Command, args []string) error { - return env.SetupCSI(cmd.Context(), csiDriver(args)) + driver := csiDriver(args) + if err := env.SetupCSI(cmd.Context(), driver); err != nil { + return err + } + return env.RegisterExternalVolumeClasses(cmd.Context(), driver) }, } diff --git a/cmd/ate-setup/internal/demos/counter/counter.go b/cmd/ate-setup/internal/demos/counter/counter.go index 9f95fa9998..321049013a 100644 --- a/cmd/ate-setup/internal/demos/counter/counter.go +++ b/cmd/ate-setup/internal/demos/counter/counter.go @@ -30,11 +30,11 @@ const ( namespace = "ate-demo-counter" template = "demos/counter/counter-template.yaml.tmpl" - defaultStorageClass = "standard" + defaultExternalVolumeClass = "csi-nfs" ) func (d *demo) externalVolumeValues(e *steps.Env) map[string]string { - sc := e.Cfg.Resolved().String("demo.counter.storageClass") + evc := e.Cfg.Resolved().String("demo.counter.externalVolumeClass") return map[string]string{ "VALIDATE_EXISTING_FILE_PATH_ARG": " - --validate-existing-file-path=/external-data/test.txt", "EXTERNAL_VOLUME_MOUNTS": " - name: external-data\n" + @@ -43,7 +43,8 @@ func (d *demo) externalVolumeValues(e *steps.Env) map[string]string { " external:\n" + " template:\n" + " capacityBytes: 1073741824 # 1Gi\n" + - " storageClassName: " + sc, + " externalVolumeClass:\n" + + " name: " + evc, } } @@ -79,9 +80,9 @@ func (d *demo) Settings() []config.Setting { Usage: "Attach an external volume and validate a pre-seeded file on it (run \"setup csi\" first)", }, { - Key: "demo.counter.storageClass", Env: "STORAGE_CLASS", - Flag: "storage-class", Kind: config.KindString, Default: defaultStorageClass, - Usage: "StorageClass backing the external volume, e.g. csi-nfs-sc or csi-hostpath-sc. Must be used --with-external-volume=true.", + Key: "demo.counter.externalVolumeClass", Env: "EXTERNAL_VOLUME_CLASS", + Flag: "external-volume-class", Kind: config.KindString, Default: defaultExternalVolumeClass, + Usage: "ExternalVolumeClass backing the external volume, e.g. csi-nfs or csi-hostpath. Must be used --with-external-volume=true.", }, } } diff --git a/cmd/ate-setup/internal/demos/counter/counter_test.go b/cmd/ate-setup/internal/demos/counter/counter_test.go index beda14bc8e..7a69a02791 100644 --- a/cmd/ate-setup/internal/demos/counter/counter_test.go +++ b/cmd/ate-setup/internal/demos/counter/counter_test.go @@ -31,31 +31,31 @@ import ( // sweep test in the demos package. func TestExternalVolumeRenders(t *testing.T) { for _, tc := range []struct { - name string - storageClass string - wantSC string + name string + externalVolumeClass string + wantEVC string }{ { - name: "unset", - storageClass: "", - wantSC: "storageClassName: standard", + name: "unset", + externalVolumeClass: "", + wantEVC: "name: csi-nfs", }, { - name: "explicit", - storageClass: "csi-nfs-sc", - wantSC: "storageClassName: csi-nfs-sc", + name: "explicit", + externalVolumeClass: "csi-hostpath", + wantEVC: "name: csi-hostpath", }, } { t.Run(tc.name, func(t *testing.T) { - // The storage class is a setting now, so steer it the way an - // operator would rather than by reaching into the demo. Unset, - // not blanked, for the case that wants the default: an exported - // empty value is a storage class the operator asked for. - if tc.storageClass == "" { - t.Setenv("STORAGE_CLASS", "x") - _ = os.Unsetenv("STORAGE_CLASS") + // The external volume class is a setting, so steer it the way an + // operator would rather than by reaching into the demo. Unset, not + // blanked, for the case that wants the default: an exported empty + // value is a class name the operator asked for. + if tc.externalVolumeClass == "" { + t.Setenv("EXTERNAL_VOLUME_CLASS", "x") + _ = os.Unsetenv("EXTERNAL_VOLUME_CLASS") } else { - t.Setenv("STORAGE_CLASS", tc.storageClass) + t.Setenv("EXTERNAL_VOLUME_CLASS", tc.externalVolumeClass) } e := demotest.Env(t) d := &demo{} @@ -71,7 +71,8 @@ func TestExternalVolumeRenders(t *testing.T) { "mountPath: /external-data", "external:", "template:", - tc.wantSC, + "externalVolumeClass:", + tc.wantEVC, } { if !strings.Contains(string(manifest), want) { t.Errorf("rendered manifest is missing %q", want) diff --git a/cmd/ate-setup/internal/demos/substrate.go b/cmd/ate-setup/internal/demos/substrate.go index dedfc17019..88bd6a2e7d 100644 --- a/cmd/ate-setup/internal/demos/substrate.go +++ b/cmd/ate-setup/internal/demos/substrate.go @@ -164,6 +164,13 @@ func (d *Substrate) Deploy(ctx context.Context, e *steps.Env) error { if err != nil { return err } + for _, v := range template.GetVolumes() { + if className := v.GetExternal().GetTemplate().GetExternalVolumeClass().GetName(); className != "" { + if err := steps.EnsureExternalVolumeClassAtespaceAccess(ctx, client, className, template.GetMetadata().GetAtespace()); err != nil { + return err + } + } + } if err := steps.CreateActorTemplate(ctx, client, template); err != nil { return err } diff --git a/cmd/ate-setup/internal/steps/csi.go b/cmd/ate-setup/internal/steps/csi.go index 0a2d9e0e24..36dc0bd025 100644 --- a/cmd/ate-setup/internal/steps/csi.go +++ b/cmd/ate-setup/internal/steps/csi.go @@ -185,9 +185,6 @@ func (e *Env) setupCSIHostpath(ctx context.Context) error { if err := e.deleteService(ctx, "default", "csi-hostpath-controller"); err != nil { return err } - if err := e.deleteStorageClass(ctx, "csi-hostpath-sc"); err != nil { - return err - } if err := e.Kube.WaitDeleted(ctx, schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "StatefulSet"}, "default", "csi-hostpathplugin", e.Cfg.RolloutTimeout); err != nil { return err } @@ -252,11 +249,6 @@ spec: return fmt.Errorf("while patching the csi-hostpathplugin StatefulSet: %w", err) } - log.Infof("Creating the csi-hostpath-sc StorageClass...") - if err := e.Kube.ApplyPath(ctx, driverDir+"/examples/csi-storageclass.yaml"); err != nil { - return err - } - log.Infof("Waiting for the CSI hostpath and proxy pods to be ready...") for _, name := range []string{"csi-hostpathplugin", "csi-hostpath-socat"} { if err := e.Kube.RolloutStatus(ctx, kube.KindStatefulSet, "default", name, e.Cfg.WaitTimeout(BootstrapTimeout)); err != nil { @@ -537,13 +529,6 @@ spec: return fmt.Errorf("while patching the csi-nfs-controller Deployment: %w", err) } - // The driver resolves the server's DNS name at provisioning time, so the - // StorageClass can be created before the NFS server has an address. - log.Infof("Creating the csi-nfs-sc StorageClass...") - if err := e.Kube.ApplyPath(ctx, deployDir+"/example/storageclass-nfs.yaml"); err != nil { - return err - } - log.Infof("Waiting for the NFS server and CSI driver to be ready...") if err := e.Kube.RolloutStatus(ctx, kube.KindDeployment, "default", "nfs-server", e.Cfg.WaitTimeout(BootstrapTimeout)); err != nil { return err @@ -592,14 +577,6 @@ func (e *Env) deleteService(ctx context.Context, namespace, name string) error { return nil } -func (e *Env) deleteStorageClass(ctx context.Context, name string) error { - err := e.Kube.Typed.StorageV1().StorageClasses().Delete(ctx, name, metav1.DeleteOptions{}) - if err != nil && !apierrors.IsNotFound(err) { - return fmt.Errorf("while deleting storageclass %s: %w", name, err) - } - return nil -} - // kindNodeName returns the worker node to pin the hostpath driver to, // preferring a non-control-plane node and falling back to the only node on a // single-node cluster. diff --git a/cmd/ate-setup/internal/steps/csi_test.go b/cmd/ate-setup/internal/steps/csi_test.go index b8f83ea8b7..390d860684 100644 --- a/cmd/ate-setup/internal/steps/csi_test.go +++ b/cmd/ate-setup/internal/steps/csi_test.go @@ -18,6 +18,7 @@ import ( "context" "os" "path/filepath" + "slices" "strconv" "strings" "testing" @@ -128,42 +129,56 @@ func TestTheHostpathControllerServiceIsCreatedBeforeTheDriver(t *testing.T) { } } -// The e2e tests, the demos and the benchmarks all provision from csi-nfs-sc, so -// both NFS setups apply the one manifest that defines it rather than each -// carrying a copy that can drift. The step wants a cluster, so which file it -// applies is pinned in the source. -func TestTheNFSSetupsApplyTheSharedStorageClass(t *testing.T) { - const manifest = "hack/third_party/csi-driver-nfs/deploy/example/storageclass-nfs.yaml" +// The e2e tests, the demos and the benchmarks all provision from csi-nfs, so +// both NFS setups register the one manifest that defines it rather than each +// carrying a copy that can drift. +func TestTheNFSSetupsRegisterTheSharedExternalVolumeClass(t *testing.T) { + const manifest = "hack/csi/external-volume-class-nfs.yaml" root := repoRoot(t) - objs, err := kube.LoadPath(filepath.Join(root, manifest)) + raw, err := os.ReadFile(filepath.Join(root, manifest)) if err != nil { - t.Fatalf("loading %s: %v", manifest, err) + t.Fatalf("reading %s: %v", manifest, err) } - if len(objs) != 1 || objs[0].GetKind() != "StorageClass" || objs[0].GetName() != "csi-nfs-sc" { - t.Fatalf("%s holds %d object(s), want only the csi-nfs-sc StorageClass", manifest, len(objs)) + class, err := ExternalVolumeClassFromManifest(raw) + if err != nil { + t.Fatalf("parsing %s: %v", manifest, err) + } + if class.GetMetadata().GetName() != "csi-nfs" { + t.Errorf("csi-nfs metadata.name = %q, want csi-nfs", class.GetMetadata().GetName()) } - if p, _, _ := unstructured.NestedString(objs[0].Object, "provisioner"); p != "nfs.csi.k8s.io" { - t.Errorf("csi-nfs-sc provisioner = %q, want nfs.csi.k8s.io", p) + if class.GetDriverName() != "nfs.csi.k8s.io" { + t.Errorf("csi-nfs driverName = %q, want nfs.csi.k8s.io", class.GetDriverName()) + } + if !slices.Equal(class.GetMountOptions(), []string{"nfsvers=4.1"}) { + t.Errorf("csi-nfs mountOptions = %v, want [nfsvers=4.1]", class.GetMountOptions()) } - goSetup := functionBody(t, "csi.go", "func (e *Env) setupCSINFS(") - if !strings.Contains(goSetup, `deployDir+"/example/storageclass-nfs.yaml"`) { - t.Errorf("setupCSINFS no longer applies %s", manifest) + goRegister := functionBody(t, "substrate.go", "func externalVolumeClassesForDriver(") + if !strings.Contains(goRegister, `"external-volume-class-nfs.yaml"`) { + t.Errorf("externalVolumeClassesForDriver no longer loads %s", manifest) + } + for fn, sig := range map[string]string{ + "setupCSINFS": "func (e *Env) setupCSINFS(", + "setupCSIHostpath": "func (e *Env) setupCSIHostpath(", + } { + if strings.Contains(functionBody(t, "csi.go", sig), "StorageClass") { + t.Errorf("%s still references a Kubernetes StorageClass", fn) + } } script, err := os.ReadFile(filepath.Join(root, "hack", "setup-csi-nfs-kind.sh")) if err != nil { t.Fatalf("reading the shell setup: %v", err) } if !strings.Contains(string(script), manifest) { - t.Errorf("hack/setup-csi-nfs-kind.sh no longer applies %s", manifest) + t.Errorf("hack/setup-csi-nfs-kind.sh no longer registers %s", manifest) } for name, src := range map[string]string{ - "setupCSINFS": goSetup, - "hack/setup-csi-nfs-kind.sh": string(script), + "externalVolumeClassesForDriver": goRegister, + "hack/setup-csi-nfs-kind.sh": string(script), } { - if strings.Contains(src, "kind: StorageClass") { - t.Errorf("%s defines a StorageClass inline; apply %s instead", name, manifest) + if strings.Contains(src, "\ndriverName:") { + t.Errorf("%s defines an ExternalVolumeClass inline; register %s instead", name, manifest) } } } @@ -237,7 +252,7 @@ func TestTheNFSShellSetupMatchesTheGoSetup(t *testing.T) { } src := string(script) - for _, forbidden := range []string{"socat:", "privileged: true"} { + for _, forbidden := range []string{"socat:", "privileged: true", "StorageClass"} { if strings.Contains(src, forbidden) { t.Errorf("hack/setup-csi-nfs-kind.sh still contains %q", forbidden) } @@ -247,6 +262,8 @@ func TestTheNFSShellSetupMatchesTheGoSetup(t *testing.T) { "serverName: csi-nfs-controller.kube-system.svc\n", "usePodIdentity: true", "/sa/ate-api-server", + "ExternalVolumes", + "--preview create external-volume-class -f", } { if !strings.Contains(src, required) { t.Errorf("hack/setup-csi-nfs-kind.sh no longer contains %q", required) @@ -255,6 +272,9 @@ func TestTheNFSShellSetupMatchesTheGoSetup(t *testing.T) { if service, driver := strings.Index(src, "name: csi-nfs-controller\n namespace: kube-system"), strings.Index(src, "csi-nfs-controller.yaml"); service < 0 || driver < 0 || service > driver { t.Error("hack/setup-csi-nfs-kind.sh deploys the NFS driver before creating the csi-nfs-controller Service") } + if cdc, evc := strings.Index(src, "kind: CSIDriverConfig"), strings.Index(src, "external-volume-class-nfs.yaml"); cdc < 0 || evc < 0 || cdc > evc { + t.Error("hack/setup-csi-nfs-kind.sh registers the csi-nfs ExternalVolumeClass before creating the CSIDriverConfig") + } } // The hostpath proxy needs no more than root to reach the driver's socket. diff --git a/cmd/ate-setup/internal/steps/deploy.go b/cmd/ate-setup/internal/steps/deploy.go index b1f9c4fe7a..2f4ddc6802 100644 --- a/cmd/ate-setup/internal/steps/deploy.go +++ b/cmd/ate-setup/internal/steps/deploy.go @@ -212,6 +212,9 @@ func (e *Env) DeployAteSystem(ctx context.Context, opts DeployOptions) error { return err } } + if err := e.RegisterExternalVolumeClasses(ctx, opts.SetupCSI); err != nil { + return err + } if err := e.waitFakeWorkersync(ctx); err != nil { return err } diff --git a/cmd/ate-setup/internal/steps/substrate.go b/cmd/ate-setup/internal/steps/substrate.go index 4490a71d43..e2344ca201 100644 --- a/cmd/ate-setup/internal/steps/substrate.go +++ b/cmd/ate-setup/internal/steps/substrate.go @@ -17,15 +17,20 @@ package steps import ( "context" "fmt" + "maps" + "os" + "slices" "time" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/encoding/protojson" + "google.golang.org/protobuf/proto" "sigs.k8s.io/yaml" "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/cmd/ate-setup/internal/config" "go.ate.dev/substrate/cmd/ate-setup/internal/log" "go.ate.dev/substrate/internal/ateclient" "go.ate.dev/substrate/internal/preview" @@ -56,25 +61,231 @@ func EnsureAtespace(ctx context.Context, client *ateclient.Client, atespace stri return err } -// ActorTemplateFromManifest parses a single protojson-shaped YAML or JSON -// document into an ActorTemplate, as `kubectl ate create actor-template` -// does. Parsing is strict: unknown fields are an error, so typos don't -// silently drop configuration. -func ActorTemplateFromManifest(manifest []byte) (*ateapi.ActorTemplate, error) { +// unmarshalProtoManifest parses a single protojson-shaped YAML or JSON +// document into dst. Parsing is strict so typos fail instead of being dropped. +func unmarshalProtoManifest(manifest []byte, dst proto.Message) error { jsonData, err := yaml.YAMLToJSON(manifest) if err != nil { - return nil, fmt.Errorf("invalid YAML: %w", err) + return fmt.Errorf("invalid YAML: %w", err) } if string(jsonData) == "null" { - return nil, fmt.Errorf("manifest is empty") + return fmt.Errorf("manifest is empty") } + return protojson.Unmarshal(jsonData, dst) +} + +// ActorTemplateFromManifest parses a single protojson-shaped YAML or JSON +// document into an ActorTemplate, as `kubectl ate create actor-template` +// does. Parsing is strict: unknown fields are an error, so typos don't +// silently drop configuration. +func ActorTemplateFromManifest(manifest []byte) (*ateapi.ActorTemplate, error) { template := &ateapi.ActorTemplate{} - if err := protojson.Unmarshal(jsonData, template); err != nil { + if err := unmarshalProtoManifest(manifest, template); err != nil { return nil, err } return template, nil } +// ExternalVolumeClassFromManifest parses a single protojson-shaped YAML or +// JSON document into an ExternalVolumeClass, as `kubectl ate create +// external-volume-class` does. +func ExternalVolumeClassFromManifest(manifest []byte) (*ateapi.ExternalVolumeClass, error) { + class := &ateapi.ExternalVolumeClass{} + if err := unmarshalProtoManifest(manifest, class); err != nil { + return nil, err + } + return class, nil +} + +type externalVolumeClassClient interface { + CreateExternalVolumeClass(ctx context.Context, in *ateapi.CreateExternalVolumeClassRequest, opts ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) + GetExternalVolumeClass(ctx context.Context, in *ateapi.GetExternalVolumeClassRequest, opts ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) +} + +// RegisterExternalVolumeClasses creates the canonical ExternalVolumeClass +// resources for the selected CSI driver when the ExternalVolumes preview gate +// is enabled and ate-api-server is deployed. Existing classes with the same +// spec are kept; differing specs return an error. +func (e *Env) RegisterExternalVolumeClasses(ctx context.Context, driver string) error { + if err := ValidateCSIDriver(driver); err != nil { + return err + } + spec := csiDrivers[driver] + if spec.installsNothing() { + return nil + } + if !previewGateEnabled(e.Cfg.PreviewGates, preview.GateExternalVolumes) { + log.Infof("Skipping ExternalVolumeClass registration: %s preview gate is disabled.", preview.GateExternalVolumes) + return nil + } + classes, err := externalVolumeClassesForDriver(e.Cfg, spec) + if err != nil { + return err + } + present, err := e.Kube.DeploymentExists(ctx, e.Namespace(), "ate-api-server") + if err != nil { + return err + } + if !present { + log.Step("ate-api-server not found; skipping ExternalVolumeClass registration") + return nil + } + + client, err := e.AteClient(ctx) + if err != nil { + return err + } + defer client.Close() + + return registerExternalVolumeClasses(ctx, client, classes) +} + +func externalVolumeClassesForDriver(cfg *config.Config, spec csiDriverSpec) ([]*ateapi.ExternalVolumeClass, error) { + var paths []string + if spec.hostpath { + paths = append(paths, cfg.Path("hack", "csi", "external-volume-class-hostpath.yaml")) + } + if spec.nfs { + paths = append(paths, cfg.Path("hack", "csi", "external-volume-class-nfs.yaml")) + } + classes := make([]*ateapi.ExternalVolumeClass, 0, len(paths)) + for _, p := range paths { + data, err := os.ReadFile(p) + if err != nil { + return nil, fmt.Errorf("reading external volume class manifest %s: %w", p, err) + } + class, err := ExternalVolumeClassFromManifest(data) + if err != nil { + return nil, fmt.Errorf("parsing external volume class manifest %s: %w", p, err) + } + classes = append(classes, class) + } + return classes, nil +} + +func registerExternalVolumeClasses(ctx context.Context, client externalVolumeClassClient, classes []*ateapi.ExternalVolumeClass) error { + for _, class := range classes { + name := class.GetMetadata().GetName() + _, err := client.CreateExternalVolumeClass(ctx, &ateapi.CreateExternalVolumeClassRequest{ExternalVolumeClass: class}) + if err == nil { + log.Stepf("registered external volume class %q", name) + continue + } + if status.Code(err) != codes.AlreadyExists { + return fmt.Errorf("creating external volume class %q: %w", name, err) + } + existing, getErr := client.GetExternalVolumeClass(ctx, &ateapi.GetExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: name}, + }) + if getErr != nil { + return fmt.Errorf("getting existing external volume class %q: %w", name, getErr) + } + if !externalVolumeClassEqual(class, existing) { + return fmt.Errorf("external volume class %q already exists with a different spec (got driver=%q parameters=%v mountOptions=%v, want driver=%q parameters=%v mountOptions=%v); delete and recreate it", + name, + existing.GetDriverName(), existing.GetParameters(), existing.GetMountOptions(), + class.GetDriverName(), class.GetParameters(), class.GetMountOptions()) + } + log.Stepf("external volume class %q already exists; keeping it", name) + } + return nil +} + +func externalVolumeClassEqual(want, got *ateapi.ExternalVolumeClass) bool { + return want.GetMetadata().GetName() == got.GetMetadata().GetName() && + want.GetDriverName() == got.GetDriverName() && + maps.Equal(want.GetParameters(), got.GetParameters()) && + slices.Equal(want.GetMountOptions(), got.GetMountOptions()) +} + +const ( + externalVolumeClassAllowedRole = "allowed_atespace" + maxPolicyGrantAttempts = 5 +) + +type externalVolumeClassAccessPolicyClient interface { + GetExternalVolumeClassAccessPolicy(ctx context.Context, in *ateapi.GetExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) + CreateExternalVolumeClassAccessPolicy(ctx context.Context, in *ateapi.CreateExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) + UpdateExternalVolumeClassAccessPolicy(ctx context.Context, in *ateapi.UpdateExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) +} + +// EnsureExternalVolumeClassAtespaceAccess ensures atespace is listed in the +// allowed_atespace binding of className's AccessPolicy, creating the policy if +// none exists and retrying optimistic-concurrency conflicts. +func EnsureExternalVolumeClassAtespaceAccess(ctx context.Context, client externalVolumeClassAccessPolicyClient, className, atespace string) error { + member := "atespace:" + atespace + ref := &ateapi.ObjectRef{Name: className} + + var lastErr error + for range maxPolicyGrantAttempts { + current, err := client.GetExternalVolumeClassAccessPolicy(ctx, &ateapi.GetExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }) + if err != nil { + if status.Code(err) != codes.NotFound { + return fmt.Errorf("getting access policy for external volume class %q: %w", className, err) + } + _, err = client.CreateExternalVolumeClassAccessPolicy(ctx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: resources.SingletonName}, + Bindings: []*ateapi.Binding{{ + Role: externalVolumeClassAllowedRole, + Members: []string{member}, + }}, + }, + }) + if err == nil { + log.Stepf("granted atespace %q access to external volume class %q", atespace, className) + return nil + } + if status.Code(err) == codes.AlreadyExists { + lastErr = err + continue + } + return fmt.Errorf("creating access policy for external volume class %q: %w", className, err) + } + + updated := proto.CloneOf(current) + if !addExternalVolumeClassMember(updated, member) { + return nil + } + _, err = client.UpdateExternalVolumeClassAccessPolicy(ctx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: updated, + }) + if err == nil { + log.Stepf("granted atespace %q access to external volume class %q", atespace, className) + return nil + } + if status.Code(err) == codes.Aborted || status.Code(err) == codes.NotFound { + lastErr = err + continue + } + return fmt.Errorf("updating access policy for external volume class %q: %w", className, err) + } + return fmt.Errorf("exceeded %d attempts updating access policy for external volume class %q: %w", maxPolicyGrantAttempts, className, lastErr) +} + +func addExternalVolumeClassMember(policy *ateapi.AccessPolicy, member string) bool { + for _, b := range policy.GetBindings() { + if b.GetRole() != externalVolumeClassAllowedRole { + continue + } + if slices.Contains(b.GetMembers(), member) { + return false + } + b.Members = append(b.Members, member) + return true + } + policy.Bindings = append(policy.Bindings, &ateapi.Binding{ + Role: externalVolumeClassAllowedRole, + Members: []string{member}, + }) + return true +} + // CreateActorTemplate creates the template through the ate API. Actor // templates are immutable (no update RPC), so an existing template is left // in place: delete the demo and redeploy to change it. diff --git a/cmd/ate-setup/internal/steps/substrate_test.go b/cmd/ate-setup/internal/steps/substrate_test.go index 19e662b873..b09820a64f 100644 --- a/cmd/ate-setup/internal/steps/substrate_test.go +++ b/cmd/ate-setup/internal/steps/substrate_test.go @@ -19,12 +19,14 @@ import ( "errors" "os" "path/filepath" + "slices" "strings" "testing" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "google.golang.org/protobuf/proto" "go.ate.dev/substrate/api/ateapi/v1" "go.ate.dev/substrate/cmd/ate-setup/internal/config" @@ -44,11 +46,12 @@ func TestActorTemplateFromManifestDemos(t *testing.T) { // The values benchmarking/workloads/deploy.sh substitutes. benchmarkValues := map[string]string{ - "${ACTOR_CPU_MILLICORES}": "1000", - "${ACTOR_MEMORY_BYTES}": "268435456", - "${ACTOR_MEMORY}": "256Mi", - "${ATE_ENV_IMAGE}": "gcr.io/example/ate-env-guest@sha256:1d38934ef1dac71fcb1f1286de734e06ab2e19747279bccbd37bfe69e0d5bc72", - "${OTLP_ENDPOINT}": "http://otel-collector.otel-system:4317", + "${ACTOR_CPU_MILLICORES}": "1000", + "${ACTOR_MEMORY_BYTES}": "268435456", + "${ACTOR_MEMORY}": "256Mi", + "${ATE_ENV_IMAGE}": "gcr.io/example/ate-env-guest@sha256:1d38934ef1dac71fcb1f1286de734e06ab2e19747279bccbd37bfe69e0d5bc72", + "${EXTERNAL_VOLUME_CLASS}": "csi-nfs", + "${OTLP_ENDPOINT}": "http://otel-collector.otel-system:4317", } tests := []struct { @@ -93,6 +96,11 @@ func TestActorTemplateFromManifestDemos(t *testing.T) { values: benchmarkValues, want: resources.ActorTemplateRef{Atespace: "benchmark-workloads", Name: "glutton-durdir-full"}, }, + { + relPath: "benchmarking/workloads/manifests/glutton-storage-template.yaml.tmpl", + values: benchmarkValues, + want: resources.ActorTemplateRef{Atespace: "benchmark-workloads", Name: "glutton-storage"}, + }, { relPath: "benchmarking/workloads/manifests/usermem-template.yaml.tmpl", values: benchmarkValues, @@ -291,3 +299,411 @@ func TestCreateActorEgressPolicy(t *testing.T) { } }) } + +func TestExternalVolumeClassFromManifest(t *testing.T) { + root, err := config.RepoRoot() + if err != nil { + t.Fatalf("RepoRoot() = %v", err) + } + + t.Run("checked-in manifests", func(t *testing.T) { + nfsRaw, err := os.ReadFile(filepath.Join(root, "hack/csi/external-volume-class-nfs.yaml")) + if err != nil { + t.Fatalf("read nfs manifest: %v", err) + } + nfsClass, err := ExternalVolumeClassFromManifest(nfsRaw) + if err != nil { + t.Fatalf("ExternalVolumeClassFromManifest(nfs) = %v", err) + } + if nfsClass.GetMetadata().GetName() != "csi-nfs" { + t.Errorf("nfs metadata.name = %q, want %q", nfsClass.GetMetadata().GetName(), "csi-nfs") + } + if nfsClass.GetDriverName() != "nfs.csi.k8s.io" { + t.Errorf("nfs driverName = %q, want %q", nfsClass.GetDriverName(), "nfs.csi.k8s.io") + } + wantParams := map[string]string{ + "server": "nfs-server.default.svc.cluster.local", + "share": "/", + } + if got := nfsClass.GetParameters(); len(got) != len(wantParams) || got["server"] != wantParams["server"] || got["share"] != wantParams["share"] { + t.Errorf("nfs parameters = %v, want %v", got, wantParams) + } + if got := nfsClass.GetMountOptions(); len(got) != 1 || got[0] != "nfsvers=4.1" { + t.Errorf("nfs mountOptions = %v, want [nfsvers=4.1]", got) + } + + hpRaw, err := os.ReadFile(filepath.Join(root, "hack/csi/external-volume-class-hostpath.yaml")) + if err != nil { + t.Fatalf("read hostpath manifest: %v", err) + } + hpClass, err := ExternalVolumeClassFromManifest(hpRaw) + if err != nil { + t.Fatalf("ExternalVolumeClassFromManifest(hostpath) = %v", err) + } + if hpClass.GetMetadata().GetName() != "csi-hostpath" { + t.Errorf("hostpath metadata.name = %q, want %q", hpClass.GetMetadata().GetName(), "csi-hostpath") + } + if hpClass.GetDriverName() != "hostpath.csi.k8s.io" { + t.Errorf("hostpath driverName = %q, want %q", hpClass.GetDriverName(), "hostpath.csi.k8s.io") + } + if len(hpClass.GetParameters()) != 0 { + t.Errorf("hostpath parameters = %v, want empty", hpClass.GetParameters()) + } + if len(hpClass.GetMountOptions()) != 0 { + t.Errorf("hostpath mountOptions = %v, want empty", hpClass.GetMountOptions()) + } + }) + + errCases := []struct { + name string + raw string + }{ + {name: "empty", raw: ""}, + {name: "invalid yaml", raw: ":\n - [unclosed"}, + {name: "unknown field", raw: "metadata:\n name: csi-nfs\nunknownField: value\n"}, + } + for _, tc := range errCases { + t.Run(tc.name, func(t *testing.T) { + if _, err := ExternalVolumeClassFromManifest([]byte(tc.raw)); err == nil { + t.Fatalf("ExternalVolumeClassFromManifest(%s) = nil, want error", tc.name) + } + }) + } +} + +func TestExternalVolumeClassesForDriver(t *testing.T) { + root, err := config.RepoRoot() + if err != nil { + t.Fatalf("RepoRoot() = %v", err) + } + cfg := &config.Config{Root: root} + + tests := []struct { + driver string + want []string + }{ + {driver: "none", want: nil}, + {driver: "nfs", want: []string{"csi-nfs"}}, + {driver: "hostpath", want: []string{"csi-hostpath"}}, + {driver: "both", want: []string{"csi-hostpath", "csi-nfs"}}, + } + for _, tc := range tests { + t.Run(tc.driver, func(t *testing.T) { + if err := ValidateCSIDriver(tc.driver); err != nil { + t.Fatalf("ValidateCSIDriver(%q) = %v", tc.driver, err) + } + spec := csiDrivers[tc.driver] + classes, err := externalVolumeClassesForDriver(cfg, spec) + if err != nil { + t.Fatalf("externalVolumeClassesForDriver(%q) = %v", tc.driver, err) + } + if len(classes) != len(tc.want) { + t.Fatalf("len(classes) = %d, want %d", len(classes), len(tc.want)) + } + for i, name := range tc.want { + if classes[i].GetMetadata().GetName() != name { + t.Errorf("classes[%d].name = %q, want %q", i, classes[i].GetMetadata().GetName(), name) + } + } + }) + } + + t.Run("missing manifest returns error", func(t *testing.T) { + if err := ValidateCSIDriver("nfs"); err != nil { + t.Fatalf("ValidateCSIDriver(nfs) = %v", err) + } + if _, err := externalVolumeClassesForDriver(&config.Config{Root: t.TempDir()}, csiDrivers["nfs"]); err == nil { + t.Fatal("externalVolumeClassesForDriver with empty root = nil, want error") + } + }) +} + +func TestRegisterExternalVolumeClassesEarlySkipsAndErrors(t *testing.T) { + root, err := config.RepoRoot() + if err != nil { + t.Fatalf("RepoRoot() = %v", err) + } + + t.Run("unknown driver returns error", func(t *testing.T) { + env := &Env{Cfg: &config.Config{Root: root}} + if err := env.RegisterExternalVolumeClasses(context.Background(), "bogus"); err == nil { + t.Fatal("RegisterExternalVolumeClasses(bogus) = nil, want error") + } + }) + + t.Run("driver none skips with gate enabled", func(t *testing.T) { + env := &Env{Cfg: &config.Config{Root: root, PreviewGates: []string{"ExternalVolumes"}}} + if err := env.RegisterExternalVolumeClasses(context.Background(), "none"); err != nil { + t.Fatalf("RegisterExternalVolumeClasses(none) = %v, want nil", err) + } + }) + + gateOffTests := []struct { + name string + driver string + gates []string + }{ + {name: "nfs empty gates", driver: "nfs", gates: nil}, + {name: "hostpath empty gates", driver: "hostpath", gates: nil}, + {name: "both unrelated gate", driver: "both", gates: []string{"OtherGate"}}, + } + for _, tc := range gateOffTests { + t.Run(tc.name, func(t *testing.T) { + env := &Env{Cfg: &config.Config{Root: root, PreviewGates: tc.gates}} + if err := env.RegisterExternalVolumeClasses(context.Background(), tc.driver); err != nil { + t.Fatalf("RegisterExternalVolumeClasses(%q) with gate off = %v, want nil", tc.driver, err) + } + }) + } + + missingDeploymentTests := []struct { + name string + driver string + gates []string + }{ + {name: "ExternalVolumes gate", driver: "nfs", gates: []string{"ExternalVolumes"}}, + {name: "ALL gate", driver: "both", gates: []string{"ALL"}}, + } + for _, tc := range missingDeploymentTests { + t.Run("skips without ate-api-server "+tc.name, func(t *testing.T) { + env := &Env{ + Cfg: &config.Config{Root: root, PreviewGates: tc.gates}, + Kube: fakeKube(t), + } + if err := env.RegisterExternalVolumeClasses(context.Background(), tc.driver); err != nil { + t.Fatalf("RegisterExternalVolumeClasses(%q) = %v, want nil", tc.driver, err) + } + }) + } +} + +type fakeExternalVolumeClassClient struct { + stored map[string]*ateapi.ExternalVolumeClass + createErr error + getErr error + creates int + gets int +} + +func (f *fakeExternalVolumeClassClient) CreateExternalVolumeClass(_ context.Context, in *ateapi.CreateExternalVolumeClassRequest, _ ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) { + f.creates++ + if f.createErr != nil { + return nil, f.createErr + } + evc := in.GetExternalVolumeClass() + name := evc.GetMetadata().GetName() + if _, ok := f.stored[name]; ok { + return nil, status.Errorf(codes.AlreadyExists, "external volume class %q already exists", name) + } + f.stored[name] = evc + return evc, nil +} + +func (f *fakeExternalVolumeClassClient) GetExternalVolumeClass(_ context.Context, in *ateapi.GetExternalVolumeClassRequest, _ ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) { + f.gets++ + if f.getErr != nil { + return nil, f.getErr + } + name := in.GetExternalVolumeClass().GetName() + evc, ok := f.stored[name] + if !ok { + return nil, status.Errorf(codes.NotFound, "external volume class %q not found", name) + } + return evc, nil +} + +func TestRegisterExternalVolumeClassesClient(t *testing.T) { + nfs := &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "csi-nfs"}, + DriverName: "nfs.csi.k8s.io", + Parameters: map[string]string{"server": "nfs-server.default.svc.cluster.local", "share": "/"}, + MountOptions: []string{"nfsvers=4.1"}, + } + hp := &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "csi-hostpath"}, + DriverName: "hostpath.csi.k8s.io", + } + + t.Run("creates missing classes", func(t *testing.T) { + client := &fakeExternalVolumeClassClient{stored: map[string]*ateapi.ExternalVolumeClass{}} + if err := registerExternalVolumeClasses(context.Background(), client, []*ateapi.ExternalVolumeClass{nfs, hp}); err != nil { + t.Fatalf("registerExternalVolumeClasses = %v, want nil", err) + } + if client.creates != 2 || client.gets != 0 { + t.Errorf("creates=%d gets=%d, want creates=2 gets=0", client.creates, client.gets) + } + if len(client.stored) != 2 { + t.Errorf("stored %d classes, want 2", len(client.stored)) + } + }) + + t.Run("idempotent on AlreadyExists with matching spec", func(t *testing.T) { + client := &fakeExternalVolumeClassClient{ + stored: map[string]*ateapi.ExternalVolumeClass{ + "csi-nfs": { + Metadata: &ateapi.ResourceMetadata{Name: "csi-nfs", Uid: "uid-1", Version: 3}, + DriverName: "nfs.csi.k8s.io", + Parameters: map[string]string{"server": "nfs-server.default.svc.cluster.local", "share": "/"}, + MountOptions: []string{"nfsvers=4.1"}, + }, + "csi-hostpath": { + Metadata: &ateapi.ResourceMetadata{Name: "csi-hostpath", Uid: "uid-2", Version: 1}, + DriverName: "hostpath.csi.k8s.io", + Parameters: map[string]string{}, + MountOptions: []string{}, + }, + }, + } + if err := registerExternalVolumeClasses(context.Background(), client, []*ateapi.ExternalVolumeClass{nfs, hp}); err != nil { + t.Fatalf("registerExternalVolumeClasses = %v, want nil", err) + } + if client.gets != 2 { + t.Errorf("gets = %d, want 2", client.gets) + } + }) + + mismatchCases := []struct { + name string + existing *ateapi.ExternalVolumeClass + }{ + { + name: "driver mismatch", + existing: &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "csi-nfs"}, + DriverName: "other.csi.k8s.io", + Parameters: map[string]string{"server": "nfs-server.default.svc.cluster.local", "share": "/"}, + MountOptions: []string{"nfsvers=4.1"}, + }, + }, + { + name: "parameters mismatch", + existing: &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "csi-nfs"}, + DriverName: "nfs.csi.k8s.io", + Parameters: map[string]string{"server": "other-nfs", "share": "/"}, + MountOptions: []string{"nfsvers=4.1"}, + }, + }, + { + name: "mount options mismatch", + existing: &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "csi-nfs"}, + DriverName: "nfs.csi.k8s.io", + Parameters: map[string]string{"server": "nfs-server.default.svc.cluster.local", "share": "/"}, + MountOptions: []string{"nfsvers=4.2"}, + }, + }, + } + for _, tc := range mismatchCases { + t.Run("AlreadyExists "+tc.name, func(t *testing.T) { + client := &fakeExternalVolumeClassClient{ + stored: map[string]*ateapi.ExternalVolumeClass{"csi-nfs": tc.existing}, + } + if err := registerExternalVolumeClasses(context.Background(), client, []*ateapi.ExternalVolumeClass{nfs}); err == nil { + t.Fatalf("registerExternalVolumeClasses(%s) = nil, want error", tc.name) + } + }) + } + + t.Run("create error propagated", func(t *testing.T) { + client := &fakeExternalVolumeClassClient{ + stored: map[string]*ateapi.ExternalVolumeClass{}, + createErr: status.Error(codes.Unavailable, "unavailable"), + } + if err := registerExternalVolumeClasses(context.Background(), client, []*ateapi.ExternalVolumeClass{nfs}); err == nil { + t.Fatal("registerExternalVolumeClasses on create error = nil, want error") + } + }) + + t.Run("get error after AlreadyExists propagated", func(t *testing.T) { + client := &fakeExternalVolumeClassClient{ + stored: map[string]*ateapi.ExternalVolumeClass{"csi-nfs": nfs}, + getErr: status.Error(codes.Internal, "internal"), + } + if err := registerExternalVolumeClasses(context.Background(), client, []*ateapi.ExternalVolumeClass{nfs}); err == nil { + t.Fatal("registerExternalVolumeClasses on get error = nil, want error") + } + }) +} + +type fakeExternalVolumeClassAccessPolicyClient struct { + policy *ateapi.AccessPolicy + updateErrOnce error + createCalls int + updateCalls int +} + +func (f *fakeExternalVolumeClassAccessPolicyClient) GetExternalVolumeClassAccessPolicy(_ context.Context, _ *ateapi.GetExternalVolumeClassAccessPolicyRequest, _ ...grpc.CallOption) (*ateapi.AccessPolicy, error) { + if f.policy == nil { + return nil, status.Error(codes.NotFound, "not found") + } + return proto.CloneOf(f.policy), nil +} + +func (f *fakeExternalVolumeClassAccessPolicyClient) CreateExternalVolumeClassAccessPolicy(_ context.Context, in *ateapi.CreateExternalVolumeClassAccessPolicyRequest, _ ...grpc.CallOption) (*ateapi.AccessPolicy, error) { + f.createCalls++ + f.policy = proto.CloneOf(in.GetAccessPolicy()) + f.policy.Metadata = &ateapi.ResourceMetadata{Name: "default", Uid: "uid-1", Version: 1} + return proto.CloneOf(f.policy), nil +} + +func (f *fakeExternalVolumeClassAccessPolicyClient) UpdateExternalVolumeClassAccessPolicy(_ context.Context, in *ateapi.UpdateExternalVolumeClassAccessPolicyRequest, _ ...grpc.CallOption) (*ateapi.AccessPolicy, error) { + f.updateCalls++ + if f.updateErrOnce != nil { + err := f.updateErrOnce + f.updateErrOnce = nil + return nil, err + } + f.policy = proto.CloneOf(in.GetAccessPolicy()) + f.policy.Metadata.Version++ + return proto.CloneOf(f.policy), nil +} + +func TestEnsureExternalVolumeClassAtespaceAccess(t *testing.T) { + t.Run("creates policy when absent", func(t *testing.T) { + client := &fakeExternalVolumeClassAccessPolicyClient{} + if err := EnsureExternalVolumeClassAtespaceAccess(context.Background(), client, "csi-nfs", "ate-demo"); err != nil { + t.Fatalf("EnsureExternalVolumeClassAtespaceAccess = %v, want nil", err) + } + if client.createCalls != 1 { + t.Fatalf("createCalls = %d, want 1", client.createCalls) + } + if got := client.policy.GetBindings()[0].GetMembers(); !slices.Equal(got, []string{"atespace:ate-demo"}) { + t.Fatalf("members = %v, want [atespace:ate-demo]", got) + } + }) + + t.Run("idempotent when already granted", func(t *testing.T) { + client := &fakeExternalVolumeClassAccessPolicyClient{ + policy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default", Uid: "uid-1", Version: 1}, + Bindings: []*ateapi.Binding{{Role: externalVolumeClassAllowedRole, Members: []string{"atespace:ate-demo"}}}, + }, + } + if err := EnsureExternalVolumeClassAtespaceAccess(context.Background(), client, "csi-nfs", "ate-demo"); err != nil { + t.Fatalf("EnsureExternalVolumeClassAtespaceAccess = %v, want nil", err) + } + if client.updateCalls != 0 { + t.Fatalf("updateCalls = %d, want 0", client.updateCalls) + } + }) + + t.Run("retries on Aborted and appends member", func(t *testing.T) { + client := &fakeExternalVolumeClassAccessPolicyClient{ + policy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default", Uid: "uid-1", Version: 1}, + Bindings: []*ateapi.Binding{{Role: externalVolumeClassAllowedRole, Members: []string{"atespace:ate-a"}}}, + }, + updateErrOnce: status.Error(codes.Aborted, "conflict"), + } + if err := EnsureExternalVolumeClassAtespaceAccess(context.Background(), client, "csi-nfs", "ate-demo"); err != nil { + t.Fatalf("EnsureExternalVolumeClassAtespaceAccess = %v, want nil", err) + } + if client.updateCalls != 2 { + t.Fatalf("updateCalls = %d, want 2", client.updateCalls) + } + if got := client.policy.GetBindings()[0].GetMembers(); !slices.Equal(got, []string{"atespace:ate-a", "atespace:ate-demo"}) { + t.Fatalf("members = %v, want [atespace:ate-a atespace:ate-demo]", got) + } + }) +} diff --git a/cmd/ateapi/internal/apivalidation/access_policy.go b/cmd/ateapi/internal/apivalidation/access_policy.go index 386bb7e60f..b654a728a2 100644 --- a/cmd/ateapi/internal/apivalidation/access_policy.go +++ b/cmd/ateapi/internal/apivalidation/access_policy.go @@ -20,6 +20,7 @@ import ( "go.ate.dev/substrate/api/ateapi/v1" "go.ate.dev/substrate/cmd/ateapi/internal/authz" + "go.ate.dev/substrate/internal/preview" "k8s.io/apimachinery/pkg/api/operation" "k8s.io/apimachinery/pkg/util/validation/field" ) @@ -28,8 +29,9 @@ import ( const maxMembersPerPolicy = 1500 var ( - validGlobalRoles = []string{authz.RoleOwner, authz.RoleViewer} - validAtespaceRoles = []string{authz.RoleOwner, authz.RoleEditor, authz.RoleViewer} + validGlobalRoles = []string{authz.RoleOwner, authz.RoleViewer} + validAtespaceRoles = []string{authz.RoleOwner, authz.RoleEditor, authz.RoleViewer} + validExternalVolumeClassRoles = []string{authz.RoleAllowedAtespace} bindingsPath = field.NewPath("access_policy", "bindings") ) @@ -37,7 +39,7 @@ var ( func ValidateCreateGlobalAccessPolicyRequest(ctx context.Context, req *ateapi.CreateGlobalAccessPolicyRequest) field.ErrorList { op := MakeCreateOp(ctx) errs := Validate_CreateGlobalAccessPolicyRequest(ctx, op, nil, req, nil) - return append(errs, validateBindings(bindingsPath, req.GetAccessPolicy(), validGlobalRoles)...) + return append(errs, validateBindings(bindingsPath, req.GetAccessPolicy(), validGlobalRoles, authz.FormatMember)...) } func ValidateGetGlobalAccessPolicyRequest(ctx context.Context, req *ateapi.GetGlobalAccessPolicyRequest) field.ErrorList { @@ -50,7 +52,7 @@ func ValidateUpdateGlobalAccessPolicyRequest(ctx context.Context, req *ateapi.Up // validated against the stored value by ValidateGlobalAccessPolicyUpdate. op := MakeCreateOp(ctx) errs := Validate_UpdateGlobalAccessPolicyRequest(ctx, op, nil, req, nil) - return append(errs, validateBindings(bindingsPath, req.GetAccessPolicy(), validGlobalRoles)...) + return append(errs, validateBindings(bindingsPath, req.GetAccessPolicy(), validGlobalRoles, authz.FormatMember)...) } // ValidateGlobalAccessPolicyUpdate validates an updated global policy against @@ -58,13 +60,13 @@ func ValidateUpdateGlobalAccessPolicyRequest(ctx context.Context, req *ateapi.Up func ValidateGlobalAccessPolicyUpdate(ctx context.Context, fldPath *field.Path, newVal, oldVal *ateapi.AccessPolicy) field.ErrorList { op := MakeUpdateOp(ctx) errs := Validate_AccessPolicy(ctx, op, fldPath, newVal, oldVal) - return append(errs, validateBindings(fldPath.Child("bindings"), newVal, validGlobalRoles)...) + return append(errs, validateBindings(fldPath.Child("bindings"), newVal, validGlobalRoles, authz.FormatMember)...) } func ValidateCreateAtespaceAccessPolicyRequest(ctx context.Context, req *ateapi.CreateAtespaceAccessPolicyRequest) field.ErrorList { op := MakeCreateOp(ctx) errs := Validate_CreateAtespaceAccessPolicyRequest(ctx, op, nil, req, nil) - return append(errs, validateBindings(bindingsPath, req.GetAccessPolicy(), validAtespaceRoles)...) + return append(errs, validateBindings(bindingsPath, req.GetAccessPolicy(), validAtespaceRoles, authz.FormatMember)...) } func ValidateGetAtespaceAccessPolicyRequest(ctx context.Context, req *ateapi.GetAtespaceAccessPolicyRequest) field.ErrorList { @@ -77,7 +79,7 @@ func ValidateUpdateAtespaceAccessPolicyRequest(ctx context.Context, req *ateapi. // validated against the stored value by ValidateAtespaceAccessPolicyUpdate. op := MakeCreateOp(ctx) errs := Validate_UpdateAtespaceAccessPolicyRequest(ctx, op, nil, req, nil) - return append(errs, validateBindings(bindingsPath, req.GetAccessPolicy(), validAtespaceRoles)...) + return append(errs, validateBindings(bindingsPath, req.GetAccessPolicy(), validAtespaceRoles, authz.FormatMember)...) } // ValidateAtespaceAccessPolicyUpdate validates an updated atespace policy @@ -85,7 +87,7 @@ func ValidateUpdateAtespaceAccessPolicyRequest(ctx context.Context, req *ateapi. func ValidateAtespaceAccessPolicyUpdate(ctx context.Context, fldPath *field.Path, newVal, oldVal *ateapi.AccessPolicy) field.ErrorList { op := MakeUpdateOp(ctx) errs := Validate_AccessPolicy(ctx, op, fldPath, newVal, oldVal) - return append(errs, validateBindings(fldPath.Child("bindings"), newVal, validAtespaceRoles)...) + return append(errs, validateBindings(fldPath.Child("bindings"), newVal, validAtespaceRoles, authz.FormatMember)...) } func ValidateDeleteAtespaceAccessPolicyRequest(ctx context.Context, req *ateapi.DeleteAtespaceAccessPolicyRequest) field.ErrorList { @@ -93,6 +95,44 @@ func ValidateDeleteAtespaceAccessPolicyRequest(ctx context.Context, req *ateapi. return Validate_DeleteAtespaceAccessPolicyRequest(ctx, op, nil, req, nil) } +func ValidateCreateExternalVolumeClassAccessPolicyRequest(ctx context.Context, req *ateapi.CreateExternalVolumeClassAccessPolicyRequest) field.ErrorList { + op := MakeCreateOp(ctx) + errs := Validate_CreateExternalVolumeClassAccessPolicyRequest(ctx, op, nil, req, nil) + if enabled, _ := op.HasOption(string(preview.GateExternalVolumes)); enabled { + errs = append(errs, validateBindings(bindingsPath, req.GetAccessPolicy(), validExternalVolumeClassRoles, authz.FormatAtespaceMember)...) + } + return errs +} + +func ValidateGetExternalVolumeClassAccessPolicyRequest(ctx context.Context, req *ateapi.GetExternalVolumeClassAccessPolicyRequest) field.ErrorList { + op := MakeCreateOp(ctx) + return Validate_GetExternalVolumeClassAccessPolicyRequest(ctx, op, nil, req, nil) +} + +func ValidateUpdateExternalVolumeClassAccessPolicyRequest(ctx context.Context, req *ateapi.UpdateExternalVolumeClassAccessPolicyRequest) field.ErrorList { + // Modeled as a create: this validates the request itself. The result is + // validated against the stored value by ValidateExternalVolumeClassAccessPolicyUpdate. + op := MakeCreateOp(ctx) + errs := Validate_UpdateExternalVolumeClassAccessPolicyRequest(ctx, op, nil, req, nil) + if enabled, _ := op.HasOption(string(preview.GateExternalVolumes)); enabled { + errs = append(errs, validateBindings(bindingsPath, req.GetAccessPolicy(), validExternalVolumeClassRoles, authz.FormatAtespaceMember)...) + } + return errs +} + +// ValidateExternalVolumeClassAccessPolicyUpdate validates an updated external +// volume class access policy against the stored one. +func ValidateExternalVolumeClassAccessPolicyUpdate(ctx context.Context, fldPath *field.Path, newVal, oldVal *ateapi.AccessPolicy) field.ErrorList { + op := MakeUpdateOp(ctx) + errs := Validate_AccessPolicy(ctx, op, fldPath, newVal, oldVal) + return append(errs, validateBindings(fldPath.Child("bindings"), newVal, validExternalVolumeClassRoles, authz.FormatAtespaceMember)...) +} + +func ValidateDeleteExternalVolumeClassAccessPolicyRequest(ctx context.Context, req *ateapi.DeleteExternalVolumeClassAccessPolicyRequest) field.ErrorList { + op := MakeCreateOp(ctx) + return Validate_DeleteExternalVolumeClassAccessPolicyRequest(ctx, op, nil, req, nil) +} + // ValidateCustom_AccessPolicy_Metadata requires an access policy to be the // unatespaced singleton named "default". func ValidateCustom_AccessPolicy_Metadata(_ context.Context, _ operation.Operation, root *field.Path, meta, _ *ateapi.ResourceMetadata) field.ErrorList { @@ -115,10 +155,18 @@ func ValidateCustom_DeleteAtespaceAccessPolicyRequest_Name(_ context.Context, _ return validateSingletonName(p, *name) } +func ValidateCustom_GetExternalVolumeClassAccessPolicyRequest_Name(_ context.Context, _ operation.Operation, p *field.Path, name, _ *string) field.ErrorList { + return validateSingletonName(p, *name) +} + +func ValidateCustom_DeleteExternalVolumeClassAccessPolicyRequest_Name(_ context.Context, _ operation.Operation, p *field.Path, name, _ *string) field.ErrorList { + return validateSingletonName(p, *name) +} + // validateBindings checks that each binding names an allowed role at most once, -// that every member is a valid OpenFGA user, and that the policy stays within +// that every member satisfies formatMember, and that the policy stays within // maxMembersPerPolicy. -func validateBindings(fldPath *field.Path, policy *ateapi.AccessPolicy, allowedRoles []string) field.ErrorList { +func validateBindings(fldPath *field.Path, policy *ateapi.AccessPolicy, allowedRoles []string, formatMember func(string) (string, error)) field.ErrorList { if policy == nil { return nil } @@ -142,7 +190,7 @@ func validateBindings(fldPath *field.Path, policy *ateapi.AccessPolicy, allowedR membersPath := bp.Child("members") totalMembers += len(b.GetMembers()) for j, member := range b.GetMembers() { - if _, err := authz.FormatMember(member); err != nil { + if _, err := formatMember(member); err != nil { errs = append(errs, field.Invalid(membersPath.Index(j), member, err.Error())) } } diff --git a/cmd/ateapi/internal/apivalidation/access_policy_test.go b/cmd/ateapi/internal/apivalidation/access_policy_test.go index 47e455c0a9..64f6132ce3 100644 --- a/cmd/ateapi/internal/apivalidation/access_policy_test.go +++ b/cmd/ateapi/internal/apivalidation/access_policy_test.go @@ -422,3 +422,345 @@ func TestValidateDeleteAtespaceAccessPolicyRequest(t *testing.T) { }) } } + +func validExternalVolumeClassAccessPolicy(mutate ...func(*ateapi.AccessPolicy)) *ateapi.AccessPolicy { + p := &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:team-a", "atespace:team-b"}}, + }, + } + for _, m := range mutate { + m(p) + } + return p +} + +func TestValidateCreateExternalVolumeClassAccessPolicyRequest(t *testing.T) { + evcPath := field.NewPath("external_volume_class") + classRef := &ateapi.ObjectRef{Name: "nfs-gold"} + tests := []struct { + name string + req *ateapi.CreateExternalVolumeClassAccessPolicyRequest + want field.ErrorList + wantWithPreview field.ErrorList + }{{ + name: "valid", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: classRef, AccessPolicy: validExternalVolumeClassAccessPolicy()}, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + }, { + name: "valid without bindings", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { p.Bindings = nil }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + }, { + name: "missing external_volume_class", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{AccessPolicy: validExternalVolumeClassAccessPolicy()}, + want: field.ErrorList{field.Required(evcPath, ""), field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Required(evcPath, "")}, + }, { + name: "external_volume_class atespace forbidden", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Atespace: "team-a", Name: "nfs-gold"}, + AccessPolicy: validExternalVolumeClassAccessPolicy(), + }, + want: field.ErrorList{field.Forbidden(evcPath.Child("atespace"), ""), field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Forbidden(evcPath.Child("atespace"), "")}, + }, { + name: "missing external_volume_class name", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{}, + AccessPolicy: validExternalVolumeClassAccessPolicy(), + }, + want: field.ErrorList{field.Required(evcPath.Child("name"), ""), field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Required(evcPath.Child("name"), "")}, + }, { + name: "invalid external_volume_class name", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "Bad_Name"}, + AccessPolicy: validExternalVolumeClassAccessPolicy(), + }, + want: field.ErrorList{field.Invalid(evcPath.Child("name"), nil, "").WithOrigin("format=k8s-short-name"), field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Invalid(evcPath.Child("name"), nil, "").WithOrigin("format=k8s-short-name")}, + }, { + name: "missing access_policy", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: classRef}, + want: field.ErrorList{field.Required(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Required(accessPolicyPath, "")}, + }, { + name: "metadata atespace set", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { p.Metadata.Atespace = "team-a" }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Forbidden(accessPolicyPath.Child("metadata", "atespace"), "")}, + }, { + name: "name not default", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { p.Metadata.Name = "other" }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Invalid(accessPolicyPath.Child("metadata", "name"), nil, "").WithOrigin("custom=default")}, + }, { + name: "owner role rejected", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { p.Bindings[0].Role = authz.RoleOwner }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.NotSupported[string](policyBindings.Index(0).Child("role"), "", nil)}, + }, { + name: "duplicate allowed_atespace role", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { + p.Bindings = append(p.Bindings, &ateapi.Binding{Role: authz.RoleAllowedAtespace, Members: []string{"atespace:team-c"}}) + }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Duplicate(policyBindings.Index(1).Child("role"), nil)}, + }, { + name: "user member rejected", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { p.Bindings[0].Members = []string{"user:alice@example.com"} }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Invalid(policyBindings.Index(0).Child("members").Index(0), nil, "")}, + }, { + name: "member without atespace prefix", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { p.Bindings[0].Members = []string{"team-a"} }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Invalid(policyBindings.Index(0).Child("members").Index(0), nil, "")}, + }, { + name: "wildcard member rejected", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { p.Bindings[0].Members = []string{"atespace:*"} }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Invalid(policyBindings.Index(0).Child("members").Index(0), nil, "")}, + }, { + name: "userset member rejected", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { p.Bindings[0].Members = []string{"atespace:team-a#editor"} }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Invalid(policyBindings.Index(0).Child("members").Index(0), nil, "")}, + }, { + name: "invalid DNS-1123 atespace name rejected", + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { p.Bindings[0].Members = []string{"atespace:Team-A"} }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Invalid(policyBindings.Index(0).Child("members").Index(0), nil, "")}, + }} + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + assertValidate(t, func() field.ErrorList { + return ValidateCreateExternalVolumeClassAccessPolicyRequest(context.Background(), tt.req) + }, tt.want, map[string]field.ErrorList{"ExternalVolumes": tt.wantWithPreview}) + }) + } +} + +func TestValidateGetExternalVolumeClassAccessPolicyRequest(t *testing.T) { + ctx := context.Background() + evcPath := field.NewPath("external_volume_class") + tests := []struct { + name string + req *ateapi.GetExternalVolumeClassAccessPolicyRequest + wantError field.ErrorList + }{{ + name: "valid", + req: &ateapi.GetExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}, Name: resources.SingletonName}, + }, { + name: "missing external_volume_class", + req: &ateapi.GetExternalVolumeClassAccessPolicyRequest{Name: resources.SingletonName}, + wantError: field.ErrorList{field.Required(evcPath, "")}, + }, { + name: "external_volume_class atespace forbidden", + req: &ateapi.GetExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Atespace: "team-a", Name: "nfs-gold"}, Name: resources.SingletonName}, + wantError: field.ErrorList{field.Forbidden(evcPath.Child("atespace"), "")}, + }, { + name: "missing external_volume_class name", + req: &ateapi.GetExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{}, Name: resources.SingletonName}, + wantError: field.ErrorList{field.Required(evcPath.Child("name"), "")}, + }, { + name: "invalid external_volume_class name", + req: &ateapi.GetExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "Bad_Name"}, Name: resources.SingletonName}, + wantError: field.ErrorList{field.Invalid(evcPath.Child("name"), nil, "").WithOrigin("format=k8s-short-name")}, + }, { + name: "missing name", + req: &ateapi.GetExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}}, + wantError: field.ErrorList{field.Required(field.NewPath("name"), "")}, + }, { + name: "wrong name", + req: &ateapi.GetExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}, Name: "other"}, + wantError: field.ErrorList{field.Invalid(field.NewPath("name"), nil, "").WithOrigin("custom=default")}, + }} + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + assertValidateErr(t, ValidateGetExternalVolumeClassAccessPolicyRequest(ctx, tt.req), tt.wantError) + }) + } +} + +func TestValidateUpdateExternalVolumeClassAccessPolicyRequest(t *testing.T) { + evcPath := field.NewPath("external_volume_class") + classRef := &ateapi.ObjectRef{Name: "nfs-gold"} + tests := []struct { + name string + req *ateapi.UpdateExternalVolumeClassAccessPolicyRequest + want field.ErrorList + wantWithPreview field.ErrorList + }{{ + name: "valid", + req: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: classRef, AccessPolicy: validExternalVolumeClassAccessPolicy()}, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + }, { + name: "missing external_volume_class", + req: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{AccessPolicy: validExternalVolumeClassAccessPolicy()}, + want: field.ErrorList{field.Required(evcPath, ""), field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Required(evcPath, "")}, + }, { + name: "external_volume_class atespace forbidden", + req: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Atespace: "team-a", Name: "nfs-gold"}, + AccessPolicy: validExternalVolumeClassAccessPolicy(), + }, + want: field.ErrorList{field.Forbidden(evcPath.Child("atespace"), ""), field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Forbidden(evcPath.Child("atespace"), "")}, + }, { + name: "missing external_volume_class name", + req: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{}, + AccessPolicy: validExternalVolumeClassAccessPolicy(), + }, + want: field.ErrorList{field.Required(evcPath.Child("name"), ""), field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Required(evcPath.Child("name"), "")}, + }, { + name: "invalid external_volume_class name", + req: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "Bad_Name"}, + AccessPolicy: validExternalVolumeClassAccessPolicy(), + }, + want: field.ErrorList{field.Invalid(evcPath.Child("name"), nil, "").WithOrigin("format=k8s-short-name"), field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Invalid(evcPath.Child("name"), nil, "").WithOrigin("format=k8s-short-name")}, + }, { + name: "missing access_policy", + req: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: classRef}, + want: field.ErrorList{field.Required(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Required(accessPolicyPath, "")}, + }, { + name: "viewer role rejected", + req: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { p.Bindings[0].Role = authz.RoleViewer }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.NotSupported[string](policyBindings.Index(0).Child("role"), "", nil)}, + }, { + name: "user member rejected", + req: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { p.Bindings[0].Members = []string{"user:bob"} }), + }, + want: field.ErrorList{field.Forbidden(accessPolicyPath, "")}, + wantWithPreview: field.ErrorList{field.Invalid(policyBindings.Index(0).Child("members").Index(0), nil, "")}, + }} + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + assertValidate(t, func() field.ErrorList { + return ValidateUpdateExternalVolumeClassAccessPolicyRequest(context.Background(), tt.req) + }, tt.want, map[string]field.ErrorList{"ExternalVolumes": tt.wantWithPreview}) + }) + } +} + +func TestValidateExternalVolumeClassAccessPolicyUpdate(t *testing.T) { + ctx := context.Background() + tests := []struct { + name string + newVal *ateapi.AccessPolicy + wantError field.ErrorList + }{{ + name: "valid", + newVal: validExternalVolumeClassAccessPolicy(), + }, { + name: "owner role rejected", + newVal: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { + p.Bindings[0].Role = authz.RoleOwner + }), + wantError: field.ErrorList{field.NotSupported[string](policyBindings.Index(0).Child("role"), "", nil)}, + }, { + name: "invalid atespace member", + newVal: validExternalVolumeClassAccessPolicy(func(p *ateapi.AccessPolicy) { + p.Bindings[0].Members = []string{"atespace:Bad_Name"} + }), + wantError: field.ErrorList{field.Invalid(policyBindings.Index(0).Child("members").Index(0), nil, "")}, + }} + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + assertValidateErr(t, ValidateExternalVolumeClassAccessPolicyUpdate(ctx, accessPolicyPath, tt.newVal, validExternalVolumeClassAccessPolicy()), tt.wantError) + }) + } +} + +func TestValidateDeleteExternalVolumeClassAccessPolicyRequest(t *testing.T) { + ctx := context.Background() + evcPath := field.NewPath("external_volume_class") + tests := []struct { + name string + req *ateapi.DeleteExternalVolumeClassAccessPolicyRequest + wantError field.ErrorList + }{{ + name: "valid", + req: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}, Name: resources.SingletonName}, + }, { + name: "valid with delete options", + req: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}, Name: resources.SingletonName, Options: &ateapi.DeleteOptions{Version: 2}}, + }, { + name: "missing external_volume_class", + req: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{Name: resources.SingletonName}, + wantError: field.ErrorList{field.Required(evcPath, "")}, + }, { + name: "external_volume_class atespace forbidden", + req: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Atespace: "team-a", Name: "nfs-gold"}, Name: resources.SingletonName}, + wantError: field.ErrorList{field.Forbidden(evcPath.Child("atespace"), "")}, + }, { + name: "missing external_volume_class name", + req: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{}, Name: resources.SingletonName}, + wantError: field.ErrorList{field.Required(evcPath.Child("name"), "")}, + }, { + name: "invalid external_volume_class name", + req: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "Bad_Name"}, Name: resources.SingletonName}, + wantError: field.ErrorList{field.Invalid(evcPath.Child("name"), nil, "").WithOrigin("format=k8s-short-name")}, + }, { + name: "missing name", + req: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}}, + wantError: field.ErrorList{field.Required(field.NewPath("name"), "")}, + }, { + name: "wrong name", + req: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}, Name: "other"}, + wantError: field.ErrorList{field.Invalid(field.NewPath("name"), nil, "").WithOrigin("custom=default")}, + }, { + name: "invalid delete options", + req: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}, Name: resources.SingletonName, Options: &ateapi.DeleteOptions{Version: -1}}, + wantError: field.ErrorList{field.Invalid(field.NewPath("options", "version"), int64(-1), "").WithOrigin("minimum")}, + }} + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + assertValidateErr(t, ValidateDeleteExternalVolumeClassAccessPolicyRequest(ctx, tt.req), tt.wantError) + }) + } +} diff --git a/cmd/ateapi/internal/apivalidation/actor_template_test.go b/cmd/ateapi/internal/apivalidation/actor_template_test.go index 0c32ef3440..1c0edf57bc 100644 --- a/cmd/ateapi/internal/apivalidation/actor_template_test.go +++ b/cmd/ateapi/internal/apivalidation/actor_template_test.go @@ -256,7 +256,8 @@ func TestValidateCreateActorTemplateRequest(t *testing.T) { func TestValidateCreateActorTemplateRequest_PreviewRestricted(t *testing.T) { setPreviewForTest(t, "ALL") req := &ateapi.CreateActorTemplateRequest{ActorTemplate: validActorTemplate(func(tmpl *ateapi.ActorTemplate) { - tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: 10 << 30, StorageClassName: "fast-ssd"}}}} + tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: 10 << 30, ExternalVolumeClass: &ateapi.ObjectRef{Name: "fast-ssd"}}}}} + tmpl.Containers[0].VolumeMounts = []*ateapi.VolumeMount{{Name: "data", MountPath: "/var/data"}} tmpl.SnapshotConfig.StorageLocation = "gs://my-bucket/snapshots" })} @@ -913,38 +914,70 @@ func TestValidateActorTemplate(t *testing.T) { }, { name: "valid external volume template", mutate: func(tmpl *ateapi.ActorTemplate) { - tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: 10 << 30, StorageClassName: "fast-ssd"}}}} + tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: 10 << 30, ExternalVolumeClass: &ateapi.ObjectRef{Name: "fast-ssd"}}}}} + tmpl.Containers[0].VolumeMounts = []*ateapi.VolumeMount{{Name: "data", MountPath: "/var/data"}} }, want: field.ErrorList{field.Forbidden(field.NewPath("volumes").Index(0).Child("external"), "")}, wantWithPreview: map[string]field.ErrorList{"ALL": nil}, }, { name: "external volume template missing capacity", mutate: func(tmpl *ateapi.ActorTemplate) { - tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{StorageClassName: "fast-ssd"}}}} + tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ExternalVolumeClass: &ateapi.ObjectRef{Name: "fast-ssd"}}}}} + tmpl.Containers[0].VolumeMounts = []*ateapi.VolumeMount{{Name: "data", MountPath: "/var/data"}} }, want: field.ErrorList{field.Forbidden(field.NewPath("volumes").Index(0).Child("external"), "")}, wantWithPreview: map[string]field.ErrorList{"ALL": {field.Required(field.NewPath("volumes").Index(0).Child("external", "template", "capacity_bytes"), "")}}, }, { name: "external volume template negative capacity", mutate: func(tmpl *ateapi.ActorTemplate) { - tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: -1, StorageClassName: "fast-ssd"}}}} + tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: -1, ExternalVolumeClass: &ateapi.ObjectRef{Name: "fast-ssd"}}}}} + tmpl.Containers[0].VolumeMounts = []*ateapi.VolumeMount{{Name: "data", MountPath: "/var/data"}} }, want: field.ErrorList{field.Forbidden(field.NewPath("volumes").Index(0).Child("external"), "")}, wantWithPreview: map[string]field.ErrorList{"ALL": {field.Invalid(field.NewPath("volumes").Index(0).Child("external", "template", "capacity_bytes"), nil, "").WithOrigin("minimum")}}, }, { - name: "external volume template missing storage_class_name", + name: "external volume template with no class", mutate: func(tmpl *ateapi.ActorTemplate) { tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: 10 << 30}}}} + tmpl.Containers[0].VolumeMounts = []*ateapi.VolumeMount{{Name: "data", MountPath: "/var/data"}} + }, + want: field.ErrorList{field.Forbidden(field.NewPath("volumes").Index(0).Child("external"), "")}, + wantWithPreview: map[string]field.ErrorList{"ALL": {field.Required(field.NewPath("volumes").Index(0).Child("external", "template", "external_volume_class"), "")}}, + }, { + name: "external volume template with forbidden storage_class_name and external_volume_class", + mutate: func(tmpl *ateapi.ActorTemplate) { + tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: 10 << 30, StorageClassName: "fast-ssd", ExternalVolumeClass: &ateapi.ObjectRef{Name: "fast-ssd"}}}}} //nolint:staticcheck // SA1019: testing that deprecated storage_class_name is forbidden + tmpl.Containers[0].VolumeMounts = []*ateapi.VolumeMount{{Name: "data", MountPath: "/var/data"}} }, want: field.ErrorList{field.Forbidden(field.NewPath("volumes").Index(0).Child("external"), "")}, - wantWithPreview: map[string]field.ErrorList{"ALL": {field.Required(field.NewPath("volumes").Index(0).Child("external", "template", "storage_class_name"), "")}}, + wantWithPreview: map[string]field.ErrorList{"ALL": {field.Forbidden(field.NewPath("volumes").Index(0).Child("external", "template", "storage_class_name"), "")}}, }, { - name: "external volume template invalid storage_class_name", + name: "external volume template with only forbidden storage_class_name", mutate: func(tmpl *ateapi.ActorTemplate) { - tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: 10 << 30, StorageClassName: "Fast SSD"}}}} + tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: 10 << 30, StorageClassName: "fast-ssd"}}}} //nolint:staticcheck // SA1019: testing that deprecated storage_class_name is forbidden + tmpl.Containers[0].VolumeMounts = []*ateapi.VolumeMount{{Name: "data", MountPath: "/var/data"}} + }, + want: field.ErrorList{field.Forbidden(field.NewPath("volumes").Index(0).Child("external"), "")}, + wantWithPreview: map[string]field.ErrorList{"ALL": { + field.Forbidden(field.NewPath("volumes").Index(0).Child("external", "template", "storage_class_name"), ""), + field.Required(field.NewPath("volumes").Index(0).Child("external", "template", "external_volume_class"), ""), + }}, + }, { + name: "external_volume_class with an atespace", + mutate: func(tmpl *ateapi.ActorTemplate) { + tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: 10 << 30, ExternalVolumeClass: &ateapi.ObjectRef{Atespace: "ns1", Name: "fast-ssd"}}}}} + tmpl.Containers[0].VolumeMounts = []*ateapi.VolumeMount{{Name: "data", MountPath: "/var/data"}} + }, + want: field.ErrorList{field.Forbidden(field.NewPath("volumes").Index(0).Child("external"), "")}, + wantWithPreview: map[string]field.ErrorList{"ALL": {field.Forbidden(field.NewPath("volumes").Index(0).Child("external", "template", "external_volume_class", "atespace"), "")}}, + }, { + name: "external_volume_class missing name", + mutate: func(tmpl *ateapi.ActorTemplate) { + tmpl.Volumes = []*ateapi.Volume{{Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: 10 << 30, ExternalVolumeClass: &ateapi.ObjectRef{}}}}} + tmpl.Containers[0].VolumeMounts = []*ateapi.VolumeMount{{Name: "data", MountPath: "/var/data"}} }, want: field.ErrorList{field.Forbidden(field.NewPath("volumes").Index(0).Child("external"), "")}, - wantWithPreview: map[string]field.ErrorList{"ALL": {field.Invalid(field.NewPath("volumes").Index(0).Child("external", "template", "storage_class_name"), nil, "").WithOrigin("format=k8s-long-name")}}, + wantWithPreview: map[string]field.ErrorList{"ALL": {field.Required(field.NewPath("volumes").Index(0).Child("external", "template", "external_volume_class", "name"), "")}}, }, { name: "valid resources", mutate: func(tmpl *ateapi.ActorTemplate) { diff --git a/cmd/ateapi/internal/apivalidation/external_volume_class.go b/cmd/ateapi/internal/apivalidation/external_volume_class.go new file mode 100644 index 0000000000..43f6d8c562 --- /dev/null +++ b/cmd/ateapi/internal/apivalidation/external_volume_class.go @@ -0,0 +1,44 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package apivalidation + +import ( + "context" + + "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/internal/resources" + "k8s.io/apimachinery/pkg/api/operation" + "k8s.io/apimachinery/pkg/util/validation/field" +) + +func ValidateCreateExternalVolumeClassRequest(ctx context.Context, req *ateapi.CreateExternalVolumeClassRequest) field.ErrorList { + return Validate_CreateExternalVolumeClassRequest(ctx, MakeCreateOp(ctx), nil, req, nil) +} + +func ValidateGetExternalVolumeClassRequest(ctx context.Context, req *ateapi.GetExternalVolumeClassRequest) field.ErrorList { + return Validate_GetExternalVolumeClassRequest(ctx, MakeCreateOp(ctx), nil, req, nil) +} + +func ValidateListExternalVolumeClassesRequest(ctx context.Context, req *ateapi.ListExternalVolumeClassesRequest) field.ErrorList { + return Validate_ListExternalVolumeClassesRequest(ctx, MakeCreateOp(ctx), nil, req, nil) +} + +func ValidateDeleteExternalVolumeClassRequest(ctx context.Context, req *ateapi.DeleteExternalVolumeClassRequest) field.ErrorList { + return Validate_DeleteExternalVolumeClassRequest(ctx, MakeCreateOp(ctx), nil, req, nil) +} + +func ValidateCustom_ExternalVolumeClass_DriverName(_ context.Context, _ operation.Operation, fldPath *field.Path, value, _ *string) field.ErrorList { + return resources.ValidateVolumeType(fldPath, *value) +} diff --git a/cmd/ateapi/internal/apivalidation/external_volume_class_test.go b/cmd/ateapi/internal/apivalidation/external_volume_class_test.go new file mode 100644 index 0000000000..e0f883c78c --- /dev/null +++ b/cmd/ateapi/internal/apivalidation/external_volume_class_test.go @@ -0,0 +1,156 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package apivalidation + +import ( + "context" + "slices" + "strings" + "testing" + + "go.ate.dev/substrate/api/ateapi/v1" + "k8s.io/apimachinery/pkg/util/validation/field" +) + +func TestValidateCreateExternalVolumeClassRequest(t *testing.T) { + evc := field.NewPath("external_volume_class") + tests := []struct { + name string + mutate func(*ateapi.ExternalVolumeClass) + want field.ErrorList + wantWithPreview field.ErrorList + }{{ + name: "valid", + want: field.ErrorList{field.Forbidden(evc, "")}, + }, { + name: "driver_name with substrate.io/ prefix", + mutate: func(c *ateapi.ExternalVolumeClass) { c.DriverName = "substrate.io/mock" }, + want: field.ErrorList{field.Forbidden(evc, "")}, + wantWithPreview: nil, + }, { + name: "metadata.atespace must be empty", + mutate: func(c *ateapi.ExternalVolumeClass) { c.Metadata.Atespace = "as" }, + want: field.ErrorList{field.Forbidden(evc, "")}, + wantWithPreview: field.ErrorList{field.Forbidden(evc.Child("metadata", "atespace"), "")}, + }, { + name: "missing driver_name", + mutate: func(c *ateapi.ExternalVolumeClass) { c.DriverName = "" }, + want: field.ErrorList{field.Forbidden(evc, "")}, + wantWithPreview: field.ErrorList{field.Required(evc.Child("driver_name"), "")}, + }, { + name: "invalid driver_name", + mutate: func(c *ateapi.ExternalVolumeClass) { c.DriverName = "Bad_Driver" }, + want: field.ErrorList{field.Forbidden(evc, "")}, + wantWithPreview: field.ErrorList{field.Invalid(evc.Child("driver_name"), nil, "")}, + }, { + name: "too-long driver_name", + mutate: func(c *ateapi.ExternalVolumeClass) { c.DriverName = "nfs.csi." + strings.Repeat("a", 56) }, + want: field.ErrorList{field.Forbidden(evc, "")}, + wantWithPreview: field.ErrorList{field.TooLong(evc.Child("driver_name"), "", 63).WithOrigin("maxLength")}, + }, { + name: "too many parameters", + mutate: func(c *ateapi.ExternalVolumeClass) { c.Parameters = selectorLabelsOfSize(33) }, + want: field.ErrorList{field.Forbidden(evc, "")}, + wantWithPreview: field.ErrorList{field.TooMany(evc.Child("parameters"), 33, 32).WithOrigin("maxProperties")}, + }, { + name: "too-long parameter value", + mutate: func(c *ateapi.ExternalVolumeClass) { c.Parameters = map[string]string{"k": strings.Repeat("v", 257)} }, + want: field.ErrorList{field.Forbidden(evc, "")}, + wantWithPreview: field.ErrorList{field.TooLong(evc.Child("parameters").Key("k"), "", 256).WithOrigin("maxLength")}, + }, { + name: "valid mount_options", + mutate: func(c *ateapi.ExternalVolumeClass) { c.MountOptions = []string{"nfsvers=4.1", "noatime"} }, + want: field.ErrorList{field.Forbidden(evc, "")}, + wantWithPreview: nil, + }, { + name: "empty mount_options item", + mutate: func(c *ateapi.ExternalVolumeClass) { c.MountOptions = []string{""} }, + want: field.ErrorList{field.Forbidden(evc, "")}, + wantWithPreview: field.ErrorList{field.TooShort(evc.Child("mount_options").Index(0), "", 1).WithOrigin("minLength")}, + }, { + name: "too-long mount_options item", + mutate: func(c *ateapi.ExternalVolumeClass) { c.MountOptions = []string{strings.Repeat("a", 257)} }, + want: field.ErrorList{field.Forbidden(evc, "")}, + wantWithPreview: field.ErrorList{field.TooLong(evc.Child("mount_options").Index(0), "", 256).WithOrigin("maxLength")}, + }, { + name: "too many mount_options", + mutate: func(c *ateapi.ExternalVolumeClass) { c.MountOptions = slices.Repeat([]string{"ro"}, 33) }, + want: field.ErrorList{field.Forbidden(evc, "")}, + wantWithPreview: field.ErrorList{field.TooMany(evc.Child("mount_options"), 33, 32).WithOrigin("maxItems")}, + }} + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + c := &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "nfs"}, + DriverName: "nfs.csi.k8s.io", + } + if tt.mutate != nil { + tt.mutate(c) + } + req := &ateapi.CreateExternalVolumeClassRequest{ExternalVolumeClass: c} + assertValidate(t, func() field.ErrorList { return ValidateCreateExternalVolumeClassRequest(context.Background(), req) }, + tt.want, map[string]field.ErrorList{"ExternalVolumes": tt.wantWithPreview}) + }) + } + t.Run("missing external_volume_class", func(t *testing.T) { + assertValidateErr(t, ValidateCreateExternalVolumeClassRequest(context.Background(), &ateapi.CreateExternalVolumeClassRequest{}), + field.ErrorList{field.Required(evc, "")}) + }) +} + +var externalVolumeClassRefCases = []struct { + name string + ref *ateapi.ObjectRef + want field.ErrorList +}{ + {"valid", &ateapi.ObjectRef{Name: "nfs"}, nil}, + {"missing ref", nil, field.ErrorList{field.Required(field.NewPath("external_volume_class"), "")}}, + {"atespace must be empty", &ateapi.ObjectRef{Atespace: "as", Name: "nfs"}, field.ErrorList{field.Forbidden(field.NewPath("external_volume_class", "atespace"), "")}}, + {"missing name", &ateapi.ObjectRef{}, field.ErrorList{field.Required(field.NewPath("external_volume_class", "name"), "")}}, +} + +func TestValidateGetExternalVolumeClassRequest(t *testing.T) { + for _, tt := range externalVolumeClassRefCases { + t.Run(tt.name, func(t *testing.T) { + req := &ateapi.GetExternalVolumeClassRequest{ExternalVolumeClass: tt.ref} + assertValidateErr(t, ValidateGetExternalVolumeClassRequest(context.Background(), req), tt.want) + }) + } +} + +func TestValidateDeleteExternalVolumeClassRequest(t *testing.T) { + for _, tt := range externalVolumeClassRefCases { + t.Run(tt.name, func(t *testing.T) { + req := &ateapi.DeleteExternalVolumeClassRequest{ExternalVolumeClass: tt.ref} + assertValidateErr(t, ValidateDeleteExternalVolumeClassRequest(context.Background(), req), tt.want) + }) + } +} + +func TestValidateListExternalVolumeClassesRequest(t *testing.T) { + tests := []struct { + name string + req *ateapi.ListExternalVolumeClassesRequest + want field.ErrorList + }{ + {"valid", &ateapi.ListExternalVolumeClassesRequest{}, nil}, + {"negative page_size", &ateapi.ListExternalVolumeClassesRequest{Options: &ateapi.ListOptions{PageSize: -1}}, field.ErrorList{field.Invalid(field.NewPath("options", "page_size"), int32(-1), "").WithOrigin("minimum")}}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + assertValidateErr(t, ValidateListExternalVolumeClassesRequest(context.Background(), tt.req), tt.want) + }) + } +} diff --git a/cmd/ateapi/internal/apivalidation/validation_test.go b/cmd/ateapi/internal/apivalidation/validation_test.go index 6534715a8c..2558e216eb 100644 --- a/cmd/ateapi/internal/apivalidation/validation_test.go +++ b/cmd/ateapi/internal/apivalidation/validation_test.go @@ -18,6 +18,7 @@ import ( "context" "fmt" "math" + "slices" "strings" "testing" @@ -956,6 +957,21 @@ func TestValidateExternalVolume(t *testing.T) { v.VolumeContext = map[string]string{"attachment": strings.Repeat("v", 40*1024)} }), want: field.ErrorList{field.TooLong(field.NewPath("volume_context"), nil, 40*1024)}, + }, { + name: "valid mount_options", + obj: valid(func(v *ateapi.ExternalVolumeStatus) { v.MountOptions = []string{"nfsvers=4.1", "noatime"} }), + }, { + name: "empty mount_options item", + obj: valid(func(v *ateapi.ExternalVolumeStatus) { v.MountOptions = []string{""} }), + want: field.ErrorList{field.TooShort(field.NewPath("mount_options").Index(0), "", 1).WithOrigin("minLength")}, + }, { + name: "too-long mount_options item", + obj: valid(func(v *ateapi.ExternalVolumeStatus) { v.MountOptions = []string{strings.Repeat("a", 257)} }), + want: field.ErrorList{field.TooLong(field.NewPath("mount_options").Index(0), "", 256).WithOrigin("maxLength")}, + }, { + name: "too many mount_options", + obj: valid(func(v *ateapi.ExternalVolumeStatus) { v.MountOptions = slices.Repeat([]string{"ro"}, 33) }), + want: field.ErrorList{field.TooMany(field.NewPath("mount_options"), 33, 32).WithOrigin("maxItems")}, }} for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/cmd/ateapi/internal/apivalidation/zz_generated.validation.go b/cmd/ateapi/internal/apivalidation/zz_generated.validation.go index 4719d8d4f4..f02297be24 100644 --- a/cmd/ateapi/internal/apivalidation/zz_generated.validation.go +++ b/cmd/ateapi/internal/apivalidation/zz_generated.validation.go @@ -2449,6 +2449,150 @@ func Validate_CreateAtespaceRequest( return errs } +// Validate_CreateExternalVolumeClassAccessPolicyRequest validates an instance of CreateExternalVolumeClassAccessPolicyRequest according +// to declarative validation rules in the API schema. +func Validate_CreateExternalVolumeClassAccessPolicyRequest( + ctx context.Context, op operation.Operation, fldPath *field.Path, + obj, oldObj *v1.CreateExternalVolumeClassAccessPolicyRequest) (errs field.ErrorList) { + + { // field v1.CreateExternalVolumeClassAccessPolicyRequest.ExternalVolumeClass + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ObjectRef, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + func() { // cohort = "atespace" + earlyReturn := false + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.ForbiddenValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + }() + // call the type's validation function + errs = append(errs, Validate_ObjectRef(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.CreateExternalVolumeClassAccessPolicyRequest) *v1.ObjectRef { + return oldObj.ExternalVolumeClass + }) + errs = append(errs, fn(fldPath.Child("external_volume_class"), obj.ExternalVolumeClass, oldVal, oldObj != nil)...) + } + + { // field v1.CreateExternalVolumeClassAccessPolicyRequest.AccessPolicy + fn := func( + fldPath *field.Path, + obj, oldObj *v1.AccessPolicy, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.IfOption(ctx, op, fldPath, obj, oldObj, "ExternalVolumes", false, validate.ForbiddenPointer).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.IfOption(ctx, op, fldPath, obj, oldObj, "ExternalVolumes", false, validate.OptionalPointer).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + // call the type's validation function + errs = append(errs, Validate_AccessPolicy(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.CreateExternalVolumeClassAccessPolicyRequest) *v1.AccessPolicy { + return oldObj.AccessPolicy + }) + errs = append(errs, fn(fldPath.Child("access_policy"), obj.AccessPolicy, oldVal, oldObj != nil)...) + } + + return errs +} + +// Validate_CreateExternalVolumeClassRequest validates an instance of CreateExternalVolumeClassRequest according +// to declarative validation rules in the API schema. +func Validate_CreateExternalVolumeClassRequest( + ctx context.Context, op operation.Operation, fldPath *field.Path, + obj, oldObj *v1.CreateExternalVolumeClassRequest) (errs field.ErrorList) { + + { // field v1.CreateExternalVolumeClassRequest.ExternalVolumeClass + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ExternalVolumeClass, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.IfOption(ctx, op, fldPath, obj, oldObj, "ExternalVolumes", false, validate.ForbiddenPointer).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.IfOption(ctx, op, fldPath, obj, oldObj, "ExternalVolumes", false, validate.OptionalPointer).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + // call the type's validation function + errs = append(errs, Validate_ExternalVolumeClass(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.CreateExternalVolumeClassRequest) *v1.ExternalVolumeClass { + return oldObj.ExternalVolumeClass + }) + errs = append(errs, fn(fldPath.Child("external_volume_class"), obj.ExternalVolumeClass, oldVal, oldObj != nil)...) + } + + return errs +} + // Validate_CreateGlobalAccessPolicyRequest validates an instance of CreateGlobalAccessPolicyRequest according // to declarative validation rules in the API schema. func Validate_CreateGlobalAccessPolicyRequest( @@ -3234,44 +3378,63 @@ func Validate_DeleteAtespaceRequest( return errs } -// Validate_DeleteOptions validates an instance of DeleteOptions according +// Validate_DeleteExternalVolumeClassAccessPolicyRequest validates an instance of DeleteExternalVolumeClassAccessPolicyRequest according // to declarative validation rules in the API schema. -func Validate_DeleteOptions( +func Validate_DeleteExternalVolumeClassAccessPolicyRequest( ctx context.Context, op operation.Operation, fldPath *field.Path, - obj, oldObj *v1.DeleteOptions) (errs field.ErrorList) { + obj, oldObj *v1.DeleteExternalVolumeClassAccessPolicyRequest) (errs field.ErrorList) { - { // field v1.DeleteOptions.Version + { // field v1.DeleteExternalVolumeClassAccessPolicyRequest.ExternalVolumeClass fn := func( fldPath *field.Path, - obj, oldObj *int64, + obj, oldObj *v1.ObjectRef, oldValueCorrelated bool) (errs field.ErrorList) { // don't revalidate unchanged data if oldValueCorrelated && op.Type == operation.Update { - if obj == oldObj || (obj != nil && oldObj != nil && *obj == *oldObj) { + if ateDeepEqual(obj, oldObj) { return nil } } // call field-attached validations earlyReturn := false - if e := validate.OptionalValue(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) earlyReturn = true } if earlyReturn { return // do not proceed } - if e := validate.Minimum(ctx, op, fldPath, obj, oldObj, 1); len(e) != 0 { - errs = append(errs, e...) - } + func() { // cohort = "atespace" + earlyReturn := false + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.ForbiddenValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + }() + // call the type's validation function + errs = append(errs, Validate_ObjectRef(ctx, op, fldPath, obj, oldObj)...) return } oldVal := safe.Field(oldObj, - func(oldObj *v1.DeleteOptions) *int64 { - return &oldObj.Version + func(oldObj *v1.DeleteExternalVolumeClassAccessPolicyRequest) *v1.ObjectRef { + return oldObj.ExternalVolumeClass }) - errs = append(errs, fn(fldPath.Child("version"), &obj.Version, oldVal, oldObj != nil)...) + errs = append(errs, fn(fldPath.Child("external_volume_class"), obj.ExternalVolumeClass, oldVal, oldObj != nil)...) } - { // field v1.DeleteOptions.Uid + { // field v1.DeleteExternalVolumeClassAccessPolicyRequest.Name fn := func( fldPath *field.Path, obj, oldObj *string, @@ -3284,80 +3447,30 @@ func Validate_DeleteOptions( } // call field-attached validations earlyReturn := false - if e := validate.OptionalValue(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + if e := validate.RequiredValue(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) earlyReturn = true } if earlyReturn { return // do not proceed } - if e := validate.UUID(ctx, op, fldPath, obj, oldObj); len(e) != 0 { + // custom validation + if e := ValidateCustom_DeleteExternalVolumeClassAccessPolicyRequest_Name(ctx, op, fldPath, obj, oldObj); len(e) != 0 { errs = append(errs, e...) } - return - } - oldVal := safe.Field(oldObj, - func(oldObj *v1.DeleteOptions) *string { - return &oldObj.Uid - }) - errs = append(errs, fn(fldPath.Child("uid"), &obj.Uid, oldVal, oldObj != nil)...) - } - - return errs -} - -// Validate_DeleteTagRequest validates an instance of DeleteTagRequest according -// to declarative validation rules in the API schema. -func Validate_DeleteTagRequest( - ctx context.Context, op operation.Operation, fldPath *field.Path, - obj, oldObj *v1.DeleteTagRequest) (errs field.ErrorList) { - - { // field v1.DeleteTagRequest.Tag - fn := func( - fldPath *field.Path, - obj, oldObj *v1.ObjectRef, - oldValueCorrelated bool) (errs field.ErrorList) { - // don't revalidate unchanged data - if oldValueCorrelated && op.Type == operation.Update { - if ateDeepEqual(obj, oldObj) { - return nil - } - } - // call field-attached validations - earlyReturn := false - if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + if e := validate.ShortName(ctx, op, fldPath, obj, oldObj); len(e) != 0 { errs = append(errs, e...) - earlyReturn = true } - if earlyReturn { - return // do not proceed - } - func() { // cohort = "atespace" - earlyReturn := false - if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", - func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.RequiredValue).MarkShortCircuit(); len(e) != 0 { - errs = append(errs, e...) - earlyReturn = true - } - if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", - func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkShortCircuit(); len(e) != 0 { - earlyReturn = true - } - if earlyReturn { - return // do not proceed - } - }() - // call the type's validation function - errs = append(errs, Validate_ObjectRef(ctx, op, fldPath, obj, oldObj)...) return } oldVal := safe.Field(oldObj, - func(oldObj *v1.DeleteTagRequest) *v1.ObjectRef { - return oldObj.Tag + func(oldObj *v1.DeleteExternalVolumeClassAccessPolicyRequest) *string { + return &oldObj.Name }) - errs = append(errs, fn(fldPath.Child("tag"), obj.Tag, oldVal, oldObj != nil)...) + errs = append(errs, fn(fldPath.Child("name"), &obj.Name, oldVal, oldObj != nil)...) } - { // field v1.DeleteTagRequest.Options + { // field v1.DeleteExternalVolumeClassAccessPolicyRequest.Options fn := func( fldPath *field.Path, obj, oldObj *v1.DeleteOptions, @@ -3381,7 +3494,7 @@ func Validate_DeleteTagRequest( return } oldVal := safe.Field(oldObj, - func(oldObj *v1.DeleteTagRequest) *v1.DeleteOptions { + func(oldObj *v1.DeleteExternalVolumeClassAccessPolicyRequest) *v1.DeleteOptions { return oldObj.Options }) errs = append(errs, fn(fldPath.Child("options"), obj.Options, oldVal, oldObj != nil)...) @@ -3390,13 +3503,13 @@ func Validate_DeleteTagRequest( return errs } -// Validate_DeleteWorkerRequest validates an instance of DeleteWorkerRequest according +// Validate_DeleteExternalVolumeClassRequest validates an instance of DeleteExternalVolumeClassRequest according // to declarative validation rules in the API schema. -func Validate_DeleteWorkerRequest( +func Validate_DeleteExternalVolumeClassRequest( ctx context.Context, op operation.Operation, fldPath *field.Path, - obj, oldObj *v1.DeleteWorkerRequest) (errs field.ErrorList) { + obj, oldObj *v1.DeleteExternalVolumeClassRequest) (errs field.ErrorList) { - { // field v1.DeleteWorkerRequest.Worker + { // field v1.DeleteExternalVolumeClassRequest.ExternalVolumeClass fn := func( fldPath *field.Path, obj, oldObj *v1.ObjectRef, @@ -3440,13 +3553,13 @@ func Validate_DeleteWorkerRequest( return } oldVal := safe.Field(oldObj, - func(oldObj *v1.DeleteWorkerRequest) *v1.ObjectRef { - return oldObj.Worker + func(oldObj *v1.DeleteExternalVolumeClassRequest) *v1.ObjectRef { + return oldObj.ExternalVolumeClass }) - errs = append(errs, fn(fldPath.Child("worker"), obj.Worker, oldVal, oldObj != nil)...) + errs = append(errs, fn(fldPath.Child("external_volume_class"), obj.ExternalVolumeClass, oldVal, oldObj != nil)...) } - { // field v1.DeleteWorkerRequest.Options + { // field v1.DeleteExternalVolumeClassRequest.Options fn := func( fldPath *field.Path, obj, oldObj *v1.DeleteOptions, @@ -3470,7 +3583,7 @@ func Validate_DeleteWorkerRequest( return } oldVal := safe.Field(oldObj, - func(oldObj *v1.DeleteWorkerRequest) *v1.DeleteOptions { + func(oldObj *v1.DeleteExternalVolumeClassRequest) *v1.DeleteOptions { return oldObj.Options }) errs = append(errs, fn(fldPath.Child("options"), obj.Options, oldVal, oldObj != nil)...) @@ -3479,33 +3592,278 @@ func Validate_DeleteWorkerRequest( return errs } -// Validate_DrainWorkerRequest validates an instance of DrainWorkerRequest according +// Validate_DeleteOptions validates an instance of DeleteOptions according // to declarative validation rules in the API schema. -func Validate_DrainWorkerRequest( +func Validate_DeleteOptions( ctx context.Context, op operation.Operation, fldPath *field.Path, - obj, oldObj *v1.DrainWorkerRequest) (errs field.ErrorList) { + obj, oldObj *v1.DeleteOptions) (errs field.ErrorList) { - { // field v1.DrainWorkerRequest.Worker + { // field v1.DeleteOptions.Version fn := func( fldPath *field.Path, - obj, oldObj *v1.ObjectRef, + obj, oldObj *int64, oldValueCorrelated bool) (errs field.ErrorList) { // don't revalidate unchanged data if oldValueCorrelated && op.Type == operation.Update { - if ateDeepEqual(obj, oldObj) { + if obj == oldObj || (obj != nil && oldObj != nil && *obj == *oldObj) { return nil } } // call field-attached validations earlyReturn := false - if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { - errs = append(errs, e...) + if e := validate.OptionalValue(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { earlyReturn = true } if earlyReturn { return // do not proceed } - func() { // cohort = "atespace" + if e := validate.Minimum(ctx, op, fldPath, obj, oldObj, 1); len(e) != 0 { + errs = append(errs, e...) + } + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.DeleteOptions) *int64 { + return &oldObj.Version + }) + errs = append(errs, fn(fldPath.Child("version"), &obj.Version, oldVal, oldObj != nil)...) + } + + { // field v1.DeleteOptions.Uid + fn := func( + fldPath *field.Path, + obj, oldObj *string, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if obj == oldObj || (obj != nil && oldObj != nil && *obj == *oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.OptionalValue(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + if e := validate.UUID(ctx, op, fldPath, obj, oldObj); len(e) != 0 { + errs = append(errs, e...) + } + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.DeleteOptions) *string { + return &oldObj.Uid + }) + errs = append(errs, fn(fldPath.Child("uid"), &obj.Uid, oldVal, oldObj != nil)...) + } + + return errs +} + +// Validate_DeleteTagRequest validates an instance of DeleteTagRequest according +// to declarative validation rules in the API schema. +func Validate_DeleteTagRequest( + ctx context.Context, op operation.Operation, fldPath *field.Path, + obj, oldObj *v1.DeleteTagRequest) (errs field.ErrorList) { + + { // field v1.DeleteTagRequest.Tag + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ObjectRef, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + func() { // cohort = "atespace" + earlyReturn := false + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.RequiredValue).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + }() + // call the type's validation function + errs = append(errs, Validate_ObjectRef(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.DeleteTagRequest) *v1.ObjectRef { + return oldObj.Tag + }) + errs = append(errs, fn(fldPath.Child("tag"), obj.Tag, oldVal, oldObj != nil)...) + } + + { // field v1.DeleteTagRequest.Options + fn := func( + fldPath *field.Path, + obj, oldObj *v1.DeleteOptions, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.OptionalPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + // call the type's validation function + errs = append(errs, Validate_DeleteOptions(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.DeleteTagRequest) *v1.DeleteOptions { + return oldObj.Options + }) + errs = append(errs, fn(fldPath.Child("options"), obj.Options, oldVal, oldObj != nil)...) + } + + return errs +} + +// Validate_DeleteWorkerRequest validates an instance of DeleteWorkerRequest according +// to declarative validation rules in the API schema. +func Validate_DeleteWorkerRequest( + ctx context.Context, op operation.Operation, fldPath *field.Path, + obj, oldObj *v1.DeleteWorkerRequest) (errs field.ErrorList) { + + { // field v1.DeleteWorkerRequest.Worker + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ObjectRef, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + func() { // cohort = "atespace" + earlyReturn := false + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.ForbiddenValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + }() + // call the type's validation function + errs = append(errs, Validate_ObjectRef(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.DeleteWorkerRequest) *v1.ObjectRef { + return oldObj.Worker + }) + errs = append(errs, fn(fldPath.Child("worker"), obj.Worker, oldVal, oldObj != nil)...) + } + + { // field v1.DeleteWorkerRequest.Options + fn := func( + fldPath *field.Path, + obj, oldObj *v1.DeleteOptions, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.OptionalPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + // call the type's validation function + errs = append(errs, Validate_DeleteOptions(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.DeleteWorkerRequest) *v1.DeleteOptions { + return oldObj.Options + }) + errs = append(errs, fn(fldPath.Child("options"), obj.Options, oldVal, oldObj != nil)...) + } + + return errs +} + +// Validate_DrainWorkerRequest validates an instance of DrainWorkerRequest according +// to declarative validation rules in the API schema. +func Validate_DrainWorkerRequest( + ctx context.Context, op operation.Operation, fldPath *field.Path, + obj, oldObj *v1.DrainWorkerRequest) (errs field.ErrorList) { + + { // field v1.DrainWorkerRequest.Worker + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ObjectRef, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + func() { // cohort = "atespace" earlyReturn := false if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.ForbiddenValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { @@ -3898,18 +4256,205 @@ func Validate_EnvVar( return errs } -var unionMembershipFor_go_ate_dev_substrate_api_ateapi_v1_ExternalVolumeSource_ = validate.NewUnionMembership(validate.NewUnionMember("template")) - -// Validate_ExternalVolumeSource validates an instance of ExternalVolumeSource according +// Validate_ExternalVolumeClass validates an instance of ExternalVolumeClass according // to declarative validation rules in the API schema. -func Validate_ExternalVolumeSource( +func Validate_ExternalVolumeClass( ctx context.Context, op operation.Operation, fldPath *field.Path, - obj, oldObj *v1.ExternalVolumeSource) (errs field.ErrorList) { + obj, oldObj *v1.ExternalVolumeClass) (errs field.ErrorList) { - if e := validate.Union(ctx, op, fldPath, obj, oldObj, unionMembershipFor_go_ate_dev_substrate_api_ateapi_v1_ExternalVolumeSource_, - func(obj *v1.ExternalVolumeSource) bool { - if obj == nil { - return false + { // field v1.ExternalVolumeClass.Metadata + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ResourceMetadata, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + func() { // cohort = "atespace" + earlyReturn := false + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ResourceMetadata) *string { return &o.Atespace }, validate.DirectEqual, validate.ForbiddenValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ResourceMetadata) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ResourceMetadata) *string { return &o.Atespace }, validate.DirectEqual, validate.Immutable).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ResourceMetadata) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + }() + // call the type's validation function + errs = append(errs, Validate_ResourceMetadata(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.ExternalVolumeClass) *v1.ResourceMetadata { + return oldObj.Metadata + }) + errs = append(errs, fn(fldPath.Child("metadata"), obj.Metadata, oldVal, oldObj != nil)...) + } + + { // field v1.ExternalVolumeClass.DriverName + fn := func( + fldPath *field.Path, + obj, oldObj *string, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if obj == oldObj || (obj != nil && oldObj != nil && *obj == *oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredValue(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + // custom validation + if e := ValidateCustom_ExternalVolumeClass_DriverName(ctx, op, fldPath, obj, oldObj); len(e) != 0 { + errs = append(errs, e...) + } + if e := validate.MaxLength(ctx, op, fldPath, obj, oldObj, 63); len(e) != 0 { + errs = append(errs, e...) + } + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.ExternalVolumeClass) *string { + return &oldObj.DriverName + }) + errs = append(errs, fn(fldPath.Child("driver_name"), &obj.DriverName, oldVal, oldObj != nil)...) + } + + { // field v1.ExternalVolumeClass.Parameters + fn := func( + fldPath *field.Path, + obj, oldObj map[string]string, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.MaxProperties(ctx, op, fldPath, obj, oldObj, 32).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.OptionalMap(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + if e := validate.EachMapKey(ctx, op, fldPath, obj, oldObj, + func(ctx context.Context, op operation.Operation, fldPath *field.Path, obj, oldObj *string) field.ErrorList { + return validate.MaxLength(ctx, op, fldPath, obj, oldObj, 128) + }); len(e) != 0 { + errs = append(errs, e...) + } + if e := validate.EachMapVal(ctx, op, fldPath, obj, oldObj, validate.DirectEqual, + func(ctx context.Context, op operation.Operation, fldPath *field.Path, obj, oldObj *string) field.ErrorList { + return validate.MaxLength(ctx, op, fldPath, obj, oldObj, 256) + }); len(e) != 0 { + errs = append(errs, e...) + } + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.ExternalVolumeClass) map[string]string { + return oldObj.Parameters + }) + errs = append(errs, fn(fldPath.Child("parameters"), obj.Parameters, oldVal, oldObj != nil)...) + } + + { // field v1.ExternalVolumeClass.MountOptions + fn := func( + fldPath *field.Path, + obj, oldObj []string, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.MaxItems(ctx, op, fldPath, obj, oldObj, 32).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.OptionalSlice(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + if e := validate.EachValSliceVal(ctx, op, fldPath, obj, oldObj, nil, nil, + func(ctx context.Context, op operation.Operation, fldPath *field.Path, obj, oldObj *string) field.ErrorList { + return validate.MinLength(ctx, op, fldPath, obj, oldObj, 1) + }); len(e) != 0 { + errs = append(errs, e...) + } + if e := validate.EachValSliceVal(ctx, op, fldPath, obj, oldObj, nil, nil, + func(ctx context.Context, op operation.Operation, fldPath *field.Path, obj, oldObj *string) field.ErrorList { + return validate.MaxLength(ctx, op, fldPath, obj, oldObj, 256) + }); len(e) != 0 { + errs = append(errs, e...) + } + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.ExternalVolumeClass) []string { + return oldObj.MountOptions + }) + errs = append(errs, fn(fldPath.Child("mount_options"), obj.MountOptions, oldVal, oldObj != nil)...) + } + + return errs +} + +var unionMembershipFor_go_ate_dev_substrate_api_ateapi_v1_ExternalVolumeSource_ = validate.NewUnionMembership(validate.NewUnionMember("template")) + +// Validate_ExternalVolumeSource validates an instance of ExternalVolumeSource according +// to declarative validation rules in the API schema. +func Validate_ExternalVolumeSource( + ctx context.Context, op operation.Operation, fldPath *field.Path, + obj, oldObj *v1.ExternalVolumeSource) (errs field.ErrorList) { + + if e := validate.Union(ctx, op, fldPath, obj, oldObj, unionMembershipFor_go_ate_dev_substrate_api_ateapi_v1_ExternalVolumeSource_, + func(obj *v1.ExternalVolumeSource) bool { + if obj == nil { + return false } return obj.Template != nil }); len(e) != 0 { @@ -4105,6 +4650,50 @@ func Validate_ExternalVolumeStatus( errs = append(errs, fn(fldPath.Child("volume_context"), obj.VolumeContext, oldVal, oldObj != nil)...) } + { // field v1.ExternalVolumeStatus.MountOptions + fn := func( + fldPath *field.Path, + obj, oldObj []string, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.MaxItems(ctx, op, fldPath, obj, oldObj, 32).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.OptionalSlice(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + if e := validate.EachValSliceVal(ctx, op, fldPath, obj, oldObj, nil, nil, + func(ctx context.Context, op operation.Operation, fldPath *field.Path, obj, oldObj *string) field.ErrorList { + return validate.MinLength(ctx, op, fldPath, obj, oldObj, 1) + }); len(e) != 0 { + errs = append(errs, e...) + } + if e := validate.EachValSliceVal(ctx, op, fldPath, obj, oldObj, nil, nil, + func(ctx context.Context, op operation.Operation, fldPath *field.Path, obj, oldObj *string) field.ErrorList { + return validate.MaxLength(ctx, op, fldPath, obj, oldObj, 256) + }); len(e) != 0 { + errs = append(errs, e...) + } + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.ExternalVolumeStatus) []string { + return oldObj.MountOptions + }) + errs = append(errs, fn(fldPath.Child("mount_options"), obj.MountOptions, oldVal, oldObj != nil)...) + } + return errs } @@ -4159,16 +4748,16 @@ func Validate_ExternalVolumeTemplate( } // call field-attached validations earlyReturn := false - if e := validate.RequiredValue(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + if e := validate.ForbiddenValue(ctx, op, fldPath, obj, oldObj).MarkBeta().MarkShortCircuit(); len(e) != 0 { errs = append(errs, e...) earlyReturn = true } + if e := validate.OptionalValue(ctx, op, fldPath, obj, oldObj).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } if earlyReturn { return // do not proceed } - if e := validate.LongName(ctx, op, fldPath, obj, oldObj); len(e) != 0 { - errs = append(errs, e...) - } return } oldVal := safe.Field(oldObj, @@ -4178,6 +4767,56 @@ func Validate_ExternalVolumeTemplate( errs = append(errs, fn(fldPath.Child("storage_class_name"), &obj.StorageClassName, oldVal, oldObj != nil)...) } + { // field v1.ExternalVolumeTemplate.ExternalVolumeClass + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ObjectRef, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + func() { // cohort = "atespace" + earlyReturn := false + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.ForbiddenValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + }() + // call the type's validation function + errs = append(errs, Validate_ObjectRef(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.ExternalVolumeTemplate) *v1.ObjectRef { + return oldObj.ExternalVolumeClass + }) + errs = append(errs, fn(fldPath.Child("external_volume_class"), obj.ExternalVolumeClass, oldVal, oldObj != nil)...) + } + return errs } @@ -4227,22 +4866,223 @@ func Validate_ExternalVolumes( return } oldVal := safe.Field(oldObj, - func(oldObj *v1.ExternalVolumes) []*v1.ExternalVolumeStatus { - return oldObj.Volumes + func(oldObj *v1.ExternalVolumes) []*v1.ExternalVolumeStatus { + return oldObj.Volumes + }) + errs = append(errs, fn(fldPath.Child("volumes"), obj.Volumes, oldVal, oldObj != nil)...) + } + + return errs +} + +// Validate_GetActorEgressPolicyRequest validates an instance of GetActorEgressPolicyRequest according +// to declarative validation rules in the API schema. +func Validate_GetActorEgressPolicyRequest( + ctx context.Context, op operation.Operation, fldPath *field.Path, + obj, oldObj *v1.GetActorEgressPolicyRequest) (errs field.ErrorList) { + + { // field v1.GetActorEgressPolicyRequest.Actor + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ObjectRef, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + func() { // cohort = "atespace" + earlyReturn := false + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.RequiredValue).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + }() + // call the type's validation function + errs = append(errs, Validate_ObjectRef(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.GetActorEgressPolicyRequest) *v1.ObjectRef { + return oldObj.Actor + }) + errs = append(errs, fn(fldPath.Child("actor"), obj.Actor, oldVal, oldObj != nil)...) + } + + { // field v1.GetActorEgressPolicyRequest.Name + fn := func( + fldPath *field.Path, + obj, oldObj *string, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if obj == oldObj || (obj != nil && oldObj != nil && *obj == *oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredValue(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + // custom validation + if e := ValidateCustom_GetActorEgressPolicyRequest_Name(ctx, op, fldPath, obj, oldObj); len(e) != 0 { + errs = append(errs, e...) + } + if e := validate.ShortName(ctx, op, fldPath, obj, oldObj); len(e) != 0 { + errs = append(errs, e...) + } + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.GetActorEgressPolicyRequest) *string { + return &oldObj.Name + }) + errs = append(errs, fn(fldPath.Child("name"), &obj.Name, oldVal, oldObj != nil)...) + } + + return errs +} + +// Validate_GetActorRequest validates an instance of GetActorRequest according +// to declarative validation rules in the API schema. +func Validate_GetActorRequest( + ctx context.Context, op operation.Operation, fldPath *field.Path, + obj, oldObj *v1.GetActorRequest) (errs field.ErrorList) { + + { // field v1.GetActorRequest.Actor + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ObjectRef, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + func() { // cohort = "atespace" + earlyReturn := false + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.RequiredValue).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + }() + // call the type's validation function + errs = append(errs, Validate_ObjectRef(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.GetActorRequest) *v1.ObjectRef { + return oldObj.Actor + }) + errs = append(errs, fn(fldPath.Child("actor"), obj.Actor, oldVal, oldObj != nil)...) + } + + return errs +} + +// Validate_GetActorTemplateRequest validates an instance of GetActorTemplateRequest according +// to declarative validation rules in the API schema. +func Validate_GetActorTemplateRequest( + ctx context.Context, op operation.Operation, fldPath *field.Path, + obj, oldObj *v1.GetActorTemplateRequest) (errs field.ErrorList) { + + { // field v1.GetActorTemplateRequest.ActorTemplate + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ObjectRef, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + func() { // cohort = "atespace" + earlyReturn := false + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.RequiredValue).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + }() + // call the type's validation function + errs = append(errs, Validate_ObjectRef(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.GetActorTemplateRequest) *v1.ObjectRef { + return oldObj.ActorTemplate }) - errs = append(errs, fn(fldPath.Child("volumes"), obj.Volumes, oldVal, oldObj != nil)...) + errs = append(errs, fn(fldPath.Child("actor_template"), obj.ActorTemplate, oldVal, oldObj != nil)...) } return errs } -// Validate_GetActorEgressPolicyRequest validates an instance of GetActorEgressPolicyRequest according +// Validate_GetAtespaceAccessPolicyRequest validates an instance of GetAtespaceAccessPolicyRequest according // to declarative validation rules in the API schema. -func Validate_GetActorEgressPolicyRequest( +func Validate_GetAtespaceAccessPolicyRequest( ctx context.Context, op operation.Operation, fldPath *field.Path, - obj, oldObj *v1.GetActorEgressPolicyRequest) (errs field.ErrorList) { + obj, oldObj *v1.GetAtespaceAccessPolicyRequest) (errs field.ErrorList) { - { // field v1.GetActorEgressPolicyRequest.Actor + { // field v1.GetAtespaceAccessPolicyRequest.Atespace fn := func( fldPath *field.Path, obj, oldObj *v1.ObjectRef, @@ -4265,12 +5105,16 @@ func Validate_GetActorEgressPolicyRequest( func() { // cohort = "atespace" earlyReturn := false if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", - func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.RequiredValue).MarkShortCircuit(); len(e) != 0 { + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.ForbiddenValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { errs = append(errs, e...) earlyReturn = true } if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", - func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkShortCircuit(); len(e) != 0 { + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { earlyReturn = true } if earlyReturn { @@ -4282,13 +5126,13 @@ func Validate_GetActorEgressPolicyRequest( return } oldVal := safe.Field(oldObj, - func(oldObj *v1.GetActorEgressPolicyRequest) *v1.ObjectRef { - return oldObj.Actor + func(oldObj *v1.GetAtespaceAccessPolicyRequest) *v1.ObjectRef { + return oldObj.Atespace }) - errs = append(errs, fn(fldPath.Child("actor"), obj.Actor, oldVal, oldObj != nil)...) + errs = append(errs, fn(fldPath.Child("atespace"), obj.Atespace, oldVal, oldObj != nil)...) } - { // field v1.GetActorEgressPolicyRequest.Name + { // field v1.GetAtespaceAccessPolicyRequest.Name fn := func( fldPath *field.Path, obj, oldObj *string, @@ -4309,7 +5153,7 @@ func Validate_GetActorEgressPolicyRequest( return // do not proceed } // custom validation - if e := ValidateCustom_GetActorEgressPolicyRequest_Name(ctx, op, fldPath, obj, oldObj); len(e) != 0 { + if e := ValidateCustom_GetAtespaceAccessPolicyRequest_Name(ctx, op, fldPath, obj, oldObj); len(e) != 0 { errs = append(errs, e...) } if e := validate.ShortName(ctx, op, fldPath, obj, oldObj); len(e) != 0 { @@ -4318,7 +5162,7 @@ func Validate_GetActorEgressPolicyRequest( return } oldVal := safe.Field(oldObj, - func(oldObj *v1.GetActorEgressPolicyRequest) *string { + func(oldObj *v1.GetAtespaceAccessPolicyRequest) *string { return &oldObj.Name }) errs = append(errs, fn(fldPath.Child("name"), &obj.Name, oldVal, oldObj != nil)...) @@ -4327,13 +5171,13 @@ func Validate_GetActorEgressPolicyRequest( return errs } -// Validate_GetActorRequest validates an instance of GetActorRequest according +// Validate_GetAtespaceRequest validates an instance of GetAtespaceRequest according // to declarative validation rules in the API schema. -func Validate_GetActorRequest( +func Validate_GetAtespaceRequest( ctx context.Context, op operation.Operation, fldPath *field.Path, - obj, oldObj *v1.GetActorRequest) (errs field.ErrorList) { + obj, oldObj *v1.GetAtespaceRequest) (errs field.ErrorList) { - { // field v1.GetActorRequest.Actor + { // field v1.GetAtespaceRequest.Atespace fn := func( fldPath *field.Path, obj, oldObj *v1.ObjectRef, @@ -4356,67 +5200,16 @@ func Validate_GetActorRequest( func() { // cohort = "atespace" earlyReturn := false if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", - func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.RequiredValue).MarkShortCircuit(); len(e) != 0 { + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.ForbiddenValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { errs = append(errs, e...) earlyReturn = true } if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", - func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkShortCircuit(); len(e) != 0 { - earlyReturn = true - } - if earlyReturn { - return // do not proceed - } - }() - // call the type's validation function - errs = append(errs, Validate_ObjectRef(ctx, op, fldPath, obj, oldObj)...) - return - } - oldVal := safe.Field(oldObj, - func(oldObj *v1.GetActorRequest) *v1.ObjectRef { - return oldObj.Actor - }) - errs = append(errs, fn(fldPath.Child("actor"), obj.Actor, oldVal, oldObj != nil)...) - } - - return errs -} - -// Validate_GetActorTemplateRequest validates an instance of GetActorTemplateRequest according -// to declarative validation rules in the API schema. -func Validate_GetActorTemplateRequest( - ctx context.Context, op operation.Operation, fldPath *field.Path, - obj, oldObj *v1.GetActorTemplateRequest) (errs field.ErrorList) { - - { // field v1.GetActorTemplateRequest.ActorTemplate - fn := func( - fldPath *field.Path, - obj, oldObj *v1.ObjectRef, - oldValueCorrelated bool) (errs field.ErrorList) { - // don't revalidate unchanged data - if oldValueCorrelated && op.Type == operation.Update { - if ateDeepEqual(obj, oldObj) { - return nil - } - } - // call field-attached validations - earlyReturn := false - if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { - errs = append(errs, e...) - earlyReturn = true - } - if earlyReturn { - return // do not proceed - } - func() { // cohort = "atespace" - earlyReturn := false - if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", - func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.RequiredValue).MarkShortCircuit(); len(e) != 0 { - errs = append(errs, e...) + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { earlyReturn = true } if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", - func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkShortCircuit(); len(e) != 0 { + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { earlyReturn = true } if earlyReturn { @@ -4428,22 +5221,22 @@ func Validate_GetActorTemplateRequest( return } oldVal := safe.Field(oldObj, - func(oldObj *v1.GetActorTemplateRequest) *v1.ObjectRef { - return oldObj.ActorTemplate + func(oldObj *v1.GetAtespaceRequest) *v1.ObjectRef { + return oldObj.Atespace }) - errs = append(errs, fn(fldPath.Child("actor_template"), obj.ActorTemplate, oldVal, oldObj != nil)...) + errs = append(errs, fn(fldPath.Child("atespace"), obj.Atespace, oldVal, oldObj != nil)...) } return errs } -// Validate_GetAtespaceAccessPolicyRequest validates an instance of GetAtespaceAccessPolicyRequest according +// Validate_GetExternalVolumeClassAccessPolicyRequest validates an instance of GetExternalVolumeClassAccessPolicyRequest according // to declarative validation rules in the API schema. -func Validate_GetAtespaceAccessPolicyRequest( +func Validate_GetExternalVolumeClassAccessPolicyRequest( ctx context.Context, op operation.Operation, fldPath *field.Path, - obj, oldObj *v1.GetAtespaceAccessPolicyRequest) (errs field.ErrorList) { + obj, oldObj *v1.GetExternalVolumeClassAccessPolicyRequest) (errs field.ErrorList) { - { // field v1.GetAtespaceAccessPolicyRequest.Atespace + { // field v1.GetExternalVolumeClassAccessPolicyRequest.ExternalVolumeClass fn := func( fldPath *field.Path, obj, oldObj *v1.ObjectRef, @@ -4487,13 +5280,13 @@ func Validate_GetAtespaceAccessPolicyRequest( return } oldVal := safe.Field(oldObj, - func(oldObj *v1.GetAtespaceAccessPolicyRequest) *v1.ObjectRef { - return oldObj.Atespace + func(oldObj *v1.GetExternalVolumeClassAccessPolicyRequest) *v1.ObjectRef { + return oldObj.ExternalVolumeClass }) - errs = append(errs, fn(fldPath.Child("atespace"), obj.Atespace, oldVal, oldObj != nil)...) + errs = append(errs, fn(fldPath.Child("external_volume_class"), obj.ExternalVolumeClass, oldVal, oldObj != nil)...) } - { // field v1.GetAtespaceAccessPolicyRequest.Name + { // field v1.GetExternalVolumeClassAccessPolicyRequest.Name fn := func( fldPath *field.Path, obj, oldObj *string, @@ -4514,7 +5307,7 @@ func Validate_GetAtespaceAccessPolicyRequest( return // do not proceed } // custom validation - if e := ValidateCustom_GetAtespaceAccessPolicyRequest_Name(ctx, op, fldPath, obj, oldObj); len(e) != 0 { + if e := ValidateCustom_GetExternalVolumeClassAccessPolicyRequest_Name(ctx, op, fldPath, obj, oldObj); len(e) != 0 { errs = append(errs, e...) } if e := validate.ShortName(ctx, op, fldPath, obj, oldObj); len(e) != 0 { @@ -4523,7 +5316,7 @@ func Validate_GetAtespaceAccessPolicyRequest( return } oldVal := safe.Field(oldObj, - func(oldObj *v1.GetAtespaceAccessPolicyRequest) *string { + func(oldObj *v1.GetExternalVolumeClassAccessPolicyRequest) *string { return &oldObj.Name }) errs = append(errs, fn(fldPath.Child("name"), &obj.Name, oldVal, oldObj != nil)...) @@ -4532,13 +5325,13 @@ func Validate_GetAtespaceAccessPolicyRequest( return errs } -// Validate_GetAtespaceRequest validates an instance of GetAtespaceRequest according +// Validate_GetExternalVolumeClassRequest validates an instance of GetExternalVolumeClassRequest according // to declarative validation rules in the API schema. -func Validate_GetAtespaceRequest( +func Validate_GetExternalVolumeClassRequest( ctx context.Context, op operation.Operation, fldPath *field.Path, - obj, oldObj *v1.GetAtespaceRequest) (errs field.ErrorList) { + obj, oldObj *v1.GetExternalVolumeClassRequest) (errs field.ErrorList) { - { // field v1.GetAtespaceRequest.Atespace + { // field v1.GetExternalVolumeClassRequest.ExternalVolumeClass fn := func( fldPath *field.Path, obj, oldObj *v1.ObjectRef, @@ -4582,10 +5375,10 @@ func Validate_GetAtespaceRequest( return } oldVal := safe.Field(oldObj, - func(oldObj *v1.GetAtespaceRequest) *v1.ObjectRef { - return oldObj.Atespace + func(oldObj *v1.GetExternalVolumeClassRequest) *v1.ObjectRef { + return oldObj.ExternalVolumeClass }) - errs = append(errs, fn(fldPath.Child("atespace"), obj.Atespace, oldVal, oldObj != nil)...) + errs = append(errs, fn(fldPath.Child("external_volume_class"), obj.ExternalVolumeClass, oldVal, oldObj != nil)...) } return errs @@ -5491,6 +6284,45 @@ func Validate_ListAtespacesRequest( return errs } +// Validate_ListExternalVolumeClassesRequest validates an instance of ListExternalVolumeClassesRequest according +// to declarative validation rules in the API schema. +func Validate_ListExternalVolumeClassesRequest( + ctx context.Context, op operation.Operation, fldPath *field.Path, + obj, oldObj *v1.ListExternalVolumeClassesRequest) (errs field.ErrorList) { + + { // field v1.ListExternalVolumeClassesRequest.Options + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ListOptions, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.OptionalPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + // call the type's validation function + errs = append(errs, Validate_ListOptions(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.ListExternalVolumeClassesRequest) *v1.ListOptions { + return oldObj.Options + }) + errs = append(errs, fn(fldPath.Child("options"), obj.Options, oldVal, oldObj != nil)...) + } + + return errs +} + // Validate_ListOptions validates an instance of ListOptions according // to declarative validation rules in the API schema. func Validate_ListOptions( @@ -9491,6 +10323,103 @@ func Validate_UpdateAtespaceAccessPolicyRequest( return errs } +// Validate_UpdateExternalVolumeClassAccessPolicyRequest validates an instance of UpdateExternalVolumeClassAccessPolicyRequest according +// to declarative validation rules in the API schema. +func Validate_UpdateExternalVolumeClassAccessPolicyRequest( + ctx context.Context, op operation.Operation, fldPath *field.Path, + obj, oldObj *v1.UpdateExternalVolumeClassAccessPolicyRequest) (errs field.ErrorList) { + + { // field v1.UpdateExternalVolumeClassAccessPolicyRequest.ExternalVolumeClass + fn := func( + fldPath *field.Path, + obj, oldObj *v1.ObjectRef, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + func() { // cohort = "atespace" + earlyReturn := false + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.ForbiddenValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if e := validate.Subfield(ctx, op, fldPath, obj, oldObj, "atespace", + func(o *v1.ObjectRef) *string { return &o.Atespace }, validate.DirectEqual, validate.OptionalValue).MarkBeta().MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + }() + // call the type's validation function + errs = append(errs, Validate_ObjectRef(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.UpdateExternalVolumeClassAccessPolicyRequest) *v1.ObjectRef { + return oldObj.ExternalVolumeClass + }) + errs = append(errs, fn(fldPath.Child("external_volume_class"), obj.ExternalVolumeClass, oldVal, oldObj != nil)...) + } + + { // field v1.UpdateExternalVolumeClassAccessPolicyRequest.AccessPolicy + fn := func( + fldPath *field.Path, + obj, oldObj *v1.AccessPolicy, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.IfOption(ctx, op, fldPath, obj, oldObj, "ExternalVolumes", false, validate.ForbiddenPointer).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.IfOption(ctx, op, fldPath, obj, oldObj, "ExternalVolumes", false, validate.OptionalPointer).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if e := validate.RequiredPointer(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + // call the type's validation function + errs = append(errs, Validate_AccessPolicy(ctx, op, fldPath, obj, oldObj)...) + return + } + oldVal := safe.Field(oldObj, + func(oldObj *v1.UpdateExternalVolumeClassAccessPolicyRequest) *v1.AccessPolicy { + return oldObj.AccessPolicy + }) + errs = append(errs, fn(fldPath.Child("access_policy"), obj.AccessPolicy, oldVal, oldObj != nil)...) + } + + return errs +} + // Validate_UpdateGlobalAccessPolicyRequest validates an instance of UpdateGlobalAccessPolicyRequest according // to declarative validation rules in the API schema. func Validate_UpdateGlobalAccessPolicyRequest( diff --git a/cmd/ateapi/internal/authz/authorizer.go b/cmd/ateapi/internal/authz/authorizer.go index dac3a324f0..dcd5b7bc17 100644 --- a/cmd/ateapi/internal/authz/authorizer.go +++ b/cmd/ateapi/internal/authz/authorizer.go @@ -52,9 +52,9 @@ type Authorizer struct { } // Check verifies that the principal in ctx has relation on object. -// Structural hierarchy links (global:root as parent_global of every atespace -// and worker, and each atespace as parent_atespace of its actors, actor -// templates and tags) and +// Structural hierarchy links (global:root as parent_global of every atespace, +// worker and external volume class, and each atespace as parent_atespace of +// its actors, actor templates and tags) and // the caller's bootstrap owner and system role grants, if any, are injected as OpenFGA // ContextualTuples at evaluation time rather than persisted in the tuple table. func (a *Authorizer) Check(ctx context.Context, relation, object string) error { @@ -70,6 +70,15 @@ func (a *Authorizer) Check(ctx context.Context, relation, object string) error { } user := formatUser(p.ID) var grants []*openfgav1.TupleKey + // A Check only evaluates the caller, so only the caller's own bootstrap + // grant can affect the result. + if _, ok := a.bootstrapOwners[user]; ok { + grants = append(grants, &openfgav1.TupleKey{ + User: user, + Relation: RoleOwner, + Object: GlobalRootObject, + }) + } if p.Kind == principal.KindMTLS { for _, role := range a.systemPrincipals[user] { grants = append(grants, &openfgav1.TupleKey{ @@ -89,20 +98,31 @@ func (a *Authorizer) Check(ctx context.Context, relation, object string) error { return nil } +// CheckSubject verifies that subject (such as "atespace:team-a") has relation +// on object, without applying caller-derived grants or bootstrap owner +// overrides. +func (a *Authorizer) CheckSubject(ctx context.Context, subject, relation, object string) error { + if IsBypassed(ctx) { + return nil + } + if a == nil || a.fgaServer == nil { + return apierror.Internal("authz: authorizer is not initialized") + } + allowed, err := a.checkRaw(ctx, subject, relation, object) + if err != nil { + return err + } + if !allowed { + return apierror.PermissionDenied("permission denied: %q lacks %q on %q", subject, relation, object) + } + return nil +} + // checkRaw reports whether user has relation on object. Besides the stored -// tuples, OpenFGA evaluates these as contextual tuples: object's structural -// parent links, user's bootstrap owner grant if configured, and grants. +// tuples, OpenFGA evaluates object's structural parent links and grants as +// contextual tuples. func (a *Authorizer) checkRaw(ctx context.Context, user, relation, object string, grants ...*openfgav1.TupleKey) (bool, error) { tuples := append(contextualTuples(object), grants...) - // A Check only evaluates the caller, so only the caller's own bootstrap - // grant can affect the result. - if _, ok := a.bootstrapOwners[user]; ok { - tuples = append(tuples, &openfgav1.TupleKey{ - User: user, - Relation: RoleOwner, - Object: GlobalRootObject, - }) - } var ctxTuples *openfgav1.ContextualTupleKeys if len(tuples) > 0 { ctxTuples = &openfgav1.ContextualTupleKeys{TupleKeys: tuples} @@ -129,20 +149,21 @@ func (a *Authorizer) checkRaw(ctx context.Context, user, relation, object string // tuples in PostgreSQL. // // Why contextual tuples are used instead of storing parent links in the database: -// 1. Deterministic structure: Every `atespace:` and `worker:` -// unconditionally has `global:root` as its `parent_global`, and every -// `actor:/`, `actor_template:/` and -// `tag:/` has `atespace:` as its -// `parent_atespace`. Because these +// 1. Deterministic structure: Every `atespace:`, `worker:` and +// `external_volume_class:` unconditionally has `global:root` as its +// `parent_global`, and every `actor:/`, +// `actor_template:/` and `tag:/` has +// `atespace:` as its `parent_atespace`. Because these // relationships are derived purely from the object type/ID, storing a row // per resource in the OpenFGA `tuple` table would be redundant. // 2. No write amplification on create: `CreateAtespace`, `CreateWorker`, -// `CreateActorTemplate`, `CreateActor` and `CreateTag` can insert their rows without -// opening an OpenFGA write transaction just to link the parent. +// `CreateExternalVolumeClass`, `CreateActorTemplate`, `CreateActor` and +// `CreateTag` can insert their rows without opening an OpenFGA write +// transaction just to link the parent. func contextualTuples(object string) []*openfgav1.TupleKey { objectType, id, _ := strings.Cut(object, ":") switch objectType { - case "atespace", "worker": + case "atespace", "worker", "external_volume_class": return []*openfgav1.TupleKey{parentGlobalTuple(object)} case "actor", "actor_template", "tag": atespace, _, ok := strings.Cut(id, "/") @@ -159,8 +180,8 @@ func contextualTuples(object string) []*openfgav1.TupleKey { return nil } -// parentGlobalTuple links a global-scoped object (an atespace or a worker) to -// global:root. +// parentGlobalTuple links a global-scoped object (an atespace, a worker or an +// external volume class) to global:root. func parentGlobalTuple(object string) *openfgav1.TupleKey { return &openfgav1.TupleKey{ User: GlobalRootObject, diff --git a/cmd/ateapi/internal/authz/authorizer_test.go b/cmd/ateapi/internal/authz/authorizer_test.go index c35b7179e0..0ccf6501b4 100644 --- a/cmd/ateapi/internal/authz/authorizer_test.go +++ b/cmd/ateapi/internal/authz/authorizer_test.go @@ -15,13 +15,31 @@ package authz import ( + "context" "testing" "github.com/google/go-cmp/cmp" openfgav1 "github.com/openfga/api/proto/openfga/v1" + "go.ate.dev/substrate/internal/apierror" + "google.golang.org/grpc/codes" "google.golang.org/protobuf/testing/protocmp" ) +func TestCheckSubjectGuards(t *testing.T) { + const subject, relation, object = "atespace:team-a", "can_reference", "external_volume_class:nfs-gold" + + var nilAuthorizer *Authorizer + if err := nilAuthorizer.CheckSubject(WithBypass(context.Background()), subject, relation, object); err != nil { + t.Errorf("CheckSubject with a bypassed context = %v, want nil", err) + } + for name, a := range map[string]*Authorizer{"nil": nil, "no OpenFGA server": {}} { + err := a.CheckSubject(context.Background(), subject, relation, object) + if got := apierror.Code(err); got != codes.Internal { + t.Errorf("CheckSubject on a %s Authorizer = %v, want code %v", name, err, codes.Internal) + } + } +} + func TestContextualTuples(t *testing.T) { parentGlobal := func(atespace string) *openfgav1.TupleKey { return &openfgav1.TupleKey{User: GlobalRootObject, Relation: "parent_global", Object: atespace} @@ -50,6 +68,11 @@ func TestContextualTuples(t *testing.T) { object: WorkerObject("w-1"), want: []*openfgav1.TupleKey{parentGlobal("worker:w-1")}, }, + { + name: "external volume class", + object: ExternalVolumeClassObject("nfs-gold"), + want: []*openfgav1.TupleKey{parentGlobal("external_volume_class:nfs-gold")}, + }, { name: "actor", object: ActorObject("team-a", "runner"), diff --git a/cmd/ateapi/internal/authz/authz_test.go b/cmd/ateapi/internal/authz/authz_test.go index 6fec93a806..237ce4bf19 100644 --- a/cmd/ateapi/internal/authz/authz_test.go +++ b/cmd/ateapi/internal/authz/authz_test.go @@ -17,9 +17,11 @@ package authz import ( "context" "errors" + "fmt" "os" "os/exec" "runtime" + "slices" "strings" "testing" "time" @@ -33,6 +35,7 @@ import ( "github.com/testcontainers/testcontainers-go/modules/postgres" "google.golang.org/grpc/codes" + "go.ate.dev/substrate/api/ateapi/v1" "go.ate.dev/substrate/cmd/ateapi/internal/store/dockerenv" "go.ate.dev/substrate/internal/apierror" "go.ate.dev/substrate/internal/principal" @@ -566,3 +569,327 @@ func TestAtespacedObjects_NoCollision(t *testing.T) { t.Errorf("ActorObject and ActorTemplateObject collided on %q", o1) } } + +func TestPolicyManager_ExternalVolumeClassAtespaces(t *testing.T) { + pool := startPostgres(t) + ctx := context.Background() + + fgaSrv, err := NewOpenFGAServer(pool) + if err != nil { + t.Fatalf("NewOpenFGAServer failed: %v", err) + } + t.Cleanup(fgaSrv.Close) + + authorizer, pm, err := New(ctx, pool, fgaSrv, []string{"root-owner"}, testSystemPrincipals()) + if err != nil { + t.Fatalf("authz.New failed: %v", err) + } + + checkAllowedAtespace := func(atespace, class string) bool { + t.Helper() + resp, err := fgaSrv.Check(ctx, &openfgav1.CheckRequest{ + StoreId: pm.storeID, + AuthorizationModelId: pm.modelID, + TupleKey: &openfgav1.CheckRequestTupleKey{ + User: AtespaceObject(atespace), + Relation: RoleAllowedAtespace, + Object: ExternalVolumeClassObject(class), + }, + }) + if err != nil { + t.Fatalf("Check(%s, %s, %s) failed: %v", atespace, RoleAllowedAtespace, class, err) + } + return resp.GetAllowed() + } + + // 1. Nil transaction checks. + if err := pm.ReconcileExternalVolumeClassAtespaces(ctx, nil, "nfs-gold", nil); !errors.Is(err, ErrNilTransaction) { + t.Fatalf("ReconcileExternalVolumeClassAtespaces(nil tx) = %v, want ErrNilTransaction", err) + } + if err := pm.DeleteExternalVolumeClassPolicies(ctx, nil, "nfs-gold"); !errors.Is(err, ErrNilTransaction) { + t.Fatalf("DeleteExternalVolumeClassPolicies(nil tx) = %v, want ErrNilTransaction", err) + } + if err := pm.RemoveAtespaceFromExternalVolumeClasses(ctx, nil, "space-1"); !errors.Is(err, ErrNilTransaction) { + t.Fatalf("RemoveAtespaceFromExternalVolumeClasses(nil tx) = %v, want ErrNilTransaction", err) + } + if _, err := pm.ExternalVolumeClassesForAtespace(ctx, nil, "space-1"); !errors.Is(err, ErrNilTransaction) { + t.Fatalf("ExternalVolumeClassesForAtespace(nil tx) = %v, want ErrNilTransaction", err) + } + + // 2. Invalid member, disallowed role, and invalid atespace name checks. + for _, badMember := range []string{"user:alice", "atespace:*", "atespace:Bad", "atespace:space-1#editor"} { + tx, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + err = pm.ReconcileExternalVolumeClassAtespaces(ctx, tx, "nfs-gold", []*ateapi.Binding{ + {Role: RoleAllowedAtespace, Members: []string{badMember}}, + }) + _ = tx.Rollback(ctx) + if err == nil { + t.Errorf("ReconcileExternalVolumeClassAtespaces(%q) succeeded, want error", badMember) + } + } + for _, badRole := range []string{RoleOwner, RoleViewer, "parent_global", RelationCanGet, "not-a-relation"} { + tx, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + err = pm.ReconcileExternalVolumeClassAtespaces(ctx, tx, "nfs-gold", []*ateapi.Binding{ + {Role: badRole, Members: []string{"atespace:space-1"}}, + }) + _ = tx.Rollback(ctx) + if err == nil { + t.Errorf("ReconcileExternalVolumeClassAtespaces(role=%q) succeeded, want error", badRole) + } + } + for _, badAtespace := range []string{"", "*", "Bad", "space-1#editor"} { + tx, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + err = pm.RemoveAtespaceFromExternalVolumeClasses(ctx, tx, badAtespace) + _, listErr := pm.ExternalVolumeClassesForAtespace(ctx, tx, badAtespace) + _ = tx.Rollback(ctx) + if err == nil { + t.Errorf("RemoveAtespaceFromExternalVolumeClasses(%q) succeeded, want error", badAtespace) + } + if listErr == nil { + t.Errorf("ExternalVolumeClassesForAtespace(%q) succeeded, want error", badAtespace) + } + } + + // 3. Reconcile initial grant (with duplicate member deduplication) + diff update + rollback atomicity. + tx, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + if err := pm.ReconcileExternalVolumeClassAtespaces(ctx, tx, "nfs-gold", []*ateapi.Binding{ + {Role: RoleAllowedAtespace, Members: []string{"atespace:space-1", "atespace:space-2", "atespace:space-1"}}, + }); err != nil { + _ = tx.Rollback(ctx) + t.Fatalf("ReconcileExternalVolumeClassAtespaces initial grant failed: %v", err) + } + if err := tx.Commit(ctx); err != nil { + t.Fatalf("tx.Commit failed: %v", err) + } + if !checkAllowedAtespace("space-1", "nfs-gold") || !checkAllowedAtespace("space-2", "nfs-gold") { + t.Fatalf("expected space-1 and space-2 allowed on nfs-gold") + } + if checkAllowedAtespace("space-3", "nfs-gold") { + t.Fatalf("expected space-3 denied on nfs-gold") + } + + // Rolled-back reconcile leaves committed tuples unchanged. + txRollback, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + if err := pm.ReconcileExternalVolumeClassAtespaces(ctx, txRollback, "nfs-gold", nil); err != nil { + t.Fatalf("ReconcileExternalVolumeClassAtespaces(nil) failed: %v", err) + } + if err := txRollback.Rollback(ctx); err != nil { + t.Fatalf("Rollback failed: %v", err) + } + if !checkAllowedAtespace("space-1", "nfs-gold") || !checkAllowedAtespace("space-2", "nfs-gold") { + t.Fatalf("expected space-1 and space-2 still allowed after rolled-back clear") + } + + // Update nfs-gold from {space-1, space-2} to {space-2, space-3}. + txUpdate, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + if err := pm.ReconcileExternalVolumeClassAtespaces(ctx, txUpdate, "nfs-gold", []*ateapi.Binding{ + {Role: RoleAllowedAtespace, Members: []string{"atespace:space-2", "atespace:space-3"}}, + }); err != nil { + _ = txUpdate.Rollback(ctx) + t.Fatalf("ReconcileExternalVolumeClassAtespaces update failed: %v", err) + } + if err := txUpdate.Commit(ctx); err != nil { + t.Fatalf("txUpdate.Commit failed: %v", err) + } + if checkAllowedAtespace("space-1", "nfs-gold") { + t.Errorf("expected space-1 removed from nfs-gold") + } + if !checkAllowedAtespace("space-2", "nfs-gold") || !checkAllowedAtespace("space-3", "nfs-gold") { + t.Errorf("expected space-2 and space-3 allowed on nfs-gold") + } + + // 4. DeleteExternalVolumeClassPolicies clears only the targeted class. + txSSD, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + if err := pm.ReconcileExternalVolumeClassAtespaces(ctx, txSSD, "ssd-fast", []*ateapi.Binding{ + {Role: RoleAllowedAtespace, Members: []string{"atespace:space-2"}}, + }); err != nil { + _ = txSSD.Rollback(ctx) + t.Fatalf("ReconcileExternalVolumeClassAtespaces(ssd-fast) failed: %v", err) + } + if err := txSSD.Commit(ctx); err != nil { + t.Fatalf("txSSD.Commit failed: %v", err) + } + + txDelClass, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + if err := pm.DeleteExternalVolumeClassPolicies(ctx, txDelClass, "ssd-fast"); err != nil { + _ = txDelClass.Rollback(ctx) + t.Fatalf("DeleteExternalVolumeClassPolicies(ssd-fast) failed: %v", err) + } + if err := txDelClass.Commit(ctx); err != nil { + t.Fatalf("txDelClass.Commit failed: %v", err) + } + if checkAllowedAtespace("space-2", "ssd-fast") { + t.Errorf("expected space-2 removed from ssd-fast after DeleteExternalVolumeClassPolicies") + } + if !checkAllowedAtespace("space-2", "nfs-gold") { + t.Errorf("expected nfs-gold untouched by DeleteExternalVolumeClassPolicies(ssd-fast)") + } + + // 5. Reverse sweep across > maxTuplesPerWrite (105 classes) exercises both + // paginated reads and chunked deletes within one transaction. + const totalClasses = maxTuplesPerWrite + 5 + txSeedMany, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + for i := range totalClasses { + className := fmt.Sprintf("class-%03d", i) + members := []string{"atespace:ephemeral"} + if i == 0 { + members = append(members, "atespace:survivor") + } + if err := pm.ReconcileExternalVolumeClassAtespaces(ctx, txSeedMany, className, []*ateapi.Binding{ + {Role: RoleAllowedAtespace, Members: members}, + }); err != nil { + _ = txSeedMany.Rollback(ctx) + t.Fatalf("seeding %s failed: %v", className, err) + } + } + if err := txSeedMany.Commit(ctx); err != nil { + t.Fatalf("txSeedMany.Commit failed: %v", err) + } + + // Rolled-back sweep leaves all seeded tuples intact. + txSweepRollback, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + if err := pm.RemoveAtespaceFromExternalVolumeClasses(ctx, txSweepRollback, "ephemeral"); err != nil { + _ = txSweepRollback.Rollback(ctx) + t.Fatalf("RemoveAtespaceFromExternalVolumeClasses(rollback) failed: %v", err) + } + if err := txSweepRollback.Rollback(ctx); err != nil { + t.Fatalf("txSweepRollback.Rollback failed: %v", err) + } + if !checkAllowedAtespace("ephemeral", "class-000") || !checkAllowedAtespace("ephemeral", "class-104") { + t.Fatalf("expected ephemeral still allowed after rolled-back sweep") + } + + txSweep, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + gotClasses, err := pm.ExternalVolumeClassesForAtespace(ctx, txSweep, "ephemeral") + if err != nil { + _ = txSweep.Rollback(ctx) + t.Fatalf("ExternalVolumeClassesForAtespace(ephemeral) failed: %v", err) + } + wantClasses := make([]string, totalClasses) + for i := range totalClasses { + wantClasses[i] = fmt.Sprintf("class-%03d", i) + } + if !slices.Equal(gotClasses, wantClasses) { + _ = txSweep.Rollback(ctx) + t.Fatalf("ExternalVolumeClassesForAtespace(ephemeral) = %v, want %v", gotClasses, wantClasses) + } + if err := pm.RemoveAtespaceFromExternalVolumeClasses(ctx, txSweep, "ephemeral"); err != nil { + _ = txSweep.Rollback(ctx) + t.Fatalf("RemoveAtespaceFromExternalVolumeClasses(ephemeral) failed: %v", err) + } + if err := txSweep.Commit(ctx); err != nil { + t.Fatalf("txSweep.Commit failed: %v", err) + } + for i := range totalClasses { + className := fmt.Sprintf("class-%03d", i) + if checkAllowedAtespace("ephemeral", className) { + t.Fatalf("expected ephemeral removed from %s", className) + } + } + if !checkAllowedAtespace("survivor", "class-000") { + t.Errorf("expected survivor retained on class-000") + } + + // Second sweep is a no-op, and ExternalVolumeClassesForAtespace returns empty. + txNoop, err := pool.Begin(ctx) + if err != nil { + t.Fatalf("pool.Begin failed: %v", err) + } + afterSweep, err := pm.ExternalVolumeClassesForAtespace(ctx, txNoop, "ephemeral") + if err != nil { + _ = txNoop.Rollback(ctx) + t.Fatalf("ExternalVolumeClassesForAtespace(ephemeral) after sweep failed: %v", err) + } + if len(afterSweep) != 0 { + _ = txNoop.Rollback(ctx) + t.Fatalf("ExternalVolumeClassesForAtespace(ephemeral) after sweep = %v, want empty", afterSweep) + } + if err := pm.RemoveAtespaceFromExternalVolumeClasses(ctx, txNoop, "ephemeral"); err != nil { + _ = txNoop.Rollback(ctx) + t.Fatalf("second RemoveAtespaceFromExternalVolumeClasses(ephemeral) failed: %v", err) + } + if err := txNoop.Commit(ctx); err != nil { + t.Fatalf("txNoop.Commit failed: %v", err) + } + + // 6. Runtime Authorizer.Check evaluation with contextual parent_global tuples: + // - Bootstrap/global owner manages the class and its access policy. + // - Editor of allowed atespace (space-2 on nfs-gold) can Get the class, but + // cannot Delete it, read/write its access policy, or Get a disallowed class. + // - Viewer of allowed atespace cannot Get the class. + writeTestTuple(t, ctx, pool, pm, "bob", RoleEditor, AtespaceObject("space-2")) + writeTestTuple(t, ctx, pool, pm, "dave", RoleViewer, AtespaceObject("space-2")) + + rootCtx := principal.InjectContext(ctx, principal.PrincipalInfo{ID: "root-owner", Kind: principal.KindJWT}) + bobCtx := principal.InjectContext(ctx, principal.PrincipalInfo{ID: "bob", Kind: principal.KindJWT}) + daveCtx := principal.InjectContext(ctx, principal.PrincipalInfo{ID: "dave", Kind: principal.KindJWT}) + + nfsGoldObj := ExternalVolumeClassObject("nfs-gold") + ssdFastObj := ExternalVolumeClassObject("ssd-fast") + + for _, rel := range []string{ + RelationCanGet, + RelationCanDelete, + RelationCanCreateAccessPolicy, + RelationCanGetAccessPolicy, + RelationCanUpdateAccessPolicy, + RelationCanDeleteAccessPolicy, + } { + if err := authorizer.Check(rootCtx, rel, nfsGoldObj); err != nil { + t.Errorf("expected root-owner allowed %s on nfs-gold, got %v", rel, err) + } + } + if err := authorizer.Check(bobCtx, RelationCanGet, nfsGoldObj); err != nil { + t.Errorf("expected allowed-atespace editor bob allowed can_get on nfs-gold, got %v", err) + } + for _, rel := range []string{ + RelationCanDelete, + RelationCanCreateAccessPolicy, + RelationCanGetAccessPolicy, + RelationCanUpdateAccessPolicy, + RelationCanDeleteAccessPolicy, + } { + if err := authorizer.Check(bobCtx, rel, nfsGoldObj); apierror.Code(err) != codes.PermissionDenied { + t.Errorf("expected bob denied %s on nfs-gold, got %v", rel, err) + } + } + if err := authorizer.Check(bobCtx, RelationCanGet, ssdFastObj); apierror.Code(err) != codes.PermissionDenied { + t.Errorf("expected bob denied can_get on disallowed ssd-fast, got %v", err) + } + if err := authorizer.Check(daveCtx, RelationCanGet, nfsGoldObj); apierror.Code(err) != codes.PermissionDenied { + t.Errorf("expected allowed-atespace viewer dave denied can_get on nfs-gold, got %v", err) + } +} diff --git a/cmd/ateapi/internal/authz/authz_util.go b/cmd/ateapi/internal/authz/authz_util.go index 092beb80fd..1c82eaa233 100644 --- a/cmd/ateapi/internal/authz/authz_util.go +++ b/cmd/ateapi/internal/authz/authz_util.go @@ -31,6 +31,7 @@ import ( "github.com/spiffe/go-spiffe/v2/spiffeid" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/wrapperspb" + "k8s.io/apimachinery/pkg/api/validate/content" ) const ( @@ -40,10 +41,15 @@ const ( // GlobalRootObject is the singleton global scope object identifier in OpenFGA. GlobalRootObject = "global:root" + atespaceObjectPrefix = "atespace:" + externalVolumeClassObjectPrefix = "external_volume_class:" + RoleOwner = "owner" RoleEditor = "editor" RoleViewer = "viewer" + RoleAllowedAtespace = "allowed_atespace" + RoleController = "controller" RoleEgressGateway = "egress_gateway" RoleIngressRouter = "ingress_router" @@ -80,6 +86,10 @@ const ( RelationCanUseTag = "can_use_tag" RelationCanMintActorJWT = "can_mint_actor_jwt" + RelationCanCreateExternalVolumeClass = "can_create_external_volume_class" + RelationCanListExternalVolumeClasses = "can_list_external_volume_classes" + RelationCanReference = "can_reference" + // maxTuplesPerWrite is OpenFGA's default maximum number of tuples allowed in a single Write request. maxTuplesPerWrite = 100 ) @@ -119,7 +129,7 @@ var objectIDReplacer = strings.NewReplacer( // AtespaceObject formats an atespace name as an OpenFGA object string. func AtespaceObject(name string) string { - return "atespace:" + objectIDReplacer.Replace(name) + return atespaceObjectPrefix + objectIDReplacer.Replace(name) } // WorkerObject formats a worker name as an OpenFGA object string. Workers are @@ -128,6 +138,12 @@ func WorkerObject(name string) string { return "worker:" + objectIDReplacer.Replace(name) } +// ExternalVolumeClassObject formats an external volume class name as an +// OpenFGA object string. External volume classes are global-scoped. +func ExternalVolumeClassObject(name string) string { + return externalVolumeClassObjectPrefix + objectIDReplacer.Replace(name) +} + // ActorObject formats an actor as an OpenFGA object string. func ActorObject(atespace, name string) string { return "actor:" + atespacedID(atespace, name) @@ -174,6 +190,32 @@ func FormatMember(member string) (string, error) { return formatUser(id), nil } +// validateAtespaceName validates a bare atespace resource name and returns its +// OpenFGA object identifier. +func validateAtespaceName(name string) (string, error) { + if strings.TrimSpace(name) == "" { + return "", fmt.Errorf("atespace name %q must not be empty", name) + } + if errs := content.IsDNS1123Label(name); len(errs) > 0 { + return "", fmt.Errorf("invalid atespace name %q: %s", name, strings.Join(errs, "; ")) + } + return AtespaceObject(name), nil +} + +// FormatAtespaceMember validates an atespace policy member string +// ("atespace:", where is a valid Substrate resource name) and +// returns its OpenFGA object identifier. +func FormatAtespaceMember(member string) (string, error) { + name, ok := strings.CutPrefix(member, atespaceObjectPrefix) + if !ok || strings.TrimSpace(name) == "" { + return "", fmt.Errorf("member %q must have non-empty \"atespace:\" format", member) + } + if name == "*" { + return "", fmt.Errorf("wildcard member %q is not allowed", member) + } + return validateAtespaceName(name) +} + //go:embed model.fga var modelDSL string diff --git a/cmd/ateapi/internal/authz/authz_util_test.go b/cmd/ateapi/internal/authz/authz_util_test.go index 4c66881fc8..812658da59 100644 --- a/cmd/ateapi/internal/authz/authz_util_test.go +++ b/cmd/ateapi/internal/authz/authz_util_test.go @@ -71,6 +71,52 @@ func TestFormatMember(t *testing.T) { } } +func TestFormatAtespaceMember(t *testing.T) { + maxLabel := strings.Repeat("a", 63) + tests := []struct { + name string + member string + want string + wantErr bool + }{ + {name: "plain", member: "atespace:space-1", want: "atespace:space-1"}, + {name: "single character", member: "atespace:a", want: "atespace:a"}, + {name: "max DNS-1123 label length", member: "atespace:" + maxLabel, want: "atespace:" + maxLabel}, + {name: "missing prefix", member: "space-1", wantErr: true}, + {name: "user prefix rejected", member: "user:alice@example.com", wantErr: true}, + {name: "empty name", member: "atespace:", wantErr: true}, + {name: "whitespace name", member: "atespace: ", wantErr: true}, + {name: "wildcard", member: "atespace:*", wantErr: true}, + {name: "userset relation rejected", member: "atespace:space-1#editor", wantErr: true}, + {name: "uppercase rejected", member: "atespace:Space-1", wantErr: true}, + {name: "slash rejected", member: "atespace:a/b", wantErr: true}, + {name: "colon rejected", member: "atespace:a:b", wantErr: true}, + {name: "percent rejected", member: "atespace:a%20b", wantErr: true}, + {name: "leading hyphen rejected", member: "atespace:-bad", wantErr: true}, + {name: "trailing hyphen rejected", member: "atespace:bad-", wantErr: true}, + {name: "too long rejected", member: "atespace:" + maxLabel + "a", wantErr: true}, + {name: "newline rejected", member: "atespace:a\nb", wantErr: true}, + {name: "NUL rejected", member: "atespace:a\x00b", wantErr: true}, + } + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + got, err := FormatAtespaceMember(tc.member) + if tc.wantErr { + if err == nil { + t.Fatalf("FormatAtespaceMember(%q) = %q, want error", tc.member, got) + } + return + } + if err != nil { + t.Fatalf("FormatAtespaceMember(%q) failed: %v", tc.member, err) + } + if got != tc.want { + t.Errorf("FormatAtespaceMember(%q) = %q, want %q", tc.member, got, tc.want) + } + }) + } +} + func TestParseBootstrapOwners(t *testing.T) { got, err := parseBootstrapOwners([]string{"alice@example.com", " user:bob ", "alice@example.com", "a:b"}) if err != nil { diff --git a/cmd/ateapi/internal/authz/interceptor.go b/cmd/ateapi/internal/authz/interceptor.go index 9eb50fd3d0..1a0c3f08f9 100644 --- a/cmd/ateapi/internal/authz/interceptor.go +++ b/cmd/ateapi/internal/authz/interceptor.go @@ -50,8 +50,14 @@ func UnaryServerInterceptor(authorizer *Authorizer) grpc.UnaryServerInterceptor return nil, err } for _, c := range checks { - if err := authorizer.Check(ctx, c.relation, c.object); err != nil { - return nil, err + var checkErr error + if c.subject != "" { + checkErr = authorizer.CheckSubject(ctx, c.subject, c.relation, c.object) + } else { + checkErr = authorizer.Check(ctx, c.relation, c.object) + } + if checkErr != nil { + return nil, checkErr } } diff --git a/cmd/ateapi/internal/authz/model.fga b/cmd/ateapi/internal/authz/model.fga index bf689b48e0..ee6f1c1c44 100644 --- a/cmd/ateapi/internal/authz/model.fga +++ b/cmd/ateapi/internal/authz/model.fga @@ -65,11 +65,31 @@ type global define can_list_actor_templates: viewer define can_list_tags: viewer + # --- Volume Infrastructure --- + define can_create_external_volume_class: owner + define can_list_external_volume_classes: viewer + # --- Policy Governance --- define can_create_access_policy: owner define can_get_access_policy: viewer define can_update_access_policy: owner +# Global-scoped; inherits its roles from global, and editors of allowed +# atespaces may read the class. +type external_volume_class + relations + define parent_global: [global] + define allowed_atespace: [atespace] + + define can_create_access_policy: owner from parent_global + define can_get_access_policy: viewer from parent_global + define can_update_access_policy: owner from parent_global + define can_delete_access_policy: owner from parent_global + + define can_get: viewer from parent_global or editor from allowed_atespace + define can_delete: owner from parent_global + define can_reference: allowed_atespace + type atespace relations define parent_global: [global] diff --git a/cmd/ateapi/internal/authz/model_test.fga.yaml b/cmd/ateapi/internal/authz/model_test.fga.yaml index c9cb9916ce..6f34357a5f 100644 --- a/cmd/ateapi/internal/authz/model_test.fga.yaml +++ b/cmd/ateapi/internal/authz/model_test.fga.yaml @@ -94,6 +94,17 @@ tuples: relation: api_server_sidecar object: global:root + # External volume classes (linked to global:root; space-1 allowed on nfs-gold only) + - user: global:root + relation: parent_global + object: external_volume_class:nfs-gold + - user: atespace:space-1 + relation: allowed_atespace + object: external_volume_class:nfs-gold + - user: global:root + relation: parent_global + object: external_volume_class:ssd-restricted + tests: - name: 1. Global Superadmin & Viewer Propagation check: @@ -572,3 +583,83 @@ tests: object: actor:runner-1 assertions: can_mint_actor_jwt: false + + - name: 10. External Volume Classes & Access Policies + check: + - user: user:carol # Global owner + object: global:root + assertions: + can_create_external_volume_class: true + can_list_external_volume_classes: true + - user: user:frank # Global viewer + object: global:root + assertions: + can_create_external_volume_class: false + can_list_external_volume_classes: true + - user: user:bob # Atespace editor + object: global:root + assertions: + can_create_external_volume_class: false + can_list_external_volume_classes: false + - user: user:carol # Global owner manages class and its access policy + object: external_volume_class:nfs-gold + assertions: + can_get: true + can_delete: true + can_create_access_policy: true + can_get_access_policy: true + can_update_access_policy: true + can_delete_access_policy: true + - user: user:frank # Global viewer reads class and its access policy + object: external_volume_class:nfs-gold + assertions: + can_get: true + can_delete: false + can_create_access_policy: false + can_get_access_policy: true + can_update_access_policy: false + can_delete_access_policy: false + - user: user:alice # Owner of allowed atespace space-1 reads class, not its policy + object: external_volume_class:nfs-gold + assertions: + can_get: true + can_delete: false + can_create_access_policy: false + can_get_access_policy: false + can_update_access_policy: false + can_delete_access_policy: false + - user: user:bob # Editor of allowed atespace space-1 reads class, not its policy + object: external_volume_class:nfs-gold + assertions: + can_get: true + can_delete: false + can_create_access_policy: false + can_get_access_policy: false + can_update_access_policy: false + can_delete_access_policy: false + - user: user:bob # Editor of space-1 cannot read disallowed class + object: external_volume_class:ssd-restricted + assertions: + can_get: false + can_delete: false + can_get_access_policy: false + - user: user:dave # Viewer of allowed atespace space-1 cannot read class + object: external_volume_class:nfs-gold + assertions: + can_get: false + can_delete: false + can_get_access_policy: false + - user: atespace:space-1 + object: external_volume_class:nfs-gold + assertions: + allowed_atespace: true + can_reference: true + - user: atespace:space-1 + object: external_volume_class:ssd-restricted + assertions: + allowed_atespace: false + can_reference: false + - user: user:carol # Global owner cannot satisfy can_reference directly + object: external_volume_class:nfs-gold + assertions: + can_reference: false diff --git a/cmd/ateapi/internal/authz/policy_manager.go b/cmd/ateapi/internal/authz/policy_manager.go index 762279cf57..dbece01c07 100644 --- a/cmd/ateapi/internal/authz/policy_manager.go +++ b/cmd/ateapi/internal/authz/policy_manager.go @@ -18,6 +18,9 @@ import ( "context" "errors" "fmt" + "net/url" + "slices" + "strings" "github.com/jackc/pgx/v5" openfgav1 "github.com/openfga/api/proto/openfga/v1" @@ -30,8 +33,8 @@ import ( // PostgreSQL transaction. var ErrNilTransaction = errors.New("authz: policy tuple writes require a non-nil pgx.Tx") -// PolicyManager writes OpenFGA tuples for access policy and atespace -// mutations within the caller's PostgreSQL transaction. +// PolicyManager writes OpenFGA tuples for access policy, atespace, and +// external volume class mutations within the caller's PostgreSQL transaction. type PolicyManager struct { fgaServer *server.Server storeID string @@ -41,19 +44,120 @@ type PolicyManager struct { // ReconcileGlobalBindings reconciles the OpenFGA role bindings on global:root // within tx. The tuple changes commit or roll back with tx. func (m *PolicyManager) ReconcileGlobalBindings(ctx context.Context, tx pgx.Tx, bindings []*ateapi.Binding) error { - return m.reconcileBindings(ctx, tx, GlobalRootObject, bindings) + return m.reconcileBindings(ctx, tx, GlobalRootObject, bindings, FormatMember) } // ReconcileAtespaceBindings reconciles the OpenFGA role bindings on an atespace // within tx. The tuple changes commit or roll back with tx. func (m *PolicyManager) ReconcileAtespaceBindings(ctx context.Context, tx pgx.Tx, name string, bindings []*ateapi.Binding) error { - return m.reconcileBindings(ctx, tx, AtespaceObject(name), bindings) + return m.reconcileBindings(ctx, tx, AtespaceObject(name), bindings, FormatMember) } // DeleteAtespacePolicies removes all OpenFGA tuples associated with an atespace // within tx. The tuple deletions commit or roll back with tx. func (m *PolicyManager) DeleteAtespacePolicies(ctx context.Context, tx pgx.Tx, name string) error { - return m.reconcileBindings(ctx, tx, AtespaceObject(name), nil) + return m.reconcileBindings(ctx, tx, AtespaceObject(name), nil, FormatMember) +} + +// ReconcileExternalVolumeClassAtespaces reconciles the OpenFGA allowed-atespace +// bindings on an external volume class within tx. The tuple changes commit or +// roll back with tx. +func (m *PolicyManager) ReconcileExternalVolumeClassAtespaces(ctx context.Context, tx pgx.Tx, name string, bindings []*ateapi.Binding) error { + return m.reconcileBindings(ctx, tx, ExternalVolumeClassObject(name), bindings, FormatAtespaceMember) +} + +// DeleteExternalVolumeClassPolicies removes all OpenFGA tuples associated with +// an external volume class within tx. The tuple deletions commit or roll back +// with tx. +func (m *PolicyManager) DeleteExternalVolumeClassPolicies(ctx context.Context, tx pgx.Tx, name string) error { + return m.reconcileBindings(ctx, tx, ExternalVolumeClassObject(name), nil, FormatAtespaceMember) +} + +// ExternalVolumeClassesForAtespace returns the sorted names of all external +// volume classes that currently have an OpenFGA tuple referencing the named +// atespace within tx, without acquiring tuple row locks. Callers that update +// both external_volume_class_access_policies and OpenFGA tuples must lock the +// policy rows in sorted name order before calling +// RemoveAtespaceFromExternalVolumeClasses so their lock order matches +// per-class policy updates. +func (m *PolicyManager) ExternalVolumeClassesForAtespace(ctx context.Context, tx pgx.Tx, name string) ([]string, error) { + if tx == nil { + return nil, ErrNilTransaction + } + user, err := validateAtespaceName(name) + if err != nil { + return nil, err + } + ctx = ContextWithTx(ctx, tx) + + tuples, err := m.readTuples(ctx, &openfgav1.ReadRequestTupleKey{ + User: user, + Object: externalVolumeClassObjectPrefix, + }) + if err != nil { + return nil, fmt.Errorf("reading external volume class tuples for %q: %w", user, err) + } + if len(tuples) == 0 { + return nil, nil + } + + seen := make(map[string]struct{}, len(tuples)) + names := make([]string, 0, len(tuples)) + for _, tk := range tuples { + rawID, ok := strings.CutPrefix(tk.GetObject(), externalVolumeClassObjectPrefix) + if !ok || rawID == "" { + return nil, fmt.Errorf("unexpected external volume class tuple object %q", tk.GetObject()) + } + className, err := url.PathUnescape(rawID) + if err != nil { + return nil, fmt.Errorf("unescaping external volume class tuple object %q: %w", tk.GetObject(), err) + } + if _, dup := seen[className]; dup { + continue + } + seen[className] = struct{}{} + names = append(names, className) + } + slices.Sort(names) + return names, nil +} + +// RemoveAtespaceFromExternalVolumeClasses deletes all OpenFGA tuples granting +// the named atespace access to any external volume class within tx. +func (m *PolicyManager) RemoveAtespaceFromExternalVolumeClasses(ctx context.Context, tx pgx.Tx, name string) error { + if tx == nil { + return ErrNilTransaction + } + user, err := validateAtespaceName(name) + if err != nil { + return err + } + ctx = ContextWithTx(ctx, tx) + + tuples, err := m.readTuples(ctx, &openfgav1.ReadRequestTupleKey{ + User: user, + Object: externalVolumeClassObjectPrefix, + }) + if err != nil { + return fmt.Errorf("reading external volume class tuples for %q: %w", user, err) + } + if len(tuples) == 0 { + return nil + } + + toDelete := make([]*openfgav1.TupleKeyWithoutCondition, 0, len(tuples)) + for _, tk := range tuples { + toDelete = append(toDelete, &openfgav1.TupleKeyWithoutCondition{ + User: tk.GetUser(), + Relation: tk.GetRelation(), + Object: tk.GetObject(), + }) + } + + if err := m.applyMutationsChunked(ctx, nil, toDelete); err != nil { + return fmt.Errorf("removing %q from external volume class tuples: %w", user, err) + } + return nil } func (m *PolicyManager) applyMutationsChunked(ctx context.Context, toWrite []*openfgav1.TupleKey, toDelete []*openfgav1.TupleKeyWithoutCondition) error { @@ -87,12 +191,16 @@ func (m *PolicyManager) applyMutationsChunked(ctx context.Context, toWrite []*op } func (m *PolicyManager) readObjectTuples(ctx context.Context, obj string) ([]*openfgav1.TupleKey, error) { + return m.readTuples(ctx, &openfgav1.ReadRequestTupleKey{Object: obj}) +} + +func (m *PolicyManager) readTuples(ctx context.Context, filter *openfgav1.ReadRequestTupleKey) ([]*openfgav1.TupleKey, error) { var out []*openfgav1.TupleKey var contToken string for { readResp, err := m.fgaServer.Read(ctx, &openfgav1.ReadRequest{ StoreId: m.storeID, - TupleKey: &openfgav1.ReadRequestTupleKey{Object: obj}, + TupleKey: filter, PageSize: wrapperspb.Int32(maxTuplesPerWrite), ContinuationToken: contToken, }) @@ -115,7 +223,13 @@ func (m *PolicyManager) readObjectTuples(ctx context.Context, obj string) ([]*op // reconcileBindings diffs the existing OpenFGA tuples on obj against // desiredBindings and writes only the net additions and deletions in batches // within tx, leaving unchanged (relation, user) tuples untouched. -func (m *PolicyManager) reconcileBindings(ctx context.Context, tx pgx.Tx, obj string, desiredBindings []*ateapi.Binding) error { +func (m *PolicyManager) reconcileBindings( + ctx context.Context, + tx pgx.Tx, + obj string, + desiredBindings []*ateapi.Binding, + formatMember func(string) (string, error), +) error { if tx == nil { return ErrNilTransaction } @@ -142,7 +256,7 @@ func (m *PolicyManager) reconcileBindings(ctx context.Context, tx pgx.Tx, obj st for _, b := range desiredBindings { role := b.GetRole() for _, rawMember := range b.GetMembers() { - fgaUser, err := FormatMember(rawMember) + fgaUser, err := formatMember(rawMember) if err != nil { return err } diff --git a/cmd/ateapi/internal/authz/registry.go b/cmd/ateapi/internal/authz/registry.go index b4bf601a0e..9e7cef63e0 100644 --- a/cmd/ateapi/internal/authz/registry.go +++ b/cmd/ateapi/internal/authz/registry.go @@ -23,8 +23,11 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" ) -// check is one OpenFGA permission check: the caller must have relation on object. +// check is one OpenFGA permission check. When subject is empty, the caller +// principal from context must have relation on object; when subject is set +// (e.g. "atespace:team-a"), subject itself must have relation on object. type check struct { + subject string relation string object string } @@ -88,6 +91,13 @@ func onWorker(relation, name string, fldPath *field.Path) ([]check, field.ErrorL return []check{{relation: relation, object: WorkerObject(name)}}, nil } +func onExternalVolumeClass(relation, name string, fldPath *field.Path) ([]check, field.ErrorList) { + if errs := validateName(name, fldPath); len(errs) > 0 { + return nil, errs + } + return []check{{relation: relation, object: ExternalVolumeClassObject(name)}}, nil +} + // resourceRef identifies an atespaced resource. Both *ateapi.ObjectRef and // *ateapi.ResourceMetadata satisfy it, including as nil pointers. type resourceRef interface { @@ -132,6 +142,38 @@ func onSourceTag(ref *ateapi.ObjectRef, fldPath *field.Path) ([]check, field.Err return onTag(RelationCanUseTag, ref, fldPath) } +// onExternalVolumeClassRefs checks can_reference for atespace on every distinct +// ExternalVolumeClass referenced by an ActorTemplate's external volumes. +func onExternalVolumeClassRefs(atespace string, volumes []*ateapi.Volume, fldPath *field.Path) ([]check, field.ErrorList) { + var ( + checks []check + errs field.ErrorList + seen = make(map[string]struct{}) + ) + subject := AtespaceObject(atespace) + for i, v := range volumes { + ref := v.GetExternal().GetTemplate().GetExternalVolumeClass() + if ref == nil { + continue + } + name := ref.GetName() + if nameErrs := validateName(name, fldPath.Index(i).Child("external", "template", "external_volume_class", "name")); len(nameErrs) > 0 { + errs = append(errs, nameErrs...) + continue + } + if _, dup := seen[name]; dup { + continue + } + seen[name] = struct{}{} + checks = append(checks, check{ + subject: subject, + relation: RelationCanReference, + object: ExternalVolumeClassObject(name), + }) + } + return checks, errs +} + // both requires the checks from a and b, reporting the validation errors of // both. func both(aChecks []check, aErrs field.ErrorList, bChecks []check, bErrs field.ErrorList) ([]check, field.ErrorList) { @@ -200,9 +242,13 @@ var defaultRPCPermissions = map[string]rpcRule{ return onAtespace(RelationCanDeleteAccessPolicy, r.GetAtespace().GetName(), field.NewPath("atespace", "name")) })), - // Actor templates. + // Actor templates. Creating a template that references an ExternalVolumeClass + // also requires that the template's atespace has can_reference on each class. ateapi.Control_CreateActorTemplate_FullMethodName: rule(checksOf(func(r *ateapi.CreateActorTemplateRequest) ([]check, field.ErrorList) { - return onAtespace(RelationCanCreateActorTemplate, r.GetActorTemplate().GetMetadata().GetAtespace(), field.NewPath("actor_template", "metadata", "atespace")) + atespace := r.GetActorTemplate().GetMetadata().GetAtespace() + atespaceChecks, atespaceErrs := onAtespace(RelationCanCreateActorTemplate, atespace, field.NewPath("actor_template", "metadata", "atespace")) + evcChecks, evcErrs := onExternalVolumeClassRefs(atespace, r.GetActorTemplate().GetVolumes(), field.NewPath("actor_template", "volumes")) + return both(atespaceChecks, atespaceErrs, evcChecks, evcErrs) })), ateapi.Control_GetActorTemplate_FullMethodName: rule(checksOf(func(r *ateapi.GetActorTemplateRequest) ([]check, field.ErrorList) { return onActorTemplate(RelationCanGet, r.GetActorTemplate(), field.NewPath("actor_template")) @@ -294,6 +340,32 @@ var defaultRPCPermissions = map[string]rpcRule{ return onWorker(RelationCanListActorAssignments, r.GetWorker().GetName(), field.NewPath("worker", "name")) })), + // External volume classes. Global-scoped like workers. + ateapi.Control_CreateExternalVolumeClass_FullMethodName: rule(checksOf(func(*ateapi.CreateExternalVolumeClassRequest) ([]check, field.ErrorList) { + return onGlobal(RelationCanCreateExternalVolumeClass) + })), + ateapi.Control_ListExternalVolumeClasses_FullMethodName: rule(checksOf(func(*ateapi.ListExternalVolumeClassesRequest) ([]check, field.ErrorList) { + return onGlobal(RelationCanListExternalVolumeClasses) + })), + ateapi.Control_GetExternalVolumeClass_FullMethodName: rule(checksOf(func(r *ateapi.GetExternalVolumeClassRequest) ([]check, field.ErrorList) { + return onExternalVolumeClass(RelationCanGet, r.GetExternalVolumeClass().GetName(), field.NewPath("external_volume_class", "name")) + })), + ateapi.Control_DeleteExternalVolumeClass_FullMethodName: rule(checksOf(func(r *ateapi.DeleteExternalVolumeClassRequest) ([]check, field.ErrorList) { + return onExternalVolumeClass(RelationCanDelete, r.GetExternalVolumeClass().GetName(), field.NewPath("external_volume_class", "name")) + })), + ateapi.Control_GetExternalVolumeClassAccessPolicy_FullMethodName: rule(checksOf(func(r *ateapi.GetExternalVolumeClassAccessPolicyRequest) ([]check, field.ErrorList) { + return onExternalVolumeClass(RelationCanGetAccessPolicy, r.GetExternalVolumeClass().GetName(), field.NewPath("external_volume_class", "name")) + })), + ateapi.Control_CreateExternalVolumeClassAccessPolicy_FullMethodName: rule(checksOf(func(r *ateapi.CreateExternalVolumeClassAccessPolicyRequest) ([]check, field.ErrorList) { + return onExternalVolumeClass(RelationCanCreateAccessPolicy, r.GetExternalVolumeClass().GetName(), field.NewPath("external_volume_class", "name")) + })), + ateapi.Control_UpdateExternalVolumeClassAccessPolicy_FullMethodName: rule(checksOf(func(r *ateapi.UpdateExternalVolumeClassAccessPolicyRequest) ([]check, field.ErrorList) { + return onExternalVolumeClass(RelationCanUpdateAccessPolicy, r.GetExternalVolumeClass().GetName(), field.NewPath("external_volume_class", "name")) + })), + ateapi.Control_DeleteExternalVolumeClassAccessPolicy_FullMethodName: rule(checksOf(func(r *ateapi.DeleteExternalVolumeClassAccessPolicyRequest) ([]check, field.ErrorList) { + return onExternalVolumeClass(RelationCanDeleteAccessPolicy, r.GetExternalVolumeClass().GetName(), field.NewPath("external_volume_class", "name")) + })), + // Actor identity credentials. ateapi.Control_MintActorJwt_FullMethodName: rule(checksOf(func(r *ateapi.MintActorJwtRequest) ([]check, field.ErrorList) { return onActor(RelationCanMintActorJWT, r.GetActor(), field.NewPath("actor")) diff --git a/cmd/ateapi/internal/authz/registry_test.go b/cmd/ateapi/internal/authz/registry_test.go index d12e60e029..308181e8f7 100644 --- a/cmd/ateapi/internal/authz/registry_test.go +++ b/cmd/ateapi/internal/authz/registry_test.go @@ -43,25 +43,25 @@ func TestDefaultRPCPermissions(t *testing.T) { name: "CreateAtespace", fullMethod: ateapi.Control_CreateAtespace_FullMethodName, req: &ateapi.CreateAtespaceRequest{}, - want: []check{{RelationCanCreateAtespace, GlobalRootObject}}, + want: []check{{relation: RelationCanCreateAtespace, object: GlobalRootObject}}, }, { name: "ListAtespaces", fullMethod: ateapi.Control_ListAtespaces_FullMethodName, req: &ateapi.ListAtespacesRequest{}, - want: []check{{RelationCanListAtespaces, GlobalRootObject}}, + want: []check{{relation: RelationCanListAtespaces, object: GlobalRootObject}}, }, { name: "GetAtespace", fullMethod: ateapi.Control_GetAtespace_FullMethodName, req: &ateapi.GetAtespaceRequest{Atespace: &ateapi.ObjectRef{Name: "team-a"}}, - want: []check{{RelationCanGet, "atespace:team-a"}}, + want: []check{{relation: RelationCanGet, object: "atespace:team-a"}}, }, { name: "DeleteAtespace", fullMethod: ateapi.Control_DeleteAtespace_FullMethodName, req: &ateapi.DeleteAtespaceRequest{Atespace: &ateapi.ObjectRef{Name: "team-a"}}, - want: []check{{RelationCanDelete, "atespace:team-a"}}, + want: []check{{relation: RelationCanDelete, object: "atespace:team-a"}}, }, // Actor templates. @@ -71,31 +71,81 @@ func TestDefaultRPCPermissions(t *testing.T) { req: &ateapi.CreateActorTemplateRequest{ActorTemplate: &ateapi.ActorTemplate{ Metadata: &ateapi.ResourceMetadata{Atespace: "team-a", Name: "tmpl"}, }}, - want: []check{{RelationCanCreateActorTemplate, "atespace:team-a"}}, + want: []check{{relation: RelationCanCreateActorTemplate, object: "atespace:team-a"}}, + }, + { + name: "CreateActorTemplate with one external volume class", + fullMethod: ateapi.Control_CreateActorTemplate_FullMethodName, + req: &ateapi.CreateActorTemplateRequest{ActorTemplate: &ateapi.ActorTemplate{ + Metadata: &ateapi.ResourceMetadata{Atespace: "team-a", Name: "tmpl"}, + Volumes: []*ateapi.Volume{{ + Name: "data", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "csi-nfs"}, + }}, + }}, + }}, + want: []check{ + {relation: RelationCanCreateActorTemplate, object: "atespace:team-a"}, + {subject: "atespace:team-a", relation: RelationCanReference, object: "external_volume_class:csi-nfs"}, + }, + }, + { + name: "CreateActorTemplate with multiple external volume classes deduplicates", + fullMethod: ateapi.Control_CreateActorTemplate_FullMethodName, + req: &ateapi.CreateActorTemplateRequest{ActorTemplate: &ateapi.ActorTemplate{ + Metadata: &ateapi.ResourceMetadata{Atespace: "team-a", Name: "tmpl"}, + Volumes: []*ateapi.Volume{ + {Name: "scratch", DurableDir: &ateapi.DurableDirVolumeSource{}}, + { + Name: "data-1", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "csi-nfs"}, + }}, + }, + { + Name: "data-2", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "csi-nfs"}, + }}, + }, + { + Name: "fast", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "csi-ssd"}, + }}, + }, + }, + }}, + want: []check{ + {relation: RelationCanCreateActorTemplate, object: "atespace:team-a"}, + {subject: "atespace:team-a", relation: RelationCanReference, object: "external_volume_class:csi-nfs"}, + {subject: "atespace:team-a", relation: RelationCanReference, object: "external_volume_class:csi-ssd"}, + }, }, { name: "GetActorTemplate", fullMethod: ateapi.Control_GetActorTemplate_FullMethodName, req: &ateapi.GetActorTemplateRequest{ActorTemplate: localTemplate}, - want: []check{{RelationCanGet, "actor_template:team-a/tmpl"}}, + want: []check{{relation: RelationCanGet, object: "actor_template:team-a/tmpl"}}, }, { name: "ListActorTemplates in an atespace", fullMethod: ateapi.Control_ListActorTemplates_FullMethodName, req: &ateapi.ListActorTemplatesRequest{Atespace: "team-a"}, - want: []check{{RelationCanListActorTemplates, "atespace:team-a"}}, + want: []check{{relation: RelationCanListActorTemplates, object: "atespace:team-a"}}, }, { name: "ListActorTemplates across all atespaces", fullMethod: ateapi.Control_ListActorTemplates_FullMethodName, req: &ateapi.ListActorTemplatesRequest{}, - want: []check{{RelationCanListActorTemplates, GlobalRootObject}}, + want: []check{{relation: RelationCanListActorTemplates, object: GlobalRootObject}}, }, { name: "DeleteActorTemplate", fullMethod: ateapi.Control_DeleteActorTemplate_FullMethodName, req: &ateapi.DeleteActorTemplateRequest{ActorTemplate: localTemplate}, - want: []check{{RelationCanDelete, "actor_template:team-a/tmpl"}}, + want: []check{{relation: RelationCanDelete, object: "actor_template:team-a/tmpl"}}, }, // Actors. @@ -104,8 +154,8 @@ func TestDefaultRPCPermissions(t *testing.T) { fullMethod: ateapi.Control_CreateActor_FullMethodName, req: &ateapi.CreateActorRequest{Actor: &ateapi.Actor{Metadata: actorMeta, ActorTemplate: sharedTemplate}}, want: []check{ - {RelationCanCreateActor, "atespace:team-a"}, - {RelationCanUseTemplate, "actor_template:shared/tmpl"}, + {relation: RelationCanCreateActor, object: "atespace:team-a"}, + {relation: RelationCanUseTemplate, object: "actor_template:shared/tmpl"}, }, }, { @@ -117,9 +167,9 @@ func TestDefaultRPCPermissions(t *testing.T) { SourceTag: &ateapi.ObjectRef{Atespace: "team-b", Name: "v1"}, }}, want: []check{ - {RelationCanCreateActor, "atespace:team-a"}, - {RelationCanUseTemplate, "actor_template:shared/tmpl"}, - {RelationCanUseTag, "tag:team-b/v1"}, + {relation: RelationCanCreateActor, object: "atespace:team-a"}, + {relation: RelationCanUseTemplate, object: "actor_template:shared/tmpl"}, + {relation: RelationCanUseTag, object: "tag:team-b/v1"}, }, }, { @@ -131,43 +181,43 @@ func TestDefaultRPCPermissions(t *testing.T) { SourceTag: &ateapi.ObjectRef{Atespace: "shared", Name: "0b5c7d4e-golden"}, }}, want: []check{ - {RelationCanCreateActor, "atespace:team-a"}, - {RelationCanUseTemplate, "actor_template:shared/tmpl"}, - {RelationCanUseTag, "tag:shared/0b5c7d4e-golden"}, + {relation: RelationCanCreateActor, object: "atespace:team-a"}, + {relation: RelationCanUseTemplate, object: "actor_template:shared/tmpl"}, + {relation: RelationCanUseTag, object: "tag:shared/0b5c7d4e-golden"}, }, }, { name: "GetActor", fullMethod: ateapi.Control_GetActor_FullMethodName, req: &ateapi.GetActorRequest{Actor: actorRef}, - want: []check{{RelationCanGet, "actor:team-a/runner"}}, + want: []check{{relation: RelationCanGet, object: "actor:team-a/runner"}}, }, { name: "ListActors in an atespace", fullMethod: ateapi.Control_ListActors_FullMethodName, req: &ateapi.ListActorsRequest{Atespace: "team-a"}, - want: []check{{RelationCanListActors, "atespace:team-a"}}, + want: []check{{relation: RelationCanListActors, object: "atespace:team-a"}}, }, { name: "ListActors across all atespaces", fullMethod: ateapi.Control_ListActors_FullMethodName, req: &ateapi.ListActorsRequest{}, - want: []check{{RelationCanListActors, GlobalRootObject}}, + want: []check{{relation: RelationCanListActors, object: GlobalRootObject}}, }, { name: "UpdateActor checks the actor and the template", fullMethod: ateapi.Control_UpdateActor_FullMethodName, req: &ateapi.UpdateActorRequest{Actor: &ateapi.Actor{Metadata: actorMeta, ActorTemplate: sharedTemplate}}, want: []check{ - {RelationCanUpdate, "actor:team-a/runner"}, - {RelationCanUseTemplate, "actor_template:shared/tmpl"}, + {relation: RelationCanUpdate, object: "actor:team-a/runner"}, + {relation: RelationCanUseTemplate, object: "actor_template:shared/tmpl"}, }, }, { name: "DeleteActor", fullMethod: ateapi.Control_DeleteActor_FullMethodName, req: &ateapi.DeleteActorRequest{Actor: actorRef}, - want: []check{{RelationCanDelete, "actor:team-a/runner"}}, + want: []check{{relation: RelationCanDelete, object: "actor:team-a/runner"}}, }, // Actor lifecycle. @@ -175,19 +225,19 @@ func TestDefaultRPCPermissions(t *testing.T) { name: "ResumeActor", fullMethod: ateapi.Control_ResumeActor_FullMethodName, req: &ateapi.ResumeActorRequest{Actor: actorRef}, - want: []check{{RelationCanResume, "actor:team-a/runner"}}, + want: []check{{relation: RelationCanResume, object: "actor:team-a/runner"}}, }, { name: "SuspendActor", fullMethod: ateapi.Control_SuspendActor_FullMethodName, req: &ateapi.SuspendActorRequest{Actor: actorRef}, - want: []check{{RelationCanSuspend, "actor:team-a/runner"}}, + want: []check{{relation: RelationCanSuspend, object: "actor:team-a/runner"}}, }, { name: "RevertActor", fullMethod: ateapi.Control_RevertActor_FullMethodName, req: &ateapi.RevertActorRequest{Actor: actorRef}, - want: []check{{RelationCanRevert, "actor:team-a/runner"}}, + want: []check{{relation: RelationCanRevert, object: "actor:team-a/runner"}}, }, // Actor egress policies. @@ -195,25 +245,25 @@ func TestDefaultRPCPermissions(t *testing.T) { name: "GetActorEgressPolicy", fullMethod: ateapi.Control_GetActorEgressPolicy_FullMethodName, req: &ateapi.GetActorEgressPolicyRequest{Actor: actorRef}, - want: []check{{RelationCanGetEgressPolicy, "actor:team-a/runner"}}, + want: []check{{relation: RelationCanGetEgressPolicy, object: "actor:team-a/runner"}}, }, { name: "CreateActorEgressPolicy", fullMethod: ateapi.Control_CreateActorEgressPolicy_FullMethodName, req: &ateapi.CreateActorEgressPolicyRequest{Actor: actorRef}, - want: []check{{RelationCanCreateEgressPolicy, "actor:team-a/runner"}}, + want: []check{{relation: RelationCanCreateEgressPolicy, object: "actor:team-a/runner"}}, }, { name: "UpdateActorEgressPolicy", fullMethod: ateapi.Control_UpdateActorEgressPolicy_FullMethodName, req: &ateapi.UpdateActorEgressPolicyRequest{Actor: actorRef}, - want: []check{{RelationCanUpdateEgressPolicy, "actor:team-a/runner"}}, + want: []check{{relation: RelationCanUpdateEgressPolicy, object: "actor:team-a/runner"}}, }, { name: "DeleteActorEgressPolicy", fullMethod: ateapi.Control_DeleteActorEgressPolicy_FullMethodName, req: &ateapi.DeleteActorEgressPolicyRequest{Actor: actorRef}, - want: []check{{RelationCanDeleteEgressPolicy, "actor:team-a/runner"}}, + want: []check{{relation: RelationCanDeleteEgressPolicy, object: "actor:team-a/runner"}}, }, // Workers. @@ -221,19 +271,19 @@ func TestDefaultRPCPermissions(t *testing.T) { name: "CreateWorker", fullMethod: ateapi.Control_CreateWorker_FullMethodName, req: &ateapi.CreateWorkerRequest{}, - want: []check{{RelationCanCreateWorker, GlobalRootObject}}, + want: []check{{relation: RelationCanCreateWorker, object: GlobalRootObject}}, }, { name: "ListWorkers", fullMethod: ateapi.Control_ListWorkers_FullMethodName, req: &ateapi.ListWorkersRequest{}, - want: []check{{RelationCanListWorkers, GlobalRootObject}}, + want: []check{{relation: RelationCanListWorkers, object: GlobalRootObject}}, }, { name: "GetWorker", fullMethod: ateapi.Control_GetWorker_FullMethodName, req: &ateapi.GetWorkerRequest{Worker: workerRef}, - want: []check{{RelationCanGet, "worker:w-1"}}, + want: []check{{relation: RelationCanGet, object: "worker:w-1"}}, }, { name: "UpdateWorker", @@ -241,37 +291,87 @@ func TestDefaultRPCPermissions(t *testing.T) { req: &ateapi.UpdateWorkerRequest{Worker: &ateapi.Worker{ Metadata: &ateapi.ResourceMetadata{Name: "w-1"}, }}, - want: []check{{RelationCanUpdate, "worker:w-1"}}, + want: []check{{relation: RelationCanUpdate, object: "worker:w-1"}}, }, { name: "DeleteWorker", fullMethod: ateapi.Control_DeleteWorker_FullMethodName, req: &ateapi.DeleteWorkerRequest{Worker: workerRef}, - want: []check{{RelationCanDelete, "worker:w-1"}}, + want: []check{{relation: RelationCanDelete, object: "worker:w-1"}}, }, { name: "DrainWorker", fullMethod: ateapi.Control_DrainWorker_FullMethodName, req: &ateapi.DrainWorkerRequest{Worker: workerRef}, - want: []check{{RelationCanDrain, "worker:w-1"}}, + want: []check{{relation: RelationCanDrain, object: "worker:w-1"}}, }, { name: "MarkWorkerAvailable", fullMethod: ateapi.Control_MarkWorkerAvailable_FullMethodName, req: &ateapi.MarkWorkerAvailableRequest{Worker: workerRef}, - want: []check{{RelationCanUpdate, "worker:w-1"}}, + want: []check{{relation: RelationCanUpdate, object: "worker:w-1"}}, }, { name: "MarkWorkerUnavailable", fullMethod: ateapi.Control_MarkWorkerUnavailable_FullMethodName, req: &ateapi.MarkWorkerUnavailableRequest{Worker: workerRef}, - want: []check{{RelationCanUpdate, "worker:w-1"}}, + want: []check{{relation: RelationCanUpdate, object: "worker:w-1"}}, }, { name: "ListWorkerActorAssignments", fullMethod: ateapi.Control_ListWorkerActorAssignments_FullMethodName, req: &ateapi.ListWorkerActorAssignmentsRequest{Worker: workerRef}, - want: []check{{RelationCanListActorAssignments, "worker:w-1"}}, + want: []check{{relation: RelationCanListActorAssignments, object: "worker:w-1"}}, + }, + + // External volume classes. + { + name: "CreateExternalVolumeClass", + fullMethod: ateapi.Control_CreateExternalVolumeClass_FullMethodName, + req: &ateapi.CreateExternalVolumeClassRequest{}, + want: []check{{relation: RelationCanCreateExternalVolumeClass, object: GlobalRootObject}}, + }, + { + name: "ListExternalVolumeClasses", + fullMethod: ateapi.Control_ListExternalVolumeClasses_FullMethodName, + req: &ateapi.ListExternalVolumeClassesRequest{}, + want: []check{{relation: RelationCanListExternalVolumeClasses, object: GlobalRootObject}}, + }, + { + name: "GetExternalVolumeClass", + fullMethod: ateapi.Control_GetExternalVolumeClass_FullMethodName, + req: &ateapi.GetExternalVolumeClassRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}}, + want: []check{{relation: RelationCanGet, object: "external_volume_class:nfs-gold"}}, + }, + { + name: "DeleteExternalVolumeClass", + fullMethod: ateapi.Control_DeleteExternalVolumeClass_FullMethodName, + req: &ateapi.DeleteExternalVolumeClassRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}}, + want: []check{{relation: RelationCanDelete, object: "external_volume_class:nfs-gold"}}, + }, + { + name: "GetExternalVolumeClassAccessPolicy", + fullMethod: ateapi.Control_GetExternalVolumeClassAccessPolicy_FullMethodName, + req: &ateapi.GetExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}}, + want: []check{{relation: RelationCanGetAccessPolicy, object: "external_volume_class:nfs-gold"}}, + }, + { + name: "CreateExternalVolumeClassAccessPolicy", + fullMethod: ateapi.Control_CreateExternalVolumeClassAccessPolicy_FullMethodName, + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}}, + want: []check{{relation: RelationCanCreateAccessPolicy, object: "external_volume_class:nfs-gold"}}, + }, + { + name: "UpdateExternalVolumeClassAccessPolicy", + fullMethod: ateapi.Control_UpdateExternalVolumeClassAccessPolicy_FullMethodName, + req: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}}, + want: []check{{relation: RelationCanUpdateAccessPolicy, object: "external_volume_class:nfs-gold"}}, + }, + { + name: "DeleteExternalVolumeClassAccessPolicy", + fullMethod: ateapi.Control_DeleteExternalVolumeClassAccessPolicy_FullMethodName, + req: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs-gold"}}, + want: []check{{relation: RelationCanDeleteAccessPolicy, object: "external_volume_class:nfs-gold"}}, }, // Actor identity credentials. @@ -279,7 +379,7 @@ func TestDefaultRPCPermissions(t *testing.T) { name: "MintActorJWT", fullMethod: ateapi.Control_MintActorJwt_FullMethodName, req: &ateapi.MintActorJwtRequest{Actor: actorRef}, - want: []check{{RelationCanMintActorJWT, "actor:team-a/runner"}}, + want: []check{{relation: RelationCanMintActorJWT, object: "actor:team-a/runner"}}, }, // Tags. @@ -290,25 +390,25 @@ func TestDefaultRPCPermissions(t *testing.T) { Metadata: &ateapi.ResourceMetadata{Atespace: "other", Name: "v1"}, SourceActor: actorRef, }}, - want: []check{{RelationCanCreateTag, "atespace:team-a"}}, + want: []check{{relation: RelationCanCreateTag, object: "atespace:team-a"}}, }, { name: "GetTag", fullMethod: ateapi.Control_GetTag_FullMethodName, req: &ateapi.GetTagRequest{Tag: tagRef}, - want: []check{{RelationCanGet, "tag:team-a/v1"}}, + want: []check{{relation: RelationCanGet, object: "tag:team-a/v1"}}, }, { name: "ListTags in an atespace", fullMethod: ateapi.Control_ListTags_FullMethodName, req: &ateapi.ListTagsRequest{Atespace: "team-a"}, - want: []check{{RelationCanListTags, "atespace:team-a"}}, + want: []check{{relation: RelationCanListTags, object: "atespace:team-a"}}, }, { name: "ListTags across all atespaces", fullMethod: ateapi.Control_ListTags_FullMethodName, req: &ateapi.ListTagsRequest{}, - want: []check{{RelationCanListTags, GlobalRootObject}}, + want: []check{{relation: RelationCanListTags, object: GlobalRootObject}}, }, { name: "UpdateTag", @@ -316,13 +416,13 @@ func TestDefaultRPCPermissions(t *testing.T) { req: &ateapi.UpdateTagRequest{Tag: &ateapi.Tag{ Metadata: &ateapi.ResourceMetadata{Atespace: "team-a", Name: "v1"}, }}, - want: []check{{RelationCanUpdate, "tag:team-a/v1"}}, + want: []check{{relation: RelationCanUpdate, object: "tag:team-a/v1"}}, }, { name: "DeleteTag", fullMethod: ateapi.Control_DeleteTag_FullMethodName, req: &ateapi.DeleteTagRequest{Tag: tagRef}, - want: []check{{RelationCanDelete, "tag:team-a/v1"}}, + want: []check{{relation: RelationCanDelete, object: "tag:team-a/v1"}}, }, } @@ -385,6 +485,20 @@ func TestDefaultRPCPermissions_MalformedIdentifierFailsClosed(t *testing.T) { req: &ateapi.CreateActorTemplateRequest{}, wantField: "actor_template.metadata.atespace", }, + { + name: "CreateActorTemplate with invalid external volume class name", + fullMethod: ateapi.Control_CreateActorTemplate_FullMethodName, + req: &ateapi.CreateActorTemplateRequest{ActorTemplate: &ateapi.ActorTemplate{ + Metadata: &ateapi.ResourceMetadata{Atespace: "team-a", Name: "tmpl"}, + Volumes: []*ateapi.Volume{{ + Name: "data", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "Bad_Name"}, + }}, + }}, + }}, + wantField: "actor_template.volumes[0].external.template.external_volume_class.name", + }, { name: "GetActorTemplate with a name containing a tab", fullMethod: ateapi.Control_GetActorTemplate_FullMethodName, @@ -591,6 +705,42 @@ func TestDefaultRPCPermissions_MalformedIdentifierFailsClosed(t *testing.T) { req: &ateapi.ListWorkerActorAssignmentsRequest{Worker: &ateapi.ObjectRef{}}, wantField: "worker.name", }, + { + name: "GetExternalVolumeClass without a class", + fullMethod: ateapi.Control_GetExternalVolumeClass_FullMethodName, + req: &ateapi.GetExternalVolumeClassRequest{}, + wantField: "external_volume_class.name", + }, + { + name: "DeleteExternalVolumeClass with an invalid name", + fullMethod: ateapi.Control_DeleteExternalVolumeClass_FullMethodName, + req: &ateapi.DeleteExternalVolumeClassRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs/gold"}}, + wantField: "external_volume_class.name", + }, + { + name: "GetExternalVolumeClassAccessPolicy without a class", + fullMethod: ateapi.Control_GetExternalVolumeClassAccessPolicy_FullMethodName, + req: &ateapi.GetExternalVolumeClassAccessPolicyRequest{}, + wantField: "external_volume_class.name", + }, + { + name: "CreateExternalVolumeClassAccessPolicy without a name", + fullMethod: ateapi.Control_CreateExternalVolumeClassAccessPolicy_FullMethodName, + req: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{}}, + wantField: "external_volume_class.name", + }, + { + name: "UpdateExternalVolumeClassAccessPolicy with an invalid name", + fullMethod: ateapi.Control_UpdateExternalVolumeClassAccessPolicy_FullMethodName, + req: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "Nfs-Gold"}}, + wantField: "external_volume_class.name", + }, + { + name: "DeleteExternalVolumeClassAccessPolicy with an invalid name", + fullMethod: ateapi.Control_DeleteExternalVolumeClassAccessPolicy_FullMethodName, + req: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs/gold"}}, + wantField: "external_volume_class.name", + }, { name: "MintActorJWT without an actor", fullMethod: ateapi.Control_MintActorJwt_FullMethodName, diff --git a/cmd/ateapi/internal/controlapi/access_policy.go b/cmd/ateapi/internal/controlapi/access_policy.go index d0dac32b8f..bd365c6525 100644 --- a/cmd/ateapi/internal/controlapi/access_policy.go +++ b/cmd/ateapi/internal/controlapi/access_policy.go @@ -43,7 +43,7 @@ func (s *RPCService) CreateGlobalAccessPolicy(ctx context.Context, req *ateapi.C func (s *ServiceImpl) CreateGlobalAccessPolicy(ctx context.Context, policy *ateapi.AccessPolicy) (*ateapi.AccessPolicy, error) { created, err := s.store.CreateGlobalAccessPolicy(ctx, policy) - return mapAccessPolicyWrite(created, err) + return mapAccessPolicyWrite(created, err, "") } func (s *RPCService) GetGlobalAccessPolicy(ctx context.Context, req *ateapi.GetGlobalAccessPolicyRequest) (*ateapi.AccessPolicy, error) { @@ -84,7 +84,7 @@ func (s *ServiceImpl) UpdateGlobalAccessPolicy(ctx context.Context, precondition errs := apivalidation.ValidateGlobalAccessPolicyUpdate(ctx, field.NewPath("access_policy"), toUpdate, oldVal) return resources.ToAPIError(errs) }) - return mapAccessPolicyWrite(updated, err) + return mapAccessPolicyWrite(updated, err, "") } func (s *RPCService) CreateAtespaceAccessPolicy(ctx context.Context, req *ateapi.CreateAtespaceAccessPolicyRequest) (*ateapi.AccessPolicy, error) { @@ -101,7 +101,7 @@ func (s *RPCService) CreateAtespaceAccessPolicy(ctx context.Context, req *ateapi func (s *ServiceImpl) CreateAtespaceAccessPolicy(ctx context.Context, name string, policy *ateapi.AccessPolicy) (*ateapi.AccessPolicy, error) { created, err := s.store.CreateAtespaceAccessPolicy(ctx, name, policy) - return mapAccessPolicyWrite(created, err) + return mapAccessPolicyWrite(created, err, "parent Atespace does not exist") } func (s *RPCService) GetAtespaceAccessPolicy(ctx context.Context, req *ateapi.GetAtespaceAccessPolicyRequest) (*ateapi.AccessPolicy, error) { @@ -142,7 +142,7 @@ func (s *ServiceImpl) UpdateAtespaceAccessPolicy(ctx context.Context, name strin errs := apivalidation.ValidateAtespaceAccessPolicyUpdate(ctx, field.NewPath("access_policy"), toUpdate, oldVal) return resources.ToAPIError(errs) }) - return mapAccessPolicyWrite(updated, err) + return mapAccessPolicyWrite(updated, err, "parent Atespace does not exist") } func (s *RPCService) DeleteAtespaceAccessPolicy(ctx context.Context, req *ateapi.DeleteAtespaceAccessPolicyRequest) (*ateapi.AccessPolicy, error) { @@ -154,7 +154,7 @@ func (s *RPCService) DeleteAtespaceAccessPolicy(ctx context.Context, req *ateapi func (s *ServiceImpl) DeleteAtespaceAccessPolicy(ctx context.Context, name string, precondition store.DeletePreconditions) (*ateapi.AccessPolicy, error) { deleted, err := s.store.DeleteAtespaceAccessPolicy(ctx, name, precondition) - return mapAccessPolicyWrite(deleted, err) + return mapAccessPolicyWrite(deleted, err, "parent Atespace does not exist") } func replaceAccessPolicy(policy *ateapi.AccessPolicy) func(*ateapi.AccessPolicy) error { @@ -168,7 +168,7 @@ func replaceAccessPolicy(policy *ateapi.AccessPolicy) func(*ateapi.AccessPolicy) } } -func mapAccessPolicyWrite(policy *ateapi.AccessPolicy, err error) (*ateapi.AccessPolicy, error) { +func mapAccessPolicyWrite(policy *ateapi.AccessPolicy, err error, preconditionMsg string) (*ateapi.AccessPolicy, error) { switch { case err == nil: return policy, nil @@ -182,8 +182,8 @@ func mapAccessPolicyWrite(policy *ateapi.AccessPolicy, err error) (*ateapi.Acces return nil, apierror.Aborted("AccessPolicy UID conflict") case errors.Is(err, store.ErrPreconditionRequired): return nil, apierror.InvalidArgument("AccessPolicy UID and version are required") - case errors.Is(err, store.ErrFailedPrecondition): - return nil, apierror.FailedPrecondition("parent Atespace does not exist") + case errors.Is(err, store.ErrFailedPrecondition) && preconditionMsg != "": + return nil, apierror.FailedPrecondition("%s", preconditionMsg) default: return nil, fmt.Errorf("while writing AccessPolicy: %w", err) } diff --git a/cmd/ateapi/internal/controlapi/access_policy_errors_test.go b/cmd/ateapi/internal/controlapi/access_policy_errors_test.go index cc6dbf7101..67480c012f 100644 --- a/cmd/ateapi/internal/controlapi/access_policy_errors_test.go +++ b/cmd/ateapi/internal/controlapi/access_policy_errors_test.go @@ -17,6 +17,7 @@ package controlapi import ( "errors" "fmt" + "strings" "testing" "go.ate.dev/substrate/cmd/ateapi/internal/store" @@ -32,20 +33,26 @@ func TestMapAccessPolicyWrite_Codes(t *testing.T) { tests := []struct { name string err error + msg string want codes.Code }{ - {name: "nonstandard backend code", err: openFGAErr, want: codes.Internal}, - {name: "wrapped nonstandard backend code", err: fmt.Errorf("reconciling: %w", openFGAErr), want: codes.Internal}, - {name: "apierror passes through", err: apierror.InvalidArgument("bad"), want: codes.InvalidArgument}, - {name: "plain error", err: errors.New("boom"), want: codes.Internal}, - {name: "not found", err: store.ErrNotFound, want: codes.NotFound}, + {name: "nonstandard backend code", err: openFGAErr, msg: "custom precondition message", want: codes.Internal}, + {name: "wrapped nonstandard backend code", err: fmt.Errorf("reconciling: %w", openFGAErr), msg: "custom precondition message", want: codes.Internal}, + {name: "apierror passes through", err: apierror.InvalidArgument("bad"), msg: "custom precondition message", want: codes.InvalidArgument}, + {name: "plain error", err: errors.New("boom"), msg: "custom precondition message", want: codes.Internal}, + {name: "not found", err: store.ErrNotFound, msg: "custom precondition message", want: codes.NotFound}, + {name: "failed precondition", err: store.ErrFailedPrecondition, msg: "custom precondition message", want: codes.FailedPrecondition}, + {name: "unexpected failed precondition falls through", err: store.ErrFailedPrecondition, msg: "", want: codes.Internal}, } for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { - _, err := mapAccessPolicyWrite(nil, tc.err) + _, err := mapAccessPolicyWrite(nil, tc.err, tc.msg) if got := apierror.Code(err); got != tc.want { t.Errorf("mapAccessPolicyWrite(%v) code = %v, want %v", tc.err, got, tc.want) } + if tc.want == codes.FailedPrecondition && !strings.Contains(err.Error(), tc.msg) { + t.Errorf("mapAccessPolicyWrite(ErrFailedPrecondition) = %q, want %q", err.Error(), tc.msg) + } }) } } diff --git a/cmd/ateapi/internal/controlapi/access_policy_test.go b/cmd/ateapi/internal/controlapi/access_policy_test.go index 900c98eb12..a037dfdf3f 100644 --- a/cmd/ateapi/internal/controlapi/access_policy_test.go +++ b/cmd/ateapi/internal/controlapi/access_policy_test.go @@ -19,14 +19,17 @@ import ( "strings" "testing" + "github.com/google/go-cmp/cmp" "go.ate.dev/substrate/api/ateapi/v1" "go.ate.dev/substrate/cmd/ateapi/internal/authz" "go.ate.dev/substrate/cmd/ateapi/internal/store/storetest" "go.ate.dev/substrate/internal/apierror" + "go.ate.dev/substrate/internal/preview" "go.ate.dev/substrate/internal/principal" "go.ate.dev/substrate/internal/resources" "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/protobuf/testing/protocmp" ) func TestAccessPolicy_GlobalAndAtespaceGovernance(t *testing.T) { @@ -48,7 +51,7 @@ func TestAccessPolicy_GlobalAndAtespaceGovernance(t *testing.T) { } persistence.SetPolicyManager(policyManager) - svc := NewRPCService(persistence, nil, nil, nil, nil, nil, "", nil, nil, "", nil, "") + svc := NewRPCService(persistence, nil, nil, nil, nil, "", nil, nil, "", nil, "") interceptor := authz.UnaryServerInterceptor(authorizer) userCtx := func(id string) context.Context { @@ -345,3 +348,318 @@ func TestAccessPolicy_GlobalAndAtespaceGovernance(t *testing.T) { t.Fatalf("expected Aborted UID conflict for UpdateAtespaceAccessPolicy with old UID, got %v", err) } } + +func TestAccessPolicy_ExternalVolumeClassGovernance(t *testing.T) { + preview.InitForTest(t, string(preview.GateExternalVolumes)) + persistence := storetest.SetupPostgresPersistence(t) + ctx := context.Background() + + pool := persistence.Pool() + fgaServer, err := authz.NewOpenFGAServer(pool) + if err != nil { + t.Fatalf("NewOpenFGAServer failed: %v", err) + } + t.Cleanup(fgaServer.Close) + + authorizer, policyManager, err := authz.New(ctx, pool, fgaServer, []string{"alice@example.com"}, storetest.DefaultSystemPrincipals()) + if err != nil { + t.Fatalf("authz.New failed: %v", err) + } + persistence.SetPolicyManager(policyManager) + + svc := NewRPCService(persistence, nil, nil, nil, nil, "", nil, nil, "", nil, "") + interceptor := authz.UnaryServerInterceptor(authorizer) + + userCtx := func(id string) context.Context { + return principal.InjectContext(ctx, principal.PrincipalInfo{ID: id, Kind: principal.KindJWT}) + } + aliceCtx := userCtx("alice@example.com") + bobCtx := userCtx("bob@example.com") + charlieCtx := userCtx("charlie@example.com") + daveCtx := userCtx("dave@example.com") + + invoke := func(c context.Context, method string, req any, handler func(context.Context, any) (any, error)) (any, error) { + return interceptor(c, req, &grpc.UnaryServerInfo{FullMethod: method}, handler) + } + getClass := func(c context.Context, name string) error { + _, err := invoke(c, ateapi.Control_GetExternalVolumeClass_FullMethodName, &ateapi.GetExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: name}, + }, func(c context.Context, r any) (any, error) { + return svc.GetExternalVolumeClass(c, r.(*ateapi.GetExternalVolumeClassRequest)) + }) + return err + } + getClassPol := func(c context.Context, name string) (*ateapi.AccessPolicy, error) { + got, err := invoke(c, ateapi.Control_GetExternalVolumeClassAccessPolicy_FullMethodName, &ateapi.GetExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: name}, + Name: resources.SingletonName, + }, func(c context.Context, r any) (any, error) { + return svc.GetExternalVolumeClassAccessPolicy(c, r.(*ateapi.GetExternalVolumeClassAccessPolicyRequest)) + }) + if err != nil { + return nil, err + } + return got.(*ateapi.AccessPolicy), nil + } + createClassPol := func(c context.Context, req *ateapi.CreateExternalVolumeClassAccessPolicyRequest) (*ateapi.AccessPolicy, error) { + got, err := invoke(c, ateapi.Control_CreateExternalVolumeClassAccessPolicy_FullMethodName, req, func(c context.Context, r any) (any, error) { + return svc.CreateExternalVolumeClassAccessPolicy(c, r.(*ateapi.CreateExternalVolumeClassAccessPolicyRequest)) + }) + if err != nil { + return nil, err + } + return got.(*ateapi.AccessPolicy), nil + } + updateClassPol := func(c context.Context, req *ateapi.UpdateExternalVolumeClassAccessPolicyRequest) (*ateapi.AccessPolicy, error) { + got, err := invoke(c, ateapi.Control_UpdateExternalVolumeClassAccessPolicy_FullMethodName, req, func(c context.Context, r any) (any, error) { + return svc.UpdateExternalVolumeClassAccessPolicy(c, r.(*ateapi.UpdateExternalVolumeClassAccessPolicyRequest)) + }) + if err != nil { + return nil, err + } + return got.(*ateapi.AccessPolicy), nil + } + deleteClassPol := func(c context.Context, req *ateapi.DeleteExternalVolumeClassAccessPolicyRequest) (*ateapi.AccessPolicy, error) { + got, err := invoke(c, ateapi.Control_DeleteExternalVolumeClassAccessPolicy_FullMethodName, req, func(c context.Context, r any) (any, error) { + return svc.DeleteExternalVolumeClassAccessPolicy(c, r.(*ateapi.DeleteExternalVolumeClassAccessPolicyRequest)) + }) + if err != nil { + return nil, err + } + return got.(*ateapi.AccessPolicy), nil + } + + // Seed global viewer Dave, class nfs-gold, atespace team-alpha, and + // team-alpha's policy granting Charlie editor and Bob viewer. + if _, err := svc.CreateGlobalAccessPolicy(aliceCtx, &ateapi.CreateGlobalAccessPolicyRequest{ + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleViewer, Members: []string{"user:dave@example.com"}}, + }, + }, + }); err != nil { + t.Fatalf("CreateGlobalAccessPolicy failed: %v", err) + } + if _, err := svc.CreateExternalVolumeClass(aliceCtx, &ateapi.CreateExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "nfs-gold"}, + DriverName: "nfs.csi.k8s.io", + }, + }); err != nil { + t.Fatalf("CreateExternalVolumeClass(nfs-gold) failed: %v", err) + } + if _, err := svc.CreateAtespace(aliceCtx, &ateapi.CreateAtespaceRequest{ + Atespace: &ateapi.Atespace{Metadata: &ateapi.ResourceMetadata{Name: "team-alpha"}}, + }); err != nil { + t.Fatalf("CreateAtespace(team-alpha) failed: %v", err) + } + if _, err := svc.CreateAtespaceAccessPolicy(aliceCtx, &ateapi.CreateAtespaceAccessPolicyRequest{ + Atespace: &ateapi.ObjectRef{Name: "team-alpha"}, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleEditor, Members: []string{"user:charlie@example.com"}}, + {Role: authz.RoleViewer, Members: []string{"user:bob@example.com"}}, + }, + }, + }); err != nil { + t.Fatalf("CreateAtespaceAccessPolicy(team-alpha) failed: %v", err) + } + + // 1. Before grant: Charlie (team-alpha editor) cannot Get nfs-gold or manage its policy. + if err := getClass(charlieCtx, "nfs-gold"); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Charlie denied GetExternalVolumeClass before grant, got %v", err) + } + if _, err := getClassPol(aliceCtx, "nfs-gold"); apierror.Code(err) != codes.NotFound { + t.Fatalf("expected NotFound before CreateExternalVolumeClassAccessPolicy, got %v", err) + } + + ref := &ateapi.ObjectRef{Name: "nfs-gold"} + grantReq := &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:team-alpha"}}, + }, + }, + } + if _, err := createClassPol(charlieCtx, grantReq); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Charlie denied CreateExternalVolumeClassAccessPolicy, got %v", err) + } + if _, err := createClassPol(daveCtx, grantReq); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Dave (global viewer) denied CreateExternalVolumeClassAccessPolicy, got %v", err) + } + + // 2. Grant team-alpha access to nfs-gold: global viewer Dave can read the + // class policy (but not mutate it), Charlie (editor) gains can_get on + // nfs-gold, while Bob (viewer) stays denied and Charlie still cannot read or + // mutate nfs-gold's access policy. + created, err := createClassPol(aliceCtx, grantReq) + if err != nil { + t.Fatalf("CreateExternalVolumeClassAccessPolicy failed: %v", err) + } + gotByViewer, err := getClassPol(daveCtx, "nfs-gold") + if err != nil { + t.Fatalf("expected Dave (global viewer) allowed GetExternalVolumeClassAccessPolicy, got %v", err) + } + if diff := cmp.Diff(created, gotByViewer, protocmp.Transform()); diff != "" { + t.Fatalf("GetExternalVolumeClassAccessPolicy mismatch (-created +got):\n%s", diff) + } + if _, err := updateClassPol(daveCtx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: created, + }); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Dave (global viewer) denied UpdateExternalVolumeClassAccessPolicy, got %v", err) + } + if _, err := deleteClassPol(daveCtx, &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Dave (global viewer) denied DeleteExternalVolumeClassAccessPolicy, got %v", err) + } + if err := getClass(charlieCtx, "nfs-gold"); err != nil { + t.Fatalf("expected Charlie (allowed-atespace editor) allowed GetExternalVolumeClass, got %v", err) + } + if err := getClass(bobCtx, "nfs-gold"); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Bob (allowed-atespace viewer) denied GetExternalVolumeClass, got %v", err) + } + if _, err := getClassPol(charlieCtx, "nfs-gold"); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Charlie denied GetExternalVolumeClassAccessPolicy, got %v", err) + } + if _, err := updateClassPol(charlieCtx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: created, + }); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Charlie denied UpdateExternalVolumeClassAccessPolicy, got %v", err) + } + if _, err := deleteClassPol(charlieCtx, &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Charlie denied DeleteExternalVolumeClassAccessPolicy, got %v", err) + } + + // 3. Revoke via Update (empty bindings) -> Charlie loses GetExternalVolumeClass. + revoked, err := updateClassPol(aliceCtx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: &ateapi.AccessPolicy{Metadata: created.GetMetadata()}, + }) + if err != nil || revoked.GetMetadata().GetVersion() != 2 { + t.Fatalf("UpdateExternalVolumeClassAccessPolicy revoke = %v, %v; want version 2", revoked, err) + } + if err := getClass(charlieCtx, "nfs-gold"); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Charlie denied GetExternalVolumeClass after revoke, got %v", err) + } + + // 4. Re-grant via Update, then revoke via DeleteExternalVolumeClassAccessPolicy. + if _, err := updateClassPol(aliceCtx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: revoked.GetMetadata(), + Bindings: grantReq.GetAccessPolicy().GetBindings(), + }, + }); err != nil { + t.Fatalf("UpdateExternalVolumeClassAccessPolicy re-grant failed: %v", err) + } + if err := getClass(charlieCtx, "nfs-gold"); err != nil { + t.Fatalf("expected Charlie allowed GetExternalVolumeClass after re-grant, got %v", err) + } + if _, err := deleteClassPol(aliceCtx, &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }); err != nil { + t.Fatalf("DeleteExternalVolumeClassAccessPolicy failed: %v", err) + } + if err := getClass(charlieCtx, "nfs-gold"); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Charlie denied GetExternalVolumeClass after policy delete, got %v", err) + } + + // 5. CreateActorTemplate enforces can_reference for every ExternalVolumeClass + // referenced by the template. Even global owner Alice cannot bypass it + // because can_reference is checked with subject atespace:. + if _, err := invoke(aliceCtx, ateapi.Control_CreateExternalVolumeClass_FullMethodName, &ateapi.CreateExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "ssd-fast"}, + DriverName: "pd.csi.storage.gke.io", + }, + }, func(c context.Context, r any) (any, error) { + return svc.CreateExternalVolumeClass(c, r.(*ateapi.CreateExternalVolumeClassRequest)) + }); err != nil { + t.Fatalf("CreateExternalVolumeClass(ssd-fast) failed: %v", err) + } + checkCreateTemplate := func(ctx context.Context, classes ...string) error { + vols := make([]*ateapi.Volume, 0, len(classes)) + for _, c := range classes { + vols = append(vols, &ateapi.Volume{ + Name: "vol-" + c, + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ + CapacityBytes: 1 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: c}, + }}, + }) + } + req := &ateapi.CreateActorTemplateRequest{ + ActorTemplate: &ateapi.ActorTemplate{ + Metadata: &ateapi.ResourceMetadata{Atespace: "team-alpha", Name: "tmpl"}, + Volumes: vols, + }, + } + _, err := invoke(ctx, ateapi.Control_CreateActorTemplate_FullMethodName, req, func(context.Context, any) (any, error) { + return &ateapi.ActorTemplate{}, nil + }) + return err + } + + // Zero external volume classes: allowed for editor Charlie and owner Alice. + if err := checkCreateTemplate(charlieCtx); err != nil { + t.Fatalf("expected Charlie allowed CreateActorTemplate without external volume classes, got %v", err) + } + // Ungranted class: denied for both editor Charlie and bootstrap global owner Alice. + if err := checkCreateTemplate(charlieCtx, "nfs-gold"); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Charlie denied CreateActorTemplate on ungranted class, got %v", err) + } + if err := checkCreateTemplate(aliceCtx, "nfs-gold"); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected bootstrap owner Alice denied CreateActorTemplate on ungranted class, got %v", err) + } + // Grant team-alpha on nfs-gold: 1-class template succeeds, 2-class template still denied. + if _, err := createClassPol(aliceCtx, grantReq); err != nil { + t.Fatalf("CreateExternalVolumeClassAccessPolicy(nfs-gold) failed: %v", err) + } + if err := checkCreateTemplate(charlieCtx, "nfs-gold"); err != nil { + t.Fatalf("expected Charlie allowed CreateActorTemplate on granted class, got %v", err) + } + if err := checkCreateTemplate(aliceCtx, "nfs-gold"); err != nil { + t.Fatalf("expected Alice allowed CreateActorTemplate on granted class, got %v", err) + } + if err := checkCreateTemplate(charlieCtx, "nfs-gold", "ssd-fast"); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Charlie denied CreateActorTemplate when second class is ungranted, got %v", err) + } + // Grant team-alpha on ssd-fast too: 2-class template succeeds. + if _, err := createClassPol(aliceCtx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "ssd-fast"}, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: resources.SingletonName}, + Bindings: []*ateapi.Binding{{ + Role: authz.RoleAllowedAtespace, + Members: []string{"atespace:team-alpha"}, + }}, + }, + }); err != nil { + t.Fatalf("CreateExternalVolumeClassAccessPolicy(ssd-fast) failed: %v", err) + } + if err := checkCreateTemplate(charlieCtx, "nfs-gold", "ssd-fast"); err != nil { + t.Fatalf("expected Charlie allowed CreateActorTemplate when both classes are granted, got %v", err) + } + // Delete nfs-gold policy: 1-class template is denied again. + if _, err := deleteClassPol(aliceCtx, &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }); err != nil { + t.Fatalf("DeleteExternalVolumeClassAccessPolicy(nfs-gold) failed: %v", err) + } + if err := checkCreateTemplate(charlieCtx, "nfs-gold"); apierror.Code(err) != codes.PermissionDenied { + t.Fatalf("expected Charlie denied CreateActorTemplate after policy delete, got %v", err) + } +} diff --git a/cmd/ateapi/internal/controlapi/actor.go b/cmd/ateapi/internal/controlapi/actor.go index 9b690a9f12..abf9d6ce3d 100644 --- a/cmd/ateapi/internal/controlapi/actor.go +++ b/cmd/ateapi/internal/controlapi/actor.go @@ -109,7 +109,7 @@ func (s *ServiceImpl) CreateActor(ctx context.Context, inActor *ateapi.Actor) (* // Volume creation is completed asynchronously after the actor is recorded. var initVols []*ateapi.ExternalVolumeStatus - if iv, err := initialExternalVolumes(ctx, s.storageClassLister, template); err != nil { + if iv, err := initialExternalVolumes(ctx, s, template); err != nil { return nil, err } else if preview.IsEnabledFor(ctx, preview.GateExternalVolumes) { initVols = iv diff --git a/cmd/ateapi/internal/controlapi/actor_template_test.go b/cmd/ateapi/internal/controlapi/actor_template_test.go index 66aa77778a..cd7de8bf6b 100644 --- a/cmd/ateapi/internal/controlapi/actor_template_test.go +++ b/cmd/ateapi/internal/controlapi/actor_template_test.go @@ -56,7 +56,7 @@ func validActorTemplate(mutations ...func(*ateapi.ActorTemplate)) *ateapi.ActorT // while the atespace is missing, and succeeds once the atespace exists. func TestCreateActorTemplate(t *testing.T) { persistence := newTestPersistence(t) - impl := newServiceImpl(persistence, nil) + impl := newServiceImpl(persistence) impl.clusterSnapshotLocation = "gs://cluster-bucket/" s := &RPCService{impl: impl} ctx := context.Background() @@ -125,7 +125,7 @@ func TestCreateActorTemplate_RequiresSnapshotLocation(t *testing.T) { t.Run(tt.name, func(t *testing.T) { preview.InitForTest(t, tt.gates...) persistence := newTestPersistence(t) - impl := newServiceImpl(persistence, nil) + impl := newServiceImpl(persistence) impl.clusterSnapshotLocation = tt.clusterSnapshotLocation s := &RPCService{impl: impl} ctx := context.Background() @@ -152,7 +152,7 @@ func TestCreateActorTemplate_RequiresSnapshotLocation(t *testing.T) { // the only guard. func TestCreateActorTemplateIgnoresServerOwnedFields(t *testing.T) { persistence := newTestPersistence(t) - impl := newServiceImpl(persistence, nil) + impl := newServiceImpl(persistence) impl.clusterSnapshotLocation = "gs://cluster-bucket/" s := &RPCService{impl: impl} ctx := context.Background() @@ -199,7 +199,7 @@ func TestCreateActorTemplateIgnoresServerOwnedFields(t *testing.T) { // snapshot_config is optional: create fills an omitted one with every default. func TestCreateActorTemplateDefaultsOmittedSnapshotConfig(t *testing.T) { persistence := newTestPersistence(t) - impl := newServiceImpl(persistence, nil) + impl := newServiceImpl(persistence) impl.clusterSnapshotLocation = "gs://cluster-bucket/" s := &RPCService{impl: impl} ctx := context.Background() @@ -276,7 +276,7 @@ func TestDeleteActorTemplate(t *testing.T) { tagRef := resources.TagRefFromTag(tag) tagURI := mustReservedTagSnapshotURI(t, tag) objects.PutSnapshot(t, tagURI, "manifest.json") - svc := &RPCService{impl: newServiceImpl(persistence, nil), actorWorkflow: workflow, objectStorePlugin: objectstoreplugintest.ControlClient(objects)} + svc := &RPCService{impl: newServiceImpl(persistence), actorWorkflow: workflow, objectStorePlugin: objectstoreplugintest.ControlClient(objects)} // The handler must clean up an active golden actor. mustUpdateActorStatus(t, ctx, persistence, actor, func(s *ateapi.ActorStatus) { s.State = ateapi.ActorState_ACTOR_STATE_RUNNING diff --git a/cmd/ateapi/internal/controlapi/actor_test.go b/cmd/ateapi/internal/controlapi/actor_test.go index 4787e0f2d5..9e42f064e2 100644 --- a/cmd/ateapi/internal/controlapi/actor_test.go +++ b/cmd/ateapi/internal/controlapi/actor_test.go @@ -306,7 +306,7 @@ func TestUpdateActor_RepointTemplate(t *testing.T) { ActorTemplate: &ateapi.ObjectRef{Atespace: testAtespace, Name: "tmpl-a"}, Status: &ateapi.ActorStatus{State: ateapi.ActorState_ACTOR_STATE_SUSPENDED}, }) - svc := &RPCService{impl: newServiceImpl(persistence, nil)} + svc := &RPCService{impl: newServiceImpl(persistence)} // Repointing at a template that does not exist is rejected. _, err := svc.UpdateActor(ctx, &ateapi.UpdateActorRequest{Actor: &ateapi.Actor{ @@ -595,7 +595,7 @@ func TestUpdateActor_RepointTemplateStorageLocation(t *testing.T) { if tt.gateOff { preview.InitForTest(t) } - impl := newServiceImpl(persistence, nil) + impl := newServiceImpl(persistence) impl.clusterSnapshotLocation = tt.clusterSnapshotLocation svc := &RPCService{impl: impl} actor := storetest.MustCreateActor(t, ctx, persistence, &ateapi.Actor{ @@ -787,7 +787,7 @@ func TestUpdateActor_DeleteRecreateRace(t *testing.T) { } }, } - svc := &RPCService{impl: newServiceImpl(racing, nil)} + svc := &RPCService{impl: newServiceImpl(racing)} // The client asserts "only update the actor with uid A". original.WorkerSelector = &ateapi.Selector{MatchLabels: map[string]string{"tier": "paid"}} @@ -848,7 +848,7 @@ func TestUpdateActor_ConcurrentDisjointUpdates(t *testing.T) { } }, } - svc := &RPCService{impl: newServiceImpl(racing, nil)} + svc := &RPCService{impl: newServiceImpl(racing)} // Update operation is changing the worker_selector field, not the actor's state (like the concurrent op) // This update must fail: the racing update bumped the version. @@ -904,7 +904,7 @@ func rpcServiceWithActor(t *testing.T, actor *ateapi.Actor) (*RPCService, *ateap t.Cleanup(cleanup) created := storetest.MustCreateActor(t, context.Background(), persistence, actor) - return &RPCService{impl: newServiceImpl(persistence, nil)}, created + return &RPCService{impl: newServiceImpl(persistence)}, created } func TestCreateActor_DoesNotInheritGoldenEgressPolicy(t *testing.T) { @@ -922,7 +922,7 @@ func TestCreateActor_DoesNotInheritGoldenEgressPolicy(t *testing.T) { t.Run(tt.name, func(t *testing.T) { ctx := t.Context() persistence := newTestPersistence(t) - impl := newServiceImpl(persistence, nil) + impl := newServiceImpl(persistence) impl.clusterSnapshotLocation = "gs://cluster-bucket/" svc := &RPCService{impl: impl} storetest.MustCreateAtespace(t, ctx, persistence, "templates") diff --git a/cmd/ateapi/internal/controlapi/atespace_test.go b/cmd/ateapi/internal/controlapi/atespace_test.go index ad6296de2c..c094bb01e5 100644 --- a/cmd/ateapi/internal/controlapi/atespace_test.go +++ b/cmd/ateapi/internal/controlapi/atespace_test.go @@ -71,7 +71,7 @@ func TestAtespace_EndToEndOpenFGAScenarios(t *testing.T) { storeID := storesResp.GetStores()[0].GetId() svc := &RPCService{ - impl: newServiceImpl(persistence, nil), + impl: newServiceImpl(persistence), } interceptor := authz.UnaryServerInterceptor(authorizer) diff --git a/cmd/ateapi/internal/controlapi/external_volume_class.go b/cmd/ateapi/internal/controlapi/external_volume_class.go new file mode 100644 index 0000000000..d32a02a711 --- /dev/null +++ b/cmd/ateapi/internal/controlapi/external_volume_class.go @@ -0,0 +1,112 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package controlapi + +import ( + "context" + "errors" + "fmt" + + "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/cmd/ateapi/internal/apivalidation" + "go.ate.dev/substrate/cmd/ateapi/internal/defaults" + "go.ate.dev/substrate/cmd/ateapi/internal/store" + "go.ate.dev/substrate/internal/apierror" + "go.ate.dev/substrate/internal/resources" +) + +func (s *RPCService) CreateExternalVolumeClass(ctx context.Context, req *ateapi.CreateExternalVolumeClassRequest) (*ateapi.ExternalVolumeClass, error) { + class := req.GetExternalVolumeClass() + if class != nil { // otherwise validation will flag it + scrubResourceMetadataForCreate(class.Metadata) + defaults.Apply(class) + } + if errs := apivalidation.ValidateCreateExternalVolumeClassRequest(ctx, req); len(errs) > 0 { + return nil, resources.ToAPIError(errs) + } + return s.impl.CreateExternalVolumeClass(ctx, class) +} + +func (s *ServiceImpl) CreateExternalVolumeClass(ctx context.Context, class *ateapi.ExternalVolumeClass) (*ateapi.ExternalVolumeClass, error) { + stored, err := s.store.CreateExternalVolumeClass(ctx, class) + if errors.Is(err, store.ErrAlreadyExists) { + return nil, apierror.AlreadyExists("ExternalVolumeClass %s already exists", class.GetMetadata().GetName()) + } else if err != nil { + return nil, fmt.Errorf("while recording external volume class: %w", err) + } + return stored, nil +} + +func (s *RPCService) GetExternalVolumeClass(ctx context.Context, req *ateapi.GetExternalVolumeClassRequest) (*ateapi.ExternalVolumeClass, error) { + if errs := apivalidation.ValidateGetExternalVolumeClassRequest(ctx, req); len(errs) > 0 { + return nil, resources.ToAPIError(errs) + } + return s.impl.GetExternalVolumeClass(ctx, req.GetExternalVolumeClass().GetName()) +} + +func (s *ServiceImpl) GetExternalVolumeClass(ctx context.Context, name string) (*ateapi.ExternalVolumeClass, error) { + class, err := s.store.GetExternalVolumeClass(ctx, name) + if errors.Is(err, store.ErrNotFound) { + return nil, apierror.NotFound("ExternalVolumeClass %s not found", name) + } else if err != nil { + return nil, fmt.Errorf("while getting external volume class from DB: %w", err) + } + return class, nil +} + +func (s *RPCService) ListExternalVolumeClasses(ctx context.Context, req *ateapi.ListExternalVolumeClassesRequest) (*ateapi.ListExternalVolumeClassesResponse, error) { + if errs := apivalidation.ValidateListExternalVolumeClassesRequest(ctx, req); len(errs) > 0 { + return nil, resources.ToAPIError(errs) + } + page, err := s.impl.ListExternalVolumeClasses(ctx, toStoreListOptions(req.GetOptions())) + if err != nil { + return nil, err + } + return &ateapi.ListExternalVolumeClassesResponse{ + ExternalVolumeClasses: page.Items, + NextPageToken: page.NextPageToken, + }, nil +} + +func (s *ServiceImpl) ListExternalVolumeClasses(ctx context.Context, opts store.ListOptions) (store.ListResponse[*ateapi.ExternalVolumeClass], error) { + page, err := s.store.ListExternalVolumeClasses(ctx, opts) + if err != nil { + return page, mapListError(fmt.Errorf("while listing external volume classes in db: %w", err)) + } + return page, nil +} + +func (s *RPCService) DeleteExternalVolumeClass(ctx context.Context, req *ateapi.DeleteExternalVolumeClassRequest) (*ateapi.ExternalVolumeClass, error) { + if errs := apivalidation.ValidateDeleteExternalVolumeClassRequest(ctx, req); len(errs) > 0 { + return nil, resources.ToAPIError(errs) + } + return s.impl.DeleteExternalVolumeClass(ctx, req.GetExternalVolumeClass().GetName(), toDeletePreconditions(req.GetOptions())) +} + +func (s *ServiceImpl) DeleteExternalVolumeClass(ctx context.Context, name string, precondition store.DeletePreconditions) (*ateapi.ExternalVolumeClass, error) { + deleted, err := s.store.DeleteExternalVolumeClass(ctx, name, precondition) + switch { + case err == nil: + return deleted, nil + case errors.Is(err, store.ErrNotFound): + return nil, apierror.NotFound("ExternalVolumeClass %s not found", name) + case errors.Is(err, store.ErrUIDConflict): + return nil, apierror.Aborted("ExternalVolumeClass %s does not have uid %s", name, precondition.UID) + case errors.Is(err, store.ErrVersionConflict): + return nil, apierror.Aborted("concurrent update conflict, please retry") + default: + return nil, fmt.Errorf("while deleting external volume class from DB: %w", err) + } +} diff --git a/cmd/ateapi/internal/controlapi/external_volume_class_access_policy.go b/cmd/ateapi/internal/controlapi/external_volume_class_access_policy.go new file mode 100644 index 0000000000..b67bcc28dc --- /dev/null +++ b/cmd/ateapi/internal/controlapi/external_volume_class_access_policy.go @@ -0,0 +1,100 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package controlapi + +import ( + "context" + "errors" + "fmt" + + "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/cmd/ateapi/internal/apivalidation" + "go.ate.dev/substrate/cmd/ateapi/internal/defaults" + "go.ate.dev/substrate/cmd/ateapi/internal/store" + "go.ate.dev/substrate/internal/apierror" + "go.ate.dev/substrate/internal/resources" + "google.golang.org/protobuf/proto" + "k8s.io/apimachinery/pkg/util/validation/field" +) + +func (s *RPCService) CreateExternalVolumeClassAccessPolicy(ctx context.Context, req *ateapi.CreateExternalVolumeClassAccessPolicyRequest) (*ateapi.AccessPolicy, error) { + policy := req.GetAccessPolicy() + if policy != nil { + scrubResourceMetadataForCreate(policy.Metadata) + defaults.Apply(policy) + } + if errs := apivalidation.ValidateCreateExternalVolumeClassAccessPolicyRequest(ctx, req); len(errs) > 0 { + return nil, resources.ToAPIError(errs) + } + return s.impl.CreateExternalVolumeClassAccessPolicy(ctx, req.GetExternalVolumeClass().GetName(), policy) +} + +func (s *ServiceImpl) CreateExternalVolumeClassAccessPolicy(ctx context.Context, name string, policy *ateapi.AccessPolicy) (*ateapi.AccessPolicy, error) { + created, err := s.store.CreateExternalVolumeClassAccessPolicy(ctx, name, policy) + return mapAccessPolicyWrite(created, err, "parent ExternalVolumeClass or referenced member Atespace does not exist") +} + +func (s *RPCService) GetExternalVolumeClassAccessPolicy(ctx context.Context, req *ateapi.GetExternalVolumeClassAccessPolicyRequest) (*ateapi.AccessPolicy, error) { + if errs := apivalidation.ValidateGetExternalVolumeClassAccessPolicyRequest(ctx, req); len(errs) > 0 { + return nil, resources.ToAPIError(errs) + } + return s.impl.GetExternalVolumeClassAccessPolicy(ctx, req.GetExternalVolumeClass().GetName()) +} + +func (s *ServiceImpl) GetExternalVolumeClassAccessPolicy(ctx context.Context, name string) (*ateapi.AccessPolicy, error) { + policy, err := s.store.GetExternalVolumeClassAccessPolicy(ctx, name) + if err != nil { + if errors.Is(err, store.ErrNotFound) { + return nil, apierror.NotFound("AccessPolicy for external volume class %s not found", name) + } + return nil, fmt.Errorf("while getting ExternalVolumeClass access policy: %w", err) + } + return policy, nil +} + +func (s *RPCService) UpdateExternalVolumeClassAccessPolicy(ctx context.Context, req *ateapi.UpdateExternalVolumeClassAccessPolicyRequest) (*ateapi.AccessPolicy, error) { + policy := req.GetAccessPolicy() + if policy != nil { + scrubResourceMetadataForUpdate(policy.Metadata) + } + if errs := apivalidation.ValidateUpdateExternalVolumeClassAccessPolicyRequest(ctx, req); len(errs) > 0 { + return nil, resources.ToAPIError(errs) + } + return s.impl.UpdateExternalVolumeClassAccessPolicy(ctx, req.GetExternalVolumeClass().GetName(), store.PreconditionFrom(policy), replaceAccessPolicy(policy)) +} + +func (s *ServiceImpl) UpdateExternalVolumeClassAccessPolicy(ctx context.Context, name string, precondition store.Precondition, mutate func(*ateapi.AccessPolicy) error) (*ateapi.AccessPolicy, error) { + updated, err := s.store.UpdateExternalVolumeClassAccessPolicy(ctx, name, precondition, func(toUpdate *ateapi.AccessPolicy) error { + oldVal := proto.CloneOf(toUpdate) + if err := mutate(toUpdate); err != nil { + return err + } + errs := apivalidation.ValidateExternalVolumeClassAccessPolicyUpdate(ctx, field.NewPath("access_policy"), toUpdate, oldVal) + return resources.ToAPIError(errs) + }) + return mapAccessPolicyWrite(updated, err, "referenced member Atespace does not exist") +} + +func (s *RPCService) DeleteExternalVolumeClassAccessPolicy(ctx context.Context, req *ateapi.DeleteExternalVolumeClassAccessPolicyRequest) (*ateapi.AccessPolicy, error) { + if errs := apivalidation.ValidateDeleteExternalVolumeClassAccessPolicyRequest(ctx, req); len(errs) > 0 { + return nil, resources.ToAPIError(errs) + } + return s.impl.DeleteExternalVolumeClassAccessPolicy(ctx, req.GetExternalVolumeClass().GetName(), toDeletePreconditions(req.GetOptions())) +} + +func (s *ServiceImpl) DeleteExternalVolumeClassAccessPolicy(ctx context.Context, name string, precondition store.DeletePreconditions) (*ateapi.AccessPolicy, error) { + deleted, err := s.store.DeleteExternalVolumeClassAccessPolicy(ctx, name, precondition) + return mapAccessPolicyWrite(deleted, err, "") +} diff --git a/cmd/ateapi/internal/controlapi/functionaltest/access_policy_test.go b/cmd/ateapi/internal/controlapi/functionaltest/access_policy_test.go index d3d6dc07f7..d4d5073210 100644 --- a/cmd/ateapi/internal/controlapi/functionaltest/access_policy_test.go +++ b/cmd/ateapi/internal/controlapi/functionaltest/access_policy_test.go @@ -20,6 +20,7 @@ import ( "github.com/google/go-cmp/cmp" "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/internal/preview" "go.ate.dev/substrate/internal/resources" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -162,3 +163,225 @@ func TestAtespaceAccessPolicy_CRUD(t *testing.T) { _, err = tc.client.GetAtespaceAccessPolicy(ctx, &ateapi.GetAtespaceAccessPolicyRequest{Atespace: ref, Name: resources.SingletonName}) wantCode(t, "Get after DeleteAtespace", err, codes.NotFound) } + +func TestExternalVolumeClassAccessPolicy_CRUD(t *testing.T) { + preview.InitForTest(t, string(preview.GateExternalVolumes)) + tc := setupPreviewTest(t, namespaceForTest("ns-evc-access-policy")) + defer tc.cleanup() + ctx := context.Background() + + createAtespace(t, tc, "team-a") + createAtespace(t, tc, "team-b") + createAtespace(t, tc, "team-c") + createExternalVolumeClass(t, tc, "nfs-gold") + ref := &ateapi.ObjectRef{Name: "nfs-gold"} + policy := &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{ + Name: "default", + Uid: "caller-supplied-uid", + Version: 99, + }, + Bindings: []*ateapi.Binding{{Role: "allowed_atespace", Members: []string{"atespace:team-a", "atespace:team-b"}}}, + } + + _, err := tc.client.CreateExternalVolumeClassAccessPolicy(ctx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "missing"}, + AccessPolicy: policy, + }) + assertGrpcError(t, err, codes.FailedPrecondition, "parent ExternalVolumeClass or referenced member Atespace does not exist") + + _, err = tc.client.CreateExternalVolumeClassAccessPolicy(ctx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{{Role: "allowed_atespace", Members: []string{"atespace:ghost"}}}, + }, + }) + assertGrpcError(t, err, codes.FailedPrecondition, "parent ExternalVolumeClass or referenced member Atespace does not exist") + + // Create and Update require preview opt-in; Get and Delete stay ungated. + _, err = tc.noOptInClient.CreateExternalVolumeClassAccessPolicy(ctx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: policy, + }) + assertGrpcErrorRegex(t, err, codes.InvalidArgument, "access_policy: Forbidden") + + _, err = tc.noOptInClient.GetExternalVolumeClassAccessPolicy(ctx, &ateapi.GetExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }) + wantCode(t, "Get before create (no opt-in)", err, codes.NotFound) + + created, err := tc.client.CreateExternalVolumeClassAccessPolicy(ctx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: policy, + }) + if err != nil { + t.Fatalf("Create failed: %v", err) + } + if md := created.GetMetadata(); md.GetName() != "default" || md.GetUid() == "" || md.GetUid() == "caller-supplied-uid" || md.GetVersion() != 1 || md.GetCreateTime() == nil { + t.Fatalf("created metadata = %v, want server-assigned uid, version 1 and create_time", md) + } + _, err = tc.client.CreateExternalVolumeClassAccessPolicy(ctx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: policy, + }) + wantCode(t, "second Create", err, codes.AlreadyExists) + + got, err := tc.noOptInClient.GetExternalVolumeClassAccessPolicy(ctx, &ateapi.GetExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }) + if err != nil { + t.Fatalf("Get failed: %v", err) + } + if diff := cmp.Diff(created, got, protocmp.Transform()); diff != "" { + t.Errorf("Get mismatch (-created +got):\n%s", diff) + } + + _, err = tc.noOptInClient.UpdateExternalVolumeClassAccessPolicy(ctx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: created, + }) + assertGrpcErrorRegex(t, err, codes.InvalidArgument, "access_policy: Forbidden") + + badUpdate := proto.CloneOf(created) + badUpdate.Bindings = []*ateapi.Binding{{Role: "allowed_atespace", Members: []string{"atespace:ghost"}}} + _, err = tc.client.UpdateExternalVolumeClassAccessPolicy(ctx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: badUpdate, + }) + assertGrpcError(t, err, codes.FailedPrecondition, "referenced member Atespace does not exist") + + // Deleting member team-a scrubs it from the stored policy and bumps version. + if _, err := tc.client.DeleteAtespace(ctx, &ateapi.DeleteAtespaceRequest{Atespace: &ateapi.ObjectRef{Name: "team-a"}}); err != nil { + t.Fatalf("DeleteAtespace(team-a) failed: %v", err) + } + afterScrub, err := tc.client.GetExternalVolumeClassAccessPolicy(ctx, &ateapi.GetExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }) + if err != nil { + t.Fatalf("Get after DeleteAtespace failed: %v", err) + } + if afterScrub.GetMetadata().GetVersion() != created.GetMetadata().GetVersion()+1 { + t.Errorf("version after scrub = %d, want %d", afterScrub.GetMetadata().GetVersion(), created.GetMetadata().GetVersion()+1) + } + wantScrubbed := []*ateapi.Binding{{Role: "allowed_atespace", Members: []string{"atespace:team-b"}}} + if diff := cmp.Diff(wantScrubbed, afterScrub.GetBindings(), protocmp.Transform()); diff != "" { + t.Fatalf("bindings after DeleteAtespace(team-a) (-want +got):\n%s", diff) + } + + update := proto.CloneOf(afterScrub) + update.Bindings[0].Members = append(update.Bindings[0].Members, "atespace:team-c") + updated, err := tc.client.UpdateExternalVolumeClassAccessPolicy(ctx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: update, + }) + if err != nil { + t.Fatalf("Update failed: %v", err) + } + if updated.GetMetadata().GetVersion() != afterScrub.GetMetadata().GetVersion()+1 { + t.Errorf("updated version = %d, want %d", updated.GetMetadata().GetVersion(), afterScrub.GetMetadata().GetVersion()+1) + } + if diff := cmp.Diff(update.GetBindings(), updated.GetBindings(), protocmp.Transform()); diff != "" { + t.Errorf("updated bindings mismatch (-want +got):\n%s", diff) + } + + // The update above consumed afterScrub's version. + _, err = tc.client.UpdateExternalVolumeClassAccessPolicy(ctx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: update, + }) + wantCode(t, "stale Update", err, codes.Aborted) + + _, err = tc.client.DeleteExternalVolumeClassAccessPolicy(ctx, &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + Options: &ateapi.DeleteOptions{Version: created.GetMetadata().GetVersion()}, + }) + wantCode(t, "Delete with stale version", err, codes.Aborted) + + deleted, err := tc.noOptInClient.DeleteExternalVolumeClassAccessPolicy(ctx, &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }) + if err != nil { + t.Fatalf("Delete failed: %v", err) + } + if deleted.GetMetadata().GetDeleteTime() == nil { + t.Error("deleted policy carries no delete_time") + } + _, err = tc.client.GetExternalVolumeClassAccessPolicy(ctx, &ateapi.GetExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }) + wantCode(t, "Get after delete", err, codes.NotFound) + _, err = tc.client.DeleteExternalVolumeClassAccessPolicy(ctx, &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }) + wantCode(t, "second Delete", err, codes.NotFound) + + // Deleting the ExternalVolumeClass removes its policy with it. + recreatePolicy := &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{{Role: "allowed_atespace", Members: []string{"atespace:team-b"}}}, + } + if _, err := tc.client.CreateExternalVolumeClassAccessPolicy(ctx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: recreatePolicy, + }); err != nil { + t.Fatalf("re-Create failed: %v", err) + } + if _, err := tc.client.DeleteExternalVolumeClass(ctx, &ateapi.DeleteExternalVolumeClassRequest{ExternalVolumeClass: ref}); err != nil { + t.Fatalf("DeleteExternalVolumeClass failed: %v", err) + } + _, err = tc.client.GetExternalVolumeClassAccessPolicy(ctx, &ateapi.GetExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }) + wantCode(t, "Get after DeleteExternalVolumeClass", err, codes.NotFound) +} + +func TestValidation_ExternalVolumeClassAccessPolicy(t *testing.T) { + preview.InitForTest(t, string(preview.GateExternalVolumes)) + tc := setupPreviewTest(t, namespaceForTest("ns-validation-evc-policy")) + defer tc.cleanup() + ctx := context.Background() + ref := &ateapi.ObjectRef{Name: "nfs-gold"} + + t.Run("CreateExternalVolumeClassAccessPolicy", func(t *testing.T) { + _, err := tc.client.CreateExternalVolumeClassAccessPolicy(ctx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{{Role: "owner", Members: []string{"user:alice"}}}, + }, + }) + assertGrpcErrorRegex(t, err, codes.InvalidArgument, "access_policy\\.bindings\\[0\\]\\.role: Unsupported value") + }) + t.Run("GetExternalVolumeClassAccessPolicy", func(t *testing.T) { + _, err := tc.client.GetExternalVolumeClassAccessPolicy(ctx, &ateapi.GetExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: "other", + }) + assertGrpcErrorRegex(t, err, codes.InvalidArgument, "name: Invalid value") + }) + t.Run("UpdateExternalVolumeClassAccessPolicy", func(t *testing.T) { + _, err := tc.client.UpdateExternalVolumeClassAccessPolicy(ctx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + }, + }) + assertGrpcError(t, err, codes.InvalidArgument, "AccessPolicy UID and version are required") + }) + t.Run("DeleteExternalVolumeClassAccessPolicy", func(t *testing.T) { + _, err := tc.client.DeleteExternalVolumeClassAccessPolicy(ctx, &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: "other", + }) + assertGrpcErrorRegex(t, err, codes.InvalidArgument, "name: Invalid value") + }) +} diff --git a/cmd/ateapi/internal/controlapi/functionaltest/actor_template_test.go b/cmd/ateapi/internal/controlapi/functionaltest/actor_template_test.go index 4d8f20a469..880cc9ab3e 100644 --- a/cmd/ateapi/internal/controlapi/functionaltest/actor_template_test.go +++ b/cmd/ateapi/internal/controlapi/functionaltest/actor_template_test.go @@ -407,7 +407,7 @@ func TestCreateActorTemplate_ExternalVolumesPreview(t *testing.T) { }}, Volumes: []*ateapi.Volume{{ Name: "data", - External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{StorageClassName: "standard", CapacityBytes: 1 << 30}}, + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, CapacityBytes: 1 << 30}}, }}, Resources: &ateapi.ResourceRequirements{Limits: resources.CPUMemory(1000, 1<<30)}, }, diff --git a/cmd/ateapi/internal/controlapi/functionaltest/actor_test.go b/cmd/ateapi/internal/controlapi/functionaltest/actor_test.go index 2d685e0e5e..9c6d3b5cd0 100644 --- a/cmd/ateapi/internal/controlapi/functionaltest/actor_test.go +++ b/cmd/ateapi/internal/controlapi/functionaltest/actor_test.go @@ -120,13 +120,14 @@ func TestCreateActor_WithExternalVolumes(t *testing.T) { ns := namespaceForTest("ns-create-ext-vols") tc := setupPreviewTest(t, ns) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") volumes := []*ateapi.Volume{ { Name: "ext-vol-1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, } @@ -183,11 +184,12 @@ func TestCreateActor_ExternalVolumesWithoutOptIn(t *testing.T) { ns := namespaceForTest("ns-create-ext-vols-no-opt-in") tc := setupPreviewTest(t, ns) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") createTemplateWithVolumes(t, tc, ns, []*ateapi.Volume{{ Name: "ext-vol-1", - External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{StorageClassName: "standard", CapacityBytes: 10 << 30}}, + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, CapacityBytes: 10 << 30}}, }}, []*ateapi.VolumeMount{{Name: "ext-vol-1", MountPath: "/data"}}) @@ -215,11 +217,12 @@ func TestActorLifecycle_ExternalVolumesWithoutOptIn(t *testing.T) { ns := namespaceForTest("ns-lifecycle-ext-vols-no-opt-in") tc := setupPreviewTest(t, ns) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "fast") createTemplateWithVolumes(t, tc, ns, []*ateapi.Volume{{ Name: "data-vol", - External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{StorageClassName: "fast", CapacityBytes: 20 << 30}}, + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ExternalVolumeClass: &ateapi.ObjectRef{Name: "fast"}, CapacityBytes: 20 << 30}}, }}, []*ateapi.VolumeMount{{Name: "data-vol", MountPath: "/mnt/data"}}) createWorkerPod(t, tc, ns, "worker-1", "node1", "pool1") @@ -399,6 +402,7 @@ func TestCreateActor_RejectsSnapshotWithExternalVolumes(t *testing.T) { ns := namespaceForTest("ns-snapshot-external-volume") tc := setupPreviewTest(t, ns) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") template, err := tc.client.CreateActorTemplate(context.Background(), &ateapi.CreateActorTemplateRequest{ ActorTemplate: &ateapi.ActorTemplate{ Metadata: &ateapi.ResourceMetadata{Atespace: testAtespace, Name: "tmpl1"}, @@ -408,7 +412,7 @@ func TestCreateActor_RejectsSnapshotWithExternalVolumes(t *testing.T) { Volumes: []*ateapi.Volume{{ Name: "data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - CapacityBytes: 1 << 30, StorageClassName: "standard", + CapacityBytes: 1 << 30, ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, }}, }}, Resources: &ateapi.ResourceRequirements{Limits: resources.CPUMemory(1000, 512<<20)}, @@ -429,8 +433,8 @@ func TestCreateActor_RejectsSnapshotWithExternalVolumes(t *testing.T) { SourceTag: tagRef, }, }) - if apierror.Code(err) != codes.FailedPrecondition { - t.Fatalf("CreateActor status = %v, want FailedPrecondition", apierror.Code(err)) + if apierror.Code(err) != codes.FailedPrecondition || !strings.Contains(err.Error(), "Tag cloning") { + t.Fatalf("CreateActor err = %v (code %v), want FailedPrecondition mentioning Tag cloning", err, apierror.Code(err)) } } @@ -1325,13 +1329,14 @@ func TestDeleteActor_Running(t *testing.T) { "substrate.io/mock": plugin, }) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") createTemplateWithVolumes(t, tc, ns, []*ateapi.Volume{ { Name: "vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, }, []*ateapi.VolumeMount{ @@ -1879,13 +1884,14 @@ func TestActorLifecycle_WithExternalVolumes(t *testing.T) { ns := namespaceForTest("ns-lifecycle-ext-vols") tc := setupPreviewTest(t, ns) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "fast") volumes := []*ateapi.Volume{ { Name: "data-vol", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "fast", - CapacityBytes: 20 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "fast"}, + CapacityBytes: 20 << 30, }}, }, } @@ -1992,6 +1998,156 @@ func TestActorLifecycle_WithExternalVolumes(t *testing.T) { } } +// TestActorLifecycle_WithExternalVolumeClass provisions a volume from an +// ExternalVolumeClass: the class's driver becomes the volume type, and its +// parameters reach the driver's CreateVolume call. +func TestActorLifecycle_WithExternalVolumeClass(t *testing.T) { + preview.InitForTest(t, "ExternalVolumes") + + ns := namespaceForTest("ns-lifecycle-evc") + tc := setupPreviewTest(t, ns) + defer tc.cleanup() + ctx := context.Background() + + class, err := tc.client.CreateExternalVolumeClass(ctx, &ateapi.CreateExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "evc-gold"}, + DriverName: "substrate.io/mock", + Parameters: map[string]string{"tier": "gold"}, + MountOptions: []string{"nfsvers=4.1"}, + }, + }) + if err != nil { + t.Fatalf("CreateExternalVolumeClass failed: %v", err) + } + if class.GetDriverName() != "substrate.io/mock" { + t.Fatalf("driver = %q, want substrate.io/mock", class.GetDriverName()) + } + volumes := []*ateapi.Volume{{ + Name: "data-vol", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "evc-gold"}, + CapacityBytes: 20 << 30, + }}, + }} + mounts := []*ateapi.VolumeMount{{Name: "data-vol", MountPath: "/mnt/data"}} + createTemplateWithVolumes(t, tc, ns, volumes, mounts) + createWorkerPod(t, tc, ns, "worker-1", "node1", "pool1") + + actorRef := &ateapi.ObjectRef{Atespace: testAtespace, Name: "actor-evc"} + createResp, err := tc.client.CreateActor(ctx, &ateapi.CreateActorRequest{ + Actor: &ateapi.Actor{ + Metadata: &ateapi.ResourceMetadata{Atespace: testAtespace, Name: "actor-evc"}, + ActorTemplate: &ateapi.ObjectRef{Atespace: testAtespace, Name: "tmpl1"}, + }, + }) + if err != nil { + t.Fatalf("CreateActor failed: %v", err) + } + created := createResp.GetStatus().GetExternalVolumes().GetVolumes() + if len(created) != 1 || created[0].GetVolumeType() != "substrate.io/mock" || created[0].GetStorageVolumeId() != "" { + t.Fatalf("CreateActor volumes = %v, want 1 unprovisioned volume of type substrate.io/mock", created) + } + if diff := cmp.Diff([]string{"nfsvers=4.1"}, created[0].GetMountOptions()); diff != "" { + t.Errorf("CreateActor mount options mismatch (-want +got):\n%s", diff) + } + + resumeResp, err := tc.client.ResumeActor(ctx, &ateapi.ResumeActorRequest{Actor: actorRef}) + if err != nil { + t.Fatalf("ResumeActor failed: %v", err) + } + resumed := resumeResp.GetActor().GetStatus().GetExternalVolumes().GetVolumes() + if len(resumed) != 1 || resumed[0].GetStorageVolumeId() == "" { + t.Fatalf("ResumeActor volumes = %v, want 1 provisioned volume", resumed) + } + if got := resumed[0].GetVolumeContext()["tier"]; got != "gold" { + t.Errorf("volume context tier = %q, want %q from the class parameters", got, "gold") + } + if diff := cmp.Diff([]string{"nfsvers=4.1"}, resumed[0].GetMountOptions()); diff != "" { + t.Errorf("ResumeActor mount options mismatch (-want +got):\n%s", diff) + } + + if _, err := tc.client.DeleteActor(ctx, &ateapi.DeleteActorRequest{Actor: actorRef}); err != nil { + t.Fatalf("DeleteActor failed: %v", err) + } +} + +// TestCreateActor_MissingExternalVolumeClass checks that CreateActor fails when +// the template names an ExternalVolumeClass that does not exist. +func TestCreateActor_MissingExternalVolumeClass(t *testing.T) { + preview.InitForTest(t, "ExternalVolumes") + + ns := namespaceForTest("ns-missing-evc") + tc := setupPreviewTest(t, ns) + defer tc.cleanup() + + volumes := []*ateapi.Volume{{ + Name: "data-vol", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "evc-missing"}, + CapacityBytes: 1 << 30, + }}, + }} + mounts := []*ateapi.VolumeMount{{Name: "data-vol", MountPath: "/mnt/data"}} + createTemplateWithVolumes(t, tc, ns, volumes, mounts) + + _, err := tc.client.CreateActor(context.Background(), &ateapi.CreateActorRequest{ + Actor: &ateapi.Actor{ + Metadata: &ateapi.ResourceMetadata{Atespace: testAtespace, Name: "actor-missing-evc"}, + ActorTemplate: &ateapi.ObjectRef{Atespace: testAtespace, Name: "tmpl1"}, + }, + }) + assertGrpcErrorRegex(t, err, codes.FailedPrecondition, `ExternalVolumeClass "evc-missing" not found`) +} + +// TestResumeActor_DeletedExternalVolumeClass checks that a resume fails with +// FailedPrecondition, before any volume is created, when the template's +// ExternalVolumeClass was deleted after the actor was created. +func TestResumeActor_DeletedExternalVolumeClass(t *testing.T) { + preview.InitForTest(t, "ExternalVolumes") + + ns := namespaceForTest("ns-deleted-evc") + tc := setupPreviewTest(t, ns) + defer tc.cleanup() + ctx := context.Background() + + if _, err := tc.client.CreateExternalVolumeClass(ctx, &ateapi.CreateExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "evc-gone"}, + DriverName: "substrate.io/mock", + }, + }); err != nil { + t.Fatalf("CreateExternalVolumeClass failed: %v", err) + } + volumes := []*ateapi.Volume{{ + Name: "data-vol", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "evc-gone"}, + CapacityBytes: 1 << 30, + }}, + }} + mounts := []*ateapi.VolumeMount{{Name: "data-vol", MountPath: "/mnt/data"}} + createTemplateWithVolumes(t, tc, ns, volumes, mounts) + + actorRef := &ateapi.ObjectRef{Atespace: testAtespace, Name: "actor-deleted-evc"} + if _, err := tc.client.CreateActor(ctx, &ateapi.CreateActorRequest{ + Actor: &ateapi.Actor{ + Metadata: &ateapi.ResourceMetadata{Atespace: testAtespace, Name: "actor-deleted-evc"}, + ActorTemplate: &ateapi.ObjectRef{Atespace: testAtespace, Name: "tmpl1"}, + }, + }); err != nil { + t.Fatalf("CreateActor failed: %v", err) + } + if _, err := tc.client.DeleteExternalVolumeClass(ctx, &ateapi.DeleteExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "evc-gone"}, + }); err != nil { + t.Fatalf("DeleteExternalVolumeClass failed: %v", err) + } + + _, err := tc.client.ResumeActor(ctx, &ateapi.ResumeActorRequest{Actor: actorRef}) + assertGrpcErrorRegex(t, err, codes.FailedPrecondition, `ExternalVolumeClass "evc-gone" not found`) +} + type partialFailVolumePlugin struct { volume.VolumePluginControlPlane deleted []string @@ -2029,20 +2185,21 @@ func TestResumeActor_VolumeCreationFailure(t *testing.T) { "substrate.io/mock": plugin, }) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") volumes := []*ateapi.Volume{ { Name: "succ-vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, { Name: "fail-vol2", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, } @@ -2173,20 +2330,21 @@ func TestResumeActor_VolumeCreationRetrySuccess(t *testing.T) { "substrate.io/mock": plugin, }) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") volumes := []*ateapi.Volume{ { Name: "succ-vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, { Name: "retry-vol2", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, } @@ -2334,13 +2492,14 @@ func TestResumeActor_VolumeAttachFailureAndRetry(t *testing.T) { "substrate.io/mock": plugin, }) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") volumes := []*ateapi.Volume{ { Name: "vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, } @@ -2437,13 +2596,14 @@ func TestResumeActor_VolumeAttachFailure_DeleteActor(t *testing.T) { "substrate.io/mock": plugin, }) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") volumes := []*ateapi.Volume{ { Name: "vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, } @@ -2586,21 +2746,22 @@ func TestResumeActor_MultiVolumePartialAttachFailure_Retry(t *testing.T) { "substrate.io/mock": plugin, }) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") // 1. Create a template with two external volumes and a worker pod. volumes := []*ateapi.Volume{ { Name: "vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, { Name: "vol2", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, } @@ -2758,14 +2919,15 @@ func TestSuspendActor_VolumeDetachFailure_RetrySuccess(t *testing.T) { "substrate.io/mock": plugin, }) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") // 1. Create template with external volume and a mock worker pod. volumes := []*ateapi.Volume{ { Name: "vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, } @@ -2868,14 +3030,15 @@ func TestSuspendActor_VolumeDetachFailure_DeleteActor(t *testing.T) { "substrate.io/mock": plugin, }) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") // 1. Create template with external volume and a mock worker pod. volumes := []*ateapi.Volume{ { Name: "vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, } @@ -2959,14 +3122,15 @@ func TestSuspendActorAsync_VolumeLifecycle_DetachResumeAndMigrate(t *testing.T) "substrate.io/mock": plugin, }) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") // 1. Create template with external volume and a mock worker pod. volumes := []*ateapi.Volume{ { Name: "vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, } @@ -3149,14 +3313,15 @@ func TestSuspendActorAsync_VolumeDetachFailure_RetrySuccess(t *testing.T) { "substrate.io/mock": plugin, }) defer tc.cleanup() + seedMockExternalVolumeClass(t, tc, "standard") // 1. Create template with external volume and a mock worker pod. volumes := []*ateapi.Volume{ { Name: "vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }, } diff --git a/cmd/ateapi/internal/controlapi/functionaltest/actor_volume_detach_test.go b/cmd/ateapi/internal/controlapi/functionaltest/actor_volume_detach_test.go index b2d615f26a..0d233dbc28 100644 --- a/cmd/ateapi/internal/controlapi/functionaltest/actor_volume_detach_test.go +++ b/cmd/ateapi/internal/controlapi/functionaltest/actor_volume_detach_test.go @@ -66,11 +66,12 @@ func assertDetachedNodes(t *testing.T, plugin *attachFailVolumePlugin, step stri func createSingleVolumeActor(t *testing.T, tc *testContext, ns, name string) string { t.Helper() preview.InitForTest(t, "ExternalVolumes") + seedMockExternalVolumeClass(t, tc, "standard") volumes := []*ateapi.Volume{{ Name: "vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - CapacityBytes: 10 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, + CapacityBytes: 10 << 30, }}, }} mounts := []*ateapi.VolumeMount{{Name: "vol1", MountPath: "/mnt/vol1"}} diff --git a/cmd/ateapi/internal/controlapi/functionaltest/common_test.go b/cmd/ateapi/internal/controlapi/functionaltest/common_test.go index 72709ef72d..886db9bf98 100644 --- a/cmd/ateapi/internal/controlapi/functionaltest/common_test.go +++ b/cmd/ateapi/internal/controlapi/functionaltest/common_test.go @@ -53,7 +53,6 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" "k8s.io/utils/ptr" @@ -156,8 +155,6 @@ func setupTestWithOptions(t *testing.T, ns string, options testOptions) *testCon // 3. Initialize Informers ateletFactory, ateletInformer := controlapi.AteletInformer(k8sClient, installdefaults.SystemNamespace) - scFactory := informers.NewSharedInformerFactory(k8sClient, 0) - scLister := scFactory.Storage().V1().StorageClasses().Lister() substrateInformerFactory := externalversions.NewSharedInformerFactory(substrateClient, 0) csiDriverConfigLister := substrateInformerFactory.Ate().V1().CSIDriverConfigs().Lister() @@ -166,11 +163,9 @@ func setupTestWithOptions(t *testing.T, ns string, options testOptions) *testCon ateletFactory.Start(ctx.Done()) substrateInformerFactory.Start(ctx.Done()) - scFactory.Start(ctx.Done()) ateletFactory.WaitForCacheSync(ctx.Done()) substrateInformerFactory.WaitForCacheSync(ctx.Done()) - scFactory.WaitForCacheSync(ctx.Done()) // 4. Initialize Service wc := workercache.New(persistence, 5*time.Minute) @@ -224,7 +219,6 @@ func setupTestWithOptions(t *testing.T, ns string, options testOptions) *testCon persistence, wc, csiDriverConfigLister, - scLister, dialer, instruments, "", diff --git a/cmd/ateapi/internal/controlapi/functionaltest/external_volume_class_test.go b/cmd/ateapi/internal/controlapi/functionaltest/external_volume_class_test.go new file mode 100644 index 0000000000..04aefbde35 --- /dev/null +++ b/cmd/ateapi/internal/controlapi/functionaltest/external_volume_class_test.go @@ -0,0 +1,180 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package functionaltest + +import ( + "context" + "testing" + + "github.com/google/go-cmp/cmp" + "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/internal/preview" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "google.golang.org/protobuf/testing/protocmp" +) + +func newExternalVolumeClass(name string) *ateapi.ExternalVolumeClass { + return &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: name}, + DriverName: "nfs.csi.k8s.io", + Parameters: map[string]string{"server": "nfs.example.com"}, + } +} + +func createExternalVolumeClass(t *testing.T, tc *testContext, name string) *ateapi.ExternalVolumeClass { + t.Helper() + created, err := tc.client.CreateExternalVolumeClass(context.Background(), &ateapi.CreateExternalVolumeClassRequest{ExternalVolumeClass: newExternalVolumeClass(name)}) + if err != nil { + t.Fatalf("CreateExternalVolumeClass(%s) failed: %v", name, err) + } + return created +} + +func seedMockExternalVolumeClass(t *testing.T, tc *testContext, name string) { + t.Helper() + if _, err := tc.client.CreateExternalVolumeClass(context.Background(), &ateapi.CreateExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: name}, + DriverName: "substrate.io/mock", + }, + }); err != nil && status.Code(err) != codes.AlreadyExists { + t.Fatalf("CreateExternalVolumeClass(%s) failed: %v", name, err) + } +} + +func TestCreateExternalVolumeClass(t *testing.T) { + preview.InitForTest(t, "ExternalVolumes") + ns := namespaceForTest("ns-create-evc") + tc := setupPreviewTest(t, ns) + defer tc.cleanup() + ctx := context.Background() + + in := newExternalVolumeClass("nfs") + in.Metadata.Uid = "caller-supplied-uid" + in.Metadata.Version = 999 + created, err := tc.client.CreateExternalVolumeClass(ctx, &ateapi.CreateExternalVolumeClassRequest{ExternalVolumeClass: in}) + if err != nil { + t.Fatalf("CreateExternalVolumeClass failed: %v", err) + } + if diff := cmp.Diff(newExternalVolumeClass("nfs"), created, protocmp.Transform(), ignoreServerMetadata, ignoreVersion); diff != "" { + t.Errorf("CreateExternalVolumeClass mismatch (-want +got):\n%s", diff) + } + if md := created.GetMetadata(); md.GetVersion() != 1 || md.GetUid() == "" || md.GetUid() == "caller-supplied-uid" { + t.Errorf("metadata = %v, want server-assigned uid and version 1", md) + } + + got, err := tc.client.GetExternalVolumeClass(ctx, &ateapi.GetExternalVolumeClassRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "nfs"}}) + if err != nil { + t.Fatalf("GetExternalVolumeClass failed: %v", err) + } + if diff := cmp.Diff(created, got, protocmp.Transform()); diff != "" { + t.Errorf("GetExternalVolumeClass mismatch (-created +got):\n%s", diff) + } + + _, err = tc.client.CreateExternalVolumeClass(ctx, &ateapi.CreateExternalVolumeClassRequest{ExternalVolumeClass: newExternalVolumeClass("nfs")}) + assertGrpcError(t, err, codes.AlreadyExists, "ExternalVolumeClass nfs already exists") + + // A client that does not opt in to preview features cannot set the field. + _, err = tc.noOptInClient.CreateExternalVolumeClass(ctx, &ateapi.CreateExternalVolumeClassRequest{ExternalVolumeClass: newExternalVolumeClass("other")}) + assertGrpcErrorRegex(t, err, codes.InvalidArgument, "external_volume_class: Forbidden") +} + +func TestListExternalVolumeClasses(t *testing.T) { + preview.InitForTest(t, "ExternalVolumes") + ns := namespaceForTest("ns-list-evc") + tc := setupPreviewTest(t, ns) + defer tc.cleanup() + + want := []string{"class-a", "class-b", "class-c"} + for _, n := range want { + createExternalVolumeClass(t, tc, n) + } + var got []string + token := "" + for { + resp, err := tc.client.ListExternalVolumeClasses(context.Background(), &ateapi.ListExternalVolumeClassesRequest{Options: &ateapi.ListOptions{PageSize: 2, PageToken: token}}) + if err != nil { + t.Fatalf("ListExternalVolumeClasses failed: %v", err) + } + for _, c := range resp.GetExternalVolumeClasses() { + got = append(got, c.GetMetadata().GetName()) + } + if token = resp.GetNextPageToken(); token == "" { + break + } + } + if diff := cmp.Diff(want, got); diff != "" { + t.Errorf("listed classes mismatch (-want +got):\n%s", diff) + } +} + +func TestDeleteExternalVolumeClass(t *testing.T) { + preview.InitForTest(t, "ExternalVolumes") + ns := namespaceForTest("ns-delete-evc") + tc := setupPreviewTest(t, ns) + defer tc.cleanup() + ctx := context.Background() + ref := &ateapi.ObjectRef{Name: "nfs"} + del := func(opts *ateapi.DeleteOptions) (*ateapi.ExternalVolumeClass, error) { + return tc.client.DeleteExternalVolumeClass(ctx, &ateapi.DeleteExternalVolumeClassRequest{ExternalVolumeClass: ref, Options: opts}) + } + + created := createExternalVolumeClass(t, tc, "nfs") + uid, version := created.GetMetadata().GetUid(), created.GetMetadata().GetVersion() + _, err := del(&ateapi.DeleteOptions{Uid: uid, Version: version + 1}) + assertGrpcError(t, err, codes.Aborted, "concurrent update conflict, please retry") + _, err = del(&ateapi.DeleteOptions{Uid: foreignUID}) + assertGrpcError(t, err, codes.Aborted, "ExternalVolumeClass nfs does not have uid "+foreignUID) + + deleted, err := del(&ateapi.DeleteOptions{Uid: uid, Version: version}) + if err != nil { + t.Fatalf("DeleteExternalVolumeClass failed: %v", err) + } + if deleted.GetMetadata().GetName() != "nfs" || deleted.GetMetadata().GetDeleteTime() == nil { + t.Errorf("deleted class = %v, want nfs with delete_time", deleted.GetMetadata()) + } + _, err = tc.client.GetExternalVolumeClass(ctx, &ateapi.GetExternalVolumeClassRequest{ExternalVolumeClass: ref}) + assertGrpcError(t, err, codes.NotFound, "ExternalVolumeClass nfs not found") + _, err = del(nil) + assertGrpcError(t, err, codes.NotFound, "ExternalVolumeClass nfs not found") +} + +func TestValidation_ExternalVolumeClass(t *testing.T) { + preview.InitForTest(t, "ExternalVolumes") + ns := namespaceForTest("ns-validation-evc") + tc := setupPreviewTest(t, ns) + defer tc.cleanup() + ctx := context.Background() + + t.Run("CreateExternalVolumeClass", func(t *testing.T) { + bad := newExternalVolumeClass("nfs") + bad.DriverName = "Bad_Driver" + _, err := tc.client.CreateExternalVolumeClass(ctx, &ateapi.CreateExternalVolumeClassRequest{ExternalVolumeClass: bad}) + assertGrpcErrorRegex(t, err, codes.InvalidArgument, "driver_name: Invalid value") + }) + t.Run("GetExternalVolumeClass", func(t *testing.T) { + _, err := tc.client.GetExternalVolumeClass(ctx, &ateapi.GetExternalVolumeClassRequest{}) + assertGrpcErrorRegex(t, err, codes.InvalidArgument, "external_volume_class: Required value") + }) + t.Run("ListExternalVolumeClasses", func(t *testing.T) { + _, err := tc.client.ListExternalVolumeClasses(ctx, &ateapi.ListExternalVolumeClassesRequest{Options: &ateapi.ListOptions{PageSize: -1}}) + assertGrpcErrorRegex(t, err, codes.InvalidArgument, "page_size: Invalid value") + }) + t.Run("DeleteExternalVolumeClass", func(t *testing.T) { + _, err := tc.client.DeleteExternalVolumeClass(ctx, &ateapi.DeleteExternalVolumeClassRequest{}) + assertGrpcErrorRegex(t, err, codes.InvalidArgument, "external_volume_class: Required value") + }) +} diff --git a/cmd/ateapi/internal/controlapi/functionaltest/main_test.go b/cmd/ateapi/internal/controlapi/functionaltest/main_test.go index 1ed69cd759..948907f072 100644 --- a/cmd/ateapi/internal/controlapi/functionaltest/main_test.go +++ b/cmd/ateapi/internal/controlapi/functionaltest/main_test.go @@ -34,7 +34,6 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/proto" corev1 "k8s.io/api/core/v1" - storagev1 "k8s.io/api/storage/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" @@ -65,22 +64,6 @@ func TestMain(m *testing.M) { log.Fatalf("create ate-system namespace: %v", err) } - // Create StorageClasses for volume tests - _, err = k8sClient.StorageV1().StorageClasses().Create(context.Background(), &storagev1.StorageClass{ - ObjectMeta: metav1.ObjectMeta{Name: "standard"}, - Provisioner: "substrate.io/mock", - }, metav1.CreateOptions{}) - if err != nil && !apierrors.IsAlreadyExists(err) { - log.Fatalf("create standard storage class: %v", err) - } - _, err = k8sClient.StorageV1().StorageClasses().Create(context.Background(), &storagev1.StorageClass{ - ObjectMeta: metav1.ObjectMeta{Name: "fast"}, - Provisioner: "substrate.io/mock", - }, metav1.CreateOptions{}) - if err != nil && !apierrors.IsAlreadyExists(err) { - log.Fatalf("create fast storage class: %v", err) - } - // Create shared Atelet Pod. Tests that place workers on another node add // their own atelet there via setupAteletOnNode. if err := createAteletPod(k8sClient, "atelet-shared", "node1"); err != nil { diff --git a/cmd/ateapi/internal/controlapi/service.go b/cmd/ateapi/internal/controlapi/service.go index f67ebcd613..b140523c3f 100644 --- a/cmd/ateapi/internal/controlapi/service.go +++ b/cmd/ateapi/internal/controlapi/service.go @@ -27,7 +27,6 @@ import ( "go.ate.dev/substrate/internal/volume" "go.ate.dev/substrate/internal/volume/csi" atelisters "go.ate.dev/substrate/pkg/client/listers/ate/v1" - storagev1listers "k8s.io/client-go/listers/storage/v1" ) // RPCService implements ateapi.ControlServer and provides the implementation of @@ -77,7 +76,6 @@ func NewRPCService( persistence store.Interface, workerCache *workercache.Cache, csiDriverConfigLister atelisters.CSIDriverConfigLister, - storageClassLister storagev1listers.StorageClassLister, dialer *AteletDialer, instruments *Instruments, egressGatewayAddress string, @@ -87,7 +85,7 @@ func NewRPCService( actorIDJWTPool localjwtauthority.Pool, snapshotLocation string, ) *RPCService { - impl := newServiceImpl(persistence, storageClassLister) + impl := newServiceImpl(persistence) impl.clusterSnapshotLocation = snapshotLocation s := &RPCService{ impl: impl, @@ -101,7 +99,7 @@ func NewRPCService( actorJWTIssuer: actorJWTIssuer, actorIDJWTPool: actorIDJWTPool, } - s.actorWorkflow = NewActorWorkflow(impl, workerCache, dialer, storageClassLister, instruments, egressGatewayAddress, s, objectStorePlugin) + s.actorWorkflow = NewActorWorkflow(impl, workerCache, dialer, instruments, egressGatewayAddress, s, objectStorePlugin) s.actorWorkflow.clusterSnapshotLocation = snapshotLocation s.workerWorkflow = NewWorkerWorkflow(impl, dialer) return s @@ -126,6 +124,10 @@ type serviceStore interface { GetAtespace(ctx context.Context, name string) (*ateapi.Atespace, error) ListAtespaces(ctx context.Context, opts store.ListOptions) (store.ListResponse[*ateapi.Atespace], error) DeleteAtespace(ctx context.Context, name string, precondition store.DeletePreconditions) (*ateapi.Atespace, error) + CreateExternalVolumeClass(ctx context.Context, class *ateapi.ExternalVolumeClass) (*ateapi.ExternalVolumeClass, error) + GetExternalVolumeClass(ctx context.Context, name string) (*ateapi.ExternalVolumeClass, error) + ListExternalVolumeClasses(ctx context.Context, opts store.ListOptions) (store.ListResponse[*ateapi.ExternalVolumeClass], error) + DeleteExternalVolumeClass(ctx context.Context, name string, precondition store.DeletePreconditions) (*ateapi.ExternalVolumeClass, error) CreateGlobalAccessPolicy(ctx context.Context, policy *ateapi.AccessPolicy) (*ateapi.AccessPolicy, error) GetGlobalAccessPolicy(ctx context.Context) (*ateapi.AccessPolicy, error) UpdateGlobalAccessPolicy(ctx context.Context, precondition store.Precondition, mutate func(*ateapi.AccessPolicy) error) (*ateapi.AccessPolicy, error) @@ -133,6 +135,10 @@ type serviceStore interface { GetAtespaceAccessPolicy(ctx context.Context, name string) (*ateapi.AccessPolicy, error) UpdateAtespaceAccessPolicy(ctx context.Context, name string, precondition store.Precondition, mutate func(*ateapi.AccessPolicy) error) (*ateapi.AccessPolicy, error) DeleteAtespaceAccessPolicy(ctx context.Context, name string, precondition store.DeletePreconditions) (*ateapi.AccessPolicy, error) + CreateExternalVolumeClassAccessPolicy(ctx context.Context, name string, policy *ateapi.AccessPolicy) (*ateapi.AccessPolicy, error) + GetExternalVolumeClassAccessPolicy(ctx context.Context, name string) (*ateapi.AccessPolicy, error) + UpdateExternalVolumeClassAccessPolicy(ctx context.Context, name string, precondition store.Precondition, mutate func(*ateapi.AccessPolicy) error) (*ateapi.AccessPolicy, error) + DeleteExternalVolumeClassAccessPolicy(ctx context.Context, name string, precondition store.DeletePreconditions) (*ateapi.AccessPolicy, error) CreateActorTemplate(ctx context.Context, template *ateapi.ActorTemplate) (*ateapi.ActorTemplate, error) GetActorTemplate(ctx context.Context, templateRef resources.ActorTemplateRef) (*ateapi.ActorTemplate, error) ListActorTemplates(ctx context.Context, atespace string, opts store.ListOptions) (store.ListResponse[*ateapi.ActorTemplate], error) @@ -175,8 +181,6 @@ type ServiceImpl struct { // methods we need to trap. store store.Interface - storageClassLister storagev1listers.StorageClassLister - // clusterSnapshotLocation is ate-api-server's --snapshot-location; see // resolveSnapshotLocation. clusterSnapshotLocation string @@ -188,11 +192,9 @@ var _ store.Interface = (*ServiceImpl)(nil) // implementation layer. func newServiceImpl( persistence store.Interface, - storageClassLister storagev1listers.StorageClassLister, ) *ServiceImpl { s := &ServiceImpl{ - store: persistence, - storageClassLister: storageClassLister, + store: persistence, } return s } diff --git a/cmd/ateapi/internal/controlapi/snapshot_report_test.go b/cmd/ateapi/internal/controlapi/snapshot_report_test.go index 1c3e098793..aa7462e6b5 100644 --- a/cmd/ateapi/internal/controlapi/snapshot_report_test.go +++ b/cmd/ateapi/internal/controlapi/snapshot_report_test.go @@ -413,7 +413,7 @@ func TestApplyLatestDurableLogsStaleReports(t *testing.T) { func TestApplyReportedSnapshotState(t *testing.T) { ctx := context.Background() persistence := newTestPersistence(t) - w := NewActorWorkflow(persistence, nil, nil, nil, nil, "", nil, nil) + w := NewActorWorkflow(persistence, nil, nil, nil, "", nil, nil) tmpl, err := persistence.CreateActorTemplate(ctx, &ateapi.ActorTemplate{ Metadata: &ateapi.ResourceMetadata{Atespace: reportAtespace, Name: "tmpl"}, SnapshotConfig: &ateapi.SnapshotConfig{StorageLocation: testStorageLocation}, diff --git a/cmd/ateapi/internal/controlapi/tag_test.go b/cmd/ateapi/internal/controlapi/tag_test.go index 4bc06d75d5..00da03f409 100644 --- a/cmd/ateapi/internal/controlapi/tag_test.go +++ b/cmd/ateapi/internal/controlapi/tag_test.go @@ -35,7 +35,7 @@ func TestListTags(t *testing.T) { ctx := context.Background() persistence, cleanup := storetest.SetupTestStore(t) t.Cleanup(cleanup) - svc := &RPCService{impl: newServiceImpl(persistence, nil)} + svc := &RPCService{impl: newServiceImpl(persistence)} const otherAtespace = "other-atespace" seedTag := func(atespace, name string) { @@ -301,7 +301,7 @@ func rpcServiceWithTag(t *testing.T, tag *ateapi.Tag) (*RPCService, *ateapi.Tag) seeded := newTestTag(t, name, actor) seeded.Scope = tag.GetScope() created := storetest.MustCreateTag(t, ctx, persistence, seeded) - return &RPCService{impl: newServiceImpl(persistence, nil)}, created + return &RPCService{impl: newServiceImpl(persistence)}, created } // TestUpdateTag_DeleteRecreateRace checks that an update is not @@ -334,7 +334,7 @@ func TestUpdateTag_DeleteRecreateRace(t *testing.T) { recreatedTag = storetest.MustCreateTag(t, ctx, persistence, newTestTag(t, tagName, actorTwo)) }, } - svc := &RPCService{impl: newServiceImpl(racing, nil)} + svc := &RPCService{impl: newServiceImpl(racing)} // The client asserts "only update the tag with uid A". Its version guard is // satisfied by B as well, because re-tagging resets the version to 1: the @@ -386,7 +386,7 @@ func TestUpdateTag_ConcurrentUpdate(t *testing.T) { } }, } - svc := &RPCService{impl: newServiceImpl(racing, nil)} + svc := &RPCService{impl: newServiceImpl(racing)} originalTag.Scope = ateapi.TagScope_TAG_SCOPE_PUBLISHED _, err := svc.UpdateTag(ctx, &ateapi.UpdateTagRequest{ @@ -417,7 +417,7 @@ func TestUpdateTag_PendingTag(t *testing.T) { ctx := context.Background() persistence, cleanup := storetest.SetupTestStore(t) t.Cleanup(cleanup) - svc := &RPCService{impl: newServiceImpl(persistence, nil)} + svc := &RPCService{impl: newServiceImpl(persistence)} actor := newTestSuspendedActor(t, ctx, persistence, testAtespace, "actor-1") tag := storetest.MustCreateTag(t, ctx, persistence, newPendingTestTag(t, "v1", actor)) diff --git a/cmd/ateapi/internal/controlapi/template_reconciler_test.go b/cmd/ateapi/internal/controlapi/template_reconciler_test.go index aea76020c7..7448733015 100644 --- a/cmd/ateapi/internal/controlapi/template_reconciler_test.go +++ b/cmd/ateapi/internal/controlapi/template_reconciler_test.go @@ -699,7 +699,7 @@ func TestReconcileOne_GoldenEgressPolicyBeforeResume(t *testing.T) { t.Run(tt.name, func(t *testing.T) { ctx := t.Context() persistence := newTestPersistence(t) - impl := newServiceImpl(persistence, nil) + impl := newServiceImpl(persistence) impl.clusterSnapshotLocation = "gs://cluster-bucket/" svc := &RPCService{impl: impl} storetest.MustCreateAtespace(t, ctx, persistence, "templates") @@ -754,7 +754,7 @@ func TestReconcileOne_GoldenEgressPolicyRecovery(t *testing.T) { t.Run(scenario, func(t *testing.T) { ctx := t.Context() persistence := newTestPersistence(t) - impl := newServiceImpl(persistence, nil) + impl := newServiceImpl(persistence) impl.clusterSnapshotLocation = "gs://cluster-bucket/" svc := &RPCService{impl: impl} storetest.MustCreateAtespace(t, ctx, persistence, "templates") diff --git a/cmd/ateapi/internal/controlapi/volumes.go b/cmd/ateapi/internal/controlapi/volumes.go index d9de1a3ff7..b68f00d6e4 100644 --- a/cmd/ateapi/internal/controlapi/volumes.go +++ b/cmd/ateapi/internal/controlapi/volumes.go @@ -25,8 +25,6 @@ import ( "go.ate.dev/substrate/internal/volume" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - k8serrors "k8s.io/apimachinery/pkg/api/errors" - storagev1listers "k8s.io/client-go/listers/storage/v1" ) // externalVolumesStatus wraps vols for ActorStatus, leaving the field unset @@ -38,27 +36,68 @@ func externalVolumesStatus(vols []*ateapi.ExternalVolumeStatus) *ateapi.External return &ateapi.ExternalVolumes{Volumes: vols} } +// externalVolumeClassGetter reads an ExternalVolumeClass by name. ServiceImpl +// implements it and reports a missing class as a NotFound API error. +type externalVolumeClassGetter interface { + GetExternalVolumeClass(ctx context.Context, name string) (*ateapi.ExternalVolumeClass, error) +} + +// volumeClass holds the resolved ExternalVolumeClass fields for an external +// volume template. +type volumeClass struct { + name string + driver string + params map[string]string + mountOptions []string +} + +// resolveVolumeClass resolves the ExternalVolumeClass of an external volume +// template. A missing class is a FailedPrecondition (the template is valid, +// while the class does not exist yet or was deleted), as is a stored template +// from before storage_class_name was retired so the caller knows to recreate +// the template. +func resolveVolumeClass(ctx context.Context, classes externalVolumeClassGetter, tmpl *ateapi.ExternalVolumeTemplate) (volumeClass, error) { + ref := tmpl.GetExternalVolumeClass() + if ref == nil { + if scName := tmpl.GetStorageClassName(); scName != "" { //nolint:staticcheck // SA1019: stored 1.0 preview templates may still carry storage_class_name + return volumeClass{}, apierror.FailedPrecondition("external volume template uses unsupported storage_class_name %q; recreate the template with external_volume_class", scName) + } + return volumeClass{}, apierror.FailedPrecondition("external volume template does not set external_volume_class") + } + name := ref.GetName() + class, err := classes.GetExternalVolumeClass(ctx, name) + if err != nil { + if apierror.Code(err) == codes.NotFound { + return volumeClass{}, apierror.FailedPrecondition("ExternalVolumeClass %q not found", name) + } + return volumeClass{}, apierror.Internal("failed to get ExternalVolumeClass %q: %v", name, err) + } + return volumeClass{ + name: name, + driver: class.GetDriverName(), + params: class.GetParameters(), + mountOptions: class.GetMountOptions(), + }, nil +} + // initialExternalVolumes constructs the actor's volume objects before volume // creation. A volume has no storage volume ID until it is provisioned. -func initialExternalVolumes(ctx context.Context, scLister storagev1listers.StorageClassLister, template *ateapi.ActorTemplate) ([]*ateapi.ExternalVolumeStatus, error) { +func initialExternalVolumes(ctx context.Context, classes externalVolumeClassGetter, template *ateapi.ActorTemplate) ([]*ateapi.ExternalVolumeStatus, error) { if template == nil { return nil, apierror.InvalidArgument("template is required") } var volumes []*ateapi.ExternalVolumeStatus for _, vol := range template.GetVolumes() { - if vol.GetExternal().GetTemplate() != nil { - scName := vol.GetExternal().GetTemplate().GetStorageClassName() - sc, err := scLister.Get(scName) + if ext := vol.GetExternal().GetTemplate(); ext != nil { + class, err := resolveVolumeClass(ctx, classes, ext) if err != nil { - if k8serrors.IsNotFound(err) { - return nil, apierror.FailedPrecondition("StorageClass %q not found", scName) - } - return nil, apierror.Internal("failed to get StorageClass %q: %v", scName, err) + return nil, err } volumes = append(volumes, &ateapi.ExternalVolumeStatus{ - Name: vol.GetName(), - VolumeType: sc.Provisioner, + Name: vol.GetName(), + VolumeType: class.driver, + MountOptions: class.mountOptions, }) } } @@ -68,7 +107,7 @@ func initialExternalVolumes(ctx context.Context, scLister storagev1listers.Stora // createActorVolumes provisions the external volumes in volumesToCreate that have no storage volume ID, using the provided volume plugin. // It returns the list of external volumes (with storage IDs), or an error if any creation fails. // Any volumes processed before or during a failure are returned alongside the error so they can be persisted on the actor. -func createActorVolumes(ctx context.Context, registry VolumePluginRegistry, scLister storagev1listers.StorageClassLister, actorUID string, template *ateapi.ActorTemplate, volumesToCreate []*ateapi.ExternalVolumeStatus) (resultVolumes []*ateapi.ExternalVolumeStatus, err error) { +func createActorVolumes(ctx context.Context, registry VolumePluginRegistry, classes externalVolumeClassGetter, actorUID string, template *ateapi.ActorTemplate, volumesToCreate []*ateapi.ExternalVolumeStatus) (resultVolumes []*ateapi.ExternalVolumeStatus, err error) { resultVolumes = make([]*ateapi.ExternalVolumeStatus, 0, len(volumesToCreate)) var currentIdx int @@ -102,28 +141,24 @@ func createActorVolumes(ctx context.Context, registry VolumePluginRegistry, scLi actVolID := actorVolumeID(actorUID, volName) - scName := specVol.GetExternal().GetTemplate().GetStorageClassName() - sc, err := scLister.Get(scName) + class, err := resolveVolumeClass(ctx, classes, specVol.GetExternal().GetTemplate()) if err != nil { - if k8serrors.IsNotFound(err) { - return resultVolumes, apierror.FailedPrecondition("StorageClass %q not found", scName) - } - return resultVolumes, apierror.Internal("failed to get StorageClass %q: %v", scName, err) + return resultVolumes, err } - if sc.Provisioner != vol.GetVolumeType() { - return resultVolumes, apierror.FailedPrecondition("volume %q has mismatched type %q (expected %q from StorageClass %q)", volName, vol.GetVolumeType(), sc.Provisioner, scName) + if class.driver != vol.GetVolumeType() { + return resultVolumes, apierror.FailedPrecondition("volume %q has mismatched type %q (expected %q from ExternalVolumeClass %q)", volName, vol.GetVolumeType(), class.driver, class.name) } plugin, err := registry.GetPlugin(ctx, vol.GetVolumeType()) if err != nil { - return resultVolumes, apierror.FailedPrecondition("failed to get volume plugin for driver %q (StorageClass %q): %v", sc.Provisioner, scName, err) + return resultVolumes, apierror.FailedPrecondition("failed to get volume plugin for driver %q (ExternalVolumeClass %q): %v", class.driver, class.name, err) } resp, volErr := plugin.CreateVolume(ctx, volume.CreateVolumeRequest{ Name: actVolID, CapacityBytes: specVol.GetExternal().GetTemplate().GetCapacityBytes(), - Parameters: sc.Parameters, + Parameters: class.params, }) if volErr != nil { return resultVolumes, apierror.Internal("failed to create volume %q: %v", specVol.GetName(), volErr) @@ -137,8 +172,9 @@ func createActorVolumes(ctx context.Context, registry VolumePluginRegistry, scLi resultVolumes = append(resultVolumes, &ateapi.ExternalVolumeStatus{ Name: volName, StorageVolumeId: resp.VolumeID, - VolumeType: sc.Provisioner, + VolumeType: class.driver, VolumeContext: resp.VolumeContext, + MountOptions: class.mountOptions, }) } return resultVolumes, nil diff --git a/cmd/ateapi/internal/controlapi/volumes_test.go b/cmd/ateapi/internal/controlapi/volumes_test.go index a7366a0c9f..8af31dc23d 100644 --- a/cmd/ateapi/internal/controlapi/volumes_test.go +++ b/cmd/ateapi/internal/controlapi/volumes_test.go @@ -29,90 +29,24 @@ import ( "go.ate.dev/substrate/api/ateapi/v1" "go.ate.dev/substrate/internal/apierror" "go.ate.dev/substrate/internal/volume" - storagev1 "k8s.io/api/storage/v1" - k8serrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - k8slabels "k8s.io/apimachinery/pkg/labels" - storagev1listers "k8s.io/client-go/listers/storage/v1" ) -type fakeStorageClassLister struct { - storageClasses map[string]*storagev1.StorageClass - getErr error +// fakeExternalVolumeClassGetter serves classes from a map and reports a +// missing name the way ServiceImpl does. +type fakeExternalVolumeClassGetter struct { + classes map[string]*ateapi.ExternalVolumeClass + getErr error } -func (f *fakeStorageClassLister) List(selector k8slabels.Selector) (ret []*storagev1.StorageClass, err error) { - return nil, nil -} - -func (f *fakeStorageClassLister) Get(name string) (*storagev1.StorageClass, error) { +func (f *fakeExternalVolumeClassGetter) GetExternalVolumeClass(_ context.Context, name string) (*ateapi.ExternalVolumeClass, error) { if f.getErr != nil { return nil, f.getErr } - sc, ok := f.storageClasses[name] + class, ok := f.classes[name] if !ok { - return nil, k8serrors.NewNotFound(storagev1.Resource("storageclass"), name) - } - return sc, nil -} - -var _ storagev1listers.StorageClassLister = (*fakeStorageClassLister)(nil) - -func TestActorVolumesStorageClassErrors(t *testing.T) { - ctx := context.Background() - tmpl := &ateapi.ActorTemplate{ - Volumes: []*ateapi.Volume{{ - Name: "data-vol", - External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", - }}, - }}, - } - volumes := []*ateapi.ExternalVolumeStatus{{ - Name: "data-vol", - VolumeType: "mock-standard", - }} - - for _, tt := range []struct { - name string - getErr error - wantCode codes.Code - }{ - { - name: "missing StorageClass", - wantCode: codes.FailedPrecondition, - }, - { - name: "StorageClass lookup fails", - getErr: errors.New("storage class cache unavailable"), - wantCode: codes.Internal, - }, - } { - t.Run(tt.name, func(t *testing.T) { - lister := &fakeStorageClassLister{getErr: tt.getErr} - t.Run("initial", func(t *testing.T) { - _, err := initialExternalVolumes(ctx, lister, tmpl) - if got := apierror.Code(err); got != tt.wantCode { - t.Fatalf("initialExternalVolumes() code = %v, want %v; error = %v", got, tt.wantCode, err) - } - if !strings.Contains(err.Error(), `StorageClass "standard"`) { - t.Errorf("initialExternalVolumes() error does not name the StorageClass: %v", err) - } - }) - t.Run("create", func(t *testing.T) { - res, err := createActorVolumes(ctx, &mockPluginRegistry{}, lister, "actor-uid-123", tmpl, volumes) - if got := apierror.Code(err); got != tt.wantCode { - t.Fatalf("createActorVolumes() code = %v, want %v; error = %v", got, tt.wantCode, err) - } - if !strings.Contains(err.Error(), `StorageClass "standard"`) { - t.Errorf("createActorVolumes() error does not name the StorageClass: %v", err) - } - if diff := cmp.Diff(volumes, res, protocmp.Transform()); diff != "" { - t.Errorf("createActorVolumes() did not preserve pending volumes (-want +got):\n%s", diff) - } - }) - }) + return nil, apierror.NotFound("ExternalVolumeClass %s not found", name) } + return class, nil } func TestInitialActorVolumes(t *testing.T) { @@ -121,7 +55,7 @@ func TestInitialActorVolumes(t *testing.T) { { Name: "data-vol-1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, }}, }, { @@ -134,7 +68,7 @@ func TestInitialActorVolumes(t *testing.T) { { Name: "data-vol-2", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "fast", + ExternalVolumeClass: &ateapi.ObjectRef{Name: "fast"}, }}, }, }, @@ -146,24 +80,24 @@ func TestInitialActorVolumes(t *testing.T) { VolumeType: "mock-standard", }, { - Name: "data-vol-2", - VolumeType: "mock-fast", + Name: "data-vol-2", + VolumeType: "mock-fast", + MountOptions: []string{"noatime"}, }, } - scLister := &fakeStorageClassLister{ - storageClasses: map[string]*storagev1.StorageClass{ + classes := &fakeExternalVolumeClassGetter{ + classes: map[string]*ateapi.ExternalVolumeClass{ "standard": { - ObjectMeta: metav1.ObjectMeta{Name: "standard"}, - Provisioner: "mock-standard", + DriverName: "mock-standard", }, "fast": { - ObjectMeta: metav1.ObjectMeta{Name: "fast"}, - Provisioner: "mock-fast", + DriverName: "mock-fast", + MountOptions: []string{"noatime"}, }, }, } - initVols, err := initialExternalVolumes(context.Background(), scLister, tmpl) + initVols, err := initialExternalVolumes(context.Background(), classes, tmpl) if err != nil { t.Fatalf("initialExternalVolumes failed: %v", err) } @@ -180,7 +114,7 @@ func TestCreateActorVolumes(t *testing.T) { { Name: "data-vol", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, }}, }, }, @@ -191,38 +125,38 @@ func TestCreateActorVolumes(t *testing.T) { { Name: "vol1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, }}, }, { Name: "vol2", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, }}, }, { Name: "vol3", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "standard", + ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}, }}, }, }, } tests := []struct { - name string - tmpl *ateapi.ActorTemplate - inputVolumes []*ateapi.ExternalVolumeStatus - storageClasses map[string]*storagev1.StorageClass - wantErr bool - wantRes []*ateapi.ExternalVolumeStatus + name string + tmpl *ateapi.ActorTemplate + inputVolumes []*ateapi.ExternalVolumeStatus + classes map[string]*ateapi.ExternalVolumeClass + wantErr bool + wantRes []*ateapi.ExternalVolumeStatus }{ { name: "partial failure returns error and preserves succeeded, failed, and remaining volumes", tmpl: multiVolTmpl, inputVolumes: []*ateapi.ExternalVolumeStatus{ {Name: "vol1", VolumeType: "mock-standard"}, - // Its type differs from its StorageClass's provisioner, so creating it fails. + // Its type differs from its ExternalVolumeClass's driver, so creating it fails. {Name: "vol2", VolumeType: "mock-fast"}, {Name: "vol3", VolumeType: "mock-standard"}, }, @@ -266,7 +200,7 @@ func TestCreateActorVolumes(t *testing.T) { }, }, { - name: "storage class parameters are propagated to volume context", + name: "class parameters and mount options are propagated", tmpl: standardTmpl, inputVolumes: []*ateapi.ExternalVolumeStatus{ { @@ -274,14 +208,14 @@ func TestCreateActorVolumes(t *testing.T) { VolumeType: "mock-standard", }, }, - storageClasses: map[string]*storagev1.StorageClass{ + classes: map[string]*ateapi.ExternalVolumeClass{ "standard": { - ObjectMeta: metav1.ObjectMeta{Name: "standard"}, - Provisioner: "mock-standard", + DriverName: "mock-standard", Parameters: map[string]string{ "type": "pd-ssd", "csi.storage.k8s.io/fstype": "ext4", }, + MountOptions: []string{"rw", "noatime"}, }, }, wantErr: false, @@ -294,6 +228,7 @@ func TestCreateActorVolumes(t *testing.T) { "type": "pd-ssd", "csi.storage.k8s.io/fstype": "ext4", }, + MountOptions: []string{"rw", "noatime"}, }, }, }, @@ -308,21 +243,15 @@ func TestCreateActorVolumes(t *testing.T) { "mock-fast": plugin, }, } - scs := tt.storageClasses - if scs == nil { - scs = map[string]*storagev1.StorageClass{ - "standard": { - ObjectMeta: metav1.ObjectMeta{Name: "standard"}, - Provisioner: "mock-standard", - }, - "fast": { - ObjectMeta: metav1.ObjectMeta{Name: "fast"}, - Provisioner: "mock-fast", - }, + cls := tt.classes + if cls == nil { + cls = map[string]*ateapi.ExternalVolumeClass{ + "standard": {DriverName: "mock-standard"}, + "fast": {DriverName: "mock-fast"}, } } - scLister := &fakeStorageClassLister{storageClasses: scs} - res, err := createActorVolumes(ctx, registry, scLister, "actor-uid-123", tt.tmpl, tt.inputVolumes) + getter := &fakeExternalVolumeClassGetter{classes: cls} + res, err := createActorVolumes(ctx, registry, getter, "actor-uid-123", tt.tmpl, tt.inputVolumes) if (err != nil) != tt.wantErr { t.Errorf("createActorVolumes() error = %v, wantErr %v", err, tt.wantErr) } @@ -333,6 +262,187 @@ func TestCreateActorVolumes(t *testing.T) { } } +func TestResolveVolumeClass(t *testing.T) { + tmpl := &ateapi.ExternalVolumeTemplate{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "gold"}, + } + for _, tt := range []struct { + name string + getter *fakeExternalVolumeClassGetter + wantCode codes.Code + wantDriver string + wantParams map[string]string + wantMountOptions []string + }{{ + name: "found", + getter: &fakeExternalVolumeClassGetter{classes: map[string]*ateapi.ExternalVolumeClass{ + "gold": { + DriverName: "mock-standard", + Parameters: map[string]string{"tier": "gold"}, + MountOptions: []string{"nfsvers=4.1", "noatime"}, + }, + }}, + wantCode: codes.OK, + wantDriver: "mock-standard", + wantParams: map[string]string{"tier": "gold"}, + wantMountOptions: []string{"nfsvers=4.1", "noatime"}, + }, { + name: "missing", + getter: &fakeExternalVolumeClassGetter{}, + wantCode: codes.FailedPrecondition, + }, { + name: "lookup fails", + getter: &fakeExternalVolumeClassGetter{getErr: errors.New("database unavailable")}, + wantCode: codes.Internal, + }} { + t.Run(tt.name, func(t *testing.T) { + got, err := resolveVolumeClass(context.Background(), tt.getter, tmpl) + if code := apierror.Code(err); code != tt.wantCode { + t.Fatalf("resolveVolumeClass() code = %v, want %v; error = %v", code, tt.wantCode, err) + } + if err != nil { + if !strings.Contains(err.Error(), `ExternalVolumeClass "gold"`) { + t.Errorf("resolveVolumeClass() error does not name the class: %v", err) + } + return + } + if got.name != "gold" { + t.Errorf("resolveVolumeClass() name = %q, want %q", got.name, "gold") + } + if got.driver != tt.wantDriver { + t.Errorf("resolveVolumeClass() driver = %q, want %q", got.driver, tt.wantDriver) + } + if diff := cmp.Diff(tt.wantParams, got.params); diff != "" { + t.Errorf("resolveVolumeClass() params mismatch (-want +got):\n%s", diff) + } + if diff := cmp.Diff(tt.wantMountOptions, got.mountOptions); diff != "" { + t.Errorf("resolveVolumeClass() mountOptions mismatch (-want +got):\n%s", diff) + } + }) + } +} + +func TestActorVolumesFromExternalVolumeClass(t *testing.T) { + ctx := context.Background() + tmpl := &ateapi.ActorTemplate{ + Volumes: []*ateapi.Volume{{ + Name: "data-vol", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "gold"}, + CapacityBytes: 1 << 30, + }}, + }}, + } + classes := &fakeExternalVolumeClassGetter{classes: map[string]*ateapi.ExternalVolumeClass{ + "gold": { + DriverName: "mock-standard", + Parameters: map[string]string{"tier": "gold"}, + MountOptions: []string{"nfsvers=4.1"}, + }, + }} + registry := &mockPluginRegistry{plugins: map[string]volume.VolumePluginControlPlane{ + "mock-standard": volume.NewMockVolumePlugin(), + }} + + t.Run("initial volume takes the class driver and mount options", func(t *testing.T) { + got, err := initialExternalVolumes(ctx, classes, tmpl) + if err != nil { + t.Fatalf("initialExternalVolumes() failed: %v", err) + } + want := []*ateapi.ExternalVolumeStatus{{ + Name: "data-vol", + VolumeType: "mock-standard", + MountOptions: []string{"nfsvers=4.1"}, + }} + if diff := cmp.Diff(want, got, protocmp.Transform()); diff != "" { + t.Errorf("initialExternalVolumes() mismatch (-want +got):\n%s", diff) + } + }) + + t.Run("create passes the class parameters and mount options", func(t *testing.T) { + input := []*ateapi.ExternalVolumeStatus{{Name: "data-vol", VolumeType: "mock-standard"}} + got, err := createActorVolumes(ctx, registry, classes, "actor-uid-123", tmpl, input) + if err != nil { + t.Fatalf("createActorVolumes() failed: %v", err) + } + want := []*ateapi.ExternalVolumeStatus{{ + Name: "data-vol", + StorageVolumeId: "mock-vol-substrate-actor-uid-123-data-vol", + VolumeType: "mock-standard", + VolumeContext: map[string]string{"tier": "gold"}, + MountOptions: []string{"nfsvers=4.1"}, + }} + if diff := cmp.Diff(want, got, protocmp.Transform()); diff != "" { + t.Errorf("createActorVolumes() mismatch (-want +got):\n%s", diff) + } + }) + + t.Run("create rejects a volume whose type differs from the class driver", func(t *testing.T) { + input := []*ateapi.ExternalVolumeStatus{{Name: "data-vol", VolumeType: "mock-fast"}} + got, err := createActorVolumes(ctx, registry, classes, "actor-uid-123", tmpl, input) + if code := apierror.Code(err); code != codes.FailedPrecondition { + t.Fatalf("createActorVolumes() code = %v, want %v; error = %v", code, codes.FailedPrecondition, err) + } + if !strings.Contains(err.Error(), `from ExternalVolumeClass "gold"`) { + t.Errorf("createActorVolumes() error does not name the class: %v", err) + } + if diff := cmp.Diff(input, got, protocmp.Transform()); diff != "" { + t.Errorf("createActorVolumes() did not preserve pending volumes (-want +got):\n%s", diff) + } + }) + + t.Run("missing class is a failed precondition", func(t *testing.T) { + missing := &fakeExternalVolumeClassGetter{} + if _, err := initialExternalVolumes(ctx, missing, tmpl); apierror.Code(err) != codes.FailedPrecondition { + t.Errorf("initialExternalVolumes() error = %v, want FailedPrecondition", err) + } + input := []*ateapi.ExternalVolumeStatus{{Name: "data-vol", VolumeType: "mock-standard"}} + got, err := createActorVolumes(ctx, registry, missing, "actor-uid-123", tmpl, input) + if code := apierror.Code(err); code != codes.FailedPrecondition { + t.Fatalf("createActorVolumes() code = %v, want %v; error = %v", code, codes.FailedPrecondition, err) + } + if diff := cmp.Diff(input, got, protocmp.Transform()); diff != "" { + t.Errorf("createActorVolumes() did not preserve pending volumes (-want +got):\n%s", diff) + } + }) + + t.Run("template with no class is a failed precondition", func(t *testing.T) { + noClass := &ateapi.ActorTemplate{Volumes: []*ateapi.Volume{{ + Name: "data-vol", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{CapacityBytes: 1 << 30}}, + }}} + if _, err := initialExternalVolumes(ctx, classes, noClass); apierror.Code(err) != codes.FailedPrecondition { + t.Errorf("initialExternalVolumes() error = %v, want FailedPrecondition", err) + } + }) + + t.Run("stored legacy template with storage_class_name is a failed precondition", func(t *testing.T) { + legacy := &ateapi.ActorTemplate{Volumes: []*ateapi.Volume{{ + Name: "data-vol", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{StorageClassName: "legacy-sc", CapacityBytes: 1 << 30}}, //nolint:staticcheck // SA1019: stored 1.0 preview templates may still carry storage_class_name + }}} + _, err := initialExternalVolumes(ctx, classes, legacy) + if code := apierror.Code(err); code != codes.FailedPrecondition { + t.Fatalf("initialExternalVolumes() code = %v, want %v; error = %v", code, codes.FailedPrecondition, err) + } + if !strings.Contains(err.Error(), `"legacy-sc"`) || !strings.Contains(err.Error(), "external_volume_class") { + t.Errorf("initialExternalVolumes() error = %v, want mention of legacy-sc and external_volume_class", err) + } + + input := []*ateapi.ExternalVolumeStatus{{Name: "data-vol", VolumeType: "mock-standard"}} + got, err := createActorVolumes(ctx, registry, classes, "actor-uid-123", legacy, input) + if code := apierror.Code(err); code != codes.FailedPrecondition { + t.Fatalf("createActorVolumes() code = %v, want %v; error = %v", code, codes.FailedPrecondition, err) + } + if !strings.Contains(err.Error(), `"legacy-sc"`) || !strings.Contains(err.Error(), "external_volume_class") { + t.Errorf("createActorVolumes() error = %v, want mention of legacy-sc and external_volume_class", err) + } + if diff := cmp.Diff(input, got, protocmp.Transform()); diff != "" { + t.Errorf("createActorVolumes() did not preserve pending volumes (-want +got):\n%s", diff) + } + }) +} + // emptyIDVolumePlugin provisions volumes without returning an ID. type emptyIDVolumePlugin struct { volume.VolumePluginControlPlane @@ -346,18 +456,18 @@ func TestCreateActorVolumesRejectsEmptyPluginID(t *testing.T) { tmpl := &ateapi.ActorTemplate{ Volumes: []*ateapi.Volume{{ Name: "data-vol", - External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{StorageClassName: "standard"}}, + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ExternalVolumeClass: &ateapi.ObjectRef{Name: "standard"}}}, }}, } registry := &mockPluginRegistry{ plugins: map[string]volume.VolumePluginControlPlane{"mock-standard": emptyIDVolumePlugin{}}, } - scLister := &fakeStorageClassLister{storageClasses: map[string]*storagev1.StorageClass{ - "standard": {ObjectMeta: metav1.ObjectMeta{Name: "standard"}, Provisioner: "mock-standard"}, + classes := &fakeExternalVolumeClassGetter{classes: map[string]*ateapi.ExternalVolumeClass{ + "standard": {DriverName: "mock-standard"}, }} input := []*ateapi.ExternalVolumeStatus{{Name: "data-vol", VolumeType: "mock-standard"}} - res, err := createActorVolumes(context.Background(), registry, scLister, "actor-uid-123", tmpl, input) + res, err := createActorVolumes(context.Background(), registry, classes, "actor-uid-123", tmpl, input) if got := apierror.Code(err); got != codes.Internal { t.Fatalf("createActorVolumes() code = %v, want %v; error = %v", got, codes.Internal, err) } diff --git a/cmd/ateapi/internal/controlapi/worker_test.go b/cmd/ateapi/internal/controlapi/worker_test.go index 6f22b94bd2..8408bbfeec 100644 --- a/cmd/ateapi/internal/controlapi/worker_test.go +++ b/cmd/ateapi/internal/controlapi/worker_test.go @@ -72,7 +72,7 @@ func newWorkerAPIService(t *testing.T) (*RPCService, store.Interface) { t.Helper() persistence, cleanup := storetest.SetupTestStore(t) t.Cleanup(cleanup) - impl := newServiceImpl(persistence, nil) + impl := newServiceImpl(persistence) return &RPCService{impl: impl, workerWorkflow: NewWorkerWorkflow(persistence, newNodeAteletDialer(t, &capturingTerminator{}))}, persistence } @@ -783,7 +783,7 @@ func TestServiceImplUpdateWorker_ImmutableFields(t *testing.T) { ctx := context.Background() persistence, cleanup := storetest.SetupTestStore(t) defer cleanup() - impl := newServiceImpl(persistence, nil) + impl := newServiceImpl(persistence) // Every case below is rejected, so nothing writes and this stays the // current incarnation for all of them. @@ -864,7 +864,7 @@ func TestServiceImplAssignmentWrites_ValidateActor(t *testing.T) { ctx := context.Background() persistence, cleanup := storetest.SetupTestStore(t) defer cleanup() - impl := newServiceImpl(persistence, nil) + impl := newServiceImpl(persistence) seedAPIWorker(t, ctx, persistence, validWorker(apiWorkerName)) actor := storetest.MustCreateActor(t, ctx, persistence, &ateapi.Actor{ Metadata: &ateapi.ResourceMetadata{Atespace: "team-a", Name: "actor-1"}, diff --git a/cmd/ateapi/internal/controlapi/workflow.go b/cmd/ateapi/internal/controlapi/workflow.go index c8579c64e5..1b6479a41b 100644 --- a/cmd/ateapi/internal/controlapi/workflow.go +++ b/cmd/ateapi/internal/controlapi/workflow.go @@ -36,7 +36,6 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" - storagev1listers "k8s.io/client-go/listers/storage/v1" ) // stepSpan opens the per-step trace span ("step." on the controlapi @@ -110,7 +109,6 @@ type ActorWorkflow struct { workerCache *workercache.Cache scheduler scheduling.Scheduler dialer *AteletDialer - storageClassLister storagev1listers.StorageClassLister instruments *Instruments egressGatewayAddress string pluginRegistry VolumePluginRegistry @@ -127,7 +125,6 @@ func NewActorWorkflow( store actorWorkflowStore, workerCache *workercache.Cache, dialer *AteletDialer, - storageClassLister storagev1listers.StorageClassLister, instruments *Instruments, egressGatewayAddress string, pluginRegistry VolumePluginRegistry, @@ -138,7 +135,6 @@ func NewActorWorkflow( workerCache: workerCache, scheduler: scheduling.New(workerCache), dialer: dialer, - storageClassLister: storageClassLister, instruments: instruments, egressGatewayAddress: egressGatewayAddress, pluginRegistry: pluginRegistry, @@ -187,6 +183,7 @@ type actorWorkflowStore interface { MarkTagForDeletion(ctx context.Context, tagRef resources.TagRef, precondition store.DeletePreconditions, mutate func(toUpdate *ateapi.Tag) error) (*ateapi.Tag, error) DeleteTag(ctx context.Context, tagRef resources.TagRef, precondition store.DeletePreconditions) (*ateapi.Tag, error) GetActorTemplate(ctx context.Context, templateRef resources.ActorTemplateRef) (*ateapi.ActorTemplate, error) + GetExternalVolumeClass(ctx context.Context, name string) (*ateapi.ExternalVolumeClass, error) MarkActorTemplateForDeletion(ctx context.Context, templateRef resources.ActorTemplateRef, precondition store.DeletePreconditions, mutate func(toUpdate *ateapi.ActorTemplate) error) (*ateapi.ActorTemplate, error) DeleteActorTemplate(ctx context.Context, templateRef resources.ActorTemplateRef, precondition store.DeletePreconditions) (*ateapi.ActorTemplate, error) AcquireLease(ctx context.Context, key string) (*store.Lease, error) diff --git a/cmd/ateapi/internal/controlapi/workflow_delete_test.go b/cmd/ateapi/internal/controlapi/workflow_delete_test.go index 9dcfba5258..2ae30b9f59 100644 --- a/cmd/ateapi/internal/controlapi/workflow_delete_test.go +++ b/cmd/ateapi/internal/controlapi/workflow_delete_test.go @@ -455,7 +455,7 @@ func TestDeleteActor_CollectsInFlightSnapshotWithoutTemplate(t *testing.T) { ctx := context.Background() persistence := newTestPersistence(t) objects := objectstoretest.New() - w := NewActorWorkflow(persistence, nil, nil, nil, nil, "", nil, objectstoreplugintest.ControlClient(objects)) + w := NewActorWorkflow(persistence, nil, nil, nil, "", nil, objectstoreplugintest.ControlClient(objects)) actorRef := resources.ActorRef{Atespace: "team-a", Name: "actor-1"} actor := storetest.MustCreateActor(t, ctx, persistence, &ateapi.Actor{ @@ -641,7 +641,7 @@ func TestDeleteActorWorkflow_RetryKeepsAdmission(t *testing.T) { ctx := context.Background() persistence := newTestPersistence(t) objects := objectstoretest.New() - w := NewActorWorkflow(persistence, nil, nil, nil, nil, "", nil, objectstoreplugintest.ControlClient(objects)) + w := NewActorWorkflow(persistence, nil, nil, nil, "", nil, objectstoreplugintest.ControlClient(objects)) actorRef := resources.ActorRef{Atespace: "team-a", Name: "actor-1"} actor := storetest.MustCreateActor(t, ctx, persistence, &ateapi.Actor{ diff --git a/cmd/ateapi/internal/controlapi/workflow_resume.go b/cmd/ateapi/internal/controlapi/workflow_resume.go index 324a16eda6..03ce65e0a1 100644 --- a/cmd/ateapi/internal/controlapi/workflow_resume.go +++ b/cmd/ateapi/internal/controlapi/workflow_resume.go @@ -206,7 +206,7 @@ func (w *ActorWorkflow) ensureVolumesCreated(ctx context.Context, actorRef resou return nil, apierror.FailedPrecondition("cannot create volumes for Actor %s in state %s", actorRef, st) } - volumes, createErr := createActorVolumes(ctx, w.pluginRegistry, w.storageClassLister, actor.GetMetadata().GetUid(), actorTemplate, actor.GetStatus().GetExternalVolumes().GetVolumes()) + volumes, createErr := createActorVolumes(ctx, w.pluginRegistry, w.store, actor.GetMetadata().GetUid(), actorTemplate, actor.GetStatus().GetExternalVolumes().GetVolumes()) // createActorVolumes reports the state it got to even when it fails, so both // paths persist the same field. updatePrecondition := store.PreconditionFrom(actor) diff --git a/cmd/ateapi/internal/controlapi/workflow_resume_test.go b/cmd/ateapi/internal/controlapi/workflow_resume_test.go index 1c81112384..611f8f10a8 100644 --- a/cmd/ateapi/internal/controlapi/workflow_resume_test.go +++ b/cmd/ateapi/internal/controlapi/workflow_resume_test.go @@ -49,7 +49,6 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/testing/protocmp" corev1 "k8s.io/api/core/v1" - storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" ) @@ -2031,8 +2030,8 @@ func TestEnsureVolumesAttached_ReturnsPublishContext(t *testing.T) { worker := &ateapi.Worker{NodeName: "node-1"} tmpl := &ateapi.ActorTemplate{ Volumes: []*ateapi.Volume{ - {Name: "mounted", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{StorageClassName: "sc"}}}, - {Name: "unmounted", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{StorageClassName: "sc"}}}, + {Name: "mounted", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ExternalVolumeClass: &ateapi.ObjectRef{Name: "sc"}}}}, + {Name: "unmounted", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ExternalVolumeClass: &ateapi.ObjectRef{Name: "sc"}}}}, }, Containers: []*ateapi.Container{ {Name: "main", Image: "img", VolumeMounts: []*ateapi.VolumeMount{{Name: "mounted", MountPath: "/data"}}}, @@ -2077,7 +2076,7 @@ func TestEnsureVolumesCreated(t *testing.T) { tmpl := &ateapi.ActorTemplate{ Volumes: []*ateapi.Volume{{ Name: "data", - External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{StorageClassName: "sc"}}, + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ExternalVolumeClass: &ateapi.ObjectRef{Name: "sc"}}}, }}, } tests := []struct { @@ -2093,6 +2092,12 @@ func TestEnsureVolumesCreated(t *testing.T) { t.Run(tt.name, func(t *testing.T) { ctx := context.Background() persistence := newTestPersistence(t) + if _, err := persistence.CreateExternalVolumeClass(ctx, &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "sc"}, + DriverName: "mock", + }); err != nil { + t.Fatalf("CreateExternalVolumeClass: %v", err) + } actorRef := resources.ActorRef{Atespace: "team-a", Name: "id1"} storetest.MustCreateActor(t, ctx, persistence, &ateapi.Actor{ Metadata: &ateapi.ResourceMetadata{Atespace: "team-a", Name: "id1"}, @@ -2110,9 +2115,6 @@ func TestEnsureVolumesCreated(t *testing.T) { w := &ActorWorkflow{ store: persistence, pluginRegistry: &mockPluginRegistry{plugins: map[string]volume.VolumePluginControlPlane{"mock": plugin}}, - storageClassLister: &fakeStorageClassLister{storageClasses: map[string]*storagev1.StorageClass{ - "sc": {ObjectMeta: metav1.ObjectMeta{Name: "sc"}, Provisioner: "mock"}, - }}, } _, err = w.ensureVolumesCreated(ctx, actorRef, actor, tmpl) @@ -3084,7 +3086,7 @@ func volumeTemplate(declared []string, mounted ...string) *ateapi.ActorTemplate Containers: []*ateapi.Container{{Name: "main", Image: "img"}}, } for _, name := range declared { - tmpl.Volumes = append(tmpl.Volumes, &ateapi.Volume{Name: name, External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{StorageClassName: "sc"}}}) + tmpl.Volumes = append(tmpl.Volumes, &ateapi.Volume{Name: name, External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ExternalVolumeClass: &ateapi.ObjectRef{Name: "sc"}}}}) } for _, name := range mounted { tmpl.Containers[0].VolumeMounts = append(tmpl.Containers[0].VolumeMounts, &ateapi.VolumeMount{Name: name, MountPath: "/" + name}) diff --git a/cmd/ateapi/internal/controlapi/workflow_testutil_test.go b/cmd/ateapi/internal/controlapi/workflow_testutil_test.go index 82c4bf7794..9d51200a2a 100644 --- a/cmd/ateapi/internal/controlapi/workflow_testutil_test.go +++ b/cmd/ateapi/internal/controlapi/workflow_testutil_test.go @@ -58,7 +58,7 @@ func newTestActorWorkflow(t *testing.T, st store.Interface, tmplAtespace, tmplNa }); err != nil && !errors.Is(err, store.ErrAlreadyExists) { t.Fatalf("create test ActorTemplate: %v", err) } - return NewActorWorkflow(st, nil, nil, nil, nil, "", nil, objectstoreplugintest.ControlClient(objectstoretest.New())) + return NewActorWorkflow(st, nil, nil, nil, "", nil, objectstoreplugintest.ControlClient(objectstoretest.New())) } // newFinalizeWorkflow builds an ActorWorkflow over persistence with an diff --git a/cmd/ateapi/internal/controlapi/workload_spec.go b/cmd/ateapi/internal/controlapi/workload_spec.go index 57e1e5986d..eff4e92d7f 100644 --- a/cmd/ateapi/internal/controlapi/workload_spec.go +++ b/cmd/ateapi/internal/controlapi/workload_spec.go @@ -150,11 +150,13 @@ func appendExternalVolumes(workloadSpec *ateletpb.WorkloadSpec, template *ateapi var storageVolID string var volType string var volCtx map[string]string + var mountOptions []string for _, dbVol := range actor.GetStatus().GetExternalVolumes().GetVolumes() { if dbVol.GetName() == vol.GetName() { storageVolID = dbVol.GetStorageVolumeId() volType = dbVol.GetVolumeType() volCtx = dbVol.GetVolumeContext() + mountOptions = dbVol.GetMountOptions() break } } @@ -168,6 +170,7 @@ func appendExternalVolumes(workloadSpec *ateletpb.WorkloadSpec, template *ateapi VolumeType: volType, VolumeContext: volCtx, PublishContext: volumePublishContexts[vol.GetName()], + MountOptions: mountOptions, }, }) } diff --git a/cmd/ateapi/internal/controlapi/workload_spec_test.go b/cmd/ateapi/internal/controlapi/workload_spec_test.go index 69f67c82fd..4b151a75ae 100644 --- a/cmd/ateapi/internal/controlapi/workload_spec_test.go +++ b/cmd/ateapi/internal/controlapi/workload_spec_test.go @@ -20,6 +20,7 @@ import ( "github.com/google/go-cmp/cmp" "go.ate.dev/substrate/api/ateapi/v1" "go.ate.dev/substrate/internal/proto/ateletpb" + "google.golang.org/protobuf/proto" "google.golang.org/protobuf/testing/protocmp" ) @@ -391,7 +392,7 @@ func TestAppendExternalVolumes(t *testing.T) { { Name: "vol-1", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "pd-standard", + ExternalVolumeClass: &ateapi.ObjectRef{Name: "pd-standard"}, }}, }, { @@ -401,7 +402,7 @@ func TestAppendExternalVolumes(t *testing.T) { { Name: "unmounted-vol", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - StorageClassName: "pd-standard", + ExternalVolumeClass: &ateapi.ObjectRef{Name: "pd-standard"}, }}, }, }, @@ -426,8 +427,10 @@ func TestAppendExternalVolumes(t *testing.T) { for _, tt := range []struct { name string + mountOptions []string volumePublishContexts map[string]map[string]string wantPublishCtx map[string]string + wantMountOptions []string }{ { name: "with attachment metadata", @@ -437,10 +440,17 @@ func TestAppendExternalVolumes(t *testing.T) { { name: "without attachment metadata", }, + { + name: "with mount options", + mountOptions: []string{"nfsvers=4.1", "noatime"}, + wantMountOptions: []string{"nfsvers=4.1", "noatime"}, + }, } { t.Run(tt.name, func(t *testing.T) { + testActor := proto.Clone(actor).(*ateapi.Actor) + testActor.Status.ExternalVolumes.Volumes[0].MountOptions = tt.mountOptions workloadSpec := &ateletpb.WorkloadSpec{} - if err := appendExternalVolumes(workloadSpec, template, actor, tt.volumePublishContexts); err != nil { + if err := appendExternalVolumes(workloadSpec, template, testActor, tt.volumePublishContexts); err != nil { t.Fatalf("appendExternalVolumes unexpected error: %v", err) } @@ -453,6 +463,7 @@ func TestAppendExternalVolumes(t *testing.T) { VolumeType: "pd-standard", VolumeContext: map[string]string{"foo": "bar"}, PublishContext: tt.wantPublishCtx, + MountOptions: tt.wantMountOptions, }, }, }, diff --git a/cmd/ateapi/internal/defaults/defaults.go b/cmd/ateapi/internal/defaults/defaults.go index 0bffefb536..ebbdcda465 100644 --- a/cmd/ateapi/internal/defaults/defaults.go +++ b/cmd/ateapi/internal/defaults/defaults.go @@ -38,6 +38,8 @@ func Apply(m proto.Message) { applyAtespaceDefaults(v) case *ateapi.EgressPolicy: applyEgressPolicyDefaults(v) + case *ateapi.ExternalVolumeClass: + applyExternalVolumeClassDefaults(v) case *ateapi.Tag: applyTagDefaults(v) case *ateapi.Worker: @@ -117,6 +119,8 @@ func applyEgressRuleDefaults(rules []*ateapi.EgressRule) { } } +func applyExternalVolumeClassDefaults(*ateapi.ExternalVolumeClass) {} + func applyTagDefaults(*ateapi.Tag) {} func applyWorkerDefaults(*ateapi.Worker) {} diff --git a/cmd/ateapi/internal/defaults/defaults_test.go b/cmd/ateapi/internal/defaults/defaults_test.go index 5a1e2e441d..a03e35e439 100644 --- a/cmd/ateapi/internal/defaults/defaults_test.go +++ b/cmd/ateapi/internal/defaults/defaults_test.go @@ -151,6 +151,10 @@ func TestApply(t *testing.T) { {Https: &ateapi.HttpsRule{Hostnames: []string{"custom.example.com"}, Ports: &ateapi.Ports{Numbers: []int32{8443}}}}, {TlsPassthrough: &ateapi.TlsPassthroughRule{Hostnames: []string{"tcp.example.com"}}}, }}}, + }, { + name: "external volume class has no defaults", + in: &ateapi.ExternalVolumeClass{Metadata: &ateapi.ResourceMetadata{Name: "csi-nfs"}, DriverName: "nfs.csi.k8s.io"}, + want: &ateapi.ExternalVolumeClass{Metadata: &ateapi.ResourceMetadata{Name: "csi-nfs"}, DriverName: "nfs.csi.k8s.io"}, }, { name: "tag has no defaults", in: &ateapi.Tag{Scope: ateapi.TagScope_TAG_SCOPE_PUBLISHED}, diff --git a/cmd/ateapi/internal/store/atepg/access_policy_test.go b/cmd/ateapi/internal/store/atepg/access_policy_test.go index 4461178a30..76685cec1e 100644 --- a/cmd/ateapi/internal/store/atepg/access_policy_test.go +++ b/cmd/ateapi/internal/store/atepg/access_policy_test.go @@ -16,6 +16,7 @@ package atepg import ( "errors" + "fmt" "slices" "sync" "testing" @@ -25,6 +26,7 @@ import ( "go.ate.dev/substrate/cmd/ateapi/internal/authz" "go.ate.dev/substrate/cmd/ateapi/internal/store" "google.golang.org/protobuf/testing/protocmp" + "google.golang.org/protobuf/types/known/timestamppb" ) func TestGlobalAccessPolicy_Lifecycle(t *testing.T) { @@ -261,3 +263,480 @@ func TestGlobalAccessPolicy_UpdateIsAtomic(t *testing.T) { } }) } + +func externalVolumeClassTuples(t *testing.T, p *Persistence, className string) []string { + t.Helper() + rows, err := p.pool.Query(t.Context(), + `SELECT relation, _user FROM tuple WHERE object_type = 'external_volume_class' AND object_id = $1`, + className) + if err != nil { + t.Fatalf("reading external volume class tuples: %v", err) + } + defer rows.Close() + var out []string + for rows.Next() { + var relation, user string + if err := rows.Scan(&relation, &user); err != nil { + t.Fatalf("scanning tuple: %v", err) + } + out = append(out, relation+" "+user) + } + if err := rows.Err(); err != nil { + t.Fatalf("reading external volume class tuples: %v", err) + } + slices.Sort(out) + return out +} + +func newTestExternalVolumeClass(name string) *ateapi.ExternalVolumeClass { + return &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: name}, + DriverName: "nfs.csi.k8s.io", + } +} + +func TestExternalVolumeClassAccessPolicy_LifecycleAndCascade(t *testing.T) { + p := setupPostgresPersistence(t) + ctx := t.Context() + + for _, space := range []string{"team-a", "team-b", "team-c"} { + createTestAtespace(t, p, space) + } + + policy := &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:team-a", "atespace:team-b"}}, + }, + } + + // Missing parent ExternalVolumeClass -> ErrFailedPrecondition. + if _, err := p.CreateExternalVolumeClassAccessPolicy(ctx, "missing-class", policy); !errors.Is(err, store.ErrFailedPrecondition) { + t.Fatalf("CreateExternalVolumeClassAccessPolicy on missing class = %v, want ErrFailedPrecondition", err) + } + + if _, err := p.CreateExternalVolumeClass(ctx, newTestExternalVolumeClass("nfs-gold")); err != nil { + t.Fatalf("CreateExternalVolumeClass(nfs-gold) failed: %v", err) + } + if _, err := p.GetExternalVolumeClassAccessPolicy(ctx, "nfs-gold"); !errors.Is(err, store.ErrNotFound) { + t.Fatalf("GetExternalVolumeClassAccessPolicy before create = %v, want ErrNotFound", err) + } + + // Nonexistent member atespace on Create -> ErrFailedPrecondition, leaving no row or tuples. + if _, err := p.CreateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:team-a", "atespace:ghost"}}, + }, + }); !errors.Is(err, store.ErrFailedPrecondition) { + t.Fatalf("CreateExternalVolumeClassAccessPolicy with missing member = %v, want ErrFailedPrecondition", err) + } + if _, err := p.GetExternalVolumeClassAccessPolicy(ctx, "nfs-gold"); !errors.Is(err, store.ErrNotFound) { + t.Fatalf("GetExternalVolumeClassAccessPolicy after failed create = %v, want ErrNotFound", err) + } + if got := externalVolumeClassTuples(t, p, "nfs-gold"); len(got) != 0 { + t.Fatalf("tuples after failed create = %v, want empty", got) + } + + created, err := p.CreateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", policy) + if err != nil { + t.Fatalf("CreateExternalVolumeClassAccessPolicy failed: %v", err) + } + if created.GetMetadata().GetName() != "default" || created.GetMetadata().GetVersion() != 1 || created.GetMetadata().GetUid() == "" { + t.Fatalf("unexpected created metadata: %+v", created.GetMetadata()) + } + wantInitialTuples := []string{"allowed_atespace atespace:team-a", "allowed_atespace atespace:team-b"} + if diff := cmp.Diff(wantInitialTuples, externalVolumeClassTuples(t, p, "nfs-gold")); diff != "" { + t.Fatalf("tuples after create (-want +got):\n%s", diff) + } + + if _, err := p.CreateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", policy); !errors.Is(err, store.ErrAlreadyExists) { + t.Fatalf("second CreateExternalVolumeClassAccessPolicy = %v, want ErrAlreadyExists", err) + } + + got, err := p.GetExternalVolumeClassAccessPolicy(ctx, "nfs-gold") + if err != nil || !cmp.Equal(got, created, protocmp.Transform()) { + t.Fatalf("GetExternalVolumeClassAccessPolicy = %v, %v; want %v", got, err, created) + } + + // Update precondition and missing-policy checks. + if _, err := p.UpdateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", store.Precondition{}, func(*ateapi.AccessPolicy) error { return nil }); !errors.Is(err, store.ErrPreconditionRequired) { + t.Fatalf("UpdateExternalVolumeClassAccessPolicy without precondition = %v, want ErrPreconditionRequired", err) + } + if _, err := p.UpdateExternalVolumeClassAccessPolicy(ctx, "missing-class", store.PreconditionFrom(created), func(*ateapi.AccessPolicy) error { return nil }); !errors.Is(err, store.ErrNotFound) { + t.Fatalf("UpdateExternalVolumeClassAccessPolicy on missing policy = %v, want ErrNotFound", err) + } + if _, err := p.UpdateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", store.Precondition{UID: created.GetMetadata().GetUid(), Version: 99}, func(*ateapi.AccessPolicy) error { return nil }); !errors.Is(err, store.ErrVersionConflict) { + t.Fatalf("UpdateExternalVolumeClassAccessPolicy wrong version = %v, want ErrVersionConflict", err) + } + if _, err := p.UpdateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", store.Precondition{UID: "wrong-uid", Version: 1}, func(*ateapi.AccessPolicy) error { return nil }); !errors.Is(err, store.ErrUIDConflict) { + t.Fatalf("UpdateExternalVolumeClassAccessPolicy wrong uid = %v, want ErrUIDConflict", err) + } + + // Nonexistent member atespace on Update -> ErrFailedPrecondition, leaving row and tuples untouched. + if _, err := p.UpdateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", store.PreconditionFrom(created), func(toUpdate *ateapi.AccessPolicy) error { + toUpdate.Bindings = []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:team-b", "atespace:ghost"}}, + } + return nil + }); !errors.Is(err, store.ErrFailedPrecondition) { + t.Fatalf("UpdateExternalVolumeClassAccessPolicy with missing member = %v, want ErrFailedPrecondition", err) + } + + // Failed OpenFGA write rolls back both row UPDATE and earlier tuple deletes. + if _, err := p.UpdateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", store.PreconditionFrom(created), func(toUpdate *ateapi.AccessPolicy) error { + toUpdate.Bindings = []*ateapi.Binding{ + {Role: "not-a-relation", Members: []string{"atespace:team-b"}}, + } + return nil + }); err == nil { + t.Fatal("UpdateExternalVolumeClassAccessPolicy with undefined relation succeeded, want error") + } + afterFailedUpdate, err := p.GetExternalVolumeClassAccessPolicy(ctx, "nfs-gold") + if err != nil || !cmp.Equal(afterFailedUpdate, created, protocmp.Transform()) { + t.Fatalf("policy row changed after failed update: got %v, err %v", afterFailedUpdate, err) + } + if diff := cmp.Diff(wantInitialTuples, externalVolumeClassTuples(t, p, "nfs-gold")); diff != "" { + t.Fatalf("tuples changed after failed update (-want +got):\n%s", diff) + } + + updated, err := p.UpdateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", store.PreconditionFrom(created), func(toUpdate *ateapi.AccessPolicy) error { + toUpdate.Metadata.Name = "tampered" + toUpdate.Metadata.DeleteTime = timestamppb.Now() + toUpdate.Bindings = []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:team-b", "atespace:team-c"}}, + } + return nil + }) + if err != nil || updated.GetMetadata().GetVersion() != 2 { + t.Fatalf("UpdateExternalVolumeClassAccessPolicy = %v, %v; want version 2", updated, err) + } + if updated.GetMetadata().GetName() != "default" || updated.GetMetadata().GetUid() != created.GetMetadata().GetUid() || updated.GetMetadata().GetDeleteTime() != nil { + t.Fatalf("UpdateExternalVolumeClassAccessPolicy did not preserve server-managed metadata: %+v", updated.GetMetadata()) + } + wantUpdatedTuples := []string{"allowed_atespace atespace:team-b", "allowed_atespace atespace:team-c"} + if diff := cmp.Diff(wantUpdatedTuples, externalVolumeClassTuples(t, p, "nfs-gold")); diff != "" { + t.Fatalf("tuples after update (-want +got):\n%s", diff) + } + + // DeleteExternalVolumeClassAccessPolicy preconditions and cleanup. + if _, err := p.DeleteExternalVolumeClassAccessPolicy(ctx, "missing-class", store.DeletePreconditions{}); !errors.Is(err, store.ErrNotFound) { + t.Fatalf("DeleteExternalVolumeClassAccessPolicy on missing policy = %v, want ErrNotFound", err) + } + if _, err := p.DeleteExternalVolumeClassAccessPolicy(ctx, "nfs-gold", store.DeletePreconditions{Version: 99}); !errors.Is(err, store.ErrVersionConflict) { + t.Fatalf("DeleteExternalVolumeClassAccessPolicy wrong version = %v, want ErrVersionConflict", err) + } + if _, err := p.DeleteExternalVolumeClassAccessPolicy(ctx, "nfs-gold", store.DeletePreconditions{UID: "wrong-uid"}); !errors.Is(err, store.ErrUIDConflict) { + t.Fatalf("DeleteExternalVolumeClassAccessPolicy wrong uid = %v, want ErrUIDConflict", err) + } + + deleted, err := p.DeleteExternalVolumeClassAccessPolicy(ctx, "nfs-gold", store.DeletePreconditions{ + UID: updated.GetMetadata().GetUid(), + Version: updated.GetMetadata().GetVersion(), + }) + if err != nil || !cmp.Equal(deleted, updated, protocmp.Transform(), protocmp.IgnoreFields(&ateapi.ResourceMetadata{}, "delete_time")) { + t.Fatalf("DeleteExternalVolumeClassAccessPolicy = %v, %v; want %v", deleted, err, updated) + } + if deleted.GetMetadata().GetDeleteTime() == nil { + t.Error("deleted policy carries no delete_time") + } + if _, err := p.GetExternalVolumeClassAccessPolicy(ctx, "nfs-gold"); !errors.Is(err, store.ErrNotFound) { + t.Fatalf("GetExternalVolumeClassAccessPolicy after delete = %v, want ErrNotFound", err) + } + if got := externalVolumeClassTuples(t, p, "nfs-gold"); len(got) != 0 { + t.Fatalf("tuples after DeleteExternalVolumeClassAccessPolicy = %v, want empty", got) + } + + // Recreate policy and verify DeleteExternalVolumeClass cascades both row and tuples atomically. + if _, err := p.CreateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", policy); err != nil { + t.Fatalf("re-creating access policy failed: %v", err) + } + if _, err := p.DeleteExternalVolumeClass(ctx, "nfs-gold", store.DeletePreconditions{Version: 99}); !errors.Is(err, store.ErrVersionConflict) { + t.Fatalf("DeleteExternalVolumeClass wrong version = %v, want ErrVersionConflict", err) + } + if diff := cmp.Diff(wantInitialTuples, externalVolumeClassTuples(t, p, "nfs-gold")); diff != "" { + t.Fatalf("tuples changed after failed DeleteExternalVolumeClass (-want +got):\n%s", diff) + } + if _, err := p.DeleteExternalVolumeClass(ctx, "nfs-gold", store.DeletePreconditions{}); err != nil { + t.Fatalf("DeleteExternalVolumeClass failed: %v", err) + } + if _, err := p.GetExternalVolumeClassAccessPolicy(ctx, "nfs-gold"); !errors.Is(err, store.ErrNotFound) { + t.Fatalf("GetExternalVolumeClassAccessPolicy after DeleteExternalVolumeClass = %v, want ErrNotFound", err) + } + if got := externalVolumeClassTuples(t, p, "nfs-gold"); len(got) != 0 { + t.Fatalf("tuples after DeleteExternalVolumeClass = %v, want empty", got) + } +} + +func TestDeleteAtespace_ScrubsExternalVolumeClassAccessPolicies(t *testing.T) { + p := setupPostgresPersistence(t) + ctx := t.Context() + + for _, space := range []string{"team-a", "team-b", "team-c"} { + createTestAtespace(t, p, space) + } + for _, className := range []string{"nfs-gold", "ssd-fast", "untouched"} { + if _, err := p.CreateExternalVolumeClass(ctx, newTestExternalVolumeClass(className)); err != nil { + t.Fatalf("CreateExternalVolumeClass(%s) failed: %v", className, err) + } + } + + nfsCreated, err := p.CreateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:team-a", "atespace:team-b"}}, + }, + }) + if err != nil { + t.Fatalf("CreateExternalVolumeClassAccessPolicy(nfs-gold) failed: %v", err) + } + if _, err := p.CreateExternalVolumeClassAccessPolicy(ctx, "ssd-fast", &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:team-a"}}, + }, + }); err != nil { + t.Fatalf("CreateExternalVolumeClassAccessPolicy(ssd-fast) failed: %v", err) + } + untouchedBefore, err := p.CreateExternalVolumeClassAccessPolicy(ctx, "untouched", &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:team-b"}}, + }, + }) + if err != nil { + t.Fatalf("CreateExternalVolumeClassAccessPolicy(untouched) failed: %v", err) + } + + // Precondition mismatch aborts before scrubbing policy rows or sweeping tuples. + if _, err := p.DeleteAtespace(ctx, "team-a", store.DeletePreconditions{Version: 99}); !errors.Is(err, store.ErrVersionConflict) { + t.Fatalf("DeleteAtespace wrong version = %v, want ErrVersionConflict", err) + } + if diff := cmp.Diff([]string{"allowed_atespace atespace:team-a", "allowed_atespace atespace:team-b"}, externalVolumeClassTuples(t, p, "nfs-gold")); diff != "" { + t.Fatalf("nfs-gold tuples changed on failed delete (-want +got):\n%s", diff) + } + + // Deleting team-a scrubs it from nfs-gold and ssd-fast without touching untouched. + if _, err := p.DeleteAtespace(ctx, "team-a", store.DeletePreconditions{}); err != nil { + t.Fatalf("DeleteAtespace(team-a) failed: %v", err) + } + + nfsPol, err := p.GetExternalVolumeClassAccessPolicy(ctx, "nfs-gold") + if err != nil { + t.Fatalf("GetExternalVolumeClassAccessPolicy(nfs-gold) failed: %v", err) + } + if nfsPol.GetMetadata().GetVersion() != 2 || nfsPol.GetMetadata().GetUid() != nfsCreated.GetMetadata().GetUid() || nfsPol.GetMetadata().GetName() != "default" { + t.Errorf("nfs-gold metadata after scrub = %+v, want version 2 with preserved uid/name", nfsPol.GetMetadata()) + } + wantNFSBindings := []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:team-b"}}, + } + if diff := cmp.Diff(wantNFSBindings, nfsPol.GetBindings(), protocmp.Transform()); diff != "" { + t.Errorf("nfs-gold bindings after scrub (-want +got):\n%s", diff) + } + + ssdPol, err := p.GetExternalVolumeClassAccessPolicy(ctx, "ssd-fast") + if err != nil { + t.Fatalf("GetExternalVolumeClassAccessPolicy(ssd-fast) failed: %v", err) + } + if ssdPol.GetMetadata().GetVersion() != 2 { + t.Errorf("ssd-fast policy version = %d, want 2", ssdPol.GetMetadata().GetVersion()) + } + if len(ssdPol.GetBindings()) != 0 { + t.Errorf("ssd-fast bindings after sole-member scrub = %v, want empty (no empty-members Binding)", ssdPol.GetBindings()) + } + + untouchedAfter, err := p.GetExternalVolumeClassAccessPolicy(ctx, "untouched") + if err != nil || !cmp.Equal(untouchedBefore, untouchedAfter, protocmp.Transform()) { + t.Errorf("untouched policy changed after DeleteAtespace(team-a): got %v, err %v", untouchedAfter, err) + } + + // Recreating team-a grants no access, and a read-modify-write Update on + // nfs-gold does not re-add team-a. + createTestAtespace(t, p, "team-a") + if diff := cmp.Diff([]string{"allowed_atespace atespace:team-b"}, externalVolumeClassTuples(t, p, "nfs-gold")); diff != "" { + t.Fatalf("nfs-gold tuples after recreating team-a (-want +got):\n%s", diff) + } + if got := externalVolumeClassTuples(t, p, "ssd-fast"); len(got) != 0 { + t.Fatalf("ssd-fast tuples after recreating team-a = %v, want empty", got) + } + + updatedNFS, err := p.UpdateExternalVolumeClassAccessPolicy(ctx, "nfs-gold", store.PreconditionFrom(nfsPol), func(toUpdate *ateapi.AccessPolicy) error { + toUpdate.Bindings[0].Members = append(toUpdate.Bindings[0].Members, "atespace:team-c") + return nil + }) + if err != nil || updatedNFS.GetMetadata().GetVersion() != 3 { + t.Fatalf("read-modify-write UpdateExternalVolumeClassAccessPolicy = %v, %v; want version 3", updatedNFS, err) + } + if diff := cmp.Diff([]string{"allowed_atespace atespace:team-b", "allowed_atespace atespace:team-c"}, externalVolumeClassTuples(t, p, "nfs-gold")); diff != "" { + t.Errorf("nfs-gold tuples after read-modify-write update (-want +got):\n%s", diff) + } +} + +func TestExternalVolumeClassAccessPolicy_ConcurrentUpdateAndDeleteAtespace(t *testing.T) { + p := setupPostgresPersistence(t) + ctx := t.Context() + + createTestAtespace(t, p, "keeper") + const classesCount = 3 + for c := range classesCount { + className := fmt.Sprintf("class-%d", c) + if _, err := p.CreateExternalVolumeClass(ctx, newTestExternalVolumeClass(className)); err != nil { + t.Fatalf("CreateExternalVolumeClass(%s) failed: %v", className, err) + } + if _, err := p.CreateExternalVolumeClassAccessPolicy(ctx, className, &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:keeper"}}, + }, + }); err != nil { + t.Fatalf("CreateExternalVolumeClassAccessPolicy(%s) failed: %v", className, err) + } + } + if _, err := p.CreateExternalVolumeClass(ctx, newTestExternalVolumeClass("adder-update")); err != nil { + t.Fatalf("CreateExternalVolumeClass(adder-update) failed: %v", err) + } + if _, err := p.CreateExternalVolumeClassAccessPolicy(ctx, "adder-update", &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:keeper"}}, + }, + }); err != nil { + t.Fatalf("CreateExternalVolumeClassAccessPolicy(adder-update) failed: %v", err) + } + + assertPolicyMatchesTuplesWithoutMember := func(className, deletedMember string) { + t.Helper() + pol, err := p.GetExternalVolumeClassAccessPolicy(ctx, className) + if errors.Is(err, store.ErrNotFound) { + if got := externalVolumeClassTuples(t, p, className); len(got) != 0 { + t.Fatalf("%s has no policy row, but tuples = %v", className, got) + } + return + } + if err != nil { + t.Fatalf("Get(%s) failed: %v", className, err) + } + var wantTuples []string + for _, b := range pol.GetBindings() { + for _, m := range b.GetMembers() { + if m == deletedMember { + t.Fatalf("%s retained deleted member %q in stored policy: %v", className, deletedMember, pol.GetBindings()) + } + wantTuples = append(wantTuples, b.GetRole()+" "+m) + } + } + slices.Sort(wantTuples) + if diff := cmp.Diff(wantTuples, externalVolumeClassTuples(t, p, className)); diff != "" { + t.Fatalf("%s stored policy vs OpenFGA tuples (-policy +tuples):\n%s", className, diff) + } + } + + for iter := range 10 { + ephemeral := fmt.Sprintf("ephemeral-%d", iter) + ephemeralMember := "atespace:" + ephemeral + adderCreateClass := fmt.Sprintf("adder-create-%d", iter) + createTestAtespace(t, p, ephemeral) + if _, err := p.CreateExternalVolumeClass(ctx, newTestExternalVolumeClass(adderCreateClass)); err != nil { + t.Fatalf("CreateExternalVolumeClass(%s) failed: %v", adderCreateClass, err) + } + for c := range classesCount { + className := fmt.Sprintf("class-%d", c) + pol, err := p.GetExternalVolumeClassAccessPolicy(ctx, className) + if err != nil { + t.Fatalf("GetExternalVolumeClassAccessPolicy(%s) failed: %v", className, err) + } + if _, err := p.UpdateExternalVolumeClassAccessPolicy(ctx, className, store.PreconditionFrom(pol), func(ap *ateapi.AccessPolicy) error { + ap.Bindings = []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:keeper", ephemeralMember}}, + } + return nil + }); err != nil { + t.Fatalf("seed UpdateExternalVolumeClassAccessPolicy(%s) failed: %v", className, err) + } + } + adderUpdatePol, err := p.GetExternalVolumeClassAccessPolicy(ctx, "adder-update") + if err != nil { + t.Fatalf("GetExternalVolumeClassAccessPolicy(adder-update) failed: %v", err) + } + + // Race DeleteAtespace(ephemeral) simultaneously against: + // - per-class updates removing ephemeral (class-0..2), + // - an update adding ephemeral (adder-update), and + // - a create adding ephemeral (adder-create-). + // Neither side may fail with 40P01 deadlock, ephemeral must not survive on + // any class, and every stored row must match its OpenFGA tuples. + var wg sync.WaitGroup + errCh := make(chan error, classesCount+3) + + wg.Add(1) + go func() { + defer wg.Done() + if _, err := p.DeleteAtespace(ctx, ephemeral, store.DeletePreconditions{}); err != nil { + errCh <- fmt.Errorf("DeleteAtespace(%s): %w", ephemeral, err) + } + }() + + for c := range classesCount { + className := fmt.Sprintf("class-%d", c) + wg.Add(1) + go func() { + defer wg.Done() + pol, err := p.GetExternalVolumeClassAccessPolicy(ctx, className) + if err != nil { + errCh <- fmt.Errorf("Get(%s): %w", className, err) + return + } + _, err = p.UpdateExternalVolumeClassAccessPolicy(ctx, className, store.PreconditionFrom(pol), func(ap *ateapi.AccessPolicy) error { + ap.Bindings = []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:keeper"}}, + } + return nil + }) + if err != nil && !errors.Is(err, store.ErrVersionConflict) { + errCh <- fmt.Errorf("Update(%s): %w", className, err) + } + }() + } + + wg.Add(1) + go func() { + defer wg.Done() + _, err := p.UpdateExternalVolumeClassAccessPolicy(ctx, "adder-update", store.PreconditionFrom(adderUpdatePol), func(ap *ateapi.AccessPolicy) error { + ap.Bindings = []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:keeper", ephemeralMember}}, + } + return nil + }) + if err != nil && !errors.Is(err, store.ErrFailedPrecondition) && !errors.Is(err, store.ErrVersionConflict) { + errCh <- fmt.Errorf("Update(adder-update): %w", err) + } + }() + + wg.Add(1) + go func() { + defer wg.Done() + _, err := p.CreateExternalVolumeClassAccessPolicy(ctx, adderCreateClass, &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{ + {Role: authz.RoleAllowedAtespace, Members: []string{"atespace:keeper", ephemeralMember}}, + }, + }) + if err != nil && !errors.Is(err, store.ErrFailedPrecondition) { + errCh <- fmt.Errorf("Create(%s): %w", adderCreateClass, err) + } + }() + + wg.Wait() + close(errCh) + for err := range errCh { + t.Fatalf("iter %d concurrent error: %v", iter, err) + } + + for c := range classesCount { + assertPolicyMatchesTuplesWithoutMember(fmt.Sprintf("class-%d", c), ephemeralMember) + } + assertPolicyMatchesTuplesWithoutMember("adder-update", ephemeralMember) + assertPolicyMatchesTuplesWithoutMember(adderCreateClass, ephemeralMember) + } +} diff --git a/cmd/ateapi/internal/store/atepg/atepg.go b/cmd/ateapi/internal/store/atepg/atepg.go index 41d04dac2a..b3585b5adb 100644 --- a/cmd/ateapi/internal/store/atepg/atepg.go +++ b/cmd/ateapi/internal/store/atepg/atepg.go @@ -369,9 +369,9 @@ func (p *Persistence) Pool() *pgxpool.Pool { } // SetPolicyManager configures the authorization policy manager that writes -// OpenFGA tuples in the same transaction as access policy and atespace -// mutations. It must be set before the store serves access policy or -// atespace writes. +// OpenFGA tuples in the same transaction as access policy, atespace, and +// external volume class mutations. It must be set before the store serves +// those writes. func (p *Persistence) SetPolicyManager(pm *authz.PolicyManager) { p.policyManager = pm } diff --git a/cmd/ateapi/internal/store/atepg/atespace.go b/cmd/ateapi/internal/store/atepg/atespace.go index 6d0f163e3b..efaa60ca26 100644 --- a/cmd/ateapi/internal/store/atepg/atespace.go +++ b/cmd/ateapi/internal/store/atepg/atespace.go @@ -18,6 +18,7 @@ import ( "context" "errors" "fmt" + "slices" "github.com/jackc/pgx/v5" "go.ate.dev/substrate/api/ateapi/v1" @@ -147,6 +148,18 @@ func (p *Persistence) DeleteAtespace(ctx context.Context, name string, precondit if err := p.policyManager.DeleteAtespacePolicies(ctx, tx, name); err != nil { return nil, fmt.Errorf("deleting authorization tuples for atespace %q: %w", name, err) } + classes, err := p.policyManager.ExternalVolumeClassesForAtespace(ctx, tx, name) + if err != nil { + return nil, fmt.Errorf("listing external volume classes for atespace %q: %w", name, err) + } + if len(classes) > 0 { + if err := scrubAtespaceFromExternalVolumeClassPolicies(ctx, tx, name, classes); err != nil { + return nil, err + } + if err := p.policyManager.RemoveAtespaceFromExternalVolumeClasses(ctx, tx, name); err != nil { + return nil, fmt.Errorf("removing atespace %q from external volume class policies: %w", name, err) + } + } if err := tx.Commit(ctx); err != nil { return nil, fmt.Errorf("committing atespace delete %q: %w", name, err) } @@ -157,3 +170,93 @@ func (p *Persistence) DeleteAtespace(ctx context.Context, name string, precondit out.Metadata.DeleteTime = timestamppb.Now() return out, nil } + +// scrubAtespaceFromExternalVolumeClassPolicies locks the affected policy rows +// in sorted class-name order before RemoveAtespaceFromExternalVolumeClasses +// locks their OpenFGA tuple rows, matching the per-class policy write lock +// order (policy row FOR UPDATE -> tuple). +func scrubAtespaceFromExternalVolumeClassPolicies(ctx context.Context, tx pgx.Tx, atespaceName string, classes []string) error { + if len(classes) == 0 { + return nil + } + rows, err := tx.Query(ctx, ` + SELECT external_volume_class_name, uid, version, proto + FROM external_volume_class_access_policies + WHERE external_volume_class_name = ANY($1) + ORDER BY external_volume_class_name + FOR UPDATE`, classes) + if err != nil { + return fmt.Errorf("locking external volume class access policies for atespace %q: %w", atespaceName, err) + } + type lockedPolicy struct { + className string + policy *ateapi.AccessPolicy + } + var locked []lockedPolicy + for rows.Next() { + var className, uid string + var version int64 + var protoBytes []byte + if err := rows.Scan(&className, &uid, &version, &protoBytes); err != nil { + rows.Close() + return fmt.Errorf("scanning external volume class access policy row: %w", err) + } + policy, err := unmarshalAccessPolicy(uid, version, protoBytes) + if err != nil { + rows.Close() + return err + } + locked = append(locked, lockedPolicy{className: className, policy: policy}) + } + rows.Close() + if err := rows.Err(); err != nil { + return fmt.Errorf("reading external volume class access policies for atespace %q: %w", atespaceName, err) + } + + targetMember := "atespace:" + atespaceName + for _, item := range locked { + if !scrubPolicyMember(item.policy, targetMember) { + continue + } + oldMeta := proto.CloneOf(item.policy.Metadata) + setUpdateMetadata(item.policy.Metadata, oldMeta) + protoBytes, err := proto.Marshal(item.policy) + if err != nil { + return fmt.Errorf("marshaling scrubbed access policy for external volume class %q: %w", item.className, err) + } + if _, err := tx.Exec(ctx, ` + UPDATE external_volume_class_access_policies + SET version = $1, proto = $2 + WHERE external_volume_class_name = $3`, + item.policy.GetMetadata().GetVersion(), protoBytes, item.className); err != nil { + return fmt.Errorf("updating scrubbed access policy for external volume class %q: %w", item.className, err) + } + } + return nil +} + +// scrubPolicyMember removes targetMember from every binding in policy, dropping +// any binding whose member list becomes empty so Binding.members stays +// non-empty. It reports whether policy was modified. +func scrubPolicyMember(policy *ateapi.AccessPolicy, targetMember string) bool { + changed := false + var keptBindings []*ateapi.Binding + for _, b := range policy.GetBindings() { + if !slices.Contains(b.GetMembers(), targetMember) { + keptBindings = append(keptBindings, b) + continue + } + changed = true + keptMembers := slices.DeleteFunc(slices.Clone(b.GetMembers()), func(m string) bool { + return m == targetMember + }) + if len(keptMembers) > 0 { + b.Members = keptMembers + keptBindings = append(keptBindings, b) + } + } + if changed { + policy.Bindings = keptBindings + } + return changed +} diff --git a/cmd/ateapi/internal/store/atepg/common_test.go b/cmd/ateapi/internal/store/atepg/common_test.go index 718317ee30..20239c808a 100644 --- a/cmd/ateapi/internal/store/atepg/common_test.go +++ b/cmd/ateapi/internal/store/atepg/common_test.go @@ -28,7 +28,7 @@ import ( // state, so the statement lives here rather than on Persistence. func clearAll(t *testing.T, p *Persistence) { t.Helper() - if _, err := p.pool.Exec(context.Background(), `TRUNCATE atespaces, global_access_policy, atespace_access_policies, actors, actor_egress_policies, actor_templates, tags, workers, worker_assignments, leases, worker_outbox, worker_outbox_trim, tuple, changelog`); err != nil { + if _, err := p.pool.Exec(context.Background(), `TRUNCATE atespaces, global_access_policy, atespace_access_policies, actors, actor_egress_policies, actor_templates, tags, workers, worker_assignments, leases, worker_outbox, worker_outbox_trim, external_volume_classes, external_volume_class_access_policies, tuple, changelog`); err != nil { t.Fatalf("truncating tables: %v", err) } } diff --git a/cmd/ateapi/internal/store/atepg/external_volume_class.go b/cmd/ateapi/internal/store/atepg/external_volume_class.go new file mode 100644 index 0000000000..685a35f377 --- /dev/null +++ b/cmd/ateapi/internal/store/atepg/external_volume_class.go @@ -0,0 +1,156 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package atepg + +import ( + "context" + "errors" + "fmt" + + "github.com/jackc/pgx/v5" + "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/cmd/ateapi/internal/store" + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/timestamppb" +) + +func (p *Persistence) CreateExternalVolumeClass(ctx context.Context, class *ateapi.ExternalVolumeClass) (*ateapi.ExternalVolumeClass, error) { + name := class.GetMetadata().GetName() + + dbClass := proto.Clone(class).(*ateapi.ExternalVolumeClass) + setCreateMetadata(dbClass.Metadata) + + protoBytes, err := proto.Marshal(dbClass) + if err != nil { + return nil, fmt.Errorf("marshaling external volume class: %w", err) + } + + _, err = p.pool.Exec(ctx, ` + INSERT INTO external_volume_classes (name, uid, version, proto) + VALUES ($1, $2, $3, $4)`, + name, dbClass.GetMetadata().GetUid(), dbClass.GetMetadata().GetVersion(), protoBytes) + if err != nil { + if isUniqueViolation(err) { + return nil, store.ErrAlreadyExists + } + return nil, fmt.Errorf("inserting external volume class %q: %w", name, err) + } + return dbClass, nil +} + +func (p *Persistence) GetExternalVolumeClass(ctx context.Context, name string) (*ateapi.ExternalVolumeClass, error) { + var protoBytes []byte + err := p.pool.QueryRow(ctx, `SELECT proto FROM external_volume_classes WHERE name = $1`, name).Scan(&protoBytes) + if err != nil { + if errors.Is(err, pgx.ErrNoRows) { + return nil, store.ErrNotFound + } + return nil, fmt.Errorf("getting external volume class %q: %w", name, err) + } + out := &ateapi.ExternalVolumeClass{} + if err := unmarshalStored(protoBytes, out); err != nil { + return nil, fmt.Errorf("unmarshaling external volume class: %w", err) + } + return out, nil +} + +func (p *Persistence) ListExternalVolumeClasses(ctx context.Context, opts store.ListOptions) (store.ListResponse[*ateapi.ExternalVolumeClass], error) { + opts, err := store.NormalizeListOptions(opts) + if err != nil { + return store.ListResponse[*ateapi.ExternalVolumeClass]{}, err + } + pageSize, pageTokenStr := opts.PageSize, opts.PageToken + token, err := decodePageToken(pageTokenStr, kindExternalVolumeClass, "", 1) + if err != nil { + return store.ListResponse[*ateapi.ExternalVolumeClass]{}, err + } + var last *string + if len(token.Last) > 0 { + last = &token.Last[0] + } + + rows, err := p.pool.Query(ctx, ` + SELECT name, proto FROM external_volume_classes + WHERE $1::text IS NULL OR name > $1 + ORDER BY name + LIMIT $2`, last, int64(pageSize)+1) + if err != nil { + return store.ListResponse[*ateapi.ExternalVolumeClass]{}, fmt.Errorf("listing external volume classes: %w", err) + } + defer rows.Close() + + var names []string + var result []*ateapi.ExternalVolumeClass + for rows.Next() { + var name string + var protoBytes []byte + if err := rows.Scan(&name, &protoBytes); err != nil { + return store.ListResponse[*ateapi.ExternalVolumeClass]{}, fmt.Errorf("scanning external volume class row: %w", err) + } + c := &ateapi.ExternalVolumeClass{} + if err := unmarshalRow(protoBytes, c, "external volume class", name); err != nil { + return store.ListResponse[*ateapi.ExternalVolumeClass]{}, err + } + result = append(result, c) + names = append(names, name) + } + if err := rows.Err(); err != nil { + return store.ListResponse[*ateapi.ExternalVolumeClass]{}, fmt.Errorf("listing external volume classes: %w", err) + } + + var nextToken string + if len(result) > int(pageSize) { + result = result[:pageSize] + nextToken = encodePageToken(kindExternalVolumeClass, "", []string{names[pageSize-1]}) + } + return store.ListResponse[*ateapi.ExternalVolumeClass]{Items: result, NextPageToken: nextToken}, nil +} + +func (p *Persistence) DeleteExternalVolumeClass(ctx context.Context, name string, precondition store.DeletePreconditions) (*ateapi.ExternalVolumeClass, error) { + tx, err := p.pool.Begin(ctx) + if err != nil { + return nil, fmt.Errorf("beginning external volume class delete: %w", err) + } + defer tx.Rollback(ctx) //nolint:errcheck // no-op once committed + + var protoBytes []byte + err = tx.QueryRow(ctx, ` + DELETE FROM external_volume_classes + WHERE name = $1 + AND ($2::text = '' OR uid = $2::text) + AND ($3::bigint = 0 OR version = $3::bigint) + RETURNING proto`, name, precondition.UID, precondition.Version).Scan(&protoBytes) + if errors.Is(err, pgx.ErrNoRows) { + var uid string + var version int64 + err := tx.QueryRow(ctx, `SELECT uid, version FROM external_volume_classes WHERE name = $1`, name).Scan(&uid, &version) + return nil, mapDeleteError(err, uid, version, precondition) + } + if err != nil { + return nil, fmt.Errorf("deleting external volume class %q: %w", name, err) + } + if err := p.policyManager.DeleteExternalVolumeClassPolicies(ctx, tx, name); err != nil { + return nil, fmt.Errorf("deleting authorization tuples for external volume class %q: %w", name, err) + } + if err := tx.Commit(ctx); err != nil { + return nil, fmt.Errorf("committing external volume class delete %q: %w", name, err) + } + out := &ateapi.ExternalVolumeClass{} + if err := unmarshalStored(protoBytes, out); err != nil { + return nil, fmt.Errorf("unmarshaling deleted external volume class: %w", err) + } + out.Metadata.DeleteTime = timestamppb.Now() + return out, nil +} diff --git a/cmd/ateapi/internal/store/atepg/external_volume_class_access_policy.go b/cmd/ateapi/internal/store/atepg/external_volume_class_access_policy.go new file mode 100644 index 0000000000..bd731b829e --- /dev/null +++ b/cmd/ateapi/internal/store/atepg/external_volume_class_access_policy.go @@ -0,0 +1,230 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package atepg + +import ( + "context" + "errors" + "fmt" + "slices" + "strings" + + "github.com/jackc/pgx/v5" + "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/cmd/ateapi/internal/authz" + "go.ate.dev/substrate/cmd/ateapi/internal/store" + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/timestamppb" +) + +func (p *Persistence) CreateExternalVolumeClassAccessPolicy(ctx context.Context, name string, policy *ateapi.AccessPolicy) (*ateapi.AccessPolicy, error) { + dbPolicy := proto.CloneOf(policy) + if dbPolicy == nil { + dbPolicy = &ateapi.AccessPolicy{} + } + if dbPolicy.Metadata == nil { + dbPolicy.Metadata = &ateapi.ResourceMetadata{} + } + setCreateMetadata(dbPolicy.Metadata) + protoBytes, err := proto.Marshal(dbPolicy) + if err != nil { + return nil, fmt.Errorf("marshaling external volume class access policy: %w", err) + } + + tx, err := p.pool.Begin(ctx) + if err != nil { + return nil, fmt.Errorf("beginning external volume class access policy create for %q: %w", name, err) + } + defer tx.Rollback(ctx) //nolint:errcheck // no-op once committed + + if err := verifyMemberAtespacesExist(ctx, tx, name, dbPolicy.GetBindings()); err != nil { + return nil, err + } + _, err = tx.Exec(ctx, ` + INSERT INTO external_volume_class_access_policies (external_volume_class_name, uid, version, proto) + VALUES ($1, $2, $3, $4)`, name, dbPolicy.GetMetadata().GetUid(), dbPolicy.GetMetadata().GetVersion(), protoBytes) + if err != nil { + if isUniqueViolation(err) { + return nil, store.ErrAlreadyExists + } + if isForeignKeyViolation(err) { + return nil, store.ErrFailedPrecondition + } + return nil, fmt.Errorf("inserting external volume class access policy for %q: %w", name, err) + } + if err := p.policyManager.ReconcileExternalVolumeClassAtespaces(ctx, tx, name, dbPolicy.GetBindings()); err != nil { + return nil, fmt.Errorf("reconciling external volume class access policy bindings for %q: %w", name, err) + } + if err := tx.Commit(ctx); err != nil { + return nil, fmt.Errorf("committing external volume class access policy create for %q: %w", name, err) + } + return dbPolicy, nil +} + +func (p *Persistence) GetExternalVolumeClassAccessPolicy(ctx context.Context, name string) (*ateapi.AccessPolicy, error) { + return getAccessPolicyRow(ctx, p.pool, ` + SELECT uid, version, proto FROM external_volume_class_access_policies + WHERE external_volume_class_name = $1`, name) +} + +func (p *Persistence) UpdateExternalVolumeClassAccessPolicy(ctx context.Context, name string, precondition store.Precondition, mutate func(*ateapi.AccessPolicy) error) (*ateapi.AccessPolicy, error) { + if err := precondition.Validate(); err != nil { + return nil, err + } + + tx, err := p.pool.Begin(ctx) + if err != nil { + return nil, fmt.Errorf("beginning external volume class access policy update for %q: %w", name, err) + } + defer tx.Rollback(ctx) //nolint:errcheck // no-op once committed + + // Read unlocked first so verifyMemberAtespacesExist acquires FOR KEY SHARE + // on atespaces before FOR UPDATE on the policy row, matching DeleteAtespace's + // lock order (atespaces -> policy row -> tuple). + dbPolicy, err := getAccessPolicyRow(ctx, tx, ` + SELECT uid, version, proto FROM external_volume_class_access_policies + WHERE external_volume_class_name = $1`, name) + if err != nil { + return nil, err + } + if err := precondition.Check(dbPolicy.GetMetadata()); err != nil { + return nil, err + } + oldMeta := proto.CloneOf(dbPolicy.Metadata) + if err := mutate(dbPolicy); err != nil { + return nil, err + } + if err := verifyMemberAtespacesExist(ctx, tx, name, dbPolicy.GetBindings()); err != nil { + return nil, err + } + + var lockedUID string + var lockedVersion int64 + if err := tx.QueryRow(ctx, ` + SELECT uid, version FROM external_volume_class_access_policies + WHERE external_volume_class_name = $1 FOR UPDATE`, name).Scan(&lockedUID, &lockedVersion); err != nil { + if errors.Is(err, pgx.ErrNoRows) { + return nil, store.ErrNotFound + } + return nil, fmt.Errorf("locking external volume class access policy for %q: %w", name, err) + } + if err := precondition.Check(&ateapi.ResourceMetadata{Uid: lockedUID, Version: lockedVersion}); err != nil { + return nil, err + } + + dbPolicy.Metadata = oldMeta + setUpdateMetadata(dbPolicy.Metadata, oldMeta) + protoBytes, err := proto.Marshal(dbPolicy) + if err != nil { + return nil, fmt.Errorf("marshaling updated external volume class access policy: %w", err) + } + _, err = tx.Exec(ctx, ` + UPDATE external_volume_class_access_policies SET version = $1, proto = $2 + WHERE external_volume_class_name = $3`, dbPolicy.GetMetadata().GetVersion(), protoBytes, name) + if err != nil { + return nil, fmt.Errorf("updating external volume class access policy for %q: %w", name, err) + } + if err := p.policyManager.ReconcileExternalVolumeClassAtespaces(ctx, tx, name, dbPolicy.GetBindings()); err != nil { + return nil, fmt.Errorf("reconciling external volume class access policy bindings for %q: %w", name, err) + } + if err := tx.Commit(ctx); err != nil { + return nil, fmt.Errorf("committing external volume class access policy update for %q: %w", name, err) + } + return dbPolicy, nil +} + +func (p *Persistence) DeleteExternalVolumeClassAccessPolicy(ctx context.Context, name string, precondition store.DeletePreconditions) (*ateapi.AccessPolicy, error) { + tx, err := p.pool.Begin(ctx) + if err != nil { + return nil, fmt.Errorf("beginning external volume class access policy delete for %q: %w", name, err) + } + defer tx.Rollback(ctx) //nolint:errcheck // no-op once committed + + var version int64 + var uid string + var protoBytes []byte + err = tx.QueryRow(ctx, ` + DELETE FROM external_volume_class_access_policies + WHERE external_volume_class_name = $1 + AND ($2::text = '' OR uid = $2::text) + AND ($3::bigint = 0 OR version = $3::bigint) + RETURNING uid, version, proto`, name, precondition.UID, precondition.Version).Scan(&uid, &version, &protoBytes) + if errors.Is(err, pgx.ErrNoRows) { + err := tx.QueryRow(ctx, `SELECT uid, version FROM external_volume_class_access_policies WHERE external_volume_class_name = $1`, name).Scan(&uid, &version) + return nil, mapDeleteError(err, uid, version, precondition) + } + if err != nil { + return nil, fmt.Errorf("deleting external volume class access policy for %q: %w", name, err) + } + deleted, err := unmarshalAccessPolicy(uid, version, protoBytes) + if err != nil { + return nil, err + } + if err := p.policyManager.DeleteExternalVolumeClassPolicies(ctx, tx, name); err != nil { + return nil, fmt.Errorf("deleting authorization tuples for external volume class %q: %w", name, err) + } + if err := tx.Commit(ctx); err != nil { + return nil, fmt.Errorf("committing external volume class access policy delete for %q: %w", name, err) + } + deleted.Metadata.DeleteTime = timestamppb.Now() + return deleted, nil +} + +// verifyMemberAtespacesExist locks every referenced "atespace:" member +// in atespaces with FOR KEY SHARE in sorted order. FOR KEY SHARE never blocks +// other readers or policy writes, while serializing against concurrent +// DeleteAtespace transactions so a deleting atespace cannot gain new policy +// rows or tuples mid-delete. +func verifyMemberAtespacesExist(ctx context.Context, tx pgx.Tx, className string, bindings []*ateapi.Binding) error { + var targets []string + var seen map[string]struct{} + for _, b := range bindings { + for _, rawMember := range b.GetMembers() { + if _, err := authz.FormatAtespaceMember(rawMember); err != nil { + return err + } + atespaceName := strings.TrimPrefix(rawMember, "atespace:") + if seen == nil { + seen = make(map[string]struct{}, len(b.GetMembers())) + } + if _, dup := seen[atespaceName]; dup { + continue + } + seen[atespaceName] = struct{}{} + targets = append(targets, atespaceName) + } + } + if len(targets) == 0 { + return nil + } + + slices.Sort(targets) + rows, err := tx.Query(ctx, `SELECT 1 FROM atespaces WHERE name = ANY($1) ORDER BY name FOR KEY SHARE`, targets) + if err != nil { + return fmt.Errorf("checking member atespaces for external volume class %q: %w", className, err) + } + found := 0 + for rows.Next() { + found++ + } + rows.Close() + if err := rows.Err(); err != nil { + return fmt.Errorf("reading member atespaces for external volume class %q: %w", className, err) + } + if found != len(targets) { + return store.ErrFailedPrecondition + } + return nil +} diff --git a/cmd/ateapi/internal/store/atepg/migrations/000002_external_volume_classes.sql b/cmd/ateapi/internal/store/atepg/migrations/000002_external_volume_classes.sql new file mode 100644 index 0000000000..cfceb9c182 --- /dev/null +++ b/cmd/ateapi/internal/store/atepg/migrations/000002_external_volume_classes.sql @@ -0,0 +1,23 @@ +-- Copyright 2026 The Agent Substrate Authors +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. + +-- +goose Up + +-- ExternalVolumeClasses are global-scoped, so name alone is the primary key. +CREATE TABLE external_volume_classes ( + name text PRIMARY KEY, + uid text NOT NULL, + version bigint NOT NULL, + proto bytea NOT NULL +); diff --git a/cmd/ateapi/internal/store/atepg/migrations/000003_external_volume_class_access_policies.sql b/cmd/ateapi/internal/store/atepg/migrations/000003_external_volume_class_access_policies.sql new file mode 100644 index 0000000000..bc0b3fe0f3 --- /dev/null +++ b/cmd/ateapi/internal/store/atepg/migrations/000003_external_volume_class_access_policies.sql @@ -0,0 +1,25 @@ +-- Copyright 2026 The Agent Substrate Authors +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. + +-- +goose Up + +CREATE TABLE external_volume_class_access_policies ( + external_volume_class_name text NOT NULL, + uid text NOT NULL, + version bigint NOT NULL, + proto bytea NOT NULL, + PRIMARY KEY (external_volume_class_name), + FOREIGN KEY (external_volume_class_name) + REFERENCES external_volume_classes(name) ON DELETE CASCADE +); diff --git a/cmd/ateapi/internal/store/atepg/pagetoken.go b/cmd/ateapi/internal/store/atepg/pagetoken.go index 5c8354c229..531167baf1 100644 --- a/cmd/ateapi/internal/store/atepg/pagetoken.go +++ b/cmd/ateapi/internal/store/atepg/pagetoken.go @@ -37,6 +37,8 @@ const ( kindTag resourceKind = "tag" kindWorker resourceKind = "worker" kindWorkerAssign resourceKind = "worker-assignment" + + kindExternalVolumeClass resourceKind = "external-volume-class" ) // pageToken is PostgreSQL's opaque keyset page token. It carries no database diff --git a/cmd/ateapi/internal/store/store.go b/cmd/ateapi/internal/store/store.go index 7545b309e8..17885d1b25 100644 --- a/cmd/ateapi/internal/store/store.go +++ b/cmd/ateapi/internal/store/store.go @@ -217,6 +217,39 @@ type Interface interface { // precondition does not describe the policy the caller observed. DeleteAtespaceAccessPolicy(ctx context.Context, name string, precondition DeletePreconditions) (*ateapi.AccessPolicy, error) + // Creates the 1:1 access policy subresource for an existing + // ExternalVolumeClass. Returns ErrAlreadyExists if the policy already exists, + // or ErrFailedPrecondition if the parent class or any referenced member + // atespace does not exist. + CreateExternalVolumeClassAccessPolicy(ctx context.Context, name string, policy *ateapi.AccessPolicy) (*ateapi.AccessPolicy, error) + // Fetches an ExternalVolumeClass's access policy subresource. Returns + // ErrNotFound if missing. + GetExternalVolumeClassAccessPolicy(ctx context.Context, name string) (*ateapi.AccessPolicy, error) + // Transactionally updates an ExternalVolumeClass's access policy when its + // current UID and version match the precondition. Returns + // ErrFailedPrecondition if any referenced member atespace does not exist. + UpdateExternalVolumeClassAccessPolicy(ctx context.Context, name string, precondition Precondition, mutate func(*ateapi.AccessPolicy) error) (*ateapi.AccessPolicy, error) + // Deletes and returns an ExternalVolumeClass's access policy subresource. + // Returns ErrNotFound if missing, or ErrUIDConflict/ErrVersionConflict if + // precondition does not describe the policy the caller observed. + DeleteExternalVolumeClassAccessPolicy(ctx context.Context, name string, precondition DeletePreconditions) (*ateapi.AccessPolicy, error) + + // Stores a new ExternalVolumeClass and returns the stored resource with + // server-assigned metadata (uid, version, timestamps). The input is not + // mutated. Returns ErrAlreadyExists if the name is taken. + CreateExternalVolumeClass(ctx context.Context, class *ateapi.ExternalVolumeClass) (*ateapi.ExternalVolumeClass, error) + + // Fetches an ExternalVolumeClass by name. Returns ErrNotFound if missing. + GetExternalVolumeClass(ctx context.Context, name string) (*ateapi.ExternalVolumeClass, error) + + // Lists ExternalVolumeClasses. + ListExternalVolumeClasses(ctx context.Context, opts ListOptions) (ListResponse[*ateapi.ExternalVolumeClass], error) + + // Removes an ExternalVolumeClass and returns the deleted resource. Returns + // ErrNotFound if missing, or ErrUIDConflict/ErrVersionConflict if + // precondition does not describe the class the caller observed. + DeleteExternalVolumeClass(ctx context.Context, name string, precondition DeletePreconditions) (*ateapi.ExternalVolumeClass, error) + // Stores a new ActorTemplate and returns the stored resource with // server-assigned metadata (uid, version, timestamps). The input is not // mutated. Returns ErrAlreadyExists if the (atespace, name) is taken. diff --git a/cmd/ateapi/internal/store/storecontract/contract.go b/cmd/ateapi/internal/store/storecontract/contract.go index dc760895fc..016ea6a3c7 100644 --- a/cmd/ateapi/internal/store/storecontract/contract.go +++ b/cmd/ateapi/internal/store/storecontract/contract.go @@ -336,6 +336,7 @@ func RunContractTests(t *testing.T, setup func(t *testing.T) store.Interface) { runWorkerContractTests(t, setup) runWorkerAssignmentContractTests(t, setup) runAtespaceContractTests(t, setup) + runExternalVolumeClassContractTests(t, setup) runActorTemplateContractTests(t, setup) runTagContractTests(t, setup) runLeaseContractTests(t, setup) @@ -3513,6 +3514,158 @@ func runAtespaceContractTests(t *testing.T, setup func(t *testing.T) store.Inter }) } +func newTestExternalVolumeClass(name string) *ateapi.ExternalVolumeClass { + return &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: name}, + DriverName: "nfs.csi.k8s.io", + Parameters: map[string]string{"server": "nfs.example.com", "share": "/exports"}, + } +} + +func runExternalVolumeClassContractTests(t *testing.T, setup func(t *testing.T) store.Interface) { + t.Helper() + + t.Run("CreateExternalVolumeClass_Success", func(t *testing.T) { + s := setup(t) + ctx := context.Background() + + want := newTestExternalVolumeClass("nfs") + created, err := s.CreateExternalVolumeClass(ctx, want) + if err != nil { + t.Fatalf("CreateExternalVolumeClass failed: %v", err) + } + if created.GetMetadata().GetUid() == "" { + t.Errorf("CreateExternalVolumeClass returned empty uid; want server-assigned uid") + } + if created.GetMetadata().GetVersion() != 1 { + t.Errorf("CreateExternalVolumeClass returned version %d, want 1", created.GetMetadata().GetVersion()) + } + if diff := cmp.Diff(want, created, protocmp.Transform(), ignoreUID, ignoreTimestamps, ignoreVersion); diff != "" { + t.Errorf("CreateExternalVolumeClass returned unexpected class (-want +got):\n%s", diff) + } + + got, err := s.GetExternalVolumeClass(ctx, "nfs") + if err != nil { + t.Fatalf("GetExternalVolumeClass failed: %v", err) + } + if diff := cmp.Diff(created, got, protocmp.Transform()); diff != "" { + t.Errorf("CreateExternalVolumeClass return does not match stored state (-created +got):\n%s", diff) + } + }) + + t.Run("CreateExternalVolumeClass_AlreadyExists", func(t *testing.T) { + s := setup(t) + ctx := context.Background() + + if _, err := s.CreateExternalVolumeClass(ctx, newTestExternalVolumeClass("nfs")); err != nil { + t.Fatalf("first CreateExternalVolumeClass failed: %v", err) + } + if _, err := s.CreateExternalVolumeClass(ctx, newTestExternalVolumeClass("nfs")); !errors.Is(err, store.ErrAlreadyExists) { + t.Errorf("second CreateExternalVolumeClass = %v, want ErrAlreadyExists", err) + } + }) + + t.Run("GetExternalVolumeClass_NotFound", func(t *testing.T) { + s := setup(t) + + if _, err := s.GetExternalVolumeClass(context.Background(), "nope"); !errors.Is(err, store.ErrNotFound) { + t.Errorf("GetExternalVolumeClass = %v, want ErrNotFound", err) + } + }) + + t.Run("ListExternalVolumeClasses_Pagination", func(t *testing.T) { + s := setup(t) + ctx := context.Background() + + empty, err := s.ListExternalVolumeClasses(ctx, store.ListOptions{PageSize: 1000}) + if err != nil || len(empty.Items) != 0 || empty.NextPageToken != "" { + t.Fatalf("empty ListExternalVolumeClasses = (%v, %q, %v); want empty", empty.Items, empty.NextPageToken, err) + } + + var want []string + for i := range 5 { + name := fmt.Sprintf("class-%d", i) + if _, err := s.CreateExternalVolumeClass(ctx, newTestExternalVolumeClass(name)); err != nil { + t.Fatalf("CreateExternalVolumeClass(%s) failed: %v", name, err) + } + want = append(want, name) + } + + var got []string + pageToken := "" + for { + page, err := s.ListExternalVolumeClasses(ctx, store.ListOptions{PageSize: 2, PageToken: pageToken}) + if err != nil { + t.Fatalf("ListExternalVolumeClasses failed: %v", err) + } + for _, c := range page.Items { + got = append(got, c.GetMetadata().GetName()) + } + pageToken = page.NextPageToken + if pageToken == "" { + break + } + } + if diff := cmp.Diff(want, got); diff != "" { + t.Errorf("paged class names mismatch (-want +got):\n%s", diff) + } + }) + + t.Run("DeleteExternalVolumeClass", func(t *testing.T) { + s := setup(t) + ctx := context.Background() + + created, err := s.CreateExternalVolumeClass(ctx, newTestExternalVolumeClass("nfs")) + if err != nil { + t.Fatalf("CreateExternalVolumeClass failed: %v", err) + } + deleted, err := s.DeleteExternalVolumeClass(ctx, "nfs", store.DeletePreconditions{}) + if err != nil { + t.Fatalf("DeleteExternalVolumeClass failed: %v", err) + } + if deleted.GetMetadata().GetDeleteTime() == nil { + t.Error("the deleted class carries no delete_time") + } + if diff := cmp.Diff(created, deleted, protocmp.Transform(), ignoreTimestamps); diff != "" { + t.Errorf("DeleteExternalVolumeClass returned unexpected class (-created +deleted):\n%s", diff) + } + if _, err := s.GetExternalVolumeClass(ctx, "nfs"); !errors.Is(err, store.ErrNotFound) { + t.Errorf("after delete, GetExternalVolumeClass = %v, want ErrNotFound", err) + } + }) + + t.Run("DeleteExternalVolumeClass_Preconditions", func(t *testing.T) { + s := setup(t) + ctx := context.Background() + del := func(precondition store.DeletePreconditions) error { + _, err := s.DeleteExternalVolumeClass(ctx, "nfs", precondition) + return err + } + + if err := del(store.DeletePreconditions{UID: foreignUID, Version: 1}); !errors.Is(err, store.ErrNotFound) { + t.Errorf("guarded delete of a missing class = %v, want ErrNotFound", err) + } + + created, err := s.CreateExternalVolumeClass(ctx, newTestExternalVolumeClass("nfs")) + if err != nil { + t.Fatalf("CreateExternalVolumeClass failed: %v", err) + } + uid, version := created.GetMetadata().GetUid(), created.GetMetadata().GetVersion() + if err := del(store.DeletePreconditions{UID: uid, Version: version + 1}); !errors.Is(err, store.ErrVersionConflict) { + t.Errorf("matching uid, stale version = %v, want ErrVersionConflict", err) + } + if err := del(store.DeletePreconditions{UID: foreignUID, Version: version}); !errors.Is(err, store.ErrUIDConflict) { + t.Errorf("foreign uid, matching version = %v, want ErrUIDConflict", err) + } + if _, err := s.GetExternalVolumeClass(ctx, "nfs"); err != nil { + t.Fatalf("a refused delete removed the class: %v", err) + } + if err := del(store.DeletePreconditions{UID: uid, Version: version}); err != nil { + t.Errorf("matching uid and version = %v, want nil", err) + } + }) +} + func runLeaseContractTests(t *testing.T, setup func(t *testing.T) store.Interface) { t.Helper() @@ -3760,6 +3913,75 @@ func runUnknownFieldContractTests(t *testing.T, setup func(t *testing.T) store.I assertPruned(t, "DeleteAtespace", created, deleted) }) + t.Run("UnknownFields_ExternalVolumeClass", func(t *testing.T) { + s := setup(t) + ctx := context.Background() + class := withUnknownField(newTestExternalVolumeClass("nfs")) + withUnknownField(class.Metadata) + created, err := s.CreateExternalVolumeClass(ctx, class) + if err != nil { + t.Fatalf("CreateExternalVolumeClass failed: %v", err) + } + + got, err := s.GetExternalVolumeClass(ctx, "nfs") + if err != nil { + t.Fatalf("GetExternalVolumeClass failed: %v", err) + } + assertPruned(t, "GetExternalVolumeClass", created, got) + + list, err := s.ListExternalVolumeClasses(ctx, store.ListOptions{}) + if err != nil || len(list.Items) != 1 { + t.Fatalf("ListExternalVolumeClasses = %d items, %v; want 1", len(list.Items), err) + } + assertPruned(t, "ListExternalVolumeClasses", created, list.Items[0]) + + deleted, err := s.DeleteExternalVolumeClass(ctx, "nfs", store.DeletePreconditions{}) + if err != nil { + t.Fatalf("DeleteExternalVolumeClass failed: %v", err) + } + assertPruned(t, "DeleteExternalVolumeClass", created, deleted) + }) + + t.Run("UnknownFields_ExternalVolumeClassAccessPolicy", func(t *testing.T) { + s := setup(t) + ctx := context.Background() + mustCreateAtespace(t, s, testAtespace) + if _, err := s.CreateExternalVolumeClass(ctx, newTestExternalVolumeClass("nfs")); err != nil { + t.Fatalf("CreateExternalVolumeClass failed: %v", err) + } + created, err := s.CreateExternalVolumeClassAccessPolicy(ctx, "nfs", withUnknownField(&ateapi.AccessPolicy{ + Metadata: withUnknownField(&ateapi.ResourceMetadata{Name: "default"}), + Bindings: []*ateapi.Binding{withUnknownField(&ateapi.Binding{ + Role: "allowed_atespace", + Members: []string{"atespace:" + testAtespace}, + })}, + })) + if err != nil { + t.Fatalf("CreateExternalVolumeClassAccessPolicy failed: %v", err) + } + + got, err := s.GetExternalVolumeClassAccessPolicy(ctx, "nfs") + if err != nil { + t.Fatalf("GetExternalVolumeClassAccessPolicy failed: %v", err) + } + assertPruned(t, "GetExternalVolumeClassAccessPolicy", created, got) + + updated, err := s.UpdateExternalVolumeClassAccessPolicy(ctx, "nfs", store.PreconditionFrom(got), func(toUpdate *ateapi.AccessPolicy) error { + requireNoUnknownFields(t, "UpdateExternalVolumeClassAccessPolicy mutation input", toUpdate) + return nil + }) + if err != nil { + t.Fatalf("UpdateExternalVolumeClassAccessPolicy failed: %v", err) + } + assertPruned(t, "UpdateExternalVolumeClassAccessPolicy", created, updated) + + deleted, err := s.DeleteExternalVolumeClassAccessPolicy(ctx, "nfs", store.DeletePreconditions{}) + if err != nil { + t.Fatalf("DeleteExternalVolumeClassAccessPolicy failed: %v", err) + } + assertPruned(t, "DeleteExternalVolumeClassAccessPolicy", created, deleted) + }) + t.Run("UnknownFields_ActorTemplate", func(t *testing.T) { s := setup(t) ctx := context.Background() diff --git a/cmd/ateapi/main.go b/cmd/ateapi/main.go index 7b08232531..be55fc33b2 100644 --- a/cmd/ateapi/main.go +++ b/cmd/ateapi/main.go @@ -62,7 +62,6 @@ import ( "google.golang.org/grpc/reflection" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" ) @@ -287,18 +286,14 @@ func main() { csiDriverConfigLister := ateFactory.Ate().V1().CSIDriverConfigs().Lister() ateletPodInformerFactory, ateletPodInformer := controlapi.AteletInformer(clientset, ateletNamespace) - scInformerFactory := informers.NewSharedInformerFactory(clientset, 0) - storageClassLister := scInformerFactory.Storage().V1().StorageClasses().Lister() stopCh := make(chan struct{}) defer close(stopCh) ateletPodInformerFactory.Start(stopCh) ateFactory.Start(stopCh) - scInformerFactory.Start(stopCh) ateletPodInformerFactory.WaitForCacheSync(stopCh) ateFactory.WaitForCacheSync(stopCh) - scInformerFactory.WaitForCacheSync(stopCh) if err := controlapi.RegisterWorkerCount(otel.Meter("ateapi"), workerCache.Workers, workerPoolLister.List); err != nil { serverboot.Fatal(ctx, "Failed to register worker-count metric", err) @@ -347,7 +342,6 @@ func main() { persistence, workerCache, csiDriverConfigLister, - storageClassLister, ateletDialer, instruments, *defaultEgressGatewayAddress, diff --git a/cmd/atelet/internal/apivalidation/validation_test.go b/cmd/atelet/internal/apivalidation/validation_test.go index 03f47b3acf..6bb566e6ce 100644 --- a/cmd/atelet/internal/apivalidation/validation_test.go +++ b/cmd/atelet/internal/apivalidation/validation_test.go @@ -17,6 +17,7 @@ package apivalidation import ( "context" "fmt" + "slices" "strings" "testing" @@ -1485,6 +1486,29 @@ func TestValidateVolume(t *testing.T) { e.PublishContext = map[string]string{"a": strings.Repeat("v", 20*1024), "b": strings.Repeat("v", 20*1024)} }), want: field.ErrorList{field.TooLong(extPath.Child("publish_context"), nil, 40*1024)}, + }, { + name: "external: valid mount_options", + obj: external(func(e *ateletpb.ExternalVolumeSource) { + e.MountOptions = []string{"nfsvers=4.1", "noatime"} + }), + }, { + name: "external: empty mount_options item", + obj: external(func(e *ateletpb.ExternalVolumeSource) { + e.MountOptions = []string{""} + }), + want: field.ErrorList{field.TooShort(extPath.Child("mount_options").Index(0), "", 1).WithOrigin("minLength")}, + }, { + name: "external: too-long mount_options item", + obj: external(func(e *ateletpb.ExternalVolumeSource) { + e.MountOptions = []string{strings.Repeat("a", 257)} + }), + want: field.ErrorList{field.TooLong(extPath.Child("mount_options").Index(0), "", 256).WithOrigin("maxLength")}, + }, { + name: "external: too many mount_options", + obj: external(func(e *ateletpb.ExternalVolumeSource) { + e.MountOptions = slices.Repeat([]string{"ro"}, 33) + }), + want: field.ErrorList{field.TooMany(extPath.Child("mount_options"), 33, 32).WithOrigin("maxItems")}, }, // ImageVolumeSource. diff --git a/cmd/atelet/internal/apivalidation/zz_generated.validation.go b/cmd/atelet/internal/apivalidation/zz_generated.validation.go index f315f19709..32aea82c8c 100644 --- a/cmd/atelet/internal/apivalidation/zz_generated.validation.go +++ b/cmd/atelet/internal/apivalidation/zz_generated.validation.go @@ -1407,6 +1407,50 @@ func Validate_ExternalVolumeSource( errs = append(errs, fn(fldPath.Child("publish_context"), obj.PublishContext, oldVal, oldObj != nil)...) } + { // field ateletpb.ExternalVolumeSource.MountOptions + fn := func( + fldPath *field.Path, + obj, oldObj []string, + oldValueCorrelated bool) (errs field.ErrorList) { + // don't revalidate unchanged data + if oldValueCorrelated && op.Type == operation.Update { + if ateDeepEqual(obj, oldObj) { + return nil + } + } + // call field-attached validations + earlyReturn := false + if e := validate.MaxItems(ctx, op, fldPath, obj, oldObj, 32).MarkShortCircuit(); len(e) != 0 { + errs = append(errs, e...) + earlyReturn = true + } + if e := validate.OptionalSlice(ctx, op, fldPath, obj, oldObj).MarkShortCircuit(); len(e) != 0 { + earlyReturn = true + } + if earlyReturn { + return // do not proceed + } + if e := validate.EachValSliceVal(ctx, op, fldPath, obj, oldObj, nil, nil, + func(ctx context.Context, op operation.Operation, fldPath *field.Path, obj, oldObj *string) field.ErrorList { + return validate.MinLength(ctx, op, fldPath, obj, oldObj, 1) + }); len(e) != 0 { + errs = append(errs, e...) + } + if e := validate.EachValSliceVal(ctx, op, fldPath, obj, oldObj, nil, nil, + func(ctx context.Context, op operation.Operation, fldPath *field.Path, obj, oldObj *string) field.ErrorList { + return validate.MaxLength(ctx, op, fldPath, obj, oldObj, 256) + }); len(e) != 0 { + errs = append(errs, e...) + } + return + } + oldVal := safe.Field(oldObj, + func(oldObj *ateletpb.ExternalVolumeSource) []string { + return oldObj.MountOptions + }) + errs = append(errs, fn(fldPath.Child("mount_options"), obj.MountOptions, oldVal, oldObj != nil)...) + } + return errs } diff --git a/cmd/atelet/volumes.go b/cmd/atelet/volumes.go index eb34d769e8..5041f2cc4a 100644 --- a/cmd/atelet/volumes.go +++ b/cmd/atelet/volumes.go @@ -54,6 +54,7 @@ func (s *Atelet) mountExternalVolumes(ctx context.Context, actorUID string, volu TargetPath: hostPath, VolumeContext: ext.GetVolumeContext(), PublishContext: ext.GetPublishContext(), + MountOptions: ext.GetMountOptions(), }); err != nil { return fmt.Errorf("failed to mount volume %q to %q: %w", ext.GetStorageVolumeId(), hostPath, err) } diff --git a/cmd/atelet/volumes_test.go b/cmd/atelet/volumes_test.go index 060be7e3ad..e4933a1ee6 100644 --- a/cmd/atelet/volumes_test.go +++ b/cmd/atelet/volumes_test.go @@ -34,9 +34,10 @@ import ( ) type mountCall struct { - volumeID string - targetPath string - attributes map[string]string + volumeID string + targetPath string + attributes map[string]string + mountOptions []string } type fakeWorkerPlugin struct { @@ -50,9 +51,10 @@ type fakeWorkerPlugin struct { func (f *fakeWorkerPlugin) MountVolume(ctx context.Context, req volume.MountVolumeRequest) error { f.mountCalls = append(f.mountCalls, mountCall{ - volumeID: req.VolumeID, - targetPath: req.TargetPath, - attributes: req.VolumeContext, + volumeID: req.VolumeID, + targetPath: req.TargetPath, + attributes: req.VolumeContext, + mountOptions: req.MountOptions, }) if f.mountErrs != nil { if err, ok := f.mountErrs[req.VolumeID]; ok { @@ -361,6 +363,41 @@ func TestMountExternalVolumes(t *testing.T) { t.Errorf("stat vol-2 mount path %q: %v", expectedPath2, err) } }) + + t.Run("forwards mount options to plugin", func(t *testing.T) { + useTempNodeDirs(t) + + volWithOpts := &ateletpb.Volume{ + Name: "vol-opts", + External: &ateletpb.ExternalVolumeSource{ + StorageVolumeId: "mock-vol-opts", + VolumeType: "mock-driver", + MountOptions: []string{"nfsvers=4.1", "noatime"}, + }, + } + + fake := &fakeWorkerPlugin{} + s := &Atelet{ + volumePlugins: map[string]volume.VolumePluginWorkerPlane{ + "mock-driver": fake, + }, + } + + if err := s.mountExternalVolumes(ctx, actorUID, []*ateletpb.Volume{volWithOpts}); err != nil { + t.Fatalf("mountExternalVolumes failed: %v", err) + } + + wantCalls := []mountCall{ + { + volumeID: "mock-vol-opts", + targetPath: ateletpath.ExternalVolumeHostPath(actorUID, "vol-opts"), + mountOptions: []string{"nfsvers=4.1", "noatime"}, + }, + } + if diff := cmp.Diff(wantCalls, fake.mountCalls, cmp.AllowUnexported(mountCall{})); diff != "" { + t.Errorf("mountCalls mismatch (-want +got):\n%s", diff) + } + }) } func TestVolumeHostDirectoryCleanup(t *testing.T) { diff --git a/cmd/kubectl-ate/internal/cmd/access_policy.go b/cmd/kubectl-ate/internal/cmd/access_policy.go index cf66c89b4b..da14547a1c 100644 --- a/cmd/kubectl-ate/internal/cmd/access_policy.go +++ b/cmd/kubectl-ate/internal/cmd/access_policy.go @@ -19,30 +19,43 @@ import ( "errors" "fmt" "io" + "slices" "github.com/spf13/cobra" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/encoding/protojson" + "google.golang.org/protobuf/proto" "go.ate.dev/substrate/api/ateapi/v1" "go.ate.dev/substrate/cmd/kubectl-ate/internal/printer" "go.ate.dev/substrate/internal/resources" ) +const ( + externalVolumeClassAllowedAtespaceRole = "allowed_atespace" + maxMemberUpdateAttempts = 5 +) + var accessPolicyFlags struct { - atespace string - global bool - filename string - uid string - version int64 + atespace string + externalVolumeClass string + global bool + filename string + addMembers []string + removeMembers []string + role string + uid string + version int64 } const accessPolicyManifestHelp = `The manifest is a YAML or JSON AccessPolicy, as printed by -"kubectl ate get access-policy -o yaml". Its metadata may be omitted. Members -are principals with a "user:" prefix, e.g. -"user:system:serviceaccount:team-a:alice". +"kubectl ate get access-policy -o yaml". Its metadata may be omitted. For +--global and --atespace, members are principals with a "user:" prefix (e.g. +"user:system:serviceaccount:team-a:alice"); for --external-volume-class, role +is "allowed_atespace" and members have an "atespace:" prefix (e.g. +"atespace:team-a"). bindings: - role: owner @@ -50,72 +63,123 @@ are principals with a "user:" prefix, e.g. - user:system:serviceaccount:team-a:alice` var getAccessPolicyCmd = &cobra.Command{ - Use: "access-policy (-a | --global)", + Use: "access-policy (-a | -c | --global)", Aliases: []string{"access-policies"}, - Short: "Get the access policy of an atespace or the global access policy", + Short: "Get the access policy of an atespace, an external volume class, or the global access policy", Args: cobra.NoArgs, RunE: runGetAccessPolicy, } var createAccessPolicyCmd = &cobra.Command{ - Use: "access-policy (-a | --global) -f ", + Use: "access-policy (-a | -c | --global) -f ", Aliases: []string{"access-policies"}, Short: "Create an access policy from a manifest", - Long: "Create the access policy of an atespace, or the global access policy.\n\n" + accessPolicyManifestHelp, + Long: "Create the access policy of an atespace, an external volume class, or the global access policy.\n\n" + accessPolicyManifestHelp, Args: cobra.NoArgs, RunE: runCreateAccessPolicy, } var updateAccessPolicyCmd = &cobra.Command{ - Use: "access-policy (-a | --global) -f ", + Use: "access-policy (-a | -c | --global) (-f | --add-member | --remove-member )", Aliases: []string{"access-policies"}, - Short: "Replace an access policy from a manifest", - Long: "Replace the access policy of an atespace, or the global access policy.\n\n" + accessPolicyManifestHelp + ` - -Its metadata.uid and metadata.version are required preconditions; the server -rejects the update when they no longer match those of the stored policy.`, + Short: "Replace an access policy from a manifest, or add/remove members", + Long: "Replace the access policy of an atespace, an external volume class, or the global access policy from a manifest, or add and remove members in place.\n\n" + accessPolicyManifestHelp + ` + +When replacing from -f, metadata.uid and metadata.version are required +preconditions; the server rejects the update when they no longer match those of +the stored policy. When using --add-member or --remove-member, the CLI reads +the stored policy (or creates one if adding members when none exists) and +retries automatically on version conflicts.`, Args: cobra.NoArgs, RunE: runUpdateAccessPolicy, } var deleteAccessPolicyCmd = &cobra.Command{ - Use: "access-policy -a ", + Use: "access-policy (-a | -c )", Aliases: []string{"access-policies"}, - Short: "Delete the access policy of an atespace", - Long: `Delete the access policy of an atespace. The global access policy cannot be -deleted; update it with no bindings instead.`, + Short: "Delete the access policy of an atespace or an external volume class", + Long: `Delete the access policy of an atespace or an external volume class. The global +access policy cannot be deleted; update it with no bindings instead.`, Args: cobra.NoArgs, RunE: runDeleteAccessPolicy, } -// accessPolicyScope is the parent of an access policy: one atespace, or the -// global singleton when atespace is empty. +// accessPolicyScope is the parent of an access policy: one atespace, one +// external volume class, or the global singleton when both are empty. type accessPolicyScope struct { - atespace string + atespace string + externalVolumeClass string +} + +func (s accessPolicyScope) global() bool { + return s.atespace == "" && s.externalVolumeClass == "" +} + +func (s accessPolicyScope) isExternalVolumeClass() bool { + return s.externalVolumeClass != "" } -func (s accessPolicyScope) global() bool { return s.atespace == "" } +func (s accessPolicyScope) tableLabel() string { + switch { + case s.externalVolumeClass != "": + return s.externalVolumeClass + case s.atespace != "": + return s.atespace + default: + return "" + } +} func (s accessPolicyScope) String() string { - if s.global() { + switch { + case s.externalVolumeClass != "": + return fmt.Sprintf("external volume class %q", s.externalVolumeClass) + case s.atespace != "": + return fmt.Sprintf("atespace %q", s.atespace) + default: return "global" } - return fmt.Sprintf("atespace %q", s.atespace) } func (s accessPolicyScope) ref() *ateapi.ObjectRef { + if s.externalVolumeClass != "" { + return &ateapi.ObjectRef{Name: s.externalVolumeClass} + } return &ateapi.ObjectRef{Name: s.atespace} } -// scopeFromFlags requires exactly one of --atespace and --global. -func scopeFromFlags(atespace string, global bool) (accessPolicyScope, error) { +// scopeFromFlags requires exactly one of --atespace, --external-volume-class, +// and --global. +func scopeFromFlags(atespace, externalVolumeClass string, global bool) (accessPolicyScope, error) { + set := 0 + if atespace != "" { + set++ + } + if externalVolumeClass != "" { + set++ + } + if global { + set++ + } + switch { + case set > 1: + return accessPolicyScope{}, errors.New("--atespace, --external-volume-class, and --global are mutually exclusive") + case set == 0: + return accessPolicyScope{}, errors.New("one of --atespace, --external-volume-class, or --global is required") + } + return accessPolicyScope{atespace: atespace, externalVolumeClass: externalVolumeClass}, nil +} + +// deleteScopeFromFlags requires exactly one of --atespace and +// --external-volume-class. +func deleteScopeFromFlags(atespace, externalVolumeClass string) (accessPolicyScope, error) { switch { - case atespace != "" && global: - return accessPolicyScope{}, errors.New("--atespace and --global are mutually exclusive") - case atespace == "" && !global: - return accessPolicyScope{}, errors.New("one of --atespace or --global is required") + case atespace != "" && externalVolumeClass != "": + return accessPolicyScope{}, errors.New("--atespace and --external-volume-class are mutually exclusive") + case atespace == "" && externalVolumeClass == "": + return accessPolicyScope{}, errors.New("one of --atespace or --external-volume-class is required") } - return accessPolicyScope{atespace: atespace}, nil + return accessPolicyScope{atespace: atespace, externalVolumeClass: externalVolumeClass}, nil } // accessPolicyFromManifest parses a single protojson-shaped YAML or JSON @@ -161,27 +225,38 @@ func loadAccessPolicyManifest(in io.Reader, filename string) (*ateapi.AccessPoli return policy, nil } -// atespaceGetter abstracts the atespace read that tells a missing atespace +// scopeGetter abstracts the parent-resource reads that tell a missing parent // from a missing access policy. -type atespaceGetter interface { +type scopeGetter interface { GetAtespace(ctx context.Context, req *ateapi.GetAtespaceRequest, opts ...grpc.CallOption) (*ateapi.Atespace, error) + GetExternalVolumeClass(ctx context.Context, req *ateapi.GetExternalVolumeClassRequest, opts ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) } // requireScope settles a NotFound from an access policy RPC. For an atespace -// the server answers NotFound for a missing atespace and for an atespace -// without a policy alike, so it reads the atespace. It returns nil when the -// scope exists, which means the policy is what is missing. -func requireScope(ctx context.Context, getter atespaceGetter, scope accessPolicyScope) error { - if scope.global() { +// or external volume class the server answers NotFound for a missing parent +// and for a parent without a policy alike, so it reads the parent. It returns +// nil when the scope exists, which means the policy is what is missing. +func requireScope(ctx context.Context, getter scopeGetter, scope accessPolicyScope) error { + switch { + case scope.global(): return nil - } - if _, err := getter.GetAtespace(ctx, &ateapi.GetAtespaceRequest{Atespace: scope.ref()}); err != nil { - if status.Code(err) == codes.NotFound { - return fmt.Errorf("atespace %q not found", scope.atespace) + case scope.isExternalVolumeClass(): + if _, err := getter.GetExternalVolumeClass(ctx, &ateapi.GetExternalVolumeClassRequest{ExternalVolumeClass: scope.ref()}); err != nil { + if status.Code(err) == codes.NotFound { + return fmt.Errorf("external volume class %q not found", scope.externalVolumeClass) + } + return fmt.Errorf("failed to get external volume class %q: %w", scope.externalVolumeClass, err) + } + return nil + default: + if _, err := getter.GetAtespace(ctx, &ateapi.GetAtespaceRequest{Atespace: scope.ref()}); err != nil { + if status.Code(err) == codes.NotFound { + return fmt.Errorf("atespace %q not found", scope.atespace) + } + return fmt.Errorf("failed to get atespace %q: %w", scope.atespace, err) } - return fmt.Errorf("failed to get atespace %q: %w", scope.atespace, err) + return nil } - return nil } // accessPolicyClient is the subset of the Control API the access policy @@ -194,7 +269,11 @@ type accessPolicyClient interface { CreateAtespaceAccessPolicy(ctx context.Context, req *ateapi.CreateAtespaceAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) UpdateAtespaceAccessPolicy(ctx context.Context, req *ateapi.UpdateAtespaceAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) DeleteAtespaceAccessPolicy(ctx context.Context, req *ateapi.DeleteAtespaceAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) - atespaceGetter + GetExternalVolumeClassAccessPolicy(ctx context.Context, req *ateapi.GetExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) + CreateExternalVolumeClassAccessPolicy(ctx context.Context, req *ateapi.CreateExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) + UpdateExternalVolumeClassAccessPolicy(ctx context.Context, req *ateapi.UpdateExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) + DeleteExternalVolumeClassAccessPolicy(ctx context.Context, req *ateapi.DeleteExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) + scopeGetter } // accessPolicyRunner executes the access policy commands. @@ -206,14 +285,41 @@ type accessPolicyRunner struct { stderr io.Writer } -func (r *accessPolicyRunner) get(ctx context.Context) error { - var policy *ateapi.AccessPolicy - var err error - if r.scope.global() { - policy, err = r.client.GetGlobalAccessPolicy(ctx, &ateapi.GetGlobalAccessPolicyRequest{Name: resources.SingletonName}) - } else { - policy, err = r.client.GetAtespaceAccessPolicy(ctx, &ateapi.GetAtespaceAccessPolicyRequest{Atespace: r.scope.ref(), Name: resources.SingletonName}) +func (r *accessPolicyRunner) fetch(ctx context.Context) (*ateapi.AccessPolicy, error) { + switch { + case r.scope.global(): + return r.client.GetGlobalAccessPolicy(ctx, &ateapi.GetGlobalAccessPolicyRequest{Name: resources.SingletonName}) + case r.scope.isExternalVolumeClass(): + return r.client.GetExternalVolumeClassAccessPolicy(ctx, &ateapi.GetExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: r.scope.ref(), Name: resources.SingletonName}) + default: + return r.client.GetAtespaceAccessPolicy(ctx, &ateapi.GetAtespaceAccessPolicyRequest{Atespace: r.scope.ref(), Name: resources.SingletonName}) + } +} + +func (r *accessPolicyRunner) sendCreate(ctx context.Context, policy *ateapi.AccessPolicy) (*ateapi.AccessPolicy, error) { + switch { + case r.scope.global(): + return r.client.CreateGlobalAccessPolicy(ctx, &ateapi.CreateGlobalAccessPolicyRequest{AccessPolicy: policy}) + case r.scope.isExternalVolumeClass(): + return r.client.CreateExternalVolumeClassAccessPolicy(ctx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: r.scope.ref(), AccessPolicy: policy}) + default: + return r.client.CreateAtespaceAccessPolicy(ctx, &ateapi.CreateAtespaceAccessPolicyRequest{Atespace: r.scope.ref(), AccessPolicy: policy}) + } +} + +func (r *accessPolicyRunner) sendUpdate(ctx context.Context, policy *ateapi.AccessPolicy) (*ateapi.AccessPolicy, error) { + switch { + case r.scope.global(): + return r.client.UpdateGlobalAccessPolicy(ctx, &ateapi.UpdateGlobalAccessPolicyRequest{AccessPolicy: policy}) + case r.scope.isExternalVolumeClass(): + return r.client.UpdateExternalVolumeClassAccessPolicy(ctx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: r.scope.ref(), AccessPolicy: policy}) + default: + return r.client.UpdateAtespaceAccessPolicy(ctx, &ateapi.UpdateAtespaceAccessPolicyRequest{Atespace: r.scope.ref(), AccessPolicy: policy}) } +} + +func (r *accessPolicyRunner) get(ctx context.Context) error { + policy, err := r.fetch(ctx) if status.Code(err) == codes.NotFound { if err := requireScope(ctx, r.client, r.scope); err != nil { return err @@ -225,34 +331,22 @@ func (r *accessPolicyRunner) get(ctx context.Context) error { if err != nil { return fmt.Errorf("failed to get %s access policy: %w", r.scope, err) } - return printer.PrintAccessPolicyTo(r.stdout, r.scope.atespace, policy, r.outputFmt) + return printer.PrintAccessPolicyTo(r.stdout, r.scope.tableLabel(), policy, r.outputFmt) } func (r *accessPolicyRunner) create(ctx context.Context, policy *ateapi.AccessPolicy) error { - var created *ateapi.AccessPolicy - var err error - if r.scope.global() { - created, err = r.client.CreateGlobalAccessPolicy(ctx, &ateapi.CreateGlobalAccessPolicyRequest{AccessPolicy: policy}) - } else { - created, err = r.client.CreateAtespaceAccessPolicy(ctx, &ateapi.CreateAtespaceAccessPolicyRequest{Atespace: r.scope.ref(), AccessPolicy: policy}) - } + created, err := r.sendCreate(ctx, policy) if status.Code(err) == codes.AlreadyExists { return fmt.Errorf(`%s already has an access policy; change it with "kubectl ate update access-policy": %w`, r.scope, err) } if err != nil { return fmt.Errorf("failed to create %s access policy: %w", r.scope, err) } - return printer.PrintAccessPolicyTo(r.stdout, r.scope.atespace, created, r.outputFmt) + return printer.PrintAccessPolicyTo(r.stdout, r.scope.tableLabel(), created, r.outputFmt) } func (r *accessPolicyRunner) update(ctx context.Context, policy *ateapi.AccessPolicy) error { - var updated *ateapi.AccessPolicy - var err error - if r.scope.global() { - updated, err = r.client.UpdateGlobalAccessPolicy(ctx, &ateapi.UpdateGlobalAccessPolicyRequest{AccessPolicy: policy}) - } else { - updated, err = r.client.UpdateAtespaceAccessPolicy(ctx, &ateapi.UpdateAtespaceAccessPolicyRequest{Atespace: r.scope.ref(), AccessPolicy: policy}) - } + updated, err := r.sendUpdate(ctx, policy) if status.Code(err) == codes.NotFound { if err := requireScope(ctx, r.client, r.scope); err != nil { return err @@ -265,11 +359,134 @@ func (r *accessPolicyRunner) update(ctx context.Context, policy *ateapi.AccessPo if err != nil { return fmt.Errorf("failed to update %s access policy: %w", r.scope, err) } - return printer.PrintAccessPolicyTo(r.stdout, r.scope.atespace, updated, r.outputFmt) + return printer.PrintAccessPolicyTo(r.stdout, r.scope.tableLabel(), updated, r.outputFmt) +} + +// mutateMembers reads the stored policy (or creates one when adding members if +// none exists), applies addMembers/removeMembers, and writes it back, retrying +// on concurrent version conflicts. +func (r *accessPolicyRunner) mutateMembers(ctx context.Context, role string, addMembers, removeMembers []string) error { + targetRole, err := resolveMemberEditRole(r.scope, role, addMembers, removeMembers) + if err != nil { + return err + } + + var lastErr error + for range maxMemberUpdateAttempts { + current, err := r.fetch(ctx) + if status.Code(err) == codes.NotFound { + if len(addMembers) == 0 { + if err := requireScope(ctx, r.client, r.scope); err != nil { + return err + } + return fmt.Errorf(`%s has no access policy to update; create it with "kubectl ate create access-policy"`, r.scope) + } + initial := &ateapi.AccessPolicy{Metadata: &ateapi.ResourceMetadata{Name: resources.SingletonName}} + applyMemberEdits(initial, targetRole, addMembers, nil) + created, createErr := r.sendCreate(ctx, initial) + if status.Code(createErr) == codes.AlreadyExists { + lastErr = createErr + continue + } + if createErr != nil { + return fmt.Errorf("failed to create %s access policy: %w", r.scope, createErr) + } + return printer.PrintAccessPolicyTo(r.stdout, r.scope.tableLabel(), created, r.outputFmt) + } + if err != nil { + return fmt.Errorf("failed to get %s access policy: %w", r.scope, err) + } + + edited := proto.CloneOf(current) + applyMemberEdits(edited, targetRole, addMembers, removeMembers) + updated, updateErr := r.sendUpdate(ctx, edited) + if status.Code(updateErr) == codes.Aborted || status.Code(updateErr) == codes.NotFound { + lastErr = updateErr + continue + } + if updateErr != nil { + return fmt.Errorf("failed to update %s access policy: %w", r.scope, updateErr) + } + return printer.PrintAccessPolicyTo(r.stdout, r.scope.tableLabel(), updated, r.outputFmt) + } + return fmt.Errorf("failed to update %s access policy after %d attempts due to concurrent modifications: %w", r.scope, maxMemberUpdateAttempts, lastErr) +} + +func resolveMemberEditRole(scope accessPolicyScope, role string, addMembers, removeMembers []string) (string, error) { + for _, m := range addMembers { + if slices.Contains(removeMembers, m) { + return "", fmt.Errorf("member %q cannot be passed to both --add-member and --remove-member", m) + } + } + if scope.isExternalVolumeClass() { + if role != "" && role != externalVolumeClassAllowedAtespaceRole { + return "", fmt.Errorf("external volume class access policies only support role %q, got %q", externalVolumeClassAllowedAtespaceRole, role) + } + return externalVolumeClassAllowedAtespaceRole, nil + } + if len(addMembers) > 0 && role == "" { + return "", errors.New("--role is required with --add-member for --atespace and --global") + } + return role, nil +} + +// applyMemberEdits removes removeMembers (from bindings matching role, or from +// all bindings when role is empty), drops any binding whose member list +// becomes empty, and appends addMembers to the binding for role. +func applyMemberEdits(policy *ateapi.AccessPolicy, role string, addMembers, removeMembers []string) { + if len(removeMembers) > 0 { + var keptBindings []*ateapi.Binding + for _, b := range policy.GetBindings() { + if role != "" && b.GetRole() != role { + keptBindings = append(keptBindings, b) + continue + } + keptMembers := slices.DeleteFunc(slices.Clone(b.GetMembers()), func(m string) bool { + return slices.Contains(removeMembers, m) + }) + if len(keptMembers) > 0 { + b.Members = keptMembers + keptBindings = append(keptBindings, b) + } + } + policy.Bindings = keptBindings + } + if len(addMembers) == 0 { + return + } + var target *ateapi.Binding + for _, b := range policy.GetBindings() { + if b.GetRole() == role { + target = b + break + } + } + if target == nil { + target = &ateapi.Binding{Role: role} + policy.Bindings = append(policy.Bindings, target) + } + for _, m := range addMembers { + if !slices.Contains(target.Members, m) { + target.Members = append(target.Members, m) + } + } } func (r *accessPolicyRunner) delete(ctx context.Context, options *ateapi.DeleteOptions) error { - _, err := r.client.DeleteAtespaceAccessPolicy(ctx, &ateapi.DeleteAtespaceAccessPolicyRequest{Atespace: r.scope.ref(), Name: resources.SingletonName, Options: options}) + var err error + if r.scope.isExternalVolumeClass() { + _, err = r.client.DeleteExternalVolumeClassAccessPolicy(ctx, &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: r.scope.ref(), + Name: resources.SingletonName, + Options: options, + }) + } else { + _, err = r.client.DeleteAtespaceAccessPolicy(ctx, &ateapi.DeleteAtespaceAccessPolicyRequest{ + Atespace: r.scope.ref(), + Name: resources.SingletonName, + Options: options, + }) + } if status.Code(err) == codes.NotFound { if err := requireScope(ctx, r.client, r.scope); err != nil { return err @@ -300,7 +517,7 @@ func newAccessPolicyRunner(cmd *cobra.Command, scope accessPolicyScope) (*access } func runGetAccessPolicy(cmd *cobra.Command, _ []string) error { - scope, err := scopeFromFlags(accessPolicyFlags.atespace, accessPolicyFlags.global) + scope, err := scopeFromFlags(accessPolicyFlags.atespace, accessPolicyFlags.externalVolumeClass, accessPolicyFlags.global) if err != nil { return err } @@ -313,7 +530,7 @@ func runGetAccessPolicy(cmd *cobra.Command, _ []string) error { } func runCreateAccessPolicy(cmd *cobra.Command, _ []string) error { - scope, err := scopeFromFlags(accessPolicyFlags.atespace, accessPolicyFlags.global) + scope, err := scopeFromFlags(accessPolicyFlags.atespace, accessPolicyFlags.externalVolumeClass, accessPolicyFlags.global) if err != nil { return err } @@ -330,10 +547,33 @@ func runCreateAccessPolicy(cmd *cobra.Command, _ []string) error { } func runUpdateAccessPolicy(cmd *cobra.Command, _ []string) error { - scope, err := scopeFromFlags(accessPolicyFlags.atespace, accessPolicyFlags.global) + scope, err := scopeFromFlags(accessPolicyFlags.atespace, accessPolicyFlags.externalVolumeClass, accessPolicyFlags.global) if err != nil { return err } + hasFile := accessPolicyFlags.filename != "" + hasMemberFlags := len(accessPolicyFlags.addMembers) > 0 || len(accessPolicyFlags.removeMembers) > 0 + switch { + case hasFile && accessPolicyFlags.role != "": + return errors.New("--role cannot be combined with --filename; the manifest sets each binding's role") + case hasFile && hasMemberFlags: + return errors.New("--filename cannot be combined with --add-member or --remove-member") + case !hasFile && !hasMemberFlags: + return errors.New("one of --filename, --add-member, or --remove-member is required") + } + + if hasMemberFlags { + if _, err := resolveMemberEditRole(scope, accessPolicyFlags.role, accessPolicyFlags.addMembers, accessPolicyFlags.removeMembers); err != nil { + return err + } + runner, closeFn, err := newAccessPolicyRunner(cmd, scope) + if err != nil { + return err + } + defer closeFn() + return runner.mutateMembers(cmd.Context(), accessPolicyFlags.role, accessPolicyFlags.addMembers, accessPolicyFlags.removeMembers) + } + policy, err := loadAccessPolicyManifest(cmd.InOrStdin(), accessPolicyFlags.filename) if err != nil { return err @@ -351,6 +591,10 @@ func runUpdateAccessPolicy(cmd *cobra.Command, _ []string) error { } func runDeleteAccessPolicy(cmd *cobra.Command, _ []string) error { + scope, err := deleteScopeFromFlags(accessPolicyFlags.atespace, accessPolicyFlags.externalVolumeClass) + if err != nil { + return err + } options, err := deleteOptionsFromFlags(deleteGuardFlags{ uidSet: cmd.Flags().Changed("uid"), uid: accessPolicyFlags.uid, @@ -360,7 +604,7 @@ func runDeleteAccessPolicy(cmd *cobra.Command, _ []string) error { if err != nil { return err } - runner, closeFn, err := newAccessPolicyRunner(cmd, accessPolicyScope{atespace: accessPolicyFlags.atespace}) + runner, closeFn, err := newAccessPolicyRunner(cmd, scope) if err != nil { return err } @@ -371,18 +615,23 @@ func runDeleteAccessPolicy(cmd *cobra.Command, _ []string) error { func init() { for _, c := range []*cobra.Command{getAccessPolicyCmd, createAccessPolicyCmd, updateAccessPolicyCmd} { c.Flags().StringVarP(&accessPolicyFlags.atespace, "atespace", "a", "", "Atespace whose access policy to use") - c.Flags().BoolVar(&accessPolicyFlags.global, "global", false, "Use the global access policy instead of an atespace's") - } - for _, c := range []*cobra.Command{createAccessPolicyCmd, updateAccessPolicyCmd} { - c.Flags().StringVarP(&accessPolicyFlags.filename, "filename", "f", "", "Manifest file holding one AccessPolicy; use - for stdin (required)") - _ = c.MarkFlagRequired("filename") + c.Flags().StringVarP(&accessPolicyFlags.externalVolumeClass, "external-volume-class", "c", "", "External volume class whose access policy to use") + c.Flags().BoolVar(&accessPolicyFlags.global, "global", false, "Use the global access policy instead of an atespace's or external volume class's") } + createAccessPolicyCmd.Flags().StringVarP(&accessPolicyFlags.filename, "filename", "f", "", "Manifest file holding one AccessPolicy; use - for stdin (required)") + _ = createAccessPolicyCmd.MarkFlagRequired("filename") + + updateAccessPolicyCmd.Flags().StringVarP(&accessPolicyFlags.filename, "filename", "f", "", "Manifest file holding one AccessPolicy; use - for stdin") + updateAccessPolicyCmd.Flags().StringSliceVar(&accessPolicyFlags.addMembers, "add-member", nil, "Add one or more members (e.g. atespace:team-a); may be repeated or comma-separated") + updateAccessPolicyCmd.Flags().StringSliceVar(&accessPolicyFlags.removeMembers, "remove-member", nil, "Remove one or more members (e.g. atespace:team-a); may be repeated or comma-separated") + updateAccessPolicyCmd.Flags().StringVar(&accessPolicyFlags.role, "role", "", "Role for --add-member/--remove-member (defaults to allowed_atespace for -c/--external-volume-class)") + getCmd.AddCommand(getAccessPolicyCmd) createCmd.AddCommand(createAccessPolicyCmd) updateCmd.AddCommand(updateAccessPolicyCmd) - deleteAccessPolicyCmd.Flags().StringVarP(&accessPolicyFlags.atespace, "atespace", "a", "", "Atespace whose access policy to delete (required)") - _ = deleteAccessPolicyCmd.MarkFlagRequired("atespace") + deleteAccessPolicyCmd.Flags().StringVarP(&accessPolicyFlags.atespace, "atespace", "a", "", "Atespace whose access policy to delete") + deleteAccessPolicyCmd.Flags().StringVarP(&accessPolicyFlags.externalVolumeClass, "external-volume-class", "c", "", "External volume class whose access policy to delete") deleteAccessPolicyCmd.Flags().StringVar(&accessPolicyFlags.uid, "uid", "", "Delete only if the policy's metadata.uid matches; from get -o yaml") deleteAccessPolicyCmd.Flags().Int64Var(&accessPolicyFlags.version, "version", 0, "Delete only if the policy's metadata.version matches; from get -o yaml") deleteCmd.AddCommand(deleteAccessPolicyCmd) diff --git a/cmd/kubectl-ate/internal/cmd/access_policy_test.go b/cmd/kubectl-ate/internal/cmd/access_policy_test.go index 1e8e1eae62..57ad5ec195 100644 --- a/cmd/kubectl-ate/internal/cmd/access_policy_test.go +++ b/cmd/kubectl-ate/internal/cmd/access_policy_test.go @@ -33,21 +33,25 @@ import ( func TestScopeFromFlags(t *testing.T) { t.Parallel() tests := []struct { - name string - atespace string - global bool - want accessPolicyScope - wantErr string + name string + atespace string + externalVolumeClass string + global bool + want accessPolicyScope + wantErr string }{ {name: "atespace", atespace: "team-a", want: accessPolicyScope{atespace: "team-a"}}, + {name: "external volume class", externalVolumeClass: "csi-nfs", want: accessPolicyScope{externalVolumeClass: "csi-nfs"}}, {name: "global", global: true, want: accessPolicyScope{}}, - {name: "neither", wantErr: "one of --atespace or --global is required"}, - {name: "both", atespace: "team-a", global: true, wantErr: "mutually exclusive"}, + {name: "none", wantErr: "one of --atespace, --external-volume-class, or --global is required"}, + {name: "atespace and global", atespace: "team-a", global: true, wantErr: "mutually exclusive"}, + {name: "atespace and class", atespace: "team-a", externalVolumeClass: "csi-nfs", wantErr: "mutually exclusive"}, + {name: "class and global", externalVolumeClass: "csi-nfs", global: true, wantErr: "mutually exclusive"}, } for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { t.Parallel() - got, err := scopeFromFlags(tc.atespace, tc.global) + got, err := scopeFromFlags(tc.atespace, tc.externalVolumeClass, tc.global) if tc.wantErr != "" { if err == nil || !strings.Contains(err.Error(), tc.wantErr) { t.Fatalf("scopeFromFlags() error = %v, want %q", err, tc.wantErr) @@ -64,6 +68,67 @@ func TestScopeFromFlags(t *testing.T) { } } +func TestDeleteScopeFromFlags(t *testing.T) { + t.Parallel() + tests := []struct { + name string + atespace string + externalVolumeClass string + want accessPolicyScope + wantErr string + }{ + {name: "atespace", atespace: "team-a", want: accessPolicyScope{atespace: "team-a"}}, + {name: "external volume class", externalVolumeClass: "csi-nfs", want: accessPolicyScope{externalVolumeClass: "csi-nfs"}}, + {name: "neither", wantErr: "one of --atespace or --external-volume-class is required"}, + {name: "both", atespace: "team-a", externalVolumeClass: "csi-nfs", wantErr: "mutually exclusive"}, + } + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + got, err := deleteScopeFromFlags(tc.atespace, tc.externalVolumeClass) + if tc.wantErr != "" { + if err == nil || !strings.Contains(err.Error(), tc.wantErr) { + t.Fatalf("deleteScopeFromFlags() error = %v, want %q", err, tc.wantErr) + } + return + } + if err != nil { + t.Fatalf("deleteScopeFromFlags() error = %v", err) + } + if got != tc.want { + t.Errorf("deleteScopeFromFlags() = %+v, want %+v", got, tc.want) + } + }) + } +} + +// The flag conflicts are rejected before the manifest is read or the server +// is dialed, so no cluster is needed. +func TestUpdateAccessPolicyFlagConflicts(t *testing.T) { + for _, tc := range []struct { + name string + args []string + wantErr string + }{ + { + name: "filename with role", + args: []string{"update", "access-policy", "-c", "csi-nfs", "-f", "policy.yaml", "--role", "allowed_atespace"}, + wantErr: "--role cannot be combined with --filename", + }, + { + name: "filename with add-member", + args: []string{"update", "access-policy", "-c", "csi-nfs", "-f", "policy.yaml", "--add-member", "atespace:team-a"}, + wantErr: "--filename cannot be combined with --add-member or --remove-member", + }, + } { + t.Run(tc.name, func(t *testing.T) { + if _, _, err := runRootCLI(t, tc.args...); err == nil || !strings.Contains(err.Error(), tc.wantErr) { + t.Fatalf("error = %v, want it to contain %q", err, tc.wantErr) + } + }) + } +} + func TestLoadAccessPolicyManifest(t *testing.T) { t.Parallel() ownerAlice := []*ateapi.Binding{{Role: "owner", Members: []string{"user:alice"}}} @@ -115,18 +180,33 @@ bindings: [{role: owner, members: ["user:alice"]}] } } -// fakeAccessPolicyClient records the last RPC and answers with policy or err. +type fakeCallResponse struct { + policy *ateapi.AccessPolicy + err error +} + +// fakeAccessPolicyClient records the last RPC and answers with policy or err +// (or consumes scripted responses when scripted is non-empty). type fakeAccessPolicyClient struct { policy *ateapi.AccessPolicy err error + scripted []fakeCallResponse atespaceErr error + classErr error method string req any + calls int } func (f *fakeAccessPolicyClient) answer(method string, req any) (*ateapi.AccessPolicy, error) { f.method, f.req = method, req + f.calls++ + if len(f.scripted) > 0 { + next := f.scripted[0] + f.scripted = f.scripted[1:] + return next.policy, next.err + } return f.policy, f.err } @@ -158,6 +238,22 @@ func (f *fakeAccessPolicyClient) DeleteAtespaceAccessPolicy(_ context.Context, r return f.answer("DeleteAtespaceAccessPolicy", req) } +func (f *fakeAccessPolicyClient) GetExternalVolumeClassAccessPolicy(_ context.Context, req *ateapi.GetExternalVolumeClassAccessPolicyRequest, _ ...grpc.CallOption) (*ateapi.AccessPolicy, error) { + return f.answer("GetExternalVolumeClassAccessPolicy", req) +} + +func (f *fakeAccessPolicyClient) CreateExternalVolumeClassAccessPolicy(_ context.Context, req *ateapi.CreateExternalVolumeClassAccessPolicyRequest, _ ...grpc.CallOption) (*ateapi.AccessPolicy, error) { + return f.answer("CreateExternalVolumeClassAccessPolicy", req) +} + +func (f *fakeAccessPolicyClient) UpdateExternalVolumeClassAccessPolicy(_ context.Context, req *ateapi.UpdateExternalVolumeClassAccessPolicyRequest, _ ...grpc.CallOption) (*ateapi.AccessPolicy, error) { + return f.answer("UpdateExternalVolumeClassAccessPolicy", req) +} + +func (f *fakeAccessPolicyClient) DeleteExternalVolumeClassAccessPolicy(_ context.Context, req *ateapi.DeleteExternalVolumeClassAccessPolicyRequest, _ ...grpc.CallOption) (*ateapi.AccessPolicy, error) { + return f.answer("DeleteExternalVolumeClassAccessPolicy", req) +} + func (f *fakeAccessPolicyClient) GetAtespace(_ context.Context, req *ateapi.GetAtespaceRequest, _ ...grpc.CallOption) (*ateapi.Atespace, error) { if f.atespaceErr != nil { return nil, f.atespaceErr @@ -165,28 +261,41 @@ func (f *fakeAccessPolicyClient) GetAtespace(_ context.Context, req *ateapi.GetA return &ateapi.Atespace{Metadata: &ateapi.ResourceMetadata{Name: req.GetAtespace().GetName()}}, nil } +func (f *fakeAccessPolicyClient) GetExternalVolumeClass(_ context.Context, req *ateapi.GetExternalVolumeClassRequest, _ ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) { + if f.classErr != nil { + return nil, f.classErr + } + return &ateapi.ExternalVolumeClass{Metadata: &ateapi.ResourceMetadata{Name: req.GetExternalVolumeClass().GetName()}}, nil +} + func TestAccessPolicyRunner(t *testing.T) { t.Parallel() stored := &ateapi.AccessPolicy{ Metadata: &ateapi.ResourceMetadata{Name: "default", Uid: "u-1", Version: 2}, Bindings: []*ateapi.Binding{{Role: "owner", Members: []string{"user:alice"}}}, } + storedEVC := &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default", Uid: "u-2", Version: 1}, + Bindings: []*ateapi.Binding{{Role: "allowed_atespace", Members: []string{"atespace:team-a"}}}, + } edit := &ateapi.AccessPolicy{Metadata: &ateapi.ResourceMetadata{Name: "default", Uid: "u-1", Version: 2}} teamA := accessPolicyScope{atespace: "team-a"} + csiNFS := accessPolicyScope{externalVolumeClass: "csi-nfs"} global := accessPolicyScope{} notFound := status.Error(codes.NotFound, "not found") + aborted := status.Error(codes.Aborted, "version mismatch") + alreadyExists := status.Error(codes.AlreadyExists, "exists") tests := []struct { - name string - scope accessPolicyScope - client *fakeAccessPolicyClient - run func(context.Context, *accessPolicyRunner) error - wantMethod string - wantReq any - wantStdout string - wantStderr string - wantErr string - wantNoCalls bool + name string + scope accessPolicyScope + client *fakeAccessPolicyClient + run func(context.Context, *accessPolicyRunner) error + wantMethod string + wantReq any + wantStdout string + wantStderr string + wantErr string }{ { name: "get atespace", @@ -197,6 +306,15 @@ func TestAccessPolicyRunner(t *testing.T) { wantReq: &ateapi.GetAtespaceAccessPolicyRequest{Atespace: &ateapi.ObjectRef{Name: "team-a"}, Name: resources.SingletonName}, wantStdout: "team-a owner user:alice", }, + { + name: "get external volume class", + scope: csiNFS, + client: &fakeAccessPolicyClient{policy: storedEVC}, + run: func(ctx context.Context, r *accessPolicyRunner) error { return r.get(ctx) }, + wantMethod: "GetExternalVolumeClassAccessPolicy", + wantReq: &ateapi.GetExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "csi-nfs"}, Name: resources.SingletonName}, + wantStdout: "csi-nfs allowed_atespace atespace:team-a", + }, { name: "get global", scope: global, @@ -214,6 +332,14 @@ func TestAccessPolicyRunner(t *testing.T) { wantMethod: "GetAtespaceAccessPolicy", wantStderr: `atespace "team-a" has no access policy`, }, + { + name: "get external volume class without a policy", + scope: csiNFS, + client: &fakeAccessPolicyClient{err: notFound}, + run: func(ctx context.Context, r *accessPolicyRunner) error { return r.get(ctx) }, + wantMethod: "GetExternalVolumeClassAccessPolicy", + wantStderr: `external volume class "csi-nfs" has no access policy`, + }, { name: "get missing atespace", scope: teamA, @@ -222,6 +348,14 @@ func TestAccessPolicyRunner(t *testing.T) { wantMethod: "GetAtespaceAccessPolicy", wantErr: `atespace "team-a" not found`, }, + { + name: "get missing external volume class", + scope: csiNFS, + client: &fakeAccessPolicyClient{err: notFound, classErr: notFound}, + run: func(ctx context.Context, r *accessPolicyRunner) error { return r.get(ctx) }, + wantMethod: "GetExternalVolumeClassAccessPolicy", + wantErr: `external volume class "csi-nfs" not found`, + }, { name: "get permission denied", scope: teamA, @@ -239,6 +373,15 @@ func TestAccessPolicyRunner(t *testing.T) { wantReq: &ateapi.CreateAtespaceAccessPolicyRequest{Atespace: &ateapi.ObjectRef{Name: "team-a"}, AccessPolicy: edit}, wantStdout: "team-a owner user:alice", }, + { + name: "create external volume class", + scope: csiNFS, + client: &fakeAccessPolicyClient{policy: storedEVC}, + run: func(ctx context.Context, r *accessPolicyRunner) error { return r.create(ctx, edit) }, + wantMethod: "CreateExternalVolumeClassAccessPolicy", + wantReq: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "csi-nfs"}, AccessPolicy: edit}, + wantStdout: "csi-nfs allowed_atespace atespace:team-a", + }, { name: "create global", scope: global, @@ -250,7 +393,7 @@ func TestAccessPolicyRunner(t *testing.T) { { name: "create existing", scope: teamA, - client: &fakeAccessPolicyClient{err: status.Error(codes.AlreadyExists, "exists")}, + client: &fakeAccessPolicyClient{err: alreadyExists}, run: func(ctx context.Context, r *accessPolicyRunner) error { return r.create(ctx, edit) }, wantMethod: "CreateAtespaceAccessPolicy", wantErr: "kubectl ate update access-policy", @@ -263,10 +406,18 @@ func TestAccessPolicyRunner(t *testing.T) { wantMethod: "UpdateGlobalAccessPolicy", wantReq: &ateapi.UpdateGlobalAccessPolicyRequest{AccessPolicy: edit}, }, + { + name: "update external volume class", + scope: csiNFS, + client: &fakeAccessPolicyClient{policy: storedEVC}, + run: func(ctx context.Context, r *accessPolicyRunner) error { return r.update(ctx, edit) }, + wantMethod: "UpdateExternalVolumeClassAccessPolicy", + wantReq: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "csi-nfs"}, AccessPolicy: edit}, + }, { name: "update stale", scope: teamA, - client: &fakeAccessPolicyClient{err: status.Error(codes.Aborted, "version mismatch")}, + client: &fakeAccessPolicyClient{err: aborted}, run: func(ctx context.Context, r *accessPolicyRunner) error { return r.update(ctx, edit) }, wantMethod: "UpdateAtespaceAccessPolicy", wantErr: "re-run", @@ -280,7 +431,7 @@ func TestAccessPolicyRunner(t *testing.T) { wantErr: "kubectl ate create access-policy", }, { - name: "delete", + name: "delete atespace", scope: teamA, client: &fakeAccessPolicyClient{policy: stored}, run: func(ctx context.Context, r *accessPolicyRunner) error { @@ -290,6 +441,17 @@ func TestAccessPolicyRunner(t *testing.T) { wantReq: &ateapi.DeleteAtespaceAccessPolicyRequest{Atespace: &ateapi.ObjectRef{Name: "team-a"}, Name: resources.SingletonName, Options: &ateapi.DeleteOptions{Version: 2}}, wantStdout: `access policy for atespace "team-a" deleted`, }, + { + name: "delete external volume class", + scope: csiNFS, + client: &fakeAccessPolicyClient{policy: storedEVC}, + run: func(ctx context.Context, r *accessPolicyRunner) error { + return r.delete(ctx, &ateapi.DeleteOptions{Version: 1}) + }, + wantMethod: "DeleteExternalVolumeClassAccessPolicy", + wantReq: &ateapi.DeleteExternalVolumeClassAccessPolicyRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "csi-nfs"}, Name: resources.SingletonName, Options: &ateapi.DeleteOptions{Version: 1}}, + wantStdout: `access policy for external volume class "csi-nfs" deleted`, + }, { name: "delete without a policy", scope: teamA, @@ -298,6 +460,103 @@ func TestAccessPolicyRunner(t *testing.T) { wantMethod: "DeleteAtespaceAccessPolicy", wantErr: `atespace "team-a" has no access policy`, }, + { + name: "add-member creates initial external volume class policy when absent", + scope: csiNFS, + client: &fakeAccessPolicyClient{ + scripted: []fakeCallResponse{ + {err: notFound}, + {policy: storedEVC}, + }, + }, + run: func(ctx context.Context, r *accessPolicyRunner) error { + return r.mutateMembers(ctx, "", []string{"atespace:team-a"}, nil) + }, + wantMethod: "CreateExternalVolumeClassAccessPolicy", + wantReq: &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "csi-nfs"}, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default"}, + Bindings: []*ateapi.Binding{{Role: "allowed_atespace", Members: []string{"atespace:team-a"}}}, + }, + }, + wantStdout: "csi-nfs allowed_atespace atespace:team-a", + }, + { + name: "add-member retries on Aborted and deduplicates existing members", + scope: csiNFS, + client: &fakeAccessPolicyClient{ + scripted: []fakeCallResponse{ + {policy: storedEVC}, + {err: aborted}, + {policy: storedEVC}, + {policy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default", Uid: "u-2", Version: 2}, + Bindings: []*ateapi.Binding{{Role: "allowed_atespace", Members: []string{"atespace:team-a", "atespace:team-b"}}}, + }}, + }, + }, + run: func(ctx context.Context, r *accessPolicyRunner) error { + return r.mutateMembers(ctx, "", []string{"atespace:team-a", "atespace:team-b"}, nil) + }, + wantMethod: "UpdateExternalVolumeClassAccessPolicy", + wantReq: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "csi-nfs"}, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default", Uid: "u-2", Version: 1}, + Bindings: []*ateapi.Binding{{Role: "allowed_atespace", Members: []string{"atespace:team-a", "atespace:team-b"}}}, + }, + }, + wantStdout: "atespace:team-a,atespace:team-b", + }, + { + name: "remove-member drops empty binding", + scope: csiNFS, + client: &fakeAccessPolicyClient{ + scripted: []fakeCallResponse{ + {policy: storedEVC}, + {policy: &ateapi.AccessPolicy{Metadata: &ateapi.ResourceMetadata{Name: "default", Uid: "u-2", Version: 2}}}, + }, + }, + run: func(ctx context.Context, r *accessPolicyRunner) error { + return r.mutateMembers(ctx, "", nil, []string{"atespace:team-a"}) + }, + wantMethod: "UpdateExternalVolumeClassAccessPolicy", + wantReq: &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: "csi-nfs"}, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: "default", Uid: "u-2", Version: 1}, + }, + }, + wantStdout: "csi-nfs ", + }, + { + name: "add-member rejects invalid role on external volume class", + scope: csiNFS, + client: &fakeAccessPolicyClient{}, + run: func(ctx context.Context, r *accessPolicyRunner) error { + return r.mutateMembers(ctx, "owner", []string{"atespace:team-a"}, nil) + }, + wantErr: `only support role "allowed_atespace"`, + }, + { + name: "add-member requires --role on atespace", + scope: teamA, + client: &fakeAccessPolicyClient{}, + run: func(ctx context.Context, r *accessPolicyRunner) error { + return r.mutateMembers(ctx, "", []string{"user:alice"}, nil) + }, + wantErr: "--role is required", + }, + { + name: "overlapping --add-member and --remove-member rejected", + scope: csiNFS, + client: &fakeAccessPolicyClient{}, + run: func(ctx context.Context, r *accessPolicyRunner) error { + return r.mutateMembers(ctx, "", []string{"atespace:team-a"}, []string{"atespace:team-a"}) + }, + wantErr: "cannot be passed to both --add-member and --remove-member", + }, } for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { diff --git a/cmd/kubectl-ate/internal/cmd/external_volume_class.go b/cmd/kubectl-ate/internal/cmd/external_volume_class.go new file mode 100644 index 0000000000..8580515b2e --- /dev/null +++ b/cmd/kubectl-ate/internal/cmd/external_volume_class.go @@ -0,0 +1,176 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package cmd + +import ( + "context" + "fmt" + "io" + + "github.com/spf13/cobra" + "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/cmd/kubectl-ate/internal/printer" + "google.golang.org/grpc" + "google.golang.org/protobuf/encoding/protojson" +) + +var ( + createExternalVolumeClassFilenameFlag string + deleteExternalVolumeClassGuard deleteGuardFlags +) + +type externalVolumeClassClient interface { + GetExternalVolumeClass(ctx context.Context, in *ateapi.GetExternalVolumeClassRequest, opts ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) + ListExternalVolumeClasses(ctx context.Context, in *ateapi.ListExternalVolumeClassesRequest, opts ...grpc.CallOption) (*ateapi.ListExternalVolumeClassesResponse, error) + CreateExternalVolumeClass(ctx context.Context, in *ateapi.CreateExternalVolumeClassRequest, opts ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) + DeleteExternalVolumeClass(ctx context.Context, in *ateapi.DeleteExternalVolumeClassRequest, opts ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) +} + +var getExternalVolumeClassesCmd = &cobra.Command{ + Use: "external-volume-class [name ...]", + Aliases: []string{"external-volume-classes"}, + Short: "List all external volume classes or get one or more external volume classes", + Long: "List or get external volume classes.", + Args: cobra.ArbitraryArgs, + RunE: func(cmd *cobra.Command, args []string) error { + apiClient, err := newAPIClient(cmd) + if err != nil { + return fmt.Errorf("failed to connect to ate-api-server: %w", err) + } + defer apiClient.Close() + return runGetExternalVolumeClasses(cmd.Context(), apiClient, cmd.OutOrStdout(), outputFmt, args) + }, +} + +var createExternalVolumeClassCmd = &cobra.Command{ + Use: "external-volume-class -f ", + Aliases: []string{"external-volume-classes"}, + Short: "Create an external volume class from a manifest", + Long: `Create an external volume class from a single YAML or JSON manifest holding one ateapi.ExternalVolumeClass message in protojson form (as printed by "kubectl ate get external-volume-class -o yaml"). External volume classes are global-scoped and immutable.`, + Args: noArgs("the external volume class name comes from the manifest passed to -f/--filename", "filename"), + RunE: func(cmd *cobra.Command, args []string) error { + class, err := loadExternalVolumeClassManifest(cmd.InOrStdin(), createExternalVolumeClassFilenameFlag) + if err != nil { + return err + } + apiClient, err := newAPIClient(cmd) + if err != nil { + return fmt.Errorf("failed to connect to ate-api-server: %w", err) + } + defer apiClient.Close() + return runCreateExternalVolumeClass(cmd.Context(), apiClient, cmd.OutOrStdout(), outputFmt, class) + }, +} + +var deleteExternalVolumeClassCmd = &cobra.Command{ + Use: "external-volume-class ", + Aliases: []string{"external-volume-classes"}, + Short: "Delete an external volume class", + Long: "Delete an external volume class. Pass --uid and/or --version to guard the delete against a concurrent replacement.", + Args: exactlyOneArg(""), + RunE: func(cmd *cobra.Command, args []string) error { + opts, err := deleteOptionsFromFlags(deleteGuardFlags{ + uidSet: cmd.Flags().Changed("uid"), + uid: deleteExternalVolumeClassGuard.uid, + versionSet: cmd.Flags().Changed("version"), + version: deleteExternalVolumeClassGuard.version, + }) + if err != nil { + return wrapUsageError(err) + } + apiClient, err := newAPIClient(cmd) + if err != nil { + return fmt.Errorf("failed to connect to ate-api-server: %w", err) + } + defer apiClient.Close() + return runDeleteExternalVolumeClass(cmd.Context(), apiClient, cmd.OutOrStdout(), args[0], opts) + }, +} + +func runGetExternalVolumeClasses(ctx context.Context, client externalVolumeClassClient, out io.Writer, format string, names []string) error { + if len(names) > 0 { + classes := make([]*ateapi.ExternalVolumeClass, 0, len(names)) + for _, name := range names { + resp, err := client.GetExternalVolumeClass(ctx, &ateapi.GetExternalVolumeClassRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: name}}) + if err != nil { + return fmt.Errorf("failed to get external volume class %q: %w", name, err) + } + classes = append(classes, resp) + } + if len(classes) == 1 { + return printer.PrintExternalVolumeClassTo(out, classes[0], format) + } + return printer.PrintExternalVolumeClassesTo(out, classes, format) + } + var allClasses []*ateapi.ExternalVolumeClass + for pageToken := ""; ; { + resp, err := client.ListExternalVolumeClasses(ctx, &ateapi.ListExternalVolumeClassesRequest{Options: &ateapi.ListOptions{PageSize: 1000, PageToken: pageToken}}) + if err != nil { + return fmt.Errorf("failed to list external volume classes: %w", err) + } + allClasses = append(allClasses, resp.GetExternalVolumeClasses()...) + if pageToken = resp.GetNextPageToken(); pageToken == "" { + break + } + } + return printer.PrintExternalVolumeClassesTo(out, allClasses, format) +} + +func runCreateExternalVolumeClass(ctx context.Context, client externalVolumeClassClient, out io.Writer, format string, class *ateapi.ExternalVolumeClass) error { + resp, err := client.CreateExternalVolumeClass(ctx, &ateapi.CreateExternalVolumeClassRequest{ExternalVolumeClass: class}) + if err != nil { + return fmt.Errorf("failed to create external volume class: %w", err) + } + return printer.PrintExternalVolumeClassTo(out, resp, format) +} + +func runDeleteExternalVolumeClass(ctx context.Context, client externalVolumeClassClient, out io.Writer, name string, opts *ateapi.DeleteOptions) error { + if _, err := client.DeleteExternalVolumeClass(ctx, &ateapi.DeleteExternalVolumeClassRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: name}, Options: opts}); err != nil { + return fmt.Errorf("failed to delete external volume class: %w", err) + } + fmt.Fprintf(out, "external volume class %q deleted\n", name) + return nil +} + +func loadExternalVolumeClassManifest(in io.Reader, path string) (*ateapi.ExternalVolumeClass, error) { + data, err := readFileOrStdin(in, path) + if err != nil { + return nil, err + } + jsonData, err := manifestToJSON(data) + if err != nil { + return nil, fmt.Errorf("failed to parse external volume class manifest %q: %w", path, err) + } + class := &ateapi.ExternalVolumeClass{} + if err := protojson.Unmarshal(jsonData, class); err != nil { + return nil, fmt.Errorf("failed to parse external volume class manifest %q: invalid ExternalVolumeClass: %w", path, err) + } + if got := class.GetMetadata().GetAtespace(); got != "" { + return nil, fmt.Errorf("external volume class is global-scoped: metadata.atespace must be empty (got %q)", got) + } + if class.GetMetadata().GetName() == "" { + return nil, fmt.Errorf("failed to parse external volume class manifest %q: metadata.name is required", path) + } + return class, nil +} + +func init() { + getCmd.AddCommand(getExternalVolumeClassesCmd) + createExternalVolumeClassCmd.Flags().StringVarP(&createExternalVolumeClassFilenameFlag, "filename", "f", "", "manifest file holding a single JSON or YAML external-volume-class document, or - for stdin") + createCmd.AddCommand(createExternalVolumeClassCmd) + deleteExternalVolumeClassCmd.Flags().StringVar(&deleteExternalVolumeClassGuard.uid, "uid", "", "require the external volume class to have this UID before deleting") + deleteExternalVolumeClassCmd.Flags().Int64Var(&deleteExternalVolumeClassGuard.version, "version", 0, "require the external volume class to be at this version before deleting") + deleteCmd.AddCommand(deleteExternalVolumeClassCmd) +} diff --git a/cmd/kubectl-ate/internal/cmd/external_volume_class_test.go b/cmd/kubectl-ate/internal/cmd/external_volume_class_test.go new file mode 100644 index 0000000000..46c544c33b --- /dev/null +++ b/cmd/kubectl-ate/internal/cmd/external_volume_class_test.go @@ -0,0 +1,224 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package cmd + +import ( + "bytes" + "context" + "errors" + "os" + "path/filepath" + "strings" + "testing" + "time" + + "github.com/google/go-cmp/cmp" + "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/cmd/kubectl-ate/internal/printer" + "google.golang.org/grpc" + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/testing/protocmp" + "google.golang.org/protobuf/types/known/timestamppb" +) + +func TestExternalVolumeClassCommandArgs(t *testing.T) { + runCommandArgsTests(t, []commandArgsTest{ + {name: "list", command: getExternalVolumeClassesCmd}, + {name: "get", command: getExternalVolumeClassesCmd, args: []string{"fast-ssd"}}, + {name: "get multiple", command: getExternalVolumeClassesCmd, args: []string{"fast-ssd", "standard-rwo"}}, + {name: "create missing -f", command: createExternalVolumeClassCmd, wantErr: true}, + {name: "create extra arg", command: createExternalVolumeClassCmd, args: []string{"fast-ssd"}, wantErr: true}, + {name: "delete", command: deleteExternalVolumeClassCmd, args: []string{"fast-ssd"}}, + {name: "delete missing name", command: deleteExternalVolumeClassCmd, wantErr: true}, + {name: "delete extra name", command: deleteExternalVolumeClassCmd, args: []string{"a", "b"}, wantErr: true}, + }) +} + +func TestLoadExternalVolumeClassManifest(t *testing.T) { + t.Parallel() + wantFastSSD := &ateapi.ExternalVolumeClass{Metadata: &ateapi.ResourceMetadata{Name: "fast-ssd"}, DriverName: "pd.csi.storage.gke.io", Parameters: map[string]string{"type": "pd-ssd"}} + for _, tc := range []struct { + name, manifest, wantErr string + want *ateapi.ExternalVolumeClass + }{ + {name: "camelCase yaml", manifest: "metadata: {name: fast-ssd}\ndriverName: pd.csi.storage.gke.io\nparameters: {type: pd-ssd}\n", want: wantFastSSD}, + {name: "snake_case yaml", manifest: "metadata: {name: fast-ssd}\ndriver_name: pd.csi.storage.gke.io\nparameters: {type: pd-ssd}\n", want: wantFastSSD}, + {name: "json input", manifest: `{"metadata": {"name": "fast-ssd"}, "driverName": "pd.csi.storage.gke.io", "parameters": {"type": "pd-ssd"}}`, want: wantFastSSD}, + {name: "missing metadata.name", manifest: "driverName: pd.csi.storage.gke.io", wantErr: "metadata.name is required"}, + {name: "atespace set", manifest: "metadata: {atespace: team-a, name: fast-ssd}", wantErr: "metadata.atespace must be empty"}, + {name: "unknown field", manifest: "metadata: {name: fast-ssd}\nprovisioner: pd.csi.storage.gke.io", wantErr: "invalid ExternalVolumeClass"}, + {name: "empty", manifest: "", wantErr: "manifest is empty"}, + {name: "multi-document yaml", manifest: "metadata: {name: a}\n---\nmetadata: {name: b}\n", wantErr: "manifest holds more than one document"}, + } { + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + got, err := loadExternalVolumeClassManifest(strings.NewReader(tc.manifest), "-") + if tc.wantErr != "" { + if err == nil || !strings.Contains(err.Error(), tc.wantErr) { + t.Fatalf("loadExternalVolumeClassManifest() error = %v, want %q", err, tc.wantErr) + } + return + } + if err != nil || cmp.Diff(tc.want, got, protocmp.Transform()) != "" { + t.Fatalf("loadExternalVolumeClassManifest() = (%v, %v), want %v", got, err, tc.want) + } + }) + } + + t.Run("yaml round-trip", func(t *testing.T) { + t.Parallel() + serverObj := &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "fast-ssd", Uid: "u-1", Version: 1, CreateTime: timestamppb.New(time.Date(2026, 1, 1, 11, 55, 0, 0, time.UTC))}, + DriverName: "pd.csi.storage.gke.io", + Parameters: map[string]string{"type": "pd-ssd"}, + } + var yamlOut bytes.Buffer + if err := printer.PrintExternalVolumeClassTo(&yamlOut, serverObj, "yaml"); err != nil { + t.Fatalf("PrintExternalVolumeClassTo(yaml) error = %v", err) + } + parsed, err := loadExternalVolumeClassManifest(&yamlOut, "-") + if err != nil || cmp.Diff(serverObj, parsed, protocmp.Transform()) != "" { + t.Fatalf("round-trip = (%v, %v), want %v", parsed, err, serverObj) + } + }) +} + +type fakeExternalVolumeClassClient struct { + byName map[string]*ateapi.ExternalVolumeClass + listPages []*ateapi.ListExternalVolumeClassesResponse + listReqs []*ateapi.ListExternalVolumeClassesRequest + createReq *ateapi.CreateExternalVolumeClassRequest + deleteReq *ateapi.DeleteExternalVolumeClassRequest + err error +} + +func (f *fakeExternalVolumeClassClient) GetExternalVolumeClass(_ context.Context, req *ateapi.GetExternalVolumeClassRequest, _ ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) { + if f.err != nil { + return nil, f.err + } + return f.byName[req.GetExternalVolumeClass().GetName()], nil +} +func (f *fakeExternalVolumeClassClient) ListExternalVolumeClasses(_ context.Context, req *ateapi.ListExternalVolumeClassesRequest, _ ...grpc.CallOption) (*ateapi.ListExternalVolumeClassesResponse, error) { + f.listReqs = append(f.listReqs, req) + if f.err != nil { + return nil, f.err + } + if len(f.listPages) == 0 { + return &ateapi.ListExternalVolumeClassesResponse{}, nil + } + page := f.listPages[0] + f.listPages = f.listPages[1:] + return page, nil +} +func (f *fakeExternalVolumeClassClient) CreateExternalVolumeClass(_ context.Context, req *ateapi.CreateExternalVolumeClassRequest, _ ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) { + f.createReq = req + if f.err != nil { + return nil, f.err + } + created := proto.Clone(req.GetExternalVolumeClass()).(*ateapi.ExternalVolumeClass) + created.Metadata.Uid, created.Metadata.Version = "srv-uid-1", 7 + return created, nil +} +func (f *fakeExternalVolumeClassClient) DeleteExternalVolumeClass(_ context.Context, req *ateapi.DeleteExternalVolumeClassRequest, _ ...grpc.CallOption) (*ateapi.ExternalVolumeClass, error) { + f.deleteReq = req + if f.err != nil { + return nil, f.err + } + return &ateapi.ExternalVolumeClass{Metadata: &ateapi.ResourceMetadata{Name: req.GetExternalVolumeClass().GetName()}}, nil +} + +func TestExternalVolumeClassRunners(t *testing.T) { + ctx := context.Background() + fastSSD := &ateapi.ExternalVolumeClass{Metadata: &ateapi.ResourceMetadata{Name: "fast-ssd", Version: 1}, DriverName: "pd.csi.storage.gke.io", Parameters: map[string]string{"type": "pd-ssd"}} + standardRWO := &ateapi.ExternalVolumeClass{Metadata: &ateapi.ResourceMetadata{Name: "standard-rwo", Version: 1}, DriverName: "pd.csi.storage.gke.io"} + + client := &fakeExternalVolumeClassClient{ + byName: map[string]*ateapi.ExternalVolumeClass{"fast-ssd": fastSSD, "standard-rwo": standardRWO}, + listPages: []*ateapi.ListExternalVolumeClassesResponse{ + {ExternalVolumeClasses: []*ateapi.ExternalVolumeClass{standardRWO}, NextPageToken: "page-2"}, + {ExternalVolumeClasses: []*ateapi.ExternalVolumeClass{fastSSD}}, + }, + } + var out bytes.Buffer + if err := runGetExternalVolumeClasses(ctx, client, &out, "yaml", []string{"fast-ssd"}); err != nil || strings.Contains(out.String(), "externalVolumeClasses:") { + t.Fatalf("single get err = %v, out = %s", err, out.String()) + } + out.Reset() + if err := runGetExternalVolumeClasses(ctx, client, &out, "yaml", []string{"standard-rwo", "fast-ssd"}); err != nil || !strings.Contains(out.String(), "externalVolumeClasses:") { + t.Fatalf("multi get err = %v, out = %s", err, out.String()) + } + out.Reset() + if err := runGetExternalVolumeClasses(ctx, client, &out, "yaml", nil); err != nil || len(client.listReqs) != 2 || client.listReqs[1].GetOptions().GetPageToken() != "page-2" { + t.Fatalf("paged list err = %v, reqs = %+v", err, client.listReqs) + } + out.Reset() + if err := runCreateExternalVolumeClass(ctx, client, &out, "yaml", fastSSD); err != nil || cmp.Diff(fastSSD, client.createReq.GetExternalVolumeClass(), protocmp.Transform()) != "" { + t.Fatalf("create err = %v, req = %v", err, client.createReq) + } + for _, w := range []string{"uid: srv-uid-1", `version: "7"`, "driverName: pd.csi.storage.gke.io"} { + if !strings.Contains(out.String(), w) { + t.Errorf("create out = %q, want server response field %q", out.String(), w) + } + } + out.Reset() + opts := &ateapi.DeleteOptions{Uid: "u-1", Version: 3} + if err := runDeleteExternalVolumeClass(ctx, client, &out, "fast-ssd", opts); err != nil || out.String() != "external volume class \"fast-ssd\" deleted\n" { + t.Fatalf("delete err = %v, out = %q", err, out.String()) + } + if diff := cmp.Diff(&ateapi.DeleteExternalVolumeClassRequest{ExternalVolumeClass: &ateapi.ObjectRef{Name: "fast-ssd"}, Options: opts}, client.deleteReq, protocmp.Transform()); diff != "" { + t.Errorf("deleteReq mismatch (-want +got):\n%s", diff) + } + bad := filepath.Join(t.TempDir(), "evc.yaml") + if err := os.WriteFile(bad, []byte("metadata: {atespace: a, name: b}\n"), 0o600); err != nil { + t.Fatal(err) + } + if _, _, err := runRootCLI(t, "create", "external-volume-class", "-f", bad); err == nil || !strings.Contains(err.Error(), "metadata.atespace must be empty") { + t.Fatalf("create -f bad error = %v, want metadata.atespace must be empty", err) + } + if _, _, err := runRootCLI(t, "delete", "external-volume-class", "fast-ssd", "--version", "0"); err == nil || !strings.Contains(err.Error(), "--version must be at least 1") { + t.Fatalf("delete --version 0 error = %v, want --version must be at least 1", err) + } + if _, _, err := runRootCLI(t, "delete", "external-volume-class", "fast-ssd", "--uid", ""); err == nil || !strings.Contains(err.Error(), "--uid must not be empty") { + t.Fatalf("delete --uid '' error = %v, want --uid must not be empty", err) + } +} + +func TestExternalVolumeClassRunnersPropagateErrors(t *testing.T) { + ctx := context.Background() + boom := errors.New("boom") + client := &fakeExternalVolumeClassClient{err: boom} + class := &ateapi.ExternalVolumeClass{Metadata: &ateapi.ResourceMetadata{Name: "x"}, DriverName: "d"} + var out bytes.Buffer + for _, tc := range []struct { + name, want string + run func() error + }{ + {"get", `failed to get external volume class "x"`, func() error { return runGetExternalVolumeClasses(ctx, client, &out, "table", []string{"x"}) }}, + {"list", "failed to list external volume classes", func() error { return runGetExternalVolumeClasses(ctx, client, &out, "table", nil) }}, + {"create", "failed to create external volume class", func() error { return runCreateExternalVolumeClass(ctx, client, &out, "yaml", class) }}, + {"delete", "failed to delete external volume class", func() error { return runDeleteExternalVolumeClass(ctx, client, &out, "x", nil) }}, + } { + t.Run(tc.name, func(t *testing.T) { + out.Reset() + err := tc.run() + if !errors.Is(err, boom) || !strings.Contains(err.Error(), tc.want) { + t.Fatalf("err = %v, want %q wrapping boom", err, tc.want) + } + if out.Len() != 0 { + t.Errorf("out = %q, want nothing printed on error", out.String()) + } + }) + } +} diff --git a/cmd/kubectl-ate/internal/printer/access_policy.go b/cmd/kubectl-ate/internal/printer/access_policy.go index aad2f239fb..3d4798d51b 100644 --- a/cmd/kubectl-ate/internal/printer/access_policy.go +++ b/cmd/kubectl-ate/internal/printer/access_policy.go @@ -25,13 +25,13 @@ import ( // PrintAccessPolicyTo prints an access policy, one table row per binding. // json and yaml emit the bare AccessPolicy. The policy's metadata carries no -// atespace, so the caller passes it; empty means the global policy. -func PrintAccessPolicyTo(out io.Writer, atespace string, policy *ateapi.AccessPolicy, format string) error { +// parent scope, so the caller passes scopeLabel; empty means the global policy. +func PrintAccessPolicyTo(out io.Writer, scopeLabel string, policy *ateapi.AccessPolicy, format string) error { switch format { case "json", "yaml": return printProto(out, policy, format) case "table": - scope := atespace + scope := scopeLabel if scope == "" { scope = "" } diff --git a/cmd/kubectl-ate/internal/printer/access_policy_test.go b/cmd/kubectl-ate/internal/printer/access_policy_test.go index c9c15f73f1..46826c0949 100644 --- a/cmd/kubectl-ate/internal/printer/access_policy_test.go +++ b/cmd/kubectl-ate/internal/printer/access_policy_test.go @@ -46,6 +46,12 @@ func TestPrintAccessPolicyTo(t *testing.T) { name: "global table", policy: policy, format: "table", want: []string{" owner"}, }, + { + name: "external volume class table", atespace: "csi-nfs", policy: &ateapi.AccessPolicy{ + Bindings: []*ateapi.Binding{{Role: "allowed_atespace", Members: []string{"atespace:team-a"}}}, + }, format: "table", + want: []string{"csi-nfs allowed_atespace atespace:team-a"}, + }, { name: "no bindings", atespace: "team-a", policy: &ateapi.AccessPolicy{}, format: "table", want: []string{"team-a "}, diff --git a/cmd/kubectl-ate/internal/printer/external_volume_class.go b/cmd/kubectl-ate/internal/printer/external_volume_class.go new file mode 100644 index 0000000000..4d9cb13a4e --- /dev/null +++ b/cmd/kubectl-ate/internal/printer/external_volume_class.go @@ -0,0 +1,79 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package printer + +import ( + "cmp" + "fmt" + "io" + "maps" + "slices" + "strings" + "text/tabwriter" + + "go.ate.dev/substrate/api/ateapi/v1" +) + +// maxParametersWidth caps the PARAMETERS table column, in runes. -o yaml and +// -o json print every parameter. +const maxParametersWidth = 40 + +func formatParameters(params map[string]string) string { + if len(params) == 0 { + return "-" + } + keys := slices.Sorted(maps.Keys(params)) + for i, k := range keys { + keys[i] = k + "=" + params[k] + } + return truncateColumn(strings.Join(keys, ","), maxParametersWidth) +} + +// truncateColumn shortens s to at most n runes, ending in "..." when it cuts. +func truncateColumn(s string, n int) string { + r := []rune(s) + if len(r) <= n { + return s + } + return string(r[:n-3]) + "..." +} + +// PrintExternalVolumeClassesTo prints a slice of external volume classes to the provided writer. +func PrintExternalVolumeClassesTo(out io.Writer, classes []*ateapi.ExternalVolumeClass, format string) error { + slices.SortFunc(classes, func(a, b *ateapi.ExternalVolumeClass) int { + return cmp.Compare(a.GetMetadata().GetName(), b.GetMetadata().GetName()) + }) + switch format { + case "json", "yaml": + return printProto(out, &ateapi.ListExternalVolumeClassesResponse{ExternalVolumeClasses: classes}, format) + case "table": + w := tabwriter.NewWriter(out, 0, 0, 3, ' ', 0) + fmt.Fprintln(w, "NAME\tDRIVER\tPARAMETERS\tAGE") + for _, c := range classes { + fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", c.GetMetadata().GetName(), c.GetDriverName(), formatParameters(c.GetParameters()), formatAge(c.GetMetadata().GetCreateTime())) + } + return w.Flush() + default: + return fmt.Errorf("unsupported format %q", format) + } +} + +// PrintExternalVolumeClassTo prints a single external volume class to the provided writer. +func PrintExternalVolumeClassTo(out io.Writer, class *ateapi.ExternalVolumeClass, format string) error { + if format == "json" || format == "yaml" { + return printProto(out, class, format) + } + return PrintExternalVolumeClassesTo(out, []*ateapi.ExternalVolumeClass{class}, format) +} diff --git a/cmd/kubectl-ate/internal/printer/external_volume_class_test.go b/cmd/kubectl-ate/internal/printer/external_volume_class_test.go new file mode 100644 index 0000000000..4514d68f28 --- /dev/null +++ b/cmd/kubectl-ate/internal/printer/external_volume_class_test.go @@ -0,0 +1,110 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package printer + +import ( + "bytes" + "strings" + "testing" + "time" + + "github.com/google/go-cmp/cmp" + "go.ate.dev/substrate/api/ateapi/v1" + "google.golang.org/protobuf/types/known/timestamppb" +) + +func TestPrintExternalVolumeClasses(t *testing.T) { + now := time.Date(2026, 1, 1, 12, 0, 0, 0, time.UTC) + pinNow(t, now) + + fastSSD := &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "fast-ssd", Uid: "u-1", Version: 1, CreateTime: timestamppb.New(now.Add(-10 * time.Minute))}, + DriverName: "pd.csi.storage.gke.io", + Parameters: map[string]string{"type": "pd-ssd", "replication-type": "none"}, + } + standardRWO := &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "standard-rwo", CreateTime: timestamppb.New(now.Add(-5 * time.Hour))}, + DriverName: "pd.csi.storage.gke.io", + } + + var buf bytes.Buffer + if err := PrintExternalVolumeClassesTo(&buf, []*ateapi.ExternalVolumeClass{standardRWO, fastSSD}, "table"); err != nil { + t.Fatalf("PrintExternalVolumeClassesTo(table) error = %v", err) + } + wantTable := "NAME DRIVER PARAMETERS AGE\n" + + "fast-ssd pd.csi.storage.gke.io replication-type=none,type=pd-ssd 10m\n" + + "standard-rwo pd.csi.storage.gke.io - 5h\n" + if diff := cmp.Diff(wantTable, buf.String()); diff != "" { + t.Errorf("table mismatch (-want +got):\n%s", diff) + } + + for _, tc := range []struct { + name, format string + single bool + wantSub []string + wantErr bool + }{ + {name: "list json", format: "json", wantSub: []string{`"externalVolumeClasses"`, `"driverName": "pd.csi.storage.gke.io"`}}, + {name: "list yaml", format: "yaml", wantSub: []string{"externalVolumeClasses:", "driverName: pd.csi.storage.gke.io"}}, + {name: "single yaml bare object", single: true, format: "yaml", wantSub: []string{"driverName: pd.csi.storage.gke.io", "uid: u-1", `version: "1"`}}, + {name: "single table", single: true, format: "table", wantSub: []string{"NAME", "fast-ssd pd.csi.storage.gke.io replication-type=none,type=pd-ssd 10m"}}, + {name: "unsupported format", single: true, format: "xml", wantErr: true}, + } { + t.Run(tc.name, func(t *testing.T) { + var out bytes.Buffer + err := PrintExternalVolumeClassesTo(&out, []*ateapi.ExternalVolumeClass{fastSSD}, tc.format) + if tc.single { + out.Reset() + err = PrintExternalVolumeClassTo(&out, fastSSD, tc.format) + } + if (err != nil) != tc.wantErr { + t.Fatalf("error = %v, wantErr %v", err, tc.wantErr) + } + for _, w := range tc.wantSub { + if !strings.Contains(out.String(), w) { + t.Errorf("output = %q, want substring %q", out.String(), w) + } + } + }) + } +} + +func TestPrintExternalVolumeClassTruncatesParameters(t *testing.T) { + nfs := &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: "nfs"}, + DriverName: "nfs.csi.k8s.io", + Parameters: map[string]string{"server": "nfs-server.default.svc.cluster.local", "share": "/exports/team-a"}, + } + var table bytes.Buffer + if err := PrintExternalVolumeClassTo(&table, nfs, "table"); err != nil { + t.Fatal(err) + } + // "server=nfs-server.default.svc.cluster" is 37 runes; +"..." = 40. + if got := table.String(); !strings.Contains(got, "server=nfs-server.default.svc.cluster...") || strings.Contains(got, "share=") { + t.Errorf("table = %q, want PARAMETERS cut to 40 runes", got) + } + var yamlOut bytes.Buffer + if err := PrintExternalVolumeClassTo(&yamlOut, nfs, "yaml"); err != nil { + t.Fatal(err) + } + for _, w := range []string{"server: nfs-server.default.svc.cluster.local", "share: /exports/team-a"} { + if !strings.Contains(yamlOut.String(), w) { + t.Errorf("yaml = %q, want lossless %q", yamlOut.String(), w) + } + } + if got := truncateColumn("ééééé", 4); got != "é..." { + t.Errorf(`truncateColumn("ééééé", 4) = %q, want "é..."`, got) + } +} diff --git a/demos/counter/README.md b/demos/counter/README.md index 0aa17b89ea..3c3a5af51e 100644 --- a/demos/counter/README.md +++ b/demos/counter/README.md @@ -201,18 +201,18 @@ go run ./cmd/ate-setup deploy ate-system \ --credential-provider='{"name":"k8s.io"}' \ --ingress-allowed-spiffe-ids=spiffe://cluster.local/ns/ate-system/sa/atenet-client -# 2. Install a bundled CSI driver and its CSIDriverConfig: -# - NFS (creates StorageClass csi-nfs-sc, requires the nfsd kernel module on nodes): -go run ./cmd/ate-setup setup csi nfs -# - Or hostpath on kind clusters (creates StorageClass csi-hostpath-sc): -# go run ./cmd/ate-setup setup csi hostpath +# 2. Install a bundled CSI driver, its CSIDriverConfig, and its ExternalVolumeClass: +# - NFS (registers ExternalVolumeClass csi-nfs, requires the nfsd kernel module on nodes): +go run ./cmd/ate-setup setup csi nfs --preview=ExternalVolumes +# - Or hostpath on kind clusters (registers ExternalVolumeClass csi-hostpath): +# go run ./cmd/ate-setup setup csi hostpath --preview=ExternalVolumes # 3. Delete any existing counter demo (templates are immutable), then deploy with the external volume go run ./cmd/ate-setup delete demo counter kubectl wait --for=delete namespace/ate-demo-counter --timeout=60s go run ./cmd/ate-setup deploy demo counter \ --with-external-volume \ - --storage-class=csi-nfs-sc \ + --external-volume-class=csi-nfs \ --preview=ExternalVolumes # 4. Create the actor with --preview enabled on kubectl ate @@ -223,10 +223,10 @@ kubectl ate --preview create actor my-counter-1 -a ate-demo-counter --template c The installer reads these settings in addition to those in [docs/guides/operator-install.md](../../docs/guides/operator-install.md#settings), through the same flag, environment variable, and configuration document channels. -| Key | Environment variable | Flag | Default | Applies to | -|-----------------------------------|-----------------------------------------|--------------------------|------------|-----------------------| -| `demo.counter.storageClass` | `STORAGE_CLASS` | `--storage-class` | `standard` | `deploy demo counter` | -| `demo.counter.withExternalVolume` | `ATE_DEMO_COUNTER_WITH_EXTERNAL_VOLUME` | `--with-external-volume` | `false` | `deploy demo counter` | +| Key | Environment variable | Flag | Default | Applies to | +|------------------------------------|-----------------------------------------|---------------------------|-----------|-----------------------| +| `demo.counter.externalVolumeClass` | `EXTERNAL_VOLUME_CLASS` | `--external-volume-class` | `csi-nfs` | `deploy demo counter` | +| `demo.counter.withExternalVolume` | `ATE_DEMO_COUNTER_WITH_EXTERNAL_VOLUME` | `--with-external-volume` | `false` | `deploy demo counter` | ## How to Uninstall diff --git a/demos/counter/counter-microvm-csi-test-template.yaml b/demos/counter/counter-microvm-csi-test-template.yaml index f62f43addc..9683f728e0 100644 --- a/demos/counter/counter-microvm-csi-test-template.yaml +++ b/demos/counter/counter-microvm-csi-test-template.yaml @@ -45,4 +45,5 @@ volumes: external: template: capacityBytes: 1073741824 # 1Gi - storageClassName: csi-hostpath-sc + externalVolumeClass: + name: csi-hostpath diff --git a/demos/sandbox/manual-test-multi-template.yaml b/demos/sandbox/manual-test-multi-template.yaml index b40b8ffb90..f973881539 100644 --- a/demos/sandbox/manual-test-multi-template.yaml +++ b/demos/sandbox/manual-test-multi-template.yaml @@ -47,9 +47,11 @@ volumes: external: template: capacityBytes: 1073741824 # 1Gi - storageClassName: csi-hostpath-sc + externalVolumeClass: + name: csi-hostpath - name: vol-nfs external: template: capacityBytes: 1073741824 # 1Gi - storageClassName: csi-nfs-sc + externalVolumeClass: + name: csi-nfs diff --git a/docs/guides/authorization.md b/docs/guides/authorization.md index 4de4c65184..56d0a29daa 100644 --- a/docs/guides/authorization.md +++ b/docs/guides/authorization.md @@ -129,6 +129,8 @@ one **atespace**. | Create an actor from a tag (`sourceTag`) | ✅ | | ✅ | ✅ | | | Workers: get, list, list assignments | ✅ | ✅ | | | | | Workers: create, update, delete, drain | ✅ | | | | | +| External volume classes: get, list, get access policies | ✅ | ✅ | get only (allowed) | get only (allowed) | | +| External volume classes: create, delete, manage access policies | ✅ | | | | | ### System roles @@ -177,7 +179,7 @@ viewer, and a global role holds the same role in every atespace. So | RPC | Permission, on | Allowed for | |---|---|---| -| `CreateActorTemplate` | `can_create_actor_template`, `metadata.atespace` | Atespace editor | +| `CreateActorTemplate` | 1. `can_create_actor_template`, `metadata.atespace`
2. `can_reference`, each `volumes[].external.template.external_volume_class` (subject: `atespace:`) | 1. Atespace editor
2. The template's atespace must be listed under `allowed_atespace` in the class's access policy. Global owners do not bypass this check. | | `GetActorTemplate` | `can_get`, the template | Viewer of its atespace | | `DeleteActorTemplate` | `can_delete`, the template | Editor of its atespace | | `ListActorTemplates` | `can_list_actor_templates`, the atespace, or global if none is given | Atespace viewer; global viewer for all atespaces | @@ -216,6 +218,21 @@ Workers have no atespace; their permissions come from the global scope. | `DrainWorker` | `can_drain`, the worker | Global owner; `ate-controller` | | `ListWorkerActorAssignments` | `can_list_actor_assignments`, the worker | Global viewer | +### External volume classes + +External volume classes have no atespace; their permissions come from the +global scope, and editors of atespaces granted `allowed_atespace` by a class's +access policy may read that class. + +| RPC | Permission, on | Allowed for | +|---|---|---| +| `CreateExternalVolumeClass` | `can_create_external_volume_class`, global | Global owner | +| `ListExternalVolumeClasses` | `can_list_external_volume_classes`, global | Global viewer | +| `GetExternalVolumeClass` | `can_get`, the class | Global viewer; editor of an allowed atespace | +| `DeleteExternalVolumeClass` | `can_delete`, the class | Global owner | +| `GetExternalVolumeClassAccessPolicy` | `can_get_access_policy`, the class | Global viewer | +| `CreateExternalVolumeClassAccessPolicy`, `UpdateExternalVolumeClassAccessPolicy`, `DeleteExternalVolumeClassAccessPolicy` | `can_create_access_policy` / `can_update_access_policy` / `can_delete_access_policy`, the class | Global owner | + ### WorkerService The interceptor skips these; each handler requires `atelet`'s pod @@ -246,7 +263,7 @@ certificate. ## Managing access Each scope has one access policy, named `default`, managed with `kubectl ate` -using `--global` or `-a `: +using `--global`, `-a `, or `-c `: ```yaml # policy.yaml @@ -266,17 +283,25 @@ kubectl ate --token-file me.token create access-policy -a team-a -f policy.yaml kubectl ate --token-file me.token get access-policy -a team-a -o yaml > current.yaml kubectl ate --token-file me.token update access-policy -a team-a -f current.yaml kubectl ate --token-file me.token delete access-policy -a team-a + +# Grant or revoke an atespace on an external volume class in place: +kubectl ate --preview --token-file me.token update access-policy -c csi-nfs --add-member atespace:team-a +kubectl ate --preview --token-file me.token update access-policy -c csi-nfs --remove-member atespace:team-a ``` - Global policies accept `owner` and `viewer`; atespace policies also accept - `editor`. -- `update` replaces the whole policy and needs the `uid` and `version` from + `editor`; external volume class policies accept `allowed_atespace` with + `atespace:` members. +- `update -f` replaces the whole policy and needs the `uid` and `version` from `get -o yaml`. It fails if the policy changed, or was deleted and recreated, - since. + since. `update --add-member` and `update --remove-member` read the stored + policy (or create one if adding members when none exists) and retry on + version conflicts. - The global policy can't be deleted; update it with no bindings instead. -- Deleting an atespace deletes its policy, so a recreated atespace starts - with none. A request authorized against the old atespace and still in - flight across the delete and recreate can apply to the new one. See +- Deleting an atespace deletes its policy and scrubs that atespace from every + external volume class access policy, so a recreated atespace starts with no + grants. A request authorized against the old atespace and still in flight + across the delete and recreate can apply to the new one. See [Known limitations](#known-limitations). - Changes take effect on the next call. @@ -313,13 +338,23 @@ For a shared cluster, beyond replacing the default bootstrap owner: ## Known limitations -- **Atespace names must not be reused.** Grants are keyed by atespace name, - and calls are authorized before the write runs. If an atespace is deleted - and recreated under the same name, a request authorized against the old - atespace and still in flight across the delete and recreate can land on +- **Atespace names must not be reused.** Grants are keyed by atespace name + (both on the atespace itself and in external volume class `allowed_atespace` + bindings), and calls are authorized before the write runs. If an atespace is + deleted and recreated under the same name, a request authorized against the + old atespace and still in flight across the delete and recreate can land on the new one, including granting access to it or deleting it. Nothing enforces unique names. Once an atespace is deleted, don't create another one under that name; use a fresh name instead. +- **Allowed-atespace editors can `Get` an external volume class, not `List`.** + `ListExternalVolumeClasses` requires global `viewer`; an editor of an + atespace granted `allowed_atespace` on a class can inspect that class by + name with `GetExternalVolumeClass`. +- **External volume class revocation is not retroactive.** `can_reference` is + checked only on `CreateActorTemplate`. Revoking an `allowed_atespace` grant + does not stop actors created from existing templates, and cloning a tag + across atespaces (`CreateActor` with `sourceTag`) does not re-check the + original template's class grant. - **Tags can copy an actor's data.** A tag is a durable copy of an actor's memory and disk, including secrets, and outlives the actor. Any atespace editor can tag, publish and clone any actor in the atespace. diff --git a/docs/guides/benchmarking.md b/docs/guides/benchmarking.md index 829ef4d9fc..5024ea7967 100644 --- a/docs/guides/benchmarking.md +++ b/docs/guides/benchmarking.md @@ -161,9 +161,10 @@ and state restoration latency when a durable directory is attached to the actor. * `glutton-durdir-full`: Attaches a durable data directory and performs a full memory snapshot restore. * `glutton-storage`: Attaches an external CSI volume instead of a durable directory. `deploy_locust.sh` and `workloads/deploy.sh` deploy it only - when `--storage-class-name` names an existing StorageClass. To run it on - NFS, install with `go run ./cmd/ate-setup setup csi nfs` and pass - `--storage-class-name csi-nfs-sc`, the class the e2e tests also use. + when `--external-volume-class` names an existing `ExternalVolumeClass`. To + run it on NFS, install with `ATE_PREVIEW=ExternalVolumes go run ./cmd/ate-setup setup csi nfs` + and pass `--external-volume-class csi-nfs`, the class the e2e tests also + use. #### DurDir Reported Metrics diff --git a/docs/guides/csi-volumes.md b/docs/guides/csi-volumes.md index fe9ba21bea..08ce9aa574 100644 --- a/docs/guides/csi-volumes.md +++ b/docs/guides/csi-volumes.md @@ -40,7 +40,10 @@ To discover and communicate with CSI drivers, Substrate uses dynamic discovery d ### The `CSIDriverConfig` Resource -`CSIDriverConfig` defines the gRPC connection parameters for a specific CSI driver. It bridges the Kubernetes `StorageClass` (referenced in the `ActorTemplate`) to the network endpoint of the CSI Controller service and the local socket path of the CSI Node plugin. +`CSIDriverConfig` defines the gRPC connection parameters for a specific CSI driver. It bridges the `ExternalVolumeClass` (referenced in the `ActorTemplate`) to the network endpoint of the CSI Controller service and the local socket path of the CSI Node plugin. + +> [!NOTE] +> The `driverName` on an `ExternalVolumeClass` must match the `CSIDriverConfig` resource's `metadata.name` as well as `spec.driverName`. ```yaml apiVersion: ate.dev/v1 @@ -61,7 +64,7 @@ spec: | Field | Type | Description | | :--- | :--- | :--- | -| `driverName` | `string` | **Required.** The standard CSI driver name (e.g. `nfs.csi.k8s.io`, `hostpath.csi.k8s.io`, `pd.csi.storage.gke.io`). Matches the `provisioner` field on the referenced Kubernetes `StorageClass`. | +| `driverName` | `string` | **Required.** The standard CSI driver name (e.g. `nfs.csi.k8s.io`, `hostpath.csi.k8s.io`, `pd.csi.storage.gke.io`). Matches the `driverName` field on the referenced `ExternalVolumeClass`. | | `controllerEndpoint` | `string` | **Required.** The gRPC endpoint for the CSI Controller service. Must be a valid URI starting with `tcp://`, `dns:///`, or `unix://` (e.g., `tcp://csi-controller.kube-system.svc:50051` or `dns:///csi-svc.default.svc:9000`). | | `nodeSocketOverride` | `string` | **Optional.** Override for the CSI Node service Unix domain socket on worker nodes. Must begin with `unix://`. If omitted, Substrate defaults to `unix:///var/lib/kubelet/plugins//csi.sock`. | | `tls` | `*CSIDriverTLSConfig` | **Optional.** Configures TLS or mTLS for the gRPC connection to the `controllerEndpoint`. | @@ -98,12 +101,13 @@ volumes: external: template: capacityBytes: 10737418240 # 10Gi - storageClassName: standard-rwx + externalVolumeClass: + name: csi-nfs ``` * `name`: Unique DNS-label-compliant volume name. * `external.template.capacityBytes`: The requested volume size in bytes (e.g. `1073741824` for 1Gi). -* `external.template.storageClassName`: Name of a Kubernetes `StorageClass` present in the cluster whose `provisioner` matches a registered `CSIDriverConfig`. +* `external.template.externalVolumeClass`: Reference (`{name: }`) to an `ExternalVolumeClass` registered in the Substrate control plane whose `driverName` matches a registered `CSIDriverConfig`. #### `containers[].volumeMounts[]` @@ -125,21 +129,23 @@ volumeMounts: The following example demonstrates setting up an NFS CSI driver with Substrate and deploying an `ActorTemplate` that mounts an external NFS volume. -### Step 1: Create the StorageClass +### Step 1: Create the ExternalVolumeClass and Grant It to the Atespace -```yaml -apiVersion: storage.k8s.io/v1 -kind: StorageClass +Create the `ExternalVolumeClass` through the Substrate API (`ate-setup setup csi nfs` registers `csi-nfs` automatically when the `ExternalVolumes` preview gate is enabled) and grant the target atespace permission to use it: + +```bash +kubectl ate --preview create external-volume-class -f - <<'EOF' metadata: - name: csi-nfs-sc -provisioner: nfs.csi.k8s.io + name: csi-nfs +driverName: nfs.csi.k8s.io parameters: server: nfs-server.default.svc.cluster.local share: / -reclaimPolicy: Delete -volumeBindingMode: Immediate mountOptions: - - nfsvers=4.1 +- nfsvers=4.1 +EOF + +kubectl ate --preview update access-policy -c csi-nfs --add-member atespace:ate-demo ``` ### Step 2: Register the CSIDriverConfig @@ -210,5 +216,6 @@ volumes: external: template: capacityBytes: 5368709120 # 5Gi - storageClassName: csi-nfs-sc + externalVolumeClass: + name: csi-nfs ``` diff --git a/docs/guides/slos-and-alerts.md b/docs/guides/slos-and-alerts.md index f5b5a48a59..f35a60581a 100644 --- a/docs/guides/slos-and-alerts.md +++ b/docs/guides/slos-and-alerts.md @@ -199,10 +199,9 @@ Substrate introduces the following CRDs: * `CSIDriverConfig`: gives ATE direct access to CSI drivers without using PV/PVCs. Read directly by atelets. -In addition, ATE uses Secrets to project trust bundles into Actors, -`StorageClass` to set up access to storage, and `PodCertificateRequest` to -provision SPIFFE mTLS identities to workers. Finally, the atelet is deployed as -a daemonset on all nodes. +In addition, ATE uses Secrets to project trust bundles into Actors and +`PodCertificateRequest` to provision SPIFFE mTLS identities to workers. +Finally, the atelet is deployed as a daemonset on all nodes. While failure conditions may be displayed on CRD status fields, these are hard to monitor and do not cover all the cases listed above. As a result, the primary diff --git a/docs/guides/upgrade.md b/docs/guides/upgrade.md index b219e7cdb0..c61881540d 100644 --- a/docs/guides/upgrade.md +++ b/docs/guides/upgrade.md @@ -244,7 +244,7 @@ This applies what the steps above do not, such as the ate-system NetworkPolicies - **Stuck:** the command fails. [Roll back step 4](#roll-back-step-4). - **API clients:** if the release changes the bundled PostgreSQL, it restarts once, and API calls fail until it is back. -Then install the new `kubectl ate` with `go install ./cmd/kubectl-ate`. Actor owners can now use API fields and commands new in this release, and you can set WorkerPool, SandboxConfig and CSIDriverConfig fields new in this release. +Then install the new `kubectl ate` with `go install ./cmd/kubectl-ate`. Actor owners can now use API fields and commands new in this release, and you can set WorkerPool, SandboxConfig and CSIDriverConfig fields new in this release. (If you used the preview `ExternalVolumeTemplate.storage_class_name` field in 1.0, recreate those templates with `external_volume_class` pointing to an `ExternalVolumeClass`.) The upgrade is done when step 4 is done and [Where am I?](#where-am-i) shows every component and pool moved, every pool done rolling and none paused. Keep `~/ate-upgrade` while you might still roll back, then delete it. diff --git a/docs/reference/glossary.md b/docs/reference/glossary.md index 0a2f398889..2b937f5f68 100644 --- a/docs/reference/glossary.md +++ b/docs/reference/glossary.md @@ -39,6 +39,14 @@ For how the pieces fit together, see the [Architecture](../concepts/architecture substrate gRPC API (e.g. `kubectl ate create actor-template`) and stored in the control-plane database; they are not Kubernetes objects. +- **ExternalVolumeClass** (ate API resource): a global-scoped, immutable + resource that declares the CSI `driverName`, driver-specific provisioning + `parameters`, and optional `mountOptions` used to provision external CSI + volumes for actors. Like `ActorTemplate`s, `ExternalVolumeClass`es are + managed through the Substrate gRPC API (e.g. `kubectl ate create + external-volume-class`) and stored in the control-plane database rather than + as Kubernetes `StorageClass` objects. + - **WorkerPool** (Kubernetes CRD): declares warm compute capacity, a fleet of pre-started worker pods. It is reconciled into a Kubernetes `Deployment` by the [atecontroller](#components). diff --git a/docs/reference/kubectl-ate.md b/docs/reference/kubectl-ate.md index 6e3e9819ca..3341dfb4ec 100644 --- a/docs/reference/kubectl-ate.md +++ b/docs/reference/kubectl-ate.md @@ -4,7 +4,7 @@ linkTitle: "CLI Reference" weight: 3 card_icon: "fa-solid fa-terminal" description: > - Manage atespaces, actor templates, actors, snapshots, egress policies, and logs with the kubectl-ate plugin. + Manage atespaces, external volume classes, access policies, actor templates, actors, snapshots, egress policies, and logs with the kubectl-ate plugin. --- # `kubectl-ate` @@ -102,7 +102,7 @@ kubectl ate top workers > **Note:** `get actors` requires either `--atespace ` / `-a ` (one atespace) or `-A`/`--all-atespaces` (all atespaces) — there is no default atespace. Getting a single actor always requires `--atespace`/`-a`, since an actor is addressed by `(atespace, name)`. `-a` (lower-case) scopes to one atespace; `-A` (upper-case) spans all. -> **Note:** Actors, workers, and actor templates are not Kubernetes CRDs — they live in the Substrate control plane's PostgreSQL database, not `etcd`. `kubectl get actor`, `kubectl get worker`, and `kubectl get actortemplate` will not return anything; only `kubectl ate get …` queries the control plane (see [Actor Templates](#actor-templates)). `kubectl get workerpool` *does* work, because pools are CRDs. +> **Note:** Actors, workers, actor templates, and external volume classes are not Kubernetes CRDs — they live in the Substrate control plane's PostgreSQL database, not `etcd`. `kubectl get actor`, `kubectl get worker`, `kubectl get actortemplate`, and `kubectl get externalvolumeclass` will not return anything; only `kubectl ate get …` queries the control plane (see [Actor Templates](#actor-templates) and [External Volume Classes](#external-volume-classes)). `kubectl get workerpool` *does* work, because pools are CRDs. #### `kubectl ate get actor` output columns @@ -157,6 +157,81 @@ kubectl ate delete atespace | `NAME` | The atespace name. Globally unique — atespaces are global-scoped. | | `AGE` | Time elapsed since the atespace was created. | +### External Volume Classes + +An **external volume class** (`ExternalVolumeClass`) is a global-scoped resource that names the CSI driver (`driverName`) and driver-specific `parameters` used to provision external volumes for actors. External volume classes are immutable. To change one, delete and recreate it. Creating an external volume class requires the `ExternalVolumes` preview gate on the server and `--preview` on the CLI. + +Example `volume-class.yaml`: + +```yaml +metadata: + name: csi-nfs +driverName: nfs.csi.k8s.io +parameters: + server: nfs-server.default.svc.cluster.local + share: / +mountOptions: +- nfsvers=4.1 +``` + +```bash +# Create an external volume class from a manifest (protojson-shaped +# ateapi.ExternalVolumeClass, a single YAML/JSON document; use -f - for stdin). +kubectl ate create external-volume-class -f volume-class.yaml --preview + +# List all external volume classes, or get one (also: -o yaml prints the re-applyable manifest). +kubectl ate get external-volume-classes +kubectl ate get external-volume-class -o yaml + +# Delete an external volume class (optionally guarded by --uid and/or --version). +kubectl ate delete external-volume-class +kubectl ate delete external-volume-class --uid --version +``` + +#### `kubectl ate get external-volume-class` output columns + +| Column | Meaning | +|---|---| +| `NAME` | The external volume class name. Globally unique; external volume classes are global-scoped. | +| `DRIVER` | The CSI driver name (`driverName`) that provisions volumes of this class. | +| `PARAMETERS` | Comma-separated `key=value` driver parameters sorted by key, cut to 40 characters with `...`; `-o yaml` shows them all. `-` when the class defines no parameters. | +| `AGE` | Time elapsed since the external volume class was created. | + +### Access Policies + +An **access policy** (`AccessPolicy`) binds role grants on one of three scopes: the deployment-wide `--global` singleton (`owner`, `viewer`), an atespace via `-a`/`--atespace` (`owner`, `editor`, `viewer`), or an external volume class via `-c`/`--external-volume-class` (`allowed_atespace`). Global and atespace policies take `"user:"` members; external volume class policies take `"atespace:"` members. Creating or updating an external volume class access policy requires `--preview`. + +```bash +# Get the access policy for global, an atespace, or an external volume class. +kubectl ate get access-policy --global +kubectl ate get access-policy -a +kubectl ate get access-policy -c -o yaml + +# Create or replace an access policy from a YAML/JSON manifest (use -f - for stdin). +kubectl ate create access-policy -a -f policy.yaml +kubectl ate update access-policy -a -f policy.yaml + +# Grant or revoke atespace access on an external volume class in place +# (creates the policy if none exists, and retries on version conflicts). +kubectl ate update access-policy -c --add-member atespace: --preview +kubectl ate update access-policy -c --remove-member atespace: --preview + +# Add or remove a principal on an atespace or global policy in place. +kubectl ate update access-policy -a --role editor --add-member user: + +# Delete the access policy of an atespace or external volume class. +kubectl ate delete access-policy -a +kubectl ate delete access-policy -c [--uid ] [--version ] +``` + +#### `kubectl ate get access-policy` output columns + +| Column | Meaning | +|---|---| +| `SCOPE` | ``, the atespace name, or the external volume class name. | +| `ROLE` | Role granted by the binding (`owner`, `editor`, `viewer`, or `allowed_atespace`), or `` when the policy has no bindings. | +| `MEMBERS` | Comma-separated member identifiers bound to that role. | + ### Actor Templates An **actor template** describes what an actor runs: containers, volumes, diff --git a/docs/reference/resource-model.md b/docs/reference/resource-model.md index 05fa1136ef..23d0b412f1 100644 --- a/docs/reference/resource-model.md +++ b/docs/reference/resource-model.md @@ -45,6 +45,8 @@ Global │ ├── Actor │ │ └── EgressPolicy "default" subresource (singleton) │ └── Tag +├── ExternalVolumeClass +│ └── AccessPolicy "default" subresource (singleton) └── Worker └── ActorAssignment subresource (one per hosted Actor, managed by Substrate) ``` @@ -57,6 +59,7 @@ Global | `ActorTemplate` | Atespace | 0..N | Clients | | `Actor` | Atespace | 0..N | Clients | | `Tag` | Atespace | 0..N | Clients | +| `ExternalVolumeClass` | Global | 0..N | Clients | | `Worker` | Global | 0..N | Substrate | ## Subresources @@ -66,6 +69,7 @@ Global | `EgressPolicy` | `Actor` | 0..1, named `default` | Clients | | `AccessPolicy` | Global | 0..1, named `default` | Clients | | `AccessPolicy` | `Atespace` | 0..1, named `default` | Clients | +| `AccessPolicy` | `ExternalVolumeClass` | 0..1, named `default` | Clients | | `ActorAssignment` | `Worker` | 0..N | Substrate | ## Kubernetes resources @@ -99,9 +103,12 @@ classDiagram class Tag class Worker class ActorAssignment + class ExternalVolumeClass + class ExternalVolumeClassAccessPolicy } Atespace "1" *-- "0..1" AtespaceAccessPolicy + ExternalVolumeClass "1" *-- "0..1" ExternalVolumeClassAccessPolicy Atespace "1" o-- "*" ActorTemplate Atespace "1" o-- "*" Actor Atespace "1" o-- "*" Tag diff --git a/hack/csi/external-volume-class-hostpath.yaml b/hack/csi/external-volume-class-hostpath.yaml new file mode 100644 index 0000000000..16f4eab497 --- /dev/null +++ b/hack/csi/external-volume-class-hostpath.yaml @@ -0,0 +1,18 @@ +# Copyright 2026 The Agent Substrate Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Canonical ExternalVolumeClass backed by the Kind hostpath CSI driver. +metadata: + name: csi-hostpath +driverName: hostpath.csi.k8s.io diff --git a/hack/csi/external-volume-class-nfs.yaml b/hack/csi/external-volume-class-nfs.yaml new file mode 100644 index 0000000000..07d3e46372 --- /dev/null +++ b/hack/csi/external-volume-class-nfs.yaml @@ -0,0 +1,23 @@ +# Copyright 2026 The Agent Substrate Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Canonical ExternalVolumeClass backed by the dev NFS server and csi-driver-nfs. +metadata: + name: csi-nfs +driverName: nfs.csi.k8s.io +parameters: + server: nfs-server.default.svc.cluster.local + share: / +mountOptions: + - nfsvers=4.1 diff --git a/hack/csi/nfs-server.yaml b/hack/csi/nfs-server.yaml index b894dbbe13..e09edd8c5d 100644 --- a/hack/csi/nfs-server.yaml +++ b/hack/csi/nfs-server.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# The NFS server backing the csi-nfs-sc StorageClass on Kind. Development only. +# The NFS server backing the csi-nfs ExternalVolumeClass on Kind. Development only. --- kind: Service apiVersion: v1 diff --git a/hack/run-e2e.sh b/hack/run-e2e.sh index 4167ccb4fa..b3809ad888 100755 --- a/hack/run-e2e.sh +++ b/hack/run-e2e.sh @@ -49,7 +49,7 @@ Common E2E Flags (passed after -args): --no-color Disable colored output --kube-config Path to kubeconfig file --kube-context Kubernetes context to use - --storage-class StorageClass to use for external volume tests (default: csi-nfs-sc) + --external-volume-class ExternalVolumeClass to use for external volume tests (default: csi-nfs) --preview Preview gates the cluster was installed with ("ALL" for all) Common Go Test Flags (passed before -args): diff --git a/hack/setup-csi-nfs-kind.sh b/hack/setup-csi-nfs-kind.sh index f6091d8656..0eb24151db 100755 --- a/hack/setup-csi-nfs-kind.sh +++ b/hack/setup-csi-nfs-kind.sh @@ -224,19 +224,13 @@ spec: path: trust-bundle.pem ' -# 6. Create NFS StorageClass (pointing to the in-cluster NFS server) -# We wait for the NFS server service to get an IP first, but we can use its DNS name -# since kube-dns should resolve it. The CSI driver will resolve it when provisioning. -echo "Creating csi-nfs-sc StorageClass..." -kubectl apply -f "${ROOT}/hack/third_party/csi-driver-nfs/deploy/example/storageclass-nfs.yaml" - -# 7. Wait for deployments to be ready +# 6. Wait for deployments to be ready echo "Waiting for NFS server and CSI driver to be ready..." kubectl rollout status deployment/nfs-server -n default --timeout=120s kubectl rollout status deployment/csi-nfs-controller -n kube-system --timeout=120s kubectl rollout status daemonset/csi-nfs-node -n kube-system --timeout=120s -# 8. Create the CSIDriverConfig for Substrate +# 7. Create the CSIDriverConfig for Substrate echo "Creating nfs.csi.k8s.io CSIDriverConfig..." cat </dev/null 2>&1; then + kubectl rollout status deployment/ate-api-server -n "${ATE_NAMESPACE}" --timeout=120s + echo "Registering csi-nfs ExternalVolumeClass..." + if create_out="$(go -C "${ROOT}" run ./cmd/kubectl-ate --preview create external-volume-class -f "${ROOT}/hack/csi/external-volume-class-nfs.yaml" 2>&1)"; then + printf '%s\n' "${create_out}" + elif [[ "${create_out}" == *"AlreadyExists"* ]]; then + # Keep an existing csi-nfs for idempotence without duplicating manifest fields here; + # ate-setup setup csi compares specs via proto unmarshaling. + echo "ExternalVolumeClass csi-nfs already exists; keeping it." + else + printf '%s\n' "${create_out}" >&2 + exit 1 + fi + else + echo "ate-api-server not found; skipping csi-nfs ExternalVolumeClass registration." + fi + ;; + *) + echo "Skipping csi-nfs ExternalVolumeClass registration: ExternalVolumes preview gate is disabled (set ATE_PREVIEW=ExternalVolumes)." + ;; +esac + # 9. Restart atelet to ensure it reconnects to the new CSI socket. echo "Restarting atelet DaemonSet (if present)..." kubectl rollout restart daemonset/atelet -n "${ATE_NAMESPACE}" >/dev/null 2>&1 || true diff --git a/hack/third_party/csi-driver-host-path/examples/csi-storageclass.yaml b/hack/third_party/csi-driver-host-path/examples/csi-storageclass.yaml deleted file mode 100644 index d53fcd0e8d..0000000000 --- a/hack/third_party/csi-driver-host-path/examples/csi-storageclass.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: csi-hostpath-sc -provisioner: hostpath.csi.k8s.io -reclaimPolicy: Delete -volumeBindingMode: Immediate -allowVolumeExpansion: true diff --git a/hack/third_party/csi-driver-nfs/deploy/example/storageclass-nfs.yaml b/hack/third_party/csi-driver-nfs/deploy/example/storageclass-nfs.yaml deleted file mode 100644 index 8d4a456ce6..0000000000 --- a/hack/third_party/csi-driver-nfs/deploy/example/storageclass-nfs.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# The csi-nfs-sc StorageClass, backed by the dev NFS server in -# hack/csi/nfs-server.yaml. `ate-setup setup csi nfs` and -# hack/setup-csi-nfs-kind.sh both apply this file, so the -# e2e tests, demos and benchmarks all provision from the same class. -# -# Based on deploy/example/storageclass-nfs.yaml from -# kubernetes-csi/csi-driver-nfs, renamed csi-nfs-sc. The share is "/" because -# nfs-server.yaml exports a single directory with fsid=0, which NFSv4 presents -# as the pseudo-root. -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: csi-nfs-sc -provisioner: nfs.csi.k8s.io -parameters: - server: nfs-server.default.svc.cluster.local - share: / -reclaimPolicy: Delete -volumeBindingMode: Immediate -mountOptions: - - nfsvers=4.1 diff --git a/internal/e2e/external_volume_class.go b/internal/e2e/external_volume_class.go new file mode 100644 index 0000000000..2d03c070f9 --- /dev/null +++ b/internal/e2e/external_volume_class.go @@ -0,0 +1,208 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package e2e + +import ( + "context" + "fmt" + "slices" + "testing" + "time" + + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "google.golang.org/protobuf/proto" + + "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/internal/resources" +) + +const ( + externalVolumeClassAllowedRole = "allowed_atespace" + maxPolicyGrantAttempts = 5 +) + +type externalVolumeClassAccessPolicyClient interface { + GetExternalVolumeClassAccessPolicy(ctx context.Context, in *ateapi.GetExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) + CreateExternalVolumeClassAccessPolicy(ctx context.Context, in *ateapi.CreateExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) + UpdateExternalVolumeClassAccessPolicy(ctx context.Context, in *ateapi.UpdateExternalVolumeClassAccessPolicyRequest, opts ...grpc.CallOption) (*ateapi.AccessPolicy, error) +} + +// EnsureExternalVolumeClassAtespaceAccess grants atespace permission to +// reference className via its ExternalVolumeClassAccessPolicy. It does not +// revoke the grant on cleanup, making it safe for suite-shared atespaces used +// by parallel tests. +func EnsureExternalVolumeClassAtespaceAccess(ctx context.Context, t *testing.T, clients *Clients, className, atespace string) { + t.Helper() + if _, err := allowAtespaceOnExternalVolumeClass(ctx, clients.SubstrateAPI, className, atespace); err != nil { + t.Fatalf("granting atespace %q access to ExternalVolumeClass %q: %v", atespace, className, err) + } +} + +// AllowAtespaceOnExternalVolumeClass grants atespace permission to reference +// className and, if the grant was newly added, registers a t.Cleanup to revoke +// it when t ends. Use this for per-test atespaces. +func AllowAtespaceOnExternalVolumeClass(ctx context.Context, t *testing.T, clients *Clients, className, atespace string) { + t.Helper() + added, err := allowAtespaceOnExternalVolumeClass(ctx, clients.SubstrateAPI, className, atespace) + if err != nil { + t.Fatalf("granting atespace %q access to ExternalVolumeClass %q: %v", atespace, className, err) + } + if !added { + return + } + t.Cleanup(func() { + cleanupCtx, cancel := context.WithTimeout(context.Background(), time.Minute) + defer cancel() + if err := revokeAtespaceOnExternalVolumeClass(cleanupCtx, clients.SubstrateAPI, className, atespace); err != nil { + t.Logf("cleanup: revoking atespace %q access from ExternalVolumeClass %q: %v", atespace, className, err) + } + }) +} + +func allowAtespaceOnExternalVolumeClass(ctx context.Context, client externalVolumeClassAccessPolicyClient, className, atespace string) (bool, error) { + member := "atespace:" + atespace + ref := &ateapi.ObjectRef{Name: className} + + var lastErr error + for range maxPolicyGrantAttempts { + current, err := client.GetExternalVolumeClassAccessPolicy(ctx, &ateapi.GetExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }) + if err != nil { + if status.Code(err) != codes.NotFound { + return false, err + } + _, err = client.CreateExternalVolumeClassAccessPolicy(ctx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: resources.SingletonName}, + Bindings: []*ateapi.Binding{{ + Role: externalVolumeClassAllowedRole, + Members: []string{member}, + }}, + }, + }) + if err == nil { + return true, nil + } + if status.Code(err) == codes.AlreadyExists { + lastErr = err + continue + } + return false, err + } + + updated := proto.CloneOf(current) + if !addPolicyMember(updated, externalVolumeClassAllowedRole, member) { + return false, nil + } + _, err = client.UpdateExternalVolumeClassAccessPolicy(ctx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: updated, + }) + if err == nil { + return true, nil + } + if status.Code(err) == codes.Aborted || status.Code(err) == codes.NotFound { + lastErr = err + continue + } + return false, err + } + return false, fmt.Errorf("exceeded %d attempts updating access policy for external volume class %q: %w", maxPolicyGrantAttempts, className, lastErr) +} + +func revokeAtespaceOnExternalVolumeClass(ctx context.Context, client externalVolumeClassAccessPolicyClient, className, atespace string) error { + member := "atespace:" + atespace + ref := &ateapi.ObjectRef{Name: className} + + var lastErr error + for range maxPolicyGrantAttempts { + current, err := client.GetExternalVolumeClassAccessPolicy(ctx, &ateapi.GetExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + Name: resources.SingletonName, + }) + if err != nil { + if status.Code(err) == codes.NotFound { + return nil + } + return err + } + + updated := proto.CloneOf(current) + if !removePolicyMember(updated, externalVolumeClassAllowedRole, member) { + return nil + } + _, err = client.UpdateExternalVolumeClassAccessPolicy(ctx, &ateapi.UpdateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: ref, + AccessPolicy: updated, + }) + if err == nil || status.Code(err) == codes.NotFound { + return nil + } + if status.Code(err) == codes.Aborted { + lastErr = err + continue + } + return err + } + return fmt.Errorf("exceeded %d attempts revoking access policy member for external volume class %q: %w", maxPolicyGrantAttempts, className, lastErr) +} + +func addPolicyMember(policy *ateapi.AccessPolicy, role, member string) bool { + for _, b := range policy.GetBindings() { + if b.GetRole() != role { + continue + } + if slices.Contains(b.GetMembers(), member) { + return false + } + b.Members = append(b.Members, member) + return true + } + policy.Bindings = append(policy.Bindings, &ateapi.Binding{ + Role: role, + Members: []string{member}, + }) + return true +} + +func removePolicyMember(policy *ateapi.AccessPolicy, role, member string) bool { + removed := false + out := make([]*ateapi.Binding, 0, len(policy.GetBindings())) + for _, b := range policy.GetBindings() { + if b.GetRole() != role { + out = append(out, b) + continue + } + members := make([]string, 0, len(b.GetMembers())) + for _, m := range b.GetMembers() { + if m == member { + removed = true + continue + } + members = append(members, m) + } + if len(members) > 0 { + b.Members = members + out = append(out, b) + } + } + policy.Bindings = out + return removed +} diff --git a/internal/e2e/external_volume_class_test.go b/internal/e2e/external_volume_class_test.go new file mode 100644 index 0000000000..7715a5d69f --- /dev/null +++ b/internal/e2e/external_volume_class_test.go @@ -0,0 +1,148 @@ +// Copyright 2026 The Agent Substrate Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package e2e + +import ( + "context" + "slices" + "testing" + + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "google.golang.org/protobuf/proto" + + "go.ate.dev/substrate/api/ateapi/v1" + "go.ate.dev/substrate/internal/resources" +) + +type fakeEVCAPClient struct { + policy *ateapi.AccessPolicy + createErrOnce error + updateErrOnce error + createCalls int + updateCalls int +} + +func (f *fakeEVCAPClient) GetExternalVolumeClassAccessPolicy(_ context.Context, _ *ateapi.GetExternalVolumeClassAccessPolicyRequest, _ ...grpc.CallOption) (*ateapi.AccessPolicy, error) { + if f.policy == nil { + return nil, status.Error(codes.NotFound, "not found") + } + return proto.CloneOf(f.policy), nil +} + +func (f *fakeEVCAPClient) CreateExternalVolumeClassAccessPolicy(_ context.Context, in *ateapi.CreateExternalVolumeClassAccessPolicyRequest, _ ...grpc.CallOption) (*ateapi.AccessPolicy, error) { + f.createCalls++ + if f.createErrOnce != nil { + err := f.createErrOnce + f.createErrOnce = nil + return nil, err + } + f.policy = proto.CloneOf(in.GetAccessPolicy()) + f.policy.Metadata = &ateapi.ResourceMetadata{Name: resources.SingletonName, Uid: "uid-1", Version: 1} + return proto.CloneOf(f.policy), nil +} + +func (f *fakeEVCAPClient) UpdateExternalVolumeClassAccessPolicy(_ context.Context, in *ateapi.UpdateExternalVolumeClassAccessPolicyRequest, _ ...grpc.CallOption) (*ateapi.AccessPolicy, error) { + f.updateCalls++ + if f.updateErrOnce != nil { + err := f.updateErrOnce + f.updateErrOnce = nil + return nil, err + } + f.policy = proto.CloneOf(in.GetAccessPolicy()) + f.policy.Metadata.Version++ + return proto.CloneOf(f.policy), nil +} + +func TestAllowAndRevokeAtespaceOnExternalVolumeClass(t *testing.T) { + t.Run("creates initial policy when absent", func(t *testing.T) { + c := &fakeEVCAPClient{} + added, err := allowAtespaceOnExternalVolumeClass(context.Background(), c, "csi-nfs", "ate-a") + if err != nil { + t.Fatalf("allow: %v", err) + } + if !added || c.createCalls != 1 { + t.Fatalf("added=%v createCalls=%d, want true, 1", added, c.createCalls) + } + got := c.policy.GetBindings()[0].GetMembers() + if !slices.Equal(got, []string{"atespace:ate-a"}) { + t.Fatalf("members = %v, want [atespace:ate-a]", got) + } + }) + + t.Run("idempotent when already granted", func(t *testing.T) { + c := &fakeEVCAPClient{ + policy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: resources.SingletonName, Uid: "uid-1", Version: 1}, + Bindings: []*ateapi.Binding{{Role: externalVolumeClassAllowedRole, Members: []string{"atespace:ate-a"}}}, + }, + } + added, err := allowAtespaceOnExternalVolumeClass(context.Background(), c, "csi-nfs", "ate-a") + if err != nil { + t.Fatalf("allow: %v", err) + } + if added || c.updateCalls != 0 { + t.Fatalf("added=%v updateCalls=%d, want false, 0", added, c.updateCalls) + } + }) + + t.Run("retries on Aborted and appends member", func(t *testing.T) { + c := &fakeEVCAPClient{ + policy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: resources.SingletonName, Uid: "uid-1", Version: 1}, + Bindings: []*ateapi.Binding{{Role: externalVolumeClassAllowedRole, Members: []string{"atespace:ate-a"}}}, + }, + updateErrOnce: status.Error(codes.Aborted, "version conflict"), + } + added, err := allowAtespaceOnExternalVolumeClass(context.Background(), c, "csi-nfs", "ate-b") + if err != nil { + t.Fatalf("allow: %v", err) + } + if !added || c.updateCalls != 2 { + t.Fatalf("added=%v updateCalls=%d, want true, 2", added, c.updateCalls) + } + got := c.policy.GetBindings()[0].GetMembers() + if !slices.Equal(got, []string{"atespace:ate-a", "atespace:ate-b"}) { + t.Fatalf("members = %v, want [atespace:ate-a atespace:ate-b]", got) + } + }) + + t.Run("revokes member and drops empty binding", func(t *testing.T) { + c := &fakeEVCAPClient{ + policy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: resources.SingletonName, Uid: "uid-1", Version: 1}, + Bindings: []*ateapi.Binding{{Role: externalVolumeClassAllowedRole, Members: []string{"atespace:ate-a"}}}, + }, + updateErrOnce: status.Error(codes.Aborted, "version conflict"), + } + if err := revokeAtespaceOnExternalVolumeClass(context.Background(), c, "csi-nfs", "ate-a"); err != nil { + t.Fatalf("revoke: %v", err) + } + if c.updateCalls != 2 { + t.Fatalf("updateCalls = %d, want 2", c.updateCalls) + } + if len(c.policy.GetBindings()) != 0 { + t.Fatalf("bindings = %v, want empty", c.policy.GetBindings()) + } + }) + + t.Run("revoke is no-op when policy is absent", func(t *testing.T) { + c := &fakeEVCAPClient{} + if err := revokeAtespaceOnExternalVolumeClass(context.Background(), c, "csi-nfs", "ate-a"); err != nil { + t.Fatalf("revoke: %v", err) + } + }) +} diff --git a/internal/e2e/suites/authz/helpers_test.go b/internal/e2e/suites/authz/helpers_test.go index 8876c8f017..bf50c37fa5 100644 --- a/internal/e2e/suites/authz/helpers_test.go +++ b/internal/e2e/suites/authz/helpers_test.go @@ -22,6 +22,7 @@ import ( "testing" "time" + "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" authv1 "k8s.io/api/authentication/v1" @@ -33,6 +34,7 @@ import ( "go.ate.dev/substrate/internal/ateclient" "go.ate.dev/substrate/internal/e2e" "go.ate.dev/substrate/internal/installdefaults" + "go.ate.dev/substrate/internal/preview" "go.ate.dev/substrate/internal/resources" ) @@ -177,7 +179,16 @@ func clientWithToken(t *testing.T, ctx context.Context, token string) *ateclient } connectCtx, cancel := context.WithTimeout(ctx, 30*time.Second) defer cancel() - api, err := ateclient.NewClient(connectCtx, e2e.KubeConfig, e2e.KubeContext, "", tokenFile, false) + // Opt in to preview features when the install enables any, as + // e2e.NewClients does. + var opts []grpc.DialOption + for _, enabled := range preview.AsMap() { + if enabled { + opts = preview.DialOptionsWithOptIn() + break + } + } + api, err := ateclient.NewClient(connectCtx, e2e.KubeConfig, e2e.KubeContext, "", tokenFile, false, opts...) if err != nil { t.Fatalf("ateclient.NewClient: %v", err) } diff --git a/internal/e2e/suites/authz/security_regression_test.go b/internal/e2e/suites/authz/security_regression_test.go index c6f5eea3a5..82f5f64e1f 100644 --- a/internal/e2e/suites/authz/security_regression_test.go +++ b/internal/e2e/suites/authz/security_regression_test.go @@ -16,15 +16,20 @@ package authz import ( "context" + "slices" + "strings" "testing" + "time" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "google.golang.org/protobuf/proto" "go.ate.dev/substrate/api/ateapi/v1" "go.ate.dev/substrate/internal/ateclient" "go.ate.dev/substrate/internal/e2e" "go.ate.dev/substrate/internal/installdefaults" + "go.ate.dev/substrate/internal/preview" "go.ate.dev/substrate/internal/resources" ) @@ -41,6 +46,7 @@ func testSecurityRegression(t *testing.T, ctx context.Context, f *fixture) { t.Run("recreated atespace drops old grants", func(t *testing.T) { testAtespaceRecreated(t, ctx, f) }) t.Run("recreated AccessPolicy rejects stale updates", func(t *testing.T) { testAccessPolicyRecreated(t, ctx, f) }) t.Run("WorkerService accepts only atelet", func(t *testing.T) { testWorkerServiceRequiresAtelet(t, ctx, f) }) + t.Run("external volume class governance is enforced", func(t *testing.T) { testExternalVolumeClassGovernance(t, ctx, f) }) } // testEnforcedByDefault checks that a default install enforces @@ -336,3 +342,146 @@ func testWorkerServiceRequiresAtelet(t *testing.T, ctx context.Context, f *fixtu {"ReportActorSnapshotState", ateletToken, reportSnapshotState, rejected}, }) } + +// testExternalVolumeClassGovernance checks that: +// 1. A non-owner (atespace editor) cannot create/delete an ExternalVolumeClass +// or write its AccessPolicy. +// 2. CreateActorTemplate referencing an ExternalVolumeClass is denied for an +// ungranted atespace, including for the bootstrap global owner, and +// succeeds once the atespace is granted allowed_atespace. +// 3. Deleting and recreating the atespace scrubs its class grant so +// CreateActorTemplate is denied again. +func testExternalVolumeClassGovernance(t *testing.T, ctx context.Context, f *fixture) { + e2e.RequirePreview(t, preview.GateExternalVolumes) + + // Leave room for the "-denied" suffix below within a 63-character name, + // and never end on "-". + className := "authz-evc-" + f.atespace + if len(className) > 56 { + className = className[:56] + } + className = strings.TrimRight(className, "-") + classRef := &ateapi.ObjectRef{Name: className} + targetAtespace := f.atespace + "-evc" + createAtespace(t, ctx, f.clients, targetAtespace) + + editor := newPrincipal(t, ctx, f.clients, f.atespace, "evc-editor") + setAtespacePolicy(t, ctx, f.clients, targetAtespace, binding("editor", editor)) + + // Positive control: bootstrap owner creates the ExternalVolumeClass. + if _, err := f.clients.SubstrateAPI.CreateExternalVolumeClass(ctx, &ateapi.CreateExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: className}, + DriverName: "nfs.csi.k8s.io", + }, + }); err != nil { + t.Fatalf("CreateExternalVolumeClass(%q): %v", className, err) + } + t.Cleanup(func() { + cleanupCtx, cancel := context.WithTimeout(context.Background(), time.Minute) + defer cancel() + if _, err := f.clients.SubstrateAPI.DeleteExternalVolumeClass(cleanupCtx, &ateapi.DeleteExternalVolumeClassRequest{ + ExternalVolumeClass: classRef, + }); err != nil && status.Code(err) != codes.NotFound { + t.Logf("cleanup: DeleteExternalVolumeClass(%q): %v", className, err) + } + }) + + createClass := func(name string) rpc { + return func(ctx context.Context, api *ateclient.Client) error { + _, err := api.CreateExternalVolumeClass(ctx, &ateapi.CreateExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ExternalVolumeClass{ + Metadata: &ateapi.ResourceMetadata{Name: name}, + DriverName: "nfs.csi.k8s.io", + }, + }) + return err + } + } + deleteClass := func(ctx context.Context, api *ateclient.Client) error { + _, err := api.DeleteExternalVolumeClass(ctx, &ateapi.DeleteExternalVolumeClassRequest{ + ExternalVolumeClass: classRef, + }) + return err + } + createClassPolicy := func(ctx context.Context, api *ateclient.Client) error { + _, err := api.CreateExternalVolumeClassAccessPolicy(ctx, &ateapi.CreateExternalVolumeClassAccessPolicyRequest{ + ExternalVolumeClass: classRef, + AccessPolicy: &ateapi.AccessPolicy{ + Metadata: &ateapi.ResourceMetadata{Name: resources.SingletonName}, + Bindings: []*ateapi.Binding{{ + Role: "allowed_atespace", + Members: []string{"atespace:" + targetAtespace}, + }}, + }, + }) + return err + } + + // 1. Atespace editor cannot create/delete classes or write class access policies. + expectAll(t, ctx, []call{ + {"CreateExternalVolumeClass", editor, createClass(className + "-denied"), denied}, + {"DeleteExternalVolumeClass", editor, deleteClass, denied}, + {"CreateExternalVolumeClassAccessPolicy", editor, createClassPolicy, denied}, + }) + + // Build a valid ActorTemplate referencing className by copying the fixture template. + srcTmpl, err := f.clients.SubstrateAPI.GetActorTemplate(ctx, &ateapi.GetActorTemplateRequest{ + ActorTemplate: f.template, + }) + if err != nil { + t.Fatalf("GetActorTemplate(%v): %v", f.template, err) + } + createTemplateWithClass := func(tmplName string) rpc { + return func(ctx context.Context, api *ateclient.Client) error { + tmpl := &ateapi.ActorTemplate{ + Metadata: &ateapi.ResourceMetadata{Atespace: targetAtespace, Name: tmplName}, + WorkerSelector: proto.CloneOf(srcTmpl.GetWorkerSelector()), + Containers: srcTmpl.GetContainers(), + Resources: proto.CloneOf(srcTmpl.GetResources()), + SnapshotConfig: &ateapi.SnapshotConfig{ + StorageLocation: e2e.SnapshotLocation(t, "authz-evc-"+tmplName), + GoldenSnapshotConfig: &ateapi.GoldenSnapshotConfig{Mode: ateapi.GoldenSnapshotMode_GOLDEN_SNAPSHOT_MODE_DISABLED}, + }, + Volumes: append(slices.Clone(srcTmpl.GetVolumes()), &ateapi.Volume{ + Name: "ext-data", + External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ + CapacityBytes: 1 << 30, + ExternalVolumeClass: classRef, + }}, + }), + } + _, err := api.CreateActorTemplate(ctx, &ateapi.CreateActorTemplateRequest{ActorTemplate: tmpl}) + return err + } + } + + // 2. Ungranted atespace is rejected on CreateActorTemplate (even for bootstrap owner). + expectAll(t, ctx, []call{ + {"CreateActorTemplate ungranted (editor)", editor, createTemplateWithClass("evc-denied-ed"), denied}, + {"CreateActorTemplate ungranted (bootstrap)", f.bootstrap, createTemplateWithClass("evc-denied-boot"), denied}, + }) + + // Grant targetAtespace access to className -> editor can now create the template. + e2e.AllowAtespaceOnExternalVolumeClass(ctx, t, f.clients, className, targetAtespace) + expectAll(t, ctx, []call{ + {"CreateActorTemplate granted (editor)", editor, createTemplateWithClass("evc-allowed"), allowed}, + }) + if t.Failed() { + return + } + if _, err := f.clients.SubstrateAPI.DeleteActorTemplate(ctx, &ateapi.DeleteActorTemplateRequest{ + ActorTemplate: &ateapi.ObjectRef{Atespace: targetAtespace, Name: "evc-allowed"}, + }); err != nil && status.Code(err) != codes.NotFound { + t.Fatalf("DeleteActorTemplate(evc-allowed): %v", err) + } + + // 3. Delete and recreate targetAtespace -> grant is scrubbed and CreateActorTemplate is denied again. + if err := deleteAtespace(ctx, f.clients, targetAtespace); err != nil { + t.Fatalf("DeleteAtespace(%q): %v", targetAtespace, err) + } + createAtespace(t, ctx, f.clients, targetAtespace) + expectAll(t, ctx, []call{ + {"CreateActorTemplate after atespace recreate (bootstrap)", f.bootstrap, createTemplateWithClass("evc-after-recreate"), denied}, + }) +} diff --git a/internal/e2e/suites/combinedvolumes/combinedvolumes_test.go b/internal/e2e/suites/combinedvolumes/combinedvolumes_test.go index cf16d686bc..12aaf82301 100644 --- a/internal/e2e/suites/combinedvolumes/combinedvolumes_test.go +++ b/internal/e2e/suites/combinedvolumes/combinedvolumes_test.go @@ -41,7 +41,8 @@ import ( "go.ate.dev/substrate/internal/e2e" "go.ate.dev/substrate/internal/preview" "go.ate.dev/substrate/internal/resources" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) const ( @@ -155,31 +156,36 @@ func buildFixtureImage(t *testing.T, repo string) string { return fmt.Sprintf("%s@%s", tag.Context().Name(), digest) } -// storageClassOrEmpty returns the configured StorageClass if external volumes -// are enabled and the cluster has the class, and "" if not. External volumes -// are a preview feature and the CSI driver is optional, so either missing -// drops the external volume from the template instead of failing every test -// in the suite. -func storageClassOrEmpty(ctx context.Context, t *testing.T, clients *e2e.Clients) string { +// externalVolumeClassOrEmpty returns the configured ExternalVolumeClass if +// external volumes are enabled and the class is registered, and "" if not. +// External volumes are a preview feature and the CSI driver is optional, so +// either missing drops the external volume from the template instead of +// failing every test in the suite. +func externalVolumeClassOrEmpty(ctx context.Context, t *testing.T, clients *e2e.Clients) string { t.Helper() if !preview.IsEnabled(preview.GateExternalVolumes) { t.Logf("preview gate %q is not enabled; the external-volume cases will be skipped", preview.GateExternalVolumes) return "" } - if _, err := clients.K8s.StorageV1().StorageClasses().Get(ctx, e2e.StorageClass, metav1.GetOptions{}); err != nil { - t.Logf("StorageClass %q not found (%v); the external-volume case will be skipped", e2e.StorageClass, err) - return "" + if _, err := clients.SubstrateAPI.GetExternalVolumeClass(ctx, &ateapi.GetExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: e2e.ExternalVolumeClass}, + }); err != nil { + if status.Code(err) == codes.NotFound { + t.Logf("ExternalVolumeClass %q not found; the external-volume case will be skipped", e2e.ExternalVolumeClass) + return "" + } + t.Fatalf("GetExternalVolumeClass(%q): %v", e2e.ExternalVolumeClass, err) } - return e2e.StorageClass + return e2e.ExternalVolumeClass } // createTemplate builds a probe ActorTemplate with the fixture attached as an // image volume, copying the resolved runtime from the shared probe template. // The template's name is suffixed per test run: it lives in the suite's // shared atespace, which outlives the per-test k8s namespace. A non-empty -// storageClass adds the external volume. -func createTemplate(ctx context.Context, t *testing.T, clients *e2e.Clients, ns *e2e.Namespace, fixtureImage, storageClass string) *ateapi.ActorTemplate { +// externalVolumeClass adds the external volume. +func createTemplate(ctx context.Context, t *testing.T, clients *e2e.Clients, ns *e2e.Namespace, fixtureImage, externalVolumeClass string) *ateapi.ActorTemplate { t.Helper() // The probe supplies this suite's container image and resolved runtime. @@ -221,7 +227,7 @@ func createTemplate(ctx context.Context, t *testing.T, clients *e2e.Clients, ns Name: "scratch", DurableDir: &ateapi.DurableDirVolumeSource{}, }) - if storageClass == "" { + if externalVolumeClass == "" { return } tmpl.Containers[0].VolumeMounts = append(tmpl.Containers[0].VolumeMounts, @@ -230,8 +236,8 @@ func createTemplate(ctx context.Context, t *testing.T, clients *e2e.Clients, ns tmpl.Volumes = append(tmpl.Volumes, &ateapi.Volume{ Name: extVolume, External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - CapacityBytes: extCapacity, - StorageClassName: storageClass, + CapacityBytes: extCapacity, + ExternalVolumeClass: &ateapi.ObjectRef{Name: externalVolumeClass}, }}, }) }, @@ -358,8 +364,8 @@ func TestCombinedVolumes(t *testing.T) { fixtureImage := buildFixtureImage(t, repo) t.Logf("fixture image: %s", fixtureImage) - storageClass := storageClassOrEmpty(ctx, t, clients) - tmpl := createTemplate(ctx, t, clients, ns, fixtureImage, storageClass) + externalVolumeClass := externalVolumeClassOrEmpty(ctx, t, clients) + tmpl := createTemplate(ctx, t, clients, ns, fixtureImage, externalVolumeClass) actorRef := resources.ActorRef{Atespace: atespace, Name: "cv-" + ns.Name} if _, err := clients.SubstrateAPI.CreateActor(ctx, &ateapi.CreateActorRequest{ @@ -392,8 +398,8 @@ func TestCombinedVolumes(t *testing.T) { requireExternalVolume := func(t *testing.T) { t.Helper() e2e.RequirePreview(t, preview.GateExternalVolumes) - if storageClass == "" { - t.Skipf("StorageClass %q is not installed", e2e.StorageClass) + if externalVolumeClass == "" { + t.Skipf("ExternalVolumeClass %q is not registered", e2e.ExternalVolumeClass) } } @@ -461,7 +467,7 @@ func TestCombinedVolumes(t *testing.T) { // Written after the suspend above, so it is in no snapshot the revert // can return the actor to. requireWrite(ctx, t, router, actorRef, scratchPathA+"/"+postSnapshotName) - if storageClass != "" { + if externalVolumeClass != "" { requireWrite(ctx, t, router, actorRef, extPathA+"/"+postSnapshotName) } diff --git a/internal/e2e/suites/demo/demo_test.go b/internal/e2e/suites/demo/demo_test.go index ea9016483c..f0a55ad8b9 100644 --- a/internal/e2e/suites/demo/demo_test.go +++ b/internal/e2e/suites/demo/demo_test.go @@ -1664,9 +1664,14 @@ func createActorTemplate(ctx context.Context, t *testing.T, clients *e2e.Clients } func createActorTemplateWithExternalVolume(ctx context.Context, t *testing.T, clients *e2e.Clients, nsObj *e2e.Namespace, fidelity ateapi.SnapshotFidelity) (*ateapi.ActorTemplate, error) { - scName := e2e.StorageClass - if !hasStorageClass(ctx, clients, scName) { - t.Fatalf("StorageClass %q not found in cluster; provide a valid --storage-class or install the CSI driver via --setup-csi", scName) + className := e2e.ExternalVolumeClass + if _, err := clients.SubstrateAPI.GetExternalVolumeClass(ctx, &ateapi.GetExternalVolumeClassRequest{ + ExternalVolumeClass: &ateapi.ObjectRef{Name: className}, + }); err != nil { + if status.Code(err) == codes.NotFound { + t.Fatalf("ExternalVolumeClass %q not found; provide a valid --external-volume-class or install the CSI driver via --setup-csi", className) + } + t.Fatalf("GetExternalVolumeClass(%q): %v", className, err) } modify := func(at *ateapi.ActorTemplate) { @@ -1702,8 +1707,8 @@ func createActorTemplateWithExternalVolume(ctx context.Context, t *testing.T, cl at.Volumes = append(at.Volumes, &ateapi.Volume{ Name: "external-data", External: &ateapi.ExternalVolumeSource{Template: &ateapi.ExternalVolumeTemplate{ - CapacityBytes: 1 << 30, - StorageClassName: scName, + CapacityBytes: 1 << 30, + ExternalVolumeClass: &ateapi.ObjectRef{Name: className}, }}, }) } @@ -1742,11 +1747,6 @@ func createActorTemplateWithTwoDurableDirs(ctx context.Context, t *testing.T, cl return createActorTemplateInternal(ctx, t, clients, nsObj, "counter-two-durabledirs", fidelity, modify) } -func hasStorageClass(ctx context.Context, clients *e2e.Clients, name string) bool { - _, err := clients.K8s.StorageV1().StorageClasses().Get(ctx, name, metav1.GetOptions{}) - return err == nil -} - func waitForActorState(ctx context.Context, t *testing.T, clients *e2e.Clients, actorName string, expectedState ateapi.ActorState) { waitForActorStateWithTimeout(ctx, t, clients, actorName, expectedState, 60*time.Second) } diff --git a/internal/e2e/template.go b/internal/e2e/template.go index a76053791f..ba4965cf4b 100644 --- a/internal/e2e/template.go +++ b/internal/e2e/template.go @@ -134,6 +134,11 @@ func CreateSubstrateTemplateFrom(ctx context.Context, t *testing.T, clients *Cli if opts.Modify != nil { opts.Modify(tmpl) } + for _, v := range tmpl.GetVolumes() { + if className := v.GetExternal().GetTemplate().GetExternalVolumeClass().GetName(); className != "" { + EnsureExternalVolumeClassAtespaceAccess(ctx, t, clients, className, opts.Atespace) + } + } created, err := clients.SubstrateAPI.CreateActorTemplate(ctx, &ateapi.CreateActorTemplateRequest{ActorTemplate: tmpl}) if err != nil { t.Fatalf("failed to create ActorTemplate %s/%s: %v", opts.Atespace, opts.Name, err) diff --git a/internal/e2e/testmain.go b/internal/e2e/testmain.go index 4d3bb355ec..30b04ebd7b 100644 --- a/internal/e2e/testmain.go +++ b/internal/e2e/testmain.go @@ -26,10 +26,10 @@ import ( ) var ( - RunE2E bool - KubeConfig string - KubeContext string - StorageClass string + RunE2E bool + KubeConfig string + KubeContext string + ExternalVolumeClass string ) var ( @@ -59,7 +59,7 @@ func bindFlags() { pflag.BoolVar(&NoColor, "no-color", false, "disable colors in output") pflag.StringVar(&KubeConfig, "kube-config", "", "Location of the kubeconfig") pflag.StringVar(&KubeContext, "kube-context", "", "Kubernetes context to use") - pflag.StringVar(&StorageClass, "storage-class", "csi-nfs-sc", "StorageClass to use for external volume tests") + pflag.StringVar(&ExternalVolumeClass, "external-volume-class", "csi-nfs", "ExternalVolumeClass to use for external volume tests") pflag.StringVar(&previewFlag, "preview", "", `Preview gates the install under test enabled, as in ATE_PREVIEW ("ALL" for all, "" for none); required in CI`) } diff --git a/internal/proto/ateletpb/atelet.pb.go b/internal/proto/ateletpb/atelet.pb.go index 1a88aec7f5..49eb4a445e 100644 --- a/internal/proto/ateletpb/atelet.pb.go +++ b/internal/proto/ateletpb/atelet.pb.go @@ -2352,8 +2352,17 @@ type ExternalVolumeSource struct { // +k8s:optional // +k8s:customValidation # at most 40 KiB in total, ten times the CSI limit for map fields PublishContext map[string]string `protobuf:"bytes,4,rep,name=publish_context,json=publishContext,proto3" json:"publish_context,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + // mount_options from the volume's class, passed to the CSI driver as + // VolumeCapability.Mount.MountFlags at mount time. + // + // +k8s:optional + // +k8s:maxItems=32 + // +k8s:listType=atomic + // +k8s:eachVal=+k8s:minLength=1 + // +k8s:eachVal=+k8s:maxLength=256 + MountOptions []string `protobuf:"bytes,5,rep,name=mount_options,json=mountOptions,proto3" json:"mount_options,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ExternalVolumeSource) Reset() { @@ -2414,6 +2423,13 @@ func (x *ExternalVolumeSource) GetPublishContext() map[string]string { return nil } +func (x *ExternalVolumeSource) GetMountOptions() []string { + if x != nil { + return x.MountOptions + } + return nil +} + type ImageVolumeSource struct { state protoimpl.MessageState `protogen:"open.v1"` // reference is the OCI image reference, pinned by digest. @@ -4543,13 +4559,14 @@ const file_internal_proto_ateletpb_atelet_proto_rawDesc = "" + "containers\x18\x01 \x03(\v2\x11.atelet.ContainerR\n" + "containers\x12(\n" + "\avolumes\x18\x02 \x03(\v2\x0e.atelet.VolumeR\avolumes\"\x18\n" + - "\x16DurableDirVolumeSource\"\x9b\x03\n" + + "\x16DurableDirVolumeSource\"\xc0\x03\n" + "\x14ExternalVolumeSource\x12*\n" + "\x11storage_volume_id\x18\x01 \x01(\tR\x0fstorageVolumeId\x12\x1f\n" + "\vvolume_type\x18\x02 \x01(\tR\n" + "volumeType\x12V\n" + "\x0evolume_context\x18\x03 \x03(\v2/.atelet.ExternalVolumeSource.VolumeContextEntryR\rvolumeContext\x12Y\n" + - "\x0fpublish_context\x18\x04 \x03(\v20.atelet.ExternalVolumeSource.PublishContextEntryR\x0epublishContext\x1a@\n" + + "\x0fpublish_context\x18\x04 \x03(\v20.atelet.ExternalVolumeSource.PublishContextEntryR\x0epublishContext\x12#\n" + + "\rmount_options\x18\x05 \x03(\tR\fmountOptions\x1a@\n" + "\x12VolumeContextEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\x1aA\n" + diff --git a/internal/proto/ateletpb/atelet.proto b/internal/proto/ateletpb/atelet.proto index 536604385e..5ceb8f5e3a 100644 --- a/internal/proto/ateletpb/atelet.proto +++ b/internal/proto/ateletpb/atelet.proto @@ -660,6 +660,16 @@ message ExternalVolumeSource { // +k8s:optional // +k8s:customValidation # at most 40 KiB in total, ten times the CSI limit for map fields map publish_context = 4; + + // mount_options from the volume's class, passed to the CSI driver as + // VolumeCapability.Mount.MountFlags at mount time. + // + // +k8s:optional + // +k8s:maxItems=32 + // +k8s:listType=atomic + // +k8s:eachVal=+k8s:minLength=1 + // +k8s:eachVal=+k8s:maxLength=256 + repeated string mount_options = 5; } message ImageVolumeSource { diff --git a/internal/volume/csi/plugin.go b/internal/volume/csi/plugin.go index 39a17207fb..9abf9f2546 100644 --- a/internal/volume/csi/plugin.go +++ b/internal/volume/csi/plugin.go @@ -263,11 +263,14 @@ func (p *Plugin) MountVolume(ctx context.Context, req volume.MountVolumeRequest) return err } + publishCap := getStandardCapabilities()[0] + publishCap.GetMount().MountFlags = req.MountOptions + csiReq := &csi.NodePublishVolumeRequest{ VolumeId: req.VolumeID, StagingTargetPath: stagingPath, TargetPath: req.TargetPath, - VolumeCapability: getStandardCapabilities()[0], + VolumeCapability: publishCap, Readonly: false, VolumeContext: req.VolumeContext, PublishContext: req.PublishContext, @@ -291,10 +294,13 @@ func (p *Plugin) stageVolume(ctx context.Context, req volume.MountVolumeRequest) return "", fmt.Errorf("failed to create staging directory %q: %w", stagingPath, err) } + stageCap := getStandardCapabilities()[0] + stageCap.GetMount().MountFlags = req.MountOptions + csiReq := &csi.NodeStageVolumeRequest{ VolumeId: req.VolumeID, StagingTargetPath: stagingPath, - VolumeCapability: getStandardCapabilities()[0], // Use primary capability + VolumeCapability: stageCap, VolumeContext: req.VolumeContext, PublishContext: req.PublishContext, } diff --git a/internal/volume/csi/plugin_test.go b/internal/volume/csi/plugin_test.go index 9e9ad33916..4e38ba1206 100644 --- a/internal/volume/csi/plugin_test.go +++ b/internal/volume/csi/plugin_test.go @@ -389,6 +389,17 @@ func TestPlugin_MountVolume(t *testing.T) { ctx := context.Background() plugin.InitNodeCapabilities(ctx) + + var gotStageFlags, gotPublishFlags []string + driver.nodeStageVolumeFunc = func(ctx context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) { + gotStageFlags = req.GetVolumeCapability().GetMount().GetMountFlags() + return &csi.NodeStageVolumeResponse{}, nil + } + driver.nodePublishVolumeFunc = func(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) { + gotPublishFlags = req.GetVolumeCapability().GetMount().GetMountFlags() + return &csi.NodePublishVolumeResponse{}, nil + } + err = plugin.MountVolume(ctx, volume.MountVolumeRequest{ VolumeID: "test-vol", TargetPath: targetPath, @@ -397,6 +408,28 @@ func TestPlugin_MountVolume(t *testing.T) { if err != nil { t.Fatalf("MountVolume failed: %v", err) } + if len(gotStageFlags) != 0 { + t.Errorf("NodeStageVolume MountFlags = %v, want empty", gotStageFlags) + } + if len(gotPublishFlags) != 0 { + t.Errorf("NodePublishVolume MountFlags = %v, want empty", gotPublishFlags) + } + + wantMountOptions := []string{"nfsvers=4.1", "noatime"} + err = plugin.MountVolume(ctx, volume.MountVolumeRequest{ + VolumeID: "test-vol", + TargetPath: targetPath, + MountOptions: wantMountOptions, + }) + if err != nil { + t.Fatalf("MountVolume with MountOptions failed: %v", err) + } + if diff := cmp.Diff(wantMountOptions, gotStageFlags); diff != "" { + t.Errorf("NodeStageVolume MountFlags mismatch (-want +got):\n%s", diff) + } + if diff := cmp.Diff(wantMountOptions, gotPublishFlags); diff != "" { + t.Errorf("NodePublishVolume MountFlags mismatch (-want +got):\n%s", diff) + } // Verify staging directory was created stagingPath := filepath.Join(plugin.stagingDirPrefix, "test-vol") diff --git a/internal/volume/plugin.go b/internal/volume/plugin.go index a3f9ca3aa9..f5d980c7ed 100644 --- a/internal/volume/plugin.go +++ b/internal/volume/plugin.go @@ -24,7 +24,7 @@ type CreateVolumeRequest struct { Name string // CapacityBytes is the requested size in bytes. CapacityBytes int64 - // Parameters are the driver-specific parameters from the StorageClass. + // Parameters are the driver-specific parameters from the volume's class. Parameters map[string]string } @@ -65,6 +65,9 @@ type MountVolumeRequest struct { // PublishContext is the metadata returned when the volume was attached to // this node. It is empty for drivers that do not implement attachment. PublishContext map[string]string + // MountOptions are passed to the CSI driver as MountFlags in the + // VolumeCapability. + MountOptions []string } // VolumePluginControlPlane abstracts storage operations performed on the control plane. diff --git a/manifests/ate-install/ate-api-server.yaml b/manifests/ate-install/ate-api-server.yaml index 2d55f435d4..60dfe3b36b 100644 --- a/manifests/ate-install/ate-api-server.yaml +++ b/manifests/ate-install/ate-api-server.yaml @@ -30,6 +30,8 @@ rules: - apiGroups: ["ate.dev"] resources: ["workerpools", "csidriverconfigs"] verbs: ["get", "watch", "list"] +# TODO(v1.2): Remove after v1.1; kept so v1.0 ate-api-server pods retain RBAC +# for scInformerFactory.WaitForCacheSync while Deployment/ate-api-server rolls. - apiGroups: ["storage.k8s.io"] resources: ["storageclasses"] verbs: ["get", "watch", "list"] diff --git a/tools/apitool/internal/docsite/docsite.go b/tools/apitool/internal/docsite/docsite.go index b585649bca..842cfd4b08 100644 --- a/tools/apitool/internal/docsite/docsite.go +++ b/tools/apitool/internal/docsite/docsite.go @@ -219,7 +219,7 @@ func (b viewBuilder) resourceView(page resourcePage) resourceView { ParentAnchor: b.anchors.parentAnchor(page), Subresources: subresourceLinks(b.pages, page), Attrs: b.attrTree(page.Message.Fields), - Example: trimLicenseHeader(b.examples[page.Message.Name]), + Example: b.exampleFor(page), } for _, m := range page.Methods { rv.Methods = append(rv.Methods, b.methodView(page, m)) @@ -227,6 +227,15 @@ func (b viewBuilder) resourceView(page resourcePage) resourceView { return rv } +func (b viewBuilder) exampleFor(page resourcePage) string { + if page.Parent != "" { + if ex, ok := b.examples[page.Parent+"."+page.Message.Name]; ok { + return trimLicenseHeader(ex) + } + } + return trimLicenseHeader(b.examples[page.Message.Name]) +} + // trimLicenseHeader drops the comment lines that start example, its license // header. func trimLicenseHeader(example string) string { diff --git a/tools/apitool/internal/docsite/docsite_test.go b/tools/apitool/internal/docsite/docsite_test.go index 8764e0a425..1e0216f5bf 100644 --- a/tools/apitool/internal/docsite/docsite_test.go +++ b/tools/apitool/internal/docsite/docsite_test.go @@ -234,6 +234,25 @@ func TestRender_Definitions(t *testing.T) { } } +func TestRender_PerParentExampleOverride(t *testing.T) { + ex := map[string]string{ + "Widget": "# License.\n\nwidget: 1\n", + "Gadget": "gadget: 2\n", + "Widget.Gadget": "# License.\n\ngadget: widget-override\n", + } + out, err := docsite.Render(fixtureAPI(t), ex, fixtureK8sAPI, fixtureK8sExamples) + if err != nil { + t.Fatalf("Render() error = %v", err) + } + html := regexp.MustCompile(`]*)?>`).ReplaceAllString(string(out.Body), "") + if got := strings.Count(html, "
gadget: 2
"); got != 1 { + t.Errorf("default Gadget example rendered %d times, want 1 (Global page only)", got) + } + if got := strings.Count(html, "
gadget: widget-override
"); got != 1 { + t.Errorf("Widget.Gadget override rendered %d times, want 1", got) + } +} + func TestRender_MissingExample(t *testing.T) { out, err := docsite.Render(fixtureAPI(t), map[string]string{"Widget": `{}`}, fixtureK8sAPI, map[string]string{}) if err != nil { @@ -360,7 +379,7 @@ func TestRender_RealAPISmoke(t *testing.T) { if err != nil { t.Fatalf("Render() error = %v", err) } - for _, want := range []string{"substrate.ateapi.v1.Actor", `id="resource-ate.dev.v1.WorkerPool"`} { + for _, want := range []string{"substrate.ateapi.v1.Actor", `id="resource-ate.dev.v1.WorkerPool"`, "atespace:team-b"} { if !strings.Contains(string(out.Body), want) { t.Errorf("output does not mention %s", want) } diff --git a/tools/apitool/internal/docsite/pages.go b/tools/apitool/internal/docsite/pages.go index 4cade7687a..7ab8670b79 100644 --- a/tools/apitool/internal/docsite/pages.go +++ b/tools/apitool/internal/docsite/pages.go @@ -44,10 +44,10 @@ type resourcePage struct { // resourcePages lists one page per resource and parent, in api's message // order: a single page for a top-level resource, and one per parent for a -// subresource. For example, AccessPolicy has a page under Global and one -// under Atespace. It fails wherever model.Resources does, and on a custom -// method of a resource with several parents, since its parent can't be read -// from its name. +// subresource. For example, AccessPolicy has a page under Global, Atespace, +// and ExternalVolumeClass. It fails wherever model.Resources does, and on a +// custom method of a resource with several parents, since its parent can't be +// read from its name. func resourcePages(api *model.API) ([]resourcePage, error) { resources, err := model.Resources(api) if err != nil { diff --git a/tools/apitool/internal/docsite/pages_test.go b/tools/apitool/internal/docsite/pages_test.go index 57992b3e59..1398ad28ea 100644 --- a/tools/apitool/internal/docsite/pages_test.go +++ b/tools/apitool/internal/docsite/pages_test.go @@ -98,25 +98,34 @@ func TestResourcePages(t *testing.T) { []model.Method{ rpc("GetGlobalAccessPolicy", "AccessPolicy", "AccessPolicy"), rpc("GetAtespaceAccessPolicy", "AccessPolicy", "AccessPolicy"), + rpc("GetExternalVolumeClassAccessPolicy", "AccessPolicy", "AccessPolicy"), rpc("UpdateGlobalAccessPolicy", "AccessPolicy", "AccessPolicy"), }, resource("Atespace", model.ResourceAnnotation{Scope: ateapi.Scope_SCOPE_GLOBAL, Plural: "Atespaces"}), - resource("AccessPolicy", model.ResourceAnnotation{Parents: []string{"Global", "Atespace"}, Singleton: true, Plural: "AccessPolicies"}), + resource("ExternalVolumeClass", model.ResourceAnnotation{Scope: ateapi.Scope_SCOPE_GLOBAL, Plural: "ExternalVolumeClasses"}), + resource("AccessPolicy", model.ResourceAnnotation{Parents: []string{"Global", "Atespace", "ExternalVolumeClass"}, Singleton: true, Plural: "AccessPolicies"}), ), want: []resourcePage{ {Message: resource("Atespace", model.ResourceAnnotation{Scope: ateapi.Scope_SCOPE_GLOBAL, Plural: "Atespaces"}), Scope: "global"}, + {Message: resource("ExternalVolumeClass", model.ResourceAnnotation{Scope: ateapi.Scope_SCOPE_GLOBAL, Plural: "ExternalVolumeClasses"}), Scope: "global"}, { - Message: resource("AccessPolicy", model.ResourceAnnotation{Parents: []string{"Global", "Atespace"}, Singleton: true, Plural: "AccessPolicies"}), + Message: resource("AccessPolicy", model.ResourceAnnotation{Parents: []string{"Global", "Atespace", "ExternalVolumeClass"}, Singleton: true, Plural: "AccessPolicies"}), Parent: "Global", Singleton: true, Methods: []model.Method{method("GetGlobalAccessPolicy", "AccessPolicy", "AccessPolicy"), method("UpdateGlobalAccessPolicy", "AccessPolicy", "AccessPolicy")}, }, { - Message: resource("AccessPolicy", model.ResourceAnnotation{Parents: []string{"Global", "Atespace"}, Singleton: true, Plural: "AccessPolicies"}), + Message: resource("AccessPolicy", model.ResourceAnnotation{Parents: []string{"Global", "Atespace", "ExternalVolumeClass"}, Singleton: true, Plural: "AccessPolicies"}), Parent: "Atespace", Singleton: true, Methods: []model.Method{method("GetAtespaceAccessPolicy", "AccessPolicy", "AccessPolicy")}, }, + { + Message: resource("AccessPolicy", model.ResourceAnnotation{Parents: []string{"Global", "Atespace", "ExternalVolumeClass"}, Singleton: true, Plural: "AccessPolicies"}), + Parent: "ExternalVolumeClass", + Singleton: true, + Methods: []model.Method{method("GetExternalVolumeClassAccessPolicy", "AccessPolicy", "AccessPolicy")}, + }, }, }, } @@ -150,7 +159,8 @@ func TestResourcePages_Invalid(t *testing.T) { api: controlAPI( []model.Method{rpc("ResetAccessPolicy", "AccessPolicy", "AccessPolicy")}, resource("Atespace", model.ResourceAnnotation{Scope: ateapi.Scope_SCOPE_GLOBAL, Plural: "Atespaces"}), - resource("AccessPolicy", model.ResourceAnnotation{Parents: []string{"Global", "Atespace"}, Singleton: true, Plural: "AccessPolicies"}), + resource("ExternalVolumeClass", model.ResourceAnnotation{Scope: ateapi.Scope_SCOPE_GLOBAL, Plural: "ExternalVolumeClasses"}), + resource("AccessPolicy", model.ResourceAnnotation{Parents: []string{"Global", "Atespace", "ExternalVolumeClass"}, Singleton: true, Plural: "AccessPolicies"}), ), }, } diff --git a/tools/apitool/internal/examples/examples.go b/tools/apitool/internal/examples/examples.go index 7662c3fe9e..853ef0f904 100644 --- a/tools/apitool/internal/examples/examples.go +++ b/tools/apitool/internal/examples/examples.go @@ -17,9 +17,11 @@ // // grpc/ holds one file per gRPC resource as ate-api-server returns it, with // server-set fields such as uid and status. Each is its message's protojson -// form as YAML, named after the message, e.g. Actor.yaml. Tests check that -// every resource has an example and that each example parses as its message, -// so a renamed or removed field fails them. +// form as YAML, named after the message, e.g. Actor.yaml; a subresource with +// several parents may also add a per-parent override named +// "..yaml", e.g. ExternalVolumeClass.AccessPolicy.yaml. +// Tests check that every resource has an example and that each example parses +// as its message, so a renamed or removed field fails them. // // k8s/ holds one file per Kubernetes resource as users apply it with kubectl, // named after its kind, e.g. WorkerPool.yaml. Tests check each against its diff --git a/tools/apitool/internal/examples/examples_test.go b/tools/apitool/internal/examples/examples_test.go index e673559cf4..f12566937e 100644 --- a/tools/apitool/internal/examples/examples_test.go +++ b/tools/apitool/internal/examples/examples_test.go @@ -52,6 +52,18 @@ func resources(t *testing.T) map[string]model.Message { return byName } +func resolveGRPCExampleResource(name string, rs map[string]model.Message) (model.Message, bool) { + if parent, resName, hasDot := strings.Cut(name, "."); hasDot { + msg, ok := rs[resName] + if !ok || msg.ResourceAnnotation == nil || !slices.Contains(msg.ResourceAnnotation.Parents, parent) { + return model.Message{}, false + } + return msg, true + } + msg, ok := rs[name] + return msg, ok +} + func TestGRPCResources_OnePerResource(t *testing.T) { got, err := examples.GRPCResources() if err != nil { @@ -64,8 +76,8 @@ func TestGRPCResources_OnePerResource(t *testing.T) { } } for name := range got { - if _, ok := rs[name]; !ok { - t.Errorf("grpc/%s.yaml names no resource", name) + if _, ok := resolveGRPCExampleResource(name, rs); !ok { + t.Errorf("grpc/%s.yaml names no resource (or valid . subresource override)", name) } } } @@ -77,7 +89,7 @@ func TestGRPCResources_ParsesAsResource(t *testing.T) { } rs := resources(t) for _, name := range slices.Sorted(maps.Keys(got)) { - msg, ok := rs[name] + msg, ok := resolveGRPCExampleResource(name, rs) if !ok { continue // Reported by TestGRPCResources_OnePerResource. } diff --git a/tools/apitool/internal/examples/grpc/ExternalVolumeClass.AccessPolicy.yaml b/tools/apitool/internal/examples/grpc/ExternalVolumeClass.AccessPolicy.yaml new file mode 100644 index 0000000000..e118ab94c6 --- /dev/null +++ b/tools/apitool/internal/examples/grpc/ExternalVolumeClass.AccessPolicy.yaml @@ -0,0 +1,24 @@ +# Copyright 2026 The Agent Substrate Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +metadata: + name: default + uid: 9a0b1c2d-3e4f-4a5b-8c6d-7e8f9a0b1c2d + version: "2" + createTime: "2026-06-01T00:05:00Z" + updateTime: "2026-08-10T16:30:00Z" +bindings: +- role: allowed_atespace + members: + - atespace:team-a + - atespace:team-b diff --git a/tools/apitool/internal/examples/grpc/ExternalVolumeClass.yaml b/tools/apitool/internal/examples/grpc/ExternalVolumeClass.yaml new file mode 100644 index 0000000000..df809c49cb --- /dev/null +++ b/tools/apitool/internal/examples/grpc/ExternalVolumeClass.yaml @@ -0,0 +1,25 @@ +# Copyright 2026 The Agent Substrate Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +metadata: + name: csi-nfs + uid: 9a8b7c6d-5e4f-4a3b-8c2d-1e0f9a8b7c6d + version: "1" + createTime: "2026-06-01T00:00:00Z" + updateTime: "2026-06-01T00:00:00Z" +driverName: nfs.csi.k8s.io +parameters: + server: nfs-server.default.svc.cluster.local + share: / +mountOptions: +- nfsvers=4.1 diff --git a/tools/apitool/internal/model/model.go b/tools/apitool/internal/model/model.go index c490a77df3..122d99f85f 100644 --- a/tools/apitool/internal/model/model.go +++ b/tools/apitool/internal/model/model.go @@ -146,8 +146,8 @@ func (m Message) IsResource() bool { type ResourceAnnotation struct { // Parents lists the resource types this resource is a subresource of: // another resource's message name, or GlobalParent. For example, - // ["Global", "Atespace"] for AccessPolicy; empty for the top-level - // Actor. + // ["Global", "Atespace", "ExternalVolumeClass"] for AccessPolicy; empty + // for the top-level Actor. Parents []string // Singleton is true if each parent has at most one instance of this // resource. For example, true for EgressPolicy. diff --git a/tools/apitool/internal/model/model_test.go b/tools/apitool/internal/model/model_test.go index 3e1bbcc25e..c2f2d076ae 100644 --- a/tools/apitool/internal/model/model_test.go +++ b/tools/apitool/internal/model/model_test.go @@ -237,26 +237,28 @@ func TestBuild_Annotations(t *testing.T) { } } wantResources := map[string]*model.ResourceAnnotation{ - "Actor": {Scope: ateapi.Scope_SCOPE_ATESPACE, Plural: "Actors"}, - "EgressPolicy": {Parents: []string{"Actor"}, Singleton: true, Plural: "EgressPolicies"}, - "Tag": {Scope: ateapi.Scope_SCOPE_ATESPACE, Plural: "Tags"}, - "Atespace": {Scope: ateapi.Scope_SCOPE_GLOBAL, Plural: "Atespaces"}, - "ActorTemplate": {Scope: ateapi.Scope_SCOPE_ATESPACE, Plural: "ActorTemplates"}, - "Worker": {Scope: ateapi.Scope_SCOPE_GLOBAL, Plural: "Workers"}, - "ActorAssignment": {Parents: []string{"Worker"}, Plural: "ActorAssignments"}, - "AccessPolicy": {Parents: []string{"Global", "Atespace"}, Singleton: true, Plural: "AccessPolicies"}, + "Actor": {Scope: ateapi.Scope_SCOPE_ATESPACE, Plural: "Actors"}, + "EgressPolicy": {Parents: []string{"Actor"}, Singleton: true, Plural: "EgressPolicies"}, + "Tag": {Scope: ateapi.Scope_SCOPE_ATESPACE, Plural: "Tags"}, + "Atespace": {Scope: ateapi.Scope_SCOPE_GLOBAL, Plural: "Atespaces"}, + "ActorTemplate": {Scope: ateapi.Scope_SCOPE_ATESPACE, Plural: "ActorTemplates"}, + "ExternalVolumeClass": {Scope: ateapi.Scope_SCOPE_GLOBAL, Plural: "ExternalVolumeClasses"}, + "Worker": {Scope: ateapi.Scope_SCOPE_GLOBAL, Plural: "Workers"}, + "ActorAssignment": {Parents: []string{"Worker"}, Plural: "ActorAssignments"}, + "AccessPolicy": {Parents: []string{"Global", "Atespace", "ExternalVolumeClass"}, Singleton: true, Plural: "AccessPolicies"}, } if diff := cmp.Diff(wantResources, gotResources); diff != "" { t.Errorf("resource annotations mismatch (-want +got):\n%s", diff) } wantMethods := map[protoreflect.Name]string{ - "GetActor": "Actor", - "SuspendActor": "Actor", - "GetActorEgressPolicy": "EgressPolicy", - "GetGlobalAccessPolicy": "AccessPolicy", - "GetAtespaceAccessPolicy": "AccessPolicy", - "ListWorkerActorAssignments": "ActorAssignment", + "GetActor": "Actor", + "SuspendActor": "Actor", + "GetActorEgressPolicy": "EgressPolicy", + "GetGlobalAccessPolicy": "AccessPolicy", + "GetAtespaceAccessPolicy": "AccessPolicy", + "GetExternalVolumeClassAccessPolicy": "AccessPolicy", + "ListWorkerActorAssignments": "ActorAssignment", } gotMethods := map[protoreflect.Name]string{} for _, svc := range api.Services {