Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'shush' into shush-connect

Browse Source
pull/35625/head
Craig Tiller 1 year ago
parent 3d9473c9d1 cc0eedd1ad
commit b8f78993c6
13 changed files with 96 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      gRPC-C++.podspec
  2. 10
      gRPC-Core.podspec
  3. 16
      gRPC.podspec
  4. 4
      requirements.bazel.txt
  5. 5
      src/objective-c/BoringSSL-GRPC.podspec
  6. 8
      src/objective-c/PrivacyInfo.xcprivacy
  7. 10
      templates/gRPC-C++.podspec.template
  8. 10
      templates/gRPC-Core.podspec.template
  9. 16
      templates/gRPC.podspec.template
  10. 5
      templates/src/objective-c/BoringSSL-GRPC.podspec.template
  11. 3
      test/core/transport/test_suite/corpus/chaotic_good/5033076095254528
  12. 17
      test/core/util/proto_bit_gen.h
  13. 2
      tools/buildgen/generate_projects.sh

10
gRPC-C++.podspec generated
Unescape View File

@ -80,6 +80,14 @@ Pod::Spec.new do |s|
s.header_mappings_dir = 'include/grpcpp'
# Exposes the privacy manifest. Depended on by any subspecs containing
# non-interface files.
s.subspec 'Privacy' do |ss|
ss.resource_bundles = {
s.module_name => 'src/objective-c/PrivacyInfo.xcprivacy'
}
end
s.subspec 'Interface' do |ss|
ss.header_mappings_dir = 'include/grpcpp'
@ -214,6 +222,7 @@ Pod::Spec.new do |s|
s.subspec 'Implementation' do |ss|
ss.header_mappings_dir = '.'
ss.dependency "#{s.name}/Privacy", version
ss.dependency "#{s.name}/Interface", version
ss.dependency 'gRPC-Core', version
abseil_version = '1.20230802.0'
@ -2738,6 +2747,7 @@ Pod::Spec.new do |s|
ss.header_mappings_dir = '.'
ss.dependency "#{s.name}/Cronet-Interface", version
ss.dependency "#{s.name}/Implementation", version
ss.dependency "#{s.name}/Privacy", version
ss.dependency 'gRPC-Core/Cronet-Implementation', version

10
gRPC-Core.podspec generated
Unescape View File

@ -94,6 +94,14 @@ Pod::Spec.new do |s|
s.compiler_flags = '-DGRPC_ARES=0 -Wno-comma'
s.libraries = 'c++'
# Exposes the privacy manifest. Depended on by any subspecs containing
# non-interface files.
s.subspec 'Privacy' do |ss|
ss.resource_bundles = {
s.module_name => 'src/objective-c/PrivacyInfo.xcprivacy'
}
end
# Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its
# sources and private headers in other directories outside `include/`. Cocoapods' linter doesn't
# allow any header to be listed outside the `header_mappings_dir` (even though doing so works in
@ -185,6 +193,7 @@ Pod::Spec.new do |s|
ss.header_mappings_dir = '.'
ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version
ss.dependency "#{s.name}/Privacy", version
ss.dependency 'BoringSSL-GRPC', '0.0.31'
ss.dependency 'abseil/algorithm/container', abseil_version
ss.dependency 'abseil/base/base', abseil_version
@ -3494,6 +3503,7 @@ Pod::Spec.new do |s|
ss.dependency "#{s.name}/Interface", version
ss.dependency "#{s.name}/Implementation", version
ss.dependency "#{s.name}/Privacy", version
ss.dependency "#{s.name}/Cronet-Interface", version
ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc',

16
gRPC.podspec generated
Unescape View File

