fix imports after rebase

rancher · Oct 25, 2022 · dfd3f03 · dfd3f03
1 parent e359a54
commit dfd3f03
Show file tree

Hide file tree

Showing 6 changed files with 313 additions and 317 deletions.
diff --git a/pkg/alerting/backend/api.go b/pkg/alerting/backend/api.go
@@ -4,10 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"time"
-
+	alertingv1 "github.com/rancher/opni/pkg/apis/alerting/v1"
 	corev1 "github.com/rancher/opni/pkg/apis/core/v1"
-	alertingv1alpha "github.com/rancher/opni/plugins/alerting/pkg/apis/common"
 
 	"github.com/go-openapi/strfmt"
 )
@@ -210,15 +208,15 @@ func (p *PostableSilence) Must() error {
 }
 
 func ConvertEndpointIdsToRoutingNode(
-	endpointList *alertingv1alpha.AlertEndpointList,
-	req *alertingv1alpha.AttachedEndpoints,
+	endpointList *alertingv1.AlertEndpointList,
+	req *alertingv1.AttachedEndpoints,
 	conditionId string,
 
-) (*alertingv1alpha.RoutingNode, error) {
-	routingNode := &alertingv1alpha.RoutingNode{
+) (*alertingv1.RoutingNode, error) {
+	routingNode := &alertingv1.RoutingNode{
 		ConditionId: &corev1.Reference{Id: conditionId},
-		FullAttachedEndpoints: &alertingv1alpha.FullAttachedEndpoints{
-			Items:              []*alertingv1alpha.FullAttachedEndpoint{},
+		FullAttachedEndpoints: &alertingv1.FullAttachedEndpoints{
+			Items:              []*alertingv1.FullAttachedEndpoint{},
 			InitialDelay:       req.InitialDelay,
 			RepeatInterval:     req.RepeatInterval,
 			ThrottlingDuration: req.ThrottlingDuration,
@@ -230,7 +228,7 @@ func ConvertEndpointIdsToRoutingNode(
 			if endpointItem.Id.Id == expectedEndpoint.EndpointId {
 				routingNode.FullAttachedEndpoints.Items = append(
 					routingNode.FullAttachedEndpoints.Items,
-					&alertingv1alpha.FullAttachedEndpoint{
+					&alertingv1.FullAttachedEndpoint{
 						EndpointId:    endpointItem.Id.Id,
 						AlertEndpoint: endpointItem.Endpoint,
 						Details:       req.Details,

diff --git a/plugins/alerting/pkg/alerting/api_conditions.go b/plugins/alerting/pkg/alerting/api_conditions.go
@@ -8,8 +8,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/rancher/opni/plugins/alerting/pkg/apis/common"
-
 	"github.com/prometheus/alertmanager/api/v2/models"
 	"github.com/prometheus/common/model"
 	"github.com/rancher/opni/pkg/alerting/backend"
@@ -191,7 +189,7 @@ func (p *Plugin) DeleteAlertCondition(ctx context.Context, ref *corev1.Reference
 		return nil, err
 	}
 	lg.Debugf("Deleted condition %s must clean up its existing endpoint implementation", ref.Id)
-	if common.ShouldDeleteRoutingNode(nil, existing.AttachedEndpoints) {
+	if alertingv1.ShouldDeleteRoutingNode(nil, existing.AttachedEndpoints) {
 		_, err = p.DeleteConditionRoutingNode(ctx, ref)
 		if err != nil {
 			return nil, err