Metadata package: remove OVF-provider from default list; move retry()…

… to Azure-OVF provider

Signed-off-by: Michael Schnerring <3743342+schnerring@users.noreply.github.com>

pkg/metadata/main.go

@@ -3,15 +3,12 @@ package main
 import (
 	"encoding/json"
 	"flag"
-	"fmt"
 	"io/ioutil"
-	"net/http"
 	"os"
 	"path"
 	"strconv"
 	"strings"
 	"syscall"
-	"time"
 
 	log "github.com/sirupsen/logrus"
 )
@@ -92,8 +89,7 @@ func main() {
 		"packet",
 		"metaldata",
 		"cdrom",
-		"azure-imds",
-		"azure-ovf",
+		"azure",
 	}
 	args := flag.Args()
 	if len(args) > 0 {
@@ -119,14 +115,8 @@ func main() {
 			netProviders = append(netProviders, NewDigitalOcean())
 		case p == "metaldata":
 			netProviders = append(netProviders, NewMetalData())
-		case p == "azure-imds":
+		case p == "azure":
 			netProviders = append(netProviders, NewAzureIMDS())
-		case p == "azure-ovf":
-			// TODO not every provider should create a separate http client
-			client := &http.Client{
-				Timeout: time.Second * 2,
-			}
-			netProviders = append(netProviders, NewAzureOVF(client))
 		case p == "cdrom":
 			cdromProviders = ListCDROMs()
 		case strings.HasPrefix(p, "file="):
@@ -297,23 +287,3 @@ type Entry struct {
 	Content *string          `json:"content,omitempty"`
 	Entries map[string]Entry `json:"entries,omitempty"`
 }
-
-// https://stackoverflow.com/questions/47606761/repeat-code-if-an-error-occured/47606858#47606858
-// https://blog.abourget.net/en/2016/01/04/my-favorite-golang-retry-function/
-func retry(attempts int, sleep time.Duration, f func() error) (err error) {
-	for i := 0; ; i++ {
-		err = f()
-		if err == nil {
-			return
-		}
-
-		if i >= (attempts - 1) {
-			break
-		}
-
-		time.Sleep(sleep)
-
-		log.Debugf("Retrying after error: %s", err)
-	}
-	return fmt.Errorf("After %d attempts, last error: %s", attempts, err)
-}

pkg/metadata/provider_azure_imds.go

@@ -37,11 +37,7 @@ func (p *ProviderAzureIMDS) String() string {
 func (p *ProviderAzureIMDS) Probe() bool {
 	// "Poll" VM Unique ID
 	// See: https://azure.microsoft.com/en-us/blog/accessing-and-using-azure-vm-unique-id/
-	pollVMID := func() error {
-		_, err := p.imdsGet("compute/vmId")
-		return err
-	}
-	if err := retry(6, 5*time.Second, pollVMID); err != nil {
+	if _, err := p.imdsGet("compute/vmId"); err != nil {
 		log.Debugf("%s: Probe failed: %s", p.String(), err)
 		return false
 	}
@@ -173,7 +169,7 @@ func (p *ProviderAzureIMDS) getUserData() ([]byte, error) {
 	if len(userData) > 0 { // Always false
 		log.Warnf("%s: Unexpectedly received user data: \n%s", p.String(), string(userData))
 		// TODO
-		// Getting user data via IMDS is disabled. See upstream issue:
+		// Getting user data via IMDS is disabled. See blocking upstream issue:
 		//  * https://github.com/MicrosoftDocs/azure-docs/issues/64154
 		//  * https://github.com/MicrosoftDocs/azure-docs/issues/30370 (OP)
 		// return userData, nil

pkg/metadata/provider_azure_ovf.go

@@ -169,3 +169,23 @@ func (p *ProviderAzureOVF) getUserData(ovf *OVF) ([]byte, error) {
 	log.Debugf("%s: Raw user data: \n%s", p.String(), string(userData))
 	return userData, nil
 }
+
+// https://stackoverflow.com/questions/47606761/repeat-code-if-an-error-occured/47606858#47606858
+// https://blog.abourget.net/en/2016/01/04/my-favorite-golang-retry-function/
+func retry(attempts int, sleep time.Duration, f func() error) (err error) {
+	for i := 0; ; i++ {
+		err = f()
+		if err == nil {
+			return
+		}
+
+		if i >= (attempts - 1) {
+			break
+		}
+
+		time.Sleep(sleep)
+
+		log.Debugf("Retrying after error: %s", err)
+	}
+	return fmt.Errorf("After %d attempts, last error: %s", attempts, err)
+}