@ -32,8 +32,6 @@ Pod::Spec.new do |s|
:tag => "v#{version}",
}
s.resource = 'src/objective-c/PrivacyInfo.xcprivacy'
name = 'GRPCClient'
s.module_name = name
s.header_dir = name
@ -52,6 +50,14 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '12.0'
s.watchos.deployment_target = '6.0'
# Exposes the privacy manifest. Depended on by any subspecs containing
# non-interface files.
s.subspec 'Privacy' do |ss|
ss.resource_bundles = {
s.module_name => 'src/objective-c/PrivacyInfo.xcprivacy'
}
end
s.subspec 'Interface-Legacy' do |ss|
ss.header_mappings_dir = 'src/objective-c/GRPCClient'
@ -72,7 +78,7 @@ Pod::Spec.new do |s|
"src/objective-c/GRPCClient/GRPCTypes.h",
"src/objective-c/GRPCClient/GRPCTypes.mm"
ss.dependency "gRPC-RxLibrary/Interface", version
ss.dependency "#{s.name}/Privacy", version
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '12.0'
@ -107,7 +113,7 @@ Pod::Spec.new do |s|
'src/objective-c/GRPCClient/version.h'
ss.dependency "#{s.name}/Interface-Legacy", version
ss.dependency "#{s.name}/Privacy", version
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '12.0'
@ -141,6 +147,7 @@ Pod::Spec.new do |s|
ss.dependency "#{s.name}/Interface-Legacy", version
ss.dependency "#{s.name}/Interface", version
ss.dependency "#{s.name}/Privacy", version
ss.dependency 'gRPC-Core', version
ss.dependency 'gRPC-RxLibrary', version
@ -157,6 +164,7 @@ Pod::Spec.new do |s|
'src/objective-c/GRPCClient/GRPCCall+Cronet.mm',
'src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/*.{h,mm}'
ss.dependency "#{s.name}/GRPCCore", version
ss.dependency "#{s.name}/Privacy", version
ss.dependency 'gRPC-Core/Cronet-Implementation', version
ss.dependency 'CronetFramework'

4
requirements.bazel.txt
Unescape View File

@ -23,9 +23,9 @@ proto-plus==1.22.3
google-auth==2.23.4
googleapis-common-protos==1.61.0
cachetools==5.3.2
charset-normalizer==3.3.2
charset-normalizer==3.3.2
pyasn1==0.5.0
rsa==4.9
rsa==4.9
greenlet==1.1.3.post0
zope.interface==6.1
opentelemetry-sdk==1.21.0

5
src/objective-c/BoringSSL-GRPC.podspec
Unescape View File

@ -122,6 +122,11 @@ Pod::Spec.new do |s|
end
s.subspec 'Implementation' do |ss|
ss.header_mappings_dir = 'src'
ss.resource_bundles = {
s.module_name => 'src/objective-c/PrivacyInfo.xcprivacy'
}
ss.source_files = 'src/ssl/*.{h,c,cc}',
'src/ssl/**/*.{h,c,cc}',
'src/crypto/*.{h,c,cc}',

8
src/objective-c/PrivacyInfo.xcprivacy
Unescape View File

@ -18,6 +18,14 @@
<string>C617.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>35F9.1</string>
</array>
</dict>
</array>
</dict>
</plist>

10
templates/gRPC-C++.podspec.template
Unescape View File

@ -164,6 +164,14 @@
s.header_mappings_dir = 'include/grpcpp'
# Exposes the privacy manifest. Depended on by any subspecs containing
# non-interface files.
s.subspec 'Privacy' do |ss|
ss.resource_bundles = {
s.module_name => 'src/objective-c/PrivacyInfo.xcprivacy'
}
end
s.subspec 'Interface' do |ss|
ss.header_mappings_dir = 'include/grpcpp'
@ -172,6 +180,7 @@
s.subspec 'Implementation' do |ss|
ss.header_mappings_dir = '.'
ss.dependency "#{s.name}/Privacy", version
ss.dependency "#{s.name}/Interface", version
ss.dependency 'gRPC-Core', version
abseil_version = '1.20230802.0'
@ -203,6 +212,7 @@
ss.header_mappings_dir = '.'
ss.dependency "#{s.name}/Cronet-Interface", version
ss.dependency "#{s.name}/Implementation", version
ss.dependency "#{s.name}/Privacy", version
ss.dependency 'gRPC-Core/Cronet-Implementation', version

10
templates/gRPC-Core.podspec.template
Unescape View File

@ -170,6 +170,14 @@
s.compiler_flags = '-DGRPC_ARES=0 -Wno-comma'
s.libraries = 'c++'
# Exposes the privacy manifest. Depended on by any subspecs containing
# non-interface files.
s.subspec 'Privacy' do |ss|
ss.resource_bundles = {
s.module_name => 'src/objective-c/PrivacyInfo.xcprivacy'
}
end
# Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its
# sources and private headers in other directories outside `include/`. Cocoapods' linter doesn't
# allow any header to be listed outside the `header_mappings_dir` (even though doing so works in
@ -189,6 +197,7 @@
ss.header_mappings_dir = '.'
ss.libraries = 'z'
ss.dependency "#{s.name}/Interface", version
ss.dependency "#{s.name}/Privacy", version
ss.dependency 'BoringSSL-GRPC', '0.0.31'
% for abseil_spec in grpc_abseil_specs:
ss.dependency '${abseil_spec}', abseil_version
@ -214,6 +223,7 @@
ss.dependency "#{s.name}/Interface", version
ss.dependency "#{s.name}/Implementation", version
ss.dependency "#{s.name}/Privacy", version
ss.dependency "#{s.name}/Cronet-Interface", version
ss.source_files = ${ruby_multiline_list(grpc_cronet_files, 22)}

