From ec93d6b57af744c1f845668dc8695e65937dc1fa Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Mon, 31 Jul 2023 22:09:59 +0000 Subject: [PATCH] revert file and var naming, add correct path to makefile --- .../{buildversion/buildversion.go => buildinfo/buildinfo.go} | 4 ++-- azure-ipam/ipam.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename azure-ipam/internal/{buildversion/buildversion.go => buildinfo/buildinfo.go} (74%) diff --git a/azure-ipam/internal/buildversion/buildversion.go b/azure-ipam/internal/buildinfo/buildinfo.go similarity index 74% rename from azure-ipam/internal/buildversion/buildversion.go rename to azure-ipam/internal/buildinfo/buildinfo.go index e25cccd172c..e26b8d2f8e9 100644 --- a/azure-ipam/internal/buildversion/buildversion.go +++ b/azure-ipam/internal/buildinfo/buildinfo.go @@ -1,6 +1,6 @@ -package buildversion +package buildinfo // this will be populate by the Go compiler via // the -ldflags, which insert dynamic information // into the binary at build time -var BuildVersion string +var Version string diff --git a/azure-ipam/ipam.go b/azure-ipam/ipam.go index b45114f38cc..ed0101bbb38 100644 --- a/azure-ipam/ipam.go +++ b/azure-ipam/ipam.go @@ -7,7 +7,7 @@ import ( "io" "net" - "github.com/Azure/azure-container-networking/azure-ipam/internal/buildversion" + "github.com/Azure/azure-container-networking/azure-ipam/internal/buildinfo" "github.com/Azure/azure-container-networking/azure-ipam/ipconfig" "github.com/Azure/azure-container-networking/cns" cnscli "github.com/Azure/azure-container-networking/cns/client" @@ -43,7 +43,7 @@ type cnsClient interface { func NewPlugin(logger *zap.Logger, c cnsClient, out io.Writer) (*IPAMPlugin, error) { plugin := &IPAMPlugin{ Name: pluginName, - Version: buildversion.BuildVersion, + Version: buildinfo.Version, logger: logger, out: out, cnsClient: c,