make archive for npm (#200)

Author: Yongli Chen

Makefile

@@ -88,6 +88,7 @@ CNM_ARCHIVE_NAME = azure-vnet-cnm-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
 CNI_ARCHIVE_NAME = azure-vnet-cni-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
 CNI_MULTITENANCY_ARCHIVE_NAME = azure-vnet-cni-multitenancy-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
 CNS_ARCHIVE_NAME = azure-cns-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
+NPM_ARCHIVE_NAME = azure-npm-$(GOOS)-$(GOARCH)-$(VERSION).$(ARCHIVE_EXT)
 
 # Docker libnetwork (CNM) plugin v2 image parameters.
 CNM_PLUGIN_IMAGE ?= microsoft/azure-vnet-plugin
@@ -107,7 +108,7 @@ azure-vnet: $(CNI_BUILD_DIR)/azure-vnet$(EXE_EXT)
 azure-vnet-ipam: $(CNI_BUILD_DIR)/azure-vnet-ipam$(EXE_EXT)
 azure-cni-plugin: azure-vnet azure-vnet-ipam cni-archive
 azure-cns: $(CNS_BUILD_DIR)/azure-cns$(EXE_EXT) cns-archive
-azure-npm: $(NPM_BUILD_DIR)/azure-npm
+azure-npm: $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT) npm-archive
 
 all-binaries: azure-cnm-plugin azure-cni-plugin azure-cns azure-npm
 
@@ -232,4 +233,14 @@ cnm-archive:
 cns-archive:
 	chmod 0755 $(CNS_BUILD_DIR)/azure-cns$(EXE_EXT)
 	cd $(CNS_BUILD_DIR) && $(ARCHIVE_CMD) $(CNS_ARCHIVE_NAME) azure-cns$(EXE_EXT)
-	chown $(BUILD_USER):$(BUILD_USER) $(CNS_BUILD_DIR)/$(CNS_ARCHIVE_NAME)
+	chown $(BUILD_USER):$(BUILD_USER) $(CNS_BUILD_DIR)/$(CNS_ARCHIVE_NAME)
+
+# Create a NPM archive for the target platform.
+.PHONY: npm-archive
+npm-archive:
+ifeq ($(GOOS),linux)
+	# Azure-NPM only supports Linux for now.
+	chmod 0755 $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT)
+	cd $(NPM_BUILD_DIR) && $(ARCHIVE_CMD) $(NPM_ARCHIVE_NAME) azure-npm$(EXE_EXT)
+	chown $(BUILD_USER):$(BUILD_USER) $(NPM_BUILD_DIR)/$(NPM_ARCHIVE_NAME)
+endif

cni/network/plugin/main.go

@@ -50,11 +50,14 @@ func reportPluginError(reportManager *telemetry.CNIReportManager, err error) {
 
 // Main is the entry point for CNI network plugin.
 func main() {
-	var config common.PluginConfig
-	var err error
+	var (
+		config common.PluginConfig
+		err    error
+	)
+
 	config.Version = version
 	reportManager := &telemetry.CNIReportManager{
-		ReportMangager: &telemetry.ReportManager{
+		ReportManager: &telemetry.ReportManager{
 			HostNetAgentURL: hostNetAgentURL,
 			ReportType:      reportType,
 		},

telemetry/telemetry.go

@@ -105,7 +105,7 @@ type NPMReport struct {
 	ClusterState      ClusterState
 }
 
-// ReportManager interface.
+// ReportManager structure.
 type ReportManager struct {
 	HostNetAgentURL string
 	ReportType      string