Merge pull request #456 from ngrok/ngrok/ryan/migrate-to-phase-based-naming

update traffic policy for phase-based naming

Author: TheConcierge

api/ingress/v1alpha1/domain_types.go

@@ -25,7 +25,7 @@ SOFTWARE.
 package v1alpha1
 
 import (
-	"github.com/ngrok/ngrok-api-go/v5"
+	"github.com/ngrok/ngrok-api-go/v6"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

api/ingress/v1alpha1/httpsedge_types.go

@@ -27,7 +27,7 @@ package v1alpha1
 import (
 	"encoding/json"
 
-	"github.com/ngrok/ngrok-api-go/v5"
+	"github.com/ngrok/ngrok-api-go/v6"
 	"golang.org/x/exp/slices"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -76,7 +76,7 @@ type HTTPSEdgeRouteSpec struct {
 	// WebhookVerification is webhook verification configuration to apply to this route
 	WebhookVerification *EndpointWebhookVerification `json:"webhookVerification,omitempty"`
 
-	// raw json policy string that was applied to the ngrok API
+	// TrafficPolicy is the raw json policy string that was applied to the ngrok API
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Type=object

api/ingress/v1alpha1/httpsedge_types_test.go

@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/ngrok/ngrok-api-go/v5"
+	"github.com/ngrok/ngrok-api-go/v6"
 )
 
 func TestHTTPSEdgeEqual(t *testing.T) {

api/ingress/v1alpha1/ngrok_common.go

@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"encoding/json"
 
-	"github.com/ngrok/ngrok-api-go/v5"
+	"github.com/ngrok/ngrok-api-go/v6"
 	"k8s.io/apimachinery/pkg/api/resource"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -488,61 +488,3 @@ type EndpointAction struct {
 	// +kubebuilder:validation:Type=object
 	Config json.RawMessage `json:"config,omitempty"`
 }
-
-func (policy *EndpointPolicy) ToNgrok() *ngrok.EndpointPolicy {
-	if policy == nil {
-		return nil
-	}
-
-	var inbound []ngrok.EndpointRule
-	for _, rule := range policy.Inbound {
-		p := rule
-		inbound = append(inbound, *p.ToNgrok())
-	}
-	var outbound []ngrok.EndpointRule
-	for _, rule := range policy.Outbound {
-		p := rule
-		mod := p.ToNgrok()
-		if mod != nil {
-			outbound = append(outbound, *mod)
-		}
-	}
-
-	return &ngrok.EndpointPolicy{
-		Enabled:  policy.Enabled,
-		Inbound:  inbound,
-		Outbound: outbound,
-	}
-}
-
-func (rule *EndpointRule) ToNgrok() *ngrok.EndpointRule {
-	if rule == nil {
-		return nil
-	}
-
-	var actions []ngrok.EndpointAction
-	for _, action := range rule.Actions {
-		a := action
-		mod := a.ToNgrok()
-		if mod != nil {
-			actions = append(actions, *mod)
-		}
-	}
-
-	return &ngrok.EndpointRule{
-		Expressions: rule.Expressions,
-		Actions:     actions,
-		Name:        rule.Name,
-	}
-}
-
-func (action *EndpointAction) ToNgrok() *ngrok.EndpointAction {
-	if action == nil {
-		return nil
-	}
-
-	return &ngrok.EndpointAction{
-		Type:   action.Type,
-		Config: action.Config,
-	}
-}

api/ingress/v1alpha1/ngrokmoduleset_types.go

@@ -39,7 +39,7 @@ type NgrokModuleSetModules struct {
 	IPRestriction *EndpointIPPolicy `json:"ipRestriction,omitempty"`
 	// OAuth configuration for this module set
 	OAuth *EndpointOAuth `json:"oauth,omitempty"`
-	// Policy configuration for this module set
+	// Policy module is deprecated, use the `NgrokTrafficPolicy` CRD or the Gateway API instead
 	Policy *EndpointPolicy `json:"policy,omitempty"`
 	// OIDC configuration for this module set
 	OIDC *EndpointOIDC `json:"oidc,omitempty"`

api/ingress/v1alpha1/tcpedge_types.go

@@ -45,7 +45,7 @@ type TCPEdgeSpec struct {
 	// IPRestriction is an IPRestriction to apply to this edge
 	IPRestriction *EndpointIPPolicy `json:"ipRestriction,omitempty"`
 
-	// raw json policy string that was applied to the ngrok API
+	// Policy is the raw json policy string that was applied to the ngrok API
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Type=object

api/ingress/v1alpha1/tlsedge_types.go

@@ -53,7 +53,7 @@ type TLSEdgeSpec struct {
 
 	MutualTLS *EndpointMutualTLS `json:"mutualTls,omitempty"`
 
-	// raw json policy string that was applied to the ngrok API
+	// Policy is the raw json policy string that was applied to the ngrok API
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Type=object

cmd/api/main.go

@@ -47,7 +47,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
-	"github.com/ngrok/ngrok-api-go/v5"
+	"github.com/ngrok/ngrok-api-go/v6"
 
 	bindingsv1alpha1 "github.com/ngrok/ngrok-operator/api/bindings/v1alpha1"
 	ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1"

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/golang/mock v1.4.4
 	github.com/google/uuid v1.3.1
 	github.com/imdario/mergo v0.3.16
-	github.com/ngrok/ngrok-api-go/v5 v5.4.1
 	github.com/ngrok/ngrok-api-go/v6 v6.1.1-0.20241025160627-dcdb6f5b23f8
 	github.com/onsi/ginkgo/v2 v2.14.0
 	github.com/onsi/gomega v1.30.0

go.sum

@@ -416,8 +416,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
-github.com/ngrok/ngrok-api-go/v5 v5.4.1 h1:rjofyT5M4pi3PtobyNy+3RMhq2uUaKuqsP34IwXRE28=
-github.com/ngrok/ngrok-api-go/v5 v5.4.1/go.mod h1:UVTaHI5B4gEsfHCOZTlRg8WkT6+KBijIkVtjpDqCyIU=
 github.com/ngrok/ngrok-api-go/v6 v6.1.1-0.20241025160627-dcdb6f5b23f8 h1:HHfIX3/eXsnxwSxXpLJFSUO5sXWwxdNIkWVMsQd5f7o=
 github.com/ngrok/ngrok-api-go/v6 v6.1.1-0.20241025160627-dcdb6f5b23f8/go.mod h1:KtRxWqEomaHZfgeS+q/7nFHF+gPYFghS5wTl5AIUjIk=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=