Metadata removing sdk dependency (#11)

* removed sdk dependency from metadata package

* fixed Dockerfile config arg

* add net/url usage

Co-authored-by: Mariia Smirnova <mariia-smi@yandex-team.ru>

Author: smi-mi

Dockerfile

@@ -5,7 +5,7 @@ ARG golang_version=1.17.8
 FROM golang:${golang_version} as builder
 ARG plugin_version
 ARG fluent_bit_version
-ARG config=github.com/yandex-cloud/fluent-bit-plugin-yandex/config
+ARG config=github.com/yandex-cloud/fluent-bit-plugin-yandex/v2/config
 WORKDIR /build
 COPY . .
 RUN CGO_ENABLED=1 go build \

metadata/metadata.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 	"os"
 	"strings"
 	"sync"
@@ -13,33 +14,41 @@ import (
 	"google.golang.org/protobuf/types/known/structpb"
 
 	"github.com/startdusk/strnaming"
-	ycsdk "github.com/yandex-cloud/go-sdk"
 )
 
-func getMetadataUrl() string {
+func getMetadataUrl(instanceMetadataAddr string) (*url.URL, error) {
 	const (
 		keyMetadataUrlEnv = "YC_METADATA_URL"
-		urlSuffix         = "/computeMetadata/v1/"
+		urlPath           = "/computeMetadata/v1/"
 	)
 	metadataEndpoint := os.Getenv(keyMetadataUrlEnv)
 	if len(metadataEndpoint) == 0 {
-		metadataEndpoint = "http://" + ycsdk.InstanceMetadataAddr
+		metadataEndpoint = "http://" + instanceMetadataAddr
 	}
-	return metadataEndpoint + urlSuffix
+	urlMetadata, err := url.Parse(metadataEndpoint)
+	if err != nil {
+		return nil, err
+	}
+	urlMetadata.Path = urlPath
+	return urlMetadata, nil
 }
 
 type Provider interface {
 	GetValue(key string) (string, error)
 }
 
 type cachingProvider struct {
-	mu         sync.RWMutex
-	lastUpdate time.Time
-	cache      *structpb.Struct
+	mu                   sync.RWMutex
+	instanceMetadataAddr string
+	lastUpdate           time.Time
+	cache                *structpb.Struct
 }
 
 func (mp *cachingProvider) GetValue(key string) (string, error) {
 	cache, err := mp.getAllMetadata()
+	if err != nil {
+		return "", fmt.Errorf("failed to get metadata value by key%q: %s", key, err.Error())
+	}
 
 	toCamel := strnaming.NewCamel()
 	toCamel.WithDelimiter('-')
@@ -48,30 +57,38 @@ func (mp *cachingProvider) GetValue(key string) (string, error) {
 
 	value, err := getValue(cache, path)
 	if err != nil {
-		return "", fmt.Errorf("failed to get metadata value by key %q because of error: %s", key, err.Error())
+		return "", fmt.Errorf("failed to get metadata value by key %q: %s", key, err.Error())
 	}
 	return value, nil
 }
 
 func (mp *cachingProvider) getAllMetadata() (*structpb.Struct, error) {
-	const updateBackoff = time.Second
+	const (
+		updateBackoff   = time.Second
+		queryParamKey   = "recursive"
+		queryParamValue = "true"
+		requestTimeout  = 5 * time.Second
+	)
+
 	mp.mu.RLock()
+
 	passed := time.Since(mp.lastUpdate)
 	if mp.cache != nil && passed < updateBackoff {
 		defer mp.mu.RUnlock()
 		return mp.cache, nil
 	}
-	mp.mu.RUnlock()
-
-	const (
-		queryParam     = "?recursive=true"
-		requestTimeout = 5 * time.Second
-	)
+	urlMetadata, err := getMetadataUrl(mp.instanceMetadataAddr)
+	if err != nil {
+		return nil, fmt.Errorf("incorrect metadata URL: %s", err.Error())
+	}
+	q := urlMetadata.Query()
+	q.Set(queryParamKey, queryParamValue)
+	urlMetadata.RawQuery = q.Encode()
 
-	urlMetadata := getMetadataUrl() + queryParam
+	mp.mu.RUnlock()
 
 	client := http.Client{}
-	req, err := http.NewRequest(http.MethodGet, urlMetadata, nil)
+	req, err := http.NewRequest(http.MethodGet, urlMetadata.String(), nil)
 	if err != nil {
 		return nil, fmt.Errorf("could not make request to get all metadata: %s", err.Error())
 	}
@@ -105,6 +122,8 @@ func (mp *cachingProvider) getAllMetadata() (*structpb.Struct, error) {
 	return metadataStruct, nil
 }
 
-func NewCachingProvider() Provider {
-	return &cachingProvider{}
+func NewCachingProvider(instanceMetadataAddr string) Provider {
+	return &cachingProvider{
+		instanceMetadataAddr: instanceMetadataAddr,
+	}
 }

yclogging.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"unsafe"
 
+	ycsdk "github.com/yandex-cloud/go-sdk"
+
 	"github.com/yandex-cloud/fluent-bit-plugin-yandex/v2/yclient"
 
 	"github.com/yandex-cloud/fluent-bit-plugin-yandex/v2/config"
@@ -33,7 +35,7 @@ func FLBPluginInit(plugin unsafe.Pointer) int {
 	getConfigValue := func(key string) string {
 		return config.GetKey(plugin, key)
 	}
-	metadataProvider := metadata.NewCachingProvider()
+	metadataProvider := metadata.NewCachingProvider(ycsdk.InstanceMetadataAddr)
 
 	destination, err := config.GetDestination(getConfigValue, metadataProvider)
 	if err != nil {