From a0179f14328e9c5e74e7b0b52e075c8f906b351a Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Thu, 6 Feb 2025 21:49:35 -0700 Subject: [PATCH] Resolve issues identifies by staticcheck Signed-off-by: Jonathon Anderson --- Tools.mk | 8 +- internal/app/wwctl/image/exec/child/main.go | 2 +- internal/app/wwctl/image/exec/main.go | 32 +- internal/pkg/api/image/image.go | 28 +- internal/pkg/api/node/add.go | 2 +- internal/pkg/api/profile/add.go | 2 +- internal/pkg/api/routes/wwapiv1/routes.pb.go | 990 +++++------------- .../pkg/api/routes/wwapiv1/routes.pb.gw.go | 647 ++++-------- .../pkg/api/routes/wwapiv1/routes_grpc.pb.go | 113 +- internal/pkg/config/buildconfig.go.in | 20 +- internal/pkg/config/dhcp.go | 4 +- internal/pkg/config/mounts.go | 8 +- internal/pkg/config/nfs.go | 4 +- internal/pkg/image/build.go | 2 +- internal/pkg/image/initramfs.go | 14 +- internal/pkg/kernel/kernel.go | 22 +- internal/pkg/upgrade/config.go | 160 +-- internal/pkg/upgrade/node.go | 338 +++--- 18 files changed, 895 insertions(+), 1501 deletions(-) diff --git a/Tools.mk b/Tools.mk index cab53506..3b2a006a 100644 --- a/Tools.mk +++ b/Tools.mk @@ -20,10 +20,10 @@ PROTOC_GEN_GRPC_GATEWAY := $(TOOLS_BIN)/protoc-gen-grpc-gateway ifeq ($(ARCH),aarch64) PROTOC_URL := https://github.com/protocolbuffers/protobuf/releases/download/v24.0/protoc-24.0-linux-aarch_64.zip -PROTOC_GEN_GRPC_GATEWAY_URL := https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.16.2/protoc-gen-grpc-gateway-v2.16.2-linux-arm64 +PROTOC_GEN_GRPC_GATEWAY_URL := https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.26.0/protoc-gen-grpc-gateway-v2.26.0-linux-arm64 else PROTOC_URL := https://github.com/protocolbuffers/protobuf/releases/download/v24.0/protoc-24.0-linux-x86_64.zip -PROTOC_GEN_GRPC_GATEWAY_URL := https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.16.2/protoc-gen-grpc-gateway-v2.16.2-linux-x86_64 +PROTOC_GEN_GRPC_GATEWAY_URL := https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v2.26.0/protoc-gen-grpc-gateway-v2.26.0-linux-x86_64 endif $(TOOLS_DIR): @@ -50,10 +50,10 @@ $(PROTOC_GEN_GRPC_GATEWAY): chmod +x $(PROTOC_GEN_GRPC_GATEWAY) $(PROTOC_GEN_GO): - GOBIN="$(PWD)/$(TOOLS_BIN)" go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 + GOBIN="$(PWD)/$(TOOLS_BIN)" go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.5 $(PROTOC_GEN_GO_GRPC): - GOBIN="$(PWD)/$(TOOLS_BIN)" go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 + GOBIN="$(PWD)/$(TOOLS_BIN)" go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.5.1 $(GOLANG_LICENSES): GOBIN="$(PWD)/$(TOOLS_BIN)" go install github.com/google/go-licenses@v1.6.0 diff --git a/internal/app/wwctl/image/exec/child/main.go b/internal/app/wwctl/image/exec/child/main.go index 64e105b2..f3b5a2e7 100644 --- a/internal/app/wwctl/image/exec/child/main.go +++ b/internal/app/wwctl/image/exec/child/main.go @@ -112,7 +112,7 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) { wwlog.Debug("overlay options: %s", options) err = syscall.Mount("overlay", imagePath, "overlay", 0, options) if err != nil { - return fmt.Errorf("Couldn't create overlay for node render overlay: %s", err) + return fmt.Errorf("couldn't create overlay for node render overlay: %s", err) } ps1Str = fmt.Sprintf("[%s|ro|%s] Warewulf> ", imageName, nodename) } diff --git a/internal/app/wwctl/image/exec/main.go b/internal/app/wwctl/image/exec/main.go index 19aa119d..8f06af48 100644 --- a/internal/app/wwctl/image/exec/main.go +++ b/internal/app/wwctl/image/exec/main.go @@ -186,46 +186,46 @@ type copyFile struct { modTime time.Time } -func (this *copyFile) imageDest(imageName string) string { - return path.Join(image.RootFsDir(imageName), this.fileName) +func (cf *copyFile) imageDest(imageName string) string { + return path.Join(image.RootFsDir(imageName), cf.fileName) } -func (this *copyFile) copyToImage(imageName string) error { - imageDest := this.imageDest(imageName) +func (cf *copyFile) copyToImage(imageName string) error { + imageDest := cf.imageDest(imageName) if _, err := os.Stat(path.Dir(imageDest)); err != nil { return err } else if _, err := os.Stat(imageDest); err == nil { return err - } else if _, err := os.Stat(this.src); err != nil { + } else if _, err := os.Stat(cf.src); err != nil { return err - } else if err := util.CopyFile(this.src, imageDest); err != nil { + } else if err := util.CopyFile(cf.src, imageDest); err != nil { return err } else if stat, err := os.Stat(imageDest); err != nil { return err } else { - this.modTime = stat.ModTime() + cf.modTime = stat.ModTime() return nil } } -func (this *copyFile) shouldRemoveFromImage(imageName string) bool { - imageDest := this.imageDest(imageName) - if this.modTime.IsZero() { - wwlog.Debug("file was not previously copied: %s", this.fileName) +func (cf *copyFile) shouldRemoveFromImage(imageName string) bool { + imageDest := cf.imageDest(imageName) + if cf.modTime.IsZero() { + wwlog.Debug("file was not previously copied: %s", cf.fileName) return false } else if destStat, err := os.Stat(imageDest); err != nil { - wwlog.Verbose("file is no longer present: %s (%s)", this.fileName, err) + wwlog.Verbose("file is no longer present: %s (%s)", cf.fileName, err) return false - } else if destStat.ModTime() == this.modTime { - wwlog.Verbose("don't remove modified file:", this.fileName) + } else if destStat.ModTime() == cf.modTime { + wwlog.Verbose("don't remove modified file:", cf.fileName) return false } else { return true } } -func (this *copyFile) removeFromImage(imageName string) error { - imageDest := this.imageDest(imageName) +func (cf *copyFile) removeFromImage(imageName string) error { + imageDest := cf.imageDest(imageName) return os.Remove(imageDest) } diff --git a/internal/pkg/api/image/image.go b/internal/pkg/api/image/image.go index bec3e98b..d9c2380b 100644 --- a/internal/pkg/api/image/image.go +++ b/internal/pkg/api/image/image.go @@ -24,7 +24,7 @@ func ImageCopy(cbp *wwapiv1.ImageCopyParameter) (err error) { } if !image.DoesSourceExist(cbp.ImageSource) { - return fmt.Errorf("image %s does not exists.", cbp.ImageSource) + return fmt.Errorf("image %s does not exist", cbp.ImageSource) } if !image.ValidName(cbp.ImageDestination) { @@ -32,7 +32,7 @@ func ImageCopy(cbp *wwapiv1.ImageCopyParameter) (err error) { } if image.DoesSourceExist(cbp.ImageDestination) { - return fmt.Errorf("An other image with the name %s already exists", cbp.ImageDestination) + return fmt.Errorf("an other image with the name %s already exists", cbp.ImageDestination) } err = image.Duplicate(cbp.ImageSource, cbp.ImageDestination) @@ -47,12 +47,12 @@ func ImageCopy(cbp *wwapiv1.ImageCopyParameter) (err error) { } } - return fmt.Errorf("Image %s has been succesfully duplicated as %s", cbp.ImageSource, cbp.ImageDestination) + return fmt.Errorf("image %s has been succesfully duplicated as %s", cbp.ImageSource, cbp.ImageDestination) } func ImageBuild(cbp *wwapiv1.ImageBuildParameter) (err error) { if cbp == nil { - return fmt.Errorf("ImageBuildParameter is nil") + return fmt.Errorf("input parameter is nil") } var images []string @@ -69,7 +69,7 @@ func ImageBuild(cbp *wwapiv1.ImageBuildParameter) (err error) { for _, c := range images { if !image.ValidSource(c) { - return fmt.Errorf("Image name does not exist: %s", c) + return fmt.Errorf("image name does not exist: %s", c) } err = image.Build(c, cbp.Force) @@ -82,7 +82,7 @@ func ImageBuild(cbp *wwapiv1.ImageBuildParameter) (err error) { func ImageDelete(cdp *wwapiv1.ImageDeleteParameter) (err error) { if cdp == nil { - return fmt.Errorf("ImageDeleteParameter is nil") + return fmt.Errorf("input parameter is nil") } nodeDB, err := node.New() @@ -101,22 +101,22 @@ ARG_LOOP: imageName := cdp.ImageNames[i] for _, n := range nodes { if n.ImageName == imageName { - wwlog.Error("Image is configured for nodes, skipping: %s", imageName) + wwlog.Error("image is configured for nodes, skipping: %s", imageName) continue ARG_LOOP } } if !image.ValidSource(imageName) { - wwlog.Error("Image name is not a valid source: %s", imageName) + wwlog.Error("image name is not a valid source: %s", imageName) continue } err := image.DeleteSource(imageName) if err != nil { - wwlog.Error("Could not remove source: %s", imageName) + wwlog.Error("could not remove source: %s", imageName) } err = image.DeleteImage(imageName) if err != nil { - wwlog.Error("Could not remove image files %s", imageName) + wwlog.Error("could not remove image files %s", imageName) } fmt.Printf("Image has been deleted: %s\n", imageName) @@ -127,7 +127,7 @@ ARG_LOOP: func ImageImport(cip *wwapiv1.ImageImportParameter) (imageName string, err error) { if cip == nil { - err = fmt.Errorf("NodeAddParameter is nil") + err = fmt.Errorf("input parameter is nil") return } @@ -137,7 +137,7 @@ func ImageImport(cip *wwapiv1.ImageImportParameter) (imageName string, err error cip.Name = name } if !image.ValidName(cip.Name) { - err = fmt.Errorf("Image name contains illegal characters: %s", cip.Name) + err = fmt.Errorf("image name contains illegal characters: %s", cip.Name) return } @@ -155,7 +155,7 @@ func ImageImport(cip *wwapiv1.ImageImportParameter) (imageName string, err error if util.IsDir(fullPath) { if !cip.Update { - err = fmt.Errorf("Image name exists, specify --force, --update, or choose a different name: %s", cip.Name) + err = fmt.Errorf("image name exists, specify --force, --update, or choose a different name: %s", cip.Name) return } wwlog.Info("Updating existing image") @@ -252,7 +252,7 @@ func ImageList() (imageInfo []*wwapiv1.ImageInfo, err error) { sourceStat, err := os.Stat(image.SourceDir(source)) wwlog.Debug("Checking creation time for: %s,%v", image.SourceDir(source), sourceStat.ModTime()) if err != nil { - wwlog.Error("%s\n", err) + wwlog.Error("%s", err) } else { creationTime = uint64(sourceStat.ModTime().Unix()) } diff --git a/internal/pkg/api/node/add.go b/internal/pkg/api/node/add.go index 5ddbd82d..1a1d0baf 100644 --- a/internal/pkg/api/node/add.go +++ b/internal/pkg/api/node/add.go @@ -38,7 +38,7 @@ func NodeAdd(nap *wwapiv1.NodeAddParameter) (err error) { } err = yaml.Unmarshal([]byte(nap.NodeConfYaml), &n) if err != nil { - return fmt.Errorf("Failed to decode nodeConf: %w", err) + return fmt.Errorf("failed to decode nodeConf: %w", err) } wwlog.Info("Added node: %s", a) for _, dev := range n.NetDevs { diff --git a/internal/pkg/api/profile/add.go b/internal/pkg/api/profile/add.go index d996a442..634ea50f 100644 --- a/internal/pkg/api/profile/add.go +++ b/internal/pkg/api/profile/add.go @@ -19,7 +19,7 @@ func ProfileAdd(nsp *wwapiv1.NodeAddParameter) error { } nodeDB, err := node.New() if err != nil { - return fmt.Errorf("Could not open database: %w", err) + return fmt.Errorf("could not open database: %w", err) } for _, p := range nsp.NodeNames { if util.InSlice(nodeDB.ListAllProfiles(), p) { diff --git a/internal/pkg/api/routes/wwapiv1/routes.pb.go b/internal/pkg/api/routes/wwapiv1/routes.pb.go index a3507c8c..6fe8208e 100644 --- a/internal/pkg/api/routes/wwapiv1/routes.pb.go +++ b/internal/pkg/api/routes/wwapiv1/routes.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.36.5 // protoc v4.24.0 // source: routes.proto @@ -16,6 +16,7 @@ import ( emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -87,20 +88,17 @@ func (GetNodeList_ListType) EnumDescriptor() ([]byte, []int) { } type NodeDBHash struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Hash string `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` unknownFields protoimpl.UnknownFields - - Hash string `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"` + sizeCache protoimpl.SizeCache } func (x *NodeDBHash) Reset() { *x = NodeDBHash{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodeDBHash) String() string { @@ -111,7 +109,7 @@ func (*NodeDBHash) ProtoMessage() {} func (x *NodeDBHash) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -135,22 +133,19 @@ func (x *NodeDBHash) GetHash() string { // ImageBuildParameter contains input for building zero or more images. type ImageBuildParameter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ImageNames []string `protobuf:"bytes,1,rep,name=imageNames,proto3" json:"imageNames,omitempty"` + Force bool `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"` + All bool `protobuf:"varint,3,opt,name=all,proto3" json:"all,omitempty"` // bool default = 4; unknownFields protoimpl.UnknownFields - - ImageNames []string `protobuf:"bytes,1,rep,name=imageNames,proto3" json:"imageNames,omitempty"` - Force bool `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"` - All bool `protobuf:"varint,3,opt,name=all,proto3" json:"all,omitempty"` // bool default = 4; + sizeCache protoimpl.SizeCache } func (x *ImageBuildParameter) Reset() { *x = ImageBuildParameter{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ImageBuildParameter) String() string { @@ -161,7 +156,7 @@ func (*ImageBuildParameter) ProtoMessage() {} func (x *ImageBuildParameter) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -200,20 +195,17 @@ func (x *ImageBuildParameter) GetAll() bool { // ImageDeleteParameter contains input for removing images from Warewulf // management. type ImageDeleteParameter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ImageNames []string `protobuf:"bytes,1,rep,name=imageNames,proto3" json:"imageNames,omitempty"` unknownFields protoimpl.UnknownFields - - ImageNames []string `protobuf:"bytes,1,rep,name=imageNames,proto3" json:"imageNames,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ImageDeleteParameter) Reset() { *x = ImageDeleteParameter{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ImageDeleteParameter) String() string { @@ -224,7 +216,7 @@ func (*ImageDeleteParameter) ProtoMessage() {} func (x *ImageDeleteParameter) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -248,22 +240,19 @@ func (x *ImageDeleteParameter) GetImageNames() []string { // ImageCopyParameter contains 2 inputs : first one for the image source name and second one for the duplicated image name. type ImageCopyParameter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ImageSource string `protobuf:"bytes,1,opt,name=imageSource,proto3" json:"imageSource,omitempty"` - ImageDestination string `protobuf:"bytes,2,opt,name=imageDestination,proto3" json:"imageDestination,omitempty"` - Build bool `protobuf:"varint,3,opt,name=build,proto3" json:"build,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + ImageSource string `protobuf:"bytes,1,opt,name=imageSource,proto3" json:"imageSource,omitempty"` + ImageDestination string `protobuf:"bytes,2,opt,name=imageDestination,proto3" json:"imageDestination,omitempty"` + Build bool `protobuf:"varint,3,opt,name=build,proto3" json:"build,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ImageCopyParameter) Reset() { *x = ImageCopyParameter{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ImageCopyParameter) String() string { @@ -274,7 +263,7 @@ func (*ImageCopyParameter) ProtoMessage() {} func (x *ImageCopyParameter) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -312,30 +301,27 @@ func (x *ImageCopyParameter) GetBuild() bool { // ImageImportParameter has all input for importing an image. type ImageImportParameter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Source string `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"` // image source uri - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` // image name - Force bool `protobuf:"varint,3,opt,name=force,proto3" json:"force,omitempty"` - Update bool `protobuf:"varint,4,opt,name=update,proto3" json:"update,omitempty"` - Build bool `protobuf:"varint,5,opt,name=build,proto3" json:"build,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + Source string `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"` // image source uri + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` // image name + Force bool `protobuf:"varint,3,opt,name=force,proto3" json:"force,omitempty"` + Update bool `protobuf:"varint,4,opt,name=update,proto3" json:"update,omitempty"` + Build bool `protobuf:"varint,5,opt,name=build,proto3" json:"build,omitempty"` // bool default = 6; - SyncUser bool `protobuf:"varint,7,opt,name=syncUser,proto3" json:"syncUser,omitempty"` - OciNoHttps bool `protobuf:"varint,8,opt,name=ociNoHttps,proto3" json:"ociNoHttps,omitempty"` - OciUsername string `protobuf:"bytes,9,opt,name=ociUsername,proto3" json:"ociUsername,omitempty"` - OciPassword string `protobuf:"bytes,10,opt,name=ociPassword,proto3" json:"ociPassword,omitempty"` - Platform string `protobuf:"bytes,11,opt,name=platform,proto3" json:"platform,omitempty"` + SyncUser bool `protobuf:"varint,7,opt,name=syncUser,proto3" json:"syncUser,omitempty"` + OciNoHttps bool `protobuf:"varint,8,opt,name=ociNoHttps,proto3" json:"ociNoHttps,omitempty"` + OciUsername string `protobuf:"bytes,9,opt,name=ociUsername,proto3" json:"ociUsername,omitempty"` + OciPassword string `protobuf:"bytes,10,opt,name=ociPassword,proto3" json:"ociPassword,omitempty"` + Platform string `protobuf:"bytes,11,opt,name=platform,proto3" json:"platform,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ImageImportParameter) Reset() { *x = ImageImportParameter{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ImageImportParameter) String() string { @@ -346,7 +332,7 @@ func (*ImageImportParameter) ProtoMessage() {} func (x *ImageImportParameter) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -434,27 +420,24 @@ func (x *ImageImportParameter) GetPlatform() string { // ImageInfo has data on each image. This is emitted in the // ImageListResponse. type ImageInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - NodeCount uint32 `protobuf:"varint,2,opt,name=nodeCount,proto3" json:"nodeCount,omitempty"` - KernelVersion string `protobuf:"bytes,3,opt,name=kernelVersion,proto3" json:"kernelVersion,omitempty"` - CreateDate uint64 `protobuf:"varint,4,opt,name=createDate,proto3" json:"createDate,omitempty"` // creation date in unix time - ModDate uint64 `protobuf:"varint,5,opt,name=modDate,proto3" json:"modDate,omitempty"` // date of last modification in unix time + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + NodeCount uint32 `protobuf:"varint,2,opt,name=nodeCount,proto3" json:"nodeCount,omitempty"` + KernelVersion string `protobuf:"bytes,3,opt,name=kernelVersion,proto3" json:"kernelVersion,omitempty"` + CreateDate uint64 `protobuf:"varint,4,opt,name=createDate,proto3" json:"createDate,omitempty"` // creation date in unix time + ModDate uint64 `protobuf:"varint,5,opt,name=modDate,proto3" json:"modDate,omitempty"` // date of last modification in unix time // uint64 size = 6; // size of chroot and images in bytes - ImgSize uint64 `protobuf:"varint,7,opt,name=imgSize,proto3" json:"imgSize,omitempty"` - ImgSizeComp uint64 `protobuf:"varint,8,opt,name=imgSizeComp,proto3" json:"imgSizeComp,omitempty"` + ImgSize uint64 `protobuf:"varint,7,opt,name=imgSize,proto3" json:"imgSize,omitempty"` + ImgSizeComp uint64 `protobuf:"varint,8,opt,name=imgSizeComp,proto3" json:"imgSizeComp,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ImageInfo) Reset() { *x = ImageInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ImageInfo) String() string { @@ -465,7 +448,7 @@ func (*ImageInfo) ProtoMessage() {} func (x *ImageInfo) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -531,20 +514,17 @@ func (x *ImageInfo) GetImgSizeComp() uint64 { // ImageListResponse has all information that ImageList provides. type ImageListResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Images []*ImageInfo `protobuf:"bytes,1,rep,name=images,proto3" json:"images,omitempty"` unknownFields protoimpl.UnknownFields - - Images []*ImageInfo `protobuf:"bytes,1,rep,name=images,proto3" json:"images,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ImageListResponse) Reset() { *x = ImageListResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ImageListResponse) String() string { @@ -555,7 +535,7 @@ func (*ImageListResponse) ProtoMessage() {} func (x *ImageListResponse) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -579,20 +559,17 @@ func (x *ImageListResponse) GetImages() []*ImageInfo { // ImageShowParameter is the input for ImageShow. type ImageShowParameter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ImageName string `protobuf:"bytes,1,opt,name=imageName,proto3" json:"imageName,omitempty"` unknownFields protoimpl.UnknownFields - - ImageName string `protobuf:"bytes,1,opt,name=imageName,proto3" json:"imageName,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ImageShowParameter) Reset() { *x = ImageShowParameter{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ImageShowParameter) String() string { @@ -603,7 +580,7 @@ func (*ImageShowParameter) ProtoMessage() {} func (x *ImageShowParameter) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -627,23 +604,20 @@ func (x *ImageShowParameter) GetImageName() string { // ImageShowResponse has all information emitted on ImageShow. type ImageShowResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"` + Rootfs string `protobuf:"bytes,2,opt,name=Rootfs,proto3" json:"Rootfs,omitempty"` + Nodes []string `protobuf:"bytes,3,rep,name=Nodes,proto3" json:"Nodes,omitempty"` + KernelVersion string `protobuf:"bytes,4,opt,name=KernelVersion,proto3" json:"KernelVersion,omitempty"` unknownFields protoimpl.UnknownFields - - Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"` - Rootfs string `protobuf:"bytes,2,opt,name=Rootfs,proto3" json:"Rootfs,omitempty"` - Nodes []string `protobuf:"bytes,3,rep,name=Nodes,proto3" json:"Nodes,omitempty"` - KernelVersion string `protobuf:"bytes,4,opt,name=KernelVersion,proto3" json:"KernelVersion,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ImageShowResponse) Reset() { *x = ImageShowResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ImageShowResponse) String() string { @@ -654,7 +628,7 @@ func (*ImageShowResponse) ProtoMessage() {} func (x *ImageShowResponse) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -699,20 +673,17 @@ func (x *ImageShowResponse) GetKernelVersion() string { // ImageSyncUserParameter is the input for ImageSyncUser. type ImageSyncUserParameter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ImageName string `protobuf:"bytes,1,opt,name=imageName,proto3" json:"imageName,omitempty"` unknownFields protoimpl.UnknownFields - - ImageName string `protobuf:"bytes,1,opt,name=imageName,proto3" json:"imageName,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ImageSyncUserParameter) Reset() { *x = ImageSyncUserParameter{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ImageSyncUserParameter) String() string { @@ -723,7 +694,7 @@ func (*ImageSyncUserParameter) ProtoMessage() {} func (x *ImageSyncUserParameter) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -747,22 +718,19 @@ func (x *ImageSyncUserParameter) GetImageName() string { // ImageRenameParameter is the input for ImageRename type ImageRenameParameter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ImageName string `protobuf:"bytes,1,opt,name=imageName,proto3" json:"imageName,omitempty"` + TargetName string `protobuf:"bytes,2,opt,name=targetName,proto3" json:"targetName,omitempty"` + Build bool `protobuf:"varint,3,opt,name=build,proto3" json:"build,omitempty"` unknownFields protoimpl.UnknownFields - - ImageName string `protobuf:"bytes,1,opt,name=imageName,proto3" json:"imageName,omitempty"` - TargetName string `protobuf:"bytes,2,opt,name=targetName,proto3" json:"targetName,omitempty"` - Build bool `protobuf:"varint,3,opt,name=build,proto3" json:"build,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ImageRenameParameter) Reset() { *x = ImageRenameParameter{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ImageRenameParameter) String() string { @@ -773,7 +741,7 @@ func (*ImageRenameParameter) ProtoMessage() {} func (x *ImageRenameParameter) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -811,20 +779,17 @@ func (x *ImageRenameParameter) GetBuild() bool { // NodeNames is an array of node ids. type NodeNames struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + NodeNames []string `protobuf:"bytes,1,rep,name=nodeNames,proto3" json:"nodeNames,omitempty"` unknownFields protoimpl.UnknownFields - - NodeNames []string `protobuf:"bytes,1,rep,name=nodeNames,proto3" json:"nodeNames,omitempty"` + sizeCache protoimpl.SizeCache } func (x *NodeNames) Reset() { *x = NodeNames{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodeNames) String() string { @@ -835,7 +800,7 @@ func (*NodeNames) ProtoMessage() {} func (x *NodeNames) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -859,22 +824,19 @@ func (x *NodeNames) GetNodeNames() []string { // NodeField contains data output on NodeList. type NodeField struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Source string `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"` + Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` // TODO: Variable name okay? + Print string `protobuf:"bytes,3,opt,name=print,proto3" json:"print,omitempty"` // Empty values printed as -- in wwctl. unknownFields protoimpl.UnknownFields - - Source string `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"` - Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` // TODO: Variable name okay? - Print string `protobuf:"bytes,3,opt,name=print,proto3" json:"print,omitempty"` // Empty values printed as -- in wwctl. + sizeCache protoimpl.SizeCache } func (x *NodeField) Reset() { *x = NodeField{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodeField) String() string { @@ -885,7 +847,7 @@ func (*NodeField) ProtoMessage() {} func (x *NodeField) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -923,21 +885,18 @@ func (x *NodeField) GetPrint() string { // NetDev is network devices (NICs) on a node. type NetDev struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Field map[string]*NodeField `protobuf:"bytes,1,rep,name=Field,proto3" json:"Field,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Tags map[string]*NodeField `protobuf:"bytes,9,rep,name=Tags,proto3" json:"Tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` unknownFields protoimpl.UnknownFields - - Field map[string]*NodeField `protobuf:"bytes,1,rep,name=Field,proto3" json:"Field,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Tags map[string]*NodeField `protobuf:"bytes,9,rep,name=Tags,proto3" json:"Tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + sizeCache protoimpl.SizeCache } func (x *NetDev) Reset() { *x = NetDev{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NetDev) String() string { @@ -948,7 +907,7 @@ func (*NetDev) ProtoMessage() {} func (x *NetDev) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -979,23 +938,20 @@ func (x *NetDev) GetTags() map[string]*NodeField { // NodeInfo contains details about a node managed by Warewulf/ type NodeInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Fields map[string]*NodeField `protobuf:"bytes,1,rep,name=Fields,proto3" json:"Fields,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + NetDevs map[string]*NetDev `protobuf:"bytes,23,rep,name=NetDevs,proto3" json:"NetDevs,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Tags map[string]*NodeField `protobuf:"bytes,24,rep,name=Tags,proto3" json:"Tags,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + Keys map[string]*NodeField `protobuf:"bytes,25,rep,name=Keys,proto3" json:"Keys,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // TODO: We may not need this. Tags may be it. Ask Greg. unknownFields protoimpl.UnknownFields - - Fields map[string]*NodeField `protobuf:"bytes,1,rep,name=Fields,proto3" json:"Fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - NetDevs map[string]*NetDev `protobuf:"bytes,23,rep,name=NetDevs,proto3" json:"NetDevs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Tags map[string]*NodeField `protobuf:"bytes,24,rep,name=Tags,proto3" json:"Tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Keys map[string]*NodeField `protobuf:"bytes,25,rep,name=Keys,proto3" json:"Keys,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // TODO: We may not need this. Tags may be it. Ask Greg. + sizeCache protoimpl.SizeCache } func (x *NodeInfo) Reset() { *x = NodeInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodeInfo) String() string { @@ -1006,7 +962,7 @@ func (*NodeInfo) ProtoMessage() {} func (x *NodeInfo) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1051,20 +1007,17 @@ func (x *NodeInfo) GetKeys() map[string]*NodeField { // NodeListResponse is the output of NodeList. type NodeListResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Nodes []*NodeInfo `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"` unknownFields protoimpl.UnknownFields - - Nodes []*NodeInfo `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"` + sizeCache protoimpl.SizeCache } func (x *NodeListResponse) Reset() { *x = NodeListResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodeListResponse) String() string { @@ -1075,7 +1028,7 @@ func (*NodeListResponse) ProtoMessage() {} func (x *NodeListResponse) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1099,21 +1052,18 @@ func (x *NodeListResponse) GetNodes() []*NodeInfo { // Request a node list type GetNodeList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Type GetNodeList_ListType `protobuf:"varint,8,opt,name=type,proto3,enum=wwapi.v1.GetNodeList_ListType" json:"type,omitempty"` + Nodes []string `protobuf:"bytes,9,rep,name=Nodes,proto3" json:"Nodes,omitempty"` unknownFields protoimpl.UnknownFields - - Type GetNodeList_ListType `protobuf:"varint,8,opt,name=type,proto3,enum=wwapi.v1.GetNodeList_ListType" json:"type,omitempty"` - Nodes []string `protobuf:"bytes,9,rep,name=Nodes,proto3" json:"Nodes,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GetNodeList) Reset() { *x = GetNodeList{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetNodeList) String() string { @@ -1124,7 +1074,7 @@ func (*GetNodeList) ProtoMessage() {} func (x *GetNodeList) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1155,20 +1105,17 @@ func (x *GetNodeList) GetNodes() []string { // Get the formated output as string type NodeList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Output []string `protobuf:"bytes,1,rep,name=Output,proto3" json:"Output,omitempty"` unknownFields protoimpl.UnknownFields - - Output []string `protobuf:"bytes,1,rep,name=Output,proto3" json:"Output,omitempty"` + sizeCache protoimpl.SizeCache } func (x *NodeList) Reset() { *x = NodeList{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodeList) String() string { @@ -1179,7 +1126,7 @@ func (*NodeList) ProtoMessage() {} func (x *NodeList) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1203,23 +1150,20 @@ func (x *NodeList) GetOutput() []string { // Request a profile list view type GetProfileList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + ShowAll bool `protobuf:"varint,1,opt,name=ShowAll,proto3" json:"ShowAll,omitempty"` + ShowYaml bool `protobuf:"varint,3,opt,name=ShowYaml,proto3" json:"ShowYaml,omitempty"` + ShowJson bool `protobuf:"varint,4,opt,name=ShowJson,proto3" json:"ShowJson,omitempty"` + Profiles []string `protobuf:"bytes,5,rep,name=Profiles,proto3" json:"Profiles,omitempty"` unknownFields protoimpl.UnknownFields - - ShowAll bool `protobuf:"varint,1,opt,name=ShowAll,proto3" json:"ShowAll,omitempty"` - ShowYaml bool `protobuf:"varint,3,opt,name=ShowYaml,proto3" json:"ShowYaml,omitempty"` - ShowJson bool `protobuf:"varint,4,opt,name=ShowJson,proto3" json:"ShowJson,omitempty"` - Profiles []string `protobuf:"bytes,5,rep,name=Profiles,proto3" json:"Profiles,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GetProfileList) Reset() { *x = GetProfileList{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetProfileList) String() string { @@ -1230,7 +1174,7 @@ func (*GetProfileList) ProtoMessage() {} func (x *GetProfileList) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1275,20 +1219,17 @@ func (x *GetProfileList) GetProfiles() []string { // Get the formated output as string type ProfileList struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Output []string `protobuf:"bytes,1,rep,name=Output,proto3" json:"Output,omitempty"` unknownFields protoimpl.UnknownFields - - Output []string `protobuf:"bytes,1,rep,name=Output,proto3" json:"Output,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ProfileList) Reset() { *x = ProfileList{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProfileList) String() string { @@ -1299,7 +1240,7 @@ func (*ProfileList) ProtoMessage() {} func (x *ProfileList) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1325,23 +1266,20 @@ func (x *ProfileList) GetOutput() []string { // Warewulf. Only adds nodes if the hash matches the actual hash of the // configuration. type NodeAddParameter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + NodeConfYaml string `protobuf:"bytes,1,opt,name=nodeConfYaml,proto3" json:"nodeConfYaml,omitempty"` + Force bool `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"` + Hash string `protobuf:"bytes,3,opt,name=hash,proto3" json:"hash,omitempty"` + NodeNames []string `protobuf:"bytes,10,rep,name=nodeNames,proto3" json:"nodeNames,omitempty"` unknownFields protoimpl.UnknownFields - - NodeConfYaml string `protobuf:"bytes,1,opt,name=nodeConfYaml,proto3" json:"nodeConfYaml,omitempty"` - Force bool `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"` - Hash string `protobuf:"bytes,3,opt,name=hash,proto3" json:"hash,omitempty"` - NodeNames []string `protobuf:"bytes,10,rep,name=nodeNames,proto3" json:"nodeNames,omitempty"` + sizeCache protoimpl.SizeCache } func (x *NodeAddParameter) Reset() { *x = NodeAddParameter{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodeAddParameter) String() string { @@ -1352,7 +1290,7 @@ func (*NodeAddParameter) ProtoMessage() {} func (x *NodeAddParameter) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1398,21 +1336,18 @@ func (x *NodeAddParameter) GetNodeNames() []string { // NodeYaml is just the updated YAML config which will be added // to nodes.conf (is resused for profile edit) type NodeYaml struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - NodeConfMapYaml string `protobuf:"bytes,1,opt,name=nodeConfMapYaml,proto3" json:"nodeConfMapYaml,omitempty"` - Hash string `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + NodeConfMapYaml string `protobuf:"bytes,1,opt,name=nodeConfMapYaml,proto3" json:"nodeConfMapYaml,omitempty"` + Hash string `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *NodeYaml) Reset() { *x = NodeYaml{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodeYaml) String() string { @@ -1423,7 +1358,7 @@ func (*NodeYaml) ProtoMessage() {} func (x *NodeYaml) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1457,22 +1392,19 @@ func (x *NodeYaml) GetHash() string { // configuration, no node is deleted. The force option allows the deletion // of nodes with a correct hash. type NodeDeleteParameter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Force bool `protobuf:"varint,1,opt,name=force,proto3" json:"force,omitempty"` + NodeNames []string `protobuf:"bytes,2,rep,name=nodeNames,proto3" json:"nodeNames,omitempty"` + Hash string `protobuf:"bytes,3,opt,name=hash,proto3" json:"hash,omitempty"` unknownFields protoimpl.UnknownFields - - Force bool `protobuf:"varint,1,opt,name=force,proto3" json:"force,omitempty"` - NodeNames []string `protobuf:"bytes,2,rep,name=nodeNames,proto3" json:"nodeNames,omitempty"` - Hash string `protobuf:"bytes,3,opt,name=hash,proto3" json:"hash,omitempty"` + sizeCache protoimpl.SizeCache } func (x *NodeDeleteParameter) Reset() { *x = NodeDeleteParameter{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodeDeleteParameter) String() string { @@ -1483,7 +1415,7 @@ func (*NodeDeleteParameter) ProtoMessage() {} func (x *NodeDeleteParameter) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1522,34 +1454,31 @@ func (x *NodeDeleteParameter) GetHash() string { // NodeSetParameter contains all fields for updating aspects of nodes managed // by Warewulf. type ConfSetParameter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - NodeConfYaml string `protobuf:"bytes,1,opt,name=nodeConfYaml,proto3" json:"nodeConfYaml,omitempty"` - NetdevDelete string `protobuf:"bytes,2,opt,name=netdevDelete,proto3" json:"netdevDelete,omitempty"` - DiskDelete string `protobuf:"bytes,3,opt,name=diskDelete,proto3" json:"diskDelete,omitempty"` - PartitionDelete string `protobuf:"bytes,4,opt,name=partitionDelete,proto3" json:"partitionDelete,omitempty"` - FilesystemDelete string `protobuf:"bytes,5,opt,name=filesystemDelete,proto3" json:"filesystemDelete,omitempty"` - AllConfs bool `protobuf:"varint,6,opt,name=allConfs,proto3" json:"allConfs,omitempty"` - Force bool `protobuf:"varint,7,opt,name=force,proto3" json:"force,omitempty"` - ConfList []string `protobuf:"bytes,8,rep,name=confList,proto3" json:"confList,omitempty"` - TagAdd map[string]string `protobuf:"bytes,9,rep,name=tagAdd,proto3" json:"tagAdd,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - NetTagAdd map[string]string `protobuf:"bytes,10,rep,name=netTagAdd,proto3" json:"netTagAdd,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - IpmiTagAdd map[string]string `protobuf:"bytes,11,rep,name=ipmiTagAdd,proto3" json:"ipmiTagAdd,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - TagDel []string `protobuf:"bytes,12,rep,name=tagDel,proto3" json:"tagDel,omitempty"` - NetTagDel []string `protobuf:"bytes,13,rep,name=netTagDel,proto3" json:"netTagDel,omitempty"` - IpmiTagDel []string `protobuf:"bytes,14,rep,name=ipmiTagDel,proto3" json:"ipmiTagDel,omitempty"` - Netdev string `protobuf:"bytes,15,opt,name=netdev,proto3" json:"netdev,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + NodeConfYaml string `protobuf:"bytes,1,opt,name=nodeConfYaml,proto3" json:"nodeConfYaml,omitempty"` + NetdevDelete string `protobuf:"bytes,2,opt,name=netdevDelete,proto3" json:"netdevDelete,omitempty"` + DiskDelete string `protobuf:"bytes,3,opt,name=diskDelete,proto3" json:"diskDelete,omitempty"` + PartitionDelete string `protobuf:"bytes,4,opt,name=partitionDelete,proto3" json:"partitionDelete,omitempty"` + FilesystemDelete string `protobuf:"bytes,5,opt,name=filesystemDelete,proto3" json:"filesystemDelete,omitempty"` + AllConfs bool `protobuf:"varint,6,opt,name=allConfs,proto3" json:"allConfs,omitempty"` + Force bool `protobuf:"varint,7,opt,name=force,proto3" json:"force,omitempty"` + ConfList []string `protobuf:"bytes,8,rep,name=confList,proto3" json:"confList,omitempty"` + TagAdd map[string]string `protobuf:"bytes,9,rep,name=tagAdd,proto3" json:"tagAdd,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + NetTagAdd map[string]string `protobuf:"bytes,10,rep,name=netTagAdd,proto3" json:"netTagAdd,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + IpmiTagAdd map[string]string `protobuf:"bytes,11,rep,name=ipmiTagAdd,proto3" json:"ipmiTagAdd,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` + TagDel []string `protobuf:"bytes,12,rep,name=tagDel,proto3" json:"tagDel,omitempty"` + NetTagDel []string `protobuf:"bytes,13,rep,name=netTagDel,proto3" json:"netTagDel,omitempty"` + IpmiTagDel []string `protobuf:"bytes,14,rep,name=ipmiTagDel,proto3" json:"ipmiTagDel,omitempty"` + Netdev string `protobuf:"bytes,15,opt,name=netdev,proto3" json:"netdev,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *ConfSetParameter) Reset() { *x = ConfSetParameter{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ConfSetParameter) String() string { @@ -1560,7 +1489,7 @@ func (*ConfSetParameter) ProtoMessage() {} func (x *ConfSetParameter) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1682,24 +1611,21 @@ func (x *ConfSetParameter) GetNetdev() string { // NodeStatus contains information about the imaging status per node. type NodeStatus struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + NodeName string `protobuf:"bytes,1,opt,name=nodeName,proto3" json:"nodeName,omitempty"` // Name (Id) of the node. + Stage string `protobuf:"bytes,2,opt,name=stage,proto3" json:"stage,omitempty"` // Stage of imaging. + Sent string `protobuf:"bytes,3,opt,name=sent,proto3" json:"sent,omitempty"` // Last overlay sent. + Ipaddr string `protobuf:"bytes,4,opt,name=ipaddr,proto3" json:"ipaddr,omitempty"` // Node IP address. + Lastseen int64 `protobuf:"varint,5,opt,name=lastseen,proto3" json:"lastseen,omitempty"` // Time in seconds since the node was last seen. unknownFields protoimpl.UnknownFields - - NodeName string `protobuf:"bytes,1,opt,name=nodeName,proto3" json:"nodeName,omitempty"` // Name (Id) of the node. - Stage string `protobuf:"bytes,2,opt,name=stage,proto3" json:"stage,omitempty"` // Stage of imaging. - Sent string `protobuf:"bytes,3,opt,name=sent,proto3" json:"sent,omitempty"` // Last overlay sent. - Ipaddr string `protobuf:"bytes,4,opt,name=ipaddr,proto3" json:"ipaddr,omitempty"` // Node IP address. - Lastseen int64 `protobuf:"varint,5,opt,name=lastseen,proto3" json:"lastseen,omitempty"` // Time in seconds since the node was last seen. + sizeCache protoimpl.SizeCache } func (x *NodeStatus) Reset() { *x = NodeStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodeStatus) String() string { @@ -1710,7 +1636,7 @@ func (*NodeStatus) ProtoMessage() {} func (x *NodeStatus) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[24] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1762,20 +1688,17 @@ func (x *NodeStatus) GetLastseen() int64 { // NodeStatusResponse contains NodeStatus for zero or more nodes. type NodeStatusResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + NodeStatus []*NodeStatus `protobuf:"bytes,1,rep,name=nodeStatus,proto3" json:"nodeStatus,omitempty"` unknownFields protoimpl.UnknownFields - - NodeStatus []*NodeStatus `protobuf:"bytes,1,rep,name=nodeStatus,proto3" json:"nodeStatus,omitempty"` + sizeCache protoimpl.SizeCache } func (x *NodeStatusResponse) Reset() { *x = NodeStatusResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NodeStatusResponse) String() string { @@ -1786,7 +1709,7 @@ func (*NodeStatusResponse) ProtoMessage() {} func (x *NodeStatusResponse) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[25] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1810,22 +1733,19 @@ func (x *NodeStatusResponse) GetNodeStatus() []*NodeStatus { // VersionReponse contains versions of the software. type VersionResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ApiPrefix string `protobuf:"bytes,1,opt,name=apiPrefix,proto3" json:"apiPrefix,omitempty"` - ApiVersion string `protobuf:"bytes,2,opt,name=apiVersion,proto3" json:"apiVersion,omitempty"` - WarewulfVersion string `protobuf:"bytes,3,opt,name=warewulfVersion,proto3" json:"warewulfVersion,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + ApiPrefix string `protobuf:"bytes,1,opt,name=apiPrefix,proto3" json:"apiPrefix,omitempty"` + ApiVersion string `protobuf:"bytes,2,opt,name=apiVersion,proto3" json:"apiVersion,omitempty"` + WarewulfVersion string `protobuf:"bytes,3,opt,name=warewulfVersion,proto3" json:"warewulfVersion,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *VersionResponse) Reset() { *x = VersionResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VersionResponse) String() string { @@ -1836,7 +1756,7 @@ func (*VersionResponse) ProtoMessage() {} func (x *VersionResponse) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1874,20 +1794,17 @@ func (x *VersionResponse) GetWarewulfVersion() string { // Check if config is writeable type CanWriteConfig struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - CanWriteConfig bool `protobuf:"varint,1,opt,name=canWriteConfig,proto3" json:"canWriteConfig,omitempty"` + state protoimpl.MessageState `protogen:"open.v1"` + CanWriteConfig bool `protobuf:"varint,1,opt,name=canWriteConfig,proto3" json:"canWriteConfig,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *CanWriteConfig) Reset() { *x = CanWriteConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_routes_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_routes_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CanWriteConfig) String() string { @@ -1898,7 +1815,7 @@ func (*CanWriteConfig) ProtoMessage() {} func (x *CanWriteConfig) ProtoReflect() protoreflect.Message { mi := &file_routes_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1922,7 +1839,7 @@ func (x *CanWriteConfig) GetCanWriteConfig() bool { var File_routes_proto protoreflect.FileDescriptor -var file_routes_proto_rawDesc = []byte{ +var file_routes_proto_rawDesc = string([]byte{ 0x0a, 0x0c, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, @@ -2189,8 +2106,8 @@ var file_routes_proto_rawDesc = []byte{ 0x6d, 0x61, 0x67, 0x65, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x1a, 0x1b, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x22, 0x0e, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x3a, 0x01, 0x2a, 0x12, 0x58, 0x0a, 0x0b, 0x49, 0x6d, + 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x3a, 0x01, 0x2a, 0x22, 0x0e, 0x2f, 0x76, 0x31, 0x2f, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x58, 0x0a, 0x0b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x1e, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, @@ -2200,15 +2117,15 @@ var file_routes_proto_rawDesc = []byte{ 0x79, 0x12, 0x1c, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x43, 0x6f, 0x70, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x22, - 0x0d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x63, 0x6f, 0x70, 0x79, 0x3a, 0x01, - 0x2a, 0x12, 0x60, 0x0a, 0x0b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, + 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x3a, + 0x01, 0x2a, 0x22, 0x0d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x63, 0x6f, 0x70, + 0x79, 0x12, 0x60, 0x0a, 0x0b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1e, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x1a, 0x1b, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x14, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x22, 0x09, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x3a, 0x01, 0x2a, 0x12, 0x53, 0x0a, 0x09, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, + 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x3a, 0x01, 0x2a, 0x22, 0x09, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6d, + 0x61, 0x67, 0x65, 0x12, 0x53, 0x0a, 0x09, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1b, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, @@ -2224,14 +2141,14 @@ var file_routes_proto_rawDesc = []byte{ 0x31, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x1a, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x22, 0x0f, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x56, 0x0a, 0x07, 0x4e, 0x6f, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x3a, 0x01, 0x2a, 0x22, 0x0f, 0x2f, 0x76, 0x31, 0x2f, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x56, 0x0a, 0x07, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x64, 0x64, 0x12, 0x1a, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x64, 0x64, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x1a, 0x1a, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x13, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x0d, 0x22, 0x08, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x3a, - 0x01, 0x2a, 0x12, 0x55, 0x0a, 0x0a, 0x4e, 0x6f, 0x64, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0xd3, 0xe4, 0x93, 0x02, 0x0d, 0x3a, 0x01, 0x2a, 0x22, 0x08, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x6f, + 0x64, 0x65, 0x12, 0x55, 0x0a, 0x0a, 0x4e, 0x6f, 0x64, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x1d, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, @@ -2246,8 +2163,8 @@ var file_routes_proto_rawDesc = []byte{ 0x6f, 0x6e, 0x66, 0x53, 0x65, 0x74, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x1a, 0x1a, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x16, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x10, 0x22, 0x0b, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x65, 0x74, - 0x3a, 0x01, 0x2a, 0x12, 0x57, 0x0a, 0x0a, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, + 0x93, 0x02, 0x10, 0x3a, 0x01, 0x2a, 0x22, 0x0b, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x6f, 0x64, 0x65, + 0x73, 0x65, 0x74, 0x12, 0x57, 0x0a, 0x0a, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x13, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x1a, 0x1c, 0x2e, 0x77, 0x77, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, @@ -2261,23 +2178,23 @@ var file_routes_proto_rawDesc = []byte{ 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x2f, 0x77, 0x77, 0x61, 0x70, 0x69, 0x76, 0x31, 0x3b, 0x77, 0x77, 0x61, 0x70, 0x69, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_routes_proto_rawDescOnce sync.Once - file_routes_proto_rawDescData = file_routes_proto_rawDesc + file_routes_proto_rawDescData []byte ) func file_routes_proto_rawDescGZIP() []byte { file_routes_proto_rawDescOnce.Do(func() { - file_routes_proto_rawDescData = protoimpl.X.CompressGZIP(file_routes_proto_rawDescData) + file_routes_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_routes_proto_rawDesc), len(file_routes_proto_rawDesc))) }) return file_routes_proto_rawDescData } var file_routes_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_routes_proto_msgTypes = make([]protoimpl.MessageInfo, 37) -var file_routes_proto_goTypes = []interface{}{ +var file_routes_proto_goTypes = []any{ (GetNodeList_ListType)(0), // 0: wwapi.v1.GetNodeList.ListType (*NodeDBHash)(nil), // 1: wwapi.v1.NodeDBHash (*ImageBuildParameter)(nil), // 2: wwapi.v1.ImageBuildParameter @@ -2376,349 +2293,11 @@ func file_routes_proto_init() { if File_routes_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_routes_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodeDBHash); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImageBuildParameter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImageDeleteParameter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImageCopyParameter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImageImportParameter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImageInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImageListResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImageShowParameter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImageShowResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImageSyncUserParameter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImageRenameParameter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodeNames); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodeField); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NetDev); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodeInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodeListResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetNodeList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodeList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetProfileList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProfileList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodeAddParameter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodeYaml); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodeDeleteParameter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConfSetParameter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodeStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NodeStatusResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VersionResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_routes_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CanWriteConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_routes_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_routes_proto_rawDesc), len(file_routes_proto_rawDesc)), NumEnums: 1, NumMessages: 37, NumExtensions: 0, @@ -2730,7 +2309,6 @@ func file_routes_proto_init() { MessageInfos: file_routes_proto_msgTypes, }.Build() File_routes_proto = out.File - file_routes_proto_rawDesc = nil file_routes_proto_goTypes = nil file_routes_proto_depIdxs = nil } diff --git a/internal/pkg/api/routes/wwapiv1/routes.pb.gw.go b/internal/pkg/api/routes/wwapiv1/routes.pb.gw.go index 5de07714..70abb410 100644 --- a/internal/pkg/api/routes/wwapiv1/routes.pb.gw.go +++ b/internal/pkg/api/routes/wwapiv1/routes.pb.gw.go @@ -10,6 +10,7 @@ package wwapiv1 import ( "context" + "errors" "io" "net/http" @@ -25,448 +26,369 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = errors.New + _ = runtime.String + _ = utilities.NewDoubleArray + _ = metadata.Join +) func request_WWApi_ImageBuild_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageBuildParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq ImageBuildParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.ImageBuild(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_ImageBuild_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageBuildParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq ImageBuildParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.ImageBuild(ctx, &protoReq) return msg, metadata, err - } -var ( - filter_WWApi_ImageDelete_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) +var filter_WWApi_ImageDelete_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} func request_WWApi_ImageDelete_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageDeleteParameter - var metadata runtime.ServerMetadata - + var ( + protoReq ImageDeleteParameter + metadata runtime.ServerMetadata + ) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_WWApi_ImageDelete_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.ImageDelete(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_ImageDelete_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageDeleteParameter - var metadata runtime.ServerMetadata - + var ( + protoReq ImageDeleteParameter + metadata runtime.ServerMetadata + ) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_WWApi_ImageDelete_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.ImageDelete(ctx, &protoReq) return msg, metadata, err - } func request_WWApi_ImageCopy_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageCopyParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq ImageCopyParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.ImageCopy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_ImageCopy_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageCopyParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq ImageCopyParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.ImageCopy(ctx, &protoReq) return msg, metadata, err - } func request_WWApi_ImageImport_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageImportParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq ImageImportParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.ImageImport(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_ImageImport_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageImportParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq ImageImportParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.ImageImport(ctx, &protoReq) return msg, metadata, err - } func request_WWApi_ImageList_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq emptypb.Empty - var metadata runtime.ServerMetadata - + var ( + protoReq emptypb.Empty + metadata runtime.ServerMetadata + ) msg, err := client.ImageList(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_ImageList_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq emptypb.Empty - var metadata runtime.ServerMetadata - + var ( + protoReq emptypb.Empty + metadata runtime.ServerMetadata + ) msg, err := server.ImageList(ctx, &protoReq) return msg, metadata, err - } -var ( - filter_WWApi_ImageShow_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) +var filter_WWApi_ImageShow_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} func request_WWApi_ImageShow_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageShowParameter - var metadata runtime.ServerMetadata - + var ( + protoReq ImageShowParameter + metadata runtime.ServerMetadata + ) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_WWApi_ImageShow_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.ImageShow(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_ImageShow_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageShowParameter - var metadata runtime.ServerMetadata - + var ( + protoReq ImageShowParameter + metadata runtime.ServerMetadata + ) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_WWApi_ImageShow_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.ImageShow(ctx, &protoReq) return msg, metadata, err - } func request_WWApi_ImageRename_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageRenameParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq ImageRenameParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.ImageRename(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_ImageRename_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ImageRenameParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq ImageRenameParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.ImageRename(ctx, &protoReq) return msg, metadata, err - } func request_WWApi_NodeAdd_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq NodeAddParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq NodeAddParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.NodeAdd(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_NodeAdd_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq NodeAddParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq NodeAddParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.NodeAdd(ctx, &protoReq) return msg, metadata, err - } -var ( - filter_WWApi_NodeDelete_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) +var filter_WWApi_NodeDelete_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} func request_WWApi_NodeDelete_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq NodeDeleteParameter - var metadata runtime.ServerMetadata - + var ( + protoReq NodeDeleteParameter + metadata runtime.ServerMetadata + ) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_WWApi_NodeDelete_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.NodeDelete(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_NodeDelete_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq NodeDeleteParameter - var metadata runtime.ServerMetadata - + var ( + protoReq NodeDeleteParameter + metadata runtime.ServerMetadata + ) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_WWApi_NodeDelete_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.NodeDelete(ctx, &protoReq) return msg, metadata, err - } -var ( - filter_WWApi_NodeList_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) +var filter_WWApi_NodeList_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} func request_WWApi_NodeList_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq NodeNames - var metadata runtime.ServerMetadata - + var ( + protoReq NodeNames + metadata runtime.ServerMetadata + ) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_WWApi_NodeList_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.NodeList(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_NodeList_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq NodeNames - var metadata runtime.ServerMetadata - + var ( + protoReq NodeNames + metadata runtime.ServerMetadata + ) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_WWApi_NodeList_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.NodeList(ctx, &protoReq) return msg, metadata, err - } func request_WWApi_NodeSet_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ConfSetParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq ConfSetParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.NodeSet(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_NodeSet_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ConfSetParameter - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq ConfSetParameter + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.NodeSet(ctx, &protoReq) return msg, metadata, err - } -var ( - filter_WWApi_NodeStatus_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) +var filter_WWApi_NodeStatus_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} func request_WWApi_NodeStatus_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq NodeNames - var metadata runtime.ServerMetadata - + var ( + protoReq NodeNames + metadata runtime.ServerMetadata + ) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_WWApi_NodeStatus_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.NodeStatus(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_NodeStatus_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq NodeNames - var metadata runtime.ServerMetadata - + var ( + protoReq NodeNames + metadata runtime.ServerMetadata + ) if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_WWApi_NodeStatus_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.NodeStatus(ctx, &protoReq) return msg, metadata, err - } func request_WWApi_Version_0(ctx context.Context, marshaler runtime.Marshaler, client WWApiClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq emptypb.Empty - var metadata runtime.ServerMetadata - + var ( + protoReq emptypb.Empty + metadata runtime.ServerMetadata + ) msg, err := client.Version(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_WWApi_Version_0(ctx context.Context, marshaler runtime.Marshaler, server WWApiServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq emptypb.Empty - var metadata runtime.ServerMetadata - + var ( + protoReq emptypb.Empty + metadata runtime.ServerMetadata + ) msg, err := server.Version(ctx, &protoReq) return msg, metadata, err - } // RegisterWWApiHandlerServer registers the http handlers for service WWApi to "mux". // UnaryRPC :call WWApiServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterWWApiHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, server WWApiServer) error { - - mux.Handle("POST", pattern_WWApi_ImageBuild_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_ImageBuild_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageBuild", runtime.WithHTTPPathPattern("/v1/imagebuild")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageBuild", runtime.WithHTTPPathPattern("/v1/imagebuild")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -478,20 +400,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageBuild_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("DELETE", pattern_WWApi_ImageDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_WWApi_ImageDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageDelete", runtime.WithHTTPPathPattern("/v1/image")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageDelete", runtime.WithHTTPPathPattern("/v1/image")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -503,20 +420,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageDelete_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_WWApi_ImageCopy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_ImageCopy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageCopy", runtime.WithHTTPPathPattern("/v1/imagecopy")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageCopy", runtime.WithHTTPPathPattern("/v1/imagecopy")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -528,20 +440,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageCopy_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_WWApi_ImageImport_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_ImageImport_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageImport", runtime.WithHTTPPathPattern("/v1/image")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageImport", runtime.WithHTTPPathPattern("/v1/image")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -553,20 +460,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageImport_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_WWApi_ImageList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_WWApi_ImageList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageList", runtime.WithHTTPPathPattern("/v1/image")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageList", runtime.WithHTTPPathPattern("/v1/image")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -578,20 +480,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageList_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_WWApi_ImageShow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_WWApi_ImageShow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageShow", runtime.WithHTTPPathPattern("/v1/imageshow")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageShow", runtime.WithHTTPPathPattern("/v1/imageshow")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -603,20 +500,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageShow_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_WWApi_ImageRename_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_ImageRename_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageRename", runtime.WithHTTPPathPattern("/v1/imagerename")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageRename", runtime.WithHTTPPathPattern("/v1/imagerename")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -628,20 +520,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageRename_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_WWApi_NodeAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_NodeAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeAdd", runtime.WithHTTPPathPattern("/v1/node")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeAdd", runtime.WithHTTPPathPattern("/v1/node")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -653,20 +540,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_NodeAdd_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("DELETE", pattern_WWApi_NodeDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_WWApi_NodeDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeDelete", runtime.WithHTTPPathPattern("/v1/node")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeDelete", runtime.WithHTTPPathPattern("/v1/node")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -678,20 +560,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_NodeDelete_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_WWApi_NodeList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_WWApi_NodeList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeList", runtime.WithHTTPPathPattern("/v1/node")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeList", runtime.WithHTTPPathPattern("/v1/node")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -703,20 +580,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_NodeList_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_WWApi_NodeSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_NodeSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeSet", runtime.WithHTTPPathPattern("/v1/nodeset")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeSet", runtime.WithHTTPPathPattern("/v1/nodeset")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -728,20 +600,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_NodeSet_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_WWApi_NodeStatus_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_WWApi_NodeStatus_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeStatus", runtime.WithHTTPPathPattern("/v1/nodestatus")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeStatus", runtime.WithHTTPPathPattern("/v1/nodestatus")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -753,20 +620,15 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_NodeStatus_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_WWApi_Version_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_WWApi_Version_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/Version", runtime.WithHTTPPathPattern("/version")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/wwapi.v1.WWApi/Version", runtime.WithHTTPPathPattern("/version")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -778,9 +640,7 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_Version_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -789,25 +649,24 @@ func RegisterWWApiHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv // RegisterWWApiHandlerFromEndpoint is same as RegisterWWApiHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterWWApiHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterWWApiHandler(ctx, mux, conn) } @@ -821,16 +680,13 @@ func RegisterWWApiHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "WWApiClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "WWApiClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "WWApiClient" to call the correct interceptors. +// "WWApiClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, client WWApiClient) error { - - mux.Handle("POST", pattern_WWApi_ImageBuild_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_ImageBuild_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageBuild", runtime.WithHTTPPathPattern("/v1/imagebuild")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageBuild", runtime.WithHTTPPathPattern("/v1/imagebuild")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -841,18 +697,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageBuild_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("DELETE", pattern_WWApi_ImageDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_WWApi_ImageDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageDelete", runtime.WithHTTPPathPattern("/v1/image")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageDelete", runtime.WithHTTPPathPattern("/v1/image")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -863,18 +714,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageDelete_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_WWApi_ImageCopy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_ImageCopy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageCopy", runtime.WithHTTPPathPattern("/v1/imagecopy")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageCopy", runtime.WithHTTPPathPattern("/v1/imagecopy")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -885,18 +731,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageCopy_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_WWApi_ImageImport_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_ImageImport_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageImport", runtime.WithHTTPPathPattern("/v1/image")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageImport", runtime.WithHTTPPathPattern("/v1/image")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -907,18 +748,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageImport_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_WWApi_ImageList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_WWApi_ImageList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageList", runtime.WithHTTPPathPattern("/v1/image")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageList", runtime.WithHTTPPathPattern("/v1/image")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -929,18 +765,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageList_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_WWApi_ImageShow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_WWApi_ImageShow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageShow", runtime.WithHTTPPathPattern("/v1/imageshow")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageShow", runtime.WithHTTPPathPattern("/v1/imageshow")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -951,18 +782,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageShow_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_WWApi_ImageRename_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_ImageRename_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageRename", runtime.WithHTTPPathPattern("/v1/imagerename")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/ImageRename", runtime.WithHTTPPathPattern("/v1/imagerename")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -973,18 +799,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_ImageRename_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_WWApi_NodeAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_NodeAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeAdd", runtime.WithHTTPPathPattern("/v1/node")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeAdd", runtime.WithHTTPPathPattern("/v1/node")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -995,18 +816,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_NodeAdd_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("DELETE", pattern_WWApi_NodeDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_WWApi_NodeDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeDelete", runtime.WithHTTPPathPattern("/v1/node")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeDelete", runtime.WithHTTPPathPattern("/v1/node")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1017,18 +833,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_NodeDelete_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_WWApi_NodeList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_WWApi_NodeList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeList", runtime.WithHTTPPathPattern("/v1/node")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeList", runtime.WithHTTPPathPattern("/v1/node")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1039,18 +850,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_NodeList_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_WWApi_NodeSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_WWApi_NodeSet_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeSet", runtime.WithHTTPPathPattern("/v1/nodeset")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeSet", runtime.WithHTTPPathPattern("/v1/nodeset")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1061,18 +867,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_NodeSet_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_WWApi_NodeStatus_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_WWApi_NodeStatus_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeStatus", runtime.WithHTTPPathPattern("/v1/nodestatus")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/NodeStatus", runtime.WithHTTPPathPattern("/v1/nodestatus")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1083,18 +884,13 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_NodeStatus_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_WWApi_Version_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_WWApi_Version_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/Version", runtime.WithHTTPPathPattern("/version")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/wwapi.v1.WWApi/Version", runtime.WithHTTPPathPattern("/version")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1105,66 +901,39 @@ func RegisterWWApiHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_WWApi_Version_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - return nil } var ( - pattern_WWApi_ImageBuild_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "imagebuild"}, "")) - + pattern_WWApi_ImageBuild_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "imagebuild"}, "")) pattern_WWApi_ImageDelete_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "image"}, "")) - - pattern_WWApi_ImageCopy_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "imagecopy"}, "")) - + pattern_WWApi_ImageCopy_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "imagecopy"}, "")) pattern_WWApi_ImageImport_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "image"}, "")) - - pattern_WWApi_ImageList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "image"}, "")) - - pattern_WWApi_ImageShow_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "imageshow"}, "")) - + pattern_WWApi_ImageList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "image"}, "")) + pattern_WWApi_ImageShow_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "imageshow"}, "")) pattern_WWApi_ImageRename_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "imagerename"}, "")) - - pattern_WWApi_NodeAdd_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "node"}, "")) - - pattern_WWApi_NodeDelete_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "node"}, "")) - - pattern_WWApi_NodeList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "node"}, "")) - - pattern_WWApi_NodeSet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "nodeset"}, "")) - - pattern_WWApi_NodeStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "nodestatus"}, "")) - - pattern_WWApi_Version_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"version"}, "")) + pattern_WWApi_NodeAdd_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "node"}, "")) + pattern_WWApi_NodeDelete_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "node"}, "")) + pattern_WWApi_NodeList_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "node"}, "")) + pattern_WWApi_NodeSet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "nodeset"}, "")) + pattern_WWApi_NodeStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "nodestatus"}, "")) + pattern_WWApi_Version_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"version"}, "")) ) var ( - forward_WWApi_ImageBuild_0 = runtime.ForwardResponseMessage - + forward_WWApi_ImageBuild_0 = runtime.ForwardResponseMessage forward_WWApi_ImageDelete_0 = runtime.ForwardResponseMessage - - forward_WWApi_ImageCopy_0 = runtime.ForwardResponseMessage - + forward_WWApi_ImageCopy_0 = runtime.ForwardResponseMessage forward_WWApi_ImageImport_0 = runtime.ForwardResponseMessage - - forward_WWApi_ImageList_0 = runtime.ForwardResponseMessage - - forward_WWApi_ImageShow_0 = runtime.ForwardResponseMessage - + forward_WWApi_ImageList_0 = runtime.ForwardResponseMessage + forward_WWApi_ImageShow_0 = runtime.ForwardResponseMessage forward_WWApi_ImageRename_0 = runtime.ForwardResponseMessage - - forward_WWApi_NodeAdd_0 = runtime.ForwardResponseMessage - - forward_WWApi_NodeDelete_0 = runtime.ForwardResponseMessage - - forward_WWApi_NodeList_0 = runtime.ForwardResponseMessage - - forward_WWApi_NodeSet_0 = runtime.ForwardResponseMessage - - forward_WWApi_NodeStatus_0 = runtime.ForwardResponseMessage - - forward_WWApi_Version_0 = runtime.ForwardResponseMessage + forward_WWApi_NodeAdd_0 = runtime.ForwardResponseMessage + forward_WWApi_NodeDelete_0 = runtime.ForwardResponseMessage + forward_WWApi_NodeList_0 = runtime.ForwardResponseMessage + forward_WWApi_NodeSet_0 = runtime.ForwardResponseMessage + forward_WWApi_NodeStatus_0 = runtime.ForwardResponseMessage + forward_WWApi_Version_0 = runtime.ForwardResponseMessage ) diff --git a/internal/pkg/api/routes/wwapiv1/routes_grpc.pb.go b/internal/pkg/api/routes/wwapiv1/routes_grpc.pb.go index 2bb1a1df..630b5736 100644 --- a/internal/pkg/api/routes/wwapiv1/routes_grpc.pb.go +++ b/internal/pkg/api/routes/wwapiv1/routes_grpc.pb.go @@ -1,6 +1,9 @@ +// Routes for the wwapi (WareWulf API). +// TODO: Try protoc-gen-doc for generating documentation. + // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 +// - protoc-gen-go-grpc v1.5.1 // - protoc v4.24.0 // source: routes.proto @@ -16,12 +19,30 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + WWApi_ImageBuild_FullMethodName = "/wwapi.v1.WWApi/ImageBuild" + WWApi_ImageDelete_FullMethodName = "/wwapi.v1.WWApi/ImageDelete" + WWApi_ImageCopy_FullMethodName = "/wwapi.v1.WWApi/ImageCopy" + WWApi_ImageImport_FullMethodName = "/wwapi.v1.WWApi/ImageImport" + WWApi_ImageList_FullMethodName = "/wwapi.v1.WWApi/ImageList" + WWApi_ImageShow_FullMethodName = "/wwapi.v1.WWApi/ImageShow" + WWApi_ImageRename_FullMethodName = "/wwapi.v1.WWApi/ImageRename" + WWApi_NodeAdd_FullMethodName = "/wwapi.v1.WWApi/NodeAdd" + WWApi_NodeDelete_FullMethodName = "/wwapi.v1.WWApi/NodeDelete" + WWApi_NodeList_FullMethodName = "/wwapi.v1.WWApi/NodeList" + WWApi_NodeSet_FullMethodName = "/wwapi.v1.WWApi/NodeSet" + WWApi_NodeStatus_FullMethodName = "/wwapi.v1.WWApi/NodeStatus" + WWApi_Version_FullMethodName = "/wwapi.v1.WWApi/Version" +) // WWApiClient is the client API for WWApi service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +// +// WWApi defines the wwapid service web interface. type WWApiClient interface { // ImageBuild builds zero or more images. ImageBuild(ctx context.Context, in *ImageBuildParameter, opts ...grpc.CallOption) (*ImageListResponse, error) @@ -62,8 +83,9 @@ func NewWWApiClient(cc grpc.ClientConnInterface) WWApiClient { } func (c *wWApiClient) ImageBuild(ctx context.Context, in *ImageBuildParameter, opts ...grpc.CallOption) (*ImageListResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ImageListResponse) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/ImageBuild", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_ImageBuild_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -71,8 +93,9 @@ func (c *wWApiClient) ImageBuild(ctx context.Context, in *ImageBuildParameter, o } func (c *wWApiClient) ImageDelete(ctx context.Context, in *ImageDeleteParameter, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/ImageDelete", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_ImageDelete_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -80,8 +103,9 @@ func (c *wWApiClient) ImageDelete(ctx context.Context, in *ImageDeleteParameter, } func (c *wWApiClient) ImageCopy(ctx context.Context, in *ImageCopyParameter, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/ImageCopy", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_ImageCopy_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -89,8 +113,9 @@ func (c *wWApiClient) ImageCopy(ctx context.Context, in *ImageCopyParameter, opt } func (c *wWApiClient) ImageImport(ctx context.Context, in *ImageImportParameter, opts ...grpc.CallOption) (*ImageListResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ImageListResponse) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/ImageImport", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_ImageImport_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -98,8 +123,9 @@ func (c *wWApiClient) ImageImport(ctx context.Context, in *ImageImportParameter, } func (c *wWApiClient) ImageList(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ImageListResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ImageListResponse) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/ImageList", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_ImageList_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -107,8 +133,9 @@ func (c *wWApiClient) ImageList(ctx context.Context, in *emptypb.Empty, opts ... } func (c *wWApiClient) ImageShow(ctx context.Context, in *ImageShowParameter, opts ...grpc.CallOption) (*ImageShowResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ImageShowResponse) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/ImageShow", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_ImageShow_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -116,8 +143,9 @@ func (c *wWApiClient) ImageShow(ctx context.Context, in *ImageShowParameter, opt } func (c *wWApiClient) ImageRename(ctx context.Context, in *ImageRenameParameter, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/ImageRename", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_ImageRename_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -125,8 +153,9 @@ func (c *wWApiClient) ImageRename(ctx context.Context, in *ImageRenameParameter, } func (c *wWApiClient) NodeAdd(ctx context.Context, in *NodeAddParameter, opts ...grpc.CallOption) (*NodeListResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(NodeListResponse) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/NodeAdd", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_NodeAdd_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -134,8 +163,9 @@ func (c *wWApiClient) NodeAdd(ctx context.Context, in *NodeAddParameter, opts .. } func (c *wWApiClient) NodeDelete(ctx context.Context, in *NodeDeleteParameter, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/NodeDelete", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_NodeDelete_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -143,8 +173,9 @@ func (c *wWApiClient) NodeDelete(ctx context.Context, in *NodeDeleteParameter, o } func (c *wWApiClient) NodeList(ctx context.Context, in *NodeNames, opts ...grpc.CallOption) (*NodeListResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(NodeListResponse) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/NodeList", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_NodeList_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -152,8 +183,9 @@ func (c *wWApiClient) NodeList(ctx context.Context, in *NodeNames, opts ...grpc. } func (c *wWApiClient) NodeSet(ctx context.Context, in *ConfSetParameter, opts ...grpc.CallOption) (*NodeListResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(NodeListResponse) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/NodeSet", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_NodeSet_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -161,8 +193,9 @@ func (c *wWApiClient) NodeSet(ctx context.Context, in *ConfSetParameter, opts .. } func (c *wWApiClient) NodeStatus(ctx context.Context, in *NodeNames, opts ...grpc.CallOption) (*NodeStatusResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(NodeStatusResponse) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/NodeStatus", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_NodeStatus_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -170,8 +203,9 @@ func (c *wWApiClient) NodeStatus(ctx context.Context, in *NodeNames, opts ...grp } func (c *wWApiClient) Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*VersionResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(VersionResponse) - err := c.cc.Invoke(ctx, "/wwapi.v1.WWApi/Version", in, out, opts...) + err := c.cc.Invoke(ctx, WWApi_Version_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -180,7 +214,9 @@ func (c *wWApiClient) Version(ctx context.Context, in *emptypb.Empty, opts ...gr // WWApiServer is the server API for WWApi service. // All implementations must embed UnimplementedWWApiServer -// for forward compatibility +// for forward compatibility. +// +// WWApi defines the wwapid service web interface. type WWApiServer interface { // ImageBuild builds zero or more images. ImageBuild(context.Context, *ImageBuildParameter) (*ImageListResponse, error) @@ -213,9 +249,12 @@ type WWApiServer interface { mustEmbedUnimplementedWWApiServer() } -// UnimplementedWWApiServer must be embedded to have forward compatible implementations. -type UnimplementedWWApiServer struct { -} +// UnimplementedWWApiServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedWWApiServer struct{} func (UnimplementedWWApiServer) ImageBuild(context.Context, *ImageBuildParameter) (*ImageListResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ImageBuild not implemented") @@ -257,6 +296,7 @@ func (UnimplementedWWApiServer) Version(context.Context, *emptypb.Empty) (*Versi return nil, status.Errorf(codes.Unimplemented, "method Version not implemented") } func (UnimplementedWWApiServer) mustEmbedUnimplementedWWApiServer() {} +func (UnimplementedWWApiServer) testEmbeddedByValue() {} // UnsafeWWApiServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to WWApiServer will @@ -266,6 +306,13 @@ type UnsafeWWApiServer interface { } func RegisterWWApiServer(s grpc.ServiceRegistrar, srv WWApiServer) { + // If the following call pancis, it indicates UnimplementedWWApiServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&WWApi_ServiceDesc, srv) } @@ -279,7 +326,7 @@ func _WWApi_ImageBuild_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/ImageBuild", + FullMethod: WWApi_ImageBuild_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).ImageBuild(ctx, req.(*ImageBuildParameter)) @@ -297,7 +344,7 @@ func _WWApi_ImageDelete_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/ImageDelete", + FullMethod: WWApi_ImageDelete_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).ImageDelete(ctx, req.(*ImageDeleteParameter)) @@ -315,7 +362,7 @@ func _WWApi_ImageCopy_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/ImageCopy", + FullMethod: WWApi_ImageCopy_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).ImageCopy(ctx, req.(*ImageCopyParameter)) @@ -333,7 +380,7 @@ func _WWApi_ImageImport_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/ImageImport", + FullMethod: WWApi_ImageImport_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).ImageImport(ctx, req.(*ImageImportParameter)) @@ -351,7 +398,7 @@ func _WWApi_ImageList_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/ImageList", + FullMethod: WWApi_ImageList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).ImageList(ctx, req.(*emptypb.Empty)) @@ -369,7 +416,7 @@ func _WWApi_ImageShow_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/ImageShow", + FullMethod: WWApi_ImageShow_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).ImageShow(ctx, req.(*ImageShowParameter)) @@ -387,7 +434,7 @@ func _WWApi_ImageRename_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/ImageRename", + FullMethod: WWApi_ImageRename_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).ImageRename(ctx, req.(*ImageRenameParameter)) @@ -405,7 +452,7 @@ func _WWApi_NodeAdd_Handler(srv interface{}, ctx context.Context, dec func(inter } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/NodeAdd", + FullMethod: WWApi_NodeAdd_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).NodeAdd(ctx, req.(*NodeAddParameter)) @@ -423,7 +470,7 @@ func _WWApi_NodeDelete_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/NodeDelete", + FullMethod: WWApi_NodeDelete_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).NodeDelete(ctx, req.(*NodeDeleteParameter)) @@ -441,7 +488,7 @@ func _WWApi_NodeList_Handler(srv interface{}, ctx context.Context, dec func(inte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/NodeList", + FullMethod: WWApi_NodeList_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).NodeList(ctx, req.(*NodeNames)) @@ -459,7 +506,7 @@ func _WWApi_NodeSet_Handler(srv interface{}, ctx context.Context, dec func(inter } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/NodeSet", + FullMethod: WWApi_NodeSet_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).NodeSet(ctx, req.(*ConfSetParameter)) @@ -477,7 +524,7 @@ func _WWApi_NodeStatus_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/NodeStatus", + FullMethod: WWApi_NodeStatus_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).NodeStatus(ctx, req.(*NodeNames)) @@ -495,7 +542,7 @@ func _WWApi_Version_Handler(srv interface{}, ctx context.Context, dec func(inter } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/wwapi.v1.WWApi/Version", + FullMethod: WWApi_Version_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(WWApiServer).Version(ctx, req.(*emptypb.Empty)) diff --git a/internal/pkg/config/buildconfig.go.in b/internal/pkg/config/buildconfig.go.in index 3d105aa7..b7cd2634 100644 --- a/internal/pkg/config/buildconfig.go.in +++ b/internal/pkg/config/buildconfig.go.in @@ -33,8 +33,8 @@ type TFTPConf struct { IpxeBinaries map[string]string `yaml:"ipxe,omitempty" default:"{\"00:09\": \"ipxe-snponly-x86_64.efi\",\"00:00\": \"undionly.kpxe\",\"00:0B\": \"arm64-efi/snponly.efi\",\"00:07\": \"ipxe-snponly-x86_64.efi\"}"` } -func (this TFTPConf) Enabled() bool { - return BoolP(this.EnabledP) +func (conf TFTPConf) Enabled() bool { + return BoolP(conf.EnabledP) } // WarewulfConf adds additional Warewulf-specific configuration to @@ -48,20 +48,20 @@ type WarewulfConf struct { GrubBootP *bool `yaml:"grubboot,omitempty" default:"false"` } -func (this WarewulfConf) Secure() bool { - return BoolP(this.SecureP) +func (conf WarewulfConf) Secure() bool { + return BoolP(conf.SecureP) } -func (this WarewulfConf) AutobuildOverlays() bool { - return BoolP(this.AutobuildOverlaysP) +func (conf WarewulfConf) AutobuildOverlays() bool { + return BoolP(conf.AutobuildOverlaysP) } -func (this WarewulfConf) EnableHostOverlay() bool { - return BoolP(this.EnableHostOverlayP) +func (conf WarewulfConf) EnableHostOverlay() bool { + return BoolP(conf.EnableHostOverlayP) } -func (this WarewulfConf) GrubBoot() bool { - return BoolP(this.GrubBootP) +func (conf WarewulfConf) GrubBoot() bool { + return BoolP(conf.GrubBootP) } func (paths BuildConfig) NodesConf() string { diff --git a/internal/pkg/config/dhcp.go b/internal/pkg/config/dhcp.go index 7149594d..a225b478 100644 --- a/internal/pkg/config/dhcp.go +++ b/internal/pkg/config/dhcp.go @@ -10,6 +10,6 @@ type DHCPConf struct { SystemdName string `yaml:"systemd name,omitempty" default:"dhcpd"` } -func (this DHCPConf) Enabled() bool { - return BoolP(this.EnabledP) +func (conf DHCPConf) Enabled() bool { + return BoolP(conf.EnabledP) } diff --git a/internal/pkg/config/mounts.go b/internal/pkg/config/mounts.go index 80e316cd..5eadfb0e 100644 --- a/internal/pkg/config/mounts.go +++ b/internal/pkg/config/mounts.go @@ -10,10 +10,10 @@ type MountEntry struct { CopyP *bool `yaml:"copy,omitempty"` // temporarily copy the file into the image } -func (this MountEntry) ReadOnly() bool { - return BoolP(this.ReadOnlyP) +func (mount MountEntry) ReadOnly() bool { + return BoolP(mount.ReadOnlyP) } -func (this MountEntry) Copy() bool { - return BoolP(this.CopyP) +func (mount MountEntry) Copy() bool { + return BoolP(mount.CopyP) } diff --git a/internal/pkg/config/nfs.go b/internal/pkg/config/nfs.go index 97babbc2..9b4f118a 100644 --- a/internal/pkg/config/nfs.go +++ b/internal/pkg/config/nfs.go @@ -13,8 +13,8 @@ type NFSConf struct { SystemdName string `yaml:"systemd name,omitempty" default:"nfsd"` } -func (this NFSConf) Enabled() bool { - return BoolP(this.EnabledP) +func (conf NFSConf) Enabled() bool { + return BoolP(conf.EnabledP) } // An NFSExportConf reprents a single NFS export / mount. diff --git a/internal/pkg/image/build.go b/internal/pkg/image/build.go index 7ae942da..a7b49731 100644 --- a/internal/pkg/image/build.go +++ b/internal/pkg/image/build.go @@ -34,7 +34,7 @@ func Build(name string, buildForce bool) error { var err error ignore, err = util.ReadFile(excludes_file) if err != nil { - return fmt.Errorf("Failed creating directory: %s: %w", imagePath, err) + return fmt.Errorf("failed creating directory: %s: %w", imagePath, err) } } diff --git a/internal/pkg/image/initramfs.go b/internal/pkg/image/initramfs.go index 230dac38..85a69010 100644 --- a/internal/pkg/image/initramfs.go +++ b/internal/pkg/image/initramfs.go @@ -28,8 +28,8 @@ type Initramfs struct { imageName string } -func (this *Initramfs) version() *version.Version { - matches := versionPattern.FindAllString(this.Path, -1) +func (initrd *Initramfs) version() *version.Version { + matches := versionPattern.FindAllString(initrd.Path, -1) for i := len(matches) - 1; i >= 0; i-- { if version_, err := version.NewVersion(strings.TrimSuffix(matches[i], ".")); err == nil { return version_ @@ -38,8 +38,8 @@ func (this *Initramfs) version() *version.Version { return nil } -func (this *Initramfs) Version() string { - version := this.version() +func (initrd *Initramfs) Version() string { + version := initrd.version() if version == nil { return "" } else { @@ -47,9 +47,9 @@ func (this *Initramfs) Version() string { } } -func (this *Initramfs) FullPath() string { - root := RootFsDir(this.imageName) - return filepath.Join(root, this.Path) +func (initrd *Initramfs) FullPath() string { + root := RootFsDir(initrd.imageName) + return filepath.Join(root, initrd.Path) } func FindInitramfsFromPattern(imageName string, version string, pattern string) (initramfs *Initramfs) { diff --git a/internal/pkg/kernel/kernel.go b/internal/pkg/kernel/kernel.go index 31408c64..7fb26199 100644 --- a/internal/pkg/kernel/kernel.go +++ b/internal/pkg/kernel/kernel.go @@ -126,12 +126,12 @@ func FindAllKernels() (kernels collection) { return kernels } -func (this *Kernel) version() *version.Version { - return util.ParseVersion(this.Path) +func (kernel *Kernel) version() *version.Version { + return util.ParseVersion(kernel.Path) } -func (this *Kernel) Version() string { - version := this.version() +func (kernel *Kernel) Version() string { + version := kernel.version() if version == nil { return "" } else { @@ -139,15 +139,15 @@ func (this *Kernel) Version() string { } } -func (this *Kernel) IsDebug() bool { - return strings.Contains(this.Path, "+debug") +func (kernel *Kernel) IsDebug() bool { + return strings.Contains(kernel.Path, "+debug") } -func (this *Kernel) IsRescue() bool { - return strings.Contains(this.Path, "-rescue") +func (kernel *Kernel) IsRescue() bool { + return strings.Contains(kernel.Path, "-rescue") } -func (this *Kernel) FullPath() string { - root := image.RootFsDir(this.ImageName) - return filepath.Join(root, this.Path) +func (kernel *Kernel) FullPath() string { + root := image.RootFsDir(kernel.ImageName) + return filepath.Join(root, kernel.Path) } diff --git a/internal/pkg/upgrade/config.go b/internal/pkg/upgrade/config.go index a41116bd..212410e8 100644 --- a/internal/pkg/upgrade/config.go +++ b/internal/pkg/upgrade/config.go @@ -35,54 +35,54 @@ type WarewulfYaml struct { WWClient *WWClientConf `yaml:"wwclient"` } -func (this *WarewulfYaml) Upgrade() (upgraded *config.WarewulfYaml) { +func (legacy *WarewulfYaml) Upgrade() (upgraded *config.WarewulfYaml) { upgraded = new(config.WarewulfYaml) - if this.WWInternal != "" { - logIgnore("WW_INTERNAL", this.WWInternal, "obsolete") + if legacy.WWInternal != "" { + logIgnore("WW_INTERNAL", legacy.WWInternal, "obsolete") } - upgraded.Comment = this.Comment - upgraded.Ipaddr = this.Ipaddr - upgraded.Ipaddr6 = this.Ipaddr6 - upgraded.Netmask = this.Netmask - upgraded.Network = this.Network - upgraded.Ipv6net = this.Ipv6net - upgraded.Fqdn = this.Fqdn - if this.Warewulf != nil { - upgraded.Warewulf = this.Warewulf.Upgrade() + upgraded.Comment = legacy.Comment + upgraded.Ipaddr = legacy.Ipaddr + upgraded.Ipaddr6 = legacy.Ipaddr6 + upgraded.Netmask = legacy.Netmask + upgraded.Network = legacy.Network + upgraded.Ipv6net = legacy.Ipv6net + upgraded.Fqdn = legacy.Fqdn + if legacy.Warewulf != nil { + upgraded.Warewulf = legacy.Warewulf.Upgrade() } - if this.DHCP != nil { - upgraded.DHCP = this.DHCP.Upgrade() + if legacy.DHCP != nil { + upgraded.DHCP = legacy.DHCP.Upgrade() } - if this.TFTP != nil { - upgraded.TFTP = this.TFTP.Upgrade() + if legacy.TFTP != nil { + upgraded.TFTP = legacy.TFTP.Upgrade() } - if this.NFS != nil { - upgraded.NFS = this.NFS.Upgrade() + if legacy.NFS != nil { + upgraded.NFS = legacy.NFS.Upgrade() } - if this.SSH != nil { - upgraded.SSH = this.SSH.Upgrade() + if legacy.SSH != nil { + upgraded.SSH = legacy.SSH.Upgrade() } upgraded.MountsImage = make([]*config.MountEntry, 0) - for _, mount := range this.MountsImage { + for _, mount := range legacy.MountsImage { upgraded.MountsImage = append(upgraded.MountsImage, mount.Upgrade()) } if len(upgraded.MountsImage) == 0 { - for _, mount := range this.MountsContainer { + for _, mount := range legacy.MountsContainer { upgraded.MountsImage = append(upgraded.MountsImage, mount.Upgrade()) } } - if this.Paths != nil { - upgraded.Paths = this.Paths.Upgrade() + if legacy.Paths != nil { + upgraded.Paths = legacy.Paths.Upgrade() } - if this.WWClient != nil { - upgraded.WWClient = this.WWClient.Upgrade() + if legacy.WWClient != nil { + upgraded.WWClient = legacy.WWClient.Upgrade() } - if this.Warewulf != nil && this.Warewulf.DataStore != "" { + if legacy.Warewulf != nil && legacy.Warewulf.DataStore != "" { if upgraded.Paths == nil { upgraded.Paths = new(config.BuildConfig) } if upgraded.Paths.Datadir == "" { - upgraded.Paths.Datadir = this.Warewulf.DataStore + upgraded.Paths.Datadir = legacy.Warewulf.DataStore } } return upgraded @@ -99,17 +99,17 @@ type WarewulfConf struct { GrubBoot *bool `yaml:"grubboot"` } -func (this *WarewulfConf) Upgrade() (upgraded *config.WarewulfConf) { +func (legacy *WarewulfConf) Upgrade() (upgraded *config.WarewulfConf) { upgraded = new(config.WarewulfConf) - upgraded.Port = this.Port - upgraded.SecureP = this.Secure - upgraded.UpdateInterval = this.UpdateInterval - upgraded.AutobuildOverlaysP = this.AutobuildOverlays - upgraded.EnableHostOverlayP = this.EnableHostOverlay - if this.Syslog != nil { + upgraded.Port = legacy.Port + upgraded.SecureP = legacy.Secure + upgraded.UpdateInterval = legacy.UpdateInterval + upgraded.AutobuildOverlaysP = legacy.AutobuildOverlays + upgraded.EnableHostOverlayP = legacy.EnableHostOverlay + if legacy.Syslog != nil { wwlog.Warn("syslog configuration ignored: all logs now go to stdout/stderr") } - upgraded.GrubBootP = this.GrubBoot + upgraded.GrubBootP = legacy.GrubBoot return upgraded } @@ -121,13 +121,13 @@ type DHCPConf struct { SystemdName string `yaml:"systemd name"` } -func (this *DHCPConf) Upgrade() (upgraded *config.DHCPConf) { +func (legacy *DHCPConf) Upgrade() (upgraded *config.DHCPConf) { upgraded = new(config.DHCPConf) - upgraded.EnabledP = this.Enabled - upgraded.Template = this.Template - upgraded.RangeStart = this.RangeStart - upgraded.RangeEnd = this.RangeEnd - upgraded.SystemdName = this.SystemdName + upgraded.EnabledP = legacy.Enabled + upgraded.Template = legacy.Template + upgraded.RangeStart = legacy.RangeStart + upgraded.RangeEnd = legacy.RangeEnd + upgraded.SystemdName = legacy.SystemdName return upgraded } @@ -138,13 +138,13 @@ type TFTPConf struct { IpxeBinaries map[string]string `yaml:"ipxe"` } -func (this *TFTPConf) Upgrade() (upgraded *config.TFTPConf) { +func (legacy *TFTPConf) Upgrade() (upgraded *config.TFTPConf) { upgraded = new(config.TFTPConf) - upgraded.EnabledP = this.Enabled - upgraded.TftpRoot = this.TftpRoot - upgraded.SystemdName = this.SystemdName + upgraded.EnabledP = legacy.Enabled + upgraded.TftpRoot = legacy.TftpRoot + upgraded.SystemdName = legacy.SystemdName upgraded.IpxeBinaries = make(map[string]string) - for name, binary := range this.IpxeBinaries { + for name, binary := range legacy.IpxeBinaries { upgraded.IpxeBinaries[name] = binary } return upgraded @@ -157,19 +157,19 @@ type NFSConf struct { SystemdName string `yaml:"systemd name"` } -func (this *NFSConf) Upgrade() (upgraded *config.NFSConf) { +func (legacy *NFSConf) Upgrade() (upgraded *config.NFSConf) { upgraded = new(config.NFSConf) - upgraded.EnabledP = this.Enabled + upgraded.EnabledP = legacy.Enabled upgraded.ExportsExtended = make([]*config.NFSExportConf, 0) - for _, export := range this.Exports { + for _, export := range legacy.Exports { extendedExport := new(config.NFSExportConf) extendedExport.Path = export upgraded.ExportsExtended = append(upgraded.ExportsExtended, extendedExport) } - for _, export := range this.ExportsExtended { + for _, export := range legacy.ExportsExtended { upgraded.ExportsExtended = append(upgraded.ExportsExtended, export.Upgrade()) } - upgraded.SystemdName = this.SystemdName + upgraded.SystemdName = legacy.SystemdName return upgraded } @@ -180,12 +180,12 @@ type NFSExportConf struct { Mount *bool `yaml:"mount"` } -func (this *NFSExportConf) Upgrade() (upgraded *config.NFSExportConf) { +func (legacy *NFSExportConf) Upgrade() (upgraded *config.NFSExportConf) { upgraded = new(config.NFSExportConf) - upgraded.Path = this.Path - upgraded.ExportOptions = this.ExportOptions - if this.Mount != nil && *(this.Mount) { - wwlog.Warn("Legacy mount configured for NFS export %s: use `wwctl upgrade nodes --with-warewulfconf=` to port to nodes.conf", this.Path) + upgraded.Path = legacy.Path + upgraded.ExportOptions = legacy.ExportOptions + if legacy.Mount != nil && *(legacy.Mount) { + wwlog.Warn("Legacy mount configured for NFS export %s: use `wwctl upgrade nodes --with-warewulfconf=` to port to nodes.conf", legacy.Path) } return upgraded } @@ -194,9 +194,9 @@ type SSHConf struct { KeyTypes []string `yaml:"key types"` } -func (this *SSHConf) Upgrade() (upgraded *config.SSHConf) { +func (legacy *SSHConf) Upgrade() (upgraded *config.SSHConf) { upgraded = new(config.SSHConf) - upgraded.KeyTypes = append([]string{}, this.KeyTypes...) + upgraded.KeyTypes = append([]string{}, legacy.KeyTypes...) return upgraded } @@ -208,13 +208,13 @@ type MountEntry struct { Copy *bool `yaml:"copy"` } -func (this *MountEntry) Upgrade() (upgraded *config.MountEntry) { +func (legacy *MountEntry) Upgrade() (upgraded *config.MountEntry) { upgraded = new(config.MountEntry) - upgraded.Source = this.Source - upgraded.Dest = this.Dest - upgraded.ReadOnlyP = this.ReadOnly - upgraded.Options = this.Options - upgraded.CopyP = this.Copy + upgraded.Source = legacy.Source + upgraded.Dest = legacy.Dest + upgraded.ReadOnlyP = legacy.ReadOnly + upgraded.Options = legacy.Options + upgraded.CopyP = legacy.Copy return upgraded } @@ -234,20 +234,20 @@ type BuildConfig struct { WWClientdir string } -func (this *BuildConfig) Upgrade() (upgraded *config.BuildConfig) { +func (legacy *BuildConfig) Upgrade() (upgraded *config.BuildConfig) { upgraded = new(config.BuildConfig) - upgraded.Bindir = this.Bindir - upgraded.Sysconfdir = this.Sysconfdir - upgraded.Localstatedir = this.Localstatedir - upgraded.Cachedir = this.Cachedir - upgraded.Ipxesource = this.Ipxesource - upgraded.Srvdir = this.Srvdir - upgraded.Firewallddir = this.Firewallddir - upgraded.Datadir = this.Datadir - upgraded.WWOverlaydir = this.WWOverlaydir - upgraded.WWChrootdir = this.WWChrootdir - upgraded.WWProvisiondir = this.WWProvisiondir - upgraded.WWClientdir = this.WWClientdir + upgraded.Bindir = legacy.Bindir + upgraded.Sysconfdir = legacy.Sysconfdir + upgraded.Localstatedir = legacy.Localstatedir + upgraded.Cachedir = legacy.Cachedir + upgraded.Ipxesource = legacy.Ipxesource + upgraded.Srvdir = legacy.Srvdir + upgraded.Firewallddir = legacy.Firewallddir + upgraded.Datadir = legacy.Datadir + upgraded.WWOverlaydir = legacy.WWOverlaydir + upgraded.WWChrootdir = legacy.WWChrootdir + upgraded.WWProvisiondir = legacy.WWProvisiondir + upgraded.WWClientdir = legacy.WWClientdir return upgraded } @@ -255,8 +255,8 @@ type WWClientConf struct { Port uint16 `yaml:"port"` } -func (this *WWClientConf) Upgrade() (upgraded *config.WWClientConf) { +func (legacy *WWClientConf) Upgrade() (upgraded *config.WWClientConf) { upgraded = new(config.WWClientConf) - upgraded.Port = this.Port + upgraded.Port = legacy.Port return upgraded } diff --git a/internal/pkg/upgrade/node.go b/internal/pkg/upgrade/node.go index 64360bb6..8ca0b287 100644 --- a/internal/pkg/upgrade/node.go +++ b/internal/pkg/upgrade/node.go @@ -51,17 +51,17 @@ type NodesYaml struct { Nodes map[string]*Node } -func (this *NodesYaml) Upgrade(addDefaults bool, replaceOverlays bool, warewulfconf *WarewulfYaml) (upgraded *node.NodesYaml) { +func (legacy *NodesYaml) Upgrade(addDefaults bool, replaceOverlays bool, warewulfconf *WarewulfYaml) (upgraded *node.NodesYaml) { upgraded = new(node.NodesYaml) upgraded.NodeProfiles = make(map[string]*node.Profile) upgraded.Nodes = make(map[string]*node.Node) - if this.WWInternal != "" { - logIgnore("WW_INTERNAL", this.WWInternal, "obsolete") + if legacy.WWInternal != "" { + logIgnore("WW_INTERNAL", legacy.WWInternal, "obsolete") } - for name, profile := range this.NodeProfiles { + for name, profile := range legacy.NodeProfiles { upgraded.NodeProfiles[name] = profile.Upgrade(addDefaults, replaceOverlays) } - for name, node := range this.Nodes { + for name, node := range legacy.Nodes { upgraded.Nodes[name] = node.Upgrade(addDefaults, replaceOverlays) if addDefaults && !util.InSlice(upgraded.Nodes[name].Profiles, "default") { wwlog.Warn("node %s does not include the default profile: verify default settings manually", name) @@ -142,7 +142,7 @@ type Node struct { Profile `yaml:"-,inline"` } -func (this *Node) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *node.Node) { +func (legacy *Node) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *node.Node) { upgraded = new(node.Node) upgraded.Tags = make(map[string]string) upgraded.Disks = make(map[string]*node.Disk) @@ -150,80 +150,80 @@ func (this *Node) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *nod upgraded.Ipmi = new(node.IpmiConf) upgraded.Kernel = new(node.KernelConf) upgraded.NetDevs = make(map[string]*node.NetDev) - upgraded.AssetKey = this.AssetKey - upgraded.ClusterName = this.ClusterName - upgraded.Comment = this.Comment - upgraded.ImageName = this.ImageName + upgraded.AssetKey = legacy.AssetKey + upgraded.ClusterName = legacy.ClusterName + upgraded.Comment = legacy.Comment + upgraded.ImageName = legacy.ImageName if upgraded.ImageName == "" { - upgraded.ImageName = this.ContainerName + upgraded.ImageName = legacy.ContainerName } - if this.Disabled != "" { - logIgnore("Disabled", this.Disabled, "obsolete") + if legacy.Disabled != "" { + logIgnore("Disabled", legacy.Disabled, "obsolete") } - if this.Discoverable != "" { - warnError(upgraded.Discoverable.Set(this.Discoverable)) + if legacy.Discoverable != "" { + warnError(upgraded.Discoverable.Set(legacy.Discoverable)) } - if this.Disks != nil { - for name, disk := range this.Disks { + if legacy.Disks != nil { + for name, disk := range legacy.Disks { upgraded.Disks[name] = disk.Upgrade() } } - if this.FileSystems != nil { - for name, fileSystem := range this.FileSystems { + if legacy.FileSystems != nil { + for name, fileSystem := range legacy.FileSystems { upgraded.FileSystems[name] = fileSystem.Upgrade() } } - upgraded.Init = this.Init - if this.Ipmi != nil { - upgraded.Ipmi = this.Ipmi.Upgrade() + upgraded.Init = legacy.Init + if legacy.Ipmi != nil { + upgraded.Ipmi = legacy.Ipmi.Upgrade() } else { upgraded.Ipmi = new(node.IpmiConf) } if upgraded.Ipmi.EscapeChar == "" { - upgraded.Ipmi.EscapeChar = this.IpmiEscapeChar + upgraded.Ipmi.EscapeChar = legacy.IpmiEscapeChar } if upgraded.Ipmi.Gateway.Equal(net.IP{}) { - upgraded.Ipmi.Gateway = net.ParseIP(this.IpmiGateway) + upgraded.Ipmi.Gateway = net.ParseIP(legacy.IpmiGateway) } if upgraded.Ipmi.Interface == "" { - upgraded.Ipmi.Interface = this.IpmiInterface + upgraded.Ipmi.Interface = legacy.IpmiInterface } if upgraded.Ipmi.Ipaddr.Equal(net.IP{}) { - upgraded.Ipmi.Ipaddr = net.ParseIP(this.IpmiIpaddr) + upgraded.Ipmi.Ipaddr = net.ParseIP(legacy.IpmiIpaddr) } if upgraded.Ipmi.Netmask.Equal(net.IP{}) { - upgraded.Ipmi.Netmask = net.ParseIP(this.IpmiNetmask) + upgraded.Ipmi.Netmask = net.ParseIP(legacy.IpmiNetmask) } if upgraded.Ipmi.Password == "" { - upgraded.Ipmi.Password = this.IpmiPassword + upgraded.Ipmi.Password = legacy.IpmiPassword } if upgraded.Ipmi.Port == "" { - upgraded.Ipmi.Port = this.IpmiPort + upgraded.Ipmi.Port = legacy.IpmiPort } if upgraded.Ipmi.UserName == "" { - upgraded.Ipmi.UserName = this.IpmiUserName + upgraded.Ipmi.UserName = legacy.IpmiUserName } - if upgraded.Ipmi.Write == "" && this.IpmiWrite != "" { - warnError(upgraded.Ipmi.Write.Set(this.IpmiWrite)) + if upgraded.Ipmi.Write == "" && legacy.IpmiWrite != "" { + warnError(upgraded.Ipmi.Write.Set(legacy.IpmiWrite)) } - upgraded.Ipxe = this.Ipxe - if this.Kernel != nil { - upgraded.Kernel = this.Kernel.Upgrade(upgraded.ImageName) + upgraded.Ipxe = legacy.Ipxe + if legacy.Kernel != nil { + upgraded.Kernel = legacy.Kernel.Upgrade(upgraded.ImageName) } else { inlineKernel := &KernelConf{ - Args: this.KernelArgs, - Version: this.KernelVersion, - Override: this.KernelOverride, + Args: legacy.KernelArgs, + Version: legacy.KernelVersion, + Override: legacy.KernelOverride, } upgraded.Kernel = inlineKernel.Upgrade(upgraded.ImageName) } - if this.Keys != nil { - for key, value := range this.Keys { + if legacy.Keys != nil { + for key, value := range legacy.Keys { upgraded.Tags[key] = value } } - if this.NetDevs != nil { - for name, netDev := range this.NetDevs { + if legacy.NetDevs != nil { + for name, netDev := range legacy.NetDevs { upgraded.NetDevs[name] = netDev.Upgrade(false) if addDefaults { if upgraded.NetDevs[name].Type == "" { @@ -235,10 +235,10 @@ func (this *Node) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *nod } } } - if this.PrimaryNetDev != "" { - upgraded.PrimaryNetDev = this.PrimaryNetDev + if legacy.PrimaryNetDev != "" { + upgraded.PrimaryNetDev = legacy.PrimaryNetDev } else { - for name, netDev := range this.NetDevs { + for name, netDev := range legacy.NetDevs { if b, _ := strconv.ParseBool(netDev.Primary); b { upgraded.PrimaryNetDev = name break @@ -248,15 +248,15 @@ func (this *Node) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *nod } } } - upgraded.Profiles = append(upgraded.Profiles, this.Profiles...) + upgraded.Profiles = append(upgraded.Profiles, legacy.Profiles...) if addDefaults { if len(upgraded.Profiles) == 0 { upgraded.Profiles = append(upgraded.Profiles, "default") } } - upgraded.Root = this.Root - if this.RuntimeOverlay != nil { - switch overlay := this.RuntimeOverlay.(type) { + upgraded.Root = legacy.Root + if legacy.RuntimeOverlay != nil { + switch overlay := legacy.RuntimeOverlay.(type) { case string: upgraded.RuntimeOverlay = append(upgraded.RuntimeOverlay, strings.Split(overlay, ",")...) case []interface{}: @@ -267,8 +267,8 @@ func (this *Node) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *nod wwlog.Error("unparsable RuntimeOverlay: %v", overlay) } } - if this.SystemOverlay != nil { - switch overlay := this.SystemOverlay.(type) { + if legacy.SystemOverlay != nil { + switch overlay := legacy.SystemOverlay.(type) { case string: upgraded.SystemOverlay = append(upgraded.SystemOverlay, strings.Split(overlay, ",")...) case []interface{}: @@ -293,12 +293,12 @@ func (this *Node) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *nod genericSplitOverlays) } } - if this.Tags != nil { - for key, value := range this.Tags { + if legacy.Tags != nil { + for key, value := range legacy.Tags { upgraded.Tags[key] = value } } - for _, tag := range this.TagsDel { + for _, tag := range legacy.TagsDel { delete(upgraded.Tags, tag) } return @@ -341,97 +341,97 @@ type Profile struct { TagsDel []string `yaml:"tagsdel,omitempty"` } -func (this *Profile) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *node.Profile) { +func (legacy *Profile) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *node.Profile) { upgraded = new(node.Profile) upgraded.Tags = make(map[string]string) upgraded.Disks = make(map[string]*node.Disk) upgraded.FileSystems = make(map[string]*node.FileSystem) upgraded.Kernel = new(node.KernelConf) upgraded.NetDevs = make(map[string]*node.NetDev) - if this.AssetKey != "" { - logIgnore("AssetKey", this.AssetKey, "invalid for profiles") + if legacy.AssetKey != "" { + logIgnore("AssetKey", legacy.AssetKey, "invalid for profiles") } - upgraded.ClusterName = this.ClusterName - upgraded.Comment = this.Comment - upgraded.ImageName = this.ImageName + upgraded.ClusterName = legacy.ClusterName + upgraded.Comment = legacy.Comment + upgraded.ImageName = legacy.ImageName if upgraded.ImageName == "" { - upgraded.ImageName = this.ContainerName + upgraded.ImageName = legacy.ContainerName } - if this.Disabled != "" { - logIgnore("Disabled", this.Disabled, "obsolete") + if legacy.Disabled != "" { + logIgnore("Disabled", legacy.Disabled, "obsolete") } - if this.Discoverable != "" { - logIgnore("Discoverable", this.Discoverable, "invalid for profiles") + if legacy.Discoverable != "" { + logIgnore("Discoverable", legacy.Discoverable, "invalid for profiles") } - if this.Disks != nil { - for name, disk := range this.Disks { + if legacy.Disks != nil { + for name, disk := range legacy.Disks { upgraded.Disks[name] = disk.Upgrade() } } - if this.FileSystems != nil { - for name, fileSystem := range this.FileSystems { + if legacy.FileSystems != nil { + for name, fileSystem := range legacy.FileSystems { upgraded.FileSystems[name] = fileSystem.Upgrade() } } - upgraded.Init = this.Init + upgraded.Init = legacy.Init upgraded.Ipmi = new(node.IpmiConf) - if this.Ipmi != nil { - upgraded.Ipmi = this.Ipmi.Upgrade() + if legacy.Ipmi != nil { + upgraded.Ipmi = legacy.Ipmi.Upgrade() } else { upgraded.Ipmi = new(node.IpmiConf) } if upgraded.Ipmi.EscapeChar == "" { - upgraded.Ipmi.EscapeChar = this.IpmiEscapeChar + upgraded.Ipmi.EscapeChar = legacy.IpmiEscapeChar } if upgraded.Ipmi.Gateway.Equal(net.IP{}) { - upgraded.Ipmi.Gateway = net.ParseIP(this.IpmiGateway) + upgraded.Ipmi.Gateway = net.ParseIP(legacy.IpmiGateway) } if upgraded.Ipmi.Interface == "" { - upgraded.Ipmi.Interface = this.IpmiInterface + upgraded.Ipmi.Interface = legacy.IpmiInterface } if upgraded.Ipmi.Ipaddr.Equal(net.IP{}) { - upgraded.Ipmi.Ipaddr = net.ParseIP(this.IpmiIpaddr) + upgraded.Ipmi.Ipaddr = net.ParseIP(legacy.IpmiIpaddr) } if upgraded.Ipmi.Netmask.Equal(net.IP{}) { - upgraded.Ipmi.Netmask = net.ParseIP(this.IpmiNetmask) + upgraded.Ipmi.Netmask = net.ParseIP(legacy.IpmiNetmask) } if upgraded.Ipmi.Password == "" { - upgraded.Ipmi.Password = this.IpmiPassword + upgraded.Ipmi.Password = legacy.IpmiPassword } if upgraded.Ipmi.Port == "" { - upgraded.Ipmi.Port = this.IpmiPort + upgraded.Ipmi.Port = legacy.IpmiPort } if upgraded.Ipmi.UserName == "" { - upgraded.Ipmi.UserName = this.IpmiUserName + upgraded.Ipmi.UserName = legacy.IpmiUserName } - if upgraded.Ipmi.Write == "" && this.IpmiWrite != "" { - warnError(upgraded.Ipmi.Write.Set(this.IpmiWrite)) + if upgraded.Ipmi.Write == "" && legacy.IpmiWrite != "" { + warnError(upgraded.Ipmi.Write.Set(legacy.IpmiWrite)) } - upgraded.Ipxe = this.Ipxe - if this.Kernel != nil { - upgraded.Kernel = this.Kernel.Upgrade(upgraded.ImageName) + upgraded.Ipxe = legacy.Ipxe + if legacy.Kernel != nil { + upgraded.Kernel = legacy.Kernel.Upgrade(upgraded.ImageName) } else { inlineKernel := &KernelConf{ - Args: this.KernelArgs, - Version: this.KernelVersion, - Override: this.KernelOverride, + Args: legacy.KernelArgs, + Version: legacy.KernelVersion, + Override: legacy.KernelOverride, } upgraded.Kernel = inlineKernel.Upgrade(upgraded.ImageName) } - if this.Keys != nil { - for key, value := range this.Keys { + if legacy.Keys != nil { + for key, value := range legacy.Keys { upgraded.Tags[key] = value } } - if this.NetDevs != nil { - for name, netDev := range this.NetDevs { + if legacy.NetDevs != nil { + for name, netDev := range legacy.NetDevs { upgraded.NetDevs[name] = netDev.Upgrade(addDefaults) } } - if this.PrimaryNetDev != "" { - upgraded.PrimaryNetDev = this.PrimaryNetDev + if legacy.PrimaryNetDev != "" { + upgraded.PrimaryNetDev = legacy.PrimaryNetDev } else { - for name, netDev := range this.NetDevs { + for name, netDev := range legacy.NetDevs { if b, _ := strconv.ParseBool(netDev.Primary); b { upgraded.PrimaryNetDev = name break @@ -442,11 +442,11 @@ func (this *Profile) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded * } } if upgraded.Profiles == nil { - upgraded.Profiles = append(upgraded.Profiles, this.Profiles...) + upgraded.Profiles = append(upgraded.Profiles, legacy.Profiles...) } - upgraded.Root = this.Root - if this.RuntimeOverlay != nil { - switch overlay := this.RuntimeOverlay.(type) { + upgraded.Root = legacy.Root + if legacy.RuntimeOverlay != nil { + switch overlay := legacy.RuntimeOverlay.(type) { case string: upgraded.RuntimeOverlay = append(upgraded.RuntimeOverlay, strings.Split(overlay, ",")...) case []interface{}: @@ -457,8 +457,8 @@ func (this *Profile) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded * wwlog.Error("unparsable RuntimeOverlay: %v", overlay) } } - if this.SystemOverlay != nil { - switch overlay := this.SystemOverlay.(type) { + if legacy.SystemOverlay != nil { + switch overlay := legacy.SystemOverlay.(type) { case string: upgraded.SystemOverlay = append(upgraded.SystemOverlay, strings.Split(overlay, ",")...) case []interface{}: @@ -483,12 +483,12 @@ func (this *Profile) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded * genericSplitOverlays) } } - if this.Tags != nil { - for key, value := range this.Tags { + if legacy.Tags != nil { + for key, value := range legacy.Tags { upgraded.Tags[key] = value } } - for _, tag := range this.TagsDel { + for _, tag := range legacy.TagsDel { delete(upgraded.Tags, tag) } return @@ -508,27 +508,27 @@ type IpmiConf struct { Write string `yaml:"write,omitempty"` } -func (this *IpmiConf) Upgrade() (upgraded *node.IpmiConf) { +func (legacy *IpmiConf) Upgrade() (upgraded *node.IpmiConf) { upgraded = new(node.IpmiConf) upgraded.Tags = make(map[string]string) - upgraded.EscapeChar = this.EscapeChar - upgraded.Gateway = net.ParseIP(this.Gateway) - upgraded.Interface = this.Interface - upgraded.Ipaddr = net.ParseIP(this.Ipaddr) - upgraded.Netmask = net.ParseIP(this.Netmask) - upgraded.Password = this.Password - upgraded.Port = this.Port - if this.Tags != nil { - for key, value := range this.Tags { + upgraded.EscapeChar = legacy.EscapeChar + upgraded.Gateway = net.ParseIP(legacy.Gateway) + upgraded.Interface = legacy.Interface + upgraded.Ipaddr = net.ParseIP(legacy.Ipaddr) + upgraded.Netmask = net.ParseIP(legacy.Netmask) + upgraded.Password = legacy.Password + upgraded.Port = legacy.Port + if legacy.Tags != nil { + for key, value := range legacy.Tags { upgraded.Tags[key] = value } } - for _, tag := range this.TagsDel { + for _, tag := range legacy.TagsDel { delete(upgraded.Tags, tag) } - upgraded.UserName = this.UserName - if this.Write != "" { - warnError(upgraded.Write.Set(this.Write)) + upgraded.UserName = legacy.UserName + if legacy.Write != "" { + warnError(upgraded.Write.Set(legacy.Write)) } return } @@ -539,9 +539,9 @@ type KernelConf struct { Version string `yaml:"version,omitempty"` } -func (this *KernelConf) Upgrade(imageName string) (upgraded *node.KernelConf) { +func (legacy *KernelConf) Upgrade(imageName string) (upgraded *node.KernelConf) { upgraded = new(node.KernelConf) - switch args := this.Args.(type) { + switch args := legacy.Args.(type) { case []string: upgraded.Args = args case string: @@ -549,32 +549,32 @@ func (this *KernelConf) Upgrade(imageName string) (upgraded *node.KernelConf) { upgraded.Args = strings.Fields(args) } default: - wwlog.Warn("unable to parse Kernel.Args: %v", this.Args) + wwlog.Warn("unable to parse Kernel.Args: %v", legacy.Args) } kernels := kernel.FindKernels(imageName) wwlog.Debug("referencing kernels: %v (imageName: %v)", kernels, imageName) - if this.Override != "" { - if version := util.ParseVersion(legacyKernelVersion(this.Override)); version != nil { + if legacy.Override != "" { + if version := util.ParseVersion(legacyKernelVersion(legacy.Override)); version != nil { for _, kernel_ := range kernels { - wwlog.Debug("checking if kernel '%v' version '%v' from image '%v' matches override '%v'", kernel_, kernel_.Version(), imageName, this.Override) + wwlog.Debug("checking if kernel '%v' version '%v' from image '%v' matches override '%v'", kernel_, kernel_.Version(), imageName, legacy.Override) if kernel_.Version() == version.String() { upgraded.Version = kernel_.Path - wwlog.Info("kernel override %v -> version %v (image %v)", this.Override, upgraded.Version, imageName) + wwlog.Info("kernel override %v -> version %v (image %v)", legacy.Override, upgraded.Version, imageName) } } - } else if util.IsFile((&kernel.Kernel{ImageName: imageName, Path: this.Override}).FullPath()) { - upgraded.Version = this.Override + } else if util.IsFile((&kernel.Kernel{ImageName: imageName, Path: legacy.Override}).FullPath()) { + upgraded.Version = legacy.Override } if upgraded.Version == "" { imageDisplay := "unknown" if imageName != "" { imageDisplay = imageName } - wwlog.Warn("unable to resolve kernel override %v (image %v)", this.Override, imageDisplay) + wwlog.Warn("unable to resolve kernel override %v (image %v)", legacy.Override, imageDisplay) } } if upgraded.Version == "" { - upgraded.Version = this.Version + upgraded.Version = legacy.Version } return } @@ -597,20 +597,20 @@ type NetDev struct { Type string `yaml:"type,omitempty"` } -func (this *NetDev) Upgrade(addDefaults bool) (upgraded *node.NetDev) { +func (legacy *NetDev) Upgrade(addDefaults bool) (upgraded *node.NetDev) { upgraded = new(node.NetDev) upgraded.Tags = make(map[string]string) - upgraded.Device = this.Device - upgraded.Gateway = net.ParseIP(this.Gateway) - upgraded.Hwaddr = this.Hwaddr - upgraded.Ipaddr = net.ParseIP(this.Ipaddr) - upgraded.Ipaddr6 = net.ParseIP(this.Ipaddr6) - upgraded.MTU = this.MTU - upgraded.Netmask = net.ParseIP(this.Netmask) - if this.IpCIDR != "" { - cidrIP, cidrIPNet, err := net.ParseCIDR(this.IpCIDR) + upgraded.Device = legacy.Device + upgraded.Gateway = net.ParseIP(legacy.Gateway) + upgraded.Hwaddr = legacy.Hwaddr + upgraded.Ipaddr = net.ParseIP(legacy.Ipaddr) + upgraded.Ipaddr6 = net.ParseIP(legacy.Ipaddr6) + upgraded.MTU = legacy.MTU + upgraded.Netmask = net.ParseIP(legacy.Netmask) + if legacy.IpCIDR != "" { + cidrIP, cidrIPNet, err := net.ParseCIDR(legacy.IpCIDR) if err != nil { - wwlog.Error("%v is not a valid CIDR address: %s", this.IpCIDR, err) + wwlog.Error("%v is not a valid CIDR address: %s", legacy.IpCIDR, err) } else { if upgraded.Ipaddr == nil { upgraded.Ipaddr = cidrIP @@ -620,19 +620,19 @@ func (this *NetDev) Upgrade(addDefaults bool) (upgraded *node.NetDev) { } } } - if this.OnBoot != "" { - warnError(upgraded.OnBoot.Set(this.OnBoot)) + if legacy.OnBoot != "" { + warnError(upgraded.OnBoot.Set(legacy.OnBoot)) } - upgraded.Prefix = net.ParseIP(this.Prefix) - if this.Tags != nil { - for key, value := range this.Tags { + upgraded.Prefix = net.ParseIP(legacy.Prefix) + if legacy.Tags != nil { + for key, value := range legacy.Tags { upgraded.Tags[key] = value } } - for _, tag := range this.TagsDel { + for _, tag := range legacy.TagsDel { delete(upgraded.Tags, tag) } - upgraded.Type = this.Type + upgraded.Type = legacy.Type if addDefaults { if upgraded.Type == "" { upgraded.Type = "ethernet" @@ -649,15 +649,15 @@ type Disk struct { WipeTable string `yaml:"wipe_table,omitempty"` } -func (this *Disk) Upgrade() (upgraded *node.Disk) { +func (legacy *Disk) Upgrade() (upgraded *node.Disk) { upgraded = new(node.Disk) upgraded.Partitions = make(map[string]*node.Partition) - if this.Partitions != nil { - for name, partition := range this.Partitions { + if legacy.Partitions != nil { + for name, partition := range legacy.Partitions { upgraded.Partitions[name] = partition.Upgrade() } } - upgraded.WipeTable, _ = strconv.ParseBool(this.WipeTable) + upgraded.WipeTable, _ = strconv.ParseBool(legacy.WipeTable) return } @@ -672,16 +672,16 @@ type Partition struct { WipePartitionEntry string `yaml:"wipe_partition_entry,omitempty"` } -func (this *Partition) Upgrade() (upgraded *node.Partition) { +func (legacy *Partition) Upgrade() (upgraded *node.Partition) { upgraded = new(node.Partition) - upgraded.Guid = this.Guid - upgraded.Number = this.Number - upgraded.Resize, _ = strconv.ParseBool(this.Resize) - upgraded.ShouldExist, _ = strconv.ParseBool(this.ShouldExist) - upgraded.SizeMiB = this.SizeMiB - upgraded.StartMiB = this.StartMiB - upgraded.TypeGuid = this.TypeGuid - upgraded.WipePartitionEntry, _ = strconv.ParseBool(this.WipePartitionEntry) + upgraded.Guid = legacy.Guid + upgraded.Number = legacy.Number + upgraded.Resize, _ = strconv.ParseBool(legacy.Resize) + upgraded.ShouldExist, _ = strconv.ParseBool(legacy.ShouldExist) + upgraded.SizeMiB = legacy.SizeMiB + upgraded.StartMiB = legacy.StartMiB + upgraded.TypeGuid = legacy.TypeGuid + upgraded.WipePartitionEntry, _ = strconv.ParseBool(legacy.WipePartitionEntry) return } @@ -695,13 +695,13 @@ type FileSystem struct { WipeFileSystem string `yaml:"wipe_filesystem,omitempty"` } -func (this *FileSystem) Upgrade() (upgraded *node.FileSystem) { +func (legacy *FileSystem) Upgrade() (upgraded *node.FileSystem) { upgraded = new(node.FileSystem) upgraded.Options = make([]string, 0) - upgraded.Format = this.Format - upgraded.Label = this.Label - if this.MountOptions != nil { - switch mountOptions := this.MountOptions.(type) { + upgraded.Format = legacy.Format + upgraded.Label = legacy.Label + if legacy.MountOptions != nil { + switch mountOptions := legacy.MountOptions.(type) { case string: upgraded.MountOptions = mountOptions case []interface{}: @@ -714,9 +714,9 @@ func (this *FileSystem) Upgrade() (upgraded *node.FileSystem) { wwlog.Error("unparsable MountOptions: %v", mountOptions) } } - upgraded.Options = append(upgraded.Options, this.Options...) - upgraded.Path = this.Path - upgraded.Uuid = this.Uuid - upgraded.WipeFileSystem, _ = strconv.ParseBool(this.WipeFileSystem) + upgraded.Options = append(upgraded.Options, legacy.Options...) + upgraded.Path = legacy.Path + upgraded.Uuid = legacy.Uuid + upgraded.WipeFileSystem, _ = strconv.ParseBool(legacy.WipeFileSystem) return }