xds: Remove redundant proto checks (#8273)

arjan-bal · web-flow · commit 030938e543b4 · 2025-04-24T15:07:19.000+05:30
diff --git a/xds/internal/clients/xdsclient/helpers_test.go b/xds/internal/clients/xdsclient/helpers_test.go
@@ -129,7 +129,7 @@ func processServerSideListener(lis *v3listenerpb.Listener) (*listenerUpdate, err
 	if n := len(lis.ListenerFilters); n != 0 {
 		return nil, fmt.Errorf("unsupported field 'listener_filters' contains %d entries", n)
 	}
-	if useOrigDst := lis.GetUseOriginalDst(); useOrigDst != nil && useOrigDst.GetValue() {
+	if lis.GetUseOriginalDst().GetValue() {
 		return nil, errors.New("unsupported field 'use_original_dst' is present and set to true")
 	}
 	addr := lis.GetAddress()
diff --git a/xds/internal/clients/xdsclient/test/helpers_test.go b/xds/internal/clients/xdsclient/test/helpers_test.go
@@ -137,7 +137,7 @@ func processServerSideListener(lis *v3listenerpb.Listener) (*listenerUpdate, err
 	if n := len(lis.ListenerFilters); n != 0 {
 		return nil, fmt.Errorf("unsupported field 'listener_filters' contains %d entries", n)
 	}
-	if useOrigDst := lis.GetUseOriginalDst(); useOrigDst != nil && useOrigDst.GetValue() {
+	if lis.GetUseOriginalDst().GetValue() {
 		return nil, errors.New("unsupported field 'use_original_dst' is present and set to true")
 	}
 	addr := lis.GetAddress()
diff --git a/xds/internal/xdsclient/xdsresource/unmarshal_lds.go b/xds/internal/xdsclient/xdsresource/unmarshal_lds.go
@@ -250,7 +250,7 @@ func processServerSideListener(lis *v3listenerpb.Listener) (*ListenerUpdate, err
 	if n := len(lis.ListenerFilters); n != 0 {
 		return nil, fmt.Errorf("unsupported field 'listener_filters' contains %d entries", n)
 	}
-	if useOrigDst := lis.GetUseOriginalDst(); useOrigDst != nil && useOrigDst.GetValue() {
+	if lis.GetUseOriginalDst().GetValue() {
 		return nil, errors.New("unsupported field 'use_original_dst' is present and set to true")
 	}
 	addr := lis.GetAddress()

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ func processServerSideListener(lis v3listenerpb.Listener) (listenerUpdate, err`
`129`	`129`	`if n := len(lis.ListenerFilters); n != 0 {`
`130`	`130`	`return nil, fmt.Errorf("unsupported field 'listener_filters' contains %d entries", n)`
`131`	`131`	`}`
`132`		`- if useOrigDst := lis.GetUseOriginalDst(); useOrigDst != nil && useOrigDst.GetValue() {`
	`132`	`+ if lis.GetUseOriginalDst().GetValue() {`
`133`	`133`	`return nil, errors.New("unsupported field 'use_original_dst' is present and set to true")`
`134`	`134`	`}`
`135`	`135`	`addr := lis.GetAddress()`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ func processServerSideListener(lis v3listenerpb.Listener) (listenerUpdate, err`
`137`	`137`	`if n := len(lis.ListenerFilters); n != 0 {`
`138`	`138`	`return nil, fmt.Errorf("unsupported field 'listener_filters' contains %d entries", n)`
`139`	`139`	`}`
`140`		`- if useOrigDst := lis.GetUseOriginalDst(); useOrigDst != nil && useOrigDst.GetValue() {`
	`140`	`+ if lis.GetUseOriginalDst().GetValue() {`
`141`	`141`	`return nil, errors.New("unsupported field 'use_original_dst' is present and set to true")`
`142`	`142`	`}`
`143`	`143`	`addr := lis.GetAddress()`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ func processServerSideListener(lis v3listenerpb.Listener) (ListenerUpdate, err`
`250`	`250`	`if n := len(lis.ListenerFilters); n != 0 {`
`251`	`251`	`return nil, fmt.Errorf("unsupported field 'listener_filters' contains %d entries", n)`
`252`	`252`	`}`
`253`		`- if useOrigDst := lis.GetUseOriginalDst(); useOrigDst != nil && useOrigDst.GetValue() {`
	`253`	`+ if lis.GetUseOriginalDst().GetValue() {`
`254`	`254`	`return nil, errors.New("unsupported field 'use_original_dst' is present and set to true")`
`255`	`255`	`}`
`256`	`256`	`addr := lis.GetAddress()`