fix: change receiver model pointer to value

Signed-off-by: François Gouteroux <[email protected]>
prometheus · Apr 25, 2023 · d14eb77 · d14eb77
1 parent 9a8d1f9
commit d14eb77
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/api/v2/api.go b/api/v2/api.go
@@ -224,7 +224,7 @@ func (api *API) getReceiversHandler(params receiver_ops.GetReceiversParams) midd
 
 	receivers := make([]*open_api_models.Receiver, 0, len(api.alertmanagerConfig.Receivers))
 	for _, r := range api.alertmanagerConfig.Receivers {
-		receivers = append(receivers, &open_api_models.Receiver{Name: &r.Name})
+		receivers = append(receivers, &open_api_models.Receiver{Name: r.Name})
 	}
 
 	return receiver_ops.NewGetReceiversOK().WithPayload(receivers)
@@ -406,7 +406,7 @@ func (api *API) getAlertGroupsHandler(params alertgroup_ops.GetAlertGroupsParams
 
 	for _, alertGroup := range alertGroups {
 		ag := &open_api_models.AlertGroup{
-			Receiver: &open_api_models.Receiver{Name: &alertGroup.Receiver},
+			Receiver: &open_api_models.Receiver{Name: alertGroup.Receiver},
 			Labels:   ModelLabelSetToAPILabelSet(alertGroup.Labels),
 			Alerts:   make([]*open_api_models.GettableAlert, 0, len(alertGroup.Alerts)),
 		}

diff --git a/api/v2/api_test.go b/api/v2/api_test.go
@@ -425,8 +425,8 @@ func TestAlertToOpenAPIAlert(t *testing.T) {
 		UpdatedAt:   convertDateTime(updated),
 		Fingerprint: &fp,
 		Receivers: []*open_api_models.Receiver{
-			{Name: &receivers[0]},
-			{Name: &receivers[1]},
+			{Name: receivers[0]},
+			{Name: receivers[1]},
 		},
 	}, openAPIAlert)
 }

diff --git a/api/v2/compat.go b/api/v2/compat.go
@@ -124,7 +124,7 @@ func AlertToOpenAPIAlert(alert *types.Alert, status types.AlertStatus, receivers
 
 	apiReceivers := make([]*open_api_models.Receiver, 0, len(receivers))
 	for i := range receivers {
-		apiReceivers = append(apiReceivers, &open_api_models.Receiver{Name: &receivers[i]})
+		apiReceivers = append(apiReceivers, &open_api_models.Receiver{Name: receivers[i]})
 	}
 
 	fp := alert.Fingerprint().String()

diff --git a/api/v2/models/receiver.go b/api/v2/models/receiver.go
diff --git a/api/v2/openapi.yaml b/api/v2/openapi.yaml
@@ -505,6 +505,7 @@ definitions:
     type: object
     properties:
       name:
+        x-nullable: false
         type: string
     required:
       - name

diff --git a/api/v2/restapi/embedded_spec.go b/api/v2/restapi/embedded_spec.go