Skip to content
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

Jump to bottom

Fix: Show warning about file import #241

Merged
merged 2 commits into from
Sep 2, 2024
+83 −36
Merged

Fix: Show warning about file import #241

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f415642
fix warning
utahta Sep 2, 2024
ed85f10
lookup DefSet, Messages, PreconditionFailures, BadRequests and Locali…
utahta Sep 2, 2024
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
22 changes: 22 additions & 0 deletions resolver/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,9 @@ func (r *Resolver) lookupPackageNameMapUsedInGRPCFederationDefinitionFromMessage
}
maps.Copy(pkgNameMap, r.lookupPackageNameMapFromMessageArguments(v.Expr.Call.Request.Args))
}
for _, err := range v.Expr.Call.Errors {
maps.Copy(pkgNameMap, r.lookupPackageNameMapFromGRPCError(err))
}
case v.Expr.Message != nil:
if v.Expr.Message.Message != nil {
pkgNameMap[v.Expr.Message.Message.PackageName()] = struct{}{}
Expand All @@ -556,6 +559,8 @@ func (r *Resolver) lookupPackageNameMapUsedInGRPCFederationDefinitionFromMessage
maps.Copy(pkgNameMap, r.lookupPackageNameMapFromMessageArguments(v.Expr.Map.Expr.Message.Args))
}
}
case v.Expr.Validation != nil:
maps.Copy(pkgNameMap, r.lookupPackageNameMapFromGRPCError(v.Expr.Validation.Error))
}
}
}
Expand Down Expand Up @@ -586,6 +591,23 @@ func (r *Resolver) lookupPackageNameMapUsedInGRPCFederationDefinitionFromMessage
return pkgNameMap
}

func (r *Resolver) lookupPackageNameMapFromGRPCError(err *GRPCError) map[string]struct{} {
if err == nil {
return nil
}
pkgNameMap := map[string]struct{}{}
maps.Copy(pkgNameMap, r.lookupPackageNameMapFromCELValue(err.If))
maps.Copy(pkgNameMap, r.lookupPackageNameMapFromCELValue(err.Message))
maps.Copy(pkgNameMap, r.lookupPackageNameMapFromCELValue(err.IgnoreAndResponse))
for _, detail := range err.Details {
maps.Copy(pkgNameMap, r.lookupPackageNameMapFromCELValue(detail.If))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other fields ( DefSet Messages PreconditionFailures BadRequests LocalizedMessages ) in GRPCErrorDetail may also need to be covered.

for _, by := range detail.By {
maps.Copy(pkgNameMap, r.lookupPackageNameMapFromCELValue(by))
}
}
return pkgNameMap
}

func (r *Resolver) lookupPackageNameMapFromCELValue(val *CELValue) map[string]struct{} {
if val == nil {
return nil
Expand Down
Loading