Skip to content

mark envoy/, absl/, and api/ as system include prefixes #115

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

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

mark envoy/, absl/, and api/ as system include prefixes #115

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
2 changes: 0 additions & 2 deletions source/common/factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
#include <ranges>
#include "fmt/format.h"

#pragma clang unsafe_buffer_usage begin
#include "envoy/common/exception.h"
#pragma clang unsafe_buffer_usage end

// algorithm priority index (0 is highest priority)
using priority_t = uint32_t;
Expand Down
2 changes: 0 additions & 2 deletions source/common/id_alloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
#include <concepts>
#include <set>

#pragma clang unsafe_buffer_usage begin
#include "absl/status/statusor.h"
#include "source/common/common/assert.h"
#pragma clang unsafe_buffer_usage end

// A basic numeric ID allocator for unsigned integer types.
// To allocate a new identifier, call alloc(). When an identifier is no longer needed and should
Expand Down
2 changes: 0 additions & 2 deletions source/common/status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

#include "source/common/common/fmt.h" // IWYU pragma: keep
#include "fmt/format.h"
#pragma clang unsafe_buffer_usage begin
#include "absl/status/statusor.h" // IWYU pragma: keep
#pragma clang unsafe_buffer_usage end

// Wraps an absl::Status with additional message context, but keeps the status code. Similar to
// fmt.Errorf.
Expand Down
5 changes: 5 additions & 0 deletions source/extensions/filters/network/ssh/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ envoy_cc_library(
"-Wimplicit-fallthrough",
"-Wimplicit-int-conversion",
"-Wunsafe-buffer-usage",
"--system-header-prefix=envoy/",
"--system-header-prefix=absl/",
"--system-header-prefix=api/",
"--system-header-prefix=source/common/common/",
"--system-header-prefix=source/common/buffer/",
],
repository = "@envoy",
deps = [
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/channel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

#include "source/extensions/filters/network/ssh/wire/messages.h"

#pragma clang unsafe_buffer_usage begin
#include "api/extensions/filters/network/ssh/ssh.pb.h"
#pragma clang unsafe_buffer_usage end

namespace Envoy::Extensions::NetworkFilters::GenericProxy::Codec {

Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/client_transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#pragma once

#pragma clang unsafe_buffer_usage begin
#include "source/extensions/filters/network/generic_proxy/codec_callbacks.h"
#pragma clang unsafe_buffer_usage end
#include "source/extensions/filters/network/generic_proxy/interface/codec.h"

#include "source/extensions/filters/network/ssh/extension_ping.h"
Expand Down
4 changes: 1 addition & 3 deletions source/extensions/filters/network/ssh/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
#include <unordered_set>
#include <unordered_map>

#include "fmt/std.h" // IWYU pragma: keep
#pragma clang unsafe_buffer_usage begin
#include "fmt/std.h" // IWYU pragma: keep
#include "absl/status/statusor.h" // IWYU pragma: keep
#pragma clang unsafe_buffer_usage end

#include "source/common/types.h" // IWYU pragma: keep

Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
#include <cerrno>
#include <unistd.h>

#pragma clang unsafe_buffer_usage begin
#include "api/extensions/filters/network/ssh/ssh.pb.h"
#include "api/extensions/filters/network/ssh/ssh.pb.validate.h"
#include "source/extensions/filters/network/generic_proxy/interface/codec.h"
#pragma clang unsafe_buffer_usage end

#include "source/extensions/filters/network/ssh/openssh.h"
#include "source/extensions/filters/network/ssh/transport.h"
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#pragma once

#pragma clang unsafe_buffer_usage begin
#include "source/extensions/filters/network/generic_proxy/interface/stream.h"
#pragma clang unsafe_buffer_usage end

#include "source/extensions/filters/network/ssh/wire/messages.h"
#include "source/extensions/filters/network/ssh/common.h"
Expand Down
3 changes: 1 addition & 2 deletions source/extensions/filters/network/ssh/grpc_client_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

#include <type_traits>

#pragma clang unsafe_buffer_usage begin
#include "source/common/grpc/typed_async_client.h"

#include "api/extensions/filters/network/ssh/ssh.pb.h"
#pragma clang unsafe_buffer_usage end

#include "source/extensions/filters/network/ssh/message_handler.h"
#include "source/extensions/filters/network/ssh/common.h"
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/message_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
#include <unordered_map>
#include <utility>

#pragma clang unsafe_buffer_usage begin
#include "absl/status/status.h"
#include "source/common/common/assert.h"
#pragma clang unsafe_buffer_usage end
#include "fmt/format.h"

#include "envoy/common/pure.h"
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/openssh.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
#include "source/common/common/assert.h"
#include "source/extensions/filters/network/ssh/wire/common.h"

#pragma clang unsafe_buffer_usage begin
#include "envoy/config/core/v3/base.pb.h"
#pragma clang unsafe_buffer_usage end

extern "C" {
#include "openssh/ssh2.h"
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/openssh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@

#include "source/extensions/filters/network/ssh/common.h"

#pragma clang unsafe_buffer_usage begin
#include "envoy/buffer/buffer.h"
#pragma clang unsafe_buffer_usage end

extern "C" {
#include "openssh/sshkey.h"
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/packet_cipher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

#include <cstdint>

#pragma clang unsafe_buffer_usage begin
#include "envoy/buffer/buffer.h"
#pragma clang unsafe_buffer_usage end
#include "source/common/factory.h"
#include "source/extensions/filters/network/ssh/openssh.h"

Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/packet_cipher_aead.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
#include <memory>
#include <string>

#pragma clang unsafe_buffer_usage begin
#include "envoy/buffer/buffer.h"
#pragma clang unsafe_buffer_usage end
#include "source/common/common/logger.h"

#include "source/extensions/filters/network/ssh/openssh.h"
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/packet_cipher_etm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#include "source/extensions/filters/network/ssh/packet_cipher_etm.h"
#include "source/common/span.h"

#pragma clang unsafe_buffer_usage begin
#include "source/common/buffer/buffer_impl.h"
#pragma clang unsafe_buffer_usage end

namespace Envoy::Extensions::NetworkFilters::GenericProxy::Codec {

Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/server_transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#pragma once

#pragma clang unsafe_buffer_usage begin
#include "source/extensions/filters/network/generic_proxy/codec_callbacks.h"
#include "api/extensions/filters/network/ssh/ssh.pb.h"
#pragma clang unsafe_buffer_usage end
#include "source/extensions/filters/network/generic_proxy/interface/codec.h"

#include "source/extensions/filters/network/ssh/transport.h"
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/stream_tracker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

#include "source/extensions/filters/network/ssh/channel.h"

#pragma clang unsafe_buffer_usage begin
#include "envoy/event/dispatcher.h"
#include "envoy/server/factory_context.h"
#include "api/extensions/filters/network/ssh/ssh.pb.h"
#include "api/extensions/filters/network/ssh/ssh.pb.validate.h"
#pragma clang unsafe_buffer_usage end

#include "source/extensions/filters/network/ssh/common.h"

Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#pragma once

#pragma clang unsafe_buffer_usage begin
#include "api/extensions/filters/network/ssh/ssh.pb.h"
#pragma clang unsafe_buffer_usage end
#include "source/common/id_alloc.h"
#include "source/extensions/filters/network/ssh/id_manager.h"
#include "source/extensions/filters/network/ssh/openssh.h"
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/version_exchange.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#pragma once

#pragma clang unsafe_buffer_usage begin
#include "absl/status/statusor.h"
#include "envoy/buffer/buffer.h"
#pragma clang unsafe_buffer_usage end

#include "source/extensions/filters/network/ssh/transport.h"

Expand Down
5 changes: 5 additions & 0 deletions source/extensions/filters/network/ssh/wire/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ envoy_cc_library(
"-Wimplicit-fallthrough",
"-Wimplicit-int-conversion",
"-Wunsafe-buffer-usage",
"--system-header-prefix=envoy/",
"--system-header-prefix=absl/",
"--system-header-prefix=api/",
"--system-header-prefix=source/common/common/",
"--system-header-prefix=source/common/buffer/",
],
repository = "@envoy",
deps = [
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/wire/encoding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@
#include <string>
#include <utility>

#pragma clang unsafe_buffer_usage begin
#include "absl/status/statusor.h"
#include "source/common/buffer/buffer_impl.h"
#pragma clang unsafe_buffer_usage end

#include "source/extensions/filters/network/ssh/wire/common.h"
#include "source/extensions/filters/network/ssh/wire/validation.h"
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/wire/field.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
#include <utility>
#include <variant>

#pragma clang unsafe_buffer_usage begin
#include "absl/strings/escaping.h"
#include "fmt/ranges.h"
#pragma clang unsafe_buffer_usage end

#include "source/common/common/fmt.h" // IWYU pragma: keep
#include "source/common/visit.h"
Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/wire/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

#include <concepts>

#pragma clang unsafe_buffer_usage begin
#include "source/common/buffer/buffer_impl.h"
#pragma clang unsafe_buffer_usage end

namespace {

Expand Down
2 changes: 0 additions & 2 deletions source/extensions/filters/network/ssh/wire/validation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
#include <cstdio>
#include <type_traits>

#pragma clang unsafe_buffer_usage begin
#include "envoy/buffer/buffer.h"
#include "absl/status/statusor.h"
#pragma clang unsafe_buffer_usage end

namespace wire::tags {
struct no_validation : ::tags::no_validation {
Expand Down
2 changes: 0 additions & 2 deletions test/common/span_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#include "source/common/span.h"
#include "gtest/gtest.h"

#pragma clang unsafe_buffer_usage begin
#include "source/common/buffer/buffer_impl.h"
#pragma clang unsafe_buffer_usage end

TEST(SpanTest, UnsafeForgeSpan) {
uint8_t* x = new uint8_t[10]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
Expand Down
2 changes: 0 additions & 2 deletions test/extensions/filters/network/ssh/config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
#include "test/mocks/server/server_factory_context.h"
#include "test/extensions/filters/network/ssh/test_env_util.h"

#pragma clang unsafe_buffer_usage begin
#include "api/extensions/filters/network/ssh/ssh.pb.h"
#include "source/extensions/filters/network/generic_proxy/interface/codec.h"
#pragma clang unsafe_buffer_usage end

#include "gtest/gtest.h"
#include "gmock/gmock.h"
Expand Down
2 changes: 0 additions & 2 deletions test/extensions/filters/network/ssh/openssh_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
#include "test/extensions/filters/network/ssh/wire/test_field_reflect.h"
#include "test/test_common/logging.h"

#pragma clang unsafe_buffer_usage begin
#include "absl/strings/str_split.h"
#include "absl/strings/str_replace.h"
#pragma clang unsafe_buffer_usage end

extern "C" {
#include "openssh/ssh2.h"
Expand Down
2 changes: 0 additions & 2 deletions test/extensions/filters/network/ssh/test_mocks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@
#include "source/extensions/filters/network/ssh/kex.h"
#include "api/extensions/filters/network/ssh/ssh.pb.h"

#pragma clang unsafe_buffer_usage begin
#include "envoy/buffer/buffer.h"
#include "absl/status/statusor.h"
#pragma clang unsafe_buffer_usage end

#include "gmock/gmock.h" // IWYU pragma: keep

Expand Down
2 changes: 0 additions & 2 deletions test/extensions/filters/network/ssh/wire/test_mocks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#pragma once

#pragma clang unsafe_buffer_usage begin
#include "envoy/buffer/buffer.h"
#include "absl/status/statusor.h"
#pragma clang unsafe_buffer_usage end

#include "gmock/gmock.h" // IWYU pragma: keep

Expand Down
2 changes: 0 additions & 2 deletions test/extensions/filters/network/ssh/wire/test_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
#include "source/extensions/filters/network/ssh/wire/common.h"
#include "gtest/gtest.h" // IWYU pragma: keep

#pragma clang unsafe_buffer_usage begin
#include "absl/random/random.h"
#pragma clang unsafe_buffer_usage end

namespace wire::test {

Expand Down
2 changes: 0 additions & 2 deletions test/test_common/test_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
#include "source/common/optref.h"
#include "source/common/types.h"
#include "source/common/type_traits.h"
#pragma clang unsafe_buffer_usage begin
#include "source/common/buffer/buffer_impl.h" // IWYU pragma: keep
#include "absl/random/random.h"
#include "test/test_common/status_utility.h" // IWYU pragma: keep

#if defined(NDEBUG) || defined(ENVOY_CONFIG_COVERAGE)
#include "test/test_common/logging.h"
#endif
#pragma clang unsafe_buffer_usage end

#include "gtest/gtest.h"
#include "gmock/gmock.h" // IWYU pragma: keep
Expand Down
Loading