Skip to content

[Aspire] Relax binding validating for non http as simple tcp #6180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Aspire] Relax binding validating for non http as simple tcp #6180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions cli/azd/pkg/apphost/aca_ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ const (
acaIngressSchemaHttp string = "http"
acaIngressSchemaHttps string = "https"
acaIngressTransportHttp2 string = "http2"
acaIngressTransportHttp string = "http"
acaDefaultHttpPort string = "80"
acaDefaultHttpsPort string = "443"
// a target port that is resolved at deployment time
Expand All @@ -70,15 +69,13 @@ func validateBindings(bindings custommaps.WithOrder[Binding]) error {
return fmt.Errorf("binding %q is empty", name)
}

switch binding.Scheme {
case acaIngressSchemaTcp:
// TCP scheme requires a target port to be specified
// Note: We check for TCP specifically since other schemes (http, https, redis, postgres, etc.)
// can work without explicit target ports in some scenarios
if binding.Scheme == acaIngressSchemaTcp {
if binding.TargetPort == nil {
return fmt.Errorf("binding %q has scheme %q but no container port", name, binding.Scheme)
}
case acaIngressSchemaHttp:
case acaIngressSchemaHttps:
default:
return fmt.Errorf("binding %q has invalid scheme %q", name, binding.Scheme)
}
}

Expand Down
13 changes: 8 additions & 5 deletions cli/azd/pkg/apphost/aca_ingress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func TestBuildAcaIngress(t *testing.T) {
assert.Equal(t, []string{"http"}, ingressBinding)
})

t.Run("invalid schema", func(t *testing.T) {
t.Run("invalid_schema", func(t *testing.T) {
bindingsManifest := `{
"http": {
"scheme": "invalid",
Expand All @@ -145,11 +145,14 @@ func TestBuildAcaIngress(t *testing.T) {
err := json.Unmarshal([]byte(bindingsManifest), &bindings)
assert.NoError(t, err)

// Custom schemes are now allowed (e.g., redis, postgres, etc.)
// The scheme should be treated as non-HTTP and use TCP transport
ingress, ingressBinding, err := buildAcaIngress(bindings, 8080)
assert.Error(t, err)
assert.EqualError(t, err, `binding "http" has invalid scheme "invalid"`)
assert.Nil(t, ingress)
assert.Equal(t, []string(nil), ingressBinding)
assert.NoError(t, err)
assert.NotNil(t, ingress)
assert.Equal(t, "tcp", ingress.Transport)
assert.Equal(t, 33, ingress.TargetPort)
assert.Equal(t, []string{"http"}, ingressBinding)
})

t.Run("additional ports", func(t *testing.T) {
Expand Down
Loading