feat(endpoint): drop id specific check for secret keys in all endpoints

the original design made the secrets unable to be reused, a bit to opinionated
to be useful eleswhere. This relaxes that requirement so that secrets can be
referenced here.

CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ### Features
 
-1. [16234](https://github.com/influxdata/influxdb/pull/16234): add support for notification endpoints to influx templates/pkgs. 
+1. [16234](https://github.com/influxdata/influxdb/pull/16234): add support for notification endpoints to influx templates/pkgs.
+2. [16242](https://github.com/influxdata/influxdb/pull/16242): drop id prefix for secret key requirement for notification endpoints 
 
 ### Bug Fixes
 1. [16225](https://github.com/influxdata/influxdb/pull/16225): Ensures env vars are applied consistently across cmd, and fixes issue where INFLUX_ env var prefix was not set globally.

notification/endpoint/endpoint_test.go

@@ -71,13 +71,13 @@ func TestValidEndpoint(t *testing.T) {
 			},
 		},
 		{
-			name: "empty slack url and token",
+			name: "empty slack url",
 			src: &endpoint.Slack{
 				Base: goodBase,
 			},
 			err: &influxdb.Error{
 				Code: influxdb.EInvalid,
-				Msg:  "slack endpoint URL and token are empty",
+				Msg:  "slack endpoint URL must be provided",
 			},
 		},
 		{
@@ -99,30 +99,6 @@ func TestValidEndpoint(t *testing.T) {
 			},
 			err: nil,
 		},
-		{
-			name: "invalid slack token",
-			src: &endpoint.Slack{
-				Base:  goodBase,
-				URL:   "localhost",
-				Token: influxdb.SecretField{Key: "bad-key"},
-			},
-			err: &influxdb.Error{
-				Code: influxdb.EInvalid,
-				Msg:  "slack endpoint token is invalid",
-			},
-		},
-		{
-			name: "invalid routine key",
-			src: &endpoint.PagerDuty{
-				Base:       goodBase,
-				ClientURL:  "localhost",
-				RoutingKey: influxdb.SecretField{Key: "bad-key"},
-			},
-			err: &influxdb.Error{
-				Code: influxdb.EInvalid,
-				Msg:  "pagerduty routing key is invalid",
-			},
-		},
 		{
 			name: "empty http http method",
 			src: &endpoint.HTTP{

notification/endpoint/http.go

@@ -103,15 +103,13 @@ func (s HTTP) Valid() error {
 			Msg:  "invalid http auth method",
 		}
 	}
-	if s.AuthMethod == "basic" &&
-		(s.Username.Key != s.ID.String()+httpUsernameSuffix ||
-			s.Password.Key != s.ID.String()+httpPasswordSuffix) {
+	if s.AuthMethod == "basic" && (s.Username.Key == "" || s.Password.Key == "") {
 		return &influxdb.Error{
 			Code: influxdb.EInvalid,
 			Msg:  "invalid http username/password for basic auth",
 		}
 	}
-	if s.AuthMethod == "bearer" && s.Token.Key != s.ID.String()+httpTokenSuffix {
+	if s.AuthMethod == "bearer" && s.Token.Key == "" {
 		return &influxdb.Error{
 			Code: influxdb.EInvalid,
 			Msg:  "invalid http token for bearer auth",

notification/endpoint/pagerduty.go

@@ -40,7 +40,7 @@ func (s PagerDuty) Valid() error {
 	if err := s.Base.valid(); err != nil {
 		return err
 	}
-	if s.RoutingKey.Key != s.ID.String()+routingKeySuffix {
+	if s.RoutingKey.Key == "" {
 		return &influxdb.Error{
 			Code: influxdb.EInvalid,
 			Msg:  "pagerduty routing key is invalid",

notification/endpoint/slack.go

@@ -45,10 +45,10 @@ func (s Slack) Valid() error {
 	if err := s.Base.valid(); err != nil {
 		return err
 	}
-	if s.URL == "" && s.Token.Key == "" {
+	if s.URL == "" {
 		return &influxdb.Error{
 			Code: influxdb.EInvalid,
-			Msg:  "slack endpoint URL and token are empty",
+			Msg:  "slack endpoint URL must be provided",
 		}
 	}
 	if s.URL != "" {
@@ -59,13 +59,6 @@ func (s Slack) Valid() error {
 			}
 		}
 	}
-	// TODO(desa): this requirement seems odd
-	if s.Token.Key != "" && s.Token.Key != s.ID.String()+slackTokenSuffix {
-		return &influxdb.Error{
-			Code: influxdb.EInvalid,
-			Msg:  "slack endpoint token is invalid",
-		}
-	}
 	return nil
 }