Move NPM from dep to go mod

.pipelines/pipeline.yaml

@@ -30,10 +30,13 @@ stages:
         steps:
           - bash: |
               echo $UID
+              sudo rm -rf $(System.DefaultWorkingDirectory)/*
               sudo rm /run/docker/plugins/test.sock || true
               sudo ip link del dev dummy || true
             displayName: "Set up OS environment"
 
+          - checkout: self
+
           - bash: |
               go version
               go env
@@ -62,7 +65,6 @@ stages:
             condition: always()
 
           - script: |
-              go get -v -t -d ./...
               go get github.com/docker/libnetwork/driverapi
               go get github.com/gorilla/mux
               go get github.com/jstemmer/go-junit-report
@@ -80,19 +82,11 @@ stages:
               make all-binaries VERSION=$(EnvironmentalVariables.Tag)
               export GOOS=linux
               make all-binaries VERSION=$(EnvironmentalVariables.Tag)
+              sudo make azure-npm-image VERSION=$(EnvironmentalVariables.Tag)
             workingDirectory: "$(modulePath)"
             name: "Build"
             displayName: "Build"
 
-          - script: |
-              sudo make azure-npm-image VERSION=$(EnvironmentalVariables.Tag)
-              echo '$(DOCKER_PASSWORD)' | docker login containernetworking.azurecr.io -u '$(DOCKER_USERNAME)' --password-stdin
-              docker tag $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag) $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-test
-              docker push $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-test
-            workingDirectory: "$(modulePath)"
-            name: "PushImages"
-            displayName: "PushNPMImage"
-
           - bash: |
               cd ./output 
               sudo find . -mindepth 2 -type f -regextype posix-extended ! -iregex '.*\.(zip|tgz)$' -delete
@@ -122,6 +116,10 @@ stages:
             condition: always()
 
           - script: |
+              echo '$(DOCKER_PASSWORD)' | docker login containernetworking.azurecr.io -u '$(DOCKER_USERNAME)' --password-stdin
+              docker tag $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag) $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-test
+              docker push $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-test
+
               function auto-retry()
               {
                   export i="1"
@@ -134,18 +132,20 @@ stages:
               auto-retry docker pull mcr.microsoft.com/containernetworking/azure-npm:$(EnvironmentalVariables.Tag)-test
             workingDirectory: "$(modulePath)"
             name: "mcrreplication"
-            displayName: "Wait for MCR"
+            displayName: "Push NPM Image and Wait for MCR"
 
           - task: PublishTestResults@2
             inputs:
               testRunner: JUnit
-              testResultsFiles: $(System.DefaultWorkingDirectory)/**/report.xml
+              testResultsFiles: $(modulePath)/report.xml
+            displayName: "Publish Test Results"
             condition: always()
 
           - task: PublishCodeCoverageResults@1
             inputs:
               codeCoverageTool: Cobertura
-              summaryFileLocation: $(System.DefaultWorkingDirectory)/**/coverage.xml
+              summaryFileLocation: $(modulePath)/coverage.xml
+            displayName: "Publish Code Coverage Results"
             condition: always()
 
           - task: CopyFiles@2
@@ -220,6 +220,7 @@ stages:
         container:
           image: "$(BUILD_IMAGE)"
         steps:
+          - checkout: none
           - task: AzureCLI@1
             inputs:
               azureSubscription: $(ARTIFACT_SUBSCRIPTION)

Makefile

@@ -198,9 +198,9 @@ $(CNMS_BUILD_DIR)/azure-cnms$(EXE_EXT): $(CNMSFILES)
 
 # Build the Azure NPM plugin.
 $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT): $(NPMFILES)
-	cd $(NPM_DIR)
-	cd $(CNI_TELEMETRY_DIR) && go build -v -o $(ROOT_DIR)/$(NPM_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -s -w" ./*.go
-	cd $(NPM_DIR) && go build -v -o $(ROOT_DIR)/$(NPM_BUILD_DIR)/azure-npm$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/npm.aiMetadata=$(NPM_AI_ID) -s -w" ./*.go
+	go build -v -o $(NPM_BUILD_DIR)/azure-vnet-telemetry$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -s -w" $(CNI_TELEMETRY_DIR)/*.go
+	go build -v -o $(NPM_BUILD_DIR)/azure-npm$(EXE_EXT) -ldflags "-X main.version=$(VERSION) -X $(ACN_PACKAGE_PATH)/npm.aiMetadata=$(NPM_AI_ID) -s -w" $(NPM_DIR)/*.go
+
 # Build all binaries in a container.
 .PHONY: all-containerized
 all-containerized:
@@ -370,8 +370,6 @@ test-all:
 		./aitelemetry/ \
         ./cnm/network/ \
         ./cni/ipam/ \
-        ./cns/ipamclient/ 
-	cd npm/ && go test -v -covermode count -coverprofile=coverage-npm.out \
-        ./iptm/ \
-        ./ipsm/ \
-        ./
+        ./cns/ipamclient/ \
+        ./npm/iptm/ \
+        ./npm/ipsm/