[api-gateway]: Support http(s) as AppProtocol in Kubernetes svc

[Krast76]

When contour is used as api-gateway in kubernetes clusters, appProtocol set to http or https doesn't work.
This PR, if applied, allow the following protocol (as defined by IANA) :

• http and www-http
• https

That doesn't allow all the IANA services, but that'll support a common case

Fix #6560

[github-actions]

Hi @Krast76! Welcome to our community and thank you for opening your first Pull Request. Someone will review it soon. Thank you for committing to making Contour better. You can also join us on our mailing list and in our channel in the Kubernetes Slack Workspace

[tsaarni]

Thanks @Krast76! Could you check also the linter nags here https://github.com/projectcontour/contour/pull/6616/files and add a changelog entry in the PR, the filename should be changelogs/unreleased/6616-Krast76-small.md.

[Krast76]

Thanks @Krast76! Could you check also the linter nags here https://github.com/projectcontour/contour/pull/6616/files and add a changelog entry in the PR, the filename should be changelogs/unreleased/6616-Krast76-small.md.

Done :)

[Krast76]

@tsaarni There is something else I should do to make the PR merged ?

The linter still failed, but I don't really understand why. 🤔

[tsaarni]

The linter still failed, but I don't really understand why. 🤔

Almost impossible to see in the error, but it was the alignment that it complains :-) Run make format to get it fixed!

[tsaarni]

@tsaarni There is something else I should do to make the PR merged ?

It could be good to add a unit test, something like this

diff --git a/internal/dag/accessors_test.go b/internal/dag/accessors_test.go
index bc3e2b86..8c3bc553 100644
--- a/internal/dag/accessors_test.go
+++ b/internal/dag/accessors_test.go
@@ -127,6 +127,18 @@ func TestBuilderLookupService(t *testing.T) {
                                        AppProtocol: ptr.To("kubernetes.io/wss"),
                                        Port:        8444,
                                },
+                               {
+                                       Name:        "iana-https",
+                                       Protocol:    "TCP",
+                                       AppProtocol: ptr.To("https"),
+                                       Port:        8445,
+                               },
+                               {
+                                       Name:        "iana-http",
+                                       Protocol:    "TCP",
+                                       AppProtocol: ptr.To("http"),
+                                       Port:        8446,
+                               },
                        },
                },
        }
@@ -212,12 +224,21 @@ func TestBuilderLookupService(t *testing.T) {
                        port:           8443,
                        want:           appProtcolService(appProtoService, "h2c"),
                },
-
                "lookup service by port number with unsupported k8s app protocol: wss": {
                        NamespacedName: types.NamespacedName{Name: appProtoService.Name, Namespace: appProtoService.Namespace},
                        port:           8444,
                        want:           appProtcolService(appProtoService, "", 1),
                },
+               "lookup service by port number with supported IANA app protocol: https": {
+                       NamespacedName: types.NamespacedName{Name: appProtoService.Name, Namespace: appProtoService.Namespace},
+                       port:           8445,
+                       want:           appProtcolService(appProtoService, "tls", 2),
+               },
+               "lookup service by port number with supported IANA app protocol: http": {
+                       NamespacedName: types.NamespacedName{Name: appProtoService.Name, Namespace: appProtoService.Namespace},
+                       port:           8446,
+                       want:           appProtcolService(appProtoService, "", 3),
+               },
        }

        for name, tc := range tests {

[Krast76]

The linter still failed, but I don't really understand why. 🤔

Almost impossible to see in the error, but it was the alignment that it complains :-) Run make format to get it fixed!

I should have guessed that 😅

The linter must be ok (for real) this time, and I have added the unit tests you have suggested, thanks ! :)

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.76%. Comparing base (f9b6f6f) to head (d609cdc).
Report is 6 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #6616   +/-   ##
=======================================
  Coverage   81.76%   81.76%           
=======================================
  Files         133      133           
  Lines       15942    15944    +2     
=======================================
+ Hits        13035    13037    +2     
  Misses       2614     2614           
  Partials      293      293           

Files	Coverage Δ
internal/dag/accessors.go	87.70% <100.00%> (+0.13%)	⬆️

[tsaarni]

Thank You @Krast76!