Added http-usermetric for HTTPSourceAdapter policy

kyma-project · Mar 3, 2020 · ddc8c95 · ddc8c95
1 parent ed85dc4
commit ddc8c95
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/components/event-sources/reconciler/httpsource/reconcile_test.go b/components/event-sources/reconciler/httpsource/reconcile_test.go
@@ -66,6 +66,7 @@ const (
 	tRevision    = "varkes-foo"
 	tPolicy      = "varkes-foo-private"
 	tRevisionSvc = "varkes-foo-private"
+	tTargetPort  = "http-usermetric"
 
 	tMetricsDomain = "testing"
 )
@@ -553,6 +554,13 @@ func newPolicyWithSpec() *authv1alpha1.Policy {
 	policy.Spec = authenticationv1alpha1api.Policy{
 		Targets: []*authenticationv1alpha1api.TargetSelector{{
 			Name: tRevisionSvc,
+			Ports: []*authenticationv1alpha1api.PortSelector{
+				{
+					Port: &authenticationv1alpha1api.PortSelector_Name{
+						Name: tTargetPort,
+					},
+				},
+			},
 		}},
 		Peers: []*authenticationv1alpha1api.PeerAuthenticationMethod{{
 			Params: &authenticationv1alpha1api.PeerAuthenticationMethod_Mtls{

diff --git a/components/event-sources/reconciler/object/policy.go b/components/event-sources/reconciler/object/policy.go
@@ -23,6 +23,8 @@ import (
 	authenticationv1alpha1 "istio.io/client-go/pkg/apis/authentication/v1alpha1"
 )
 
+const targetPort = "http-usermetric"
+
 // NewPolicy creates a Policy object.
 func NewPolicy(ns, name string, opts ...ObjectOption) *authenticationv1alpha1.Policy {
 	s := &authenticationv1alpha1.Policy{
@@ -49,13 +51,20 @@ func ApplyExistingPolicyAttributes(src, dst *authenticationv1alpha1.Policy) {
 }
 
 // WithTarget sets the target name of the Policy for a Knative Service which
-// has metrics end-points
+// has metrics end-point
 func WithTarget(target string) ObjectOption {
 	return func(o metav1.Object) {
 		p := o.(*authenticationv1alpha1.Policy)
 		p.Spec.Targets = []*authenticationv1alpha1api.TargetSelector{
 			{
 				Name: target,
+				Ports: []*authenticationv1alpha1api.PortSelector{
+					{
+						Port: &authenticationv1alpha1api.PortSelector_Name{
+							Name: targetPort,
+						},
+					},
+				},
 			},
 		}
 	}

diff --git a/components/event-sources/reconciler/object/policy_test.go b/components/event-sources/reconciler/object/policy_test.go
@@ -27,7 +27,8 @@ import (
 )
 
 const (
-	tTarget = "tRev-private"
+	tTarget     = "tRev-private"
+	tTargetPort = "http-usermetric"
 )
 
 func TestNewPolicy(t *testing.T) {
@@ -44,6 +45,13 @@ func TestNewPolicy(t *testing.T) {
 			Targets: []*authenticationv1alpha1api.TargetSelector{
 				{
 					Name: tTarget,
+					Ports: []*authenticationv1alpha1api.PortSelector{
+						{
+							Port: &authenticationv1alpha1api.PortSelector_Name{
+								Name: tTargetPort,
+							},
+						},
+					},
 				},
 			},
 			Peers: []*authenticationv1alpha1api.PeerAuthenticationMethod{

diff --git a/components/event-sources/test/fixtures/policy.json b/components/event-sources/test/fixtures/policy.json
@@ -28,7 +28,10 @@
 			}
 		}],
 		"targets": [{
-			"name": "dummy-private"
+			"name": "dummy-private",
+			"ports": [{
+				"name": "http-usermetric"
+			}]
 		}]
 	}
 }