16
templates/gRPC.podspec.template
Unescape View File

@ -34,8 +34,6 @@
:tag => "v#{version}",
}
s.resource = 'src/objective-c/PrivacyInfo.xcprivacy'
name = 'GRPCClient'
s.module_name = name
s.header_dir = name
@ -54,6 +52,14 @@
s.tvos.deployment_target = '12.0'
s.watchos.deployment_target = '6.0'
# Exposes the privacy manifest. Depended on by any subspecs containing
# non-interface files.
s.subspec 'Privacy' do |ss|
ss.resource_bundles = {
s.module_name => 'src/objective-c/PrivacyInfo.xcprivacy'
}
end
s.subspec 'Interface-Legacy' do |ss|
ss.header_mappings_dir = 'src/objective-c/GRPCClient'
@ -74,7 +80,7 @@
"src/objective-c/GRPCClient/GRPCTypes.h",
"src/objective-c/GRPCClient/GRPCTypes.mm"
ss.dependency "gRPC-RxLibrary/Interface", version
ss.dependency "#{s.name}/Privacy", version
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '12.0'
@ -109,7 +115,7 @@
'src/objective-c/GRPCClient/version.h'
ss.dependency "#{s.name}/Interface-Legacy", version
ss.dependency "#{s.name}/Privacy", version
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '12.0'
@ -143,6 +149,7 @@
ss.dependency "#{s.name}/Interface-Legacy", version
ss.dependency "#{s.name}/Interface", version
ss.dependency "#{s.name}/Privacy", version
ss.dependency 'gRPC-Core', version
ss.dependency 'gRPC-RxLibrary', version
@ -159,6 +166,7 @@
'src/objective-c/GRPCClient/GRPCCall+Cronet.mm',
'src/objective-c/GRPCClient/private/GRPCCore/GRPCCoreCronet/*.{h,mm}'
ss.dependency "#{s.name}/GRPCCore", version
ss.dependency "#{s.name}/Privacy", version
ss.dependency 'gRPC-Core/Cronet-Implementation', version
ss.dependency 'CronetFramework'

5
templates/src/objective-c/BoringSSL-GRPC.podspec.template
Unescape View File

@ -152,6 +152,11 @@
end
s.subspec 'Implementation' do |ss|
ss.header_mappings_dir = 'src'
ss.resource_bundles = {
s.module_name => 'src/objective-c/PrivacyInfo.xcprivacy'
}
ss.source_files = 'src/ssl/*.{h,c,cc}',
'src/ssl/**/*.{h,c,cc}',
'src/crypto/*.{h,c,cc}',

3
test/core/transport/test_suite/corpus/chaotic_good/5033076095254528
Unescape View File

@ -0,0 +1,3 @@
test_id: 637599745
fixture_id: 262144
rng: 18446744073709551614

17
test/core/util/proto_bit_gen.h
Unescape View File

@ -21,6 +21,7 @@
#include <cstdint>
#include <limits>
#include <random>
#include <vector>
namespace grpc_core {
@ -39,21 +40,19 @@ class ProtoBitGen : public std::numeric_limits<uint64_t> {
using result_type = uint64_t;
uint64_t operator()() {
if (results_.empty()) {
++current_;
return current_;
if (current_ < results_.size()) {
return results_[current_++];
}
// We loop through but increment by one each round, to guarantee to see all
// values eventually.
uint64_t out =
results_[current_ % results_.size()] + (current_ / results_.size());
++current_;
return out;
return generator_();
}
private:
std::vector<uint64_t> results_;
size_t current_ = 0;
std::mt19937_64 generator_ = [this]() {
std::seed_seq seq(results_.begin(), results_.end());
return std::mt19937_64(seq);
}();
};
} // namespace grpc_core

2
tools/buildgen/generate_projects.sh
Unescape View File

@ -36,7 +36,7 @@ tools/buildgen/build_cleaner.py build_handwritten.yaml
# /usr/local/google/home/rbellevi/dev/tmp/grpc/venv/bin/python3: No module named virtualenv
# Generate xds-protos
[[ -d generate_projects_virtual_environment ]] || python3 -m virtualenv generate_projects_virtual_environment
[[ -d generate_projects_virtual_environment ]] || { python3 -m pip install virtualenv --upgrade && python3 -m virtualenv generate_projects_virtual_environment; }
generate_projects_virtual_environment/bin/pip install --upgrade --ignore-installed grpcio-tools==1.59.0
generate_projects_virtual_environment/bin/python tools/distrib/python/xds_protos/build.py

Write Preview
Loading…
Cancel
Save