Simplify handling of datadog secrets

docs/features/analysis.md

@@ -916,8 +916,7 @@ metadata:
   name: datadog
 type: Opaque
 data:
-  default:
-    address: https://api.datadoghq.com
-    api-key: <datadog-api-key>
-    app-key: <datadog-app-key>
+  address: https://api.datadoghq.com
+  api-key: <datadog-api-key>
+  app-key: <datadog-app-key>
 ```

metricproviders/datadog/datadog.go

@@ -17,7 +17,6 @@ import (
 	"github.com/argoproj/argo-rollouts/utils/evaluate"
 	metricutil "github.com/argoproj/argo-rollouts/utils/metric"
 	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
@@ -173,16 +172,22 @@ func NewDatadogProvider(logCtx log.Entry, kubeclientset kubernetes.Interface) (*
 	if err != nil {
 		return nil, err
 	}
-	config := datadogConfig{}
 
-	if e := yaml.Unmarshal(secret.Data["default"], &config); e != nil {
-		return nil, e
+	apiKey := string(secret.Data["api-key"])
+	appKey := string(secret.Data["app-key"])
+	address := ""
+	if _, hasAddress := secret.Data["address"]; hasAddress {
+		address = string(secret.Data["address"])
 	}
 
-	if config.ApiKey != "" && config.AppKey != "" {
+	if apiKey != "" && appKey != "" {
 		return &Provider{
 			logCtx: logCtx,
-			config: config,
+			config: datadogConfig{
+				Address: address,
+				ApiKey:  apiKey,
+				AppKey:  appKey,
+			},
 		}, nil
 	} else {
 		return nil, errors.New("API or App token not found")

metricproviders/datadog/datadog_test.go

@@ -1,7 +1,6 @@
 package datadog
 
 import (
-	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -200,7 +199,9 @@ func TestRunSuite(t *testing.T) {
 				Name: DatadogTokensSecretName,
 			},
 			Data: map[string][]byte{
-				"default": []byte(fmt.Sprintf("address: %s\napp-key: %s\napi-key: %s", server.URL, expectedAppKey, expectedApiKey)),
+				"address": []byte(server.URL),
+				"api-key": []byte(expectedApiKey),
+				"app-key": []byte(expectedAppKey),
 			},
 		}