move address configuration to api/app secrets. Allow future support o…

…f multiple key pairs

docs/features/analysis.md

@@ -894,7 +894,6 @@ spec:
     failureLimit: 3
     provider:
       datadog:
-        address: https://api.datadoghq.com
         interval: 5m
         query: |
           sum:requests.error.count{service:{{args.service-name}}} /
@@ -910,6 +909,8 @@ metadata:
   name: datadog
 type: Opaque
 data:
-  api-key: <datadog-api-key>
-  app-key: <datadog-app-key>
+  default:
+    address: https://api.datadoghq.com
+    api-key: <datadog-api-key>
+    app-key: <datadog-app-key>
 ```

manifests/crds/analysis-run-crd.yaml

@@ -82,8 +82,6 @@ spec:
                     properties:
                       datadog:
                         properties:
-                          address:
-                            type: string
                           interval:
                             type: string
                           query:

manifests/crds/analysis-template-crd.yaml

@@ -76,8 +76,6 @@ spec:
                     properties:
                       datadog:
                         properties:
-                          address:
-                            type: string
                           interval:
                             type: string
                           query:

manifests/crds/cluster-analysis-template-crd.yaml

@@ -76,8 +76,6 @@ spec:
                     properties:
                       datadog:
                         properties:
-                          address:
-                            type: string
                           interval:
                             type: string
                           query:

metricproviders/datadog/datadog.go

@@ -16,6 +16,7 @@ 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"
 )
@@ -32,8 +33,7 @@ const (
 // Implements the Provider Interface
 type Provider struct {
 	logCtx log.Entry
-	apiKey string
-	appKey string
+	config datadogConfig
 }
 
 type datadogResponse struct {
@@ -42,6 +42,12 @@ type datadogResponse struct {
 	}
 }
 
+type datadogConfig struct {
+	Address string `yaml:"address,omitempty"`
+	ApiKey  string `yaml:"api-key,omitempty"`
+	AppKey  string `yaml:"app-key,omitempty"`
+}
+
 // Type incidates provider is a Datadog provider
 func (p *Provider) Type() string {
 	return ProviderType
@@ -56,8 +62,8 @@ func (p *Provider) Run(run *v1alpha1.AnalysisRun, metric v1alpha1.Metric) v1alph
 	}
 
 	endpoint := "https://api.datadoghq.com/api/v1/query"
-	if metric.Provider.Datadog.Address != "" {
-		endpoint = metric.Provider.Datadog.Address + "/api/v1/query"
+	if p.config.Address != "" {
+		endpoint = p.config.Address + "/api/v1/query"
 	}
 
 	url, _ := url.Parse(endpoint)
@@ -83,8 +89,8 @@ func (p *Provider) Run(run *v1alpha1.AnalysisRun, metric v1alpha1.Metric) v1alph
 	request.URL = url
 	request.Header = make(http.Header)
 	request.Header.Set("Content-Type", "application/json")
-	request.Header.Set("DD-API-KEY", p.apiKey)
-	request.Header.Set("DD-APPLICATION-KEY", p.appKey)
+	request.Header.Set("DD-API-KEY", p.config.ApiKey)
+	request.Header.Set("DD-APPLICATION-KEY", p.config.AppKey)
 
 	// Send Request
 	httpClient := &http.Client{
@@ -166,15 +172,16 @@ func NewDatadogProvider(logCtx log.Entry, kubeclientset kubernetes.Interface) (*
 	if err != nil {
 		return nil, err
 	}
+	config := datadogConfig{}
 
-	apiKey := string(secret.Data["api-key"])
-	appKey := string(secret.Data["app-key"])
+	if e := yaml.Unmarshal(secret.Data["default"], &config); e != nil {
+		return nil, e
+	}
 
-	if apiKey != "" && appKey != "" {
+	if config.ApiKey != "" && config.AppKey != "" {
 		return &Provider{
 			logCtx: logCtx,
-			apiKey: apiKey,
-			appKey: appKey,
+			config: config,
 		}, nil
 	} else {
 		return nil, errors.New("API or App token not found")

metricproviders/datadog/datadog_test.go

@@ -1,6 +1,7 @@
 package datadog
 
 import (
+	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -22,16 +23,6 @@ func TestRunSuite(t *testing.T) {
 	const expectedApiKey = "0123456789abcdef0123456789abcdef"
 	const expectedAppKey = "0123456789abcdef0123456789abcdef01234567"
 
-	tokenSecret := &corev1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: DatadogTokensSecretName,
-		},
-		Data: map[string][]byte{
-			"api-key": []byte(expectedApiKey),
-			"app-key": []byte(expectedAppKey),
-		},
-	}
-
 	unixNow = func() int64 { return 1599076435 }
 
 	// Test Cases
@@ -204,7 +195,14 @@ func TestRunSuite(t *testing.T) {
 		}))
 		defer server.Close()
 
-		test.metric.Provider.Datadog.Address = server.URL
+		tokenSecret := &corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: DatadogTokensSecretName,
+			},
+			Data: map[string][]byte{
+				"default": []byte(fmt.Sprintf("address: %s\napp-key: %s\napi-key: %s", server.URL, expectedAppKey, expectedApiKey)),
+			},
+		}
 
 		logCtx := log.WithField("test", "test")
 

pkg/apis/rollouts/v1alpha1/analysis_types.go

@@ -345,7 +345,6 @@ type WebMetricHeader struct {
 }
 
 type DatadogMetric struct {
-	Address  string         `json:"address,omitempty"`
 	Interval DurationString `json:"interval,omitempty"`
 	Query    string         `json:"query"`
 }