diff --git a/.azure-pipelines/bazel.yml b/.azure-pipelines/bazel.yml index 3c440cdef9343..d68973ab0ee45 100644 --- a/.azure-pipelines/bazel.yml +++ b/.azure-pipelines/bazel.yml @@ -1,85 +1,85 @@ parameters: - - name: ciTarget - displayName: "CI target" - type: string - default: bazel.release - - name: artifactSuffix - displayName: "Suffix of artifact" - type: string - default: "" - - name: rbe - displayName: "Enable RBE" - type: boolean - default: true - - name: managedAgent - type: boolean - default: true - - name: bazelBuildExtraOptions - type: string - default: "--flaky_test_attempts=2" +- name: ciTarget + displayName: "CI target" + type: string + default: bazel.release +- name: artifactSuffix + displayName: "Suffix of artifact" + type: string + default: "" +- name: rbe + displayName: "Enable RBE" + type: boolean + default: true +- name: managedAgent + type: boolean + default: true +- name: bazelBuildExtraOptions + type: string + default: "--flaky_test_attempts=2" steps: - - task: Cache@2 - inputs: - key: '"${{ parameters.ciTarget }}" | ./WORKSPACE | **/*.bzl' - path: $(Build.StagingDirectory)/repository_cache - continueOnError: true +- task: Cache@2 + inputs: + key: '"${{ parameters.ciTarget }}" | ./WORKSPACE | **/*.bzl' + path: $(Build.StagingDirectory)/repository_cache + continueOnError: true - - bash: .azure-pipelines/cleanup.sh - displayName: "Removing tools from agent" - condition: ${{ parameters.managedAgent }} +- bash: .azure-pipelines/cleanup.sh + displayName: "Removing tools from agent" + condition: ${{ parameters.managedAgent }} - - bash: | - echo "disk space at beginning of build:" - df -h - displayName: "Check disk space at beginning" +- bash: | + echo "disk space at beginning of build:" + df -h + displayName: "Check disk space at beginning" - - bash: | - sudo mkdir -p /etc/docker - echo '{ - "ipv6": true, - "fixed-cidr-v6": "2001:db8:1::/64" - }' | sudo tee /etc/docker/daemon.json - sudo service docker restart - displayName: "Enable IPv6" - condition: ${{ parameters.managedAgent }} +- bash: | + sudo mkdir -p /etc/docker + echo '{ + "ipv6": true, + "fixed-cidr-v6": "2001:db8:1::/64" + }' | sudo tee /etc/docker/daemon.json + sudo service docker restart + displayName: "Enable IPv6" + condition: ${{ parameters.managedAgent }} - - script: ci/run_envoy_docker.sh 'ci/do_ci.sh ${{ parameters.ciTarget }}' - workingDirectory: $(Build.SourcesDirectory) - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - SLACK_TOKEN: $(SLACK_TOKEN) - REPO_URI: $(Build.Repository.Uri) - BUILD_URI: $(Build.BuildUri) - ${{ if parameters.rbe }}: - ENVOY_RBE: "1" - BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --jobs=$(RbeJobs) ${{ parameters.bazelBuildExtraOptions }}" - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - ${{ if eq(parameters.rbe, false) }}: - BAZEL_BUILD_EXTRA_OPTIONS: "${{ parameters.bazelBuildExtraOptions }}" - BAZEL_REMOTE_CACHE: $(LocalBuildCache) +- script: ci/run_envoy_docker.sh 'ci/do_ci.sh ${{ parameters.ciTarget }}' + workingDirectory: $(Build.SourcesDirectory) + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + SLACK_TOKEN: $(SLACK_TOKEN) + REPO_URI: $(Build.Repository.Uri) + BUILD_URI: $(Build.BuildUri) + ${{ if parameters.rbe }}: + ENVOY_RBE: "1" + BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --jobs=$(RbeJobs) ${{ parameters.bazelBuildExtraOptions }}" + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + ${{ if eq(parameters.rbe, false) }}: + BAZEL_BUILD_EXTRA_OPTIONS: "${{ parameters.bazelBuildExtraOptions }}" + BAZEL_REMOTE_CACHE: $(LocalBuildCache) - displayName: "Run CI script" + displayName: "Run CI script" - - bash: | - echo "disk space at end of build:" - df -h - # Cleanup offending files with unicode names - rm -rf $(Build.StagingDirectory)/tmp/*/*/external/go_sdk/test/fixedbugs - displayName: "Check disk space at end" - condition: always() +- bash: | + echo "disk space at end of build:" + df -h + # Cleanup offending files with unicode names + rm -rf $(Build.StagingDirectory)/tmp/*/*/external/go_sdk/test/fixedbugs + displayName: "Check disk space at end" + condition: always() - - task: PublishTestResults@2 - inputs: - testResultsFiles: "**/bazel-out/**/testlogs/**/test.xml" - testRunTitle: "${{ parameters.ciTarget }}" - searchFolder: $(Build.StagingDirectory)/tmp - condition: always() +- task: PublishTestResults@2 + inputs: + testResultsFiles: "**/bazel-out/**/testlogs/**/test.xml" + testRunTitle: "${{ parameters.ciTarget }}" + searchFolder: $(Build.StagingDirectory)/tmp + condition: always() - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: "$(Build.StagingDirectory)/envoy" - artifactName: ${{ parameters.ciTarget }}${{ parameters.artifactSuffix }} - condition: always() +- task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: "$(Build.StagingDirectory)/envoy" + artifactName: ${{ parameters.ciTarget }}${{ parameters.artifactSuffix }} + condition: always() diff --git a/.azure-pipelines/cve_scan.yml b/.azure-pipelines/cve_scan.yml index 322adae2bb71c..7c951df66f689 100644 --- a/.azure-pipelines/cve_scan.yml +++ b/.azure-pipelines/cve_scan.yml @@ -15,8 +15,8 @@ schedules: pool: vmImage: "ubuntu-18.04" steps: - - script: ci/run_envoy_docker.sh 'ci/do_ci.sh cve_scan' - workingDirectory: $(Build.SourcesDirectory) - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - displayName: "Scan for CVEs in dependencies" +- script: ci/run_envoy_docker.sh 'ci/do_ci.sh cve_scan' + workingDirectory: $(Build.SourcesDirectory) + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + displayName: "Scan for CVEs in dependencies" diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml index bac100bfca96c..e52b2f7f94061 100644 --- a/.azure-pipelines/pipelines.yml +++ b/.azure-pipelines/pipelines.yml @@ -1,540 +1,540 @@ trigger: branches: include: - - "main" - - "release/v*" + - "main" + - "release/v*" tags: include: - - "v*" + - "v*" # PR build config is manually overridden in Azure pipelines UI with different secrets pr: none stages: - - stage: precheck - jobs: - - job: format_pre - dependsOn: [] - pool: - vmImage: "ubuntu-18.04" - steps: - - script: ci/run_envoy_docker.sh 'ci/do_ci.sh format_pre' - workingDirectory: $(Build.SourcesDirectory) - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - displayName: "Run format pre-checks" - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: "$(Build.StagingDirectory)/fix_format_pre.diff" - artifactName: format - # not all have fixes so improve condition/handling - condition: failed() - - - job: tooling - dependsOn: [] - pool: - vmImage: "ubuntu-18.04" - steps: - - script: ci/run_envoy_docker.sh 'ci/do_ci.sh tooling' - workingDirectory: $(Build.SourcesDirectory) - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - displayName: "Run tooling checks" - - - script: | - ci/run_envoy_docker.sh 'ci/upload_gcs_artifact.sh /source/generated/tooling tooling' - displayName: "Upload tooling coverage to GCS" - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - GCS_ARTIFACT_BUCKET: $(GcsArtifactBucket) - - - job: format - dependsOn: ["format_pre"] - pool: - vmImage: "ubuntu-18.04" - steps: - - task: Cache@2 - inputs: - key: "format | ./WORKSPACE | **/*.bzl" - path: $(Build.StagingDirectory)/repository_cache - continueOnError: true - - - script: ci/run_envoy_docker.sh 'ci/check_and_fix_format.sh' - workingDirectory: $(Build.SourcesDirectory) - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - displayName: "Run check format scripts" - - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: "$(Build.StagingDirectory)/fix_format.diff" - artifactName: format - condition: failed() - - - job: docs - dependsOn: [] # this removes the implicit dependency on previous stage and causes this to run in parallel. - condition: ne(variables['PostSubmit'], true) - pool: - vmImage: "ubuntu-18.04" - steps: - - task: Cache@2 - inputs: - key: "docs | ./WORKSPACE | **/*.bzl" - path: $(Build.StagingDirectory)/repository_cache - continueOnError: true - - - script: ci/run_envoy_docker.sh 'ci/do_ci.sh docs' - workingDirectory: $(Build.SourcesDirectory) - env: - AZP_BRANCH: $(Build.SourceBranch) - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - displayName: "Generate docs" - - - script: | - ci/run_envoy_docker.sh 'ci/upload_gcs_artifact.sh /source/generated/docs docs' - displayName: "Upload Docs to GCS" - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - GCS_ARTIFACT_BUCKET: $(GcsArtifactBucket) - - - job: dependencies - dependsOn: [] # this removes the implicit dependency on previous stage and causes this to run in parallel. - pool: - vmImage: "ubuntu-18.04" - steps: - - script: ci/run_envoy_docker.sh 'ci/do_ci.sh deps' - workingDirectory: $(Build.SourcesDirectory) - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - GITHUB_TOKEN: $(GitHubPublicRepoOnlyAccessToken) - displayName: "Verify dependency information" - - - stage: sync - condition: and(succeeded(), eq(variables['PostSubmit'], true), ne(variables['NoSync'], true)) +- stage: precheck + jobs: + - job: format_pre dependsOn: [] - jobs: - - job: filter_example - dependsOn: [] - pool: - vmImage: "ubuntu-18.04" - steps: - - task: InstallSSHKey@0 - inputs: - hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" - sshPublicKey: "$(FilterExamplePublicKey)" - sshPassphrase: "$(SshDeployKeyPassphrase)" - sshKeySecureFile: "$(FilterExamplePrivateKey)" - - - bash: ci/filter_example_mirror.sh - displayName: "Sync envoy-filter-example" - workingDirectory: $(Build.SourcesDirectory) - env: - AZP_BRANCH: $(Build.SourceBranch) - - - job: data_plane_api - dependsOn: [] - pool: - vmImage: "ubuntu-18.04" - steps: - - task: InstallSSHKey@0 - inputs: - hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" - sshPublicKey: "$(DataPlaneApiPublicKey)" - sshPassphrase: "$(SshDeployKeyPassphrase)" - sshKeySecureFile: "$(DataPlaneApiPrivateKey)" - - - bash: ci/api_mirror.sh - displayName: "Sync data-plane-api" - workingDirectory: $(Build.SourcesDirectory) - env: - AZP_BRANCH: $(Build.SourceBranch) - - - job: go_control_plane - dependsOn: [] - pool: - vmImage: "ubuntu-18.04" - steps: - - task: InstallSSHKey@0 - inputs: - hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" - sshPublicKey: "$(GoControlPlanePublicKey)" - sshPassphrase: "$(SshDeployKeyPassphrase)" - sshKeySecureFile: "$(GoControlPlanePrivateKey)" - - - bash: | - cp -a ~/.ssh $(Build.StagingDirectory)/ - ci/run_envoy_docker.sh 'ci/go_mirror.sh' - displayName: "Sync go-control-plane" - workingDirectory: $(Build.SourcesDirectory) - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - AZP_BRANCH: $(Build.SourceBranch) - - - stage: linux_x64 - dependsOn: ["precheck"] - # For post-submit builds, continue even if precheck fails - condition: and(not(canceled()), or(succeeded(), eq(variables['PostSubmit'], true))) - jobs: - - job: release - timeoutInMinutes: 120 - pool: - vmImage: "ubuntu-18.04" - steps: - - template: bazel.yml - parameters: - ciTarget: bazel.release - - - stage: linux_arm64 - dependsOn: ["precheck"] - # For post-submit builds, continue even if precheck fails - condition: and(not(canceled()), or(succeeded(), eq(variables['PostSubmit'], true))) - jobs: - - job: release - timeoutInMinutes: 120 - pool: "arm-large" - steps: - - template: bazel.yml - parameters: - managedAgent: false - ciTarget: bazel.release - rbe: false - artifactSuffix: ".arm64" - bazelBuildExtraOptions: "--sandbox_base=/tmp/sandbox_base" - - - stage: check - dependsOn: ["linux_x64"] - jobs: - - job: bazel - displayName: "linux_x64" - dependsOn: [] - strategy: - maxParallel: 3 - matrix: - api: - CI_TARGET: "bazel.api" - gcc: - CI_TARGET: "bazel.gcc" - clang_tidy: - CI_TARGET: "bazel.clang_tidy" - asan: - CI_TARGET: "bazel.asan" - tsan: - CI_TARGET: "bazel.tsan" - compile_time_options: - CI_TARGET: "bazel.compile_time_options" - timeoutInMinutes: 120 - pool: - vmImage: "ubuntu-18.04" - steps: - - template: bazel.yml - parameters: - ciTarget: $(CI_TARGET) - - - job: coverage - displayName: "linux_x64" - dependsOn: [] - timeoutInMinutes: 120 - pool: "x64-large" - strategy: - maxParallel: 2 - matrix: - coverage: - CI_TARGET: "coverage" - fuzz_coverage: - CI_TARGET: "fuzz_coverage" - steps: - - template: bazel.yml - parameters: - managedAgent: false - ciTarget: bazel.$(CI_TARGET) - rbe: false - # /tmp/sandbox_base is a tmpfs in CI environment to optimize large I/O for coverage traces - bazelBuildExtraOptions: "--define=no_debug_info=1 --linkopt=-Wl,-s --test_env=ENVOY_IP_TEST_VERSIONS=v4only --sandbox_base=/tmp/sandbox_base" - - - script: ci/run_envoy_docker.sh 'ci/upload_gcs_artifact.sh /source/generated/$(CI_TARGET) $(CI_TARGET)' - displayName: "Upload $(CI_TARGET) Report to GCS" - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - GCS_ARTIFACT_BUCKET: $(GcsArtifactBucket) - condition: always() - - - stage: docker - dependsOn: ["linux_x64", "linux_arm64"] - jobs: - - job: docker - displayName: "linux multiarch" - pool: - vmImage: "ubuntu-18.04" - steps: - - bash: .azure-pipelines/cleanup.sh - displayName: "Removing tools from agent" - - bash: | - echo "disk space at beginning of build:" - df -h - displayName: "Check disk space at beginning" - - task: DownloadBuildArtifacts@0 - inputs: - buildType: current - artifactName: "bazel.release" - itemPattern: "bazel.release/envoy_binary.tar.gz" - downloadType: single - targetPath: $(Build.StagingDirectory) - - task: DownloadBuildArtifacts@0 - inputs: - buildType: current - artifactName: "bazel.release.arm64" - itemPattern: "bazel.release.arm64/envoy_binary.tar.gz" - downloadType: single - targetPath: $(Build.StagingDirectory) - - bash: | - set -e - mkdir -p linux/amd64 && tar zxf $(Build.StagingDirectory)/bazel.release/envoy_binary.tar.gz -C ./linux/amd64 - mkdir -p linux/arm64 && tar zxf $(Build.StagingDirectory)/bazel.release.arm64/envoy_binary.tar.gz -C ./linux/arm64 - ci/docker_ci.sh - workingDirectory: $(Build.SourcesDirectory) - env: - AZP_BRANCH: $(Build.SourceBranch) - AZP_SHA1: $(Build.SourceVersion) - DOCKERHUB_USERNAME: $(DockerUsername) - DOCKERHUB_PASSWORD: $(DockerPassword) - - bash: | - echo "disk space at end of build:" - df -h - displayName: "Check disk space at end" - condition: always() - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: "$(Build.StagingDirectory)/build_images" - artifactName: docker - condition: always() - - - stage: docs - dependsOn: ["docker"] - condition: and(succeeded(), eq(variables['PostSubmit'], true), ne(variables['NoSync'], true)) - jobs: - - job: publish - pool: - vmImage: "ubuntu-18.04" - steps: - - task: Cache@2 - inputs: - key: "docs | ./WORKSPACE | **/*.bzl" - path: $(Build.StagingDirectory)/repository_cache - continueOnError: true - - - script: ci/run_envoy_docker.sh 'ci/do_ci.sh docs' - workingDirectory: $(Build.SourcesDirectory) - env: - AZP_BRANCH: $(Build.SourceBranch) - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - displayName: "Generate docs" - - - task: InstallSSHKey@0 - inputs: - hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" - sshPublicKey: "$(DocsPublicKey)" - sshPassphrase: "$(SshDeployKeyPassphrase)" - sshKeySecureFile: "$(DocsPrivateKey)" - - - script: docs/publish.sh - displayName: "Publish to GitHub" - workingDirectory: $(Build.SourcesDirectory) - env: - AZP_BRANCH: $(Build.SourceBranch) - - - stage: verify - dependsOn: ["docker"] - jobs: - - job: examples - pool: - vmImage: "ubuntu-18.04" - steps: - - task: DownloadBuildArtifacts@0 - inputs: - buildType: current - artifactName: "docker" - itemPattern: "docker/envoy-docker-images.tar.xz" - downloadType: single - targetPath: $(Build.StagingDirectory) - - bash: ./ci/do_ci.sh verify_examples - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - NO_BUILD_SETUP: 1 - - job: examples_build - dependsOn: [] - pool: - vmImage: "ubuntu-18.04" - steps: - - task: DownloadBuildArtifacts@0 - inputs: - buildType: current - artifactName: "docker" - itemPattern: "docker/envoy-docker-images.tar.xz" - downloadType: single - targetPath: $(Build.StagingDirectory) - - bash: ./ci/do_ci.sh verify_build_examples - env: - ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) - NO_BUILD_SETUP: 1 - - - stage: macos - dependsOn: ["precheck"] - jobs: - - job: test - timeoutInMinutes: 180 - pool: - vmImage: "macos-latest" - steps: - - script: ./ci/mac_ci_setup.sh - displayName: "Install dependencies" - - - script: ./ci/mac_ci_steps.sh - displayName: "Run Mac CI" - env: - BAZEL_BUILD_EXTRA_OPTIONS: "--remote_download_toplevel --flaky_test_attempts=2" - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - - - task: PublishTestResults@2 - inputs: - testResultsFiles: "**/bazel-testlogs/**/test.xml" - testRunTitle: "macOS" - condition: always() - - - script: ./ci/flaky_test/run_process_xml.sh - displayName: "Process Test Results" - env: - TEST_TMPDIR: $(Build.SourcesDirectory) - SLACK_TOKEN: $(SLACK_TOKEN) - CI_TARGET: "MacOS" - REPO_URI: $(Build.Repository.Uri) - BUILD_URI: $(Build.BuildUri) - - - stage: windows - dependsOn: ["precheck"] - jobs: - - job: release - timeoutInMinutes: 120 - pool: - vmImage: "windows-latest" - steps: - - task: Cache@2 - inputs: - key: '"windows.release" | ./WORKSPACE | **/*.bzl' - path: $(Build.StagingDirectory)/repository_cache - continueOnError: true - - bash: ci/run_envoy_docker.sh ci/windows_ci_steps.sh - displayName: "Run Windows msvc-cl CI" - env: - CI_TARGET: "windows" - ENVOY_DOCKER_BUILD_DIR: "$(Build.StagingDirectory)" - SLACK_TOKEN: $(SLACK_TOKEN) - REPO_URI: $(Build.Repository.Uri) - BUILD_URI: $(Build.BuildUri) - ENVOY_RBE: "true" - BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --config=remote-msvc-cl --jobs=$(RbeJobs) --flaky_test_attempts=2" - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - - task: PublishTestResults@2 - inputs: - testResultsFiles: "**/bazel-out/**/testlogs/**/test.xml" - testRunTitle: "windows" - searchFolder: $(Build.StagingDirectory)/tmp - condition: always() - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: "$(Build.StagingDirectory)/envoy" - artifactName: windows.release - condition: always() - - - job: clang_cl - timeoutInMinutes: 120 - pool: - vmImage: "windows-latest" - steps: - - task: Cache@2 - inputs: - key: '"windows.release" | ./WORKSPACE | **/*.bzl' - path: $(Build.StagingDirectory)/repository_cache - continueOnError: true - - bash: ci/run_envoy_docker.sh ci/windows_ci_steps.sh - displayName: "Run Windows clang-cl CI" - env: - CI_TARGET: "windows" - ENVOY_DOCKER_BUILD_DIR: "$(Build.StagingDirectory)" - SLACK_TOKEN: $(SLACK_TOKEN) - REPO_URI: $(Build.Repository.Uri) - BUILD_URI: $(Build.BuildUri) - ENVOY_RBE: "true" - BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --config=remote-clang-cl --jobs=$(RbeJobs) --flaky_test_attempts=2" - BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com - BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance - GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) - - task: PublishTestResults@2 - inputs: - testResultsFiles: "**/bazel-out/**/testlogs/**/test.xml" - testRunTitle: "clang-cl" - searchFolder: $(Build.StagingDirectory)/tmp - condition: always() - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: "$(Build.StagingDirectory)/envoy" - artifactName: windows.clang-cl - condition: always() - - - job: docker - dependsOn: ["release"] - timeoutInMinutes: 120 - pool: - vmImage: "windows-latest" - steps: - - task: DownloadBuildArtifacts@0 - inputs: - buildType: current - artifactName: "windows.release" - itemPattern: "windows.release/envoy_binary.tar.gz" - downloadType: single - targetPath: $(Build.StagingDirectory) - - bash: | - set -e - # Convert to Unix-style path so tar doesn't think drive letter is a hostname - STAGING_DIR="/$(echo '$(Build.StagingDirectory)' | tr -d ':' | tr '\\' '/')" - mkdir -p windows/amd64 && tar zxf "${STAGING_DIR}/windows.release/envoy_binary.tar.gz" -C ./windows/amd64 - ci/docker_ci.sh - workingDirectory: $(Build.SourcesDirectory) - env: - AZP_BRANCH: $(Build.SourceBranch) - AZP_SHA1: $(Build.SourceVersion) - DOCKERHUB_USERNAME: $(DockerUsername) - DOCKERHUB_PASSWORD: $(DockerPassword) - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: "$(Build.StagingDirectory)/build_images" - artifactName: docker_windows - condition: always() + pool: + vmImage: "ubuntu-18.04" + steps: + - script: ci/run_envoy_docker.sh 'ci/do_ci.sh format_pre' + workingDirectory: $(Build.SourcesDirectory) + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + displayName: "Run format pre-checks" + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: "$(Build.StagingDirectory)/fix_format_pre.diff" + artifactName: format + # not all have fixes so improve condition/handling + condition: failed() + + - job: tooling + dependsOn: [] + pool: + vmImage: "ubuntu-18.04" + steps: + - script: ci/run_envoy_docker.sh 'ci/do_ci.sh tooling' + workingDirectory: $(Build.SourcesDirectory) + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + displayName: "Run tooling checks" + + - script: | + ci/run_envoy_docker.sh 'ci/upload_gcs_artifact.sh /source/generated/tooling tooling' + displayName: "Upload tooling coverage to GCS" + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + GCS_ARTIFACT_BUCKET: $(GcsArtifactBucket) + + - job: format + dependsOn: ["format_pre"] + pool: + vmImage: "ubuntu-18.04" + steps: + - task: Cache@2 + inputs: + key: "format | ./WORKSPACE | **/*.bzl" + path: $(Build.StagingDirectory)/repository_cache + continueOnError: true + + - script: ci/run_envoy_docker.sh 'ci/check_and_fix_format.sh' + workingDirectory: $(Build.SourcesDirectory) + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + displayName: "Run check format scripts" + + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: "$(Build.StagingDirectory)/fix_format.diff" + artifactName: format + condition: failed() + + - job: docs + dependsOn: [] # this removes the implicit dependency on previous stage and causes this to run in parallel. + condition: ne(variables['PostSubmit'], true) + pool: + vmImage: "ubuntu-18.04" + steps: + - task: Cache@2 + inputs: + key: "docs | ./WORKSPACE | **/*.bzl" + path: $(Build.StagingDirectory)/repository_cache + continueOnError: true + + - script: ci/run_envoy_docker.sh 'ci/do_ci.sh docs' + workingDirectory: $(Build.SourcesDirectory) + env: + AZP_BRANCH: $(Build.SourceBranch) + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + displayName: "Generate docs" + + - script: | + ci/run_envoy_docker.sh 'ci/upload_gcs_artifact.sh /source/generated/docs docs' + displayName: "Upload Docs to GCS" + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + GCS_ARTIFACT_BUCKET: $(GcsArtifactBucket) + + - job: dependencies + dependsOn: [] # this removes the implicit dependency on previous stage and causes this to run in parallel. + pool: + vmImage: "ubuntu-18.04" + steps: + - script: ci/run_envoy_docker.sh 'ci/do_ci.sh deps' + workingDirectory: $(Build.SourcesDirectory) + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + GITHUB_TOKEN: $(GitHubPublicRepoOnlyAccessToken) + displayName: "Verify dependency information" + +- stage: sync + condition: and(succeeded(), eq(variables['PostSubmit'], true), ne(variables['NoSync'], true)) + dependsOn: [] + jobs: + - job: filter_example + dependsOn: [] + pool: + vmImage: "ubuntu-18.04" + steps: + - task: InstallSSHKey@0 + inputs: + hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" + sshPublicKey: "$(FilterExamplePublicKey)" + sshPassphrase: "$(SshDeployKeyPassphrase)" + sshKeySecureFile: "$(FilterExamplePrivateKey)" + + - bash: ci/filter_example_mirror.sh + displayName: "Sync envoy-filter-example" + workingDirectory: $(Build.SourcesDirectory) + env: + AZP_BRANCH: $(Build.SourceBranch) + + - job: data_plane_api + dependsOn: [] + pool: + vmImage: "ubuntu-18.04" + steps: + - task: InstallSSHKey@0 + inputs: + hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" + sshPublicKey: "$(DataPlaneApiPublicKey)" + sshPassphrase: "$(SshDeployKeyPassphrase)" + sshKeySecureFile: "$(DataPlaneApiPrivateKey)" + + - bash: ci/api_mirror.sh + displayName: "Sync data-plane-api" + workingDirectory: $(Build.SourcesDirectory) + env: + AZP_BRANCH: $(Build.SourceBranch) + + - job: go_control_plane + dependsOn: [] + pool: + vmImage: "ubuntu-18.04" + steps: + - task: InstallSSHKey@0 + inputs: + hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" + sshPublicKey: "$(GoControlPlanePublicKey)" + sshPassphrase: "$(SshDeployKeyPassphrase)" + sshKeySecureFile: "$(GoControlPlanePrivateKey)" + + - bash: | + cp -a ~/.ssh $(Build.StagingDirectory)/ + ci/run_envoy_docker.sh 'ci/go_mirror.sh' + displayName: "Sync go-control-plane" + workingDirectory: $(Build.SourcesDirectory) + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + AZP_BRANCH: $(Build.SourceBranch) + +- stage: linux_x64 + dependsOn: ["precheck"] + # For post-submit builds, continue even if precheck fails + condition: and(not(canceled()), or(succeeded(), eq(variables['PostSubmit'], true))) + jobs: + - job: release + timeoutInMinutes: 120 + pool: + vmImage: "ubuntu-18.04" + steps: + - template: bazel.yml + parameters: + ciTarget: bazel.release + +- stage: linux_arm64 + dependsOn: ["precheck"] + # For post-submit builds, continue even if precheck fails + condition: and(not(canceled()), or(succeeded(), eq(variables['PostSubmit'], true))) + jobs: + - job: release + timeoutInMinutes: 120 + pool: "arm-large" + steps: + - template: bazel.yml + parameters: + managedAgent: false + ciTarget: bazel.release + rbe: false + artifactSuffix: ".arm64" + bazelBuildExtraOptions: "--sandbox_base=/tmp/sandbox_base" + +- stage: check + dependsOn: ["linux_x64"] + jobs: + - job: bazel + displayName: "linux_x64" + dependsOn: [] + strategy: + maxParallel: 3 + matrix: + api: + CI_TARGET: "bazel.api" + gcc: + CI_TARGET: "bazel.gcc" + clang_tidy: + CI_TARGET: "bazel.clang_tidy" + asan: + CI_TARGET: "bazel.asan" + tsan: + CI_TARGET: "bazel.tsan" + compile_time_options: + CI_TARGET: "bazel.compile_time_options" + timeoutInMinutes: 120 + pool: + vmImage: "ubuntu-18.04" + steps: + - template: bazel.yml + parameters: + ciTarget: $(CI_TARGET) + + - job: coverage + displayName: "linux_x64" + dependsOn: [] + timeoutInMinutes: 120 + pool: "x64-large" + strategy: + maxParallel: 2 + matrix: + coverage: + CI_TARGET: "coverage" + fuzz_coverage: + CI_TARGET: "fuzz_coverage" + steps: + - template: bazel.yml + parameters: + managedAgent: false + ciTarget: bazel.$(CI_TARGET) + rbe: false + # /tmp/sandbox_base is a tmpfs in CI environment to optimize large I/O for coverage traces + bazelBuildExtraOptions: "--define=no_debug_info=1 --linkopt=-Wl,-s --test_env=ENVOY_IP_TEST_VERSIONS=v4only --sandbox_base=/tmp/sandbox_base" + + - script: ci/run_envoy_docker.sh 'ci/upload_gcs_artifact.sh /source/generated/$(CI_TARGET) $(CI_TARGET)' + displayName: "Upload $(CI_TARGET) Report to GCS" + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + GCS_ARTIFACT_BUCKET: $(GcsArtifactBucket) + condition: always() + +- stage: docker + dependsOn: ["linux_x64", "linux_arm64"] + jobs: + - job: docker + displayName: "linux multiarch" + pool: + vmImage: "ubuntu-18.04" + steps: + - bash: .azure-pipelines/cleanup.sh + displayName: "Removing tools from agent" + - bash: | + echo "disk space at beginning of build:" + df -h + displayName: "Check disk space at beginning" + - task: DownloadBuildArtifacts@0 + inputs: + buildType: current + artifactName: "bazel.release" + itemPattern: "bazel.release/envoy_binary.tar.gz" + downloadType: single + targetPath: $(Build.StagingDirectory) + - task: DownloadBuildArtifacts@0 + inputs: + buildType: current + artifactName: "bazel.release.arm64" + itemPattern: "bazel.release.arm64/envoy_binary.tar.gz" + downloadType: single + targetPath: $(Build.StagingDirectory) + - bash: | + set -e + mkdir -p linux/amd64 && tar zxf $(Build.StagingDirectory)/bazel.release/envoy_binary.tar.gz -C ./linux/amd64 + mkdir -p linux/arm64 && tar zxf $(Build.StagingDirectory)/bazel.release.arm64/envoy_binary.tar.gz -C ./linux/arm64 + ci/docker_ci.sh + workingDirectory: $(Build.SourcesDirectory) + env: + AZP_BRANCH: $(Build.SourceBranch) + AZP_SHA1: $(Build.SourceVersion) + DOCKERHUB_USERNAME: $(DockerUsername) + DOCKERHUB_PASSWORD: $(DockerPassword) + - bash: | + echo "disk space at end of build:" + df -h + displayName: "Check disk space at end" + condition: always() + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: "$(Build.StagingDirectory)/build_images" + artifactName: docker + condition: always() + +- stage: docs + dependsOn: ["docker"] + condition: and(succeeded(), eq(variables['PostSubmit'], true), ne(variables['NoSync'], true)) + jobs: + - job: publish + pool: + vmImage: "ubuntu-18.04" + steps: + - task: Cache@2 + inputs: + key: "docs | ./WORKSPACE | **/*.bzl" + path: $(Build.StagingDirectory)/repository_cache + continueOnError: true + + - script: ci/run_envoy_docker.sh 'ci/do_ci.sh docs' + workingDirectory: $(Build.SourcesDirectory) + env: + AZP_BRANCH: $(Build.SourceBranch) + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + displayName: "Generate docs" + + - task: InstallSSHKey@0 + inputs: + hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" + sshPublicKey: "$(DocsPublicKey)" + sshPassphrase: "$(SshDeployKeyPassphrase)" + sshKeySecureFile: "$(DocsPrivateKey)" + + - script: docs/publish.sh + displayName: "Publish to GitHub" + workingDirectory: $(Build.SourcesDirectory) + env: + AZP_BRANCH: $(Build.SourceBranch) + +- stage: verify + dependsOn: ["docker"] + jobs: + - job: examples + pool: + vmImage: "ubuntu-18.04" + steps: + - task: DownloadBuildArtifacts@0 + inputs: + buildType: current + artifactName: "docker" + itemPattern: "docker/envoy-docker-images.tar.xz" + downloadType: single + targetPath: $(Build.StagingDirectory) + - bash: ./ci/do_ci.sh verify_examples + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + NO_BUILD_SETUP: 1 + - job: examples_build + dependsOn: [] + pool: + vmImage: "ubuntu-18.04" + steps: + - task: DownloadBuildArtifacts@0 + inputs: + buildType: current + artifactName: "docker" + itemPattern: "docker/envoy-docker-images.tar.xz" + downloadType: single + targetPath: $(Build.StagingDirectory) + - bash: ./ci/do_ci.sh verify_build_examples + env: + ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory) + NO_BUILD_SETUP: 1 + +- stage: macos + dependsOn: ["precheck"] + jobs: + - job: test + timeoutInMinutes: 180 + pool: + vmImage: "macos-latest" + steps: + - script: ./ci/mac_ci_setup.sh + displayName: "Install dependencies" + + - script: ./ci/mac_ci_steps.sh + displayName: "Run Mac CI" + env: + BAZEL_BUILD_EXTRA_OPTIONS: "--remote_download_toplevel --flaky_test_attempts=2" + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + + - task: PublishTestResults@2 + inputs: + testResultsFiles: "**/bazel-testlogs/**/test.xml" + testRunTitle: "macOS" + condition: always() + + - script: ./ci/flaky_test/run_process_xml.sh + displayName: "Process Test Results" + env: + TEST_TMPDIR: $(Build.SourcesDirectory) + SLACK_TOKEN: $(SLACK_TOKEN) + CI_TARGET: "MacOS" + REPO_URI: $(Build.Repository.Uri) + BUILD_URI: $(Build.BuildUri) + +- stage: windows + dependsOn: ["precheck"] + jobs: + - job: release + timeoutInMinutes: 120 + pool: + vmImage: "windows-latest" + steps: + - task: Cache@2 + inputs: + key: '"windows.release" | ./WORKSPACE | **/*.bzl' + path: $(Build.StagingDirectory)/repository_cache + continueOnError: true + - bash: ci/run_envoy_docker.sh ci/windows_ci_steps.sh + displayName: "Run Windows msvc-cl CI" + env: + CI_TARGET: "windows" + ENVOY_DOCKER_BUILD_DIR: "$(Build.StagingDirectory)" + SLACK_TOKEN: $(SLACK_TOKEN) + REPO_URI: $(Build.Repository.Uri) + BUILD_URI: $(Build.BuildUri) + ENVOY_RBE: "true" + BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --config=remote-msvc-cl --jobs=$(RbeJobs) --flaky_test_attempts=2" + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + - task: PublishTestResults@2 + inputs: + testResultsFiles: "**/bazel-out/**/testlogs/**/test.xml" + testRunTitle: "windows" + searchFolder: $(Build.StagingDirectory)/tmp + condition: always() + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: "$(Build.StagingDirectory)/envoy" + artifactName: windows.release + condition: always() + + - job: clang_cl + timeoutInMinutes: 120 + pool: + vmImage: "windows-latest" + steps: + - task: Cache@2 + inputs: + key: '"windows.release" | ./WORKSPACE | **/*.bzl' + path: $(Build.StagingDirectory)/repository_cache + continueOnError: true + - bash: ci/run_envoy_docker.sh ci/windows_ci_steps.sh + displayName: "Run Windows clang-cl CI" + env: + CI_TARGET: "windows" + ENVOY_DOCKER_BUILD_DIR: "$(Build.StagingDirectory)" + SLACK_TOKEN: $(SLACK_TOKEN) + REPO_URI: $(Build.Repository.Uri) + BUILD_URI: $(Build.BuildUri) + ENVOY_RBE: "true" + BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --config=remote-clang-cl --jobs=$(RbeJobs) --flaky_test_attempts=2" + BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com + BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance + GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey) + - task: PublishTestResults@2 + inputs: + testResultsFiles: "**/bazel-out/**/testlogs/**/test.xml" + testRunTitle: "clang-cl" + searchFolder: $(Build.StagingDirectory)/tmp + condition: always() + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: "$(Build.StagingDirectory)/envoy" + artifactName: windows.clang-cl + condition: always() + + - job: docker + dependsOn: ["release"] + timeoutInMinutes: 120 + pool: + vmImage: "windows-latest" + steps: + - task: DownloadBuildArtifacts@0 + inputs: + buildType: current + artifactName: "windows.release" + itemPattern: "windows.release/envoy_binary.tar.gz" + downloadType: single + targetPath: $(Build.StagingDirectory) + - bash: | + set -e + # Convert to Unix-style path so tar doesn't think drive letter is a hostname + STAGING_DIR="/$(echo '$(Build.StagingDirectory)' | tr -d ':' | tr '\\' '/')" + mkdir -p windows/amd64 && tar zxf "${STAGING_DIR}/windows.release/envoy_binary.tar.gz" -C ./windows/amd64 + ci/docker_ci.sh + workingDirectory: $(Build.SourcesDirectory) + env: + AZP_BRANCH: $(Build.SourceBranch) + AZP_SHA1: $(Build.SourceVersion) + DOCKERHUB_USERNAME: $(DockerUsername) + DOCKERHUB_PASSWORD: $(DockerPassword) + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: "$(Build.StagingDirectory)/build_images" + artifactName: docker_windows + condition: always() diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index befd00065cbdb..e11da6611401a 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -4,34 +4,34 @@ tasks: name: "RBE" platform: ubuntu1804 test_targets: - - "//test/common/common/..." - - "//test/integration/..." - - "//test/exe/..." + - "//test/common/common/..." + - "//test/integration/..." + - "//test/exe/..." test_flags: - - "--config=remote-clang-libc++" - - "--config=remote-ci" - - "--define=wasm=disabled" - - "--jobs=75" + - "--config=remote-clang-libc++" + - "--config=remote-ci" + - "--define=wasm=disabled" + - "--jobs=75" coverage: name: "Coverage" platform: ubuntu1804 shell_commands: - - "bazel/setup_clang.sh /usr/lib/llvm-10" + - "bazel/setup_clang.sh /usr/lib/llvm-10" test_targets: - - "//test/common/common/..." - - "//test/integration/..." - - "//test/exe/..." + - "//test/common/common/..." + - "//test/integration/..." + - "//test/exe/..." test_flags: - - "--config=coverage" - - "--config=clang" + - "--config=coverage" + - "--config=clang" fuzz_coverage: name: "Fuzz-Coverage" platform: ubuntu1804 shell_commands: - - "bazel/setup_clang.sh /usr/lib/llvm-10" + - "bazel/setup_clang.sh /usr/lib/llvm-10" test_targets: - - "//test/server:server_fuzz_test" + - "//test/server:server_fuzz_test" test_flags: - - "--config=fuzz-coverage" - - "--config=coverage" - - "--config=clang" + - "--config=fuzz-coverage" + - "--config=coverage" + - "--config=clang" diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index cf659d48fe60e..e15c5a08f654d 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: false contact_links: - - name: "Crash bug" - url: https://github.com/envoyproxy/envoy/security/policy - about: "Please file any crash bug with envoy-security@googlegroups.com." +- name: "Crash bug" + url: https://github.com/envoyproxy/envoy/security/policy + about: "Please file any crash bug with envoy-security@googlegroups.com." diff --git a/.github/actions/pr_notifier/pr_notifier.py b/.github/actions/pr_notifier/pr_notifier.py new file mode 100644 index 0000000000000..dd9f9b33796a9 --- /dev/null +++ b/.github/actions/pr_notifier/pr_notifier.py @@ -0,0 +1,165 @@ +# Script for collecting PRs in need of review, and informing maintainers via +# slack + +from __future__ import print_function + +import datetime +import os +import sys + +import github +from slack_sdk import WebClient +from slack_sdk.errors import SlackApiError + +MAINTAINERS = { + 'alyssawilk': 'U78RP48V9', + 'mattklein123': 'U5CALEVSL', + 'lizan': 'U79E51EQ6', + 'snowp': 'U93KTPQP6', + 'ggreenway': 'U78MBV869', + 'htuch': 'U78E7055Z', + 'zuercher': 'U78J72Q82', + 'phlax': 'U017PLM0GNQ', + 'jmarantz': 'U80HPLBPG', + 'antoniovicente': 'UKVNCQ212', + 'junr03': 'U79K0Q431', + 'wrowe': 'UBQR8NGBS', + 'yanavlasov': 'UJHLR5KFS', + 'asraa': 'UKZKCFRTP', +} + + +def get_slo_hours(): + # on Monday, allow for 24h + 48h + if datetime.date.today().weekday() == 0: + return 72 + return 24 + + +# Return true if the PR has a waiting tag, false otherwise. +def is_waiting(labels): + for label in labels: + if label.name == 'waiting' or label.name == 'waiting:any': + return True + return False + + +# Generate a pr message, bolding the time if it's out-SLO +def pr_message(pr_age, pr_url, pr_title, delta_days, delta_hours): + if pr_age < datetime.timedelta(hours=get_slo_hours()): + return "<%s|%s> has been waiting %s days %s hours\n" % ( + pr_url, pr_title, delta_days, delta_hours) + else: + return "<%s|%s> has been waiting *%s days %s hours*\n" % ( + pr_url, pr_title, delta_days, delta_hours) + + +# Adds reminder lines to the appropriate maintainer to review the assigned PRs +def add_reminders(assignees, maintainers_and_prs, message): + has_maintainer_assignee = False + for assignee_info in assignees: + assignee = assignee_info.login + if assignee not in MAINTAINERS: + continue + has_maintainer_assignee = True + if assignee not in maintainers_and_prs.keys(): + maintainers_and_prs[ + assignee] = "Hello, %s, here are your PR reminders for the day \n" % assignee + maintainers_and_prs[assignee] = maintainers_and_prs[assignee] + message + return has_maintainer_assignee + + +def track_prs(): + git = github.Github() + repo = git.get_repo('envoyproxy/envoy') + + # The list of PRs which are not waiting, but are well within review SLO + recent_prs = [] + # A dict of maintainer : outstanding_pr_string to be sent to slack + maintainers_and_prs = {} + # A placeholder for unassigned PRs, to be sent to #maintainers eventually + maintainers_and_prs['unassigned'] = "" + # Out-SLO PRs to be sent to #envoy-maintainer-oncall + stalled_prs = "" + + # Snag all PRs, including drafts + for pr_info in repo.get_pulls("open", "updated", "desc"): + # If the PR is waiting, continue. + if is_waiting(pr_info.labels): + continue + + # Update the time based on the time zone delta from github's + pr_age = pr_info.updated_at - datetime.timedelta(hours=4) + delta = datetime.datetime.now() - pr_age + delta_days = delta.days + delta_hours = delta.seconds // 3600 + + # If we get to this point, the review may be in SLO - nudge if it's in + # SLO, nudge in bold if not. + message = pr_message(delta, pr_info.html_url, pr_info.title, delta_days, delta_hours) + + # If the PR has been out-SLO for over a day, inform on-call + if delta > datetime.timedelta(hours=get_slo_hours() + 36): + stalled_prs = stalled_prs + message + + # Add a reminder to each maintainer-assigner on the PR. + has_maintainer_assignee = add_reminders(pr_info.assignees, maintainers_and_prs, message) + + # If there was no maintainer, track it as unassigned. + if not has_maintainer_assignee: + # don't bother assigning maintainer WIPs. + if pr_info.draft and pr_info.user.login in maintainers_and_prs.keys(): + continue + maintainers_and_prs['unassigned'] = maintainers_and_prs['unassigned'] + message + + # Return the dict of {maintainers : PR notifications}, and stalled PRs + return maintainers_and_prs, stalled_prs + + +def post_to_maintainers(client, maintainers_and_messages): + # Post updates to individual maintainers + for key in maintainers_and_messages: + message = maintainers_and_messages[key] + + # Only send messages if we have the maintainer UID + if key not in MAINTAINERS: + continue + uid = MAINTAINERS[key] + + # Ship messages off to slack. + try: + print(maintainers_and_messages[key]) + response = client.conversations_open(users=uid, text="hello") + channel_id = response["channel"]["id"] + response = client.chat_postMessage(channel=channel_id, text=message) + except SlackApiError as e: + print("Unexpected error %s", e.response["error"]) + + +def post_to_oncall(client, unassigned_prs, out_slo_prs): + # Post updates to #envoy-maintainer-oncall + unassigned_prs = maintainers_and_messages['unassigned'] + if unassigned_prs: + try: + response = client.chat_postMessage( + channel='#envoy-maintainer-oncall', + text=("*'Unassigned' PRs* (PRs with no maintainer assigned)\n%s" % unassigned_prs)) + response = client.chat_postMessage( + channel='#envoy-maintainer-oncall', text=("*Stalled PRs*\n\n%s" % out_slo_prs)) + except SlackApiError as e: + print("Unexpected error %s", e.response["error"]) + + +if __name__ == '__main__': + SLACK_BOT_TOKEN = os.getenv('SLACK_BOT_TOKEN') + if not SLACK_BOT_TOKEN: + print( + 'Missing SLACK_BOT_TOKEN: please export token from https://api.slack.com/apps/A023NPQQ33K/oauth?' + ) + sys.exit(1) + + maintainers_and_messages, stalled_prs = track_prs() + + client = WebClient(token=SLACK_BOT_TOKEN) + post_to_maintainers(client, maintainers_and_messages) + post_to_oncall(client, maintainers_and_messages['unassigned'], stalled_prs) diff --git a/.github/actions/pr_notifier/requirements.txt b/.github/actions/pr_notifier/requirements.txt new file mode 100644 index 0000000000000..253c687e5fe77 --- /dev/null +++ b/.github/actions/pr_notifier/requirements.txt @@ -0,0 +1,124 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile --generate-hashes .github/actions/pr_notifier/requirements.txt +# +certifi==2021.5.30 \ + --hash=sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee \ + --hash=sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8 + # via requests +cffi==1.14.5 \ + --hash=sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813 \ + --hash=sha256:04c468b622ed31d408fea2346bec5bbffba2cc44226302a0de1ade9f5ea3d373 \ + --hash=sha256:06d7cd1abac2ffd92e65c0609661866709b4b2d82dd15f611e602b9b188b0b69 \ + --hash=sha256:06db6321b7a68b2bd6df96d08a5adadc1fa0e8f419226e25b2a5fbf6ccc7350f \ + --hash=sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06 \ + --hash=sha256:0f861a89e0043afec2a51fd177a567005847973be86f709bbb044d7f42fc4e05 \ + --hash=sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea \ + --hash=sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee \ + --hash=sha256:1bf1ac1984eaa7675ca8d5745a8cb87ef7abecb5592178406e55858d411eadc0 \ + --hash=sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396 \ + --hash=sha256:24a570cd11895b60829e941f2613a4f79df1a27344cbbb82164ef2e0116f09c7 \ + --hash=sha256:24ec4ff2c5c0c8f9c6b87d5bb53555bf267e1e6f70e52e5a9740d32861d36b6f \ + --hash=sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73 \ + --hash=sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315 \ + --hash=sha256:293e7ea41280cb28c6fcaaa0b1aa1f533b8ce060b9e701d78511e1e6c4a1de76 \ + --hash=sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1 \ + --hash=sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49 \ + --hash=sha256:3c3f39fa737542161d8b0d680df2ec249334cd70a8f420f71c9304bd83c3cbed \ + --hash=sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892 \ + --hash=sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482 \ + --hash=sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058 \ + --hash=sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5 \ + --hash=sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53 \ + --hash=sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045 \ + --hash=sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3 \ + --hash=sha256:681d07b0d1e3c462dd15585ef5e33cb021321588bebd910124ef4f4fb71aef55 \ + --hash=sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5 \ + --hash=sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e \ + --hash=sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c \ + --hash=sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369 \ + --hash=sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827 \ + --hash=sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053 \ + --hash=sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa \ + --hash=sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4 \ + --hash=sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322 \ + --hash=sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132 \ + --hash=sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62 \ + --hash=sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa \ + --hash=sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0 \ + --hash=sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396 \ + --hash=sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e \ + --hash=sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991 \ + --hash=sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6 \ + --hash=sha256:cc5a8e069b9ebfa22e26d0e6b97d6f9781302fe7f4f2b8776c3e1daea35f1adc \ + --hash=sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1 \ + --hash=sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406 \ + --hash=sha256:df5052c5d867c1ea0b311fb7c3cd28b19df469c056f7fdcfe88c7473aa63e333 \ + --hash=sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d \ + --hash=sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c + # via pynacl +chardet==4.0.0 \ + --hash=sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa \ + --hash=sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5 + # via requests +deprecated==1.2.12 \ + --hash=sha256:08452d69b6b5bc66e8330adde0a4f8642e969b9e1702904d137eeb29c8ffc771 \ + --hash=sha256:6d2de2de7931a968874481ef30208fd4e08da39177d61d3d4ebdf4366e7dbca1 + # via pygithub +idna==2.10 \ + --hash=sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6 \ + --hash=sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0 + # via requests +pycparser==2.20 \ + --hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 \ + --hash=sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 + # via cffi +pygithub==1.55 \ + --hash=sha256:1bbfff9372047ff3f21d5cd8e07720f3dbfdaf6462fcaed9d815f528f1ba7283 \ + --hash=sha256:2caf0054ea079b71e539741ae56c5a95e073b81fa472ce222e81667381b9601b + # via -r .github/actions/pr_notifier/requirements.txt +pyjwt==2.1.0 \ + --hash=sha256:934d73fbba91b0483d3857d1aff50e96b2a892384ee2c17417ed3203f173fca1 \ + --hash=sha256:fba44e7898bbca160a2b2b501f492824fc8382485d3a6f11ba5d0c1937ce6130 + # via pygithub +pynacl==1.4.0 \ + --hash=sha256:06cbb4d9b2c4bd3c8dc0d267416aaed79906e7b33f114ddbf0911969794b1cc4 \ + --hash=sha256:11335f09060af52c97137d4ac54285bcb7df0cef29014a1a4efe64ac065434c4 \ + --hash=sha256:2fe0fc5a2480361dcaf4e6e7cea00e078fcda07ba45f811b167e3f99e8cff574 \ + --hash=sha256:30f9b96db44e09b3304f9ea95079b1b7316b2b4f3744fe3aaecccd95d547063d \ + --hash=sha256:4e10569f8cbed81cb7526ae137049759d2a8d57726d52c1a000a3ce366779634 \ + --hash=sha256:511d269ee845037b95c9781aa702f90ccc36036f95d0f31373a6a79bd8242e25 \ + --hash=sha256:537a7ccbea22905a0ab36ea58577b39d1fa9b1884869d173b5cf111f006f689f \ + --hash=sha256:54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 \ + --hash=sha256:757250ddb3bff1eecd7e41e65f7f833a8405fede0194319f87899690624f2122 \ + --hash=sha256:7757ae33dae81c300487591c68790dfb5145c7d03324000433d9a2c141f82af7 \ + --hash=sha256:7c6092102219f59ff29788860ccb021e80fffd953920c4a8653889c029b2d420 \ + --hash=sha256:8122ba5f2a2169ca5da936b2e5a511740ffb73979381b4229d9188f6dcb22f1f \ + --hash=sha256:9c4a7ea4fb81536c1b1f5cc44d54a296f96ae78c1ebd2311bd0b60be45a48d96 \ + --hash=sha256:c914f78da4953b33d4685e3cdc7ce63401247a21425c16a39760e282075ac4a6 \ + --hash=sha256:cd401ccbc2a249a47a3a1724c2918fcd04be1f7b54eb2a5a71ff915db0ac51c6 \ + --hash=sha256:d452a6746f0a7e11121e64625109bc4468fc3100452817001dbe018bb8b08514 \ + --hash=sha256:ea6841bc3a76fa4942ce00f3bda7d436fda21e2d91602b9e21b7ca9ecab8f3ff \ + --hash=sha256:f8851ab9041756003119368c1e6cd0b9c631f46d686b3904b18c0139f4419f80 + # via pygithub +requests==2.25.1 \ + --hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 \ + --hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e + # via pygithub +six==1.16.0 \ + --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ + --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 + # via pynacl +slack-sdk==3.6.0 \ + --hash=sha256:195f044e02a2844579a7a26818ce323e85dde8de224730c859644918d793399e \ + --hash=sha256:e1b257923a1ef88b8620dd3abff94dc5b3eee16ef37975d101ba9e60123ac3af + # via -r .github/actions/pr_notifier/requirements.txt +urllib3==1.26.5 \ + --hash=sha256:753a0374df26658f99d826cfe40394a686d05985786d946fbe4165b5148f5a7c \ + --hash=sha256:a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098 + # via requests +wrapt==1.12.1 \ + --hash=sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7 + # via deprecated diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 119ae1ccf1614..f2f567dddaa36 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,87 +1,97 @@ version: 2 updates: - - package-ecosystem: "pip" - directory: "/test/extensions/filters/network/thrift_proxy" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/source/extensions/filters/network/kafka" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/examples/grpc-bridge/client" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/docs" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/tools/github" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/tools/config_validation" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/tools/dependency" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/tools/deprecate_version" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/tools/protodoc" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/tools/deprecate_features" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/tools/code_format" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/tools/envoy_headersplit" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/ci/flaky_test" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/configs" - schedule: - interval: "daily" - - - package-ecosystem: "pip" - directory: "/tools/testing" - schedule: - interval: "daily" - - - package-ecosystem: "docker" - directory: "/ci" - schedule: - interval: daily - - - package-ecosystem: "docker" - directory: "/.devcontainer" - schedule: - interval: daily +- package-ecosystem: "pip" + directory: "/.github/actions/pr_notifier" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/test/extensions/filters/network/thrift_proxy" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/source/extensions/filters/network/kafka" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/examples/grpc-bridge/client" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/docs" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/tools/docs" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/tools/github" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/tools/config_validation" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/tools/dependency" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/tools/deprecate_version" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/tools/protodoc" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/tools/deprecate_features" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/tools/code_format" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/tools/envoy_headersplit" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/ci/flaky_test" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/configs" + schedule: + interval: "daily" + +- package-ecosystem: "pip" + directory: "/tools/testing" + schedule: + interval: "daily" + +- package-ecosystem: "docker" + directory: "/ci" + schedule: + interval: daily + +- package-ecosystem: "docker" + directory: "/.devcontainer" + schedule: + interval: daily diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml index 00707a85782ac..d266b56ccc5d3 100644 --- a/.github/workflows/codeql-daily.yml +++ b/.github/workflows/codeql-daily.yml @@ -1,6 +1,6 @@ on: schedule: - - cron: '0 12 * * 4' + - cron: '0 12 * * 4' jobs: CodeQL-Build: @@ -29,7 +29,7 @@ jobs: uses: github/codeql-action/init@v1 # Override language selection by uncommenting this and choosing your languages with: - languages: cpp + languages: cpp - name: Install deps shell: bash diff --git a/.github/workflows/codeql-push.yml b/.github/workflows/codeql-push.yml index 56254401e418f..84e8e3a008e64 100644 --- a/.github/workflows/codeql-push.yml +++ b/.github/workflows/codeql-push.yml @@ -37,7 +37,7 @@ jobs: uses: github/codeql-action/init@v1 # Override language selection by uncommenting this and choosing your languages with: - languages: cpp + languages: cpp - name: Install deps shell: bash diff --git a/.github/workflows/pr_notifier.yml b/.github/workflows/pr_notifier.yml new file mode 100644 index 0000000000000..1ccc9695e3dd5 --- /dev/null +++ b/.github/workflows/pr_notifier.yml @@ -0,0 +1,25 @@ +on: + workflow_dispatch: + schedule: + - cron: '0 5 * * 1,2,3,4,5' + +jobs: + pr_notifier: + name: PR Notifier + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: '3.8' + architecture: 'x64' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r ./.github/actions/pr_notifier/requirements.txt + - name: Notify about PRs + run: python ./.github/actions/pr_notifier/pr_notifier.py + env: + SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index f3ce371f510e3..0b82b48b088e3 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -1,7 +1,7 @@ on: workflow_dispatch: schedule: - - cron: '0 */4 * * *' + - cron: '0 */4 * * *' jobs: prune_stale: diff --git a/.zuul/playbooks/envoy-build/run.yaml b/.zuul/playbooks/envoy-build/run.yaml index 0087029e4a4f3..e4fc75422d3e5 100644 --- a/.zuul/playbooks/envoy-build/run.yaml +++ b/.zuul/playbooks/envoy-build/run.yaml @@ -1,17 +1,17 @@ - hosts: all become: yes roles: - - role: config-gcc - gcc_version: 7 - - role: config-bazel - bazel_version: 0.28.1 + - role: config-gcc + gcc_version: 7 + - role: config-bazel + bazel_version: 0.28.1 tasks: - - name: Build envoy - shell: - cmd: | - apt update - apt-get update - apt-get install -y \ + - name: Build envoy + shell: + cmd: | + apt update + apt-get update + apt-get install -y \ libtool \ cmake \ automake \ @@ -22,9 +22,9 @@ unzip \ virtualenv - bazel build //source/exe:envoy-static | tee $LOGS_PATH//bazel.txt + bazel build //source/exe:envoy-static | tee $LOGS_PATH//bazel.txt - cp -r ./bazel-bin $RESULTS_PATH - chdir: '{{ zuul.project.src_dir }}' - executable: /bin/bash - environment: '{{ global_env }}' + cp -r ./bazel-bin $RESULTS_PATH + chdir: '{{ zuul.project.src_dir }}' + executable: /bin/bash + environment: '{{ global_env }}' diff --git a/SECURITY.md b/SECURITY.md index 22e7c92f60624..62a1424a1a983 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -451,21 +451,22 @@ and security team to ensure they still qualify for inclusion on the list. | Organization | End User | Last Review | |:-------------:|:--------:|:-----------:| -| Aspen Mesh | No | 12/19 | -| AWS | No | 12/19 | -| Cilium | No | 12/19 | -| Cloud Foundry | No | 12/19 | -| Datawire | No | 12/19 | -| Google | No | 12/19 | -| IBM | No | 12/19 | -| Istio | No | 12/19 | +| Aspen Mesh | No | 06/21 | +| AWS | No | 06/21 | +| Cilium | No | 06/21 | +| Cloud Foundry | No | 06/21 | +| Datawire | No | 06/21 | +| Google | No | 06/21 | +| IBM | No | 06/21 | +| Istio | No | 06/21 | | Microsoft | No | 2/21 | -| Red Hat | No | 12/19 | -| solo.io | No | 12/19 | -| Tetrate | No | 12/19 | -| VMware | No | 12/19 | -| Pinterest | Yes | 12/19 | +| Red Hat | No | 06/21 | +| solo.io | No | 06/21 | +| Tetrate | No | 06/21 | +| VMware | No | 06/21 | +| Pinterest | Yes | 06/21 | | Dropbox | Yes | 01/20 | | Stripe | Yes | 01/20 | | Square | Yes | 05/21 | | Apple | Yes | 05/21 | +| Spotify | Yes | 06/21 | diff --git a/api/bazel/repository_locations.bzl b/api/bazel/repository_locations.bzl index 9d8159c5fd012..71f0481fce35c 100644 --- a/api/bazel/repository_locations.bzl +++ b/api/bazel/repository_locations.bzl @@ -36,7 +36,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "0d3ca4ed434958dda241fb129f77bd5ef0ce246250feed2d5a5470c6f29a77fa", strip_prefix = "buildtools-4.0.0", urls = ["https://github.com/bazelbuild/buildtools/archive/4.0.0.tar.gz"], - release_date = "2021-02-03", + release_date = "2021-02-04", use_category = ["api"], ), com_github_cncf_udpa = dict( @@ -115,7 +115,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "39cc1fb45039c7687354ca497aff8a55c71d0f1e484f6b81124ba9d821c36441", strip_prefix = "opentelemetry-proto-{version}", urls = ["https://github.com/open-telemetry/opentelemetry-proto/archive/v{version}.tar.gz"], - release_date = "2020-12-09", + release_date = "2021-01-27", use_category = ["api"], ), ) diff --git a/api/envoy/config/bootstrap/v3/bootstrap.proto b/api/envoy/config/bootstrap/v3/bootstrap.proto index b179d3f4f6645..431b45b661717 100644 --- a/api/envoy/config/bootstrap/v3/bootstrap.proto +++ b/api/envoy/config/bootstrap/v3/bootstrap.proto @@ -9,6 +9,7 @@ import "envoy/config/core/v3/base.proto"; import "envoy/config/core/v3/config_source.proto"; import "envoy/config/core/v3/event_service_config.proto"; import "envoy/config/core/v3/extension.proto"; +import "envoy/config/core/v3/resolver.proto"; import "envoy/config/core/v3/socket_option.proto"; import "envoy/config/listener/v3/listener.proto"; import "envoy/config/metrics/v3/stats.proto"; @@ -39,7 +40,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // ` for more detail. // Bootstrap :ref:`configuration overview `. -// [#next-free-field: 30] +// [#next-free-field: 31] message Bootstrap { option (udpa.annotations.versioning).previous_message_type = "envoy.config.bootstrap.v2.Bootstrap"; @@ -250,7 +251,16 @@ message Bootstrap { // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple' API only uses UDP for DNS resolution. - bool use_tcp_for_dns_lookups = 20; + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + bool use_tcp_for_dns_lookups = 20 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; + + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + // This may be overridden on a per-cluster basis in cds_config, when + // :ref:`dns_resolution_config ` + // is specified. + core.v3.DnsResolutionConfig dns_resolution_config = 30; // Specifies optional bootstrap extensions to be instantiated at startup time. // Each item contains extension specific configuration. diff --git a/api/envoy/config/bootstrap/v4alpha/bootstrap.proto b/api/envoy/config/bootstrap/v4alpha/bootstrap.proto index a6ec388d54c54..c8ac9b16d87d9 100644 --- a/api/envoy/config/bootstrap/v4alpha/bootstrap.proto +++ b/api/envoy/config/bootstrap/v4alpha/bootstrap.proto @@ -9,6 +9,7 @@ import "envoy/config/core/v4alpha/base.proto"; import "envoy/config/core/v4alpha/config_source.proto"; import "envoy/config/core/v4alpha/event_service_config.proto"; import "envoy/config/core/v4alpha/extension.proto"; +import "envoy/config/core/v4alpha/resolver.proto"; import "envoy/config/core/v4alpha/socket_option.proto"; import "envoy/config/listener/v4alpha/listener.proto"; import "envoy/config/metrics/v4alpha/stats.proto"; @@ -36,7 +37,7 @@ option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSIO // ` for more detail. // Bootstrap :ref:`configuration overview `. -// [#next-free-field: 30] +// [#next-free-field: 31] message Bootstrap { option (udpa.annotations.versioning).previous_message_type = "envoy.config.bootstrap.v3.Bootstrap"; @@ -96,9 +97,9 @@ message Bootstrap { core.v4alpha.ApiConfigSource ads_config = 3; } - reserved 10, 11, 8, 9; + reserved 10, 11, 8, 9, 20; - reserved "runtime", "watchdog", "tracing"; + reserved "runtime", "watchdog", "tracing", "use_tcp_for_dns_lookups"; // Node identity to present to the management server and for instance // identification purposes (e.g. in generated headers). @@ -222,15 +223,11 @@ message Bootstrap { // :ref:`stats sinks `. google.protobuf.UInt64Value stats_server_version_override = 19; - // Always use TCP queries instead of UDP queries for DNS lookups. - // This may be overridden on a per-cluster basis in cds_config, - // when :ref:`dns_resolvers ` and - // :ref:`use_tcp_for_dns_lookups ` are - // specified. - // Setting this value causes failure if the - // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during - // server startup. Apple' API only uses UDP for DNS resolution. - bool use_tcp_for_dns_lookups = 20; + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + // This may be overridden on a per-cluster basis in cds_config, when + // :ref:`dns_resolution_config ` + // is specified. + core.v4alpha.DnsResolutionConfig dns_resolution_config = 30; // Specifies optional bootstrap extensions to be instantiated at startup time. // Each item contains extension specific configuration. diff --git a/api/envoy/config/cluster/v3/cluster.proto b/api/envoy/config/cluster/v3/cluster.proto index 957c2b3341e3a..5470b1807d435 100644 --- a/api/envoy/config/cluster/v3/cluster.proto +++ b/api/envoy/config/cluster/v3/cluster.proto @@ -11,6 +11,7 @@ import "envoy/config/core/v3/config_source.proto"; import "envoy/config/core/v3/extension.proto"; import "envoy/config/core/v3/health_check.proto"; import "envoy/config/core/v3/protocol.proto"; +import "envoy/config/core/v3/resolver.proto"; import "envoy/config/endpoint/v3/endpoint.proto"; import "envoy/type/v3/percent.proto"; @@ -42,7 +43,7 @@ message ClusterCollection { } // Configuration for a single upstream cluster. -// [#next-free-field: 53] +// [#next-free-field: 54] message Cluster { option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.Cluster"; @@ -858,14 +859,22 @@ message Cluster { // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple's API only allows overriding DNS resolvers via system settings. - repeated core.v3.Address dns_resolvers = 18; + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + repeated core.v3.Address dns_resolvers = 18 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; - // [#next-major-version: Reconcile DNS options in a single message.] // Always use TCP queries instead of UDP queries for DNS lookups. // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple' API only uses UDP for DNS resolution. - bool use_tcp_for_dns_lookups = 45; + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + bool use_tcp_for_dns_lookups = 45 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; + + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + core.v3.DnsResolutionConfig dns_resolution_config = 53; // If specified, outlier detection will be enabled for this upstream cluster. // Each of the configuration values can be overridden via diff --git a/api/envoy/config/cluster/v3/filter.proto b/api/envoy/config/cluster/v3/filter.proto index 74f4a1137dab6..7d11b87bcd5d5 100644 --- a/api/envoy/config/cluster/v3/filter.proto +++ b/api/envoy/config/cluster/v3/filter.proto @@ -20,7 +20,8 @@ message Filter { option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.cluster.Filter"; // The name of the filter to instantiate. The name must match a - // :ref:`supported filter `. + // supported upstream filter. Note that Envoy's :ref:`downstream network + // filters ` are not valid upstream filters. string name = 1 [(validate.rules).string = {min_len: 1}]; // Filter specific configuration which depends on the filter being diff --git a/api/envoy/config/cluster/v4alpha/cluster.proto b/api/envoy/config/cluster/v4alpha/cluster.proto index 8adf5ea460e4e..bfea44955bf58 100644 --- a/api/envoy/config/cluster/v4alpha/cluster.proto +++ b/api/envoy/config/cluster/v4alpha/cluster.proto @@ -10,6 +10,7 @@ import "envoy/config/core/v4alpha/base.proto"; import "envoy/config/core/v4alpha/config_source.proto"; import "envoy/config/core/v4alpha/extension.proto"; import "envoy/config/core/v4alpha/health_check.proto"; +import "envoy/config/core/v4alpha/resolver.proto"; import "envoy/config/endpoint/v3/endpoint.proto"; import "envoy/type/v3/percent.proto"; @@ -42,7 +43,7 @@ message ClusterCollection { } // Configuration for a single upstream cluster. -// [#next-free-field: 53] +// [#next-free-field: 54] message Cluster { option (udpa.annotations.versioning).previous_message_type = "envoy.config.cluster.v3.Cluster"; @@ -630,11 +631,11 @@ message Cluster { [(validate.rules).double = {lte: 3.0 gte: 1.0}]; } - reserved 12, 15, 7, 11, 35, 46, 29, 13, 14, 26, 47; + reserved 12, 15, 7, 11, 35, 46, 29, 13, 14, 18, 45, 26, 47; reserved "hosts", "tls_context", "extension_protocol_options", "upstream_http_protocol_options", "common_http_protocol_options", "http_protocol_options", "http2_protocol_options", - "protocol_selection", "track_timeout_budgets"; + "dns_resolvers", "use_tcp_for_dns_lookups", "protocol_selection", "track_timeout_budgets"; // Configuration to use different transport sockets for different endpoints. // The entry of *envoy.transport_socket_match* in the @@ -798,27 +799,8 @@ message Cluster { // :ref:`AUTO`. DnsLookupFamily dns_lookup_family = 17 [(validate.rules).enum = {defined_only: true}]; - // If DNS resolvers are specified and the cluster type is either - // :ref:`STRICT_DNS`, - // or :ref:`LOGICAL_DNS`, - // this value is used to specify the cluster’s dns resolvers. - // If this setting is not specified, the value defaults to the default - // resolver, which uses /etc/resolv.conf for configuration. For cluster types - // other than - // :ref:`STRICT_DNS` - // and :ref:`LOGICAL_DNS` - // this setting is ignored. - // Setting this value causes failure if the - // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during - // server startup. Apple's API only allows overriding DNS resolvers via system settings. - repeated core.v4alpha.Address dns_resolvers = 18; - - // [#next-major-version: Reconcile DNS options in a single message.] - // Always use TCP queries instead of UDP queries for DNS lookups. - // Setting this value causes failure if the - // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during - // server startup. Apple' API only uses UDP for DNS resolution. - bool use_tcp_for_dns_lookups = 45; + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + core.v4alpha.DnsResolutionConfig dns_resolution_config = 53; // If specified, outlier detection will be enabled for this upstream cluster. // Each of the configuration values can be overridden via diff --git a/api/envoy/config/cluster/v4alpha/filter.proto b/api/envoy/config/cluster/v4alpha/filter.proto index 5a4a4facbd81e..d478fd34f1c79 100644 --- a/api/envoy/config/cluster/v4alpha/filter.proto +++ b/api/envoy/config/cluster/v4alpha/filter.proto @@ -20,7 +20,8 @@ message Filter { option (udpa.annotations.versioning).previous_message_type = "envoy.config.cluster.v3.Filter"; // The name of the filter to instantiate. The name must match a - // :ref:`supported filter `. + // supported upstream filter. Note that Envoy's :ref:`downstream network + // filters ` are not valid upstream filters. string name = 1 [(validate.rules).string = {min_len: 1}]; // Filter specific configuration which depends on the filter being diff --git a/api/envoy/config/core/v3/resolver.proto b/api/envoy/config/core/v3/resolver.proto index b5e31814f56aa..21d40425f7a6b 100644 --- a/api/envoy/config/core/v3/resolver.proto +++ b/api/envoy/config/core/v3/resolver.proto @@ -14,11 +14,28 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Resolver] -// DNS resolver configuration which includes the underlying dns resolver addresses and options. -message DnsResolver { - // A list of dns resolver addresses +// Configuration of DNS resolver option flags which control the behavior of the DNS resolver. +message DnsResolverOptions { + // Use TCP for all DNS queries instead of the default protocol UDP. + // Setting this value causes failure if the + // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during + // server startup. Apple's API only uses UDP for DNS resolution. + bool use_tcp_for_dns_lookups = 1; + + // Do not use the default search domains; only query hostnames as-is or as aliases. + bool no_default_search_domain = 2; +} + +// DNS resolution configuration which includes the underlying dns resolver addresses and options. +message DnsResolutionConfig { + // A list of dns resolver addresses. If specified, the DNS client library will perform resolution + // via the underlying DNS resolvers. Otherwise, the default system resolvers + // (e.g., /etc/resolv.conf) will be used. // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple's API only allows overriding DNS resolvers via system settings. repeated Address resolvers = 1 [(validate.rules).repeated = {min_items: 1}]; + + // Configuration of DNS resolver option flags which control the behavior of the DNS resolver. + DnsResolverOptions dns_resolver_options = 2; } diff --git a/api/envoy/config/core/v4alpha/resolver.proto b/api/envoy/config/core/v4alpha/resolver.proto index ad597c85549de..4849a54161ced 100644 --- a/api/envoy/config/core/v4alpha/resolver.proto +++ b/api/envoy/config/core/v4alpha/resolver.proto @@ -15,13 +15,34 @@ option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSIO // [#protodoc-title: Resolver] -// DNS resolver configuration which includes the underlying dns resolver addresses and options. -message DnsResolver { - option (udpa.annotations.versioning).previous_message_type = "envoy.config.core.v3.DnsResolver"; +// Configuration of DNS resolver option flags which control the behavior of the DNS resolver. +message DnsResolverOptions { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.core.v3.DnsResolverOptions"; - // A list of dns resolver addresses + // Use TCP for all DNS queries instead of the default protocol UDP. + // Setting this value causes failure if the + // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during + // server startup. Apple's API only uses UDP for DNS resolution. + bool use_tcp_for_dns_lookups = 1; + + // Do not use the default search domains; only query hostnames as-is or as aliases. + bool no_default_search_domain = 2; +} + +// DNS resolution configuration which includes the underlying dns resolver addresses and options. +message DnsResolutionConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.core.v3.DnsResolutionConfig"; + + // A list of dns resolver addresses. If specified, the DNS client library will perform resolution + // via the underlying DNS resolvers. Otherwise, the default system resolvers + // (e.g., /etc/resolv.conf) will be used. // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple's API only allows overriding DNS resolvers via system settings. repeated Address resolvers = 1 [(validate.rules).repeated = {min_items: 1}]; + + // Configuration of DNS resolver option flags which control the behavior of the DNS resolver. + DnsResolverOptions dns_resolver_options = 2; } diff --git a/api/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/BUILD b/api/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/BUILD new file mode 100644 index 0000000000000..ca83092e39b11 --- /dev/null +++ b/api/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/BUILD @@ -0,0 +1,13 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg", + "//envoy/extensions/common/dynamic_forward_proxy/v4alpha:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/api/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/cluster.proto b/api/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/cluster.proto new file mode 100644 index 0000000000000..1b989e0bb725e --- /dev/null +++ b/api/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/cluster.proto @@ -0,0 +1,35 @@ +syntax = "proto3"; + +package envoy.extensions.clusters.dynamic_forward_proxy.v4alpha; + +import "envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.clusters.dynamic_forward_proxy.v4alpha"; +option java_outer_classname = "ClusterProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; + +// [#protodoc-title: Dynamic forward proxy cluster configuration] + +// Configuration for the dynamic forward proxy cluster. See the :ref:`architecture overview +// ` for more information. +// [#extension: envoy.clusters.dynamic_forward_proxy] +message ClusterConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.clusters.dynamic_forward_proxy.v3.ClusterConfig"; + + // The DNS cache configuration that the cluster will attach to. Note this configuration must + // match that of associated :ref:`dynamic forward proxy HTTP filter configuration + // `. + common.dynamic_forward_proxy.v4alpha.DnsCacheConfig dns_cache_config = 1 + [(validate.rules).message = {required: true}]; + + // If true allow the cluster configuration to disable the auto_sni and auto_san_validation options + // in the :ref:`cluster's upstream_http_protocol_options + // ` + bool allow_insecure_cluster_options = 2; +} diff --git a/api/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD b/api/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD index 6e74b985c580d..fb5436a6bf93a 100644 --- a/api/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD +++ b/api/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD @@ -6,6 +6,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ + "//envoy/annotations:pkg", "//envoy/config/cluster/v3:pkg", "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg", "//envoy/config/core/v3:pkg", diff --git a/api/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto b/api/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto index 1c14739b94c86..79d6752502094 100644 --- a/api/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto +++ b/api/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto @@ -8,6 +8,7 @@ import "envoy/config/core/v3/resolver.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; +import "envoy/annotations/deprecation.proto"; import "udpa/annotations/status.proto"; import "udpa/annotations/versioning.proto"; import "validate/validate.proto"; @@ -96,15 +97,15 @@ message DnsCacheConfig { // Envoy will use dns cache circuit breakers with default settings even if this value is not set. DnsCacheCircuitBreakers dns_cache_circuit_breaker = 7; - // [#next-major-version: Reconcile DNS options in a single message.] // Always use TCP queries instead of UDP queries for DNS lookups. // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple' API only uses UDP for DNS resolution. - bool use_tcp_for_dns_lookups = 8; + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + bool use_tcp_for_dns_lookups = 8 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; - // DNS resolver configuration - // If specified, DNS cache will perform resolution via the underlying DNS resolvers. - // Otherwise, the default system resolvers (e.g., /etc/resolv.conf) will be used. - config.core.v3.DnsResolver dns_resolver = 9; + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + config.core.v3.DnsResolutionConfig dns_resolution_config = 9; } diff --git a/api/envoy/extensions/common/dynamic_forward_proxy/v4alpha/BUILD b/api/envoy/extensions/common/dynamic_forward_proxy/v4alpha/BUILD new file mode 100644 index 0000000000000..a70cf4f2bbbd6 --- /dev/null +++ b/api/envoy/extensions/common/dynamic_forward_proxy/v4alpha/BUILD @@ -0,0 +1,14 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/config/cluster/v4alpha:pkg", + "//envoy/config/core/v4alpha:pkg", + "//envoy/extensions/common/dynamic_forward_proxy/v3:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/api/envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto b/api/envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto new file mode 100644 index 0000000000000..89b2fb12a0923 --- /dev/null +++ b/api/envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto @@ -0,0 +1,108 @@ +syntax = "proto3"; + +package envoy.extensions.common.dynamic_forward_proxy.v4alpha; + +import "envoy/config/cluster/v4alpha/cluster.proto"; +import "envoy/config/core/v4alpha/resolver.proto"; + +import "google/protobuf/duration.proto"; +import "google/protobuf/wrappers.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.common.dynamic_forward_proxy.v4alpha"; +option java_outer_classname = "DnsCacheProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; + +// [#protodoc-title: Dynamic forward proxy common configuration] + +// Configuration of circuit breakers for resolver. +message DnsCacheCircuitBreakers { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheCircuitBreakers"; + + // The maximum number of pending requests that Envoy will allow to the + // resolver. If not specified, the default is 1024. + google.protobuf.UInt32Value max_pending_requests = 1; +} + +// Configuration for the dynamic forward proxy DNS cache. See the :ref:`architecture overview +// ` for more information. +// [#next-free-field: 10] +message DnsCacheConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig"; + + reserved 8; + + reserved "use_tcp_for_dns_lookups"; + + // The name of the cache. Multiple named caches allow independent dynamic forward proxy + // configurations to operate within a single Envoy process using different configurations. All + // configurations with the same name *must* otherwise have the same settings when referenced + // from different configuration components. Configuration will fail to load if this is not + // the case. + string name = 1 [(validate.rules).string = {min_len: 1}]; + + // The DNS lookup family to use during resolution. + // + // [#comment:TODO(mattklein123): Figure out how to support IPv4/IPv6 "happy eyeballs" mode. The + // way this might work is a new lookup family which returns both IPv4 and IPv6 addresses, and + // then configures a host to have a primary and fall back address. With this, we could very + // likely build a "happy eyeballs" connection pool which would race the primary / fall back + // address and return the one that wins. This same method could potentially also be used for + // QUIC to TCP fall back.] + config.cluster.v4alpha.Cluster.DnsLookupFamily dns_lookup_family = 2 + [(validate.rules).enum = {defined_only: true}]; + + // The DNS refresh rate for currently cached DNS hosts. If not specified defaults to 60s. + // + // .. note: + // + // The returned DNS TTL is not currently used to alter the refresh rate. This feature will be + // added in a future change. + // + // .. note: + // + // The refresh rate is rounded to the closest millisecond, and must be at least 1ms. + google.protobuf.Duration dns_refresh_rate = 3 + [(validate.rules).duration = {gte {nanos: 1000000}}]; + + // The TTL for hosts that are unused. Hosts that have not been used in the configured time + // interval will be purged. If not specified defaults to 5m. + // + // .. note: + // + // The TTL is only checked at the time of DNS refresh, as specified by *dns_refresh_rate*. This + // means that if the configured TTL is shorter than the refresh rate the host may not be removed + // immediately. + // + // .. note: + // + // The TTL has no relation to DNS TTL and is only used to control Envoy's resource usage. + google.protobuf.Duration host_ttl = 4 [(validate.rules).duration = {gt {}}]; + + // The maximum number of hosts that the cache will hold. If not specified defaults to 1024. + // + // .. note: + // + // The implementation is approximate and enforced independently on each worker thread, thus + // it is possible for the maximum hosts in the cache to go slightly above the configured + // value depending on timing. This is similar to how other circuit breakers work. + google.protobuf.UInt32Value max_hosts = 5 [(validate.rules).uint32 = {gt: 0}]; + + // If the DNS failure refresh rate is specified, + // this is used as the cache's DNS refresh rate when DNS requests are failing. If this setting is + // not specified, the failure refresh rate defaults to the dns_refresh_rate. + config.cluster.v4alpha.Cluster.RefreshRate dns_failure_refresh_rate = 6; + + // The config of circuit breakers for resolver. It provides a configurable threshold. + // Envoy will use dns cache circuit breakers with default settings even if this value is not set. + DnsCacheCircuitBreakers dns_cache_circuit_breaker = 7; + + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + config.core.v4alpha.DnsResolutionConfig dns_resolution_config = 9; +} diff --git a/api/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/BUILD b/api/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/BUILD new file mode 100644 index 0000000000000..8486b45d71d91 --- /dev/null +++ b/api/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/BUILD @@ -0,0 +1,13 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/extensions/common/dynamic_forward_proxy/v4alpha:pkg", + "//envoy/extensions/filters/http/dynamic_forward_proxy/v3:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/api/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/dynamic_forward_proxy.proto b/api/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/dynamic_forward_proxy.proto new file mode 100644 index 0000000000000..0dba06106b074 --- /dev/null +++ b/api/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/dynamic_forward_proxy.proto @@ -0,0 +1,64 @@ +syntax = "proto3"; + +package envoy.extensions.filters.http.dynamic_forward_proxy.v4alpha; + +import "envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.filters.http.dynamic_forward_proxy.v4alpha"; +option java_outer_classname = "DynamicForwardProxyProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; + +// [#protodoc-title: Dynamic forward proxy] + +// Configuration for the dynamic forward proxy HTTP filter. See the :ref:`architecture overview +// ` for more information. +// [#extension: envoy.filters.http.dynamic_forward_proxy] +message FilterConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.filters.http.dynamic_forward_proxy.v3.FilterConfig"; + + // The DNS cache configuration that the filter will attach to. Note this configuration must + // match that of associated :ref:`dynamic forward proxy cluster configuration + // `. + common.dynamic_forward_proxy.v4alpha.DnsCacheConfig dns_cache_config = 1 + [(validate.rules).message = {required: true}]; +} + +// Per route Configuration for the dynamic forward proxy HTTP filter. +message PerRouteConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.filters.http.dynamic_forward_proxy.v3.PerRouteConfig"; + + oneof host_rewrite_specifier { + // Indicates that before DNS lookup, the host header will be swapped with + // this value. If not set or empty, the original host header value + // will be used and no rewrite will happen. + // + // Note: this rewrite affects both DNS lookup and host header forwarding. However, this + // option shouldn't be used with + // :ref:`HCM host rewrite ` given that the + // value set here would be used for DNS lookups whereas the value set in the HCM would be used + // for host header forwarding which is not the desired outcome. + string host_rewrite_literal = 1; + + // Indicates that before DNS lookup, the host header will be swapped with + // the value of this header. If not set or empty, the original host header + // value will be used and no rewrite will happen. + // + // Note: this rewrite affects both DNS lookup and host header forwarding. However, this + // option shouldn't be used with + // :ref:`HCM host rewrite header ` + // given that the value set here would be used for DNS lookups whereas the value set in the HCM + // would be used for host header forwarding which is not the desired outcome. + // + // .. note:: + // + // If the header appears multiple times only the first value is used. + string host_rewrite_header = 2; + } +} diff --git a/api/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/BUILD b/api/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/BUILD new file mode 100644 index 0000000000000..465ea4ff28449 --- /dev/null +++ b/api/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/BUILD @@ -0,0 +1,13 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/extensions/common/dynamic_forward_proxy/v4alpha:pkg", + "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/api/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/sni_dynamic_forward_proxy.proto b/api/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/sni_dynamic_forward_proxy.proto new file mode 100644 index 0000000000000..de2947fcba9ec --- /dev/null +++ b/api/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/sni_dynamic_forward_proxy.proto @@ -0,0 +1,40 @@ +syntax = "proto3"; + +package envoy.extensions.filters.network.sni_dynamic_forward_proxy.v4alpha; + +import "envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.filters.network.sni_dynamic_forward_proxy.v4alpha"; +option java_outer_classname = "SniDynamicForwardProxyProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).work_in_progress = true; +option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; + +// [#protodoc-title: SNI dynamic forward proxy] + +// Configuration for the SNI-based dynamic forward proxy filter. See the +// :ref:`architecture overview ` for +// more information. Note this filter must be configured along with +// :ref:`TLS inspector listener filter ` +// to work. +// [#extension: envoy.filters.network.sni_dynamic_forward_proxy] +message FilterConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3alpha.FilterConfig"; + + // The DNS cache configuration that the filter will attach to. Note this + // configuration must match that of associated :ref:`dynamic forward proxy + // cluster configuration + // `. + common.dynamic_forward_proxy.v4alpha.DnsCacheConfig dns_cache_config = 1 + [(validate.rules).message = {required: true}]; + + oneof port_specifier { + // The port number to connect to the upstream. + uint32 port_value = 2 [(validate.rules).uint32 = {lte: 65535 gt: 0}]; + } +} diff --git a/api/envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto b/api/envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto index 32103540c1d2b..8221c11efbe78 100644 --- a/api/envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto +++ b/api/envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package envoy.extensions.filters.udp.dns_filter.v3alpha; -import "envoy/config/core/v3/address.proto"; import "envoy/config/core/v3/base.proto"; +import "envoy/config/core/v3/resolver.proto"; import "envoy/data/dns/v3/dns_table.proto"; import "google/protobuf/duration.proto"; @@ -51,10 +51,8 @@ message DnsFilterConfig { // number of retries multiplied by the resolver_timeout. google.protobuf.Duration resolver_timeout = 1 [(validate.rules).duration = {gte {seconds: 1}}]; - // A list of DNS servers to which we can forward queries. If not - // specified, Envoy will use the ambient DNS resolvers in the - // system. - repeated config.core.v3.Address upstream_resolvers = 2; + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + config.core.v3.DnsResolutionConfig dns_resolution_config = 2; // Controls how many outstanding external lookup contexts the filter tracks. // The context structure allows the filter to respond to every query even if the external diff --git a/api/envoy/extensions/filters/udp/dns_filter/v4alpha/dns_filter.proto b/api/envoy/extensions/filters/udp/dns_filter/v4alpha/dns_filter.proto index 54615b8b93ed8..6957e58dbb068 100644 --- a/api/envoy/extensions/filters/udp/dns_filter/v4alpha/dns_filter.proto +++ b/api/envoy/extensions/filters/udp/dns_filter/v4alpha/dns_filter.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package envoy.extensions.filters.udp.dns_filter.v4alpha; -import "envoy/config/core/v4alpha/address.proto"; import "envoy/config/core/v4alpha/base.proto"; +import "envoy/config/core/v4alpha/resolver.proto"; import "envoy/data/dns/v4alpha/dns_table.proto"; import "google/protobuf/duration.proto"; @@ -61,10 +61,8 @@ message DnsFilterConfig { // number of retries multiplied by the resolver_timeout. google.protobuf.Duration resolver_timeout = 1 [(validate.rules).duration = {gte {seconds: 1}}]; - // A list of DNS servers to which we can forward queries. If not - // specified, Envoy will use the ambient DNS resolvers in the - // system. - repeated config.core.v4alpha.Address upstream_resolvers = 2; + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + config.core.v4alpha.DnsResolutionConfig dns_resolution_config = 2; // Controls how many outstanding external lookup contexts the filter tracks. // The context structure allows the filter to respond to every query even if the external diff --git a/api/envoy/service/status/v3/csds.proto b/api/envoy/service/status/v3/csds.proto index 3a1c748fc81b8..1d940d6a2dfe1 100644 --- a/api/envoy/service/status/v3/csds.proto +++ b/api/envoy/service/status/v3/csds.proto @@ -7,6 +7,8 @@ import "envoy/config/core/v3/base.proto"; import "envoy/type/matcher/v3/node.proto"; import "google/api/annotations.proto"; +import "google/protobuf/any.proto"; +import "google/protobuf/timestamp.proto"; import "envoy/annotations/deprecation.proto"; import "udpa/annotations/status.proto"; @@ -124,10 +126,60 @@ message ClientConfig { option (udpa.annotations.versioning).previous_message_type = "envoy.service.status.v2.ClientConfig"; + // GenericXdsConfig is used to specify the config status and the dump + // of any xDS resource identified by their type URL. It is the generalized + // version of the now deprecated ListenersConfigDump, ClustersConfigDump etc + // [#next-free-field: 10] + message GenericXdsConfig { + // Type_url represents the fully qualified name of xDS resource type + // like envoy.v3.Cluster, envoy.v3.ClusterLoadAssignment etc. + string type_url = 1; + + // Name of the xDS resource + string name = 2; + + // This is the :ref:`version_info ` + // in the last processed xDS discovery response. If there are only + // static bootstrap listeners, this field will be "" + string version_info = 3; + + // The xDS resource config. Actual content depends on the type + google.protobuf.Any xds_config = 4; + + // Timestamp when the xDS resource was last updated + google.protobuf.Timestamp last_updated = 5; + + // Per xDS resource config status. It is generated by management servers. + // It will not be present if the CSDS server is an xDS client. + ConfigStatus config_status = 6; + + // Per xDS resource status from the view of a xDS client + admin.v3.ClientResourceStatus client_status = 7; + + // Set if the last update failed, cleared after the next successful + // update. The *error_state* field contains the rejected version of + // this particular resource along with the reason and timestamp. For + // successfully updated or acknowledged resource, this field should + // be empty. + // [#not-implemented-hide:] + admin.v3.UpdateFailureState error_state = 8; + + // Is static resource is true if it is specified in the config supplied + // through the file at the startup. + bool is_static_resource = 9; + } + // Node for a particular client. config.core.v3.Node node = 1; - repeated PerXdsConfig xds_config = 2; + // This field is deprecated in favor of generic_xds_configs which is + // much simpler and uniform in structure. + repeated PerXdsConfig xds_config = 2 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; + + // Represents generic xDS config and the exact config structure depends on + // the type URL (like Cluster if it is CDS) + repeated GenericXdsConfig generic_xds_configs = 3; } message ClientStatusResponse { diff --git a/api/envoy/service/status/v4alpha/csds.proto b/api/envoy/service/status/v4alpha/csds.proto index b8720330e9b71..9680c6feacf79 100644 --- a/api/envoy/service/status/v4alpha/csds.proto +++ b/api/envoy/service/status/v4alpha/csds.proto @@ -7,6 +7,8 @@ import "envoy/config/core/v4alpha/base.proto"; import "envoy/type/matcher/v4alpha/node.proto"; import "google/api/annotations.proto"; +import "google/protobuf/any.proto"; +import "google/protobuf/timestamp.proto"; import "udpa/annotations/status.proto"; import "udpa/annotations/versioning.proto"; @@ -116,10 +118,62 @@ message ClientConfig { option (udpa.annotations.versioning).previous_message_type = "envoy.service.status.v3.ClientConfig"; + // GenericXdsConfig is used to specify the config status and the dump + // of any xDS resource identified by their type URL. It is the generalized + // version of the now deprecated ListenersConfigDump, ClustersConfigDump etc + // [#next-free-field: 10] + message GenericXdsConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.service.status.v3.ClientConfig.GenericXdsConfig"; + + // Type_url represents the fully qualified name of xDS resource type + // like envoy.v3.Cluster, envoy.v3.ClusterLoadAssignment etc. + string type_url = 1; + + // Name of the xDS resource + string name = 2; + + // This is the :ref:`version_info ` + // in the last processed xDS discovery response. If there are only + // static bootstrap listeners, this field will be "" + string version_info = 3; + + // The xDS resource config. Actual content depends on the type + google.protobuf.Any xds_config = 4; + + // Timestamp when the xDS resource was last updated + google.protobuf.Timestamp last_updated = 5; + + // Per xDS resource config status. It is generated by management servers. + // It will not be present if the CSDS server is an xDS client. + ConfigStatus config_status = 6; + + // Per xDS resource status from the view of a xDS client + admin.v4alpha.ClientResourceStatus client_status = 7; + + // Set if the last update failed, cleared after the next successful + // update. The *error_state* field contains the rejected version of + // this particular resource along with the reason and timestamp. For + // successfully updated or acknowledged resource, this field should + // be empty. + // [#not-implemented-hide:] + admin.v4alpha.UpdateFailureState error_state = 8; + + // Is static resource is true if it is specified in the config supplied + // through the file at the startup. + bool is_static_resource = 9; + } + + reserved 2; + + reserved "xds_config"; + // Node for a particular client. config.core.v4alpha.Node node = 1; - repeated PerXdsConfig xds_config = 2; + // Represents generic xDS config and the exact config structure depends on + // the type URL (like Cluster if it is CDS) + repeated GenericXdsConfig generic_xds_configs = 3; } message ClientStatusResponse { diff --git a/bazel/README.md b/bazel/README.md index 87060090a61c1..081550b4c60f2 100644 --- a/bazel/README.md +++ b/bazel/README.md @@ -23,9 +23,6 @@ powershell Invoke-WebRequest https://github.com/bazelbuild/bazelisk/releases/lat set PATH=%PATH%;%USERPROFILE%\bazel ``` -If you're building from an revision of Envoy prior to August 2019, which doesn't contains a `.bazelversion` file, run `ci/run_envoy_docker.sh "bazel version"` -to find the right version of Bazel and set the version to `USE_BAZEL_VERSION` environment variable to build. - ## Production environments To build Envoy with Bazel in a production environment, where the [Envoy @@ -167,9 +164,9 @@ for how to update or override dependencies. and Bazel rules which follow POSIX python conventions. Add `pip.exe` to the PATH and install the `wheel` package. ```cmd - mklink %USERPROFILE%\Python38\python3.exe %USERPROFILE%\Python38\python.exe - set PATH=%PATH%;%USERPROFILE%\Python38 - set PATH=%PATH%;%USERPROFILE%\Python38\Scripts + mklink %USERPROFILE%\Python39\python3.exe %USERPROFILE%\Python39\python.exe + set PATH=%PATH%;%USERPROFILE%\Python39 + set PATH=%PATH%;%USERPROFILE%\Python39\Scripts pip install wheel ``` diff --git a/bazel/abseil.patch b/bazel/abseil.patch new file mode 100644 index 0000000000000..d52556466e6fe --- /dev/null +++ b/bazel/abseil.patch @@ -0,0 +1,42 @@ +# Force internal versions of std classes per +# https://abseil.io/docs/cpp/guides/options +diff --git a/absl/base/options.h b/absl/base/options.h +index 230bf1e..6e1b9e5 100644 +--- a/absl/base/options.h ++++ b/absl/base/options.h +@@ -100,7 +100,7 @@ + // User code should not inspect this macro. To check in the preprocessor if + // absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY. + +-#define ABSL_OPTION_USE_STD_ANY 2 ++#define ABSL_OPTION_USE_STD_ANY 0 + + + // ABSL_OPTION_USE_STD_OPTIONAL +@@ -127,7 +127,7 @@ + // absl::optional is a typedef of std::optional, use the feature macro + // ABSL_USES_STD_OPTIONAL. + +-#define ABSL_OPTION_USE_STD_OPTIONAL 2 ++#define ABSL_OPTION_USE_STD_OPTIONAL 0 + + + // ABSL_OPTION_USE_STD_STRING_VIEW +@@ -154,7 +154,7 @@ + // absl::string_view is a typedef of std::string_view, use the feature macro + // ABSL_USES_STD_STRING_VIEW. + +-#define ABSL_OPTION_USE_STD_STRING_VIEW 2 ++#define ABSL_OPTION_USE_STD_STRING_VIEW 0 + + // ABSL_OPTION_USE_STD_VARIANT + // +@@ -180,7 +180,7 @@ + // absl::variant is a typedef of std::variant, use the feature macro + // ABSL_USES_STD_VARIANT. + +-#define ABSL_OPTION_USE_STD_VARIANT 2 ++#define ABSL_OPTION_USE_STD_VARIANT 0 + + + // ABSL_OPTION_USE_INLINE_NAMESPACE diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl index f33c92c943df7..c312d1f6f2e5f 100644 --- a/bazel/envoy_build_system.bzl +++ b/bazel/envoy_build_system.bzl @@ -12,7 +12,6 @@ load( _envoy_cc_posix_library = "envoy_cc_posix_library", _envoy_cc_posix_without_linux_library = "envoy_cc_posix_without_linux_library", _envoy_cc_win32_library = "envoy_cc_win32_library", - _envoy_include_prefix = "envoy_include_prefix", _envoy_proto_library = "envoy_proto_library", ) load( @@ -225,7 +224,6 @@ envoy_cc_linux_library = _envoy_cc_linux_library envoy_cc_posix_library = _envoy_cc_posix_library envoy_cc_posix_without_linux_library = _envoy_cc_posix_without_linux_library envoy_cc_win32_library = _envoy_cc_win32_library -envoy_include_prefix = _envoy_include_prefix envoy_proto_library = _envoy_proto_library # Test wrappers (from envoy_test.bzl) diff --git a/bazel/envoy_library.bzl b/bazel/envoy_library.bzl index 30d5106edb8e2..a6e77598f912d 100644 --- a/bazel/envoy_library.bzl +++ b/bazel/envoy_library.bzl @@ -82,6 +82,7 @@ def envoy_cc_library( tags = [], deps = [], strip_include_prefix = None, + include_prefix = None, textual_hdrs = None, defines = []): if tcmalloc_dep: @@ -96,7 +97,7 @@ def envoy_cc_library( tags = tags, textual_hdrs = textual_hdrs, deps = deps + [envoy_external_dep_path(dep) for dep in external_deps] + [ - repository + "//include/envoy/common:base_includes", + repository + "//envoy/common:base_includes", repository + "//source/common/common:fmt_lib", envoy_external_dep_path("abseil_flat_hash_map"), envoy_external_dep_path("abseil_flat_hash_set"), @@ -104,10 +105,10 @@ def envoy_cc_library( envoy_external_dep_path("spdlog"), envoy_external_dep_path("fmtlib"), ], - include_prefix = envoy_include_prefix(native.package_name()), alwayslink = 1, linkstatic = envoy_linkstatic(), strip_include_prefix = strip_include_prefix, + include_prefix = include_prefix, defines = defines, ) @@ -121,6 +122,7 @@ def envoy_cc_library( tags = ["nocompdb"] + tags, deps = [":" + name], strip_include_prefix = strip_include_prefix, + include_prefix = include_prefix, ) # Used to specify a library that only builds on POSIX @@ -185,14 +187,6 @@ def envoy_cc_win32_library(name, srcs = [], hdrs = [], **kargs): **kargs ) -# Transform the package path (e.g. include/envoy/common) into a path for -# exporting the package headers at (e.g. envoy/common). Source files can then -# include using this path scheme (e.g. #include "envoy/common/time.h"). -def envoy_include_prefix(path): - if path.startswith("source/") or path.startswith("include/"): - return "/".join(path.split("/")[1:]) - return None - # Envoy proto targets should be specified with this function. def envoy_proto_library(name, external_deps = [], **kwargs): api_cc_py_proto_library( diff --git a/bazel/external/proxy_wasm_cpp_host.BUILD b/bazel/external/proxy_wasm_cpp_host.BUILD index 073324b07ac32..b1f3acbc21c07 100644 --- a/bazel/external/proxy_wasm_cpp_host.BUILD +++ b/bazel/external/proxy_wasm_cpp_host.BUILD @@ -18,7 +18,6 @@ cc_library( "src/*.h", "src/*.cc", "src/common/*.h", - "src/common/*.cc", "src/third_party/*.h", "src/third_party/*.cc", ]), diff --git a/bazel/external/quiche.genrule_cmd b/bazel/external/quiche.genrule_cmd index b67f4dc74bdad..43f17a517e408 100644 --- a/bazel/external/quiche.genrule_cmd +++ b/bazel/external/quiche.genrule_cmd @@ -47,10 +47,10 @@ cat <sed_commands /^#include/ s!"epoll_server/!"quiche/epoll_server/! # The above global substitutions will prepend "quiche" to the platform code which we want to undo. -/^#include/ s!"quiche/common/quic/platform/!"common/quic/platform/! +/^#include/ s!"quiche/common/quic/platform/!"source/common/quic/platform/! # Use envoy specific implementations for below platform APIs. -/^#include/ s!"quiche_platform_impl/quiche_logging_impl.h!"common/quic/platform/quiche_logging_impl.h! +/^#include/ s!"quiche_platform_impl/quiche_logging_impl.h!"source/common/quic/platform/quiche_logging_impl.h! # The reset platform APIs use the QUICHE default implementations. /^#include/ s!"quiche_platform_impl/!"quiche/common/platform/default/quiche_platform_impl/! diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 89ce847384d32..e975f1cf0049e 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -516,7 +516,11 @@ def _com_google_googletest(): # pull in more bits of abseil as needed, and is now the preferred # method for pure Bazel deps. def _com_google_absl(): - external_http_archive("com_google_absl") + external_http_archive( + name = "com_google_absl", + patches = ["@envoy//bazel:abseil.patch"], + patch_args = ["-p1"], + ) native.bind( name = "abseil_any", actual = "@com_google_absl//absl/types:any", diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl index bda3919952dd9..2bde3d1c1e290 100644 --- a/bazel/repositories_extra.bzl +++ b/bazel/repositories_extra.bzl @@ -36,6 +36,11 @@ def _python_deps(): # release_date = "2019-02-23" # use_category = ["test"], ) + pip_install( + name = "docs_pip3", + requirements = "@envoy//tools/docs:requirements.txt", + extra_pip_args = ["--require-hashes"], + ) pip_install( name = "deps_pip3", requirements = "@envoy//tools/dependency:requirements.txt", diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index c7f0c8b96159f..e014a6cc54fb8 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -42,7 +42,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( version = "0.31.2", sha256 = "c84962b64d9ae4472adfb01ec2cf1aa73cb2ee8308242add55fa7cc38602d882", urls = ["https://github.com/bazelbuild/rules_apple/releases/download/{version}/rules_apple.{version}.tar.gz"], - release_date = "2021-05-04", + release_date = "2021-05-07", use_category = ["build"], ), rules_fuzzing = dict( @@ -185,7 +185,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "fmt-{version}", urls = ["https://github.com/fmtlib/fmt/releases/download/{version}/fmt-{version}.zip"], use_category = ["dataplane_core", "controlplane"], - release_date = "2020-08-06", + release_date = "2020-08-07", cpe = "cpe:2.3:a:fmt:fmt:*", ), com_github_gabime_spdlog = dict( @@ -208,7 +208,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "792f250fb546bde8590e72d64311ea00a70c175fd77df6bb5e02328fa15fe28e", strip_prefix = "libprotobuf-mutator-{version}", urls = ["https://github.com/google/libprotobuf-mutator/archive/v{version}.tar.gz"], - release_date = "2020-11-06", + release_date = "2020-11-13", use_category = ["test_only"], ), com_github_google_tcmalloc = dict( @@ -244,7 +244,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "grpc-{version}", urls = ["https://github.com/grpc/grpc/archive/v{version}.tar.gz"], use_category = ["dataplane_core", "controlplane"], - release_date = "2020-12-01", + release_date = "2020-12-02", cpe = "cpe:2.3:a:grpc:grpc:*", ), com_github_luajit_luajit = dict( @@ -328,7 +328,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( version = "8.4.0", use_category = ["observability_ext"], extensions = ["envoy.tracers.skywalking"], - release_date = "2021-01-20", + release_date = "2021-02-01", cpe = "N/A", ), com_github_skyapm_cpp2sky = dict( @@ -341,7 +341,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( urls = ["https://github.com/SkyAPM/cpp2sky/archive/v{version}.tar.gz"], use_category = ["observability_ext"], extensions = ["envoy.tracers.skywalking"], - release_date = "2021-03-17", + release_date = "2021-03-24", cpe = "N/A", ), com_github_datadog_dd_opentracing_cpp = dict( @@ -354,7 +354,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( urls = ["https://github.com/DataDog/dd-opentracing-cpp/archive/v{version}.tar.gz"], use_category = ["observability_ext"], extensions = ["envoy.tracers.datadog"], - release_date = "2021-01-26", + release_date = "2021-01-27", cpe = "N/A", ), com_github_google_benchmark = dict( @@ -603,7 +603,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( strip_prefix = "protobuf-{version}", urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v{version}/protobuf-all-{version}.tar.gz"], use_category = ["dataplane_core", "controlplane"], - release_date = "2021-05-06", + release_date = "2021-05-07", cpe = "cpe:2.3:a:google:protobuf:*", ), grpc_httpjson_transcoding = dict( @@ -671,11 +671,11 @@ REPOSITORY_LOCATIONS_SPEC = dict( six = dict( project_name = "Six", project_desc = "Python 2 and 3 compatibility library", - project_url = "https://pypi.org/project/six", + project_url = "https://github.com/benjaminp/six", version = "1.12.0", - sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73", - urls = ["https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca/six-{version}.tar.gz"], - release_date = "2018-12-09", + sha256 = "0ce7aef70d066b8dda6425c670d00c25579c3daad8108b3e3d41bef26003c852", + urls = ["https://github.com/benjaminp/six/archive/{version}.tar.gz"], + release_date = "2018-12-10", use_category = ["other"], ), org_llvm_llvm = dict( @@ -686,7 +686,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "df83a44b3a9a71029049ec101fb0077ecbbdf5fe41e395215025779099a98fdf", strip_prefix = "llvm-{version}.src", urls = ["https://github.com/llvm/llvm-project/releases/download/llvmorg-{version}/llvm-{version}.src.tar.xz"], - release_date = "2020-03-23", + release_date = "2020-03-24", use_category = ["dataplane_ext"], extensions = [ "envoy.wasm.runtime.wamr", @@ -887,7 +887,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( # Only allow peeking at fuzzer related files for now. strip_prefix = "compiler-rt-{version}.src", urls = ["https://github.com/llvm/llvm-project/releases/download/llvmorg-{version}/compiler-rt-{version}.src.tar.xz"], - release_date = "2020-12-18", + release_date = "2021-01-06", use_category = ["test_only"], ), upb = dict( @@ -934,7 +934,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "05f7c6eecb402f11fcb7e524c903f1ba1c38d3bdc9bf42bc8ec3cf7567b9f979", strip_prefix = "kafka-python-{version}", urls = ["https://github.com/dpkp/kafka-python/archive/{version}.tar.gz"], - release_date = "2020-02-20", + release_date = "2020-09-30", use_category = ["test_only"], ), proxy_wasm_cpp_sdk = dict( @@ -965,8 +965,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "WebAssembly for Proxies (C++ host implementation)", project_desc = "WebAssembly for Proxies (C++ host implementation)", project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host", - version = "e641ffa8893477cdb4720f572f50f003cd51a083", - sha256 = "20abaa0ff37b3765111fb81774bf4fa4630e23dc9c468b42016c4ebf4f27a38a", + version = "c3712617b28c69ff205e8302f70942c06e35f4e2", + sha256 = "60dd1a7f4b51e20ee1620a7106b09adf06763333c907076f884aeb37b741c17d", strip_prefix = "proxy-wasm-cpp-host-{version}", urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"], use_category = ["dataplane_ext"], @@ -982,7 +982,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( "envoy.wasm.runtime.wavm", "envoy.wasm.runtime.wasmtime", ], - release_date = "2021-05-07", + release_date = "2021-06-01", cpe = "N/A", ), proxy_wasm_rust_sdk = dict( diff --git a/ci/README.md b/ci/README.md index 9cde25759f94d..6841eecf2ea5d 100644 --- a/ci/README.md +++ b/ci/README.md @@ -34,7 +34,7 @@ Currently there are three build images for Linux and one for Windows: * `envoyproxy/envoy-build` — alias to `envoyproxy/envoy-build-ubuntu`. * `envoyproxy/envoy-build-ubuntu` — based on Ubuntu 18.04 (Bionic) with GCC 9 and Clang 10 compiler. * `envoyproxy/envoy-build-centos` — based on CentOS 7 with GCC 9 and Clang 10 compiler, this image is experimental and not well tested. -* `envoyproxy/envoy-build-windows2019` — based on Windows 2019 LTS with VS 2019 Build Tools. +* `envoyproxy/envoy-build-windows2019` — based on Windows ltsc2019 with VS 2019 Build Tools, as well as LLVM. The source for these images is located in the [envoyproxy/envoy-build-tools](https://github.com/envoyproxy/envoy-build-tools) repository. @@ -148,15 +148,15 @@ An example basic invocation to build the Envoy static binary and run tests is: ./ci/run_envoy_docker.sh './ci/windows_ci_steps.sh' ``` -You can modify `./ci/windows_ci_steps.sh` to modify `bazel` arguments, tests to run, etc. as well +You can pass additional command line arguments to `./ci/windows_ci_steps.sh` to list specific `bazel` arguments and build/test targets. as set environment variables to adjust your container build environment as described above. -The Envoy binary can be found in `C:\Windows\Temp\envoy-docker-build\envoy\source\exe` on the Docker host. You +The Envoy binary can be found in `${TEMP}\envoy-docker-build\envoy\source\exe` on the Docker host. You can control this by setting `ENVOY_DOCKER_BUILD_DIR` in the environment, e.g. to generate the binary in `C:\Users\foo\build\envoy\source\exe` you can run: ```bash -ENVOY_DOCKER_BUILD_DIR="C:\Users\foo\build" ./ci/run_envoy_docker.sh './ci/do_ci.sh bazel.dev' +ENVOY_DOCKER_BUILD_DIR="C:\Users\foo\build" ./ci/run_envoy_docker.sh './ci/windows_ci_steps.sh' ``` Note the quotations around the `ENVOY_DOCKER_BUILD_DIR` value to preserve the backslashes in the @@ -168,24 +168,16 @@ If you would like to run an interactive session to keep the build container runn ./ci/run_envoy_docker.sh 'bash' ``` -From an interactive session, you can invoke `bazel` manually or use the `./ci/windows_ci_steps.sh` script to build and run tests. +From an interactive session, you can invoke `bazel` directly, or use the `./ci/windows_ci_steps.sh` script to build and run tests. +Bazel will look for .bazelrc in the `${HOME}` path, which is mapped to the persistent path `${TEMP}\envoy-docker-build\` on the +Docker host. # Testing changes to the build image as a developer -While all changes to the build image should eventually be upstreamed, it can be useful to -test those changes locally before sending out a pull request. To experiment -with a local clone of the upstream build image you can make changes to files such as -build_container.sh locally and then run: - -```bash -DISTRO=ubuntu -cd ci/build_container -LINUX_DISTRO="${DISTRO}" CIRCLE_SHA1=my_tag ./docker_build.sh # Wait patiently for quite some time -cd ../.. -IMAGE_NAME="envoyproxy/envoy-build-${DISTRO}" IMAGE_ID=my_tag ./ci/run_envoy_docker.sh './ci/do_ci.sh bazel.whatever' -``` - -This build the Ubuntu based `envoyproxy/envoy-build-ubuntu` image, and the final call will run against your local copy of the build image. +The base build image used in the CI flows here lives in the [envoy-build-tools](https://github.com/envoyproxy/envoy-build-tools) +repository. If you need to make and/or test changes to the build image, instructions to do so can be found in +the [build_container](https://github.com/envoyproxy/envoy-build-tools/blob/main/build_container/README.md) folder. +See the Dockerfiles and build scripts there for building a new image. # macOS Build Flow diff --git a/ci/do_ci.sh b/ci/do_ci.sh index ca3be47b42891..e0d3cad3d255f 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -218,20 +218,11 @@ elif [[ "$CI_TARGET" == "bazel.sizeopt" ]]; then bazel_binary_build sizeopt exit 0 elif [[ "$CI_TARGET" == "bazel.gcc" ]]; then - # Temporariliy exclude some extensions from the envoy binary to address build failures - # due to long command line. Tests will still run. - BAZEL_BUILD_OPTIONS+=( - "--test_env=HEAPCHECK=" - "--//source/extensions/filters/network/rocketmq_proxy:enabled=False" - "--//source/extensions/filters/http/admission_control:enabled=False" - "--//source/extensions/filters/http/dynamo:enabled=False" - "--//source/extensions/filters/http/header_to_metadata:enabled=False" - "--//source/extensions/filters/http/on_demand:enabled=False") + BAZEL_BUILD_OPTIONS+=("--test_env=HEAPCHECK=") setup_gcc_toolchain - # Disable //test/config_test:example_configs_test so it does not fail because of excluded extensions above - echo "Testing ${TEST_TARGETS[*]} -//test/config_test:example_configs_test" - bazel_with_collection test "${BAZEL_BUILD_OPTIONS[@]}" -c fastbuild -- "${TEST_TARGETS[@]}" -//test/config_test:example_configs_test + echo "Testing ${TEST_TARGETS[*]}" + bazel_with_collection test "${BAZEL_BUILD_OPTIONS[@]}" -c fastbuild -- "${TEST_TARGETS[@]}" echo "bazel release build with gcc..." bazel_binary_build fastbuild @@ -483,7 +474,7 @@ elif [[ "$CI_TARGET" == "tooling" ]]; then bazel run "${BAZEL_BUILD_OPTIONS[@]}" //tools/testing:all_pytests -- --cov-html /source/generated/tooling "${ENVOY_SRCDIR}" exit 0 elif [[ "$CI_TARGET" == "verify_examples" ]]; then - run_ci_verify "*" wasm-cc + run_ci_verify "*" "wasm-cc|win32-front-proxy" exit 0 elif [[ "$CI_TARGET" == "verify_build_examples" ]]; then run_ci_verify wasm-cc diff --git a/ci/filter_example_setup.sh b/ci/filter_example_setup.sh index 0d0cd1f602805..5ef74fa491195 100644 --- a/ci/filter_example_setup.sh +++ b/ci/filter_example_setup.sh @@ -5,7 +5,7 @@ set -e # This is the hash on https://github.com/envoyproxy/envoy-filter-example.git we pin to. -ENVOY_FILTER_EXAMPLE_GITSHA="dfdc226d44d1b7c300e6e691e2e8ada98b045edb" +ENVOY_FILTER_EXAMPLE_GITSHA="ac6a66a4a1c08138ccc03c23aafc9637b2df55a1" ENVOY_FILTER_EXAMPLE_SRCDIR="${BUILD_DIR}/envoy-filter-example" # shellcheck disable=SC2034 diff --git a/ci/verify_examples.sh b/ci/verify_examples.sh index 8f78d54e1a297..8ec2b0701d3e4 100755 --- a/ci/verify_examples.sh +++ b/ci/verify_examples.sh @@ -29,7 +29,8 @@ trap exit 1 INT run_examples () { local examples example cd "${SRCDIR}/examples" || exit 1 - examples=$(find . -mindepth 1 -maxdepth 1 -type d -name "$TESTFILTER" ! -iname "_*" ! -name "$TESTEXCLUDES" | sort) + + examples=$(find . -mindepth 1 -maxdepth 1 -type d -name "$TESTFILTER" ! -iname "_*" | grep -Ev "$TESTEXCLUDES" | sort) for example in $examples; do pushd "$example" > /dev/null || return 1 ./verify.sh diff --git a/ci/windows_ci_steps.sh b/ci/windows_ci_steps.sh index 33f6713a122f8..67ff0eb409949 100755 --- a/ci/windows_ci_steps.sh +++ b/ci/windows_ci_steps.sh @@ -67,24 +67,55 @@ if [[ "${BAZEL_BUILD_EXTRA_OPTIONS[*]}" =~ "clang-cl" ]]; then FAIL_GROUP=clang_cl fi -# Pre-Validate updates of all dependency libraries in bazel/foreign_cc and bazel/external -# and complete envoy-static build -bazel "${BAZEL_STARTUP_OPTIONS[@]}" build "${BAZEL_BUILD_OPTIONS[@]}" //bazel/... //source/exe:envoy-static --build_tag_filters=-skip_on_windows - -# Copy binary to delivery directory -cp -f bazel-bin/source/exe/envoy-static.exe "${ENVOY_DELIVERY_DIR}/envoy.exe" +# Optional arguments include //source/exe:envoy-static to build, +# //test/... to test all with flake handling and test tag filters +# (these are the default), either one or the other, or a list of +# explicit tests or patterns which does not perform tag exclusions, +# unless given as additional argument. (If we explicitly ask, we +# are determined to fight a broken test, whether it is tagged +# skip/fail on windows or not.) + +if [[ $1 == "//source/exe:envoy-static" ]]; then + BUILD_ENVOY_STATIC=1 + shift + TEST_TARGETS=$* +elif [[ $# -gt 0 ]]; then + BUILD_ENVOY_STATIC=0 + TEST_TARGETS=$* +else + BUILD_ENVOY_STATIC=1 + TEST_TARGETS='//test/...' +fi -# Copy for azp, creating a tar archive -tar czf "${ENVOY_BUILD_DIR}"/envoy_binary.tar.gz -C "${ENVOY_DELIVERY_DIR}" envoy.exe +# Complete envoy-static build +if [[ $BUILD_ENVOY_STATIC -eq 1 ]]; then + bazel "${BAZEL_STARTUP_OPTIONS[@]}" build "${BAZEL_BUILD_OPTIONS[@]}" //source/exe:envoy-static -# Test invocations of known-working tests on Windows -bazel "${BAZEL_STARTUP_OPTIONS[@]}" test "${BAZEL_BUILD_OPTIONS[@]}" //test/... --test_tag_filters=-skip_on_windows,-fails_on_${FAIL_GROUP} --build_tests_only + # Copy binary to delivery directory + cp -f bazel-bin/source/exe/envoy-static.exe "${ENVOY_DELIVERY_DIR}/envoy.exe" -echo "running flaky test reporting script" -"${ENVOY_SRCDIR}"/ci/flaky_test/run_process_xml.sh "$CI_TARGET" + # Copy for azp, creating a tar archive + tar czf "${ENVOY_BUILD_DIR}"/envoy_binary.tar.gz -C "${ENVOY_DELIVERY_DIR}" envoy.exe +fi -# Build tests that are known flaky or failing to ensure no compilation regressions -bazel "${BAZEL_STARTUP_OPTIONS[@]}" build "${BAZEL_BUILD_OPTIONS[@]}" //test/... --test_tag_filters=-skip_on_windows,fails_on_${FAIL_GROUP} --build_tests_only +# Test invocations of known-working tests on Windows +if [[ $TEST_TARGETS == "//test/..." ]]; then + bazel "${BAZEL_STARTUP_OPTIONS[@]}" test "${BAZEL_BUILD_OPTIONS[@]}" $TEST_TARGETS --test_tag_filters=-skip_on_windows,-fails_on_${FAIL_GROUP} --build_tests_only + + echo "running flaky test reporting script" + "${ENVOY_SRCDIR}"/ci/flaky_test/run_process_xml.sh "$CI_TARGET" + + # Build tests that are known flaky or failing to ensure no compilation regressions + bazel "${BAZEL_STARTUP_OPTIONS[@]}" build "${BAZEL_BUILD_OPTIONS[@]}" //test/... --test_tag_filters=fails_on_${FAIL_GROUP} --build_tests_only + + if [[ $BUILD_ENVOY_STATIC -eq 1 ]]; then + # Validate introduction or updates of any dependency libraries in bazel/foreign_cc and bazel/external + # not triggered by envoy-static or //test/... targets and not deliberately tagged skip_on_windows + bazel "${BAZEL_STARTUP_OPTIONS[@]}" build "${BAZEL_BUILD_OPTIONS[@]}" //bazel/... --build_tag_filters=-skip_on_windows + fi +elif [[ -n "$TEST_TARGETS" ]]; then + bazel "${BAZEL_STARTUP_OPTIONS[@]}" test "${BAZEL_BUILD_OPTIONS[@]}" $TEST_TARGETS --build_tests_only +fi # Summarize known unbuildable or inapplicable tests (example) # bazel "${BAZEL_STARTUP_OPTIONS[@]}" query 'kind(".*test rule", attr("tags", "skip_on_windows", //test/...))' 2>/dev/null | sort diff --git a/configs/envoyproxy_io_proxy_http3_downstream.yaml b/configs/envoyproxy_io_proxy_http3_downstream.yaml index 2037b192af08a..e2382f7035a2a 100644 --- a/configs/envoyproxy_io_proxy_http3_downstream.yaml +++ b/configs/envoyproxy_io_proxy_http3_downstream.yaml @@ -1,4 +1,5 @@ # An example config which accepts HTTP/3 and forwarads the requests upstream over TCP. +# This includes a TCP listener which advertises that HTTP/3 is available via the alt-svc header admin: address: socket_address: @@ -18,13 +19,12 @@ static_resources: name: envoy.transport_sockets.tls typed_config: "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext - downstream_tls_context: - common_tls_context: - tls_certificates: - - certificate_chain: - filename: certs/servercert.pem - private_key: - filename: certs/serverkey.pem + common_tls_context: + tls_certificates: + - certificate_chain: + filename: certs/servercert.pem + private_key: + filename: certs/serverkey.pem filters: - name: envoy.filters.network.http_connection_manager typed_config: @@ -49,8 +49,6 @@ static_resources: http3_protocol_options: http_filters: - name: envoy.filters.http.router - - listeners: - name: listener_udp address: socket_address: diff --git a/docs/BUILD b/docs/BUILD index 0c2797f66ff16..1c054c1984b6b 100644 --- a/docs/BUILD +++ b/docs/BUILD @@ -8,6 +8,7 @@ licenses(["notice"]) # Apache 2 exports_files([ "protodoc_manifest.yaml", "v2_mapping.json", + "redirects.txt", ]) envoy_package() @@ -44,3 +45,20 @@ filegroup( ], ), ) + +genrule( + name = "v2_redirects", + outs = ["v2_redirects.txt"], + cmd = "jq -r 'with_entries(.key |= sub(\"^envoy/\";\"api-v3/\")) | with_entries(.value |= sub(\"^envoy/\";\"api-v2/\")) | to_entries[] | \"\\(.value)\t\t\\(.key)\"' docs/v2_mapping.json > $@", + tools = ["//docs:v2_mapping.json"], +) + +genrule( + name = "redirects", + outs = ["envoy-redirects.txt"], + cmd = "cat $(location //docs:redirects.txt) > $@ && cat $(location :v2_redirects) >> $@", + tools = [ + ":redirects.txt", + ":v2_redirects", + ], +) diff --git a/docs/build.sh b/docs/build.sh index bca3935841fe2..d1dd77174fddb 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -75,10 +75,10 @@ BAZEL_BUILD_OPTIONS+=( # Generate RST for the lists of trusted/untrusted extensions in # intro/arch_overview/security docs. -bazel run "${BAZEL_BUILD_OPTIONS[@]}" //tools/extensions:generate_extension_rst +bazel build "${BAZEL_BUILD_OPTIONS[@]}" //tools/docs:extensions_security_rst # Generate RST for external dependency docs in intro/arch_overview/security. -bazel run "${BAZEL_BUILD_OPTIONS[@]}" //tools/dependency:generate_external_dep_rst +bazel build "${BAZEL_BUILD_OPTIONS[@]}" //tools/docs:external_deps_rst function generate_api_rst() { local proto_target @@ -145,8 +145,12 @@ rsync -av \ "${SCRIPT_DIR}"/_ext \ "${GENERATED_RST_DIR}" -# Merge generated redirects -jq -r 'with_entries(.key |= sub("^envoy/";"api-v3/")) | with_entries(.value |= sub("^envoy/";"api-v2/")) | to_entries[] | "\(.value)\t\t\(.key)"' docs/v2_mapping.json >> "${GENERATED_RST_DIR}"/redirects.txt +bazel build "${BAZEL_BUILD_OPTIONS[@]}" //docs:redirects + +# TODO(phlax): once all of above jobs are moved to bazel build genrules these can be done as part of the sphinx build +tar -xf bazel-bin/tools/docs/extensions_security_rst.tar -C "${GENERATED_RST_DIR}" +tar -xf bazel-bin/tools/docs/external_deps_rst.tar -C "${GENERATED_RST_DIR}" +cp -a bazel-bin/docs/envoy-redirects.txt "${GENERATED_RST_DIR}" # To speed up validate_fragment invocations in validating_code_block bazel build "${BAZEL_BUILD_OPTIONS[@]}" //tools/config_validation:validate_fragment diff --git a/docs/conf.py b/docs/conf.py index 08acd7a903beb..ec296c5c6c268 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -288,7 +288,7 @@ def setup(app): # TODO(phlax): add redirect diff (`rediraffe_branch` setting) # - not sure how diffing will work with main merging in PRs - might need # to be injected dynamically, somehow -rediraffe_redirects = "redirects.txt" +rediraffe_redirects = "envoy-redirects.txt" intersphinx_mapping = { 'v1.5.0': ('https://www.envoyproxy.io/docs/envoy/v1.5.0', None), diff --git a/docs/protodoc_manifest.yaml b/docs/protodoc_manifest.yaml index e12bdea114202..4f32c94d4a51d 100644 --- a/docs/protodoc_manifest.yaml +++ b/docs/protodoc_manifest.yaml @@ -20,40 +20,40 @@ fields: threshold: value: 0.95 envoy.config.cluster.v3.Cluster.per_connection_buffer_limit_bytes: - edge_config: { example: 32768 } + edge_config: {example: 32768} envoy.config.cluster.v3.Cluster.http2_protocol_options: edge_config: example: - initial_stream_window_size: 65536 # 64 KiB - initial_connection_window_size: 1048576 # 1 MiB + initial_stream_window_size: 65536 # 64 KiB + initial_connection_window_size: 1048576 # 1 MiB envoy.config.listener.v3.Listener.per_connection_buffer_limit_bytes: - edge_config: { example: 32768 } + edge_config: {example: 32768} envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.common_http_protocol_options: edge_config: example: - idle_timeout: 900s # 15 mins + idle_timeout: 900s # 15 mins headers_with_underscores_action: REJECT_REQUEST envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.http2_protocol_options: edge_config: example: max_concurrent_streams: 100 - initial_stream_window_size: 65536 # 64 KiB - initial_connection_window_size: 1048576 # 1 MiB + initial_stream_window_size: 65536 # 64 KiB + initial_connection_window_size: 1048576 # 1 MiB envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.stream_idle_timeout: edge_config: - example: 300s # 5 mins + example: 300s # 5 mins envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.request_headers_timeout: edge_config: - example: 10s # 10 seconds + example: 10s # 10 seconds envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.request_timeout: edge_config: note: > This timeout is not compatible with streaming requests. - example: 300s # 5 mins + example: 300s # 5 mins envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.use_remote_address: - edge_config: { example: true } + edge_config: {example: true} envoy.config.listener.v3.QuicProtocolOptions.quic_protocol_options: edge_config: example: - initial_stream_window_size: 65536 # 64 KiB - initial_connection_window_size: 65536 # 64 KiB + initial_stream_window_size: 65536 # 64 KiB + initial_connection_window_size: 65536 # 64 KiB diff --git a/docs/root/api-docs/xds_protocol.rst b/docs/root/api-docs/xds_protocol.rst index 71c5f646627bb..2f8873f7c7b47 100644 --- a/docs/root/api-docs/xds_protocol.rst +++ b/docs/root/api-docs/xds_protocol.rst @@ -763,6 +763,10 @@ is present for debugging purposes only. - As an ACK or NACK response to a previous :ref:`DeltaDiscoveryResponse `. In this case the :ref:`response_nonce ` is set to the nonce value in the Response. ACK or NACK is determined by the absence or presence of :ref:`error_detail `. - Spontaneous :ref:`DeltaDiscoveryRequests ` from the client. This can be done to dynamically add or remove elements from the tracked :ref:`resource_names ` set. In this case :ref:`response_nonce ` must be omitted. +Note that while a :ref:`response_nonce ` may +be set on the request, the server must honor changes to the subscription state even if the nonce is stale. The nonce +may be used to correlate an ack/nack with a server response, but should *not* be used to reject stale requests. + In this first example the client connects and receives a first update that it ACKs. The second update fails and the client NACKs the update. Later the xDS client spontaneously requests the "wc" resource. diff --git a/docs/root/configuration/best_practices/_include/edge.yaml b/docs/root/configuration/best_practices/_include/edge.yaml index cfcb3c4bd5980..29f56fbac089c 100644 --- a/docs/root/configuration/best_practices/_include/edge.yaml +++ b/docs/root/configuration/best_practices/_include/edge.yaml @@ -5,7 +5,7 @@ overload_manager: typed_config: "@type": type.googleapis.com/envoy.extensions.resource_monitors.fixed_heap.v3.FixedHeapConfig # TODO: Tune for your system. - max_heap_size_bytes: 2147483648 # 2 GiB + max_heap_size_bytes: 2147483648 # 2 GiB actions: - name: "envoy.overload_actions.shrink_heap" triggers: @@ -37,7 +37,7 @@ static_resources: # - name: envoy.filters.listener.proxy_protocol # typed_config: # "@type": type.googleapis.com/envoy.extensions.filters.listener.proxy_protocol.v3.ProxyProtocol - per_connection_buffer_limit_bytes: 32768 # 32 KiB + per_connection_buffer_limit_bytes: 32768 # 32 KiB filter_chains: - filter_chain_match: server_names: ["example.com", "www.example.com"] @@ -47,8 +47,8 @@ static_resources: "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext common_tls_context: tls_certificates: - - certificate_chain: { filename: "certs/servercert.pem" } - private_key: { filename: "certs/serverkey.pem" } + - certificate_chain: {filename: "certs/servercert.pem"} + private_key: {filename: "certs/serverkey.pem"} filters: - name: envoy.filters.network.http_connection_manager typed_config: @@ -59,51 +59,51 @@ static_resources: merge_slashes: true path_with_escaped_slashes_action: UNESCAPE_AND_REDIRECT common_http_protocol_options: - idle_timeout: 3600s # 1 hour + idle_timeout: 3600s # 1 hour headers_with_underscores_action: REJECT_REQUEST http2_protocol_options: max_concurrent_streams: 100 - initial_stream_window_size: 65536 # 64 KiB - initial_connection_window_size: 1048576 # 1 MiB - stream_idle_timeout: 300s # 5 mins, must be disabled for long-lived and streaming requests - request_timeout: 300s # 5 mins, must be disabled for long-lived and streaming requests + initial_stream_window_size: 65536 # 64 KiB + initial_connection_window_size: 1048576 # 1 MiB + stream_idle_timeout: 300s # 5 mins, must be disabled for long-lived and streaming requests + request_timeout: 300s # 5 mins, must be disabled for long-lived and streaming requests route_config: virtual_hosts: - name: default domains: ["*"] routes: - - match: { prefix: "/" } + - match: {prefix: "/"} route: cluster: service_foo - idle_timeout: 15s # must be disabled for long-lived and streaming requests + idle_timeout: 15s # must be disabled for long-lived and streaming requests clusters: - name: service_foo - per_connection_buffer_limit_bytes: 32768 # 32 KiB + per_connection_buffer_limit_bytes: 32768 # 32 KiB load_assignment: cluster_name: some_service endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: 127.0.0.1 - port_value: 8080 + - lb_endpoints: + - endpoint: + address: + socket_address: + address: 127.0.0.1 + port_value: 8080 typed_extension_protocol_options: envoy.extensions.upstreams.http.v3.HttpProtocolOptions: "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions explicit_http_config: http2_protocol_options: - initial_stream_window_size: 65536 # 64 KiB - initial_connection_window_size: 1048576 # 1 MiB + initial_stream_window_size: 65536 # 64 KiB + initial_connection_window_size: 1048576 # 1 MiB layered_runtime: layers: - - name: static_layer_0 - static_layer: - envoy: - resource_limits: - listener: - example_listener_name: - connection_limit: 10000 - overload: - global_downstream_max_connections: 50000 + - name: static_layer_0 + static_layer: + envoy: + resource_limits: + listener: + example_listener_name: + connection_limit: 10000 + overload: + global_downstream_max_connections: 50000 diff --git a/docs/root/configuration/http/http_conn_man/_include/preserve-case.yaml b/docs/root/configuration/http/http_conn_man/_include/preserve-case.yaml index a4ea11ac4af5e..cd70bffa507a1 100644 --- a/docs/root/configuration/http/http_conn_man/_include/preserve-case.yaml +++ b/docs/root/configuration/http/http_conn_man/_include/preserve-case.yaml @@ -1,49 +1,49 @@ static_resources: listeners: - - address: - socket_address: - address: 0.0.0.0 - port_value: 443 - filter_chains: - - filters: - - name: envoy.filters.network.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - stat_prefix: ingress_http - http_protocol_options: - header_key_format: - stateful_formatter: - name: preserve_case - typed_config: - "@type": type.googleapis.com/envoy.extensions.http.header_formatters.preserve_case.v3.PreserveCaseFormatterConfig - http_filters: - - name: envoy.filters.http.router - route_config: - virtual_hosts: - - name: default - domains: ["*"] - routes: - - match: { prefix: "/" } - route: - cluster: service_foo + - address: + socket_address: + address: 0.0.0.0 + port_value: 443 + filter_chains: + - filters: + - name: envoy.filters.network.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + stat_prefix: ingress_http + http_protocol_options: + header_key_format: + stateful_formatter: + name: preserve_case + typed_config: + "@type": type.googleapis.com/envoy.extensions.http.header_formatters.preserve_case.v3.PreserveCaseFormatterConfig + http_filters: + - name: envoy.filters.http.router + route_config: + virtual_hosts: + - name: default + domains: ["*"] + routes: + - match: {prefix: "/"} + route: + cluster: service_foo clusters: - - name: service_foo - typed_extension_protocol_options: - envoy.extensions.upstreams.http.v3.HttpProtocolOptions: - "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions - explicit_http_config: - http_protocol_options: - header_key_format: - stateful_formatter: - name: preserve_case - typed_config: - "@type": type.googleapis.com/envoy.extensions.http.header_formatters.preserve_case.v3.PreserveCaseFormatterConfig - load_assignment: - cluster_name: some_service - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: 127.0.0.1 - port_value: 8080 + - name: service_foo + typed_extension_protocol_options: + envoy.extensions.upstreams.http.v3.HttpProtocolOptions: + "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions + explicit_http_config: + http_protocol_options: + header_key_format: + stateful_formatter: + name: preserve_case + typed_config: + "@type": type.googleapis.com/envoy.extensions.http.header_formatters.preserve_case.v3.PreserveCaseFormatterConfig + load_assignment: + cluster_name: some_service + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: 127.0.0.1 + port_value: 8080 diff --git a/docs/root/configuration/http/http_conn_man/response_code_details.rst b/docs/root/configuration/http/http_conn_man/response_code_details.rst index def0da6cbba23..342350c6a4f8c 100644 --- a/docs/root/configuration/http/http_conn_man/response_code_details.rst +++ b/docs/root/configuration/http/http_conn_man/response_code_details.rst @@ -26,7 +26,8 @@ Below are the list of reasons the HttpConnectionManager or Router filter may sen duration_timeout, The max connection duration was exceeded. direct_response, A direct response was generated by the router filter. filter_chain_not_found, The request was rejected due to no matching filter chain. - filter_removed_required_headers, The request was rejected in the filter manager because a configured filter removed required headers. + filter_removed_required_request_headers, The request was rejected in the filter manager because a configured filter removed required request headers. + filter_removed_required_response_headers, The response was rejected in the filter manager because a configured filter removed required response headers or these values were invalid (e.g. overflown status). internal_redirect, The original stream was replaced with an internal redirect. low_version, The HTTP/1.0 or HTTP/0.9 request was rejected due to HTTP/1.0 support not being configured. maintenance_mode, The request was rejected by the router filter because the cluster was in maintenance mode. diff --git a/docs/root/configuration/http/http_conn_man/stats.rst b/docs/root/configuration/http/http_conn_man/stats.rst index dd6891ce2d220..30a016594812e 100644 --- a/docs/root/configuration/http/http_conn_man/stats.rst +++ b/docs/root/configuration/http/http_conn_man/stats.rst @@ -87,7 +87,12 @@ the following statistics: Per listener statistics ----------------------- -Additional per listener statistics are rooted at *listener.
.http..* with the +Per listener statistics are rooted at *listener.
*. + +HTTP per listener statistics +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Additional HTTP statistics are of the form *http..* with the following statistics: .. csv-table:: @@ -101,15 +106,27 @@ following statistics: downstream_rq_4xx, Counter, Total 4xx responses downstream_rq_5xx, Counter, Total 5xx responses +HTTP/3 per listener statistics +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +HTTP/3 statistics with the form of *http3.downstream..*: + +.. csv-table:: + :header: Name, Type, Description + :widths: 1, 1, 2 + + .quic_connection_close_error_code_, Counter, A collection of counters that are lazily initialized to record each quic connection close error code that's present. + + .. _config_http_conn_man_stats_per_codec: Per codec statistics ----------------------- -Each codec has the option of adding per-codec statistics. Both http1 and http2 have codec stats. +Each codec has the option of adding per-codec statistics. http1, http2, and http3 all have codec stats. -Http1 codec statistics -~~~~~~~~~~~~~~~~~~~~~~ +HTTP/1 codec statistics +~~~~~~~~~~~~~~~~~~~~~~~ On the downstream side all http1 statistics are rooted at *http1.* @@ -124,8 +141,8 @@ On the upstream side all http1 statistics are rooted at *cluster..http1.* response_flood, Counter, Total number of connections closed due to response flooding requests_rejected_with_underscores_in_headers, Counter, Total numbers of rejected requests due to header names containing underscores. This action is configured by setting the :ref:`headers_with_underscores_action config setting `. -Http2 codec statistics -~~~~~~~~~~~~~~~~~~~~~~ +HTTP/2 codec statistics +~~~~~~~~~~~~~~~~~~~~~~~ On the downstream side all http2 statistics are rooted at *http2.* @@ -160,8 +177,8 @@ On the upstream side all http2 statistics are rooted at *cluster..http2.* `downstream_rq_active` gauge due to differences in stream accounting between the codec and the HTTP connection manager. -Http3 codec statistics -~~~~~~~~~~~~~~~~~~~~~~ +HTTP/3 codec statistics +~~~~~~~~~~~~~~~~~~~~~~~ On the downstream side all http3 statistics are rooted at *http3.* diff --git a/docs/root/configuration/http/http_filters/_include/bandwidth-limit-filter.yaml b/docs/root/configuration/http/http_filters/_include/bandwidth-limit-filter.yaml index 2f63fb2147bc1..76ab6d35ad922 100644 --- a/docs/root/configuration/http/http_filters/_include/bandwidth-limit-filter.yaml +++ b/docs/root/configuration/http/http_filters/_include/bandwidth-limit-filter.yaml @@ -17,8 +17,8 @@ static_resources: - name: local_service domains: ["*"] routes: - - match: { prefix: "/path/with/bandwidth/limit" } - route: { cluster: service_protected_by_bandwidth_limit } + - match: {prefix: "/path/with/bandwidth/limit"} + route: {cluster: service_protected_by_bandwidth_limit} typed_per_filter_config: envoy.filters.http.bandwidth_limit: "@type": type.googleapis.com/envoy.extensions.filters.http.bandwidth_limit.v3alpha.BandwidthLimit @@ -26,8 +26,8 @@ static_resources: enable_mode: REQUEST_AND_RESPONSE limit_kbps: 500 fill_interval: 0.1s - - match: { prefix: "/" } - route: { cluster: web_service } + - match: {prefix: "/"} + route: {cluster: web_service} http_filters: - name: envoy.filters.http.bandwidth_limit typed_config: diff --git a/docs/root/configuration/http/http_filters/_include/composite.yaml b/docs/root/configuration/http/http_filters/_include/composite.yaml index 72d11abde1114..d45969ba43615 100644 --- a/docs/root/configuration/http/http_filters/_include/composite.yaml +++ b/docs/root/configuration/http/http_filters/_include/composite.yaml @@ -1,12 +1,13 @@ admin: access_log_path: /tmp/admin_access.log address: - socket_address: { address: 0.0.0.0, port_value: 9901 } + socket_address: {address: 0.0.0.0, port_value: 9901} + static_resources: listeners: - name: listener1 address: - socket_address: { address: 0.0.0.0, port_value: 51051 } + socket_address: {address: 0.0.0.0, port_value: 51051} filter_chains: - filters: - name: envoy.filters.network.http_connection_manager @@ -22,8 +23,8 @@ static_resources: routes: # NOTE: by default, matching happens based on the gRPC route, and not on the incoming request path. # Reference: https://www.envoyproxy.io/docs/envoy/latest/configuration/http_filters/grpc_json_transcoder_filter#route-configs-for-transcoded-requests - - match: { prefix: "/helloworld.Greeter" } - route: { cluster: grpc, timeout: 60s } + - match: {prefix: "/helloworld.Greeter"} + route: {cluster: grpc, timeout: 60s} http_filters: - name: composite typed_config: @@ -41,7 +42,7 @@ static_resources: header_name: x-fault-category exact_match_map: map: - "huge fault": # inject 10s latency into all requests + "huge fault": # inject 10s latency into all requests action: name: composite-action typed_config: @@ -55,7 +56,7 @@ static_resources: percentage: numerator: 100 denominator: HUNDRED - "tiny fault": # inject 1s latency into all requests + "tiny fault": # inject 1s latency into all requests action: name: composite-action typed_config: @@ -93,8 +94,8 @@ static_resources: layered_runtime: layers: - - name: static-layer - static_layer: - envoy: - reloadable_features: - experimental_matching_api: true + - name: static-layer + static_layer: + envoy: + reloadable_features: + experimental_matching_api: true diff --git a/docs/root/configuration/http/http_filters/_include/dns-cache-circuit-breaker.yaml b/docs/root/configuration/http/http_filters/_include/dns-cache-circuit-breaker.yaml index 8742d6954f5a6..427600e102392 100644 --- a/docs/root/configuration/http/http_filters/_include/dns-cache-circuit-breaker.yaml +++ b/docs/root/configuration/http/http_filters/_include/dns-cache-circuit-breaker.yaml @@ -43,6 +43,14 @@ static_resources: dns_cache_config: name: dynamic_forward_proxy_cache_config dns_lookup_family: V4_ONLY + dns_resolution_config: + resolvers: + - socket_address: + address: "8.8.8.8" + port_value: 53 + dns_resolver_options: + use_tcp_for_dns_lookups: true + no_default_search_domain: true - name: envoy.filters.http.router typed_config: "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router @@ -56,6 +64,14 @@ static_resources: dns_cache_config: name: dynamic_forward_proxy_cache_config dns_lookup_family: V4_ONLY + dns_resolution_config: + resolvers: + - socket_address: + address: "8.8.8.8" + port_value: 53 + dns_resolver_options: + use_tcp_for_dns_lookups: true + no_default_search_domain: true transport_socket: name: envoy.transport_sockets.tls typed_config: diff --git a/docs/root/configuration/http/http_filters/_include/grpc-reverse-bridge-filter.yaml b/docs/root/configuration/http/http_filters/_include/grpc-reverse-bridge-filter.yaml index 4ffc8af0e483e..9d62826782fbc 100644 --- a/docs/root/configuration/http/http_filters/_include/grpc-reverse-bridge-filter.yaml +++ b/docs/root/configuration/http/http_filters/_include/grpc-reverse-bridge-filter.yaml @@ -59,12 +59,12 @@ static_resources: load_assignment: cluster_name: some_service endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: localhost - port_value: 4630 + - lb_endpoints: + - endpoint: + address: + socket_address: + address: localhost + port_value: 4630 - name: grpc type: STRICT_DNS lb_policy: ROUND_ROBIN @@ -76,9 +76,9 @@ static_resources: load_assignment: cluster_name: grpc endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: localhost - port_value: 10005 + - lb_endpoints: + - endpoint: + address: + socket_address: + address: localhost + port_value: 10005 diff --git a/docs/root/configuration/http/http_filters/_include/grpc-transcoder-filter.yaml b/docs/root/configuration/http/http_filters/_include/grpc-transcoder-filter.yaml index 704b58d4f9b29..80a8c67e0f726 100644 --- a/docs/root/configuration/http/http_filters/_include/grpc-transcoder-filter.yaml +++ b/docs/root/configuration/http/http_filters/_include/grpc-transcoder-filter.yaml @@ -1,12 +1,12 @@ admin: address: - socket_address: { address: 0.0.0.0, port_value: 9901 } + socket_address: {address: 0.0.0.0, port_value: 9901} static_resources: listeners: - name: listener1 address: - socket_address: { address: 0.0.0.0, port_value: 51051 } + socket_address: {address: 0.0.0.0, port_value: 51051} filter_chains: - filters: - name: envoy.filters.network.http_connection_manager @@ -22,8 +22,8 @@ static_resources: routes: # NOTE: by default, matching happens based on the gRPC route, and not on the incoming request path. # Reference: https://www.envoyproxy.io/docs/envoy/latest/configuration/http_filters/grpc_json_transcoder_filter#route-configs-for-transcoded-requests - - match: { prefix: "/helloworld.Greeter" } - route: { cluster: grpc, timeout: 60s } + - match: {prefix: "/helloworld.Greeter"} + route: {cluster: grpc, timeout: 60s} http_filters: - name: envoy.filters.http.grpc_json_transcoder typed_config: diff --git a/docs/root/configuration/listeners/network_filters/_include/sni-dynamic-forward-proxy-filter.yaml b/docs/root/configuration/listeners/network_filters/_include/sni-dynamic-forward-proxy-filter.yaml index c78ad55d80324..2e30456d03d0e 100644 --- a/docs/root/configuration/listeners/network_filters/_include/sni-dynamic-forward-proxy-filter.yaml +++ b/docs/root/configuration/listeners/network_filters/_include/sni-dynamic-forward-proxy-filter.yaml @@ -13,21 +13,21 @@ static_resources: address: 0.0.0.0 port_value: 10000 listener_filters: - - name: envoy.filters.listener.tls_inspector + - name: envoy.filters.listener.tls_inspector filter_chains: - - filters: - - name: envoy.filters.network.sni_dynamic_forward_proxy - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3alpha.FilterConfig - port_value: 443 - dns_cache_config: - name: dynamic_forward_proxy_cache_config - dns_lookup_family: V4_ONLY - - name: envoy.tcp_proxy - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy - stat_prefix: tcp - cluster: dynamic_forward_proxy_cluster + - filters: + - name: envoy.filters.network.sni_dynamic_forward_proxy + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3alpha.FilterConfig + port_value: 443 + dns_cache_config: + name: dynamic_forward_proxy_cache_config + dns_lookup_family: V4_ONLY + - name: envoy.tcp_proxy + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + stat_prefix: tcp + cluster: dynamic_forward_proxy_cluster clusters: - name: dynamic_forward_proxy_cluster lb_policy: CLUSTER_PROVIDED diff --git a/docs/root/configuration/listeners/network_filters/_include/zookeeper-filter-proxy.yaml b/docs/root/configuration/listeners/network_filters/_include/zookeeper-filter-proxy.yaml index a9850d4672243..3215fcadad685 100644 --- a/docs/root/configuration/listeners/network_filters/_include/zookeeper-filter-proxy.yaml +++ b/docs/root/configuration/listeners/network_filters/_include/zookeeper-filter-proxy.yaml @@ -1,36 +1,36 @@ static_resources: listeners: - - name: main - address: - socket_address: - address: 127.0.0.1 # Host that zookeeper clients should connect to. - port_value: 10001 # Port that zookeeper clients should connect to. - filter_chains: - - filters: - - name: envoy.filters.network.zookeeper_proxy - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.zookeeper_proxy.v3.ZooKeeperProxy - stat_prefix: zookeeper - - name: envoy.filters.network.tcp_proxy - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy - stat_prefix: tcp - cluster: local_zk_server + - name: main + address: + socket_address: + address: 127.0.0.1 # Host that zookeeper clients should connect to. + port_value: 10001 # Port that zookeeper clients should connect to. + filter_chains: + - filters: + - name: envoy.filters.network.zookeeper_proxy + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.zookeeper_proxy.v3.ZooKeeperProxy + stat_prefix: zookeeper + - name: envoy.filters.network.tcp_proxy + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy + stat_prefix: tcp + cluster: local_zk_server clusters: - - name: local_zk_server - type: LOGICAL_DNS - lb_policy: ROUND_ROBIN - typed_extension_protocol_options: - envoy.extensions.upstreams.http.v3.HttpProtocolOptions: - "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions - explicit_http_config: - http2_protocol_options: {} - load_assignment: - cluster_name: local_zk_server - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: 127.0.0.1 - port_value: 2181 + - name: local_zk_server + type: LOGICAL_DNS + lb_policy: ROUND_ROBIN + typed_extension_protocol_options: + envoy.extensions.upstreams.http.v3.HttpProtocolOptions: + "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions + explicit_http_config: + http2_protocol_options: {} + load_assignment: + cluster_name: local_zk_server + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: 127.0.0.1 + port_value: 2181 diff --git a/docs/root/configuration/listeners/udp_filters/dns_filter.rst b/docs/root/configuration/listeners/udp_filters/dns_filter.rst index d2243351f3403..7e3d74cf10f97 100644 --- a/docs/root/configuration/listeners/udp_filters/dns_filter.rst +++ b/docs/root/configuration/listeners/udp_filters/dns_filter.rst @@ -39,13 +39,17 @@ Example Configuration stat_prefix: "dns_filter_prefix" client_config: resolution_timeout: 5s - upstream_resolvers: - - socket_address: - address: "8.8.8.8" - port_value: 53 - - socket_address: - address: "8.8.4.4" - port_value: 53 + dns_resolution_config: + dns_resolver_options: + use_tcp_for_dns_lookups: false + no_default_search_domain: false + resolvers: + - socket_address: + address: "8.8.8.8" + port_value: 53 + - socket_address: + address: "8.8.4.4" + port_value: 53 max_pending_lookups: 256 server_config: inline_dns_table: diff --git a/docs/root/configuration/overview/_include/tagged.yaml b/docs/root/configuration/overview/_include/tagged.yaml index a333ec7ffda1a..1146593ea9d31 100644 --- a/docs/root/configuration/overview/_include/tagged.yaml +++ b/docs/root/configuration/overview/_include/tagged.yaml @@ -1,7 +1,7 @@ !ignore dynamic_sockets: - - &admin_address { address: 127.0.0.1, port_value: 9901 } - - &listener_address { address: 127.0.0.1, port_value: 10000 } - - &lb_address { address: 127.0.0.1, port_value: 1234 } +- &admin_address {address: 127.0.0.1, port_value: 9901} +- &listener_address {address: 127.0.0.1, port_value: 10000} +- &lb_address {address: 127.0.0.1, port_value: 1234} admin: address: @@ -25,8 +25,8 @@ static_resources: - name: local_service domains: ["*"] routes: - - match: { prefix: "/" } - route: { cluster: some_service } + - match: {prefix: "/"} + route: {cluster: some_service} http_filters: - name: envoy.filters.http.router clusters: diff --git a/docs/root/intro/_include/life-of-a-request.yaml b/docs/root/intro/_include/life-of-a-request.yaml index 9dbe644dcaaeb..f1517c3807cde 100644 --- a/docs/root/intro/_include/life-of-a-request.yaml +++ b/docs/root/intro/_include/life-of-a-request.yaml @@ -24,8 +24,8 @@ static_resources: "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext common_tls_context: tls_certificates: - - certificate_chain: { filename: "certs/servercert.pem" } - private_key: { filename: "certs/serverkey.pem" } + - certificate_chain: {filename: "certs/servercert.pem"} + private_key: {filename: "certs/serverkey.pem"} filters: # The HTTP connection manager is the only network filter. - name: envoy.filters.network.http_connection_manager @@ -37,10 +37,10 @@ static_resources: max_concurrent_streams: 100 # File system based access logging. access_log: - - name: envoy.access_loggers.file - typed_config: - "@type": type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog - path: "/var/log/envoy/access.log" + - name: envoy.access_loggers.file + typed_config: + "@type": type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog + path: "/var/log/envoy/access.log" # The route table, mapping /foo to some_service. route_config: name: local_route @@ -54,8 +54,8 @@ static_resources: cluster: some_service # CustomFilter and the HTTP router filter are the HTTP filter chain. http_filters: - # - name: some.customer.filter - - name: envoy.filters.http.router + # - name: some.customer.filter + - name: envoy.filters.http.router clusters: - name: some_service # Upstream TLS configuration. @@ -85,10 +85,10 @@ static_resources: http2_protocol_options: max_concurrent_streams: 100 - name: some_statsd_sink - # The rest of the configuration for statsd sink cluster. + # The rest of the configuration for statsd sink cluster. # statsd sink. stats_sinks: - - name: envoy.stat_sinks.statsd - typed_config: - "@type": type.googleapis.com/envoy.config.metrics.v3.StatsdSink - tcp_cluster_name: some_statsd_sink +- name: envoy.stat_sinks.statsd + typed_config: + "@type": type.googleapis.com/envoy.config.metrics.v3.StatsdSink + tcp_cluster_name: some_statsd_sink diff --git a/docs/root/intro/arch_overview/advanced/matching/_include/complicated.yaml b/docs/root/intro/arch_overview/advanced/matching/_include/complicated.yaml index a9dd901d638b2..9efc4cbf217e8 100644 --- a/docs/root/intro/arch_overview/advanced/matching/_include/complicated.yaml +++ b/docs/root/intro/arch_overview/advanced/matching/_include/complicated.yaml @@ -1,100 +1,100 @@ static_resources: listeners: - - address: - socket_address: - address: 0.0.0.0 - port_value: 443 - listener_filters: - filter_chains: - - filters: - - name: envoy.filters.network.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - stat_prefix: ingress_http - http_filters: - - name: with-matcher + - address: + socket_address: + address: 0.0.0.0 + port_value: 443 + listener_filters: + filter_chains: + - filters: + - name: envoy.filters.network.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + stat_prefix: ingress_http + http_filters: + - name: with-matcher + typed_config: + "@type": type.googleapis.com/envoy.extensions.common.matching.v3.ExtensionWithMatcher + extension_config: + name: envoy.filters.http.fault + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault + abort: + http_status: 503 + percentage: + numerator: 0 + denominator: HUNDRED + delay: + fixed_delay: 3s + percentage: + numerator: 0 + denominator: HUNDRED + matcher: + # The top level matcher is a matcher tree which conceptually selects one of several subtrees. + matcher_tree: + input: + name: request-headers typed_config: - "@type": type.googleapis.com/envoy.extensions.common.matching.v3.ExtensionWithMatcher - extension_config: - name: envoy.filters.http.fault - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault - abort: - http_status: 503 - percentage: - numerator: 0 - denominator: HUNDRED - delay: - fixed_delay: 3s - percentage: - numerator: 0 - denominator: HUNDRED - matcher: - # The top level matcher is a matcher tree which conceptually selects one of several subtrees. - matcher_tree: - input: - name: request-headers - typed_config: - "@type": type.googleapis.com/envoy.type.matcher.v3.HttpRequestHeaderMatchInput - header_name: some-header - exact_match_map: - # Note this additional indirection; this is a workaround for Protobuf oneof limitations. - map: - some_value_to_match_on: # This is the header value we're trying to match against. - # The OnMatch resulting on matching with this branch of the exact matcher is another matcher, allowing for recursive matching. - matcher: - # The inner matcher is a matcher list, which attempts to match a list of predicates. - matcher_list: - matchers: - - predicate: - or_matcher: - predicate: - - single_predicate: - input: - name: request-headers - typed_config: - "@type": type.googleapis.com/envoy.type.matcher.v3.HttpRequestHeaderMatchInput - header_name: second-header - value_match: - exact: foo - - single_predicate: - input: - name: request-headers - typed_config: - "@type": type.googleapis.com/envoy.type.matcher.v3.HttpRequestHeaderMatchInput - header_name: second-header - value_match: - exact: bar - on_match: - action: - name: skip - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.common.matcher.action.v3.SkipFilter - - name: envoy.filters.http.router - route_config: - virtual_hosts: - - name: default - domains: ["*"] - routes: - - match: { prefix: "/" } - route: - cluster: service_foo + "@type": type.googleapis.com/envoy.type.matcher.v3.HttpRequestHeaderMatchInput + header_name: some-header + exact_match_map: + # Note this additional indirection; this is a workaround for Protobuf oneof limitations. + map: + some_value_to_match_on: # This is the header value we're trying to match against. + # The OnMatch resulting on matching with this branch of the exact matcher is another matcher, allowing for recursive matching. + matcher: + # The inner matcher is a matcher list, which attempts to match a list of predicates. + matcher_list: + matchers: + - predicate: + or_matcher: + predicate: + - single_predicate: + input: + name: request-headers + typed_config: + "@type": type.googleapis.com/envoy.type.matcher.v3.HttpRequestHeaderMatchInput + header_name: second-header + value_match: + exact: foo + - single_predicate: + input: + name: request-headers + typed_config: + "@type": type.googleapis.com/envoy.type.matcher.v3.HttpRequestHeaderMatchInput + header_name: second-header + value_match: + exact: bar + on_match: + action: + name: skip + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.common.matcher.action.v3.SkipFilter + - name: envoy.filters.http.router + route_config: + virtual_hosts: + - name: default + domains: ["*"] + routes: + - match: {prefix: "/"} + route: + cluster: service_foo clusters: - - name: service_foo - load_assignment: - cluster_name: some_service - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: 127.0.0.1 - port_value: 8080 + - name: service_foo + load_assignment: + cluster_name: some_service + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: 127.0.0.1 + port_value: 8080 layered_runtime: layers: - - name: static-layer - static_layer: - envoy: - reloadable_features: - experimental_matching_api: true + - name: static-layer + static_layer: + envoy: + reloadable_features: + experimental_matching_api: true diff --git a/docs/root/intro/arch_overview/advanced/matching/_include/request_response.yaml b/docs/root/intro/arch_overview/advanced/matching/_include/request_response.yaml index ff48ee5e13f52..bf4721e48e24f 100644 --- a/docs/root/intro/arch_overview/advanced/matching/_include/request_response.yaml +++ b/docs/root/intro/arch_overview/advanced/matching/_include/request_response.yaml @@ -1,86 +1,86 @@ static_resources: listeners: - - address: - socket_address: - address: 0.0.0.0 - port_value: 443 - listener_filters: - filter_chains: - - filters: - - name: envoy.filters.network.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - stat_prefix: ingress_http - http_filters: - - name: with-matcher - typed_config: - "@type": type.googleapis.com/envoy.extensions.common.matching.v3.ExtensionWithMatcher - extension_config: - name: envoy.filters.http.fault + - address: + socket_address: + address: 0.0.0.0 + port_value: 443 + listener_filters: + filter_chains: + - filters: + - name: envoy.filters.network.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + stat_prefix: ingress_http + http_filters: + - name: with-matcher + typed_config: + "@type": type.googleapis.com/envoy.extensions.common.matching.v3.ExtensionWithMatcher + extension_config: + name: envoy.filters.http.fault + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault + abort: + http_status: 503 + percentage: + numerator: 0 + denominator: HUNDRED + delay: + fixed_delay: 3s + percentage: + numerator: 0 + denominator: HUNDRED + matcher: + matcher_list: + matchers: + - predicate: + or_matcher: + predicate: + - single_predicate: + input: + name: request-headers + typed_config: + "@type": type.googleapis.com/envoy.type.matcher.v3.HttpRequestHeaderMatchInput + header_name: request-header + value_match: + exact: foo + - single_predicate: + input: + name: request-headers + typed_config: + "@type": type.googleapis.com/envoy.type.matcher.v3.HttpResponseHeaderMatchInput + header_name: response-header + value_match: + exact: bar + on_match: + action: + name: skip typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault - abort: - http_status: 503 - percentage: - numerator: 0 - denominator: HUNDRED - delay: - fixed_delay: 3s - percentage: - numerator: 0 - denominator: HUNDRED - matcher: - matcher_list: - matchers: - - predicate: - or_matcher: - predicate: - - single_predicate: - input: - name: request-headers - typed_config: - "@type": type.googleapis.com/envoy.type.matcher.v3.HttpRequestHeaderMatchInput - header_name: request-header - value_match: - exact: foo - - single_predicate: - input: - name: request-headers - typed_config: - "@type": type.googleapis.com/envoy.type.matcher.v3.HttpResponseHeaderMatchInput - header_name: response-header - value_match: - exact: bar - on_match: - action: - name: skip - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.common.matcher.action.v3.SkipFilter - - name: envoy.filters.http.router - route_config: - virtual_hosts: - - name: default - domains: ["*"] - routes: - - match: { prefix: "/" } - route: - cluster: service_foo + "@type": type.googleapis.com/envoy.extensions.filters.common.matcher.action.v3.SkipFilter + - name: envoy.filters.http.router + route_config: + virtual_hosts: + - name: default + domains: ["*"] + routes: + - match: {prefix: "/"} + route: + cluster: service_foo clusters: - - name: service_foo - load_assignment: - cluster_name: some_service - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: 127.0.0.1 - port_value: 8080 + - name: service_foo + load_assignment: + cluster_name: some_service + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: 127.0.0.1 + port_value: 8080 layered_runtime: layers: - - name: static-layer - static_layer: - envoy: - reloadable_features: - experimental_matching_api: true + - name: static-layer + static_layer: + envoy: + reloadable_features: + experimental_matching_api: true diff --git a/docs/root/intro/arch_overview/advanced/matching/_include/simple.yaml b/docs/root/intro/arch_overview/advanced/matching/_include/simple.yaml index fdf2f1c8c183a..836deb8191825 100644 --- a/docs/root/intro/arch_overview/advanced/matching/_include/simple.yaml +++ b/docs/root/intro/arch_overview/advanced/matching/_include/simple.yaml @@ -1,74 +1,74 @@ static_resources: listeners: - - address: - socket_address: - address: 0.0.0.0 - port_value: 443 - listener_filters: - filter_chains: - - filters: - - name: envoy.filters.network.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - stat_prefix: ingress_http - http_filters: - - name: with-matcher + - address: + socket_address: + address: 0.0.0.0 + port_value: 443 + listener_filters: + filter_chains: + - filters: + - name: envoy.filters.network.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + stat_prefix: ingress_http + http_filters: + - name: with-matcher + typed_config: + "@type": type.googleapis.com/envoy.extensions.common.matching.v3.ExtensionWithMatcher + extension_config: + name: envoy.filters.http.fault + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault + abort: + http_status: 503 + percentage: + numerator: 0 + denominator: HUNDRED + delay: + fixed_delay: 3s + percentage: + numerator: 0 + denominator: HUNDRED + matcher: + matcher_tree: + input: + name: request-headers typed_config: - "@type": type.googleapis.com/envoy.extensions.common.matching.v3.ExtensionWithMatcher - extension_config: - name: envoy.filters.http.fault - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.http.fault.v3.HTTPFault - abort: - http_status: 503 - percentage: - numerator: 0 - denominator: HUNDRED - delay: - fixed_delay: 3s - percentage: - numerator: 0 - denominator: HUNDRED - matcher: - matcher_tree: - input: - name: request-headers - typed_config: - "@type": type.googleapis.com/envoy.type.matcher.v3.HttpRequestHeaderMatchInput - header_name: some-header - exact_match_map: - # Note this additional indirection; this is a workaround for Protobuf oneof limitations. - map: - some_value_to_match_on: # This is the header value we're trying to match against. - action: - name: skip - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.common.matcher.action.v3.SkipFilter - - name: envoy.filters.http.router - route_config: - virtual_hosts: - - name: default - domains: ["*"] - routes: - - match: { prefix: "/" } - route: - cluster: service_foo + "@type": type.googleapis.com/envoy.type.matcher.v3.HttpRequestHeaderMatchInput + header_name: some-header + exact_match_map: + # Note this additional indirection; this is a workaround for Protobuf oneof limitations. + map: + some_value_to_match_on: # This is the header value we're trying to match against. + action: + name: skip + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.common.matcher.action.v3.SkipFilter + - name: envoy.filters.http.router + route_config: + virtual_hosts: + - name: default + domains: ["*"] + routes: + - match: {prefix: "/"} + route: + cluster: service_foo clusters: - - name: service_foo - load_assignment: - cluster_name: some_service - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: 127.0.0.1 - port_value: 8080 + - name: service_foo + load_assignment: + cluster_name: some_service + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: 127.0.0.1 + port_value: 8080 layered_runtime: layers: - - name: static-layer - static_layer: - envoy: - reloadable_features: - experimental_matching_api: true + - name: static-layer + static_layer: + envoy: + reloadable_features: + experimental_matching_api: true diff --git a/docs/root/intro/arch_overview/other_protocols/redis.rst b/docs/root/intro/arch_overview/other_protocols/redis.rst index d8da73a0f2b9f..cfe2a45b77b43 100644 --- a/docs/root/intro/arch_overview/other_protocols/redis.rst +++ b/docs/root/intro/arch_overview/other_protocols/redis.rst @@ -8,8 +8,8 @@ In this mode, the goals of Envoy are to maintain availability and partition tole over consistency. This is the key point when comparing Envoy to `Redis Cluster `_. Envoy is designed as a best-effort cache, meaning that it will not try to reconcile inconsistent data or keep a globally consistent -view of cluster membership. It also supports routing commands from different workload to -different to different upstream clusters based on their access patterns, eviction, or isolation +view of cluster membership. It also supports routing commands from different workloads to +different upstream clusters based on their access patterns, eviction, or isolation requirements. The Redis project offers a thorough reference on partitioning as it relates to Redis. See diff --git a/docs/root/intro/arch_overview/security/_include/ssl.yaml b/docs/root/intro/arch_overview/security/_include/ssl.yaml index e23727f0d1473..205142dcbb019 100644 --- a/docs/root/intro/arch_overview/security/_include/ssl.yaml +++ b/docs/root/intro/arch_overview/security/_include/ssl.yaml @@ -1,7 +1,7 @@ static_resources: listeners: - name: listener_0 - address: { socket_address: { address: 127.0.0.1, port_value: 10000 } } + address: {socket_address: {address: 127.0.0.1, port_value: 10000}} filter_chains: - filters: - name: envoy.filters.network.http_connection_manager @@ -13,7 +13,7 @@ static_resources: - name: default domains: ["*"] routes: - - match: { prefix: "/" } + - match: {prefix: "/"} route: cluster: some_service transport_socket: @@ -22,8 +22,8 @@ static_resources: "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext common_tls_context: tls_certificates: - - certificate_chain: { filename: "certs/servercert.pem" } - private_key: { filename: "certs/serverkey.pem" } + - certificate_chain: {filename: "certs/servercert.pem"} + private_key: {filename: "certs/serverkey.pem"} validation_context: trusted_ca: filename: certs/cacert.pem @@ -46,9 +46,9 @@ static_resources: "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext common_tls_context: tls_certificates: - - certificate_chain: { "filename": "certs/servercert.pem" } - private_key: { "filename": "certs/serverkey.pem" } - ocsp_staple: { "filename": "certs/server_ocsp_resp.der" } + - certificate_chain: {"filename": "certs/servercert.pem"} + private_key: {"filename": "certs/serverkey.pem"} + ocsp_staple: {"filename": "certs/server_ocsp_resp.der"} validation_context: match_subject_alt_names: - exact: "foo" diff --git a/docs/root/start/sandboxes/gzip.rst b/docs/root/start/sandboxes/gzip.rst index 4325cb7901d93..205403dad3b20 100644 --- a/docs/root/start/sandboxes/gzip.rst +++ b/docs/root/start/sandboxes/gzip.rst @@ -83,3 +83,13 @@ Now, use ``curl`` to make a request for the compressed statistics: $ curl -si -H "Accept-Encoding: gzip" localhost:9902/stats/prometheus | grep "content-encoding" content-encoding: gzip + +.. seealso:: + :ref:`Gzip API ` + API and configuration reference for Envoy's gzip compression. + + :ref:`Compression configuration ` + Reference documentation for Envoy's compressor filter. + + :ref:`Envoy admin quick start guide ` + Quick start guide to the Envoy admin interface. diff --git a/docs/root/start/sandboxes/index.rst b/docs/root/start/sandboxes/index.rst index e1a89268a3883..4cf45d94969c7 100644 --- a/docs/root/start/sandboxes/index.rst +++ b/docs/root/start/sandboxes/index.rst @@ -70,4 +70,5 @@ The following sandboxes are available: udp wasm-cc websocket + win32_front_proxy zipkin_tracing diff --git a/docs/root/start/sandboxes/setup.rst b/docs/root/start/sandboxes/setup.rst index 6f4c6067bbda7..eb1c1193823ba 100644 --- a/docs/root/start/sandboxes/setup.rst +++ b/docs/root/start/sandboxes/setup.rst @@ -37,6 +37,9 @@ The user account running the examples will need to have permission to use Docker Full instructions for installing Docker can be found on the `Docker website `_ +If you want to use the Windows based Envoy images make sure that you +`switch Docker to use Windows containers `_. + .. _start_sandboxes_setup_docker_compose: Install Docker Compose diff --git a/docs/root/start/sandboxes/win32_front_proxy.rst b/docs/root/start/sandboxes/win32_front_proxy.rst new file mode 100644 index 0000000000000..625bc6ce2e551 --- /dev/null +++ b/docs/root/start/sandboxes/win32_front_proxy.rst @@ -0,0 +1,352 @@ +Windows based Front proxy +========================= + +.. sidebar:: Requirements + + .. include:: _include/docker-env-setup-link.rst + +To get a flavor of what Envoy has to offer on Windows, we are releasing a +`docker compose `_ sandbox that deploys a front Envoy and a +couple of services (simple Flask apps) colocated with a running service Envoy. + +The three containers will be deployed inside a virtual network called ``envoymesh``. + +Below you can see a graphic showing the docker compose deployment: + +.. image:: /_static/docker_compose_front_proxy.svg + :width: 100% + +All incoming requests are routed via the front Envoy, which is acting as a reverse proxy sitting on +the edge of the ``envoymesh`` network. Port ``8080``, ``8443``, and ``8001`` are exposed by docker +compose (see :download:`docker-compose.yaml <_include/front-proxy/docker-compose.yaml>`) to handle +``HTTP``, ``HTTPS`` calls to the services and requests to ``/admin`` respectively. + +Moreover, notice that all traffic routed by the front Envoy to the service containers is actually +routed to the service Envoys (routes setup in :download:`front-envoy.yaml <_include/front-proxy/front-envoy.yaml>`). + +In turn the service Envoys route the request to the Flask app via the loopback +address (routes setup in :download:`service-envoy.yaml <_include/front-proxy/service-envoy.yaml>`). This +setup illustrates the advantage of running service Envoys collocated with your services: all +requests are handled by the service Envoy, and efficiently routed to your services. + +Step 1: Start all of our containers +*********************************** + +Change to the ``examples/front-proxy`` directory. + +.. code-block:: console + + PS> $PWD + D:\envoy\examples\win32-front-proxy + PS> docker-compose build --pull + PS> docker-compose up -d + PS> docker-compose ps + Name Command State Ports + ------------------------------------------------------------------------------------------------------------------------------------------------------------ + envoy-front-proxy_front-envoy_1 powershell.exe ./start_env ... Up 10000/tcp, 0.0.0.0:8003->8003/tcp, 0.0.0.0:8080->8080/tcp, 0.0.0.0:8443->8443/tcp + envoy-front-proxy_service1_1 powershell.exe ./start_ser ... Up 10000/tcp + envoy-front-proxy_service2_1 powershell.exe ./start_ser ... Up 10000/tcp + +Step 2: Test Envoy's routing capabilities +***************************************** + +You can now send a request to both services via the ``front-envoy``. + +For ``service1``: + +.. code-block:: console + + PS> curl -v localhost:8080/service/1 + * Trying ::1... + * TCP_NODELAY set + * Trying 127.0.0.1... + * TCP_NODELAY set + * Connected to localhost (127.0.0.1) port 8080 (#0) + > GET /service/1 HTTP/1.1 + > Host: localhost:8080 + > User-Agent: curl/7.55.1 + > Accept: */* + > + < HTTP/1.1 200 OK + < content-type: text/html; charset=utf-8 + < content-length: 92 + < server: envoy + < date: Wed, 05 May 2021 05:55:55 GMT + < x-envoy-upstream-service-time: 18 + < + Hello from behind Envoy (service 1)! hostname: 8a45bba91d83 resolvedhostname: 172.30.97.237 + * Connection #0 to host localhost left intact + +For ``service2``: + +.. code-block:: console + + PS> curl -v localhost:8080/service/2 + * Trying ::1... + * TCP_NODELAY set + * Trying 127.0.0.1... + * TCP_NODELAY set + * Connected to localhost (127.0.0.1) port 8080 (#0) + > GET /service/2 HTTP/1.1 + > Host: localhost:8080 + > User-Agent: curl/7.55.1 + > Accept: */* + > + < HTTP/1.1 200 OK + < content-type: text/html; charset=utf-8 + < content-length: 93 + < server: envoy + < date: Wed, 05 May 2021 05:57:03 GMT + < x-envoy-upstream-service-time: 14 + < + Hello from behind Envoy (service 2)! hostname: 51e28eb3c8b8 resolvedhostname: 172.30.109.113 + * Connection #0 to host localhost left intact + +Notice that each request, while sent to the front Envoy, was correctly routed to the respective +application. + +We can also use ``HTTPS`` to call services behind the front Envoy. For example, calling ``service1``: + +.. code-block:: console + + PS> curl https://localhost:8443/service/1 -k -v + * Trying ::1... + * TCP_NODELAY set + * Trying 127.0.0.1... + * TCP_NODELAY set + * Connected to localhost (127.0.0.1) port 8443 (#0) + * schannel: SSL/TLS connection with localhost port 8443 (step 1/3) + * schannel: disabled server certificate revocation checks + * schannel: verifyhost setting prevents Schannel from comparing the supplied target name with the subject names in server certificates. + * schannel: sending initial handshake data: sending 171 bytes... + * schannel: sent initial handshake data: sent 171 bytes + * schannel: SSL/TLS connection with localhost port 8443 (step 2/3) + * schannel: failed to receive handshake, need more data + * schannel: SSL/TLS connection with localhost port 8443 (step 2/3) + * schannel: encrypted data got 1081 + * schannel: encrypted data buffer: offset 1081 length 4096 + * schannel: sending next handshake data: sending 93 bytes... + * schannel: SSL/TLS connection with localhost port 8443 (step 2/3) + * schannel: encrypted data got 258 + * schannel: encrypted data buffer: offset 258 length 4096 + * schannel: SSL/TLS handshake complete + * schannel: SSL/TLS connection with localhost port 8443 (step 3/3) + * schannel: stored credential handle in session cache + > GET /service/1 HTTP/1.1 + > Host: localhost:8443 + > User-Agent: curl/7.55.1 + > Accept: */* + > + * schannel: client wants to read 102400 bytes + * schannel: encdata_buffer resized 103424 + * schannel: encrypted data buffer: offset 0 length 103424 + * schannel: encrypted data got 286 + * schannel: encrypted data buffer: offset 286 length 103424 + * schannel: decrypted data length: 257 + * schannel: decrypted data added: 257 + * schannel: decrypted data cached: offset 257 length 102400 + * schannel: encrypted data buffer: offset 0 length 103424 + * schannel: decrypted data buffer: offset 257 length 102400 + * schannel: schannel_recv cleanup + * schannel: decrypted data returned 257 + * schannel: decrypted data buffer: offset 0 length 102400 + < HTTP/1.1 200 OK + < content-type: text/html; charset=utf-8 + < content-length: 92 + < server: envoy + < date: Wed, 05 May 2021 05:57:45 GMT + < x-envoy-upstream-service-time: 3 + < + Hello from behind Envoy (service 1)! hostname: 8a45bba91d83 resolvedhostname: 172.30.97.237 + * Connection #0 to host localhost left intact + +Step 3: Test Envoy's load balancing capabilities +************************************************ + +Now let's scale up our ``service1`` nodes to demonstrate the load balancing abilities of Envoy: + +.. code-block:: console + + PS> docker-compose scale service1=3 + Creating and starting example_service1_2 ... done + Creating and starting example_service1_3 ... done + +Now if we send a request to ``service1`` multiple times, the front Envoy will load balance the +requests by doing a round robin of the three ``service1`` machines: + +.. code-block:: console + + PS> curl -v localhost:8080/service/1 + * Trying ::1... + * TCP_NODELAY set + * Trying 127.0.0.1... + * TCP_NODELAY set + * Connected to localhost (127.0.0.1) port 8080 (#0) + > GET /service/1 HTTP/1.1 + > Host: localhost:8080 + > User-Agent: curl/7.55.1 + > Accept: */* + > + < HTTP/1.1 200 OK + < content-type: text/html; charset=utf-8 + < content-length: 93 + < server: envoy + < date: Wed, 05 May 2021 05:58:40 GMT + < x-envoy-upstream-service-time: 22 + < + Hello from behind Envoy (service 1)! hostname: 8d2359ee21a8 resolvedhostname: 172.30.101.143 + * Connection #0 to host localhost left intact + PS> curl -v localhost:8080/service/1 + * Trying ::1... + * TCP_NODELAY set + * Trying 127.0.0.1... + * TCP_NODELAY set + * Connected to localhost (127.0.0.1) port 8080 (#0) + > GET /service/1 HTTP/1.1 + > Host: localhost:8080 + > User-Agent: curl/7.55.1 + > Accept: */* + > + < HTTP/1.1 200 OK + < content-type: text/html; charset=utf-8 + < content-length: 91 + < server: envoy + < date: Wed, 05 May 2021 05:58:43 GMT + < x-envoy-upstream-service-time: 11 + < + Hello from behind Envoy (service 1)! hostname: 41e1141eebf4 resolvedhostname: 172.30.96.11 + * Connection #0 to host localhost left intact + PS> curl -v localhost:8080/service/1 + * Trying ::1... + * TCP_NODELAY set + * Trying 127.0.0.1... + * TCP_NODELAY set + * Connected to localhost (127.0.0.1) port 8080 (#0) + > GET /service/1 HTTP/1.1 + > Host: localhost:8080 + > User-Agent: curl/7.55.1 + > Accept: */* + > + < HTTP/1.1 200 OK + < content-type: text/html; charset=utf-8 + < content-length: 92 + < server: envoy + < date: Wed, 05 May 2021 05:58:44 GMT + < x-envoy-upstream-service-time: 7 + < + Hello from behind Envoy (service 1)! hostname: 8a45bba91d83 resolvedhostname: 172.30.97.237 + * Connection #0 to host localhost left intact + +Step 4: Enter containers and curl services +****************************************** + +In addition of using ``curl`` from your host machine, you can also enter the +containers themselves and ``curl`` from inside them. To enter a container you +can use ``docker-compose exec /bin/bash``. For example we can +enter the ``front-envoy`` container, and ``curl`` for services locally: + +.. code-block:: console + + PS> docker-compose exec front-envoy powershell + PS C:\> (curl -UseBasicParsing http://localhost:8080/service/1).Content + Hello from behind Envoy (service 1)! hostname: 41e1141eebf4 resolvedhostname: 172.30.96.11 + + PS C:\> (curl -UseBasicParsing http://localhost:8080/service/1).Content + Hello from behind Envoy (service 1)! hostname: 8a45bba91d83 resolvedhostname: 172.30.97.237 + + PS C:\> (curl -UseBasicParsing http://localhost:8080/service/1).Content + Hello from behind Envoy (service 1)! hostname: 8d2359ee21a8 resolvedhostname: 172.30.101.143 + + +Step 5: Enter container and curl admin interface +************************************************ + +When Envoy runs it also attaches an ``admin`` to your desired port. + +In the example configs the admin listener is bound to port ``8001``. + +We can ``curl`` it to gain useful information: + +- :ref:`/server_info ` provides information about the Envoy version you are running. +- :ref:`/stats ` provides statistics about the Envoy server. + +In the example we can enter the ``front-envoy`` container to query admin: + +.. code-block:: console + + PS> docker-compose exec front-envoy powershell + PS C:\> (curl http://localhost:8003/server_info -UseBasicParsing).Content + +.. code-block:: json + + { + "version": "093e2ffe046313242144d0431f1bb5cf18d82544/1.15.0-dev/Clean/RELEASE/BoringSSL", + "state": "LIVE", + "hot_restart_version": "11.104", + "command_line_options": { + "base_id": "0", + "use_dynamic_base_id": false, + "base_id_path": "", + "concurrency": 8, + "config_path": "/etc/front-envoy.yaml", + "config_yaml": "", + "allow_unknown_static_fields": false, + "reject_unknown_dynamic_fields": false, + "ignore_unknown_dynamic_fields": false, + "admin_address_path": "", + "local_address_ip_version": "v4", + "log_level": "info", + "component_log_level": "", + "log_format": "[%Y-%m-%d %T.%e][%t][%l][%n] [%g:%#] %v", + "log_format_escaped": false, + "log_path": "", + "service_cluster": "front-proxy", + "service_node": "", + "service_zone": "", + "drain_strategy": "Gradual", + "mode": "Serve", + "disable_hot_restart": false, + "enable_mutex_tracing": false, + "restart_epoch": 0, + "cpuset_threads": false, + "disabled_extensions": [], + "bootstrap_version": 0, + "hidden_envoy_deprecated_max_stats": "0", + "hidden_envoy_deprecated_max_obj_name_len": "0", + "file_flush_interval": "10s", + "drain_time": "600s", + "parent_shutdown_time": "900s" + }, + "uptime_current_epoch": "188s", + "uptime_all_epochs": "188s" + } + +.. code-block:: console + + PS C:\> (curl http://localhost:8003/stats -UseBasicParsing).Content + cluster.service1.external.upstream_rq_200: 7 + ... + cluster.service1.membership_change: 2 + cluster.service1.membership_total: 3 + ... + cluster.service1.upstream_cx_http2_total: 3 + ... + cluster.service1.upstream_rq_total: 7 + ... + cluster.service2.external.upstream_rq_200: 2 + ... + cluster.service2.membership_change: 1 + cluster.service2.membership_total: 1 + ... + cluster.service2.upstream_cx_http2_total: 1 + ... + cluster.service2.upstream_rq_total: 2 + ... + +Notice that we can get the number of members of upstream clusters, number of requests fulfilled by +them, information about http ingress, and a plethora of other useful stats. + +.. seealso:: + + :ref:`Envoy admin quick start guide ` + Quick start guide to the Envoy admin interface. diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst index cd8c4a7258bc4..3e88b63f3c90b 100644 --- a/docs/root/version_history/current.rst +++ b/docs/root/version_history/current.rst @@ -14,6 +14,7 @@ Minor Behavior Changes *Changes that may cause incompatibilities for some users, but should not for most* * access_log: add new access_log command operator ``%REQUEST_TX_DURATION%``. +* access_log: remove extra quotes on metadata string values. This behavior can be temporarily reverted by setting ``envoy.reloadable_features.unquote_log_string_values`` to false. * aws_request_signing: requests are now buffered by default to compute signatures which include the payload hash, making the filter compatible with most AWS services. Previously, requests were never buffered, which only produced correct signatures for requests without a body, or for @@ -68,8 +69,13 @@ New Features ------------ * bandwidth_limit: added new :ref:`HTTP bandwidth limit filter `. +* bootstrap: added :ref:`dns_resolution_config ` to aggregate all of the DNS resolver configuration in a single message. By setting one such configuration option *no_default_search_domain* as true the DNS resolver will not use the default search domains. And by setting the configuration *resolvers* we can specify the external DNS servers to be used for external DNS query. +* cluster: added :ref:`dns_resolution_config ` to aggregate all of the DNS resolver configuration in a single message. By setting one such configuration option *no_default_search_domain* as true the DNS resolver will not use the default search domains. * crash support: restore crash context when continuing to processing requests or responses as a result of an asynchronous callback that invokes a filter directly. This is unlike the call stacks that go through the various network layers, to eventually reach the filter. For a concrete example see: ``Envoy::Extensions::HttpFilters::Cache::CacheFilter::getHeaders`` which posts a callback on the dispatcher that will invoke the filter directly. -* dynamic_forward_proxy: added :ref:`dns_resolver` option to the DNS cache config in order use custom DNS resolvers instead of the system default resolvers. +* dns resolver: added *DnsResolverOptions* protobuf message to reconcile all of the DNS lookup option flags. By setting the configuration option :ref:`use_tcp_for_dns_lookups ` as true we can make the underlying dns resolver library to make only TCP queries to the DNS servers and by setting the configuration option :ref:`no_default_search_domain ` as true the DNS resolver library will not use the default search domains. +* dns resolver: added *DnsResolutionConfig* to combine :ref:`dns_resolver_options ` and :ref:`resolvers ` in a single protobuf message. The field *resolvers* can be specified with a list of DNS resolver addresses. If specified, DNS client library will perform resolution via the underlying DNS resolvers. Otherwise, the default system resolvers (e.g., /etc/resolv.conf) will be used. +* dns_filter: added :ref:`dns_resolution_config ` to aggregate all of the DNS resolver configuration in a single message. By setting the configuration option *use_tcp_for_dns_lookups* to true we can make dns filter's external resolvers to answer queries using TCP only, by setting the configuration option *no_default_search_domain* as true the DNS resolver will not use the default search domains. And by setting the configuration *resolvers* we can specify the external DNS servers to be used for external DNS query which replaces the pre-existing alpha api field *upstream_resolvers*. +* dynamic_forward_proxy: added :ref:`dns_resolution_config ` option to the DNS cache config in order to aggregate all of the DNS resolver configuration in a single message. By setting one such configuration option *no_default_search_domain* as true the DNS resolver will not use the default search domains. And by setting the configuration *resolvers* we can specify the external DNS servers to be used for external DNS query instead of the system default resolvers. * http: a new field `is_optional` is added to `extensions.filters.network.http_connection_manager.v3.HttpFilter`. When value is `true`, the unsupported http filter will be ignored by envoy. This is also same with unsupported http filter in the typed per filter config. For more information, please reference @@ -94,4 +100,7 @@ New Features Deprecated ---------- +* bootstrap: the field :ref:`use_tcp_for_dns_lookups ` is deprecated in favor of :ref:`dns_resolution_config ` which aggregates all of the DNS resolver configuration in a single message. +* cluster: the fields :ref:`use_tcp_for_dns_lookups ` and :ref:`dns_resolvers ` are deprecated in favor of :ref:`dns_resolution_config ` which aggregates all of the DNS resolver configuration in a single message. +* dynamic_forward_proxy: the field :ref:`use_tcp_for_dns_lookups ` is deprecated in favor of :ref:`dns_resolution_config ` which aggregates all of the DNS resolver configuration in a single message. * http: :ref:`xff_num_trusted_hops ` is deprecated in favor of :ref:`original IP detection extensions`. diff --git a/include/envoy/access_log/BUILD b/envoy/access_log/BUILD similarity index 55% rename from include/envoy/access_log/BUILD rename to envoy/access_log/BUILD index 6bf20375270a9..c9578cb50311d 100644 --- a/include/envoy/access_log/BUILD +++ b/envoy/access_log/BUILD @@ -12,10 +12,10 @@ envoy_cc_library( name = "access_log_interface", hdrs = ["access_log.h"], deps = [ - "//include/envoy/config:typed_config_interface", - "//include/envoy/filesystem:filesystem_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/config:typed_config_interface", + "//envoy/filesystem:filesystem_interface", + "//envoy/http:header_map_interface", + "//envoy/stream_info:stream_info_interface", "//source/common/protobuf", ], ) diff --git a/include/envoy/access_log/access_log.h b/envoy/access_log/access_log.h similarity index 98% rename from include/envoy/access_log/access_log.h rename to envoy/access_log/access_log.h index 23a4bb0631864..5c8d952877d43 100644 --- a/include/envoy/access_log/access_log.h +++ b/envoy/access_log/access_log.h @@ -8,7 +8,7 @@ #include "envoy/http/header_map.h" #include "envoy/stream_info/stream_info.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace AccessLog { diff --git a/include/envoy/api/BUILD b/envoy/api/BUILD similarity index 59% rename from include/envoy/api/BUILD rename to envoy/api/BUILD index 36736838c6d80..55e267505ee54 100644 --- a/include/envoy/api/BUILD +++ b/envoy/api/BUILD @@ -12,12 +12,12 @@ envoy_cc_library( name = "api_interface", hdrs = ["api.h"], deps = [ - "//include/envoy/common:random_generator_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:scaled_range_timer_manager_interface", - "//include/envoy/filesystem:filesystem_interface", - "//include/envoy/server:process_context_interface", - "//include/envoy/thread:thread_interface", + "//envoy/common:random_generator_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:scaled_range_timer_manager_interface", + "//envoy/filesystem:filesystem_interface", + "//envoy/server:process_context_interface", + "//envoy/thread:thread_interface", ], ) diff --git a/include/envoy/api/api.h b/envoy/api/api.h similarity index 100% rename from include/envoy/api/api.h rename to envoy/api/api.h diff --git a/include/envoy/api/io_error.h b/envoy/api/io_error.h similarity index 100% rename from include/envoy/api/io_error.h rename to envoy/api/io_error.h diff --git a/include/envoy/api/os_sys_calls.h b/envoy/api/os_sys_calls.h similarity index 100% rename from include/envoy/api/os_sys_calls.h rename to envoy/api/os_sys_calls.h diff --git a/include/envoy/api/os_sys_calls_common.h b/envoy/api/os_sys_calls_common.h similarity index 100% rename from include/envoy/api/os_sys_calls_common.h rename to envoy/api/os_sys_calls_common.h diff --git a/include/envoy/api/os_sys_calls_hot_restart.h b/envoy/api/os_sys_calls_hot_restart.h similarity index 100% rename from include/envoy/api/os_sys_calls_hot_restart.h rename to envoy/api/os_sys_calls_hot_restart.h diff --git a/include/envoy/api/os_sys_calls_linux.h b/envoy/api/os_sys_calls_linux.h similarity index 100% rename from include/envoy/api/os_sys_calls_linux.h rename to envoy/api/os_sys_calls_linux.h diff --git a/include/envoy/buffer/BUILD b/envoy/buffer/BUILD similarity index 89% rename from include/envoy/buffer/BUILD rename to envoy/buffer/BUILD index 9367bedb85ecb..3b9157d06f5fd 100644 --- a/include/envoy/buffer/BUILD +++ b/envoy/buffer/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( "abseil_inlined_vector", ], deps = [ - "//include/envoy/api:os_sys_calls_interface", + "//envoy/api:os_sys_calls_interface", "//source/common/common:assert_lib", "//source/common/common:byte_order_lib", "//source/common/common:utility_lib", diff --git a/include/envoy/buffer/buffer.h b/envoy/buffer/buffer.h similarity index 99% rename from include/envoy/buffer/buffer.h rename to envoy/buffer/buffer.h index 2ac7674e37668..a4029715e6c7b 100644 --- a/include/envoy/buffer/buffer.h +++ b/envoy/buffer/buffer.h @@ -10,9 +10,9 @@ #include "envoy/common/platform.h" #include "envoy/common/pure.h" -#include "common/common/assert.h" -#include "common/common/byte_order.h" -#include "common/common/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/byte_order.h" +#include "source/common/common/utility.h" #include "absl/container/inlined_vector.h" #include "absl/strings/string_view.h" diff --git a/include/envoy/common/BUILD b/envoy/common/BUILD similarity index 91% rename from include/envoy/common/BUILD rename to envoy/common/BUILD index f831dcd62708b..d7e0130cf1f13 100644 --- a/include/envoy/common/BUILD +++ b/envoy/common/BUILD @@ -18,15 +18,14 @@ envoy_basic_cc_library( "pure.h", ], external_deps = ["abseil_optional"], - include_prefix = "envoy/common", ) envoy_cc_library( name = "conn_pool_interface", hdrs = ["conn_pool.h"], deps = [ - "//include/envoy/event:deferred_deletable", - "//include/envoy/upstream:upstream_interface", + "//envoy/event:deferred_deletable", + "//envoy/upstream:upstream_interface", ], ) diff --git a/include/envoy/common/backoff_strategy.h b/envoy/common/backoff_strategy.h similarity index 100% rename from include/envoy/common/backoff_strategy.h rename to envoy/common/backoff_strategy.h diff --git a/include/envoy/common/callback.h b/envoy/common/callback.h similarity index 100% rename from include/envoy/common/callback.h rename to envoy/common/callback.h diff --git a/include/envoy/common/conn_pool.h b/envoy/common/conn_pool.h similarity index 100% rename from include/envoy/common/conn_pool.h rename to envoy/common/conn_pool.h diff --git a/include/envoy/common/crypto/BUILD b/envoy/common/crypto/BUILD similarity index 100% rename from include/envoy/common/crypto/BUILD rename to envoy/common/crypto/BUILD diff --git a/include/envoy/common/crypto/crypto.h b/envoy/common/crypto/crypto.h similarity index 100% rename from include/envoy/common/crypto/crypto.h rename to envoy/common/crypto/crypto.h diff --git a/include/envoy/common/exception.h b/envoy/common/exception.h similarity index 100% rename from include/envoy/common/exception.h rename to envoy/common/exception.h diff --git a/include/envoy/common/interval_set.h b/envoy/common/interval_set.h similarity index 100% rename from include/envoy/common/interval_set.h rename to envoy/common/interval_set.h diff --git a/include/envoy/common/matchers.h b/envoy/common/matchers.h similarity index 100% rename from include/envoy/common/matchers.h rename to envoy/common/matchers.h diff --git a/include/envoy/common/mutex_tracer.h b/envoy/common/mutex_tracer.h similarity index 100% rename from include/envoy/common/mutex_tracer.h rename to envoy/common/mutex_tracer.h diff --git a/include/envoy/common/optref.h b/envoy/common/optref.h similarity index 100% rename from include/envoy/common/optref.h rename to envoy/common/optref.h diff --git a/include/envoy/common/platform.h b/envoy/common/platform.h similarity index 100% rename from include/envoy/common/platform.h rename to envoy/common/platform.h diff --git a/include/envoy/common/pure.h b/envoy/common/pure.h similarity index 100% rename from include/envoy/common/pure.h rename to envoy/common/pure.h diff --git a/include/envoy/common/random_generator.h b/envoy/common/random_generator.h similarity index 97% rename from include/envoy/common/random_generator.h rename to envoy/common/random_generator.h index ed4c079d2fb03..b0e4257bcb169 100644 --- a/include/envoy/common/random_generator.h +++ b/envoy/common/random_generator.h @@ -6,7 +6,7 @@ #include "envoy/common/pure.h" -#include "common/common/interval_value.h" +#include "source/common/common/interval_value.h" namespace Envoy { namespace Random { diff --git a/include/envoy/common/regex.h b/envoy/common/regex.h similarity index 100% rename from include/envoy/common/regex.h rename to envoy/common/regex.h diff --git a/include/envoy/common/resource.h b/envoy/common/resource.h similarity index 100% rename from include/envoy/common/resource.h rename to envoy/common/resource.h diff --git a/include/envoy/common/scope_tracker.h b/envoy/common/scope_tracker.h similarity index 100% rename from include/envoy/common/scope_tracker.h rename to envoy/common/scope_tracker.h diff --git a/include/envoy/common/time.h b/envoy/common/time.h similarity index 100% rename from include/envoy/common/time.h rename to envoy/common/time.h diff --git a/include/envoy/common/token_bucket.h b/envoy/common/token_bucket.h similarity index 100% rename from include/envoy/common/token_bucket.h rename to envoy/common/token_bucket.h diff --git a/include/envoy/compression/compressor/BUILD b/envoy/compression/compressor/BUILD similarity index 76% rename from include/envoy/compression/compressor/BUILD rename to envoy/compression/compressor/BUILD index 6632229aaed46..7b767df2e1894 100644 --- a/include/envoy/compression/compressor/BUILD +++ b/envoy/compression/compressor/BUILD @@ -12,7 +12,7 @@ envoy_cc_library( name = "compressor_interface", hdrs = ["compressor.h"], deps = [ - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", ], ) @@ -29,7 +29,7 @@ envoy_cc_library( hdrs = ["config.h"], deps = [ ":compressor_factory_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/config:typed_config_interface", + "//envoy/server:filter_config_interface", ], ) diff --git a/include/envoy/compression/compressor/compressor.h b/envoy/compression/compressor/compressor.h similarity index 100% rename from include/envoy/compression/compressor/compressor.h rename to envoy/compression/compressor/compressor.h diff --git a/include/envoy/compression/compressor/config.h b/envoy/compression/compressor/config.h similarity index 100% rename from include/envoy/compression/compressor/config.h rename to envoy/compression/compressor/config.h diff --git a/include/envoy/compression/compressor/factory.h b/envoy/compression/compressor/factory.h similarity index 100% rename from include/envoy/compression/compressor/factory.h rename to envoy/compression/compressor/factory.h diff --git a/include/envoy/compression/decompressor/BUILD b/envoy/compression/decompressor/BUILD similarity index 76% rename from include/envoy/compression/decompressor/BUILD rename to envoy/compression/decompressor/BUILD index 156d81d52356f..f3c32382d59a9 100644 --- a/include/envoy/compression/decompressor/BUILD +++ b/envoy/compression/decompressor/BUILD @@ -13,8 +13,8 @@ envoy_cc_library( hdrs = ["config.h"], deps = [ ":decompressor_factory_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/config:typed_config_interface", + "//envoy/server:filter_config_interface", ], ) @@ -30,6 +30,6 @@ envoy_cc_library( name = "decompressor_interface", hdrs = ["decompressor.h"], deps = [ - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", ], ) diff --git a/include/envoy/compression/decompressor/config.h b/envoy/compression/decompressor/config.h similarity index 100% rename from include/envoy/compression/decompressor/config.h rename to envoy/compression/decompressor/config.h diff --git a/include/envoy/compression/decompressor/decompressor.h b/envoy/compression/decompressor/decompressor.h similarity index 100% rename from include/envoy/compression/decompressor/decompressor.h rename to envoy/compression/decompressor/decompressor.h diff --git a/include/envoy/compression/decompressor/factory.h b/envoy/compression/decompressor/factory.h similarity index 100% rename from include/envoy/compression/decompressor/factory.h rename to envoy/compression/decompressor/factory.h diff --git a/include/envoy/config/BUILD b/envoy/config/BUILD similarity index 89% rename from include/envoy/config/BUILD rename to envoy/config/BUILD index e01486c8d0f09..cb8b6a9ce6cf1 100644 --- a/include/envoy/config/BUILD +++ b/envoy/config/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( hdrs = ["config_provider.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/common:time_interface", + "//envoy/common:time_interface", "//source/common/common:assert_lib", "//source/common/protobuf", ], @@ -24,7 +24,7 @@ envoy_cc_library( hdrs = ["config_provider_manager.h"], deps = [ ":config_provider_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/server:filter_config_interface", "//source/common/protobuf", ], ) @@ -33,7 +33,7 @@ envoy_cc_library( name = "context_provider_interface", hdrs = ["context_provider.h"], deps = [ - "//include/envoy/common:callback", + "//envoy/common:callback", "@com_github_cncf_udpa//xds/core/v3:pkg_cc_proto", ], ) @@ -49,7 +49,7 @@ envoy_cc_library( hdrs = ["grpc_mux.h"], deps = [ ":subscription_interface", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_macros", "//source/common/common:cleanup_lib", "//source/common/protobuf", ], @@ -69,7 +69,7 @@ envoy_cc_library( name = "subscription_interface", hdrs = ["subscription.h"], deps = [ - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_macros", "//source/common/config:api_type_oracle_lib", "//source/common/protobuf", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", diff --git a/include/envoy/config/config_provider.h b/envoy/config/config_provider.h similarity index 98% rename from include/envoy/config/config_provider.h rename to envoy/config/config_provider.h index dbc5b579c626a..bda6cc5871c20 100644 --- a/include/envoy/config/config_provider.h +++ b/envoy/config/config_provider.h @@ -4,8 +4,8 @@ #include "envoy/common/time.h" -#include "common/common/assert.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/assert.h" +#include "source/common/protobuf/protobuf.h" #include "absl/types/optional.h" diff --git a/include/envoy/config/config_provider_manager.h b/envoy/config/config_provider_manager.h similarity index 98% rename from include/envoy/config/config_provider_manager.h rename to envoy/config/config_provider_manager.h index eaf6d4d0ec114..fbb98c14605cb 100644 --- a/include/envoy/config/config_provider_manager.h +++ b/envoy/config/config_provider_manager.h @@ -5,7 +5,7 @@ #include "envoy/config/config_provider.h" #include "envoy/server/filter_config.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Config { diff --git a/include/envoy/config/context_provider.h b/envoy/config/context_provider.h similarity index 100% rename from include/envoy/config/context_provider.h rename to envoy/config/context_provider.h diff --git a/include/envoy/config/extension_config_provider.h b/envoy/config/extension_config_provider.h similarity index 97% rename from include/envoy/config/extension_config_provider.h rename to envoy/config/extension_config_provider.h index 182670f523dbb..6524f10270881 100644 --- a/include/envoy/config/extension_config_provider.h +++ b/envoy/config/extension_config_provider.h @@ -2,7 +2,7 @@ #include "envoy/common/pure.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "absl/types/optional.h" diff --git a/include/envoy/config/grpc_mux.h b/envoy/config/grpc_mux.h similarity index 98% rename from include/envoy/config/grpc_mux.h rename to envoy/config/grpc_mux.h index 57befc93e01ca..0139cb3d95243 100644 --- a/include/envoy/config/grpc_mux.h +++ b/envoy/config/grpc_mux.h @@ -7,8 +7,8 @@ #include "envoy/config/subscription.h" #include "envoy/stats/stats_macros.h" -#include "common/common/cleanup.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/cleanup.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Config { diff --git a/include/envoy/config/subscription.h b/envoy/config/subscription.h similarity index 99% rename from include/envoy/config/subscription.h rename to envoy/config/subscription.h index 22385e6eb4877..8f7ba87c20365 100644 --- a/include/envoy/config/subscription.h +++ b/envoy/config/subscription.h @@ -8,7 +8,7 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/stats_macros.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Config { diff --git a/include/envoy/config/subscription_factory.h b/envoy/config/subscription_factory.h similarity index 100% rename from include/envoy/config/subscription_factory.h rename to envoy/config/subscription_factory.h diff --git a/include/envoy/config/typed_config.h b/envoy/config/typed_config.h similarity index 94% rename from include/envoy/config/typed_config.h rename to envoy/config/typed_config.h index 49cc2c1f3416c..e75a841d26e74 100644 --- a/include/envoy/config/typed_config.h +++ b/envoy/config/typed_config.h @@ -2,8 +2,8 @@ #include "envoy/common/pure.h" -#include "common/common/assert.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/assert.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Config { diff --git a/include/envoy/config/typed_metadata.h b/envoy/config/typed_metadata.h similarity index 98% rename from include/envoy/config/typed_metadata.h rename to envoy/config/typed_metadata.h index 9406e6a99baa8..059c563c782e9 100644 --- a/include/envoy/config/typed_metadata.h +++ b/envoy/config/typed_metadata.h @@ -6,7 +6,7 @@ #include "envoy/common/pure.h" #include "envoy/config/typed_config.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Config { diff --git a/include/envoy/event/BUILD b/envoy/event/BUILD similarity index 68% rename from include/envoy/event/BUILD rename to envoy/event/BUILD index acc8770007d00..ec7695f542820 100644 --- a/include/envoy/event/BUILD +++ b/envoy/event/BUILD @@ -29,17 +29,17 @@ envoy_cc_library( ":schedulable_cb_interface", ":signal_interface", ":timer_interface", - "//include/envoy/common:scope_tracker_interface", - "//include/envoy/common:time_interface", - "//include/envoy/filesystem:watcher_interface", - "//include/envoy/network:connection_handler_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:dns_interface", - "//include/envoy/network:listen_socket_interface", - "//include/envoy/network:listener_interface", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/server:watchdog_interface", - "//include/envoy/thread:thread_interface", + "//envoy/common:scope_tracker_interface", + "//envoy/common:time_interface", + "//envoy/filesystem:watcher_interface", + "//envoy/network:connection_handler_interface", + "//envoy/network:connection_interface", + "//envoy/network:dns_interface", + "//envoy/network:listen_socket_interface", + "//envoy/network:listener_interface", + "//envoy/network:transport_socket_interface", + "//envoy/server:watchdog_interface", + "//envoy/thread:thread_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -81,6 +81,6 @@ envoy_cc_library( hdrs = ["timer.h"], deps = [ ":schedulable_cb_interface", - "//include/envoy/common:time_interface", + "//envoy/common:time_interface", ], ) diff --git a/include/envoy/event/deferred_deletable.h b/envoy/event/deferred_deletable.h similarity index 100% rename from include/envoy/event/deferred_deletable.h rename to envoy/event/deferred_deletable.h diff --git a/include/envoy/event/dispatcher.h b/envoy/event/dispatcher.h similarity index 98% rename from include/envoy/event/dispatcher.h rename to envoy/event/dispatcher.h index 1618c9236d178..867fd651234a2 100644 --- a/include/envoy/event/dispatcher.h +++ b/envoy/event/dispatcher.h @@ -8,6 +8,7 @@ #include "envoy/common/scope_tracker.h" #include "envoy/common/time.h" +#include "envoy/config/core/v3/resolver.pb.h" #include "envoy/config/core/v3/udp_socket_config.pb.h" #include "envoy/event/dispatcher_thread_deletable.h" #include "envoy/event/file_event.h" @@ -208,13 +209,13 @@ class Dispatcher : public DispatcherBase { * dispatcher. * @param resolvers supplies the addresses of DNS resolvers that this resolver should use. If left * empty, it will not use any specific resolvers, but use defaults (/etc/resolv.conf) - * @param use_tcp_for_dns_lookups if set to true, tcp will be used to perform dns lookups. - * Otherwise, udp is used. + * @param dns_resolver_options supplies the aggregated area options flags needed for dns resolver + * init. * @return Network::DnsResolverSharedPtr that is owned by the caller. */ virtual Network::DnsResolverSharedPtr createDnsResolver(const std::vector& resolvers, - bool use_tcp_for_dns_lookups) PURE; + const envoy::config::core::v3::DnsResolverOptions& dns_resolver_options) PURE; /** * @return Filesystem::WatcherPtr a filesystem watcher owned by the caller. diff --git a/include/envoy/event/dispatcher_thread_deletable.h b/envoy/event/dispatcher_thread_deletable.h similarity index 100% rename from include/envoy/event/dispatcher_thread_deletable.h rename to envoy/event/dispatcher_thread_deletable.h diff --git a/include/envoy/event/file_event.h b/envoy/event/file_event.h similarity index 100% rename from include/envoy/event/file_event.h rename to envoy/event/file_event.h diff --git a/include/envoy/event/scaled_range_timer_manager.h b/envoy/event/scaled_range_timer_manager.h similarity index 97% rename from include/envoy/event/scaled_range_timer_manager.h rename to envoy/event/scaled_range_timer_manager.h index 8b91ec5758fce..d7e86dc542d93 100644 --- a/include/envoy/event/scaled_range_timer_manager.h +++ b/envoy/event/scaled_range_timer_manager.h @@ -4,7 +4,7 @@ #include "envoy/event/scaled_timer.h" #include "envoy/event/timer.h" -#include "common/common/interval_value.h" +#include "source/common/common/interval_value.h" #include "absl/types/variant.h" diff --git a/include/envoy/event/scaled_timer.h b/envoy/event/scaled_timer.h similarity index 98% rename from include/envoy/event/scaled_timer.h rename to envoy/event/scaled_timer.h index 0d05c79614260..bfc06b87973ed 100644 --- a/include/envoy/event/scaled_timer.h +++ b/envoy/event/scaled_timer.h @@ -3,7 +3,7 @@ #include #include -#include "common/common/interval_value.h" +#include "source/common/common/interval_value.h" #include "absl/container/flat_hash_map.h" #include "absl/types/variant.h" diff --git a/include/envoy/event/schedulable_cb.h b/envoy/event/schedulable_cb.h similarity index 100% rename from include/envoy/event/schedulable_cb.h rename to envoy/event/schedulable_cb.h diff --git a/include/envoy/event/signal.h b/envoy/event/signal.h similarity index 100% rename from include/envoy/event/signal.h rename to envoy/event/signal.h diff --git a/include/envoy/event/timer.h b/envoy/event/timer.h similarity index 100% rename from include/envoy/event/timer.h rename to envoy/event/timer.h diff --git a/include/envoy/filesystem/BUILD b/envoy/filesystem/BUILD similarity index 75% rename from include/envoy/filesystem/BUILD rename to envoy/filesystem/BUILD index 94d5405b122b9..e4349eba0d179 100644 --- a/include/envoy/filesystem/BUILD +++ b/envoy/filesystem/BUILD @@ -12,8 +12,8 @@ envoy_cc_library( name = "filesystem_interface", hdrs = ["filesystem.h"], deps = [ - "//include/envoy/api:io_error_interface", - "//include/envoy/api:os_sys_calls_interface", + "//envoy/api:io_error_interface", + "//envoy/api:os_sys_calls_interface", ], ) diff --git a/include/envoy/filesystem/filesystem.h b/envoy/filesystem/filesystem.h similarity index 100% rename from include/envoy/filesystem/filesystem.h rename to envoy/filesystem/filesystem.h diff --git a/include/envoy/filesystem/watcher.h b/envoy/filesystem/watcher.h similarity index 100% rename from include/envoy/filesystem/watcher.h rename to envoy/filesystem/watcher.h diff --git a/include/envoy/filter/http/BUILD b/envoy/filter/http/BUILD similarity index 59% rename from include/envoy/filter/http/BUILD rename to envoy/filter/http/BUILD index 5a76c4ba7b9dc..887967fd5e8c4 100644 --- a/include/envoy/filter/http/BUILD +++ b/envoy/filter/http/BUILD @@ -12,10 +12,10 @@ envoy_cc_library( name = "filter_config_provider_interface", hdrs = ["filter_config_provider.h"], deps = [ - "//include/envoy/config:extension_config_provider_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/init:manager_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/config:extension_config_provider_interface", + "//envoy/http:filter_interface", + "//envoy/init:manager_interface", + "//envoy/server:filter_config_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) diff --git a/include/envoy/filter/http/filter_config_provider.h b/envoy/filter/http/filter_config_provider.h similarity index 100% rename from include/envoy/filter/http/filter_config_provider.h rename to envoy/filter/http/filter_config_provider.h diff --git a/include/envoy/formatter/BUILD b/envoy/formatter/BUILD similarity index 61% rename from include/envoy/formatter/BUILD rename to envoy/formatter/BUILD index df87c4cbac10b..f630c6607644c 100644 --- a/include/envoy/formatter/BUILD +++ b/envoy/formatter/BUILD @@ -12,8 +12,8 @@ envoy_cc_library( name = "substitution_formatter_interface", hdrs = ["substitution_formatter.h"], deps = [ - "//include/envoy/config:typed_config_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/config:typed_config_interface", + "//envoy/http:header_map_interface", + "//envoy/stream_info:stream_info_interface", ], ) diff --git a/include/envoy/formatter/substitution_formatter.h b/envoy/formatter/substitution_formatter.h similarity index 100% rename from include/envoy/formatter/substitution_formatter.h rename to envoy/formatter/substitution_formatter.h diff --git a/include/envoy/grpc/BUILD b/envoy/grpc/BUILD similarity index 67% rename from include/envoy/grpc/BUILD rename to envoy/grpc/BUILD index 07d87ce33d193..0d782aee76e54 100644 --- a/include/envoy/grpc/BUILD +++ b/envoy/grpc/BUILD @@ -14,10 +14,10 @@ envoy_cc_library( external_deps = ["abseil_optional"], deps = [ ":status", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/http:async_client_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/tracing:http_tracer_interface", + "//envoy/buffer:buffer_interface", + "//envoy/http:async_client_interface", + "//envoy/http:header_map_interface", + "//envoy/tracing:http_tracer_interface", "//source/common/common:assert_lib", "//source/common/protobuf", ], @@ -28,7 +28,7 @@ envoy_cc_library( hdrs = ["async_client_manager.h"], deps = [ ":async_client_interface", - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -37,8 +37,8 @@ envoy_cc_library( name = "context_interface", hdrs = ["context.h"], deps = [ - "//include/envoy/http:context_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/http:context_interface", + "//envoy/upstream:upstream_interface", ], ) @@ -49,8 +49,8 @@ envoy_cc_library( "grpc", ], deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/config:typed_config_interface", + "//envoy/api:api_interface", + "//envoy/config:typed_config_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) diff --git a/include/envoy/grpc/async_client.h b/envoy/grpc/async_client.h similarity index 98% rename from include/envoy/grpc/async_client.h rename to envoy/grpc/async_client.h index bba3d106df00d..09caee17099f7 100644 --- a/include/envoy/grpc/async_client.h +++ b/envoy/grpc/async_client.h @@ -9,8 +9,8 @@ #include "envoy/http/header_map.h" #include "envoy/tracing/http_tracer.h" -#include "common/common/assert.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/assert.h" +#include "source/common/protobuf/protobuf.h" #include "absl/types/optional.h" diff --git a/include/envoy/grpc/async_client_manager.h b/envoy/grpc/async_client_manager.h similarity index 100% rename from include/envoy/grpc/async_client_manager.h rename to envoy/grpc/async_client_manager.h diff --git a/include/envoy/grpc/context.h b/envoy/grpc/context.h similarity index 100% rename from include/envoy/grpc/context.h rename to envoy/grpc/context.h diff --git a/include/envoy/grpc/google_grpc_creds.h b/envoy/grpc/google_grpc_creds.h similarity index 100% rename from include/envoy/grpc/google_grpc_creds.h rename to envoy/grpc/google_grpc_creds.h diff --git a/include/envoy/grpc/status.h b/envoy/grpc/status.h similarity index 100% rename from include/envoy/grpc/status.h rename to envoy/grpc/status.h diff --git a/include/envoy/http/BUILD b/envoy/http/BUILD similarity index 66% rename from include/envoy/http/BUILD rename to envoy/http/BUILD index de8f76446a1dd..dab2c3fab66c1 100644 --- a/include/envoy/http/BUILD +++ b/envoy/http/BUILD @@ -12,7 +12,7 @@ envoy_cc_library( name = "alternate_protocols_cache_interface", hdrs = ["alternate_protocols_cache.h"], deps = [ - "//include/envoy/common:time_interface", + "//envoy/common:time_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -29,8 +29,8 @@ envoy_cc_library( external_deps = ["abseil_optional"], deps = [ ":message_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/tracing:http_tracer_interface", + "//envoy/event:dispatcher_interface", + "//envoy/tracing:http_tracer_interface", "//source/common/protobuf", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", ], @@ -43,10 +43,10 @@ envoy_cc_library( ":header_map_interface", ":metadata_interface", ":protocol_interface", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/grpc:status", - "//include/envoy/network:address_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/buffer:buffer_interface", + "//envoy/grpc:status", + "//envoy/network:address_interface", + "//envoy/stream_info:stream_info_interface", "//source/common/http:status_lib", ], ) @@ -54,7 +54,7 @@ envoy_cc_library( envoy_cc_library( name = "codes_interface", hdrs = ["codes.h"], - deps = ["//include/envoy/stats:stats_interface"], + deps = ["//envoy/stats:stats_interface"], ) envoy_cc_library( @@ -62,9 +62,9 @@ envoy_cc_library( hdrs = ["conn_pool.h"], deps = [ ":codec_interface", - "//include/envoy/common:conn_pool_interface", - "//include/envoy/event:deferred_deletable", - "//include/envoy/upstream:upstream_interface", + "//envoy/common:conn_pool_interface", + "//envoy/event:deferred_deletable", + "//envoy/upstream:upstream_interface", ], ) @@ -84,15 +84,15 @@ envoy_cc_library( deps = [ ":codec_interface", ":header_map_interface", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/common:scope_tracker_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/grpc:status", - "//include/envoy/matcher:matcher_interface", - "//include/envoy/router:router_interface", - "//include/envoy/ssl:connection_interface", - "//include/envoy/stream_info:stream_info_interface", - "//include/envoy/tracing:http_tracer_interface", + "//envoy/access_log:access_log_interface", + "//envoy/common:scope_tracker_interface", + "//envoy/event:dispatcher_interface", + "//envoy/grpc:status", + "//envoy/matcher:matcher_interface", + "//envoy/router:router_interface", + "//envoy/ssl:connection_interface", + "//envoy/stream_info:stream_info_interface", + "//envoy/tracing:http_tracer_interface", "//source/common/common:scope_tracked_object_stack", ], ) @@ -102,8 +102,8 @@ envoy_cc_library( hdrs = ["hash_policy.h"], deps = [ ":header_map_interface", - "//include/envoy/network:address_interface", - "//include/envoy/stream_info:filter_state_interface", + "//envoy/network:address_interface", + "//envoy/stream_info:filter_state_interface", ], ) @@ -125,7 +125,7 @@ envoy_cc_library( hdrs = ["message.h"], deps = [ ":header_map_interface", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", ], ) @@ -150,7 +150,7 @@ envoy_cc_library( hdrs = ["request_id_extension.h"], deps = [ ":header_map_interface", - "//include/envoy/tracing:trace_reason_interface", + "//envoy/tracing:trace_reason_interface", ], ) @@ -158,7 +158,7 @@ envoy_cc_library( name = "header_formatter_interface", hdrs = ["header_formatter.h"], deps = [ - "//include/envoy/config:typed_config_interface", + "//envoy/config:typed_config_interface", ], ) @@ -168,8 +168,8 @@ envoy_cc_library( deps = [ ":codes_interface", ":header_map_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/network:address_interface", - "//include/envoy/server:factory_context_interface", + "//envoy/config:typed_config_interface", + "//envoy/network:address_interface", + "//envoy/server:factory_context_interface", ], ) diff --git a/include/envoy/http/alternate_protocols_cache.h b/envoy/http/alternate_protocols_cache.h similarity index 100% rename from include/envoy/http/alternate_protocols_cache.h rename to envoy/http/alternate_protocols_cache.h diff --git a/include/envoy/http/api_listener.h b/envoy/http/api_listener.h similarity index 100% rename from include/envoy/http/api_listener.h rename to envoy/http/api_listener.h diff --git a/include/envoy/http/async_client.h b/envoy/http/async_client.h similarity index 99% rename from include/envoy/http/async_client.h rename to envoy/http/async_client.h index b38eabc2d76c0..81058137ce6a3 100644 --- a/include/envoy/http/async_client.h +++ b/envoy/http/async_client.h @@ -9,7 +9,7 @@ #include "envoy/stream_info/stream_info.h" #include "envoy/tracing/http_tracer.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "absl/types/optional.h" diff --git a/include/envoy/http/codec.h b/envoy/http/codec.h similarity index 99% rename from include/envoy/http/codec.h rename to envoy/http/codec.h index 67b1bc95ce813..606fe1d5bde46 100644 --- a/include/envoy/http/codec.h +++ b/envoy/http/codec.h @@ -14,7 +14,7 @@ #include "envoy/network/address.h" #include "envoy/stream_info/stream_info.h" -#include "common/http/status.h" +#include "source/common/http/status.h" namespace Envoy { namespace Http { diff --git a/include/envoy/http/codes.h b/envoy/http/codes.h similarity index 100% rename from include/envoy/http/codes.h rename to envoy/http/codes.h diff --git a/include/envoy/http/conn_pool.h b/envoy/http/conn_pool.h similarity index 100% rename from include/envoy/http/conn_pool.h rename to envoy/http/conn_pool.h diff --git a/include/envoy/http/context.h b/envoy/http/context.h similarity index 100% rename from include/envoy/http/context.h rename to envoy/http/context.h diff --git a/include/envoy/http/filter.h b/envoy/http/filter.h similarity index 99% rename from include/envoy/http/filter.h rename to envoy/http/filter.h index 3d15d9735da19..e677c85e1b7de 100644 --- a/include/envoy/http/filter.h +++ b/envoy/http/filter.h @@ -18,7 +18,7 @@ #include "envoy/tracing/http_tracer.h" #include "envoy/upstream/upstream.h" -#include "common/common/scope_tracked_object_stack.h" +#include "source/common/common/scope_tracked_object_stack.h" #include "absl/types/optional.h" diff --git a/include/envoy/http/hash_policy.h b/envoy/http/hash_policy.h similarity index 100% rename from include/envoy/http/hash_policy.h rename to envoy/http/hash_policy.h diff --git a/include/envoy/http/header_formatter.h b/envoy/http/header_formatter.h similarity index 100% rename from include/envoy/http/header_formatter.h rename to envoy/http/header_formatter.h diff --git a/include/envoy/http/header_map.h b/envoy/http/header_map.h similarity index 99% rename from include/envoy/http/header_map.h rename to envoy/http/header_map.h index 2567a95b6935f..202f2e492f449 100644 --- a/include/envoy/http/header_map.h +++ b/envoy/http/header_map.h @@ -12,9 +12,9 @@ #include "envoy/common/pure.h" #include "envoy/http/header_formatter.h" -#include "common/common/assert.h" -#include "common/common/hash.h" -#include "common/common/macros.h" +#include "source/common/common/assert.h" +#include "source/common/common/hash.h" +#include "source/common/common/macros.h" #include "absl/container/inlined_vector.h" #include "absl/strings/string_view.h" diff --git a/include/envoy/http/message.h b/envoy/http/message.h similarity index 100% rename from include/envoy/http/message.h rename to envoy/http/message.h diff --git a/include/envoy/http/metadata_interface.h b/envoy/http/metadata_interface.h similarity index 100% rename from include/envoy/http/metadata_interface.h rename to envoy/http/metadata_interface.h diff --git a/include/envoy/http/original_ip_detection.h b/envoy/http/original_ip_detection.h similarity index 100% rename from include/envoy/http/original_ip_detection.h rename to envoy/http/original_ip_detection.h diff --git a/include/envoy/http/protocol.h b/envoy/http/protocol.h similarity index 100% rename from include/envoy/http/protocol.h rename to envoy/http/protocol.h diff --git a/include/envoy/http/query_params.h b/envoy/http/query_params.h similarity index 100% rename from include/envoy/http/query_params.h rename to envoy/http/query_params.h diff --git a/include/envoy/http/request_id_extension.h b/envoy/http/request_id_extension.h similarity index 100% rename from include/envoy/http/request_id_extension.h rename to envoy/http/request_id_extension.h diff --git a/include/envoy/init/BUILD b/envoy/init/BUILD similarity index 100% rename from include/envoy/init/BUILD rename to envoy/init/BUILD diff --git a/include/envoy/init/manager.h b/envoy/init/manager.h similarity index 100% rename from include/envoy/init/manager.h rename to envoy/init/manager.h diff --git a/include/envoy/init/target.h b/envoy/init/target.h similarity index 100% rename from include/envoy/init/target.h rename to envoy/init/target.h diff --git a/include/envoy/init/watcher.h b/envoy/init/watcher.h similarity index 100% rename from include/envoy/init/watcher.h rename to envoy/init/watcher.h diff --git a/include/envoy/json/BUILD b/envoy/json/BUILD similarity index 100% rename from include/envoy/json/BUILD rename to envoy/json/BUILD diff --git a/include/envoy/json/json_object.h b/envoy/json/json_object.h similarity index 100% rename from include/envoy/json/json_object.h rename to envoy/json/json_object.h diff --git a/include/envoy/local_info/BUILD b/envoy/local_info/BUILD similarity index 64% rename from include/envoy/local_info/BUILD rename to envoy/local_info/BUILD index 20cf5b66d0bbe..31ee44aa746ed 100644 --- a/include/envoy/local_info/BUILD +++ b/envoy/local_info/BUILD @@ -12,9 +12,9 @@ envoy_cc_library( name = "local_info_interface", hdrs = ["local_info.h"], deps = [ - "//include/envoy/config:context_provider_interface", - "//include/envoy/network:address_interface", - "//include/envoy/stats:symbol_table_interface", + "//envoy/config:context_provider_interface", + "//envoy/network:address_interface", + "//envoy/stats:symbol_table_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) diff --git a/include/envoy/local_info/local_info.h b/envoy/local_info/local_info.h similarity index 100% rename from include/envoy/local_info/local_info.h rename to envoy/local_info/local_info.h diff --git a/include/envoy/matcher/BUILD b/envoy/matcher/BUILD similarity index 78% rename from include/envoy/matcher/BUILD rename to envoy/matcher/BUILD index fadfc109afb0c..e04a38f51cfb5 100644 --- a/include/envoy/matcher/BUILD +++ b/envoy/matcher/BUILD @@ -16,8 +16,8 @@ envoy_cc_library( "abseil_hash", ], deps = [ - "//include/envoy/config:typed_config_interface", - "//include/envoy/protobuf:message_validator_interface", + "//envoy/config:typed_config_interface", + "//envoy/protobuf:message_validator_interface", "@envoy_api//envoy/config/common/matcher/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], diff --git a/include/envoy/matcher/matcher.h b/envoy/matcher/matcher.h similarity index 98% rename from include/envoy/matcher/matcher.h rename to envoy/matcher/matcher.h index f334ccedf2097..97b4aa16e5897 100644 --- a/include/envoy/matcher/matcher.h +++ b/envoy/matcher/matcher.h @@ -183,7 +183,7 @@ struct DataInputGetResult { // which attempts to look a key up in the map: if we don't have access to the map yet, we return // absl::nullopt with NotAvailable. If we have the entire map, but the key doesn't exist in the // map, we return absl::nullopt with AllDataAvailable. - absl::optional data_; + absl::optional data_; // For pretty printing. friend std::ostream& operator<<(std::ostream& out, const DataInputGetResult& result) { @@ -209,7 +209,7 @@ template class DataInput { public: virtual ~DataInput() = default; - virtual DataInputGetResult get(const DataType& data) PURE; + virtual DataInputGetResult get(const DataType& data) const PURE; }; template using DataInputPtr = std::unique_ptr>; @@ -245,7 +245,7 @@ template class DataInputFactory : public Config::TypedFactory { class CommonProtocolInput { public: virtual ~CommonProtocolInput() = default; - virtual absl::optional get() PURE; + virtual absl::optional get() PURE; }; using CommonProtocolInputPtr = std::unique_ptr; diff --git a/include/envoy/network/BUILD b/envoy/network/BUILD similarity index 72% rename from include/envoy/network/BUILD rename to envoy/network/BUILD index 32239faccff61..10a3458c687ac 100644 --- a/include/envoy/network/BUILD +++ b/envoy/network/BUILD @@ -12,7 +12,7 @@ envoy_cc_library( name = "address_interface", hdrs = ["address.h"], deps = [ - "//include/envoy/api:os_sys_calls_interface", + "//envoy/api:os_sys_calls_interface", ], ) @@ -24,10 +24,10 @@ envoy_cc_library( ":address_interface", ":filter_interface", ":listen_socket_interface", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/event:deferred_deletable", - "//include/envoy/ssl:connection_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/buffer:buffer_interface", + "//envoy/event:deferred_deletable", + "//envoy/ssl:connection_interface", + "//envoy/stream_info:stream_info_interface", ], ) @@ -38,7 +38,7 @@ envoy_cc_library( ":connection_balancer_interface", ":listen_socket_interface", ":listener_interface", - "//include/envoy/ssl:context_interface", + "//envoy/ssl:context_interface", "//source/common/common:interval_value", ], ) @@ -50,17 +50,17 @@ envoy_cc_library( ":address_interface", ":io_handle_interface", ":socket_interface", - "//include/envoy/api:io_error_interface", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/api:io_error_interface", + "//envoy/buffer:buffer_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", ], ) envoy_cc_library( name = "dns_interface", hdrs = ["dns.h"], - deps = ["//include/envoy/network:address_interface"], + deps = ["//envoy/network:address_interface"], ) envoy_cc_library( @@ -79,9 +79,9 @@ envoy_cc_library( deps = [ ":listen_socket_interface", ":transport_socket_interface", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/stream_info:stream_info_interface", - "//include/envoy/upstream:host_description_interface", + "//envoy/buffer:buffer_interface", + "//envoy/stream_info:stream_info_interface", + "//envoy/upstream:host_description_interface", "//source/common/protobuf", ], ) @@ -101,9 +101,9 @@ envoy_cc_library( external_deps = ["abseil_optional"], deps = [ ":address_interface", - "//include/envoy/api:io_error_interface", - "//include/envoy/api:os_sys_calls_interface", - "//include/envoy/event:file_event_interface", + "//envoy/api:io_error_interface", + "//envoy/api:os_sys_calls_interface", + "//envoy/event:file_event_interface", "//source/common/common:assert_lib", ], ) @@ -123,7 +123,7 @@ envoy_cc_library( hdrs = ["socket_interface.h"], deps = [ ":socket_interface", - "//include/envoy/config:typed_config_interface", + "//envoy/config:typed_config_interface", ], ) @@ -133,7 +133,7 @@ envoy_cc_library( deps = [ ":io_handle_interface", ":socket_interface", - "//include/envoy/common:scope_tracker_interface", + "//envoy/common:scope_tracker_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -145,8 +145,8 @@ envoy_cc_library( ":io_handle_interface", ":post_io_action_interface", ":proxy_protocol_options_lib", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/ssl:connection_interface", + "//envoy/buffer:buffer_interface", + "//envoy/ssl:connection_interface", ], ) @@ -172,10 +172,10 @@ envoy_cc_library( ":connection_interface", ":listen_socket_interface", ":udp_packet_writer_handler_interface", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/common:resource_interface", - "//include/envoy/init:manager_interface", - "//include/envoy/stats:stats_interface", + "//envoy/access_log:access_log_interface", + "//envoy/common:resource_interface", + "//envoy/init:manager_interface", + "//envoy/stats:stats_interface", "//source/common/common:interval_value", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", @@ -187,7 +187,7 @@ envoy_cc_library( hdrs = ["resolver.h"], deps = [ ":address_interface", - "//include/envoy/config:typed_config_interface", + "//envoy/config:typed_config_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) diff --git a/include/envoy/network/address.h b/envoy/network/address.h similarity index 100% rename from include/envoy/network/address.h rename to envoy/network/address.h diff --git a/include/envoy/network/connection.h b/envoy/network/connection.h similarity index 100% rename from include/envoy/network/connection.h rename to envoy/network/connection.h diff --git a/include/envoy/network/connection_balancer.h b/envoy/network/connection_balancer.h similarity index 100% rename from include/envoy/network/connection_balancer.h rename to envoy/network/connection_balancer.h diff --git a/include/envoy/network/connection_handler.h b/envoy/network/connection_handler.h similarity index 99% rename from include/envoy/network/connection_handler.h rename to envoy/network/connection_handler.h index 1a3ba831bfc9b..e5c48a359ed6a 100644 --- a/include/envoy/network/connection_handler.h +++ b/envoy/network/connection_handler.h @@ -10,7 +10,7 @@ #include "envoy/network/listener.h" #include "envoy/ssl/context.h" -#include "common/common/interval_value.h" +#include "source/common/common/interval_value.h" namespace Envoy { namespace Network { diff --git a/include/envoy/network/dns.h b/envoy/network/dns.h similarity index 100% rename from include/envoy/network/dns.h rename to envoy/network/dns.h diff --git a/include/envoy/network/drain_decision.h b/envoy/network/drain_decision.h similarity index 100% rename from include/envoy/network/drain_decision.h rename to envoy/network/drain_decision.h diff --git a/include/envoy/network/exception.h b/envoy/network/exception.h similarity index 100% rename from include/envoy/network/exception.h rename to envoy/network/exception.h diff --git a/include/envoy/network/filter.h b/envoy/network/filter.h similarity index 99% rename from include/envoy/network/filter.h rename to envoy/network/filter.h index 88b94cc664ab6..f14a11bf53c8a 100644 --- a/include/envoy/network/filter.h +++ b/envoy/network/filter.h @@ -8,7 +8,7 @@ #include "envoy/stream_info/stream_info.h" #include "envoy/upstream/host_description.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { diff --git a/include/envoy/network/hash_policy.h b/envoy/network/hash_policy.h similarity index 100% rename from include/envoy/network/hash_policy.h rename to envoy/network/hash_policy.h diff --git a/include/envoy/network/io_handle.h b/envoy/network/io_handle.h similarity index 100% rename from include/envoy/network/io_handle.h rename to envoy/network/io_handle.h diff --git a/include/envoy/network/listen_socket.h b/envoy/network/listen_socket.h similarity index 100% rename from include/envoy/network/listen_socket.h rename to envoy/network/listen_socket.h diff --git a/include/envoy/network/listener.h b/envoy/network/listener.h similarity index 99% rename from include/envoy/network/listener.h rename to envoy/network/listener.h index 73dbced7fa93a..d4377278d59a2 100644 --- a/include/envoy/network/listener.h +++ b/envoy/network/listener.h @@ -17,7 +17,7 @@ #include "envoy/network/udp_packet_writer_handler.h" #include "envoy/stats/scope.h" -#include "common/common/interval_value.h" +#include "source/common/common/interval_value.h" namespace Envoy { namespace Network { diff --git a/include/envoy/network/post_io_action.h b/envoy/network/post_io_action.h similarity index 100% rename from include/envoy/network/post_io_action.h rename to envoy/network/post_io_action.h diff --git a/include/envoy/network/proxy_protocol.h b/envoy/network/proxy_protocol.h similarity index 100% rename from include/envoy/network/proxy_protocol.h rename to envoy/network/proxy_protocol.h diff --git a/include/envoy/network/resolver.h b/envoy/network/resolver.h similarity index 100% rename from include/envoy/network/resolver.h rename to envoy/network/resolver.h diff --git a/include/envoy/network/socket.h b/envoy/network/socket.h similarity index 100% rename from include/envoy/network/socket.h rename to envoy/network/socket.h diff --git a/include/envoy/network/socket_interface.h b/envoy/network/socket_interface.h similarity index 100% rename from include/envoy/network/socket_interface.h rename to envoy/network/socket_interface.h diff --git a/include/envoy/network/transport_socket.h b/envoy/network/transport_socket.h similarity index 100% rename from include/envoy/network/transport_socket.h rename to envoy/network/transport_socket.h diff --git a/include/envoy/network/udp_packet_writer_handler.h b/envoy/network/udp_packet_writer_handler.h similarity index 100% rename from include/envoy/network/udp_packet_writer_handler.h rename to envoy/network/udp_packet_writer_handler.h diff --git a/include/envoy/protobuf/BUILD b/envoy/protobuf/BUILD similarity index 100% rename from include/envoy/protobuf/BUILD rename to envoy/protobuf/BUILD diff --git a/include/envoy/protobuf/message_validator.h b/envoy/protobuf/message_validator.h similarity index 97% rename from include/envoy/protobuf/message_validator.h rename to envoy/protobuf/message_validator.h index 8ec4dccb46e3b..6a2f02c274c7d 100644 --- a/include/envoy/protobuf/message_validator.h +++ b/envoy/protobuf/message_validator.h @@ -3,7 +3,7 @@ #include "envoy/common/exception.h" #include "envoy/common/pure.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "absl/strings/string_view.h" diff --git a/include/envoy/ratelimit/BUILD b/envoy/ratelimit/BUILD similarity index 55% rename from include/envoy/ratelimit/BUILD rename to envoy/ratelimit/BUILD index 96c325023043c..42e2cd2b6b237 100644 --- a/include/envoy/ratelimit/BUILD +++ b/envoy/ratelimit/BUILD @@ -12,10 +12,10 @@ envoy_cc_library( name = "ratelimit_interface", hdrs = ["ratelimit.h"], deps = [ - "//include/envoy/config:typed_config_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/protobuf:message_validator_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/config:typed_config_interface", + "//envoy/http:header_map_interface", + "//envoy/protobuf:message_validator_interface", + "//envoy/stream_info:stream_info_interface", "@envoy_api//envoy/type/v3:pkg_cc_proto", ], ) diff --git a/include/envoy/ratelimit/ratelimit.h b/envoy/ratelimit/ratelimit.h similarity index 100% rename from include/envoy/ratelimit/ratelimit.h rename to envoy/ratelimit/ratelimit.h diff --git a/include/envoy/registry/BUILD b/envoy/registry/BUILD similarity index 100% rename from include/envoy/registry/BUILD rename to envoy/registry/BUILD diff --git a/include/envoy/registry/registry.h b/envoy/registry/registry.h similarity index 98% rename from include/envoy/registry/registry.h rename to envoy/registry/registry.h index b90e86ca52f3a..1bc909f23c76b 100644 --- a/include/envoy/registry/registry.h +++ b/envoy/registry/registry.h @@ -9,14 +9,13 @@ #include "envoy/common/exception.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/logger.h" -#include "common/common/utility.h" -#include "common/config/api_type_oracle.h" -#include "common/protobuf/utility.h" - -#include "extensions/common/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" +#include "source/common/config/api_type_oracle.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/common/utility.h" #include "absl/base/attributes.h" #include "absl/container/flat_hash_map.h" diff --git a/include/envoy/router/BUILD b/envoy/router/BUILD similarity index 55% rename from include/envoy/router/BUILD rename to envoy/router/BUILD index 754412a7ee346..86bc52bc99f04 100644 --- a/include/envoy/router/BUILD +++ b/envoy/router/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( hdrs = ["rds.h"], deps = [ ":router_interface", - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", ], ) @@ -28,14 +28,14 @@ envoy_cc_library( hdrs = ["route_config_provider_manager.h"], deps = [ ":rds_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/json:json_object_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/event:dispatcher_interface", + "//envoy/json:json_object_interface", + "//envoy/local_info:local_info_interface", + "//envoy/runtime:runtime_interface", + "//envoy/server:filter_config_interface", + "//envoy/stats:stats_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", ], @@ -47,7 +47,7 @@ envoy_cc_library( external_deps = ["abseil_optional"], deps = [ ":rds_interface", - "//include/envoy/common:time_interface", + "//envoy/common:time_interface", "//source/common/protobuf", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", @@ -60,20 +60,20 @@ envoy_cc_library( external_deps = ["abseil_optional"], deps = [ ":internal_redirect_interface", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/common:conn_pool_interface", - "//include/envoy/common:matchers_interface", - "//include/envoy/common:time_interface", - "//include/envoy/config:typed_metadata_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/http:conn_pool_interface", - "//include/envoy/http:hash_policy_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/tcp:conn_pool_interface", - "//include/envoy/tracing:http_tracer_interface", - "//include/envoy/upstream:resource_manager_interface", - "//include/envoy/upstream:retry_interface", + "//envoy/access_log:access_log_interface", + "//envoy/common:conn_pool_interface", + "//envoy/common:matchers_interface", + "//envoy/common:time_interface", + "//envoy/config:typed_metadata_interface", + "//envoy/http:codec_interface", + "//envoy/http:codes_interface", + "//envoy/http:conn_pool_interface", + "//envoy/http:hash_policy_interface", + "//envoy/http:header_map_interface", + "//envoy/tcp:conn_pool_interface", + "//envoy/tracing:http_tracer_interface", + "//envoy/upstream:resource_manager_interface", + "//envoy/upstream:retry_interface", "//source/common/protobuf", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -87,8 +87,8 @@ envoy_cc_library( hdrs = ["scopes.h"], deps = [ ":router_interface", - "//include/envoy/config:config_provider_interface", - "//include/envoy/http:header_map_interface", + "//envoy/config:config_provider_interface", + "//envoy/http:header_map_interface", ], ) @@ -96,8 +96,8 @@ envoy_cc_library( name = "router_ratelimit_interface", hdrs = ["router_ratelimit.h"], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/ratelimit:ratelimit_interface", + "//envoy/http:filter_interface", + "//envoy/ratelimit:ratelimit_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -106,8 +106,8 @@ envoy_cc_library( name = "shadow_writer_interface", hdrs = ["shadow_writer.h"], deps = [ - "//include/envoy/http:async_client_interface", - "//include/envoy/http:message_interface", + "//envoy/http:async_client_interface", + "//envoy/http:message_interface", ], ) @@ -116,7 +116,7 @@ envoy_cc_library( hdrs = ["string_accessor.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/stream_info:filter_state_interface", + "//envoy/stream_info:filter_state_interface", ], ) @@ -124,8 +124,8 @@ envoy_cc_library( name = "internal_redirect_interface", hdrs = ["internal_redirect.h"], deps = [ - "//include/envoy/config:typed_config_interface", - "//include/envoy/stream_info:filter_state_interface", + "//envoy/config:typed_config_interface", + "//envoy/stream_info:filter_state_interface", "//source/common/common:minimal_logger_lib", ], ) diff --git a/include/envoy/router/context.h b/envoy/router/context.h similarity index 100% rename from include/envoy/router/context.h rename to envoy/router/context.h diff --git a/include/envoy/router/internal_redirect.h b/envoy/router/internal_redirect.h similarity index 98% rename from include/envoy/router/internal_redirect.h rename to envoy/router/internal_redirect.h index 95f624255ace6..1352bb1e2f2fa 100644 --- a/include/envoy/router/internal_redirect.h +++ b/envoy/router/internal_redirect.h @@ -3,7 +3,7 @@ #include "envoy/config/typed_config.h" #include "envoy/stream_info/filter_state.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "absl/strings/string_view.h" diff --git a/include/envoy/router/rds.h b/envoy/router/rds.h similarity index 100% rename from include/envoy/router/rds.h rename to envoy/router/rds.h diff --git a/include/envoy/router/route_config_provider_manager.h b/envoy/router/route_config_provider_manager.h similarity index 100% rename from include/envoy/router/route_config_provider_manager.h rename to envoy/router/route_config_provider_manager.h diff --git a/include/envoy/router/route_config_update_receiver.h b/envoy/router/route_config_update_receiver.h similarity index 98% rename from include/envoy/router/route_config_update_receiver.h rename to envoy/router/route_config_update_receiver.h index a22342274c0c1..13ab7c45cefb5 100644 --- a/include/envoy/router/route_config_update_receiver.h +++ b/envoy/router/route_config_update_receiver.h @@ -8,7 +8,7 @@ #include "envoy/router/rds.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "absl/types/optional.h" diff --git a/include/envoy/router/router.h b/envoy/router/router.h similarity index 99% rename from include/envoy/router/router.h rename to envoy/router/router.h index 7cf920f6f68b2..e8a932262bfb7 100644 --- a/include/envoy/router/router.h +++ b/envoy/router/router.h @@ -26,8 +26,8 @@ #include "envoy/upstream/resource_manager.h" #include "envoy/upstream/retry.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "absl/types/optional.h" diff --git a/include/envoy/router/router_ratelimit.h b/envoy/router/router_ratelimit.h similarity index 100% rename from include/envoy/router/router_ratelimit.h rename to envoy/router/router_ratelimit.h diff --git a/include/envoy/router/scopes.h b/envoy/router/scopes.h similarity index 100% rename from include/envoy/router/scopes.h rename to envoy/router/scopes.h diff --git a/include/envoy/router/shadow_writer.h b/envoy/router/shadow_writer.h similarity index 100% rename from include/envoy/router/shadow_writer.h rename to envoy/router/shadow_writer.h diff --git a/include/envoy/router/string_accessor.h b/envoy/router/string_accessor.h similarity index 100% rename from include/envoy/router/string_accessor.h rename to envoy/router/string_accessor.h diff --git a/include/envoy/runtime/BUILD b/envoy/runtime/BUILD similarity index 81% rename from include/envoy/runtime/BUILD rename to envoy/runtime/BUILD index f28a5af6a50ec..da5c1527ab1a4 100644 --- a/include/envoy/runtime/BUILD +++ b/envoy/runtime/BUILD @@ -16,8 +16,8 @@ envoy_cc_library( "abseil_optional", ], deps = [ - "//include/envoy/stats:stats_interface", - "//include/envoy/thread_local:thread_local_object", + "//envoy/stats:stats_interface", + "//envoy/thread_local:thread_local_object", "//source/common/common:assert_lib", "//source/common/singleton:threadsafe_singleton", "@envoy_api//envoy/type/v3:pkg_cc_proto", diff --git a/include/envoy/runtime/runtime.h b/envoy/runtime/runtime.h similarity index 99% rename from include/envoy/runtime/runtime.h rename to envoy/runtime/runtime.h index 27264a1f9e583..36be807ac6283 100644 --- a/include/envoy/runtime/runtime.h +++ b/envoy/runtime/runtime.h @@ -12,8 +12,8 @@ #include "envoy/thread_local/thread_local_object.h" #include "envoy/type/v3/percent.pb.h" -#include "common/common/assert.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/common/assert.h" +#include "source/common/singleton/threadsafe_singleton.h" #include "absl/container/flat_hash_map.h" #include "absl/container/node_hash_map.h" diff --git a/include/envoy/secret/BUILD b/envoy/secret/BUILD similarity index 76% rename from include/envoy/secret/BUILD rename to envoy/secret/BUILD index 04adec2fab503..0f510ec3992e6 100644 --- a/include/envoy/secret/BUILD +++ b/envoy/secret/BUILD @@ -18,9 +18,9 @@ envoy_cc_library( hdrs = ["secret_provider.h"], deps = [ ":secret_callbacks_interface", - "//include/envoy/common:callback", - "//include/envoy/ssl:certificate_validation_context_config_interface", - "//include/envoy/ssl:tls_certificate_config_interface", + "//envoy/common:callback", + "//envoy/ssl:certificate_validation_context_config_interface", + "//envoy/ssl:tls_certificate_config_interface", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", ], ) @@ -30,7 +30,7 @@ envoy_cc_library( hdrs = ["secret_manager.h"], deps = [ ":secret_provider_interface", - "//include/envoy/init:target_interface", + "//envoy/init:target_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", ], diff --git a/include/envoy/secret/secret_callbacks.h b/envoy/secret/secret_callbacks.h similarity index 100% rename from include/envoy/secret/secret_callbacks.h rename to envoy/secret/secret_callbacks.h diff --git a/include/envoy/secret/secret_manager.h b/envoy/secret/secret_manager.h similarity index 100% rename from include/envoy/secret/secret_manager.h rename to envoy/secret/secret_manager.h diff --git a/include/envoy/secret/secret_provider.h b/envoy/secret/secret_provider.h similarity index 100% rename from include/envoy/secret/secret_provider.h rename to envoy/secret/secret_provider.h diff --git a/include/envoy/server/BUILD b/envoy/server/BUILD similarity index 50% rename from include/envoy/server/BUILD rename to envoy/server/BUILD index accac0a604273..e7914be881528 100644 --- a/include/envoy/server/BUILD +++ b/envoy/server/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( hdrs = ["access_log_config.h"], deps = [ ":filter_config_interface", - "//include/envoy/access_log:access_log_interface", + "//envoy/access_log:access_log_interface", "//source/common/protobuf", ], ) @@ -23,18 +23,18 @@ envoy_cc_library( hdrs = ["admin.h"], deps = [ ":config_tracker_interface", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/http:query_params_interface", - "//include/envoy/network:listen_socket_interface", + "//envoy/buffer:buffer_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", + "//envoy/http:query_params_interface", + "//envoy/network:listen_socket_interface", ], ) envoy_cc_library( name = "api_listener_interface", hdrs = ["api_listener.h"], - deps = ["//include/envoy/http:api_listener_interface"], + deps = ["//envoy/http:api_listener_interface"], ) envoy_cc_library( @@ -42,9 +42,9 @@ envoy_cc_library( hdrs = ["configuration.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/http:context_interface", - "//include/envoy/ratelimit:ratelimit_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/http:context_interface", + "//envoy/ratelimit:ratelimit_interface", + "//envoy/upstream:cluster_manager_interface", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", ], ) @@ -61,17 +61,17 @@ envoy_cc_library( envoy_cc_library( name = "drain_manager_interface", hdrs = ["drain_manager.h"], - deps = ["//include/envoy/network:drain_decision_interface"], + deps = ["//envoy/network:drain_decision_interface"], ) envoy_cc_library( name = "guarddog_interface", hdrs = ["guarddog.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/server:watchdog_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/thread:thread_interface", + "//envoy/event:dispatcher_interface", + "//envoy/server:watchdog_interface", + "//envoy/stats:stats_interface", + "//envoy/thread:thread_interface", ], ) @@ -80,8 +80,8 @@ envoy_cc_library( hdrs = ["guarddog_config.h"], deps = [ ":guarddog_interface", - "//include/envoy/api:api_interface", - "//include/envoy/protobuf:message_validator_interface", + "//envoy/api:api_interface", + "//envoy/protobuf:message_validator_interface", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", ], ) @@ -90,9 +90,9 @@ envoy_cc_library( name = "health_checker_config_interface", hdrs = ["health_checker_config.h"], deps = [ - "//include/envoy/common:random_generator_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/upstream:health_checker_interface", + "//envoy/common:random_generator_interface", + "//envoy/config:typed_config_interface", + "//envoy/upstream:health_checker_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -101,8 +101,8 @@ envoy_cc_library( name = "hot_restart_interface", hdrs = ["hot_restart.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/thread:thread_interface", + "//envoy/event:dispatcher_interface", + "//envoy/thread:thread_interface", "//source/server:hot_restart_cc_proto", ], ) @@ -118,21 +118,21 @@ envoy_cc_library( ":lifecycle_notifier_interface", ":listener_manager_interface", ":options_interface", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/api:api_interface", - "//include/envoy/common:mutex_tracer", - "//include/envoy/event:timer_interface", - "//include/envoy/http:context_interface", - "//include/envoy/http:query_params_interface", - "//include/envoy/init:manager_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/secret:secret_manager_interface", - "//include/envoy/server/overload:overload_manager_interface", - "//include/envoy/ssl:context_manager_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/tracing:http_tracer_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/access_log:access_log_interface", + "//envoy/api:api_interface", + "//envoy/common:mutex_tracer", + "//envoy/event:timer_interface", + "//envoy/http:context_interface", + "//envoy/http:query_params_interface", + "//envoy/init:manager_interface", + "//envoy/local_info:local_info_interface", + "//envoy/runtime:runtime_interface", + "//envoy/secret:secret_manager_interface", + "//envoy/server/overload:overload_manager_interface", + "//envoy/ssl:context_manager_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/tracing:http_tracer_interface", + "//envoy/upstream:cluster_manager_interface", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", ], ) @@ -141,8 +141,8 @@ envoy_cc_library( name = "options_interface", hdrs = ["options.h"], deps = [ - "//include/envoy/network:address_interface", - "//include/envoy/stats:stats_interface", + "//envoy/network:address_interface", + "//envoy/stats:stats_interface", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", ], @@ -152,8 +152,8 @@ envoy_cc_library( name = "worker_interface", hdrs = ["worker.h"], deps = [ - "//include/envoy/server:guarddog_interface", - "//include/envoy/server/overload:overload_manager_interface", + "//envoy/server:guarddog_interface", + "//envoy/server/overload:overload_manager_interface", ], ) @@ -161,7 +161,7 @@ envoy_cc_library( name = "watchdog_interface", hdrs = ["watchdog.h"], deps = [ - "//include/envoy/thread:thread_interface", + "//envoy/thread:thread_interface", ], ) @@ -175,23 +175,23 @@ envoy_cc_library( ":lifecycle_notifier_interface", ":options_interface", ":process_context_interface", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/api:api_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/grpc:context_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/http:context_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/init:manager_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/network:drain_decision_interface", - "//include/envoy/router:context_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/server/overload:overload_manager_interface", - "//include/envoy/singleton:manager_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/tracing:http_tracer_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/access_log:access_log_interface", + "//envoy/api:api_interface", + "//envoy/config:typed_config_interface", + "//envoy/grpc:context_interface", + "//envoy/http:codes_interface", + "//envoy/http:context_interface", + "//envoy/http:filter_interface", + "//envoy/init:manager_interface", + "//envoy/local_info:local_info_interface", + "//envoy/network:drain_decision_interface", + "//envoy/router:context_interface", + "//envoy/runtime:runtime_interface", + "//envoy/server/overload:overload_manager_interface", + "//envoy/singleton:manager_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/tracing:http_tracer_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:assert_lib", "//source/common/common:macros", "//source/common/protobuf", @@ -207,16 +207,16 @@ envoy_cc_library( ":factory_context_interface", ":lifecycle_notifier_interface", ":process_context_interface", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/server:transport_socket_config_interface", - "//include/envoy/server/overload:overload_manager_interface", - "//include/envoy/singleton:manager_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/tracing:http_tracer_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/access_log:access_log_interface", + "//envoy/config:typed_config_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", + "//envoy/server:transport_socket_config_interface", + "//envoy/server/overload:overload_manager_interface", + "//envoy/singleton:manager_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/tracing:http_tracer_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:assert_lib", "//source/common/common:macros", "//source/common/protobuf", @@ -228,7 +228,7 @@ envoy_cc_library( name = "lifecycle_notifier_interface", hdrs = ["lifecycle_notifier.h"], deps = [ - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", ], ) @@ -240,9 +240,9 @@ envoy_cc_library( ":drain_manager_interface", ":filter_config_interface", ":guarddog_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/network:listen_socket_interface", - "//include/envoy/ssl:context_interface", + "//envoy/network:filter_interface", + "//envoy/network:listen_socket_interface", + "//envoy/ssl:context_interface", "//source/common/protobuf", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -260,18 +260,18 @@ envoy_cc_library( hdrs = ["transport_socket_config.h"], deps = [ ":factory_context_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/init:manager_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/secret:secret_manager_interface", - "//include/envoy/singleton:manager_interface", - "//include/envoy/ssl:context_manager_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/config:typed_config_interface", + "//envoy/event:dispatcher_interface", + "//envoy/init:manager_interface", + "//envoy/local_info:local_info_interface", + "//envoy/network:transport_socket_interface", + "//envoy/runtime:runtime_interface", + "//envoy/secret:secret_manager_interface", + "//envoy/singleton:manager_interface", + "//envoy/ssl:context_manager_interface", + "//envoy/stats:stats_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/protobuf", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], @@ -281,7 +281,7 @@ envoy_cc_library( name = "resource_monitor_interface", hdrs = ["resource_monitor.h"], deps = [ - "//include/envoy/config:typed_config_interface", + "//envoy/config:typed_config_interface", "//source/common/protobuf", ], ) @@ -291,7 +291,7 @@ envoy_cc_library( hdrs = ["request_id_extension_config.h"], deps = [ ":filter_config_interface", - "//include/envoy/http:request_id_extension_interface", + "//envoy/http:request_id_extension_interface", "//source/common/protobuf", ], ) @@ -302,9 +302,9 @@ envoy_cc_library( deps = [ ":options_interface", ":resource_monitor_interface", - "//include/envoy/api:api_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/protobuf:message_validator_interface", + "//envoy/api:api_interface", + "//envoy/event:dispatcher_interface", + "//envoy/protobuf:message_validator_interface", ], ) @@ -313,7 +313,7 @@ envoy_cc_library( hdrs = ["tracer_config.h"], deps = [ ":filter_config_interface", - "//include/envoy/config:typed_config_interface", + "//envoy/config:typed_config_interface", "//source/common/protobuf", ], ) @@ -323,7 +323,7 @@ envoy_cc_library( hdrs = ["bootstrap_extension_config.h"], deps = [ ":factory_context_interface", - "//include/envoy/config:typed_config_interface", + "//envoy/config:typed_config_interface", ], ) @@ -331,10 +331,10 @@ envoy_cc_library( name = "fatal_action_interface", hdrs = ["fatal_action_config.h"], deps = [ - "//include/envoy/config:typed_config_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/protobuf:message_validator_interface", - "//include/envoy/server:instance_interface", + "//envoy/config:typed_config_interface", + "//envoy/event:dispatcher_interface", + "//envoy/protobuf:message_validator_interface", + "//envoy/server:instance_interface", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", ], ) @@ -343,7 +343,7 @@ envoy_cc_library( name = "platform_interface", hdrs = ["platform.h"], deps = [ - "//include/envoy/filesystem:filesystem_interface", - "//include/envoy/thread:thread_interface", + "//envoy/filesystem:filesystem_interface", + "//envoy/thread:thread_interface", ], ) diff --git a/include/envoy/server/access_log_config.h b/envoy/server/access_log_config.h similarity index 97% rename from include/envoy/server/access_log_config.h rename to envoy/server/access_log_config.h index 4202b3b61e414..7b64779ce7927 100644 --- a/include/envoy/server/access_log_config.h +++ b/envoy/server/access_log_config.h @@ -6,7 +6,7 @@ #include "envoy/config/typed_config.h" #include "envoy/server/filter_config.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/admin.h b/envoy/server/admin.h similarity index 100% rename from include/envoy/server/admin.h rename to envoy/server/admin.h diff --git a/include/envoy/server/api_listener.h b/envoy/server/api_listener.h similarity index 100% rename from include/envoy/server/api_listener.h rename to envoy/server/api_listener.h diff --git a/include/envoy/server/bootstrap_extension_config.h b/envoy/server/bootstrap_extension_config.h similarity index 97% rename from include/envoy/server/bootstrap_extension_config.h rename to envoy/server/bootstrap_extension_config.h index f674540d19fb5..d70fb8d9ce0ed 100644 --- a/include/envoy/server/bootstrap_extension_config.h +++ b/envoy/server/bootstrap_extension_config.h @@ -4,7 +4,7 @@ #include "envoy/server/factory_context.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/config_tracker.h b/envoy/server/config_tracker.h similarity index 95% rename from include/envoy/server/config_tracker.h rename to envoy/server/config_tracker.h index 53bcb11121e9f..62932be2c853c 100644 --- a/include/envoy/server/config_tracker.h +++ b/envoy/server/config_tracker.h @@ -6,8 +6,8 @@ #include "envoy/common/pure.h" -#include "common/common/non_copyable.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/non_copyable.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/configuration.h b/envoy/server/configuration.h similarity index 100% rename from include/envoy/server/configuration.h rename to envoy/server/configuration.h diff --git a/include/envoy/server/drain_manager.h b/envoy/server/drain_manager.h similarity index 100% rename from include/envoy/server/drain_manager.h rename to envoy/server/drain_manager.h diff --git a/include/envoy/server/factory_context.h b/envoy/server/factory_context.h similarity index 98% rename from include/envoy/server/factory_context.h rename to envoy/server/factory_context.h index cbe5433bd64b2..7e63b2b0b3021 100644 --- a/include/envoy/server/factory_context.h +++ b/envoy/server/factory_context.h @@ -30,9 +30,9 @@ #include "envoy/tracing/http_tracer.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/assert.h" -#include "common/common/macros.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/fatal_action_config.h b/envoy/server/fatal_action_config.h similarity index 100% rename from include/envoy/server/fatal_action_config.h rename to envoy/server/fatal_action_config.h diff --git a/include/envoy/server/filter_config.h b/envoy/server/filter_config.h similarity index 98% rename from include/envoy/server/filter_config.h rename to envoy/server/filter_config.h index cea17eceabdef..5abe7f6e5872e 100644 --- a/include/envoy/server/filter_config.h +++ b/envoy/server/filter_config.h @@ -10,9 +10,9 @@ #include "envoy/server/drain_manager.h" #include "envoy/server/factory_context.h" -#include "common/common/assert.h" -#include "common/common/macros.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/guarddog.h b/envoy/server/guarddog.h similarity index 100% rename from include/envoy/server/guarddog.h rename to envoy/server/guarddog.h diff --git a/include/envoy/server/guarddog_config.h b/envoy/server/guarddog_config.h similarity index 97% rename from include/envoy/server/guarddog_config.h rename to envoy/server/guarddog_config.h index e89a3f5308c77..5063e809f65f8 100644 --- a/include/envoy/server/guarddog_config.h +++ b/envoy/server/guarddog_config.h @@ -11,7 +11,7 @@ #include "envoy/server/guarddog.h" #include "envoy/stats/scope.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/health_checker_config.h b/envoy/server/health_checker_config.h similarity index 100% rename from include/envoy/server/health_checker_config.h rename to envoy/server/health_checker_config.h diff --git a/include/envoy/server/hot_restart.h b/envoy/server/hot_restart.h similarity index 100% rename from include/envoy/server/hot_restart.h rename to envoy/server/hot_restart.h diff --git a/include/envoy/server/instance.h b/envoy/server/instance.h similarity index 100% rename from include/envoy/server/instance.h rename to envoy/server/instance.h diff --git a/include/envoy/server/lifecycle_notifier.h b/envoy/server/lifecycle_notifier.h similarity index 100% rename from include/envoy/server/lifecycle_notifier.h rename to envoy/server/lifecycle_notifier.h diff --git a/include/envoy/server/listener_manager.h b/envoy/server/listener_manager.h similarity index 99% rename from include/envoy/server/listener_manager.h rename to envoy/server/listener_manager.h index 9f43b26a4e051..5fa8c2503e67a 100644 --- a/include/envoy/server/listener_manager.h +++ b/envoy/server/listener_manager.h @@ -14,7 +14,7 @@ #include "envoy/server/filter_config.h" #include "envoy/server/guarddog.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/options.h b/envoy/server/options.h similarity index 100% rename from include/envoy/server/options.h rename to envoy/server/options.h diff --git a/include/envoy/server/overload/BUILD b/envoy/server/overload/BUILD similarity index 64% rename from include/envoy/server/overload/BUILD rename to envoy/server/overload/BUILD index a6e3f789c4449..6d937fb8d5e18 100644 --- a/include/envoy/server/overload/BUILD +++ b/envoy/server/overload/BUILD @@ -13,8 +13,8 @@ envoy_cc_library( hdrs = ["overload_manager.h"], deps = [ ":thread_local_overload_state", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/event:dispatcher_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/singleton:const_singleton", ], ) @@ -23,9 +23,9 @@ envoy_cc_library( name = "thread_local_overload_state", hdrs = ["thread_local_overload_state.h"], deps = [ - "//include/envoy/event:scaled_range_timer_manager_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/thread_local:thread_local_object", + "//envoy/event:scaled_range_timer_manager_interface", + "//envoy/event:timer_interface", + "//envoy/thread_local:thread_local_object", "//source/common/common:interval_value", ], ) diff --git a/include/envoy/server/overload/overload_manager.h b/envoy/server/overload/overload_manager.h similarity index 98% rename from include/envoy/server/overload/overload_manager.h rename to envoy/server/overload/overload_manager.h index a9092b64341bf..7aa694b34f489 100644 --- a/include/envoy/server/overload/overload_manager.h +++ b/envoy/server/overload/overload_manager.h @@ -7,7 +7,7 @@ #include "envoy/event/scaled_range_timer_manager.h" #include "envoy/server/overload/thread_local_overload_state.h" -#include "common/singleton/const_singleton.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/overload/thread_local_overload_state.h b/envoy/server/overload/thread_local_overload_state.h similarity index 97% rename from include/envoy/server/overload/thread_local_overload_state.h rename to envoy/server/overload/thread_local_overload_state.h index ccee5b9ceb22c..9a57400d8eb31 100644 --- a/include/envoy/server/overload/thread_local_overload_state.h +++ b/envoy/server/overload/thread_local_overload_state.h @@ -7,7 +7,7 @@ #include "envoy/event/timer.h" #include "envoy/thread_local/thread_local_object.h" -#include "common/common/interval_value.h" +#include "source/common/common/interval_value.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/platform.h b/envoy/server/platform.h similarity index 100% rename from include/envoy/server/platform.h rename to envoy/server/platform.h diff --git a/include/envoy/server/process_context.h b/envoy/server/process_context.h similarity index 100% rename from include/envoy/server/process_context.h rename to envoy/server/process_context.h diff --git a/include/envoy/server/request_id_extension_config.h b/envoy/server/request_id_extension_config.h similarity index 95% rename from include/envoy/server/request_id_extension_config.h rename to envoy/server/request_id_extension_config.h index 4e56597e4fb72..fa2288ae7f9f2 100644 --- a/include/envoy/server/request_id_extension_config.h +++ b/envoy/server/request_id_extension_config.h @@ -5,7 +5,7 @@ #include "envoy/http/request_id_extension.h" #include "envoy/server/filter_config.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/resource_monitor.h b/envoy/server/resource_monitor.h similarity index 100% rename from include/envoy/server/resource_monitor.h rename to envoy/server/resource_monitor.h diff --git a/include/envoy/server/resource_monitor_config.h b/envoy/server/resource_monitor_config.h similarity index 97% rename from include/envoy/server/resource_monitor_config.h rename to envoy/server/resource_monitor_config.h index f72587022c1ed..18e211e3801f1 100644 --- a/include/envoy/server/resource_monitor_config.h +++ b/envoy/server/resource_monitor_config.h @@ -8,7 +8,7 @@ #include "envoy/server/options.h" #include "envoy/server/resource_monitor.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/tracer_config.h b/envoy/server/tracer_config.h similarity index 97% rename from include/envoy/server/tracer_config.h rename to envoy/server/tracer_config.h index 4af4caf45bc9a..53fb87969ff45 100644 --- a/include/envoy/server/tracer_config.h +++ b/envoy/server/tracer_config.h @@ -5,7 +5,7 @@ #include "envoy/server/filter_config.h" #include "envoy/tracing/http_tracer.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/transport_socket_config.h b/envoy/server/transport_socket_config.h similarity index 99% rename from include/envoy/server/transport_socket_config.h rename to envoy/server/transport_socket_config.h index db15960bac1bf..2cea944a4f45c 100644 --- a/include/envoy/server/transport_socket_config.h +++ b/envoy/server/transport_socket_config.h @@ -16,7 +16,7 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Server { diff --git a/include/envoy/server/watchdog.h b/envoy/server/watchdog.h similarity index 100% rename from include/envoy/server/watchdog.h rename to envoy/server/watchdog.h diff --git a/include/envoy/server/worker.h b/envoy/server/worker.h similarity index 100% rename from include/envoy/server/worker.h rename to envoy/server/worker.h diff --git a/include/envoy/singleton/BUILD b/envoy/singleton/BUILD similarity index 79% rename from include/envoy/singleton/BUILD rename to envoy/singleton/BUILD index a0eb2536c45ea..ae51a9dd285b4 100644 --- a/include/envoy/singleton/BUILD +++ b/envoy/singleton/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( hdrs = ["manager.h"], deps = [ ":instance_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/registry", + "//envoy/config:typed_config_interface", + "//envoy/registry", ], ) diff --git a/include/envoy/singleton/instance.h b/envoy/singleton/instance.h similarity index 100% rename from include/envoy/singleton/instance.h rename to envoy/singleton/instance.h diff --git a/include/envoy/singleton/manager.h b/envoy/singleton/manager.h similarity index 100% rename from include/envoy/singleton/manager.h rename to envoy/singleton/manager.h diff --git a/include/envoy/ssl/BUILD b/envoy/ssl/BUILD similarity index 75% rename from include/envoy/ssl/BUILD rename to envoy/ssl/BUILD index 30f15f687f3ea..d9234abdfafeb 100644 --- a/include/envoy/ssl/BUILD +++ b/envoy/ssl/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( external_deps = ["abseil_optional"], deps = [ ":ssl_socket_state", - "//include/envoy/common:time_interface", + "//envoy/common:time_interface", ], ) @@ -40,9 +40,9 @@ envoy_cc_library( deps = [ ":context_config_interface", ":context_interface", - "//include/envoy/common:time_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/stats:stats_interface", + "//envoy/common:time_interface", + "//envoy/config:typed_config_interface", + "//envoy/stats:stats_interface", ], ) @@ -50,7 +50,7 @@ envoy_cc_library( name = "tls_certificate_config_interface", hdrs = ["tls_certificate_config.h"], deps = [ - "//include/envoy/ssl/private_key:private_key_interface", + "//envoy/ssl/private_key:private_key_interface", ], ) @@ -80,10 +80,10 @@ envoy_cc_library( hdrs = ["handshaker.h"], external_deps = ["ssl"], deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:post_io_action_interface", - "//include/envoy/protobuf:message_validator_interface", + "//envoy/api:api_interface", + "//envoy/config:typed_config_interface", + "//envoy/network:connection_interface", + "//envoy/network:post_io_action_interface", + "//envoy/protobuf:message_validator_interface", ], ) diff --git a/include/envoy/ssl/certificate_validation_context_config.h b/envoy/ssl/certificate_validation_context_config.h similarity index 100% rename from include/envoy/ssl/certificate_validation_context_config.h rename to envoy/ssl/certificate_validation_context_config.h diff --git a/include/envoy/ssl/connection.h b/envoy/ssl/connection.h similarity index 100% rename from include/envoy/ssl/connection.h rename to envoy/ssl/connection.h diff --git a/include/envoy/ssl/context.h b/envoy/ssl/context.h similarity index 100% rename from include/envoy/ssl/context.h rename to envoy/ssl/context.h diff --git a/include/envoy/ssl/context_config.h b/envoy/ssl/context_config.h similarity index 100% rename from include/envoy/ssl/context_config.h rename to envoy/ssl/context_config.h diff --git a/include/envoy/ssl/context_manager.h b/envoy/ssl/context_manager.h similarity index 100% rename from include/envoy/ssl/context_manager.h rename to envoy/ssl/context_manager.h diff --git a/include/envoy/ssl/handshaker.h b/envoy/ssl/handshaker.h similarity index 100% rename from include/envoy/ssl/handshaker.h rename to envoy/ssl/handshaker.h diff --git a/include/envoy/ssl/private_key/BUILD b/envoy/ssl/private_key/BUILD similarity index 83% rename from include/envoy/ssl/private_key/BUILD rename to envoy/ssl/private_key/BUILD index 51ecf0198ec26..aedc02691ed03 100644 --- a/include/envoy/ssl/private_key/BUILD +++ b/envoy/ssl/private_key/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( external_deps = ["ssl"], deps = [ ":private_key_callbacks_interface", - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", ], ) @@ -24,8 +24,8 @@ envoy_cc_library( hdrs = ["private_key_config.h"], deps = [ ":private_key_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/registry", + "//envoy/config:typed_config_interface", + "//envoy/registry", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", ], ) diff --git a/include/envoy/ssl/private_key/private_key.h b/envoy/ssl/private_key/private_key.h similarity index 100% rename from include/envoy/ssl/private_key/private_key.h rename to envoy/ssl/private_key/private_key.h diff --git a/include/envoy/ssl/private_key/private_key_callbacks.h b/envoy/ssl/private_key/private_key_callbacks.h similarity index 100% rename from include/envoy/ssl/private_key/private_key_callbacks.h rename to envoy/ssl/private_key/private_key_callbacks.h diff --git a/include/envoy/ssl/private_key/private_key_config.h b/envoy/ssl/private_key/private_key_config.h similarity index 100% rename from include/envoy/ssl/private_key/private_key_config.h rename to envoy/ssl/private_key/private_key_config.h diff --git a/include/envoy/ssl/ssl_socket_extended_info.h b/envoy/ssl/ssl_socket_extended_info.h similarity index 100% rename from include/envoy/ssl/ssl_socket_extended_info.h rename to envoy/ssl/ssl_socket_extended_info.h diff --git a/include/envoy/ssl/ssl_socket_state.h b/envoy/ssl/ssl_socket_state.h similarity index 100% rename from include/envoy/ssl/ssl_socket_state.h rename to envoy/ssl/ssl_socket_state.h diff --git a/include/envoy/ssl/tls_certificate_config.h b/envoy/ssl/tls_certificate_config.h similarity index 100% rename from include/envoy/ssl/tls_certificate_config.h rename to envoy/ssl/tls_certificate_config.h diff --git a/include/envoy/stats/BUILD b/envoy/stats/BUILD similarity index 93% rename from include/envoy/stats/BUILD rename to envoy/stats/BUILD index 27953a2700415..0516c76b1552b 100644 --- a/include/envoy/stats/BUILD +++ b/envoy/stats/BUILD @@ -33,8 +33,8 @@ envoy_cc_library( deps = [ ":refcount_ptr_interface", ":symbol_table_interface", - "//include/envoy/common:interval_set_interface", - "//include/envoy/common:time_interface", + "//envoy/common:interval_set_interface", + "//envoy/common:time_interface", ], ) diff --git a/include/envoy/stats/allocator.h b/envoy/stats/allocator.h similarity index 100% rename from include/envoy/stats/allocator.h rename to envoy/stats/allocator.h diff --git a/include/envoy/stats/histogram.h b/envoy/stats/histogram.h similarity index 100% rename from include/envoy/stats/histogram.h rename to envoy/stats/histogram.h diff --git a/include/envoy/stats/primitive_stats.h b/envoy/stats/primitive_stats.h similarity index 94% rename from include/envoy/stats/primitive_stats.h rename to envoy/stats/primitive_stats.h index 704908201fe05..d27375a21c008 100644 --- a/include/envoy/stats/primitive_stats.h +++ b/envoy/stats/primitive_stats.h @@ -2,8 +2,8 @@ #include -#include "common/common/assert.h" -#include "common/common/non_copyable.h" +#include "source/common/common/assert.h" +#include "source/common/common/non_copyable.h" #include "absl/strings/string_view.h" diff --git a/include/envoy/stats/primitive_stats_macros.h b/envoy/stats/primitive_stats_macros.h similarity index 100% rename from include/envoy/stats/primitive_stats_macros.h rename to envoy/stats/primitive_stats_macros.h diff --git a/include/envoy/stats/refcount_ptr.h b/envoy/stats/refcount_ptr.h similarity index 99% rename from include/envoy/stats/refcount_ptr.h rename to envoy/stats/refcount_ptr.h index 437f7b40cce24..c467df8215843 100644 --- a/include/envoy/stats/refcount_ptr.h +++ b/envoy/stats/refcount_ptr.h @@ -4,7 +4,7 @@ #include "envoy/common/pure.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Stats { diff --git a/include/envoy/stats/scope.h b/envoy/stats/scope.h similarity index 100% rename from include/envoy/stats/scope.h rename to envoy/stats/scope.h diff --git a/include/envoy/stats/sink.h b/envoy/stats/sink.h similarity index 100% rename from include/envoy/stats/sink.h rename to envoy/stats/sink.h diff --git a/include/envoy/stats/stats.h b/envoy/stats/stats.h similarity index 100% rename from include/envoy/stats/stats.h rename to envoy/stats/stats.h diff --git a/include/envoy/stats/stats_macros.h b/envoy/stats/stats_macros.h similarity index 98% rename from include/envoy/stats/stats_macros.h rename to envoy/stats/stats_macros.h index 0f61674cfdca0..0cc6ee927472d 100644 --- a/include/envoy/stats/stats_macros.h +++ b/envoy/stats/stats_macros.h @@ -5,8 +5,8 @@ #include "envoy/stats/histogram.h" #include "envoy/stats/stats.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/utility.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/utility.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" diff --git a/include/envoy/stats/stats_matcher.h b/envoy/stats/stats_matcher.h similarity index 100% rename from include/envoy/stats/stats_matcher.h rename to envoy/stats/stats_matcher.h diff --git a/include/envoy/stats/store.h b/envoy/stats/store.h similarity index 100% rename from include/envoy/stats/store.h rename to envoy/stats/store.h diff --git a/include/envoy/stats/symbol_table.h b/envoy/stats/symbol_table.h similarity index 100% rename from include/envoy/stats/symbol_table.h rename to envoy/stats/symbol_table.h diff --git a/include/envoy/stats/tag.h b/envoy/stats/tag.h similarity index 100% rename from include/envoy/stats/tag.h rename to envoy/stats/tag.h diff --git a/include/envoy/stats/tag_extractor.h b/envoy/stats/tag_extractor.h similarity index 100% rename from include/envoy/stats/tag_extractor.h rename to envoy/stats/tag_extractor.h diff --git a/include/envoy/stats/tag_producer.h b/envoy/stats/tag_producer.h similarity index 100% rename from include/envoy/stats/tag_producer.h rename to envoy/stats/tag_producer.h diff --git a/include/envoy/stats/timespan.h b/envoy/stats/timespan.h similarity index 100% rename from include/envoy/stats/timespan.h rename to envoy/stats/timespan.h diff --git a/include/envoy/stream_info/BUILD b/envoy/stream_info/BUILD similarity index 70% rename from include/envoy/stream_info/BUILD rename to envoy/stream_info/BUILD index ff6df798b1d65..fb517d70d97e1 100644 --- a/include/envoy/stream_info/BUILD +++ b/envoy/stream_info/BUILD @@ -14,13 +14,13 @@ envoy_cc_library( external_deps = ["abseil_optional"], deps = [ ":filter_state_interface", - "//include/envoy/common:time_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/http:protocol_interface", - "//include/envoy/http:request_id_extension_interface", - "//include/envoy/network:socket_interface", - "//include/envoy/ssl:connection_interface", - "//include/envoy/upstream:host_description_interface", + "//envoy/common:time_interface", + "//envoy/http:header_map_interface", + "//envoy/http:protocol_interface", + "//envoy/http:request_id_extension_interface", + "//envoy/network:socket_interface", + "//envoy/ssl:connection_interface", + "//envoy/upstream:host_description_interface", "//source/common/common:assert_lib", "//source/common/protobuf", "//source/common/singleton:const_singleton", diff --git a/include/envoy/stream_info/filter_state.h b/envoy/stream_info/filter_state.h similarity index 98% rename from include/envoy/stream_info/filter_state.h rename to envoy/stream_info/filter_state.h index 612dc6994ec58..2faa5bb8c089c 100644 --- a/include/envoy/stream_info/filter_state.h +++ b/envoy/stream_info/filter_state.h @@ -6,9 +6,9 @@ #include "envoy/common/exception.h" #include "envoy/common/pure.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/protobuf/protobuf.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" diff --git a/include/envoy/stream_info/stream_info.h b/envoy/stream_info/stream_info.h similarity index 97% rename from include/envoy/stream_info/stream_info.h rename to envoy/stream_info/stream_info.h index acf84800d7303..d409aecb89103 100644 --- a/include/envoy/stream_info/stream_info.h +++ b/envoy/stream_info/stream_info.h @@ -16,9 +16,9 @@ #include "envoy/tracing/trace_reason.h" #include "envoy/upstream/host_description.h" -#include "common/common/assert.h" -#include "common/protobuf/protobuf.h" -#include "common/singleton/const_singleton.h" +#include "source/common/common/assert.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/singleton/const_singleton.h" #include "absl/types/optional.h" @@ -179,8 +179,13 @@ struct ResponseCodeDetailValues { const std::string AdminFilterResponse = "admin_filter_response"; // The original stream was replaced with an internal redirect. const std::string InternalRedirect = "internal_redirect"; - // The request was rejected because configured filters erroneously removed required headers. - const std::string FilterRemovedRequiredHeaders = "filter_removed_required_headers"; + // The request was rejected because configured filters erroneously removed required request + // headers. + const std::string FilterRemovedRequiredRequestHeaders = "filter_removed_required_request_headers"; + // The request was rejected because configured filters erroneously removed required response + // headers. + const std::string FilterRemovedRequiredResponseHeaders = + "filter_removed_required_response_headers"; // The request was rejected because the original IP couldn't be detected. const std::string OriginalIPDetectionFailed = "rejecting because detection failed"; // Changes or additions to details should be reflected in diff --git a/include/envoy/stream_info/uint32_accessor.h b/envoy/stream_info/uint32_accessor.h similarity index 100% rename from include/envoy/stream_info/uint32_accessor.h rename to envoy/stream_info/uint32_accessor.h diff --git a/include/envoy/tcp/BUILD b/envoy/tcp/BUILD similarity index 57% rename from include/envoy/tcp/BUILD rename to envoy/tcp/BUILD index 2ab93df039963..7a19f5f9ad7e2 100644 --- a/include/envoy/tcp/BUILD +++ b/envoy/tcp/BUILD @@ -12,10 +12,10 @@ envoy_cc_library( name = "conn_pool_interface", hdrs = ["conn_pool.h"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/common:conn_pool_interface", - "//include/envoy/event:deferred_deletable", - "//include/envoy/upstream:upstream_interface", + "//envoy/buffer:buffer_interface", + "//envoy/common:conn_pool_interface", + "//envoy/event:deferred_deletable", + "//envoy/upstream:upstream_interface", ], ) @@ -23,8 +23,8 @@ envoy_cc_library( name = "upstream_interface", hdrs = ["upstream.h"], deps = [ - "//include/envoy/tcp:conn_pool_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/tcp:conn_pool_interface", + "//envoy/upstream:upstream_interface", "@envoy_api//envoy/extensions/filters/network/tcp_proxy/v3:pkg_cc_proto", ], ) diff --git a/include/envoy/tcp/conn_pool.h b/envoy/tcp/conn_pool.h similarity index 100% rename from include/envoy/tcp/conn_pool.h rename to envoy/tcp/conn_pool.h diff --git a/include/envoy/tcp/upstream.h b/envoy/tcp/upstream.h similarity index 100% rename from include/envoy/tcp/upstream.h rename to envoy/tcp/upstream.h diff --git a/include/envoy/thread/BUILD b/envoy/thread/BUILD similarity index 100% rename from include/envoy/thread/BUILD rename to envoy/thread/BUILD diff --git a/include/envoy/thread/thread.h b/envoy/thread/thread.h similarity index 97% rename from include/envoy/thread/thread.h rename to envoy/thread/thread.h index 6a2cce96eeb0f..7b969f3e2c011 100644 --- a/include/envoy/thread/thread.h +++ b/envoy/thread/thread.h @@ -7,7 +7,7 @@ #include "envoy/common/pure.h" -#include "common/common/thread_annotations.h" +#include "source/common/common/thread_annotations.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" diff --git a/include/envoy/thread_local/BUILD b/envoy/thread_local/BUILD similarity index 89% rename from include/envoy/thread_local/BUILD rename to envoy/thread_local/BUILD index 9a5e612354943..01b0a4cf5e4d0 100644 --- a/include/envoy/thread_local/BUILD +++ b/envoy/thread_local/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( hdrs = ["thread_local.h"], deps = [ ":thread_local_object", - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "//source/common/common:assert_lib", ], ) diff --git a/include/envoy/thread_local/thread_local.h b/envoy/thread_local/thread_local.h similarity index 99% rename from include/envoy/thread_local/thread_local.h rename to envoy/thread_local/thread_local.h index f3d846ff5cca5..b314fa817aaf3 100644 --- a/include/envoy/thread_local/thread_local.h +++ b/envoy/thread_local/thread_local.h @@ -9,7 +9,7 @@ #include "envoy/event/dispatcher.h" #include "envoy/thread_local/thread_local_object.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace ThreadLocal { diff --git a/include/envoy/thread_local/thread_local_object.h b/envoy/thread_local/thread_local_object.h similarity index 94% rename from include/envoy/thread_local/thread_local_object.h rename to envoy/thread_local/thread_local_object.h index e305102f71187..f5500fa9a4ba2 100644 --- a/include/envoy/thread_local/thread_local_object.h +++ b/envoy/thread_local/thread_local_object.h @@ -4,7 +4,7 @@ #include #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace ThreadLocal { diff --git a/include/envoy/tracing/BUILD b/envoy/tracing/BUILD similarity index 80% rename from include/envoy/tracing/BUILD rename to envoy/tracing/BUILD index 9bed839d05ae9..c1711b1a92ac5 100644 --- a/include/envoy/tracing/BUILD +++ b/envoy/tracing/BUILD @@ -13,8 +13,8 @@ envoy_cc_library( hdrs = ["http_tracer.h"], deps = [ ":trace_driver_interface", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/http:header_map_interface", + "//envoy/access_log:access_log_interface", + "//envoy/http:header_map_interface", ], ) @@ -37,6 +37,6 @@ envoy_cc_library( hdrs = ["trace_driver.h"], deps = [ ":trace_reason_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/stream_info:stream_info_interface", ], ) diff --git a/include/envoy/tracing/http_tracer.h b/envoy/tracing/http_tracer.h similarity index 100% rename from include/envoy/tracing/http_tracer.h rename to envoy/tracing/http_tracer.h diff --git a/include/envoy/tracing/http_tracer_manager.h b/envoy/tracing/http_tracer_manager.h similarity index 100% rename from include/envoy/tracing/http_tracer_manager.h rename to envoy/tracing/http_tracer_manager.h diff --git a/include/envoy/tracing/trace_driver.h b/envoy/tracing/trace_driver.h similarity index 100% rename from include/envoy/tracing/trace_driver.h rename to envoy/tracing/trace_driver.h diff --git a/include/envoy/tracing/trace_reason.h b/envoy/tracing/trace_reason.h similarity index 100% rename from include/envoy/tracing/trace_reason.h rename to envoy/tracing/trace_reason.h diff --git a/include/envoy/udp/BUILD b/envoy/udp/BUILD similarity index 84% rename from include/envoy/udp/BUILD rename to envoy/udp/BUILD index bc5cce7271e36..8454b0e89759c 100644 --- a/include/envoy/udp/BUILD +++ b/envoy/udp/BUILD @@ -13,6 +13,6 @@ envoy_cc_library( hdrs = ["hash_policy.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/network:address_interface", + "//envoy/network:address_interface", ], ) diff --git a/include/envoy/udp/hash_policy.h b/envoy/udp/hash_policy.h similarity index 100% rename from include/envoy/udp/hash_policy.h rename to envoy/udp/hash_policy.h diff --git a/include/envoy/upstream/BUILD b/envoy/upstream/BUILD similarity index 57% rename from include/envoy/upstream/BUILD rename to envoy/upstream/BUILD index be14e1d398c74..7a19f61deec29 100644 --- a/include/envoy/upstream/BUILD +++ b/envoy/upstream/BUILD @@ -19,21 +19,21 @@ envoy_cc_library( ":load_balancer_interface", ":thread_local_cluster_interface", ":upstream_interface", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/common:random_generator_interface", - "//include/envoy/config:grpc_mux_interface", - "//include/envoy/config:subscription_factory_interface", - "//include/envoy/grpc:async_client_manager_interface", - "//include/envoy/http:async_client_interface", - "//include/envoy/http:conn_pool_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/secret:secret_manager_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:options_interface", - "//include/envoy/singleton:manager_interface", - "//include/envoy/tcp:conn_pool_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/access_log:access_log_interface", + "//envoy/common:random_generator_interface", + "//envoy/config:grpc_mux_interface", + "//envoy/config:subscription_factory_interface", + "//envoy/grpc:async_client_manager_interface", + "//envoy/http:async_client_interface", + "//envoy/http:conn_pool_interface", + "//envoy/local_info:local_info_interface", + "//envoy/runtime:runtime_interface", + "//envoy/secret:secret_manager_interface", + "//envoy/server:admin_interface", + "//envoy/server:options_interface", + "//envoy/singleton:manager_interface", + "//envoy/tcp:conn_pool_interface", + "//envoy/thread_local:thread_local_interface", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -60,10 +60,10 @@ envoy_cc_library( deps = [ ":health_check_host_monitor_interface", ":outlier_detection_interface", - "//include/envoy/network:address_interface", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/stats:primitive_stats_macros", - "//include/envoy/stats:stats_macros", + "//envoy/network:address_interface", + "//envoy/network:transport_socket_interface", + "//envoy/stats:primitive_stats_macros", + "//envoy/stats:stats_macros", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) @@ -73,8 +73,8 @@ envoy_cc_library( hdrs = ["load_balancer.h"], deps = [ ":upstream_interface", - "//include/envoy/router:router_interface", - "//include/envoy/upstream:types_interface", + "//envoy/router:router_interface", + "//envoy/upstream:types_interface", ], ) @@ -101,7 +101,7 @@ envoy_cc_library( hdrs = ["outlier_detection.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/common:time_interface", + "//envoy/common:time_interface", "@envoy_api//envoy/data/cluster/v3:pkg_cc_proto", ], ) @@ -110,16 +110,16 @@ envoy_cc_library( name = "retry_interface", hdrs = ["retry.h"], deps = [ - "//include/envoy/config:typed_config_interface", - "//include/envoy/upstream:types_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/config:typed_config_interface", + "//envoy/upstream:types_interface", + "//envoy/upstream:upstream_interface", ], ) envoy_cc_library( name = "resource_manager_interface", hdrs = ["resource_manager.h"], - deps = ["//include/envoy/common:resource_interface"], + deps = ["//envoy/common:resource_interface"], ) envoy_cc_library( @@ -128,6 +128,7 @@ envoy_cc_library( deps = [ ":load_balancer_interface", ":upstream_interface", + "//envoy/http:async_client_interface", ], ) @@ -148,16 +149,16 @@ envoy_cc_library( ":load_balancer_type_interface", ":locality_lib", ":resource_manager_interface", - "//include/envoy/common:callback", - "//include/envoy/config:subscription_interface", - "//include/envoy/config:typed_metadata_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/ssl:context_interface", - "//include/envoy/ssl:context_manager_interface", - "//include/envoy/upstream:types_interface", + "//envoy/common:callback", + "//envoy/config:subscription_interface", + "//envoy/config:typed_metadata_interface", + "//envoy/http:codec_interface", + "//envoy/network:connection_interface", + "//envoy/network:transport_socket_interface", + "//envoy/runtime:runtime_interface", + "//envoy/ssl:context_interface", + "//envoy/ssl:context_manager_interface", + "//envoy/upstream:types_interface", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], @@ -173,15 +174,15 @@ envoy_cc_library( ":locality_lib", ":resource_manager_interface", ":upstream_interface", - "//include/envoy/common:callback", - "//include/envoy/config:typed_config_interface", - "//include/envoy/config:typed_metadata_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/ssl:context_interface", - "//include/envoy/ssl:context_manager_interface", + "//envoy/common:callback", + "//envoy/config:typed_config_interface", + "//envoy/config:typed_metadata_interface", + "//envoy/http:codec_interface", + "//envoy/network:connection_interface", + "//envoy/network:transport_socket_interface", + "//envoy/runtime:runtime_interface", + "//envoy/ssl:context_interface", + "//envoy/ssl:context_manager_interface", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], ) diff --git a/include/envoy/upstream/cluster_factory.h b/envoy/upstream/cluster_factory.h similarity index 100% rename from include/envoy/upstream/cluster_factory.h rename to envoy/upstream/cluster_factory.h diff --git a/include/envoy/upstream/cluster_manager.h b/envoy/upstream/cluster_manager.h similarity index 100% rename from include/envoy/upstream/cluster_manager.h rename to envoy/upstream/cluster_manager.h diff --git a/include/envoy/upstream/health_check_host_monitor.h b/envoy/upstream/health_check_host_monitor.h similarity index 100% rename from include/envoy/upstream/health_check_host_monitor.h rename to envoy/upstream/health_check_host_monitor.h diff --git a/include/envoy/upstream/health_checker.h b/envoy/upstream/health_checker.h similarity index 100% rename from include/envoy/upstream/health_checker.h rename to envoy/upstream/health_checker.h diff --git a/include/envoy/upstream/host_description.h b/envoy/upstream/host_description.h similarity index 100% rename from include/envoy/upstream/host_description.h rename to envoy/upstream/host_description.h diff --git a/include/envoy/upstream/load_balancer.h b/envoy/upstream/load_balancer.h similarity index 100% rename from include/envoy/upstream/load_balancer.h rename to envoy/upstream/load_balancer.h diff --git a/include/envoy/upstream/load_balancer_type.h b/envoy/upstream/load_balancer_type.h similarity index 98% rename from include/envoy/upstream/load_balancer_type.h rename to envoy/upstream/load_balancer_type.h index 44d8f708e8143..280c317cdcce2 100644 --- a/include/envoy/upstream/load_balancer_type.h +++ b/envoy/upstream/load_balancer_type.h @@ -7,7 +7,7 @@ #include "envoy/common/pure.h" #include "envoy/config/cluster/v3/cluster.pb.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Upstream { diff --git a/include/envoy/upstream/locality.h b/envoy/upstream/locality.h similarity index 98% rename from include/envoy/upstream/locality.h rename to envoy/upstream/locality.h index 0f5c23ac20b58..a01a0baf697fd 100644 --- a/include/envoy/upstream/locality.h +++ b/envoy/upstream/locality.h @@ -2,7 +2,7 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Upstream { diff --git a/include/envoy/upstream/outlier_detection.h b/envoy/upstream/outlier_detection.h similarity index 100% rename from include/envoy/upstream/outlier_detection.h rename to envoy/upstream/outlier_detection.h diff --git a/include/envoy/upstream/resource_manager.h b/envoy/upstream/resource_manager.h similarity index 100% rename from include/envoy/upstream/resource_manager.h rename to envoy/upstream/resource_manager.h diff --git a/include/envoy/upstream/retry.h b/envoy/upstream/retry.h similarity index 100% rename from include/envoy/upstream/retry.h rename to envoy/upstream/retry.h diff --git a/include/envoy/upstream/thread_local_cluster.h b/envoy/upstream/thread_local_cluster.h similarity index 57% rename from include/envoy/upstream/thread_local_cluster.h rename to envoy/upstream/thread_local_cluster.h index 6c08c194103b1..16c59ebf7f0ef 100644 --- a/include/envoy/upstream/thread_local_cluster.h +++ b/envoy/upstream/thread_local_cluster.h @@ -8,6 +8,54 @@ namespace Envoy { namespace Upstream { +// HttpPoolData returns information about a given pool as well as a function +// to create streams on that pool. +class HttpPoolData { +public: + using OnNewStreamFn = std::function; + + HttpPoolData(OnNewStreamFn on_new_stream, Http::ConnectionPool::Instance* pool) + : on_new_stream_(on_new_stream), pool_(pool) {} + + Envoy::Http::ConnectionPool::Cancellable* + newStream(Http::ResponseDecoder& response_decoder, + Envoy::Http::ConnectionPool::Callbacks& callbacks) { + on_new_stream_(); + return pool_->newStream(response_decoder, callbacks); + } + + Upstream::HostDescriptionConstSharedPtr host() const { return pool_->host(); } + +private: + friend class HttpPoolDataPeer; + + OnNewStreamFn on_new_stream_; + Http::ConnectionPool::Instance* pool_; +}; + +// Tcp pool returns information about a given pool, as well as a function to +// create connections on that pool. +class TcpPoolData { +public: + using OnNewConnectionFn = std::function; + + TcpPoolData(OnNewConnectionFn on_new_connection, Tcp::ConnectionPool::Instance* pool) + : on_new_connection_(on_new_connection), pool_(pool) {} + + Envoy::Tcp::ConnectionPool::Cancellable* + newConnection(Envoy::Tcp::ConnectionPool::Callbacks& callbacks) { + on_new_connection_(); + return pool_->newConnection(callbacks); + } + + Upstream::HostDescriptionConstSharedPtr host() const { return pool_->host(); } + +private: + friend class TcpPoolDataPeer; + OnNewConnectionFn on_new_connection_; + Tcp::ConnectionPool::Instance* pool_; +}; + /** * A thread local cluster instance that can be used for direct load balancing and host set * interactions. In general, an instance of ThreadLocalCluster can only be safely used in the @@ -42,10 +90,11 @@ class ThreadLocalCluster { * @param priority the connection pool priority. * @param downstream_protocol the downstream protocol (if one exists) to use in protocol * selection. - * @param context the optional load balancer context. - * @return the connection pool or nullptr if there is no host available in the cluster. + * @param context the optional load balancer context. Must continue to be + * valid until newConnection is called on the pool (if it is to be called). + * @return the connection pool data or nullopt if there is no host available in the cluster. */ - virtual Http::ConnectionPool::Instance* + virtual absl::optional httpConnPool(ResourcePriority priority, absl::optional downstream_protocol, LoadBalancerContext* context) PURE; @@ -55,11 +104,12 @@ class ThreadLocalCluster { * is used is the one defined on the cluster when it was created. * * @param priority the connection pool priority. - * @param context the optional load balancer context. - * @return the connection pool or nullptr if there is no host available in the cluster. + * @param context the optional load balancer context. Must continue to be + * valid until newConnection is called on the pool (if it is to be called). + * @return the connection pool data or nullopt if there is no host available in the cluster. */ - virtual Tcp::ConnectionPool::Instance* tcpConnPool(ResourcePriority priority, - LoadBalancerContext* context) PURE; + virtual absl::optional tcpConnPool(ResourcePriority priority, + LoadBalancerContext* context) PURE; /** * Allocate a load balanced TCP connection for a cluster. The created connection is already diff --git a/include/envoy/upstream/types.h b/envoy/upstream/types.h similarity index 97% rename from include/envoy/upstream/types.h rename to envoy/upstream/types.h index dafc0f22f6bf8..589dbe75cee8f 100644 --- a/include/envoy/upstream/types.h +++ b/envoy/upstream/types.h @@ -3,7 +3,7 @@ #include #include -#include "common/common/phantom.h" +#include "source/common/common/phantom.h" namespace Envoy { namespace Upstream { diff --git a/include/envoy/upstream/upstream.h b/envoy/upstream/upstream.h similarity index 100% rename from include/envoy/upstream/upstream.h rename to envoy/upstream/upstream.h diff --git a/examples/cache/docker-compose.yaml b/examples/cache/docker-compose.yaml index 98619eba73ce5..d13c1353816cb 100644 --- a/examples/cache/docker-compose.yaml +++ b/examples/cache/docker-compose.yaml @@ -6,22 +6,22 @@ services: context: . dockerfile: Dockerfile-frontenvoy ports: - - "8000:8000" + - "8000:8000" service1: build: context: . dockerfile: Dockerfile-service volumes: - - ./responses.yaml:/etc/responses.yaml + - ./responses.yaml:/etc/responses.yaml environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 service2: build: context: . dockerfile: Dockerfile-service volumes: - - ./responses.yaml:/etc/responses.yaml + - ./responses.yaml:/etc/responses.yaml environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 diff --git a/examples/cors/backend/docker-compose.yaml b/examples/cors/backend/docker-compose.yaml index ae64b59026c3b..00a29c16bf6bb 100644 --- a/examples/cors/backend/docker-compose.yaml +++ b/examples/cors/backend/docker-compose.yaml @@ -6,8 +6,8 @@ services: context: . dockerfile: Dockerfile-frontenvoy ports: - - "8002:8000" - - "8003:8001" + - "8002:8000" + - "8003:8001" backend-service: build: diff --git a/examples/cors/backend/front-envoy.yaml b/examples/cors/backend/front-envoy.yaml index 2c64fad1e09ed..3b480ab24fdc3 100644 --- a/examples/cors/backend/front-envoy.yaml +++ b/examples/cors/backend/front-envoy.yaml @@ -12,9 +12,9 @@ static_resources: codec_type: AUTO stat_prefix: ingress_http access_log: - - name: envoy.access_loggers.stdout - typed_config: - "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog + - name: envoy.access_loggers.stdout + typed_config: + "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog route_config: name: local_route virtual_hosts: diff --git a/examples/cors/frontend/docker-compose.yaml b/examples/cors/frontend/docker-compose.yaml index 9ed7c014c322e..20b6b81a5e9c5 100644 --- a/examples/cors/frontend/docker-compose.yaml +++ b/examples/cors/frontend/docker-compose.yaml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile-frontenvoy ports: - - "8000:8000" + - "8000:8000" frontend-service: build: diff --git a/examples/cors/frontend/front-envoy.yaml b/examples/cors/frontend/front-envoy.yaml index 51318fb26243b..50fa897b238ed 100644 --- a/examples/cors/frontend/front-envoy.yaml +++ b/examples/cors/frontend/front-envoy.yaml @@ -12,9 +12,9 @@ static_resources: codec_type: AUTO stat_prefix: ingress_http access_log: - - name: envoy.access_loggers.stdout - typed_config: - "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog + - name: envoy.access_loggers.stdout + typed_config: + "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog route_config: name: local_route virtual_hosts: diff --git a/examples/csrf/crosssite/docker-compose.yml b/examples/csrf/crosssite/docker-compose.yml index bc6e93e22f715..feb091e90671d 100644 --- a/examples/csrf/crosssite/docker-compose.yml +++ b/examples/csrf/crosssite/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile-frontenvoy ports: - - "8002:8000" + - "8002:8000" service: build: diff --git a/examples/csrf/crosssite/front-envoy.yaml b/examples/csrf/crosssite/front-envoy.yaml index 18f8be37fa47d..a6cb4f9eb5962 100644 --- a/examples/csrf/crosssite/front-envoy.yaml +++ b/examples/csrf/crosssite/front-envoy.yaml @@ -12,9 +12,9 @@ static_resources: codec_type: AUTO stat_prefix: ingress_http access_log: - - name: envoy.access_loggers.stdout - typed_config: - "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog + - name: envoy.access_loggers.stdout + typed_config: + "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog route_config: name: local_route virtual_hosts: diff --git a/examples/csrf/samesite/docker-compose.yml b/examples/csrf/samesite/docker-compose.yml index 0f7a92d16186a..2ed503341fe28 100644 --- a/examples/csrf/samesite/docker-compose.yml +++ b/examples/csrf/samesite/docker-compose.yml @@ -6,8 +6,8 @@ services: context: . dockerfile: Dockerfile-frontenvoy ports: - - "8000:8000" - - "8001:8001" + - "8000:8000" + - "8001:8001" service: build: diff --git a/examples/csrf/samesite/front-envoy.yaml b/examples/csrf/samesite/front-envoy.yaml index de99d4a8c4f13..57773f803257a 100644 --- a/examples/csrf/samesite/front-envoy.yaml +++ b/examples/csrf/samesite/front-envoy.yaml @@ -12,9 +12,9 @@ static_resources: codec_type: AUTO stat_prefix: ingress_http access_log: - - name: envoy.access_loggers.stdout - typed_config: - "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog + - name: envoy.access_loggers.stdout + typed_config: + "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog route_config: name: local_route virtual_hosts: diff --git a/examples/double-proxy/docker-compose.yaml b/examples/double-proxy/docker-compose.yaml index 5b4d7b6452ee3..5d51b65186c88 100644 --- a/examples/double-proxy/docker-compose.yaml +++ b/examples/double-proxy/docker-compose.yaml @@ -8,7 +8,7 @@ services: networks: edge: ports: - - "10000:10000" + - "10000:10000" app: build: @@ -25,7 +25,7 @@ services: networks: postgres-frontend: aliases: - - postgres + - postgres postgres-in-between: proxy-postgres-backend: diff --git a/examples/dynamic-config-cp/docker-compose.yaml b/examples/dynamic-config-cp/docker-compose.yaml index dde3bb3696bcd..7431c17f0754a 100644 --- a/examples/dynamic-config-cp/docker-compose.yaml +++ b/examples/dynamic-config-cp/docker-compose.yaml @@ -6,11 +6,11 @@ services: context: . dockerfile: Dockerfile-proxy depends_on: - - service1 - - service2 + - service1 + - service2 ports: - - 10000:10000 - - 19000:19000 + - 10000:10000 + - 19000:19000 service1: image: jmalloc/echo-server diff --git a/examples/ext_authz/config/http-service.yaml b/examples/ext_authz/config/http-service.yaml index 581f48961d131..4bc3fc9ea39bb 100644 --- a/examples/ext_authz/config/http-service.yaml +++ b/examples/ext_authz/config/http-service.yaml @@ -31,7 +31,7 @@ static_resources: server_uri: uri: ext_authz cluster: ext_authz-http-service - timeout: 0.250s + timeout: 0.250s authorization_response: allowed_upstream_headers: patterns: diff --git a/examples/ext_authz/docker-compose.yaml b/examples/ext_authz/docker-compose.yaml index 1805409cc65d6..947c8e853b409 100644 --- a/examples/ext_authz/docker-compose.yaml +++ b/examples/ext_authz/docker-compose.yaml @@ -6,53 +6,53 @@ services: context: . dockerfile: Dockerfile-frontenvoy environment: - - FRONT_ENVOY_YAML + - FRONT_ENVOY_YAML networks: - - envoymesh + - envoymesh ports: - - "8000:8000" + - "8000:8000" ext_authz-http-service: build: context: ./auth dockerfile: http-service/Dockerfile volumes: - - ./users.json:/etc/users.json + - ./users.json:/etc/users.json environment: - - USERS=/etc/users.json + - USERS=/etc/users.json networks: - - envoymesh + - envoymesh ext_authz-grpc-service: build: context: ./auth dockerfile: grpc-service/Dockerfile volumes: - - ./users.json:/etc/users.json + - ./users.json:/etc/users.json networks: - - envoymesh + - envoymesh ext_authz-opa-service: image: openpolicyagent/opa:0.25.1-istio volumes: - - ./config/opa-service/policy.rego:/etc/policy.rego + - ./config/opa-service/policy.rego:/etc/policy.rego command: - - run - - --log-level=debug - - --server - - --log-format=json-pretty - - --set=plugins.envoy_ext_authz_grpc.addr=:9002 - - --set=decision_logs.console=true - - /etc/policy.rego + - run + - --log-level=debug + - --server + - --log-format=json-pretty + - --set=plugins.envoy_ext_authz_grpc.addr=:9002 + - --set=decision_logs.console=true + - /etc/policy.rego networks: - - envoymesh + - envoymesh upstream-service: build: context: ./upstream dockerfile: service/Dockerfile networks: - - envoymesh + - envoymesh networks: envoymesh: {} diff --git a/examples/fault-injection/docker-compose.yaml b/examples/fault-injection/docker-compose.yaml index 0a7cb9988c146..7d933eac2eb81 100644 --- a/examples/fault-injection/docker-compose.yaml +++ b/examples/fault-injection/docker-compose.yaml @@ -6,16 +6,16 @@ services: dockerfile: Dockerfile-envoy command: /usr/local/bin/envoy -c /etc/envoy.yaml volumes: - - ./runtime:/srv/runtime + - ./runtime:/srv/runtime networks: - - envoymesh + - envoymesh ports: - - 9211:9211 + - 9211:9211 backend: image: kennethreitz/httpbin@sha256:2c7abc4803080c22928265744410173b6fea3b898872c01c5fd0f0f9df4a59fb networks: - - envoymesh + - envoymesh ports: - - 8080:80 + - 8080:80 networks: envoymesh: {} diff --git a/examples/front-proxy/docker-compose.yaml b/examples/front-proxy/docker-compose.yaml index 4deb35d7cb9bd..2bc2f0f48afdd 100644 --- a/examples/front-proxy/docker-compose.yaml +++ b/examples/front-proxy/docker-compose.yaml @@ -6,33 +6,33 @@ services: context: . dockerfile: Dockerfile-frontenvoy networks: - - envoymesh + - envoymesh ports: - - "8080:8080" - - "8443:8443" - - "8001:8001" + - "8080:8080" + - "8443:8443" + - "8001:8001" service1: build: context: . dockerfile: Dockerfile-service volumes: - - ./service-envoy.yaml:/etc/service-envoy.yaml + - ./service-envoy.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 service2: build: context: . dockerfile: Dockerfile-service volumes: - - ./service-envoy.yaml:/etc/service-envoy.yaml + - ./service-envoy.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 networks: envoymesh: {} diff --git a/examples/front-proxy/front-envoy.yaml b/examples/front-proxy/front-envoy.yaml index b97ac7b278fa9..bbd124295898f 100644 --- a/examples/front-proxy/front-envoy.yaml +++ b/examples/front-proxy/front-envoy.yaml @@ -156,10 +156,10 @@ admin: port_value: 8001 layered_runtime: layers: - - name: static_layer_0 - static_layer: - envoy: - resource_limits: - listener: - example_listener_name: - connection_limit: 10000 + - name: static_layer_0 + static_layer: + envoy: + resource_limits: + listener: + example_listener_name: + connection_limit: 10000 diff --git a/examples/grpc-bridge/client/requirements.txt b/examples/grpc-bridge/client/requirements.txt index 43e9983674907..d28db2229bbb0 100644 --- a/examples/grpc-bridge/client/requirements.txt +++ b/examples/grpc-bridge/client/requirements.txt @@ -1,4 +1,4 @@ requests>=2.22.0 grpcio grpcio-tools -protobuf==3.17.1 +protobuf==3.17.2 diff --git a/examples/grpc-bridge/docker-compose-protos.yaml b/examples/grpc-bridge/docker-compose-protos.yaml index 543fe4bf5aca7..d21ca8bc5a244 100644 --- a/examples/grpc-bridge/docker-compose-protos.yaml +++ b/examples/grpc-bridge/docker-compose-protos.yaml @@ -9,13 +9,13 @@ services: image: grpc/go command: protoc --go_out=plugins=grpc:/stubs -I/protos /protos/kv.proto volumes: - - ./protos:/protos - - ./server/kv:/stubs + - ./protos:/protos + - ./server/kv:/stubs # $ docker run -ti -v $(pwd):/protos -v $(pwd)/stubs:/stubs grpc/python python -m grpc.tools.protoc --python_out=/stubs --grpc_python_out=/stubs -I/protos /protos/kv.proto stubs_python: image: grpc/python command: python -m grpc.tools.protoc --python_out=/stubs --grpc_python_out=/stubs -I/protos /protos/kv.proto volumes: - - ./protos:/protos - - ./client/kv:/stubs + - ./protos:/protos + - ./client/kv:/stubs diff --git a/examples/grpc-bridge/docker-compose.yaml b/examples/grpc-bridge/docker-compose.yaml index d709403011e15..7d6db81d6a359 100644 --- a/examples/grpc-bridge/docker-compose.yaml +++ b/examples/grpc-bridge/docker-compose.yaml @@ -8,11 +8,11 @@ services: build: context: server ports: - - "8081:8081" + - "8081:8081" networks: envoymesh: aliases: - - kv-backend-service + - kv-backend-service grpc-server-proxy: build: @@ -21,9 +21,9 @@ services: networks: envoymesh: aliases: - - kv-backend-proxy + - kv-backend-proxy ports: - - "8811:8811" + - "8811:8811" # Requires the build of the stubs first grpc-client: @@ -31,9 +31,9 @@ services: build: context: client environment: - - CLIENT_PROXY=http://kv-client-proxy:9911 + - CLIENT_PROXY=http://kv-client-proxy:9911 networks: - - envoymesh + - envoymesh grpc-client-proxy: build: @@ -42,9 +42,9 @@ services: networks: envoymesh: aliases: - - kv-client-proxy + - kv-client-proxy ports: - - "9911:9911" + - "9911:9911" networks: envoymesh: {} diff --git a/examples/gzip/docker-compose.yaml b/examples/gzip/docker-compose.yaml index 8043462341cd3..ea9a094922fe0 100644 --- a/examples/gzip/docker-compose.yaml +++ b/examples/gzip/docker-compose.yaml @@ -5,9 +5,9 @@ services: context: . dockerfile: Dockerfile-gzip ports: - - "9901:9901" - - "9902:9902" - - "10000:10000" + - "9901:9901" + - "9902:9902" + - "10000:10000" service: build: diff --git a/examples/gzip/gzip-envoy.yaml b/examples/gzip/gzip-envoy.yaml index 4aba4e64cdc0c..034333fc5aae6 100644 --- a/examples/gzip/gzip-envoy.yaml +++ b/examples/gzip/gzip-envoy.yaml @@ -29,7 +29,7 @@ static_resources: common_config: min_content_length: 100 content_type: - - application/json + - application/json disable_on_etag_header: true compressor_library: name: text_optimized @@ -68,7 +68,7 @@ static_resources: common_config: min_content_length: 100 content_type: - - text/plain + - text/plain disable_on_etag_header: true compressor_library: name: text_optimized diff --git a/examples/jaeger-native-tracing/docker-compose.yaml b/examples/jaeger-native-tracing/docker-compose.yaml index 07c9c01c0bf03..5294cffd99aa6 100644 --- a/examples/jaeger-native-tracing/docker-compose.yaml +++ b/examples/jaeger-native-tracing/docker-compose.yaml @@ -6,49 +6,49 @@ services: context: . dockerfile: Dockerfile-frontenvoy networks: - - envoymesh + - envoymesh ports: - - "8000:8000" + - "8000:8000" dns: - - 8.8.8.8 - - 8.8.4.4 + - 8.8.8.8 + - 8.8.4.4 service1: build: context: ../front-proxy dockerfile: Dockerfile-jaeger-service volumes: - - ./service1-envoy-jaeger.yaml:/etc/service-envoy.yaml + - ./service1-envoy-jaeger.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 dns: - - 8.8.8.8 - - 8.8.4.4 + - 8.8.8.8 + - 8.8.4.4 service2: build: context: ../front-proxy dockerfile: Dockerfile-jaeger-service volumes: - - ./service2-envoy-jaeger.yaml:/etc/service-envoy.yaml + - ./service2-envoy-jaeger.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 dns: - - 8.8.8.8 - - 8.8.4.4 + - 8.8.8.8 + - 8.8.4.4 jaeger: image: jaegertracing/all-in-one environment: - - COLLECTOR_ZIPKIN_HTTP_PORT=9411 + - COLLECTOR_ZIPKIN_HTTP_PORT=9411 networks: - - envoymesh + - envoymesh ports: - - "16686:16686" + - "16686:16686" networks: envoymesh: {} diff --git a/examples/jaeger-tracing/docker-compose.yaml b/examples/jaeger-tracing/docker-compose.yaml index 061ea802e166a..a803fa94c28d6 100644 --- a/examples/jaeger-tracing/docker-compose.yaml +++ b/examples/jaeger-tracing/docker-compose.yaml @@ -6,42 +6,42 @@ services: context: . dockerfile: Dockerfile-frontenvoy networks: - - envoymesh + - envoymesh ports: - - "8000:8000" - - "8001:8001" + - "8000:8000" + - "8001:8001" service1: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service1-envoy-jaeger.yaml:/etc/service-envoy.yaml + - ./service1-envoy-jaeger.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 service2: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service2-envoy-jaeger.yaml:/etc/service-envoy.yaml + - ./service2-envoy-jaeger.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 jaeger: image: jaegertracing/all-in-one environment: - - COLLECTOR_ZIPKIN_HTTP_PORT=9411 + - COLLECTOR_ZIPKIN_HTTP_PORT=9411 networks: - - envoymesh + - envoymesh ports: - - "9411:9411" - - "16686:16686" + - "9411:9411" + - "16686:16686" networks: envoymesh: {} diff --git a/examples/load-reporting-service/docker-compose.yaml b/examples/load-reporting-service/docker-compose.yaml index 3582e8744c689..3298a8287a017 100644 --- a/examples/load-reporting-service/docker-compose.yaml +++ b/examples/load-reporting-service/docker-compose.yaml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile-envoy ports: - - "80-81:80" + - "80-81:80" http_service: build: @@ -18,6 +18,6 @@ services: context: . dockerfile: Dockerfile-lrs volumes: - - /go/src/github.com/envoyproxy/envoy/examples/load-reporting-service + - /go/src/github.com/envoyproxy/envoy/examples/load-reporting-service ports: - - "18000:18000" + - "18000:18000" diff --git a/examples/lua/docker-compose.yaml b/examples/lua/docker-compose.yaml index e21a52c2be0ae..f1d36fba73393 100644 --- a/examples/lua/docker-compose.yaml +++ b/examples/lua/docker-compose.yaml @@ -6,18 +6,18 @@ services: context: . dockerfile: Dockerfile-proxy networks: - - envoymesh + - envoymesh ports: - - "8000:8000" + - "8000:8000" web_service: build: context: . dockerfile: Dockerfile-web-service networks: - - envoymesh + - envoymesh ports: - - "8080:80" + - "8080:80" networks: envoymesh: {} diff --git a/examples/lua/envoy.yaml b/examples/lua/envoy.yaml index a9cc2555282e1..2876d1e9d8cb6 100644 --- a/examples/lua/envoy.yaml +++ b/examples/lua/envoy.yaml @@ -42,7 +42,7 @@ static_resources: clusters: - name: web_service - type: STRICT_DNS # static + type: STRICT_DNS # static lb_policy: ROUND_ROBIN load_assignment: cluster_name: web_service diff --git a/examples/mysql/docker-compose.yaml b/examples/mysql/docker-compose.yaml index 22c46dc72e7ae..42a880eac877d 100644 --- a/examples/mysql/docker-compose.yaml +++ b/examples/mysql/docker-compose.yaml @@ -6,19 +6,19 @@ services: context: . dockerfile: Dockerfile-proxy networks: - - envoymesh + - envoymesh ports: - - "1999:1999" - - "8001:8001" + - "1999:1999" + - "8001:8001" mysql: build: context: . dockerfile: Dockerfile-mysql networks: - - envoymesh + - envoymesh environment: - - MYSQL_ALLOW_EMPTY_PASSWORD=yes + - MYSQL_ALLOW_EMPTY_PASSWORD=yes networks: envoymesh: diff --git a/examples/postgres/docker-compose.yaml b/examples/postgres/docker-compose.yaml index c4073f1422258..0532125d59138 100644 --- a/examples/postgres/docker-compose.yaml +++ b/examples/postgres/docker-compose.yaml @@ -8,8 +8,8 @@ services: networks: envoymesh: ports: - - "1999:1999" - - "8001:8001" + - "1999:1999" + - "8001:8001" command: "/usr/local/bin/envoy -c /etc/envoy.yaml -l debug" postgres: diff --git a/examples/redis/docker-compose.yaml b/examples/redis/docker-compose.yaml index 1dc0b9e21dd22..8dc223a2f5d27 100644 --- a/examples/redis/docker-compose.yaml +++ b/examples/redis/docker-compose.yaml @@ -6,10 +6,10 @@ services: context: . dockerfile: Dockerfile-proxy networks: - - envoymesh + - envoymesh ports: - - "1999:1999" - - "8001:8001" + - "1999:1999" + - "8001:8001" redis: build: @@ -18,7 +18,7 @@ services: networks: envoymesh: aliases: - - redis_server + - redis_server networks: envoymesh: {} diff --git a/examples/redis/envoy.yaml b/examples/redis/envoy.yaml index 1960f7925daf9..7af3a0e196b02 100644 --- a/examples/redis/envoy.yaml +++ b/examples/redis/envoy.yaml @@ -18,7 +18,7 @@ static_resources: cluster: redis_cluster clusters: - name: redis_cluster - type: STRICT_DNS # static + type: STRICT_DNS # static lb_policy: MAGLEV load_assignment: cluster_name: redis_cluster diff --git a/examples/skywalking-tracing/docker-compose.yaml b/examples/skywalking-tracing/docker-compose.yaml index e09ddb4b141a6..9ae58205f4e75 100644 --- a/examples/skywalking-tracing/docker-compose.yaml +++ b/examples/skywalking-tracing/docker-compose.yaml @@ -6,43 +6,43 @@ services: context: . dockerfile: Dockerfile-frontenvoy networks: - - envoymesh + - envoymesh ports: - - 8000:8000 - - 8001:8001 + - 8000:8000 + - 8001:8001 depends_on: - - skywalking-oap + - skywalking-oap # First service. service1: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service1-envoy-skywalking.yaml:/etc/service-envoy.yaml + - ./service1-envoy-skywalking.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 depends_on: - - skywalking-oap + - skywalking-oap # Second service. service2: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service2-envoy-skywalking.yaml:/etc/service-envoy.yaml + - ./service2-envoy-skywalking.yaml:/etc/service-envoy.yaml networks: - - envoymesh + - envoymesh environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 depends_on: - - skywalking-oap + - skywalking-oap # Skywalking components. elasticsearch: image: elasticsearch:7.9.2 networks: - - envoymesh + - envoymesh healthcheck: test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"] interval: 30s @@ -58,9 +58,9 @@ services: skywalking-oap: image: apache/skywalking-oap-server:8.4.0-es7 networks: - - envoymesh + - envoymesh depends_on: - - elasticsearch + - elasticsearch environment: SW_STORAGE: elasticsearch7 SW_STORAGE_ES_CLUSTER_NODES: elasticsearch:9200 @@ -74,11 +74,11 @@ services: skywalking-ui: image: apache/skywalking-ui:8.4.0 networks: - - envoymesh + - envoymesh depends_on: - - skywalking-oap + - skywalking-oap ports: - - 8080:8080 + - 8080:8080 environment: SW_OAP_ADDRESS: skywalking-oap:12800 networks: diff --git a/examples/tls-inspector/docker-compose.yaml b/examples/tls-inspector/docker-compose.yaml index c2fd6b6651925..879aa860d4660 100644 --- a/examples/tls-inspector/docker-compose.yaml +++ b/examples/tls-inspector/docker-compose.yaml @@ -6,23 +6,23 @@ services: context: . dockerfile: Dockerfile ports: - - "10000:10000" - - "12345:12345" + - "10000:10000" + - "12345:12345" service-https-http2: image: mendhak/http-https-echo hostname: service-https-http2 environment: - - HTTP_PORT=0 + - HTTP_PORT=0 service-https-http1.1: image: mendhak/http-https-echo hostname: service-https-http1.1 environment: - - HTTP_PORT=0 + - HTTP_PORT=0 service-http: image: mendhak/http-https-echo hostname: service-http environment: - - HTTPS_PORT=0 + - HTTPS_PORT=0 diff --git a/examples/tls-inspector/envoy.yaml b/examples/tls-inspector/envoy.yaml index 634f82075de0c..b8e444dae1f27 100644 --- a/examples/tls-inspector/envoy.yaml +++ b/examples/tls-inspector/envoy.yaml @@ -11,9 +11,9 @@ static_resources: address: 0.0.0.0 port_value: 10000 listener_filters: - - name: "envoy.filters.listener.tls_inspector" - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector + - name: "envoy.filters.listener.tls_inspector" + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector filter_chains: - filter_chain_match: transport_protocol: tls diff --git a/examples/tls-sni/docker-compose.yaml b/examples/tls-sni/docker-compose.yaml index 0c5fbd4ac516e..a76732c161958 100644 --- a/examples/tls-sni/docker-compose.yaml +++ b/examples/tls-sni/docker-compose.yaml @@ -6,29 +6,29 @@ services: context: . dockerfile: Dockerfile ports: - - "10000:10000" + - "10000:10000" proxy-client: build: context: . dockerfile: Dockerfile-client ports: - - "20000:10000" + - "20000:10000" http-upstream1: image: mendhak/http-https-echo hostname: http-upstream1 environment: - - HTTPS_PORT=0 + - HTTPS_PORT=0 http-upstream2: image: mendhak/http-https-echo hostname: http-upstream2 environment: - - HTTPS_PORT=0 + - HTTPS_PORT=0 https-upstream3: image: mendhak/http-https-echo hostname: https-upstream3 environment: - - HTTP_PORT=0 + - HTTP_PORT=0 diff --git a/examples/tls/docker-compose.yaml b/examples/tls/docker-compose.yaml index 1db7809a22209..46b9a41f14c94 100644 --- a/examples/tls/docker-compose.yaml +++ b/examples/tls/docker-compose.yaml @@ -6,37 +6,37 @@ services: context: . dockerfile: Dockerfile-proxy-https-http ports: - - "10000:10000" + - "10000:10000" proxy-https-to-https: build: context: . dockerfile: Dockerfile-proxy-https-https ports: - - "10001:10000" + - "10001:10000" proxy-http-to-https: build: context: . dockerfile: Dockerfile-proxy-http-https ports: - - "10002:10000" + - "10002:10000" proxy-https-passthrough: build: context: . dockerfile: Dockerfile-proxy-https-passthrough ports: - - "10003:10000" + - "10003:10000" service-http: image: mendhak/http-https-echo hostname: service-http environment: - - HTTPS_PORT=0 + - HTTPS_PORT=0 service-https: image: mendhak/http-https-echo hostname: service-https environment: - - HTTP_PORT=0 + - HTTP_PORT=0 diff --git a/examples/udp/docker-compose.yaml b/examples/udp/docker-compose.yaml index 1127d4894e525..fa17ea189304c 100644 --- a/examples/udp/docker-compose.yaml +++ b/examples/udp/docker-compose.yaml @@ -6,8 +6,8 @@ services: context: . dockerfile: Dockerfile ports: - - "10000:10000/udp" - - "10001:10001" + - "10000:10000/udp" + - "10001:10001" service-udp: image: mendhak/udp-listener diff --git a/examples/vrp-litmus/docker-compose.yaml b/examples/vrp-litmus/docker-compose.yaml index 46eefcafb9aa5..db11603fa0127 100644 --- a/examples/vrp-litmus/docker-compose.yaml +++ b/examples/vrp-litmus/docker-compose.yaml @@ -9,9 +9,9 @@ services: ENVOY_EDGE_EXTRA_ARGS: "" ENVOY_ORIGIN_EXTRA_ARGS: "" networks: - - envoymesh + - envoymesh ports: - - "10000:10000" + - "10000:10000" networks: envoymesh: {} diff --git a/examples/vrp-local/docker-compose.yaml b/examples/vrp-local/docker-compose.yaml index 46eefcafb9aa5..db11603fa0127 100644 --- a/examples/vrp-local/docker-compose.yaml +++ b/examples/vrp-local/docker-compose.yaml @@ -9,9 +9,9 @@ services: ENVOY_EDGE_EXTRA_ARGS: "" ENVOY_ORIGIN_EXTRA_ARGS: "" networks: - - envoymesh + - envoymesh ports: - - "10000:10000" + - "10000:10000" networks: envoymesh: {} diff --git a/examples/wasm-cc/docker-compose-wasm.yaml b/examples/wasm-cc/docker-compose-wasm.yaml index 32caf4245c275..0f3c45f09ce15 100644 --- a/examples/wasm-cc/docker-compose-wasm.yaml +++ b/examples/wasm-cc/docker-compose-wasm.yaml @@ -8,8 +8,8 @@ services: && cp -a bazel-bin/examples/wasm-cc/* /build" working_dir: /source volumes: - - ../..:/source - - ./lib:/build + - ../..:/source + - ./lib:/build wasm_compile: image: envoyproxy/envoy-build-ubuntu:55d9e4719d2bd0accce8f829b44dab70cd42112a @@ -18,5 +18,5 @@ services: && cp -a bazel-bin/examples/wasm-cc/* /build" working_dir: /source volumes: - - ../..:/source - - ./lib:/build + - ../..:/source + - ./lib:/build diff --git a/examples/wasm-cc/docker-compose.yaml b/examples/wasm-cc/docker-compose.yaml index 8e9f1aacbcb02..948de012b98b1 100644 --- a/examples/wasm-cc/docker-compose.yaml +++ b/examples/wasm-cc/docker-compose.yaml @@ -6,18 +6,18 @@ services: context: . dockerfile: Dockerfile-proxy depends_on: - - web_service + - web_service networks: - - envoymesh + - envoymesh ports: - - "8000:8000" + - "8000:8000" web_service: build: context: . dockerfile: Dockerfile-web-service networks: - - envoymesh + - envoymesh networks: envoymesh: {} diff --git a/examples/websocket/docker-compose.yaml b/examples/websocket/docker-compose.yaml index 0435bfddaec29..14cf5f983e4e8 100644 --- a/examples/websocket/docker-compose.yaml +++ b/examples/websocket/docker-compose.yaml @@ -6,21 +6,21 @@ services: context: . dockerfile: Dockerfile-proxy-ws ports: - - "10000:10000" + - "10000:10000" proxy-wss-wss: build: context: . dockerfile: Dockerfile-proxy-wss ports: - - "20000:10000" + - "20000:10000" proxy-wss-passthrough: build: context: . dockerfile: Dockerfile-proxy-wss-passthrough ports: - - "30000:10000" + - "30000:10000" service-ws: image: solsson/websocat @@ -32,4 +32,4 @@ services: hostname: service-wss command: wss-listen:0.0.0.0:443 literalreply:"[wss] HELO" --pkcs12-der /certs/output.pkcs12 volumes: - - ./certs/output.pkcs12:/certs/output.pkcs12 + - ./certs/output.pkcs12:/certs/output.pkcs12 diff --git a/examples/win32-front-proxy/Dockerfile-frontenvoy b/examples/win32-front-proxy/Dockerfile-frontenvoy new file mode 100644 index 0000000000000..3a3494f54c0d1 --- /dev/null +++ b/examples/win32-front-proxy/Dockerfile-frontenvoy @@ -0,0 +1,6 @@ +FROM envoyproxy/envoy-windows-dev:latest + +COPY ./front-envoy.yaml './front-envoy.yaml' +COPY ./start_envoy.ps1 ./start_envoy.ps1 +ENTRYPOINT ["powershell.exe", "./start_envoy.ps1"] + diff --git a/examples/win32-front-proxy/Dockerfile-service b/examples/win32-front-proxy/Dockerfile-service new file mode 100644 index 0000000000000..a347d8c3189fc --- /dev/null +++ b/examples/win32-front-proxy/Dockerfile-service @@ -0,0 +1,12 @@ +FROM envoyproxy/envoy-windows-dev:latest + +COPY ./setup_python.ps1 / + +RUN powershell.exe .\\setup_python.ps1 +RUN pip3 install -q Flask==0.11.1 requests==2.18.4 + +RUN powershell mkdir code +ADD ./service.py ./code +ADD ./service-envoy.yaml ./service-envoy.yaml +ADD ./start_service.ps1 ./start_service.ps1 +ENTRYPOINT ["powershell.exe", "./start_service.ps1"] diff --git a/examples/win32-front-proxy/README.md b/examples/win32-front-proxy/README.md new file mode 100644 index 0000000000000..cca1fdaf55f96 --- /dev/null +++ b/examples/win32-front-proxy/README.md @@ -0,0 +1,2 @@ +To learn about this sandbox and for instructions on how to run it please head over +to the [envoy docs](https://www.envoyproxy.io/docs/envoy/latest/start/sandboxes/win32_front_proxy.html) diff --git a/examples/win32-front-proxy/docker-compose.yaml b/examples/win32-front-proxy/docker-compose.yaml new file mode 100644 index 0000000000000..5c5b31adeb32e --- /dev/null +++ b/examples/win32-front-proxy/docker-compose.yaml @@ -0,0 +1,34 @@ +version: "3.7" +services: + + front-envoy: + build: + context: . + dockerfile: Dockerfile-frontenvoy + networks: + - envoymesh + ports: + - "8080:8080" + - "8443:8443" + - "8003:8003" + + service1: + build: + context: . + dockerfile: Dockerfile-service + networks: + - envoymesh + environment: + - SERVICE_NAME=1 + + service2: + build: + context: . + dockerfile: Dockerfile-service + networks: + - envoymesh + environment: + - SERVICE_NAME=2 + +networks: + envoymesh: {} diff --git a/examples/win32-front-proxy/front-envoy.yaml b/examples/win32-front-proxy/front-envoy.yaml new file mode 100644 index 0000000000000..2cc1c547bef8c --- /dev/null +++ b/examples/win32-front-proxy/front-envoy.yaml @@ -0,0 +1,167 @@ +static_resources: + listeners: + - address: + socket_address: + address: 0.0.0.0 + port_value: 8080 + filter_chains: + - filters: + - name: envoy.filters.network.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + codec_type: AUTO + stat_prefix: ingress_http + route_config: + name: local_route + virtual_hosts: + - name: backend + domains: + - "*" + routes: + - match: + prefix: "/service/1" + route: + cluster: service1 + - match: + prefix: "/service/2" + route: + cluster: service2 + http_filters: + - name: envoy.filters.http.router + typed_config: {} + + - address: + socket_address: + address: 0.0.0.0 + port_value: 8443 + filter_chains: + - filters: + - name: envoy.filters.network.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + codec_type: AUTO + stat_prefix: ingress_http + route_config: + name: local_route + virtual_hosts: + - name: backend + domains: + - "*" + routes: + - match: + prefix: "/service/1" + route: + cluster: service1 + - match: + prefix: "/service/2" + route: + cluster: service2 + http_filters: + - name: envoy.filters.http.router + typed_config: {} + + transport_socket: + name: envoy.transport_sockets.tls + typed_config: + "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext + common_tls_context: + tls_certificates: + # The following self-signed certificate pair is generated using: + # $ openssl req -x509 -newkey rsa:2048 -keyout a/front-proxy-key.pem -out a/front-proxy-crt.pem -days 3650 -nodes -subj '/CN=front-envoy' + # + # Instead of feeding it as an inline_string, certificate pair can also be fed to Envoy + # via filename. Reference: https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/base.proto#config-core-v3-datasource. + # + # Or in a dynamic configuration scenario, certificate pair can be fetched remotely via + # Secret Discovery Service (SDS). Reference: https://www.envoyproxy.io/docs/envoy/latest/configuration/security/secret. + - certificate_chain: + inline_string: | + -----BEGIN CERTIFICATE----- + MIICqDCCAZACCQCquzpHNpqBcDANBgkqhkiG9w0BAQsFADAWMRQwEgYDVQQDDAtm + cm9udC1lbnZveTAeFw0yMDA3MDgwMTMxNDZaFw0zMDA3MDYwMTMxNDZaMBYxFDAS + BgNVBAMMC2Zyb250LWVudm95MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC + AQEAthnYkqVQBX+Wg7aQWyCCb87hBce1hAFhbRM8Y9dQTqxoMXZiA2n8G089hUou + oQpEdJgitXVS6YMFPFUUWfwcqxYAynLK4X5im26Yfa1eO8La8sZUS+4Bjao1gF5/ + VJxSEo2yZ7fFBo8M4E44ZehIIocipCRS+YZehFs6dmHoq/MGvh2eAHIa+O9xssPt + ofFcQMR8rwBHVbKy484O10tNCouX4yUkyQXqCRy6HRu7kSjOjNKSGtjfG+h5M8bh + 10W7ZrsJ1hWhzBulSaMZaUY3vh5ngpws1JATQVSK1Jm/dmMRciwlTK7KfzgxHlSX + 58ENpS7yPTISkEICcLbXkkKGEQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCmj6Hg + vwOxWz0xu+6fSfRL6PGJUGq6wghCfUvjfwZ7zppDUqU47fk+yqPIOzuGZMdAqi7N + v1DXkeO4A3hnMD22Rlqt25vfogAaZVToBeQxCPd/ALBLFrvLUFYuSlS3zXSBpQqQ + Ny2IKFYsMllz5RSROONHBjaJOn5OwqenJ91MPmTAG7ujXKN6INSBM0PjX9Jy4Xb9 + zT+I85jRDQHnTFce1WICBDCYidTIvJtdSSokGSuy4/xyxAAc/BpZAfOjBQ4G1QRe + 9XwOi790LyNUYFJVyeOvNJwveloWuPLHb9idmY5YABwikUY6QNcXwyHTbRCkPB2I + m+/R4XnmL4cKQ+5Z + -----END CERTIFICATE----- + private_key: + inline_string: | + -----BEGIN PRIVATE KEY----- + MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC2GdiSpVAFf5aD + tpBbIIJvzuEFx7WEAWFtEzxj11BOrGgxdmIDafwbTz2FSi6hCkR0mCK1dVLpgwU8 + VRRZ/ByrFgDKcsrhfmKbbph9rV47wtryxlRL7gGNqjWAXn9UnFISjbJnt8UGjwzg + Tjhl6EgihyKkJFL5hl6EWzp2Yeir8wa+HZ4Achr473Gyw+2h8VxAxHyvAEdVsrLj + zg7XS00Ki5fjJSTJBeoJHLodG7uRKM6M0pIa2N8b6HkzxuHXRbtmuwnWFaHMG6VJ + oxlpRje+HmeCnCzUkBNBVIrUmb92YxFyLCVMrsp/ODEeVJfnwQ2lLvI9MhKQQgJw + tteSQoYRAgMBAAECggEAeDGdEkYNCGQLe8pvg8Z0ccoSGpeTxpqGrNEKhjfi6NrB + NwyVav10iq4FxEmPd3nobzDPkAftfvWc6hKaCT7vyTkPspCMOsQJ39/ixOk+jqFx + lNa1YxyoZ9IV2DIHR1iaj2Z5gB367PZUoGTgstrbafbaNY9IOSyojCIO935ubbcx + DWwL24XAf51ez6sXnI8V5tXmrFlNXhbhJdH8iIxNyM45HrnlUlOk0lCK4gmLJjy9 + 10IS2H2Wh3M5zsTpihH1JvM56oAH1ahrhMXs/rVFXXkg50yD1KV+HQiEbglYKUxO + eMYtfaY9i2CuLwhDnWp3oxP3HfgQQhD09OEN3e0IlQKBgQDZ/3poG9TiMZSjfKqL + xnCABMXGVQsfFWNC8THoW6RRx5Rqi8q08yJrmhCu32YKvccsOljDQJQQJdQO1g09 + e/adJmCnTrqxNtjPkX9txV23Lp6Ak7emjiQ5ICu7iWxrcO3zf7hmKtj7z+av8sjO + mDI7NkX5vnlE74nztBEjp3eC0wKBgQDV2GeJV028RW3b/QyP3Gwmax2+cKLR9PKR + nJnmO5bxAT0nQ3xuJEAqMIss/Rfb/macWc2N/6CWJCRT6a2vgy6xBW+bqG6RdQMB + xEZXFZl+sSKhXPkc5Wjb4lQ14YWyRPrTjMlwez3k4UolIJhJmwl+D7OkMRrOUERO + EtUvc7odCwKBgBi+nhdZKWXveM7B5N3uzXBKmmRz3MpPdC/yDtcwJ8u8msUpTv4R + JxQNrd0bsIqBli0YBmFLYEMg+BwjAee7vXeDFq+HCTv6XMva2RsNryCO4yD3I359 + XfE6DJzB8ZOUgv4Dvluie3TB2Y6ZQV/p+LGt7G13yG4hvofyJYvlg3RPAoGAcjDg + +OH5zLN2eqah8qBN0CYa9/rFt0AJ19+7/smLTJ7QvQq4g0gwS1couplcCEnNGWiK + 72y1n/ckvvplmPeAE19HveMvR9UoCeV5ej86fACy8V/oVpnaaLBvL2aCMjPLjPP9 + DWeCIZp8MV86cvOrGfngf6kJG2qZTueXl4NAuwkCgYEArKkhlZVXjwBoVvtHYmN2 + o+F6cGMlRJTLhNc391WApsgDZfTZSdeJsBsvvzS/Nc0burrufJg0wYioTlpReSy4 + ohhtprnQQAddfjHP7rh2LGt+irFzhdXXQ1ybGaGM9D764KUNCXLuwdly0vzXU4HU + q5sGxGrC1RECGB5Zwx2S2ZY= + -----END PRIVATE KEY----- + + clusters: + - name: service1 + connect_timeout: 0.25s + type: STRICT_DNS + lb_policy: ROUND_ROBIN + load_assignment: + cluster_name: service1 + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: service1 + port_value: 8000 + - name: service2 + connect_timeout: 0.25s + type: STRICT_DNS + lb_policy: ROUND_ROBIN + load_assignment: + cluster_name: service2 + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: service2 + port_value: 8000 +admin: + address: + socket_address: + address: 0.0.0.0 + port_value: 8001 +layered_runtime: + layers: + - name: static_layer_0 + static_layer: + envoy: + resource_limits: + listener: + example_listener_name: + connection_limit: 10000 diff --git a/examples/win32-front-proxy/service-envoy.yaml b/examples/win32-front-proxy/service-envoy.yaml new file mode 100644 index 0000000000000..b3ea728cc5f60 --- /dev/null +++ b/examples/win32-front-proxy/service-envoy.yaml @@ -0,0 +1,46 @@ +static_resources: + listeners: + - address: + socket_address: + address: 0.0.0.0 + port_value: 8000 + filter_chains: + - filters: + - name: envoy.filters.network.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + codec_type: AUTO + stat_prefix: ingress_http + route_config: + name: local_route + virtual_hosts: + - name: service + domains: + - "*" + routes: + - match: + prefix: "/service" + route: + cluster: local_service + http_filters: + - name: envoy.filters.http.router + typed_config: {} + clusters: + - name: local_service + connect_timeout: 0.25s + type: STRICT_DNS + lb_policy: ROUND_ROBIN + load_assignment: + cluster_name: local_service + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: 127.0.0.1 + port_value: 8080 +admin: + address: + socket_address: + address: 0.0.0.0 + port_value: 8081 diff --git a/examples/win32-front-proxy/service.py b/examples/win32-front-proxy/service.py new file mode 100644 index 0000000000000..d08b0a897c9e0 --- /dev/null +++ b/examples/win32-front-proxy/service.py @@ -0,0 +1,31 @@ +from flask import Flask +import os +import requests +import socket +import sys + +app = Flask(__name__) + + +@app.route('/service/') +def hello(service_number): + return ( + 'Hello from behind Envoy (service {})! hostname: {} resolved' + 'hostname: {}\n'.format( + os.environ['SERVICE_NAME'], socket.gethostname(), + socket.gethostbyname(socket.gethostname()))) + + +@app.route('/trace/') +def trace(service_number): + if int(os.environ['SERVICE_NAME']) == 1: + requests.get("http://localhost:9000/trace/2") + return ( + 'Hello from behind Envoy (service {})! hostname: {} resolved' + 'hostname: {}\n'.format( + os.environ['SERVICE_NAME'], socket.gethostname(), + socket.gethostbyname(socket.gethostname()))) + + +if __name__ == "__main__": + app.run(host='127.0.0.1', port=8080, debug=True) diff --git a/examples/win32-front-proxy/setup_python.ps1 b/examples/win32-front-proxy/setup_python.ps1 new file mode 100644 index 0000000000000..0905a4b03062c --- /dev/null +++ b/examples/win32-front-proxy/setup_python.ps1 @@ -0,0 +1,54 @@ +$ErrorActionPreference = "Stop"; + +function DownloadAndCheck +{ + param([string]$to, [string]$url, [string]$sha256) + + Write-Host "Downloading $url to $to..." + (New-Object System.Net.WebClient).DownloadFile($url, $to) + $actual = (Get-FileHash -Path $to -Algorithm SHA256).Hash + if ($actual -ne $sha256) { + Write-Host "Download of $url to $to is invalid, expected sha256: $sha256, but got: $actual"; + exit 1 + } + Write-Host "done." +} + +function AddToPath +{ + param([string] $directory) + + $oldPath = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH).Path + $newPath = "$oldPath;$directory" + Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH -Value $newPath + # Add to local path so subsequent commands have access to the executables they need + $env:PATH += ";$directory" + Write-Host "Added $directory to PATH" +} + +function RunAndCheckError +{ + param([string] $exe, [string[]] $argList, [Parameter(Mandatory=$false)] $isInstaller = $false) + + Write-Host "Running '$exe $argList'..." + if ($isInstaller) { + Write-Host "(running as Windows software installer)" + Start-Process $exe -ArgumentList "$argList" -Wait -NoNewWindow + } else { + &$exe $argList + if ($LASTEXITCODE -ne 0) { + Write-Host "$exe $argList exited with code $LASTEXITCODE" + exit $LASTEXITCODE + } + } + Write-Host "done." +} + +# Python3 (do not install via msys2 or the MS store's flavors, this version follows Win32 semantics) +DownloadAndCheck $env:TEMP\python3-installer.exe ` + https://www.python.org/ftp/python/3.8.5/python-3.8.5-amd64.exe ` + cd427c7b17337d7c13761ca20877d2d8be661bd30415ddc17072a31a65a91b64 +# python installer needs to be run as an installer with Start-Process +RunAndCheckError "$env:TEMP\python3-installer.exe" @("/quiet", "InstallAllUsers=1", "Include_launcher=0", "InstallLauncherAllUsers=0") $true +AddToPath $env:ProgramFiles\Python38 +AddToPath $env:ProgramFiles\Python38\Scripts diff --git a/examples/win32-front-proxy/start_envoy.ps1 b/examples/win32-front-proxy/start_envoy.ps1 new file mode 100644 index 0000000000000..efe1e2592e248 --- /dev/null +++ b/examples/win32-front-proxy/start_envoy.ps1 @@ -0,0 +1 @@ +& 'C:\\Program Files\\envoy\\envoy.exe' --config-path .\front-envoy.yaml --service-cluster front-proxy diff --git a/examples/win32-front-proxy/start_service.ps1 b/examples/win32-front-proxy/start_service.ps1 new file mode 100644 index 0000000000000..0aabb3b0b3deb --- /dev/null +++ b/examples/win32-front-proxy/start_service.ps1 @@ -0,0 +1,4 @@ +Start-Process -FilePath "python" -ArgumentList @("./code/service.py") + +$serviceName = "service$env:ServiceId" +& 'C:\\Program Files\\envoy\\envoy.exe' --config-path .\service-envoy.yaml --service-cluster $serviceName diff --git a/examples/zipkin-tracing/docker-compose.yaml b/examples/zipkin-tracing/docker-compose.yaml index 6f0e7542186ef..443a4377070e6 100644 --- a/examples/zipkin-tracing/docker-compose.yaml +++ b/examples/zipkin-tracing/docker-compose.yaml @@ -6,44 +6,44 @@ services: context: . dockerfile: Dockerfile-frontenvoy networks: - - envoymesh + - envoymesh ports: - - "8000:8000" + - "8000:8000" service1: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service1-envoy-zipkin.yaml:/etc/service-envoy.yaml + - ./service1-envoy-zipkin.yaml:/etc/service-envoy.yaml networks: envoymesh: aliases: - - service1 + - service1 environment: - - SERVICE_NAME=1 + - SERVICE_NAME=1 service2: build: context: ../front-proxy dockerfile: Dockerfile-service volumes: - - ./service2-envoy-zipkin.yaml:/etc/service-envoy.yaml + - ./service2-envoy-zipkin.yaml:/etc/service-envoy.yaml networks: envoymesh: aliases: - - service2 + - service2 environment: - - SERVICE_NAME=2 + - SERVICE_NAME=2 zipkin: image: openzipkin/zipkin networks: envoymesh: aliases: - - zipkin + - zipkin ports: - - "9411:9411" + - "9411:9411" networks: envoymesh: {} diff --git a/generated_api_shadow/bazel/repository_locations.bzl b/generated_api_shadow/bazel/repository_locations.bzl index 9d8159c5fd012..71f0481fce35c 100644 --- a/generated_api_shadow/bazel/repository_locations.bzl +++ b/generated_api_shadow/bazel/repository_locations.bzl @@ -36,7 +36,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "0d3ca4ed434958dda241fb129f77bd5ef0ce246250feed2d5a5470c6f29a77fa", strip_prefix = "buildtools-4.0.0", urls = ["https://github.com/bazelbuild/buildtools/archive/4.0.0.tar.gz"], - release_date = "2021-02-03", + release_date = "2021-02-04", use_category = ["api"], ), com_github_cncf_udpa = dict( @@ -115,7 +115,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( sha256 = "39cc1fb45039c7687354ca497aff8a55c71d0f1e484f6b81124ba9d821c36441", strip_prefix = "opentelemetry-proto-{version}", urls = ["https://github.com/open-telemetry/opentelemetry-proto/archive/v{version}.tar.gz"], - release_date = "2020-12-09", + release_date = "2021-01-27", use_category = ["api"], ), ) diff --git a/generated_api_shadow/envoy/config/bootstrap/v3/bootstrap.proto b/generated_api_shadow/envoy/config/bootstrap/v3/bootstrap.proto index 20470800201d3..32d865f1abf15 100644 --- a/generated_api_shadow/envoy/config/bootstrap/v3/bootstrap.proto +++ b/generated_api_shadow/envoy/config/bootstrap/v3/bootstrap.proto @@ -9,6 +9,7 @@ import "envoy/config/core/v3/base.proto"; import "envoy/config/core/v3/config_source.proto"; import "envoy/config/core/v3/event_service_config.proto"; import "envoy/config/core/v3/extension.proto"; +import "envoy/config/core/v3/resolver.proto"; import "envoy/config/core/v3/socket_option.proto"; import "envoy/config/listener/v3/listener.proto"; import "envoy/config/metrics/v3/stats.proto"; @@ -39,7 +40,7 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // ` for more detail. // Bootstrap :ref:`configuration overview `. -// [#next-free-field: 30] +// [#next-free-field: 31] message Bootstrap { option (udpa.annotations.versioning).previous_message_type = "envoy.config.bootstrap.v2.Bootstrap"; @@ -248,7 +249,16 @@ message Bootstrap { // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple' API only uses UDP for DNS resolution. - bool use_tcp_for_dns_lookups = 20; + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + bool use_tcp_for_dns_lookups = 20 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; + + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + // This may be overridden on a per-cluster basis in cds_config, when + // :ref:`dns_resolution_config ` + // is specified. + core.v3.DnsResolutionConfig dns_resolution_config = 30; // Specifies optional bootstrap extensions to be instantiated at startup time. // Each item contains extension specific configuration. diff --git a/generated_api_shadow/envoy/config/bootstrap/v4alpha/bootstrap.proto b/generated_api_shadow/envoy/config/bootstrap/v4alpha/bootstrap.proto index b572cd301959d..00f640675453d 100644 --- a/generated_api_shadow/envoy/config/bootstrap/v4alpha/bootstrap.proto +++ b/generated_api_shadow/envoy/config/bootstrap/v4alpha/bootstrap.proto @@ -9,6 +9,7 @@ import "envoy/config/core/v4alpha/base.proto"; import "envoy/config/core/v4alpha/config_source.proto"; import "envoy/config/core/v4alpha/event_service_config.proto"; import "envoy/config/core/v4alpha/extension.proto"; +import "envoy/config/core/v4alpha/resolver.proto"; import "envoy/config/core/v4alpha/socket_option.proto"; import "envoy/config/listener/v4alpha/listener.proto"; import "envoy/config/metrics/v4alpha/stats.proto"; @@ -38,7 +39,7 @@ option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSIO // ` for more detail. // Bootstrap :ref:`configuration overview `. -// [#next-free-field: 30] +// [#next-free-field: 31] message Bootstrap { option (udpa.annotations.versioning).previous_message_type = "envoy.config.bootstrap.v3.Bootstrap"; @@ -246,7 +247,16 @@ message Bootstrap { // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple' API only uses UDP for DNS resolution. - bool use_tcp_for_dns_lookups = 20; + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + bool hidden_envoy_deprecated_use_tcp_for_dns_lookups = 20 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; + + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + // This may be overridden on a per-cluster basis in cds_config, when + // :ref:`dns_resolution_config ` + // is specified. + core.v4alpha.DnsResolutionConfig dns_resolution_config = 30; // Specifies optional bootstrap extensions to be instantiated at startup time. // Each item contains extension specific configuration. diff --git a/generated_api_shadow/envoy/config/cluster/v3/cluster.proto b/generated_api_shadow/envoy/config/cluster/v3/cluster.proto index d9e64b44ce88a..7ba5e5c8fb436 100644 --- a/generated_api_shadow/envoy/config/cluster/v3/cluster.proto +++ b/generated_api_shadow/envoy/config/cluster/v3/cluster.proto @@ -11,6 +11,7 @@ import "envoy/config/core/v3/config_source.proto"; import "envoy/config/core/v3/extension.proto"; import "envoy/config/core/v3/health_check.proto"; import "envoy/config/core/v3/protocol.proto"; +import "envoy/config/core/v3/resolver.proto"; import "envoy/config/endpoint/v3/endpoint.proto"; import "envoy/extensions/transport_sockets/tls/v3/tls.proto"; import "envoy/type/v3/percent.proto"; @@ -43,7 +44,7 @@ message ClusterCollection { } // Configuration for a single upstream cluster. -// [#next-free-field: 53] +// [#next-free-field: 54] message Cluster { option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.Cluster"; @@ -859,14 +860,22 @@ message Cluster { // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple's API only allows overriding DNS resolvers via system settings. - repeated core.v3.Address dns_resolvers = 18; + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + repeated core.v3.Address dns_resolvers = 18 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; - // [#next-major-version: Reconcile DNS options in a single message.] // Always use TCP queries instead of UDP queries for DNS lookups. // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple' API only uses UDP for DNS resolution. - bool use_tcp_for_dns_lookups = 45; + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + bool use_tcp_for_dns_lookups = 45 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; + + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + core.v3.DnsResolutionConfig dns_resolution_config = 53; // If specified, outlier detection will be enabled for this upstream cluster. // Each of the configuration values can be overridden via diff --git a/generated_api_shadow/envoy/config/cluster/v3/filter.proto b/generated_api_shadow/envoy/config/cluster/v3/filter.proto index 74f4a1137dab6..7d11b87bcd5d5 100644 --- a/generated_api_shadow/envoy/config/cluster/v3/filter.proto +++ b/generated_api_shadow/envoy/config/cluster/v3/filter.proto @@ -20,7 +20,8 @@ message Filter { option (udpa.annotations.versioning).previous_message_type = "envoy.api.v2.cluster.Filter"; // The name of the filter to instantiate. The name must match a - // :ref:`supported filter `. + // supported upstream filter. Note that Envoy's :ref:`downstream network + // filters ` are not valid upstream filters. string name = 1 [(validate.rules).string = {min_len: 1}]; // Filter specific configuration which depends on the filter being diff --git a/generated_api_shadow/envoy/config/cluster/v4alpha/cluster.proto b/generated_api_shadow/envoy/config/cluster/v4alpha/cluster.proto index d637591a2251c..1ead224bc876f 100644 --- a/generated_api_shadow/envoy/config/cluster/v4alpha/cluster.proto +++ b/generated_api_shadow/envoy/config/cluster/v4alpha/cluster.proto @@ -11,6 +11,7 @@ import "envoy/config/core/v4alpha/config_source.proto"; import "envoy/config/core/v4alpha/extension.proto"; import "envoy/config/core/v4alpha/health_check.proto"; import "envoy/config/core/v4alpha/protocol.proto"; +import "envoy/config/core/v4alpha/resolver.proto"; import "envoy/config/endpoint/v3/endpoint.proto"; import "envoy/type/v3/percent.proto"; @@ -44,7 +45,7 @@ message ClusterCollection { } // Configuration for a single upstream cluster. -// [#next-free-field: 53] +// [#next-free-field: 54] message Cluster { option (udpa.annotations.versioning).previous_message_type = "envoy.config.cluster.v3.Cluster"; @@ -867,14 +868,22 @@ message Cluster { // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple's API only allows overriding DNS resolvers via system settings. - repeated core.v4alpha.Address dns_resolvers = 18; + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + repeated core.v4alpha.Address hidden_envoy_deprecated_dns_resolvers = 18 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; - // [#next-major-version: Reconcile DNS options in a single message.] // Always use TCP queries instead of UDP queries for DNS lookups. // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple' API only uses UDP for DNS resolution. - bool use_tcp_for_dns_lookups = 45; + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + bool hidden_envoy_deprecated_use_tcp_for_dns_lookups = 45 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; + + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + core.v4alpha.DnsResolutionConfig dns_resolution_config = 53; // If specified, outlier detection will be enabled for this upstream cluster. // Each of the configuration values can be overridden via diff --git a/generated_api_shadow/envoy/config/cluster/v4alpha/filter.proto b/generated_api_shadow/envoy/config/cluster/v4alpha/filter.proto index 5a4a4facbd81e..d478fd34f1c79 100644 --- a/generated_api_shadow/envoy/config/cluster/v4alpha/filter.proto +++ b/generated_api_shadow/envoy/config/cluster/v4alpha/filter.proto @@ -20,7 +20,8 @@ message Filter { option (udpa.annotations.versioning).previous_message_type = "envoy.config.cluster.v3.Filter"; // The name of the filter to instantiate. The name must match a - // :ref:`supported filter `. + // supported upstream filter. Note that Envoy's :ref:`downstream network + // filters ` are not valid upstream filters. string name = 1 [(validate.rules).string = {min_len: 1}]; // Filter specific configuration which depends on the filter being diff --git a/generated_api_shadow/envoy/config/core/v3/resolver.proto b/generated_api_shadow/envoy/config/core/v3/resolver.proto index b5e31814f56aa..21d40425f7a6b 100644 --- a/generated_api_shadow/envoy/config/core/v3/resolver.proto +++ b/generated_api_shadow/envoy/config/core/v3/resolver.proto @@ -14,11 +14,28 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Resolver] -// DNS resolver configuration which includes the underlying dns resolver addresses and options. -message DnsResolver { - // A list of dns resolver addresses +// Configuration of DNS resolver option flags which control the behavior of the DNS resolver. +message DnsResolverOptions { + // Use TCP for all DNS queries instead of the default protocol UDP. + // Setting this value causes failure if the + // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during + // server startup. Apple's API only uses UDP for DNS resolution. + bool use_tcp_for_dns_lookups = 1; + + // Do not use the default search domains; only query hostnames as-is or as aliases. + bool no_default_search_domain = 2; +} + +// DNS resolution configuration which includes the underlying dns resolver addresses and options. +message DnsResolutionConfig { + // A list of dns resolver addresses. If specified, the DNS client library will perform resolution + // via the underlying DNS resolvers. Otherwise, the default system resolvers + // (e.g., /etc/resolv.conf) will be used. // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple's API only allows overriding DNS resolvers via system settings. repeated Address resolvers = 1 [(validate.rules).repeated = {min_items: 1}]; + + // Configuration of DNS resolver option flags which control the behavior of the DNS resolver. + DnsResolverOptions dns_resolver_options = 2; } diff --git a/generated_api_shadow/envoy/config/core/v4alpha/resolver.proto b/generated_api_shadow/envoy/config/core/v4alpha/resolver.proto index ad597c85549de..4849a54161ced 100644 --- a/generated_api_shadow/envoy/config/core/v4alpha/resolver.proto +++ b/generated_api_shadow/envoy/config/core/v4alpha/resolver.proto @@ -15,13 +15,34 @@ option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSIO // [#protodoc-title: Resolver] -// DNS resolver configuration which includes the underlying dns resolver addresses and options. -message DnsResolver { - option (udpa.annotations.versioning).previous_message_type = "envoy.config.core.v3.DnsResolver"; +// Configuration of DNS resolver option flags which control the behavior of the DNS resolver. +message DnsResolverOptions { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.core.v3.DnsResolverOptions"; - // A list of dns resolver addresses + // Use TCP for all DNS queries instead of the default protocol UDP. + // Setting this value causes failure if the + // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during + // server startup. Apple's API only uses UDP for DNS resolution. + bool use_tcp_for_dns_lookups = 1; + + // Do not use the default search domains; only query hostnames as-is or as aliases. + bool no_default_search_domain = 2; +} + +// DNS resolution configuration which includes the underlying dns resolver addresses and options. +message DnsResolutionConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.config.core.v3.DnsResolutionConfig"; + + // A list of dns resolver addresses. If specified, the DNS client library will perform resolution + // via the underlying DNS resolvers. Otherwise, the default system resolvers + // (e.g., /etc/resolv.conf) will be used. // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple's API only allows overriding DNS resolvers via system settings. repeated Address resolvers = 1 [(validate.rules).repeated = {min_items: 1}]; + + // Configuration of DNS resolver option flags which control the behavior of the DNS resolver. + DnsResolverOptions dns_resolver_options = 2; } diff --git a/generated_api_shadow/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/BUILD b/generated_api_shadow/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/BUILD new file mode 100644 index 0000000000000..ca83092e39b11 --- /dev/null +++ b/generated_api_shadow/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/BUILD @@ -0,0 +1,13 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg", + "//envoy/extensions/common/dynamic_forward_proxy/v4alpha:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/generated_api_shadow/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/cluster.proto b/generated_api_shadow/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/cluster.proto new file mode 100644 index 0000000000000..1b989e0bb725e --- /dev/null +++ b/generated_api_shadow/envoy/extensions/clusters/dynamic_forward_proxy/v4alpha/cluster.proto @@ -0,0 +1,35 @@ +syntax = "proto3"; + +package envoy.extensions.clusters.dynamic_forward_proxy.v4alpha; + +import "envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.clusters.dynamic_forward_proxy.v4alpha"; +option java_outer_classname = "ClusterProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; + +// [#protodoc-title: Dynamic forward proxy cluster configuration] + +// Configuration for the dynamic forward proxy cluster. See the :ref:`architecture overview +// ` for more information. +// [#extension: envoy.clusters.dynamic_forward_proxy] +message ClusterConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.clusters.dynamic_forward_proxy.v3.ClusterConfig"; + + // The DNS cache configuration that the cluster will attach to. Note this configuration must + // match that of associated :ref:`dynamic forward proxy HTTP filter configuration + // `. + common.dynamic_forward_proxy.v4alpha.DnsCacheConfig dns_cache_config = 1 + [(validate.rules).message = {required: true}]; + + // If true allow the cluster configuration to disable the auto_sni and auto_san_validation options + // in the :ref:`cluster's upstream_http_protocol_options + // ` + bool allow_insecure_cluster_options = 2; +} diff --git a/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD b/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD index 6e74b985c580d..fb5436a6bf93a 100644 --- a/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD +++ b/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v3/BUILD @@ -6,6 +6,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ + "//envoy/annotations:pkg", "//envoy/config/cluster/v3:pkg", "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg", "//envoy/config/core/v3:pkg", diff --git a/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto b/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto index 1c14739b94c86..79d6752502094 100644 --- a/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto +++ b/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto @@ -8,6 +8,7 @@ import "envoy/config/core/v3/resolver.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; +import "envoy/annotations/deprecation.proto"; import "udpa/annotations/status.proto"; import "udpa/annotations/versioning.proto"; import "validate/validate.proto"; @@ -96,15 +97,15 @@ message DnsCacheConfig { // Envoy will use dns cache circuit breakers with default settings even if this value is not set. DnsCacheCircuitBreakers dns_cache_circuit_breaker = 7; - // [#next-major-version: Reconcile DNS options in a single message.] // Always use TCP queries instead of UDP queries for DNS lookups. // Setting this value causes failure if the // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during // server startup. Apple' API only uses UDP for DNS resolution. - bool use_tcp_for_dns_lookups = 8; + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + bool use_tcp_for_dns_lookups = 8 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; - // DNS resolver configuration - // If specified, DNS cache will perform resolution via the underlying DNS resolvers. - // Otherwise, the default system resolvers (e.g., /etc/resolv.conf) will be used. - config.core.v3.DnsResolver dns_resolver = 9; + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + config.core.v3.DnsResolutionConfig dns_resolution_config = 9; } diff --git a/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v4alpha/BUILD b/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v4alpha/BUILD new file mode 100644 index 0000000000000..20571020ac927 --- /dev/null +++ b/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v4alpha/BUILD @@ -0,0 +1,15 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/annotations:pkg", + "//envoy/config/cluster/v4alpha:pkg", + "//envoy/config/core/v4alpha:pkg", + "//envoy/extensions/common/dynamic_forward_proxy/v3:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto b/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto new file mode 100644 index 0000000000000..a9040a90dfc20 --- /dev/null +++ b/generated_api_shadow/envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto @@ -0,0 +1,114 @@ +syntax = "proto3"; + +package envoy.extensions.common.dynamic_forward_proxy.v4alpha; + +import "envoy/config/cluster/v4alpha/cluster.proto"; +import "envoy/config/core/v4alpha/resolver.proto"; + +import "google/protobuf/duration.proto"; +import "google/protobuf/wrappers.proto"; + +import "envoy/annotations/deprecation.proto"; +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.common.dynamic_forward_proxy.v4alpha"; +option java_outer_classname = "DnsCacheProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; + +// [#protodoc-title: Dynamic forward proxy common configuration] + +// Configuration of circuit breakers for resolver. +message DnsCacheCircuitBreakers { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheCircuitBreakers"; + + // The maximum number of pending requests that Envoy will allow to the + // resolver. If not specified, the default is 1024. + google.protobuf.UInt32Value max_pending_requests = 1; +} + +// Configuration for the dynamic forward proxy DNS cache. See the :ref:`architecture overview +// ` for more information. +// [#next-free-field: 10] +message DnsCacheConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.common.dynamic_forward_proxy.v3.DnsCacheConfig"; + + // The name of the cache. Multiple named caches allow independent dynamic forward proxy + // configurations to operate within a single Envoy process using different configurations. All + // configurations with the same name *must* otherwise have the same settings when referenced + // from different configuration components. Configuration will fail to load if this is not + // the case. + string name = 1 [(validate.rules).string = {min_len: 1}]; + + // The DNS lookup family to use during resolution. + // + // [#comment:TODO(mattklein123): Figure out how to support IPv4/IPv6 "happy eyeballs" mode. The + // way this might work is a new lookup family which returns both IPv4 and IPv6 addresses, and + // then configures a host to have a primary and fall back address. With this, we could very + // likely build a "happy eyeballs" connection pool which would race the primary / fall back + // address and return the one that wins. This same method could potentially also be used for + // QUIC to TCP fall back.] + config.cluster.v4alpha.Cluster.DnsLookupFamily dns_lookup_family = 2 + [(validate.rules).enum = {defined_only: true}]; + + // The DNS refresh rate for currently cached DNS hosts. If not specified defaults to 60s. + // + // .. note: + // + // The returned DNS TTL is not currently used to alter the refresh rate. This feature will be + // added in a future change. + // + // .. note: + // + // The refresh rate is rounded to the closest millisecond, and must be at least 1ms. + google.protobuf.Duration dns_refresh_rate = 3 + [(validate.rules).duration = {gte {nanos: 1000000}}]; + + // The TTL for hosts that are unused. Hosts that have not been used in the configured time + // interval will be purged. If not specified defaults to 5m. + // + // .. note: + // + // The TTL is only checked at the time of DNS refresh, as specified by *dns_refresh_rate*. This + // means that if the configured TTL is shorter than the refresh rate the host may not be removed + // immediately. + // + // .. note: + // + // The TTL has no relation to DNS TTL and is only used to control Envoy's resource usage. + google.protobuf.Duration host_ttl = 4 [(validate.rules).duration = {gt {}}]; + + // The maximum number of hosts that the cache will hold. If not specified defaults to 1024. + // + // .. note: + // + // The implementation is approximate and enforced independently on each worker thread, thus + // it is possible for the maximum hosts in the cache to go slightly above the configured + // value depending on timing. This is similar to how other circuit breakers work. + google.protobuf.UInt32Value max_hosts = 5 [(validate.rules).uint32 = {gt: 0}]; + + // If the DNS failure refresh rate is specified, + // this is used as the cache's DNS refresh rate when DNS requests are failing. If this setting is + // not specified, the failure refresh rate defaults to the dns_refresh_rate. + config.cluster.v4alpha.Cluster.RefreshRate dns_failure_refresh_rate = 6; + + // The config of circuit breakers for resolver. It provides a configurable threshold. + // Envoy will use dns cache circuit breakers with default settings even if this value is not set. + DnsCacheCircuitBreakers dns_cache_circuit_breaker = 7; + + // Always use TCP queries instead of UDP queries for DNS lookups. + // Setting this value causes failure if the + // ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during + // server startup. Apple' API only uses UDP for DNS resolution. + // This field is deprecated in favor of *dns_resolution_config* + // which aggregates all of the DNS resolver configuration in a single message. + bool hidden_envoy_deprecated_use_tcp_for_dns_lookups = 8 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; + + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + config.core.v4alpha.DnsResolutionConfig dns_resolution_config = 9; +} diff --git a/generated_api_shadow/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/BUILD b/generated_api_shadow/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/BUILD new file mode 100644 index 0000000000000..8486b45d71d91 --- /dev/null +++ b/generated_api_shadow/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/BUILD @@ -0,0 +1,13 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/extensions/common/dynamic_forward_proxy/v4alpha:pkg", + "//envoy/extensions/filters/http/dynamic_forward_proxy/v3:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/generated_api_shadow/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/dynamic_forward_proxy.proto b/generated_api_shadow/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/dynamic_forward_proxy.proto new file mode 100644 index 0000000000000..0dba06106b074 --- /dev/null +++ b/generated_api_shadow/envoy/extensions/filters/http/dynamic_forward_proxy/v4alpha/dynamic_forward_proxy.proto @@ -0,0 +1,64 @@ +syntax = "proto3"; + +package envoy.extensions.filters.http.dynamic_forward_proxy.v4alpha; + +import "envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.filters.http.dynamic_forward_proxy.v4alpha"; +option java_outer_classname = "DynamicForwardProxyProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; + +// [#protodoc-title: Dynamic forward proxy] + +// Configuration for the dynamic forward proxy HTTP filter. See the :ref:`architecture overview +// ` for more information. +// [#extension: envoy.filters.http.dynamic_forward_proxy] +message FilterConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.filters.http.dynamic_forward_proxy.v3.FilterConfig"; + + // The DNS cache configuration that the filter will attach to. Note this configuration must + // match that of associated :ref:`dynamic forward proxy cluster configuration + // `. + common.dynamic_forward_proxy.v4alpha.DnsCacheConfig dns_cache_config = 1 + [(validate.rules).message = {required: true}]; +} + +// Per route Configuration for the dynamic forward proxy HTTP filter. +message PerRouteConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.filters.http.dynamic_forward_proxy.v3.PerRouteConfig"; + + oneof host_rewrite_specifier { + // Indicates that before DNS lookup, the host header will be swapped with + // this value. If not set or empty, the original host header value + // will be used and no rewrite will happen. + // + // Note: this rewrite affects both DNS lookup and host header forwarding. However, this + // option shouldn't be used with + // :ref:`HCM host rewrite ` given that the + // value set here would be used for DNS lookups whereas the value set in the HCM would be used + // for host header forwarding which is not the desired outcome. + string host_rewrite_literal = 1; + + // Indicates that before DNS lookup, the host header will be swapped with + // the value of this header. If not set or empty, the original host header + // value will be used and no rewrite will happen. + // + // Note: this rewrite affects both DNS lookup and host header forwarding. However, this + // option shouldn't be used with + // :ref:`HCM host rewrite header ` + // given that the value set here would be used for DNS lookups whereas the value set in the HCM + // would be used for host header forwarding which is not the desired outcome. + // + // .. note:: + // + // If the header appears multiple times only the first value is used. + string host_rewrite_header = 2; + } +} diff --git a/generated_api_shadow/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/BUILD b/generated_api_shadow/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/BUILD new file mode 100644 index 0000000000000..465ea4ff28449 --- /dev/null +++ b/generated_api_shadow/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/BUILD @@ -0,0 +1,13 @@ +# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py. + +load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/extensions/common/dynamic_forward_proxy/v4alpha:pkg", + "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/generated_api_shadow/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/sni_dynamic_forward_proxy.proto b/generated_api_shadow/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/sni_dynamic_forward_proxy.proto new file mode 100644 index 0000000000000..de2947fcba9ec --- /dev/null +++ b/generated_api_shadow/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v4alpha/sni_dynamic_forward_proxy.proto @@ -0,0 +1,40 @@ +syntax = "proto3"; + +package envoy.extensions.filters.network.sni_dynamic_forward_proxy.v4alpha; + +import "envoy/extensions/common/dynamic_forward_proxy/v4alpha/dns_cache.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.filters.network.sni_dynamic_forward_proxy.v4alpha"; +option java_outer_classname = "SniDynamicForwardProxyProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).work_in_progress = true; +option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE; + +// [#protodoc-title: SNI dynamic forward proxy] + +// Configuration for the SNI-based dynamic forward proxy filter. See the +// :ref:`architecture overview ` for +// more information. Note this filter must be configured along with +// :ref:`TLS inspector listener filter ` +// to work. +// [#extension: envoy.filters.network.sni_dynamic_forward_proxy] +message FilterConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3alpha.FilterConfig"; + + // The DNS cache configuration that the filter will attach to. Note this + // configuration must match that of associated :ref:`dynamic forward proxy + // cluster configuration + // `. + common.dynamic_forward_proxy.v4alpha.DnsCacheConfig dns_cache_config = 1 + [(validate.rules).message = {required: true}]; + + oneof port_specifier { + // The port number to connect to the upstream. + uint32 port_value = 2 [(validate.rules).uint32 = {lte: 65535 gt: 0}]; + } +} diff --git a/generated_api_shadow/envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto b/generated_api_shadow/envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto index 32103540c1d2b..8221c11efbe78 100644 --- a/generated_api_shadow/envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto +++ b/generated_api_shadow/envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package envoy.extensions.filters.udp.dns_filter.v3alpha; -import "envoy/config/core/v3/address.proto"; import "envoy/config/core/v3/base.proto"; +import "envoy/config/core/v3/resolver.proto"; import "envoy/data/dns/v3/dns_table.proto"; import "google/protobuf/duration.proto"; @@ -51,10 +51,8 @@ message DnsFilterConfig { // number of retries multiplied by the resolver_timeout. google.protobuf.Duration resolver_timeout = 1 [(validate.rules).duration = {gte {seconds: 1}}]; - // A list of DNS servers to which we can forward queries. If not - // specified, Envoy will use the ambient DNS resolvers in the - // system. - repeated config.core.v3.Address upstream_resolvers = 2; + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + config.core.v3.DnsResolutionConfig dns_resolution_config = 2; // Controls how many outstanding external lookup contexts the filter tracks. // The context structure allows the filter to respond to every query even if the external diff --git a/generated_api_shadow/envoy/extensions/filters/udp/dns_filter/v4alpha/dns_filter.proto b/generated_api_shadow/envoy/extensions/filters/udp/dns_filter/v4alpha/dns_filter.proto index 54615b8b93ed8..6957e58dbb068 100644 --- a/generated_api_shadow/envoy/extensions/filters/udp/dns_filter/v4alpha/dns_filter.proto +++ b/generated_api_shadow/envoy/extensions/filters/udp/dns_filter/v4alpha/dns_filter.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package envoy.extensions.filters.udp.dns_filter.v4alpha; -import "envoy/config/core/v4alpha/address.proto"; import "envoy/config/core/v4alpha/base.proto"; +import "envoy/config/core/v4alpha/resolver.proto"; import "envoy/data/dns/v4alpha/dns_table.proto"; import "google/protobuf/duration.proto"; @@ -61,10 +61,8 @@ message DnsFilterConfig { // number of retries multiplied by the resolver_timeout. google.protobuf.Duration resolver_timeout = 1 [(validate.rules).duration = {gte {seconds: 1}}]; - // A list of DNS servers to which we can forward queries. If not - // specified, Envoy will use the ambient DNS resolvers in the - // system. - repeated config.core.v4alpha.Address upstream_resolvers = 2; + // DNS resolution configuration which includes the underlying dns resolver addresses and options. + config.core.v4alpha.DnsResolutionConfig dns_resolution_config = 2; // Controls how many outstanding external lookup contexts the filter tracks. // The context structure allows the filter to respond to every query even if the external diff --git a/generated_api_shadow/envoy/service/status/v3/csds.proto b/generated_api_shadow/envoy/service/status/v3/csds.proto index 3a1c748fc81b8..1d940d6a2dfe1 100644 --- a/generated_api_shadow/envoy/service/status/v3/csds.proto +++ b/generated_api_shadow/envoy/service/status/v3/csds.proto @@ -7,6 +7,8 @@ import "envoy/config/core/v3/base.proto"; import "envoy/type/matcher/v3/node.proto"; import "google/api/annotations.proto"; +import "google/protobuf/any.proto"; +import "google/protobuf/timestamp.proto"; import "envoy/annotations/deprecation.proto"; import "udpa/annotations/status.proto"; @@ -124,10 +126,60 @@ message ClientConfig { option (udpa.annotations.versioning).previous_message_type = "envoy.service.status.v2.ClientConfig"; + // GenericXdsConfig is used to specify the config status and the dump + // of any xDS resource identified by their type URL. It is the generalized + // version of the now deprecated ListenersConfigDump, ClustersConfigDump etc + // [#next-free-field: 10] + message GenericXdsConfig { + // Type_url represents the fully qualified name of xDS resource type + // like envoy.v3.Cluster, envoy.v3.ClusterLoadAssignment etc. + string type_url = 1; + + // Name of the xDS resource + string name = 2; + + // This is the :ref:`version_info ` + // in the last processed xDS discovery response. If there are only + // static bootstrap listeners, this field will be "" + string version_info = 3; + + // The xDS resource config. Actual content depends on the type + google.protobuf.Any xds_config = 4; + + // Timestamp when the xDS resource was last updated + google.protobuf.Timestamp last_updated = 5; + + // Per xDS resource config status. It is generated by management servers. + // It will not be present if the CSDS server is an xDS client. + ConfigStatus config_status = 6; + + // Per xDS resource status from the view of a xDS client + admin.v3.ClientResourceStatus client_status = 7; + + // Set if the last update failed, cleared after the next successful + // update. The *error_state* field contains the rejected version of + // this particular resource along with the reason and timestamp. For + // successfully updated or acknowledged resource, this field should + // be empty. + // [#not-implemented-hide:] + admin.v3.UpdateFailureState error_state = 8; + + // Is static resource is true if it is specified in the config supplied + // through the file at the startup. + bool is_static_resource = 9; + } + // Node for a particular client. config.core.v3.Node node = 1; - repeated PerXdsConfig xds_config = 2; + // This field is deprecated in favor of generic_xds_configs which is + // much simpler and uniform in structure. + repeated PerXdsConfig xds_config = 2 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; + + // Represents generic xDS config and the exact config structure depends on + // the type URL (like Cluster if it is CDS) + repeated GenericXdsConfig generic_xds_configs = 3; } message ClientStatusResponse { diff --git a/generated_api_shadow/envoy/service/status/v4alpha/csds.proto b/generated_api_shadow/envoy/service/status/v4alpha/csds.proto index 751e06b645cea..8a47045546f7f 100644 --- a/generated_api_shadow/envoy/service/status/v4alpha/csds.proto +++ b/generated_api_shadow/envoy/service/status/v4alpha/csds.proto @@ -7,6 +7,8 @@ import "envoy/config/core/v4alpha/base.proto"; import "envoy/type/matcher/v4alpha/node.proto"; import "google/api/annotations.proto"; +import "google/protobuf/any.proto"; +import "google/protobuf/timestamp.proto"; import "envoy/annotations/deprecation.proto"; import "udpa/annotations/status.proto"; @@ -124,10 +126,63 @@ message ClientConfig { option (udpa.annotations.versioning).previous_message_type = "envoy.service.status.v3.ClientConfig"; + // GenericXdsConfig is used to specify the config status and the dump + // of any xDS resource identified by their type URL. It is the generalized + // version of the now deprecated ListenersConfigDump, ClustersConfigDump etc + // [#next-free-field: 10] + message GenericXdsConfig { + option (udpa.annotations.versioning).previous_message_type = + "envoy.service.status.v3.ClientConfig.GenericXdsConfig"; + + // Type_url represents the fully qualified name of xDS resource type + // like envoy.v3.Cluster, envoy.v3.ClusterLoadAssignment etc. + string type_url = 1; + + // Name of the xDS resource + string name = 2; + + // This is the :ref:`version_info ` + // in the last processed xDS discovery response. If there are only + // static bootstrap listeners, this field will be "" + string version_info = 3; + + // The xDS resource config. Actual content depends on the type + google.protobuf.Any xds_config = 4; + + // Timestamp when the xDS resource was last updated + google.protobuf.Timestamp last_updated = 5; + + // Per xDS resource config status. It is generated by management servers. + // It will not be present if the CSDS server is an xDS client. + ConfigStatus config_status = 6; + + // Per xDS resource status from the view of a xDS client + admin.v4alpha.ClientResourceStatus client_status = 7; + + // Set if the last update failed, cleared after the next successful + // update. The *error_state* field contains the rejected version of + // this particular resource along with the reason and timestamp. For + // successfully updated or acknowledged resource, this field should + // be empty. + // [#not-implemented-hide:] + admin.v4alpha.UpdateFailureState error_state = 8; + + // Is static resource is true if it is specified in the config supplied + // through the file at the startup. + bool is_static_resource = 9; + } + // Node for a particular client. config.core.v4alpha.Node node = 1; - repeated PerXdsConfig xds_config = 2; + // This field is deprecated in favor of generic_xds_configs which is + // much simpler and uniform in structure. + repeated PerXdsConfig hidden_envoy_deprecated_xds_config = 2 + [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; + + // Represents generic xDS config and the exact config structure depends on + // the type URL (like Cluster if it is CDS) + repeated GenericXdsConfig generic_xds_configs = 3; } message ClientStatusResponse { diff --git a/source/common/access_log/BUILD b/source/common/access_log/BUILD index 00bfcb101f798..0ba22ffe9a4d8 100644 --- a/source/common/access_log/BUILD +++ b/source/common/access_log/BUILD @@ -16,13 +16,13 @@ envoy_cc_library( "abseil_hash", ], deps = [ - "//include/envoy/access_log:access_log_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/filesystem:filesystem_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/server:access_log_config_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/access_log:access_log_interface", + "//envoy/config:typed_config_interface", + "//envoy/filesystem:filesystem_interface", + "//envoy/http:header_map_interface", + "//envoy/runtime:runtime_interface", + "//envoy/server:access_log_config_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:assert_lib", "//source/common/common:utility_lib", "//source/common/config:utility_lib", @@ -43,8 +43,8 @@ envoy_cc_library( srcs = ["access_log_manager_impl.cc"], hdrs = ["access_log_manager_impl.h"], deps = [ - "//include/envoy/access_log:access_log_interface", - "//include/envoy/api:api_interface", + "//envoy/access_log:access_log_interface", + "//envoy/api:api_interface", "//source/common/buffer:buffer_lib", "//source/common/common:logger_lib", "//source/common/common:thread_lib", diff --git a/source/common/access_log/access_log_impl.cc b/source/common/access_log/access_log_impl.cc index 6eeeeafb9f11b..6e8b0542d4933 100644 --- a/source/common/access_log/access_log_impl.cc +++ b/source/common/access_log/access_log_impl.cc @@ -1,4 +1,4 @@ -#include "common/access_log/access_log_impl.h" +#include "source/common/access_log/access_log_impl.h" #include #include @@ -11,17 +11,17 @@ #include "envoy/runtime/runtime.h" #include "envoy/upstream/upstream.h" -#include "common/common/assert.h" -#include "common/common/utility.h" -#include "common/config/metadata.h" -#include "common/config/utility.h" -#include "common/http/header_map_impl.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" -#include "common/stream_info/utility.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/common/config/metadata.h" +#include "source/common/config/utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stream_info/utility.h" +#include "source/common/tracing/http_tracer_impl.h" #include "absl/types/optional.h" diff --git a/source/common/access_log/access_log_impl.h b/source/common/access_log/access_log_impl.h index 6993012a356da..1a524bd2c1b24 100644 --- a/source/common/access_log/access_log_impl.h +++ b/source/common/access_log/access_log_impl.h @@ -12,10 +12,10 @@ #include "envoy/server/access_log_config.h" #include "envoy/type/v3/percent.pb.h" -#include "common/common/matchers.h" -#include "common/grpc/status.h" -#include "common/http/header_utility.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/matchers.h" +#include "source/common/grpc/status.h" +#include "source/common/http/header_utility.h" +#include "source/common/protobuf/protobuf.h" #include "absl/container/node_hash_set.h" #include "absl/hash/hash.h" diff --git a/source/common/access_log/access_log_manager_impl.cc b/source/common/access_log/access_log_manager_impl.cc index 14bcb798b06da..9c5f83a189e74 100644 --- a/source/common/access_log/access_log_manager_impl.cc +++ b/source/common/access_log/access_log_manager_impl.cc @@ -1,12 +1,12 @@ -#include "common/access_log/access_log_manager_impl.h" +#include "source/common/access_log/access_log_manager_impl.h" #include #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/lock_guard.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/lock_guard.h" #include "absl/container/fixed_array.h" diff --git a/source/common/access_log/access_log_manager_impl.h b/source/common/access_log/access_log_manager_impl.h index 6a94ccedf2752..23651b874e1cc 100644 --- a/source/common/access_log/access_log_manager_impl.h +++ b/source/common/access_log/access_log_manager_impl.h @@ -9,9 +9,9 @@ #include "envoy/stats/stats_macros.h" #include "envoy/stats/store.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" -#include "common/common/thread.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" #include "absl/container/node_hash_map.h" diff --git a/source/common/api/BUILD b/source/common/api/BUILD index 7e7264f8f0ff3..60412c4513432 100644 --- a/source/common/api/BUILD +++ b/source/common/api/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( srcs = ["api_impl.cc"], hdrs = ["api_impl.h"], deps = [ - "//include/envoy/api:api_interface", + "//envoy/api:api_interface", "//source/common/common:thread_lib", "//source/common/event:dispatcher_lib", "//source/common/network:socket_lib", @@ -39,12 +39,13 @@ envoy_cc_library( "//bazel:windows_x86_64": ["win32/os_sys_calls_impl.h"], "//conditions:default": ["posix/os_sys_calls_impl.h"], }) + envoy_select_hot_restart(["posix/os_sys_calls_impl_hot_restart.h"]), + include_prefix = "source/common/api", strip_include_prefix = select({ "//bazel:windows_x86_64": "win32", "//conditions:default": "posix", }), deps = [ - "//include/envoy/api:os_sys_calls_interface", + "//envoy/api:os_sys_calls_interface", "//source/common/singleton:threadsafe_singleton", ], ) diff --git a/source/common/api/api_impl.cc b/source/common/api/api_impl.cc index f91e5c6a1c6fb..73de8f4a320c2 100644 --- a/source/common/api/api_impl.cc +++ b/source/common/api/api_impl.cc @@ -1,10 +1,10 @@ -#include "common/api/api_impl.h" +#include "source/common/api/api_impl.h" #include #include -#include "common/common/thread.h" -#include "common/event/dispatcher_impl.h" +#include "source/common/common/thread.h" +#include "source/common/event/dispatcher_impl.h" namespace Envoy { namespace Api { diff --git a/source/common/api/posix/os_sys_calls_impl.cc b/source/common/api/posix/os_sys_calls_impl.cc index 9428dc7c5e6fd..ad2a36dd2af1a 100644 --- a/source/common/api/posix/os_sys_calls_impl.cc +++ b/source/common/api/posix/os_sys_calls_impl.cc @@ -5,7 +5,7 @@ #include #include -#include "common/api/os_sys_calls_impl.h" +#include "source/common/api/os_sys_calls_impl.h" namespace Envoy { namespace Api { diff --git a/source/common/api/posix/os_sys_calls_impl.h b/source/common/api/posix/os_sys_calls_impl.h index bb23b16aad92f..77ccb0da2b083 100644 --- a/source/common/api/posix/os_sys_calls_impl.h +++ b/source/common/api/posix/os_sys_calls_impl.h @@ -4,7 +4,7 @@ #include "envoy/api/os_sys_calls.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/singleton/threadsafe_singleton.h" namespace Envoy { namespace Api { diff --git a/source/common/api/posix/os_sys_calls_impl_hot_restart.cc b/source/common/api/posix/os_sys_calls_impl_hot_restart.cc index 7f9d6e0ffd280..813ffe1b30b92 100644 --- a/source/common/api/posix/os_sys_calls_impl_hot_restart.cc +++ b/source/common/api/posix/os_sys_calls_impl_hot_restart.cc @@ -1,6 +1,6 @@ #include -#include "common/api/os_sys_calls_impl_hot_restart.h" +#include "source/common/api/os_sys_calls_impl_hot_restart.h" namespace Envoy { namespace Api { diff --git a/source/common/api/posix/os_sys_calls_impl_hot_restart.h b/source/common/api/posix/os_sys_calls_impl_hot_restart.h index 59ce2cb6bed9c..146b421dac911 100644 --- a/source/common/api/posix/os_sys_calls_impl_hot_restart.h +++ b/source/common/api/posix/os_sys_calls_impl_hot_restart.h @@ -2,7 +2,7 @@ #include "envoy/api/os_sys_calls_hot_restart.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/singleton/threadsafe_singleton.h" namespace Envoy { namespace Api { diff --git a/source/common/api/posix/os_sys_calls_impl_linux.cc b/source/common/api/posix/os_sys_calls_impl_linux.cc index 1eece81f7822c..2971191ac88f3 100644 --- a/source/common/api/posix/os_sys_calls_impl_linux.cc +++ b/source/common/api/posix/os_sys_calls_impl_linux.cc @@ -6,7 +6,7 @@ #include -#include "common/api/os_sys_calls_impl_linux.h" +#include "source/common/api/os_sys_calls_impl_linux.h" namespace Envoy { namespace Api { diff --git a/source/common/api/posix/os_sys_calls_impl_linux.h b/source/common/api/posix/os_sys_calls_impl_linux.h index 7a250943c7ace..eaa72435c164c 100644 --- a/source/common/api/posix/os_sys_calls_impl_linux.h +++ b/source/common/api/posix/os_sys_calls_impl_linux.h @@ -6,7 +6,7 @@ #include "envoy/api/os_sys_calls_linux.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/singleton/threadsafe_singleton.h" namespace Envoy { namespace Api { diff --git a/source/common/api/win32/os_sys_calls_impl.cc b/source/common/api/win32/os_sys_calls_impl.cc index 717c3a1965d87..d534e5e07cd02 100644 --- a/source/common/api/win32/os_sys_calls_impl.cc +++ b/source/common/api/win32/os_sys_calls_impl.cc @@ -6,7 +6,7 @@ #include #include -#include "common/api/os_sys_calls_impl.h" +#include "source/common/api/os_sys_calls_impl.h" #define DWORD_MAX UINT32_MAX diff --git a/source/common/api/win32/os_sys_calls_impl.h b/source/common/api/win32/os_sys_calls_impl.h index 89e75f40a29cf..4dc62e0770d2b 100644 --- a/source/common/api/win32/os_sys_calls_impl.h +++ b/source/common/api/win32/os_sys_calls_impl.h @@ -4,7 +4,7 @@ #include "envoy/api/os_sys_calls.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/singleton/threadsafe_singleton.h" namespace Envoy { namespace Api { diff --git a/source/common/buffer/BUILD b/source/common/buffer/BUILD index 171aa8a089872..832d72c913128 100644 --- a/source/common/buffer/BUILD +++ b/source/common/buffer/BUILD @@ -24,7 +24,7 @@ envoy_cc_library( srcs = ["buffer_impl.cc"], hdrs = ["buffer_impl.h"], deps = [ - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/common:non_copyable", "//source/common/common:utility_lib", "//source/common/event:libevent_lib", diff --git a/source/common/buffer/buffer_impl.cc b/source/common/buffer/buffer_impl.cc index 3187cae8abe52..85a7bd34f6582 100644 --- a/source/common/buffer/buffer_impl.cc +++ b/source/common/buffer/buffer_impl.cc @@ -1,10 +1,10 @@ -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include #include #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/container/fixed_array.h" #include "event2/buffer.h" diff --git a/source/common/buffer/buffer_impl.h b/source/common/buffer/buffer_impl.h index 35d2c16b8079c..8f7977f9c269c 100644 --- a/source/common/buffer/buffer_impl.h +++ b/source/common/buffer/buffer_impl.h @@ -8,10 +8,10 @@ #include "envoy/buffer/buffer.h" -#include "common/common/assert.h" -#include "common/common/non_copyable.h" -#include "common/common/utility.h" -#include "common/event/libevent.h" +#include "source/common/common/assert.h" +#include "source/common/common/non_copyable.h" +#include "source/common/common/utility.h" +#include "source/common/event/libevent.h" namespace Envoy { namespace Buffer { diff --git a/source/common/buffer/watermark_buffer.cc b/source/common/buffer/watermark_buffer.cc index eefa6022c8ef0..781321f99dc44 100644 --- a/source/common/buffer/watermark_buffer.cc +++ b/source/common/buffer/watermark_buffer.cc @@ -1,7 +1,7 @@ -#include "common/buffer/watermark_buffer.h" +#include "source/common/buffer/watermark_buffer.h" -#include "common/common/assert.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/assert.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Buffer { diff --git a/source/common/buffer/watermark_buffer.h b/source/common/buffer/watermark_buffer.h index c8700cc0ca151..3a432c76481c2 100644 --- a/source/common/buffer/watermark_buffer.h +++ b/source/common/buffer/watermark_buffer.h @@ -3,7 +3,7 @@ #include #include -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" namespace Envoy { namespace Buffer { diff --git a/source/common/buffer/zero_copy_input_stream_impl.cc b/source/common/buffer/zero_copy_input_stream_impl.cc index bfd0e4794c0a3..83bccc807c047 100644 --- a/source/common/buffer/zero_copy_input_stream_impl.cc +++ b/source/common/buffer/zero_copy_input_stream_impl.cc @@ -1,7 +1,7 @@ -#include "common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Buffer { diff --git a/source/common/buffer/zero_copy_input_stream_impl.h b/source/common/buffer/zero_copy_input_stream_impl.h index 23304d06e34f6..07d4a3f3afb11 100644 --- a/source/common/buffer/zero_copy_input_stream_impl.h +++ b/source/common/buffer/zero_copy_input_stream_impl.h @@ -5,7 +5,7 @@ #include "envoy/buffer/buffer.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { diff --git a/source/common/chromium_url/envoy_shim.h b/source/common/chromium_url/envoy_shim.h index 2b7443926c1f5..c581e21d45bf8 100644 --- a/source/common/chromium_url/envoy_shim.h +++ b/source/common/chromium_url/envoy_shim.h @@ -1,6 +1,6 @@ #pragma once -#include "common/common/assert.h" +#include "source/common/common/assert.h" // This is a minimal Envoy adaptation layer for the Chromium URL library. // NOLINT(namespace-envoy) diff --git a/source/common/chromium_url/url_canon.cc b/source/common/chromium_url/url_canon.cc index b9ad1b829726c..79b36e986ca52 100644 --- a/source/common/chromium_url/url_canon.cc +++ b/source/common/chromium_url/url_canon.cc @@ -5,9 +5,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/chromium_url/url_canon.h" +#include "source/common/chromium_url/url_canon.h" -#include "common/chromium_url/envoy_shim.h" +#include "source/common/chromium_url/envoy_shim.h" namespace chromium_url { diff --git a/source/common/chromium_url/url_canon.h b/source/common/chromium_url/url_canon.h index a5d0939cb7616..d56346d5ee164 100644 --- a/source/common/chromium_url/url_canon.h +++ b/source/common/chromium_url/url_canon.h @@ -11,9 +11,9 @@ #include #include -#include "common/chromium_url/envoy_shim.h" -#include "common/chromium_url/url_parse.h" -#include "common/common/mem_block_builder.h" +#include "source/common/chromium_url/envoy_shim.h" +#include "source/common/chromium_url/url_parse.h" +#include "source/common/common/mem_block_builder.h" namespace chromium_url { diff --git a/source/common/chromium_url/url_canon_internal.cc b/source/common/chromium_url/url_canon_internal.cc index 38c932cad5b47..ee29b04ef162a 100644 --- a/source/common/chromium_url/url_canon_internal.cc +++ b/source/common/chromium_url/url_canon_internal.cc @@ -5,7 +5,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/chromium_url/url_canon_internal.h" +#include "source/common/chromium_url/url_canon_internal.h" namespace chromium_url { diff --git a/source/common/chromium_url/url_canon_internal.h b/source/common/chromium_url/url_canon_internal.h index 8c405b49814a0..84c761a6a0686 100644 --- a/source/common/chromium_url/url_canon_internal.h +++ b/source/common/chromium_url/url_canon_internal.h @@ -16,8 +16,8 @@ #include #include -#include "common/chromium_url/envoy_shim.h" -#include "common/chromium_url/url_canon.h" +#include "source/common/chromium_url/envoy_shim.h" +#include "source/common/chromium_url/url_canon.h" namespace chromium_url { diff --git a/source/common/chromium_url/url_canon_path.cc b/source/common/chromium_url/url_canon_path.cc index 22587c0ab8a10..17eec73510db0 100644 --- a/source/common/chromium_url/url_canon_path.cc +++ b/source/common/chromium_url/url_canon_path.cc @@ -7,9 +7,9 @@ #include -#include "common/chromium_url/url_canon.h" -#include "common/chromium_url/url_canon_internal.h" -#include "common/chromium_url/url_parse_internal.h" +#include "source/common/chromium_url/url_canon.h" +#include "source/common/chromium_url/url_canon_internal.h" +#include "source/common/chromium_url/url_parse_internal.h" namespace chromium_url { diff --git a/source/common/chromium_url/url_canon_stdstring.cc b/source/common/chromium_url/url_canon_stdstring.cc index 0c61831e5f1ac..0d62cf5764245 100644 --- a/source/common/chromium_url/url_canon_stdstring.cc +++ b/source/common/chromium_url/url_canon_stdstring.cc @@ -5,7 +5,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "common/chromium_url/url_canon_stdstring.h" +#include "source/common/chromium_url/url_canon_stdstring.h" namespace chromium_url { diff --git a/source/common/chromium_url/url_canon_stdstring.h b/source/common/chromium_url/url_canon_stdstring.h index e14d6c22e74e8..6292c4e61dae3 100644 --- a/source/common/chromium_url/url_canon_stdstring.h +++ b/source/common/chromium_url/url_canon_stdstring.h @@ -14,8 +14,8 @@ #include -#include "common/chromium_url/envoy_shim.h" -#include "common/chromium_url/url_canon.h" +#include "source/common/chromium_url/envoy_shim.h" +#include "source/common/chromium_url/url_canon.h" #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ TypeName(const TypeName&) = delete; \ diff --git a/source/common/common/BUILD b/source/common/common/BUILD index 664e2564e3fa3..15067b74e8e02 100644 --- a/source/common/common/BUILD +++ b/source/common/common/BUILD @@ -5,7 +5,6 @@ load( "envoy_cc_platform_dep", "envoy_cc_posix_library", "envoy_cc_win32_library", - "envoy_include_prefix", "envoy_package", ) @@ -44,8 +43,8 @@ envoy_cc_library( hdrs = ["backoff_strategy.h"], deps = [ ":assert_lib", - "//include/envoy/common:backoff_strategy_interface", - "//include/envoy/common:random_generator_interface", + "//envoy/common:backoff_strategy_interface", + "//envoy/common:random_generator_interface", ], ) @@ -56,7 +55,7 @@ envoy_cc_library( deps = [ ":assert_lib", ":empty_string", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", ], ) @@ -111,8 +110,7 @@ envoy_basic_cc_library( "abseil_strings", "fmtlib", ], - include_prefix = envoy_include_prefix(package_name()), - deps = ["//include/envoy/common:base_includes"], + deps = ["//envoy/common:base_includes"], ) envoy_cc_library( @@ -189,6 +187,7 @@ envoy_cc_library( envoy_cc_library( name = "logger_impl_lib_standard", hdrs = ["standard/logger_impl.h"], + include_prefix = "source/common/common", strip_include_prefix = "standard", deps = [":base_logger_lib"], ) @@ -203,6 +202,7 @@ envoy_cc_library( "//bazel:android_logger": ["android/logger_impl.h"], "//conditions:default": [], }), + include_prefix = "source/common/common", strip_include_prefix = "android", deps = [":base_logger_lib"], ) @@ -227,7 +227,7 @@ envoy_cc_library( external_deps = ["abseil_synchronization"], deps = [ ":assert_lib", - "//include/envoy/common:mutex_tracer", + "//envoy/common:mutex_tracer", ], ) @@ -241,7 +241,7 @@ envoy_cc_library( ":dump_state_utils", ":macros", ":minimal_logger_lib", - "//include/envoy/access_log:access_log_interface", + "//envoy/access_log:access_log_interface", ], ) @@ -249,8 +249,8 @@ envoy_cc_library( name = "basic_resource_lib", hdrs = ["basic_resource_impl.h"], deps = [ - "//include/envoy/common:resource_interface", - "//include/envoy/runtime:runtime_interface", + "//envoy/common:resource_interface", + "//envoy/runtime:runtime_interface", ], ) @@ -266,7 +266,7 @@ envoy_cc_library( external_deps = ["abseil_optional"], deps = [ ":utility_lib", - "//include/envoy/common:matchers_interface", + "//envoy/common:matchers_interface", "//source/common/common:regex_lib", "//source/common/config:metadata_lib", "//source/common/http:path_utility_lib", @@ -287,7 +287,7 @@ envoy_cc_library( external_deps = ["ssl"], deps = [ ":assert_lib", - "//include/envoy/common:random_generator_interface", + "//envoy/common:random_generator_interface", ], ) @@ -297,7 +297,7 @@ envoy_cc_library( hdrs = ["regex.h"], deps = [ ":assert_lib", - "//include/envoy/common:regex_interface", + "//envoy/common:regex_interface", "//source/common/protobuf:utility_lib", "//source/common/stats:symbol_table_lib", "@com_googlesource_code_re2//:re2", @@ -319,8 +319,8 @@ envoy_cc_library( name = "scope_tracker", hdrs = ["scope_tracker.h"], deps = [ - "//include/envoy/common:scope_tracker_interface", - "//include/envoy/event:dispatcher_interface", + "//envoy/common:scope_tracker_interface", + "//envoy/event:dispatcher_interface", ], ) @@ -328,7 +328,7 @@ envoy_cc_library( name = "scope_tracked_object_stack", hdrs = ["scope_tracked_object_stack.h"], deps = [ - "//include/envoy/common:scope_tracker_interface", + "//envoy/common:scope_tracker_interface", ], ) @@ -368,10 +368,11 @@ envoy_cc_posix_library( name = "thread_impl_lib", srcs = ["posix/thread_impl.cc"], hdrs = ["posix/thread_impl.h"], + include_prefix = "source/common/common", strip_include_prefix = "posix", deps = [ ":assert_lib", - "//include/envoy/thread:thread_interface", + "//envoy/thread:thread_interface", ], ) @@ -379,10 +380,11 @@ envoy_cc_win32_library( name = "thread_impl_lib", srcs = ["win32/thread_impl.cc"], hdrs = ["win32/thread_impl.h"], + include_prefix = "source/common/common", strip_include_prefix = "win32", deps = [ ":assert_lib", - "//include/envoy/thread:thread_interface", + "//envoy/thread:thread_interface", ], ) @@ -391,7 +393,7 @@ envoy_cc_library( hdrs = ["lock_guard.h"], deps = [ ":thread_annotations", - "//include/envoy/thread:thread_interface", + "//envoy/thread:thread_interface", ], ) @@ -404,8 +406,8 @@ envoy_cc_library( ":assert_lib", ":hash_lib", ":non_copyable", - "//include/envoy/common:interval_set_interface", - "//include/envoy/common:time_interface", + "//envoy/common:interval_set_interface", + "//envoy/common:time_interface", "//source/common/singleton:const_singleton", ], ) @@ -415,7 +417,7 @@ envoy_cc_library( hdrs = ["callback_impl.h"], deps = [ ":assert_lib", - "//include/envoy/common:callback", + "//envoy/common:callback", ], ) @@ -441,8 +443,8 @@ envoy_cc_library( srcs = ["token_bucket_impl.cc"], hdrs = ["token_bucket_impl.h"], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/common:token_bucket_interface", + "//envoy/common:time_interface", + "//envoy/common:token_bucket_interface", "//source/common/common:utility_lib", ], ) @@ -452,7 +454,7 @@ envoy_cc_library( srcs = ["shared_token_bucket_impl.cc"], hdrs = ["shared_token_bucket_impl.h"], deps = [ - "//include/envoy/common:time_interface", + "//envoy/common:time_interface", "//source/common/common:thread_lib", "//source/common/common:thread_synchronizer_lib", "//source/common/common:token_bucket_impl_lib", diff --git a/source/common/common/android/logger_impl.cc b/source/common/common/android/logger_impl.cc index 90af89767d041..4a566863eeea5 100644 --- a/source/common/common/android/logger_impl.cc +++ b/source/common/common/android/logger_impl.cc @@ -1,4 +1,4 @@ -#include "common/common/logger_impl.h" +#include "source/common/common/logger_impl.h" #include "spdlog/sinks/android_sink.h" diff --git a/source/common/common/android/logger_impl.h b/source/common/common/android/logger_impl.h index 11bb1a7a48383..4e75598dcf8e5 100644 --- a/source/common/common/android/logger_impl.h +++ b/source/common/common/android/logger_impl.h @@ -1,6 +1,6 @@ #pragma once -#include "common/common/base_logger.h" +#include "source/common/common/base_logger.h" namespace Envoy { namespace Logger { diff --git a/source/common/common/assert.cc b/source/common/common/assert.cc index ae26004b64275..9f79edc0bd655 100644 --- a/source/common/common/assert.cc +++ b/source/common/common/assert.cc @@ -1,4 +1,4 @@ -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/str_join.h" diff --git a/source/common/common/assert.h b/source/common/common/assert.h index 2580910700aef..2e184bbe13168 100644 --- a/source/common/common/assert.h +++ b/source/common/common/assert.h @@ -2,7 +2,7 @@ #include -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Assert { diff --git a/source/common/common/backoff_strategy.cc b/source/common/common/backoff_strategy.cc index 8e007a6554ab4..46a298d119032 100644 --- a/source/common/common/backoff_strategy.cc +++ b/source/common/common/backoff_strategy.cc @@ -1,4 +1,4 @@ -#include "common/common/backoff_strategy.h" +#include "source/common/common/backoff_strategy.h" namespace Envoy { diff --git a/source/common/common/backoff_strategy.h b/source/common/common/backoff_strategy.h index 2247d5dde730c..cb47e9c6279b9 100644 --- a/source/common/common/backoff_strategy.h +++ b/source/common/common/backoff_strategy.h @@ -6,7 +6,7 @@ #include "envoy/common/backoff_strategy.h" #include "envoy/common/random_generator.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { diff --git a/source/common/common/base64.cc b/source/common/common/base64.cc index fc4cd599c20d3..8d0f02e090c4d 100644 --- a/source/common/common/base64.cc +++ b/source/common/common/base64.cc @@ -1,10 +1,10 @@ -#include "common/common/base64.h" +#include "source/common/common/base64.h" #include #include -#include "common/common/assert.h" -#include "common/common/empty_string.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" #include "absl/container/fixed_array.h" diff --git a/source/common/common/base_logger.cc b/source/common/common/base_logger.cc index 2491ab389dc33..f42eeafdb442c 100644 --- a/source/common/common/base_logger.cc +++ b/source/common/common/base_logger.cc @@ -1,4 +1,4 @@ -#include "common/common/base_logger.h" +#include "source/common/common/base_logger.h" namespace Envoy { namespace Logger { diff --git a/source/common/common/basic_resource_impl.h b/source/common/common/basic_resource_impl.h index 820412e04a88a..8fedbb4ad8013 100644 --- a/source/common/common/basic_resource_impl.h +++ b/source/common/common/basic_resource_impl.h @@ -5,7 +5,7 @@ #include "envoy/common/resource.h" #include "envoy/runtime/runtime.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/types/optional.h" diff --git a/source/common/common/callback_impl.h b/source/common/common/callback_impl.h index 0e8d0bd017f2c..367aa05591ecb 100644 --- a/source/common/common/callback_impl.h +++ b/source/common/common/callback_impl.h @@ -5,7 +5,7 @@ #include "envoy/common/callback.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Common { diff --git a/source/common/common/cleanup.h b/source/common/common/cleanup.h index abcf23f6a7b7a..7f18c9854c21c 100644 --- a/source/common/common/cleanup.h +++ b/source/common/common/cleanup.h @@ -3,7 +3,7 @@ #include #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { diff --git a/source/common/common/containers.h b/source/common/common/containers.h index ac96e6949dfbf..a2f4090b418ce 100644 --- a/source/common/common/containers.h +++ b/source/common/common/containers.h @@ -3,7 +3,7 @@ #include #include -#include "common/common/cleanup.h" +#include "source/common/common/cleanup.h" namespace Envoy { namespace Common { diff --git a/source/common/common/debug_recursion_checker.h b/source/common/common/debug_recursion_checker.h index e2ab275ca219d..437029db4415d 100644 --- a/source/common/common/debug_recursion_checker.h +++ b/source/common/common/debug_recursion_checker.h @@ -1,6 +1,6 @@ #pragma once -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Common { diff --git a/source/common/common/fancy_logger.cc b/source/common/common/fancy_logger.cc index 3c28414cbf405..4c5686ec9a274 100644 --- a/source/common/common/fancy_logger.cc +++ b/source/common/common/fancy_logger.cc @@ -1,9 +1,9 @@ -#include "common/common/fancy_logger.h" +#include "source/common/common/fancy_logger.h" #include #include -#include "common/common/logger.h" +#include "source/common/common/logger.h" using spdlog::level::level_enum; diff --git a/source/common/common/fancy_logger.h b/source/common/common/fancy_logger.h index bd3e37d2dbd4a..da149d9cdfbf5 100644 --- a/source/common/common/fancy_logger.h +++ b/source/common/common/fancy_logger.h @@ -2,7 +2,7 @@ #include -#include "common/common/macros.h" +#include "source/common/common/macros.h" #include "absl/container/flat_hash_map.h" #include "absl/synchronization/mutex.h" diff --git a/source/common/common/hash.cc b/source/common/common/hash.cc index 984f040fa3dae..4db50b44e3d2a 100644 --- a/source/common/common/hash.cc +++ b/source/common/common/hash.cc @@ -1,4 +1,4 @@ -#include "common/common/hash.h" +#include "source/common/common/hash.h" #include "absl/strings/string_view.h" diff --git a/source/common/common/hash.h b/source/common/common/hash.h index de37144ab5d82..2c9fb22e777c8 100644 --- a/source/common/common/hash.h +++ b/source/common/common/hash.h @@ -2,8 +2,8 @@ #include -#include "common/common/macros.h" -#include "common/common/safe_memcpy.h" +#include "source/common/common/macros.h" +#include "source/common/common/safe_memcpy.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" diff --git a/source/common/common/hex.cc b/source/common/common/hex.cc index 7c0b7f8c2e132..83d6788b50fb9 100644 --- a/source/common/common/hex.cc +++ b/source/common/common/hex.cc @@ -1,4 +1,4 @@ -#include "common/common/hex.h" +#include "source/common/common/hex.h" #include #include @@ -7,8 +7,8 @@ #include "envoy/common/exception.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" namespace Envoy { std::string Hex::encode(const uint8_t* data, size_t length) { diff --git a/source/common/common/json_escape_string.h b/source/common/common/json_escape_string.h index 94e93bfce2556..679f0ef1da4c1 100644 --- a/source/common/common/json_escape_string.h +++ b/source/common/common/json_escape_string.h @@ -3,7 +3,7 @@ #include #include -#include "common/common/macros.h" +#include "source/common/common/macros.h" #include "absl/strings/string_view.h" diff --git a/source/common/common/linked_object.h b/source/common/common/linked_object.h index 9c65e085b76f7..bad90149d72db 100644 --- a/source/common/common/linked_object.h +++ b/source/common/common/linked_object.h @@ -3,7 +3,7 @@ #include #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { diff --git a/source/common/common/logger.cc b/source/common/common/logger.cc index cca504814e426..fa62bc23f2de2 100644 --- a/source/common/common/logger.cc +++ b/source/common/common/logger.cc @@ -1,4 +1,4 @@ -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include // use direct system-assert to avoid cyclic dependency. #include @@ -6,8 +6,8 @@ #include #include -#include "common/common/json_escape_string.h" -#include "common/common/lock_guard.h" +#include "source/common/common/json_escape_string.h" +#include "source/common/common/lock_guard.h" #include "absl/strings/ascii.h" #include "absl/strings/escaping.h" diff --git a/source/common/common/logger.h b/source/common/common/logger.h index 4db2216c43b3a..03edb6b569303 100644 --- a/source/common/common/logger.h +++ b/source/common/common/logger.h @@ -9,12 +9,12 @@ #include "envoy/thread/thread.h" -#include "common/common/base_logger.h" -#include "common/common/fancy_logger.h" -#include "common/common/fmt.h" -#include "common/common/logger_impl.h" -#include "common/common/macros.h" -#include "common/common/non_copyable.h" +#include "source/common/common/base_logger.h" +#include "source/common/common/fancy_logger.h" +#include "source/common/common/fmt.h" +#include "source/common/common/logger_impl.h" +#include "source/common/common/macros.h" +#include "source/common/common/non_copyable.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" diff --git a/source/common/common/logger_delegates.cc b/source/common/common/logger_delegates.cc index df6bc446c83e2..8f008b296fb7e 100644 --- a/source/common/common/logger_delegates.cc +++ b/source/common/common/logger_delegates.cc @@ -1,4 +1,4 @@ -#include "common/common/logger_delegates.h" +#include "source/common/common/logger_delegates.h" #include // use direct system-assert to avoid cyclic dependency. #include diff --git a/source/common/common/logger_delegates.h b/source/common/common/logger_delegates.h index f6058fcd507fa..f9e1d7da69cc1 100644 --- a/source/common/common/logger_delegates.h +++ b/source/common/common/logger_delegates.h @@ -6,8 +6,8 @@ #include "envoy/access_log/access_log.h" -#include "common/common/logger.h" -#include "common/common/macros.h" +#include "source/common/common/logger.h" +#include "source/common/common/macros.h" #include "absl/strings/string_view.h" diff --git a/source/common/common/matchers.cc b/source/common/common/matchers.cc index 490fb0f019e2d..b1970aead08cb 100644 --- a/source/common/common/matchers.cc +++ b/source/common/common/matchers.cc @@ -1,4 +1,4 @@ -#include "common/common/matchers.h" +#include "source/common/common/matchers.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/type/matcher/v3/metadata.pb.h" @@ -6,10 +6,10 @@ #include "envoy/type/matcher/v3/string.pb.h" #include "envoy/type/matcher/v3/value.pb.h" -#include "common/common/macros.h" -#include "common/common/regex.h" -#include "common/config/metadata.h" -#include "common/http/path_utility.h" +#include "source/common/common/macros.h" +#include "source/common/common/regex.h" +#include "source/common/config/metadata.h" +#include "source/common/http/path_utility.h" #include "absl/strings/match.h" diff --git a/source/common/common/matchers.h b/source/common/common/matchers.h index 10f6f34fddd97..396203ce5b50d 100644 --- a/source/common/common/matchers.h +++ b/source/common/common/matchers.h @@ -11,8 +11,8 @@ #include "envoy/type/matcher/v3/string.pb.h" #include "envoy/type/matcher/v3/value.pb.h" -#include "common/common/utility.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/utility.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Matchers { diff --git a/source/common/common/mem_block_builder.h b/source/common/common/mem_block_builder.h index ce2323c44fa80..a391db7cd5c96 100644 --- a/source/common/common/mem_block_builder.h +++ b/source/common/common/mem_block_builder.h @@ -2,7 +2,7 @@ #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/types/span.h" diff --git a/source/common/common/mutex_tracer_impl.cc b/source/common/common/mutex_tracer_impl.cc index 3f7c3aa855f2b..2683ed61c803e 100644 --- a/source/common/common/mutex_tracer_impl.cc +++ b/source/common/common/mutex_tracer_impl.cc @@ -1,9 +1,9 @@ -#include "common/common/mutex_tracer_impl.h" +#include "source/common/common/mutex_tracer_impl.h" #include #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/synchronization/mutex.h" diff --git a/source/common/common/mutex_tracer_impl.h b/source/common/common/mutex_tracer_impl.h index f9fa99e11946d..d5368f3c83e95 100644 --- a/source/common/common/mutex_tracer_impl.h +++ b/source/common/common/mutex_tracer_impl.h @@ -6,7 +6,7 @@ #include "envoy/common/mutex_tracer.h" -#include "common/common/thread_annotations.h" +#include "source/common/common/thread_annotations.h" namespace Envoy { diff --git a/source/common/common/perf_annotation.cc b/source/common/common/perf_annotation.cc index daa39ff0ca31a..f5170e5b4d0cd 100644 --- a/source/common/common/perf_annotation.cc +++ b/source/common/common/perf_annotation.cc @@ -2,7 +2,7 @@ #define ENVOY_PERF_ANNOTATION #endif -#include "common/common/perf_annotation.h" +#include "source/common/common/perf_annotation.h" #include #include @@ -10,8 +10,8 @@ #include "envoy/common/platform.h" -#include "common/common/lock_guard.h" -#include "common/common/utility.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/utility.h" #include "absl/strings/str_cat.h" diff --git a/source/common/common/perf_annotation.h b/source/common/common/perf_annotation.h index 7fba5aec0321f..ab9ec215eae45 100644 --- a/source/common/common/perf_annotation.h +++ b/source/common/common/perf_annotation.h @@ -5,8 +5,8 @@ #include #include -#include "common/common/thread.h" -#include "common/common/utility.h" +#include "source/common/common/thread.h" +#include "source/common/common/utility.h" #include "absl/container/node_hash_map.h" #include "absl/strings/string_view.h" diff --git a/source/common/common/posix/thread_impl.cc b/source/common/common/posix/thread_impl.cc index 71cbf2b02eb6b..fae09194d8cca 100644 --- a/source/common/common/posix/thread_impl.cc +++ b/source/common/common/posix/thread_impl.cc @@ -1,5 +1,5 @@ -#include "common/common/assert.h" -#include "common/common/thread_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/thread_impl.h" #include "absl/strings/str_cat.h" diff --git a/source/common/common/random_generator.cc b/source/common/common/random_generator.cc index 69eabc5e6c078..53e59c2ffb609 100644 --- a/source/common/common/random_generator.cc +++ b/source/common/common/random_generator.cc @@ -1,6 +1,6 @@ -#include "common/common/random_generator.h" +#include "source/common/common/random_generator.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "openssl/rand.h" diff --git a/source/common/common/regex.cc b/source/common/common/regex.cc index 735a24d25b8d7..deeef41aa12bf 100644 --- a/source/common/common/regex.cc +++ b/source/common/common/regex.cc @@ -1,13 +1,13 @@ -#include "common/common/regex.h" +#include "source/common/common/regex.h" #include "envoy/common/exception.h" #include "envoy/runtime/runtime.h" #include "envoy/type/matcher/v3/regex.pb.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/protobuf/utility.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stats/symbol_table_impl.h" #include "re2/re2.h" diff --git a/source/common/common/scope_tracker.h b/source/common/common/scope_tracker.h index 4426bbaca5cc1..5e2850b082aab 100644 --- a/source/common/common/scope_tracker.h +++ b/source/common/common/scope_tracker.h @@ -3,7 +3,7 @@ #include "envoy/common/scope_tracker.h" #include "envoy/event/dispatcher.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { diff --git a/source/common/common/shared_token_bucket_impl.cc b/source/common/common/shared_token_bucket_impl.cc index 50a5e02ec582e..f0942226afcf7 100644 --- a/source/common/common/shared_token_bucket_impl.cc +++ b/source/common/common/shared_token_bucket_impl.cc @@ -1,8 +1,8 @@ -#include "common/common/shared_token_bucket_impl.h" +#include "source/common/common/shared_token_bucket_impl.h" #include -#include "common/common/lock_guard.h" +#include "source/common/common/lock_guard.h" namespace Envoy { diff --git a/source/common/common/shared_token_bucket_impl.h b/source/common/common/shared_token_bucket_impl.h index 7b677e543134d..51594c3da57fc 100644 --- a/source/common/common/shared_token_bucket_impl.h +++ b/source/common/common/shared_token_bucket_impl.h @@ -1,8 +1,8 @@ #pragma once -#include "common/common/thread.h" -#include "common/common/thread_synchronizer.h" -#include "common/common/token_bucket_impl.h" +#include "source/common/common/thread.h" +#include "source/common/common/thread_synchronizer.h" +#include "source/common/common/token_bucket_impl.h" namespace Envoy { diff --git a/source/common/common/standard/logger_impl.h b/source/common/common/standard/logger_impl.h index a07664151c654..938ed5f6ea298 100644 --- a/source/common/common/standard/logger_impl.h +++ b/source/common/common/standard/logger_impl.h @@ -1,6 +1,6 @@ #pragma once -#include "common/common/base_logger.h" +#include "source/common/common/base_logger.h" namespace Envoy { namespace Logger { diff --git a/source/common/common/stl_helpers.h b/source/common/common/stl_helpers.h index 080edc43c4c7a..674372f64eaa1 100644 --- a/source/common/common/stl_helpers.h +++ b/source/common/common/stl_helpers.h @@ -34,6 +34,19 @@ std::string accumulateToString(const ContainerT& source, }) + "]"; } + +// Used for converting sanctioned uses of std string_view (e.g. extensions) to absl::string_view +// for internal use. +inline absl::string_view toAbslStringView(std::string_view view) { // NOLINT(std::string_view) + return absl::string_view(view.data(), view.size()); // NOLINT(std::string_view) +} + +// Used for converting internal absl::string_view to sanctioned uses of std string_view (e.g. +// extensions). +inline std::string_view toStdStringView(absl::string_view view) { // NOLINT(std::string_view) + return std::string_view(view.data(), view.size()); // NOLINT(std::string_view) +} + } // namespace Envoy // NOLINT(namespace-envoy) diff --git a/source/common/common/thread.cc b/source/common/common/thread.cc index d32907be06763..e6ee78c8e5208 100644 --- a/source/common/common/thread.cc +++ b/source/common/common/thread.cc @@ -1,4 +1,4 @@ -#include "common/common/thread.h" +#include "source/common/common/thread.h" namespace Envoy { namespace Thread { diff --git a/source/common/common/thread.h b/source/common/common/thread.h index e84fb7b38bf7a..1ade49a3d1b93 100644 --- a/source/common/common/thread.h +++ b/source/common/common/thread.h @@ -7,8 +7,8 @@ #include "envoy/thread/thread.h" -#include "common/common/non_copyable.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/common/non_copyable.h" +#include "source/common/singleton/threadsafe_singleton.h" #include "absl/synchronization/mutex.h" diff --git a/source/common/common/thread_synchronizer.cc b/source/common/common/thread_synchronizer.cc index 099fafdb6ab8c..c4330b4710d29 100644 --- a/source/common/common/thread_synchronizer.cc +++ b/source/common/common/thread_synchronizer.cc @@ -1,4 +1,4 @@ -#include "common/common/thread_synchronizer.h" +#include "source/common/common/thread_synchronizer.h" namespace Envoy { namespace Thread { diff --git a/source/common/common/thread_synchronizer.h b/source/common/common/thread_synchronizer.h index b86df8a926bce..bdb4a18a1c092 100644 --- a/source/common/common/thread_synchronizer.h +++ b/source/common/common/thread_synchronizer.h @@ -1,7 +1,7 @@ #pragma once -#include "common/common/assert.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" diff --git a/source/common/common/token_bucket_impl.cc b/source/common/common/token_bucket_impl.cc index 74dd981e1828d..eaf6f06d0c9e9 100644 --- a/source/common/common/token_bucket_impl.cc +++ b/source/common/common/token_bucket_impl.cc @@ -1,4 +1,4 @@ -#include "common/common/token_bucket_impl.h" +#include "source/common/common/token_bucket_impl.h" #include diff --git a/source/common/common/token_bucket_impl.h b/source/common/common/token_bucket_impl.h index b168b4cc2894e..96ac238e3778f 100644 --- a/source/common/common/token_bucket_impl.h +++ b/source/common/common/token_bucket_impl.h @@ -3,7 +3,7 @@ #include "envoy/common/time.h" #include "envoy/common/token_bucket.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" namespace Envoy { diff --git a/source/common/common/utility.cc b/source/common/common/utility.cc index 659259fd86195..06a2a7027fc46 100644 --- a/source/common/common/utility.cc +++ b/source/common/common/utility.cc @@ -1,4 +1,4 @@ -#include "common/common/utility.h" +#include "source/common/common/utility.h" #include #include @@ -12,10 +12,10 @@ #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/hash.h" -#include "common/singleton/const_singleton.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/hash.h" +#include "source/common/singleton/const_singleton.h" #include "absl/container/node_hash_map.h" #include "absl/strings/ascii.h" diff --git a/source/common/common/utility.h b/source/common/common/utility.h index dbf1d4192f2e4..24b29a1273500 100644 --- a/source/common/common/utility.h +++ b/source/common/common/utility.h @@ -11,9 +11,9 @@ #include "envoy/common/interval_set.h" #include "envoy/common/time.h" -#include "common/common/assert.h" -#include "common/common/hash.h" -#include "common/common/non_copyable.h" +#include "source/common/common/assert.h" +#include "source/common/common/hash.h" +#include "source/common/common/non_copyable.h" #include "absl/strings/string_view.h" diff --git a/source/common/common/win32/event_logger_impl.cc b/source/common/common/win32/event_logger_impl.cc index 96e0cc74b06b9..f547152ae7daa 100644 --- a/source/common/common/win32/event_logger_impl.cc +++ b/source/common/common/win32/event_logger_impl.cc @@ -1,4 +1,4 @@ -#include "common/common/win32/event_logger_impl.h" +#include "source/common/common/win32/event_logger_impl.h" #include "spdlog/sinks/win_eventlog_sink.h" diff --git a/source/common/common/win32/event_logger_impl.h b/source/common/common/win32/event_logger_impl.h index 5fd864bce0ee4..02c711ee57541 100644 --- a/source/common/common/win32/event_logger_impl.h +++ b/source/common/common/win32/event_logger_impl.h @@ -1,6 +1,6 @@ #pragma once -#include "common/common/base_logger.h" +#include "source/common/common/base_logger.h" namespace Envoy { namespace Logger { diff --git a/source/common/common/win32/thread_impl.cc b/source/common/common/win32/thread_impl.cc index 8f26d63e0eb39..e7e548883a806 100644 --- a/source/common/common/win32/thread_impl.cc +++ b/source/common/common/win32/thread_impl.cc @@ -1,7 +1,7 @@ #include -#include "common/common/assert.h" -#include "common/common/thread_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/thread_impl.h" namespace Envoy { namespace Thread { diff --git a/source/common/config/BUILD b/source/common/config/BUILD index e5e73d9e9d4da..1890b921b93dc 100644 --- a/source/common/config/BUILD +++ b/source/common/config/BUILD @@ -29,13 +29,13 @@ envoy_cc_library( hdrs = ["config_provider_impl.h"], deps = [ ":utility_lib", - "//include/envoy/config:config_provider_interface", - "//include/envoy/config:config_provider_manager_interface", - "//include/envoy/init:manager_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:config_tracker_interface", - "//include/envoy/singleton:instance_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/config:config_provider_interface", + "//envoy/config:config_provider_manager_interface", + "//envoy/init:manager_interface", + "//envoy/server:admin_interface", + "//envoy/server:config_tracker_interface", + "//envoy/singleton:instance_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/init:manager_lib", "//source/common/init:target_lib", "//source/common/init:watcher_lib", @@ -48,7 +48,7 @@ envoy_cc_library( hdrs = ["context_provider_impl.h"], deps = [ ":xds_context_params_lib", - "//include/envoy/config:context_provider_interface", + "//envoy/config:context_provider_interface", "//source/common/common:callback_impl_lib", "//source/common/common:thread_lib", ], @@ -60,9 +60,9 @@ envoy_cc_library( hdrs = ["datasource.h"], deps = [ ":remote_data_fetcher_lib", - "//include/envoy/api:api_interface", - "//include/envoy/init:manager_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/api:api_interface", + "//envoy/init:manager_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:backoff_lib", "//source/common/common:empty_string", "//source/common/init:target_lib", @@ -75,7 +75,7 @@ envoy_cc_library( name = "decoded_resource_lib", hdrs = ["decoded_resource_impl.h"], deps = [ - "//include/envoy/config:subscription_interface", + "//envoy/config:subscription_interface", "//source/common/protobuf:utility_lib", "@com_github_cncf_udpa//xds/core/v3:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", @@ -87,9 +87,9 @@ envoy_cc_library( srcs = ["ttl.cc"], hdrs = ["ttl.h"], deps = [ - "//include/envoy/config:subscription_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", + "//envoy/config:subscription_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", "@com_google_absl//absl/container:btree", ], ) @@ -104,8 +104,8 @@ envoy_cc_library( ":ttl_lib", ":utility_lib", ":watch_map_lib", - "//include/envoy/config:subscription_interface", - "//include/envoy/event:dispatcher_interface", + "//envoy/config:subscription_interface", + "//envoy/event:dispatcher_interface", "//source/common/common:assert_lib", "//source/common/common:backoff_lib", "//source/common/common:minimal_logger_lib", @@ -123,9 +123,9 @@ envoy_cc_library( hdrs = ["filesystem_subscription_impl.h"], deps = [ ":decoded_resource_lib", - "//include/envoy/config:subscription_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/filesystem:filesystem_interface", + "//envoy/config:subscription_interface", + "//envoy/event:dispatcher_interface", + "//envoy/filesystem:filesystem_interface", "//source/common/common:minimal_logger_lib", "//source/common/common:utility_lib", "//source/common/config:utility_lib", @@ -141,10 +141,10 @@ envoy_cc_library( hdrs = ["grpc_stream.h"], deps = [ ":utility_lib", - "//include/envoy/config:grpc_mux_interface", - "//include/envoy/config:subscription_interface", - "//include/envoy/grpc:async_client_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/config:grpc_mux_interface", + "//envoy/config:subscription_interface", + "//envoy/grpc:async_client_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:backoff_lib", "//source/common/common:minimal_logger_lib", "//source/common/common:token_bucket_impl_lib", @@ -163,9 +163,9 @@ envoy_cc_library( ":grpc_stream_lib", ":ttl_lib", ":utility_lib", - "//include/envoy/config:grpc_mux_interface", - "//include/envoy/config:subscription_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/config:grpc_mux_interface", + "//envoy/config:subscription_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:cleanup_lib", "//source/common/common:minimal_logger_lib", "//source/common/common:utility_lib", @@ -184,9 +184,9 @@ envoy_cc_library( deps = [ ":grpc_mux_lib", ":xds_resource_lib", - "//include/envoy/config:subscription_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/grpc:async_client_interface", + "//envoy/config:subscription_interface", + "//envoy/event:dispatcher_interface", + "//envoy/grpc:async_client_interface", ], ) @@ -202,8 +202,8 @@ envoy_cc_library( ":watch_map_lib", ":xds_context_params_lib", ":xds_resource_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/grpc:async_client_interface", + "//envoy/event:dispatcher_interface", + "//envoy/grpc:async_client_interface", "//source/common/memory:utils_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", @@ -221,8 +221,8 @@ envoy_cc_library( ":api_version_lib", ":decoded_resource_lib", ":version_converter_lib", - "//include/envoy/config:subscription_interface", - "//include/envoy/event:dispatcher_interface", + "//envoy/config:subscription_interface", + "//envoy/event:dispatcher_interface", "//source/common/buffer:buffer_lib", "//source/common/common:minimal_logger_lib", "//source/common/common:utility_lib", @@ -241,10 +241,10 @@ envoy_cc_library( srcs = ["metadata.cc"], hdrs = ["metadata.h"], deps = [ - "//include/envoy/config:typed_metadata_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/registry", - "//include/envoy/singleton:manager_interface", + "//envoy/config:typed_metadata_interface", + "//envoy/event:dispatcher_interface", + "//envoy/registry", + "//envoy/singleton:manager_interface", "//source/common/common:assert_lib", "//source/common/protobuf", "//source/common/protobuf:utility_lib", @@ -258,7 +258,7 @@ envoy_cc_library( name = "opaque_resource_decoder_lib", hdrs = ["opaque_resource_decoder_impl.h"], deps = [ - "//include/envoy/config:subscription_interface", + "//envoy/config:subscription_interface", "//source/common/protobuf:utility_lib", ], ) @@ -298,7 +298,7 @@ envoy_cc_library( srcs = ["remote_data_fetcher.cc"], hdrs = ["remote_data_fetcher.h"], deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:hex_lib", "//source/common/crypto:utility_lib", "//source/common/http:utility_lib", @@ -335,9 +335,9 @@ envoy_cc_library( ":type_to_endpoint_lib", ":utility_lib", ":xds_resource_lib", - "//include/envoy/config:subscription_factory_interface", - "//include/envoy/config:subscription_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/config:subscription_factory_interface", + "//envoy/config:subscription_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:minimal_logger_lib", "//source/common/http:utility_lib", "//source/common/protobuf", @@ -392,12 +392,12 @@ envoy_cc_library( deps = [ ":api_type_oracle_lib", ":version_converter_lib", - "//include/envoy/config:grpc_mux_interface", - "//include/envoy/config:subscription_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/config:grpc_mux_interface", + "//envoy/config:subscription_interface", + "//envoy/local_info:local_info_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:assert_lib", "//source/common/common:backoff_lib", "//source/common/common:hash_lib", @@ -440,7 +440,7 @@ envoy_cc_library( deps = [ ":decoded_resource_lib", ":xds_resource_lib", - "//include/envoy/config:subscription_interface", + "//envoy/config:subscription_interface", "//source/common/common:assert_lib", "//source/common/common:cleanup_lib", "//source/common/common:minimal_logger_lib", @@ -456,7 +456,7 @@ envoy_cc_library( deps = [ ":opaque_resource_decoder_lib", ":resource_name_lib", - "//include/envoy/config:subscription_interface", + "//envoy/config:subscription_interface", ], ) @@ -465,8 +465,8 @@ envoy_cc_library( srcs = ["watched_directory.cc"], hdrs = ["watched_directory.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/filesystem:watcher_interface", + "//envoy/event:dispatcher_interface", + "//envoy/filesystem:watcher_interface", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], ) diff --git a/source/common/config/api_type_oracle.cc b/source/common/config/api_type_oracle.cc index 8762392af5cbd..66da4f79a9283 100644 --- a/source/common/config/api_type_oracle.cc +++ b/source/common/config/api_type_oracle.cc @@ -1,4 +1,4 @@ -#include "common/config/api_type_oracle.h" +#include "source/common/config/api_type_oracle.h" #include "udpa/annotations/versioning.pb.h" diff --git a/source/common/config/api_type_oracle.h b/source/common/config/api_type_oracle.h index bde8186fa555c..7320309b33ccb 100644 --- a/source/common/config/api_type_oracle.h +++ b/source/common/config/api_type_oracle.h @@ -1,6 +1,6 @@ #pragma once -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" diff --git a/source/common/config/config_provider_impl.cc b/source/common/config/config_provider_impl.cc index 78eddb0ffe10f..172c5305ee57d 100644 --- a/source/common/config/config_provider_impl.cc +++ b/source/common/config/config_provider_impl.cc @@ -1,4 +1,4 @@ -#include "common/config/config_provider_impl.h" +#include "source/common/config/config_provider_impl.h" namespace Envoy { namespace Config { diff --git a/source/common/config/config_provider_impl.h b/source/common/config/config_provider_impl.h index f1ecf3cf8932c..8db998ebab884 100644 --- a/source/common/config/config_provider_impl.h +++ b/source/common/config/config_provider_impl.h @@ -8,13 +8,13 @@ #include "envoy/singleton/instance.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/thread.h" -#include "common/common/utility.h" -#include "common/config/utility.h" -#include "common/init/manager_impl.h" -#include "common/init/target_impl.h" -#include "common/init/watcher_impl.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/thread.h" +#include "source/common/common/utility.h" +#include "source/common/config/utility.h" +#include "source/common/init/manager_impl.h" +#include "source/common/init/target_impl.h" +#include "source/common/init/watcher_impl.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Config { diff --git a/source/common/config/context_provider_impl.h b/source/common/config/context_provider_impl.h index 08e4b6c5c85a5..3123b2066cef4 100644 --- a/source/common/config/context_provider_impl.h +++ b/source/common/config/context_provider_impl.h @@ -2,9 +2,10 @@ #include "envoy/config/context_provider.h" -#include "common/common/callback_impl.h" -#include "common/common/thread.h" -#include "common/config/xds_context_params.h" +#include "source/common/common/callback_impl.h" +#include "source/common/common/stl_helpers.h" +#include "source/common/common/thread.h" +#include "source/common/config/xds_context_params.h" namespace Envoy { namespace Config { @@ -29,13 +30,16 @@ class ContextProviderImpl : public ContextProvider { void setDynamicContextParam(absl::string_view resource_type_url, absl::string_view key, absl::string_view value) override { ASSERT(Thread::MainThread::isMainThread()); - (*dynamic_context_[resource_type_url].mutable_params())[key] = value; + (*dynamic_context_[resource_type_url] + .mutable_params())[toStdStringView(key)] = // NOLINT(std::string_view) + toStdStringView(value); // NOLINT(std::string_view) update_cb_helper_.runCallbacks(resource_type_url); } void unsetDynamicContextParam(absl::string_view resource_type_url, absl::string_view key) override { ASSERT(Thread::MainThread::isMainThread()); - dynamic_context_[resource_type_url].mutable_params()->erase(key); + dynamic_context_[resource_type_url].mutable_params()->erase( + toStdStringView(key)); // NOLINT(std::string_view) update_cb_helper_.runCallbacks(resource_type_url); } ABSL_MUST_USE_RESULT Common::CallbackHandlePtr diff --git a/source/common/config/datasource.cc b/source/common/config/datasource.cc index 3f60da031a28d..19a4b82e6a9da 100644 --- a/source/common/config/datasource.cc +++ b/source/common/config/datasource.cc @@ -1,4 +1,4 @@ -#include "common/config/datasource.h" +#include "source/common/config/datasource.h" #include "envoy/config/core/v3/base.pb.h" diff --git a/source/common/config/datasource.h b/source/common/config/datasource.h index c3969ee7f4501..9f884bd40968d 100644 --- a/source/common/config/datasource.h +++ b/source/common/config/datasource.h @@ -7,11 +7,11 @@ #include "envoy/init/manager.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/backoff_strategy.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/config/remote_data_fetcher.h" -#include "common/init/target_impl.h" +#include "source/common/common/backoff_strategy.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/config/remote_data_fetcher.h" +#include "source/common/init/target_impl.h" #include "absl/types/optional.h" diff --git a/source/common/config/decoded_resource_impl.h b/source/common/config/decoded_resource_impl.h index 04299f7745baf..58f6b9d5cd5da 100644 --- a/source/common/config/decoded_resource_impl.h +++ b/source/common/config/decoded_resource_impl.h @@ -3,7 +3,7 @@ #include "envoy/config/subscription.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" #include "xds/core/v3/collection_entry.pb.h" diff --git a/source/common/config/delta_subscription_state.cc b/source/common/config/delta_subscription_state.cc index 215dc55602fbc..b1b162d3f3274 100644 --- a/source/common/config/delta_subscription_state.cc +++ b/source/common/config/delta_subscription_state.cc @@ -1,12 +1,12 @@ -#include "common/config/delta_subscription_state.h" +#include "source/common/config/delta_subscription_state.h" #include "envoy/event/dispatcher.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/common/hash.h" -#include "common/config/utility.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/assert.h" +#include "source/common/common/hash.h" +#include "source/common/config/utility.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Config { diff --git a/source/common/config/delta_subscription_state.h b/source/common/config/delta_subscription_state.h index 7c478002ce379..cafdbe0022ee5 100644 --- a/source/common/config/delta_subscription_state.h +++ b/source/common/config/delta_subscription_state.h @@ -7,12 +7,12 @@ #include "envoy/local_info/local_info.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/config/api_version.h" -#include "common/config/pausable_ack_queue.h" -#include "common/config/ttl.h" -#include "common/config/watch_map.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/config/api_version.h" +#include "source/common/config/pausable_ack_queue.h" +#include "source/common/config/ttl.h" +#include "source/common/config/watch_map.h" #include "absl/container/node_hash_map.h" diff --git a/source/common/config/filesystem_subscription_impl.cc b/source/common/config/filesystem_subscription_impl.cc index 5e27d1e8d937e..0bed53c374e6d 100644 --- a/source/common/config/filesystem_subscription_impl.cc +++ b/source/common/config/filesystem_subscription_impl.cc @@ -1,13 +1,13 @@ -#include "common/config/filesystem_subscription_impl.h" +#include "source/common/config/filesystem_subscription_impl.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/macros.h" -#include "common/common/utility.h" -#include "common/config/decoded_resource_impl.h" -#include "common/config/utility.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/common/config/decoded_resource_impl.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Config { diff --git a/source/common/config/filesystem_subscription_impl.h b/source/common/config/filesystem_subscription_impl.h index 1c8d9d041ccf8..178b6a44a0301 100644 --- a/source/common/config/filesystem_subscription_impl.h +++ b/source/common/config/filesystem_subscription_impl.h @@ -6,7 +6,7 @@ #include "envoy/filesystem/filesystem.h" #include "envoy/protobuf/message_validator.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Config { diff --git a/source/common/config/grpc_mux_impl.cc b/source/common/config/grpc_mux_impl.cc index eab59e846bdac..efcb6b38b7762 100644 --- a/source/common/config/grpc_mux_impl.cc +++ b/source/common/config/grpc_mux_impl.cc @@ -1,12 +1,12 @@ -#include "common/config/grpc_mux_impl.h" +#include "source/common/config/grpc_mux_impl.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/decoded_resource_impl.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" -#include "common/memory/utils.h" -#include "common/protobuf/protobuf.h" +#include "source/common/config/decoded_resource_impl.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/memory/utils.h" +#include "source/common/protobuf/protobuf.h" #include "absl/container/btree_map.h" #include "absl/container/node_hash_set.h" diff --git a/source/common/config/grpc_mux_impl.h b/source/common/config/grpc_mux_impl.h index 3c4b973b8d9d1..26b3f2a8669fd 100644 --- a/source/common/config/grpc_mux_impl.h +++ b/source/common/config/grpc_mux_impl.h @@ -14,13 +14,13 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/cleanup.h" -#include "common/common/logger.h" -#include "common/common/utility.h" -#include "common/config/api_version.h" -#include "common/config/grpc_stream.h" -#include "common/config/ttl.h" -#include "common/config/utility.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" +#include "source/common/config/api_version.h" +#include "source/common/config/grpc_stream.h" +#include "source/common/config/ttl.h" +#include "source/common/config/utility.h" #include "absl/container/node_hash_map.h" diff --git a/source/common/config/grpc_stream.h b/source/common/config/grpc_stream.h index f6673402df4f5..a682fef77d0ce 100644 --- a/source/common/config/grpc_stream.h +++ b/source/common/config/grpc_stream.h @@ -7,10 +7,10 @@ #include "envoy/config/grpc_mux.h" #include "envoy/grpc/async_client.h" -#include "common/common/backoff_strategy.h" -#include "common/common/token_bucket_impl.h" -#include "common/config/utility.h" -#include "common/grpc/typed_async_client.h" +#include "source/common/common/backoff_strategy.h" +#include "source/common/common/token_bucket_impl.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/typed_async_client.h" namespace Envoy { namespace Config { diff --git a/source/common/config/grpc_subscription_impl.cc b/source/common/config/grpc_subscription_impl.cc index 3b6412d111dc3..fbc55abe693b6 100644 --- a/source/common/config/grpc_subscription_impl.cc +++ b/source/common/config/grpc_subscription_impl.cc @@ -1,14 +1,14 @@ -#include "common/config/grpc_subscription_impl.h" +#include "source/common/config/grpc_subscription_impl.h" #include -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/common/utility.h" -#include "common/config/xds_resource.h" -#include "common/grpc/common.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" +#include "source/common/config/xds_resource.h" +#include "source/common/grpc/common.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Config { diff --git a/source/common/config/grpc_subscription_impl.h b/source/common/config/grpc_subscription_impl.h index 35dfa34f166e8..b1b15c585011c 100644 --- a/source/common/config/grpc_subscription_impl.h +++ b/source/common/config/grpc_subscription_impl.h @@ -7,7 +7,7 @@ #include "envoy/config/subscription.h" #include "envoy/event/dispatcher.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "xds/core/v3/resource_locator.pb.h" diff --git a/source/common/config/http_subscription_impl.cc b/source/common/config/http_subscription_impl.cc index d8ad488e108a3..ecf6afffa9b98 100644 --- a/source/common/config/http_subscription_impl.cc +++ b/source/common/config/http_subscription_impl.cc @@ -1,19 +1,19 @@ -#include "common/config/http_subscription_impl.h" +#include "source/common/config/http_subscription_impl.h" #include #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/macros.h" -#include "common/common/utility.h" -#include "common/config/decoded_resource_impl.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" -#include "common/http/headers.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/common/config/decoded_resource_impl.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/http/headers.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "google/api/annotations.pb.h" diff --git a/source/common/config/http_subscription_impl.h b/source/common/config/http_subscription_impl.h index 33263e0ef3eb3..4672e45894882 100644 --- a/source/common/config/http_subscription_impl.h +++ b/source/common/config/http_subscription_impl.h @@ -6,8 +6,8 @@ #include "envoy/event/dispatcher.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/api_version.h" -#include "common/http/rest_api_fetcher.h" +#include "source/common/config/api_version.h" +#include "source/common/http/rest_api_fetcher.h" namespace Envoy { namespace Config { diff --git a/source/common/config/metadata.cc b/source/common/config/metadata.cc index c5dfaa77540d5..522d82e973039 100644 --- a/source/common/config/metadata.cc +++ b/source/common/config/metadata.cc @@ -1,9 +1,9 @@ -#include "common/config/metadata.h" +#include "source/common/config/metadata.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/type/metadata/v3/metadata.pb.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Config { diff --git a/source/common/config/metadata.h b/source/common/config/metadata.h index 9b4ddbbcb0f43..fe870c5169018 100644 --- a/source/common/config/metadata.h +++ b/source/common/config/metadata.h @@ -10,8 +10,8 @@ #include "envoy/singleton/manager.h" #include "envoy/type/metadata/v3/metadata.pb.h" -#include "common/protobuf/protobuf.h" -#include "common/shared_pool/shared_pool.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/shared_pool/shared_pool.h" #include "absl/container/node_hash_map.h" diff --git a/source/common/config/new_grpc_mux_impl.cc b/source/common/config/new_grpc_mux_impl.cc index 62a2ba950d155..07b55626b83a8 100644 --- a/source/common/config/new_grpc_mux_impl.cc +++ b/source/common/config/new_grpc_mux_impl.cc @@ -1,17 +1,17 @@ -#include "common/config/new_grpc_mux_impl.h" +#include "source/common/config/new_grpc_mux_impl.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/common/backoff_strategy.h" -#include "common/common/token_bucket_impl.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" -#include "common/config/xds_context_params.h" -#include "common/config/xds_resource.h" -#include "common/memory/utils.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/backoff_strategy.h" +#include "source/common/common/token_bucket_impl.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/config/xds_context_params.h" +#include "source/common/config/xds_resource.h" +#include "source/common/memory/utils.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Config { diff --git a/source/common/config/new_grpc_mux_impl.h b/source/common/config/new_grpc_mux_impl.h index 570cc7dfafc44..71ed0735ecf9a 100644 --- a/source/common/config/new_grpc_mux_impl.h +++ b/source/common/config/new_grpc_mux_impl.h @@ -9,14 +9,14 @@ #include "envoy/config/subscription.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/logger.h" -#include "common/config/api_version.h" -#include "common/config/delta_subscription_state.h" -#include "common/config/grpc_stream.h" -#include "common/config/pausable_ack_queue.h" -#include "common/config/watch_map.h" -#include "common/grpc/common.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/logger.h" +#include "source/common/config/api_version.h" +#include "source/common/config/delta_subscription_state.h" +#include "source/common/config/grpc_stream.h" +#include "source/common/config/pausable_ack_queue.h" +#include "source/common/config/watch_map.h" +#include "source/common/grpc/common.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Config { diff --git a/source/common/config/opaque_resource_decoder_impl.h b/source/common/config/opaque_resource_decoder_impl.h index ef066101952b2..bb0af603f15d1 100644 --- a/source/common/config/opaque_resource_decoder_impl.h +++ b/source/common/config/opaque_resource_decoder_impl.h @@ -2,7 +2,7 @@ #include "envoy/config/subscription.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Config { diff --git a/source/common/config/pausable_ack_queue.cc b/source/common/config/pausable_ack_queue.cc index b18cb9754f5eb..d2e433c63d383 100644 --- a/source/common/config/pausable_ack_queue.cc +++ b/source/common/config/pausable_ack_queue.cc @@ -1,8 +1,8 @@ -#include "common/config/pausable_ack_queue.h" +#include "source/common/config/pausable_ack_queue.h" #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Config { diff --git a/source/common/config/pausable_ack_queue.h b/source/common/config/pausable_ack_queue.h index eb04358398df7..07af25fa9bfd8 100644 --- a/source/common/config/pausable_ack_queue.h +++ b/source/common/config/pausable_ack_queue.h @@ -2,7 +2,7 @@ #include -#include "common/config/update_ack.h" +#include "source/common/config/update_ack.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/config/remote_data_fetcher.cc b/source/common/config/remote_data_fetcher.cc index c6f8382c5c152..66e0e9074e1ef 100644 --- a/source/common/config/remote_data_fetcher.cc +++ b/source/common/config/remote_data_fetcher.cc @@ -1,12 +1,12 @@ -#include "common/config/remote_data_fetcher.h" +#include "source/common/config/remote_data_fetcher.h" #include "envoy/config/core/v3/http_uri.pb.h" -#include "common/common/enum_to_int.h" -#include "common/common/hex.h" -#include "common/crypto/utility.h" -#include "common/http/headers.h" -#include "common/http/utility.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/hex.h" +#include "source/common/crypto/utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" namespace Envoy { namespace Config { diff --git a/source/common/config/resource_name.h b/source/common/config/resource_name.h index b21a7d47d7108..b3ca8e8175266 100644 --- a/source/common/config/resource_name.h +++ b/source/common/config/resource_name.h @@ -5,8 +5,8 @@ #include "envoy/config/core/v3/config_source.pb.h" -#include "common/common/assert.h" -#include "common/config/api_type_oracle.h" +#include "source/common/common/assert.h" +#include "source/common/config/api_type_oracle.h" namespace Envoy { namespace Config { diff --git a/source/common/config/runtime_utility.cc b/source/common/config/runtime_utility.cc index b3db72983f981..07f06af8e33e2 100644 --- a/source/common/config/runtime_utility.cc +++ b/source/common/config/runtime_utility.cc @@ -1,4 +1,4 @@ -#include "common/config/runtime_utility.h" +#include "source/common/config/runtime_utility.h" #include "envoy/config/bootstrap/v3/bootstrap.pb.h" diff --git a/source/common/config/subscription_base.h b/source/common/config/subscription_base.h index 765e28934ebcb..447931d1c36b1 100644 --- a/source/common/config/subscription_base.h +++ b/source/common/config/subscription_base.h @@ -2,8 +2,8 @@ #include "envoy/config/subscription.h" -#include "common/config/opaque_resource_decoder_impl.h" -#include "common/config/resource_name.h" +#include "source/common/config/opaque_resource_decoder_impl.h" +#include "source/common/config/resource_name.h" namespace Envoy { namespace Config { diff --git a/source/common/config/subscription_factory_impl.cc b/source/common/config/subscription_factory_impl.cc index 277a3524e7282..eadf0dd3bfda0 100644 --- a/source/common/config/subscription_factory_impl.cc +++ b/source/common/config/subscription_factory_impl.cc @@ -1,18 +1,18 @@ -#include "common/config/subscription_factory_impl.h" +#include "source/common/config/subscription_factory_impl.h" #include "envoy/config/core/v3/config_source.pb.h" -#include "common/config/filesystem_subscription_impl.h" -#include "common/config/grpc_mux_impl.h" -#include "common/config/grpc_subscription_impl.h" -#include "common/config/http_subscription_impl.h" -#include "common/config/new_grpc_mux_impl.h" -#include "common/config/type_to_endpoint.h" -#include "common/config/utility.h" -#include "common/config/xds_resource.h" -#include "common/http/utility.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/config/filesystem_subscription_impl.h" +#include "source/common/config/grpc_mux_impl.h" +#include "source/common/config/grpc_subscription_impl.h" +#include "source/common/config/http_subscription_impl.h" +#include "source/common/config/new_grpc_mux_impl.h" +#include "source/common/config/type_to_endpoint.h" +#include "source/common/config/utility.h" +#include "source/common/config/xds_resource.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Config { diff --git a/source/common/config/subscription_factory_impl.h b/source/common/config/subscription_factory_impl.h index 246d5afe65746..07cfa5d17520a 100644 --- a/source/common/config/subscription_factory_impl.h +++ b/source/common/config/subscription_factory_impl.h @@ -8,7 +8,7 @@ #include "envoy/stats/scope.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Config { diff --git a/source/common/config/ttl.cc b/source/common/config/ttl.cc index 07dfec5fe33cf..86dd100c71fc0 100644 --- a/source/common/config/ttl.cc +++ b/source/common/config/ttl.cc @@ -1,4 +1,4 @@ -#include "common/config/ttl.h" +#include "source/common/config/ttl.h" namespace Envoy { namespace Config { diff --git a/source/common/config/type_to_endpoint.cc b/source/common/config/type_to_endpoint.cc index 1c32fe47ad2c5..2ac9af5b27f54 100644 --- a/source/common/config/type_to_endpoint.cc +++ b/source/common/config/type_to_endpoint.cc @@ -1,8 +1,8 @@ -#include "common/config/type_to_endpoint.h" +#include "source/common/config/type_to_endpoint.h" #include "envoy/annotations/resource.pb.h" -#include "common/grpc/common.h" +#include "source/common/grpc/common.h" // API_NO_BOOST_FILE diff --git a/source/common/config/type_to_endpoint.h b/source/common/config/type_to_endpoint.h index ed9f9e6e5c89d..7c9f5a5007374 100644 --- a/source/common/config/type_to_endpoint.h +++ b/source/common/config/type_to_endpoint.h @@ -2,7 +2,7 @@ #include "envoy/config/core/v3/config_source.pb.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "absl/strings/string_view.h" diff --git a/source/common/config/utility.cc b/source/common/config/utility.cc index 440957d0ef55c..b7288b401ed7f 100644 --- a/source/common/config/utility.cc +++ b/source/common/config/utility.cc @@ -1,4 +1,4 @@ -#include "common/config/utility.h" +#include "source/common/config/utility.h" #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/config/cluster/v3/cluster.pb.h" @@ -9,18 +9,18 @@ #include "envoy/config/endpoint/v3/endpoint_components.pb.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/hex.h" -#include "common/common/utility.h" -#include "common/config/api_type_oracle.h" -#include "common/config/version_converter.h" -#include "common/config/well_known_names.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/stats/histogram_impl.h" -#include "common/stats/stats_matcher_impl.h" -#include "common/stats/tag_producer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/hex.h" +#include "source/common/common/utility.h" +#include "source/common/config/api_type_oracle.h" +#include "source/common/config/version_converter.h" +#include "source/common/config/well_known_names.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stats/histogram_impl.h" +#include "source/common/stats/stats_matcher_impl.h" +#include "source/common/stats/tag_producer_impl.h" namespace Envoy { namespace Config { diff --git a/source/common/config/utility.h b/source/common/config/utility.h index 93304377ccf4b..f4bc2be309ffd 100644 --- a/source/common/config/utility.h +++ b/source/common/config/utility.h @@ -19,16 +19,16 @@ #include "envoy/stats/tag_producer.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/assert.h" -#include "common/common/backoff_strategy.h" -#include "common/common/hash.h" -#include "common/common/hex.h" -#include "common/common/utility.h" -#include "common/grpc/common.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_features.h" -#include "common/singleton/const_singleton.h" +#include "source/common/common/assert.h" +#include "source/common/common/backoff_strategy.h" +#include "source/common/common/hash.h" +#include "source/common/common/hex.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/singleton/const_singleton.h" #include "udpa/type/v1/typed_struct.pb.h" diff --git a/source/common/config/version_converter.cc b/source/common/config/version_converter.cc index 0477c29bcf861..7129374c8bcee 100644 --- a/source/common/config/version_converter.cc +++ b/source/common/config/version_converter.cc @@ -1,12 +1,12 @@ -#include "common/config/version_converter.h" +#include "source/common/config/version_converter.h" #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/macros.h" -#include "common/config/api_type_oracle.h" -#include "common/protobuf/visitor.h" -#include "common/protobuf/well_known.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/common/config/api_type_oracle.h" +#include "source/common/protobuf/visitor.h" +#include "source/common/protobuf/well_known.h" #include "absl/strings/match.h" diff --git a/source/common/config/version_converter.h b/source/common/config/version_converter.h index db9c765239318..a7f5db3e9d8a9 100644 --- a/source/common/config/version_converter.h +++ b/source/common/config/version_converter.h @@ -2,7 +2,7 @@ #include "envoy/config/core/v3/config_source.pb.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" // Convenience macro for downgrading a message and obtaining a reference. #define API_DOWNGRADE(msg) (*Envoy::Config::VersionConverter::downgrade(msg)->msg_) diff --git a/source/common/config/watch_map.cc b/source/common/config/watch_map.cc index fd65b5375b1f9..992fdc35393cf 100644 --- a/source/common/config/watch_map.cc +++ b/source/common/config/watch_map.cc @@ -1,11 +1,11 @@ -#include "common/config/watch_map.h" +#include "source/common/config/watch_map.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/cleanup.h" -#include "common/common/utility.h" -#include "common/config/decoded_resource_impl.h" -#include "common/config/xds_resource.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/utility.h" +#include "source/common/config/decoded_resource_impl.h" +#include "source/common/config/xds_resource.h" namespace Envoy { namespace Config { diff --git a/source/common/config/watch_map.h b/source/common/config/watch_map.h index 768117e93be6c..d1139e23e0afb 100644 --- a/source/common/config/watch_map.h +++ b/source/common/config/watch_map.h @@ -7,8 +7,8 @@ #include "envoy/config/subscription.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" diff --git a/source/common/config/watched_directory.cc b/source/common/config/watched_directory.cc index c3843ee3f71c7..fc2a3a832a505 100644 --- a/source/common/config/watched_directory.cc +++ b/source/common/config/watched_directory.cc @@ -1,4 +1,4 @@ -#include "common/config/watched_directory.h" +#include "source/common/config/watched_directory.h" namespace Envoy { namespace Config { diff --git a/source/common/config/well_known_names.cc b/source/common/config/well_known_names.cc index 53388bf160429..71a03839b1a7b 100644 --- a/source/common/config/well_known_names.cc +++ b/source/common/config/well_known_names.cc @@ -1,4 +1,4 @@ -#include "common/config/well_known_names.h" +#include "source/common/config/well_known_names.h" #include "absl/strings/str_replace.h" diff --git a/source/common/config/well_known_names.h b/source/common/config/well_known_names.h index 5b809ec8366ce..0b694392a4aeb 100644 --- a/source/common/config/well_known_names.h +++ b/source/common/config/well_known_names.h @@ -5,9 +5,9 @@ #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/regex.h" -#include "common/singleton/const_singleton.h" +#include "source/common/common/assert.h" +#include "source/common/common/regex.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Config { diff --git a/source/common/config/xds_context_params.cc b/source/common/config/xds_context_params.cc index d618364dcce51..7a2ad91ec33dd 100644 --- a/source/common/config/xds_context_params.cc +++ b/source/common/config/xds_context_params.cc @@ -1,7 +1,7 @@ -#include "common/config/xds_context_params.h" +#include "source/common/config/xds_context_params.h" -#include "common/common/macros.h" -#include "common/protobuf/utility.h" +#include "source/common/common/macros.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Config { diff --git a/source/common/config/xds_context_params.h b/source/common/config/xds_context_params.h index 2627ba8e1513c..68519eb414d07 100644 --- a/source/common/config/xds_context_params.h +++ b/source/common/config/xds_context_params.h @@ -2,7 +2,7 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "absl/container/flat_hash_map.h" #include "xds/core/v3/context_params.pb.h" diff --git a/source/common/config/xds_resource.cc b/source/common/config/xds_resource.cc index 414d2f6b30185..9baa14ea8a955 100644 --- a/source/common/config/xds_resource.cc +++ b/source/common/config/xds_resource.cc @@ -1,9 +1,9 @@ -#include "common/config/xds_resource.h" +#include "source/common/config/xds_resource.h" #include -#include "common/common/fmt.h" -#include "common/http/utility.h" +#include "source/common/common/fmt.h" +#include "source/common/http/utility.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" diff --git a/source/common/conn_pool/BUILD b/source/common/conn_pool/BUILD index fafa208adc168..d526dfbf956b2 100644 --- a/source/common/conn_pool/BUILD +++ b/source/common/conn_pool/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( srcs = ["conn_pool_base.cc"], hdrs = ["conn_pool_base.h"], deps = [ - "//include/envoy/stats:timespan_interface", + "//envoy/stats:timespan_interface", "//source/common/common:linked_object", "//source/common/stats:timespan_lib", "//source/common/upstream:upstream_lib", diff --git a/source/common/conn_pool/conn_pool_base.cc b/source/common/conn_pool/conn_pool_base.cc index a1982b7fa0fe8..9483fcafbab48 100644 --- a/source/common/conn_pool/conn_pool_base.cc +++ b/source/common/conn_pool/conn_pool_base.cc @@ -1,10 +1,10 @@ -#include "common/conn_pool/conn_pool_base.h" +#include "source/common/conn_pool/conn_pool_base.h" -#include "common/common/assert.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/runtime/runtime_features.h" -#include "common/stats/timespan_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/common/assert.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/stats/timespan_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace ConnectionPool { diff --git a/source/common/conn_pool/conn_pool_base.h b/source/common/conn_pool/conn_pool_base.h index dd72cc83a30bd..1332e46009c4b 100644 --- a/source/common/conn_pool/conn_pool_base.h +++ b/source/common/conn_pool/conn_pool_base.h @@ -6,8 +6,8 @@ #include "envoy/stats/timespan.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/dump_state_utils.h" -#include "common/common/linked_object.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/common/linked_object.h" #include "absl/strings/string_view.h" diff --git a/source/common/crypto/BUILD b/source/common/crypto/BUILD index e47c843fe72a6..07b461c6ab0b7 100644 --- a/source/common/crypto/BUILD +++ b/source/common/crypto/BUILD @@ -14,8 +14,8 @@ envoy_cc_library( "utility.h", ], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/common/crypto:crypto_interface", + "//envoy/buffer:buffer_interface", + "//envoy/common/crypto:crypto_interface", "//source/common/common:assert_lib", "//source/common/singleton:threadsafe_singleton", ], diff --git a/source/common/crypto/utility.h b/source/common/crypto/utility.h index 4f81b0d73e6f6..2dbc4427e8da3 100644 --- a/source/common/crypto/utility.h +++ b/source/common/crypto/utility.h @@ -6,7 +6,7 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/crypto/crypto.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/singleton/threadsafe_singleton.h" #include "absl/strings/string_view.h" diff --git a/source/common/event/BUILD b/source/common/event/BUILD index 35e5bb6601b1b..f847b9dd614fa 100644 --- a/source/common/event/BUILD +++ b/source/common/event/BUILD @@ -25,6 +25,7 @@ envoy_cc_library( "posix/signal_impl.h", ], }), + include_prefix = "source/common/event", strip_include_prefix = select({ "//bazel:windows_x86_64": "win32", "//conditions:default": "posix", @@ -35,11 +36,11 @@ envoy_cc_library( ":real_time_system_lib", ":signal_lib", ":scaled_range_timer_manager_lib", - "//include/envoy/common:scope_tracker_interface", - "//include/envoy/common:time_interface", - "//include/envoy/event:signal_interface", - "//include/envoy/network:listen_socket_interface", - "//include/envoy/network:listener_interface", + "//envoy/common:scope_tracker_interface", + "//envoy/common:time_interface", + "//envoy/event:signal_interface", + "//envoy/network:listen_socket_interface", + "//envoy/network:listener_interface", "//source/common/common:assert_lib", "//source/common/common:thread_lib", "//source/common/filesystem:watcher_lib", @@ -61,10 +62,11 @@ envoy_cc_posix_library( name = "signal_impl_lib", srcs = ["posix/signal_impl.cc"], hdrs = ["posix/signal_impl.h"], + include_prefix = "source/common/event", strip_include_prefix = "posix", deps = [ ":dispatcher_includes", - "//include/envoy/event:signal_interface", + "//envoy/event:signal_interface", "//source/common/common:thread_lib", ], ) @@ -73,10 +75,11 @@ envoy_cc_win32_library( name = "signal_impl_lib", srcs = ["win32/signal_impl.cc"], hdrs = ["win32/signal_impl.h"], + include_prefix = "source/common/event", strip_include_prefix = "win32", deps = [ ":dispatcher_includes", - "//include/envoy/event:signal_interface", + "//envoy/event:signal_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:thread_lib", "//source/common/network:default_socket_interface_lib", @@ -99,7 +102,7 @@ envoy_cc_library( deps = [ ":event_impl_base_lib", ":timer_lib", - "//include/envoy/event:timer_interface", + "//envoy/event:timer_interface", "//source/common/common:utility_lib", "//source/common/event:dispatcher_includes", ], @@ -119,11 +122,11 @@ envoy_cc_library( deps = [ ":libevent_lib", ":libevent_scheduler_lib", - "//include/envoy/api:api_interface", - "//include/envoy/event:deferred_deletable", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:file_event_interface", - "//include/envoy/network:connection_handler_interface", + "//envoy/api:api_interface", + "//envoy/event:deferred_deletable", + "//envoy/event:dispatcher_interface", + "//envoy/event:file_event_interface", + "//envoy/network:connection_handler_interface", "//source/common/common:minimal_logger_lib", "//source/common/common:thread_lib", "//source/common/signal:fatal_error_handler_lib", @@ -157,8 +160,8 @@ envoy_cc_library( ":libevent_lib", ":schedulable_cb_lib", ":timer_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", "//source/common/common:assert_lib", ], ) @@ -171,7 +174,7 @@ envoy_cc_library( deps = [ ":event_impl_base_lib", ":libevent_lib", - "//include/envoy/event:schedulable_cb_interface", + "//envoy/event:schedulable_cb_interface", ], ) @@ -183,7 +186,7 @@ envoy_cc_library( deps = [ ":event_impl_base_lib", ":libevent_lib", - "//include/envoy/event:timer_interface", + "//envoy/event:timer_interface", "//source/common/common:scope_tracker", "//source/common/common:utility_lib", ], @@ -193,8 +196,8 @@ envoy_cc_library( name = "deferred_task", hdrs = ["deferred_task.h"], deps = [ - "//include/envoy/event:deferred_deletable", - "//include/envoy/event:dispatcher_interface", + "//envoy/event:deferred_deletable", + "//envoy/event:dispatcher_interface", ], ) @@ -203,9 +206,9 @@ envoy_cc_library( srcs = ["scaled_range_timer_manager_impl.cc"], hdrs = ["scaled_range_timer_manager_impl.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:scaled_range_timer_manager_interface", - "//include/envoy/event:timer_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:scaled_range_timer_manager_interface", + "//envoy/event:timer_interface", "//source/common/common:scope_tracker", ], ) diff --git a/source/common/event/dispatcher_impl.cc b/source/common/event/dispatcher_impl.cc index b3ff5128eb781..e6ce9164b0e8a 100644 --- a/source/common/event/dispatcher_impl.cc +++ b/source/common/event/dispatcher_impl.cc @@ -1,4 +1,4 @@ -#include "common/event/dispatcher_impl.h" +#include "source/common/event/dispatcher_impl.h" #include #include @@ -11,30 +11,30 @@ #include "envoy/network/listen_socket.h" #include "envoy/network/listener.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/lock_guard.h" -#include "common/common/thread.h" -#include "common/event/file_event_impl.h" -#include "common/event/libevent_scheduler.h" -#include "common/event/scaled_range_timer_manager_impl.h" -#include "common/event/signal_impl.h" -#include "common/event/timer_impl.h" -#include "common/filesystem/watcher_impl.h" -#include "common/network/connection_impl.h" -#include "common/network/dns_impl.h" -#include "common/network/tcp_listener_impl.h" -#include "common/network/udp_listener_impl.h" -#include "common/runtime/runtime_features.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/thread.h" +#include "source/common/event/file_event_impl.h" +#include "source/common/event/libevent_scheduler.h" +#include "source/common/event/scaled_range_timer_manager_impl.h" +#include "source/common/event/signal_impl.h" +#include "source/common/event/timer_impl.h" +#include "source/common/filesystem/watcher_impl.h" +#include "source/common/network/connection_impl.h" +#include "source/common/network/dns_impl.h" +#include "source/common/network/tcp_listener_impl.h" +#include "source/common/network/udp_listener_impl.h" +#include "source/common/runtime/runtime_features.h" #include "event2/event.h" #ifdef ENVOY_HANDLE_SIGNALS -#include "common/signal/signal_action.h" +#include "source/common/signal/signal_action.h" #endif #ifdef __APPLE__ -#include "common/network/apple_dns_impl.h" +#include "source/common/network/apple_dns_impl.h" #endif namespace Envoy { @@ -157,7 +157,7 @@ DispatcherImpl::createClientConnection(Network::Address::InstanceConstSharedPtr Network::DnsResolverSharedPtr DispatcherImpl::createDnsResolver( const std::vector& resolvers, - const bool use_tcp_for_dns_lookups) { + const envoy::config::core::v3::DnsResolverOptions& dns_resolver_options) { ASSERT(isThreadSafe()); #ifdef __APPLE__ static bool use_apple_api_for_dns_lookups = @@ -169,7 +169,7 @@ Network::DnsResolverSharedPtr DispatcherImpl::createDnsResolver( "Apple's API only allows overriding DNS resolvers via system settings. Delete resolvers " "config or disable the envoy.restart_features.use_apple_api_for_dns_lookups runtime " "feature."); - RELEASE_ASSERT(!use_tcp_for_dns_lookups, + RELEASE_ASSERT(!dns_resolver_options.use_tcp_for_dns_lookups(), "using TCP for DNS lookups is not possible when using Apple APIs for DNS " "resolution. Apple' API only uses UDP for DNS resolution. Use UDP or disable " "the envoy.restart_features.use_apple_api_for_dns_lookups runtime feature."); @@ -177,7 +177,7 @@ Network::DnsResolverSharedPtr DispatcherImpl::createDnsResolver( api_.rootScope()); } #endif - return std::make_shared(*this, resolvers, use_tcp_for_dns_lookups); + return std::make_shared(*this, resolvers, dns_resolver_options); } FileEventPtr DispatcherImpl::createFileEvent(os_fd_t fd, FileReadyCb cb, FileTriggerType trigger, diff --git a/source/common/event/dispatcher_impl.h b/source/common/event/dispatcher_impl.h index fe16145e7cd2d..601bc206c1c31 100644 --- a/source/common/event/dispatcher_impl.h +++ b/source/common/event/dispatcher_impl.h @@ -14,11 +14,11 @@ #include "envoy/network/connection_handler.h" #include "envoy/stats/scope.h" -#include "common/common/logger.h" -#include "common/common/thread.h" -#include "common/event/libevent.h" -#include "common/event/libevent_scheduler.h" -#include "common/signal/fatal_error_handler.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/common/event/libevent.h" +#include "source/common/event/libevent_scheduler.h" +#include "source/common/signal/fatal_error_handler.h" #include "absl/container/inlined_vector.h" @@ -66,9 +66,9 @@ class DispatcherImpl : Logger::Loggable, Network::Address::InstanceConstSharedPtr source_address, Network::TransportSocketPtr&& transport_socket, const Network::ConnectionSocket::OptionsSharedPtr& options) override; - Network::DnsResolverSharedPtr - createDnsResolver(const std::vector& resolvers, - const bool use_tcp_for_dns_lookups) override; + Network::DnsResolverSharedPtr createDnsResolver( + const std::vector& resolvers, + const envoy::config::core::v3::DnsResolverOptions& dns_resolver_options) override; FileEventPtr createFileEvent(os_fd_t fd, FileReadyCb cb, FileTriggerType trigger, uint32_t events) override; Filesystem::WatcherPtr createFilesystemWatcher() override; diff --git a/source/common/event/event_impl_base.cc b/source/common/event/event_impl_base.cc index c14eb1874bc12..e7cb00f066960 100644 --- a/source/common/event/event_impl_base.cc +++ b/source/common/event/event_impl_base.cc @@ -1,4 +1,4 @@ -#include "common/event/event_impl_base.h" +#include "source/common/event/event_impl_base.h" #include "event2/event.h" diff --git a/source/common/event/file_event_impl.cc b/source/common/event/file_event_impl.cc index 45f01dffa467c..5b83e694d5481 100644 --- a/source/common/event/file_event_impl.cc +++ b/source/common/event/file_event_impl.cc @@ -1,9 +1,9 @@ -#include "common/event/file_event_impl.h" +#include "source/common/event/file_event_impl.h" #include -#include "common/common/assert.h" -#include "common/event/dispatcher_impl.h" +#include "source/common/common/assert.h" +#include "source/common/event/dispatcher_impl.h" #include "event2/event.h" diff --git a/source/common/event/file_event_impl.h b/source/common/event/file_event_impl.h index a0dd6a362334b..acb43334ccc3a 100644 --- a/source/common/event/file_event_impl.h +++ b/source/common/event/file_event_impl.h @@ -4,8 +4,8 @@ #include "envoy/event/file_event.h" -#include "common/event/dispatcher_impl.h" -#include "common/event/event_impl_base.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/event/event_impl_base.h" namespace Envoy { namespace Event { diff --git a/source/common/event/libevent.cc b/source/common/event/libevent.cc index c7ec364ddf249..d84dc16d4c519 100644 --- a/source/common/event/libevent.cc +++ b/source/common/event/libevent.cc @@ -1,8 +1,8 @@ -#include "common/event/libevent.h" +#include "source/common/event/libevent.h" #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "event2/thread.h" diff --git a/source/common/event/libevent.h b/source/common/event/libevent.h index 304b326fb4ddf..6687333926ca6 100644 --- a/source/common/event/libevent.h +++ b/source/common/event/libevent.h @@ -1,6 +1,6 @@ #pragma once -#include "common/common/c_smart_ptr.h" +#include "source/common/common/c_smart_ptr.h" struct event_base; extern "C" { diff --git a/source/common/event/libevent_scheduler.cc b/source/common/event/libevent_scheduler.cc index e0f21c5da2ba8..b41c8db0901dd 100644 --- a/source/common/event/libevent_scheduler.cc +++ b/source/common/event/libevent_scheduler.cc @@ -1,8 +1,8 @@ -#include "common/event/libevent_scheduler.h" +#include "source/common/event/libevent_scheduler.h" -#include "common/common/assert.h" -#include "common/event/schedulable_cb_impl.h" -#include "common/event/timer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/event/schedulable_cb_impl.h" +#include "source/common/event/timer_impl.h" #include "event2/util.h" diff --git a/source/common/event/libevent_scheduler.h b/source/common/event/libevent_scheduler.h index 063f3061a5ce8..93e81ef424bac 100644 --- a/source/common/event/libevent_scheduler.h +++ b/source/common/event/libevent_scheduler.h @@ -6,7 +6,7 @@ #include "envoy/event/schedulable_cb.h" #include "envoy/event/timer.h" -#include "common/event/libevent.h" +#include "source/common/event/libevent.h" #include "event2/event.h" #include "event2/watch.h" diff --git a/source/common/event/posix/signal_impl.cc b/source/common/event/posix/signal_impl.cc index 459e3f9b0dead..3e3a55160efcc 100644 --- a/source/common/event/posix/signal_impl.cc +++ b/source/common/event/posix/signal_impl.cc @@ -1,5 +1,5 @@ -#include "common/event/dispatcher_impl.h" -#include "common/event/signal_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/event/signal_impl.h" #include "event2/event.h" diff --git a/source/common/event/posix/signal_impl.h b/source/common/event/posix/signal_impl.h index b2d6014b041a4..d48aed73aad52 100644 --- a/source/common/event/posix/signal_impl.h +++ b/source/common/event/posix/signal_impl.h @@ -2,8 +2,8 @@ #include "envoy/event/signal.h" -#include "common/event/dispatcher_impl.h" -#include "common/event/event_impl_base.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/event/event_impl_base.h" namespace Envoy { namespace Event { diff --git a/source/common/event/real_time_system.cc b/source/common/event/real_time_system.cc index 7f022c23a0bb8..7f8f76005fe68 100644 --- a/source/common/event/real_time_system.cc +++ b/source/common/event/real_time_system.cc @@ -1,9 +1,9 @@ -#include "common/event/real_time_system.h" +#include "source/common/event/real_time_system.h" #include -#include "common/common/assert.h" -#include "common/event/timer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/event/timer_impl.h" namespace Envoy { namespace Event { diff --git a/source/common/event/real_time_system.h b/source/common/event/real_time_system.h index a5b86466eec1f..01b593d4d5f12 100644 --- a/source/common/event/real_time_system.h +++ b/source/common/event/real_time_system.h @@ -2,7 +2,7 @@ #include "envoy/event/timer.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Event { diff --git a/source/common/event/scaled_range_timer_manager_impl.cc b/source/common/event/scaled_range_timer_manager_impl.cc index 919116ae06d22..81e4e91afd485 100644 --- a/source/common/event/scaled_range_timer_manager_impl.cc +++ b/source/common/event/scaled_range_timer_manager_impl.cc @@ -1,4 +1,4 @@ -#include "common/event/scaled_range_timer_manager_impl.h" +#include "source/common/event/scaled_range_timer_manager_impl.h" #include #include @@ -6,8 +6,8 @@ #include "envoy/event/timer.h" -#include "common/common/assert.h" -#include "common/common/scope_tracker.h" +#include "source/common/common/assert.h" +#include "source/common/common/scope_tracker.h" namespace Envoy { namespace Event { diff --git a/source/common/event/schedulable_cb_impl.cc b/source/common/event/schedulable_cb_impl.cc index 2109af17972eb..f59ea2ff5bcb5 100644 --- a/source/common/event/schedulable_cb_impl.cc +++ b/source/common/event/schedulable_cb_impl.cc @@ -1,6 +1,6 @@ -#include "common/event/schedulable_cb_impl.h" +#include "source/common/event/schedulable_cb_impl.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "event2/event.h" diff --git a/source/common/event/schedulable_cb_impl.h b/source/common/event/schedulable_cb_impl.h index 48c6224f6a967..be9e434140c0c 100644 --- a/source/common/event/schedulable_cb_impl.h +++ b/source/common/event/schedulable_cb_impl.h @@ -2,8 +2,8 @@ #include "envoy/event/schedulable_cb.h" -#include "common/event/event_impl_base.h" -#include "common/event/libevent.h" +#include "source/common/event/event_impl_base.h" +#include "source/common/event/libevent.h" namespace Envoy { namespace Event { diff --git a/source/common/event/timer_impl.cc b/source/common/event/timer_impl.cc index 3a2189f95c40a..813bd7af55242 100644 --- a/source/common/event/timer_impl.cc +++ b/source/common/event/timer_impl.cc @@ -1,8 +1,8 @@ -#include "common/event/timer_impl.h" +#include "source/common/event/timer_impl.h" #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "event2/event.h" diff --git a/source/common/event/timer_impl.h b/source/common/event/timer_impl.h index bd56d528409e3..20641db7e29a1 100644 --- a/source/common/event/timer_impl.h +++ b/source/common/event/timer_impl.h @@ -4,10 +4,10 @@ #include "envoy/event/timer.h" -#include "common/common/scope_tracker.h" -#include "common/common/utility.h" -#include "common/event/event_impl_base.h" -#include "common/event/libevent.h" +#include "source/common/common/scope_tracker.h" +#include "source/common/common/utility.h" +#include "source/common/event/event_impl_base.h" +#include "source/common/event/libevent.h" namespace Envoy { namespace Event { diff --git a/source/common/event/win32/signal_impl.cc b/source/common/event/win32/signal_impl.cc index 4ffd62b73094b..d2a96b0de6fe3 100644 --- a/source/common/event/win32/signal_impl.cc +++ b/source/common/event/win32/signal_impl.cc @@ -1,6 +1,6 @@ -#include "common/api/os_sys_calls_impl.h" -#include "common/event/dispatcher_impl.h" -#include "common/event/signal_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/event/signal_impl.h" #include "event2/event.h" diff --git a/source/common/event/win32/signal_impl.h b/source/common/event/win32/signal_impl.h index 51e21e4f1ec90..fc7a05cf5697a 100644 --- a/source/common/event/win32/signal_impl.h +++ b/source/common/event/win32/signal_impl.h @@ -3,10 +3,10 @@ #include "envoy/event/signal.h" #include "envoy/network/io_handle.h" -#include "common/event/dispatcher_impl.h" -#include "common/event/event_impl_base.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/event/event_impl_base.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/singleton/threadsafe_singleton.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/filesystem/BUILD b/source/common/filesystem/BUILD index afcf463ef0b38..9fc6afae7863f 100644 --- a/source/common/filesystem/BUILD +++ b/source/common/filesystem/BUILD @@ -21,9 +21,10 @@ envoy_cc_win32_library( name = "directory_iterator_impl_lib", srcs = ["win32/directory_iterator_impl.cc"], hdrs = ["win32/directory_iterator_impl.h"], + include_prefix = "source/common/filesystem", strip_include_prefix = "win32", deps = [ - "//include/envoy/filesystem:filesystem_interface", + "//envoy/filesystem:filesystem_interface", ], ) @@ -31,9 +32,10 @@ envoy_cc_posix_library( name = "directory_iterator_impl_lib", srcs = ["posix/directory_iterator_impl.cc"], hdrs = ["posix/directory_iterator_impl.h"], + include_prefix = "source/common/filesystem", strip_include_prefix = "posix", deps = [ - "//include/envoy/filesystem:filesystem_interface", + "//envoy/filesystem:filesystem_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:utility_lib", ], @@ -48,6 +50,7 @@ envoy_cc_posix_library( name = "filesystem_impl_lib", srcs = ["posix/filesystem_impl.cc"], hdrs = ["posix/filesystem_impl.h"], + include_prefix = "source/common/filesystem", strip_include_prefix = "posix", deps = [ ":file_shared_lib", @@ -58,6 +61,7 @@ envoy_cc_win32_library( name = "filesystem_impl_lib", srcs = ["win32/filesystem_impl.cc"], hdrs = ["win32/filesystem_impl.h"], + include_prefix = "source/common/filesystem", strip_include_prefix = "win32", deps = [ ":file_shared_lib", @@ -69,7 +73,7 @@ envoy_cc_library( srcs = ["file_shared_impl.cc"], hdrs = ["file_shared_impl.h"], deps = [ - "//include/envoy/filesystem:filesystem_interface", + "//envoy/filesystem:filesystem_interface", "//source/common/common:assert_lib", "//source/common/common:utility_lib", ], @@ -102,14 +106,15 @@ envoy_cc_library( external_deps = [ "event", ], + include_prefix = "source/common/filesystem", strip_include_prefix = select({ "//bazel:apple": "kqueue", "//bazel:windows_x86_64": "win32", "//conditions:default": "inotify", }), deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/event:dispatcher_interface", + "//envoy/api:api_interface", + "//envoy/event:dispatcher_interface", "//source/common/common:assert_lib", "//source/common/common:linked_object", "//source/common/common:minimal_logger_lib", diff --git a/source/common/filesystem/directory.h b/source/common/filesystem/directory.h index a949ce724a722..2ca76e19fc0d1 100644 --- a/source/common/filesystem/directory.h +++ b/source/common/filesystem/directory.h @@ -4,7 +4,7 @@ #include "envoy/filesystem/filesystem.h" -#include "common/filesystem/directory_iterator_impl.h" +#include "source/common/filesystem/directory_iterator_impl.h" namespace Envoy { namespace Filesystem { diff --git a/source/common/filesystem/file_shared_impl.cc b/source/common/filesystem/file_shared_impl.cc index 510912e220dee..f4ad412f61cfa 100644 --- a/source/common/filesystem/file_shared_impl.cc +++ b/source/common/filesystem/file_shared_impl.cc @@ -1,6 +1,6 @@ -#include "common/filesystem/file_shared_impl.h" +#include "source/common/filesystem/file_shared_impl.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Filesystem { diff --git a/source/common/filesystem/file_shared_impl.h b/source/common/filesystem/file_shared_impl.h index b3834938b7559..fd81d03ec794e 100644 --- a/source/common/filesystem/file_shared_impl.h +++ b/source/common/filesystem/file_shared_impl.h @@ -4,7 +4,7 @@ #include "envoy/filesystem/filesystem.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Filesystem { diff --git a/source/common/filesystem/inotify/watcher_impl.cc b/source/common/filesystem/inotify/watcher_impl.cc index 2aeb9b6ef30b7..a30d6ef48e56e 100644 --- a/source/common/filesystem/inotify/watcher_impl.cc +++ b/source/common/filesystem/inotify/watcher_impl.cc @@ -8,10 +8,10 @@ #include "envoy/event/dispatcher.h" #include "envoy/event/file_event.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/filesystem/watcher_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/filesystem/watcher_impl.h" namespace Envoy { namespace Filesystem { diff --git a/source/common/filesystem/inotify/watcher_impl.h b/source/common/filesystem/inotify/watcher_impl.h index 9b416f5c9c031..73c4439fc53a9 100644 --- a/source/common/filesystem/inotify/watcher_impl.h +++ b/source/common/filesystem/inotify/watcher_impl.h @@ -8,7 +8,7 @@ #include "envoy/event/dispatcher.h" #include "envoy/filesystem/watcher.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "absl/container/node_hash_map.h" diff --git a/source/common/filesystem/kqueue/watcher_impl.cc b/source/common/filesystem/kqueue/watcher_impl.cc index 2452eeb688b29..47edf3a2c2912 100644 --- a/source/common/filesystem/kqueue/watcher_impl.cc +++ b/source/common/filesystem/kqueue/watcher_impl.cc @@ -6,10 +6,10 @@ #include "envoy/event/dispatcher.h" #include "envoy/event/file_event.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/filesystem/watcher_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/filesystem/watcher_impl.h" #include "event2/event.h" diff --git a/source/common/filesystem/kqueue/watcher_impl.h b/source/common/filesystem/kqueue/watcher_impl.h index e34d905489792..4a86f8be4ca5e 100644 --- a/source/common/filesystem/kqueue/watcher_impl.h +++ b/source/common/filesystem/kqueue/watcher_impl.h @@ -8,8 +8,8 @@ #include "envoy/event/dispatcher.h" #include "envoy/filesystem/watcher.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" #include "absl/container/node_hash_map.h" diff --git a/source/common/filesystem/posix/directory_iterator_impl.cc b/source/common/filesystem/posix/directory_iterator_impl.cc index 34a0ca9b2c4cd..65c1fe2bd7dfe 100644 --- a/source/common/filesystem/posix/directory_iterator_impl.cc +++ b/source/common/filesystem/posix/directory_iterator_impl.cc @@ -1,8 +1,8 @@ #include "envoy/common/exception.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/filesystem/directory_iterator_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/filesystem/directory_iterator_impl.h" namespace Envoy { namespace Filesystem { diff --git a/source/common/filesystem/posix/directory_iterator_impl.h b/source/common/filesystem/posix/directory_iterator_impl.h index abbe8e3fc1aa9..ffb2a6b2d62ab 100644 --- a/source/common/filesystem/posix/directory_iterator_impl.h +++ b/source/common/filesystem/posix/directory_iterator_impl.h @@ -4,7 +4,7 @@ #include "envoy/filesystem/filesystem.h" -#include "common/api/os_sys_calls_impl.h" +#include "source/common/api/os_sys_calls_impl.h" namespace Envoy { namespace Filesystem { diff --git a/source/common/filesystem/posix/filesystem_impl.cc b/source/common/filesystem/posix/filesystem_impl.cc index 0e514c91261a8..c89cacd6dafb4 100644 --- a/source/common/filesystem/posix/filesystem_impl.cc +++ b/source/common/filesystem/posix/filesystem_impl.cc @@ -11,11 +11,11 @@ #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/logger.h" -#include "common/common/utility.h" -#include "common/filesystem/filesystem_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" +#include "source/common/filesystem/filesystem_impl.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" diff --git a/source/common/filesystem/posix/filesystem_impl.h b/source/common/filesystem/posix/filesystem_impl.h index 65ff10c64c1a3..98abed720c61f 100644 --- a/source/common/filesystem/posix/filesystem_impl.h +++ b/source/common/filesystem/posix/filesystem_impl.h @@ -5,7 +5,7 @@ #include "envoy/api/os_sys_calls.h" -#include "common/filesystem/file_shared_impl.h" +#include "source/common/filesystem/file_shared_impl.h" namespace Envoy { namespace Filesystem { diff --git a/source/common/filesystem/win32/directory_iterator_impl.cc b/source/common/filesystem/win32/directory_iterator_impl.cc index 559cfda7eb271..645d5b16e5211 100644 --- a/source/common/filesystem/win32/directory_iterator_impl.cc +++ b/source/common/filesystem/win32/directory_iterator_impl.cc @@ -1,7 +1,7 @@ #include "envoy/common/exception.h" -#include "common/common/fmt.h" -#include "common/filesystem/directory_iterator_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/filesystem/directory_iterator_impl.h" namespace Envoy { namespace Filesystem { diff --git a/source/common/filesystem/win32/filesystem_impl.cc b/source/common/filesystem/win32/filesystem_impl.cc index 058cca07fe0b2..9ec504375951d 100644 --- a/source/common/filesystem/win32/filesystem_impl.cc +++ b/source/common/filesystem/win32/filesystem_impl.cc @@ -8,9 +8,9 @@ #include "envoy/common/exception.h" #include "envoy/common/platform.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/filesystem/filesystem_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/filesystem/filesystem_impl.h" #include "absl/container/node_hash_map.h" #include "absl/strings/str_cat.h" diff --git a/source/common/filesystem/win32/filesystem_impl.h b/source/common/filesystem/win32/filesystem_impl.h index fe9b1fea0dc15..4c009dd30beac 100644 --- a/source/common/filesystem/win32/filesystem_impl.h +++ b/source/common/filesystem/win32/filesystem_impl.h @@ -3,7 +3,7 @@ #include #include -#include "common/filesystem/file_shared_impl.h" +#include "source/common/filesystem/file_shared_impl.h" namespace Envoy { namespace Filesystem { diff --git a/source/common/filesystem/win32/watcher_impl.cc b/source/common/filesystem/win32/watcher_impl.cc index f7e5ed12dfa87..e4a3dd7e87f9e 100644 --- a/source/common/filesystem/win32/watcher_impl.cc +++ b/source/common/filesystem/win32/watcher_impl.cc @@ -1,8 +1,8 @@ -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/thread_impl.h" -#include "common/filesystem/watcher_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/thread_impl.h" +#include "source/common/filesystem/watcher_impl.h" namespace Envoy { namespace Filesystem { diff --git a/source/common/filesystem/win32/watcher_impl.h b/source/common/filesystem/win32/watcher_impl.h index 0633b254b4fca..2742293db6485 100644 --- a/source/common/filesystem/win32/watcher_impl.h +++ b/source/common/filesystem/win32/watcher_impl.h @@ -13,12 +13,12 @@ #include "envoy/filesystem/watcher.h" #include "envoy/network/io_handle.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/fmt.h" -#include "common/common/logger.h" -#include "common/common/thread_impl.h" -#include "common/network/io_socket_handle_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread_impl.h" +#include "source/common/network/io_socket_handle_impl.h" #include "absl/container/node_hash_map.h" diff --git a/source/common/filter/http/BUILD b/source/common/filter/http/BUILD index 3248d73417450..683467b9530ff 100644 --- a/source/common/filter/http/BUILD +++ b/source/common/filter/http/BUILD @@ -13,11 +13,11 @@ envoy_cc_library( srcs = ["filter_config_discovery_impl.cc"], hdrs = ["filter_config_discovery_impl.h"], deps = [ - "//include/envoy/config:subscription_interface", - "//include/envoy/filter/http:filter_config_provider_interface", - "//include/envoy/singleton:instance_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/config:subscription_interface", + "//envoy/filter/http:filter_config_provider_interface", + "//envoy/singleton:instance_interface", + "//envoy/stats:stats_macros", + "//envoy/thread_local:thread_local_interface", "//source/common/common:containers_lib", "//source/common/config:subscription_base_interface", "//source/common/config:subscription_factory_lib", diff --git a/source/common/filter/http/filter_config_discovery_impl.cc b/source/common/filter/http/filter_config_discovery_impl.cc index 8f5f74b000258..33c47f94eec93 100644 --- a/source/common/filter/http/filter_config_discovery_impl.cc +++ b/source/common/filter/http/filter_config_discovery_impl.cc @@ -1,4 +1,4 @@ -#include "common/filter/http/filter_config_discovery_impl.h" +#include "source/common/filter/http/filter_config_discovery_impl.h" #include "envoy/config/core/v3/extension.pb.h" #include "envoy/config/core/v3/extension.pb.validate.h" @@ -6,11 +6,11 @@ #include "envoy/http/filter.h" #include "envoy/server/filter_config.h" -#include "common/common/containers.h" -#include "common/common/thread.h" -#include "common/config/utility.h" -#include "common/grpc/common.h" -#include "common/protobuf/utility.h" +#include "source/common/common/containers.h" +#include "source/common/common/thread.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/protobuf/utility.h" #include "absl/strings/str_join.h" diff --git a/source/common/filter/http/filter_config_discovery_impl.h b/source/common/filter/http/filter_config_discovery_impl.h index 5027bc863f5f5..a207eca3099d0 100644 --- a/source/common/filter/http/filter_config_discovery_impl.h +++ b/source/common/filter/http/filter_config_discovery_impl.h @@ -12,10 +12,10 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/assert.h" -#include "common/config/subscription_base.h" -#include "common/init/manager_impl.h" -#include "common/init/target_impl.h" +#include "source/common/common/assert.h" +#include "source/common/config/subscription_base.h" +#include "source/common/init/manager_impl.h" +#include "source/common/init/target_impl.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" diff --git a/source/common/formatter/BUILD b/source/common/formatter/BUILD index 3acb8213a4637..202ad9d030cda 100644 --- a/source/common/formatter/BUILD +++ b/source/common/formatter/BUILD @@ -14,11 +14,11 @@ envoy_cc_library( hdrs = ["substitution_formatter.h"], external_deps = ["abseil_str_format"], deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/formatter:substitution_formatter_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/stream_info:stream_info_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/api:api_interface", + "//envoy/formatter:substitution_formatter_interface", + "//envoy/runtime:runtime_interface", + "//envoy/stream_info:stream_info_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:assert_lib", "//source/common/common:utility_lib", "//source/common/config:datasource_lib", diff --git a/source/common/formatter/substitution_format_string.cc b/source/common/formatter/substitution_format_string.cc index 5cd4a2f22e355..72937757950aa 100644 --- a/source/common/formatter/substitution_format_string.cc +++ b/source/common/formatter/substitution_format_string.cc @@ -1,10 +1,10 @@ -#include "common/formatter/substitution_format_string.h" +#include "source/common/formatter/substitution_format_string.h" #include "envoy/api/api.h" -#include "common/config/datasource.h" -#include "common/config/utility.h" -#include "common/formatter/substitution_formatter.h" +#include "source/common/config/datasource.h" +#include "source/common/config/utility.h" +#include "source/common/formatter/substitution_formatter.h" namespace Envoy { namespace Formatter { diff --git a/source/common/formatter/substitution_format_string.h b/source/common/formatter/substitution_format_string.h index d60033cabafd6..35d36f0c4de79 100644 --- a/source/common/formatter/substitution_format_string.h +++ b/source/common/formatter/substitution_format_string.h @@ -6,7 +6,7 @@ #include "envoy/config/core/v3/substitution_format_string.pb.h" #include "envoy/formatter/substitution_formatter.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Formatter { diff --git a/source/common/formatter/substitution_formatter.cc b/source/common/formatter/substitution_formatter.cc index 6c1c48c513202..76261d9f882ac 100644 --- a/source/common/formatter/substitution_formatter.cc +++ b/source/common/formatter/substitution_formatter.cc @@ -1,4 +1,4 @@ -#include "common/formatter/substitution_formatter.h" +#include "source/common/formatter/substitution_formatter.h" #include #include @@ -9,20 +9,20 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/upstream/upstream.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/common/thread.h" -#include "common/common/utility.h" -#include "common/config/metadata.h" -#include "common/grpc/common.h" -#include "common/grpc/status.h" -#include "common/http/utility.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_features.h" -#include "common/stream_info/utility.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/common/thread.h" +#include "source/common/common/utility.h" +#include "source/common/config/metadata.h" +#include "source/common/grpc/common.h" +#include "source/common/grpc/status.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/stream_info/utility.h" #include "absl/strings/str_split.h" #include "fmt/format.h" @@ -415,7 +415,7 @@ FormatterProviderPtr SubstitutionFormatParser::parseBuiltinCommand(const std::st } if (serialize_type.empty()) { - serialize_type = TYPED_SERIALIZATION; + serialize_type = std::string(TYPED_SERIALIZATION); } if (serialize_type != PLAIN_SERIALIZATION && serialize_type != TYPED_SERIALIZATION) { throw EnvoyException("Invalid filter state serialize type, only support PLAIN/TYPED."); @@ -1146,9 +1146,15 @@ MetadataFormatter::formatMetadata(const envoy::config::core::v3::Metadata& metad return absl::nullopt; } - std::string json = MessageUtil::getJsonStringFromMessageOrDie(value, false, true); - truncate(json, max_length_); - return json; + std::string str; + if (Runtime::runtimeFeatureEnabled("envoy.reloadable_features.unquote_log_string_values") && + value.kind_case() == ProtobufWkt::Value::kStringValue) { + str = value.string_value(); + } else { + str = MessageUtil::getJsonStringFromMessageOrDie(value, false, true); + } + truncate(str, max_length_); + return str; } ProtobufWkt::Value diff --git a/source/common/formatter/substitution_formatter.h b/source/common/formatter/substitution_formatter.h index 2a3150be4f2fd..ebe4752d1a56c 100644 --- a/source/common/formatter/substitution_formatter.h +++ b/source/common/formatter/substitution_formatter.h @@ -10,7 +10,7 @@ #include "envoy/formatter/substitution_formatter.h" #include "envoy/stream_info/stream_info.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" #include "absl/container/flat_hash_map.h" #include "absl/types/optional.h" @@ -81,13 +81,15 @@ class SubstitutionFormatParser { if constexpr (std::is_same_v::type, std::string>) { // Compile time handler for std::string. - param = *it; + param = std::string(*it); it++; } else { // Compile time handler for container type. It will catch all remaining tokens and // move iterator to the end. - param.insert(param.begin(), it, tokens.end()); - it = tokens.end(); + do { + param.push_back(std::string(*it)); + it++; + } while (it != tokens.end()); } } }(params), diff --git a/source/common/grpc/BUILD b/source/common/grpc/BUILD index c00ce5555e079..a0b15654ed0d7 100644 --- a/source/common/grpc/BUILD +++ b/source/common/grpc/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( deps = [ ":codec_lib", ":context_lib", - "//include/envoy/grpc:async_client_interface", + "//envoy/grpc:async_client_interface", "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/http:async_client_lib", ], @@ -31,7 +31,7 @@ envoy_cc_library( ":codec_lib", ":context_lib", ":typed_async_client_lib", - "//include/envoy/grpc:async_client_interface", + "//envoy/grpc:async_client_interface", "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/config:version_converter_lib", "//source/common/http:async_client_lib", @@ -46,10 +46,10 @@ envoy_cc_library( deps = [ ":async_client_lib", ":context_lib", - "//include/envoy/grpc:async_client_manager_interface", - "//include/envoy/singleton:manager_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/grpc:async_client_manager_interface", + "//envoy/singleton:manager_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", ] + envoy_select_google_grpc([":google_async_client_lib"]), ) @@ -58,7 +58,7 @@ envoy_cc_library( srcs = ["codec.cc"], hdrs = ["codec.h"], deps = [ - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/buffer:buffer_lib", "//source/common/common:minimal_logger_lib", ], @@ -70,7 +70,7 @@ envoy_cc_library( hdrs = ["status.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/grpc:status", + "//envoy/grpc:status", ], ) @@ -80,11 +80,11 @@ envoy_cc_library( hdrs = ["common.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/http:header_map_interface", - "//include/envoy/http:message_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/http:header_map_interface", + "//envoy/http:message_interface", + "//envoy/stats:stats_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/buffer:buffer_lib", "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/common:assert_lib", @@ -112,9 +112,9 @@ envoy_cc_library( deps = [ ":common_lib", ":stat_names_lib", - "//include/envoy/grpc:context_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/stats:stats_interface", + "//envoy/grpc:context_interface", + "//envoy/http:header_map_interface", + "//envoy/stats:stats_interface", "//source/common/common:hash_lib", "//source/common/stats:symbol_table_lib", "//source/common/stats:utility_lib", @@ -131,8 +131,8 @@ envoy_cc_library( ], deps = [ ":google_grpc_creds_lib", - "//include/envoy/api:api_interface", - "//include/envoy/registry", + "//envoy/api:api_interface", + "//envoy/registry", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:empty_string", @@ -149,7 +149,7 @@ envoy_cc_library( srcs = ["stat_names.cc"], hdrs = ["stat_names.h"], deps = [ - "//include/envoy/grpc:status", + "//envoy/grpc:status", "//source/common/stats:symbol_table_lib", ], ) @@ -169,10 +169,10 @@ envoy_cc_library( ":google_grpc_utils_lib", ":stat_names_lib", ":typed_async_client_lib", - "//include/envoy/api:api_interface", - "//include/envoy/grpc:google_grpc_creds_interface", - "//include/envoy/thread:thread_interface", - "//include/envoy/thread_local:thread_local_object", + "//envoy/api:api_interface", + "//envoy/grpc:google_grpc_creds_interface", + "//envoy/thread:thread_interface", + "//envoy/thread_local:thread_local_object", "//source/common/common:base64_lib", "//source/common/common:empty_string", "//source/common/common:linked_object", @@ -200,9 +200,9 @@ envoy_cc_library( hdrs = ["google_grpc_creds_impl.h"], external_deps = ["grpc"], deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/grpc:google_grpc_creds_interface", - "//include/envoy/registry", + "//envoy/api:api_interface", + "//envoy/grpc:google_grpc_creds_interface", + "//envoy/registry", "//source/common/config:datasource_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], @@ -216,9 +216,9 @@ envoy_cc_library( "grpc", ], deps = [ - "//include/envoy/grpc:async_client_manager_interface", - "//include/envoy/server:factory_context_interface", - "//include/envoy/singleton:instance_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/grpc:async_client_manager_interface", + "//envoy/server:factory_context_interface", + "//envoy/singleton:instance_interface", + "//envoy/thread_local:thread_local_interface", ], ) diff --git a/source/common/grpc/async_client_impl.cc b/source/common/grpc/async_client_impl.cc index 6d1152ef9f45a..53aeacf6236e6 100644 --- a/source/common/grpc/async_client_impl.cc +++ b/source/common/grpc/async_client_impl.cc @@ -1,13 +1,13 @@ -#include "common/grpc/async_client_impl.h" +#include "source/common/grpc/async_client_impl.h" #include "envoy/config/core/v3/grpc_service.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/common/enum_to_int.h" -#include "common/common/utility.h" -#include "common/grpc/common.h" -#include "common/http/header_map_impl.h" -#include "common/http/utility.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/utility.h" namespace Envoy { namespace Grpc { diff --git a/source/common/grpc/async_client_impl.h b/source/common/grpc/async_client_impl.h index 2e7139df209c0..33d68f61417ef 100644 --- a/source/common/grpc/async_client_impl.h +++ b/source/common/grpc/async_client_impl.h @@ -6,11 +6,11 @@ #include "envoy/config/core/v3/grpc_service.pb.h" #include "envoy/grpc/async_client.h" -#include "common/common/linked_object.h" -#include "common/grpc/codec.h" -#include "common/grpc/typed_async_client.h" -#include "common/http/async_client_impl.h" -#include "common/router/header_parser.h" +#include "source/common/common/linked_object.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/typed_async_client.h" +#include "source/common/http/async_client_impl.h" +#include "source/common/router/header_parser.h" namespace Envoy { namespace Grpc { diff --git a/source/common/grpc/async_client_manager_impl.cc b/source/common/grpc/async_client_manager_impl.cc index 7b122e8bd59e4..9538aa3d9d71b 100644 --- a/source/common/grpc/async_client_manager_impl.cc +++ b/source/common/grpc/async_client_manager_impl.cc @@ -1,15 +1,15 @@ -#include "common/grpc/async_client_manager_impl.h" +#include "source/common/grpc/async_client_manager_impl.h" #include "envoy/config/core/v3/grpc_service.pb.h" #include "envoy/stats/scope.h" -#include "common/common/base64.h" -#include "common/grpc/async_client_impl.h" +#include "source/common/common/base64.h" +#include "source/common/grpc/async_client_impl.h" #include "absl/strings/match.h" #ifdef ENVOY_GOOGLE_GRPC -#include "common/grpc/google_async_client_impl.h" +#include "source/common/grpc/google_async_client_impl.h" #endif namespace Envoy { diff --git a/source/common/grpc/async_client_manager_impl.h b/source/common/grpc/async_client_manager_impl.h index 923dc3beb9c15..8e3abaf23b55f 100644 --- a/source/common/grpc/async_client_manager_impl.h +++ b/source/common/grpc/async_client_manager_impl.h @@ -8,7 +8,7 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" -#include "common/grpc/stat_names.h" +#include "source/common/grpc/stat_names.h" namespace Envoy { namespace Grpc { diff --git a/source/common/grpc/codec.cc b/source/common/grpc/codec.cc index 4ac61523d3153..3c8233d2644c8 100644 --- a/source/common/grpc/codec.cc +++ b/source/common/grpc/codec.cc @@ -1,11 +1,11 @@ -#include "common/grpc/codec.h" +#include "source/common/grpc/codec.h" #include #include #include #include -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "absl/container/fixed_array.h" diff --git a/source/common/grpc/common.cc b/source/common/grpc/common.cc index 306062d781420..3cf1af966ffd1 100644 --- a/source/common/grpc/common.cc +++ b/source/common/grpc/common.cc @@ -1,25 +1,25 @@ -#include "common/grpc/common.h" +#include "source/common/grpc/common.h" #include #include #include #include -#include "common/buffer/buffer_impl.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/common/assert.h" -#include "common/common/base64.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/macros.h" -#include "common/common/safe_memcpy.h" -#include "common/common/utility.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/protobuf/protobuf.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/base64.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/macros.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/common/utility.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/protobuf.h" #include "absl/container/fixed_array.h" #include "absl/strings/match.h" diff --git a/source/common/grpc/common.h b/source/common/grpc/common.h index dcade2ad8015a..c723aeca970ff 100644 --- a/source/common/grpc/common.h +++ b/source/common/grpc/common.h @@ -10,9 +10,9 @@ #include "envoy/http/header_map.h" #include "envoy/http/message.h" -#include "common/common/hash.h" -#include "common/grpc/status.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/hash.h" +#include "source/common/grpc/status.h" +#include "source/common/protobuf/protobuf.h" #include "absl/types/optional.h" #include "google/rpc/status.pb.h" diff --git a/source/common/grpc/context_impl.cc b/source/common/grpc/context_impl.cc index 4c0e2f91ebc3e..11350f4546167 100644 --- a/source/common/grpc/context_impl.cc +++ b/source/common/grpc/context_impl.cc @@ -1,10 +1,10 @@ -#include "common/grpc/context_impl.h" +#include "source/common/grpc/context_impl.h" #include #include -#include "common/grpc/common.h" -#include "common/stats/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/stats/utility.h" namespace Envoy { namespace Grpc { diff --git a/source/common/grpc/context_impl.h b/source/common/grpc/context_impl.h index 98a34695235bb..8cc073a46be4e 100644 --- a/source/common/grpc/context_impl.h +++ b/source/common/grpc/context_impl.h @@ -6,10 +6,10 @@ #include "envoy/grpc/context.h" #include "envoy/http/header_map.h" -#include "common/common/hash.h" -#include "common/grpc/stat_names.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/utility.h" +#include "source/common/common/hash.h" +#include "source/common/grpc/stat_names.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/utility.h" #include "absl/types/optional.h" diff --git a/source/common/grpc/google_async_client_cache.cc b/source/common/grpc/google_async_client_cache.cc index 5150f8182b20b..2d7e5c664a73a 100644 --- a/source/common/grpc/google_async_client_cache.cc +++ b/source/common/grpc/google_async_client_cache.cc @@ -1,4 +1,4 @@ -#include "common/grpc/google_async_client_cache.h" +#include "source/common/grpc/google_async_client_cache.h" namespace Envoy { namespace Grpc { diff --git a/source/common/grpc/google_async_client_impl.cc b/source/common/grpc/google_async_client_impl.cc index c3d1cdd89bc45..56380d58dcb13 100644 --- a/source/common/grpc/google_async_client_impl.cc +++ b/source/common/grpc/google_async_client_impl.cc @@ -1,17 +1,17 @@ -#include "common/grpc/google_async_client_impl.h" +#include "source/common/grpc/google_async_client_impl.h" #include "envoy/config/core/v3/grpc_service.pb.h" #include "envoy/stats/scope.h" -#include "common/common/base64.h" -#include "common/common/empty_string.h" -#include "common/common/lock_guard.h" -#include "common/config/datasource.h" -#include "common/grpc/common.h" -#include "common/grpc/google_grpc_creds_impl.h" -#include "common/grpc/google_grpc_utils.h" -#include "common/router/header_parser.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/common/base64.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/lock_guard.h" +#include "source/common/config/datasource.h" +#include "source/common/grpc/common.h" +#include "source/common/grpc/google_grpc_creds_impl.h" +#include "source/common/grpc/google_grpc_utils.h" +#include "source/common/router/header_parser.h" +#include "source/common/tracing/http_tracer_impl.h" #include "grpcpp/support/proto_buffer_reader.h" diff --git a/source/common/grpc/google_async_client_impl.h b/source/common/grpc/google_async_client_impl.h index c3ea7f4c12d46..4977ed2191320 100644 --- a/source/common/grpc/google_async_client_impl.h +++ b/source/common/grpc/google_async_client_impl.h @@ -13,14 +13,14 @@ #include "envoy/thread_local/thread_local_object.h" #include "envoy/tracing/http_tracer.h" -#include "common/common/linked_object.h" -#include "common/common/thread.h" -#include "common/common/thread_annotations.h" -#include "common/grpc/google_grpc_context.h" -#include "common/grpc/stat_names.h" -#include "common/grpc/typed_async_client.h" -#include "common/router/header_parser.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/thread.h" +#include "source/common/common/thread_annotations.h" +#include "source/common/grpc/google_grpc_context.h" +#include "source/common/grpc/stat_names.h" +#include "source/common/grpc/typed_async_client.h" +#include "source/common/router/header_parser.h" +#include "source/common/tracing/http_tracer_impl.h" #include "absl/container/node_hash_set.h" #include "grpcpp/generic/generic_stub.h" diff --git a/source/common/grpc/google_grpc_context.cc b/source/common/grpc/google_grpc_context.cc index cdd9808399285..5309b11ac2c4f 100644 --- a/source/common/grpc/google_grpc_context.cc +++ b/source/common/grpc/google_grpc_context.cc @@ -1,11 +1,11 @@ -#include "common/grpc/google_grpc_context.h" +#include "source/common/grpc/google_grpc_context.h" #include -#include "common/common/assert.h" -#include "common/common/lock_guard.h" -#include "common/common/macros.h" -#include "common/common/thread.h" +#include "source/common/common/assert.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/macros.h" +#include "source/common/common/thread.h" #ifdef ENVOY_GOOGLE_GRPC #include "grpcpp/grpcpp.h" diff --git a/source/common/grpc/google_grpc_context.h b/source/common/grpc/google_grpc_context.h index 2ec235161f2e0..b1378a11cf083 100644 --- a/source/common/grpc/google_grpc_context.h +++ b/source/common/grpc/google_grpc_context.h @@ -1,6 +1,6 @@ #pragma once -#include "common/common/thread.h" +#include "source/common/common/thread.h" namespace Envoy { namespace Grpc { diff --git a/source/common/grpc/google_grpc_creds_impl.cc b/source/common/grpc/google_grpc_creds_impl.cc index b534c2eebdf76..dc45e45bd78c7 100644 --- a/source/common/grpc/google_grpc_creds_impl.cc +++ b/source/common/grpc/google_grpc_creds_impl.cc @@ -1,10 +1,10 @@ -#include "common/grpc/google_grpc_creds_impl.h" +#include "source/common/grpc/google_grpc_creds_impl.h" #include "envoy/config/core/v3/grpc_service.pb.h" #include "envoy/grpc/google_grpc_creds.h" #include "envoy/registry/registry.h" -#include "common/config/datasource.h" +#include "source/common/config/datasource.h" namespace Envoy { namespace Grpc { diff --git a/source/common/grpc/google_grpc_utils.cc b/source/common/grpc/google_grpc_utils.cc index b3fe1e20a320b..dc7575ffae56e 100644 --- a/source/common/grpc/google_grpc_utils.cc +++ b/source/common/grpc/google_grpc_utils.cc @@ -1,4 +1,4 @@ -#include "common/grpc/google_grpc_utils.h" +#include "source/common/grpc/google_grpc_utils.h" #include #include @@ -8,13 +8,13 @@ #include "envoy/grpc/google_grpc_creds.h" #include "envoy/registry/registry.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/macros.h" -#include "common/common/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" #include "absl/container/fixed_array.h" #include "absl/strings/match.h" diff --git a/source/common/grpc/stat_names.cc b/source/common/grpc/stat_names.cc index 3366c45c99cf6..51df2f66247a1 100644 --- a/source/common/grpc/stat_names.cc +++ b/source/common/grpc/stat_names.cc @@ -1,4 +1,4 @@ -#include "common/grpc/stat_names.h" +#include "source/common/grpc/stat_names.h" namespace Envoy { namespace Grpc { diff --git a/source/common/grpc/stat_names.h b/source/common/grpc/stat_names.h index daa2f7c9aeb9b..2c65f597aeea2 100644 --- a/source/common/grpc/stat_names.h +++ b/source/common/grpc/stat_names.h @@ -2,7 +2,7 @@ #include "envoy/grpc/status.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/grpc/status.cc b/source/common/grpc/status.cc index 7f0c194e2f6c3..87cc5547637d2 100644 --- a/source/common/grpc/status.cc +++ b/source/common/grpc/status.cc @@ -1,4 +1,4 @@ -#include "common/grpc/status.h" +#include "source/common/grpc/status.h" namespace Envoy { namespace Grpc { diff --git a/source/common/grpc/typed_async_client.cc b/source/common/grpc/typed_async_client.cc index 465bde6e139e0..8afc4ae192a33 100644 --- a/source/common/grpc/typed_async_client.cc +++ b/source/common/grpc/typed_async_client.cc @@ -1,11 +1,11 @@ -#include "common/grpc/typed_async_client.h" +#include "source/common/grpc/typed_async_client.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/common/assert.h" -#include "common/common/macros.h" -#include "common/common/utility.h" -#include "common/grpc/common.h" -#include "common/http/utility.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/http/utility.h" namespace Envoy { namespace Grpc { diff --git a/source/common/grpc/typed_async_client.h b/source/common/grpc/typed_async_client.h index 2905db8f345ac..22a009054357c 100644 --- a/source/common/grpc/typed_async_client.h +++ b/source/common/grpc/typed_async_client.h @@ -5,8 +5,8 @@ #include "envoy/grpc/async_client.h" -#include "common/common/empty_string.h" -#include "common/config/version_converter.h" +#include "source/common/common/empty_string.h" +#include "source/common/config/version_converter.h" namespace Envoy { namespace Grpc { diff --git a/source/common/html/utility.cc b/source/common/html/utility.cc index e2b80e188da6b..e895fe857ff43 100644 --- a/source/common/html/utility.cc +++ b/source/common/html/utility.cc @@ -1,4 +1,4 @@ -#include "common/html/utility.h" +#include "source/common/html/utility.h" #include diff --git a/source/common/http/BUILD b/source/common/http/BUILD index a07a7265adaf8..55c15b06a3f3f 100644 --- a/source/common/http/BUILD +++ b/source/common/http/BUILD @@ -14,18 +14,18 @@ envoy_cc_library( srcs = ["async_client_impl.cc"], hdrs = ["async_client_impl.h"], deps = [ - "//include/envoy/config:typed_metadata_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/http:async_client_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/http:context_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/http:message_interface", - "//include/envoy/router:context_interface", - "//include/envoy/router:router_interface", - "//include/envoy/router:router_ratelimit_interface", - "//include/envoy/router:shadow_writer_interface", - "//include/envoy/ssl:connection_interface", + "//envoy/config:typed_metadata_interface", + "//envoy/event:dispatcher_interface", + "//envoy/http:async_client_interface", + "//envoy/http:codec_interface", + "//envoy/http:context_interface", + "//envoy/http:header_map_interface", + "//envoy/http:message_interface", + "//envoy/router:context_interface", + "//envoy/router:router_interface", + "//envoy/router:router_ratelimit_interface", + "//envoy/router:shadow_writer_interface", + "//envoy/ssl:connection_interface", "//source/common/common:empty_string", "//source/common/common:linked_object", "//source/common/router:router_lib", @@ -42,7 +42,7 @@ envoy_cc_library( srcs = ["async_client_utility.cc"], hdrs = ["async_client_utility.h"], deps = [ - "//include/envoy/http:async_client_interface", + "//envoy/http:async_client_interface", ], ) @@ -55,10 +55,10 @@ envoy_cc_library( ":exception_lib", ":status_lib", ":utility_lib", - "//include/envoy/event:deferred_deletable", - "//include/envoy/http:codec_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", + "//envoy/event:deferred_deletable", + "//envoy/http:codec_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", "//source/common/common:assert_lib", "//source/common/common:enum_to_int", "//source/common/common:linked_object", @@ -76,7 +76,7 @@ envoy_cc_library( name = "codec_helper_lib", hdrs = ["codec_helper.h"], deps = [ - "//include/envoy/http:codec_interface", + "//envoy/http:codec_interface", "//source/common/common:assert_lib", ], ) @@ -92,7 +92,7 @@ envoy_cc_library( envoy_cc_library( name = "codec_wrappers_lib", hdrs = ["codec_wrappers.h"], - deps = ["//include/envoy/http:codec_interface"], + deps = ["//envoy/http:codec_interface"], ) envoy_cc_library( @@ -102,9 +102,9 @@ envoy_cc_library( deps = [ ":headers_lib", ":utility_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/stats:stats_interface", + "//envoy/http:codes_interface", + "//envoy/http:header_map_interface", + "//envoy/stats:stats_interface", "//source/common/common:enum_to_int", "//source/common/common:utility_lib", "//source/common/stats:symbol_table_lib", @@ -118,7 +118,7 @@ envoy_cc_library( deps = [ ":codes_lib", ":user_agent_lib", - "//include/envoy/http:context_interface", + "//envoy/http:context_interface", ], ) @@ -128,8 +128,8 @@ envoy_cc_library( hdrs = ["conn_pool_base.h"], deps = [ ":codec_client_lib", - "//include/envoy/http:conn_pool_interface", - "//include/envoy/stats:timespan_interface", + "//envoy/http:conn_pool_interface", + "//envoy/stats:timespan_interface", "//source/common/common:linked_object", "//source/common/conn_pool:conn_pool_base_lib", "//source/common/stats:timespan_lib", @@ -154,8 +154,8 @@ envoy_cc_library( srcs = ["http3_status_tracker.cc"], hdrs = ["http3_status_tracker.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", ], ) @@ -170,12 +170,12 @@ envoy_cc_library( "alternate_protocols_cache_manager_impl.h", ], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/http:alternate_protocols_cache_interface", - "//include/envoy/singleton:manager_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:resource_manager_interface", + "//envoy/common:time_interface", + "//envoy/event:dispatcher_interface", + "//envoy/http:alternate_protocols_cache_interface", + "//envoy/singleton:manager_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:resource_manager_interface", "//source/common/common:logger_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], @@ -198,11 +198,11 @@ envoy_cc_library( hdrs = ["conn_manager_config.h"], deps = [ ":date_provider_lib", - "//include/envoy/config:config_provider_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/http:original_ip_detection_interface", - "//include/envoy/http:request_id_extension_interface", - "//include/envoy/router:rds_interface", + "//envoy/config:config_provider_interface", + "//envoy/http:filter_interface", + "//envoy/http:original_ip_detection_interface", + "//envoy/http:request_id_extension_interface", + "//envoy/router:rds_interface", "//source/common/local_reply:local_reply_lib", "//source/common/network:utility_lib", "//source/common/stats:symbol_table_lib", @@ -221,8 +221,8 @@ envoy_cc_library( ], deps = [ ":headers_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/matcher:matcher_interface", + "//envoy/http:filter_interface", + "//envoy/matcher:matcher_interface", "//source/common/buffer:watermark_buffer_lib", "//source/common/common:linked_object", "//source/common/common:scope_tracked_object_stack", @@ -260,30 +260,30 @@ envoy_cc_library( ":status_lib", ":user_agent_lib", ":utility_lib", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/common:scope_tracker_interface", - "//include/envoy/common:time_interface", - "//include/envoy/event:deferred_deletable", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/http:api_listener_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/http:context_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:drain_decision_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/router:rds_interface", - "//include/envoy/router:scopes_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/server/overload:overload_manager_interface", - "//include/envoy/ssl:connection_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/stats:timespan_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/access_log:access_log_interface", + "//envoy/buffer:buffer_interface", + "//envoy/common:scope_tracker_interface", + "//envoy/common:time_interface", + "//envoy/event:deferred_deletable", + "//envoy/event:dispatcher_interface", + "//envoy/http:api_listener_interface", + "//envoy/http:codec_interface", + "//envoy/http:context_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", + "//envoy/local_info:local_info_interface", + "//envoy/network:connection_interface", + "//envoy/network:drain_decision_interface", + "//envoy/network:filter_interface", + "//envoy/router:rds_interface", + "//envoy/router:scopes_interface", + "//envoy/runtime:runtime_interface", + "//envoy/server/overload:overload_manager_interface", + "//envoy/ssl:connection_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", + "//envoy/stats:timespan_interface", + "//envoy/upstream:upstream_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:dump_state_utils", @@ -317,10 +317,10 @@ envoy_cc_library( "date_provider_impl.h", ], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/singleton:instance_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/event:dispatcher_interface", + "//envoy/http:header_map_interface", + "//envoy/singleton:instance_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/common:utility_lib", ], ) @@ -329,8 +329,8 @@ envoy_cc_library( name = "exception_lib", hdrs = ["exception.h"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/http:header_map_interface", + "//envoy/http:codes_interface", + "//envoy/http:header_map_interface", ], ) @@ -340,7 +340,7 @@ envoy_cc_library( hdrs = ["hash_policy.h"], deps = [ ":utility_lib", - "//include/envoy/http:hash_policy_interface", + "//envoy/http:hash_policy_interface", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", ], ) @@ -350,7 +350,7 @@ envoy_cc_library( srcs = ["header_list_view.cc"], hdrs = ["header_list_view.h"], deps = [ - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", ], ) @@ -360,7 +360,7 @@ envoy_cc_library( hdrs = ["header_map_impl.h"], deps = [ ":headers_lib", - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "//source/common/common:assert_lib", "//source/common/common:dump_state_utils", "//source/common/common:empty_string", @@ -375,7 +375,7 @@ envoy_cc_library( name = "headers_lib", hdrs = ["headers.h"], deps = [ - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "//source/common/singleton:const_singleton", "//source/common/singleton:threadsafe_singleton", ], @@ -386,8 +386,8 @@ envoy_cc_library( hdrs = ["message_impl.h"], deps = [ ":header_map_lib", - "//include/envoy/http:header_map_interface", - "//include/envoy/http:message_interface", + "//envoy/http:header_map_interface", + "//envoy/http:message_interface", "//source/common/buffer:buffer_lib", "//source/common/common:non_copyable", ], @@ -400,9 +400,9 @@ envoy_cc_library( deps = [ ":message_lib", ":utility_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/event:dispatcher_interface", + "//envoy/runtime:runtime_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:enum_to_int", "//source/common/config:utility_lib", ], @@ -414,11 +414,11 @@ envoy_cc_library( hdrs = ["user_agent.h"], deps = [ ":headers_lib", - "//include/envoy/http:header_map_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/stats:timespan_interface", + "//envoy/http:header_map_interface", + "//envoy/network:connection_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", + "//envoy/stats:timespan_interface", "//source/common/stats:symbol_table_lib", "//source/common/stats:utility_lib", ], @@ -439,10 +439,10 @@ envoy_cc_library( ":header_map_lib", ":headers_lib", ":message_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/http:query_params_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", + "//envoy/http:query_params_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:empty_string", @@ -467,8 +467,8 @@ envoy_cc_library( ":header_map_lib", ":status_lib", ":utility_lib", - "//include/envoy/common:regex_interface", - "//include/envoy/http:header_map_interface", + "//envoy/common:regex_interface", + "//envoy/http:header_map_interface", "//source/common/common:regex_lib", "//source/common/common:utility_lib", "//source/common/protobuf:utility_lib", @@ -488,7 +488,7 @@ envoy_cc_library( ], deps = [ ":legacy_path_canonicalizer", - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "//source/common/common:logger_lib", "//source/common/runtime:runtime_features_lib", "@com_googlesource_googleurl//url:envoy_url", @@ -511,8 +511,8 @@ envoy_cc_library( "request_id_extension_impl.h", ], deps = [ - "//include/envoy/http:request_id_extension_interface", - "//include/envoy/server:request_id_extension_config_interface", + "//envoy/http:request_id_extension_interface", + "//envoy/server:request_id_extension_config_interface", "//source/common/config:utility_lib", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", ], @@ -526,7 +526,7 @@ envoy_cc_library( "abseil_status", ], deps = [ - "//include/envoy/http:codes_interface", + "//envoy/http:codes_interface", "//source/common/common:assert_lib", ], ) diff --git a/source/common/http/alternate_protocols_cache_impl.cc b/source/common/http/alternate_protocols_cache_impl.cc index 4368e9a778599..f4a176fb405df 100644 --- a/source/common/http/alternate_protocols_cache_impl.cc +++ b/source/common/http/alternate_protocols_cache_impl.cc @@ -1,6 +1,6 @@ -#include "common/http/alternate_protocols_cache_impl.h" +#include "source/common/http/alternate_protocols_cache_impl.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Http { diff --git a/source/common/http/alternate_protocols_cache_manager_impl.cc b/source/common/http/alternate_protocols_cache_manager_impl.cc index b70290b86f6c6..a787e72cbe55d 100644 --- a/source/common/http/alternate_protocols_cache_manager_impl.cc +++ b/source/common/http/alternate_protocols_cache_manager_impl.cc @@ -1,7 +1,7 @@ -#include "common/http/alternate_protocols_cache_manager_impl.h" +#include "source/common/http/alternate_protocols_cache_manager_impl.h" -#include "common/http/alternate_protocols_cache_impl.h" -#include "common/protobuf/protobuf.h" +#include "source/common/http/alternate_protocols_cache_impl.h" +#include "source/common/protobuf/protobuf.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/http/async_client_impl.cc b/source/common/http/async_client_impl.cc index 044bf497b4c42..c66fd5f57a6bc 100644 --- a/source/common/http/async_client_impl.cc +++ b/source/common/http/async_client_impl.cc @@ -1,4 +1,4 @@ -#include "common/http/async_client_impl.h" +#include "source/common/http/async_client_impl.h" #include #include @@ -8,9 +8,9 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/grpc/common.h" -#include "common/http/utility.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/grpc/common.h" +#include "source/common/http/utility.h" +#include "source/common/tracing/http_tracer_impl.h" namespace Envoy { namespace Http { diff --git a/source/common/http/async_client_impl.h b/source/common/http/async_client_impl.h index c4e7455bda687..d496e21bbefad 100644 --- a/source/common/http/async_client_impl.h +++ b/source/common/http/async_client_impl.h @@ -31,13 +31,13 @@ #include "envoy/upstream/load_balancer.h" #include "envoy/upstream/upstream.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/linked_object.h" -#include "common/http/message_impl.h" -#include "common/router/router.h" -#include "common/stream_info/stream_info_impl.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/linked_object.h" +#include "source/common/http/message_impl.h" +#include "source/common/router/router.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/common/tracing/http_tracer_impl.h" namespace Envoy { namespace Http { diff --git a/source/common/http/async_client_utility.cc b/source/common/http/async_client_utility.cc index 664a0fc0c651a..95630bc474bbe 100644 --- a/source/common/http/async_client_utility.cc +++ b/source/common/http/async_client_utility.cc @@ -1,6 +1,6 @@ -#include "common/http/async_client_utility.h" +#include "source/common/http/async_client_utility.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Http { diff --git a/source/common/http/codec_client.cc b/source/common/http/codec_client.cc index 0b21cf4bc6939..899dde6f9eff0 100644 --- a/source/common/http/codec_client.cc +++ b/source/common/http/codec_client.cc @@ -1,20 +1,20 @@ -#include "common/http/codec_client.h" +#include "source/common/http/codec_client.h" #include #include #include "envoy/http/codec.h" -#include "common/common/enum_to_int.h" -#include "common/config/utility.h" -#include "common/http/exception.h" -#include "common/http/http1/codec_impl.h" -#include "common/http/http2/codec_impl.h" -#include "common/http/status.h" -#include "common/http/utility.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/config/utility.h" +#include "source/common/http/exception.h" +#include "source/common/http/http1/codec_impl.h" +#include "source/common/http/http2/codec_impl.h" +#include "source/common/http/status.h" +#include "source/common/http/utility.h" #ifdef ENVOY_ENABLE_QUIC -#include "common/quic/codec_impl.h" +#include "source/common/quic/codec_impl.h" #endif namespace Envoy { diff --git a/source/common/http/codec_client.h b/source/common/http/codec_client.h index b2cb841010d65..684c962380f32 100644 --- a/source/common/http/codec_client.h +++ b/source/common/http/codec_client.h @@ -12,11 +12,11 @@ #include "envoy/network/filter.h" #include "envoy/upstream/upstream.h" -#include "common/common/assert.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" -#include "common/http/codec_wrappers.h" -#include "common/network/filter_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/common/http/codec_wrappers.h" +#include "source/common/network/filter_impl.h" namespace Envoy { namespace Http { diff --git a/source/common/http/codec_helper.h b/source/common/http/codec_helper.h index 5128891e41055..4a304c159e56c 100644 --- a/source/common/http/codec_helper.h +++ b/source/common/http/codec_helper.h @@ -2,7 +2,7 @@ #include "envoy/http/codec.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/container/inlined_vector.h" diff --git a/source/common/http/codes.cc b/source/common/http/codes.cc index 37273856a1c60..2cf5d52960397 100644 --- a/source/common/http/codes.cc +++ b/source/common/http/codes.cc @@ -1,4 +1,4 @@ -#include "common/http/codes.h" +#include "source/common/http/codes.h" #include #include @@ -6,10 +6,10 @@ #include "envoy/http/header_map.h" #include "envoy/stats/scope.h" -#include "common/common/enum_to_int.h" -#include "common/common/utility.h" -#include "common/http/headers.h" -#include "common/http/utility.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" diff --git a/source/common/http/codes.h b/source/common/http/codes.h index 3957377aa2c2f..a2c70cc13c597 100644 --- a/source/common/http/codes.h +++ b/source/common/http/codes.h @@ -8,8 +8,8 @@ #include "envoy/http/header_map.h" #include "envoy/stats/scope.h" -#include "common/common/thread.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/common/thread.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Http { diff --git a/source/common/http/conn_manager_config.h b/source/common/http/conn_manager_config.h index 0569921eb9287..d69beb04e0805 100644 --- a/source/common/http/conn_manager_config.h +++ b/source/common/http/conn_manager_config.h @@ -10,10 +10,10 @@ #include "envoy/tracing/http_tracer.h" #include "envoy/type/v3/percent.pb.h" -#include "common/http/date_provider.h" -#include "common/local_reply/local_reply.h" -#include "common/network/utility.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/http/date_provider.h" +#include "source/common/local_reply/local_reply.h" +#include "source/common/network/utility.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Http { diff --git a/source/common/http/conn_manager_impl.cc b/source/common/http/conn_manager_impl.cc index 05d4277b37567..3f4a567f26e07 100644 --- a/source/common/http/conn_manager_impl.cc +++ b/source/common/http/conn_manager_impl.cc @@ -1,4 +1,4 @@ -#include "common/http/conn_manager_impl.h" +#include "source/common/http/conn_manager_impl.h" #include #include @@ -22,28 +22,28 @@ #include "envoy/tracing/http_tracer.h" #include "envoy/type/v3/percent.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/scope_tracker.h" -#include "common/common/utility.h" -#include "common/http/codes.h" -#include "common/http/conn_manager_utility.h" -#include "common/http/exception.h" -#include "common/http/header_map_impl.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/http/http1/codec_impl.h" -#include "common/http/http2/codec_impl.h" -#include "common/http/path_utility.h" -#include "common/http/status.h" -#include "common/http/utility.h" -#include "common/network/utility.h" -#include "common/router/config_impl.h" -#include "common/runtime/runtime_features.h" -#include "common/stats/timespan_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/scope_tracker.h" +#include "source/common/common/utility.h" +#include "source/common/http/codes.h" +#include "source/common/http/conn_manager_utility.h" +#include "source/common/http/exception.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/http1/codec_impl.h" +#include "source/common/http/http2/codec_impl.h" +#include "source/common/http/path_utility.h" +#include "source/common/http/status.h" +#include "source/common/http/utility.h" +#include "source/common/network/utility.h" +#include "source/common/router/config_impl.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/stats/timespan_impl.h" #include "absl/strings/escaping.h" #include "absl/strings/match.h" diff --git a/source/common/http/conn_manager_impl.h b/source/common/http/conn_manager_impl.h index 541cf7b3da632..a81b95b6ac658 100644 --- a/source/common/http/conn_manager_impl.h +++ b/source/common/http/conn_manager_impl.h @@ -35,19 +35,19 @@ #include "envoy/tracing/http_tracer.h" #include "envoy/upstream/upstream.h" -#include "common/buffer/watermark_buffer.h" -#include "common/common/dump_state_utils.h" -#include "common/common/linked_object.h" -#include "common/grpc/common.h" -#include "common/http/conn_manager_config.h" -#include "common/http/filter_manager.h" -#include "common/http/user_agent.h" -#include "common/http/utility.h" -#include "common/local_reply/local_reply.h" -#include "common/network/proxy_protocol_filter_state.h" -#include "common/router/scoped_rds.h" -#include "common/stream_info/stream_info_impl.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/common/linked_object.h" +#include "source/common/grpc/common.h" +#include "source/common/http/conn_manager_config.h" +#include "source/common/http/filter_manager.h" +#include "source/common/http/user_agent.h" +#include "source/common/http/utility.h" +#include "source/common/local_reply/local_reply.h" +#include "source/common/network/proxy_protocol_filter_state.h" +#include "source/common/router/scoped_rds.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/common/tracing/http_tracer_impl.h" namespace Envoy { namespace Http { diff --git a/source/common/http/conn_manager_utility.cc b/source/common/http/conn_manager_utility.cc index 887fe09bcd095..4c0bddcd6a61a 100644 --- a/source/common/http/conn_manager_utility.cc +++ b/source/common/http/conn_manager_utility.cc @@ -1,4 +1,4 @@ -#include "common/http/conn_manager_utility.h" +#include "source/common/http/conn_manager_utility.h" #include #include @@ -6,18 +6,18 @@ #include "envoy/type/v3/percent.pb.h" -#include "common/common/empty_string.h" -#include "common/common/utility.h" -#include "common/http/conn_manager_config.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/http/http1/codec_impl.h" -#include "common/http/http2/codec_impl.h" -#include "common/http/path_utility.h" -#include "common/http/utility.h" -#include "common/network/utility.h" -#include "common/runtime/runtime_features.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/utility.h" +#include "source/common/http/conn_manager_config.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/http1/codec_impl.h" +#include "source/common/http/http2/codec_impl.h" +#include "source/common/http/path_utility.h" +#include "source/common/http/utility.h" +#include "source/common/network/utility.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/tracing/http_tracer_impl.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" diff --git a/source/common/http/conn_manager_utility.h b/source/common/http/conn_manager_utility.h index f5b15eebdfebf..a33af8efcae32 100644 --- a/source/common/http/conn_manager_utility.h +++ b/source/common/http/conn_manager_utility.h @@ -7,9 +7,9 @@ #include "envoy/network/connection.h" #include "envoy/tracing/trace_reason.h" -#include "common/http/conn_manager_impl.h" -#include "common/http/http1/codec_stats.h" -#include "common/http/http2/codec_stats.h" +#include "source/common/http/conn_manager_impl.h" +#include "source/common/http/http1/codec_stats.h" +#include "source/common/http/http2/codec_stats.h" namespace Envoy { namespace Http { diff --git a/source/common/http/conn_pool_base.cc b/source/common/http/conn_pool_base.cc index 16a043b1fc581..e071614787b34 100644 --- a/source/common/http/conn_pool_base.cc +++ b/source/common/http/conn_pool_base.cc @@ -1,11 +1,11 @@ -#include "common/http/conn_pool_base.h" - -#include "common/common/assert.h" -#include "common/http/utility.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/runtime/runtime_features.h" -#include "common/stats/timespan_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/http/conn_pool_base.h" + +#include "source/common/common/assert.h" +#include "source/common/http/utility.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/stats/timespan_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Http { diff --git a/source/common/http/conn_pool_base.h b/source/common/http/conn_pool_base.h index cde57ea4fb89a..0be7cf2fc7c19 100644 --- a/source/common/http/conn_pool_base.h +++ b/source/common/http/conn_pool_base.h @@ -5,10 +5,10 @@ #include "envoy/network/connection.h" #include "envoy/stats/timespan.h" -#include "common/common/linked_object.h" -#include "common/conn_pool/conn_pool_base.h" -#include "common/http/codec_client.h" -#include "common/http/utility.h" +#include "source/common/common/linked_object.h" +#include "source/common/conn_pool/conn_pool_base.h" +#include "source/common/http/codec_client.h" +#include "source/common/http/utility.h" #include "absl/strings/string_view.h" diff --git a/source/common/http/conn_pool_grid.cc b/source/common/http/conn_pool_grid.cc index 12d143717a9d6..5938c0d1ed342 100644 --- a/source/common/http/conn_pool_grid.cc +++ b/source/common/http/conn_pool_grid.cc @@ -1,7 +1,7 @@ -#include "common/http/conn_pool_grid.h" +#include "source/common/http/conn_pool_grid.h" -#include "common/http/http3/conn_pool.h" -#include "common/http/mixed_conn_pool.h" +#include "source/common/http/http3/conn_pool.h" +#include "source/common/http/mixed_conn_pool.h" #include "quiche/quic/core/quic_versions.h" diff --git a/source/common/http/conn_pool_grid.h b/source/common/http/conn_pool_grid.h index e05a2ae68dc8f..3c1b74ed74ea0 100644 --- a/source/common/http/conn_pool_grid.h +++ b/source/common/http/conn_pool_grid.h @@ -1,8 +1,8 @@ #pragma once -#include "common/http/alternate_protocols_cache_impl.h" -#include "common/http/conn_pool_base.h" -#include "common/http/http3_status_tracker.h" +#include "source/common/http/alternate_protocols_cache_impl.h" +#include "source/common/http/conn_pool_base.h" +#include "source/common/http/http3_status_tracker.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/http/context_impl.cc b/source/common/http/context_impl.cc index 05fdd5f54f3db..837564dff8151 100644 --- a/source/common/http/context_impl.cc +++ b/source/common/http/context_impl.cc @@ -1,4 +1,4 @@ -#include "common/http/context_impl.h" +#include "source/common/http/context_impl.h" namespace Envoy { namespace Http { diff --git a/source/common/http/context_impl.h b/source/common/http/context_impl.h index c7fb0732e8dda..590b997e1f0a8 100644 --- a/source/common/http/context_impl.h +++ b/source/common/http/context_impl.h @@ -2,8 +2,8 @@ #include "envoy/http/context.h" -#include "common/http/codes.h" -#include "common/http/user_agent.h" +#include "source/common/http/codes.h" +#include "source/common/http/user_agent.h" namespace Envoy { namespace Http { diff --git a/source/common/http/date_provider_impl.cc b/source/common/http/date_provider_impl.cc index 6f08a53258eea..da41a64e1fa4a 100644 --- a/source/common/http/date_provider_impl.cc +++ b/source/common/http/date_provider_impl.cc @@ -1,4 +1,4 @@ -#include "common/http/date_provider_impl.h" +#include "source/common/http/date_provider_impl.h" #include #include diff --git a/source/common/http/date_provider_impl.h b/source/common/http/date_provider_impl.h index 08ff1bfe6f2e7..03a73aa04c3ef 100644 --- a/source/common/http/date_provider_impl.h +++ b/source/common/http/date_provider_impl.h @@ -7,7 +7,7 @@ #include "envoy/singleton/instance.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" #include "date_provider.h" diff --git a/source/common/http/default_server_string.h b/source/common/http/default_server_string.h index 26fb7ff47d462..3f0915c66abdc 100644 --- a/source/common/http/default_server_string.h +++ b/source/common/http/default_server_string.h @@ -2,7 +2,7 @@ #include -#include "common/common/macros.h" +#include "source/common/common/macros.h" namespace Envoy { namespace Http { diff --git a/source/common/http/filter_manager.cc b/source/common/http/filter_manager.cc index a962365e10f36..a68e3207c7a3e 100644 --- a/source/common/http/filter_manager.cc +++ b/source/common/http/filter_manager.cc @@ -1,17 +1,17 @@ -#include "common/http/filter_manager.h" +#include "source/common/http/filter_manager.h" #include #include "envoy/http/header_map.h" #include "envoy/matcher/matcher.h" -#include "common/common/enum_to_int.h" -#include "common/common/scope_tracked_object_stack.h" -#include "common/common/scope_tracker.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/header_utility.h" -#include "common/http/utility.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/scope_tracked_object_stack.h" +#include "source/common/common/scope_tracker.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/utility.h" namespace Envoy { namespace Http { @@ -1084,6 +1084,21 @@ void FilterManager::encodeHeaders(ActiveStreamEncoderFilter* filter, ResponseHea } } + // Check if the filter chain above did not remove critical headers or set malformed header values. + // We could do this at the codec in order to prevent other places than the filter chain from + // removing critical headers, but it will come with the implementation complexity. + // See the previous attempt (#15658) for detail, and for now we choose to protect only against + // filter chains. + const auto status = HeaderUtility::checkRequiredResponseHeaders(headers); + if (!status.ok()) { + // If the check failed, then we reply with BadGateway, and stop the further processing. + sendLocalReply( + Http::Code::BadGateway, status.message(), nullptr, absl::nullopt, + absl::StrCat(StreamInfo::ResponseCodeDetails::get().FilterRemovedRequiredResponseHeaders, + "{", status.message(), "}")); + return; + } + const bool modified_end_stream = (end_stream && continue_data_entry == encoder_filters_.end()); state_.non_100_response_headers_encoded_ = true; filter_manager_callbacks_.encodeHeaders(headers, modified_end_stream); diff --git a/source/common/http/filter_manager.h b/source/common/http/filter_manager.h index 2f65055c77839..1e826f1df5d1c 100644 --- a/source/common/http/filter_manager.h +++ b/source/common/http/filter_manager.h @@ -15,18 +15,18 @@ #include "envoy/protobuf/message_validator.h" #include "envoy/type/matcher/v3/http_inputs.pb.validate.h" -#include "common/buffer/watermark_buffer.h" -#include "common/common/dump_state_utils.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" -#include "common/grpc/common.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/http/matching/data_impl.h" -#include "common/local_reply/local_reply.h" -#include "common/matcher/matcher.h" -#include "common/protobuf/utility.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/common/grpc/common.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/matching/data_impl.h" +#include "source/common/local_reply/local_reply.h" +#include "source/common/matcher/matcher.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stream_info/stream_info_impl.h" namespace Envoy { namespace Http { diff --git a/source/common/http/hash_policy.cc b/source/common/http/hash_policy.cc index e8f331d6165a9..a2eda3f01579d 100644 --- a/source/common/http/hash_policy.cc +++ b/source/common/http/hash_policy.cc @@ -1,13 +1,13 @@ -#include "common/http/hash_policy.h" +#include "source/common/http/hash_policy.h" #include #include "envoy/config/route/v3/route_components.pb.h" -#include "common/common/matchers.h" -#include "common/common/regex.h" -#include "common/http/utility.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/matchers.h" +#include "source/common/common/regex.h" +#include "source/common/http/utility.h" +#include "source/common/runtime/runtime_features.h" #include "absl/strings/str_cat.h" diff --git a/source/common/http/header_list_view.cc b/source/common/http/header_list_view.cc index dab359253b100..7b5e551b720e8 100644 --- a/source/common/http/header_list_view.cc +++ b/source/common/http/header_list_view.cc @@ -1,4 +1,4 @@ -#include "common/http/header_list_view.h" +#include "source/common/http/header_list_view.h" namespace Envoy { namespace Http { diff --git a/source/common/http/header_map_impl.cc b/source/common/http/header_map_impl.cc index cc83f950e7d27..ed84303497cc1 100644 --- a/source/common/http/header_map_impl.cc +++ b/source/common/http/header_map_impl.cc @@ -1,4 +1,4 @@ -#include "common/http/header_map_impl.h" +#include "source/common/http/header_map_impl.h" #include #include @@ -7,11 +7,11 @@ #include "envoy/http/header_map.h" -#include "common/common/assert.h" -#include "common/common/dump_state_utils.h" -#include "common/common/empty_string.h" -#include "common/runtime/runtime_features.h" -#include "common/singleton/const_singleton.h" +#include "source/common/common/assert.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/common/empty_string.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/singleton/const_singleton.h" #include "absl/strings/match.h" diff --git a/source/common/http/header_map_impl.h b/source/common/http/header_map_impl.h index 2f52e70c66691..e146e1b4c2bfc 100644 --- a/source/common/http/header_map_impl.h +++ b/source/common/http/header_map_impl.h @@ -10,10 +10,10 @@ #include "envoy/common/optref.h" #include "envoy/http/header_map.h" -#include "common/common/non_copyable.h" -#include "common/common/utility.h" -#include "common/http/headers.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/non_copyable.h" +#include "source/common/common/utility.h" +#include "source/common/http/headers.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Http { diff --git a/source/common/http/header_utility.cc b/source/common/http/header_utility.cc index c60d42db120cb..a25d62cc83a32 100644 --- a/source/common/http/header_utility.cc +++ b/source/common/http/header_utility.cc @@ -1,13 +1,13 @@ -#include "common/http/header_utility.h" +#include "source/common/http/header_utility.h" #include "envoy/config/route/v3/route_components.pb.h" -#include "common/common/regex.h" -#include "common/common/utility.h" -#include "common/http/header_map_impl.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/regex.h" +#include "source/common/common/utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_features.h" #include "absl/strings/match.h" #include "nghttp2/nghttp2.h" @@ -316,7 +316,7 @@ bool HeaderUtility::shouldCloseConnection(Http::Protocol protocol, return false; } -Http::Status HeaderUtility::checkRequiredHeaders(const Http::RequestHeaderMap& headers) { +Http::Status HeaderUtility::checkRequiredRequestHeaders(const Http::RequestHeaderMap& headers) { if (!headers.Method()) { return absl::InvalidArgumentError( absl::StrCat("missing required header: ", Envoy::Http::Headers::get().Method.get())); @@ -338,6 +338,15 @@ Http::Status HeaderUtility::checkRequiredHeaders(const Http::RequestHeaderMap& h return Http::okStatus(); } +Http::Status HeaderUtility::checkRequiredResponseHeaders(const Http::ResponseHeaderMap& headers) { + const absl::optional status = Utility::getResponseStatusNoThrow(headers); + if (!status.has_value()) { + return absl::InvalidArgumentError( + absl::StrCat("missing required header: ", Envoy::Http::Headers::get().Status.get())); + } + return Http::okStatus(); +} + bool HeaderUtility::isRemovableHeader(absl::string_view header) { return (header.empty() || header[0] != ':') && !absl::EqualsIgnoreCase(header, Headers::get().HostLegacy.get()); diff --git a/source/common/http/header_utility.h b/source/common/http/header_utility.h index 04d1201d61ecf..c3b8a2088ea90 100644 --- a/source/common/http/header_utility.h +++ b/source/common/http/header_utility.h @@ -9,8 +9,8 @@ #include "envoy/http/protocol.h" #include "envoy/type/v3/range.pb.h" -#include "common/http/status.h" -#include "common/protobuf/protobuf.h" +#include "source/common/http/status.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Http { @@ -198,13 +198,20 @@ class HeaderUtility { */ static absl::string_view::size_type getPortStart(absl::string_view host); - /* Does a common header check ensuring required headers are present. + /* Does a common header check ensuring required request headers are present. * Required request headers include :method header, :path for non-CONNECT requests, and * host/authority for HTTP/1.1 or CONNECT requests. * @return Status containing the result. If failed, message includes details on which header was * missing. */ - static Http::Status checkRequiredHeaders(const Http::RequestHeaderMap& headers); + static Http::Status checkRequiredRequestHeaders(const Http::RequestHeaderMap& headers); + + /* Does a common header check ensuring required response headers are present. + * Current required response headers only includes :status. + * @return Status containing the result. If failed, message includes details on which header was + * missing. + */ + static Http::Status checkRequiredResponseHeaders(const Http::ResponseHeaderMap& headers); /** * Returns true if a header may be safely removed without causing additional diff --git a/source/common/http/headers.h b/source/common/http/headers.h index 9471dae6eb60a..a4580468bfd8f 100644 --- a/source/common/http/headers.h +++ b/source/common/http/headers.h @@ -4,8 +4,8 @@ #include "envoy/http/header_map.h" -#include "common/singleton/const_singleton.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/singleton/const_singleton.h" +#include "source/common/singleton/threadsafe_singleton.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http1/BUILD b/source/common/http/http1/BUILD index 495eef9ee4fdf..e801968ec5335 100644 --- a/source/common/http/http1/BUILD +++ b/source/common/http/http1/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( srcs = ["header_formatter.cc"], hdrs = ["header_formatter.h"], deps = [ - "//include/envoy/http:header_formatter_interface", + "//envoy/http:header_formatter_interface", ], ) @@ -21,8 +21,8 @@ envoy_cc_library( name = "codec_stats_lib", hdrs = ["codec_stats.h"], deps = [ - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/common:thread_lib", ], ) @@ -36,11 +36,11 @@ envoy_cc_library( ":header_formatter_lib", ":legacy_parser_lib", ":parser_interface", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/common:scope_tracker_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/network:connection_interface", + "//envoy/buffer:buffer_interface", + "//envoy/common:scope_tracker_interface", + "//envoy/http:codec_interface", + "//envoy/http:header_map_interface", + "//envoy/network:connection_interface", "//source/common/buffer:buffer_lib", "//source/common/buffer:watermark_buffer_lib", "//source/common/common:assert_lib", @@ -68,12 +68,12 @@ envoy_cc_library( hdrs = ["conn_pool.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/event:deferred_deletable", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/http:conn_pool_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/event:deferred_deletable", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/http:conn_pool_interface", + "//envoy/http:header_map_interface", + "//envoy/upstream:upstream_interface", "//source/common/http:codec_client_lib", "//source/common/http:codec_wrappers_lib", "//source/common/http:codes_lib", @@ -90,8 +90,8 @@ envoy_cc_library( hdrs = ["settings.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/http:codec_interface", - "//include/envoy/protobuf:message_validator_interface", + "//envoy/http:codec_interface", + "//envoy/protobuf:message_validator_interface", "//source/common/config:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], diff --git a/source/common/http/http1/codec_impl.cc b/source/common/http/http1/codec_impl.cc index 23859ac380a2c..34fa19fd31956 100644 --- a/source/common/http/http1/codec_impl.cc +++ b/source/common/http/http1/codec_impl.cc @@ -1,4 +1,4 @@ -#include "common/http/http1/codec_impl.h" +#include "source/common/http/http1/codec_impl.h" #include #include @@ -9,20 +9,20 @@ #include "envoy/http/header_map.h" #include "envoy/network/connection.h" -#include "common/common/cleanup.h" -#include "common/common/dump_state_utils.h" -#include "common/common/enum_to_int.h" -#include "common/common/scope_tracker.h" -#include "common/common/statusor.h" -#include "common/common/utility.h" -#include "common/grpc/common.h" -#include "common/http/exception.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/http/http1/header_formatter.h" -#include "common/http/http1/legacy_parser_impl.h" -#include "common/http/utility.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/scope_tracker.h" +#include "source/common/common/statusor.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/http/exception.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/http1/header_formatter.h" +#include "source/common/http/http1/legacy_parser_impl.h" +#include "source/common/http/utility.h" +#include "source/common/runtime/runtime_features.h" #include "absl/container/fixed_array.h" #include "absl/strings/ascii.h" @@ -402,7 +402,7 @@ static const char REQUEST_POSTFIX[] = " HTTP/1.1\r\n"; Status RequestEncoderImpl::encodeHeaders(const RequestHeaderMap& headers, bool end_stream) { // Required headers must be present. This can only happen by some erroneous processing after the // downstream codecs decode. - RETURN_IF_ERROR(HeaderUtility::checkRequiredHeaders(headers)); + RETURN_IF_ERROR(HeaderUtility::checkRequiredRequestHeaders(headers)); const HeaderEntry* method = headers.Method(); const HeaderEntry* path = headers.Path(); diff --git a/source/common/http/http1/codec_impl.h b/source/common/http/http1/codec_impl.h index 4cfd38b5b1ec9..d93e5d50f9024 100644 --- a/source/common/http/http1/codec_impl.h +++ b/source/common/http/http1/codec_impl.h @@ -12,16 +12,16 @@ #include "envoy/http/codec.h" #include "envoy/network/connection.h" -#include "common/buffer/watermark_buffer.h" -#include "common/common/assert.h" -#include "common/common/statusor.h" -#include "common/http/codec_helper.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/http1/codec_stats.h" -#include "common/http/http1/header_formatter.h" -#include "common/http/http1/parser.h" -#include "common/http/status.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/common/assert.h" +#include "source/common/common/statusor.h" +#include "source/common/http/codec_helper.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/http1/codec_stats.h" +#include "source/common/http/http1/header_formatter.h" +#include "source/common/http/http1/parser.h" +#include "source/common/http/status.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http1/codec_stats.h b/source/common/http/http1/codec_stats.h index ac296522adc21..8fa7f254a0bd0 100644 --- a/source/common/http/http1/codec_stats.h +++ b/source/common/http/http1/codec_stats.h @@ -3,7 +3,7 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/thread.h" +#include "source/common/common/thread.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http1/conn_pool.cc b/source/common/http/http1/conn_pool.cc index db90cfc87a48b..4667aaae06d73 100644 --- a/source/common/http/http1/conn_pool.cc +++ b/source/common/http/http1/conn_pool.cc @@ -1,4 +1,4 @@ -#include "common/http/http1/conn_pool.h" +#include "source/common/http/http1/conn_pool.h" #include #include @@ -11,11 +11,11 @@ #include "envoy/http/header_map.h" #include "envoy/upstream/upstream.h" -#include "common/http/codec_client.h" -#include "common/http/codes.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/runtime/runtime_features.h" +#include "source/common/http/codec_client.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/runtime/runtime_features.h" #include "absl/strings/match.h" diff --git a/source/common/http/http1/conn_pool.h b/source/common/http/http1/conn_pool.h index d45109ac93279..f2c295797eb9c 100644 --- a/source/common/http/http1/conn_pool.h +++ b/source/common/http/http1/conn_pool.h @@ -4,8 +4,8 @@ #include "envoy/http/codec.h" #include "envoy/upstream/upstream.h" -#include "common/http/codec_wrappers.h" -#include "common/http/conn_pool_base.h" +#include "source/common/http/codec_wrappers.h" +#include "source/common/http/conn_pool_base.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http1/header_formatter.cc b/source/common/http/http1/header_formatter.cc index 514f2383dff02..c66c70fead200 100644 --- a/source/common/http/http1/header_formatter.cc +++ b/source/common/http/http1/header_formatter.cc @@ -1,4 +1,4 @@ -#include "common/http/http1/header_formatter.h" +#include "source/common/http/http1/header_formatter.h" #include diff --git a/source/common/http/http1/legacy_parser_impl.cc b/source/common/http/http1/legacy_parser_impl.cc index 8087e663c8acf..840ba419099f6 100644 --- a/source/common/http/http1/legacy_parser_impl.cc +++ b/source/common/http/http1/legacy_parser_impl.cc @@ -1,11 +1,11 @@ -#include "common/http/http1/legacy_parser_impl.h" +#include "source/common/http/http1/legacy_parser_impl.h" #include #include -#include "common/common/assert.h" -#include "common/http/http1/parser.h" +#include "source/common/common/assert.h" +#include "source/common/http/http1/parser.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http1/legacy_parser_impl.h b/source/common/http/http1/legacy_parser_impl.h index 62b46dde0b062..2099f815824b4 100644 --- a/source/common/http/http1/legacy_parser_impl.h +++ b/source/common/http/http1/legacy_parser_impl.h @@ -2,7 +2,7 @@ #include -#include "common/http/http1/parser.h" +#include "source/common/http/http1/parser.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http1/parser.h b/source/common/http/http1/parser.h index 9008b2afd4afc..23f6795a1f752 100644 --- a/source/common/http/http1/parser.h +++ b/source/common/http/http1/parser.h @@ -4,8 +4,8 @@ #include "envoy/common/pure.h" -#include "common/common/statusor.h" -#include "common/http/status.h" +#include "source/common/common/statusor.h" +#include "source/common/http/status.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http1/settings.cc b/source/common/http/http1/settings.cc index 18a4dd0dadf01..43155b42fbe46 100644 --- a/source/common/http/http1/settings.cc +++ b/source/common/http/http1/settings.cc @@ -1,8 +1,8 @@ -#include "common/http/http1/settings.h" +#include "source/common/http/http1/settings.h" #include "envoy/http/header_formatter.h" -#include "common/config/utility.h" +#include "source/common/config/utility.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http2/BUILD b/source/common/http/http2/BUILD index 7e31b3e97a478..3ec423ce65c1d 100644 --- a/source/common/http/http2/BUILD +++ b/source/common/http/http2/BUILD @@ -12,8 +12,8 @@ envoy_cc_library( name = "codec_stats_lib", hdrs = ["codec_stats.h"], deps = [ - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/common:thread_lib", ], ) @@ -33,13 +33,13 @@ envoy_cc_library( ":metadata_decoder_lib", ":metadata_encoder_lib", ":protocol_constraints_lib", - "//include/envoy/event:deferred_deletable", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/stats:stats_interface", + "//envoy/event:deferred_deletable", + "//envoy/event:dispatcher_interface", + "//envoy/http:codec_interface", + "//envoy/http:codes_interface", + "//envoy/http:header_map_interface", + "//envoy/network:connection_interface", + "//envoy/stats:stats_interface", "//source/common/buffer:buffer_lib", "//source/common/buffer:watermark_buffer_lib", "//source/common/common:assert_lib", @@ -78,8 +78,8 @@ envoy_cc_library( srcs = ["conn_pool.cc"], hdrs = ["conn_pool.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/event:dispatcher_interface", + "//envoy/upstream:upstream_interface", "//source/common/http:codec_client_lib", "//source/common/http:conn_pool_base_lib", ], @@ -93,7 +93,7 @@ envoy_cc_library( "nghttp2", ], deps = [ - "//include/envoy/http:codec_interface", + "//envoy/http:codec_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", @@ -108,7 +108,7 @@ envoy_cc_library( "nghttp2", ], deps = [ - "//include/envoy/http:codec_interface", + "//envoy/http:codec_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", @@ -124,7 +124,7 @@ envoy_cc_library( ], deps = [ ":codec_stats_lib", - "//include/envoy/network:connection_interface", + "//envoy/network:connection_interface", "//source/common/common:assert_lib", "//source/common/common:dump_state_utils", "//source/common/http:status_lib", diff --git a/source/common/http/http2/codec_impl.cc b/source/common/http/http2/codec_impl.cc index 5f3cc901a7684..8124c273256ba 100644 --- a/source/common/http/http2/codec_impl.cc +++ b/source/common/http/http2/codec_impl.cc @@ -1,4 +1,4 @@ -#include "common/http/http2/codec_impl.h" +#include "source/common/http/http2/codec_impl.h" #include #include @@ -11,21 +11,21 @@ #include "envoy/http/header_map.h" #include "envoy/network/connection.h" -#include "common/common/assert.h" -#include "common/common/cleanup.h" -#include "common/common/dump_state_utils.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/safe_memcpy.h" -#include "common/common/scope_tracker.h" -#include "common/common/utility.h" -#include "common/http/codes.h" -#include "common/http/exception.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/http/http2/codec_stats.h" -#include "common/http/utility.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/assert.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/common/scope_tracker.h" +#include "source/common/common/utility.h" +#include "source/common/http/codes.h" +#include "source/common/http/exception.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/http2/codec_stats.h" +#include "source/common/http/utility.h" +#include "source/common/runtime/runtime_features.h" #include "absl/container/fixed_array.h" @@ -210,7 +210,7 @@ Status ConnectionImpl::ClientStreamImpl::encodeHeaders(const RequestHeaderMap& h bool end_stream) { // Required headers must be present. This can only happen by some erroneous processing after the // downstream codecs decode. - RETURN_IF_ERROR(HeaderUtility::checkRequiredHeaders(headers)); + RETURN_IF_ERROR(HeaderUtility::checkRequiredRequestHeaders(headers)); // This must exist outside of the scope of isUpgrade as the underlying memory is // needed until encodeHeadersBase has been called. std::vector final_headers; diff --git a/source/common/http/http2/codec_impl.h b/source/common/http/http2/codec_impl.h index 9a767e1c8337b..10ba725ea9f96 100644 --- a/source/common/http/http2/codec_impl.h +++ b/source/common/http/http2/codec_impl.h @@ -16,21 +16,21 @@ #include "envoy/http/codec.h" #include "envoy/network/connection.h" -#include "common/buffer/buffer_impl.h" -#include "common/buffer/watermark_buffer.h" -#include "common/common/assert.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" -#include "common/common/statusor.h" -#include "common/common/thread.h" -#include "common/http/codec_helper.h" -#include "common/http/header_map_impl.h" -#include "common/http/http2/codec_stats.h" -#include "common/http/http2/metadata_decoder.h" -#include "common/http/http2/metadata_encoder.h" -#include "common/http/http2/protocol_constraints.h" -#include "common/http/status.h" -#include "common/http/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/common/assert.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/common/common/statusor.h" +#include "source/common/common/thread.h" +#include "source/common/http/codec_helper.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/http2/codec_stats.h" +#include "source/common/http/http2/metadata_decoder.h" +#include "source/common/http/http2/metadata_encoder.h" +#include "source/common/http/http2/protocol_constraints.h" +#include "source/common/http/status.h" +#include "source/common/http/utility.h" #include "absl/types/optional.h" #include "nghttp2/nghttp2.h" diff --git a/source/common/http/http2/codec_stats.h b/source/common/http/http2/codec_stats.h index eb11291f82f4b..ecc71be7a27bf 100644 --- a/source/common/http/http2/codec_stats.h +++ b/source/common/http/http2/codec_stats.h @@ -3,7 +3,7 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/thread.h" +#include "source/common/common/thread.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http2/conn_pool.cc b/source/common/http/http2/conn_pool.cc index bc137ba39a8f9..50cb7778b8bfc 100644 --- a/source/common/http/http2/conn_pool.cc +++ b/source/common/http/http2/conn_pool.cc @@ -1,12 +1,12 @@ -#include "common/http/http2/conn_pool.h" +#include "source/common/http/http2/conn_pool.h" #include #include "envoy/event/dispatcher.h" #include "envoy/upstream/upstream.h" -#include "common/http/http2/codec_impl.h" -#include "common/runtime/runtime_features.h" +#include "source/common/http/http2/codec_impl.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http2/conn_pool.h b/source/common/http/http2/conn_pool.h index 529167cb85357..9d96c494873ca 100644 --- a/source/common/http/http2/conn_pool.h +++ b/source/common/http/http2/conn_pool.h @@ -4,8 +4,8 @@ #include "envoy/upstream/upstream.h" -#include "common/http/codec_client.h" -#include "common/http/conn_pool_base.h" +#include "source/common/http/codec_client.h" +#include "source/common/http/conn_pool_base.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http2/metadata_decoder.cc b/source/common/http/http2/metadata_decoder.cc index 836bc8dbbe365..3efd9346e5910 100644 --- a/source/common/http/http2/metadata_decoder.cc +++ b/source/common/http/http2/metadata_decoder.cc @@ -1,6 +1,6 @@ -#include "common/http/http2/metadata_decoder.h" +#include "source/common/http/http2/metadata_decoder.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/container/fixed_array.h" diff --git a/source/common/http/http2/metadata_decoder.h b/source/common/http/http2/metadata_decoder.h index 16510776e5635..4a3c9ad301ec6 100644 --- a/source/common/http/http2/metadata_decoder.h +++ b/source/common/http/http2/metadata_decoder.h @@ -5,8 +5,8 @@ #include "envoy/http/codec.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" #include "nghttp2/nghttp2.h" diff --git a/source/common/http/http2/metadata_encoder.cc b/source/common/http/http2/metadata_encoder.cc index ac1c06af4f360..81002de8566d9 100644 --- a/source/common/http/http2/metadata_encoder.cc +++ b/source/common/http/http2/metadata_encoder.cc @@ -1,6 +1,6 @@ -#include "common/http/http2/metadata_encoder.h" +#include "source/common/http/http2/metadata_encoder.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/container/fixed_array.h" #include "nghttp2/nghttp2.h" diff --git a/source/common/http/http2/metadata_encoder.h b/source/common/http/http2/metadata_encoder.h index 64e520e0cded5..9fe06ce6e459b 100644 --- a/source/common/http/http2/metadata_encoder.h +++ b/source/common/http/http2/metadata_encoder.h @@ -6,9 +6,9 @@ #include "envoy/http/codec.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/c_smart_ptr.h" -#include "common/common/logger.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/c_smart_ptr.h" +#include "source/common/common/logger.h" #include "nghttp2/nghttp2.h" diff --git a/source/common/http/http2/nghttp2.cc b/source/common/http/http2/nghttp2.cc index 68e9c620e9c86..83e37878221d7 100644 --- a/source/common/http/http2/nghttp2.cc +++ b/source/common/http/http2/nghttp2.cc @@ -1,6 +1,6 @@ -#include "common/http/http2/nghttp2.h" +#include "source/common/http/http2/nghttp2.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" // nghttp2 fails to convey the POSIX ssize_t declaration // that Microsoft declines to implement. Pick up a valid diff --git a/source/common/http/http2/protocol_constraints.cc b/source/common/http/http2/protocol_constraints.cc index 5d8f38a44c406..cc3d2252d8dc2 100644 --- a/source/common/http/http2/protocol_constraints.cc +++ b/source/common/http/http2/protocol_constraints.cc @@ -1,7 +1,7 @@ -#include "common/http/http2/protocol_constraints.h" +#include "source/common/http/http2/protocol_constraints.h" -#include "common/common/assert.h" -#include "common/common/dump_state_utils.h" +#include "source/common/common/assert.h" +#include "source/common/common/dump_state_utils.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http2/protocol_constraints.h b/source/common/http/http2/protocol_constraints.h index 017db57289e01..a2e1f203cedcb 100644 --- a/source/common/http/http2/protocol_constraints.h +++ b/source/common/http/http2/protocol_constraints.h @@ -6,8 +6,8 @@ #include "envoy/config/core/v3/protocol.pb.h" #include "envoy/network/connection.h" -#include "common/http/http2/codec_stats.h" -#include "common/http/status.h" +#include "source/common/http/http2/codec_stats.h" +#include "source/common/http/status.h" #include "nghttp2/nghttp2.h" diff --git a/source/common/http/http3/BUILD b/source/common/http/http3/BUILD index 62021588859a8..92a28b20c1d5a 100644 --- a/source/common/http/http3/BUILD +++ b/source/common/http/http3/BUILD @@ -14,8 +14,8 @@ envoy_cc_library( hdrs = ["conn_pool.h"], deps = [ ":quic_client_connection_factory_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/event:dispatcher_interface", + "//envoy/upstream:upstream_interface", "//source/common/http:codec_client_lib", "//source/common/http:conn_pool_base_lib", "//source/common/quic:client_connection_factory_lib", @@ -31,8 +31,8 @@ envoy_cc_library( name = "codec_stats_lib", hdrs = ["codec_stats.h"], deps = [ - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/common:thread_lib", ], ) diff --git a/source/common/http/http3/codec_stats.h b/source/common/http/http3/codec_stats.h index c9dcf6f395a29..d8044922cbdbf 100644 --- a/source/common/http/http3/codec_stats.h +++ b/source/common/http/http3/codec_stats.h @@ -3,7 +3,7 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/thread.h" +#include "source/common/common/thread.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http3/conn_pool.cc b/source/common/http/http3/conn_pool.cc index ec920aa646d24..efc9b0b61db92 100644 --- a/source/common/http/http3/conn_pool.cc +++ b/source/common/http/http3/conn_pool.cc @@ -1,16 +1,16 @@ -#include "common/http/http3/conn_pool.h" +#include "source/common/http/http3/conn_pool.h" #include #include "envoy/event/dispatcher.h" #include "envoy/upstream/upstream.h" -#include "common/config/utility.h" -#include "common/http/http3/quic_client_connection_factory.h" -#include "common/http/utility.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" -#include "common/runtime/runtime_features.h" +#include "source/common/config/utility.h" +#include "source/common/http/http3/quic_client_connection_factory.h" +#include "source/common/http/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Http { diff --git a/source/common/http/http3/conn_pool.h b/source/common/http/http3/conn_pool.h index 674063e3c9411..7ab19f1f4a663 100644 --- a/source/common/http/http3/conn_pool.h +++ b/source/common/http/http3/conn_pool.h @@ -4,13 +4,13 @@ #include "envoy/upstream/upstream.h" -#include "common/http/codec_client.h" -#include "common/http/conn_pool_base.h" +#include "source/common/http/codec_client.h" +#include "source/common/http/conn_pool_base.h" #ifdef ENVOY_ENABLE_QUIC -#include "common/quic/client_connection_factory_impl.h" -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/quic_transport_socket_factory.h" +#include "source/common/quic/client_connection_factory_impl.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/quic_transport_socket_factory.h" #else #error "http3 conn pool should not be built with QUIC disabled" #endif diff --git a/source/common/http/http3_status_tracker.cc b/source/common/http/http3_status_tracker.cc index 472d0672ed5b5..1ace46923b667 100644 --- a/source/common/http/http3_status_tracker.cc +++ b/source/common/http/http3_status_tracker.cc @@ -1,4 +1,4 @@ -#include "common/http/http3_status_tracker.h" +#include "source/common/http/http3_status_tracker.h" namespace Envoy { namespace Http { diff --git a/source/common/http/legacy_path_canonicalizer.cc b/source/common/http/legacy_path_canonicalizer.cc index 920e81bef260a..e1798b8ec80c4 100644 --- a/source/common/http/legacy_path_canonicalizer.cc +++ b/source/common/http/legacy_path_canonicalizer.cc @@ -1,7 +1,7 @@ -#include "common/http/legacy_path_canonicalizer.h" +#include "source/common/http/legacy_path_canonicalizer.h" -#include "common/chromium_url/url_canon.h" -#include "common/chromium_url/url_canon_stdstring.h" +#include "source/common/chromium_url/url_canon.h" +#include "source/common/chromium_url/url_canon_stdstring.h" namespace Envoy { namespace Http { diff --git a/source/common/http/match_wrapper/BUILD b/source/common/http/match_wrapper/BUILD index 1350d3db39e0b..a89a51a3b402d 100644 --- a/source/common/http/match_wrapper/BUILD +++ b/source/common/http/match_wrapper/BUILD @@ -13,8 +13,8 @@ envoy_cc_library( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/common/matcher:matcher_lib", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/common/http/match_wrapper/config.cc b/source/common/http/match_wrapper/config.cc index fe1bf7efd34f0..ef4fd0fa966f7 100644 --- a/source/common/http/match_wrapper/config.cc +++ b/source/common/http/match_wrapper/config.cc @@ -1,11 +1,11 @@ -#include "common/http/match_wrapper/config.h" +#include "source/common/http/match_wrapper/config.h" #include "envoy/http/filter.h" #include "envoy/matcher/matcher.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" -#include "common/matcher/matcher.h" +#include "source/common/config/utility.h" +#include "source/common/matcher/matcher.h" #include "absl/status/status.h" diff --git a/source/common/http/match_wrapper/config.h b/source/common/http/match_wrapper/config.h index c1417aaa6f247..dd4a3f14fc2fe 100644 --- a/source/common/http/match_wrapper/config.h +++ b/source/common/http/match_wrapper/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/common/matching/v3/extension_matcher.pb.validate.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Common { diff --git a/source/common/http/matching/BUILD b/source/common/http/matching/BUILD index 8b379453cbc65..87837d2e6ff34 100644 --- a/source/common/http/matching/BUILD +++ b/source/common/http/matching/BUILD @@ -12,8 +12,8 @@ envoy_cc_library( name = "data_impl_lib", hdrs = ["data_impl.h"], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", ], ) @@ -22,8 +22,8 @@ envoy_cc_library( srcs = ["inputs.cc"], hdrs = ["inputs.h"], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", "//source/common/http:header_utility_lib", "@envoy_api//envoy/type/matcher/v3:pkg_cc_proto", ], diff --git a/source/common/http/matching/inputs.cc b/source/common/http/matching/inputs.cc index a7874d440456e..ed1afbfc30ab3 100644 --- a/source/common/http/matching/inputs.cc +++ b/source/common/http/matching/inputs.cc @@ -1,4 +1,4 @@ -#include "common/http/matching/inputs.h" +#include "source/common/http/matching/inputs.h" #include "envoy/registry/registry.h" diff --git a/source/common/http/matching/inputs.h b/source/common/http/matching/inputs.h index bb69aa26b306c..7cafa2936a39b 100644 --- a/source/common/http/matching/inputs.h +++ b/source/common/http/matching/inputs.h @@ -6,7 +6,7 @@ #include "envoy/type/matcher/v3/http_inputs.pb.h" #include "envoy/type/matcher/v3/http_inputs.pb.validate.h" -#include "common/http/header_utility.h" +#include "source/common/http/header_utility.h" namespace Envoy { namespace Http { @@ -22,32 +22,25 @@ class HttpHeadersDataInputBase : public Matcher::DataInput { virtual absl::optional> headerMap(const HttpMatchingData& data) const PURE; - Matcher::DataInputGetResult get(const HttpMatchingData& data) override { + Matcher::DataInputGetResult get(const HttpMatchingData& data) const override { const auto maybe_headers = headerMap(data); if (!maybe_headers) { return {Matcher::DataInputGetResult::DataAvailability::NotAvailable, absl::nullopt}; } - auto header = maybe_headers->get().get(name_); - if (header.empty()) { - return {Matcher::DataInputGetResult::DataAvailability::AllDataAvailable, absl::nullopt}; - } + auto header_string = HeaderUtility::getAllOfHeaderAsString(maybe_headers->get(), name_, ","); - if (header_as_string_result_) { + if (header_string.result()) { return {Matcher::DataInputGetResult::DataAvailability::AllDataAvailable, - header_as_string_result_->result()}; + std::string(header_string.result().value())}; } - header_as_string_result_ = HeaderUtility::getAllOfHeaderAsString(header, ","); - - return {Matcher::DataInputGetResult::DataAvailability::AllDataAvailable, - header_as_string_result_->result()}; + return {Matcher::DataInputGetResult::DataAvailability::AllDataAvailable, absl::nullopt}; } private: const LowerCaseString name_; - absl::optional header_as_string_result_; }; /** diff --git a/source/common/http/message_impl.h b/source/common/http/message_impl.h index d746227912fc7..49ad140fd4800 100644 --- a/source/common/http/message_impl.h +++ b/source/common/http/message_impl.h @@ -5,9 +5,9 @@ #include "envoy/http/header_map.h" #include "envoy/http/message.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/non_copyable.h" -#include "common/http/header_map_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/non_copyable.h" +#include "source/common/http/header_map_impl.h" namespace Envoy { namespace Http { diff --git a/source/common/http/mixed_conn_pool.cc b/source/common/http/mixed_conn_pool.cc index 07fcfea475aee..f9622d746a21a 100644 --- a/source/common/http/mixed_conn_pool.cc +++ b/source/common/http/mixed_conn_pool.cc @@ -1,10 +1,10 @@ -#include "common/http/mixed_conn_pool.h" +#include "source/common/http/mixed_conn_pool.h" -#include "common/http/codec_client.h" -#include "common/http/http1/conn_pool.h" -#include "common/http/http2/conn_pool.h" -#include "common/http/utility.h" -#include "common/tcp/conn_pool.h" +#include "source/common/http/codec_client.h" +#include "source/common/http/http1/conn_pool.h" +#include "source/common/http/http2/conn_pool.h" +#include "source/common/http/utility.h" +#include "source/common/tcp/conn_pool.h" namespace Envoy { namespace Http { diff --git a/source/common/http/mixed_conn_pool.h b/source/common/http/mixed_conn_pool.h index bdee838d78178..4528aeb6eacd6 100644 --- a/source/common/http/mixed_conn_pool.h +++ b/source/common/http/mixed_conn_pool.h @@ -1,6 +1,6 @@ #pragma once -#include "common/http/conn_pool_base.h" +#include "source/common/http/conn_pool_base.h" namespace Envoy { namespace Http { diff --git a/source/common/http/path_utility.cc b/source/common/http/path_utility.cc index 3967520be305d..4afc26cd6ed2b 100644 --- a/source/common/http/path_utility.cc +++ b/source/common/http/path_utility.cc @@ -1,8 +1,8 @@ -#include "common/http/path_utility.h" +#include "source/common/http/path_utility.h" -#include "common/common/logger.h" -#include "common/http/legacy_path_canonicalizer.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/logger.h" +#include "source/common/http/legacy_path_canonicalizer.h" +#include "source/common/runtime/runtime_features.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" diff --git a/source/common/http/request_id_extension_impl.cc b/source/common/http/request_id_extension_impl.cc index 8798c58484138..482a32b60ee48 100644 --- a/source/common/http/request_id_extension_impl.cc +++ b/source/common/http/request_id_extension_impl.cc @@ -1,6 +1,6 @@ -#include "common/http/request_id_extension_impl.h" +#include "source/common/http/request_id_extension_impl.h" -#include "common/config/utility.h" +#include "source/common/config/utility.h" namespace Envoy { namespace Http { diff --git a/source/common/http/rest_api_fetcher.cc b/source/common/http/rest_api_fetcher.cc index af154ef89caf1..cbcb6a99232ca 100644 --- a/source/common/http/rest_api_fetcher.cc +++ b/source/common/http/rest_api_fetcher.cc @@ -1,13 +1,13 @@ -#include "common/http/rest_api_fetcher.h" +#include "source/common/http/rest_api_fetcher.h" #include #include #include -#include "common/common/enum_to_int.h" -#include "common/config/utility.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/config/utility.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" namespace Envoy { namespace Http { diff --git a/source/common/http/status.cc b/source/common/http/status.cc index 1204a9ac9e4ff..a6eb3c92eb8f2 100644 --- a/source/common/http/status.cc +++ b/source/common/http/status.cc @@ -1,6 +1,6 @@ -#include "common/http/status.h" +#include "source/common/http/status.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/strings/str_cat.h" diff --git a/source/common/http/user_agent.cc b/source/common/http/user_agent.cc index 65c243aeae24c..cf5e6746f7783 100644 --- a/source/common/http/user_agent.cc +++ b/source/common/http/user_agent.cc @@ -1,4 +1,4 @@ -#include "common/http/user_agent.h" +#include "source/common/http/user_agent.h" #include #include @@ -8,9 +8,9 @@ #include "envoy/stats/scope.h" #include "envoy/stats/timespan.h" -#include "common/http/headers.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/utility.h" +#include "source/common/http/headers.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/utility.h" namespace Envoy { namespace Http { diff --git a/source/common/http/user_agent.h b/source/common/http/user_agent.h index aa617f48c4e59..8cb482b556c36 100644 --- a/source/common/http/user_agent.h +++ b/source/common/http/user_agent.h @@ -10,7 +10,7 @@ #include "envoy/stats/stats_macros.h" #include "envoy/stats/timespan.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Http { diff --git a/source/common/http/utility.cc b/source/common/http/utility.cc index c1ade1087e365..58ac1b6015f50 100644 --- a/source/common/http/utility.cc +++ b/source/common/http/utility.cc @@ -1,4 +1,4 @@ -#include "common/http/utility.h" +#include "source/common/http/utility.h" #include @@ -10,20 +10,20 @@ #include "envoy/config/core/v3/protocol.pb.h" #include "envoy/http/header_map.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/grpc/status.h" -#include "common/http/exception.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_features.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/status.h" +#include "source/common/http/exception.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_features.h" #include "absl/container/node_hash_set.h" #include "absl/strings/match.h" diff --git a/source/common/http/utility.h b/source/common/http/utility.h index 4c972a3fb4cf0..0cf5f612eb367 100644 --- a/source/common/http/utility.h +++ b/source/common/http/utility.h @@ -13,8 +13,8 @@ #include "envoy/http/metadata_interface.h" #include "envoy/http/query_params.h" -#include "common/http/exception.h" -#include "common/http/status.h" +#include "source/common/http/exception.h" +#include "source/common/http/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" diff --git a/source/common/init/BUILD b/source/common/init/BUILD index 5b75ca4a82851..7df56e667b4b1 100644 --- a/source/common/init/BUILD +++ b/source/common/init/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( srcs = ["watcher_impl.cc"], hdrs = ["watcher_impl.h"], deps = [ - "//include/envoy/init:watcher_interface", + "//envoy/init:watcher_interface", "//source/common/common:logger_lib", ], ) @@ -23,7 +23,7 @@ envoy_cc_library( srcs = ["target_impl.cc"], hdrs = ["target_impl.h"], deps = [ - "//include/envoy/init:target_interface", + "//envoy/init:target_interface", "//source/common/common:logger_lib", ], ) @@ -34,7 +34,7 @@ envoy_cc_library( hdrs = ["manager_impl.h"], deps = [ ":watcher_lib", - "//include/envoy/init:manager_interface", + "//envoy/init:manager_interface", "//source/common/common:logger_lib", ], ) diff --git a/source/common/init/manager_impl.cc b/source/common/init/manager_impl.cc index f0452170d7785..4ffbf75a2b1bf 100644 --- a/source/common/init/manager_impl.cc +++ b/source/common/init/manager_impl.cc @@ -1,9 +1,9 @@ -#include "common/init/manager_impl.h" +#include "source/common/init/manager_impl.h" #include -#include "common/common/assert.h" -#include "common/init/watcher_impl.h" +#include "source/common/common/assert.h" +#include "source/common/init/watcher_impl.h" namespace Envoy { namespace Init { diff --git a/source/common/init/manager_impl.h b/source/common/init/manager_impl.h index 4bba5b344659f..85d901cd56a66 100644 --- a/source/common/init/manager_impl.h +++ b/source/common/init/manager_impl.h @@ -4,8 +4,8 @@ #include "envoy/init/manager.h" -#include "common/common/logger.h" -#include "common/init/watcher_impl.h" +#include "source/common/common/logger.h" +#include "source/common/init/watcher_impl.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/init/target_impl.cc b/source/common/init/target_impl.cc index 4e3fda44b6a08..1c8ddfdea5cec 100644 --- a/source/common/init/target_impl.cc +++ b/source/common/init/target_impl.cc @@ -1,4 +1,4 @@ -#include "common/init/target_impl.h" +#include "source/common/init/target_impl.h" namespace Envoy { namespace Init { diff --git a/source/common/init/target_impl.h b/source/common/init/target_impl.h index 9cc0bac76c11e..72bde7f8d32a9 100644 --- a/source/common/init/target_impl.h +++ b/source/common/init/target_impl.h @@ -4,7 +4,7 @@ #include "envoy/init/target.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Init { diff --git a/source/common/init/watcher_impl.cc b/source/common/init/watcher_impl.cc index 50b792bdcbbe0..de17f7c1b5dc2 100644 --- a/source/common/init/watcher_impl.cc +++ b/source/common/init/watcher_impl.cc @@ -1,4 +1,4 @@ -#include "common/init/watcher_impl.h" +#include "source/common/init/watcher_impl.h" namespace Envoy { namespace Init { diff --git a/source/common/init/watcher_impl.h b/source/common/init/watcher_impl.h index fb41d8c0400a7..10ff51ee83b56 100644 --- a/source/common/init/watcher_impl.h +++ b/source/common/init/watcher_impl.h @@ -4,7 +4,7 @@ #include "envoy/init/watcher.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Init { diff --git a/source/common/json/BUILD b/source/common/json/BUILD index 4cc634bc0d697..23060918cb52b 100644 --- a/source/common/json/BUILD +++ b/source/common/json/BUILD @@ -16,7 +16,7 @@ envoy_cc_library( "rapidjson", ], deps = [ - "//include/envoy/json:json_object_interface", + "//envoy/json:json_object_interface", "//source/common/common:assert_lib", "//source/common/common:hash_lib", "//source/common/common:utility_lib", @@ -32,7 +32,7 @@ envoy_cc_library( "json", ], deps = [ - "//include/envoy/json:json_object_interface", + "//envoy/json:json_object_interface", "//source/common/common:assert_lib", "//source/common/common:hash_lib", "//source/common/common:utility_lib", @@ -47,7 +47,7 @@ envoy_cc_library( deps = [ ":json_internal_legacy_lib", ":json_internal_lib", - "//include/envoy/json:json_object_interface", + "//envoy/json:json_object_interface", "//source/common/runtime:runtime_features_lib", ], ) diff --git a/source/common/json/json_internal.cc b/source/common/json/json_internal.cc index d26c62d1e163c..ce6138d870ad0 100644 --- a/source/common/json/json_internal.cc +++ b/source/common/json/json_internal.cc @@ -1,4 +1,4 @@ -#include "common/json/json_internal.h" +#include "source/common/json/json_internal.h" #include #include @@ -9,11 +9,11 @@ #include #include -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/hash.h" -#include "common/common/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/hash.h" +#include "source/common/common/utility.h" +#include "source/common/protobuf/utility.h" // Do not let nlohmann/json leak outside of this file. #include "include/nlohmann/json.hpp" @@ -209,7 +209,7 @@ class ObjectHandler : public nlohmann::json_sax { "documentation in case error string changed."); } else { // Extract portion after ": " to get error string. - error_ = error.substr(end + 2); + error_ = std::string(error.substr(end + 2)); // Extract position information if present. auto start = error.find("at "); if (start != std::string::npos && (start + 3) < end) { diff --git a/source/common/json/json_internal_legacy.cc b/source/common/json/json_internal_legacy.cc index c323cf75810c7..d77fd773122bf 100644 --- a/source/common/json/json_internal_legacy.cc +++ b/source/common/json/json_internal_legacy.cc @@ -1,4 +1,4 @@ -#include "common/json/json_internal_legacy.h" +#include "source/common/json/json_internal_legacy.h" #include #include @@ -9,11 +9,11 @@ #include #include -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/hash.h" -#include "common/common/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/hash.h" +#include "source/common/common/utility.h" +#include "source/common/protobuf/utility.h" // Do not let RapidJson leak outside of this file. #include "rapidjson/document.h" diff --git a/source/common/json/json_loader.cc b/source/common/json/json_loader.cc index 0e4f3669a1b85..2bef4c314be21 100644 --- a/source/common/json/json_loader.cc +++ b/source/common/json/json_loader.cc @@ -1,8 +1,8 @@ -#include "common/json/json_loader.h" +#include "source/common/json/json_loader.h" -#include "common/json/json_internal.h" -#include "common/json/json_internal_legacy.h" -#include "common/runtime/runtime_features.h" +#include "source/common/json/json_internal.h" +#include "source/common/json/json_internal_legacy.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Json { diff --git a/source/common/local_info/BUILD b/source/common/local_info/BUILD index 47c3b542d5bb5..254710601695f 100644 --- a/source/common/local_info/BUILD +++ b/source/common/local_info/BUILD @@ -12,7 +12,7 @@ envoy_cc_library( name = "local_info_lib", hdrs = ["local_info_impl.h"], deps = [ - "//include/envoy/local_info:local_info_interface", + "//envoy/local_info:local_info_interface", "//source/common/config:context_provider_lib", "//source/common/config:version_converter_lib", "//source/common/stats:symbol_table_lib", diff --git a/source/common/local_info/local_info_impl.h b/source/common/local_info/local_info_impl.h index 629d5eaff0e0a..6280d782088c7 100644 --- a/source/common/local_info/local_info_impl.h +++ b/source/common/local_info/local_info_impl.h @@ -5,9 +5,9 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/local_info/local_info.h" -#include "common/config/context_provider_impl.h" -#include "common/config/version_converter.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/config/context_provider_impl.h" +#include "source/common/config/version_converter.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace LocalInfo { @@ -55,8 +55,9 @@ class LocalInfoImpl : public LocalInfo { zone_stat_name_(zone_stat_name_storage_.statName()), dynamic_update_callback_handle_(context_provider_.addDynamicContextUpdateCallback( [this](absl::string_view resource_type_url) { - (*node_.mutable_dynamic_parameters())[resource_type_url].CopyFrom( - context_provider_.dynamicContext(resource_type_url)); + (*node_.mutable_dynamic_parameters()) + [toStdStringView(resource_type_url)] // NOLINT(std::string_view) + .CopyFrom(context_provider_.dynamicContext(resource_type_url)); })) {} Network::Address::InstanceConstSharedPtr address() const override { return address_; } diff --git a/source/common/local_reply/BUILD b/source/common/local_reply/BUILD index a01895c3bebc6..4976d7c19ab58 100644 --- a/source/common/local_reply/BUILD +++ b/source/common/local_reply/BUILD @@ -13,11 +13,11 @@ envoy_cc_library( srcs = ["local_reply.cc"], hdrs = ["local_reply.h"], deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/api:api_interface", + "//envoy/http:codes_interface", + "//envoy/http:header_map_interface", + "//envoy/server:filter_config_interface", + "//envoy/stream_info:stream_info_interface", "//source/common/access_log:access_log_lib", "//source/common/common:enum_to_int", "//source/common/config:datasource_lib", diff --git a/source/common/local_reply/local_reply.cc b/source/common/local_reply/local_reply.cc index 753003f223b33..c99c3b2d44454 100644 --- a/source/common/local_reply/local_reply.cc +++ b/source/common/local_reply/local_reply.cc @@ -1,17 +1,17 @@ -#include "common/local_reply/local_reply.h" +#include "source/common/local_reply/local_reply.h" #include #include #include "envoy/api/api.h" -#include "common/access_log/access_log_impl.h" -#include "common/common/enum_to_int.h" -#include "common/config/datasource.h" -#include "common/formatter/substitution_format_string.h" -#include "common/formatter/substitution_formatter.h" -#include "common/http/header_map_impl.h" -#include "common/router/header_parser.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/config/datasource.h" +#include "source/common/formatter/substitution_format_string.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/router/header_parser.h" namespace Envoy { namespace LocalReply { diff --git a/source/common/local_reply/local_reply.h b/source/common/local_reply/local_reply.h index 5db93caa07fda..23294df76a25f 100644 --- a/source/common/local_reply/local_reply.h +++ b/source/common/local_reply/local_reply.h @@ -5,7 +5,7 @@ #include "envoy/http/header_map.h" #include "envoy/server/filter_config.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/stream_info/stream_info_impl.h" namespace Envoy { namespace LocalReply { diff --git a/source/common/matcher/BUILD b/source/common/matcher/BUILD index 98fe3f15b0ce7..303c889ef82b2 100644 --- a/source/common/matcher/BUILD +++ b/source/common/matcher/BUILD @@ -12,7 +12,7 @@ envoy_cc_library( name = "exact_map_matcher_lib", hdrs = ["exact_map_matcher.h"], deps = [ - "//include/envoy/matcher:matcher_interface", + "//envoy/matcher:matcher_interface", ], ) @@ -20,7 +20,7 @@ envoy_cc_library( name = "value_input_matcher_lib", hdrs = ["value_input_matcher.h"], deps = [ - "//include/envoy/matcher:matcher_interface", + "//envoy/matcher:matcher_interface", "//source/common/common:matchers_lib", ], ) @@ -29,7 +29,7 @@ envoy_cc_library( name = "validation_visitor_lib", hdrs = ["validation_visitor.h"], deps = [ - "//include/envoy/matcher:matcher_interface", + "//envoy/matcher:matcher_interface", ], ) @@ -38,7 +38,7 @@ envoy_cc_library( hdrs = ["list_matcher.h"], deps = [ ":field_matcher_lib", - "//include/envoy/matcher:matcher_interface", + "//envoy/matcher:matcher_interface", ], ) @@ -46,7 +46,7 @@ envoy_cc_library( name = "field_matcher_lib", hdrs = ["field_matcher.h"], deps = [ - "//include/envoy/matcher:matcher_interface", + "//envoy/matcher:matcher_interface", ], ) @@ -60,8 +60,8 @@ envoy_cc_library( ":list_matcher_lib", ":validation_visitor_lib", ":value_input_matcher_lib", - "//include/envoy/config:typed_config_interface", - "//include/envoy/matcher:matcher_interface", + "//envoy/config:typed_config_interface", + "//envoy/matcher:matcher_interface", "//source/common/config:utility_lib", "@envoy_api//envoy/config/common/matcher/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/source/common/matcher/list_matcher.h b/source/common/matcher/list_matcher.h index 94b9b9274f77e..336446160a3e2 100644 --- a/source/common/matcher/list_matcher.h +++ b/source/common/matcher/list_matcher.h @@ -2,7 +2,7 @@ #include "envoy/matcher/matcher.h" -#include "common/matcher/field_matcher.h" +#include "source/common/matcher/field_matcher.h" namespace Envoy { namespace Matcher { diff --git a/source/common/matcher/matcher.cc b/source/common/matcher/matcher.cc index e784c8f02496e..ea7215a3fcf60 100644 --- a/source/common/matcher/matcher.cc +++ b/source/common/matcher/matcher.cc @@ -1,6 +1,6 @@ -#include "common/matcher/matcher.h" +#include "source/common/matcher/matcher.h" -#include "common/common/assert.h" -#include "common/config/utility.h" +#include "source/common/common/assert.h" +#include "source/common/config/utility.h" namespace Envoy {} diff --git a/source/common/matcher/matcher.h b/source/common/matcher/matcher.h index 511e844287e92..0c1f193aa8cde 100644 --- a/source/common/matcher/matcher.h +++ b/source/common/matcher/matcher.h @@ -8,13 +8,13 @@ #include "envoy/config/typed_config.h" #include "envoy/matcher/matcher.h" -#include "common/common/assert.h" -#include "common/config/utility.h" -#include "common/matcher/exact_map_matcher.h" -#include "common/matcher/field_matcher.h" -#include "common/matcher/list_matcher.h" -#include "common/matcher/validation_visitor.h" -#include "common/matcher/value_input_matcher.h" +#include "source/common/common/assert.h" +#include "source/common/config/utility.h" +#include "source/common/matcher/exact_map_matcher.h" +#include "source/common/matcher/field_matcher.h" +#include "source/common/matcher/list_matcher.h" +#include "source/common/matcher/validation_visitor.h" +#include "source/common/matcher/value_input_matcher.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" @@ -170,7 +170,7 @@ template class MatchTreeFactory { explicit CommonProtocolInputWrapper(CommonProtocolInputPtr&& common_protocol_input) : common_protocol_input_(std::move(common_protocol_input)) {} - DataInputGetResult get(const DataType&) override { + DataInputGetResult get(const DataType&) const override { return DataInputGetResult{DataInputGetResult::DataAvailability::AllDataAvailable, common_protocol_input_->get()}; } diff --git a/source/common/matcher/value_input_matcher.h b/source/common/matcher/value_input_matcher.h index acbfded9cd7e2..e381f393550c2 100644 --- a/source/common/matcher/value_input_matcher.h +++ b/source/common/matcher/value_input_matcher.h @@ -2,7 +2,7 @@ #include "envoy/matcher/matcher.h" -#include "common/common/matchers.h" +#include "source/common/common/matchers.h" namespace Envoy { namespace Matcher { diff --git a/source/common/memory/BUILD b/source/common/memory/BUILD index 1fe67e534e494..e6e528c960006 100644 --- a/source/common/memory/BUILD +++ b/source/common/memory/BUILD @@ -34,9 +34,9 @@ envoy_cc_library( hdrs = ["heap_shrinker.h"], deps = [ ":utils_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/server/overload:overload_manager_interface", - "//include/envoy/stats:stats_interface", + "//envoy/event:dispatcher_interface", + "//envoy/server/overload:overload_manager_interface", + "//envoy/stats:stats_interface", "//source/common/stats:symbol_table_lib", ], ) diff --git a/source/common/memory/heap_shrinker.cc b/source/common/memory/heap_shrinker.cc index 5df99c8b42d09..4cc3ea7c51319 100644 --- a/source/common/memory/heap_shrinker.cc +++ b/source/common/memory/heap_shrinker.cc @@ -1,7 +1,7 @@ -#include "common/memory/heap_shrinker.h" +#include "source/common/memory/heap_shrinker.h" -#include "common/memory/utils.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/memory/utils.h" +#include "source/common/stats/symbol_table_impl.h" #include "absl/strings/str_cat.h" diff --git a/source/common/memory/stats.cc b/source/common/memory/stats.cc index 5b4e97261a4c9..3c3abb00aae4b 100644 --- a/source/common/memory/stats.cc +++ b/source/common/memory/stats.cc @@ -1,8 +1,8 @@ -#include "common/memory/stats.h" +#include "source/common/memory/stats.h" #include -#include "common/common/logger.h" +#include "source/common/common/logger.h" #if defined(TCMALLOC) diff --git a/source/common/memory/utils.cc b/source/common/memory/utils.cc index c6ac4f6c5fe87..f8b19d92e3502 100644 --- a/source/common/memory/utils.cc +++ b/source/common/memory/utils.cc @@ -1,7 +1,7 @@ -#include "common/memory/utils.h" +#include "source/common/memory/utils.h" -#include "common/common/assert.h" -#include "common/memory/stats.h" +#include "source/common/common/assert.h" +#include "source/common/memory/stats.h" #if defined(TCMALLOC) #include "tcmalloc/malloc_extension.h" diff --git a/source/common/network/BUILD b/source/common/network/BUILD index 4991af1ad8996..650edfa192ea4 100644 --- a/source/common/network/BUILD +++ b/source/common/network/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( hdrs = ["address_impl.h"], deps = [ ":socket_interface_lib", - "//include/envoy/network:address_interface", + "//envoy/network:address_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:safe_memcpy_lib", @@ -27,7 +27,7 @@ envoy_cc_library( srcs = ["application_protocol.cc"], hdrs = ["application_protocol.h"], deps = [ - "//include/envoy/stream_info:filter_state_interface", + "//envoy/stream_info:filter_state_interface", "//source/common/common:macros", ], ) @@ -39,7 +39,7 @@ envoy_cc_library( deps = [ ":address_lib", ":utility_lib", - "//include/envoy/network:address_interface", + "//envoy/network:address_interface", "//source/common/common:assert_lib", "//source/common/common:safe_memcpy_lib", "//source/common/common:utility_lib", @@ -52,7 +52,7 @@ envoy_cc_library( srcs = ["connection_balancer_impl.cc"], hdrs = ["connection_balancer_impl.h"], deps = [ - "//include/envoy/network:connection_balancer_interface", + "//envoy/network:connection_balancer_interface", ], ) @@ -62,8 +62,8 @@ envoy_cc_library( hdrs = ["connection_impl_base.h"], deps = [ ":filter_manager_lib", - "//include/envoy/common:scope_tracker_interface", - "//include/envoy/event:dispatcher_interface", + "//envoy/common:scope_tracker_interface", + "//envoy/event:dispatcher_interface", "//source/common/common:assert_lib", "//source/common/common:dump_state_utils", ], @@ -79,10 +79,10 @@ envoy_cc_library( ":connection_base_lib", ":raw_buffer_socket_lib", ":utility_lib", - "//include/envoy/event:timer_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/server/overload:thread_local_overload_state", + "//envoy/event:timer_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/server/overload:thread_local_overload_state", "//source/common/buffer:buffer_lib", "//source/common/buffer:watermark_buffer_lib", "//source/common/common:assert_lib", @@ -109,10 +109,10 @@ envoy_cc_library( deps = [ ":address_lib", ":utility_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:file_event_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:dns_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:file_event_interface", + "//envoy/event:timer_interface", + "//envoy/network:dns_interface", "//source/common/common:assert_lib", "//source/common/common:backoff_lib", "//source/common/common:linked_object", @@ -128,9 +128,9 @@ envoy_cc_library( deps = [ ":address_lib", ":utility_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:file_event_interface", - "//include/envoy/network:dns_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:file_event_interface", + "//envoy/network:dns_interface", "//source/common/common:assert_lib", "//source/common/common:linked_object", ], @@ -140,7 +140,7 @@ envoy_cc_library( name = "filter_lib", hdrs = ["filter_impl.h"], deps = [ - "//include/envoy/network:filter_interface", + "//envoy/network:filter_interface", ], ) @@ -149,8 +149,8 @@ envoy_cc_library( srcs = ["filter_manager_impl.cc"], hdrs = ["filter_manager_impl.h"], deps = [ - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", "//source/common/common:assert_lib", "//source/common/common:linked_object", ], @@ -161,7 +161,7 @@ envoy_cc_library( srcs = ["hash_policy.cc"], hdrs = ["hash_policy.h"], deps = [ - "//include/envoy/network:hash_policy_interface", + "//envoy/network:hash_policy_interface", "//source/common/common:assert_lib", "//source/common/common:hash_lib", "@envoy_api//envoy/type/v3:pkg_cc_proto", @@ -173,7 +173,7 @@ envoy_cc_library( srcs = ["io_socket_error_impl.cc"], hdrs = ["io_socket_error_impl.h"], deps = [ - "//include/envoy/api:io_error_interface", + "//envoy/api:io_error_interface", "//source/common/common:assert_lib", "//source/common/common:utility_lib", ], @@ -198,10 +198,10 @@ envoy_cc_library( name = "socket_interface_lib", hdrs = ["socket_interface.h"], deps = [ - "//include/envoy/config:typed_config_interface", - "//include/envoy/network:socket_interface_interface", - "//include/envoy/registry", - "//include/envoy/server:bootstrap_extension_config_interface", + "//envoy/config:typed_config_interface", + "//envoy/network:socket_interface_interface", + "//envoy/registry", + "//envoy/server:bootstrap_extension_config_interface", ], ) @@ -220,8 +220,8 @@ envoy_cc_library( ":io_socket_error_lib", ":socket_interface_lib", ":socket_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:io_handle_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:io_handle_interface", "//source/common/api:os_sys_calls_lib", "//source/common/event:dispatcher_includes", "@envoy_api//envoy/extensions/network/socket_interface/v3:pkg_cc_proto", @@ -233,8 +233,8 @@ envoy_cc_library( srcs = ["socket_impl.cc"], hdrs = ["socket_impl.h"], deps = [ - "//include/envoy/network:socket_interface", - "//include/envoy/network:socket_interface_interface", + "//envoy/network:socket_interface", + "//envoy/network:socket_interface_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:dump_state_utils", @@ -249,8 +249,8 @@ envoy_cc_library( deps = [ ":socket_lib", ":utility_lib", - "//include/envoy/network:exception_interface", - "//include/envoy/network:listen_socket_interface", + "//envoy/network:exception_interface", + "//envoy/network:listen_socket_interface", "//source/common/common:assert_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], @@ -272,13 +272,13 @@ envoy_cc_library( ":address_lib", ":default_socket_interface_lib", ":listen_socket_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:file_event_interface", - "//include/envoy/network:exception_interface", - "//include/envoy/network:listener_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/event:dispatcher_interface", + "//envoy/event:file_event_interface", + "//envoy/network:exception_interface", + "//envoy/network:listener_interface", + "//envoy/runtime:runtime_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:empty_string", @@ -294,8 +294,8 @@ envoy_cc_library( hdrs = ["raw_buffer_socket.h"], deps = [ ":utility_lib", - "//include/envoy/network:connection_interface", - "//include/envoy/network:transport_socket_interface", + "//envoy/network:connection_interface", + "//envoy/network:transport_socket_interface", "//source/common/buffer:buffer_lib", "//source/common/common:empty_string", "//source/common/http:headers_lib", @@ -308,9 +308,9 @@ envoy_cc_library( hdrs = ["resolver_impl.h"], deps = [ ":utility_lib", - "//include/envoy/network:address_interface", - "//include/envoy/network:resolver_interface", - "//include/envoy/registry", + "//envoy/network:address_interface", + "//envoy/network:resolver_interface", + "//envoy/registry", "//source/common/config:well_known_names", "//source/common/network:address_lib", "//source/common/protobuf", @@ -326,8 +326,8 @@ envoy_cc_library( deps = [ ":address_lib", ":listen_socket_lib", - "//include/envoy/api:os_sys_calls_interface", - "//include/envoy/network:listen_socket_interface", + "//envoy/api:os_sys_calls_interface", + "//envoy/network:listen_socket_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", @@ -345,7 +345,7 @@ envoy_cc_library( ":address_lib", ":socket_lib", ":socket_option_lib", - "//include/envoy/network:listen_socket_interface", + "//envoy/network:listen_socket_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:logger_lib", @@ -361,7 +361,7 @@ envoy_cc_library( ":address_lib", ":socket_lib", ":socket_option_lib", - "//include/envoy/network:listen_socket_interface", + "//envoy/network:listen_socket_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:logger_lib", @@ -380,7 +380,7 @@ envoy_cc_library( ":address_lib", ":socket_option_lib", ":win32_redirect_records_option_lib", - "//include/envoy/network:listen_socket_interface", + "//envoy/network:listen_socket_interface", "//source/common/common:logger_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], @@ -394,9 +394,9 @@ envoy_cc_library( ":address_lib", ":default_socket_interface_lib", ":socket_lib", - "//include/envoy/network:connection_interface", - "//include/envoy/network:listener_interface", - "//include/envoy/stats:stats_interface", + "//envoy/network:connection_interface", + "//envoy/network:listener_interface", + "//envoy/stats:stats_interface", "//source/common/api:os_sys_calls_lib", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", @@ -416,9 +416,9 @@ envoy_cc_library( ":proxy_protocol_filter_state_lib", ":upstream_server_name_lib", ":upstream_subject_alt_names_lib", - "//include/envoy/network:proxy_protocol_options_lib", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/stream_info:filter_state_interface", + "//envoy/network:proxy_protocol_options_lib", + "//envoy/network:transport_socket_interface", + "//envoy/stream_info:filter_state_interface", "//source/common/common:scalar_to_byte_vector_lib", "//source/common/common:utility_lib", ], @@ -429,7 +429,7 @@ envoy_cc_library( srcs = ["upstream_server_name.cc"], hdrs = ["upstream_server_name.h"], deps = [ - "//include/envoy/stream_info:filter_state_interface", + "//envoy/stream_info:filter_state_interface", "//source/common/common:macros", ], ) @@ -439,7 +439,7 @@ envoy_cc_library( srcs = ["upstream_subject_alt_names.cc"], hdrs = ["upstream_subject_alt_names.h"], deps = [ - "//include/envoy/stream_info:filter_state_interface", + "//envoy/stream_info:filter_state_interface", "//source/common/common:macros", ], ) @@ -454,8 +454,8 @@ envoy_cc_library( "abseil_str_format", ], deps = [ - "//include/envoy/network:filter_interface", - "//include/envoy/network:listen_socket_interface", + "//envoy/network:filter_interface", + "//envoy/network:listen_socket_interface", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", ], ) @@ -467,8 +467,8 @@ envoy_cc_library( deps = [ ":io_socket_error_lib", ":utility_lib", - "//include/envoy/network:socket_interface", - "//include/envoy/network:udp_packet_writer_handler_interface", + "//envoy/network:socket_interface", + "//envoy/network:udp_packet_writer_handler_interface", "//source/common/buffer:buffer_lib", ], ) @@ -478,8 +478,8 @@ envoy_cc_library( srcs = ["proxy_protocol_filter_state.cc"], hdrs = ["proxy_protocol_filter_state.h"], deps = [ - "//include/envoy/network:proxy_protocol_options_lib", - "//include/envoy/stream_info:filter_state_interface", + "//envoy/network:proxy_protocol_options_lib", + "//envoy/stream_info:filter_state_interface", "//source/common/common:macros", ], ) @@ -491,8 +491,8 @@ envoy_cc_library( deps = [ ":socket_interface_lib", ":socket_option_factory_lib", - "//include/envoy/network:io_handle_interface", - "//include/envoy/stream_info:filter_state_interface", + "//envoy/network:io_handle_interface", + "//envoy/stream_info:filter_state_interface", "//source/common/common:macros", ], ) diff --git a/source/common/network/addr_family_aware_socket_option_impl.cc b/source/common/network/addr_family_aware_socket_option_impl.cc index 4e48958f27120..8c4c756a1093c 100644 --- a/source/common/network/addr_family_aware_socket_option_impl.cc +++ b/source/common/network/addr_family_aware_socket_option_impl.cc @@ -1,13 +1,13 @@ -#include "common/network/addr_family_aware_socket_option_impl.h" +#include "source/common/network/addr_family_aware_socket_option_impl.h" #include "envoy/common/exception.h" #include "envoy/common/platform.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/network/address_impl.h" -#include "common/network/socket_option_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_option_impl.h" namespace Envoy { namespace Network { diff --git a/source/common/network/addr_family_aware_socket_option_impl.h b/source/common/network/addr_family_aware_socket_option_impl.h index 5f06b13e9cd80..749788a4d9fa4 100644 --- a/source/common/network/addr_family_aware_socket_option_impl.h +++ b/source/common/network/addr_family_aware_socket_option_impl.h @@ -4,8 +4,8 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/network/listen_socket.h" -#include "common/common/logger.h" -#include "common/network/socket_option_impl.h" +#include "source/common/common/logger.h" +#include "source/common/network/socket_option_impl.h" #include "absl/types/optional.h" diff --git a/source/common/network/address_impl.cc b/source/common/network/address_impl.cc index 478299a503ee3..be1d06a491148 100644 --- a/source/common/network/address_impl.cc +++ b/source/common/network/address_impl.cc @@ -1,4 +1,4 @@ -#include "common/network/address_impl.h" +#include "source/common/network/address_impl.h" #include #include @@ -7,11 +7,11 @@ #include "envoy/common/exception.h" #include "envoy/common/platform.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/safe_memcpy.h" -#include "common/common/utility.h" -#include "common/network/socket_interface.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/common/utility.h" +#include "source/common/network/socket_interface.h" namespace Envoy { namespace Network { diff --git a/source/common/network/address_impl.h b/source/common/network/address_impl.h index 584b5384d1405..a158ca63e4fca 100644 --- a/source/common/network/address_impl.h +++ b/source/common/network/address_impl.h @@ -10,7 +10,7 @@ #include "envoy/network/address.h" #include "envoy/network/socket.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Network { diff --git a/source/common/network/apple_dns_impl.cc b/source/common/network/apple_dns_impl.cc index 25a44ace0a666..f542c2424f7f8 100644 --- a/source/common/network/apple_dns_impl.cc +++ b/source/common/network/apple_dns_impl.cc @@ -1,4 +1,4 @@ -#include "common/network/apple_dns_impl.h" +#include "source/common/network/apple_dns_impl.h" #include @@ -11,10 +11,10 @@ #include "envoy/common/platform.h" #include "envoy/event/file_event.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" #include "absl/strings/str_join.h" diff --git a/source/common/network/apple_dns_impl.h b/source/common/network/apple_dns_impl.h index 0ca2cd2517bc0..d22bc2c7c87e2 100644 --- a/source/common/network/apple_dns_impl.h +++ b/source/common/network/apple_dns_impl.h @@ -11,11 +11,11 @@ #include "envoy/event/timer.h" #include "envoy/network/dns.h" -#include "common/common/backoff_strategy.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" -#include "common/common/utility.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/common/backoff_strategy.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" +#include "source/common/singleton/threadsafe_singleton.h" #include "absl/container/node_hash_map.h" diff --git a/source/common/network/application_protocol.cc b/source/common/network/application_protocol.cc index 57d9bbb556ce3..6794194ac90d5 100644 --- a/source/common/network/application_protocol.cc +++ b/source/common/network/application_protocol.cc @@ -1,6 +1,6 @@ -#include "common/network/application_protocol.h" +#include "source/common/network/application_protocol.h" -#include "common/common/macros.h" +#include "source/common/common/macros.h" namespace Envoy { namespace Network { diff --git a/source/common/network/base_listener_impl.cc b/source/common/network/base_listener_impl.cc index bd524c7921549..df953ecd29e3d 100644 --- a/source/common/network/base_listener_impl.cc +++ b/source/common/network/base_listener_impl.cc @@ -1,14 +1,14 @@ -#include "common/network/base_listener_impl.h" +#include "source/common/network/base_listener_impl.h" #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/event/dispatcher_impl.h" -#include "common/event/file_event_impl.h" -#include "common/network/address_impl.h" -#include "common/network/socket_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/event/file_event_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_impl.h" #include "event2/listener.h" diff --git a/source/common/network/base_listener_impl.h b/source/common/network/base_listener_impl.h index 2cf97dea86c4a..62cebdbd4dd57 100644 --- a/source/common/network/base_listener_impl.h +++ b/source/common/network/base_listener_impl.h @@ -2,8 +2,8 @@ #include "envoy/network/listener.h" -#include "common/event/dispatcher_impl.h" -#include "common/network/listen_socket_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/network/listen_socket_impl.h" namespace Envoy { namespace Network { diff --git a/source/common/network/cidr_range.cc b/source/common/network/cidr_range.cc index 2ee249f265c1b..cdbfe9fe1d60b 100644 --- a/source/common/network/cidr_range.cc +++ b/source/common/network/cidr_range.cc @@ -1,4 +1,4 @@ -#include "common/network/cidr_range.h" +#include "source/common/network/cidr_range.h" #include #include @@ -9,12 +9,12 @@ #include "envoy/common/platform.h" #include "envoy/config/core/v3/address.pb.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/safe_memcpy.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Network { diff --git a/source/common/network/cidr_range.h b/source/common/network/cidr_range.h index 9ec72f39156b8..791f3de7b5d67 100644 --- a/source/common/network/cidr_range.h +++ b/source/common/network/cidr_range.h @@ -6,7 +6,7 @@ #include "envoy/config/core/v3/address.pb.h" #include "envoy/network/address.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Network { diff --git a/source/common/network/connection_balancer_impl.cc b/source/common/network/connection_balancer_impl.cc index 84aed4ef64051..309628073f19e 100644 --- a/source/common/network/connection_balancer_impl.cc +++ b/source/common/network/connection_balancer_impl.cc @@ -1,4 +1,4 @@ -#include "common/network/connection_balancer_impl.h" +#include "source/common/network/connection_balancer_impl.h" namespace Envoy { namespace Network { diff --git a/source/common/network/connection_impl.cc b/source/common/network/connection_impl.cc index 2d964ac4c22a6..9f37d4b5b70da 100644 --- a/source/common/network/connection_impl.cc +++ b/source/common/network/connection_impl.cc @@ -1,4 +1,4 @@ -#include "common/network/connection_impl.h" +#include "source/common/network/connection_impl.h" #include #include @@ -12,15 +12,15 @@ #include "envoy/network/filter.h" #include "envoy/network/socket.h" -#include "common/common/assert.h" -#include "common/common/dump_state_utils.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/scope_tracker.h" -#include "common/network/address_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/raw_buffer_socket.h" -#include "common/network/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/scope_tracker.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Network { diff --git a/source/common/network/connection_impl.h b/source/common/network/connection_impl.h index 17021980febbf..4e9f0044924c1 100644 --- a/source/common/network/connection_impl.h +++ b/source/common/network/connection_impl.h @@ -9,10 +9,10 @@ #include "envoy/common/scope_tracker.h" #include "envoy/network/transport_socket.h" -#include "common/buffer/watermark_buffer.h" -#include "common/event/libevent.h" -#include "common/network/connection_impl_base.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/event/libevent.h" +#include "source/common/network/connection_impl_base.h" +#include "source/common/stream_info/stream_info_impl.h" #include "absl/types/optional.h" diff --git a/source/common/network/connection_impl_base.cc b/source/common/network/connection_impl_base.cc index 22803ec56642a..71a5fbb5e94ac 100644 --- a/source/common/network/connection_impl_base.cc +++ b/source/common/network/connection_impl_base.cc @@ -1,4 +1,4 @@ -#include "common/network/connection_impl_base.h" +#include "source/common/network/connection_impl_base.h" namespace Envoy { namespace Network { diff --git a/source/common/network/connection_impl_base.h b/source/common/network/connection_impl_base.h index 5bb12eea5a7d9..05a7eddee9f60 100644 --- a/source/common/network/connection_impl_base.h +++ b/source/common/network/connection_impl_base.h @@ -2,8 +2,8 @@ #include "envoy/event/dispatcher.h" -#include "common/common/logger.h" -#include "common/network/filter_manager_impl.h" +#include "source/common/common/logger.h" +#include "source/common/network/filter_manager_impl.h" namespace Envoy { namespace Network { diff --git a/source/common/network/dns_impl.cc b/source/common/network/dns_impl.cc index c2b0411a9696b..5e42755061c72 100644 --- a/source/common/network/dns_impl.cc +++ b/source/common/network/dns_impl.cc @@ -1,4 +1,4 @@ -#include "common/network/dns_impl.h" +#include "source/common/network/dns_impl.h" #include #include @@ -8,11 +8,11 @@ #include "envoy/common/platform.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/thread.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/thread.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" #include "absl/strings/str_join.h" #include "ares.h" @@ -23,10 +23,10 @@ namespace Network { DnsResolverImpl::DnsResolverImpl( Event::Dispatcher& dispatcher, const std::vector& resolvers, - const bool use_tcp_for_dns_lookups) + const envoy::config::core::v3::DnsResolverOptions& dns_resolver_options) : dispatcher_(dispatcher), timer_(dispatcher.createTimer([this] { onEventCallback(ARES_SOCKET_BAD, 0); })), - use_tcp_for_dns_lookups_(use_tcp_for_dns_lookups), + dns_resolver_options_(dns_resolver_options), resolvers_csv_(maybeBuildResolversCsv(resolvers)) { AresOptions options = defaultAresOptions(); initializeChannel(&options.options_, options.optmask_); @@ -66,11 +66,16 @@ absl::optional DnsResolverImpl::maybeBuildResolversCsv( DnsResolverImpl::AresOptions DnsResolverImpl::defaultAresOptions() { AresOptions options{}; - if (use_tcp_for_dns_lookups_) { + if (dns_resolver_options_.use_tcp_for_dns_lookups()) { options.optmask_ |= ARES_OPT_FLAGS; options.options_.flags |= ARES_FLAG_USEVC; } + if (dns_resolver_options_.no_default_search_domain()) { + options.optmask_ |= ARES_OPT_FLAGS; + options.options_.flags |= ARES_FLAG_NOSEARCH; + } + return options; } diff --git a/source/common/network/dns_impl.h b/source/common/network/dns_impl.h index ace150273f31a..f58609ad674a8 100644 --- a/source/common/network/dns_impl.h +++ b/source/common/network/dns_impl.h @@ -8,9 +8,9 @@ #include "envoy/event/file_event.h" #include "envoy/network/dns.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" -#include "common/common/utility.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" #include "absl/container/node_hash_map.h" #include "ares.h" @@ -28,7 +28,7 @@ class DnsResolverImpl : public DnsResolver, protected Logger::Loggable& resolvers, - const bool use_tcp_for_dns_lookups); + const envoy::config::core::v3::DnsResolverOptions& dns_resolver_options); ~DnsResolverImpl() override; // Network::DnsResolver @@ -106,7 +106,8 @@ class DnsResolverImpl : public DnsResolver, protected Logger::Loggable events_; const absl::optional resolvers_csv_; }; diff --git a/source/common/network/filter_manager_impl.cc b/source/common/network/filter_manager_impl.cc index 5bec16f5f75ae..f5984f2db43ce 100644 --- a/source/common/network/filter_manager_impl.cc +++ b/source/common/network/filter_manager_impl.cc @@ -1,10 +1,10 @@ -#include "common/network/filter_manager_impl.h" +#include "source/common/network/filter_manager_impl.h" #include #include "envoy/network/connection.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Network { diff --git a/source/common/network/filter_manager_impl.h b/source/common/network/filter_manager_impl.h index 0f10e6302a1f6..87973160939ef 100644 --- a/source/common/network/filter_manager_impl.h +++ b/source/common/network/filter_manager_impl.h @@ -7,7 +7,7 @@ #include "envoy/network/filter.h" #include "envoy/network/socket.h" -#include "common/common/linked_object.h" +#include "source/common/common/linked_object.h" namespace Envoy { namespace Network { diff --git a/source/common/network/filter_matcher.cc b/source/common/network/filter_matcher.cc index 3865d3e05d992..6e1410eab566a 100644 --- a/source/common/network/filter_matcher.cc +++ b/source/common/network/filter_matcher.cc @@ -1,8 +1,8 @@ -#include "common/network/filter_matcher.h" +#include "source/common/network/filter_matcher.h" #include "envoy/network/filter.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/strings/str_format.h" diff --git a/source/common/network/hash_policy.cc b/source/common/network/hash_policy.cc index 486be4772f3b5..2baf9fe8d0e51 100644 --- a/source/common/network/hash_policy.cc +++ b/source/common/network/hash_policy.cc @@ -1,9 +1,9 @@ -#include "common/network/hash_policy.h" +#include "source/common/network/hash_policy.h" #include "envoy/common/exception.h" #include "envoy/type/v3/hash_policy.pb.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Network { diff --git a/source/common/network/hash_policy.h b/source/common/network/hash_policy.h index b0c2c4894cc4e..1b5d09489fcf0 100644 --- a/source/common/network/hash_policy.h +++ b/source/common/network/hash_policy.h @@ -3,7 +3,7 @@ #include "envoy/network/hash_policy.h" #include "envoy/type/v3/hash_policy.pb.h" -#include "common/common/hash.h" +#include "source/common/common/hash.h" namespace Envoy { namespace Network { diff --git a/source/common/network/io_socket_error_impl.cc b/source/common/network/io_socket_error_impl.cc index 04a91c3d79623..8d664be8e1f47 100644 --- a/source/common/network/io_socket_error_impl.cc +++ b/source/common/network/io_socket_error_impl.cc @@ -1,9 +1,9 @@ -#include "common/network/io_socket_error_impl.h" +#include "source/common/network/io_socket_error_impl.h" #include "envoy/common/platform.h" -#include "common/common/assert.h" -#include "common/common/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Network { diff --git a/source/common/network/io_socket_error_impl.h b/source/common/network/io_socket_error_impl.h index 1b361a9a3e2f3..bd4d80ce68e12 100644 --- a/source/common/network/io_socket_error_impl.h +++ b/source/common/network/io_socket_error_impl.h @@ -2,7 +2,7 @@ #include "envoy/api/io_error.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Network { diff --git a/source/common/network/io_socket_handle_impl.cc b/source/common/network/io_socket_handle_impl.cc index b8bd7f2ac1c94..7e2f3a5b789db 100644 --- a/source/common/network/io_socket_handle_impl.cc +++ b/source/common/network/io_socket_handle_impl.cc @@ -1,11 +1,11 @@ -#include "common/network/io_socket_handle_impl.h" +#include "source/common/network/io_socket_handle_impl.h" #include "envoy/buffer/buffer.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/utility.h" -#include "common/event/file_event_impl.h" -#include "common/network/address_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/utility.h" +#include "source/common/event/file_event_impl.h" +#include "source/common/network/address_impl.h" #include "absl/container/fixed_array.h" #include "absl/types/optional.h" diff --git a/source/common/network/io_socket_handle_impl.h b/source/common/network/io_socket_handle_impl.h index 6b21e94c6927a..398ab1f554f5f 100644 --- a/source/common/network/io_socket_handle_impl.h +++ b/source/common/network/io_socket_handle_impl.h @@ -6,8 +6,8 @@ #include "envoy/event/dispatcher.h" #include "envoy/network/io_handle.h" -#include "common/common/logger.h" -#include "common/network/io_socket_error_impl.h" +#include "source/common/common/logger.h" +#include "source/common/network/io_socket_error_impl.h" namespace Envoy { namespace Network { diff --git a/source/common/network/lc_trie.h b/source/common/network/lc_trie.h index 6069eab01eb0c..db523fe980a59 100644 --- a/source/common/network/lc_trie.h +++ b/source/common/network/lc_trie.h @@ -8,11 +8,11 @@ #include "envoy/common/platform.h" #include "envoy/network/address.h" -#include "common/common/assert.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/network/cidr_range.h" -#include "common/network/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/cidr_range.h" +#include "source/common/network/utility.h" #include "absl/container/node_hash_set.h" #include "absl/numeric/int128.h" diff --git a/source/common/network/listen_socket_impl.cc b/source/common/network/listen_socket_impl.cc index 674cf456bce06..4ed599d19b737 100644 --- a/source/common/network/listen_socket_impl.cc +++ b/source/common/network/listen_socket_impl.cc @@ -1,4 +1,4 @@ -#include "common/network/listen_socket_impl.h" +#include "source/common/network/listen_socket_impl.h" #include @@ -9,11 +9,11 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/network/exception.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Network { @@ -48,20 +48,16 @@ void ListenSocketImpl::setupSocket(const Network::Socket::OptionsSharedPtr& opti } } +// UDP listen socket desires io handle regardless bind_to_port is true or false. template <> -void NetworkListenSocket>::setPrebindSocketOptions() { -// On Windows, SO_REUSEADDR does not restrict subsequent bind calls when there is a listener as on -// Linux and later BSD socket stacks -#ifndef WIN32 - int on = 1; - auto status = setSocketOption(SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - RELEASE_ASSERT(status.rc_ != -1, "failed to set SO_REUSEADDR socket option"); -#endif +NetworkListenSocket>::NetworkListenSocket( + const Address::InstanceConstSharedPtr& address, + const Network::Socket::OptionsSharedPtr& options, bool bind_to_port) + : ListenSocketImpl(Network::ioHandleForAddr(Socket::Type::Datagram, address), address) { + setPrebindSocketOptions(); + setupSocket(options, bind_to_port); } -template <> -void NetworkListenSocket>::setPrebindSocketOptions() {} - UdsListenSocket::UdsListenSocket(const Address::InstanceConstSharedPtr& address) : ListenSocketImpl(ioHandleForAddr(Socket::Type::Stream, address), address) { RELEASE_ASSERT(io_handle_->isOpen(), ""); diff --git a/source/common/network/listen_socket_impl.h b/source/common/network/listen_socket_impl.h index 663c372c6ee89..d42e8cadd683a 100644 --- a/source/common/network/listen_socket_impl.h +++ b/source/common/network/listen_socket_impl.h @@ -10,9 +10,10 @@ #include "envoy/network/socket.h" #include "envoy/network/socket_interface.h" -#include "common/common/assert.h" -#include "common/common/dump_state_utils.h" -#include "common/network/socket_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/network/socket_impl.h" +#include "source/common/network/socket_interface.h" namespace Envoy { namespace Network { @@ -25,7 +26,8 @@ class ListenSocketImpl : public SocketImpl { SocketPtr duplicate() override { // Using `new` to access a non-public constructor. return absl::WrapUnique( - new ListenSocketImpl(io_handle_->duplicate(), address_provider_->localAddress())); + new ListenSocketImpl(io_handle_ == nullptr ? nullptr : io_handle_->duplicate(), + address_provider_->localAddress())); } void setupSocket(const Network::Socket::OptionsSharedPtr& options, bool bind_to_port); @@ -50,11 +52,23 @@ template class NetworkListenSocket : public ListenSocketImpl { public: NetworkListenSocket(const Address::InstanceConstSharedPtr& address, const Network::Socket::OptionsSharedPtr& options, bool bind_to_port) - : ListenSocketImpl(Network::ioHandleForAddr(T::type, address), address) { - RELEASE_ASSERT(io_handle_->isOpen(), ""); - - setPrebindSocketOptions(); - + : ListenSocketImpl(bind_to_port ? Network::ioHandleForAddr(T::type, address) : nullptr, + address) { + // Prebind is applied if the socket is bind to port. + if (bind_to_port) { + RELEASE_ASSERT(io_handle_->isOpen(), ""); + setPrebindSocketOptions(); + } else { + // If the tcp listener does not bind to port, we test that the ip family is supported. + if (auto ip = address->ip(); ip != nullptr) { + RELEASE_ASSERT( + Network::SocketInterfaceSingleton::get().ipFamilySupported(ip->ipv4() ? AF_INET + : AF_INET6), + fmt::format( + "Creating listen socket address {} but the address familiy is not supported", + address->asStringView())); + } + } setupSocket(options, bind_to_port); } @@ -67,9 +81,30 @@ template class NetworkListenSocket : public ListenSocketImpl { Socket::Type socketType() const override { return T::type; } protected: - void setPrebindSocketOptions(); + void setPrebindSocketOptions() { + // On Windows, SO_REUSEADDR does not restrict subsequent bind calls when there is a listener as + // on Linux and later BSD socket stacks +#ifndef WIN32 + int on = 1; + auto status = setSocketOption(SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + RELEASE_ASSERT(status.rc_ != -1, "failed to set SO_REUSEADDR socket option"); +#endif + } }; +template <> +inline void +NetworkListenSocket>::setPrebindSocketOptions() {} + +// UDP listen socket desires io handle regardless bind_to_port is true or false. +template <> +NetworkListenSocket>::NetworkListenSocket( + const Address::InstanceConstSharedPtr& address, + const Network::Socket::OptionsSharedPtr& options, bool bind_to_port); + +template class NetworkListenSocket>; +template class NetworkListenSocket>; + using TcpListenSocket = NetworkListenSocket>; using TcpListenSocketPtr = std::unique_ptr; diff --git a/source/common/network/proxy_protocol_filter_state.cc b/source/common/network/proxy_protocol_filter_state.cc index cae58c9612537..37940bbad746a 100644 --- a/source/common/network/proxy_protocol_filter_state.cc +++ b/source/common/network/proxy_protocol_filter_state.cc @@ -1,6 +1,6 @@ -#include "common/network/proxy_protocol_filter_state.h" +#include "source/common/network/proxy_protocol_filter_state.h" -#include "common/common/macros.h" +#include "source/common/common/macros.h" namespace Envoy { namespace Network { diff --git a/source/common/network/raw_buffer_socket.cc b/source/common/network/raw_buffer_socket.cc index 96f75a1c419be..ad72a2fb434de 100644 --- a/source/common/network/raw_buffer_socket.cc +++ b/source/common/network/raw_buffer_socket.cc @@ -1,9 +1,9 @@ -#include "common/network/raw_buffer_socket.h" +#include "source/common/network/raw_buffer_socket.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/http/headers.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/headers.h" namespace Envoy { namespace Network { diff --git a/source/common/network/raw_buffer_socket.h b/source/common/network/raw_buffer_socket.h index 24e498ebf59a9..06462d86f886d 100644 --- a/source/common/network/raw_buffer_socket.h +++ b/source/common/network/raw_buffer_socket.h @@ -4,7 +4,7 @@ #include "envoy/network/connection.h" #include "envoy/network/transport_socket.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Network { diff --git a/source/common/network/resolver_impl.cc b/source/common/network/resolver_impl.cc index 66554c0d23674..069ff71208ee2 100644 --- a/source/common/network/resolver_impl.cc +++ b/source/common/network/resolver_impl.cc @@ -1,4 +1,4 @@ -#include "common/network/resolver_impl.h" +#include "source/common/network/resolver_impl.h" #include "envoy/common/exception.h" #include "envoy/config/core/v3/address.pb.h" @@ -6,9 +6,9 @@ #include "envoy/network/resolver.h" #include "envoy/registry/registry.h" -#include "common/config/well_known_names.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" +#include "source/common/config/well_known_names.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Network { diff --git a/source/common/network/resolver_impl.h b/source/common/network/resolver_impl.h index 0241a4fe53094..e6da88a4af508 100644 --- a/source/common/network/resolver_impl.h +++ b/source/common/network/resolver_impl.h @@ -5,7 +5,7 @@ #include "envoy/network/connection.h" #include "envoy/network/resolver.h" -#include "common/network/address_impl.h" +#include "source/common/network/address_impl.h" namespace Envoy { namespace Network { diff --git a/source/common/network/socket_impl.cc b/source/common/network/socket_impl.cc index 7a558ca059081..08505cb65b0a4 100644 --- a/source/common/network/socket_impl.cc +++ b/source/common/network/socket_impl.cc @@ -1,10 +1,10 @@ -#include "common/network/socket_impl.h" +#include "source/common/network/socket_impl.h" #include "envoy/common/exception.h" #include "envoy/network/socket_interface.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/utility.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Network { diff --git a/source/common/network/socket_impl.h b/source/common/network/socket_impl.h index 756b96638d21a..fd2765646f1ce 100644 --- a/source/common/network/socket_impl.h +++ b/source/common/network/socket_impl.h @@ -2,8 +2,8 @@ #include "envoy/network/socket.h" -#include "common/common/assert.h" -#include "common/common/dump_state_utils.h" +#include "source/common/common/assert.h" +#include "source/common/common/dump_state_utils.h" namespace Envoy { namespace Network { diff --git a/source/common/network/socket_interface.h b/source/common/network/socket_interface.h index 89ae1d9770ded..d225040cd0163 100644 --- a/source/common/network/socket_interface.h +++ b/source/common/network/socket_interface.h @@ -5,7 +5,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/bootstrap_extension_config.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/singleton/threadsafe_singleton.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/network/socket_interface_impl.cc b/source/common/network/socket_interface_impl.cc index 8a3802e36769e..4847161321e5e 100644 --- a/source/common/network/socket_interface_impl.cc +++ b/source/common/network/socket_interface_impl.cc @@ -1,12 +1,12 @@ -#include "common/network/socket_interface_impl.h" +#include "source/common/network/socket_interface_impl.h" #include "envoy/common/exception.h" #include "envoy/extensions/network/socket_interface/v3/default_socket_interface.pb.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/common/utility.h" -#include "common/network/io_socket_handle_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/common/network/io_socket_handle_impl.h" namespace Envoy { namespace Network { diff --git a/source/common/network/socket_interface_impl.h b/source/common/network/socket_interface_impl.h index ecc14e2e551b1..ce3889230f85a 100644 --- a/source/common/network/socket_interface_impl.h +++ b/source/common/network/socket_interface_impl.h @@ -2,7 +2,7 @@ #include "envoy/network/socket.h" -#include "common/network/socket_interface.h" +#include "source/common/network/socket_interface.h" namespace Envoy { namespace Network { diff --git a/source/common/network/socket_option_factory.cc b/source/common/network/socket_option_factory.cc index 484f0f3999afe..72b71d60fab0e 100644 --- a/source/common/network/socket_option_factory.cc +++ b/source/common/network/socket_option_factory.cc @@ -1,11 +1,11 @@ -#include "common/network/socket_option_factory.h" +#include "source/common/network/socket_option_factory.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/common/fmt.h" -#include "common/network/addr_family_aware_socket_option_impl.h" -#include "common/network/socket_option_impl.h" -#include "common/network/win32_redirect_records_option_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/network/addr_family_aware_socket_option_impl.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/win32_redirect_records_option_impl.h" namespace Envoy { namespace Network { diff --git a/source/common/network/socket_option_factory.h b/source/common/network/socket_option_factory.h index 878a5fc0cd721..e40730167a1ba 100644 --- a/source/common/network/socket_option_factory.h +++ b/source/common/network/socket_option_factory.h @@ -4,8 +4,8 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/network/socket.h" -#include "common/common/logger.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/logger.h" +#include "source/common/protobuf/protobuf.h" #include "absl/types/optional.h" diff --git a/source/common/network/socket_option_impl.cc b/source/common/network/socket_option_impl.cc index 7293fa483b2f4..53d3bc8efd1ff 100644 --- a/source/common/network/socket_option_impl.cc +++ b/source/common/network/socket_option_impl.cc @@ -1,12 +1,12 @@ -#include "common/network/socket_option_impl.h" +#include "source/common/network/socket_option_impl.h" #include "envoy/common/exception.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" namespace Envoy { namespace Network { diff --git a/source/common/network/socket_option_impl.h b/source/common/network/socket_option_impl.h index ce6ebb9265793..4c47dde2c08a7 100644 --- a/source/common/network/socket_option_impl.h +++ b/source/common/network/socket_option_impl.h @@ -5,8 +5,8 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/network/listen_socket.h" -#include "common/common/assert.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Network { diff --git a/source/common/network/tcp_listener_impl.cc b/source/common/network/tcp_listener_impl.cc index 38c77db31e441..ad8eb0e5c310f 100644 --- a/source/common/network/tcp_listener_impl.cc +++ b/source/common/network/tcp_listener_impl.cc @@ -1,18 +1,18 @@ -#include "common/network/tcp_listener_impl.h" +#include "source/common/network/tcp_listener_impl.h" #include "envoy/common/exception.h" #include "envoy/common/platform.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/network/exception.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/event/dispatcher_impl.h" -#include "common/event/file_event_impl.h" -#include "common/network/address_impl.h" -#include "common/network/io_socket_handle_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/event/file_event_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/io_socket_handle_impl.h" namespace Envoy { namespace Network { @@ -42,6 +42,7 @@ bool TcpListenerImpl::rejectCxOverGlobalLimit() { } void TcpListenerImpl::onSocketEvent(short flags) { + ASSERT(bind_to_port_); ASSERT(flags & (Event::FileReadyType::Read)); // TODO(fcoras): Add limit on number of accepted calls per wakeup @@ -95,6 +96,8 @@ void TcpListenerImpl::onSocketEvent(short flags) { } void TcpListenerImpl::setupServerSocket(Event::DispatcherImpl& dispatcher, Socket& socket) { + ASSERT(bind_to_port_); + socket.ioHandle().listen(backlog_size_); // Although onSocketEvent drains to completion, use level triggered mode to avoid potential @@ -114,15 +117,27 @@ TcpListenerImpl::TcpListenerImpl(Event::DispatcherImpl& dispatcher, Random::Rand SocketSharedPtr socket, TcpListenerCallbacks& cb, bool bind_to_port, uint32_t backlog_size) : BaseListenerImpl(dispatcher, std::move(socket)), cb_(cb), backlog_size_(backlog_size), - random_(random), reject_fraction_(0.0) { + random_(random), bind_to_port_(bind_to_port), reject_fraction_(0.0) { if (bind_to_port) { setupServerSocket(dispatcher, *socket_); } } -void TcpListenerImpl::enable() { socket_->ioHandle().enableFileEvents(Event::FileReadyType::Read); } +void TcpListenerImpl::enable() { + if (bind_to_port_) { + socket_->ioHandle().enableFileEvents(Event::FileReadyType::Read); + } else { + FANCY_LOG(debug, "The listener cannot be enabled since it's not bind to port."); + } +} -void TcpListenerImpl::disable() { socket_->ioHandle().enableFileEvents(0); } +void TcpListenerImpl::disable() { + if (bind_to_port_) { + socket_->ioHandle().enableFileEvents(0); + } else { + FANCY_LOG(debug, "The listener cannot be disable since it's not bind to port."); + } +} void TcpListenerImpl::setRejectFraction(const UnitFloat reject_fraction) { reject_fraction_ = reject_fraction; diff --git a/source/common/network/tcp_listener_impl.h b/source/common/network/tcp_listener_impl.h index fd66ffc60deea..bf5826038c844 100644 --- a/source/common/network/tcp_listener_impl.h +++ b/source/common/network/tcp_listener_impl.h @@ -3,7 +3,7 @@ #include "envoy/common/random_generator.h" #include "envoy/runtime/runtime.h" -#include "common/common/interval_value.h" +#include "source/common/common/interval_value.h" #include "absl/strings/string_view.h" #include "base_listener_impl.h" @@ -19,7 +19,11 @@ class TcpListenerImpl : public BaseListenerImpl { TcpListenerImpl(Event::DispatcherImpl& dispatcher, Random::RandomGenerator& random, SocketSharedPtr socket, TcpListenerCallbacks& cb, bool bind_to_port, uint32_t backlog_size); - ~TcpListenerImpl() override { socket_->ioHandle().resetFileEvents(); } + ~TcpListenerImpl() override { + if (bind_to_port_) { + socket_->ioHandle().resetFileEvents(); + } + } void disable() override; void enable() override; void setRejectFraction(UnitFloat reject_fraction) override; @@ -40,6 +44,7 @@ class TcpListenerImpl : public BaseListenerImpl { static bool rejectCxOverGlobalLimit(); Random::RandomGenerator& random_; + bool bind_to_port_; UnitFloat reject_fraction_; }; diff --git a/source/common/network/transport_socket_options_impl.cc b/source/common/network/transport_socket_options_impl.cc index 739bb3011d58e..2950a918cd22a 100644 --- a/source/common/network/transport_socket_options_impl.cc +++ b/source/common/network/transport_socket_options_impl.cc @@ -1,4 +1,4 @@ -#include "common/network/transport_socket_options_impl.h" +#include "source/common/network/transport_socket_options_impl.h" #include #include @@ -6,12 +6,12 @@ #include #include -#include "common/common/scalar_to_byte_vector.h" -#include "common/common/utility.h" -#include "common/network/application_protocol.h" -#include "common/network/proxy_protocol_filter_state.h" -#include "common/network/upstream_server_name.h" -#include "common/network/upstream_subject_alt_names.h" +#include "source/common/common/scalar_to_byte_vector.h" +#include "source/common/common/utility.h" +#include "source/common/network/application_protocol.h" +#include "source/common/network/proxy_protocol_filter_state.h" +#include "source/common/network/upstream_server_name.h" +#include "source/common/network/upstream_subject_alt_names.h" namespace Envoy { namespace Network { diff --git a/source/common/network/udp_listener_impl.cc b/source/common/network/udp_listener_impl.cc index 940ae25f9073f..44179ec4b0e52 100644 --- a/source/common/network/udp_listener_impl.cc +++ b/source/common/network/udp_listener_impl.cc @@ -1,4 +1,4 @@ -#include "common/network/udp_listener_impl.h" +#include "source/common/network/udp_listener_impl.h" #include #include @@ -10,13 +10,13 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/network/exception.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/event/dispatcher_impl.h" -#include "common/network/address_impl.h" -#include "common/network/io_socket_error_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/io_socket_error_impl.h" #include "absl/container/fixed_array.h" #include "event2/listener.h" diff --git a/source/common/network/udp_listener_impl.h b/source/common/network/udp_listener_impl.h index afd78713eb896..e6bd28c82ba21 100644 --- a/source/common/network/udp_listener_impl.h +++ b/source/common/network/udp_listener_impl.h @@ -4,10 +4,10 @@ #include "envoy/common/time.h" -#include "common/buffer/buffer_impl.h" -#include "common/event/event_impl_base.h" -#include "common/event/file_event_impl.h" -#include "common/network/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/event/event_impl_base.h" +#include "source/common/event/file_event_impl.h" +#include "source/common/network/utility.h" #include "base_listener_impl.h" diff --git a/source/common/network/udp_packet_writer_handler_impl.cc b/source/common/network/udp_packet_writer_handler_impl.cc index 27d499268e28a..cb0e8991e0ae9 100644 --- a/source/common/network/udp_packet_writer_handler_impl.cc +++ b/source/common/network/udp_packet_writer_handler_impl.cc @@ -1,7 +1,7 @@ -#include "common/network/udp_packet_writer_handler_impl.h" +#include "source/common/network/udp_packet_writer_handler_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Network { diff --git a/source/common/network/udp_packet_writer_handler_impl.h b/source/common/network/udp_packet_writer_handler_impl.h index 16182d79fb6c7..7162195d85834 100644 --- a/source/common/network/udp_packet_writer_handler_impl.h +++ b/source/common/network/udp_packet_writer_handler_impl.h @@ -4,7 +4,7 @@ #include "envoy/network/socket.h" #include "envoy/network/udp_packet_writer_handler.h" -#include "common/network/io_socket_error_impl.h" +#include "source/common/network/io_socket_error_impl.h" namespace Envoy { namespace Network { diff --git a/source/common/network/upstream_server_name.cc b/source/common/network/upstream_server_name.cc index d4bd93a94dc15..c6bc2559679eb 100644 --- a/source/common/network/upstream_server_name.cc +++ b/source/common/network/upstream_server_name.cc @@ -1,6 +1,6 @@ -#include "common/network/upstream_server_name.h" +#include "source/common/network/upstream_server_name.h" -#include "common/common/macros.h" +#include "source/common/common/macros.h" namespace Envoy { namespace Network { diff --git a/source/common/network/upstream_socket_options_filter_state.cc b/source/common/network/upstream_socket_options_filter_state.cc index 9ab637f05a34b..3ef5627482342 100644 --- a/source/common/network/upstream_socket_options_filter_state.cc +++ b/source/common/network/upstream_socket_options_filter_state.cc @@ -1,6 +1,6 @@ -#include "common/network/upstream_socket_options_filter_state.h" +#include "source/common/network/upstream_socket_options_filter_state.h" -#include "common/common/macros.h" +#include "source/common/common/macros.h" namespace Envoy { namespace Network { diff --git a/source/common/network/upstream_subject_alt_names.cc b/source/common/network/upstream_subject_alt_names.cc index 341f47e454e2c..df8aa9adb1842 100644 --- a/source/common/network/upstream_subject_alt_names.cc +++ b/source/common/network/upstream_subject_alt_names.cc @@ -1,6 +1,6 @@ -#include "common/network/upstream_subject_alt_names.h" +#include "source/common/network/upstream_subject_alt_names.h" -#include "common/common/macros.h" +#include "source/common/common/macros.h" namespace Envoy { namespace Network { diff --git a/source/common/network/utility.cc b/source/common/network/utility.cc index c2c58af71c086..df7c966232df1 100644 --- a/source/common/network/utility.cc +++ b/source/common/network/utility.cc @@ -1,4 +1,4 @@ -#include "common/network/utility.h" +#include "source/common/network/utility.h" #include #include @@ -13,17 +13,17 @@ #include "envoy/config/core/v3/address.pb.h" #include "envoy/network/connection.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/cleanup.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/network/io_socket_error_impl.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_features.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/io_socket_error_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_features.h" #include "absl/container/fixed_array.h" #include "absl/strings/match.h" diff --git a/source/common/network/win32_redirect_records_option_impl.cc b/source/common/network/win32_redirect_records_option_impl.cc index a1dafb5ac8457..2786e85df1140 100644 --- a/source/common/network/win32_redirect_records_option_impl.cc +++ b/source/common/network/win32_redirect_records_option_impl.cc @@ -1,13 +1,13 @@ -#include "common/network/win32_redirect_records_option_impl.h" +#include "source/common/network/win32_redirect_records_option_impl.h" #include "envoy/common/exception.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/common/scalar_to_byte_vector.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/scalar_to_byte_vector.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" namespace Envoy { namespace Network { diff --git a/source/common/network/win32_redirect_records_option_impl.h b/source/common/network/win32_redirect_records_option_impl.h index febf71846f3a9..3fbe5f6fc5855 100644 --- a/source/common/network/win32_redirect_records_option_impl.h +++ b/source/common/network/win32_redirect_records_option_impl.h @@ -5,8 +5,8 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/network/listen_socket.h" -#include "common/common/assert.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Network { diff --git a/source/common/profiler/profiler.cc b/source/common/profiler/profiler.cc index b3ef32ca832ba..fdf9244751216 100644 --- a/source/common/profiler/profiler.cc +++ b/source/common/profiler/profiler.cc @@ -1,4 +1,4 @@ -#include "common/profiler/profiler.h" +#include "source/common/profiler/profiler.h" #include diff --git a/source/common/protobuf/BUILD b/source/common/protobuf/BUILD index d8f3c67a06c95..64bfefa6c0031 100644 --- a/source/common/protobuf/BUILD +++ b/source/common/protobuf/BUILD @@ -32,8 +32,8 @@ envoy_cc_library( hdrs = ["message_validator_impl.h"], external_deps = ["protobuf"], deps = [ - "//include/envoy/protobuf:message_validator_interface", - "//include/envoy/stats:stats_interface", + "//envoy/protobuf:message_validator_interface", + "//envoy/stats:stats_interface", "//source/common/common:documentation_url_lib", "//source/common/common:hash_lib", "//source/common/common:logger_lib", @@ -62,9 +62,9 @@ envoy_cc_library( ":message_validator_lib", ":protobuf", ":well_known_lib", - "//include/envoy/api:api_interface", - "//include/envoy/protobuf:message_validator_interface", - "//include/envoy/runtime:runtime_interface", + "//envoy/api:api_interface", + "//envoy/protobuf:message_validator_interface", + "//envoy/runtime:runtime_interface", "//source/common/common:assert_lib", "//source/common/common:documentation_url_lib", "//source/common/common:hash_lib", diff --git a/source/common/protobuf/message_validator_impl.cc b/source/common/protobuf/message_validator_impl.cc index c486f9d0d4ecd..2d9d3dbb334ce 100644 --- a/source/common/protobuf/message_validator_impl.cc +++ b/source/common/protobuf/message_validator_impl.cc @@ -1,10 +1,10 @@ -#include "common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/message_validator_impl.h" #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/hash.h" -#include "common/common/macros.h" +#include "source/common/common/assert.h" +#include "source/common/common/hash.h" +#include "source/common/common/macros.h" #include "absl/strings/str_cat.h" diff --git a/source/common/protobuf/message_validator_impl.h b/source/common/protobuf/message_validator_impl.h index 54644f49b8430..865fc7e8ee559 100644 --- a/source/common/protobuf/message_validator_impl.h +++ b/source/common/protobuf/message_validator_impl.h @@ -3,8 +3,8 @@ #include "envoy/protobuf/message_validator.h" #include "envoy/stats/stats.h" -#include "common/common/documentation_url.h" -#include "common/common/logger.h" +#include "source/common/common/documentation_url.h" +#include "source/common/common/logger.h" #include "absl/container/flat_hash_set.h" diff --git a/source/common/protobuf/utility.cc b/source/common/protobuf/utility.cc index 806aca2aec969..543e8cf7a99f2 100644 --- a/source/common/protobuf/utility.cc +++ b/source/common/protobuf/utility.cc @@ -1,4 +1,4 @@ -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" #include #include @@ -7,16 +7,16 @@ #include "envoy/protobuf/message_validator.h" #include "envoy/type/v3/percent.pb.h" -#include "common/common/assert.h" -#include "common/common/documentation_url.h" -#include "common/common/fmt.h" -#include "common/config/api_type_oracle.h" -#include "common/config/version_converter.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/visitor.h" -#include "common/protobuf/well_known.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/assert.h" +#include "source/common/common/documentation_url.h" +#include "source/common/common/fmt.h" +#include "source/common/config/api_type_oracle.h" +#include "source/common/config/version_converter.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/visitor.h" +#include "source/common/protobuf/well_known.h" +#include "source/common/runtime/runtime_features.h" #include "absl/strings/match.h" #include "udpa/annotations/sensitive.pb.h" diff --git a/source/common/protobuf/utility.h b/source/common/protobuf/utility.h index 2feee5bcadb2f..0ba43337a8344 100644 --- a/source/common/protobuf/utility.h +++ b/source/common/protobuf/utility.h @@ -8,12 +8,12 @@ #include "envoy/runtime/runtime.h" #include "envoy/type/v3/percent.pb.h" -#include "common/common/hash.h" -#include "common/common/stl_helpers.h" -#include "common/common/utility.h" -#include "common/config/version_converter.h" -#include "common/protobuf/protobuf.h" -#include "common/singleton/const_singleton.h" +#include "source/common/common/hash.h" +#include "source/common/common/stl_helpers.h" +#include "source/common/common/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/singleton/const_singleton.h" #include "absl/strings/str_join.h" diff --git a/source/common/protobuf/visitor.cc b/source/common/protobuf/visitor.cc index d978f964ff0fb..ed6d0b6857d9a 100644 --- a/source/common/protobuf/visitor.cc +++ b/source/common/protobuf/visitor.cc @@ -1,4 +1,4 @@ -#include "common/protobuf/visitor.h" +#include "source/common/protobuf/visitor.h" namespace Envoy { namespace ProtobufMessage { diff --git a/source/common/protobuf/visitor.h b/source/common/protobuf/visitor.h index 93ec07af93b71..129f5e52d4743 100644 --- a/source/common/protobuf/visitor.h +++ b/source/common/protobuf/visitor.h @@ -1,6 +1,6 @@ #pragma once -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace ProtobufMessage { diff --git a/source/common/quic/BUILD b/source/common/quic/BUILD index ba0c0401ea00c..84352360f91df 100644 --- a/source/common/quic/BUILD +++ b/source/common/quic/BUILD @@ -18,8 +18,8 @@ envoy_cc_library( external_deps = ["quiche_quic_platform"], tags = ["nofips"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", "@com_googlesource_quiche//:quic_core_alarm_lib", "@com_googlesource_quiche//:quic_core_clock_lib", ], @@ -51,6 +51,19 @@ envoy_cc_library( ], ) +envoy_cc_library( + name = "quic_stat_names_lib", + srcs = ["quic_stat_names.cc"], + hdrs = ["quic_stat_names.h"], + tags = ["nofips"], + deps = [ + "//envoy/stats:stats_interface", + "//source/common/stats:symbol_table_lib", + "@com_googlesource_quiche//:quic_core_error_codes_lib", + "@com_googlesource_quiche//:quic_core_types_lib", + ], +) + envoy_cc_library( name = "envoy_quic_proof_source_base_lib", srcs = ["envoy_quic_proof_source_base.cc"], @@ -78,7 +91,7 @@ envoy_cc_library( ":envoy_quic_utils_lib", ":quic_io_handle_wrapper_lib", ":quic_transport_socket_factory_lib", - "//include/envoy/ssl:tls_certificate_config_interface", + "//envoy/ssl:tls_certificate_config_interface", "//source/server:connection_handler_lib", "@com_googlesource_quiche//:quic_core_crypto_certificate_view_lib", ], @@ -141,8 +154,8 @@ envoy_cc_library( ":envoy_quic_utils_lib", ":quic_filter_manager_connection_lib", ":send_buffer_monitor_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/http:codec_interface", + "//envoy/event:dispatcher_interface", + "//envoy/http:codec_interface", "//source/common/http:codec_helper_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], @@ -162,8 +175,8 @@ envoy_cc_library( ":envoy_quic_server_session_lib", ":envoy_quic_session_cache_lib", ":envoy_quic_utils_lib", - "//include/envoy/http:codec_interface", - "//include/envoy/registry", + "//envoy/http:codec_interface", + "//envoy/registry", "//source/common/http/http3:quic_client_connection_factory_lib", "//source/extensions/transport_sockets/tls:ssl_socket_lib", "@com_googlesource_quiche//:quic_core_http_spdy_session_lib", @@ -179,8 +192,8 @@ envoy_cc_library( ":envoy_quic_client_session_lib", ":envoy_quic_server_session_lib", ":envoy_quic_utils_lib", - "//include/envoy/http:codec_interface", - "//include/envoy/registry", + "//envoy/http:codec_interface", + "//envoy/registry", "@com_googlesource_quiche//:quic_core_http_spdy_session_lib", ], ) @@ -194,8 +207,8 @@ envoy_cc_library( ":envoy_quic_simulated_watermark_buffer_lib", ":quic_network_connection_lib", ":send_buffer_monitor_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:connection_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:connection_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:empty_string", @@ -262,7 +275,7 @@ envoy_cc_library( name = "quic_io_handle_wrapper_lib", hdrs = ["quic_io_handle_wrapper.h"], deps = [ - "//include/envoy/network:io_handle_interface", + "//envoy/network:io_handle_interface", "//source/common/network:io_socket_error_lib", ], ) @@ -273,7 +286,7 @@ envoy_cc_library( hdrs = ["quic_network_connection.h"], tags = ["nofips"], deps = [ - "//include/envoy/network:connection_interface", + "//envoy/network:connection_interface", "//source/common/network:listen_socket_lib", ], ) @@ -300,7 +313,7 @@ envoy_cc_library( deps = [ ":envoy_quic_packet_writer_lib", ":quic_network_connection_lib", - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "//source/common/network:socket_option_factory_lib", "//source/common/network:udp_packet_writer_handler_lib", "@com_googlesource_quiche//:quic_core_connection_lib", @@ -314,10 +327,11 @@ envoy_cc_library( hdrs = ["envoy_quic_dispatcher.h"], tags = ["nofips"], deps = [ + "quic_stat_names_lib", ":envoy_quic_proof_source_lib", ":envoy_quic_server_connection_lib", ":envoy_quic_server_session_lib", - "//include/envoy/network:listener_interface", + "//envoy/network:listener_interface", "//source/server:connection_handler_lib", "@com_googlesource_quiche//:quic_core_server_lib", "@com_googlesource_quiche//:quic_core_utils_lib", @@ -342,7 +356,7 @@ envoy_cc_library( ":envoy_quic_packet_writer_lib", ":envoy_quic_proof_source_lib", ":envoy_quic_utils_lib", - "//include/envoy/network:listener_interface", + "//envoy/network:listener_interface", "//source/common/network:listener_lib", "//source/common/protobuf:utility_lib", "//source/common/runtime:runtime_lib", @@ -361,7 +375,7 @@ envoy_cc_library( ], tags = ["nofips"], deps = [ - "//include/envoy/http:codec_interface", + "//envoy/http:codec_interface", "//source/common/http:header_map_lib", "//source/common/http:header_utility_lib", "//source/common/network:address_lib", @@ -381,9 +395,9 @@ envoy_cc_library( hdrs = ["quic_transport_socket_factory.h"], tags = ["nofips"], deps = [ - "//include/envoy/network:transport_socket_interface", - "//include/envoy/server:transport_socket_config_interface", - "//include/envoy/ssl:context_config_interface", + "//envoy/network:transport_socket_interface", + "//envoy/server:transport_socket_config_interface", + "//envoy/ssl:context_config_interface", "//source/common/common:assert_lib", "//source/extensions/transport_sockets/tls:context_config_lib", "//source/extensions/transport_sockets/tls:ssl_socket_lib", @@ -432,7 +446,7 @@ envoy_cc_library( tags = ["nofips"], deps = [ ":envoy_quic_utils_lib", - "//include/envoy/network:udp_packet_writer_handler_interface", + "//envoy/network:udp_packet_writer_handler_interface", "//source/common/network:io_socket_error_lib", "//source/common/protobuf:utility_lib", "//source/common/runtime:runtime_lib", diff --git a/source/common/quic/active_quic_listener.cc b/source/common/quic/active_quic_listener.cc index 75d32d5792cfe..835b371457f48 100644 --- a/source/common/quic/active_quic_listener.cc +++ b/source/common/quic/active_quic_listener.cc @@ -1,4 +1,4 @@ -#include "common/quic/active_quic_listener.h" +#include "source/common/quic/active_quic_listener.h" #include "envoy/network/exception.h" @@ -8,17 +8,17 @@ #include -#include "common/http/utility.h" -#include "common/network/socket_option_impl.h" -#include "common/quic/envoy_quic_alarm_factory.h" -#include "common/quic/envoy_quic_connection_helper.h" -#include "common/quic/envoy_quic_dispatcher.h" -#include "common/quic/envoy_quic_packet_writer.h" -#include "common/quic/envoy_quic_proof_source.h" -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/quic_network_connection.h" -#include "common/runtime/runtime_features.h" +#include "source/common/http/utility.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/quic/envoy_quic_alarm_factory.h" +#include "source/common/quic/envoy_quic_connection_helper.h" +#include "source/common/quic/envoy_quic_dispatcher.h" +#include "source/common/quic/envoy_quic_packet_writer.h" +#include "source/common/quic/envoy_quic_proof_source.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/quic_network_connection.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Quic { @@ -28,18 +28,18 @@ ActiveQuicListener::ActiveQuicListener( Network::UdpConnectionHandler& parent, Network::ListenerConfig& listener_config, const quic::QuicConfig& quic_config, Network::Socket::OptionsSharedPtr options, bool kernel_worker_routing, const envoy::config::core::v3::RuntimeFeatureFlag& enabled, - uint32_t packets_received_to_connection_count_ratio) + QuicStatNames& quic_stat_names, uint32_t packets_received_to_connection_count_ratio) : ActiveQuicListener(worker_index, concurrency, dispatcher, parent, listener_config.listenSocketFactory().getListenSocket(), listener_config, quic_config, std::move(options), kernel_worker_routing, enabled, - packets_received_to_connection_count_ratio) {} + quic_stat_names, packets_received_to_connection_count_ratio) {} ActiveQuicListener::ActiveQuicListener( uint32_t worker_index, uint32_t concurrency, Event::Dispatcher& dispatcher, Network::UdpConnectionHandler& parent, Network::SocketSharedPtr listen_socket, Network::ListenerConfig& listener_config, const quic::QuicConfig& quic_config, Network::Socket::OptionsSharedPtr options, bool kernel_worker_routing, - const envoy::config::core::v3::RuntimeFeatureFlag& enabled, + const envoy::config::core::v3::RuntimeFeatureFlag& enabled, QuicStatNames& quic_stat_names, uint32_t packets_to_read_to_connection_count_ratio) : Server::ActiveUdpListenerBase( worker_index, concurrency, parent, *listen_socket, @@ -87,7 +87,7 @@ ActiveQuicListener::ActiveQuicListener( quic_dispatcher_ = std::make_unique( crypto_config_.get(), quic_config, &version_manager_, std::move(connection_helper), std::move(alarm_factory), quic::kQuicDefaultConnectionIdLength, parent, *config_, stats_, - per_worker_stats_, dispatcher, listen_socket_); + per_worker_stats_, dispatcher, listen_socket_, quic_stat_names); // Create udp_packet_writer Network::UdpPacketWriterPtr udp_packet_writer = @@ -227,8 +227,9 @@ size_t ActiveQuicListener::numPacketsExpectedPerEventLoop() const { } ActiveQuicListenerFactory::ActiveQuicListenerFactory( - const envoy::config::listener::v3::QuicProtocolOptions& config, uint32_t concurrency) - : concurrency_(concurrency), enabled_(config.enabled()), + const envoy::config::listener::v3::QuicProtocolOptions& config, uint32_t concurrency, + QuicStatNames& quic_stat_names) + : concurrency_(concurrency), enabled_(config.enabled()), quic_stat_names_(quic_stat_names), packets_to_read_to_connection_count_ratio_( PROTOBUF_GET_WRAPPED_OR_DEFAULT(config, packets_to_read_to_connection_count_ratio, DEFAULT_PACKETS_TO_READ_PER_CONNECTION)) { @@ -314,9 +315,10 @@ Network::ConnectionHandler::ActiveUdpListenerPtr ActiveQuicListenerFactory::crea } #endif - return std::make_unique( - worker_index, concurrency_, disptacher, parent, config, quic_config_, std::move(options), - kernel_worker_routing, enabled_, packets_to_read_to_connection_count_ratio_); + return std::make_unique(worker_index, concurrency_, disptacher, parent, + config, quic_config_, std::move(options), + kernel_worker_routing, enabled_, quic_stat_names_, + packets_to_read_to_connection_count_ratio_); } // namespace Quic } // namespace Quic diff --git a/source/common/quic/active_quic_listener.h b/source/common/quic/active_quic_listener.h index 7c2264d2da9e1..44ec98bb7c939 100644 --- a/source/common/quic/active_quic_listener.h +++ b/source/common/quic/active_quic_listener.h @@ -6,12 +6,11 @@ #include "envoy/network/socket.h" #include "envoy/runtime/runtime.h" -#include "common/protobuf/utility.h" -#include "common/quic/envoy_quic_dispatcher.h" -#include "common/runtime/runtime_protos.h" - -#include "server/active_udp_listener.h" -#include "server/connection_handler_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/quic/envoy_quic_dispatcher.h" +#include "source/common/runtime/runtime_protos.h" +#include "source/server/active_udp_listener.h" +#include "source/server/connection_handler_impl.h" namespace Envoy { namespace Quic { @@ -29,6 +28,7 @@ class ActiveQuicListener : public Envoy::Server::ActiveUdpListenerBase, Network::ListenerConfig& listener_config, const quic::QuicConfig& quic_config, Network::Socket::OptionsSharedPtr options, bool kernel_worker_routing, const envoy::config::core::v3::RuntimeFeatureFlag& enabled, + QuicStatNames& quic_stat_names, uint32_t packets_to_read_to_connection_count_ratio); ActiveQuicListener(uint32_t worker_index, uint32_t concurrency, Event::Dispatcher& dispatcher, @@ -36,6 +36,7 @@ class ActiveQuicListener : public Envoy::Server::ActiveUdpListenerBase, Network::ListenerConfig& listener_config, const quic::QuicConfig& quic_config, Network::Socket::OptionsSharedPtr options, bool kernel_worker_routing, const envoy::config::core::v3::RuntimeFeatureFlag& enabled, + QuicStatNames& quic_stat_names, uint32_t packets_to_read_to_connection_count_ratio); ~ActiveQuicListener() override; @@ -87,7 +88,7 @@ class ActiveQuicListenerFactory : public Network::ActiveUdpListenerFactory, Logger::Loggable { public: ActiveQuicListenerFactory(const envoy::config::listener::v3::QuicProtocolOptions& config, - uint32_t concurrency); + uint32_t concurrency, QuicStatNames& quic_stat_names); // Network::ActiveUdpListenerFactory. Network::ConnectionHandler::ActiveUdpListenerPtr @@ -102,6 +103,7 @@ class ActiveQuicListenerFactory : public Network::ActiveUdpListenerFactory, const uint32_t concurrency_; absl::once_flag install_bpf_once_; envoy::config::core::v3::RuntimeFeatureFlag enabled_; + QuicStatNames& quic_stat_names_; const uint32_t packets_to_read_to_connection_count_ratio_; }; diff --git a/source/common/quic/client_connection_factory_impl.cc b/source/common/quic/client_connection_factory_impl.cc index fcc871f382670..8d3519b630ac4 100644 --- a/source/common/quic/client_connection_factory_impl.cc +++ b/source/common/quic/client_connection_factory_impl.cc @@ -1,7 +1,7 @@ -#include "common/quic/client_connection_factory_impl.h" +#include "source/common/quic/client_connection_factory_impl.h" -#include "common/quic/envoy_quic_session_cache.h" -#include "common/quic/quic_transport_socket_factory.h" +#include "source/common/quic/envoy_quic_session_cache.h" +#include "source/common/quic/quic_transport_socket_factory.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/client_connection_factory_impl.h b/source/common/quic/client_connection_factory_impl.h index 991249bebee47..ca66d75725562 100644 --- a/source/common/quic/client_connection_factory_impl.h +++ b/source/common/quic/client_connection_factory_impl.h @@ -1,13 +1,12 @@ #pragma once -#include "common/http/http3/quic_client_connection_factory.h" -#include "common/quic/envoy_quic_alarm_factory.h" -#include "common/quic/envoy_quic_client_session.h" -#include "common/quic/envoy_quic_connection_helper.h" -#include "common/quic/envoy_quic_proof_verifier.h" -#include "common/quic/envoy_quic_utils.h" - -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/http/http3/quic_client_connection_factory.h" +#include "source/common/quic/envoy_quic_alarm_factory.h" +#include "source/common/quic/envoy_quic_client_session.h" +#include "source/common/quic/envoy_quic_connection_helper.h" +#include "source/common/quic/envoy_quic_proof_verifier.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "quiche/quic/core/http/quic_client_push_promise_index.h" #include "quiche/quic/core/quic_utils.h" diff --git a/source/common/quic/codec_impl.cc b/source/common/quic/codec_impl.cc index 6ec3c355e0232..546ea7ee0c193 100644 --- a/source/common/quic/codec_impl.cc +++ b/source/common/quic/codec_impl.cc @@ -1,7 +1,7 @@ -#include "common/quic/codec_impl.h" +#include "source/common/quic/codec_impl.h" -#include "common/quic/envoy_quic_client_stream.h" -#include "common/quic/envoy_quic_server_stream.h" +#include "source/common/quic/envoy_quic_client_stream.h" +#include "source/common/quic/envoy_quic_server_stream.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/codec_impl.h b/source/common/quic/codec_impl.h index 1dca7b65931ab..7faed7d94136f 100644 --- a/source/common/quic/codec_impl.h +++ b/source/common/quic/codec_impl.h @@ -3,10 +3,10 @@ #include "envoy/http/codec.h" #include "envoy/registry/registry.h" -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/quic/envoy_quic_client_session.h" -#include "common/quic/envoy_quic_server_session.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/quic/envoy_quic_client_session.h" +#include "source/common/quic/envoy_quic_server_session.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_alarm.cc b/source/common/quic/envoy_quic_alarm.cc index a5c123be556f0..780a3cbfcf11c 100644 --- a/source/common/quic/envoy_quic_alarm.cc +++ b/source/common/quic/envoy_quic_alarm.cc @@ -1,4 +1,4 @@ -#include "common/quic/envoy_quic_alarm.h" +#include "source/common/quic/envoy_quic_alarm.h" #include diff --git a/source/common/quic/envoy_quic_alarm.h b/source/common/quic/envoy_quic_alarm.h index ec56eafa6fff0..fdbdc2031716a 100644 --- a/source/common/quic/envoy_quic_alarm.h +++ b/source/common/quic/envoy_quic_alarm.h @@ -3,7 +3,7 @@ #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "quiche/quic/core/quic_alarm.h" #include "quiche/quic/core/quic_clock.h" diff --git a/source/common/quic/envoy_quic_alarm_factory.cc b/source/common/quic/envoy_quic_alarm_factory.cc index 8f285650ece2d..865370c355da0 100644 --- a/source/common/quic/envoy_quic_alarm_factory.cc +++ b/source/common/quic/envoy_quic_alarm_factory.cc @@ -1,4 +1,4 @@ -#include "common/quic/envoy_quic_alarm_factory.h" +#include "source/common/quic/envoy_quic_alarm_factory.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_alarm_factory.h b/source/common/quic/envoy_quic_alarm_factory.h index 8a185b0c6d239..ca491b2005ece 100644 --- a/source/common/quic/envoy_quic_alarm_factory.h +++ b/source/common/quic/envoy_quic_alarm_factory.h @@ -1,7 +1,7 @@ #pragma once -#include "common/common/non_copyable.h" -#include "common/quic/envoy_quic_alarm.h" +#include "source/common/common/non_copyable.h" +#include "source/common/quic/envoy_quic_alarm.h" #if defined(__GNUC__) #pragma GCC diagnostic push diff --git a/source/common/quic/envoy_quic_client_connection.cc b/source/common/quic/envoy_quic_client_connection.cc index ac30a8d8b9cf1..2b15f236b757a 100644 --- a/source/common/quic/envoy_quic_client_connection.cc +++ b/source/common/quic/envoy_quic_client_connection.cc @@ -1,14 +1,14 @@ -#include "common/quic/envoy_quic_client_connection.h" +#include "source/common/quic/envoy_quic_client_connection.h" #include #include "envoy/config/core/v3/base.pb.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/udp_packet_writer_handler_impl.h" -#include "common/quic/envoy_quic_packet_writer.h" -#include "common/quic/envoy_quic_utils.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/udp_packet_writer_handler_impl.h" +#include "source/common/quic/envoy_quic_packet_writer.h" +#include "source/common/quic/envoy_quic_utils.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_client_connection.h b/source/common/quic/envoy_quic_client_connection.h index 21000adce734c..dbf6fc23f3f69 100644 --- a/source/common/quic/envoy_quic_client_connection.h +++ b/source/common/quic/envoy_quic_client_connection.h @@ -2,9 +2,9 @@ #include "envoy/event/dispatcher.h" -#include "common/network/utility.h" -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/quic_network_connection.h" +#include "source/common/network/utility.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/quic_network_connection.h" #if defined(__GNUC__) #pragma GCC diagnostic push diff --git a/source/common/quic/envoy_quic_client_session.cc b/source/common/quic/envoy_quic_client_session.cc index 0763a5f009322..8910d62e8eb32 100644 --- a/source/common/quic/envoy_quic_client_session.cc +++ b/source/common/quic/envoy_quic_client_session.cc @@ -1,6 +1,6 @@ -#include "common/quic/envoy_quic_client_session.h" +#include "source/common/quic/envoy_quic_client_session.h" -#include "common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_utils.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_client_session.h b/source/common/quic/envoy_quic_client_session.h index c4fe12ffd7062..29da91ad1a0be 100644 --- a/source/common/quic/envoy_quic_client_session.h +++ b/source/common/quic/envoy_quic_client_session.h @@ -13,9 +13,9 @@ #pragma GCC diagnostic pop #endif -#include "common/quic/envoy_quic_client_stream.h" -#include "common/quic/envoy_quic_client_connection.h" -#include "common/quic/quic_filter_manager_connection_impl.h" +#include "source/common/quic/envoy_quic_client_stream.h" +#include "source/common/quic/envoy_quic_client_connection.h" +#include "source/common/quic/quic_filter_manager_connection_impl.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_client_stream.cc b/source/common/quic/envoy_quic_client_stream.cc index 1098a39b79fd5..10cde85e31e10 100644 --- a/source/common/quic/envoy_quic_client_stream.cc +++ b/source/common/quic/envoy_quic_client_stream.cc @@ -1,4 +1,4 @@ -#include "common/quic/envoy_quic_client_stream.h" +#include "source/common/quic/envoy_quic_client_stream.h" #if defined(__GNUC__) #pragma GCC diagnostic push @@ -9,22 +9,22 @@ #include "quiche/quic/core/quic_session.h" #include "quiche/quic/core/http/quic_header_list.h" #include "quiche/spdy/core/spdy_header_block.h" -#include "common/quic/platform/quic_mem_slice_span_impl.h" +#include "source/common/quic/platform/quic_mem_slice_span_impl.h" #if defined(__GNUC__) #pragma GCC diagnostic pop #endif -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/envoy_quic_client_session.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_client_session.h" -#include "common/buffer/buffer_impl.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/header_utility.h" -#include "common/http/utility.h" -#include "common/common/enum_to_int.h" -#include "common/common/assert.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/utility.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Quic { @@ -58,7 +58,7 @@ Http::Status EnvoyQuicClientStream::encodeHeaders(const Http::RequestHeaderMap& bool end_stream) { // Required headers must be present. This can only happen by some erroneous processing after the // downstream codecs decode. - RETURN_IF_ERROR(Http::HeaderUtility::checkRequiredHeaders(headers)); + RETURN_IF_ERROR(Http::HeaderUtility::checkRequiredRequestHeaders(headers)); ENVOY_STREAM_LOG(debug, "encodeHeaders: (end_stream={}) {}.", *this, end_stream, headers); local_end_stream_ = end_stream; diff --git a/source/common/quic/envoy_quic_client_stream.h b/source/common/quic/envoy_quic_client_stream.h index b7e3f21d0d05f..0e82d8622319e 100644 --- a/source/common/quic/envoy_quic_client_stream.h +++ b/source/common/quic/envoy_quic_client_stream.h @@ -14,7 +14,7 @@ #pragma GCC diagnostic pop #endif -#include "common/quic/envoy_quic_stream.h" +#include "source/common/quic/envoy_quic_stream.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_connection_helper.h b/source/common/quic/envoy_quic_connection_helper.h index 8772e1ef0ab16..a8d8ba2bbc949 100644 --- a/source/common/quic/envoy_quic_connection_helper.h +++ b/source/common/quic/envoy_quic_connection_helper.h @@ -15,7 +15,7 @@ #pragma GCC diagnostic pop #endif -#include "common/quic/platform/envoy_quic_clock.h" +#include "source/common/quic/platform/envoy_quic_clock.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_dispatcher.cc b/source/common/quic/envoy_quic_dispatcher.cc index 4191e80d4d793..95709319823aa 100644 --- a/source/common/quic/envoy_quic_dispatcher.cc +++ b/source/common/quic/envoy_quic_dispatcher.cc @@ -1,10 +1,10 @@ -#include "common/quic/envoy_quic_dispatcher.h" +#include "source/common/quic/envoy_quic_dispatcher.h" -#include "common/common/safe_memcpy.h" -#include "common/http/utility.h" -#include "common/quic/envoy_quic_server_connection.h" -#include "common/quic/envoy_quic_server_session.h" -#include "common/quic/envoy_quic_utils.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/http/utility.h" +#include "source/common/quic/envoy_quic_server_connection.h" +#include "source/common/quic/envoy_quic_server_session.h" +#include "source/common/quic/envoy_quic_utils.h" namespace Envoy { namespace Quic { @@ -17,13 +17,13 @@ EnvoyQuicDispatcher::EnvoyQuicDispatcher( uint8_t expected_server_connection_id_length, Network::ConnectionHandler& connection_handler, Network::ListenerConfig& listener_config, Server::ListenerStats& listener_stats, Server::PerHandlerListenerStats& per_worker_stats, Event::Dispatcher& dispatcher, - Network::Socket& listen_socket) + Network::Socket& listen_socket, QuicStatNames& quic_stat_names) : quic::QuicDispatcher(&quic_config, crypto_config, version_manager, std::move(helper), std::make_unique(), std::move(alarm_factory), expected_server_connection_id_length), connection_handler_(connection_handler), listener_config_(listener_config), listener_stats_(listener_stats), per_worker_stats_(per_worker_stats), dispatcher_(dispatcher), - listen_socket_(listen_socket) { + listen_socket_(listen_socket), quic_stat_names_(quic_stat_names) { // Set send buffer twice of max flow control window to ensure that stream send // buffer always takes all the data. // The max amount of data buffered is the per-stream high watermark + the max @@ -46,6 +46,8 @@ void EnvoyQuicDispatcher::OnConnectionClosed(quic::QuicConnectionId connection_i listener_stats_.downstream_cx_active_.dec(); per_worker_stats_.downstream_cx_active_.dec(); connection_handler_.decNumConnections(); + quic_stat_names_.chargeQuicConnectionCloseStats(listener_config_.listenerScope(), error, source, + /*is_upstream*/ false); } std::unique_ptr EnvoyQuicDispatcher::CreateQuicSession( diff --git a/source/common/quic/envoy_quic_dispatcher.h b/source/common/quic/envoy_quic_dispatcher.h index 987dd2b450651..caa259329dc99 100644 --- a/source/common/quic/envoy_quic_dispatcher.h +++ b/source/common/quic/envoy_quic_dispatcher.h @@ -17,8 +17,9 @@ #include #include "envoy/network/listener.h" -#include "server/connection_handler_impl.h" -#include "server/active_listener_base.h" +#include "source/server/connection_handler_impl.h" +#include "source/server/active_listener_base.h" +#include "source/common/quic/quic_stat_names.h" namespace Envoy { namespace Quic { @@ -43,17 +44,15 @@ class EnvoyQuicCryptoServerStreamHelper : public quic::QuicCryptoServerStreamBas class EnvoyQuicDispatcher : public quic::QuicDispatcher { public: - EnvoyQuicDispatcher(const quic::QuicCryptoServerConfig* crypto_config, - const quic::QuicConfig& quic_config, - quic::QuicVersionManager* version_manager, - std::unique_ptr helper, - std::unique_ptr alarm_factory, - uint8_t expected_server_connection_id_length, - Network::ConnectionHandler& connection_handler, - Network::ListenerConfig& listener_config, - Server::ListenerStats& listener_stats, - Server::PerHandlerListenerStats& per_worker_stats, - Event::Dispatcher& dispatcher, Network::Socket& listen_socket); + EnvoyQuicDispatcher( + const quic::QuicCryptoServerConfig* crypto_config, const quic::QuicConfig& quic_config, + quic::QuicVersionManager* version_manager, + std::unique_ptr helper, + std::unique_ptr alarm_factory, + uint8_t expected_server_connection_id_length, Network::ConnectionHandler& connection_handler, + Network::ListenerConfig& listener_config, Server::ListenerStats& listener_stats, + Server::PerHandlerListenerStats& per_worker_stats, Event::Dispatcher& dispatcher, + Network::Socket& listen_socket, QuicStatNames& quic_stat_names); void OnConnectionClosed(quic::QuicConnectionId connection_id, quic::QuicErrorCode error, const std::string& error_details, @@ -81,6 +80,7 @@ class EnvoyQuicDispatcher : public quic::QuicDispatcher { Server::PerHandlerListenerStats& per_worker_stats_; Event::Dispatcher& dispatcher_; Network::Socket& listen_socket_; + QuicStatNames& quic_stat_names_; }; } // namespace Quic diff --git a/source/common/quic/envoy_quic_packet_writer.cc b/source/common/quic/envoy_quic_packet_writer.cc index 9c125b6c3b772..5ee3b5da3a57f 100644 --- a/source/common/quic/envoy_quic_packet_writer.cc +++ b/source/common/quic/envoy_quic_packet_writer.cc @@ -1,8 +1,8 @@ -#include "common/quic/envoy_quic_packet_writer.h" +#include "source/common/quic/envoy_quic_packet_writer.h" #include -#include "common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_utils.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_proof_source.cc b/source/common/quic/envoy_quic_proof_source.cc index e1b7673596d7d..c9ee45eb12000 100644 --- a/source/common/quic/envoy_quic_proof_source.cc +++ b/source/common/quic/envoy_quic_proof_source.cc @@ -1,11 +1,11 @@ -#include "common/quic/envoy_quic_proof_source.h" +#include "source/common/quic/envoy_quic_proof_source.h" #include #include "envoy/ssl/tls_certificate_config.h" -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/quic_io_handle_wrapper.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/quic_io_handle_wrapper.h" #include "openssl/bytestring.h" #include "quiche/quic/core/crypto/certificate_view.h" diff --git a/source/common/quic/envoy_quic_proof_source.h b/source/common/quic/envoy_quic_proof_source.h index 97c2120870b75..fcf388c609140 100644 --- a/source/common/quic/envoy_quic_proof_source.h +++ b/source/common/quic/envoy_quic_proof_source.h @@ -1,10 +1,9 @@ #pragma once -#include "common/quic/envoy_quic_proof_source_base.h" -#include "common/quic/quic_transport_socket_factory.h" - -#include "server/active_listener_base.h" -#include "server/connection_handler_impl.h" +#include "source/common/quic/envoy_quic_proof_source_base.h" +#include "source/common/quic/quic_transport_socket_factory.h" +#include "source/server/active_listener_base.h" +#include "source/server/connection_handler_impl.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_proof_source_base.cc b/source/common/quic/envoy_quic_proof_source_base.cc index 79cfa0c3171f9..f6adb247d95ed 100644 --- a/source/common/quic/envoy_quic_proof_source_base.cc +++ b/source/common/quic/envoy_quic_proof_source_base.cc @@ -1,4 +1,4 @@ -#include "common/quic/envoy_quic_proof_source_base.h" +#include "source/common/quic/envoy_quic_proof_source_base.h" #if defined(__GNUC__) #pragma GCC diagnostic push @@ -11,7 +11,7 @@ #pragma GCC diagnostic pop #endif -#include "common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_utils.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_proof_source_base.h b/source/common/quic/envoy_quic_proof_source_base.h index 22de52a0ce5e9..f963edec26e5a 100644 --- a/source/common/quic/envoy_quic_proof_source_base.h +++ b/source/common/quic/envoy_quic_proof_source_base.h @@ -2,7 +2,7 @@ #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/strings/str_cat.h" @@ -23,7 +23,7 @@ #include "openssl/ssl.h" #include "envoy/network/filter.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_proof_verifier.cc b/source/common/quic/envoy_quic_proof_verifier.cc index 2e79eeb7ef7c1..2a4b80c76e1aa 100644 --- a/source/common/quic/envoy_quic_proof_verifier.cc +++ b/source/common/quic/envoy_quic_proof_verifier.cc @@ -1,8 +1,7 @@ -#include "common/quic/envoy_quic_proof_verifier.h" +#include "source/common/quic/envoy_quic_proof_verifier.h" -#include "common/quic/envoy_quic_utils.h" - -#include "extensions/transport_sockets/tls/cert_validator/default_validator.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h" #include "quiche/quic/core/crypto/certificate_view.h" diff --git a/source/common/quic/envoy_quic_proof_verifier.h b/source/common/quic/envoy_quic_proof_verifier.h index cdbfc70109b6a..6574ab434bd01 100644 --- a/source/common/quic/envoy_quic_proof_verifier.h +++ b/source/common/quic/envoy_quic_proof_verifier.h @@ -1,8 +1,7 @@ #pragma once -#include "common/quic/envoy_quic_proof_verifier_base.h" - -#include "extensions/transport_sockets/tls/context_impl.h" +#include "source/common/quic/envoy_quic_proof_verifier_base.h" +#include "source/extensions/transport_sockets/tls/context_impl.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_proof_verifier_base.cc b/source/common/quic/envoy_quic_proof_verifier_base.cc index cc880404bcfb0..7f791b0c3f103 100644 --- a/source/common/quic/envoy_quic_proof_verifier_base.cc +++ b/source/common/quic/envoy_quic_proof_verifier_base.cc @@ -1,6 +1,6 @@ -#include "common/quic/envoy_quic_proof_verifier_base.h" +#include "source/common/quic/envoy_quic_proof_verifier_base.h" -#include "common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_utils.h" #include "openssl/ssl.h" #include "quiche/quic/core/crypto/certificate_view.h" diff --git a/source/common/quic/envoy_quic_proof_verifier_base.h b/source/common/quic/envoy_quic_proof_verifier_base.h index f45736c7d19ad..e3835b917ddae 100644 --- a/source/common/quic/envoy_quic_proof_verifier_base.h +++ b/source/common/quic/envoy_quic_proof_verifier_base.h @@ -14,7 +14,7 @@ #pragma GCC diagnostic pop #endif -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_server_connection.cc b/source/common/quic/envoy_quic_server_connection.cc index f2bc90257dd85..c30cf02fcaa0f 100644 --- a/source/common/quic/envoy_quic_server_connection.cc +++ b/source/common/quic/envoy_quic_server_connection.cc @@ -1,8 +1,8 @@ -#include "common/quic/envoy_quic_server_connection.h" +#include "source/common/quic/envoy_quic_server_connection.h" -#include "common/network/listen_socket_impl.h" -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/quic_io_handle_wrapper.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/quic_io_handle_wrapper.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_server_connection.h b/source/common/quic/envoy_quic_server_connection.h index 04c1a4b8f80d9..7b188366cda4c 100644 --- a/source/common/quic/envoy_quic_server_connection.h +++ b/source/common/quic/envoy_quic_server_connection.h @@ -2,10 +2,9 @@ #include "envoy/network/listener.h" -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/quic_network_connection.h" - -#include "server/connection_handler_impl.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/quic_network_connection.h" +#include "source/server/connection_handler_impl.h" #if defined(__GNUC__) #pragma GCC diagnostic push diff --git a/source/common/quic/envoy_quic_server_session.cc b/source/common/quic/envoy_quic_server_session.cc index 44208d4fb3f34..0ad888aaf34ac 100644 --- a/source/common/quic/envoy_quic_server_session.cc +++ b/source/common/quic/envoy_quic_server_session.cc @@ -1,10 +1,10 @@ -#include "common/quic/envoy_quic_server_session.h" +#include "source/common/quic/envoy_quic_server_session.h" #include -#include "common/common/assert.h" -#include "common/quic/envoy_quic_proof_source.h" -#include "common/quic/envoy_quic_server_stream.h" +#include "source/common/common/assert.h" +#include "source/common/quic/envoy_quic_proof_source.h" +#include "source/common/quic/envoy_quic_server_stream.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_server_session.h b/source/common/quic/envoy_quic_server_session.h index b186cc3b2b53a..9eee2c94107ca 100644 --- a/source/common/quic/envoy_quic_server_session.h +++ b/source/common/quic/envoy_quic_server_session.h @@ -19,10 +19,10 @@ #include -#include "common/quic/send_buffer_monitor.h" -#include "common/quic/quic_filter_manager_connection_impl.h" -#include "common/quic/envoy_quic_server_connection.h" -#include "common/quic/envoy_quic_server_stream.h" +#include "source/common/quic/send_buffer_monitor.h" +#include "source/common/quic/quic_filter_manager_connection_impl.h" +#include "source/common/quic/envoy_quic_server_connection.h" +#include "source/common/quic/envoy_quic_server_stream.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_server_stream.cc b/source/common/quic/envoy_quic_server_stream.cc index 74b439e246253..e9fd4fd72d8c6 100644 --- a/source/common/quic/envoy_quic_server_stream.cc +++ b/source/common/quic/envoy_quic_server_stream.cc @@ -1,4 +1,4 @@ -#include "common/quic/envoy_quic_server_stream.h" +#include "source/common/quic/envoy_quic_server_stream.h" #include #include @@ -14,19 +14,19 @@ #include "quiche/quic/core/http/quic_header_list.h" #include "quiche/quic/core/quic_session.h" #include "quiche/spdy/core/spdy_header_block.h" -#include "common/quic/platform/quic_mem_slice_span_impl.h" +#include "source/common/quic/platform/quic_mem_slice_span_impl.h" #if defined(__GNUC__) #pragma GCC diagnostic pop #endif -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/envoy_quic_server_session.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_server_session.h" -#include "common/buffer/buffer_impl.h" -#include "common/http/header_map_impl.h" -#include "common/common/assert.h" -#include "common/http/header_utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/common/assert.h" +#include "source/common/http/header_utility.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_server_stream.h b/source/common/quic/envoy_quic_server_stream.h index ac44a083b1f4b..e0b98e835fdad 100644 --- a/source/common/quic/envoy_quic_server_stream.h +++ b/source/common/quic/envoy_quic_server_stream.h @@ -12,7 +12,7 @@ #pragma GCC diagnostic pop #endif -#include "common/quic/envoy_quic_stream.h" +#include "source/common/quic/envoy_quic_stream.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_session_cache.cc b/source/common/quic/envoy_quic_session_cache.cc index 7404f132f1537..b6ce80f7717c6 100644 --- a/source/common/quic/envoy_quic_session_cache.cc +++ b/source/common/quic/envoy_quic_session_cache.cc @@ -1,4 +1,4 @@ -#include "common/quic/envoy_quic_session_cache.h" +#include "source/common/quic/envoy_quic_session_cache.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_simulated_watermark_buffer.h b/source/common/quic/envoy_quic_simulated_watermark_buffer.h index 50c46f0152769..e4dbdcb187eda 100644 --- a/source/common/quic/envoy_quic_simulated_watermark_buffer.h +++ b/source/common/quic/envoy_quic_simulated_watermark_buffer.h @@ -2,7 +2,7 @@ #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "spdlog/spdlog.h" diff --git a/source/common/quic/envoy_quic_stream.h b/source/common/quic/envoy_quic_stream.h index 56e744d56d80b..f28cae4cf0119 100644 --- a/source/common/quic/envoy_quic_stream.h +++ b/source/common/quic/envoy_quic_stream.h @@ -4,11 +4,11 @@ #include "envoy/event/dispatcher.h" #include "envoy/http/codec.h" -#include "common/http/codec_helper.h" -#include "common/quic/envoy_quic_simulated_watermark_buffer.h" -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/quic_filter_manager_connection_impl.h" -#include "common/quic/send_buffer_monitor.h" +#include "source/common/http/codec_helper.h" +#include "source/common/quic/envoy_quic_simulated_watermark_buffer.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/quic_filter_manager_connection_impl.h" +#include "source/common/quic/send_buffer_monitor.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_utils.cc b/source/common/quic/envoy_quic_utils.cc index 2f9682b31a20f..1ca1ecfd24f0d 100644 --- a/source/common/quic/envoy_quic_utils.cc +++ b/source/common/quic/envoy_quic_utils.cc @@ -1,13 +1,13 @@ -#include "common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_utils.h" #include #include "envoy/common/platform.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/http/utility.h" -#include "common/network/socket_option_factory.h" -#include "common/network/utility.h" +#include "source/common/http/utility.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/envoy_quic_utils.h b/source/common/quic/envoy_quic_utils.h index 2625e7acc0e0c..292caaabaf985 100644 --- a/source/common/quic/envoy_quic_utils.h +++ b/source/common/quic/envoy_quic_utils.h @@ -4,11 +4,11 @@ #include "envoy/config/listener/v3/quic_config.pb.h" #include "envoy/http/codec.h" -#include "common/common/assert.h" -#include "common/http/header_map_impl.h" -#include "common/network/address_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/quic/quic_io_handle_wrapper.h" +#include "source/common/common/assert.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/quic/quic_io_handle_wrapper.h" #if defined(__GNUC__) #pragma GCC diagnostic push @@ -27,7 +27,7 @@ #include "quiche/quic/core/quic_error_codes.h" #include "quiche/quic/platform/api/quic_ip_address.h" #include "quiche/quic/platform/api/quic_socket_address.h" -#include "common/http/header_utility.h" +#include "source/common/http/header_utility.h" #include "openssl/ssl.h" diff --git a/source/common/quic/platform/BUILD b/source/common/quic/platform/BUILD index 0d9edee9c2334..b3a72681cd759 100644 --- a/source/common/quic/platform/BUILD +++ b/source/common/quic/platform/BUILD @@ -137,7 +137,7 @@ envoy_cc_library( deps = [ ":quiche_flags_impl_lib", ":string_utils_lib", - "//include/envoy/api:io_error_interface", + "//envoy/api:io_error_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/server:backtrace_lib", @@ -189,7 +189,7 @@ envoy_cc_library( tags = ["nofips"], visibility = ["//visibility:public"], deps = [ - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "@com_googlesource_quiche//:quic_core_types_lib", "@com_googlesource_quiche//:quic_platform_base", ], @@ -233,7 +233,7 @@ envoy_cc_library( tags = ["nofips"], visibility = ["//visibility:public"], deps = [ - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "@com_googlesource_quiche//:quic_core_clock_lib", ], ) diff --git a/source/common/quic/platform/envoy_quic_clock.cc b/source/common/quic/platform/envoy_quic_clock.cc index 4981716706202..450caa59f0282 100644 --- a/source/common/quic/platform/envoy_quic_clock.cc +++ b/source/common/quic/platform/envoy_quic_clock.cc @@ -1,4 +1,4 @@ -#include "common/quic/platform/envoy_quic_clock.h" +#include "source/common/quic/platform/envoy_quic_clock.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/platform/http2_bug_tracker_impl.h b/source/common/quic/platform/http2_bug_tracker_impl.h index f36c334ec88af..b8f5a8693039f 100644 --- a/source/common/quic/platform/http2_bug_tracker_impl.h +++ b/source/common/quic/platform/http2_bug_tracker_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_bug_tracker_impl.h" +#include "source/common/quic/platform/quic_bug_tracker_impl.h" #define HTTP2_BUG_IMPL QUIC_BUG_IMPL #define HTTP2_BUG_IF_IMPL QUIC_BUG_IF_IMPL diff --git a/source/common/quic/platform/http2_flags_impl.h b/source/common/quic/platform/http2_flags_impl.h index f209c3ec8b7a0..27e2b8448a558 100644 --- a/source/common/quic/platform/http2_flags_impl.h +++ b/source/common/quic/platform/http2_flags_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/flags_impl.h" +#include "source/common/quic/platform/flags_impl.h" #define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() diff --git a/source/common/quic/platform/http2_logging_impl.h b/source/common/quic/platform/http2_logging_impl.h index 8633db83ce514..5ef754f7aea82 100644 --- a/source/common/quic/platform/http2_logging_impl.h +++ b/source/common/quic/platform/http2_logging_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_logging_impl.h" +#include "source/common/quic/platform/quic_logging_impl.h" #define HTTP2_LOG_IMPL(severity) QUICHE_LOG_IMPL(severity) diff --git a/source/common/quic/platform/http2_macros_impl.h b/source/common/quic/platform/http2_macros_impl.h index 984f58885b5ce..1484e360601db 100644 --- a/source/common/quic/platform/http2_macros_impl.h +++ b/source/common/quic/platform/http2_macros_impl.h @@ -8,7 +8,7 @@ #include -#include "common/quic/platform/quic_logging_impl.h" +#include "source/common/quic/platform/quic_logging_impl.h" #include "absl/base/macros.h" diff --git a/source/common/quic/platform/http2_string_utils_impl.h b/source/common/quic/platform/http2_string_utils_impl.h index 4bd33e99c4009..38c75a57a3948 100644 --- a/source/common/quic/platform/http2_string_utils_impl.h +++ b/source/common/quic/platform/http2_string_utils_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/string_utils.h" +#include "source/common/quic/platform/string_utils.h" #include "absl/strings/escaping.h" #include "absl/strings/str_cat.h" diff --git a/source/common/quic/platform/quic_file_utils_impl.cc b/source/common/quic/platform/quic_file_utils_impl.cc index 4112785357ebc..9c909c801643c 100644 --- a/source/common/quic/platform/quic_file_utils_impl.cc +++ b/source/common/quic/platform/quic_file_utils_impl.cc @@ -4,10 +4,10 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_file_utils_impl.h" +#include "source/common/quic/platform/quic_file_utils_impl.h" -#include "common/filesystem/directory.h" -#include "common/filesystem/filesystem_impl.h" +#include "source/common/filesystem/directory.h" +#include "source/common/filesystem/filesystem_impl.h" #include "absl/strings/str_cat.h" diff --git a/source/common/quic/platform/quic_flags_impl.h b/source/common/quic/platform/quic_flags_impl.h index aa433b5b83f48..1fd7e6cfad750 100644 --- a/source/common/quic/platform/quic_flags_impl.h +++ b/source/common/quic/platform/quic_flags_impl.h @@ -9,7 +9,7 @@ #include #include -#include "common/quic/platform/quiche_flags_impl.h" +#include "source/common/quic/platform/quiche_flags_impl.h" // Not wired into command-line parsing. #define DEFINE_QUIC_COMMAND_LINE_FLAG_IMPL(type, flag, value, help) \ diff --git a/source/common/quic/platform/quic_hostname_utils_impl.cc b/source/common/quic/platform/quic_hostname_utils_impl.cc index bc7d64c5c2f8f..1afe7b411eda0 100644 --- a/source/common/quic/platform/quic_hostname_utils_impl.cc +++ b/source/common/quic/platform/quic_hostname_utils_impl.cc @@ -4,11 +4,11 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_hostname_utils_impl.h" +#include "source/common/quic/platform/quic_hostname_utils_impl.h" #include -#include "common/http/utility.h" +#include "source/common/http/utility.h" #include "absl/strings/ascii.h" #include "absl/strings/str_cat.h" diff --git a/source/common/quic/platform/quic_logging_impl.cc b/source/common/quic/platform/quic_logging_impl.cc index 08eb9699f1d76..00920beb72620 100644 --- a/source/common/quic/platform/quic_logging_impl.cc +++ b/source/common/quic/platform/quic_logging_impl.cc @@ -4,12 +4,12 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_logging_impl.h" +#include "source/common/quic/platform/quic_logging_impl.h" #include #include -#include "common/common/utility.h" +#include "source/common/common/utility.h" namespace quic { diff --git a/source/common/quic/platform/quic_logging_impl.h b/source/common/quic/platform/quic_logging_impl.h index e08595f4e9034..f5dc65dd7c431 100644 --- a/source/common/quic/platform/quic_logging_impl.h +++ b/source/common/quic/platform/quic_logging_impl.h @@ -12,9 +12,9 @@ #include #include -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/common/stl_helpers.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/common/stl_helpers.h" #include "absl/base/optimization.h" #include "absl/synchronization/mutex.h" diff --git a/source/common/quic/platform/quic_mem_slice_impl.cc b/source/common/quic/platform/quic_mem_slice_impl.cc index 164419b681f3d..3744ae0597e44 100644 --- a/source/common/quic/platform/quic_mem_slice_impl.cc +++ b/source/common/quic/platform/quic_mem_slice_impl.cc @@ -4,11 +4,11 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_mem_slice_impl.h" +#include "source/common/quic/platform/quic_mem_slice_impl.h" #include "envoy/buffer/buffer.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace quic { diff --git a/source/common/quic/platform/quic_mem_slice_impl.h b/source/common/quic/platform/quic_mem_slice_impl.h index 9882b2afad802..c6e90cba507a2 100644 --- a/source/common/quic/platform/quic_mem_slice_impl.h +++ b/source/common/quic/platform/quic_mem_slice_impl.h @@ -10,7 +10,7 @@ #include #include -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "quiche/quic/core/quic_buffer_allocator.h" diff --git a/source/common/quic/platform/quic_mem_slice_span_impl.cc b/source/common/quic/platform/quic_mem_slice_span_impl.cc index e7ac9d86f8379..89a7357d37437 100644 --- a/source/common/quic/platform/quic_mem_slice_span_impl.cc +++ b/source/common/quic/platform/quic_mem_slice_span_impl.cc @@ -4,7 +4,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_mem_slice_span_impl.h" +#include "source/common/quic/platform/quic_mem_slice_span_impl.h" #include "quiche/quic/platform/api/quic_mem_slice.h" diff --git a/source/common/quic/platform/quic_mem_slice_storage_impl.cc b/source/common/quic/platform/quic_mem_slice_storage_impl.cc index d4d7767f65874..0f90210eb992b 100644 --- a/source/common/quic/platform/quic_mem_slice_storage_impl.cc +++ b/source/common/quic/platform/quic_mem_slice_storage_impl.cc @@ -4,7 +4,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_mem_slice_storage_impl.h" +#include "source/common/quic/platform/quic_mem_slice_storage_impl.h" #include diff --git a/source/common/quic/platform/quic_mem_slice_storage_impl.h b/source/common/quic/platform/quic_mem_slice_storage_impl.h index c7a5e17e187c6..437e9be46736f 100644 --- a/source/common/quic/platform/quic_mem_slice_storage_impl.h +++ b/source/common/quic/platform/quic_mem_slice_storage_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "quiche/quic/core/quic_buffer_allocator.h" #include "quiche/quic/platform/api/quic_iovec.h" diff --git a/source/common/quic/platform/quic_pcc_sender_impl.h b/source/common/quic/platform/quic_pcc_sender_impl.h index 1e0f2bcbaf8b2..de6ac4ed2a753 100644 --- a/source/common/quic/platform/quic_pcc_sender_impl.h +++ b/source/common/quic/platform/quic_pcc_sender_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "quiche/quic/core/quic_types.h" diff --git a/source/common/quic/platform/quic_stack_trace_impl.h b/source/common/quic/platform/quic_stack_trace_impl.h index ec06b6299d65e..c154796513d95 100644 --- a/source/common/quic/platform/quic_stack_trace_impl.h +++ b/source/common/quic/platform/quic_stack_trace_impl.h @@ -9,7 +9,7 @@ #include #include -#include "server/backtrace.h" +#include "source/server/backtrace.h" namespace quic { diff --git a/source/common/quic/platform/quiche_bug_tracker_impl.h b/source/common/quic/platform/quiche_bug_tracker_impl.h index 3a13f66c7db8a..0d4f8aa884acb 100644 --- a/source/common/quic/platform/quiche_bug_tracker_impl.h +++ b/source/common/quic/platform/quiche_bug_tracker_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_logging_impl.h" +#include "source/common/quic/platform/quic_logging_impl.h" // TODO(wub): Implement exponential back off to avoid performance problems due // to excessive QUIC_BUG. diff --git a/source/common/quic/platform/quiche_flags_impl.cc b/source/common/quic/platform/quiche_flags_impl.cc index 5f937e3b73396..a251af757b085 100644 --- a/source/common/quic/platform/quiche_flags_impl.cc +++ b/source/common/quic/platform/quiche_flags_impl.cc @@ -4,11 +4,11 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quiche_flags_impl.h" +#include "source/common/quic/platform/quiche_flags_impl.h" #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/strings/ascii.h" #include "absl/strings/match.h" diff --git a/source/common/quic/platform/quiche_logging_impl.h b/source/common/quic/platform/quiche_logging_impl.h index 4b7e662d2f011..08dc8f84c7bb4 100644 --- a/source/common/quic/platform/quiche_logging_impl.h +++ b/source/common/quic/platform/quiche_logging_impl.h @@ -6,4 +6,4 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_logging_impl.h" +#include "source/common/quic/platform/quic_logging_impl.h" diff --git a/source/common/quic/platform/quiche_text_utils_impl.h b/source/common/quic/platform/quiche_text_utils_impl.h index aed6d4f5c6b54..b8b4d77dfa8b9 100644 --- a/source/common/quic/platform/quiche_text_utils_impl.h +++ b/source/common/quic/platform/quiche_text_utils_impl.h @@ -1,7 +1,7 @@ #pragma once -#include "common/common/base64.h" -#include "common/quic/platform/string_utils.h" +#include "source/common/common/base64.h" +#include "source/common/quic/platform/string_utils.h" #include "absl/strings/ascii.h" #include "absl/strings/escaping.h" diff --git a/source/common/quic/platform/quiche_time_utils_impl.cc b/source/common/quic/platform/quiche_time_utils_impl.cc index 4453985b3f2fa..91fda404f8474 100644 --- a/source/common/quic/platform/quiche_time_utils_impl.cc +++ b/source/common/quic/platform/quiche_time_utils_impl.cc @@ -4,7 +4,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quiche_time_utils_impl.h" +#include "source/common/quic/platform/quiche_time_utils_impl.h" namespace quiche { diff --git a/source/common/quic/platform/spdy_bug_tracker_impl.h b/source/common/quic/platform/spdy_bug_tracker_impl.h index 708d388648efb..29990935d94f1 100644 --- a/source/common/quic/platform/spdy_bug_tracker_impl.h +++ b/source/common/quic/platform/spdy_bug_tracker_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quiche_bug_tracker_impl.h" +#include "source/common/quic/platform/quiche_bug_tracker_impl.h" #define SPDY_BUG_IMPL QUICHE_BUG_IMPL #define SPDY_BUG_IF_IMPL QUICHE_BUG_IF_IMPL diff --git a/source/common/quic/platform/spdy_flags_impl.h b/source/common/quic/platform/spdy_flags_impl.h index 697cee197329e..701aff548c1e9 100644 --- a/source/common/quic/platform/spdy_flags_impl.h +++ b/source/common/quic/platform/spdy_flags_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/flags_impl.h" +#include "source/common/quic/platform/flags_impl.h" #define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() diff --git a/source/common/quic/platform/spdy_logging_impl.h b/source/common/quic/platform/spdy_logging_impl.h index a2b6f6ff0a5a2..b572688364caa 100644 --- a/source/common/quic/platform/spdy_logging_impl.h +++ b/source/common/quic/platform/spdy_logging_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_logging_impl.h" +#include "source/common/quic/platform/quic_logging_impl.h" #define SPDY_LOG_IMPL(severity) QUICHE_LOG_IMPL(severity) diff --git a/source/common/quic/platform/spdy_string_utils_impl.h b/source/common/quic/platform/spdy_string_utils_impl.h index 1e876f0e16bf3..e62fdb3f73aad 100644 --- a/source/common/quic/platform/spdy_string_utils_impl.h +++ b/source/common/quic/platform/spdy_string_utils_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/string_utils.h" +#include "source/common/quic/platform/string_utils.h" #include "absl/strings/escaping.h" #include "absl/strings/match.h" diff --git a/source/common/quic/platform/string_utils.cc b/source/common/quic/platform/string_utils.cc index 788cd0a4742e7..5353033aee516 100644 --- a/source/common/quic/platform/string_utils.cc +++ b/source/common/quic/platform/string_utils.cc @@ -1,4 +1,4 @@ -#include "common/quic/platform/string_utils.h" +#include "source/common/quic/platform/string_utils.h" // NOLINT(namespace-envoy) // @@ -13,7 +13,7 @@ #include "absl/strings/ascii.h" #include "absl/strings/escaping.h" #include "absl/strings/str_format.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace quiche { diff --git a/source/common/quic/quic_filter_manager_connection_impl.cc b/source/common/quic/quic_filter_manager_connection_impl.cc index e47c27080d1d2..fe3c229ab895a 100644 --- a/source/common/quic/quic_filter_manager_connection_impl.cc +++ b/source/common/quic/quic_filter_manager_connection_impl.cc @@ -1,4 +1,4 @@ -#include "common/quic/quic_filter_manager_connection_impl.h" +#include "source/common/quic/quic_filter_manager_connection_impl.h" #include #include diff --git a/source/common/quic/quic_filter_manager_connection_impl.h b/source/common/quic/quic_filter_manager_connection_impl.h index f0f666434c7fa..59d1bf8375b5a 100644 --- a/source/common/quic/quic_filter_manager_connection_impl.h +++ b/source/common/quic/quic_filter_manager_connection_impl.h @@ -17,14 +17,14 @@ #pragma GCC diagnostic pop #endif -#include "common/common/empty_string.h" -#include "common/common/logger.h" -#include "common/http/http3/codec_stats.h" -#include "common/network/connection_impl_base.h" -#include "common/quic/quic_network_connection.h" -#include "common/quic/envoy_quic_simulated_watermark_buffer.h" -#include "common/quic/send_buffer_monitor.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/logger.h" +#include "source/common/http/http3/codec_stats.h" +#include "source/common/network/connection_impl_base.h" +#include "source/common/quic/quic_network_connection.h" +#include "source/common/quic/envoy_quic_simulated_watermark_buffer.h" +#include "source/common/quic/send_buffer_monitor.h" +#include "source/common/stream_info/stream_info_impl.h" namespace Envoy { diff --git a/source/common/quic/quic_io_handle_wrapper.h b/source/common/quic/quic_io_handle_wrapper.h index cdc4eb3719eaa..15247bb4184c6 100644 --- a/source/common/quic/quic_io_handle_wrapper.h +++ b/source/common/quic/quic_io_handle_wrapper.h @@ -5,7 +5,7 @@ #include "envoy/network/io_handle.h" -#include "common/network/io_socket_error_impl.h" +#include "source/common/network/io_socket_error_impl.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/quic_network_connection.cc b/source/common/quic/quic_network_connection.cc index 577178c9cc320..bc22c6efaa670 100644 --- a/source/common/quic/quic_network_connection.cc +++ b/source/common/quic/quic_network_connection.cc @@ -1,4 +1,4 @@ -#include "common/quic/quic_network_connection.h" +#include "source/common/quic/quic_network_connection.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/quic_network_connection.h b/source/common/quic/quic_network_connection.h index 78ea81402e5c5..ae122304c353c 100644 --- a/source/common/quic/quic_network_connection.h +++ b/source/common/quic/quic_network_connection.h @@ -4,7 +4,7 @@ #include "envoy/network/connection.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/quic_stat_names.cc b/source/common/quic/quic_stat_names.cc new file mode 100644 index 0000000000000..5c8440ed892f4 --- /dev/null +++ b/source/common/quic/quic_stat_names.cc @@ -0,0 +1,52 @@ +#include "source/common/quic/quic_stat_names.h" + +namespace Envoy { +namespace Quic { + +// TODO(renjietang): Currently these stats are only available in downstream. Wire it up to upstream +// QUIC also. +QuicStatNames::QuicStatNames(Stats::SymbolTable& symbol_table) + : stat_name_pool_(symbol_table), symbol_table_(symbol_table), + http3_prefix_(stat_name_pool_.add("http3")), downstream_(stat_name_pool_.add("downstream")), + upstream_(stat_name_pool_.add("upstream")), from_self_(stat_name_pool_.add("tx")), + from_peer_(stat_name_pool_.add("rx")) { + // Preallocate most used counters + // Most popular in client initiated connection close. + connectionCloseStatName(quic::QUIC_NETWORK_IDLE_TIMEOUT); + // Most popular in server initiated connection close. + connectionCloseStatName(quic::QUIC_SILENT_IDLE_TIMEOUT); +} + +void QuicStatNames::incCounter(Stats::Scope& scope, const Stats::StatNameVec& names) { + Stats::SymbolTable::StoragePtr stat_name_storage = symbol_table_.join(names); + scope.counterFromStatName(Stats::StatName(stat_name_storage.get())).inc(); +} + +void QuicStatNames::chargeQuicConnectionCloseStats(Stats::Scope& scope, + quic::QuicErrorCode error_code, + quic::ConnectionCloseSource source, + bool is_upstream) { + ASSERT(&symbol_table_ == &scope.symbolTable()); + + if (error_code > quic::QUIC_LAST_ERROR) { + error_code = quic::QUIC_LAST_ERROR; + } + + const Stats::StatName connection_close = connectionCloseStatName(error_code); + incCounter(scope, {http3_prefix_, is_upstream ? upstream_ : downstream_, + source == quic::ConnectionCloseSource::FROM_SELF ? from_self_ : from_peer_, + connection_close}); +} + +Stats::StatName QuicStatNames::connectionCloseStatName(quic::QuicErrorCode error_code) { + ASSERT(error_code <= quic::QUIC_LAST_ERROR); + + return Stats::StatName( + connection_error_stat_names_.get(error_code, [this, error_code]() -> const uint8_t* { + return stat_name_pool_.addReturningStorage( + absl::StrCat("quic_connection_close_error_code_", QuicErrorCodeToString(error_code))); + })); +} + +} // namespace Quic +} // namespace Envoy diff --git a/source/common/quic/quic_stat_names.h b/source/common/quic/quic_stat_names.h new file mode 100644 index 0000000000000..34706a35dd95c --- /dev/null +++ b/source/common/quic/quic_stat_names.h @@ -0,0 +1,42 @@ +#pragma once + +#include "envoy/stats/scope.h" + +#include "source/common/common/thread.h" +#include "source/common/stats/symbol_table_impl.h" + +#include "quiche/quic/core/quic_error_codes.h" +#include "quiche/quic/core/quic_types.h" + +namespace Envoy { +namespace Quic { + +class QuicStatNames { +public: + // This class holds lazily symbolized stat names and is responsible for charging them. + explicit QuicStatNames(Stats::SymbolTable& symbol_table); + + void chargeQuicConnectionCloseStats(Stats::Scope& scope, quic::QuicErrorCode error_code, + quic::ConnectionCloseSource source, bool is_upstream); + +private: + // Find the actual counter in |scope| and increment it. + // An example counter name: "http3.downstream.tx.quic_connection_close_error_code_QUIC_NO_ERROR". + void incCounter(Stats::Scope& scope, const Stats::StatNameVec& names); + + Stats::StatName connectionCloseStatName(quic::QuicErrorCode error_code); + + Stats::StatNamePool stat_name_pool_; + Stats::SymbolTable& symbol_table_; + const Stats::StatName http3_prefix_; + const Stats::StatName downstream_; + const Stats::StatName upstream_; + const Stats::StatName from_self_; + const Stats::StatName from_peer_; + Thread::AtomicPtrArray + connection_error_stat_names_; +}; + +} // namespace Quic +} // namespace Envoy diff --git a/source/common/quic/quic_transport_socket_factory.cc b/source/common/quic/quic_transport_socket_factory.cc index 5be0794ba5ec5..452b4f45d7c66 100644 --- a/source/common/quic/quic_transport_socket_factory.cc +++ b/source/common/quic/quic_transport_socket_factory.cc @@ -1,8 +1,8 @@ -#include "common/quic/quic_transport_socket_factory.h" +#include "source/common/quic/quic_transport_socket_factory.h" #include "envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.validate.h" -#include "extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/quic_transport_socket_factory.h b/source/common/quic/quic_transport_socket_factory.h index 9fad6a0b256da..53fede86f8112 100644 --- a/source/common/quic/quic_transport_socket_factory.h +++ b/source/common/quic/quic_transport_socket_factory.h @@ -5,9 +5,8 @@ #include "envoy/server/transport_socket_config.h" #include "envoy/ssl/context_config.h" -#include "common/common/assert.h" - -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/common/assert.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/send_buffer_monitor.cc b/source/common/quic/send_buffer_monitor.cc index 476481b344daf..bf75886710992 100644 --- a/source/common/quic/send_buffer_monitor.cc +++ b/source/common/quic/send_buffer_monitor.cc @@ -1,4 +1,4 @@ -#include "common/quic/send_buffer_monitor.h" +#include "source/common/quic/send_buffer_monitor.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/udp_gso_batch_writer.cc b/source/common/quic/udp_gso_batch_writer.cc index 8f46df35f2ea8..2eccc5755f129 100644 --- a/source/common/quic/udp_gso_batch_writer.cc +++ b/source/common/quic/udp_gso_batch_writer.cc @@ -1,7 +1,7 @@ -#include "common/quic/udp_gso_batch_writer.h" +#include "source/common/quic/udp_gso_batch_writer.h" -#include "common/network/io_socket_error_impl.h" -#include "common/quic/envoy_quic_utils.h" +#include "source/common/network/io_socket_error_impl.h" +#include "source/common/quic/envoy_quic_utils.h" namespace Envoy { namespace Quic { diff --git a/source/common/quic/udp_gso_batch_writer.h b/source/common/quic/udp_gso_batch_writer.h index 700d061bd5144..367f248bd7b4e 100644 --- a/source/common/quic/udp_gso_batch_writer.h +++ b/source/common/quic/udp_gso_batch_writer.h @@ -28,8 +28,8 @@ #include "envoy/network/udp_packet_writer_handler.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_protos.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_protos.h" namespace Envoy { namespace Quic { diff --git a/source/common/router/BUILD b/source/common/router/BUILD index beccd55248f85..a282658e2ec9f 100644 --- a/source/common/router/BUILD +++ b/source/common/router/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( srcs = ["metadatamatchcriteria_impl.cc"], hdrs = ["metadatamatchcriteria_impl.h"], deps = [ - "//include/envoy/router:router_interface", + "//envoy/router:router_interface", ], ) @@ -22,7 +22,7 @@ envoy_cc_library( srcs = ["tls_context_match_criteria_impl.cc"], hdrs = ["tls_context_match_criteria_impl.h"], deps = [ - "//include/envoy/router:router_interface", + "//envoy/router:router_interface", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", ], ) @@ -41,13 +41,13 @@ envoy_cc_library( ":retry_state_lib", ":router_ratelimit_lib", ":tls_context_match_criteria_lib", - "//include/envoy/config:typed_metadata_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/router:router_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/server:filter_config_interface", # TODO(rodaine): break dependency on server - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/config:typed_metadata_interface", + "//envoy/http:header_map_interface", + "//envoy/router:router_interface", + "//envoy/runtime:runtime_interface", + "//envoy/server:filter_config_interface", # TODO(rodaine): break dependency on server + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:assert_lib", "//source/common/common:empty_string", "//source/common/common:hash_lib", @@ -77,8 +77,8 @@ envoy_cc_library( srcs = ["config_utility.cc"], hdrs = ["config_utility.h"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/upstream:resource_manager_interface", + "//envoy/http:codes_interface", + "//envoy/upstream:resource_manager_interface", "//source/common/common:assert_lib", "//source/common/common:empty_string", "//source/common/common:matchers_lib", @@ -96,9 +96,9 @@ envoy_cc_library( srcs = ["context_impl.cc"], hdrs = ["context_impl.h"], deps = [ - "//include/envoy/router:context_interface", - "//include/envoy/router:router_interface", - "//include/envoy/stats:stats_macros", + "//envoy/router:context_interface", + "//envoy/router:router_interface", + "//envoy/stats:stats_macros", ], ) @@ -107,8 +107,8 @@ envoy_cc_library( srcs = ["debug_config.cc"], hdrs = ["debug_config.h"], deps = [ - "//include/envoy/http:header_map_interface", - "//include/envoy/stream_info:filter_state_interface", + "//envoy/http:header_map_interface", + "//envoy/stream_info:filter_state_interface", "//source/common/common:macros", ], ) @@ -119,9 +119,9 @@ envoy_cc_library( hdrs = ["route_config_update_receiver_impl.h"], deps = [ ":config_lib", - "//include/envoy/router:rds_interface", - "//include/envoy/router:route_config_update_info_interface", - "//include/envoy/server:factory_context_interface", + "//envoy/router:rds_interface", + "//envoy/router:route_config_update_info_interface", + "//envoy/server:factory_context_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/protobuf:utility_lib", @@ -136,14 +136,14 @@ envoy_cc_library( hdrs = ["vhds.h"], deps = [ ":config_lib", - "//include/envoy/config:subscription_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/router:rds_interface", - "//include/envoy/router:route_config_provider_manager_interface", - "//include/envoy/router:route_config_update_info_interface", - "//include/envoy/singleton:instance_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/config:subscription_interface", + "//envoy/http:codes_interface", + "//envoy/local_info:local_info_interface", + "//envoy/router:rds_interface", + "//envoy/router:route_config_provider_manager_interface", + "//envoy/router:route_config_update_info_interface", + "//envoy/singleton:instance_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/config:api_version_lib", @@ -165,15 +165,15 @@ envoy_cc_library( hdrs = ["rds_impl.h"], deps = [ ":config_lib", - "//include/envoy/config:subscription_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/router:rds_interface", - "//include/envoy/router:route_config_provider_manager_interface", - "//include/envoy/router:route_config_update_info_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/singleton:instance_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/config:subscription_interface", + "//envoy/http:codes_interface", + "//envoy/local_info:local_info_interface", + "//envoy/router:rds_interface", + "//envoy/router:route_config_provider_manager_interface", + "//envoy/router:route_config_update_info_interface", + "//envoy/server:admin_interface", + "//envoy/singleton:instance_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/common:assert_lib", "//source/common/common:callback_impl_lib", "//source/common/common:cleanup_lib", @@ -207,9 +207,9 @@ envoy_cc_library( ], deps = [ ":config_lib", - "//include/envoy/router:rds_interface", - "//include/envoy/router:scopes_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/router:rds_interface", + "//envoy/router:scopes_interface", + "//envoy/thread_local:thread_local_interface", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", ], @@ -222,10 +222,10 @@ envoy_cc_library( deps = [ ":rds_lib", ":scoped_config_lib", - "//include/envoy/config:config_provider_interface", - "//include/envoy/config:subscription_interface", - "//include/envoy/router:route_config_provider_manager_interface", - "//include/envoy/stats:stats_interface", + "//envoy/config:config_provider_interface", + "//envoy/config:subscription_interface", + "//envoy/router:route_config_provider_manager_interface", + "//envoy/stats:stats_interface", "//source/common/common:assert_lib", "//source/common/common:cleanup_lib", "//source/common/common:minimal_logger_lib", @@ -252,12 +252,12 @@ envoy_cc_library( hdrs = ["retry_state_impl.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/event:timer_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/router:router_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/event:timer_interface", + "//envoy/http:codec_interface", + "//envoy/http:header_map_interface", + "//envoy/router:router_interface", + "//envoy/runtime:runtime_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:assert_lib", "//source/common/common:backoff_lib", "//source/common/common:utility_lib", @@ -286,21 +286,21 @@ envoy_cc_library( ":debug_config_lib", ":header_parser_lib", ":retry_state_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/grpc:status", - "//include/envoy/http:codec_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/http:conn_pool_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/router:shadow_writer_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/grpc:status", + "//envoy/http:codec_interface", + "//envoy/http:codes_interface", + "//envoy/http:conn_pool_interface", + "//envoy/http:filter_interface", + "//envoy/local_info:local_info_interface", + "//envoy/router:shadow_writer_interface", + "//envoy/runtime:runtime_interface", + "//envoy/server:filter_config_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/access_log:access_log_lib", "//source/common/buffer:watermark_buffer_lib", "//source/common/common:assert_lib", @@ -338,9 +338,9 @@ envoy_cc_library( hdrs = ["router_ratelimit.h"], deps = [ ":config_utility_lib", - "//include/envoy/ratelimit:ratelimit_interface", - "//include/envoy/router:router_interface", - "//include/envoy/router:router_ratelimit_interface", + "//envoy/ratelimit:ratelimit_interface", + "//envoy/router:router_interface", + "//envoy/router:router_ratelimit_interface", "//source/common/common:assert_lib", "//source/common/common:empty_string", "//source/common/config:metadata_lib", @@ -357,8 +357,8 @@ envoy_cc_library( srcs = ["shadow_writer_impl.cc"], hdrs = ["shadow_writer_impl.h"], deps = [ - "//include/envoy/router:shadow_writer_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/router:shadow_writer_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:assert_lib", "//source/common/http:headers_lib", ], @@ -370,7 +370,7 @@ envoy_cc_library( hdrs = ["header_parser.h"], deps = [ ":header_formatter_lib", - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "//source/common/http:header_utility_lib", "//source/common/http:headers_lib", "//source/common/protobuf:utility_lib", @@ -384,9 +384,9 @@ envoy_cc_library( hdrs = ["header_formatter.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/router:string_accessor_interface", - "//include/envoy/stream_info:filter_state_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/router:string_accessor_interface", + "//envoy/stream_info:filter_state_interface", + "//envoy/stream_info:stream_info_interface", "//source/common/common:minimal_logger_lib", "//source/common/common:utility_lib", "//source/common/config:metadata_lib", @@ -401,9 +401,9 @@ envoy_cc_library( srcs = ["reset_header_parser.cc"], hdrs = ["reset_header_parser.h"], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/router:router_interface", + "//envoy/common:time_interface", + "//envoy/http:header_map_interface", + "//envoy/router:router_interface", "//source/common/http:headers_lib", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", @@ -414,7 +414,7 @@ envoy_cc_library( name = "string_accessor_lib", hdrs = ["string_accessor_impl.h"], deps = [ - "//include/envoy/router:string_accessor_interface", + "//envoy/router:string_accessor_interface", ], ) @@ -423,6 +423,6 @@ envoy_cc_library( srcs = ["delegating_route_impl.cc"], hdrs = ["delegating_route_impl.h"], deps = [ - "//include/envoy/router:router_interface", + "//envoy/router:router_interface", ], ) diff --git a/source/common/router/config_impl.cc b/source/common/router/config_impl.cc index 13e017148f94d..742ddc9fbf7fd 100644 --- a/source/common/router/config_impl.cc +++ b/source/common/router/config_impl.cc @@ -1,4 +1,4 @@ -#include "common/router/config_impl.h" +#include "source/common/router/config_impl.h" #include #include @@ -18,28 +18,27 @@ #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/upstream.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/common/hash.h" -#include "common/common/logger.h" -#include "common/common/regex.h" -#include "common/common/utility.h" -#include "common/config/metadata.h" -#include "common/config/utility.h" -#include "common/config/well_known_names.h" -#include "common/http/headers.h" -#include "common/http/path_utility.h" -#include "common/http/utility.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/router/reset_header_parser.h" -#include "common/router/retry_state_impl.h" -#include "common/runtime/runtime_features.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/filters/http/common/utility.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/common/hash.h" +#include "source/common/common/logger.h" +#include "source/common/common/regex.h" +#include "source/common/common/utility.h" +#include "source/common/config/metadata.h" +#include "source/common/config/utility.h" +#include "source/common/config/well_known_names.h" +#include "source/common/http/headers.h" +#include "source/common/http/path_utility.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/reset_header_parser.h" +#include "source/common/router/retry_state_impl.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/filters/http/common/utility.h" +#include "source/extensions/filters/http/well_known_names.h" #include "absl/strings/match.h" diff --git a/source/common/router/config_impl.h b/source/common/router/config_impl.h index dc512ebd7121e..e367683e092ec 100644 --- a/source/common/router/config_impl.h +++ b/source/common/router/config_impl.h @@ -19,17 +19,17 @@ #include "envoy/type/v3/percent.pb.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/matchers.h" -#include "common/config/metadata.h" -#include "common/http/hash_policy.h" -#include "common/http/header_utility.h" -#include "common/router/config_utility.h" -#include "common/router/header_formatter.h" -#include "common/router/header_parser.h" -#include "common/router/metadatamatchcriteria_impl.h" -#include "common/router/router_ratelimit.h" -#include "common/router/tls_context_match_criteria_impl.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/common/matchers.h" +#include "source/common/config/metadata.h" +#include "source/common/http/hash_policy.h" +#include "source/common/http/header_utility.h" +#include "source/common/router/config_utility.h" +#include "source/common/router/header_formatter.h" +#include "source/common/router/header_parser.h" +#include "source/common/router/metadatamatchcriteria_impl.h" +#include "source/common/router/router_ratelimit.h" +#include "source/common/router/tls_context_match_criteria_impl.h" +#include "source/common/stats/symbol_table_impl.h" #include "absl/container/node_hash_map.h" #include "absl/types/optional.h" diff --git a/source/common/router/config_utility.cc b/source/common/router/config_utility.cc index 99dd80aa0f0fc..f94d6b68a19ef 100644 --- a/source/common/router/config_utility.cc +++ b/source/common/router/config_utility.cc @@ -1,4 +1,4 @@ -#include "common/router/config_utility.h" +#include "source/common/router/config_utility.h" #include #include @@ -7,8 +7,8 @@ #include "envoy/config/route/v3/route_components.pb.h" #include "envoy/type/matcher/v3/string.pb.h" -#include "common/common/assert.h" -#include "common/common/regex.h" +#include "source/common/common/assert.h" +#include "source/common/common/regex.h" namespace Envoy { namespace Router { diff --git a/source/common/router/config_utility.h b/source/common/router/config_utility.h index 5f9513103af99..3c8167c2faa38 100644 --- a/source/common/router/config_utility.h +++ b/source/common/router/config_utility.h @@ -9,12 +9,12 @@ #include "envoy/http/codes.h" #include "envoy/upstream/resource_manager.h" -#include "common/common/empty_string.h" -#include "common/common/matchers.h" -#include "common/common/utility.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/matchers.h" +#include "source/common/common/utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" #include "absl/types/optional.h" diff --git a/source/common/router/context_impl.cc b/source/common/router/context_impl.cc index dd9cfc22c0353..2a2df3b234e30 100644 --- a/source/common/router/context_impl.cc +++ b/source/common/router/context_impl.cc @@ -1,4 +1,4 @@ -#include "common/router/context_impl.h" +#include "source/common/router/context_impl.h" namespace Envoy { namespace Router { diff --git a/source/common/router/debug_config.cc b/source/common/router/debug_config.cc index 8ec9cb59687ea..4b6d4f3b5cb41 100644 --- a/source/common/router/debug_config.cc +++ b/source/common/router/debug_config.cc @@ -1,6 +1,6 @@ -#include "common/router/debug_config.h" +#include "source/common/router/debug_config.h" -#include "common/common/macros.h" +#include "source/common/common/macros.h" namespace Envoy { namespace Router { diff --git a/source/common/router/delegating_route_impl.cc b/source/common/router/delegating_route_impl.cc index bdc8ce1dde02f..935a648e9cbeb 100644 --- a/source/common/router/delegating_route_impl.cc +++ b/source/common/router/delegating_route_impl.cc @@ -1,4 +1,4 @@ -#include "common/router/delegating_route_impl.h" +#include "source/common/router/delegating_route_impl.h" namespace Envoy { namespace Router { diff --git a/source/common/router/header_formatter.cc b/source/common/router/header_formatter.cc index aa464deab7832..80482fc17b3bb 100644 --- a/source/common/router/header_formatter.cc +++ b/source/common/router/header_formatter.cc @@ -1,18 +1,18 @@ -#include "common/router/header_formatter.h" +#include "source/common/router/header_formatter.h" #include #include "envoy/router/string_accessor.h" -#include "common/common/fmt.h" -#include "common/common/logger.h" -#include "common/common/thread.h" -#include "common/common/utility.h" -#include "common/config/metadata.h" -#include "common/formatter/substitution_formatter.h" -#include "common/http/header_map_impl.h" -#include "common/json/json_loader.h" -#include "common/stream_info/utility.h" +#include "source/common/common/fmt.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/common/common/utility.h" +#include "source/common/config/metadata.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/json/json_loader.h" +#include "source/common/stream_info/utility.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" diff --git a/source/common/router/header_parser.cc b/source/common/router/header_parser.cc index 5a46d92d7c152..81a9475714447 100644 --- a/source/common/router/header_parser.cc +++ b/source/common/router/header_parser.cc @@ -1,4 +1,4 @@ -#include "common/router/header_parser.h" +#include "source/common/router/header_parser.h" #include #include @@ -6,10 +6,10 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/common/assert.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/protobuf/utility.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_replace.h" diff --git a/source/common/router/header_parser.h b/source/common/router/header_parser.h index 03b1dc65b00c3..2cf52bdef09dd 100644 --- a/source/common/router/header_parser.h +++ b/source/common/router/header_parser.h @@ -7,8 +7,8 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/http/header_map.h" -#include "common/protobuf/protobuf.h" -#include "common/router/header_formatter.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/router/header_formatter.h" namespace Envoy { namespace Router { diff --git a/source/common/router/metadatamatchcriteria_impl.cc b/source/common/router/metadatamatchcriteria_impl.cc index 88cfa4b229fdf..bcfbc733c6d1d 100644 --- a/source/common/router/metadatamatchcriteria_impl.cc +++ b/source/common/router/metadatamatchcriteria_impl.cc @@ -1,4 +1,4 @@ -#include "common/router/metadatamatchcriteria_impl.h" +#include "source/common/router/metadatamatchcriteria_impl.h" namespace Envoy { namespace Router { diff --git a/source/common/router/rds_impl.cc b/source/common/router/rds_impl.cc index cc9c20e2d30e1..b07c7b9bb02b6 100644 --- a/source/common/router/rds_impl.cc +++ b/source/common/router/rds_impl.cc @@ -1,4 +1,4 @@ -#include "common/router/rds_impl.h" +#include "source/common/router/rds_impl.h" #include #include @@ -11,14 +11,14 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/config/api_version.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" -#include "common/http/header_map_impl.h" -#include "common/protobuf/utility.h" -#include "common/router/config_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/config/api_version.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/config_impl.h" namespace Envoy { namespace Router { diff --git a/source/common/router/rds_impl.h b/source/common/router/rds_impl.h index 22182e48d416e..6ea491b88d253 100644 --- a/source/common/router/rds_impl.h +++ b/source/common/router/rds_impl.h @@ -24,15 +24,15 @@ #include "envoy/stats/scope.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/callback_impl.h" -#include "common/common/cleanup.h" -#include "common/common/logger.h" -#include "common/init/manager_impl.h" -#include "common/init/target_impl.h" -#include "common/init/watcher_impl.h" -#include "common/protobuf/utility.h" -#include "common/router/route_config_update_receiver_impl.h" -#include "common/router/vhds.h" +#include "source/common/common/callback_impl.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/logger.h" +#include "source/common/init/manager_impl.h" +#include "source/common/init/target_impl.h" +#include "source/common/init/watcher_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/route_config_update_receiver_impl.h" +#include "source/common/router/vhds.h" #include "absl/container/node_hash_map.h" #include "absl/container/node_hash_set.h" diff --git a/source/common/router/reset_header_parser.cc b/source/common/router/reset_header_parser.cc index f2a7f1581f94d..db73f9f4de3e3 100644 --- a/source/common/router/reset_header_parser.cc +++ b/source/common/router/reset_header_parser.cc @@ -1,8 +1,8 @@ -#include "common/router/reset_header_parser.h" +#include "source/common/router/reset_header_parser.h" #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/strings/numbers.h" diff --git a/source/common/router/reset_header_parser.h b/source/common/router/reset_header_parser.h index 776486d339b18..75f1b26d61cde 100644 --- a/source/common/router/reset_header_parser.h +++ b/source/common/router/reset_header_parser.h @@ -9,7 +9,7 @@ #include "envoy/http/header_map.h" #include "envoy/router/router.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "absl/types/optional.h" diff --git a/source/common/router/retry_state_impl.cc b/source/common/router/retry_state_impl.cc index e39275c5c274d..0b7d86b2c2e7e 100644 --- a/source/common/router/retry_state_impl.cc +++ b/source/common/router/retry_state_impl.cc @@ -1,4 +1,4 @@ -#include "common/router/retry_state_impl.h" +#include "source/common/router/retry_state_impl.h" #include #include @@ -7,12 +7,12 @@ #include "envoy/config/route/v3/route_components.pb.h" -#include "common/common/assert.h" -#include "common/common/utility.h" -#include "common/grpc/common.h" -#include "common/http/codes.h" -#include "common/http/headers.h" -#include "common/http/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/http/codes.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" namespace Envoy { namespace Router { diff --git a/source/common/router/retry_state_impl.h b/source/common/router/retry_state_impl.h index 8931b5bf37516..affa6f9fa0eb6 100644 --- a/source/common/router/retry_state_impl.h +++ b/source/common/router/retry_state_impl.h @@ -11,8 +11,8 @@ #include "envoy/runtime/runtime.h" #include "envoy/upstream/upstream.h" -#include "common/common/backoff_strategy.h" -#include "common/http/header_utility.h" +#include "source/common/common/backoff_strategy.h" +#include "source/common/http/header_utility.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" diff --git a/source/common/router/route_config_update_receiver_impl.cc b/source/common/router/route_config_update_receiver_impl.cc index b3226de028005..61d451ce62910 100644 --- a/source/common/router/route_config_update_receiver_impl.cc +++ b/source/common/router/route_config_update_receiver_impl.cc @@ -1,15 +1,15 @@ -#include "common/router/route_config_update_receiver_impl.h" +#include "source/common/router/route_config_update_receiver_impl.h" #include #include "envoy/config/route/v3/route.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/thread.h" -#include "common/protobuf/utility.h" -#include "common/router/config_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/thread.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/config_impl.h" namespace Envoy { namespace Router { diff --git a/source/common/router/route_config_update_receiver_impl.h b/source/common/router/route_config_update_receiver_impl.h index 4f77bd34156bd..fc07c9f9e3f98 100644 --- a/source/common/router/route_config_update_receiver_impl.h +++ b/source/common/router/route_config_update_receiver_impl.h @@ -9,9 +9,9 @@ #include "envoy/server/factory_context.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/logger.h" -#include "common/protobuf/utility.h" -#include "common/router/config_impl.h" +#include "source/common/common/logger.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/config_impl.h" namespace Envoy { namespace Router { diff --git a/source/common/router/router.cc b/source/common/router/router.cc index ec67fdbd87b0a..4d816305fb010 100644 --- a/source/common/router/router.cc +++ b/source/common/router/router.cc @@ -1,4 +1,4 @@ -#include "common/router/router.h" +#include "source/common/router/router.h" #include #include @@ -15,34 +15,33 @@ #include "envoy/upstream/health_check_host_monitor.h" #include "envoy/upstream/upstream.h" -#include "common/common/assert.h" -#include "common/common/cleanup.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/scope_tracker.h" -#include "common/common/utility.h" -#include "common/config/utility.h" -#include "common/grpc/common.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/network/application_protocol.h" -#include "common/network/socket_option_factory.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/network/upstream_server_name.h" -#include "common/network/upstream_socket_options_filter_state.h" -#include "common/network/upstream_subject_alt_names.h" -#include "common/router/config_impl.h" -#include "common/router/debug_config.h" -#include "common/router/retry_state_impl.h" -#include "common/router/upstream_request.h" -#include "common/runtime/runtime_features.h" -#include "common/stream_info/uint32_accessor_impl.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/scope_tracker.h" +#include "source/common/common/utility.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/network/application_protocol.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/network/upstream_server_name.h" +#include "source/common/network/upstream_socket_options_filter_state.h" +#include "source/common/network/upstream_subject_alt_names.h" +#include "source/common/router/config_impl.h" +#include "source/common/router/debug_config.h" +#include "source/common/router/retry_state_impl.h" +#include "source/common/router/upstream_request.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/stream_info/uint32_accessor_impl.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Router { diff --git a/source/common/router/router.h b/source/common/router/router.h index e0ba5d4bae993..8aa19572a94c8 100644 --- a/source/common/router/router.h +++ b/source/common/router/router.h @@ -19,21 +19,21 @@ #include "envoy/stats/stats_macros.h" #include "envoy/upstream/cluster_manager.h" -#include "common/access_log/access_log_impl.h" -#include "common/buffer/watermark_buffer.h" -#include "common/common/cleanup.h" -#include "common/common/hash.h" -#include "common/common/hex.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" -#include "common/config/well_known_names.h" -#include "common/http/utility.h" -#include "common/router/config_impl.h" -#include "common/router/context_impl.h" -#include "common/router/upstream_request.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stream_info/stream_info_impl.h" -#include "common/upstream/load_balancer_impl.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/hash.h" +#include "source/common/common/hex.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/common/config/well_known_names.h" +#include "source/common/http/utility.h" +#include "source/common/router/config_impl.h" +#include "source/common/router/context_impl.h" +#include "source/common/router/upstream_request.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/common/upstream/load_balancer_impl.h" namespace Envoy { namespace Router { diff --git a/source/common/router/router_ratelimit.cc b/source/common/router/router_ratelimit.cc index 6a194da1df9f8..d7fe0b081ac54 100644 --- a/source/common/router/router_ratelimit.cc +++ b/source/common/router/router_ratelimit.cc @@ -1,4 +1,4 @@ -#include "common/router/router_ratelimit.h" +#include "source/common/router/router_ratelimit.h" #include #include @@ -8,11 +8,11 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/config/route/v3/route_components.pb.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/config/metadata.h" -#include "common/config/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/config/metadata.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Router { diff --git a/source/common/router/router_ratelimit.h b/source/common/router/router_ratelimit.h index b7d592f329740..d4acc92ae48d7 100644 --- a/source/common/router/router_ratelimit.h +++ b/source/common/router/router_ratelimit.h @@ -11,8 +11,8 @@ #include "envoy/router/router.h" #include "envoy/router/router_ratelimit.h" -#include "common/config/metadata.h" -#include "common/http/header_utility.h" +#include "source/common/config/metadata.h" +#include "source/common/http/header_utility.h" #include "absl/types/optional.h" diff --git a/source/common/router/scoped_config_impl.cc b/source/common/router/scoped_config_impl.cc index 4c379e1b7a333..6aafffaf5ce29 100644 --- a/source/common/router/scoped_config_impl.cc +++ b/source/common/router/scoped_config_impl.cc @@ -1,4 +1,4 @@ -#include "common/router/scoped_config_impl.h" +#include "source/common/router/scoped_config_impl.h" #include "envoy/config/route/v3/scoped_route.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" diff --git a/source/common/router/scoped_config_impl.h b/source/common/router/scoped_config_impl.h index 17c6847de79dd..e1783da59255e 100644 --- a/source/common/router/scoped_config_impl.h +++ b/source/common/router/scoped_config_impl.h @@ -10,9 +10,9 @@ #include "envoy/router/scopes.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/hash.h" -#include "common/protobuf/utility.h" -#include "common/router/config_impl.h" +#include "source/common/common/hash.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/config_impl.h" #include "absl/numeric/int128.h" #include "absl/strings/str_format.h" diff --git a/source/common/router/scoped_rds.cc b/source/common/router/scoped_rds.cc index 1e7e6d584972f..949c260a1975b 100644 --- a/source/common/router/scoped_rds.cc +++ b/source/common/router/scoped_rds.cc @@ -1,4 +1,4 @@ -#include "common/router/scoped_rds.h" +#include "source/common/router/scoped_rds.h" #include @@ -9,18 +9,18 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/common/cleanup.h" -#include "common/common/logger.h" -#include "common/common/utility.h" -#include "common/config/api_version.h" -#include "common/config/resource_name.h" -#include "common/config/version_converter.h" -#include "common/config/xds_resource.h" -#include "common/init/manager_impl.h" -#include "common/init/watcher_impl.h" -#include "common/router/rds_impl.h" -#include "common/router/scoped_config_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" +#include "source/common/config/api_version.h" +#include "source/common/config/resource_name.h" +#include "source/common/config/version_converter.h" +#include "source/common/config/xds_resource.h" +#include "source/common/init/manager_impl.h" +#include "source/common/init/watcher_impl.h" +#include "source/common/router/rds_impl.h" +#include "source/common/router/scoped_config_impl.h" #include "absl/strings/str_join.h" diff --git a/source/common/router/scoped_rds.h b/source/common/router/scoped_rds.h index 12fde395b134e..df24117c83ead 100644 --- a/source/common/router/scoped_rds.h +++ b/source/common/router/scoped_rds.h @@ -13,11 +13,11 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/scope.h" -#include "common/config/config_provider_impl.h" -#include "common/config/subscription_base.h" -#include "common/init/manager_impl.h" -#include "common/router/rds_impl.h" -#include "common/router/scoped_config_impl.h" +#include "source/common/config/config_provider_impl.h" +#include "source/common/config/subscription_base.h" +#include "source/common/init/manager_impl.h" +#include "source/common/router/rds_impl.h" +#include "source/common/router/scoped_config_impl.h" namespace Envoy { namespace Router { diff --git a/source/common/router/shadow_writer_impl.cc b/source/common/router/shadow_writer_impl.cc index 89da4c9ef85bb..d07447a13aba5 100644 --- a/source/common/router/shadow_writer_impl.cc +++ b/source/common/router/shadow_writer_impl.cc @@ -1,10 +1,10 @@ -#include "common/router/shadow_writer_impl.h" +#include "source/common/router/shadow_writer_impl.h" #include #include -#include "common/common/assert.h" -#include "common/http/headers.h" +#include "source/common/common/assert.h" +#include "source/common/http/headers.h" #include "absl/strings/str_join.h" diff --git a/source/common/router/tls_context_match_criteria_impl.cc b/source/common/router/tls_context_match_criteria_impl.cc index ee14369720272..128fe5e00e6be 100644 --- a/source/common/router/tls_context_match_criteria_impl.cc +++ b/source/common/router/tls_context_match_criteria_impl.cc @@ -1,4 +1,4 @@ -#include "common/router/tls_context_match_criteria_impl.h" +#include "source/common/router/tls_context_match_criteria_impl.h" #include "envoy/config/route/v3/route_components.pb.h" diff --git a/source/common/router/upstream_request.cc b/source/common/router/upstream_request.cc index 355f577a38bc7..758b2d734cfda 100644 --- a/source/common/router/upstream_request.cc +++ b/source/common/router/upstream_request.cc @@ -1,4 +1,4 @@ -#include "common/router/upstream_request.h" +#include "source/common/router/upstream_request.h" #include #include @@ -15,30 +15,29 @@ #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/upstream.h" -#include "common/common/assert.h" -#include "common/common/dump_state_utils.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/scope_tracker.h" -#include "common/common/utility.h" -#include "common/grpc/common.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/network/application_protocol.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/network/upstream_server_name.h" -#include "common/network/upstream_subject_alt_names.h" -#include "common/router/config_impl.h" -#include "common/router/debug_config.h" -#include "common/router/router.h" -#include "common/stream_info/uint32_accessor_impl.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/common/proxy_protocol/proxy_protocol_header.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/scope_tracker.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/network/application_protocol.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/network/upstream_server_name.h" +#include "source/common/network/upstream_subject_alt_names.h" +#include "source/common/router/config_impl.h" +#include "source/common/router/debug_config.h" +#include "source/common/router/router.h" +#include "source/common/stream_info/uint32_accessor_impl.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Router { @@ -449,8 +448,8 @@ void UpstreamRequest::onPoolReady( // erroneously remove required headers. stream_info_.setResponseFlag(StreamInfo::ResponseFlag::DownstreamProtocolError); const std::string details = - absl::StrCat(StreamInfo::ResponseCodeDetails::get().FilterRemovedRequiredHeaders, "{", - status.message(), "}"); + absl::StrCat(StreamInfo::ResponseCodeDetails::get().FilterRemovedRequiredRequestHeaders, + "{", status.message(), "}"); parent_.callbacks()->sendLocalReply(Http::Code::ServiceUnavailable, status.message(), nullptr, absl::nullopt, details); return; diff --git a/source/common/router/upstream_request.h b/source/common/router/upstream_request.h index 5c0bb6480bc8d..33edf91bf0df2 100644 --- a/source/common/router/upstream_request.h +++ b/source/common/router/upstream_request.h @@ -13,14 +13,14 @@ #include "envoy/stats/scope.h" #include "envoy/tcp/conn_pool.h" -#include "common/buffer/watermark_buffer.h" -#include "common/common/cleanup.h" -#include "common/common/hash.h" -#include "common/common/hex.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" -#include "common/config/well_known_names.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/hash.h" +#include "source/common/common/hex.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/common/config/well_known_names.h" +#include "source/common/stream_info/stream_info_impl.h" namespace Envoy { namespace Router { diff --git a/source/common/router/vhds.cc b/source/common/router/vhds.cc index 572a835344f5c..b291b9af14f5d 100644 --- a/source/common/router/vhds.cc +++ b/source/common/router/vhds.cc @@ -1,4 +1,4 @@ -#include "common/router/vhds.h" +#include "source/common/router/vhds.h" #include #include @@ -10,12 +10,12 @@ #include "envoy/config/subscription.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/config/api_version.h" -#include "common/config/utility.h" -#include "common/protobuf/utility.h" -#include "common/router/config_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/config/api_version.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/config_impl.h" namespace Envoy { namespace Router { diff --git a/source/common/router/vhds.h b/source/common/router/vhds.h index 2e38433c454b1..099b00ff322d9 100644 --- a/source/common/router/vhds.h +++ b/source/common/router/vhds.h @@ -18,10 +18,10 @@ #include "envoy/stats/scope.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/logger.h" -#include "common/config/subscription_base.h" -#include "common/init/target_impl.h" -#include "common/protobuf/utility.h" +#include "source/common/common/logger.h" +#include "source/common/config/subscription_base.h" +#include "source/common/init/target_impl.h" +#include "source/common/protobuf/utility.h" #include "absl/container/node_hash_set.h" diff --git a/source/common/runtime/BUILD b/source/common/runtime/BUILD index 6b2f326d2cb64..ce7a517e9a4a5 100644 --- a/source/common/runtime/BUILD +++ b/source/common/runtime/BUILD @@ -21,7 +21,7 @@ envoy_cc_library( # AVOID ADDING TO THESE DEPENDENCIES IF POSSIBLE # Any code using runtime guards depends on this library, and the more dependencies there are, # the harder it is to runtime-guard without dependency loops. - "//include/envoy/runtime:runtime_interface", + "//envoy/runtime:runtime_interface", "//source/common/common:hash_lib", "//source/common/singleton:const_singleton", ], @@ -33,7 +33,7 @@ envoy_cc_library( "runtime_protos.h", ], deps = [ - "//include/envoy/runtime:runtime_interface", + "//envoy/runtime:runtime_interface", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/type/v3:pkg_cc_proto", @@ -51,14 +51,14 @@ envoy_cc_library( deps = [ ":runtime_features_lib", ":runtime_protos_lib", - "//include/envoy/config:subscription_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/init:manager_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/config:subscription_interface", + "//envoy/event:dispatcher_interface", + "//envoy/init:manager_interface", + "//envoy/runtime:runtime_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:empty_string", "//source/common/common:minimal_logger_lib", "//source/common/common:thread_lib", diff --git a/source/common/runtime/runtime_features.cc b/source/common/runtime/runtime_features.cc index 82f9b46eea368..b1aa82b623822 100644 --- a/source/common/runtime/runtime_features.cc +++ b/source/common/runtime/runtime_features.cc @@ -1,4 +1,4 @@ -#include "common/runtime/runtime_features.h" +#include "source/common/runtime/runtime_features.h" #include "absl/strings/match.h" @@ -87,6 +87,7 @@ constexpr const char* runtime_features[] = { "envoy.reloadable_features.treat_host_like_authority", "envoy.reloadable_features.treat_upstream_connect_timeout_as_connect_failure", "envoy.reloadable_features.udp_per_event_loop_read_limit", + "envoy.reloadable_features.unquote_log_string_values", "envoy.reloadable_features.upstream_host_weight_change_causes_rebuild", "envoy.reloadable_features.use_observable_cluster_name", "envoy.reloadable_features.vhds_heartbeats", diff --git a/source/common/runtime/runtime_features.h b/source/common/runtime/runtime_features.h index 4760d218504c2..deebe3a65c53b 100644 --- a/source/common/runtime/runtime_features.h +++ b/source/common/runtime/runtime_features.h @@ -4,7 +4,7 @@ #include "envoy/runtime/runtime.h" -#include "common/singleton/const_singleton.h" +#include "source/common/singleton/const_singleton.h" #include "absl/container/flat_hash_set.h" diff --git a/source/common/runtime/runtime_impl.cc b/source/common/runtime/runtime_impl.cc index e41a19217f9cb..85a7fc91ecec4 100644 --- a/source/common/runtime/runtime_impl.cc +++ b/source/common/runtime/runtime_impl.cc @@ -1,4 +1,4 @@ -#include "common/runtime/runtime_impl.h" +#include "source/common/runtime/runtime_impl.h" #include #include @@ -12,15 +12,15 @@ #include "envoy/type/v3/percent.pb.h" #include "envoy/type/v3/percent.pb.validate.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/config/api_version.h" -#include "common/filesystem/directory.h" -#include "common/grpc/common.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/config/api_version.h" +#include "source/common/filesystem/directory.h" +#include "source/common/grpc/common.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_features.h" #include "absl/container/node_hash_map.h" #include "absl/container/node_hash_set.h" @@ -28,7 +28,7 @@ #include "absl/strings/numbers.h" #ifdef ENVOY_ENABLE_QUIC -#include "common/quic/platform/quiche_flags_impl.h" +#include "source/common/quic/platform/quiche_flags_impl.h" #endif namespace Envoy { diff --git a/source/common/runtime/runtime_impl.h b/source/common/runtime/runtime_impl.h index 3d99376369677..cd42d479383d6 100644 --- a/source/common/runtime/runtime_impl.h +++ b/source/common/runtime/runtime_impl.h @@ -21,13 +21,13 @@ #include "envoy/type/v3/percent.pb.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/common/thread.h" -#include "common/config/subscription_base.h" -#include "common/init/manager_impl.h" -#include "common/init/target_impl.h" -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/common/config/subscription_base.h" +#include "source/common/init/manager_impl.h" +#include "source/common/init/target_impl.h" +#include "source/common/singleton/threadsafe_singleton.h" #include "absl/container/node_hash_map.h" #include "spdlog/spdlog.h" diff --git a/source/common/runtime/runtime_protos.h b/source/common/runtime/runtime_protos.h index b9d7d2550e9fa..e8b6f2381911b 100644 --- a/source/common/runtime/runtime_protos.h +++ b/source/common/runtime/runtime_protos.h @@ -6,7 +6,7 @@ #include "envoy/runtime/runtime.h" #include "envoy/type/v3/percent.pb.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Runtime { diff --git a/source/common/secret/BUILD b/source/common/secret/BUILD index 84defb7ef88bd..4dc783bc83e32 100644 --- a/source/common/secret/BUILD +++ b/source/common/secret/BUILD @@ -15,8 +15,8 @@ envoy_cc_library( deps = [ ":sds_api_lib", ":secret_provider_impl_lib", - "//include/envoy/secret:secret_manager_interface", - "//include/envoy/server:transport_socket_config_interface", + "//envoy/secret:secret_manager_interface", + "//envoy/server:transport_socket_config_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/config:version_converter_lib", @@ -32,7 +32,7 @@ envoy_cc_library( srcs = ["secret_provider_impl.cc"], hdrs = ["secret_provider_impl.h"], deps = [ - "//include/envoy/secret:secret_provider_interface", + "//envoy/secret:secret_provider_interface", "//source/common/ssl:certificate_validation_context_config_impl_lib", "//source/common/ssl:tls_certificate_config_impl_lib", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", @@ -44,15 +44,15 @@ envoy_cc_library( srcs = ["sds_api.cc"], hdrs = ["sds_api.h"], deps = [ - "//include/envoy/config:subscription_factory_interface", - "//include/envoy/config:subscription_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/init:manager_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/secret:secret_provider_interface", - "//include/envoy/server:transport_socket_config_interface", - "//include/envoy/stats:stats_interface", + "//envoy/config:subscription_factory_interface", + "//envoy/config:subscription_interface", + "//envoy/event:dispatcher_interface", + "//envoy/init:manager_interface", + "//envoy/local_info:local_info_interface", + "//envoy/runtime:runtime_interface", + "//envoy/secret:secret_provider_interface", + "//envoy/server:transport_socket_config_interface", + "//envoy/stats:stats_interface", "//source/common/common:callback_impl_lib", "//source/common/common:cleanup_lib", "//source/common/config:api_version_lib", diff --git a/source/common/secret/sds_api.cc b/source/common/secret/sds_api.cc index 0c9323c4f7f3f..03dba0ccfe555 100644 --- a/source/common/secret/sds_api.cc +++ b/source/common/secret/sds_api.cc @@ -1,13 +1,13 @@ -#include "common/secret/sds_api.h" +#include "source/common/secret/sds_api.h" #include "envoy/api/v2/auth/cert.pb.h" #include "envoy/config/core/v3/config_source.pb.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/config/api_version.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/config/api_version.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Secret { diff --git a/source/common/secret/sds_api.h b/source/common/secret/sds_api.h index 74edb0fb857dc..a29cfdace2cc4 100644 --- a/source/common/secret/sds_api.h +++ b/source/common/secret/sds_api.h @@ -19,14 +19,14 @@ #include "envoy/stats/stats.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/callback_impl.h" -#include "common/common/cleanup.h" -#include "common/config/subscription_base.h" -#include "common/config/utility.h" -#include "common/config/watched_directory.h" -#include "common/init/target_impl.h" -#include "common/ssl/certificate_validation_context_config_impl.h" -#include "common/ssl/tls_certificate_config_impl.h" +#include "source/common/common/callback_impl.h" +#include "source/common/common/cleanup.h" +#include "source/common/config/subscription_base.h" +#include "source/common/config/utility.h" +#include "source/common/config/watched_directory.h" +#include "source/common/init/target_impl.h" +#include "source/common/ssl/certificate_validation_context_config_impl.h" +#include "source/common/ssl/tls_certificate_config_impl.h" namespace Envoy { namespace Secret { diff --git a/source/common/secret/secret_manager_impl.cc b/source/common/secret/secret_manager_impl.cc index f99a1205caa0f..0d583128c6c43 100644 --- a/source/common/secret/secret_manager_impl.cc +++ b/source/common/secret/secret_manager_impl.cc @@ -1,4 +1,4 @@ -#include "common/secret/secret_manager_impl.h" +#include "source/common/secret/secret_manager_impl.h" #include "envoy/admin/v3/config_dump.pb.h" #include "envoy/common/exception.h" @@ -6,14 +6,14 @@ #include "envoy/config/core/v3/config_source.pb.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/config/version_converter.h" -#include "common/protobuf/utility.h" -#include "common/secret/sds_api.h" -#include "common/secret/secret_provider_impl.h" -#include "common/ssl/certificate_validation_context_config_impl.h" -#include "common/ssl/tls_certificate_config_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/config/version_converter.h" +#include "source/common/protobuf/utility.h" +#include "source/common/secret/sds_api.h" +#include "source/common/secret/secret_provider_impl.h" +#include "source/common/ssl/certificate_validation_context_config_impl.h" +#include "source/common/ssl/tls_certificate_config_impl.h" namespace Envoy { namespace Secret { diff --git a/source/common/secret/secret_manager_impl.h b/source/common/secret/secret_manager_impl.h index a3045a87b4da5..66ca9e4435818 100644 --- a/source/common/secret/secret_manager_impl.h +++ b/source/common/secret/secret_manager_impl.h @@ -8,8 +8,8 @@ #include "envoy/ssl/certificate_validation_context_config.h" #include "envoy/ssl/tls_certificate_config.h" -#include "common/common/logger.h" -#include "common/secret/sds_api.h" +#include "source/common/common/logger.h" +#include "source/common/secret/sds_api.h" #include "absl/container/node_hash_map.h" diff --git a/source/common/secret/secret_provider_impl.cc b/source/common/secret/secret_provider_impl.cc index 0513c2180a417..6aed80d0107c0 100644 --- a/source/common/secret/secret_provider_impl.cc +++ b/source/common/secret/secret_provider_impl.cc @@ -1,10 +1,10 @@ -#include "common/secret/secret_provider_impl.h" +#include "source/common/secret/secret_provider_impl.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" -#include "common/common/assert.h" -#include "common/ssl/certificate_validation_context_config_impl.h" -#include "common/ssl/tls_certificate_config_impl.h" +#include "source/common/common/assert.h" +#include "source/common/ssl/certificate_validation_context_config_impl.h" +#include "source/common/ssl/tls_certificate_config_impl.h" namespace Envoy { namespace Secret { diff --git a/source/common/shared_pool/BUILD b/source/common/shared_pool/BUILD index 1d55c9ec99a03..9ed361337a47b 100644 --- a/source/common/shared_pool/BUILD +++ b/source/common/shared_pool/BUILD @@ -14,8 +14,8 @@ envoy_cc_library( "shared_pool.h", ], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/singleton:instance_interface", + "//envoy/event:dispatcher_interface", + "//envoy/singleton:instance_interface", "//source/common/common:assert_lib", "//source/common/common:non_copyable", "//source/common/common:thread_synchronizer_lib", diff --git a/source/common/shared_pool/shared_pool.h b/source/common/shared_pool/shared_pool.h index d7119d17140f7..2e1f2309507aa 100644 --- a/source/common/shared_pool/shared_pool.h +++ b/source/common/shared_pool/shared_pool.h @@ -8,9 +8,9 @@ #include "envoy/event/dispatcher.h" #include "envoy/singleton/instance.h" -#include "common/common/assert.h" -#include "common/common/non_copyable.h" -#include "common/common/thread_synchronizer.h" +#include "source/common/common/assert.h" +#include "source/common/common/non_copyable.h" +#include "source/common/common/thread_synchronizer.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/signal/BUILD b/source/common/signal/BUILD index 893f2fa78454b..9c825d1d9928e 100644 --- a/source/common/signal/BUILD +++ b/source/common/signal/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( hdrs = ["fatal_error_handler.h"], deps = [ ":fatal_action_lib", - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "//source/common/common:macros", ], ) @@ -37,7 +37,7 @@ envoy_cc_library( name = "fatal_action_lib", hdrs = ["fatal_action.h"], deps = [ - "//include/envoy/server:fatal_action_interface", - "//include/envoy/thread:thread_interface", + "//envoy/server:fatal_action_interface", + "//envoy/thread:thread_interface", ], ) diff --git a/source/common/signal/fatal_error_handler.cc b/source/common/signal/fatal_error_handler.cc index 627c352415b10..baf1ea267b579 100644 --- a/source/common/signal/fatal_error_handler.cc +++ b/source/common/signal/fatal_error_handler.cc @@ -1,13 +1,13 @@ -#include "common/signal/fatal_error_handler.h" +#include "source/common/signal/fatal_error_handler.h" #include #include #include "envoy/event/dispatcher.h" -#include "common/common/assert.h" -#include "common/common/macros.h" -#include "common/signal/fatal_action.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/common/signal/fatal_action.h" #include "absl/base/attributes.h" #include "absl/synchronization/mutex.h" diff --git a/source/common/signal/fatal_error_handler.h b/source/common/signal/fatal_error_handler.h index d7d25013432d0..afcb152f9d635 100644 --- a/source/common/signal/fatal_error_handler.h +++ b/source/common/signal/fatal_error_handler.h @@ -4,7 +4,7 @@ #include "envoy/common/pure.h" -#include "common/signal/fatal_action.h" +#include "source/common/signal/fatal_action.h" namespace Envoy { diff --git a/source/common/signal/signal_action.cc b/source/common/signal/signal_action.cc index dea90f1cc1f4c..aec06302ef8f6 100644 --- a/source/common/signal/signal_action.cc +++ b/source/common/signal/signal_action.cc @@ -1,12 +1,12 @@ -#include "common/signal/signal_action.h" +#include "source/common/signal/signal_action.h" #include #include -#include "common/common/assert.h" -#include "common/signal/fatal_action.h" -#include "common/version/version.h" +#include "source/common/common/assert.h" +#include "source/common/signal/fatal_action.h" +#include "source/common/version/version.h" namespace Envoy { diff --git a/source/common/signal/signal_action.h b/source/common/signal/signal_action.h index ffabf9cc3cde3..79bc2ab30c765 100644 --- a/source/common/signal/signal_action.h +++ b/source/common/signal/signal_action.h @@ -6,10 +6,9 @@ #include #include -#include "common/common/non_copyable.h" -#include "common/signal/fatal_error_handler.h" - -#include "server/backtrace.h" +#include "source/common/common/non_copyable.h" +#include "source/common/signal/fatal_error_handler.h" +#include "source/server/backtrace.h" namespace Envoy { diff --git a/source/common/singleton/BUILD b/source/common/singleton/BUILD index 06d67beae1b50..728c2ed78213a 100644 --- a/source/common/singleton/BUILD +++ b/source/common/singleton/BUILD @@ -18,8 +18,8 @@ envoy_cc_library( srcs = ["manager_impl.cc"], hdrs = ["manager_impl.h"], deps = [ - "//include/envoy/registry", - "//include/envoy/singleton:manager_interface", + "//envoy/registry", + "//envoy/singleton:manager_interface", "//source/common/common:assert_lib", "//source/common/common:non_copyable", "//source/common/common:thread_lib", diff --git a/source/common/singleton/manager_impl.cc b/source/common/singleton/manager_impl.cc index e90d3b000c63b..cca7ac2bc6b8d 100644 --- a/source/common/singleton/manager_impl.cc +++ b/source/common/singleton/manager_impl.cc @@ -1,9 +1,9 @@ -#include "common/singleton/manager_impl.h" +#include "source/common/singleton/manager_impl.h" #include "envoy/registry/registry.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" namespace Envoy { namespace Singleton { diff --git a/source/common/singleton/manager_impl.h b/source/common/singleton/manager_impl.h index e6eb8cb9af97a..32de2d1127501 100644 --- a/source/common/singleton/manager_impl.h +++ b/source/common/singleton/manager_impl.h @@ -3,7 +3,7 @@ #include "envoy/singleton/manager.h" #include "envoy/thread/thread.h" -#include "common/common/non_copyable.h" +#include "source/common/common/non_copyable.h" #include "absl/container/node_hash_map.h" diff --git a/source/common/singleton/threadsafe_singleton.h b/source/common/singleton/threadsafe_singleton.h index c60a4bb06be31..f88ae9ed161a2 100644 --- a/source/common/singleton/threadsafe_singleton.h +++ b/source/common/singleton/threadsafe_singleton.h @@ -2,7 +2,7 @@ #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/base/call_once.h" @@ -74,7 +74,7 @@ template std::atomic InjectableSingleton::loader_ = nullptr; template class ScopedInjectableLoader { public: - ScopedInjectableLoader(std::unique_ptr&& instance) { + explicit ScopedInjectableLoader(std::unique_ptr&& instance) { instance_ = std::move(instance); InjectableSingleton::initialize(instance_.get()); } @@ -84,4 +84,24 @@ template class ScopedInjectableLoader { std::unique_ptr instance_; }; +// This class saves the singleton object and restore the original singleton at destroy. This class +// is not thread safe. It can be used in single thread test. +template +class StackedScopedInjectableLoader : + // To access the protected loader_. + protected InjectableSingleton { +public: + explicit StackedScopedInjectableLoader(std::unique_ptr&& instance) { + original_loader_ = InjectableSingleton::getExisting(); + InjectableSingleton::clear(); + instance_ = std::move(instance); + InjectableSingleton::initialize(instance_.get()); + } + ~StackedScopedInjectableLoader() { InjectableSingleton::loader_ = original_loader_; } + +private: + std::unique_ptr instance_; + T* original_loader_; +}; + } // namespace Envoy diff --git a/source/common/ssl/BUILD b/source/common/ssl/BUILD index c02d221dd5281..714c426b930f3 100644 --- a/source/common/ssl/BUILD +++ b/source/common/ssl/BUILD @@ -13,9 +13,9 @@ envoy_cc_library( srcs = ["tls_certificate_config_impl.cc"], hdrs = ["tls_certificate_config_impl.h"], deps = [ - "//include/envoy/server:transport_socket_config_interface", - "//include/envoy/ssl:tls_certificate_config_interface", - "//include/envoy/ssl/private_key:private_key_interface", + "//envoy/server:transport_socket_config_interface", + "//envoy/ssl:tls_certificate_config_interface", + "//envoy/ssl/private_key:private_key_interface", "//source/common/common:empty_string", "//source/common/config:datasource_lib", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", @@ -28,8 +28,8 @@ envoy_cc_library( hdrs = ["certificate_validation_context_config_impl.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/ssl:certificate_validation_context_config_interface", + "//envoy/api:api_interface", + "//envoy/ssl:certificate_validation_context_config_interface", "//source/common/common:empty_string", "//source/common/config:datasource_lib", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", diff --git a/source/common/ssl/certificate_validation_context_config_impl.cc b/source/common/ssl/certificate_validation_context_config_impl.cc index 8198290b6ab8f..4782127e99ecc 100644 --- a/source/common/ssl/certificate_validation_context_config_impl.cc +++ b/source/common/ssl/certificate_validation_context_config_impl.cc @@ -1,11 +1,11 @@ -#include "common/ssl/certificate_validation_context_config_impl.h" +#include "source/common/ssl/certificate_validation_context_config_impl.h" #include "envoy/common/exception.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/config/datasource.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/config/datasource.h" namespace Envoy { namespace Ssl { diff --git a/source/common/ssl/tls_certificate_config_impl.cc b/source/common/ssl/tls_certificate_config_impl.cc index 7a4d4f64ed2a9..1c5073d1ff1ea 100644 --- a/source/common/ssl/tls_certificate_config_impl.cc +++ b/source/common/ssl/tls_certificate_config_impl.cc @@ -1,12 +1,12 @@ -#include "common/ssl/tls_certificate_config_impl.h" +#include "source/common/ssl/tls_certificate_config_impl.h" #include "envoy/common/exception.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" #include "envoy/server/transport_socket_config.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/config/datasource.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/config/datasource.h" namespace Envoy { namespace Ssl { diff --git a/source/common/stats/BUILD b/source/common/stats/BUILD index 4e1d1dc29e694..8391ecfd2c4d2 100644 --- a/source/common/stats/BUILD +++ b/source/common/stats/BUILD @@ -54,7 +54,7 @@ envoy_cc_library( ":stats_lib", ":store_impl_lib", ":tag_utility_lib", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_macros", "//source/common/stats:allocator_lib", ], ) @@ -65,7 +65,7 @@ envoy_cc_library( hdrs = ["metric_impl.h"], deps = [ ":symbol_table_lib", - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", "//source/common/common:assert_lib", ], ) @@ -76,8 +76,8 @@ envoy_cc_library( hdrs = ["tag_utility.h"], deps = [ ":symbol_table_lib", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:symbol_table_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:symbol_table_interface", ], ) @@ -87,7 +87,7 @@ envoy_cc_library( deps = [ ":metric_impl_lib", ":symbol_table_lib", - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", ], ) @@ -97,7 +97,7 @@ envoy_cc_library( deps = [ ":metric_impl_lib", ":symbol_table_lib", - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", ], ) @@ -107,7 +107,7 @@ envoy_cc_library( deps = [ ":metric_impl_lib", ":symbol_table_lib", - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", ], ) @@ -125,7 +125,7 @@ envoy_cc_library( hdrs = ["store_impl.h"], deps = [ ":symbol_table_lib", - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", ], ) @@ -136,7 +136,7 @@ envoy_cc_library( deps = [ ":symbol_table_lib", ":utility_lib", - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", ], ) @@ -146,7 +146,7 @@ envoy_cc_library( hdrs = ["stat_merger.h"], deps = [ ":symbol_table_lib", - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", "//source/common/protobuf", ], ) @@ -159,9 +159,9 @@ envoy_cc_library( ":symbol_table_lib", ":tag_extractor_lib", ":utility_lib", - "//include/envoy/common:time_interface", - "//include/envoy/server:options_interface", - "//include/envoy/stats:stats_interface", + "//envoy/common:time_interface", + "//envoy/server:options_interface", + "//envoy/stats:stats_interface", "//source/common/common:assert_lib", "//source/common/common:hash_lib", "//source/common/common:non_copyable", @@ -180,7 +180,7 @@ envoy_cc_library( external_deps = ["abseil_base"], deps = [ ":recent_lookups_lib", - "//include/envoy/stats:symbol_table_interface", + "//envoy/stats:symbol_table_interface", "//source/common/common:assert_lib", "//source/common/common:mem_block_builder_lib", "//source/common/common:minimal_logger_lib", @@ -194,7 +194,7 @@ envoy_cc_library( srcs = ["tag_extractor_impl.cc"], hdrs = ["tag_extractor_impl.h"], deps = [ - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", "//source/common/common:assert_lib", "//source/common/common:perf_annotation_lib", "//source/common/common:regex_lib", @@ -210,7 +210,7 @@ envoy_cc_library( ":symbol_table_lib", ":tag_extractor_lib", ":utility_lib", - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", "//source/common/common:perf_annotation_lib", "//source/common/config:well_known_names", "//source/common/protobuf", @@ -223,7 +223,7 @@ envoy_cc_library( srcs = ["stats_matcher_impl.cc"], hdrs = ["stats_matcher_impl.h"], deps = [ - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", "//source/common/common:matchers_lib", "//source/common/protobuf", "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto", @@ -245,7 +245,7 @@ envoy_cc_library( ":stats_matcher_lib", ":tag_producer_lib", ":tag_utility_lib", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/thread_local:thread_local_interface", ], ) @@ -254,9 +254,9 @@ envoy_cc_library( srcs = ["timespan_impl.cc"], hdrs = ["timespan_impl.h"], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:timespan_interface", + "//envoy/common:time_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:timespan_interface", "//source/common/common:assert_lib", ], ) @@ -267,6 +267,6 @@ envoy_cc_library( hdrs = ["utility.h"], deps = [ ":symbol_table_lib", - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", ], ) diff --git a/source/common/stats/allocator_impl.cc b/source/common/stats/allocator_impl.cc index 63e3159a842ed..3c64b6ba49511 100644 --- a/source/common/stats/allocator_impl.cc +++ b/source/common/stats/allocator_impl.cc @@ -1,19 +1,19 @@ -#include "common/stats/allocator_impl.h" +#include "source/common/stats/allocator_impl.h" #include #include "envoy/stats/stats.h" #include "envoy/stats/symbol_table.h" -#include "common/common/hash.h" -#include "common/common/lock_guard.h" -#include "common/common/logger.h" -#include "common/common/thread.h" -#include "common/common/thread_annotations.h" -#include "common/common/utility.h" -#include "common/stats/metric_impl.h" -#include "common/stats/stat_merger.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/common/hash.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/common/common/thread_annotations.h" +#include "source/common/common/utility.h" +#include "source/common/stats/metric_impl.h" +#include "source/common/stats/stat_merger.h" +#include "source/common/stats/symbol_table_impl.h" #include "absl/container/flat_hash_set.h" diff --git a/source/common/stats/allocator_impl.h b/source/common/stats/allocator_impl.h index 469484866f18a..db656e2e40134 100644 --- a/source/common/stats/allocator_impl.h +++ b/source/common/stats/allocator_impl.h @@ -6,8 +6,8 @@ #include "envoy/stats/stats.h" #include "envoy/stats/symbol_table.h" -#include "common/common/thread_synchronizer.h" -#include "common/stats/metric_impl.h" +#include "source/common/common/thread_synchronizer.h" +#include "source/common/stats/metric_impl.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" diff --git a/source/common/stats/histogram_impl.cc b/source/common/stats/histogram_impl.cc index a2b866dc112d3..cac5903393183 100644 --- a/source/common/stats/histogram_impl.cc +++ b/source/common/stats/histogram_impl.cc @@ -1,9 +1,9 @@ -#include "common/stats/histogram_impl.h" +#include "source/common/stats/histogram_impl.h" #include #include -#include "common/common/utility.h" +#include "source/common/common/utility.h" #include "absl/strings/str_join.h" diff --git a/source/common/stats/histogram_impl.h b/source/common/stats/histogram_impl.h index 67c2d7d170668..4090434f46edd 100644 --- a/source/common/stats/histogram_impl.h +++ b/source/common/stats/histogram_impl.h @@ -8,9 +8,9 @@ #include "envoy/stats/stats.h" #include "envoy/stats/store.h" -#include "common/common/matchers.h" -#include "common/common/non_copyable.h" -#include "common/stats/metric_impl.h" +#include "source/common/common/matchers.h" +#include "source/common/common/non_copyable.h" +#include "source/common/stats/metric_impl.h" #include "circllhist.h" diff --git a/source/common/stats/isolated_store_impl.cc b/source/common/stats/isolated_store_impl.cc index ab419e6ecae1e..47cf0b3fc5c07 100644 --- a/source/common/stats/isolated_store_impl.cc +++ b/source/common/stats/isolated_store_impl.cc @@ -1,13 +1,13 @@ -#include "common/stats/isolated_store_impl.h" +#include "source/common/stats/isolated_store_impl.h" #include #include #include -#include "common/common/utility.h" -#include "common/stats/histogram_impl.h" -#include "common/stats/scope_prefixer.h" -#include "common/stats/utility.h" +#include "source/common/common/utility.h" +#include "source/common/stats/histogram_impl.h" +#include "source/common/stats/scope_prefixer.h" +#include "source/common/stats/utility.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/isolated_store_impl.h b/source/common/stats/isolated_store_impl.h index 669f115d623ae..f0f924ebda541 100644 --- a/source/common/stats/isolated_store_impl.h +++ b/source/common/stats/isolated_store_impl.h @@ -7,14 +7,14 @@ #include "envoy/stats/stats.h" #include "envoy/stats/store.h" -#include "common/common/utility.h" -#include "common/stats/allocator_impl.h" -#include "common/stats/null_counter.h" -#include "common/stats/null_gauge.h" -#include "common/stats/store_impl.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/tag_utility.h" -#include "common/stats/utility.h" +#include "source/common/common/utility.h" +#include "source/common/stats/allocator_impl.h" +#include "source/common/stats/null_counter.h" +#include "source/common/stats/null_gauge.h" +#include "source/common/stats/store_impl.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/tag_utility.h" +#include "source/common/stats/utility.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/stats/metric_impl.cc b/source/common/stats/metric_impl.cc index 12801e90fafe4..7a43ce886e3e5 100644 --- a/source/common/stats/metric_impl.cc +++ b/source/common/stats/metric_impl.cc @@ -1,8 +1,8 @@ -#include "common/stats/metric_impl.h" +#include "source/common/stats/metric_impl.h" #include "envoy/stats/tag.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/metric_impl.h b/source/common/stats/metric_impl.h index 52b577230fd3b..e188f1abe7942 100644 --- a/source/common/stats/metric_impl.h +++ b/source/common/stats/metric_impl.h @@ -7,8 +7,8 @@ #include "envoy/stats/stats.h" #include "envoy/stats/tag.h" -#include "common/common/assert.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/common/assert.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/null_counter.h b/source/common/stats/null_counter.h index 61e86d16b6449..074349125a3f0 100644 --- a/source/common/stats/null_counter.h +++ b/source/common/stats/null_counter.h @@ -2,7 +2,7 @@ #include "envoy/stats/stats.h" -#include "common/stats/metric_impl.h" +#include "source/common/stats/metric_impl.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/null_gauge.h b/source/common/stats/null_gauge.h index bbd8b2e507359..2c12f923aeda0 100644 --- a/source/common/stats/null_gauge.h +++ b/source/common/stats/null_gauge.h @@ -2,7 +2,7 @@ #include "envoy/stats/stats.h" -#include "common/stats/metric_impl.h" +#include "source/common/stats/metric_impl.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/null_text_readout.h b/source/common/stats/null_text_readout.h index da6c0976abf74..4cb01d74c9a80 100644 --- a/source/common/stats/null_text_readout.h +++ b/source/common/stats/null_text_readout.h @@ -2,7 +2,7 @@ #include "envoy/stats/stats.h" -#include "common/stats/metric_impl.h" +#include "source/common/stats/metric_impl.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/recent_lookups.cc b/source/common/stats/recent_lookups.cc index 994441cccb025..243208b88ba97 100644 --- a/source/common/stats/recent_lookups.cc +++ b/source/common/stats/recent_lookups.cc @@ -1,6 +1,6 @@ -#include "common/stats/recent_lookups.h" +#include "source/common/stats/recent_lookups.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/scope_prefixer.cc b/source/common/stats/scope_prefixer.cc index 0bdfe99354665..cbe4c3b1c45e6 100644 --- a/source/common/stats/scope_prefixer.cc +++ b/source/common/stats/scope_prefixer.cc @@ -1,9 +1,9 @@ -#include "common/stats/scope_prefixer.h" +#include "source/common/stats/scope_prefixer.h" #include "envoy/stats/scope.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/utility.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/utility.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/scope_prefixer.h b/source/common/stats/scope_prefixer.h index 5f64c08149650..4e1301d356e15 100644 --- a/source/common/stats/scope_prefixer.h +++ b/source/common/stats/scope_prefixer.h @@ -2,7 +2,7 @@ #include "envoy/stats/scope.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/stat_merger.cc b/source/common/stats/stat_merger.cc index 870866a2615e7..8b772483d8cb3 100644 --- a/source/common/stats/stat_merger.cc +++ b/source/common/stats/stat_merger.cc @@ -1,4 +1,4 @@ -#include "common/stats/stat_merger.h" +#include "source/common/stats/stat_merger.h" #include diff --git a/source/common/stats/stat_merger.h b/source/common/stats/stat_merger.h index 6dbf01d25aa3a..3a9fb6c3093fd 100644 --- a/source/common/stats/stat_merger.h +++ b/source/common/stats/stat_merger.h @@ -2,8 +2,8 @@ #include "envoy/stats/store.h" -#include "common/protobuf/protobuf.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/stats/symbol_table_impl.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/stats/stats_matcher_impl.cc b/source/common/stats/stats_matcher_impl.cc index 3a5793bb651e3..01b0049771f03 100644 --- a/source/common/stats/stats_matcher_impl.cc +++ b/source/common/stats/stats_matcher_impl.cc @@ -1,11 +1,11 @@ -#include "common/stats/stats_matcher_impl.h" +#include "source/common/stats/stats_matcher_impl.h" #include #include #include "envoy/config/metrics/v3/stats.pb.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/stats_matcher_impl.h b/source/common/stats/stats_matcher_impl.h index a47b2a7b9f25a..de8ece9a02da2 100644 --- a/source/common/stats/stats_matcher_impl.h +++ b/source/common/stats/stats_matcher_impl.h @@ -5,8 +5,8 @@ #include "envoy/config/metrics/v3/stats.pb.h" #include "envoy/stats/stats_matcher.h" -#include "common/common/matchers.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/matchers.h" +#include "source/common/protobuf/protobuf.h" #include "absl/strings/string_view.h" diff --git a/source/common/stats/store_impl.h b/source/common/stats/store_impl.h index e4a83f7514372..e4de8fe918b20 100644 --- a/source/common/stats/store_impl.h +++ b/source/common/stats/store_impl.h @@ -3,7 +3,7 @@ #include "envoy/stats/stats.h" #include "envoy/stats/store.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/symbol_table_impl.cc b/source/common/stats/symbol_table_impl.cc index 22529eadab7ea..a60fa31d9b426 100644 --- a/source/common/stats/symbol_table_impl.cc +++ b/source/common/stats/symbol_table_impl.cc @@ -1,13 +1,13 @@ -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" #include #include #include #include -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/common/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" #include "absl/strings/str_cat.h" diff --git a/source/common/stats/symbol_table_impl.h b/source/common/stats/symbol_table_impl.h index 96db24124a6ba..cee896e649fa3 100644 --- a/source/common/stats/symbol_table_impl.h +++ b/source/common/stats/symbol_table_impl.h @@ -10,14 +10,14 @@ #include "envoy/common/exception.h" #include "envoy/stats/symbol_table.h" -#include "common/common/assert.h" -#include "common/common/hash.h" -#include "common/common/lock_guard.h" -#include "common/common/mem_block_builder.h" -#include "common/common/non_copyable.h" -#include "common/common/thread.h" -#include "common/common/utility.h" -#include "common/stats/recent_lookups.h" +#include "source/common/common/assert.h" +#include "source/common/common/hash.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/mem_block_builder.h" +#include "source/common/common/non_copyable.h" +#include "source/common/common/thread.h" +#include "source/common/common/utility.h" +#include "source/common/stats/recent_lookups.h" #include "absl/container/fixed_array.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/stats/tag_extractor_impl.cc b/source/common/stats/tag_extractor_impl.cc index 337de441f4563..752bcf73af61a 100644 --- a/source/common/stats/tag_extractor_impl.cc +++ b/source/common/stats/tag_extractor_impl.cc @@ -1,14 +1,14 @@ -#include "common/stats/tag_extractor_impl.h" +#include "source/common/stats/tag_extractor_impl.h" #include #include #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/perf_annotation.h" -#include "common/common/regex.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/perf_annotation.h" +#include "source/common/common/regex.h" #include "absl/strings/ascii.h" #include "absl/strings/match.h" @@ -136,7 +136,7 @@ bool TagExtractorStdRegexImpl::extractTag(TagExtractionContext& context, std::ve TagExtractorRe2Impl::TagExtractorRe2Impl(absl::string_view name, absl::string_view regex, absl::string_view substr) - : TagExtractorImplBase(name, regex, substr), regex_(regex) {} + : TagExtractorImplBase(name, regex, substr), regex_(std::string(regex)) {} bool TagExtractorRe2Impl::extractTag(TagExtractionContext& context, std::vector& tags, IntervalSet& remove_characters) const { @@ -186,7 +186,7 @@ TagExtractorTokensImpl::TagExtractorTokensImpl(absl::string_view name, absl::str if (!tokens_.empty()) { const absl::string_view first = tokens_[0]; if (first != "$" && first != "*" && first != "**") { - prefix_ = first; + prefix_ = std::string(first); } } } @@ -236,7 +236,7 @@ bool TagExtractorTokensImpl::extractTag(TagExtractionContext& context, std::vect } else if (start > 0) { --start; // Remove the dot prior to the lat token, e.g. ".ef" } - addTag(tags) = tag_value; + addTag(tags) = std::string(tag_value); remove_characters.insert(start, end); PERF_RECORD(perf, "tokens-match", name_); diff --git a/source/common/stats/tag_extractor_impl.h b/source/common/stats/tag_extractor_impl.h index a6ea3d7bb779a..2da63cd173f60 100644 --- a/source/common/stats/tag_extractor_impl.h +++ b/source/common/stats/tag_extractor_impl.h @@ -10,7 +10,7 @@ #include "envoy/stats/tag_extractor.h" -#include "common/common/regex.h" +#include "source/common/common/regex.h" #include "absl/strings/string_view.h" #include "re2/re2.h" diff --git a/source/common/stats/tag_producer_impl.cc b/source/common/stats/tag_producer_impl.cc index 81843def060fb..85384e7eb2ec2 100644 --- a/source/common/stats/tag_producer_impl.cc +++ b/source/common/stats/tag_producer_impl.cc @@ -1,12 +1,12 @@ -#include "common/stats/tag_producer_impl.h" +#include "source/common/stats/tag_producer_impl.h" #include #include "envoy/common/exception.h" #include "envoy/config/metrics/v3/stats.pb.h" -#include "common/common/utility.h" -#include "common/stats/tag_extractor_impl.h" +#include "source/common/common/utility.h" +#include "source/common/stats/tag_extractor_impl.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/tag_producer_impl.h b/source/common/stats/tag_producer_impl.h index 093d4021389b8..ff5dc3d34fb10 100644 --- a/source/common/stats/tag_producer_impl.h +++ b/source/common/stats/tag_producer_impl.h @@ -10,10 +10,10 @@ #include "envoy/stats/tag_extractor.h" #include "envoy/stats/tag_producer.h" -#include "common/common/hash.h" -#include "common/common/utility.h" -#include "common/config/well_known_names.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/hash.h" +#include "source/common/common/utility.h" +#include "source/common/config/well_known_names.h" +#include "source/common/protobuf/protobuf.h" #include "absl/container/flat_hash_map.h" #include "absl/container/node_hash_set.h" diff --git a/source/common/stats/tag_utility.cc b/source/common/stats/tag_utility.cc index 7710277fd5ba2..b73ff3d81fe20 100644 --- a/source/common/stats/tag_utility.cc +++ b/source/common/stats/tag_utility.cc @@ -1,6 +1,6 @@ -#include "common/stats/tag_utility.h" +#include "source/common/stats/tag_utility.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/tag_utility.h b/source/common/stats/tag_utility.h index 0aeacbaf53ae2..b3e56e7737b3d 100644 --- a/source/common/stats/tag_utility.h +++ b/source/common/stats/tag_utility.h @@ -3,7 +3,7 @@ #include "envoy/stats/symbol_table.h" #include "envoy/stats/tag.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/thread_local_store.cc b/source/common/stats/thread_local_store.cc index 78dda479cf821..de7b0c061a191 100644 --- a/source/common/stats/thread_local_store.cc +++ b/source/common/stats/thread_local_store.cc @@ -1,4 +1,4 @@ -#include "common/stats/thread_local_store.h" +#include "source/common/stats/thread_local_store.h" #include #include @@ -11,11 +11,11 @@ #include "envoy/stats/sink.h" #include "envoy/stats/stats.h" -#include "common/common/lock_guard.h" -#include "common/stats/histogram_impl.h" -#include "common/stats/stats_matcher_impl.h" -#include "common/stats/tag_producer_impl.h" -#include "common/stats/tag_utility.h" +#include "source/common/common/lock_guard.h" +#include "source/common/stats/histogram_impl.h" +#include "source/common/stats/stats_matcher_impl.h" +#include "source/common/stats/tag_producer_impl.h" +#include "source/common/stats/tag_utility.h" #include "absl/strings/str_join.h" diff --git a/source/common/stats/thread_local_store.h b/source/common/stats/thread_local_store.h index bc76c13c9aa92..ecc359841bce0 100644 --- a/source/common/stats/thread_local_store.h +++ b/source/common/stats/thread_local_store.h @@ -10,15 +10,15 @@ #include "envoy/stats/tag.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/hash.h" -#include "common/common/thread_synchronizer.h" -#include "common/stats/allocator_impl.h" -#include "common/stats/histogram_impl.h" -#include "common/stats/null_counter.h" -#include "common/stats/null_gauge.h" -#include "common/stats/null_text_readout.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/utility.h" +#include "source/common/common/hash.h" +#include "source/common/common/thread_synchronizer.h" +#include "source/common/stats/allocator_impl.h" +#include "source/common/stats/histogram_impl.h" +#include "source/common/stats/null_counter.h" +#include "source/common/stats/null_gauge.h" +#include "source/common/stats/null_text_readout.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/utility.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" diff --git a/source/common/stats/timespan_impl.cc b/source/common/stats/timespan_impl.cc index 4c63172389262..33875c0656a4c 100644 --- a/source/common/stats/timespan_impl.cc +++ b/source/common/stats/timespan_impl.cc @@ -1,7 +1,7 @@ -#include "common/stats/timespan_impl.h" +#include "source/common/stats/timespan_impl.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" namespace Envoy { namespace Stats { diff --git a/source/common/stats/utility.cc b/source/common/stats/utility.cc index d6b8917f826d0..a4e5574713e23 100644 --- a/source/common/stats/utility.cc +++ b/source/common/stats/utility.cc @@ -1,4 +1,4 @@ -#include "common/stats/utility.h" +#include "source/common/stats/utility.h" #include #include diff --git a/source/common/stats/utility.h b/source/common/stats/utility.h index 926aace1004d7..2ef817b61c171 100644 --- a/source/common/stats/utility.h +++ b/source/common/stats/utility.h @@ -5,8 +5,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats.h" -#include "common/common/thread.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/common/thread.h" +#include "source/common/stats/symbol_table_impl.h" #include "absl/container/inlined_vector.h" #include "absl/strings/string_view.h" diff --git a/source/common/stream_info/BUILD b/source/common/stream_info/BUILD index 9096e23a71cb7..8ed41ec327106 100644 --- a/source/common/stream_info/BUILD +++ b/source/common/stream_info/BUILD @@ -13,8 +13,8 @@ envoy_cc_library( hdrs = ["stream_info_impl.h"], deps = [ ":filter_state_lib", - "//include/envoy/http:request_id_extension_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/http:request_id_extension_interface", + "//envoy/stream_info:stream_info_interface", "//source/common/common:assert_lib", "//source/common/common:dump_state_utils", "//source/common/network:socket_lib", @@ -27,7 +27,7 @@ envoy_cc_library( srcs = ["filter_state_impl.cc"], hdrs = ["filter_state_impl.h"], deps = [ - "//include/envoy/stream_info:filter_state_interface", + "//envoy/stream_info:filter_state_interface", ], ) @@ -37,8 +37,8 @@ envoy_cc_library( hdrs = ["utility.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/common:time_interface", + "//envoy/stream_info:stream_info_interface", ], ) @@ -46,6 +46,6 @@ envoy_cc_library( name = "uint32_accessor_lib", hdrs = ["uint32_accessor_impl.h"], deps = [ - "//include/envoy/stream_info:uint32_accessor_interface", + "//envoy/stream_info:uint32_accessor_interface", ], ) diff --git a/source/common/stream_info/filter_state_impl.cc b/source/common/stream_info/filter_state_impl.cc index d873587abfcf8..d5a42eb75c18f 100644 --- a/source/common/stream_info/filter_state_impl.cc +++ b/source/common/stream_info/filter_state_impl.cc @@ -1,4 +1,4 @@ -#include "common/stream_info/filter_state_impl.h" +#include "source/common/stream_info/filter_state_impl.h" #include "envoy/common/exception.h" diff --git a/source/common/stream_info/stream_info_impl.h b/source/common/stream_info/stream_info_impl.h index 9e64932af177e..633178d2c361b 100644 --- a/source/common/stream_info/stream_info_impl.h +++ b/source/common/stream_info/stream_info_impl.h @@ -11,11 +11,11 @@ #include "envoy/stream_info/stream_info.h" #include "envoy/tracing/trace_reason.h" -#include "common/common/assert.h" -#include "common/common/dump_state_utils.h" -#include "common/common/macros.h" -#include "common/network/socket_impl.h" -#include "common/stream_info/filter_state_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/common/macros.h" +#include "source/common/network/socket_impl.h" +#include "source/common/stream_info/filter_state_impl.h" #include "absl/strings/str_replace.h" @@ -285,7 +285,7 @@ struct StreamInfoImpl : public StreamInfo { absl::optional connectionID() const override { return connection_id_; } void setFilterChainName(absl::string_view filter_chain_name) override { - filter_chain_name_ = filter_chain_name; + filter_chain_name_ = std::string(filter_chain_name); } const std::string& filterChainName() const override { return filter_chain_name_; } diff --git a/source/common/stream_info/utility.cc b/source/common/stream_info/utility.cc index e09708fc46cfa..8ea8da5158b48 100644 --- a/source/common/stream_info/utility.cc +++ b/source/common/stream_info/utility.cc @@ -1,4 +1,4 @@ -#include "common/stream_info/utility.h" +#include "source/common/stream_info/utility.h" #include diff --git a/source/common/tcp/BUILD b/source/common/tcp/BUILD index 9a4234e77bb8f..82bcdfbf6a6f7 100644 --- a/source/common/tcp/BUILD +++ b/source/common/tcp/BUILD @@ -20,14 +20,14 @@ envoy_cc_library( ], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/event:deferred_deletable", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:timespan_interface", - "//include/envoy/tcp:conn_pool_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/event:deferred_deletable", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/network:connection_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:timespan_interface", + "//envoy/tcp:conn_pool_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:linked_object", "//source/common/common:utility_lib", "//source/common/http:conn_pool_base_lib", diff --git a/source/common/tcp/conn_pool.cc b/source/common/tcp/conn_pool.cc index f26d82c4a4d9a..dd0ae46994ff1 100644 --- a/source/common/tcp/conn_pool.cc +++ b/source/common/tcp/conn_pool.cc @@ -1,4 +1,4 @@ -#include "common/tcp/conn_pool.h" +#include "source/common/tcp/conn_pool.h" #include @@ -6,8 +6,8 @@ #include "envoy/event/timer.h" #include "envoy/upstream/upstream.h" -#include "common/stats/timespan_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/stats/timespan_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Tcp { diff --git a/source/common/tcp/conn_pool.h b/source/common/tcp/conn_pool.h index 9f204ad3c9658..e1208f7205359 100644 --- a/source/common/tcp/conn_pool.h +++ b/source/common/tcp/conn_pool.h @@ -11,10 +11,10 @@ #include "envoy/tcp/conn_pool.h" #include "envoy/upstream/upstream.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" -#include "common/http/conn_pool_base.h" -#include "common/network/filter_impl.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/common/http/conn_pool_base.h" +#include "source/common/network/filter_impl.h" namespace Envoy { namespace Tcp { diff --git a/source/common/tcp/original_conn_pool.cc b/source/common/tcp/original_conn_pool.cc index b34c31280f89a..33796607c4489 100644 --- a/source/common/tcp/original_conn_pool.cc +++ b/source/common/tcp/original_conn_pool.cc @@ -1,4 +1,4 @@ -#include "common/tcp/original_conn_pool.h" +#include "source/common/tcp/original_conn_pool.h" #include @@ -6,8 +6,8 @@ #include "envoy/event/timer.h" #include "envoy/upstream/upstream.h" -#include "common/stats/timespan_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/stats/timespan_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Tcp { diff --git a/source/common/tcp/original_conn_pool.h b/source/common/tcp/original_conn_pool.h index b10b6b0b8d41c..d6b021bcf3e29 100644 --- a/source/common/tcp/original_conn_pool.h +++ b/source/common/tcp/original_conn_pool.h @@ -12,9 +12,9 @@ #include "envoy/tcp/conn_pool.h" #include "envoy/upstream/upstream.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" -#include "common/network/filter_impl.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/common/network/filter_impl.h" namespace Envoy { namespace Tcp { diff --git a/source/common/tcp_proxy/BUILD b/source/common/tcp_proxy/BUILD index 1e80c6506d71b..bd2a496c4eef5 100644 --- a/source/common/tcp_proxy/BUILD +++ b/source/common/tcp_proxy/BUILD @@ -17,10 +17,10 @@ envoy_cc_library( "upstream.h", ], deps = [ - "//include/envoy/tcp:conn_pool_interface", - "//include/envoy/tcp:upstream_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:load_balancer_interface", + "//envoy/tcp:conn_pool_interface", + "//envoy/tcp:upstream_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:load_balancer_interface", "//source/common/http:codec_client_lib", "//source/common/http:header_map_lib", "//source/common/http:headers_lib", @@ -39,22 +39,22 @@ envoy_cc_library( ], deps = [ ":upstream_lib", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/common:time_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/router:router_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/stats:timespan_interface", - "//include/envoy/stream_info:filter_state_interface", - "//include/envoy/tcp:conn_pool_interface", - "//include/envoy/tcp:upstream_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/access_log:access_log_interface", + "//envoy/buffer:buffer_interface", + "//envoy/common:time_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/router:router_interface", + "//envoy/server:filter_config_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", + "//envoy/stats:timespan_interface", + "//envoy/stream_info:filter_state_interface", + "//envoy/tcp:conn_pool_interface", + "//envoy/tcp:upstream_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/access_log:access_log_lib", "//source/common/common:assert_lib", "//source/common/common:empty_string", diff --git a/source/common/tcp_proxy/tcp_proxy.cc b/source/common/tcp_proxy/tcp_proxy.cc index fb76f6a942c7e..37f71070dd9d2 100644 --- a/source/common/tcp_proxy/tcp_proxy.cc +++ b/source/common/tcp_proxy/tcp_proxy.cc @@ -1,4 +1,4 @@ -#include "common/tcp_proxy/tcp_proxy.h" +#include "source/common/tcp_proxy/tcp_proxy.h" #include #include @@ -13,22 +13,22 @@ #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/upstream.h" -#include "common/access_log/access_log_impl.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/macros.h" -#include "common/common/utility.h" -#include "common/config/utility.h" -#include "common/config/well_known_names.h" -#include "common/network/application_protocol.h" -#include "common/network/proxy_protocol_filter_state.h" -#include "common/network/socket_option_factory.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/network/upstream_server_name.h" -#include "common/network/upstream_socket_options_filter_state.h" -#include "common/router/metadatamatchcriteria_impl.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/common/config/utility.h" +#include "source/common/config/well_known_names.h" +#include "source/common/network/application_protocol.h" +#include "source/common/network/proxy_protocol_filter_state.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/network/upstream_server_name.h" +#include "source/common/network/upstream_socket_options_filter_state.h" +#include "source/common/router/metadatamatchcriteria_impl.h" namespace Envoy { namespace TcpProxy { diff --git a/source/common/tcp_proxy/tcp_proxy.h b/source/common/tcp_proxy/tcp_proxy.h index 6579995d1340e..e51d3e7ffbcdf 100644 --- a/source/common/tcp_proxy/tcp_proxy.h +++ b/source/common/tcp_proxy/tcp_proxy.h @@ -20,14 +20,14 @@ #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/upstream.h" -#include "common/common/logger.h" -#include "common/network/cidr_range.h" -#include "common/network/filter_impl.h" -#include "common/network/hash_policy.h" -#include "common/network/utility.h" -#include "common/stream_info/stream_info_impl.h" -#include "common/tcp_proxy/upstream.h" -#include "common/upstream/load_balancer_impl.h" +#include "source/common/common/logger.h" +#include "source/common/network/cidr_range.h" +#include "source/common/network/filter_impl.h" +#include "source/common/network/hash_policy.h" +#include "source/common/network/utility.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/common/tcp_proxy/upstream.h" +#include "source/common/upstream/load_balancer_impl.h" #include "absl/container/node_hash_map.h" diff --git a/source/common/tcp_proxy/upstream.cc b/source/common/tcp_proxy/upstream.cc index 22b939a30bc47..3e866bf94f830 100644 --- a/source/common/tcp_proxy/upstream.cc +++ b/source/common/tcp_proxy/upstream.cc @@ -1,13 +1,13 @@ -#include "common/tcp_proxy/upstream.h" +#include "source/common/tcp_proxy/upstream.h" #include "envoy/upstream/cluster_manager.h" -#include "common/http/codec_client.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/runtime/runtime_features.h" +#include "source/common/http/codec_client.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace TcpProxy { @@ -150,7 +150,7 @@ TcpConnPool::TcpConnPool(Upstream::ThreadLocalCluster& thread_local_cluster, Upstream::LoadBalancerContext* context, Tcp::ConnectionPool::UpstreamCallbacks& upstream_callbacks) : upstream_callbacks_(upstream_callbacks) { - conn_pool_ = thread_local_cluster.tcpConnPool(Upstream::ResourcePriority::Default, context); + conn_pool_data_ = thread_local_cluster.tcpConnPool(Upstream::ResourcePriority::Default, context); } TcpConnPool::~TcpConnPool() { @@ -165,7 +165,7 @@ void TcpConnPool::newStream(GenericConnectionPoolCallbacks& callbacks) { // valid connection handle. If newConnection fails inline it may result in attempting to // select a new host, and a recursive call to initializeUpstreamConnection. In this case the // first call to newConnection will return null and the inner call will persist. - Tcp::ConnectionPool::Cancellable* handle = conn_pool_->newConnection(*this); + Tcp::ConnectionPool::Cancellable* handle = conn_pool_data_.value().newConnection(*this); if (handle) { ASSERT(upstream_handle_ == nullptr); upstream_handle_ = handle; @@ -195,8 +195,8 @@ HttpConnPool::HttpConnPool(Upstream::ThreadLocalCluster& thread_local_cluster, Tcp::ConnectionPool::UpstreamCallbacks& upstream_callbacks, Http::CodecType type) : config_(config), type_(type), upstream_callbacks_(upstream_callbacks) { - conn_pool_ = thread_local_cluster.httpConnPool(Upstream::ResourcePriority::Default, absl::nullopt, - context); + conn_pool_data_ = thread_local_cluster.httpConnPool(Upstream::ResourcePriority::Default, + absl::nullopt, context); } HttpConnPool::~HttpConnPool() { @@ -215,7 +215,7 @@ void HttpConnPool::newStream(GenericConnectionPoolCallbacks& callbacks) { upstream_ = std::make_unique(upstream_callbacks_, config_); } Tcp::ConnectionPool::Cancellable* handle = - conn_pool_->newStream(upstream_->responseDecoder(), *this); + conn_pool_data_.value().newStream(upstream_->responseDecoder(), *this); if (handle != nullptr) { upstream_handle_ = handle; } diff --git a/source/common/tcp_proxy/upstream.h b/source/common/tcp_proxy/upstream.h index 3047441a9a4fb..4da9830209d96 100644 --- a/source/common/tcp_proxy/upstream.h +++ b/source/common/tcp_proxy/upstream.h @@ -5,11 +5,12 @@ #include "envoy/tcp/conn_pool.h" #include "envoy/tcp/upstream.h" #include "envoy/upstream/load_balancer.h" +#include "envoy/upstream/thread_local_cluster.h" #include "envoy/upstream/upstream.h" -#include "common/common/dump_state_utils.h" -#include "common/http/codec_client.h" -#include "common/router/header_parser.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/http/codec_client.h" +#include "source/common/router/header_parser.h" namespace Envoy { namespace TcpProxy { @@ -21,7 +22,7 @@ class TcpConnPool : public GenericConnPool, public Tcp::ConnectionPool::Callback Tcp::ConnectionPool::UpstreamCallbacks& upstream_callbacks); ~TcpConnPool() override; - bool valid() const { return conn_pool_ != nullptr; } + bool valid() const { return conn_pool_data_.has_value(); } // GenericConnPool void newStream(GenericConnectionPoolCallbacks& callbacks) override; @@ -33,7 +34,7 @@ class TcpConnPool : public GenericConnPool, public Tcp::ConnectionPool::Callback Upstream::HostDescriptionConstSharedPtr host) override; private: - Tcp::ConnectionPool::Instance* conn_pool_{}; + absl::optional conn_pool_data_{}; Tcp::ConnectionPool::Cancellable* upstream_handle_{}; GenericConnectionPoolCallbacks* callbacks_{}; Tcp::ConnectionPool::UpstreamCallbacks& upstream_callbacks_; @@ -52,7 +53,7 @@ class HttpConnPool : public GenericConnPool, public Http::ConnectionPool::Callba ~HttpConnPool() override; // HTTP/3 upstreams are not supported at the moment. - bool valid() const { return conn_pool_ != nullptr && type_ <= Http::CodecType::HTTP2; } + bool valid() const { return conn_pool_data_.has_value() && type_ <= Http::CodecType::HTTP2; } // GenericConnPool void newStream(GenericConnectionPoolCallbacks& callbacks) override; @@ -97,7 +98,7 @@ class HttpConnPool : public GenericConnPool, public Http::ConnectionPool::Callba Ssl::ConnectionInfoConstSharedPtr ssl_info); const TunnelingConfig config_; Http::CodecType type_; - Http::ConnectionPool::Instance* conn_pool_{}; + absl::optional conn_pool_data_{}; Http::ConnectionPool::Cancellable* upstream_handle_{}; GenericConnectionPoolCallbacks* callbacks_{}; Tcp::ConnectionPool::UpstreamCallbacks& upstream_callbacks_; diff --git a/source/common/thread/BUILD b/source/common/thread/BUILD index 6f79301e8676b..45ffdec2aa146 100644 --- a/source/common/thread/BUILD +++ b/source/common/thread/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( srcs = ["terminate_thread.cc"], hdrs = ["terminate_thread.h"], deps = [ - "//include/envoy/thread:thread_interface", + "//envoy/thread:thread_interface", "//source/common/common:minimal_logger_lib", ], ) diff --git a/source/common/thread/terminate_thread.cc b/source/common/thread/terminate_thread.cc index 435d704e6d249..8ddb9f20edf95 100644 --- a/source/common/thread/terminate_thread.cc +++ b/source/common/thread/terminate_thread.cc @@ -1,10 +1,10 @@ -#include "common/thread/terminate_thread.h" +#include "source/common/thread/terminate_thread.h" #include #include -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Thread { diff --git a/source/common/thread_local/BUILD b/source/common/thread_local/BUILD index 3892298e00d64..3e1697e397855 100644 --- a/source/common/thread_local/BUILD +++ b/source/common/thread_local/BUILD @@ -13,8 +13,8 @@ envoy_cc_library( srcs = ["thread_local_impl.cc"], hdrs = ["thread_local_impl.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/event:dispatcher_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/common:stl_helpers", diff --git a/source/common/thread_local/thread_local_impl.cc b/source/common/thread_local/thread_local_impl.cc index 9bf485419745b..baeade40f0c27 100644 --- a/source/common/thread_local/thread_local_impl.cc +++ b/source/common/thread_local/thread_local_impl.cc @@ -1,4 +1,4 @@ -#include "common/thread_local/thread_local_impl.h" +#include "source/common/thread_local/thread_local_impl.h" #include #include @@ -7,8 +7,8 @@ #include "envoy/event/dispatcher.h" -#include "common/common/assert.h" -#include "common/common/stl_helpers.h" +#include "source/common/common/assert.h" +#include "source/common/common/stl_helpers.h" namespace Envoy { namespace ThreadLocal { diff --git a/source/common/thread_local/thread_local_impl.h b/source/common/thread_local/thread_local_impl.h index c9df63b1e0b85..f7825b66e151f 100644 --- a/source/common/thread_local/thread_local_impl.h +++ b/source/common/thread_local/thread_local_impl.h @@ -8,8 +8,8 @@ #include "envoy/thread_local/thread_local.h" -#include "common/common/logger.h" -#include "common/common/non_copyable.h" +#include "source/common/common/logger.h" +#include "source/common/common/non_copyable.h" namespace Envoy { namespace ThreadLocal { diff --git a/source/common/tracing/BUILD b/source/common/tracing/BUILD index 8dce4bdd7b64f..93b6a596fa970 100644 --- a/source/common/tracing/BUILD +++ b/source/common/tracing/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( "null_span_impl.h", ], deps = [ - "//include/envoy/tracing:trace_driver_interface", + "//envoy/tracing:trace_driver_interface", "//source/common/common:empty_string", ], ) @@ -40,12 +40,12 @@ envoy_cc_library( deps = [ ":common_values_lib", ":null_span_lib", - "//include/envoy/http:request_id_extension_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/tracing:http_tracer_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/http:request_id_extension_interface", + "//envoy/local_info:local_info_interface", + "//envoy/runtime:runtime_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/tracing:http_tracer_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/common:base64_lib", "//source/common/common:macros", @@ -73,7 +73,7 @@ envoy_cc_library( "tracer_config_impl.h", ], deps = [ - "//include/envoy/server:tracer_config_interface", + "//envoy/server:tracer_config_interface", ], ) @@ -86,9 +86,9 @@ envoy_cc_library( "http_tracer_manager_impl.h", ], deps = [ - "//include/envoy/server:tracer_config_interface", - "//include/envoy/singleton:instance_interface", - "//include/envoy/tracing:http_tracer_manager_interface", + "//envoy/server:tracer_config_interface", + "//envoy/singleton:instance_interface", + "//envoy/tracing:http_tracer_manager_interface", "//source/common/common:minimal_logger_lib", "//source/common/config:utility_lib", "//source/common/tracing:http_tracer_lib", diff --git a/source/common/tracing/common_values.h b/source/common/tracing/common_values.h index 41cb3947772f4..8595c959fced2 100644 --- a/source/common/tracing/common_values.h +++ b/source/common/tracing/common_values.h @@ -2,7 +2,7 @@ #include -#include "common/singleton/const_singleton.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Tracing { diff --git a/source/common/tracing/http_tracer_impl.cc b/source/common/tracing/http_tracer_impl.cc index df9d29b4a72a1..12aeace932b89 100644 --- a/source/common/tracing/http_tracer_impl.cc +++ b/source/common/tracing/http_tracer_impl.cc @@ -1,4 +1,4 @@ -#include "common/tracing/http_tracer_impl.h" +#include "source/common/tracing/http_tracer_impl.h" #include @@ -8,18 +8,18 @@ #include "envoy/type/metadata/v3/metadata.pb.h" #include "envoy/type/tracing/v3/custom_tag.pb.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/macros.h" -#include "common/common/utility.h" -#include "common/formatter/substitution_formatter.h" -#include "common/grpc/common.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" -#include "common/stream_info/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/common/grpc/common.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stream_info/utility.h" #include "absl/strings/str_cat.h" diff --git a/source/common/tracing/http_tracer_impl.h b/source/common/tracing/http_tracer_impl.h index 4c3b733ab0904..6bd0b8e6b6671 100644 --- a/source/common/tracing/http_tracer_impl.h +++ b/source/common/tracing/http_tracer_impl.h @@ -13,11 +13,11 @@ #include "envoy/type/tracing/v3/custom_tag.pb.h" #include "envoy/upstream/cluster_manager.h" -#include "common/config/metadata.h" -#include "common/http/header_map_impl.h" -#include "common/json/json_loader.h" -#include "common/tracing/common_values.h" -#include "common/tracing/null_span_impl.h" +#include "source/common/config/metadata.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/json/json_loader.h" +#include "source/common/tracing/common_values.h" +#include "source/common/tracing/null_span_impl.h" namespace Envoy { namespace Tracing { diff --git a/source/common/tracing/http_tracer_manager_impl.cc b/source/common/tracing/http_tracer_manager_impl.cc index e25f5d99ba2d9..e746ff89d6662 100644 --- a/source/common/tracing/http_tracer_manager_impl.cc +++ b/source/common/tracing/http_tracer_manager_impl.cc @@ -1,6 +1,6 @@ -#include "common/tracing/http_tracer_manager_impl.h" +#include "source/common/tracing/http_tracer_manager_impl.h" -#include "common/config/utility.h" +#include "source/common/config/utility.h" namespace Envoy { namespace Tracing { diff --git a/source/common/tracing/http_tracer_manager_impl.h b/source/common/tracing/http_tracer_manager_impl.h index a4fb18bcbf139..2080e56d00777 100644 --- a/source/common/tracing/http_tracer_manager_impl.h +++ b/source/common/tracing/http_tracer_manager_impl.h @@ -4,8 +4,8 @@ #include "envoy/singleton/instance.h" #include "envoy/tracing/http_tracer_manager.h" -#include "common/common/logger.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/common/logger.h" +#include "source/common/tracing/http_tracer_impl.h" namespace Envoy { namespace Tracing { diff --git a/source/common/tracing/null_span_impl.h b/source/common/tracing/null_span_impl.h index 18677818dfcaa..653147ffd88f0 100644 --- a/source/common/tracing/null_span_impl.h +++ b/source/common/tracing/null_span_impl.h @@ -2,7 +2,7 @@ #include "envoy/tracing/trace_driver.h" -#include "common/common/empty_string.h" +#include "source/common/common/empty_string.h" namespace Envoy { namespace Tracing { diff --git a/source/common/upstream/BUILD b/source/common/upstream/BUILD index e8b3693993742..901d530d882df 100644 --- a/source/common/upstream/BUILD +++ b/source/common/upstream/BUILD @@ -14,9 +14,9 @@ envoy_cc_library( srcs = ["cds_api_helper.cc"], hdrs = ["cds_api_helper.h"], deps = [ - "//include/envoy/config:grpc_mux_interface", - "//include/envoy/config:subscription_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/config:grpc_mux_interface", + "//envoy/config:subscription_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:minimal_logger_lib", "//source/common/config:resource_name_lib", "//source/common/protobuf", @@ -31,10 +31,10 @@ envoy_cc_library( hdrs = ["cds_api_impl.h"], deps = [ ":cds_api_helper_lib", - "//include/envoy/config:subscription_interface", - "//include/envoy/protobuf:message_validator_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/config:subscription_interface", + "//envoy/protobuf:message_validator_interface", + "//envoy/stats:stats_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:minimal_logger_lib", "//source/common/config:subscription_base_interface", "//source/common/grpc:common_lib", @@ -54,16 +54,16 @@ envoy_cc_library( ":load_stats_reporter_lib", ":ring_hash_lb_lib", ":subset_lb_lib", - "//include/envoy/api:api_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/network:dns_interface", - "//include/envoy/router:context_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/ssl:context_manager_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/api:api_interface", + "//envoy/event:dispatcher_interface", + "//envoy/http:codes_interface", + "//envoy/local_info:local_info_interface", + "//envoy/network:dns_interface", + "//envoy/router:context_interface", + "//envoy/runtime:runtime_interface", + "//envoy/ssl:context_manager_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:cleanup_lib", "//source/common/common:enum_to_int", "//source/common/common:utility_lib", @@ -102,7 +102,7 @@ envoy_cc_library( srcs = ["cluster_update_tracker.cc"], hdrs = ["cluster_update_tracker.h"], deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", ], ) @@ -110,9 +110,9 @@ envoy_cc_library( name = "conn_pool_map", hdrs = ["conn_pool_map.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/upstream:resource_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/event:dispatcher_interface", + "//envoy/upstream:resource_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:debug_recursion_checker_lib", ], ) @@ -130,9 +130,9 @@ envoy_cc_library( hdrs = ["priority_conn_pool_map.h"], deps = [ ":conn_pool_map", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/upstream:resource_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/event:dispatcher_interface", + "//envoy/upstream:resource_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:debug_recursion_checker_lib", ], ) @@ -157,7 +157,7 @@ envoy_cc_library( srcs = ["health_checker_base_impl.cc"], hdrs = ["health_checker_base_impl.h"], deps = [ - "//include/envoy/upstream:health_checker_interface", + "//envoy/upstream:health_checker_interface", "//source/common/router:router_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/data/core/v3:pkg_cc_proto", @@ -178,7 +178,7 @@ envoy_cc_library( "@envoy_api//envoy/data/core/v3:pkg_cc_proto", "@envoy_api//envoy/type/v3:pkg_cc_proto", # TODO(dio): Remove dependency to server. - "//include/envoy/server:health_checker_config_interface", + "//envoy/server:health_checker_config_interface", "//source/common/grpc:codec_lib", "//source/common/http:codec_client_lib", "//source/common/upstream:host_utility_lib", @@ -189,7 +189,7 @@ envoy_cc_library( name = "host_utility_lib", srcs = ["host_utility.cc"], hdrs = ["host_utility.h"], - deps = ["//include/envoy/upstream:upstream_interface"], + deps = ["//envoy/upstream:upstream_interface"], ) envoy_cc_library( @@ -198,11 +198,11 @@ envoy_cc_library( hdrs = ["load_balancer_impl.h"], deps = [ ":edf_scheduler_lib", - "//include/envoy/common:random_generator_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/upstream:load_balancer_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/common:random_generator_interface", + "//envoy/runtime:runtime_interface", + "//envoy/stats:stats_interface", + "//envoy/upstream:load_balancer_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:assert_lib", "//source/common/protobuf:utility_lib", "//source/common/runtime:runtime_protos_lib", @@ -215,9 +215,9 @@ envoy_cc_library( srcs = ["load_stats_reporter.cc"], hdrs = ["load_stats_reporter.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/event:dispatcher_interface", + "//envoy/stats:stats_macros", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:minimal_logger_lib", "//source/common/config:version_converter_lib", "//source/common/grpc:async_client_lib", @@ -243,14 +243,14 @@ envoy_cc_library( ":health_checker_lib", ":locality_endpoint_lib", ":upstream_includes", - "//include/envoy/api:api_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/server:transport_socket_config_interface", - "//include/envoy/ssl:context_manager_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/api:api_interface", + "//envoy/event:dispatcher_interface", + "//envoy/runtime:runtime_interface", + "//envoy/server:transport_socket_config_interface", + "//envoy/ssl:context_manager_interface", + "//envoy/stats:stats_macros", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:backoff_lib", "//source/common/common:minimal_logger_lib", "//source/common/config:utility_lib", @@ -286,14 +286,13 @@ envoy_cc_library( ":cluster_factory_lib", ":logical_host_lib", ":upstream_includes", - "//include/envoy/upstream:cluster_factory_interface", + "//envoy/upstream:cluster_factory_interface", "//source/common/common:empty_string", "//source/common/config:utility_lib", "//source/common/network:address_lib", "//source/common/network:utility_lib", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "//source/extensions/clusters:well_known_names", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", @@ -307,12 +306,11 @@ envoy_cc_library( deps = [ ":cluster_factory_lib", ":upstream_includes", - "//include/envoy/secret:secret_manager_interface", - "//include/envoy/upstream:cluster_factory_interface", + "//envoy/secret:secret_manager_interface", + "//envoy/upstream:cluster_factory_interface", "//source/common/common:empty_string", "//source/common/network:address_lib", "//source/common/network:utility_lib", - "//source/extensions/clusters:well_known_names", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", @@ -324,12 +322,12 @@ envoy_cc_library( srcs = ["outlier_detection_impl.cc"], hdrs = ["outlier_detection_impl.h"], deps = [ - "//include/envoy/access_log:access_log_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/upstream:outlier_detection_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/access_log:access_log_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/runtime:runtime_interface", + "//envoy/upstream:outlier_detection_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:assert_lib", "//source/common/common:utility_lib", "//source/common/http:codes_lib", @@ -343,9 +341,9 @@ envoy_cc_library( name = "resource_manager_lib", hdrs = ["resource_manager_impl.h"], deps = [ - "//include/envoy/runtime:runtime_interface", - "//include/envoy/upstream:resource_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/runtime:runtime_interface", + "//envoy/upstream:resource_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:assert_lib", "//source/common/common:basic_resource_lib", ], @@ -397,13 +395,13 @@ envoy_cc_library( deps = [ ":cluster_factory_lib", ":upstream_includes", - "//include/envoy/config:grpc_mux_interface", - "//include/envoy/config:subscription_factory_interface", - "//include/envoy/config:subscription_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/secret:secret_manager_interface", - "//include/envoy/upstream:cluster_factory_interface", - "//include/envoy/upstream:locality_lib", + "//envoy/config:grpc_mux_interface", + "//envoy/config:subscription_factory_interface", + "//envoy/config:subscription_interface", + "//envoy/local_info:local_info_interface", + "//envoy/secret:secret_manager_interface", + "//envoy/upstream:cluster_factory_interface", + "//envoy/upstream:locality_lib", "//source/common/config:api_version_lib", "//source/common/config:decoded_resource_lib", "//source/common/config:metadata_lib", @@ -415,7 +413,6 @@ envoy_cc_library( "//source/common/network:resolver_lib", "//source/common/network:utility_lib", "//source/common/protobuf:utility_lib", - "//source/extensions/clusters:well_known_names", "@envoy_api//envoy/api/v2:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -433,8 +430,8 @@ envoy_cc_library( ":maglev_lb_lib", ":ring_hash_lb_lib", ":upstream_lib", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/upstream:load_balancer_interface", + "//envoy/runtime:runtime_interface", + "//envoy/upstream:load_balancer_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/config:metadata_lib", @@ -461,12 +458,12 @@ envoy_cc_library( "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:dns_interface", - "//include/envoy/network:listen_socket_interface", - "//include/envoy/ssl:context_interface", - "//include/envoy/upstream:health_checker_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/network:dns_interface", + "//envoy/network:listen_socket_interface", + "//envoy/ssl:context_interface", + "//envoy/upstream:health_checker_interface", "//source/common/common:enum_to_int", "//source/common/common:thread_lib", "//source/common/common:utility_lib", @@ -535,19 +532,19 @@ envoy_cc_library( ":load_balancer_lib", ":outlier_detection_lib", ":resource_manager_lib", - "//include/envoy/event:timer_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/network:dns_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/server:transport_socket_config_interface", - "//include/envoy/ssl:context_manager_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:health_checker_interface", - "//include/envoy/upstream:load_balancer_interface", - "//include/envoy/upstream:locality_lib", - "//include/envoy/upstream:upstream_interface", + "//envoy/event:timer_interface", + "//envoy/local_info:local_info_interface", + "//envoy/network:dns_interface", + "//envoy/runtime:runtime_interface", + "//envoy/server:filter_config_interface", + "//envoy/server:transport_socket_config_interface", + "//envoy/ssl:context_manager_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:health_checker_interface", + "//envoy/upstream:load_balancer_interface", + "//envoy/upstream:locality_lib", + "//envoy/upstream:upstream_interface", "//source/common/common:callback_impl_lib", "//source/common/common:enum_to_int", "//source/common/common:minimal_logger_lib", @@ -575,12 +572,12 @@ envoy_cc_library( ":cluster_factory_includes", ":health_checker_lib", ":upstream_includes", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:dns_interface", - "//include/envoy/network:listen_socket_interface", - "//include/envoy/ssl:context_interface", - "//include/envoy/upstream:health_checker_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/network:dns_interface", + "//envoy/network:listen_socket_interface", + "//envoy/ssl:context_interface", + "//envoy/upstream:health_checker_interface", "//source/common/common:enum_to_int", "//source/common/common:utility_lib", "//source/common/http:utility_lib", @@ -590,7 +587,6 @@ envoy_cc_library( "//source/common/network:utility_lib", "//source/common/protobuf", "//source/common/protobuf:utility_lib", - "//source/extensions/clusters:well_known_names", "//source/server:transport_socket_config_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], @@ -604,19 +600,19 @@ envoy_cc_library( ":outlier_detection_lib", ":resource_manager_lib", ":upstream_includes", - "//include/envoy/event:timer_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/network:dns_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/server:transport_socket_config_interface", - "//include/envoy/ssl:context_manager_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_factory_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:health_checker_interface", - "//include/envoy/upstream:load_balancer_interface", - "//include/envoy/upstream:locality_lib", - "//include/envoy/upstream:upstream_interface", + "//envoy/event:timer_interface", + "//envoy/local_info:local_info_interface", + "//envoy/network:dns_interface", + "//envoy/runtime:runtime_interface", + "//envoy/server:transport_socket_config_interface", + "//envoy/ssl:context_manager_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_factory_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:health_checker_interface", + "//envoy/upstream:load_balancer_interface", + "//envoy/upstream:locality_lib", + "//envoy/upstream:upstream_interface", "//source/common/common:callback_impl_lib", "//source/common/common:enum_to_int", "//source/common/common:minimal_logger_lib", @@ -626,7 +622,6 @@ envoy_cc_library( "//source/common/config:well_known_names", "//source/common/stats:isolated_store_lib", "//source/common/stats:stats_lib", - "//source/extensions/clusters:well_known_names", "//source/server:transport_socket_config_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], diff --git a/source/common/upstream/cds_api_helper.cc b/source/common/upstream/cds_api_helper.cc index a5a860078f08c..c75b1526d2f08 100644 --- a/source/common/upstream/cds_api_helper.cc +++ b/source/common/upstream/cds_api_helper.cc @@ -1,12 +1,12 @@ -#include "common/upstream/cds_api_helper.h" +#include "source/common/upstream/cds_api_helper.h" #include "envoy/common/exception.h" #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/config/endpoint/v3/endpoint.pb.h" #include "envoy/config/grpc_mux.h" -#include "common/common/fmt.h" -#include "common/config/resource_name.h" +#include "source/common/common/fmt.h" +#include "source/common/config/resource_name.h" #include "absl/container/flat_hash_set.h" diff --git a/source/common/upstream/cds_api_helper.h b/source/common/upstream/cds_api_helper.h index a7a91c4ebe46a..17384a6fb6025 100644 --- a/source/common/upstream/cds_api_helper.h +++ b/source/common/upstream/cds_api_helper.h @@ -6,8 +6,8 @@ #include "envoy/config/subscription.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/logger.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/logger.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/cds_api_impl.cc b/source/common/upstream/cds_api_impl.cc index e442c72b613af..3c9d8ab46b6dc 100644 --- a/source/common/upstream/cds_api_impl.cc +++ b/source/common/upstream/cds_api_impl.cc @@ -1,7 +1,7 @@ -#include "common/upstream/cds_api_impl.h" +#include "source/common/upstream/cds_api_impl.h" -#include "common/common/assert.h" -#include "common/grpc/common.h" +#include "source/common/common/assert.h" +#include "source/common/grpc/common.h" #include "absl/strings/str_join.h" diff --git a/source/common/upstream/cds_api_impl.h b/source/common/upstream/cds_api_impl.h index ef88890b58862..63ca584eb06db 100644 --- a/source/common/upstream/cds_api_impl.h +++ b/source/common/upstream/cds_api_impl.h @@ -12,9 +12,9 @@ #include "envoy/stats/scope.h" #include "envoy/upstream/cluster_manager.h" -#include "common/config/subscription_base.h" -#include "common/protobuf/protobuf.h" -#include "common/upstream/cds_api_helper.h" +#include "source/common/config/subscription_base.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/upstream/cds_api_helper.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/cluster_factory_impl.cc b/source/common/upstream/cluster_factory_impl.cc index b9c21a75429ad..ab599bd092b66 100644 --- a/source/common/upstream/cluster_factory_impl.cc +++ b/source/common/upstream/cluster_factory_impl.cc @@ -1,15 +1,14 @@ -#include "common/upstream/cluster_factory_impl.h" +#include "source/common/upstream/cluster_factory_impl.h" #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/server/options.h" -#include "common/http/utility.h" -#include "common/network/address_impl.h" -#include "common/network/resolver_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/upstream/health_checker_impl.h" - -#include "server/transport_socket_config_impl.h" +#include "source/common/http/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/resolver_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/upstream/health_checker_impl.h" +#include "source/server/transport_socket_config_impl.h" namespace Envoy { namespace Upstream { @@ -38,19 +37,19 @@ std::pair ClusterFactoryImplBase:: if (!cluster.has_cluster_type()) { switch (cluster.type()) { case envoy::config::cluster::v3::Cluster::STATIC: - cluster_type = Extensions::Clusters::ClusterTypes::get().Static; + cluster_type = "envoy.cluster.static"; break; case envoy::config::cluster::v3::Cluster::STRICT_DNS: - cluster_type = Extensions::Clusters::ClusterTypes::get().StrictDns; + cluster_type = "envoy.cluster.strict_dns"; break; case envoy::config::cluster::v3::Cluster::LOGICAL_DNS: - cluster_type = Extensions::Clusters::ClusterTypes::get().LogicalDns; + cluster_type = "envoy.cluster.logical_dns"; break; case envoy::config::cluster::v3::Cluster::ORIGINAL_DST: - cluster_type = Extensions::Clusters::ClusterTypes::get().OriginalDst; + cluster_type = "envoy.cluster.original_dst"; break; case envoy::config::cluster::v3::Cluster::EDS: - cluster_type = Extensions::Clusters::ClusterTypes::get().Eds; + cluster_type = "envoy.cluster.eds"; break; default: NOT_REACHED_GCOVR_EXCL_LINE; @@ -89,15 +88,32 @@ ClusterFactoryImplBase::selectDnsResolver(const envoy::config::cluster::v3::Clus // where 'dns_resolvers' is specified, we have per-cluster DNS // resolvers that are created here but ownership resides with // StrictDnsClusterImpl/LogicalDnsCluster. - if (!cluster.dns_resolvers().empty()) { - const auto& resolver_addrs = cluster.dns_resolvers(); + if ((cluster.has_dns_resolution_config() && + !cluster.dns_resolution_config().resolvers().empty()) || + !cluster.dns_resolvers().empty()) { + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; std::vector resolvers; - resolvers.reserve(resolver_addrs.size()); - for (const auto& resolver_addr : resolver_addrs) { - resolvers.push_back(Network::Address::resolveProtoAddress(resolver_addr)); + Protobuf::RepeatedPtrField resolver_addrs; + if (cluster.has_dns_resolution_config()) { + dns_resolver_options.CopyFrom(cluster.dns_resolution_config().dns_resolver_options()); + resolver_addrs.CopyFrom(cluster.dns_resolution_config().resolvers()); + } else { + /* if `cluster.dns_resolution_config` is not set. */ + // Field bool `use_tcp_for_dns_lookups` will be deprecated in future. To be backward + // compatible utilize cluster.use_tcp_for_dns_lookups(). + dns_resolver_options.set_use_tcp_for_dns_lookups(cluster.use_tcp_for_dns_lookups()); + // Field repeated Address `dns_resolvers` will be deprecated in future. To be backward + // compatible utilize cluster.dns_resolvers(). + resolver_addrs.CopyFrom(cluster.dns_resolvers()); + } + + if (!resolver_addrs.empty()) { + resolvers.reserve(resolver_addrs.size()); + for (const auto& resolver_addr : resolver_addrs) { + resolvers.push_back(Network::Address::resolveProtoAddress(resolver_addr)); + } } - const bool use_tcp_for_dns_lookups = cluster.use_tcp_for_dns_lookups(); - return context.dispatcher().createDnsResolver(resolvers, use_tcp_for_dns_lookups); + return context.dispatcher().createDnsResolver(resolvers, dns_resolver_options); } return context.dnsResolver(); diff --git a/source/common/upstream/cluster_factory_impl.h b/source/common/upstream/cluster_factory_impl.h index 5a3e8b49cdcf6..acae527f57268 100644 --- a/source/common/upstream/cluster_factory_impl.h +++ b/source/common/upstream/cluster_factory_impl.h @@ -30,21 +30,19 @@ #include "envoy/upstream/locality.h" #include "envoy/upstream/upstream.h" -#include "common/common/callback_impl.h" -#include "common/common/enum_to_int.h" -#include "common/common/logger.h" -#include "common/config/metadata.h" -#include "common/config/utility.h" -#include "common/config/well_known_names.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" -#include "common/stats/isolated_store_impl.h" -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/outlier_detection_impl.h" -#include "common/upstream/resource_manager_impl.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/clusters/well_known_names.h" +#include "source/common/common/callback_impl.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/logger.h" +#include "source/common/config/metadata.h" +#include "source/common/config/utility.h" +#include "source/common/config/well_known_names.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/outlier_detection_impl.h" +#include "source/common/upstream/resource_manager_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/cluster_manager_impl.cc b/source/common/upstream/cluster_manager_impl.cc index 05e18092e9332..4ffb69b48f545 100644 --- a/source/common/upstream/cluster_manager_impl.cc +++ b/source/common/upstream/cluster_manager_impl.cc @@ -1,4 +1,4 @@ -#include "common/upstream/cluster_manager_impl.h" +#include "source/common/upstream/cluster_manager_impl.h" #include #include @@ -17,37 +17,37 @@ #include "envoy/runtime/runtime.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/config/new_grpc_mux_impl.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" -#include "common/config/xds_resource.h" -#include "common/grpc/async_client_manager_impl.h" -#include "common/http/async_client_impl.h" -#include "common/http/http1/conn_pool.h" -#include "common/http/http2/conn_pool.h" -#include "common/http/mixed_conn_pool.h" -#include "common/network/resolver_impl.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" -#include "common/router/shadow_writer_impl.h" -#include "common/runtime/runtime_features.h" -#include "common/tcp/conn_pool.h" -#include "common/tcp/original_conn_pool.h" -#include "common/upstream/cds_api_impl.h" -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/maglev_lb.h" -#include "common/upstream/original_dst_cluster.h" -#include "common/upstream/priority_conn_pool_map_impl.h" -#include "common/upstream/ring_hash_lb.h" -#include "common/upstream/subset_lb.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/config/new_grpc_mux_impl.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/config/xds_resource.h" +#include "source/common/grpc/async_client_manager_impl.h" +#include "source/common/http/async_client_impl.h" +#include "source/common/http/http1/conn_pool.h" +#include "source/common/http/http2/conn_pool.h" +#include "source/common/http/mixed_conn_pool.h" +#include "source/common/network/resolver_impl.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/shadow_writer_impl.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/tcp/conn_pool.h" +#include "source/common/tcp/original_conn_pool.h" +#include "source/common/upstream/cds_api_impl.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/maglev_lb.h" +#include "source/common/upstream/original_dst_cluster.h" +#include "source/common/upstream/priority_conn_pool_map_impl.h" +#include "source/common/upstream/ring_hash_lb.h" +#include "source/common/upstream/subset_lb.h" #ifdef ENVOY_ENABLE_QUIC -#include "common/http/conn_pool_grid.h" -#include "common/http/http3/conn_pool.h" +#include "source/common/http/conn_pool_grid.h" +#include "source/common/http/http3/conn_pool.h" #endif namespace Envoy { @@ -905,41 +905,45 @@ void ClusterManagerImpl::maybePreconnect( } } -Http::ConnectionPool::Instance* +absl::optional ClusterManagerImpl::ThreadLocalClusterManagerImpl::ClusterEntry::httpConnPool( ResourcePriority priority, absl::optional protocol, LoadBalancerContext* context) { // Select a host and create a connection pool for it if it does not already exist. - auto ret = connPool(priority, protocol, context, false); - - // Now see if another host should be preconnected. - // httpConnPool is called immediately before a call for newStream. newStream doesn't - // have the load balancer context needed to make selection decisions so preconnecting must be - // performed here in anticipation of the new stream. - // TODO(alyssawilk) refactor to have one function call and return a pair, so this invariant is - // code-enforced. - maybePreconnect(*this, parent_.cluster_manager_state_, [this, &priority, &protocol, &context]() { - return connPool(priority, protocol, context, true); - }); - return ret; + auto pool = connPool(priority, protocol, context, false); + if (pool == nullptr) { + return absl::nullopt; + } + + HttpPoolData data( + [this, priority, protocol, context]() -> void { + // Now that a new stream is being established, attempt to preconnect. + maybePreconnect(*this, parent_.cluster_manager_state_, + [this, &priority, &protocol, &context]() { + return connPool(priority, protocol, context, true); + }); + }, + pool); + return data; } -Tcp::ConnectionPool::Instance* +absl::optional ClusterManagerImpl::ThreadLocalClusterManagerImpl::ClusterEntry::tcpConnPool( ResourcePriority priority, LoadBalancerContext* context) { // Select a host and create a connection pool for it if it does not already exist. - auto ret = tcpConnPool(priority, context, false); - - // tcpConnPool is called immediately before a call for newConnection. newConnection - // doesn't have the load balancer context needed to make selection decisions so preconnecting must - // be performed here in anticipation of the new connection. - // TODO(alyssawilk) refactor to have one function call and return a pair, so this invariant is - // code-enforced. - // Now see if another host should be preconnected. - maybePreconnect(*this, parent_.cluster_manager_state_, - [this, &priority, &context]() { return tcpConnPool(priority, context, true); }); - - return ret; + auto pool = tcpConnPool(priority, context, false); + if (pool == nullptr) { + return absl::nullopt; + } + + TcpPoolData data( + [this, priority, context]() -> void { + maybePreconnect(*this, parent_.cluster_manager_state_, [this, &priority, &context]() { + return tcpConnPool(priority, context, true); + }); + }, + pool); + return data; } void ClusterManagerImpl::postThreadLocalDrainConnections(const Cluster& cluster, diff --git a/source/common/upstream/cluster_manager_impl.h b/source/common/upstream/cluster_manager_impl.h index 5034a261c107b..18073d43a00df 100644 --- a/source/common/upstream/cluster_manager_impl.h +++ b/source/common/upstream/cluster_manager_impl.h @@ -26,15 +26,15 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/cleanup.h" -#include "common/config/grpc_mux_impl.h" -#include "common/config/subscription_factory_impl.h" -#include "common/http/alternate_protocols_cache_impl.h" -#include "common/http/alternate_protocols_cache_manager_impl.h" -#include "common/http/async_client_impl.h" -#include "common/upstream/load_stats_reporter.h" -#include "common/upstream/priority_conn_pool_map.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/common/cleanup.h" +#include "source/common/config/grpc_mux_impl.h" +#include "source/common/config/subscription_factory_impl.h" +#include "source/common/http/alternate_protocols_cache_impl.h" +#include "source/common/http/alternate_protocols_cache_manager_impl.h" +#include "source/common/http/async_client_impl.h" +#include "source/common/upstream/load_stats_reporter.h" +#include "source/common/upstream/priority_conn_pool_map.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Upstream { @@ -413,11 +413,11 @@ class ClusterManagerImpl : public ClusterManager, Logger::Loggable downstream_protocol, - LoadBalancerContext* context) override; - Tcp::ConnectionPool::Instance* tcpConnPool(ResourcePriority priority, - LoadBalancerContext* context) override; + absl::optional httpConnPool(ResourcePriority priority, + absl::optional downstream_protocol, + LoadBalancerContext* context) override; + absl::optional tcpConnPool(ResourcePriority priority, + LoadBalancerContext* context) override; Host::CreateConnectionData tcpConn(LoadBalancerContext* context) override; Http::AsyncClient& httpAsyncClient() override; diff --git a/source/common/upstream/cluster_update_tracker.cc b/source/common/upstream/cluster_update_tracker.cc index 5a591f1774697..15eefc0d2ca5f 100644 --- a/source/common/upstream/cluster_update_tracker.cc +++ b/source/common/upstream/cluster_update_tracker.cc @@ -1,4 +1,4 @@ -#include "common/upstream/cluster_update_tracker.h" +#include "source/common/upstream/cluster_update_tracker.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/conn_pool_map.h b/source/common/upstream/conn_pool_map.h index 041f619e0bfab..0b5f61cb6eaf8 100644 --- a/source/common/upstream/conn_pool_map.h +++ b/source/common/upstream/conn_pool_map.h @@ -7,7 +7,7 @@ #include "envoy/upstream/resource_manager.h" #include "envoy/upstream/upstream.h" -#include "common/common/debug_recursion_checker.h" +#include "source/common/common/debug_recursion_checker.h" #include "absl/container/flat_hash_map.h" #include "absl/types/optional.h" diff --git a/source/common/upstream/conn_pool_map_impl.h b/source/common/upstream/conn_pool_map_impl.h index c0daca8ef37a8..b183f9d438bb7 100644 --- a/source/common/upstream/conn_pool_map_impl.h +++ b/source/common/upstream/conn_pool_map_impl.h @@ -1,6 +1,6 @@ #pragma once -#include "common/upstream/conn_pool_map.h" +#include "source/common/upstream/conn_pool_map.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/edf_scheduler.h b/source/common/upstream/edf_scheduler.h index 2f91d0e5cbedf..eaac9f08857a0 100644 --- a/source/common/upstream/edf_scheduler.h +++ b/source/common/upstream/edf_scheduler.h @@ -3,7 +3,7 @@ #include #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/eds.cc b/source/common/upstream/eds.cc index 57fe03e3de329..c8ea0bb333487 100644 --- a/source/common/upstream/eds.cc +++ b/source/common/upstream/eds.cc @@ -1,4 +1,4 @@ -#include "common/upstream/eds.h" +#include "source/common/upstream/eds.h" #include "envoy/api/v2/endpoint.pb.h" #include "envoy/common/exception.h" @@ -6,11 +6,11 @@ #include "envoy/config/core/v3/config_source.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/common/utility.h" -#include "common/config/api_version.h" -#include "common/config/decoded_resource_impl.h" -#include "common/config/version_converter.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/common/config/api_version.h" +#include "source/common/config/decoded_resource_impl.h" +#include "source/common/config/version_converter.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/eds.h b/source/common/upstream/eds.h index 224f0984e420c..45469661df798 100644 --- a/source/common/upstream/eds.h +++ b/source/common/upstream/eds.h @@ -15,11 +15,9 @@ #include "envoy/stats/scope.h" #include "envoy/upstream/locality.h" -#include "common/config/subscription_base.h" -#include "common/upstream/cluster_factory_impl.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/clusters/well_known_names.h" +#include "source/common/config/subscription_base.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Upstream { @@ -89,7 +87,7 @@ using EdsClusterImplSharedPtr = std::shared_ptr; class EdsClusterFactory : public ClusterFactoryImplBase { public: - EdsClusterFactory() : ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().Eds) {} + EdsClusterFactory() : ClusterFactoryImplBase("envoy.cluster.eds") {} private: std::pair createClusterImpl( diff --git a/source/common/upstream/health_checker_base_impl.cc b/source/common/upstream/health_checker_base_impl.cc index c396402a118c1..b82058cf2aadd 100644 --- a/source/common/upstream/health_checker_base_impl.cc +++ b/source/common/upstream/health_checker_base_impl.cc @@ -1,12 +1,12 @@ -#include "common/upstream/health_checker_base_impl.h" +#include "source/common/upstream/health_checker_base_impl.h" #include "envoy/config/core/v3/address.pb.h" #include "envoy/config/core/v3/health_check.pb.h" #include "envoy/data/core/v3/health_check_event.pb.h" #include "envoy/stats/scope.h" -#include "common/network/utility.h" -#include "common/router/router.h" +#include "source/common/network/utility.h" +#include "source/common/router/router.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/health_checker_base_impl.h b/source/common/upstream/health_checker_base_impl.h index 4053cd3f623d6..5081aac7351d2 100644 --- a/source/common/upstream/health_checker_base_impl.h +++ b/source/common/upstream/health_checker_base_impl.h @@ -11,9 +11,9 @@ #include "envoy/type/matcher/string.pb.h" #include "envoy/upstream/health_checker.h" -#include "common/common/logger.h" -#include "common/common/matchers.h" -#include "common/network/transport_socket_options_impl.h" +#include "source/common/common/logger.h" +#include "source/common/common/matchers.h" +#include "source/common/network/transport_socket_options_impl.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/health_checker_impl.cc b/source/common/upstream/health_checker_impl.cc index 608c02e2b7a22..2859e58767584 100644 --- a/source/common/upstream/health_checker_impl.cc +++ b/source/common/upstream/health_checker_impl.cc @@ -1,4 +1,4 @@ -#include "common/upstream/health_checker_impl.h" +#include "source/common/upstream/health_checker_impl.h" #include @@ -8,21 +8,21 @@ #include "envoy/type/v3/http.pb.h" #include "envoy/type/v3/range.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/macros.h" -#include "common/config/utility.h" -#include "common/config/well_known_names.h" -#include "common/grpc/common.h" -#include "common/http/header_map_impl.h" -#include "common/http/header_utility.h" -#include "common/network/address_impl.h" -#include "common/network/socket_impl.h" -#include "common/network/utility.h" -#include "common/router/router.h" -#include "common/runtime/runtime_features.h" -#include "common/upstream/host_utility.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/macros.h" +#include "source/common/config/utility.h" +#include "source/common/config/well_known_names.h" +#include "source/common/grpc/common.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/header_utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_impl.h" +#include "source/common/network/utility.h" +#include "source/common/router/router.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/upstream/host_utility.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" diff --git a/source/common/upstream/health_checker_impl.h b/source/common/upstream/health_checker_impl.h index fdc337d142f6d..ec3b615ea5abe 100644 --- a/source/common/upstream/health_checker_impl.h +++ b/source/common/upstream/health_checker_impl.h @@ -10,13 +10,13 @@ #include "envoy/type/v3/http.pb.h" #include "envoy/type/v3/range.pb.h" -#include "common/common/dump_state_utils.h" -#include "common/common/logger.h" -#include "common/grpc/codec.h" -#include "common/http/codec_client.h" -#include "common/router/header_parser.h" -#include "common/stream_info/stream_info_impl.h" -#include "common/upstream/health_checker_base_impl.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/common/logger.h" +#include "source/common/grpc/codec.h" +#include "source/common/http/codec_client.h" +#include "source/common/router/header_parser.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/common/upstream/health_checker_base_impl.h" #include "src/proto/grpc/health/v1/health.pb.h" diff --git a/source/common/upstream/health_discovery_service.cc b/source/common/upstream/health_discovery_service.cc index 01a171c3ef1d9..c9f5a58649582 100644 --- a/source/common/upstream/health_discovery_service.cc +++ b/source/common/upstream/health_discovery_service.cc @@ -1,4 +1,4 @@ -#include "common/upstream/health_discovery_service.h" +#include "source/common/upstream/health_discovery_service.h" #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/config/core/v3/address.pb.h" @@ -9,11 +9,11 @@ #include "envoy/service/health/v3/hds.pb.validate.h" #include "envoy/stats/scope.h" -#include "common/config/version_converter.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/config/version_converter.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/health_discovery_service.h b/source/common/upstream/health_discovery_service.h index e943efe63fe41..dd9b37722ee4f 100644 --- a/source/common/upstream/health_discovery_service.h +++ b/source/common/upstream/health_discovery_service.h @@ -11,17 +11,16 @@ #include "envoy/stats/stats_macros.h" #include "envoy/upstream/upstream.h" -#include "common/common/backoff_strategy.h" -#include "common/common/logger.h" -#include "common/common/macros.h" -#include "common/config/utility.h" -#include "common/grpc/async_client_impl.h" -#include "common/network/resolver_impl.h" -#include "common/upstream/health_checker_impl.h" -#include "common/upstream/locality_endpoint.h" -#include "common/upstream/upstream_impl.h" - -#include "server/transport_socket_config_impl.h" +#include "source/common/common/backoff_strategy.h" +#include "source/common/common/logger.h" +#include "source/common/common/macros.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/async_client_impl.h" +#include "source/common/network/resolver_impl.h" +#include "source/common/upstream/health_checker_impl.h" +#include "source/common/upstream/locality_endpoint.h" +#include "source/common/upstream/upstream_impl.h" +#include "source/server/transport_socket_config_impl.h" #include "absl/container/flat_hash_map.h" diff --git a/source/common/upstream/host_utility.cc b/source/common/upstream/host_utility.cc index 10df4ae94029c..7a09ee9dc0299 100644 --- a/source/common/upstream/host_utility.cc +++ b/source/common/upstream/host_utility.cc @@ -1,4 +1,4 @@ -#include "common/upstream/host_utility.h" +#include "source/common/upstream/host_utility.h" #include diff --git a/source/common/upstream/load_balancer_impl.cc b/source/common/upstream/load_balancer_impl.cc index 6278a4ab39dcd..47db0423169e5 100644 --- a/source/common/upstream/load_balancer_impl.cc +++ b/source/common/upstream/load_balancer_impl.cc @@ -1,4 +1,4 @@ -#include "common/upstream/load_balancer_impl.h" +#include "source/common/upstream/load_balancer_impl.h" #include #include @@ -9,8 +9,8 @@ #include "envoy/runtime/runtime.h" #include "envoy/upstream/upstream.h" -#include "common/common/assert.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/protobuf/utility.h" #include "absl/container/fixed_array.h" diff --git a/source/common/upstream/load_balancer_impl.h b/source/common/upstream/load_balancer_impl.h index db9f815dce0e4..330fc14be3d5d 100644 --- a/source/common/upstream/load_balancer_impl.h +++ b/source/common/upstream/load_balancer_impl.h @@ -14,9 +14,9 @@ #include "envoy/upstream/load_balancer.h" #include "envoy/upstream/upstream.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_protos.h" -#include "common/upstream/edf_scheduler.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_protos.h" +#include "source/common/upstream/edf_scheduler.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/load_stats_reporter.cc b/source/common/upstream/load_stats_reporter.cc index 9edf4e318a273..3b3f1bd06d08e 100644 --- a/source/common/upstream/load_stats_reporter.cc +++ b/source/common/upstream/load_stats_reporter.cc @@ -1,10 +1,10 @@ -#include "common/upstream/load_stats_reporter.h" +#include "source/common/upstream/load_stats_reporter.h" #include "envoy/service/load_stats/v3/lrs.pb.h" #include "envoy/stats/scope.h" -#include "common/config/version_converter.h" -#include "common/protobuf/protobuf.h" +#include "source/common/config/version_converter.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/load_stats_reporter.h b/source/common/upstream/load_stats_reporter.h index d656ad0cf6e3e..97302ad1223f2 100644 --- a/source/common/upstream/load_stats_reporter.h +++ b/source/common/upstream/load_stats_reporter.h @@ -6,9 +6,9 @@ #include "envoy/stats/stats_macros.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/logger.h" -#include "common/grpc/async_client_impl.h" -#include "common/grpc/typed_async_client.h" +#include "source/common/common/logger.h" +#include "source/common/grpc/async_client_impl.h" +#include "source/common/grpc/typed_async_client.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/locality_endpoint.h b/source/common/upstream/locality_endpoint.h index a928cbde3ad0b..295110bf1e0ff 100644 --- a/source/common/upstream/locality_endpoint.h +++ b/source/common/upstream/locality_endpoint.h @@ -3,7 +3,7 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/config/endpoint/v3/endpoint_components.pb.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/logical_dns_cluster.cc b/source/common/upstream/logical_dns_cluster.cc index c0a3433f49f9e..7424ba44fbb53 100644 --- a/source/common/upstream/logical_dns_cluster.cc +++ b/source/common/upstream/logical_dns_cluster.cc @@ -1,4 +1,4 @@ -#include "common/upstream/logical_dns_cluster.h" +#include "source/common/upstream/logical_dns_cluster.h" #include #include @@ -12,12 +12,12 @@ #include "envoy/config/endpoint/v3/endpoint.pb.h" #include "envoy/stats/scope.h" -#include "common/common/fmt.h" -#include "common/config/utility.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/common/fmt.h" +#include "source/common/config/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/logical_dns_cluster.h b/source/common/upstream/logical_dns_cluster.h index c0503cd891fdb..b2d13cbc9b515 100644 --- a/source/common/upstream/logical_dns_cluster.h +++ b/source/common/upstream/logical_dns_cluster.h @@ -10,12 +10,10 @@ #include "envoy/config/endpoint/v3/endpoint_components.pb.h" #include "envoy/stats/scope.h" -#include "common/common/empty_string.h" -#include "common/upstream/cluster_factory_impl.h" -#include "common/upstream/logical_host.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/clusters/well_known_names.h" +#include "source/common/common/empty_string.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/common/upstream/logical_host.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Upstream { @@ -80,8 +78,7 @@ class LogicalDnsCluster : public ClusterImplBase { class LogicalDnsClusterFactory : public ClusterFactoryImplBase { public: - LogicalDnsClusterFactory() - : ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().LogicalDns) {} + LogicalDnsClusterFactory() : ClusterFactoryImplBase("envoy.cluster.logical_dns") {} private: std::pair createClusterImpl( diff --git a/source/common/upstream/logical_host.cc b/source/common/upstream/logical_host.cc index 302b125cc18e7..6fe30a3498936 100644 --- a/source/common/upstream/logical_host.cc +++ b/source/common/upstream/logical_host.cc @@ -1,4 +1,4 @@ -#include "common/upstream/logical_host.h" +#include "source/common/upstream/logical_host.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/logical_host.h b/source/common/upstream/logical_host.h index ae2efb3ebb45a..68d6ca0b66dd4 100644 --- a/source/common/upstream/logical_host.h +++ b/source/common/upstream/logical_host.h @@ -4,7 +4,7 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/config/endpoint/v3/endpoint_components.pb.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/maglev_lb.cc b/source/common/upstream/maglev_lb.cc index bf542bf788791..7617853725d06 100644 --- a/source/common/upstream/maglev_lb.cc +++ b/source/common/upstream/maglev_lb.cc @@ -1,4 +1,4 @@ -#include "common/upstream/maglev_lb.h" +#include "source/common/upstream/maglev_lb.h" #include "envoy/config/cluster/v3/cluster.pb.h" diff --git a/source/common/upstream/maglev_lb.h b/source/common/upstream/maglev_lb.h index 3f80b842d4744..d2c4ed58109bd 100644 --- a/source/common/upstream/maglev_lb.h +++ b/source/common/upstream/maglev_lb.h @@ -5,8 +5,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/upstream/thread_aware_lb_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/upstream/thread_aware_lb_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/original_dst_cluster.cc b/source/common/upstream/original_dst_cluster.cc index 22313edebe5d0..6ab8ed4db7599 100644 --- a/source/common/upstream/original_dst_cluster.cc +++ b/source/common/upstream/original_dst_cluster.cc @@ -1,4 +1,4 @@ -#include "common/upstream/original_dst_cluster.h" +#include "source/common/upstream/original_dst_cluster.h" #include #include @@ -11,11 +11,11 @@ #include "envoy/config/endpoint/v3/endpoint_components.pb.h" #include "envoy/stats/scope.h" -#include "common/http/headers.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/http/headers.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/original_dst_cluster.h b/source/common/upstream/original_dst_cluster.h index 0e1a3d992e7a7..2ee8eceac5018 100644 --- a/source/common/upstream/original_dst_cluster.h +++ b/source/common/upstream/original_dst_cluster.h @@ -10,12 +10,10 @@ #include "envoy/stats/scope.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/empty_string.h" -#include "common/common/logger.h" -#include "common/upstream/cluster_factory_impl.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/clusters/well_known_names.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/logger.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Upstream { @@ -120,8 +118,7 @@ using OriginalDstClusterSharedPtr = std::shared_ptr; class OriginalDstClusterFactory : public ClusterFactoryImplBase { public: - OriginalDstClusterFactory() - : ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().OriginalDst) {} + OriginalDstClusterFactory() : ClusterFactoryImplBase("envoy.cluster.original_dst") {} private: std::pair createClusterImpl( diff --git a/source/common/upstream/outlier_detection_impl.cc b/source/common/upstream/outlier_detection_impl.cc index 4532c6c43ca81..bbf52ae4bc615 100644 --- a/source/common/upstream/outlier_detection_impl.cc +++ b/source/common/upstream/outlier_detection_impl.cc @@ -1,4 +1,4 @@ -#include "common/upstream/outlier_detection_impl.h" +#include "source/common/upstream/outlier_detection_impl.h" #include #include @@ -12,12 +12,12 @@ #include "envoy/event/dispatcher.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/http/codes.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/http/codes.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/priority_conn_pool_map.h b/source/common/upstream/priority_conn_pool_map.h index 92b17174170da..18ce2c52eb959 100644 --- a/source/common/upstream/priority_conn_pool_map.h +++ b/source/common/upstream/priority_conn_pool_map.h @@ -4,7 +4,7 @@ #include "envoy/upstream/resource_manager.h" #include "envoy/upstream/upstream.h" -#include "common/upstream/conn_pool_map.h" +#include "source/common/upstream/conn_pool_map.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/priority_conn_pool_map_impl.h b/source/common/upstream/priority_conn_pool_map_impl.h index 8ece04d0272e0..b1cb6f8c54d12 100644 --- a/source/common/upstream/priority_conn_pool_map_impl.h +++ b/source/common/upstream/priority_conn_pool_map_impl.h @@ -1,7 +1,7 @@ #pragma once -#include "common/upstream/conn_pool_map_impl.h" -#include "common/upstream/priority_conn_pool_map.h" +#include "source/common/upstream/conn_pool_map_impl.h" +#include "source/common/upstream/priority_conn_pool_map.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/resource_manager_impl.h b/source/common/upstream/resource_manager_impl.h index 4cbf371daf1da..1609273568d2d 100644 --- a/source/common/upstream/resource_manager_impl.h +++ b/source/common/upstream/resource_manager_impl.h @@ -10,8 +10,8 @@ #include "envoy/upstream/resource_manager.h" #include "envoy/upstream/upstream.h" -#include "common/common/assert.h" -#include "common/common/basic_resource_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/basic_resource_impl.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/ring_hash_lb.cc b/source/common/upstream/ring_hash_lb.cc index bbdcec520def0..567ea6b300d0e 100644 --- a/source/common/upstream/ring_hash_lb.cc +++ b/source/common/upstream/ring_hash_lb.cc @@ -1,4 +1,4 @@ -#include "common/upstream/ring_hash_lb.h" +#include "source/common/upstream/ring_hash_lb.h" #include #include @@ -7,8 +7,8 @@ #include "envoy/config/cluster/v3/cluster.pb.h" -#include "common/common/assert.h" -#include "common/upstream/load_balancer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/upstream/load_balancer_impl.h" #include "absl/container/inlined_vector.h" #include "absl/strings/string_view.h" diff --git a/source/common/upstream/ring_hash_lb.h b/source/common/upstream/ring_hash_lb.h index 2f6dc03ab5636..3369a7ba635a1 100644 --- a/source/common/upstream/ring_hash_lb.h +++ b/source/common/upstream/ring_hash_lb.h @@ -7,8 +7,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" -#include "common/upstream/thread_aware_lb_impl.h" +#include "source/common/common/logger.h" +#include "source/common/upstream/thread_aware_lb_impl.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/static_cluster.cc b/source/common/upstream/static_cluster.cc index 12fa3999b5524..e6044f91aa019 100644 --- a/source/common/upstream/static_cluster.cc +++ b/source/common/upstream/static_cluster.cc @@ -1,4 +1,4 @@ -#include "common/upstream/static_cluster.h" +#include "source/common/upstream/static_cluster.h" #include "envoy/common/exception.h" #include "envoy/config/cluster/v3/cluster.pb.h" diff --git a/source/common/upstream/static_cluster.h b/source/common/upstream/static_cluster.h index b5de7b76b8dd6..a6c710ac6aec6 100644 --- a/source/common/upstream/static_cluster.h +++ b/source/common/upstream/static_cluster.h @@ -2,8 +2,8 @@ #include "envoy/config/cluster/v3/cluster.pb.h" -#include "common/upstream/cluster_factory_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Upstream { @@ -34,8 +34,7 @@ class StaticClusterImpl : public ClusterImplBase { */ class StaticClusterFactory : public ClusterFactoryImplBase { public: - StaticClusterFactory() - : ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().Static) {} + StaticClusterFactory() : ClusterFactoryImplBase("envoy.cluster.static") {} private: std::pair createClusterImpl( diff --git a/source/common/upstream/strict_dns_cluster.cc b/source/common/upstream/strict_dns_cluster.cc index 726070b6389b7..8eb57bf2ba2e8 100644 --- a/source/common/upstream/strict_dns_cluster.cc +++ b/source/common/upstream/strict_dns_cluster.cc @@ -1,4 +1,4 @@ -#include "common/upstream/strict_dns_cluster.h" +#include "source/common/upstream/strict_dns_cluster.h" #include "envoy/common/exception.h" #include "envoy/config/cluster/v3/cluster.pb.h" diff --git a/source/common/upstream/strict_dns_cluster.h b/source/common/upstream/strict_dns_cluster.h index 6895c411a5fb3..6be3a83f436ec 100644 --- a/source/common/upstream/strict_dns_cluster.h +++ b/source/common/upstream/strict_dns_cluster.h @@ -3,8 +3,8 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/config/endpoint/v3/endpoint_components.pb.h" -#include "common/upstream/cluster_factory_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Upstream { @@ -70,8 +70,7 @@ class StrictDnsClusterImpl : public BaseDynamicClusterImpl { */ class StrictDnsClusterFactory : public ClusterFactoryImplBase { public: - StrictDnsClusterFactory() - : ClusterFactoryImplBase(Extensions::Clusters::ClusterTypes::get().StrictDns) {} + StrictDnsClusterFactory() : ClusterFactoryImplBase("envoy.cluster.strict_dns") {} private: std::pair createClusterImpl( diff --git a/source/common/upstream/subset_lb.cc b/source/common/upstream/subset_lb.cc index 65fc2d241c6a6..95cbf16af8cb4 100644 --- a/source/common/upstream/subset_lb.cc +++ b/source/common/upstream/subset_lb.cc @@ -1,4 +1,4 @@ -#include "common/upstream/subset_lb.h" +#include "source/common/upstream/subset_lb.h" #include @@ -6,13 +6,13 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/runtime/runtime.h" -#include "common/common/assert.h" -#include "common/config/metadata.h" -#include "common/config/well_known_names.h" -#include "common/protobuf/utility.h" -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/maglev_lb.h" -#include "common/upstream/ring_hash_lb.h" +#include "source/common/common/assert.h" +#include "source/common/config/metadata.h" +#include "source/common/config/well_known_names.h" +#include "source/common/protobuf/utility.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/maglev_lb.h" +#include "source/common/upstream/ring_hash_lb.h" #include "absl/container/node_hash_set.h" diff --git a/source/common/upstream/subset_lb.h b/source/common/upstream/subset_lb.h index 87b08ae115b88..c84c572d78baf 100644 --- a/source/common/upstream/subset_lb.h +++ b/source/common/upstream/subset_lb.h @@ -10,10 +10,10 @@ #include "envoy/stats/scope.h" #include "envoy/upstream/load_balancer.h" -#include "common/common/macros.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/common/macros.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/upstream/upstream_impl.h" #include "absl/container/node_hash_map.h" #include "absl/types/optional.h" diff --git a/source/common/upstream/thread_aware_lb_impl.cc b/source/common/upstream/thread_aware_lb_impl.cc index 1a4141fb85c86..888f63a3789f3 100644 --- a/source/common/upstream/thread_aware_lb_impl.cc +++ b/source/common/upstream/thread_aware_lb_impl.cc @@ -1,4 +1,4 @@ -#include "common/upstream/thread_aware_lb_impl.h" +#include "source/common/upstream/thread_aware_lb_impl.h" #include #include diff --git a/source/common/upstream/thread_aware_lb_impl.h b/source/common/upstream/thread_aware_lb_impl.h index 97895e8e2d858..38c04e99b5019 100644 --- a/source/common/upstream/thread_aware_lb_impl.h +++ b/source/common/upstream/thread_aware_lb_impl.h @@ -3,10 +3,10 @@ #include "envoy/common/callback.h" #include "envoy/config/cluster/v3/cluster.pb.h" -#include "common/common/logger.h" -#include "common/config/metadata.h" -#include "common/config/well_known_names.h" -#include "common/upstream/load_balancer_impl.h" +#include "source/common/common/logger.h" +#include "source/common/config/metadata.h" +#include "source/common/config/well_known_names.h" +#include "source/common/upstream/load_balancer_impl.h" #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" diff --git a/source/common/upstream/transport_socket_match_impl.cc b/source/common/upstream/transport_socket_match_impl.cc index 7d425dd4a53c7..57e8f140a94b2 100644 --- a/source/common/upstream/transport_socket_match_impl.cc +++ b/source/common/upstream/transport_socket_match_impl.cc @@ -1,10 +1,10 @@ -#include "common/upstream/transport_socket_match_impl.h" +#include "source/common/upstream/transport_socket_match_impl.h" #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/server/transport_socket_config.h" -#include "common/config/utility.h" +#include "source/common/config/utility.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/transport_socket_match_impl.h b/source/common/upstream/transport_socket_match_impl.h index f3fb2ab173e40..83ffb41774c91 100644 --- a/source/common/upstream/transport_socket_match_impl.h +++ b/source/common/upstream/transport_socket_match_impl.h @@ -11,10 +11,10 @@ #include "envoy/upstream/host_description.h" #include "envoy/upstream/upstream.h" -#include "common/common/logger.h" -#include "common/config/metadata.h" -#include "common/config/well_known_names.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/logger.h" +#include "source/common/config/metadata.h" +#include "source/common/config/well_known_names.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Upstream { diff --git a/source/common/upstream/upstream_impl.cc b/source/common/upstream/upstream_impl.cc index a4dbd0eeb21a7..d710972e00311 100644 --- a/source/common/upstream/upstream_impl.cc +++ b/source/common/upstream/upstream_impl.cc @@ -1,4 +1,4 @@ -#include "common/upstream/upstream_impl.h" +#include "source/common/upstream/upstream_impl.h" #include #include @@ -28,30 +28,28 @@ #include "envoy/upstream/health_checker.h" #include "envoy/upstream/upstream.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/config/utility.h" -#include "common/http/http1/codec_stats.h" -#include "common/http/http2/codec_stats.h" -#include "common/http/utility.h" -#include "common/network/address_impl.h" -#include "common/network/resolver_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/socket_option_impl.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/router/config_utility.h" -#include "common/runtime/runtime_features.h" -#include "common/runtime/runtime_impl.h" -#include "common/upstream/eds.h" -#include "common/upstream/health_checker_impl.h" -#include "common/upstream/logical_dns_cluster.h" -#include "common/upstream/original_dst_cluster.h" - -#include "server/transport_socket_config_impl.h" - -#include "extensions/filters/network/common/utility.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/config/utility.h" +#include "source/common/http/http1/codec_stats.h" +#include "source/common/http/http2/codec_stats.h" +#include "source/common/http/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/resolver_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/config_utility.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/upstream/eds.h" +#include "source/common/upstream/health_checker_impl.h" +#include "source/common/upstream/logical_dns_cluster.h" +#include "source/common/upstream/original_dst_cluster.h" +#include "source/extensions/filters/network/common/utility.h" +#include "source/server/transport_socket_config_impl.h" #include "absl/container/node_hash_set.h" #include "absl/strings/str_cat.h" diff --git a/source/common/upstream/upstream_impl.h b/source/common/upstream/upstream_impl.h index 18c8d8ce832da..52f5731db50c2 100644 --- a/source/common/upstream/upstream_impl.h +++ b/source/common/upstream/upstream_impl.h @@ -37,27 +37,25 @@ #include "envoy/upstream/locality.h" #include "envoy/upstream/upstream.h" -#include "common/common/callback_impl.h" -#include "common/common/enum_to_int.h" -#include "common/common/logger.h" -#include "common/common/thread.h" -#include "common/config/metadata.h" -#include "common/config/well_known_names.h" -#include "common/http/http1/codec_stats.h" -#include "common/http/http2/codec_stats.h" -#include "common/http/http3/codec_stats.h" -#include "common/init/manager_impl.h" -#include "common/network/utility.h" -#include "common/shared_pool/shared_pool.h" -#include "common/stats/isolated_store_impl.h" -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/outlier_detection_impl.h" -#include "common/upstream/resource_manager_impl.h" -#include "common/upstream/transport_socket_match_impl.h" - -#include "server/transport_socket_config_impl.h" - -#include "extensions/upstreams/http/config.h" +#include "source/common/common/callback_impl.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/common/config/metadata.h" +#include "source/common/config/well_known_names.h" +#include "source/common/http/http1/codec_stats.h" +#include "source/common/http/http2/codec_stats.h" +#include "source/common/http/http3/codec_stats.h" +#include "source/common/init/manager_impl.h" +#include "source/common/network/utility.h" +#include "source/common/shared_pool/shared_pool.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/outlier_detection_impl.h" +#include "source/common/upstream/resource_manager_impl.h" +#include "source/common/upstream/transport_socket_match_impl.h" +#include "source/extensions/upstreams/http/config.h" +#include "source/server/transport_socket_config_impl.h" #include "absl/container/node_hash_set.h" #include "absl/synchronization/mutex.h" diff --git a/source/common/version/api_version.h b/source/common/version/api_version.h index 10681596c44e1..38e36a20f0f55 100644 --- a/source/common/version/api_version.h +++ b/source/common/version/api_version.h @@ -1,10 +1,10 @@ #pragma once -#include "common/version/api_version_struct.h" +#include "source/common/version/api_version_struct.h" // Defines the ApiVersion current version (Envoy::api_version), and oldest // version (Envoy::oldest_api_version). -#include "common/version/api_version_number.h" +#include "source/common/version/api_version_number.h" namespace Envoy { diff --git a/source/common/version/version.cc b/source/common/version/version.cc index f1d80c8e19e4b..1d0b3ff7d05b2 100644 --- a/source/common/version/version.cc +++ b/source/common/version/version.cc @@ -1,12 +1,12 @@ -#include "common/version/version.h" +#include "source/common/version/version.h" #include #include #include -#include "common/common/fmt.h" -#include "common/common/macros.h" -#include "common/protobuf/utility.h" +#include "source/common/common/fmt.h" +#include "source/common/common/macros.h" +#include "source/common/protobuf/utility.h" #include "absl/strings/numbers.h" #include "absl/strings/str_split.h" diff --git a/source/common/version/version.h b/source/common/version/version.h index 345ef2714c066..a1ed1a5e2d200 100644 --- a/source/common/version/version.h +++ b/source/common/version/version.h @@ -4,8 +4,8 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/singleton/const_singleton.h" -#include "common/version/version_number.h" +#include "source/common/singleton/const_singleton.h" +#include "source/common/version/version_number.h" namespace Envoy { diff --git a/source/common/watchdog/BUILD b/source/common/watchdog/BUILD index db6b6162ba75d..21fbfd3302ce5 100644 --- a/source/common/watchdog/BUILD +++ b/source/common/watchdog/BUILD @@ -13,9 +13,9 @@ envoy_cc_library( srcs = ["abort_action.cc"], hdrs = ["abort_action.h"], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/server:guarddog_config_interface", - "//include/envoy/thread:thread_interface", + "//envoy/common:time_interface", + "//envoy/server:guarddog_config_interface", + "//envoy/thread:thread_interface", "//source/common/common:assert_lib", "//source/common/protobuf:utility_lib", "//source/common/thread:terminate_thread_lib", @@ -29,7 +29,7 @@ envoy_cc_library( hdrs = ["abort_action_config.h"], deps = [ ":abort_action_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/common/config:utility_lib", "//source/common/protobuf", "//source/common/protobuf:message_validator_lib", diff --git a/source/common/watchdog/abort_action.cc b/source/common/watchdog/abort_action.cc index d629b0bce70ea..daa405fdda249 100644 --- a/source/common/watchdog/abort_action.cc +++ b/source/common/watchdog/abort_action.cc @@ -1,12 +1,12 @@ -#include "common/watchdog/abort_action.h" +#include "source/common/watchdog/abort_action.h" #include "envoy/thread/thread.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/logger.h" -#include "common/protobuf/utility.h" -#include "common/thread/terminate_thread.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/logger.h" +#include "source/common/protobuf/utility.h" +#include "source/common/thread/terminate_thread.h" namespace Envoy { namespace Watchdog { diff --git a/source/common/watchdog/abort_action_config.cc b/source/common/watchdog/abort_action_config.cc index 916864386ace2..ad775743598a8 100644 --- a/source/common/watchdog/abort_action_config.cc +++ b/source/common/watchdog/abort_action_config.cc @@ -1,10 +1,10 @@ -#include "common/watchdog/abort_action_config.h" +#include "source/common/watchdog/abort_action_config.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/watchdog/abort_action.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/watchdog/abort_action.h" namespace Envoy { namespace Watchdog { diff --git a/source/common/watchdog/abort_action_config.h b/source/common/watchdog/abort_action_config.h index 27f65ea16b609..54f2169bf15f6 100644 --- a/source/common/watchdog/abort_action_config.h +++ b/source/common/watchdog/abort_action_config.h @@ -3,7 +3,7 @@ #include "envoy/server/guarddog_config.h" #include "envoy/watchdog/v3alpha/abort_action.pb.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Watchdog { diff --git a/source/exe/BUILD b/source/exe/BUILD index f7ac0c912ff5b..f3fb551eb83ab 100644 --- a/source/exe/BUILD +++ b/source/exe/BUILD @@ -111,7 +111,7 @@ envoy_cc_library( ":envoy_common_with_core_extensions_lib", ":platform_impl_lib", ":process_wide_lib", - "//include/envoy/server:platform_interface", + "//envoy/server:platform_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:compiler_requirements_lib", "//source/common/common:perf_annotation_lib", @@ -151,7 +151,7 @@ envoy_cc_library( name = "platform_header_lib", hdrs = ["platform_impl.h"], deps = [ - "//include/envoy/server:platform_interface", + "//envoy/server:platform_interface", ], ) @@ -203,6 +203,7 @@ envoy_cc_library( ], "//conditions:default": [], }), + include_prefix = "source/exe", strip_include_prefix = select({ "//bazel:windows_x86_64": "win32", "//conditions:default": "", diff --git a/source/exe/linux/platform_impl.cc b/source/exe/linux/platform_impl.cc index 60e2ae80914ab..a1c04243eb773 100644 --- a/source/exe/linux/platform_impl.cc +++ b/source/exe/linux/platform_impl.cc @@ -4,10 +4,9 @@ #include -#include "common/common/thread_impl.h" -#include "common/filesystem/filesystem_impl.h" - -#include "exe/platform_impl.h" +#include "source/common/common/thread_impl.h" +#include "source/common/filesystem/filesystem_impl.h" +#include "source/exe/platform_impl.h" namespace Envoy { diff --git a/source/exe/main.cc b/source/exe/main.cc index 0737d3e1d22e8..d1c1ba8d40a94 100644 --- a/source/exe/main.cc +++ b/source/exe/main.cc @@ -1,7 +1,7 @@ -#include "exe/main_common.h" +#include "source/exe/main_common.h" #ifdef WIN32 -#include "exe/service_base.h" +#include "source/exe/service_base.h" #endif // NOLINT(namespace-envoy) diff --git a/source/exe/main_common.cc b/source/exe/main_common.cc index 2051c22b0a510..2db8fca337e36 100644 --- a/source/exe/main_common.cc +++ b/source/exe/main_common.cc @@ -1,4 +1,4 @@ -#include "exe/main_common.h" +#include "source/exe/main_common.h" #include #include @@ -7,26 +7,24 @@ #include "envoy/config/listener/v3/listener.pb.h" -#include "common/common/compiler_requirements.h" -#include "common/common/logger.h" -#include "common/common/perf_annotation.h" -#include "common/network/utility.h" -#include "common/stats/thread_local_store.h" - -#include "exe/platform_impl.h" - -#include "server/config_validation/server.h" -#include "server/drain_manager_impl.h" -#include "server/hot_restart_nop_impl.h" -#include "server/listener_hooks.h" -#include "server/options_impl.h" -#include "server/server.h" +#include "source/common/common/compiler_requirements.h" +#include "source/common/common/logger.h" +#include "source/common/common/perf_annotation.h" +#include "source/common/network/utility.h" +#include "source/common/stats/thread_local_store.h" +#include "source/exe/platform_impl.h" +#include "source/server/config_validation/server.h" +#include "source/server/drain_manager_impl.h" +#include "source/server/hot_restart_nop_impl.h" +#include "source/server/listener_hooks.h" +#include "source/server/options_impl.h" +#include "source/server/server.h" #include "absl/debugging/symbolize.h" #include "absl/strings/str_split.h" #ifdef ENVOY_HOT_RESTART -#include "server/hot_restart_impl.h" +#include "source/server/hot_restart_impl.h" #endif namespace Envoy { diff --git a/source/exe/main_common.h b/source/exe/main_common.h index 60ef44d42997a..d61ecdac4ee06 100644 --- a/source/exe/main_common.h +++ b/source/exe/main_common.h @@ -4,22 +4,20 @@ #include "envoy/runtime/runtime.h" #include "envoy/server/platform.h" -#include "common/common/thread.h" -#include "common/event/real_time_system.h" -#include "common/grpc/google_grpc_context.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/thread_local_store.h" -#include "common/thread_local/thread_local_impl.h" - -#include "exe/process_wide.h" - -#include "server/listener_hooks.h" -#include "server/options_impl.h" -#include "server/server.h" +#include "source/common/common/thread.h" +#include "source/common/event/real_time_system.h" +#include "source/common/grpc/google_grpc_context.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/thread_local_store.h" +#include "source/common/thread_local/thread_local_impl.h" +#include "source/exe/process_wide.h" +#include "source/server/listener_hooks.h" +#include "source/server/options_impl.h" +#include "source/server/server.h" #ifdef ENVOY_HANDLE_SIGNALS -#include "common/signal/signal_action.h" -#include "exe/terminate_handler.h" +#include "source/common/signal/signal_action.h" +#include "source/exe/terminate_handler.h" #endif namespace Envoy { diff --git a/source/exe/posix/platform_impl.cc b/source/exe/posix/platform_impl.cc index 730280c4bd960..391d3be940ae2 100644 --- a/source/exe/posix/platform_impl.cc +++ b/source/exe/posix/platform_impl.cc @@ -1,7 +1,6 @@ -#include "common/common/thread_impl.h" -#include "common/filesystem/filesystem_impl.h" - -#include "exe/platform_impl.h" +#include "source/common/common/thread_impl.h" +#include "source/common/filesystem/filesystem_impl.h" +#include "source/exe/platform_impl.h" namespace Envoy { diff --git a/source/exe/process_wide.cc b/source/exe/process_wide.cc index 219921c081bbc..48512525bc5f5 100644 --- a/source/exe/process_wide.cc +++ b/source/exe/process_wide.cc @@ -1,10 +1,9 @@ -#include "exe/process_wide.h" +#include "source/exe/process_wide.h" -#include "common/common/assert.h" -#include "common/event/libevent.h" -#include "common/http/http2/nghttp2.h" - -#include "server/proto_descriptors.h" +#include "source/common/common/assert.h" +#include "source/common/event/libevent.h" +#include "source/common/http/http2/nghttp2.h" +#include "source/server/proto_descriptors.h" #include "ares.h" diff --git a/source/exe/terminate_handler.cc b/source/exe/terminate_handler.cc index 262ebbfbf0b6d..74c68e2076f2d 100644 --- a/source/exe/terminate_handler.cc +++ b/source/exe/terminate_handler.cc @@ -1,10 +1,9 @@ -#include "exe/terminate_handler.h" +#include "source/exe/terminate_handler.h" #include -#include "common/common/logger.h" - -#include "server/backtrace.h" +#include "source/common/common/logger.h" +#include "source/server/backtrace.h" namespace Envoy { diff --git a/source/exe/terminate_handler.h b/source/exe/terminate_handler.h index e862031af651f..62ddfe5876737 100644 --- a/source/exe/terminate_handler.h +++ b/source/exe/terminate_handler.h @@ -2,8 +2,8 @@ #include -#include "common/common/logger.h" -#include "common/common/non_copyable.h" +#include "source/common/common/logger.h" +#include "source/common/common/non_copyable.h" namespace Envoy { diff --git a/source/exe/win32/platform_impl.cc b/source/exe/win32/platform_impl.cc index 4b10bece2bbf2..8b788a60e586d 100644 --- a/source/exe/win32/platform_impl.cc +++ b/source/exe/win32/platform_impl.cc @@ -1,13 +1,12 @@ #include #include -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/thread_impl.h" -#include "common/event/signal_impl.h" -#include "common/filesystem/filesystem_impl.h" - -#include "exe/platform_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/thread_impl.h" +#include "source/common/event/signal_impl.h" +#include "source/common/filesystem/filesystem_impl.h" +#include "source/exe/platform_impl.h" namespace Envoy { diff --git a/source/exe/win32/service_base.cc b/source/exe/win32/service_base.cc index e5e3298c667a1..0c226a8acf637 100644 --- a/source/exe/win32/service_base.cc +++ b/source/exe/win32/service_base.cc @@ -1,13 +1,12 @@ #include #include -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/thread.h" -#include "common/event/signal_impl.h" - -#include "exe/main_common.h" -#include "exe/service_base.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/thread.h" +#include "source/common/event/signal_impl.h" +#include "source/exe/main_common.h" +#include "source/exe/service_base.h" #include "absl/debugging/symbolize.h" diff --git a/source/exe/win32/service_base.h b/source/exe/win32/service_base.h index ed48c2ac7430a..14bd8498ddd7e 100644 --- a/source/exe/win32/service_base.h +++ b/source/exe/win32/service_base.h @@ -9,9 +9,8 @@ #include "envoy/event/signal.h" -#include "common/common/win32/event_logger_impl.h" - -#include "exe/service_status.h" +#include "source/common/common/win32/event_logger_impl.h" +#include "source/exe/service_status.h" namespace Envoy { class ServiceBase { diff --git a/source/extensions/access_loggers/BUILD b/source/extensions/access_loggers/BUILD index 40a5e79b39d3b..90e061ad8da39 100644 --- a/source/extensions/access_loggers/BUILD +++ b/source/extensions/access_loggers/BUILD @@ -1,19 +1,8 @@ load( "//bazel:envoy_build_system.bzl", - "envoy_cc_library", "envoy_extension_package", ) licenses(["notice"]) # Apache 2 envoy_extension_package() - -envoy_cc_library( - name = "well_known_names", - hdrs = ["well_known_names.h"], - # well known names files are public as long as they exist. - visibility = ["//visibility:public"], - deps = [ - "//source/common/singleton:const_singleton", - ], -) diff --git a/source/extensions/access_loggers/common/BUILD b/source/extensions/access_loggers/common/BUILD index 669f7149cd2a0..d7968b6e0560c 100644 --- a/source/extensions/access_loggers/common/BUILD +++ b/source/extensions/access_loggers/common/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( srcs = ["access_log_base.cc"], hdrs = ["access_log_base.h"], deps = [ - "//include/envoy/access_log:access_log_interface", + "//envoy/access_log:access_log_interface", "//source/common/access_log:access_log_lib", "//source/common/http:header_map_lib", "//source/common/singleton:const_singleton", @@ -49,11 +49,11 @@ envoy_cc_library( name = "grpc_access_logger", hdrs = ["grpc_access_logger.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/grpc:async_client_manager_interface", - "//include/envoy/singleton:instance_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/event:dispatcher_interface", + "//envoy/grpc:async_client_manager_interface", + "//envoy/singleton:instance_interface", + "//envoy/stats:stats_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/common:assert_lib", "//source/common/grpc:typed_async_client_lib", "//source/common/protobuf:utility_lib", diff --git a/source/extensions/access_loggers/common/access_log_base.cc b/source/extensions/access_loggers/common/access_log_base.cc index 0323013d63504..f5ed7675f85f5 100644 --- a/source/extensions/access_loggers/common/access_log_base.cc +++ b/source/extensions/access_loggers/common/access_log_base.cc @@ -1,7 +1,7 @@ -#include "extensions/access_loggers/common/access_log_base.h" +#include "source/extensions/access_loggers/common/access_log_base.h" -#include "common/http/header_map_impl.h" -#include "common/singleton/const_singleton.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/common/access_log_base.h b/source/extensions/access_loggers/common/access_log_base.h index 4fc1aae87d6c2..5ae041c72951a 100644 --- a/source/extensions/access_loggers/common/access_log_base.h +++ b/source/extensions/access_loggers/common/access_log_base.h @@ -8,8 +8,8 @@ #include "envoy/runtime/runtime.h" #include "envoy/server/access_log_config.h" -#include "common/http/header_utility.h" -#include "common/protobuf/protobuf.h" +#include "source/common/http/header_utility.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/common/file_access_log_impl.cc b/source/extensions/access_loggers/common/file_access_log_impl.cc index 37f2698057dcd..9b074362e55a7 100644 --- a/source/extensions/access_loggers/common/file_access_log_impl.cc +++ b/source/extensions/access_loggers/common/file_access_log_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/access_loggers/common/file_access_log_impl.h" +#include "source/extensions/access_loggers/common/file_access_log_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/common/file_access_log_impl.h b/source/extensions/access_loggers/common/file_access_log_impl.h index b44b2999582f5..6a4f0daf7df9b 100644 --- a/source/extensions/access_loggers/common/file_access_log_impl.h +++ b/source/extensions/access_loggers/common/file_access_log_impl.h @@ -1,8 +1,7 @@ #pragma once -#include "common/formatter/substitution_formatter.h" - -#include "extensions/access_loggers/common/access_log_base.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/extensions/access_loggers/common/access_log_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/common/grpc_access_logger.h b/source/extensions/access_loggers/common/grpc_access_logger.h index 9fa38a4491b4e..91e634d499b09 100644 --- a/source/extensions/access_loggers/common/grpc_access_logger.h +++ b/source/extensions/access_loggers/common/grpc_access_logger.h @@ -9,9 +9,9 @@ #include "envoy/stats/scope.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/assert.h" -#include "common/grpc/typed_async_client.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/grpc/typed_async_client.h" +#include "source/common/protobuf/utility.h" #include "absl/container/flat_hash_map.h" #include "absl/types/optional.h" diff --git a/source/extensions/access_loggers/common/stream_access_log_common_impl.h b/source/extensions/access_loggers/common/stream_access_log_common_impl.h index feec726dc834d..7c5e335594a25 100644 --- a/source/extensions/access_loggers/common/stream_access_log_common_impl.h +++ b/source/extensions/access_loggers/common/stream_access_log_common_impl.h @@ -2,10 +2,9 @@ #include "envoy/server/access_log_config.h" -#include "common/formatter/substitution_format_string.h" -#include "common/formatter/substitution_formatter.h" - -#include "extensions/access_loggers/common/file_access_log_impl.h" +#include "source/common/formatter/substitution_format_string.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/extensions/access_loggers/common/file_access_log_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/file/BUILD b/source/extensions/access_loggers/file/BUILD index d053296f6a9b8..b0f1c2df0ea67 100644 --- a/source/extensions/access_loggers/file/BUILD +++ b/source/extensions/access_loggers/file/BUILD @@ -20,11 +20,10 @@ envoy_cc_extension( "//test:__subpackages__", ], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/config:config_provider_lib", "//source/common/formatter:substitution_format_string_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/common:file_access_log_lib", "@envoy_api//envoy/extensions/access_loggers/file/v3:pkg_cc_proto", ], diff --git a/source/extensions/access_loggers/file/config.cc b/source/extensions/access_loggers/file/config.cc index 5eaacb5a37e14..44e7a29a7b92a 100644 --- a/source/extensions/access_loggers/file/config.cc +++ b/source/extensions/access_loggers/file/config.cc @@ -1,4 +1,4 @@ -#include "extensions/access_loggers/file/config.h" +#include "source/extensions/access_loggers/file/config.h" #include @@ -7,14 +7,12 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/common/logger.h" -#include "common/config/utility.h" -#include "common/formatter/substitution_format_string.h" -#include "common/formatter/substitution_formatter.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/access_loggers/common/file_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" +#include "source/common/common/logger.h" +#include "source/common/config/utility.h" +#include "source/common/formatter/substitution_format_string.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/access_loggers/common/file_access_log_impl.h" namespace Envoy { namespace Extensions { @@ -72,7 +70,7 @@ ProtobufTypes::MessagePtr FileAccessLogFactory::createEmptyConfigProto() { new envoy::extensions::access_loggers::file::v3::FileAccessLog()}; } -std::string FileAccessLogFactory::name() const { return AccessLogNames::get().File; } +std::string FileAccessLogFactory::name() const { return "envoy.access_loggers.file"; } /** * Static registration for the file access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/grpc/BUILD b/source/extensions/access_loggers/grpc/BUILD index 043c5dc898a1d..1174056f7b798 100644 --- a/source/extensions/access_loggers/grpc/BUILD +++ b/source/extensions/access_loggers/grpc/BUILD @@ -18,9 +18,9 @@ envoy_cc_library( hdrs = ["config_utils.h"], deps = [ ":grpc_access_log_lib", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", - "//include/envoy/singleton:instance_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", + "//envoy/singleton:instance_interface", ], ) @@ -29,10 +29,10 @@ envoy_cc_library( srcs = ["grpc_access_log_impl.cc"], hdrs = ["grpc_access_log_impl.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/grpc:async_client_manager_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/event:dispatcher_interface", + "//envoy/grpc:async_client_manager_interface", + "//envoy/local_info:local_info_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/config:utility_lib", "//source/common/grpc:typed_async_client_lib", "//source/extensions/access_loggers/common:grpc_access_logger", @@ -47,7 +47,7 @@ envoy_cc_library( srcs = ["grpc_access_log_utils.cc"], hdrs = ["grpc_access_log_utils.h"], deps = [ - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:upstream_interface", "//source/common/network:utility_lib", "//source/common/stream_info:stream_info_lib", "//source/common/stream_info:utility_lib", @@ -104,11 +104,10 @@ envoy_cc_extension( ], deps = [ ":config_utils", - "//include/envoy/server:access_log_config_interface", + "//envoy/server:access_log_config_interface", "//source/common/common:assert_lib", "//source/common/grpc:async_client_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/grpc:grpc_access_log_proto_descriptors_lib", "//source/extensions/access_loggers/grpc:http_grpc_access_log_lib", "@envoy_api//envoy/extensions/access_loggers/grpc/v3:pkg_cc_proto", @@ -126,11 +125,10 @@ envoy_cc_extension( ], deps = [ ":config_utils", - "//include/envoy/server:access_log_config_interface", + "//envoy/server:access_log_config_interface", "//source/common/common:assert_lib", "//source/common/grpc:async_client_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/grpc:grpc_access_log_proto_descriptors_lib", "//source/extensions/access_loggers/grpc:tcp_grpc_access_log_lib", "@envoy_api//envoy/extensions/access_loggers/grpc/v3:pkg_cc_proto", diff --git a/source/extensions/access_loggers/grpc/config_utils.cc b/source/extensions/access_loggers/grpc/config_utils.cc index b09bf2735bcfd..0010109617cd7 100644 --- a/source/extensions/access_loggers/grpc/config_utils.cc +++ b/source/extensions/access_loggers/grpc/config_utils.cc @@ -1,4 +1,4 @@ -#include "extensions/access_loggers/grpc/config_utils.h" +#include "source/extensions/access_loggers/grpc/config_utils.h" #include "envoy/singleton/manager.h" diff --git a/source/extensions/access_loggers/grpc/config_utils.h b/source/extensions/access_loggers/grpc/config_utils.h index 7d7e5082f8482..561d941784a2c 100644 --- a/source/extensions/access_loggers/grpc/config_utils.h +++ b/source/extensions/access_loggers/grpc/config_utils.h @@ -2,7 +2,7 @@ #include "envoy/server/filter_config.h" -#include "extensions/access_loggers/grpc/grpc_access_log_impl.h" +#include "source/extensions/access_loggers/grpc/grpc_access_log_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc b/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc index 8543e533a1a13..3c14627c3c96b 100644 --- a/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc +++ b/source/extensions/access_loggers/grpc/grpc_access_log_impl.cc @@ -1,12 +1,12 @@ -#include "extensions/access_loggers/grpc/grpc_access_log_impl.h" +#include "source/extensions/access_loggers/grpc/grpc_access_log_impl.h" #include "envoy/data/accesslog/v3/accesslog.pb.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" #include "envoy/grpc/async_client_manager.h" #include "envoy/local_info/local_info.h" -#include "common/config/utility.h" -#include "common/grpc/typed_async_client.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/typed_async_client.h" const char GRPC_LOG_STATS_PREFIX[] = "access_logs.grpc_access_log."; diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_impl.h b/source/extensions/access_loggers/grpc/grpc_access_log_impl.h index 0ab9628deb81a..5aef1e3edcf9f 100644 --- a/source/extensions/access_loggers/grpc/grpc_access_log_impl.h +++ b/source/extensions/access_loggers/grpc/grpc_access_log_impl.h @@ -10,7 +10,7 @@ #include "envoy/service/accesslog/v3/als.pb.h" #include "envoy/thread_local/thread_local.h" -#include "extensions/access_loggers/common/grpc_access_logger.h" +#include "source/extensions/access_loggers/common/grpc_access_logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc b/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc index 67dd0585bc557..e9346911355a0 100644 --- a/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc +++ b/source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.cc @@ -1,8 +1,8 @@ -#include "extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h" +#include "source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc b/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc index 84784c34ada8f..3d924c0cd47cb 100644 --- a/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc +++ b/source/extensions/access_loggers/grpc/grpc_access_log_utils.cc @@ -1,10 +1,10 @@ -#include "extensions/access_loggers/grpc/grpc_access_log_utils.h" +#include "source/extensions/access_loggers/grpc/grpc_access_log_utils.h" #include "envoy/data/accesslog/v3/accesslog.pb.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" #include "envoy/upstream/upstream.h" -#include "common/network/utility.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/grpc/http_config.cc b/source/extensions/access_loggers/grpc/http_config.cc index ae3ca564dc4f8..4d333f6d91fdc 100644 --- a/source/extensions/access_loggers/grpc/http_config.cc +++ b/source/extensions/access_loggers/grpc/http_config.cc @@ -1,19 +1,17 @@ -#include "extensions/access_loggers/grpc/http_config.h" +#include "source/extensions/access_loggers/grpc/http_config.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/common/assert.h" -#include "common/common/macros.h" -#include "common/grpc/async_client_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/access_loggers/grpc/config_utils.h" -#include "extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h" -#include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/common/grpc/async_client_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/access_loggers/grpc/config_utils.h" +#include "source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h" +#include "source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h" namespace Envoy { namespace Extensions { @@ -38,7 +36,7 @@ ProtobufTypes::MessagePtr HttpGrpcAccessLogFactory::createEmptyConfigProto() { return std::make_unique(); } -std::string HttpGrpcAccessLogFactory::name() const { return AccessLogNames::get().HttpGrpc; } +std::string HttpGrpcAccessLogFactory::name() const { return "envoy.access_loggers.http_grpc"; } /** * Static registration for the HTTP gRPC access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc index 64d3a283d13b2..cb37f1315efd2 100644 --- a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc +++ b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.cc @@ -1,16 +1,15 @@ -#include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h" +#include "source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/data/accesslog/v3/accesslog.pb.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" -#include "common/common/assert.h" -#include "common/config/utility.h" -#include "common/http/headers.h" -#include "common/network/utility.h" -#include "common/stream_info/utility.h" - -#include "extensions/access_loggers/grpc/grpc_access_log_utils.h" +#include "source/common/common/assert.h" +#include "source/common/config/utility.h" +#include "source/common/http/headers.h" +#include "source/common/network/utility.h" +#include "source/common/stream_info/utility.h" +#include "source/extensions/access_loggers/grpc/grpc_access_log_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h index fcae58bd5f105..d403596f8decc 100644 --- a/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h +++ b/source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h @@ -10,10 +10,9 @@ #include "envoy/singleton/instance.h" #include "envoy/thread_local/thread_local.h" -#include "common/grpc/typed_async_client.h" - -#include "extensions/access_loggers/common/access_log_base.h" -#include "extensions/access_loggers/grpc/grpc_access_log_impl.h" +#include "source/common/grpc/typed_async_client.h" +#include "source/extensions/access_loggers/common/access_log_base.h" +#include "source/extensions/access_loggers/grpc/grpc_access_log_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/grpc/tcp_config.cc b/source/extensions/access_loggers/grpc/tcp_config.cc index e93d6989c9bff..185a76e934d8a 100644 --- a/source/extensions/access_loggers/grpc/tcp_config.cc +++ b/source/extensions/access_loggers/grpc/tcp_config.cc @@ -1,19 +1,17 @@ -#include "extensions/access_loggers/grpc/tcp_config.h" +#include "source/extensions/access_loggers/grpc/tcp_config.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/common/assert.h" -#include "common/common/macros.h" -#include "common/grpc/async_client_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/access_loggers/grpc/config_utils.h" -#include "extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h" -#include "extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/common/grpc/async_client_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/access_loggers/grpc/config_utils.h" +#include "source/extensions/access_loggers/grpc/grpc_access_log_proto_descriptors.h" +#include "source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h" namespace Envoy { namespace Extensions { @@ -38,7 +36,7 @@ ProtobufTypes::MessagePtr TcpGrpcAccessLogFactory::createEmptyConfigProto() { return std::make_unique(); } -std::string TcpGrpcAccessLogFactory::name() const { return AccessLogNames::get().TcpGrpc; } +std::string TcpGrpcAccessLogFactory::name() const { return "envoy.access_loggers.tcp_grpc"; } /** * Static registration for the TCP gRPC access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc index 85c2b258cbb93..c475f134a7b61 100644 --- a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc +++ b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.cc @@ -1,14 +1,13 @@ -#include "extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h" +#include "source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h" #include "envoy/data/accesslog/v3/accesslog.pb.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" -#include "common/common/assert.h" -#include "common/config/utility.h" -#include "common/network/utility.h" -#include "common/stream_info/utility.h" - -#include "extensions/access_loggers/grpc/grpc_access_log_utils.h" +#include "source/common/common/assert.h" +#include "source/common/config/utility.h" +#include "source/common/network/utility.h" +#include "source/common/stream_info/utility.h" +#include "source/extensions/access_loggers/grpc/grpc_access_log_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h index cf424bb92a3df..fba13f16d6c6d 100644 --- a/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h +++ b/source/extensions/access_loggers/grpc/tcp_grpc_access_log_impl.h @@ -9,10 +9,9 @@ #include "envoy/singleton/instance.h" #include "envoy/thread_local/thread_local.h" -#include "common/grpc/typed_async_client.h" - -#include "extensions/access_loggers/common/access_log_base.h" -#include "extensions/access_loggers/grpc/grpc_access_log_impl.h" +#include "source/common/grpc/typed_async_client.h" +#include "source/extensions/access_loggers/common/access_log_base.h" +#include "source/extensions/access_loggers/grpc/grpc_access_log_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/open_telemetry/BUILD b/source/extensions/access_loggers/open_telemetry/BUILD index cb85c6957fbf0..c500ee1aea1f3 100644 --- a/source/extensions/access_loggers/open_telemetry/BUILD +++ b/source/extensions/access_loggers/open_telemetry/BUILD @@ -14,10 +14,10 @@ envoy_cc_library( srcs = ["grpc_access_log_impl.cc"], hdrs = ["grpc_access_log_impl.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/grpc:async_client_manager_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/event:dispatcher_interface", + "//envoy/grpc:async_client_manager_interface", + "//envoy/local_info:local_info_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/config:utility_lib", "//source/common/grpc:typed_async_client_lib", "//source/common/protobuf", @@ -34,8 +34,8 @@ envoy_cc_library( hdrs = ["access_log_impl.h"], deps = [ ":grpc_access_log_lib", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/protobuf:message_validator_interface", + "//envoy/access_log:access_log_interface", + "//envoy/protobuf:message_validator_interface", "//source/common/formatter:substitution_formatter_lib", "//source/common/protobuf:utility_lib", "//source/extensions/access_loggers/common:access_log_base", @@ -67,11 +67,10 @@ envoy_cc_extension( "//test/integration:__subpackages__", ], deps = [ - "//include/envoy/server:access_log_config_interface", + "//envoy/server:access_log_config_interface", "//source/common/common:assert_lib", "//source/common/grpc:async_client_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/open_telemetry:access_log_lib", "//source/extensions/access_loggers/open_telemetry:access_log_proto_descriptors_lib", "//source/extensions/access_loggers/open_telemetry:grpc_access_log_lib", diff --git a/source/extensions/access_loggers/open_telemetry/access_log_impl.cc b/source/extensions/access_loggers/open_telemetry/access_log_impl.cc index ea4920151fba7..f3376483ad318 100644 --- a/source/extensions/access_loggers/open_telemetry/access_log_impl.cc +++ b/source/extensions/access_loggers/open_telemetry/access_log_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/access_loggers/open_telemetry/access_log_impl.h" +#include "source/extensions/access_loggers/open_telemetry/access_log_impl.h" #include @@ -7,14 +7,14 @@ #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" #include "envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.pb.h" -#include "common/common/assert.h" -#include "common/config/utility.h" -#include "common/formatter/substitution_formatter.h" -#include "common/http/headers.h" -#include "common/network/utility.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" -#include "common/stream_info/utility.h" +#include "source/common/common/assert.h" +#include "source/common/config/utility.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/common/http/headers.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stream_info/utility.h" #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h" #include "opentelemetry/proto/common/v1/common.pb.h" diff --git a/source/extensions/access_loggers/open_telemetry/access_log_impl.h b/source/extensions/access_loggers/open_telemetry/access_log_impl.h index aa9fb20eac5d8..1bd6b34804c8b 100644 --- a/source/extensions/access_loggers/open_telemetry/access_log_impl.h +++ b/source/extensions/access_loggers/open_telemetry/access_log_impl.h @@ -11,11 +11,10 @@ #include "envoy/singleton/instance.h" #include "envoy/thread_local/thread_local.h" -#include "common/formatter/substitution_formatter.h" -#include "common/grpc/typed_async_client.h" - -#include "extensions/access_loggers/common/access_log_base.h" -#include "extensions/access_loggers/open_telemetry/grpc_access_log_impl.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/common/grpc/typed_async_client.h" +#include "source/extensions/access_loggers/common/access_log_base.h" +#include "source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h" #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h" #include "opentelemetry/proto/common/v1/common.pb.h" diff --git a/source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.cc b/source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.cc index 892aa74b0c963..aa8ba51c77578 100644 --- a/source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.cc +++ b/source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.cc @@ -1,8 +1,8 @@ -#include "extensions/access_loggers/open_telemetry/access_log_proto_descriptors.h" +#include "source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/open_telemetry/config.cc b/source/extensions/access_loggers/open_telemetry/config.cc index dd1bd6a8ea4d9..2b0f02f3acd2b 100644 --- a/source/extensions/access_loggers/open_telemetry/config.cc +++ b/source/extensions/access_loggers/open_telemetry/config.cc @@ -1,4 +1,4 @@ -#include "extensions/access_loggers/open_telemetry/config.h" +#include "source/extensions/access_loggers/open_telemetry/config.h" #include "envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.pb.h" #include "envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.pb.validate.h" @@ -6,14 +6,12 @@ #include "envoy/server/access_log_config.h" #include "envoy/server/filter_config.h" -#include "common/common/assert.h" -#include "common/common/macros.h" -#include "common/grpc/async_client_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/access_loggers/open_telemetry/access_log_impl.h" -#include "extensions/access_loggers/open_telemetry/access_log_proto_descriptors.h" -#include "extensions/access_loggers/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/common/grpc/async_client_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/access_loggers/open_telemetry/access_log_impl.h" +#include "source/extensions/access_loggers/open_telemetry/access_log_proto_descriptors.h" namespace Envoy { namespace Extensions { @@ -53,7 +51,7 @@ ProtobufTypes::MessagePtr AccessLogFactory::createEmptyConfigProto() { envoy::extensions::access_loggers::open_telemetry::v3alpha::OpenTelemetryAccessLogConfig>(); } -std::string AccessLogFactory::name() const { return AccessLogNames::get().OpenTelemetry; } +std::string AccessLogFactory::name() const { return "envoy.access_loggers.open_telemetry"; } /** * Static registration for the OpenTelemetry (gRPC) access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.cc b/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.cc index 535d7023ff74f..909caf38aa3dd 100644 --- a/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.cc +++ b/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.cc @@ -1,12 +1,12 @@ -#include "extensions/access_loggers/open_telemetry/grpc_access_log_impl.h" +#include "source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" #include "envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.pb.h" #include "envoy/grpc/async_client_manager.h" #include "envoy/local_info/local_info.h" -#include "common/config/utility.h" -#include "common/grpc/typed_async_client.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/typed_async_client.h" #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h" #include "opentelemetry/proto/common/v1/common.pb.h" diff --git a/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h b/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h index 006cc9691ed05..4273b1a420016 100644 --- a/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h +++ b/source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h @@ -8,9 +8,8 @@ #include "envoy/local_info/local_info.h" #include "envoy/thread_local/thread_local.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/access_loggers/common/grpc_access_logger.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/access_loggers/common/grpc_access_logger.h" #include "opentelemetry/proto/collector/logs/v1/logs_service.pb.h" #include "opentelemetry/proto/common/v1/common.pb.h" diff --git a/source/extensions/access_loggers/stream/BUILD b/source/extensions/access_loggers/stream/BUILD index f78092b3aedb3..2b006910ca15a 100644 --- a/source/extensions/access_loggers/stream/BUILD +++ b/source/extensions/access_loggers/stream/BUILD @@ -16,11 +16,10 @@ envoy_cc_extension( "//test:__subpackages__", ], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/config:config_provider_lib", "//source/common/formatter:substitution_format_string_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/common:file_access_log_lib", "//source/extensions/access_loggers/common:stream_access_log_common_impl_lib", "@envoy_api//envoy/extensions/access_loggers/stream/v3:pkg_cc_proto", diff --git a/source/extensions/access_loggers/stream/config.cc b/source/extensions/access_loggers/stream/config.cc index 5fce7ea8cc3e4..9482d510f92f7 100644 --- a/source/extensions/access_loggers/stream/config.cc +++ b/source/extensions/access_loggers/stream/config.cc @@ -1,4 +1,4 @@ -#include "extensions/access_loggers/stream/config.h" +#include "source/extensions/access_loggers/stream/config.h" #include @@ -7,15 +7,13 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/common/logger.h" -#include "common/config/utility.h" -#include "common/formatter/substitution_format_string.h" -#include "common/formatter/substitution_formatter.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/access_loggers/common/file_access_log_impl.h" -#include "extensions/access_loggers/common/stream_access_log_common_impl.h" -#include "extensions/access_loggers/well_known_names.h" +#include "source/common/common/logger.h" +#include "source/common/config/utility.h" +#include "source/common/formatter/substitution_format_string.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/access_loggers/common/file_access_log_impl.h" +#include "source/extensions/access_loggers/common/stream_access_log_common_impl.h" namespace Envoy { namespace Extensions { @@ -35,7 +33,7 @@ ProtobufTypes::MessagePtr StdoutAccessLogFactory::createEmptyConfigProto() { new envoy::extensions::access_loggers::stream::v3::StdoutAccessLog()}; } -std::string StdoutAccessLogFactory::name() const { return AccessLogNames::get().Stdout; } +std::string StdoutAccessLogFactory::name() const { return "envoy.access_loggers.stdout"; } /** * Static registration for the file access log. @see RegisterFactory. @@ -56,7 +54,7 @@ ProtobufTypes::MessagePtr StderrAccessLogFactory::createEmptyConfigProto() { new envoy::extensions::access_loggers::stream::v3::StderrAccessLog()}; } -std::string StderrAccessLogFactory::name() const { return AccessLogNames::get().Stderr; } +std::string StderrAccessLogFactory::name() const { return "envoy.access_loggers.stderr"; } /** * Static registration for the `stderr` access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/wasm/BUILD b/source/extensions/access_loggers/wasm/BUILD index ebe064a25c6f4..3ea6a5ba7c0fb 100644 --- a/source/extensions/access_loggers/wasm/BUILD +++ b/source/extensions/access_loggers/wasm/BUILD @@ -15,9 +15,8 @@ envoy_cc_library( name = "wasm_access_log_lib", hdrs = ["wasm_access_log_impl.h"], deps = [ - "//include/envoy/access_log:access_log_interface", + "//envoy/access_log:access_log_interface", "//source/common/http:header_map_lib", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/common/wasm:wasm_lib", ], ) @@ -28,11 +27,10 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":wasm_access_log_lib", - "//include/envoy/registry", - "//include/envoy/server:access_log_config_interface", + "//envoy/registry", + "//envoy/server:access_log_config_interface", "//source/common/config:datasource_lib", "//source/common/protobuf", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/common/wasm:wasm_lib", "@envoy_api//envoy/extensions/access_loggers/wasm/v3:pkg_cc_proto", ], diff --git a/source/extensions/access_loggers/wasm/config.cc b/source/extensions/access_loggers/wasm/config.cc index d6ba35aba1c9c..0c8fb063abb04 100644 --- a/source/extensions/access_loggers/wasm/config.cc +++ b/source/extensions/access_loggers/wasm/config.cc @@ -1,15 +1,13 @@ -#include "extensions/access_loggers/wasm/config.h" +#include "source/extensions/access_loggers/wasm/config.h" #include "envoy/extensions/access_loggers/wasm/v3/wasm.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/common/logger.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/access_loggers/wasm/wasm_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" -#include "extensions/common/wasm/wasm.h" +#include "source/common/common/logger.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/access_loggers/wasm/wasm_access_log_impl.h" +#include "source/extensions/common/wasm/wasm.h" namespace Envoy { namespace Extensions { @@ -55,7 +53,7 @@ ProtobufTypes::MessagePtr WasmAccessLogFactory::createEmptyConfigProto() { new envoy::extensions::access_loggers::wasm::v3::WasmAccessLog()}; } -std::string WasmAccessLogFactory::name() const { return AccessLogNames::get().Wasm; } +std::string WasmAccessLogFactory::name() const { return "envoy.access_loggers.wasm"; } /** * Static registration for the wasm access log. @see RegisterFactory. diff --git a/source/extensions/access_loggers/wasm/config.h b/source/extensions/access_loggers/wasm/config.h index 2a8062fb34c7b..9806fe66d36e5 100644 --- a/source/extensions/access_loggers/wasm/config.h +++ b/source/extensions/access_loggers/wasm/config.h @@ -2,7 +2,7 @@ #include "envoy/server/access_log_config.h" -#include "common/config/datasource.h" +#include "source/common/config/datasource.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/wasm/wasm_access_log_impl.h b/source/extensions/access_loggers/wasm/wasm_access_log_impl.h index 94910ef56712b..ec7fb29797dea 100644 --- a/source/extensions/access_loggers/wasm/wasm_access_log_impl.h +++ b/source/extensions/access_loggers/wasm/wasm_access_log_impl.h @@ -2,10 +2,8 @@ #include "envoy/access_log/access_log.h" -#include "common/common/logger.h" - -#include "extensions/access_loggers/well_known_names.h" -#include "extensions/common/wasm/wasm.h" +#include "source/common/common/logger.h" +#include "source/extensions/common/wasm/wasm.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/access_loggers/well_known_names.h b/source/extensions/access_loggers/well_known_names.h deleted file mode 100644 index e3b7a375c8e2e..0000000000000 --- a/source/extensions/access_loggers/well_known_names.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include - -#include "common/singleton/const_singleton.h" - -namespace Envoy { -namespace Extensions { -namespace AccessLoggers { - -/** - * Well-known access logger names. - * NOTE: New access loggers should use the well known name: envoy.access_loggers.name. - */ -class AccessLogNameValues { -public: - // File access log - const std::string File = "envoy.access_loggers.file"; - // HTTP gRPC access log - const std::string HttpGrpc = "envoy.access_loggers.http_grpc"; - // Standard error access log - const std::string Stderr = "envoy.access_loggers.stderr"; - // Standard output access log - const std::string Stdout = "envoy.access_loggers.stdout"; - // TCP gRPC access log - const std::string TcpGrpc = "envoy.access_loggers.tcp_grpc"; - // OpenTelemetry gRPC access log - const std::string OpenTelemetry = "envoy.access_loggers.open_telemetry"; - // WASM access log - const std::string Wasm = "envoy.access_loggers.wasm"; -}; - -using AccessLogNames = ConstSingleton; - -} // namespace AccessLoggers -} // namespace Extensions -} // namespace Envoy diff --git a/source/extensions/bootstrap/wasm/BUILD b/source/extensions/bootstrap/wasm/BUILD index be38ee803f4aa..913e72fc54317 100644 --- a/source/extensions/bootstrap/wasm/BUILD +++ b/source/extensions/bootstrap/wasm/BUILD @@ -17,10 +17,10 @@ envoy_cc_extension( "config.h", ], deps = [ - "//include/envoy/registry", - "//include/envoy/server:bootstrap_extension_config_interface", - "//include/envoy/server:factory_context_interface", - "//include/envoy/server:instance_interface", + "//envoy/registry", + "//envoy/server:bootstrap_extension_config_interface", + "//envoy/server:factory_context_interface", + "//envoy/server:instance_interface", "//source/common/common:assert_lib", "//source/common/common:empty_string", "//source/common/config:datasource_lib", diff --git a/source/extensions/bootstrap/wasm/config.cc b/source/extensions/bootstrap/wasm/config.cc index 3a2b0d488601d..ae8e733d57d60 100644 --- a/source/extensions/bootstrap/wasm/config.cc +++ b/source/extensions/bootstrap/wasm/config.cc @@ -1,13 +1,12 @@ -#include "extensions/bootstrap/wasm/config.h" +#include "source/extensions/bootstrap/wasm/config.h" #include "envoy/registry/registry.h" #include "envoy/server/factory_context.h" -#include "common/common/empty_string.h" -#include "common/config/datasource.h" -#include "common/protobuf/utility.h" - -#include "extensions/common/wasm/wasm.h" +#include "source/common/common/empty_string.h" +#include "source/common/config/datasource.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/common/wasm/wasm.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/bootstrap/wasm/config.h b/source/extensions/bootstrap/wasm/config.h index 9d09a7905b2d4..db415cb14f14a 100644 --- a/source/extensions/bootstrap/wasm/config.h +++ b/source/extensions/bootstrap/wasm/config.h @@ -7,9 +7,8 @@ #include "envoy/server/filter_config.h" #include "envoy/server/instance.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/common/wasm/wasm.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/common/wasm/wasm.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/clusters/BUILD b/source/extensions/clusters/BUILD index 46709ec0c238c..90e061ad8da39 100644 --- a/source/extensions/clusters/BUILD +++ b/source/extensions/clusters/BUILD @@ -1,20 +1,8 @@ load( "//bazel:envoy_build_system.bzl", - "envoy_cc_library", "envoy_extension_package", ) licenses(["notice"]) # Apache 2 envoy_extension_package() - -envoy_cc_library( - name = "well_known_names", - hdrs = ["well_known_names.h"], - # well known names files are public as long as they exist. - visibility = ["//visibility:public"], - deps = [ - "//source/common/config:well_known_names", - "//source/common/singleton:const_singleton", - ], -) diff --git a/source/extensions/clusters/aggregate/BUILD b/source/extensions/clusters/aggregate/BUILD index 38f702f15543c..8a640940b7c76 100644 --- a/source/extensions/clusters/aggregate/BUILD +++ b/source/extensions/clusters/aggregate/BUILD @@ -18,7 +18,6 @@ envoy_cc_extension( deps = [ "//source/common/upstream:cluster_factory_lib", "//source/common/upstream:upstream_includes", - "//source/extensions/clusters:well_known_names", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/clusters/aggregate/v3:pkg_cc_proto", ], diff --git a/source/extensions/clusters/aggregate/cluster.cc b/source/extensions/clusters/aggregate/cluster.cc index ac4eee0885946..c7f21b5abdbd3 100644 --- a/source/extensions/clusters/aggregate/cluster.cc +++ b/source/extensions/clusters/aggregate/cluster.cc @@ -1,11 +1,11 @@ -#include "extensions/clusters/aggregate/cluster.h" +#include "source/extensions/clusters/aggregate/cluster.h" #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/event/dispatcher.h" #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.h" #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.validate.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/clusters/aggregate/cluster.h b/source/extensions/clusters/aggregate/cluster.h index 373897944b6c8..031a3fe2b63d3 100644 --- a/source/extensions/clusters/aggregate/cluster.h +++ b/source/extensions/clusters/aggregate/cluster.h @@ -8,11 +8,10 @@ #include "envoy/thread_local/thread_local_object.h" #include "envoy/upstream/thread_local_cluster.h" -#include "common/common/logger.h" -#include "common/upstream/cluster_factory_impl.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/clusters/aggregate/lb_context.h" +#include "source/common/common/logger.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/common/upstream/upstream_impl.h" +#include "source/extensions/clusters/aggregate/lb_context.h" namespace Envoy { namespace Extensions { @@ -160,8 +159,7 @@ struct AggregateThreadAwareLoadBalancer : public Upstream::ThreadAwareLoadBalanc class ClusterFactory : public Upstream::ConfigurableClusterFactoryBase< envoy::extensions::clusters::aggregate::v3::ClusterConfig> { public: - ClusterFactory() - : ConfigurableClusterFactoryBase(Extensions::Clusters::ClusterTypes::get().Aggregate) {} + ClusterFactory() : ConfigurableClusterFactoryBase("envoy.clusters.aggregate") {} private: std::pair diff --git a/source/extensions/clusters/aggregate/lb_context.h b/source/extensions/clusters/aggregate/lb_context.h index 08aae97f51e7e..8add803c63c29 100644 --- a/source/extensions/clusters/aggregate/lb_context.h +++ b/source/extensions/clusters/aggregate/lb_context.h @@ -1,7 +1,7 @@ #pragma once -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/clusters/dynamic_forward_proxy/BUILD b/source/extensions/clusters/dynamic_forward_proxy/BUILD index 36d74421839a1..44da3c9be55d9 100644 --- a/source/extensions/clusters/dynamic_forward_proxy/BUILD +++ b/source/extensions/clusters/dynamic_forward_proxy/BUILD @@ -16,7 +16,6 @@ envoy_cc_extension( "//source/common/network:transport_socket_options_lib", "//source/common/upstream:cluster_factory_lib", "//source/common/upstream:logical_host_lib", - "//source/extensions/clusters:well_known_names", "//source/extensions/common/dynamic_forward_proxy:dns_cache_interface", "//source/extensions/common/dynamic_forward_proxy:dns_cache_manager_impl", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", diff --git a/source/extensions/clusters/dynamic_forward_proxy/cluster.cc b/source/extensions/clusters/dynamic_forward_proxy/cluster.cc index 39712337ecb39..335bb2a8c9a86 100644 --- a/source/extensions/clusters/dynamic_forward_proxy/cluster.cc +++ b/source/extensions/clusters/dynamic_forward_proxy/cluster.cc @@ -1,12 +1,11 @@ -#include "extensions/clusters/dynamic_forward_proxy/cluster.h" +#include "source/extensions/clusters/dynamic_forward_proxy/cluster.h" #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.h" #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.validate.h" -#include "common/network/transport_socket_options_impl.h" - -#include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/clusters/dynamic_forward_proxy/cluster.h b/source/extensions/clusters/dynamic_forward_proxy/cluster.h index 309da4ed44070..dcd1e235607f5 100644 --- a/source/extensions/clusters/dynamic_forward_proxy/cluster.h +++ b/source/extensions/clusters/dynamic_forward_proxy/cluster.h @@ -5,11 +5,9 @@ #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.h" #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.validate.h" -#include "common/upstream/cluster_factory_impl.h" -#include "common/upstream/logical_host.h" - -#include "extensions/clusters/well_known_names.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/common/upstream/logical_host.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h" namespace Envoy { namespace Extensions { @@ -115,9 +113,7 @@ class Cluster : public Upstream::BaseDynamicClusterImpl, class ClusterFactory : public Upstream::ConfigurableClusterFactoryBase< envoy::extensions::clusters::dynamic_forward_proxy::v3::ClusterConfig> { public: - ClusterFactory() - : ConfigurableClusterFactoryBase( - Extensions::Clusters::ClusterTypes::get().DynamicForwardProxy) {} + ClusterFactory() : ConfigurableClusterFactoryBase("envoy.clusters.dynamic_forward_proxy") {} private: std::pair diff --git a/source/extensions/clusters/redis/BUILD b/source/extensions/clusters/redis/BUILD index 829f517516d24..464da0ef8bfb6 100644 --- a/source/extensions/clusters/redis/BUILD +++ b/source/extensions/clusters/redis/BUILD @@ -25,11 +25,10 @@ envoy_cc_library( ], deps = [ ":crc16_lib", - "//include/envoy/upstream:thread_local_cluster_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:thread_local_cluster_interface", + "//envoy/upstream:upstream_interface", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", - "//source/extensions/clusters:well_known_names", "//source/extensions/filters/network/common/redis:client_interface", "//source/extensions/filters/network/common/redis:codec_interface", "//source/extensions/filters/network/common/redis:supported_commands_lib", @@ -44,12 +43,12 @@ envoy_cc_extension( ], deps = [ "redis_cluster_lb", - "//include/envoy/api:api_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/singleton:manager_interface", - "//include/envoy/upstream:cluster_factory_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/api:api_interface", + "//envoy/http:codec_interface", + "//envoy/singleton:manager_interface", + "//envoy/upstream:cluster_factory_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/config:datasource_lib", "//source/common/config:metadata_lib", "//source/common/event:dispatcher_lib", @@ -59,7 +58,6 @@ envoy_cc_extension( "//source/common/upstream:cluster_factory_lib", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", - "//source/extensions/clusters:well_known_names", "//source/extensions/common/redis:cluster_refresh_manager_lib", "//source/extensions/filters/network/common/redis:client_interface", "//source/extensions/filters/network/common/redis:client_lib", diff --git a/source/extensions/clusters/redis/redis_cluster.cc b/source/extensions/clusters/redis/redis_cluster.cc index 822eab1166be6..2eb3207cad8f5 100644 --- a/source/extensions/clusters/redis/redis_cluster.cc +++ b/source/extensions/clusters/redis/redis_cluster.cc @@ -385,8 +385,7 @@ RedisClusterFactory::createClusterWithConfig( Upstream::ClusterFactoryContext& context, Envoy::Server::Configuration::TransportSocketFactoryContextImpl& socket_factory_context, Envoy::Stats::ScopePtr&& stats_scope) { - if (!cluster.has_cluster_type() || - cluster.cluster_type().name() != Extensions::Clusters::ClusterTypes::get().Redis) { + if (!cluster.has_cluster_type() || cluster.cluster_type().name() != "envoy.clusters.redis") { throw EnvoyException("Redis cluster can only created with redis cluster type."); } // TODO(hyang): This is needed to migrate existing cluster, disallow using other lb_policy diff --git a/source/extensions/clusters/redis/redis_cluster.h b/source/extensions/clusters/redis/redis_cluster.h index 49af6d50d1be9..96161c3514b11 100644 --- a/source/extensions/clusters/redis/redis_cluster.h +++ b/source/extensions/clusters/redis/redis_cluster.h @@ -40,32 +40,28 @@ #include "envoy/upstream/locality.h" #include "envoy/upstream/upstream.h" -#include "common/common/callback_impl.h" -#include "common/common/enum_to_int.h" -#include "common/common/logger.h" -#include "common/config/datasource.h" -#include "common/config/metadata.h" -#include "common/config/well_known_names.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" -#include "common/stats/isolated_store_impl.h" -#include "common/upstream/cluster_factory_impl.h" -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/outlier_detection_impl.h" -#include "common/upstream/resource_manager_impl.h" -#include "common/upstream/upstream_impl.h" - +#include "source/common/common/callback_impl.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/logger.h" +#include "source/common/config/datasource.h" +#include "source/common/config/metadata.h" +#include "source/common/config/well_known_names.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/outlier_detection_impl.h" +#include "source/common/upstream/resource_manager_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "source/extensions/clusters/redis/redis_cluster_lb.h" - -#include "server/transport_socket_config_impl.h" - -#include "extensions/clusters/well_known_names.h" -#include "extensions/common/redis/cluster_refresh_manager_impl.h" -#include "extensions/filters/network/common/redis/client.h" -#include "extensions/filters/network/common/redis/client_impl.h" -#include "extensions/filters/network/common/redis/codec.h" -#include "extensions/filters/network/common/redis/utility.h" -#include "extensions/filters/network/redis_proxy/config.h" +#include "source/extensions/common/redis/cluster_refresh_manager_impl.h" +#include "source/extensions/filters/network/common/redis/client.h" +#include "source/extensions/filters/network/common/redis/client_impl.h" +#include "source/extensions/filters/network/common/redis/codec.h" +#include "source/extensions/filters/network/common/redis/utility.h" +#include "source/extensions/filters/network/redis_proxy/config.h" +#include "source/server/transport_socket_config_impl.h" namespace Envoy { namespace Extensions { @@ -292,8 +288,7 @@ class RedisCluster : public Upstream::BaseDynamicClusterImpl { class RedisClusterFactory : public Upstream::ConfigurableClusterFactoryBase< envoy::extensions::clusters::redis::v3::RedisClusterConfig> { public: - RedisClusterFactory() - : ConfigurableClusterFactoryBase(Extensions::Clusters::ClusterTypes::get().Redis) {} + RedisClusterFactory() : ConfigurableClusterFactoryBase("envoy.clusters.redis") {} private: friend class RedisClusterTest; diff --git a/source/extensions/clusters/redis/redis_cluster_lb.h b/source/extensions/clusters/redis/redis_cluster_lb.h index 7ca27407d1612..4ac9f565e0b58 100644 --- a/source/extensions/clusters/redis/redis_cluster_lb.h +++ b/source/extensions/clusters/redis/redis_cluster_lb.h @@ -7,16 +7,13 @@ #include "envoy/upstream/load_balancer.h" #include "envoy/upstream/upstream.h" -#include "common/network/address_impl.h" -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/upstream_impl.h" - +#include "source/common/network/address_impl.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "source/extensions/clusters/redis/crc16.h" - -#include "extensions/clusters/well_known_names.h" -#include "extensions/filters/network/common/redis/client.h" -#include "extensions/filters/network/common/redis/codec.h" -#include "extensions/filters/network/common/redis/supported_commands.h" +#include "source/extensions/filters/network/common/redis/client.h" +#include "source/extensions/filters/network/common/redis/codec.h" +#include "source/extensions/filters/network/common/redis/supported_commands.h" #include "absl/container/btree_map.h" #include "absl/synchronization/mutex.h" diff --git a/source/extensions/clusters/well_known_names.h b/source/extensions/clusters/well_known_names.h deleted file mode 100644 index a387cf32c735c..0000000000000 --- a/source/extensions/clusters/well_known_names.h +++ /dev/null @@ -1,48 +0,0 @@ -#pragma once - -#include "common/config/well_known_names.h" - -namespace Envoy { -namespace Extensions { -namespace Clusters { - -/** - * Well-known cluster types, this supersede the service discovery types - */ -class ClusterTypeValues { -public: - // Static clusters (cluster that have a fixed number of hosts with resolved IP addresses). - const std::string Static = "envoy.cluster.static"; - - // Strict DNS (cluster that periodic DNS resolution and updates the host member set if the DNS - // members change). - const std::string StrictDns = "envoy.cluster.strict_dns"; - - // Logical DNS (cluster that creates a single logical host that wraps an async DNS resolver). - const std::string LogicalDns = "envoy.cluster.logical_dns"; - - // Endpoint Discovery Service (dynamic cluster that reads host information from the Endpoint - // Discovery Service). - const std::string Eds = "envoy.cluster.eds"; - - // Original destination (dynamic cluster that automatically adds hosts as needed based on the - // original destination address of the downstream connection). - const std::string OriginalDst = "envoy.cluster.original_dst"; - - // Redis cluster (cluster that reads host information using the redis cluster protocol). - const std::string Redis = "envoy.clusters.redis"; - - // Dynamic forward proxy cluster. This cluster is designed to work directly with the - // dynamic forward proxy HTTP filter. - const std::string DynamicForwardProxy = "envoy.clusters.dynamic_forward_proxy"; - - // Aggregate cluster which may contain different types of clusters. It allows load balance between - // different type of clusters. - const std::string Aggregate = "envoy.clusters.aggregate"; -}; - -using ClusterTypes = ConstSingleton; - -} // namespace Clusters -} // namespace Extensions -} // namespace Envoy diff --git a/source/extensions/common/BUILD b/source/extensions/common/BUILD index 50e003b975619..70c9f76e7af4c 100644 --- a/source/extensions/common/BUILD +++ b/source/extensions/common/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( # Legacy. TODO(#9953) clean up. visibility = ["//visibility:public"], deps = [ - "//include/envoy/runtime:runtime_interface", + "//envoy/runtime:runtime_interface", "//source/common/common:documentation_url_lib", "//source/common/common:minimal_logger_lib", "//source/common/common:utility_lib", diff --git a/source/extensions/common/aws/BUILD b/source/extensions/common/aws/BUILD index 621d60806d548..2f79649e36a05 100644 --- a/source/extensions/common/aws/BUILD +++ b/source/extensions/common/aws/BUILD @@ -12,7 +12,7 @@ envoy_cc_library( name = "signer_interface", hdrs = ["signer.h"], deps = [ - "//include/envoy/http:message_interface", + "//envoy/http:message_interface", ], ) @@ -48,7 +48,7 @@ envoy_cc_library( external_deps = ["abseil_time"], deps = [ ":credentials_provider_interface", - "//include/envoy/api:api_interface", + "//envoy/api:api_interface", "//source/common/common:logger_lib", "//source/common/common:thread_lib", "//source/common/http:utility_lib", diff --git a/source/extensions/common/aws/credentials_provider_impl.cc b/source/extensions/common/aws/credentials_provider_impl.cc index aa367a07d0198..4dd5bfed47aee 100644 --- a/source/extensions/common/aws/credentials_provider_impl.cc +++ b/source/extensions/common/aws/credentials_provider_impl.cc @@ -1,10 +1,10 @@ -#include "extensions/common/aws/credentials_provider_impl.h" +#include "source/extensions/common/aws/credentials_provider_impl.h" #include "envoy/common/exception.h" -#include "common/common/lock_guard.h" -#include "common/http/utility.h" -#include "common/json/json_loader.h" +#include "source/common/common/lock_guard.h" +#include "source/common/http/utility.h" +#include "source/common/json/json_loader.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/aws/credentials_provider_impl.h b/source/extensions/common/aws/credentials_provider_impl.h index e493ebdb74ddb..b15637282aa8e 100644 --- a/source/extensions/common/aws/credentials_provider_impl.h +++ b/source/extensions/common/aws/credentials_provider_impl.h @@ -5,10 +5,9 @@ #include "envoy/api/api.h" #include "envoy/event/timer.h" -#include "common/common/logger.h" -#include "common/common/thread.h" - -#include "extensions/common/aws/credentials_provider.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/extensions/common/aws/credentials_provider.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/common/aws/region_provider_impl.cc b/source/extensions/common/aws/region_provider_impl.cc index 3943f45ba2cc3..0914c46ced410 100644 --- a/source/extensions/common/aws/region_provider_impl.cc +++ b/source/extensions/common/aws/region_provider_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/common/aws/region_provider_impl.h" +#include "source/extensions/common/aws/region_provider_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/aws/region_provider_impl.h b/source/extensions/common/aws/region_provider_impl.h index 9e45823d44655..b4f08af157372 100644 --- a/source/extensions/common/aws/region_provider_impl.h +++ b/source/extensions/common/aws/region_provider_impl.h @@ -1,8 +1,7 @@ #pragma once -#include "common/common/logger.h" - -#include "extensions/common/aws/region_provider.h" +#include "source/common/common/logger.h" +#include "source/extensions/common/aws/region_provider.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/aws/signer_impl.cc b/source/extensions/common/aws/signer_impl.cc index a328610e28042..368285c91fb05 100644 --- a/source/extensions/common/aws/signer_impl.cc +++ b/source/extensions/common/aws/signer_impl.cc @@ -1,14 +1,13 @@ -#include "extensions/common/aws/signer_impl.h" +#include "source/extensions/common/aws/signer_impl.h" #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/fmt.h" -#include "common/common/hex.h" -#include "common/crypto/utility.h" -#include "common/http/headers.h" - -#include "extensions/common/aws/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/common/hex.h" +#include "source/common/crypto/utility.h" +#include "source/common/http/headers.h" +#include "source/extensions/common/aws/utility.h" #include "absl/strings/str_join.h" diff --git a/source/extensions/common/aws/signer_impl.h b/source/extensions/common/aws/signer_impl.h index b1b5ad3c550d4..301ead3e40eec 100644 --- a/source/extensions/common/aws/signer_impl.h +++ b/source/extensions/common/aws/signer_impl.h @@ -1,11 +1,10 @@ #pragma once -#include "common/common/logger.h" -#include "common/common/utility.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/common/aws/credentials_provider.h" -#include "extensions/common/aws/signer.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/common/aws/credentials_provider.h" +#include "source/extensions/common/aws/signer.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/aws/utility.cc b/source/extensions/common/aws/utility.cc index 794051e0d67a5..497e37f409628 100644 --- a/source/extensions/common/aws/utility.cc +++ b/source/extensions/common/aws/utility.cc @@ -1,7 +1,7 @@ -#include "extensions/common/aws/utility.h" +#include "source/extensions/common/aws/utility.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" #include "absl/strings/str_join.h" #include "curl/curl.h" diff --git a/source/extensions/common/aws/utility.h b/source/extensions/common/aws/utility.h index 5aba489ce707b..79f9b937b8959 100644 --- a/source/extensions/common/aws/utility.h +++ b/source/extensions/common/aws/utility.h @@ -1,6 +1,6 @@ #pragma once -#include "common/http/headers.h" +#include "source/common/http/headers.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/crypto/BUILD b/source/extensions/common/crypto/BUILD index 4cd26ae3701ae..1896816e5e960 100644 --- a/source/extensions/common/crypto/BUILD +++ b/source/extensions/common/crypto/BUILD @@ -27,7 +27,7 @@ envoy_cc_extension( "//test/common/crypto:__subpackages__", ], deps = [ - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/common:assert_lib", "//source/common/crypto:utility_lib", ], diff --git a/source/extensions/common/crypto/crypto_impl.cc b/source/extensions/common/crypto/crypto_impl.cc index b5abbf8b858a2..e26682cbf6483 100644 --- a/source/extensions/common/crypto/crypto_impl.cc +++ b/source/extensions/common/crypto/crypto_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/common/crypto/crypto_impl.h" +#include "source/extensions/common/crypto/crypto_impl.h" namespace Envoy { namespace Common { diff --git a/source/extensions/common/crypto/utility_impl.cc b/source/extensions/common/crypto/utility_impl.cc index b8c1b151ef548..7319bfca3676a 100644 --- a/source/extensions/common/crypto/utility_impl.cc +++ b/source/extensions/common/crypto/utility_impl.cc @@ -1,8 +1,7 @@ -#include "extensions/common/crypto/utility_impl.h" +#include "source/extensions/common/crypto/utility_impl.h" -#include "common/common/assert.h" - -#include "extensions/common/crypto/crypto_impl.h" +#include "source/common/common/assert.h" +#include "source/extensions/common/crypto/crypto_impl.h" #include "absl/container/fixed_array.h" #include "absl/strings/ascii.h" diff --git a/source/extensions/common/crypto/utility_impl.h b/source/extensions/common/crypto/utility_impl.h index 1b5b107a4738f..3f18ac436be54 100644 --- a/source/extensions/common/crypto/utility_impl.h +++ b/source/extensions/common/crypto/utility_impl.h @@ -1,6 +1,6 @@ #pragma once -#include "common/crypto/utility.h" +#include "source/common/crypto/utility.h" #include "openssl/bytestring.h" #include "openssl/hmac.h" diff --git a/source/extensions/common/dynamic_forward_proxy/BUILD b/source/extensions/common/dynamic_forward_proxy/BUILD index 19d6138696182..1fa99cbecef29 100644 --- a/source/extensions/common/dynamic_forward_proxy/BUILD +++ b/source/extensions/common/dynamic_forward_proxy/BUILD @@ -12,12 +12,12 @@ envoy_cc_library( name = "dns_cache_interface", hdrs = ["dns_cache.h"], deps = [ - "//include/envoy/common:backoff_strategy_interface", - "//include/envoy/common:random_generator_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/singleton:manager_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:resource_manager_interface", + "//envoy/common:backoff_strategy_interface", + "//envoy/common:random_generator_interface", + "//envoy/event:dispatcher_interface", + "//envoy/singleton:manager_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:resource_manager_interface", "@envoy_api//envoy/extensions/common/dynamic_forward_proxy/v3:pkg_cc_proto", ], ) @@ -40,10 +40,11 @@ envoy_cc_library( deps = [ ":dns_cache_interface", ":dns_cache_resource_manager", - "//include/envoy/network:dns_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/network:dns_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/common:cleanup_lib", "//source/common/config:utility_lib", + "//source/common/network:resolver_lib", "//source/common/network:utility_lib", "//source/common/upstream:upstream_lib", "@envoy_api//envoy/extensions/common/dynamic_forward_proxy/v3:pkg_cc_proto", @@ -56,8 +57,8 @@ envoy_cc_library( hdrs = ["dns_cache_resource_manager.h"], deps = [ ":dns_cache_interface", - "//include/envoy/common:resource_interface", - "//include/envoy/stats:stats_interface", + "//envoy/common:resource_interface", + "//envoy/stats:stats_interface", "//source/common/common:assert_lib", "//source/common/common:basic_resource_lib", "//source/common/runtime:runtime_lib", diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc index 2aa86bbb80ba4..15e3adb4d715b 100644 --- a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc +++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.cc @@ -1,14 +1,14 @@ -#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h" #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h" -#include "common/config/utility.h" -#include "common/http/utility.h" -#include "common/network/resolver_impl.h" -#include "common/network/utility.h" +#include "source/common/config/utility.h" +#include "source/common/http/utility.h" +#include "source/common/network/resolver_impl.h" +#include "source/common/network/utility.h" // TODO(mattklein123): Move DNS family helpers to a smaller include. -#include "common/upstream/upstream_impl.h" +#include "source/common/upstream/upstream_impl.h" namespace Envoy { namespace Extensions { @@ -50,17 +50,24 @@ DnsCacheImpl::~DnsCacheImpl() { Network::DnsResolverSharedPtr DnsCacheImpl::selectDnsResolver( const envoy::extensions::common::dynamic_forward_proxy::v3::DnsCacheConfig& config, Event::Dispatcher& main_thread_dispatcher) { - if (config.has_dns_resolver()) { - const auto& resolver_addrs = config.dns_resolver().resolvers(); - std::vector resolvers; - resolvers.reserve(resolver_addrs.size()); - for (const auto& resolver_addr : resolver_addrs) { - resolvers.push_back(Network::Address::resolveProtoAddress(resolver_addr)); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + std::vector resolvers; + if (config.has_dns_resolution_config()) { + dns_resolver_options.CopyFrom(config.dns_resolution_config().dns_resolver_options()); + if (!config.dns_resolution_config().resolvers().empty()) { + const auto& resolver_addrs = config.dns_resolution_config().resolvers(); + resolvers.reserve(resolver_addrs.size()); + for (const auto& resolver_addr : resolver_addrs) { + resolvers.push_back(Network::Address::resolveProtoAddress(resolver_addr)); + } } - return main_thread_dispatcher.createDnsResolver(resolvers, config.use_tcp_for_dns_lookups()); + } else { + // Field bool `use_tcp_for_dns_lookups` will be deprecated in future. To be backward + // compatible utilize config.use_tcp_for_dns_lookups() if `config.dns_resolution_config` + // is not set. + dns_resolver_options.set_use_tcp_for_dns_lookups(config.use_tcp_for_dns_lookups()); } - - return main_thread_dispatcher.createDnsResolver({}, config.use_tcp_for_dns_lookups()); + return main_thread_dispatcher.createDnsResolver(resolvers, dns_resolver_options); } DnsCacheStats DnsCacheImpl::generateDnsCacheStats(Stats::Scope& scope) { diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h index 1f5237dc035e5..1e668c9847f20 100644 --- a/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h +++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h @@ -6,10 +6,9 @@ #include "envoy/network/dns.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/cleanup.h" - -#include "extensions/common/dynamic_forward_proxy/dns_cache.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h" +#include "source/common/common/cleanup.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h" #include "absl/container/flat_hash_map.h" diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc index c758d416d6fa8..70d577df63d7a 100644 --- a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc +++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.cc @@ -1,10 +1,9 @@ -#include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h" #include "absl/container/flat_hash_map.h" diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h index 3a8c5d26013be..553f45e22bacd 100644 --- a/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h +++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h @@ -2,7 +2,7 @@ #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h" #include "absl/container/flat_hash_map.h" diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.cc b/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.cc index 65ce809275efa..fbe02fe11b8c9 100644 --- a/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.cc +++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.cc @@ -1,4 +1,4 @@ -#include "extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h b/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h index 34a6004f6e360..1c435d69f88c9 100644 --- a/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h +++ b/source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h @@ -10,11 +10,10 @@ #include "envoy/stats/stats_macros.h" #include "envoy/upstream/resource_manager.h" -#include "common/common/assert.h" -#include "common/common/basic_resource_impl.h" -#include "common/upstream/resource_manager_impl.h" - -#include "extensions/common/dynamic_forward_proxy/dns_cache.h" +#include "source/common/common/assert.h" +#include "source/common/common/basic_resource_impl.h" +#include "source/common/upstream/resource_manager_impl.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/matcher/matcher.cc b/source/extensions/common/matcher/matcher.cc index 8040b4650bca0..f2a5056ec4882 100644 --- a/source/extensions/common/matcher/matcher.cc +++ b/source/extensions/common/matcher/matcher.cc @@ -1,6 +1,6 @@ -#include "extensions/common/matcher/matcher.h" +#include "source/extensions/common/matcher/matcher.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/matcher/matcher.h b/source/extensions/common/matcher/matcher.h index 4eecd25d3786a..03309fa73406b 100644 --- a/source/extensions/common/matcher/matcher.h +++ b/source/extensions/common/matcher/matcher.h @@ -2,8 +2,8 @@ #include "envoy/config/common/matcher/v3/matcher.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/http/header_utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/header_utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/proxy_protocol/BUILD b/source/extensions/common/proxy_protocol/BUILD index 7a2b9bf66d034..55493cebc9697 100644 --- a/source/extensions/common/proxy_protocol/BUILD +++ b/source/extensions/common/proxy_protocol/BUILD @@ -15,9 +15,9 @@ envoy_cc_library( # This is used by the router, so considered core code. visibility = ["//visibility:public"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/network:address_interface", - "//include/envoy/network:connection_interface", + "//envoy/buffer:buffer_interface", + "//envoy/network:address_interface", + "//envoy/network:connection_interface", "//source/common/network:address_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], diff --git a/source/extensions/common/proxy_protocol/proxy_protocol_header.cc b/source/extensions/common/proxy_protocol/proxy_protocol_header.cc index 123bff19f2b71..3296b0e14044c 100644 --- a/source/extensions/common/proxy_protocol/proxy_protocol_header.cc +++ b/source/extensions/common/proxy_protocol/proxy_protocol_header.cc @@ -1,11 +1,11 @@ -#include "extensions/common/proxy_protocol/proxy_protocol_header.h" +#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h" #include #include "envoy/buffer/buffer.h" #include "envoy/network/address.h" -#include "common/network/address_impl.h" +#include "source/common/network/address_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/redis/BUILD b/source/extensions/common/redis/BUILD index f7427e61ad2e8..36e05034f57f6 100644 --- a/source/extensions/common/redis/BUILD +++ b/source/extensions/common/redis/BUILD @@ -25,9 +25,9 @@ envoy_cc_library( hdrs = ["cluster_refresh_manager_impl.h"], deps = [ ":cluster_refresh_manager_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/singleton:manager_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/event:dispatcher_interface", + "//envoy/singleton:manager_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:lock_guard_lib", "//source/common/common:thread_annotations", "//source/common/common:thread_lib", diff --git a/source/extensions/common/redis/cluster_refresh_manager_impl.cc b/source/extensions/common/redis/cluster_refresh_manager_impl.cc index c3caa96d9eec3..bc22bace274c7 100644 --- a/source/extensions/common/redis/cluster_refresh_manager_impl.cc +++ b/source/extensions/common/redis/cluster_refresh_manager_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/common/redis/cluster_refresh_manager_impl.h" +#include "source/extensions/common/redis/cluster_refresh_manager_impl.h" #include "envoy/singleton/manager.h" diff --git a/source/extensions/common/redis/cluster_refresh_manager_impl.h b/source/extensions/common/redis/cluster_refresh_manager_impl.h index a62db60327f1b..94bbfc315db65 100644 --- a/source/extensions/common/redis/cluster_refresh_manager_impl.h +++ b/source/extensions/common/redis/cluster_refresh_manager_impl.h @@ -8,10 +8,9 @@ #include "envoy/singleton/instance.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/lock_guard.h" -#include "common/common/thread.h" - -#include "extensions/common/redis/cluster_refresh_manager.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/thread.h" +#include "source/extensions/common/redis/cluster_refresh_manager.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/sqlutils/sqlutils.cc b/source/extensions/common/sqlutils/sqlutils.cc index 64b5438111be2..1c9a30d6e502d 100644 --- a/source/extensions/common/sqlutils/sqlutils.cc +++ b/source/extensions/common/sqlutils/sqlutils.cc @@ -1,4 +1,4 @@ -#include "extensions/common/sqlutils/sqlutils.h" +#include "source/extensions/common/sqlutils/sqlutils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/sqlutils/sqlutils.h b/source/extensions/common/sqlutils/sqlutils.h index 659025893027f..4c62f2a5e91d9 100644 --- a/source/extensions/common/sqlutils/sqlutils.h +++ b/source/extensions/common/sqlutils/sqlutils.h @@ -1,6 +1,6 @@ #pragma once -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" #include "include/sqlparser/SQLParser.h" diff --git a/source/extensions/common/tap/BUILD b/source/extensions/common/tap/BUILD index e127bf3aaa192..c70943346fb7c 100644 --- a/source/extensions/common/tap/BUILD +++ b/source/extensions/common/tap/BUILD @@ -12,7 +12,7 @@ envoy_cc_library( name = "tap_interface", hdrs = ["tap.h"], deps = [ - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "//source/extensions/common/matcher:matcher_lib", "@envoy_api//envoy/config/tap/v3:pkg_cc_proto", "@envoy_api//envoy/data/tap/v3:pkg_cc_proto", @@ -39,8 +39,8 @@ envoy_cc_library( hdrs = ["admin.h"], deps = [ ":tap_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/singleton:manager_interface", + "//envoy/server:admin_interface", + "//envoy/singleton:manager_interface", "//source/common/buffer:buffer_lib", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/tap/v3:pkg_cc_proto", @@ -53,7 +53,7 @@ envoy_cc_library( srcs = ["extension_config_base.cc"], hdrs = ["extension_config_base.h"], deps = [ - "//include/envoy/thread_local:thread_local_interface", + "//envoy/thread_local:thread_local_interface", "//source/extensions/common/tap:admin", "@envoy_api//envoy/config/tap/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/common/tap/v3:pkg_cc_proto", diff --git a/source/extensions/common/tap/admin.cc b/source/extensions/common/tap/admin.cc index ee52d24b0c175..8c674cb141f6f 100644 --- a/source/extensions/common/tap/admin.cc +++ b/source/extensions/common/tap/admin.cc @@ -1,13 +1,13 @@ -#include "extensions/common/tap/admin.h" +#include "source/extensions/common/tap/admin.h" #include "envoy/admin/v3/tap.pb.h" #include "envoy/admin/v3/tap.pb.validate.h" #include "envoy/config/tap/v3/common.pb.h" #include "envoy/data/tap/v3/wrapper.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/tap/admin.h b/source/extensions/common/tap/admin.h index 90feda4946e9b..39d002a52caf2 100644 --- a/source/extensions/common/tap/admin.h +++ b/source/extensions/common/tap/admin.h @@ -3,7 +3,7 @@ #include "envoy/server/admin.h" #include "envoy/singleton/manager.h" -#include "extensions/common/tap/tap.h" +#include "source/extensions/common/tap/tap.h" #include "absl/container/node_hash_set.h" diff --git a/source/extensions/common/tap/extension_config_base.cc b/source/extensions/common/tap/extension_config_base.cc index 04a6fb73d20b7..66173ebbee210 100644 --- a/source/extensions/common/tap/extension_config_base.cc +++ b/source/extensions/common/tap/extension_config_base.cc @@ -1,4 +1,4 @@ -#include "extensions/common/tap/extension_config_base.h" +#include "source/extensions/common/tap/extension_config_base.h" #include "envoy/config/tap/v3/common.pb.h" #include "envoy/extensions/common/tap/v3/common.pb.h" diff --git a/source/extensions/common/tap/extension_config_base.h b/source/extensions/common/tap/extension_config_base.h index 7e0e00625dd9e..ff8f87646a6c8 100644 --- a/source/extensions/common/tap/extension_config_base.h +++ b/source/extensions/common/tap/extension_config_base.h @@ -4,8 +4,8 @@ #include "envoy/extensions/common/tap/v3/common.pb.h" #include "envoy/thread_local/thread_local.h" -#include "extensions/common/tap/admin.h" -#include "extensions/common/tap/tap.h" +#include "source/extensions/common/tap/admin.h" +#include "source/extensions/common/tap/tap.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/tap/tap.h b/source/extensions/common/tap/tap.h index 972ebef3a8130..83b521ce8043a 100644 --- a/source/extensions/common/tap/tap.h +++ b/source/extensions/common/tap/tap.h @@ -5,7 +5,7 @@ #include "envoy/data/tap/v3/wrapper.pb.h" #include "envoy/http/header_map.h" -#include "extensions/common/matcher/matcher.h" +#include "source/extensions/common/matcher/matcher.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/common/tap/tap_config_base.cc b/source/extensions/common/tap/tap_config_base.cc index 5e7d77a1a15a0..b1f9785c65888 100644 --- a/source/extensions/common/tap/tap_config_base.cc +++ b/source/extensions/common/tap/tap_config_base.cc @@ -1,15 +1,14 @@ -#include "extensions/common/tap/tap_config_base.h" +#include "source/extensions/common/tap/tap_config_base.h" #include "envoy/config/tap/v3/common.pb.h" #include "envoy/data/tap/v3/common.pb.h" #include "envoy/data/tap/v3/wrapper.pb.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/config/version_converter.h" -#include "common/protobuf/utility.h" - -#include "extensions/common/matcher/matcher.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/config/version_converter.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/common/matcher/matcher.h" #include "absl/container/fixed_array.h" diff --git a/source/extensions/common/tap/tap_config_base.h b/source/extensions/common/tap/tap_config_base.h index a0aeb9967fc3d..94685339fba02 100644 --- a/source/extensions/common/tap/tap_config_base.h +++ b/source/extensions/common/tap/tap_config_base.h @@ -7,8 +7,8 @@ #include "envoy/data/tap/v3/common.pb.h" #include "envoy/data/tap/v3/wrapper.pb.h" -#include "extensions/common/matcher/matcher.h" -#include "extensions/common/tap/tap.h" +#include "source/extensions/common/matcher/matcher.h" +#include "source/extensions/common/tap/tap.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/utility.h b/source/extensions/common/utility.h index 378223c912cdc..7b326227222ec 100644 --- a/source/extensions/common/utility.h +++ b/source/extensions/common/utility.h @@ -3,9 +3,9 @@ #include "envoy/common/exception.h" #include "envoy/runtime/runtime.h" -#include "common/common/documentation_url.h" -#include "common/common/logger.h" -#include "common/common/utility.h" +#include "source/common/common/documentation_url.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/wasm/BUILD b/source/extensions/common/wasm/BUILD index 37182ea34ebef..f319fb2d00d6d 100644 --- a/source/extensions/common/wasm/BUILD +++ b/source/extensions/common/wasm/BUILD @@ -30,11 +30,11 @@ envoy_cc_library( ], visibility = ["//visibility:public"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/server:lifecycle_notifier_interface", - "//include/envoy/thread_local:thread_local_object", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", + "//envoy/server:lifecycle_notifier_interface", + "//envoy/thread_local:thread_local_object", + "//envoy/upstream:cluster_manager_interface", "//source/common/config:datasource_lib", "//source/common/protobuf:utility_lib", "//source/common/singleton:const_singleton", @@ -71,7 +71,7 @@ envoy_cc_library( ":wasm_runtime_factory_interface", "//external:abseil_base", "//external:abseil_node_hash_map", - "//include/envoy/server:lifecycle_notifier_interface", + "//envoy/server:lifecycle_notifier_interface", "//source/common/buffer:buffer_lib", "//source/common/common:enum_to_int", "//source/common/common:safe_memcpy_lib", diff --git a/source/extensions/common/wasm/context.cc b/source/extensions/common/wasm/context.cc index 7d9c0fdeb22c2..4591f9d2a177b 100644 --- a/source/extensions/common/wasm/context.cc +++ b/source/extensions/common/wasm/context.cc @@ -15,20 +15,19 @@ #include "envoy/stats/sink.h" #include "envoy/thread_local/thread_local.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/logger.h" -#include "common/common/safe_memcpy.h" -#include "common/http/header_map_impl.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/common/wasm/plugin.h" -#include "extensions/common/wasm/wasm.h" -#include "extensions/filters/common/expr/context.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/logger.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/common/wasm/plugin.h" +#include "source/extensions/common/wasm/wasm.h" +#include "source/extensions/filters/common/expr/context.h" #include "absl/base/casts.h" #include "absl/container/flat_hash_map.h" @@ -118,21 +117,21 @@ WasmResult Buffer::copyTo(WasmBase* wasm, size_t start, size_t length, uint64_t return proxy_wasm::BufferBase::copyTo(wasm, start, length, ptr_ptr, size_ptr); } -WasmResult Buffer::copyFrom(size_t start, size_t length, absl::string_view data) { +WasmResult Buffer::copyFrom(size_t start, size_t length, std::string_view data) { if (buffer_instance_) { if (start == 0) { if (length == 0) { - buffer_instance_->prepend(data); + buffer_instance_->prepend(toAbslStringView(data)); return WasmResult::Ok; } else if (length >= buffer_instance_->length()) { buffer_instance_->drain(buffer_instance_->length()); - buffer_instance_->add(data); + buffer_instance_->add(toAbslStringView(data)); return WasmResult::Ok; } else { return WasmResult::BadArgument; } } else if (start >= buffer_instance_->length()) { - buffer_instance_->add(data); + buffer_instance_->add(toAbslStringView(data)); return WasmResult::Ok; } else { return WasmResult::BadArgument; @@ -157,7 +156,7 @@ Plugin* Context::plugin() const { return static_cast(plugin_.get()); } Context* Context::rootContext() const { return static_cast(root_context()); } Upstream::ClusterManager& Context::clusterManager() const { return wasm()->clusterManager(); } -void Context::error(absl::string_view message) { ENVOY_LOG(trace, message); } +void Context::error(std::string_view message) { ENVOY_LOG(trace, message); } uint64_t Context::getCurrentTimeNanoseconds() { return std::chrono::duration_cast( @@ -565,9 +564,9 @@ Context::findValue(absl::string_view name, Protobuf::Arena* arena, bool last) co } break; case PropertyToken::PLUGIN_ROOT_ID: - return CelValue::CreateStringView(root_id()); + return CelValue::CreateStringView(toAbslStringView(root_id())); case PropertyToken::PLUGIN_VM_ID: - return CelValue::CreateStringView(wasm()->vm_id()); + return CelValue::CreateStringView(toAbslStringView(wasm()->vm_id())); case PropertyToken::FILTER_STATE: return Protobuf::Arena::Create(arena, info->filterState()) @@ -576,7 +575,7 @@ Context::findValue(absl::string_view name, Protobuf::Arena* arena, bool last) co return {}; } -WasmResult Context::getProperty(absl::string_view path, std::string* result) { +WasmResult Context::getProperty(std::string_view path, std::string* result) { using google::api::expr::runtime::CelValue; bool first = true; @@ -599,14 +598,14 @@ WasmResult Context::getProperty(absl::string_view path, std::string* result) { if (first) { // top-level identifier first = false; - auto top_value = findValue(part, &arena, start >= path.size()); + auto top_value = findValue(toAbslStringView(part), &arena, start >= path.size()); if (!top_value.has_value()) { return WasmResult::NotFound; } value = top_value.value(); } else if (value.IsMap()) { auto& map = *value.MapOrDie(); - auto field = map[CelValue::CreateStringView(part)]; + auto field = map[CelValue::CreateStringView(toAbslStringView(part))]; if (!field.has_value()) { return WasmResult::NotFound; } @@ -639,7 +638,7 @@ WasmResult Context::getProperty(absl::string_view path, std::string* result) { } else if (value.IsList()) { auto& list = *value.ListOrDie(); int idx = 0; - if (!absl::SimpleAtoi(part, &idx)) { + if (!absl::SimpleAtoi(toAbslStringView(part), &idx)) { return WasmResult::NotFound; } if (idx < 0 || idx >= list.size()) { @@ -720,8 +719,8 @@ const Http::HeaderMap* Context::getConstMap(WasmHeaderMapType type) { NOT_REACHED_GCOVR_EXCL_LINE; } -WasmResult Context::addHeaderMapValue(WasmHeaderMapType type, absl::string_view key, - absl::string_view value) { +WasmResult Context::addHeaderMapValue(WasmHeaderMapType type, std::string_view key, + std::string_view value) { auto map = getMap(type); if (!map) { return WasmResult::BadArgument; @@ -734,8 +733,8 @@ WasmResult Context::addHeaderMapValue(WasmHeaderMapType type, absl::string_view return WasmResult::Ok; } -WasmResult Context::getHeaderMapValue(WasmHeaderMapType type, absl::string_view key, - absl::string_view* value) { +WasmResult Context::getHeaderMapValue(WasmHeaderMapType type, std::string_view key, + std::string_view* value) { auto map = getConstMap(type); if (!map) { if (access_log_phase_) { @@ -762,7 +761,7 @@ WasmResult Context::getHeaderMapValue(WasmHeaderMapType type, absl::string_view } // TODO(kyessenov, PiotrSikora): This needs to either return a concatenated list of values, or // the ABI needs to be changed to return multiple values. This is a potential security issue. - *value = entry[0]->value().getStringView(); + *value = toStdStringView(entry[0]->value().getStringView()); return WasmResult::Ok; } @@ -773,7 +772,8 @@ Pairs headerMapToPairs(const Http::HeaderMap* map) { Pairs pairs; pairs.reserve(map->size()); map->iterate([&pairs](const Http::HeaderEntry& header) -> Http::HeaderMap::Iterate { - pairs.push_back(std::make_pair(header.key().getStringView(), header.value().getStringView())); + pairs.push_back(std::make_pair(toStdStringView(header.key().getStringView()), + toStdStringView(header.value().getStringView()))); return Http::HeaderMap::Iterate::Continue; }); return pairs; @@ -808,7 +808,7 @@ WasmResult Context::setHeaderMapPairs(WasmHeaderMapType type, const Pairs& pairs return WasmResult::Ok; } -WasmResult Context::removeHeaderMapValue(WasmHeaderMapType type, absl::string_view key) { +WasmResult Context::removeHeaderMapValue(WasmHeaderMapType type, std::string_view key) { auto map = getMap(type); if (!map) { return WasmResult::BadArgument; @@ -821,14 +821,14 @@ WasmResult Context::removeHeaderMapValue(WasmHeaderMapType type, absl::string_vi return WasmResult::Ok; } -WasmResult Context::replaceHeaderMapValue(WasmHeaderMapType type, absl::string_view key, - absl::string_view value) { +WasmResult Context::replaceHeaderMapValue(WasmHeaderMapType type, std::string_view key, + std::string_view value) { auto map = getMap(type); if (!map) { return WasmResult::BadArgument; } const Http::LowerCaseString lower_key{std::string(key)}; - map->setCopy(lower_key, value); + map->setCopy(lower_key, toAbslStringView(value)); if (type == WasmHeaderMapType::RequestHeaders) { decoder_callbacks_->clearRouteCache(); } @@ -886,8 +886,8 @@ BufferInterface* Context::getBuffer(WasmBufferType type) { response = rootContext()->http_call_response_; if (response) { auto& body = (*response)->body(); - return buffer_.set(absl::string_view(static_cast(body.linearize(body.length())), - body.length())); + return buffer_.set( + std::string_view(static_cast(body.linearize(body.length())), body.length())); } return nullptr; case WasmBufferType::GrpcReceiveBuffer: @@ -927,8 +927,8 @@ uint32_t Context::nextHttpCallToken() { } // Async call via HTTP -WasmResult Context::httpCall(absl::string_view cluster, const Pairs& request_headers, - absl::string_view request_body, const Pairs& request_trailers, +WasmResult Context::httpCall(std::string_view cluster, const Pairs& request_headers, + std::string_view request_body, const Pairs& request_trailers, int timeout_milliseconds, uint32_t* token_ptr) { if (timeout_milliseconds < 0) { return WasmResult::BadArgument; @@ -949,7 +949,7 @@ WasmResult Context::httpCall(absl::string_view cluster, const Pairs& request_hea } if (!request_body.empty()) { - message->body().add(request_body); + message->body().add(toAbslStringView(request_body)); message->headers().setContentLength(request_body.size()); } @@ -1000,9 +1000,9 @@ uint32_t Context::nextGrpcCallToken() { return token; } -WasmResult Context::grpcCall(absl::string_view grpc_service, absl::string_view service_name, - absl::string_view method_name, const Pairs& initial_metadata, - absl::string_view request, std::chrono::milliseconds timeout, +WasmResult Context::grpcCall(std::string_view grpc_service, std::string_view service_name, + std::string_view method_name, const Pairs& initial_metadata, + std::string_view request, std::chrono::milliseconds timeout, uint32_t* token_ptr) { GrpcService service_proto; if (!service_proto.ParseFromArray(grpc_service.data(), grpc_service.size())) { @@ -1038,9 +1038,10 @@ WasmResult Context::grpcCall(absl::string_view grpc_service, absl::string_view s hash_policy.Add()->mutable_header()->set_header_name(Http::Headers::get().Host.get()); options.setHashPolicy(hash_policy); - auto grpc_request = grpc_client->sendRaw(service_name, method_name, - std::make_unique<::Envoy::Buffer::OwnedImpl>(request), - handler, Tracing::NullSpan::instance(), options); + auto grpc_request = + grpc_client->sendRaw(toAbslStringView(service_name), toAbslStringView(method_name), + std::make_unique<::Envoy::Buffer::OwnedImpl>(toAbslStringView(request)), + handler, Tracing::NullSpan::instance(), options); if (!grpc_request) { grpc_call_request_.erase(token); return WasmResult::InternalFailure; @@ -1071,8 +1072,8 @@ uint32_t Context::nextGrpcStreamToken() { return token; } -WasmResult Context::grpcStream(absl::string_view grpc_service, absl::string_view service_name, - absl::string_view method_name, const Pairs& initial_metadata, +WasmResult Context::grpcStream(std::string_view grpc_service, std::string_view service_name, + std::string_view method_name, const Pairs& initial_metadata, uint32_t* token_ptr) { GrpcService service_proto; if (!service_proto.ParseFromArray(grpc_service.data(), grpc_service.size())) { @@ -1107,7 +1108,8 @@ WasmResult Context::grpcStream(absl::string_view grpc_service, absl::string_view hash_policy.Add()->mutable_header()->set_header_name(Http::Headers::get().Host.get()); options.setHashPolicy(hash_policy); - auto grpc_stream = grpc_client->startRaw(service_name, method_name, handler, options); + auto grpc_stream = grpc_client->startRaw(toAbslStringView(service_name), + toAbslStringView(method_name), handler, options); if (!grpc_stream) { grpc_stream_.erase(token); return WasmResult::InternalFailure; @@ -1170,18 +1172,18 @@ const Network::Connection* Context::getConnection() const { return nullptr; } -WasmResult Context::setProperty(absl::string_view path, absl::string_view value) { +WasmResult Context::setProperty(std::string_view path, std::string_view value) { auto* stream_info = getRequestStreamInfo(); if (!stream_info) { return WasmResult::NotFound; } std::string key; - absl::StrAppend(&key, CelStateKeyPrefix, path); + absl::StrAppend(&key, CelStateKeyPrefix, toAbslStringView(path)); CelState* state; if (stream_info->filterState()->hasData(key)) { state = &stream_info->filterState()->getDataMutable(key); } else { - const auto& it = rootContext()->state_prototypes_.find(path); + const auto& it = rootContext()->state_prototypes_.find(toAbslStringView(path)); const CelStatePrototype& prototype = it == rootContext()->state_prototypes_.end() ? Filters::Common::Expr::DefaultCelStatePrototype::get() @@ -1192,24 +1194,24 @@ WasmResult Context::setProperty(absl::string_view path, absl::string_view value) StreamInfo::FilterState::StateType::Mutable, prototype.life_span_); } - if (!state->setValue(value)) { + if (!state->setValue(toAbslStringView(value))) { return WasmResult::BadArgument; } return WasmResult::Ok; } WasmResult -Context::declareProperty(absl::string_view path, +Context::declareProperty(std::string_view path, Filters::Common::Expr::CelStatePrototypeConstPtr state_prototype) { // Do not delete existing schema since it can be referenced by state objects. - if (state_prototypes_.find(path) == state_prototypes_.end()) { - state_prototypes_[path] = std::move(state_prototype); + if (state_prototypes_.find(toAbslStringView(path)) == state_prototypes_.end()) { + state_prototypes_[toAbslStringView(path)] = std::move(state_prototype); return WasmResult::Ok; } return WasmResult::BadArgument; } -WasmResult Context::log(uint32_t level, absl::string_view message) { +WasmResult Context::log(uint32_t level, std::string_view message) { switch (static_cast(level)) { case spdlog::level::trace: ENVOY_LOG(trace, "wasm log{}: {}", log_prefix(), message); @@ -1243,7 +1245,7 @@ uint32_t Context::getLogLevel() { // // Calls into the Wasm code. // -bool Context::validateConfiguration(absl::string_view configuration, +bool Context::validateConfiguration(std::string_view configuration, const std::shared_ptr& plugin_base) { auto plugin = std::static_pointer_cast(plugin_base); if (!wasm()->validate_configuration_) { @@ -1258,7 +1260,7 @@ bool Context::validateConfiguration(absl::string_view configuration, return result; } -absl::string_view Context::getConfiguration() { +std::string_view Context::getConfiguration() { if (temp_plugin_) { return temp_plugin_->plugin_configuration_; } else { @@ -1266,8 +1268,8 @@ absl::string_view Context::getConfiguration() { } }; -std::pair Context::getStatus() { - return std::make_pair(status_code_, status_message_); +std::pair Context::getStatus() { + return std::make_pair(status_code_, toStdStringView(status_message_)); } void Context::onGrpcReceiveInitialMetadataWrapper(uint32_t token, Http::HeaderMapPtr&& metadata) { @@ -1282,14 +1284,14 @@ void Context::onGrpcReceiveTrailingMetadataWrapper(uint32_t token, Http::HeaderM grpc_receive_trailing_metadata_ = nullptr; } -WasmResult Context::defineMetric(uint32_t metric_type, absl::string_view name, +WasmResult Context::defineMetric(uint32_t metric_type, std::string_view name, uint32_t* metric_id_ptr) { if (metric_type > static_cast(MetricType::Max)) { return WasmResult::BadArgument; } auto type = static_cast(metric_type); // TODO: Consider rethinking the scoping policy as it does not help in this case. - Stats::StatNameManagedStorage storage(name, wasm()->scope_->symbolTable()); + Stats::StatNameManagedStorage storage(toAbslStringView(name), wasm()->scope_->symbolTable()); Stats::StatName stat_name = storage.statName(); if (type == MetricType::Counter) { auto id = wasm()->nextCounterMetricId(); @@ -1656,9 +1658,9 @@ void Context::failStream(WasmStreamType stream_type) { } } -WasmResult Context::sendLocalResponse(uint32_t response_code, absl::string_view body_text, +WasmResult Context::sendLocalResponse(uint32_t response_code, std::string_view body_text, Pairs additional_headers, uint32_t grpc_status, - absl::string_view details) { + std::string_view details) { // "additional_headers" is a collection of string_views. These will no longer // be valid when "modify_headers" is finally called below, so we must // make copies of all the headers. @@ -1878,7 +1880,7 @@ void Context::onGrpcReceiveWrapper(uint32_t token, ::Envoy::Buffer::InstancePtr } void Context::onGrpcCloseWrapper(uint32_t token, const Grpc::Status::GrpcStatus& status, - const absl::string_view message) { + const std::string_view message) { if (proxy_wasm::current_context_ != nullptr) { // We are in a reentrant call, so defer. wasm()->addAfterVmCallAction([this, token, status, message = std::string(message)] { @@ -1888,7 +1890,7 @@ void Context::onGrpcCloseWrapper(uint32_t token, const Grpc::Status::GrpcStatus& } if (wasm()->on_grpc_close_) { status_code_ = static_cast(status); - status_message_ = message; + status_message_ = toAbslStringView(message); onGrpcClose(token, status_code_); status_message_ = ""; } @@ -1904,7 +1906,7 @@ void Context::onGrpcCloseWrapper(uint32_t token, const Grpc::Status::GrpcStatus& } } -WasmResult Context::grpcSend(uint32_t token, absl::string_view message, bool end_stream) { +WasmResult Context::grpcSend(uint32_t token, std::string_view message, bool end_stream) { if (isGrpcCallToken(token)) { return WasmResult::BadArgument; } diff --git a/source/extensions/common/wasm/context.h b/source/extensions/common/wasm/context.h index 65b8e862bbcbe..a834be202a5aa 100644 --- a/source/extensions/common/wasm/context.h +++ b/source/extensions/common/wasm/context.h @@ -11,12 +11,11 @@ #include "envoy/stats/sink.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/assert.h" -#include "common/common/logger.h" - -#include "extensions/common/wasm/plugin.h" -#include "extensions/filters/common/expr/cel_state.h" -#include "extensions/filters/common/expr/evaluator.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/extensions/common/wasm/plugin.h" +#include "source/extensions/filters/common/expr/cel_state.h" +#include "source/extensions/filters/common/expr/evaluator.h" #include "eval/public/activation.h" #include "include/proxy-wasm/wasm.h" @@ -67,7 +66,7 @@ class Buffer : public proxy_wasm::BufferBase { size_t size() const override; WasmResult copyTo(WasmBase* wasm, size_t start, size_t length, uint64_t ptr_ptr, uint64_t size_ptr) const override; - WasmResult copyFrom(size_t start, size_t length, absl::string_view data) override; + WasmResult copyFrom(size_t start, size_t length, std::string_view data) override; // proxy_wasm::BufferBase void clear() override { @@ -75,7 +74,7 @@ class Buffer : public proxy_wasm::BufferBase { const_buffer_instance_ = nullptr; buffer_instance_ = nullptr; } - Buffer* set(absl::string_view data) { + Buffer* set(std::string_view data) { return static_cast(proxy_wasm::BufferBase::set(data)); } Buffer* set(std::unique_ptr owned_data, uint32_t owned_data_size) { @@ -123,7 +122,7 @@ class Context : public proxy_wasm::ContextBase, Upstream::ClusterManager& clusterManager() const; // proxy_wasm::ContextBase - void error(absl::string_view message) override; + void error(std::string_view message) override; // Retrieves the stream info associated with the request (a.k.a active stream). // It selects a value based on the following order: encoder callback, decoder @@ -142,7 +141,7 @@ class Context : public proxy_wasm::ContextBase, // // VM level down-calls into the Wasm code on Context(id == 0). // - virtual bool validateConfiguration(absl::string_view configuration, + virtual bool validateConfiguration(std::string_view configuration, const std::shared_ptr& plugin); // deprecated // AccessLog::Instance @@ -195,25 +194,25 @@ class Context : public proxy_wasm::ContextBase, // proxy_wasm::ContextBase // General - WasmResult log(uint32_t level, absl::string_view message) override; + WasmResult log(uint32_t level, std::string_view message) override; uint64_t getCurrentTimeNanoseconds() override; uint64_t getMonotonicTimeNanoseconds() override; - absl::string_view getConfiguration() override; - std::pair getStatus() override; + std::string_view getConfiguration() override; + std::pair getStatus() override; // State accessors - WasmResult getProperty(absl::string_view path, std::string* result) override; - WasmResult setProperty(absl::string_view path, absl::string_view value) override; - WasmResult declareProperty(absl::string_view path, + WasmResult getProperty(std::string_view path, std::string* result) override; + WasmResult setProperty(std::string_view path, std::string_view value) override; + WasmResult declareProperty(std::string_view path, Filters::Common::Expr::CelStatePrototypeConstPtr state_prototype); // Continue WasmResult continueStream(WasmStreamType stream_type) override; WasmResult closeStream(WasmStreamType stream_type) override; void failStream(WasmStreamType stream_type) override; - WasmResult sendLocalResponse(uint32_t response_code, absl::string_view body_text, + WasmResult sendLocalResponse(uint32_t response_code, std::string_view body_text, Pairs additional_headers, uint32_t grpc_status, - absl::string_view details) override; + std::string_view details) override; void clearRouteCache() override { if (decoder_callbacks_) { decoder_callbacks_->clearRouteCache(); @@ -221,16 +220,16 @@ class Context : public proxy_wasm::ContextBase, } // Header/Trailer/Metadata Maps - WasmResult addHeaderMapValue(WasmHeaderMapType type, absl::string_view key, - absl::string_view value) override; - WasmResult getHeaderMapValue(WasmHeaderMapType type, absl::string_view key, - absl::string_view* value) override; + WasmResult addHeaderMapValue(WasmHeaderMapType type, std::string_view key, + std::string_view value) override; + WasmResult getHeaderMapValue(WasmHeaderMapType type, std::string_view key, + std::string_view* value) override; WasmResult getHeaderMapPairs(WasmHeaderMapType type, Pairs* result) override; WasmResult setHeaderMapPairs(WasmHeaderMapType type, const Pairs& pairs) override; - WasmResult removeHeaderMapValue(WasmHeaderMapType type, absl::string_view key) override; - WasmResult replaceHeaderMapValue(WasmHeaderMapType type, absl::string_view key, - absl::string_view value) override; + WasmResult removeHeaderMapValue(WasmHeaderMapType type, std::string_view key) override; + WasmResult replaceHeaderMapValue(WasmHeaderMapType type, std::string_view key, + std::string_view value) override; WasmResult getHeaderMapSize(WasmHeaderMapType type, uint32_t* size) override; @@ -240,28 +239,28 @@ class Context : public proxy_wasm::ContextBase, bool endOfStream(WasmStreamType /* stream_type */) override { return end_of_stream_; } // HTTP - WasmResult httpCall(absl::string_view cluster, const Pairs& request_headers, - absl::string_view request_body, const Pairs& request_trailers, + WasmResult httpCall(std::string_view cluster, const Pairs& request_headers, + std::string_view request_body, const Pairs& request_trailers, int timeout_millisconds, uint32_t* token_ptr) override; // Stats/Metrics - WasmResult defineMetric(uint32_t type, absl::string_view name, uint32_t* metric_id_ptr) override; + WasmResult defineMetric(uint32_t type, std::string_view name, uint32_t* metric_id_ptr) override; WasmResult incrementMetric(uint32_t metric_id, int64_t offset) override; WasmResult recordMetric(uint32_t metric_id, uint64_t value) override; WasmResult getMetric(uint32_t metric_id, uint64_t* value_ptr) override; // gRPC - WasmResult grpcCall(absl::string_view grpc_service, absl::string_view service_name, - absl::string_view method_name, const Pairs& initial_metadata, - absl::string_view request, std::chrono::milliseconds timeout, + WasmResult grpcCall(std::string_view grpc_service, std::string_view service_name, + std::string_view method_name, const Pairs& initial_metadata, + std::string_view request, std::chrono::milliseconds timeout, uint32_t* token_ptr) override; - WasmResult grpcStream(absl::string_view grpc_service, absl::string_view service_name, - absl::string_view method_name, const Pairs& initial_metadat, + WasmResult grpcStream(std::string_view grpc_service, std::string_view service_name, + std::string_view method_name, const Pairs& initial_metadat, uint32_t* token_ptr) override; WasmResult grpcClose(uint32_t token) override; WasmResult grpcCancel(uint32_t token) override; - WasmResult grpcSend(uint32_t token, absl::string_view message, bool end_stream) override; + WasmResult grpcSend(uint32_t token, std::string_view message, bool end_stream) override; // Envoy specific ABI void onResolveDns(uint32_t token, Envoy::Network::DnsResolver::ResolutionStatus status, @@ -388,7 +387,7 @@ class Context : public proxy_wasm::ContextBase, void onGrpcReceiveWrapper(uint32_t token, ::Envoy::Buffer::InstancePtr response); void onGrpcReceiveTrailingMetadataWrapper(uint32_t token, Http::HeaderMapPtr&& metadata); void onGrpcCloseWrapper(uint32_t token, const Grpc::Status::GrpcStatus& status, - const absl::string_view message); + const std::string_view message); bool isGrpcStreamToken(uint32_t token) { return (token & 1) == 0; } bool isGrpcCallToken(uint32_t token) { return (token & 1) == 1; } diff --git a/source/extensions/common/wasm/ext/envoy_null_plugin.h b/source/extensions/common/wasm/ext/envoy_null_plugin.h index 1463e00e1ef5c..49544355f4623 100644 --- a/source/extensions/common/wasm/ext/envoy_null_plugin.h +++ b/source/extensions/common/wasm/ext/envoy_null_plugin.h @@ -26,7 +26,7 @@ proxy_wasm::Word resolve_dns(void* raw_context, proxy_wasm::Word dns_address, namespace proxy_wasm { namespace null_plugin { -#include "extensions/common/wasm/ext/envoy_proxy_wasm_api.h" +#include "source/extensions/common/wasm/ext/envoy_proxy_wasm_api.h" using GrpcService = envoy::config::core::v3::GrpcService; using namespace proxy_wasm::null_plugin; diff --git a/source/extensions/common/wasm/ext/envoy_null_vm_wasm_api.h b/source/extensions/common/wasm/ext/envoy_null_vm_wasm_api.h index f6415b3fd2fa4..dd74afa291401 100644 --- a/source/extensions/common/wasm/ext/envoy_null_vm_wasm_api.h +++ b/source/extensions/common/wasm/ext/envoy_null_vm_wasm_api.h @@ -17,7 +17,7 @@ namespace null_plugin { #include "proxy_wasm_api.h" #undef _THE_FOLLOWING_INCLUDE_MUST_COME_AFTER_THOSE_ABOVE_ #define _THE_FOLLOWING_INCLUDE_MUST_COME_AFTER_THOSE_ABOVE_ 1 -#include "extensions/common/wasm/ext/envoy_proxy_wasm_api.h" +#include "source/extensions/common/wasm/ext/envoy_proxy_wasm_api.h" #undef _THE_FOLLOWING_INCLUDE_MUST_COME_AFTER_THOSE_ABOVE_ } // namespace null_plugin diff --git a/source/extensions/common/wasm/foreign.cc b/source/extensions/common/wasm/foreign.cc index 2d59dcc43e1f2..3f153461e96c9 100644 --- a/source/extensions/common/wasm/foreign.cc +++ b/source/extensions/common/wasm/foreign.cc @@ -1,8 +1,6 @@ -#include "common/common/logger.h" - +#include "source/common/common/logger.h" #include "source/extensions/common/wasm/ext/declare_property.pb.h" - -#include "extensions/common/wasm/wasm.h" +#include "source/extensions/common/wasm/wasm.h" #if defined(WASM_USE_CEL_PARSER) #include "eval/public/builtin_func_registrar.h" @@ -28,7 +26,7 @@ template WasmForeignFunction createFromClass() { RegisterForeignFunction registerCompressForeignFunction( "compress", - [](WasmBase&, absl::string_view arguments, + [](WasmBase&, std::string_view arguments, const std::function& alloc_result) -> WasmResult { unsigned long dest_len = compressBound(arguments.size()); std::unique_ptr b(new unsigned char[dest_len]); @@ -43,7 +41,7 @@ RegisterForeignFunction registerCompressForeignFunction( RegisterForeignFunction registerUncompressForeignFunction( "uncompress", - [](WasmBase&, absl::string_view arguments, + [](WasmBase&, std::string_view arguments, const std::function& alloc_result) -> WasmResult { unsigned long dest_len = arguments.size() * 2 + 2; // output estimate. while (true) { @@ -120,7 +118,7 @@ class CreateExpressionFactory : public ExpressionFactory { public: WasmForeignFunction create(std::shared_ptr self) const { WasmForeignFunction f = - [self](WasmBase&, absl::string_view expr, + [self](WasmBase&, std::string_view expr, const std::function& alloc_result) -> WasmResult { auto parse_status = google::api::expr::parser::Parse(std::string(expr)); if (!parse_status.ok()) { @@ -157,7 +155,7 @@ class EvaluateExpressionFactory : public ExpressionFactory { public: WasmForeignFunction create(std::shared_ptr self) const { WasmForeignFunction f = - [self](WasmBase&, absl::string_view argument, + [self](WasmBase&, std::string_view argument, const std::function& alloc_result) -> WasmResult { auto& expr_context = getOrCreateContext(proxy_wasm::current_context_->root_context()); if (argument.size() != sizeof(uint32_t)) { @@ -199,7 +197,7 @@ RegisterForeignFunction class DeleteExpressionFactory : public ExpressionFactory { public: WasmForeignFunction create(std::shared_ptr self) const { - WasmForeignFunction f = [self](WasmBase&, absl::string_view argument, + WasmForeignFunction f = [self](WasmBase&, std::string_view argument, const std::function&) -> WasmResult { auto& expr_context = getOrCreateContext(proxy_wasm::current_context_->root_context()); if (argument.size() != sizeof(uint32_t)) { @@ -222,7 +220,7 @@ RegisterForeignFunction class DeclarePropertyFactory { public: WasmForeignFunction create(std::shared_ptr self) const { - WasmForeignFunction f = [self](WasmBase&, absl::string_view arguments, + WasmForeignFunction f = [self](WasmBase&, std::string_view arguments, const std::function&) -> WasmResult { envoy::source::extensions::common::wasm::DeclarePropertyArguments args; if (args.ParseFromArray(arguments.data(), arguments.size())) { diff --git a/source/extensions/common/wasm/plugin.cc b/source/extensions/common/wasm/plugin.cc index fe773a3b1e100..ae1628981e870 100644 --- a/source/extensions/common/wasm/plugin.cc +++ b/source/extensions/common/wasm/plugin.cc @@ -1,4 +1,4 @@ -#include "extensions/common/wasm/plugin.h" +#include "source/extensions/common/wasm/plugin.h" #include "envoy/common/exception.h" diff --git a/source/extensions/common/wasm/plugin.h b/source/extensions/common/wasm/plugin.h index 1e053e607ffd0..ca42101f8de03 100644 --- a/source/extensions/common/wasm/plugin.h +++ b/source/extensions/common/wasm/plugin.h @@ -5,8 +5,8 @@ #include "envoy/extensions/wasm/v3/wasm.pb.validate.h" #include "envoy/local_info/local_info.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "include/proxy-wasm/wasm.h" diff --git a/source/extensions/common/wasm/wasm.cc b/source/extensions/common/wasm/wasm.cc index c037c988c28ac..8bef9b885485e 100644 --- a/source/extensions/common/wasm/wasm.cc +++ b/source/extensions/common/wasm/wasm.cc @@ -1,14 +1,13 @@ -#include "extensions/common/wasm/wasm.h" +#include "source/extensions/common/wasm/wasm.h" #include #include #include "envoy/event/deferred_deletable.h" -#include "common/common/logger.h" - -#include "extensions/common/wasm/plugin.h" -#include "extensions/common/wasm/wasm_extension.h" +#include "source/common/common/logger.h" +#include "source/extensions/common/wasm/plugin.h" +#include "source/extensions/common/wasm/wasm_extension.h" #include "absl/strings/str_cat.h" @@ -88,10 +87,10 @@ void Wasm::initializeLifecycle(Server::ServerLifecycleNotifier& lifecycle_notifi Wasm::Wasm(WasmConfig& config, absl::string_view vm_key, const Stats::ScopeSharedPtr& scope, Upstream::ClusterManager& cluster_manager, Event::Dispatcher& dispatcher) - : WasmBase(createWasmVm(config.config().vm_config().runtime()), - config.config().vm_config().vm_id(), - MessageUtil::anyToBytes(config.config().vm_config().configuration()), vm_key, - config.environmentVariables(), config.allowedCapabilities()), + : WasmBase( + createWasmVm(config.config().vm_config().runtime()), config.config().vm_config().vm_id(), + MessageUtil::anyToBytes(config.config().vm_config().configuration()), + toStdStringView(vm_key), config.environmentVariables(), config.allowedCapabilities()), scope_(scope), cluster_manager_(cluster_manager), dispatcher_(dispatcher), time_source_(dispatcher.timeSource()), wasm_stats_(WasmStats{ALL_WASM_STATS( @@ -106,8 +105,9 @@ Wasm::Wasm(WasmConfig& config, absl::string_view vm_key, const Stats::ScopeShare Wasm::Wasm(WasmHandleSharedPtr base_wasm_handle, Event::Dispatcher& dispatcher) : WasmBase(base_wasm_handle, [&base_wasm_handle]() { - return createWasmVm(absl::StrCat("envoy.wasm.runtime.", - base_wasm_handle->wasm()->wasm_vm()->runtime())); + return createWasmVm(absl::StrCat( + "envoy.wasm.runtime.", + toAbslStringView(base_wasm_handle->wasm()->wasm_vm()->runtime()))); }), scope_(getWasm(base_wasm_handle)->scope_), cluster_manager_(getWasm(base_wasm_handle)->clusterManager()), dispatcher_(dispatcher), @@ -116,7 +116,7 @@ Wasm::Wasm(WasmHandleSharedPtr base_wasm_handle, Event::Dispatcher& dispatcher) ENVOY_LOG(debug, "Thread-Local Wasm created {} now active", active_wasms); } -void Wasm::error(absl::string_view message) { ENVOY_LOG(error, "Wasm VM failed {}", message); } +void Wasm::error(std::string_view message) { ENVOY_LOG(error, "Wasm VM failed {}", message); } void Wasm::setTimerPeriod(uint32_t context_id, std::chrono::milliseconds new_period) { auto& period = timer_period_[context_id]; @@ -187,7 +187,8 @@ Word resolve_dns(void* raw_context, Word dns_address_ptr, Word dns_address_size, root_context->onResolveDns(token, status, std::move(response)); }; if (!context->wasm()->dnsResolver()) { - context->wasm()->dnsResolver() = context->wasm()->dispatcher().createDnsResolver({}, false); + context->wasm()->dnsResolver() = context->wasm()->dispatcher().createDnsResolver( + {}, envoy::config::core::v3::DnsResolverOptions()); } context->wasm()->dnsResolver()->resolve(std::string(address.value()), Network::DnsLookupFamily::Auto, callback); @@ -387,8 +388,9 @@ bool createWasm(const PluginSharedPtr& plugin, const Stats::ScopeSharedPtr& scop auto config = plugin->wasmConfig(); proxy_wasm::WasmHandleFactory proxy_wasm_factory = [&config, scope, &cluster_manager, &dispatcher, &lifecycle_notifier, - wasm_factory](absl::string_view vm_key) -> WasmHandleBaseSharedPtr { - return wasm_factory(config, scope, cluster_manager, dispatcher, lifecycle_notifier, vm_key); + wasm_factory](std::string_view vm_key) -> WasmHandleBaseSharedPtr { + return wasm_factory(config, scope, cluster_manager, dispatcher, lifecycle_notifier, + toAbslStringView(vm_key)); }; auto wasm = proxy_wasm::createWasm( vm_key, code, plugin, proxy_wasm_factory, diff --git a/source/extensions/common/wasm/wasm.h b/source/extensions/common/wasm/wasm.h index a44da29e56492..b696268ae5b75 100644 --- a/source/extensions/common/wasm/wasm.h +++ b/source/extensions/common/wasm/wasm.h @@ -14,16 +14,15 @@ #include "envoy/thread_local/thread_local_object.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/config/datasource.h" -#include "common/stats/symbol_table_impl.h" -#include "common/version/version.h" - -#include "extensions/common/wasm/context.h" -#include "extensions/common/wasm/plugin.h" -#include "extensions/common/wasm/wasm_extension.h" -#include "extensions/common/wasm/wasm_vm.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/config/datasource.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/version/version.h" +#include "source/extensions/common/wasm/context.h" +#include "source/extensions/common/wasm/plugin.h" +#include "source/extensions/common/wasm/wasm_extension.h" +#include "source/extensions/common/wasm/wasm_vm.h" #include "include/proxy-wasm/exports.h" #include "include/proxy-wasm/wasm.h" @@ -62,7 +61,7 @@ class Wasm : public WasmBase, Logger::Loggable { Network::DnsResolverSharedPtr& dnsResolver() { return dns_resolver_; } // WasmBase - void error(absl::string_view message) override; + void error(std::string_view message) override; proxy_wasm::CallOnThreadFunction callOnThreadFunction() override; ContextBase* createContext(const std::shared_ptr& plugin) override; ContextBase* createRootContext(const std::shared_ptr& plugin) override; diff --git a/source/extensions/common/wasm/wasm_extension.cc b/source/extensions/common/wasm/wasm_extension.cc index 44b3b0776cd4d..376c7cd3cb59c 100644 --- a/source/extensions/common/wasm/wasm_extension.cc +++ b/source/extensions/common/wasm/wasm_extension.cc @@ -1,8 +1,8 @@ -#include "extensions/common/wasm/wasm_extension.h" +#include "source/extensions/common/wasm/wasm_extension.h" -#include "extensions/common/wasm/context.h" -#include "extensions/common/wasm/wasm.h" -#include "extensions/common/wasm/wasm_vm.h" +#include "source/extensions/common/wasm/context.h" +#include "source/extensions/common/wasm/wasm.h" +#include "source/extensions/common/wasm/wasm_vm.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/wasm/wasm_extension.h b/source/extensions/common/wasm/wasm_extension.h index 706eb4f78c029..d365fec05246f 100644 --- a/source/extensions/common/wasm/wasm_extension.h +++ b/source/extensions/common/wasm/wasm_extension.h @@ -7,11 +7,10 @@ #include "envoy/stats/stats.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/logger.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/common/wasm/context.h" -#include "extensions/common/wasm/plugin.h" +#include "source/common/common/logger.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/common/wasm/context.h" +#include "source/extensions/common/wasm/plugin.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/common/wasm/wasm_vm.cc b/source/extensions/common/wasm/wasm_vm.cc index ca6538de5cf8b..51e1e3af52ae7 100644 --- a/source/extensions/common/wasm/wasm_vm.cc +++ b/source/extensions/common/wasm/wasm_vm.cc @@ -1,12 +1,12 @@ -#include "extensions/common/wasm/wasm_vm.h" +#include "source/extensions/common/wasm/wasm_vm.h" #include #include -#include "extensions/common/wasm/context.h" -#include "extensions/common/wasm/ext/envoy_null_vm_wasm_api.h" -#include "extensions/common/wasm/wasm_extension.h" -#include "extensions/common/wasm/wasm_runtime_factory.h" +#include "source/extensions/common/wasm/context.h" +#include "source/extensions/common/wasm/ext/envoy_null_vm_wasm_api.h" +#include "source/extensions/common/wasm/wasm_extension.h" +#include "source/extensions/common/wasm/wasm_runtime_factory.h" #include "include/proxy-wasm/null_plugin.h" @@ -35,10 +35,10 @@ proxy_wasm::LogLevel EnvoyWasmVmIntegration::getLogLevel() { } } -void EnvoyWasmVmIntegration::error(absl::string_view message) { ENVOY_LOG(error, message); } -void EnvoyWasmVmIntegration::trace(absl::string_view message) { ENVOY_LOG(trace, message); } +void EnvoyWasmVmIntegration::error(std::string_view message) { ENVOY_LOG(error, message); } +void EnvoyWasmVmIntegration::trace(std::string_view message) { ENVOY_LOG(trace, message); } -bool EnvoyWasmVmIntegration::getNullVmFunction(absl::string_view function_name, bool returns_word, +bool EnvoyWasmVmIntegration::getNullVmFunction(std::string_view function_name, bool returns_word, int number_of_arguments, proxy_wasm::NullPlugin* plugin, void* ptr_to_function_return) { diff --git a/source/extensions/common/wasm/wasm_vm.h b/source/extensions/common/wasm/wasm_vm.h index 668f8a60f36b2..a4a6a1f1be03d 100644 --- a/source/extensions/common/wasm/wasm_vm.h +++ b/source/extensions/common/wasm/wasm_vm.h @@ -6,7 +6,7 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "absl/strings/str_cat.h" #include "include/proxy-wasm/wasm_vm.h" @@ -23,12 +23,11 @@ class EnvoyWasmVmIntegration : public proxy_wasm::WasmVmIntegration, public: // proxy_wasm::WasmVmIntegration proxy_wasm::WasmVmIntegration* clone() override { return new EnvoyWasmVmIntegration(); } - bool getNullVmFunction(absl::string_view function_name, bool returns_word, - int number_of_arguments, proxy_wasm::NullPlugin* plugin, - void* ptr_to_function_return) override; + bool getNullVmFunction(std::string_view function_name, bool returns_word, int number_of_arguments, + proxy_wasm::NullPlugin* plugin, void* ptr_to_function_return) override; proxy_wasm::LogLevel getLogLevel() override; - void error(absl::string_view message) override; - void trace(absl::string_view message) override; + void error(std::string_view message) override; + void trace(std::string_view message) override; }; // Exceptions for issues with the WebAssembly code. diff --git a/source/extensions/compression/brotli/common/base.cc b/source/extensions/compression/brotli/common/base.cc index 12a9a944c8fdb..fd364124962c9 100644 --- a/source/extensions/compression/brotli/common/base.cc +++ b/source/extensions/compression/brotli/common/base.cc @@ -1,4 +1,4 @@ -#include "extensions/compression/brotli/common/base.h" +#include "source/extensions/compression/brotli/common/base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/compression/brotli/compressor/BUILD b/source/extensions/compression/brotli/compressor/BUILD index d190709060059..c8e6e3a8a424b 100644 --- a/source/extensions/compression/brotli/compressor/BUILD +++ b/source/extensions/compression/brotli/compressor/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( hdrs = ["brotli_compressor_impl.h"], external_deps = ["brotlienc"], deps = [ - "//include/envoy/compression/compressor:compressor_interface", + "//envoy/compression/compressor:compressor_interface", "//source/common/buffer:buffer_lib", "//source/extensions/compression/brotli/common:brotli_base_lib", ], diff --git a/source/extensions/compression/brotli/compressor/brotli_compressor_impl.cc b/source/extensions/compression/brotli/compressor/brotli_compressor_impl.cc index 4b4366fbe3aff..94b389cbefb64 100644 --- a/source/extensions/compression/brotli/compressor/brotli_compressor_impl.cc +++ b/source/extensions/compression/brotli/compressor/brotli_compressor_impl.cc @@ -1,6 +1,6 @@ -#include "extensions/compression/brotli/compressor/brotli_compressor_impl.h" +#include "source/extensions/compression/brotli/compressor/brotli_compressor_impl.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/compression/brotli/compressor/brotli_compressor_impl.h b/source/extensions/compression/brotli/compressor/brotli_compressor_impl.h index ff153e81b6ad7..a30603865261e 100644 --- a/source/extensions/compression/brotli/compressor/brotli_compressor_impl.h +++ b/source/extensions/compression/brotli/compressor/brotli_compressor_impl.h @@ -2,7 +2,7 @@ #include "envoy/compression/compressor/compressor.h" -#include "extensions/compression/brotli/common/base.h" +#include "source/extensions/compression/brotli/common/base.h" #include "brotli/encode.h" diff --git a/source/extensions/compression/brotli/compressor/config.cc b/source/extensions/compression/brotli/compressor/config.cc index 4ca5f639f1a0d..0f5559aa5c6f7 100644 --- a/source/extensions/compression/brotli/compressor/config.cc +++ b/source/extensions/compression/brotli/compressor/config.cc @@ -1,4 +1,4 @@ -#include "extensions/compression/brotli/compressor/config.h" +#include "source/extensions/compression/brotli/compressor/config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/compression/brotli/compressor/config.h b/source/extensions/compression/brotli/compressor/config.h index 7046676421337..9cd3d8bc869e3 100644 --- a/source/extensions/compression/brotli/compressor/config.h +++ b/source/extensions/compression/brotli/compressor/config.h @@ -4,10 +4,9 @@ #include "envoy/extensions/compression/brotli/compressor/v3/brotli.pb.h" #include "envoy/extensions/compression/brotli/compressor/v3/brotli.pb.validate.h" -#include "common/http/headers.h" - -#include "extensions/compression/brotli/compressor/brotli_compressor_impl.h" -#include "extensions/compression/common/compressor/factory_base.h" +#include "source/common/http/headers.h" +#include "source/extensions/compression/brotli/compressor/brotli_compressor_impl.h" +#include "source/extensions/compression/common/compressor/factory_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/compression/brotli/decompressor/BUILD b/source/extensions/compression/brotli/decompressor/BUILD index 22ae257a84ab9..252eb0e072ac0 100644 --- a/source/extensions/compression/brotli/decompressor/BUILD +++ b/source/extensions/compression/brotli/decompressor/BUILD @@ -15,9 +15,9 @@ envoy_cc_library( hdrs = ["brotli_decompressor_impl.h"], external_deps = ["brotlidec"], deps = [ - "//include/envoy/compression/decompressor:decompressor_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/compression/decompressor:decompressor_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/buffer:buffer_lib", "//source/extensions/compression/brotli/common:brotli_base_lib", ], diff --git a/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.cc b/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.cc index 634c832b80332..adc2dbb9c731b 100644 --- a/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.cc +++ b/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/compression/brotli/decompressor/brotli_decompressor_impl.h" +#include "source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h" #include diff --git a/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h b/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h index 26472903410f2..f55f6a7c545ac 100644 --- a/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h +++ b/source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h @@ -4,7 +4,7 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "extensions/compression/brotli/common/base.h" +#include "source/extensions/compression/brotli/common/base.h" #include "brotli/decode.h" diff --git a/source/extensions/compression/brotli/decompressor/config.cc b/source/extensions/compression/brotli/decompressor/config.cc index 63ae34cd2f994..f8b21e1a7a106 100644 --- a/source/extensions/compression/brotli/decompressor/config.cc +++ b/source/extensions/compression/brotli/decompressor/config.cc @@ -1,4 +1,4 @@ -#include "extensions/compression/brotli/decompressor/config.h" +#include "source/extensions/compression/brotli/decompressor/config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/compression/brotli/decompressor/config.h b/source/extensions/compression/brotli/decompressor/config.h index 111e9b5ebe77e..632a11d91cde9 100644 --- a/source/extensions/compression/brotli/decompressor/config.h +++ b/source/extensions/compression/brotli/decompressor/config.h @@ -4,10 +4,9 @@ #include "envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.h" #include "envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.validate.h" -#include "common/http/headers.h" - -#include "extensions/compression/brotli/decompressor/brotli_decompressor_impl.h" -#include "extensions/compression/common/decompressor/factory_base.h" +#include "source/common/http/headers.h" +#include "source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h" +#include "source/extensions/compression/common/decompressor/factory_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/compression/common/compressor/BUILD b/source/extensions/compression/common/compressor/BUILD index db3d5c88ae16f..3756d2ae341f1 100644 --- a/source/extensions/compression/common/compressor/BUILD +++ b/source/extensions/compression/common/compressor/BUILD @@ -12,8 +12,8 @@ envoy_cc_library( name = "compressor_factory_base_lib", hdrs = ["factory_base.h"], deps = [ - "//include/envoy/compression/compressor:compressor_config_interface", - "//include/envoy/compression/compressor:compressor_factory_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/compression/compressor:compressor_config_interface", + "//envoy/compression/compressor:compressor_factory_interface", + "//envoy/server:filter_config_interface", ], ) diff --git a/source/extensions/compression/common/decompressor/BUILD b/source/extensions/compression/common/decompressor/BUILD index 0d69c90a8acdc..da1d737174d47 100644 --- a/source/extensions/compression/common/decompressor/BUILD +++ b/source/extensions/compression/common/decompressor/BUILD @@ -12,6 +12,6 @@ envoy_cc_library( name = "decompressor_factory_base_lib", hdrs = ["factory_base.h"], deps = [ - "//include/envoy/compression/decompressor:decompressor_config_interface", + "//envoy/compression/decompressor:decompressor_config_interface", ], ) diff --git a/source/extensions/compression/gzip/common/base.cc b/source/extensions/compression/gzip/common/base.cc index b3843c1aec1ff..0e956c1826067 100644 --- a/source/extensions/compression/gzip/common/base.cc +++ b/source/extensions/compression/gzip/common/base.cc @@ -1,4 +1,4 @@ -#include "extensions/compression/gzip/common/base.h" +#include "source/extensions/compression/gzip/common/base.h" namespace Envoy { namespace Zlib { diff --git a/source/extensions/compression/gzip/compressor/BUILD b/source/extensions/compression/gzip/compressor/BUILD index 1274b4d8e6ea7..672f5cfe500a6 100644 --- a/source/extensions/compression/gzip/compressor/BUILD +++ b/source/extensions/compression/gzip/compressor/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( hdrs = ["zlib_compressor_impl.h"], external_deps = ["zlib"], deps = [ - "//include/envoy/compression/compressor:compressor_interface", + "//envoy/compression/compressor:compressor_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/extensions/compression/gzip/common:zlib_base_lib", diff --git a/source/extensions/compression/gzip/compressor/config.cc b/source/extensions/compression/gzip/compressor/config.cc index 0971a9a905864..4b4b07251709b 100644 --- a/source/extensions/compression/gzip/compressor/config.cc +++ b/source/extensions/compression/gzip/compressor/config.cc @@ -1,4 +1,4 @@ -#include "extensions/compression/gzip/compressor/config.h" +#include "source/extensions/compression/gzip/compressor/config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/compression/gzip/compressor/config.h b/source/extensions/compression/gzip/compressor/config.h index 2fcee31020b30..cb45ac8546386 100644 --- a/source/extensions/compression/gzip/compressor/config.h +++ b/source/extensions/compression/gzip/compressor/config.h @@ -4,11 +4,10 @@ #include "envoy/extensions/compression/gzip/compressor/v3/gzip.pb.h" #include "envoy/extensions/compression/gzip/compressor/v3/gzip.pb.validate.h" -#include "common/http/headers.h" - -#include "extensions/compression/common/compressor/factory_base.h" -#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/http/headers.h" +#include "source/extensions/compression/common/compressor/factory_base.h" +#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/compression/gzip/compressor/zlib_compressor_impl.cc b/source/extensions/compression/gzip/compressor/zlib_compressor_impl.cc index 432c36e970150..9cde79fadacf9 100644 --- a/source/extensions/compression/gzip/compressor/zlib_compressor_impl.cc +++ b/source/extensions/compression/gzip/compressor/zlib_compressor_impl.cc @@ -1,10 +1,10 @@ -#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h" +#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h" #include #include "envoy/common/exception.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/container/fixed_array.h" diff --git a/source/extensions/compression/gzip/compressor/zlib_compressor_impl.h b/source/extensions/compression/gzip/compressor/zlib_compressor_impl.h index deddf3aac37a5..0bb86a46ec912 100644 --- a/source/extensions/compression/gzip/compressor/zlib_compressor_impl.h +++ b/source/extensions/compression/gzip/compressor/zlib_compressor_impl.h @@ -2,7 +2,7 @@ #include "envoy/compression/compressor/compressor.h" -#include "extensions/compression/gzip/common/base.h" +#include "source/extensions/compression/gzip/common/base.h" #include "zlib.h" diff --git a/source/extensions/compression/gzip/decompressor/BUILD b/source/extensions/compression/gzip/decompressor/BUILD index 541aa8bf8df96..13939fdcbf2c9 100644 --- a/source/extensions/compression/gzip/decompressor/BUILD +++ b/source/extensions/compression/gzip/decompressor/BUILD @@ -15,9 +15,9 @@ envoy_cc_library( hdrs = ["zlib_decompressor_impl.h"], external_deps = ["zlib"], deps = [ - "//include/envoy/compression/decompressor:decompressor_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/compression/decompressor:decompressor_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", diff --git a/source/extensions/compression/gzip/decompressor/config.cc b/source/extensions/compression/gzip/decompressor/config.cc index 66ea8d0a6494f..d7b5dbbff0768 100644 --- a/source/extensions/compression/gzip/decompressor/config.cc +++ b/source/extensions/compression/gzip/decompressor/config.cc @@ -1,4 +1,4 @@ -#include "extensions/compression/gzip/decompressor/config.h" +#include "source/extensions/compression/gzip/decompressor/config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/compression/gzip/decompressor/config.h b/source/extensions/compression/gzip/decompressor/config.h index 34c9ca11bf57b..4394ae66a1cdf 100644 --- a/source/extensions/compression/gzip/decompressor/config.h +++ b/source/extensions/compression/gzip/decompressor/config.h @@ -4,10 +4,9 @@ #include "envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.h" #include "envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.validate.h" -#include "common/http/headers.h" - -#include "extensions/compression/common/decompressor/factory_base.h" -#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" +#include "source/common/http/headers.h" +#include "source/extensions/compression/common/decompressor/factory_base.h" +#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.cc b/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.cc index 9066af8f0426f..966730c238805 100644 --- a/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.cc +++ b/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" +#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" #include @@ -6,7 +6,7 @@ #include "envoy/common/exception.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/container/fixed_array.h" diff --git a/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h b/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h index ec20b8c8dbcaa..78bfb1147b38f 100644 --- a/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h +++ b/source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h @@ -4,9 +4,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" - -#include "extensions/compression/gzip/common/base.h" +#include "source/common/common/logger.h" +#include "source/extensions/compression/gzip/common/base.h" #include "zlib.h" diff --git a/source/extensions/filters/common/expr/BUILD b/source/extensions/filters/common/expr/BUILD index 70fe78aad022d..dc146b13b9a6c 100644 --- a/source/extensions/filters/common/expr/BUILD +++ b/source/extensions/filters/common/expr/BUILD @@ -50,7 +50,7 @@ envoy_cc_library( ], visibility = ["//visibility:public"], deps = [ - "//include/envoy/stream_info:filter_state_interface", + "//envoy/stream_info:filter_state_interface", "//source/common/protobuf", "//source/common/singleton:const_singleton", "@com_github_google_flatbuffers//:flatbuffers", diff --git a/source/extensions/filters/common/expr/cel_state.cc b/source/extensions/filters/common/expr/cel_state.cc index 72774378162f3..7a25144b80ede 100644 --- a/source/extensions/filters/common/expr/cel_state.cc +++ b/source/extensions/filters/common/expr/cel_state.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/common/expr/cel_state.h" +#include "source/extensions/filters/common/expr/cel_state.h" #include "eval/public/structs/cel_proto_wrapper.h" #include "flatbuffers/reflection.h" diff --git a/source/extensions/filters/common/expr/cel_state.h b/source/extensions/filters/common/expr/cel_state.h index 703a271a0860b..6c4659dcc53b9 100644 --- a/source/extensions/filters/common/expr/cel_state.h +++ b/source/extensions/filters/common/expr/cel_state.h @@ -4,8 +4,8 @@ #include "envoy/stream_info/filter_state.h" -#include "common/protobuf/protobuf.h" -#include "common/singleton/const_singleton.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/singleton/const_singleton.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/common/expr/context.cc b/source/extensions/filters/common/expr/context.cc index a0d6213ec4bba..66603460003c6 100644 --- a/source/extensions/filters/common/expr/context.cc +++ b/source/extensions/filters/common/expr/context.cc @@ -1,10 +1,9 @@ -#include "extensions/filters/common/expr/context.h" +#include "source/extensions/filters/common/expr/context.h" -#include "common/grpc/common.h" -#include "common/http/header_map_impl.h" -#include "common/http/utility.h" - -#include "extensions/filters/common/expr/cel_state.h" +#include "source/common/grpc/common.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/utility.h" +#include "source/extensions/filters/common/expr/cel_state.h" #include "absl/strings/numbers.h" #include "absl/time/time.h" diff --git a/source/extensions/filters/common/expr/context.h b/source/extensions/filters/common/expr/context.h index ad6fcb9721609..2f3f2539c98c5 100644 --- a/source/extensions/filters/common/expr/context.h +++ b/source/extensions/filters/common/expr/context.h @@ -3,9 +3,9 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/stream_info/stream_info.h" -#include "common/grpc/status.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" +#include "source/common/grpc/status.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" #include "eval/public/cel_value.h" #include "eval/public/cel_value_producer.h" diff --git a/source/extensions/filters/common/expr/evaluator.cc b/source/extensions/filters/common/expr/evaluator.cc index 4a7ed3c9fc4cd..3c5e04dd5955d 100644 --- a/source/extensions/filters/common/expr/evaluator.cc +++ b/source/extensions/filters/common/expr/evaluator.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/common/expr/evaluator.h" +#include "source/extensions/filters/common/expr/evaluator.h" #include "envoy/common/exception.h" diff --git a/source/extensions/filters/common/expr/evaluator.h b/source/extensions/filters/common/expr/evaluator.h index 32ee98572f354..2e00d620f9e82 100644 --- a/source/extensions/filters/common/expr/evaluator.h +++ b/source/extensions/filters/common/expr/evaluator.h @@ -2,10 +2,9 @@ #include "envoy/stream_info/stream_info.h" -#include "common/http/headers.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/common/expr/context.h" +#include "source/common/http/headers.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/common/expr/context.h" #include "eval/public/cel_expression.h" #include "eval/public/cel_value.h" diff --git a/source/extensions/filters/common/ext_authz/BUILD b/source/extensions/filters/common/ext_authz/BUILD index fdd81e0081d89..fe5d536b437ff 100644 --- a/source/extensions/filters/common/ext_authz/BUILD +++ b/source/extensions/filters/common/ext_authz/BUILD @@ -12,8 +12,8 @@ envoy_cc_library( name = "ext_authz_interface", hdrs = ["ext_authz.h"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/http:codes_interface", + "//envoy/stream_info:stream_info_interface", "//source/common/http:headers_lib", "//source/common/tracing:http_tracer_lib", "@envoy_api//envoy/service/auth/v3:pkg_cc_proto", @@ -27,15 +27,15 @@ envoy_cc_library( deps = [ ":check_request_utils_lib", ":ext_authz_interface", - "//include/envoy/grpc:async_client_interface", - "//include/envoy/grpc:async_client_manager_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/http:protocol_interface", - "//include/envoy/network:address_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/grpc:async_client_interface", + "//envoy/grpc:async_client_manager_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", + "//envoy/http:protocol_interface", + "//envoy/network:address_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:assert_lib", "//source/common/grpc:async_client_lib", "//source/common/grpc:typed_async_client_lib", @@ -57,7 +57,7 @@ envoy_cc_library( deps = [ ":check_request_utils_lib", ":ext_authz_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:matchers_lib", "//source/common/common:minimal_logger_lib", "//source/common/http:async_client_lib", @@ -76,10 +76,10 @@ envoy_cc_library( hdrs = ["check_request_utils.h"], deps = [ ":ext_authz_interface", - "//include/envoy/grpc:async_client_interface", - "//include/envoy/grpc:async_client_manager_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/grpc:async_client_interface", + "//envoy/grpc:async_client_manager_interface", + "//envoy/http:filter_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/grpc:async_client_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/service/auth/v3:pkg_cc_proto", diff --git a/source/extensions/filters/common/ext_authz/check_request_utils.cc b/source/extensions/filters/common/ext_authz/check_request_utils.cc index e77dd8e0b32b1..f389dea8201d8 100644 --- a/source/extensions/filters/common/ext_authz/check_request_utils.cc +++ b/source/extensions/filters/common/ext_authz/check_request_utils.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/common/ext_authz/check_request_utils.h" +#include "source/extensions/filters/common/ext_authz/check_request_utils.h" #include #include @@ -10,18 +10,17 @@ #include "envoy/service/auth/v3/external_auth.pb.h" #include "envoy/ssl/connection.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/grpc/async_client_impl.h" -#include "common/http/codes.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/network/utility.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/common/ext_authz/ext_authz.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/grpc/async_client_impl.h" +#include "source/common/http/codes.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/common/ext_authz/ext_authz.h" #include "absl/strings/str_cat.h" diff --git a/source/extensions/filters/common/ext_authz/check_request_utils.h b/source/extensions/filters/common/ext_authz/check_request_utils.h index f0272d6741666..cb47e4e05737d 100644 --- a/source/extensions/filters/common/ext_authz/check_request_utils.h +++ b/source/extensions/filters/common/ext_authz/check_request_utils.h @@ -19,8 +19,8 @@ #include "envoy/tracing/http_tracer.h" #include "envoy/upstream/cluster_manager.h" -#include "common/http/async_client_impl.h" -#include "common/singleton/const_singleton.h" +#include "source/common/http/async_client_impl.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/ext_authz/ext_authz.h b/source/extensions/filters/common/ext_authz/ext_authz.h index 0d89e58031614..3d06846ed1123 100644 --- a/source/extensions/filters/common/ext_authz/ext_authz.h +++ b/source/extensions/filters/common/ext_authz/ext_authz.h @@ -11,8 +11,8 @@ #include "envoy/stream_info/stream_info.h" #include "envoy/tracing/http_tracer.h" -#include "common/http/headers.h" -#include "common/singleton/const_singleton.h" +#include "source/common/http/headers.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc index ee6027ca0ad9f..2902b954ff221 100644 --- a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc +++ b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.cc @@ -1,14 +1,14 @@ -#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/service/auth/v3/external_auth.pb.h" -#include "common/common/assert.h" -#include "common/grpc/async_client_impl.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/network/utility.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/assert.h" +#include "source/common/grpc/async_client_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h index e9e7edfb46357..4dc841eedd7a7 100644 --- a/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h +++ b/source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h @@ -20,10 +20,9 @@ #include "envoy/tracing/http_tracer.h" #include "envoy/upstream/cluster_manager.h" -#include "common/grpc/typed_async_client.h" - -#include "extensions/filters/common/ext_authz/check_request_utils.h" -#include "extensions/filters/common/ext_authz/ext_authz.h" +#include "source/common/grpc/typed_async_client.h" +#include "source/extensions/filters/common/ext_authz/check_request_utils.h" +#include "source/extensions/filters/common/ext_authz/ext_authz.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc index 11da8bc4f7dd8..f80b3022080a0 100644 --- a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc +++ b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.cc @@ -1,16 +1,16 @@ -#include "extensions/filters/common/ext_authz/ext_authz_http_impl.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_http_impl.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.h" #include "envoy/service/auth/v3/external_auth.pb.h" #include "envoy/type/matcher/v3/string.pb.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/matchers.h" -#include "common/http/async_client_impl.h" -#include "common/http/codes.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/matchers.h" +#include "source/common/http/async_client_impl.h" +#include "source/common/http/codes.h" +#include "source/common/runtime/runtime_features.h" #include "absl/strings/str_cat.h" diff --git a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h index f2e6e5726973d..ab13c2b494fa8 100644 --- a/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h +++ b/source/extensions/filters/common/ext_authz/ext_authz_http_impl.h @@ -7,11 +7,10 @@ #include "envoy/type/matcher/v3/string.pb.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/logger.h" -#include "common/common/matchers.h" -#include "common/router/header_parser.h" - -#include "extensions/filters/common/ext_authz/ext_authz.h" +#include "source/common/common/logger.h" +#include "source/common/common/matchers.h" +#include "source/common/router/header_parser.h" +#include "source/extensions/filters/common/ext_authz/ext_authz.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/fault/BUILD b/source/extensions/filters/common/fault/BUILD index bf05af548e013..a8a2e84e58e8a 100644 --- a/source/extensions/filters/common/fault/BUILD +++ b/source/extensions/filters/common/fault/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( srcs = ["fault_config.cc"], hdrs = ["fault_config.h"], deps = [ - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "//source/common/http:codes_lib", "//source/common/http:headers_lib", "//source/common/protobuf:utility_lib", diff --git a/source/extensions/filters/common/fault/fault_config.cc b/source/extensions/filters/common/fault/fault_config.cc index db7f6028152cf..2f263e9f9346a 100644 --- a/source/extensions/filters/common/fault/fault_config.cc +++ b/source/extensions/filters/common/fault/fault_config.cc @@ -1,9 +1,9 @@ -#include "extensions/filters/common/fault/fault_config.h" +#include "source/extensions/filters/common/fault/fault_config.h" #include "envoy/extensions/filters/common/fault/v3/fault.pb.h" #include "envoy/extensions/filters/http/fault/v3/fault.pb.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/fault/fault_config.h b/source/extensions/filters/common/fault/fault_config.h index eca8c7918aee6..486b7ac0d8fd4 100644 --- a/source/extensions/filters/common/fault/fault_config.h +++ b/source/extensions/filters/common/fault/fault_config.h @@ -6,9 +6,9 @@ #include "envoy/http/header_map.h" #include "envoy/type/v3/percent.pb.h" -#include "common/http/codes.h" -#include "common/http/headers.h" -#include "common/singleton/const_singleton.h" +#include "source/common/http/codes.h" +#include "source/common/http/headers.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/local_ratelimit/BUILD b/source/extensions/filters/common/local_ratelimit/BUILD index 0234c335c3e68..2e6af5b6daccc 100644 --- a/source/extensions/filters/common/local_ratelimit/BUILD +++ b/source/extensions/filters/common/local_ratelimit/BUILD @@ -13,9 +13,9 @@ envoy_cc_library( srcs = ["local_ratelimit_impl.cc"], hdrs = ["local_ratelimit_impl.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/ratelimit:ratelimit_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/ratelimit:ratelimit_interface", "//source/common/common:thread_synchronizer_lib", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/extensions/common/ratelimit/v3:pkg_cc_proto", diff --git a/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.cc b/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.cc index ab3100e503911..1acd3049456cd 100644 --- a/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.cc +++ b/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/common/local_ratelimit/local_ratelimit_impl.h" +#include "source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h b/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h index 2c66a1e0f9150..ab8f4e3a5ea51 100644 --- a/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h +++ b/source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h @@ -7,8 +7,8 @@ #include "envoy/extensions/common/ratelimit/v3/ratelimit.pb.h" #include "envoy/ratelimit/ratelimit.h" -#include "common/common/thread_synchronizer.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/thread_synchronizer.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/lua/BUILD b/source/extensions/filters/common/lua/BUILD index 78894e43b475f..ede969dfc1d22 100644 --- a/source/extensions/filters/common/lua/BUILD +++ b/source/extensions/filters/common/lua/BUILD @@ -27,7 +27,7 @@ envoy_cc_library( srcs = ["lua.cc"], hdrs = ["lua.h"], deps = [ - "//include/envoy/thread_local:thread_local_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/common:assert_lib", "//source/common/common:lock_guard_lib", "//source/common/common:thread_lib", @@ -45,7 +45,7 @@ envoy_cc_library( hdrs = ["wrappers.h"], deps = [ ":lua_lib", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/common:hex_lib", "//source/common/protobuf", ], diff --git a/source/extensions/filters/common/lua/lua.cc b/source/extensions/filters/common/lua/lua.cc index e5daf32216398..d399510368bd3 100644 --- a/source/extensions/filters/common/lua/lua.cc +++ b/source/extensions/filters/common/lua/lua.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/common/lua/lua.h" +#include "source/extensions/filters/common/lua/lua.h" #include #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/lock_guard.h" -#include "common/common/thread.h" +#include "source/common/common/assert.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/thread.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/lua/lua.h b/source/extensions/filters/common/lua/lua.h index d911316eb82b8..54bdcabe33bc5 100644 --- a/source/extensions/filters/common/lua/lua.h +++ b/source/extensions/filters/common/lua/lua.h @@ -7,9 +7,9 @@ #include "envoy/common/exception.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/assert.h" -#include "common/common/c_smart_ptr.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/c_smart_ptr.h" +#include "source/common/common/logger.h" #include "lua.hpp" diff --git a/source/extensions/filters/common/lua/wrappers.cc b/source/extensions/filters/common/lua/wrappers.cc index 8c26d9e10bec9..cb148e18bcfe2 100644 --- a/source/extensions/filters/common/lua/wrappers.cc +++ b/source/extensions/filters/common/lua/wrappers.cc @@ -1,11 +1,11 @@ -#include "extensions/filters/common/lua/wrappers.h" +#include "source/extensions/filters/common/lua/wrappers.h" #include #include -#include "common/common/assert.h" -#include "common/common/hex.h" +#include "source/common/common/assert.h" +#include "source/common/common/hex.h" #include "absl/time/time.h" diff --git a/source/extensions/filters/common/lua/wrappers.h b/source/extensions/filters/common/lua/wrappers.h index 2b0f39970c746..344467d39ff2c 100644 --- a/source/extensions/filters/common/lua/wrappers.h +++ b/source/extensions/filters/common/lua/wrappers.h @@ -2,9 +2,8 @@ #include "envoy/buffer/buffer.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/common/lua/lua.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/common/lua/lua.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/original_src/BUILD b/source/extensions/filters/common/original_src/BUILD index 0c4b4832e2e35..a8422fdc3d335 100644 --- a/source/extensions/filters/common/original_src/BUILD +++ b/source/extensions/filters/common/original_src/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( srcs = ["original_src_socket_option.cc"], hdrs = ["original_src_socket_option.h"], deps = [ - "//include/envoy/network:listen_socket_interface", + "//envoy/network:listen_socket_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/network:address_lib", @@ -30,7 +30,7 @@ envoy_cc_library( hdrs = ["socket_option_factory.h"], deps = [ ":original_src_socket_option_lib", - "//include/envoy/network:listen_socket_interface", + "//envoy/network:listen_socket_interface", "//source/common/network:address_lib", "//source/common/network:socket_option_factory_lib", "//source/common/network:utility_lib", diff --git a/source/extensions/filters/common/original_src/original_src_socket_option.cc b/source/extensions/filters/common/original_src/original_src_socket_option.cc index 4bdbdd4ea7f8e..0942ffd113d8d 100644 --- a/source/extensions/filters/common/original_src/original_src_socket_option.cc +++ b/source/extensions/filters/common/original_src/original_src_socket_option.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/common/original_src/original_src_socket_option.h" +#include "source/extensions/filters/common/original_src/original_src_socket_option.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/original_src/socket_option_factory.cc b/source/extensions/filters/common/original_src/socket_option_factory.cc index cf84b9d26596c..47f429cce8ca0 100644 --- a/source/extensions/filters/common/original_src/socket_option_factory.cc +++ b/source/extensions/filters/common/original_src/socket_option_factory.cc @@ -1,9 +1,8 @@ -#include "extensions/filters/common/original_src/socket_option_factory.h" +#include "source/extensions/filters/common/original_src/socket_option_factory.h" -#include "common/network/socket_option_factory.h" -#include "common/network/utility.h" - -#include "extensions/filters/common/original_src/original_src_socket_option.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/common/original_src/original_src_socket_option.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/ratelimit/BUILD b/source/extensions/filters/common/ratelimit/BUILD index 4bf0b36b1e5de..0f4978d7025f2 100644 --- a/source/extensions/filters/common/ratelimit/BUILD +++ b/source/extensions/filters/common/ratelimit/BUILD @@ -14,11 +14,11 @@ envoy_cc_library( hdrs = ["ratelimit_impl.h"], deps = [ ":ratelimit_client_interface", - "//include/envoy/grpc:async_client_interface", - "//include/envoy/grpc:async_client_manager_interface", - "//include/envoy/ratelimit:ratelimit_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/grpc:async_client_interface", + "//envoy/grpc:async_client_manager_interface", + "//envoy/ratelimit:ratelimit_interface", + "//envoy/server:filter_config_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/grpc:typed_async_client_lib", @@ -35,9 +35,9 @@ envoy_cc_library( hdrs = ["ratelimit.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/ratelimit:ratelimit_interface", - "//include/envoy/singleton:manager_interface", - "//include/envoy/tracing:http_tracer_interface", + "//envoy/ratelimit:ratelimit_interface", + "//envoy/singleton:manager_interface", + "//envoy/tracing:http_tracer_interface", "//source/common/stats:symbol_table_lib", "@envoy_api//envoy/service/ratelimit/v3:pkg_cc_proto", ], diff --git a/source/extensions/filters/common/ratelimit/ratelimit_impl.cc b/source/extensions/filters/common/ratelimit/ratelimit_impl.cc index 055d2e8cdd55a..37378240d5c3b 100644 --- a/source/extensions/filters/common/ratelimit/ratelimit_impl.cc +++ b/source/extensions/filters/common/ratelimit/ratelimit_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/common/ratelimit/ratelimit_impl.h" +#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h" #include #include @@ -9,9 +9,9 @@ #include "envoy/extensions/common/ratelimit/v3/ratelimit.pb.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" +#include "source/common/common/assert.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/ratelimit/ratelimit_impl.h b/source/extensions/filters/common/ratelimit/ratelimit_impl.h index 4386102a21ca7..7ff0f1a7a8253 100644 --- a/source/extensions/filters/common/ratelimit/ratelimit_impl.h +++ b/source/extensions/filters/common/ratelimit/ratelimit_impl.h @@ -15,11 +15,10 @@ #include "envoy/tracing/http_tracer.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/logger.h" -#include "common/grpc/typed_async_client.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/filters/common/ratelimit/ratelimit.h" +#include "source/common/common/logger.h" +#include "source/common/grpc/typed_async_client.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/filters/common/ratelimit/ratelimit.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/ratelimit/stat_names.h b/source/extensions/filters/common/ratelimit/stat_names.h index 33dd13a188b34..45161fe43d44e 100644 --- a/source/extensions/filters/common/ratelimit/stat_names.h +++ b/source/extensions/filters/common/ratelimit/stat_names.h @@ -1,6 +1,6 @@ #pragma once -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/rbac/BUILD b/source/extensions/filters/common/rbac/BUILD index 14c649ca43406..5d8e3712c0e2a 100644 --- a/source/extensions/filters/common/rbac/BUILD +++ b/source/extensions/filters/common/rbac/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( hdrs = ["utility.h"], deps = [ ":engine_lib", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_macros", "//source/common/singleton:const_singleton", ], ) @@ -25,8 +25,8 @@ envoy_cc_library( hdrs = ["matchers.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/http:header_map_interface", - "//include/envoy/network:connection_interface", + "//envoy/http:header_map_interface", + "//envoy/network:connection_interface", "//source/common/common:assert_lib", "//source/common/common:matchers_lib", "//source/common/http:header_utility_lib", @@ -43,9 +43,9 @@ envoy_cc_library( name = "engine_interface", hdrs = ["engine.h"], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/network:connection_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", + "//envoy/network:connection_interface", ], ) diff --git a/source/extensions/filters/common/rbac/engine_impl.cc b/source/extensions/filters/common/rbac/engine_impl.cc index dc2a6ba79222a..dbac3dee1135a 100644 --- a/source/extensions/filters/common/rbac/engine_impl.cc +++ b/source/extensions/filters/common/rbac/engine_impl.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/common/rbac/engine_impl.h" +#include "source/extensions/filters/common/rbac/engine_impl.h" #include "envoy/config/rbac/v3/rbac.pb.h" -#include "common/http/header_map_impl.h" +#include "source/common/http/header_map_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/rbac/engine_impl.h b/source/extensions/filters/common/rbac/engine_impl.h index 0aacfb41f8e15..237d4fd79868f 100644 --- a/source/extensions/filters/common/rbac/engine_impl.h +++ b/source/extensions/filters/common/rbac/engine_impl.h @@ -2,8 +2,8 @@ #include "envoy/config/rbac/v3/rbac.pb.h" -#include "extensions/filters/common/rbac/engine.h" -#include "extensions/filters/common/rbac/matchers.h" +#include "source/extensions/filters/common/rbac/engine.h" +#include "source/extensions/filters/common/rbac/matchers.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/rbac/matchers.cc b/source/extensions/filters/common/rbac/matchers.cc index eac3c3d20576e..25d8e2de63b54 100644 --- a/source/extensions/filters/common/rbac/matchers.cc +++ b/source/extensions/filters/common/rbac/matchers.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/common/rbac/matchers.h" +#include "source/extensions/filters/common/rbac/matchers.h" #include "envoy/config/rbac/v3/rbac.pb.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/rbac/matchers.h b/source/extensions/filters/common/rbac/matchers.h index a73bcf3732665..472b4a2c9c17e 100644 --- a/source/extensions/filters/common/rbac/matchers.h +++ b/source/extensions/filters/common/rbac/matchers.h @@ -10,11 +10,10 @@ #include "envoy/type/matcher/v3/path.pb.h" #include "envoy/type/matcher/v3/string.pb.h" -#include "common/common/matchers.h" -#include "common/http/header_utility.h" -#include "common/network/cidr_range.h" - -#include "extensions/filters/common/expr/evaluator.h" +#include "source/common/common/matchers.h" +#include "source/common/http/header_utility.h" +#include "source/common/network/cidr_range.h" +#include "source/extensions/filters/common/expr/evaluator.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/common/rbac/utility.cc b/source/extensions/filters/common/rbac/utility.cc index 8273e9659c207..3e2697745cfa8 100644 --- a/source/extensions/filters/common/rbac/utility.cc +++ b/source/extensions/filters/common/rbac/utility.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/common/rbac/utility.h" +#include "source/extensions/filters/common/rbac/utility.h" #include diff --git a/source/extensions/filters/common/rbac/utility.h b/source/extensions/filters/common/rbac/utility.h index 91f8711f2210a..f4acc822a36fb 100644 --- a/source/extensions/filters/common/rbac/utility.h +++ b/source/extensions/filters/common/rbac/utility.h @@ -2,10 +2,9 @@ #include "envoy/stats/stats_macros.h" -#include "common/common/fmt.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/filters/common/rbac/engine_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/filters/common/rbac/engine_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/adaptive_concurrency/BUILD b/source/extensions/filters/http/adaptive_concurrency/BUILD index 8baef84564d7e..a3f7ad6748ea5 100644 --- a/source/extensions/filters/http/adaptive_concurrency/BUILD +++ b/source/extensions/filters/http/adaptive_concurrency/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( srcs = ["adaptive_concurrency_filter.cc"], hdrs = ["adaptive_concurrency_filter.h"], deps = [ - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/adaptive_concurrency/controller:controller_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", @@ -31,7 +31,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/adaptive_concurrency:adaptive_concurrency_filter_lib", "//source/extensions/filters/http/adaptive_concurrency/controller:controller_lib", diff --git a/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc b/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc index 1b2d7400f771b..d03da5915c84d 100644 --- a/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc +++ b/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h" +#include "source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h" #include #include @@ -7,11 +7,10 @@ #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.h" -#include "common/common/assert.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/adaptive_concurrency/controller/controller.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h b/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h index 7424e1d3bdbaa..4b426a732217f 100644 --- a/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h +++ b/source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h @@ -11,11 +11,10 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/cleanup.h" -#include "common/runtime/runtime_protos.h" - -#include "extensions/filters/http/adaptive_concurrency/controller/controller.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/common/cleanup.h" +#include "source/common/runtime/runtime_protos.h" +#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/adaptive_concurrency/config.cc b/source/extensions/filters/http/adaptive_concurrency/config.cc index 45783f034de11..5abc39bf6fd97 100644 --- a/source/extensions/filters/http/adaptive_concurrency/config.cc +++ b/source/extensions/filters/http/adaptive_concurrency/config.cc @@ -1,11 +1,11 @@ -#include "extensions/filters/http/adaptive_concurrency/config.h" +#include "source/extensions/filters/http/adaptive_concurrency/config.h" #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.h" #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h" -#include "extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h" +#include "source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h" +#include "source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/adaptive_concurrency/config.h b/source/extensions/filters/http/adaptive_concurrency/config.h index da9733579cf91..27fdd0ef87e47 100644 --- a/source/extensions/filters/http/adaptive_concurrency/config.h +++ b/source/extensions/filters/http/adaptive_concurrency/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.h" #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/adaptive_concurrency/controller/BUILD b/source/extensions/filters/http/adaptive_concurrency/controller/BUILD index 67e85c133f4d1..60cb03dd31d2a 100644 --- a/source/extensions/filters/http/adaptive_concurrency/controller/BUILD +++ b/source/extensions/filters/http/adaptive_concurrency/controller/BUILD @@ -23,7 +23,7 @@ envoy_cc_library( "libcircllhist", ], deps = [ - "//include/envoy/common:time_interface", + "//envoy/common:time_interface", "//source/common/common:thread_synchronizer_lib", "//source/common/event:dispatcher_lib", "//source/common/protobuf", diff --git a/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.cc b/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.cc index aa9bc226d74f4..c00112da2ede4 100644 --- a/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.cc +++ b/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h" +#include "source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h" #include #include @@ -9,11 +9,10 @@ #include "envoy/runtime/runtime.h" #include "envoy/stats/stats.h" -#include "common/common/cleanup.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/adaptive_concurrency/controller/controller.h" +#include "source/common/common/cleanup.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h" #include "absl/synchronization/mutex.h" diff --git a/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h b/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h index 0309aaa0c6eaa..1764f4aec6cb3 100644 --- a/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h +++ b/source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h @@ -10,9 +10,8 @@ #include "envoy/runtime/runtime.h" #include "envoy/stats/stats_macros.h" -#include "common/common/thread_synchronizer.h" - -#include "extensions/filters/http/adaptive_concurrency/controller/controller.h" +#include "source/common/common/thread_synchronizer.h" +#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h" #include "absl/base/thread_annotations.h" #include "absl/strings/numbers.h" diff --git a/source/extensions/filters/http/admission_control/BUILD b/source/extensions/filters/http/admission_control/BUILD index f7b60baf0ef51..c6cec4e9a52dc 100644 --- a/source/extensions/filters/http/admission_control/BUILD +++ b/source/extensions/filters/http/admission_control/BUILD @@ -23,9 +23,9 @@ envoy_cc_library( "thread_local_controller.h", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/thread_local:thread_local_object", + "//envoy/http:filter_interface", + "//envoy/runtime:runtime_interface", + "//envoy/thread_local:thread_local_object", "//source/common/common:cleanup_lib", "//source/common/http:codes_lib", "//source/common/runtime:runtime_lib", @@ -41,7 +41,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/common:enum_to_int", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/admission_control:admission_control_filter_lib", diff --git a/source/extensions/filters/http/admission_control/admission_control.cc b/source/extensions/filters/http/admission_control/admission_control.cc index 9329e10ab351a..3576dfb9099d5 100644 --- a/source/extensions/filters/http/admission_control/admission_control.cc +++ b/source/extensions/filters/http/admission_control/admission_control.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/admission_control/admission_control.h" +#include "source/extensions/filters/http/admission_control/admission_control.h" #include #include @@ -12,15 +12,14 @@ #include "envoy/runtime/runtime.h" #include "envoy/server/filter_config.h" -#include "common/common/cleanup.h" -#include "common/common/enum_to_int.h" -#include "common/grpc/common.h" -#include "common/http/codes.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/grpc/common.h" +#include "source/common/http/codes.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/admission_control/admission_control.h b/source/extensions/filters/http/admission_control/admission_control.h index 7b4e83de80c7f..7e6b0d159b876 100644 --- a/source/extensions/filters/http/admission_control/admission_control.h +++ b/source/extensions/filters/http/admission_control/admission_control.h @@ -14,16 +14,15 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/cleanup.h" -#include "common/common/logger.h" -#include "common/grpc/common.h" -#include "common/grpc/status.h" -#include "common/http/codes.h" -#include "common/runtime/runtime_protos.h" - -#include "extensions/filters/http/admission_control/evaluators/response_evaluator.h" -#include "extensions/filters/http/admission_control/thread_local_controller.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/logger.h" +#include "source/common/grpc/common.h" +#include "source/common/grpc/status.h" +#include "source/common/http/codes.h" +#include "source/common/runtime/runtime_protos.h" +#include "source/extensions/filters/http/admission_control/evaluators/response_evaluator.h" +#include "source/extensions/filters/http/admission_control/thread_local_controller.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/admission_control/config.cc b/source/extensions/filters/http/admission_control/config.cc index 27b7f9f1eb253..e28e0445b6435 100644 --- a/source/extensions/filters/http/admission_control/config.cc +++ b/source/extensions/filters/http/admission_control/config.cc @@ -1,15 +1,14 @@ -#include "extensions/filters/http/admission_control/config.h" +#include "source/extensions/filters/http/admission_control/config.h" #include "envoy/common/exception.h" #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h" #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/common/enum_to_int.h" - -#include "extensions/filters/http/admission_control/admission_control.h" -#include "extensions/filters/http/admission_control/evaluators/response_evaluator.h" -#include "extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h" +#include "source/common/common/enum_to_int.h" +#include "source/extensions/filters/http/admission_control/admission_control.h" +#include "source/extensions/filters/http/admission_control/evaluators/response_evaluator.h" +#include "source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/admission_control/config.h b/source/extensions/filters/http/admission_control/config.h index 8abe84eafefcb..e8ca3c6e8322b 100644 --- a/source/extensions/filters/http/admission_control/config.h +++ b/source/extensions/filters/http/admission_control/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h" #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/admission_control/evaluators/BUILD b/source/extensions/filters/http/admission_control/evaluators/BUILD index c5c72ee2db5ca..cddd0f2f0a43f 100644 --- a/source/extensions/filters/http/admission_control/evaluators/BUILD +++ b/source/extensions/filters/http/admission_control/evaluators/BUILD @@ -19,7 +19,7 @@ envoy_cc_library( ], visibility = ["//visibility:public"], deps = [ - "//include/envoy/grpc:status", + "//envoy/grpc:status", "//source/common/common:enum_to_int", "@envoy_api//envoy/extensions/filters/http/admission_control/v3alpha:pkg_cc_proto", ], diff --git a/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.cc b/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.cc index 6771bfba9a7b2..5a7ae7fc915c7 100644 --- a/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.cc +++ b/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h" +#include "source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h" #include #include "envoy/common/exception.h" #include "envoy/grpc/status.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h b/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h index 511d54408f42e..551975ead8818 100644 --- a/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h +++ b/source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h @@ -5,7 +5,7 @@ #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h" #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h" -#include "extensions/filters/http/admission_control/evaluators/response_evaluator.h" +#include "source/extensions/filters/http/admission_control/evaluators/response_evaluator.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/admission_control/thread_local_controller.cc b/source/extensions/filters/http/admission_control/thread_local_controller.cc index 30f0aac40061c..e98ee62433cbb 100644 --- a/source/extensions/filters/http/admission_control/thread_local_controller.cc +++ b/source/extensions/filters/http/admission_control/thread_local_controller.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/admission_control/thread_local_controller.h" +#include "source/extensions/filters/http/admission_control/thread_local_controller.h" #include diff --git a/source/extensions/filters/http/aws_lambda/BUILD b/source/extensions/filters/http/aws_lambda/BUILD index 43544b5eccee7..11026fd340101 100644 --- a/source/extensions/filters/http/aws_lambda/BUILD +++ b/source/extensions/filters/http/aws_lambda/BUILD @@ -24,7 +24,7 @@ envoy_cc_library( hdrs = ["aws_lambda_filter.h"], deps = [ ":request_response_cc_proto", - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/common/common:base64_lib", "//source/extensions/common/aws:credentials_provider_impl_lib", "//source/extensions/common/aws:signer_impl_lib", @@ -39,7 +39,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":aws_lambda_filter_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "@envoy_api//envoy/extensions/filters/http/aws_lambda/v3:pkg_cc_proto", diff --git a/source/extensions/filters/http/aws_lambda/aws_lambda_filter.cc b/source/extensions/filters/http/aws_lambda/aws_lambda_filter.cc index e1597a36ae95f..01655e1aa41e3 100644 --- a/source/extensions/filters/http/aws_lambda/aws_lambda_filter.cc +++ b/source/extensions/filters/http/aws_lambda/aws_lambda_filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/aws_lambda/aws_lambda_filter.h" +#include "source/extensions/filters/http/aws_lambda/aws_lambda_filter.h" #include #include @@ -8,20 +8,18 @@ #include "envoy/http/header_map.h" #include "envoy/upstream/upstream.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/base64.h" -#include "common/common/fmt.h" -#include "common/common/hex.h" -#include "common/crypto/utility.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" -#include "common/singleton/const_singleton.h" - +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/base64.h" +#include "source/common/common/fmt.h" +#include "source/common/common/hex.h" +#include "source/common/crypto/utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/singleton/const_singleton.h" #include "source/extensions/filters/http/aws_lambda/request_response.pb.validate.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/well_known_names.h" #include "absl/strings/numbers.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/aws_lambda/aws_lambda_filter.h b/source/extensions/filters/http/aws_lambda/aws_lambda_filter.h index 82bfdaf85cf2f..be3d03d3a24c3 100644 --- a/source/extensions/filters/http/aws_lambda/aws_lambda_filter.h +++ b/source/extensions/filters/http/aws_lambda/aws_lambda_filter.h @@ -5,10 +5,9 @@ #include "envoy/http/filter.h" #include "envoy/stats/scope.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/common/aws/signer.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/common/aws/signer.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/aws_lambda/config.cc b/source/extensions/filters/http/aws_lambda/config.cc index c784020da619d..a538f07847ddd 100644 --- a/source/extensions/filters/http/aws_lambda/config.cc +++ b/source/extensions/filters/http/aws_lambda/config.cc @@ -1,16 +1,15 @@ -#include "extensions/filters/http/aws_lambda/config.h" +#include "source/extensions/filters/http/aws_lambda/config.h" #include "envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/fmt.h" - -#include "extensions/common/aws/credentials_provider_impl.h" -#include "extensions/common/aws/signer_impl.h" -#include "extensions/common/aws/utility.h" -#include "extensions/filters/http/aws_lambda/aws_lambda_filter.h" +#include "source/common/common/fmt.h" +#include "source/extensions/common/aws/credentials_provider_impl.h" +#include "source/extensions/common/aws/signer_impl.h" +#include "source/extensions/common/aws/utility.h" +#include "source/extensions/filters/http/aws_lambda/aws_lambda_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/aws_lambda/config.h b/source/extensions/filters/http/aws_lambda/config.h index fbdfb26ff9e71..50705ea95270d 100644 --- a/source/extensions/filters/http/aws_lambda/config.h +++ b/source/extensions/filters/http/aws_lambda/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.h" #include "envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/aws_request_signing/BUILD b/source/extensions/filters/http/aws_request_signing/BUILD index b1bcf820a85e5..5093d9d759837 100644 --- a/source/extensions/filters/http/aws_request_signing/BUILD +++ b/source/extensions/filters/http/aws_request_signing/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( srcs = ["aws_request_signing_filter.cc"], hdrs = ["aws_request_signing_filter.h"], deps = [ - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/extensions/common/aws:credentials_provider_impl_lib", "//source/extensions/common/aws:signer_impl_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", @@ -31,7 +31,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":aws_request_signing_filter_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/common/aws:credentials_provider_impl_lib", "//source/extensions/common/aws:signer_impl_lib", "//source/extensions/filters/http:well_known_names", diff --git a/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.cc b/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.cc index 4a9fb083345dd..94b1c6add1a68 100644 --- a/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.cc +++ b/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.cc @@ -1,9 +1,9 @@ -#include "extensions/filters/http/aws_request_signing/aws_request_signing_filter.h" +#include "source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h" #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.h" -#include "common/common/hex.h" -#include "common/crypto/utility.h" +#include "source/common/common/hex.h" +#include "source/common/crypto/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h b/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h index 2903ec4898530..2ae73277d995d 100644 --- a/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h +++ b/source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h @@ -5,8 +5,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "extensions/common/aws/signer.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/common/aws/signer.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/aws_request_signing/config.cc b/source/extensions/filters/http/aws_request_signing/config.cc index 11396f39e0523..02408ec90a091 100644 --- a/source/extensions/filters/http/aws_request_signing/config.cc +++ b/source/extensions/filters/http/aws_request_signing/config.cc @@ -1,13 +1,13 @@ -#include "extensions/filters/http/aws_request_signing/config.h" +#include "source/extensions/filters/http/aws_request_signing/config.h" #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.h" #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/common/aws/credentials_provider_impl.h" -#include "extensions/common/aws/signer_impl.h" -#include "extensions/common/aws/utility.h" -#include "extensions/filters/http/aws_request_signing/aws_request_signing_filter.h" +#include "source/extensions/common/aws/credentials_provider_impl.h" +#include "source/extensions/common/aws/signer_impl.h" +#include "source/extensions/common/aws/utility.h" +#include "source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/aws_request_signing/config.h b/source/extensions/filters/http/aws_request_signing/config.h index 21128e3d755a8..4dad8a603d64d 100644 --- a/source/extensions/filters/http/aws_request_signing/config.h +++ b/source/extensions/filters/http/aws_request_signing/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.h" #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/bandwidth_limit/BUILD b/source/extensions/filters/http/bandwidth_limit/BUILD index 723e3aa158f38..3f3b5e3f72735 100644 --- a/source/extensions/filters/http/bandwidth_limit/BUILD +++ b/source/extensions/filters/http/bandwidth_limit/BUILD @@ -17,9 +17,9 @@ envoy_cc_library( srcs = ["bandwidth_limit.cc"], hdrs = ["bandwidth_limit.h"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stats:stats_macros", + "//envoy/http:codes_interface", + "//envoy/server:filter_config_interface", + "//envoy/stats:stats_macros", "//source/common/common:shared_token_bucket_impl_lib", "//source/common/common:utility_lib", "//source/common/http:header_utility_lib", @@ -38,7 +38,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":bandwidth_limit_lib", - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/common/protobuf:utility_lib", "//source/extensions/filters/http/common:factory_base_lib", "@envoy_api//envoy/extensions/filters/http/bandwidth_limit/v3alpha:pkg_cc_proto", diff --git a/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.cc b/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.cc index 23735fe9b1664..6d831d6de8903 100644 --- a/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.cc +++ b/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/http/bandwidth_limit/bandwidth_limit.h" +#include "source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h" #include #include #include "envoy/http/codes.h" -#include "common/http/utility.h" -#include "common/stats/timespan_impl.h" +#include "source/common/http/utility.h" +#include "source/common/stats/timespan_impl.h" using envoy::extensions::filters::http::bandwidth_limit::v3alpha::BandwidthLimit; using Envoy::Extensions::HttpFilters::Common::StreamRateLimiter; diff --git a/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h b/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h index d3b44e75380af..f5bac46426425 100644 --- a/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h +++ b/source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h @@ -12,13 +12,12 @@ #include "envoy/stats/stats_macros.h" #include "envoy/stats/timespan.h" -#include "common/common/assert.h" -#include "common/common/shared_token_bucket_impl.h" -#include "common/http/header_map_impl.h" -#include "common/router/header_parser.h" -#include "common/runtime/runtime_protos.h" - -#include "extensions/filters/http/common/stream_rate_limiter.h" +#include "source/common/common/assert.h" +#include "source/common/common/shared_token_bucket_impl.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/router/header_parser.h" +#include "source/common/runtime/runtime_protos.h" +#include "source/extensions/filters/http/common/stream_rate_limiter.h" #include "absl/synchronization/mutex.h" diff --git a/source/extensions/filters/http/bandwidth_limit/config.cc b/source/extensions/filters/http/bandwidth_limit/config.cc index 2ed2118fea451..95b62c134175a 100644 --- a/source/extensions/filters/http/bandwidth_limit/config.cc +++ b/source/extensions/filters/http/bandwidth_limit/config.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/http/bandwidth_limit/config.h" +#include "source/extensions/filters/http/bandwidth_limit/config.h" #include #include "envoy/registry/registry.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/bandwidth_limit/bandwidth_limit.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/bandwidth_limit/config.h b/source/extensions/filters/http/bandwidth_limit/config.h index e9945bbf745d8..b29a3ac2320b2 100644 --- a/source/extensions/filters/http/bandwidth_limit/config.h +++ b/source/extensions/filters/http/bandwidth_limit/config.h @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/http/bandwidth_limit/v3alpha/bandwidth_limit.pb.h" #include "envoy/extensions/filters/http/bandwidth_limit/v3alpha/bandwidth_limit.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/common/factory_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/buffer/BUILD b/source/extensions/filters/http/buffer/BUILD index c691bc382862b..631163874cad9 100644 --- a/source/extensions/filters/http/buffer/BUILD +++ b/source/extensions/filters/http/buffer/BUILD @@ -17,9 +17,9 @@ envoy_cc_library( srcs = ["buffer_filter.cc"], hdrs = ["buffer_filter.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", + "//envoy/event:dispatcher_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:enum_to_int", @@ -40,7 +40,7 @@ envoy_cc_extension( # Legacy test use. TODO(#9953) clean up. visibility = ["//visibility:public"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/buffer:buffer_filter_lib", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/extensions/filters/http/buffer/buffer_filter.cc b/source/extensions/filters/http/buffer/buffer_filter.cc index 18cf208e71b50..978d0452930d5 100644 --- a/source/extensions/filters/http/buffer/buffer_filter.cc +++ b/source/extensions/filters/http/buffer/buffer_filter.cc @@ -1,18 +1,17 @@ -#include "extensions/filters/http/buffer/buffer_filter.h" +#include "source/extensions/filters/http/buffer/buffer_filter.h" #include "envoy/event/dispatcher.h" #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h" #include "envoy/http/codes.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/runtime/runtime_impl.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/buffer/buffer_filter.h b/source/extensions/filters/http/buffer/buffer_filter.h index bc0750374a648..c8296063c8c57 100644 --- a/source/extensions/filters/http/buffer/buffer_filter.h +++ b/source/extensions/filters/http/buffer/buffer_filter.h @@ -8,7 +8,7 @@ #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h" #include "envoy/http/filter.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/buffer/config.cc b/source/extensions/filters/http/buffer/config.cc index 23c18ed50c7d6..dcd9c6b9d7ddd 100644 --- a/source/extensions/filters/http/buffer/config.cc +++ b/source/extensions/filters/http/buffer/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/buffer/config.h" +#include "source/extensions/filters/http/buffer/config.h" #include #include @@ -8,7 +8,7 @@ #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/buffer/buffer_filter.h" +#include "source/extensions/filters/http/buffer/buffer_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/buffer/config.h b/source/extensions/filters/http/buffer/config.h index e31cd5dbf75b4..9464fae241d1a 100644 --- a/source/extensions/filters/http/buffer/config.h +++ b/source/extensions/filters/http/buffer/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h" #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cache/BUILD b/source/extensions/filters/http/cache/BUILD index bd205889fdfa1..6c3a0dd173e09 100644 --- a/source/extensions/filters/http/cache/BUILD +++ b/source/extensions/filters/http/cache/BUILD @@ -57,11 +57,11 @@ envoy_cc_library( ":cache_custom_headers", ":cache_headers_utils_lib", ":key_cc_proto", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/common:time_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/http:header_map_interface", + "//envoy/buffer:buffer_interface", + "//envoy/common:time_interface", + "//envoy/config:typed_config_interface", + "//envoy/http:codes_interface", + "//envoy/http:header_map_interface", "//source/common/common:assert_lib", "//source/common/http:header_utility_lib", "//source/common/http:headers_lib", @@ -77,8 +77,8 @@ envoy_cc_library( external_deps = ["abseil_optional"], deps = [ ":cache_custom_headers", - "//include/envoy/common:time_interface", - "//include/envoy/http:header_map_interface", + "//envoy/common:time_interface", + "//envoy/http:header_map_interface", "//source/common/common:matchers_lib", "//source/common/http:header_map_lib", "//source/common/http:header_utility_lib", diff --git a/source/extensions/filters/http/cache/cache_custom_headers.cc b/source/extensions/filters/http/cache/cache_custom_headers.cc index 119100fc9e9d6..507ae5c398700 100644 --- a/source/extensions/filters/http/cache/cache_custom_headers.cc +++ b/source/extensions/filters/http/cache/cache_custom_headers.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/cache/cache_custom_headers.h" +#include "source/extensions/filters/http/cache/cache_custom_headers.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cache/cache_custom_headers.h b/source/extensions/filters/http/cache/cache_custom_headers.h index 61a094b452570..dd5d2694fea37 100644 --- a/source/extensions/filters/http/cache/cache_custom_headers.h +++ b/source/extensions/filters/http/cache/cache_custom_headers.h @@ -2,7 +2,7 @@ #include "envoy/http/header_map.h" -#include "common/http/headers.h" +#include "source/common/http/headers.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cache/cache_filter.cc b/source/extensions/filters/http/cache/cache_filter.cc index 8eea39694faf9..768fd0ae5b99e 100644 --- a/source/extensions/filters/http/cache/cache_filter.cc +++ b/source/extensions/filters/http/cache/cache_filter.cc @@ -1,13 +1,12 @@ -#include "extensions/filters/http/cache/cache_filter.h" +#include "source/extensions/filters/http/cache/cache_filter.h" #include "envoy/http/header_map.h" -#include "common/common/enum_to_int.h" -#include "common/http/headers.h" -#include "common/http/utility.h" - -#include "extensions/filters/http/cache/cache_custom_headers.h" -#include "extensions/filters/http/cache/cacheability_utils.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/extensions/filters/http/cache/cache_custom_headers.h" +#include "source/extensions/filters/http/cache/cacheability_utils.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" diff --git a/source/extensions/filters/http/cache/cache_filter.h b/source/extensions/filters/http/cache/cache_filter.h index 360c91fa816c7..5560298f73561 100644 --- a/source/extensions/filters/http/cache/cache_filter.h +++ b/source/extensions/filters/http/cache/cache_filter.h @@ -7,11 +7,10 @@ #include "envoy/extensions/filters/http/cache/v3alpha/cache.pb.h" -#include "common/common/logger.h" - -#include "extensions/filters/http/cache/cache_headers_utils.h" -#include "extensions/filters/http/cache/http_cache.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/http/cache/cache_headers_utils.h" +#include "source/extensions/filters/http/cache/http_cache.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cache/cache_headers_utils.cc b/source/extensions/filters/http/cache/cache_headers_utils.cc index 9577d7876532c..73a9c5b5625a8 100644 --- a/source/extensions/filters/http/cache/cache_headers_utils.cc +++ b/source/extensions/filters/http/cache/cache_headers_utils.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/cache/cache_headers_utils.h" +#include "source/extensions/filters/http/cache/cache_headers_utils.h" #include #include @@ -6,10 +6,9 @@ #include "envoy/http/header_map.h" -#include "common/http/header_map_impl.h" -#include "common/http/header_utility.h" - -#include "extensions/filters/http/cache/cache_custom_headers.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/header_utility.h" +#include "source/extensions/filters/http/cache/cache_custom_headers.h" #include "absl/algorithm/container.h" #include "absl/strings/ascii.h" diff --git a/source/extensions/filters/http/cache/cache_headers_utils.h b/source/extensions/filters/http/cache/cache_headers_utils.h index aec5c78e4bcfa..5c170452a9697 100644 --- a/source/extensions/filters/http/cache/cache_headers_utils.h +++ b/source/extensions/filters/http/cache/cache_headers_utils.h @@ -4,11 +4,11 @@ #include "envoy/extensions/filters/http/cache/v3alpha/cache.pb.h" #include "envoy/http/header_map.h" -#include "common/common/matchers.h" -#include "common/http/header_map_impl.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/matchers.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/protobuf/protobuf.h" #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/cache/cacheability_utils.cc b/source/extensions/filters/http/cache/cacheability_utils.cc index a4c0d8a0c6737..20fe9107ebfe5 100644 --- a/source/extensions/filters/http/cache/cacheability_utils.cc +++ b/source/extensions/filters/http/cache/cacheability_utils.cc @@ -1,11 +1,10 @@ -#include "extensions/filters/http/cache/cacheability_utils.h" +#include "source/extensions/filters/http/cache/cacheability_utils.h" #include "envoy/http/header_map.h" -#include "common/common/macros.h" -#include "common/common/utility.h" - -#include "extensions/filters/http/cache/cache_custom_headers.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/extensions/filters/http/cache/cache_custom_headers.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cache/cacheability_utils.h b/source/extensions/filters/http/cache/cacheability_utils.h index d968c3261cf07..00f5cfd8bfdf1 100644 --- a/source/extensions/filters/http/cache/cacheability_utils.h +++ b/source/extensions/filters/http/cache/cacheability_utils.h @@ -1,9 +1,8 @@ #pragma once -#include "common/common/utility.h" -#include "common/http/headers.h" - -#include "extensions/filters/http/cache/cache_headers_utils.h" +#include "source/common/common/utility.h" +#include "source/common/http/headers.h" +#include "source/extensions/filters/http/cache/cache_headers_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cache/config.cc b/source/extensions/filters/http/cache/config.cc index 86277189a789b..f1d713e8d1c19 100644 --- a/source/extensions/filters/http/cache/config.cc +++ b/source/extensions/filters/http/cache/config.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/http/cache/config.h" +#include "source/extensions/filters/http/cache/config.h" -#include "extensions/filters/http/cache/cache_filter.h" +#include "source/extensions/filters/http/cache/cache_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cache/config.h b/source/extensions/filters/http/cache/config.h index 656a1d68ca959..f9c9f678ff20e 100644 --- a/source/extensions/filters/http/cache/config.h +++ b/source/extensions/filters/http/cache/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/cache/v3alpha/cache.pb.h" #include "envoy/extensions/filters/http/cache/v3alpha/cache.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cache/http_cache.cc b/source/extensions/filters/http/cache/http_cache.cc index 2229252407d42..2fef083676bfb 100644 --- a/source/extensions/filters/http/cache/http_cache.cc +++ b/source/extensions/filters/http/cache/http_cache.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/cache/http_cache.h" +#include "source/extensions/filters/http/cache/http_cache.h" #include #include @@ -7,12 +7,11 @@ #include "envoy/http/codes.h" #include "envoy/http/header_map.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/cache/cache_custom_headers.h" -#include "extensions/filters/http/cache/cache_headers_utils.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/cache/cache_custom_headers.h" +#include "source/extensions/filters/http/cache/cache_headers_utils.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/cache/http_cache.h b/source/extensions/filters/http/cache/http_cache.h index efde461d146a3..ebd6c888ec97c 100644 --- a/source/extensions/filters/http/cache/http_cache.h +++ b/source/extensions/filters/http/cache/http_cache.h @@ -10,13 +10,11 @@ #include "envoy/extensions/filters/http/cache/v3alpha/cache.pb.h" #include "envoy/http/header_map.h" -#include "common/common/assert.h" -#include "common/common/logger.h" - +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/http/cache/cache_headers_utils.h" #include "source/extensions/filters/http/cache/key.pb.h" -#include "extensions/filters/http/cache/cache_headers_utils.h" - #include "absl/strings/string_view.h" namespace Envoy { diff --git a/source/extensions/filters/http/cache/simple_http_cache/BUILD b/source/extensions/filters/http/cache/simple_http_cache/BUILD index 481380f23591f..5b25659f64b0f 100644 --- a/source/extensions/filters/http/cache/simple_http_cache/BUILD +++ b/source/extensions/filters/http/cache/simple_http_cache/BUILD @@ -15,8 +15,8 @@ envoy_cc_extension( srcs = ["simple_http_cache.cc"], hdrs = ["simple_http_cache.h"], deps = [ - "//include/envoy/registry", - "//include/envoy/runtime:runtime_interface", + "//envoy/registry", + "//envoy/runtime:runtime_interface", "//source/common/buffer:buffer_lib", "//source/common/common:macros", "//source/common/http:header_map_lib", diff --git a/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.cc b/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.cc index 7a7f3170504e9..c39b136be8764 100644 --- a/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.cc +++ b/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/cache/simple_http_cache/simple_http_cache.h" +#include "source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h" #include "envoy/extensions/cache/simple_http_cache/v3alpha/config.pb.h" #include "envoy/registry/registry.h" -#include "common/buffer/buffer_impl.h" -#include "common/http/header_map_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/header_map_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h b/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h index 03ee72e51e613..0cb45d7b58701 100644 --- a/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h +++ b/source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h @@ -1,8 +1,7 @@ #pragma once -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/cache/http_cache.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/cache/http_cache.h" #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_map.h" diff --git a/source/extensions/filters/http/cdn_loop/BUILD b/source/extensions/filters/http/cdn_loop/BUILD index b42834465a14f..5ef8fb6b4068a 100644 --- a/source/extensions/filters/http/cdn_loop/BUILD +++ b/source/extensions/filters/http/cdn_loop/BUILD @@ -15,9 +15,9 @@ envoy_cc_library( hdrs = ["filter.h"], deps = [ ":utils_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", "//source/common/common:statusor_lib", "//source/common/http:headers_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", @@ -48,9 +48,9 @@ envoy_cc_extension( deps = [ ":filter_lib", ":parser_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:factory_context_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:factory_context_interface", "//source/common/common:statusor_lib", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/extensions/filters/http/cdn_loop/config.cc b/source/extensions/filters/http/cdn_loop/config.cc index 0b16b3c819583..93c3d155a8ad8 100644 --- a/source/extensions/filters/http/cdn_loop/config.cc +++ b/source/extensions/filters/http/cdn_loop/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/cdn_loop/config.h" +#include "source/extensions/filters/http/cdn_loop/config.h" #include @@ -8,10 +8,9 @@ #include "envoy/registry/registry.h" #include "envoy/server/factory_context.h" -#include "common/common/statusor.h" - -#include "extensions/filters/http/cdn_loop/filter.h" -#include "extensions/filters/http/cdn_loop/parser.h" +#include "source/common/common/statusor.h" +#include "source/extensions/filters/http/cdn_loop/filter.h" +#include "source/extensions/filters/http/cdn_loop/parser.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cdn_loop/config.h b/source/extensions/filters/http/cdn_loop/config.h index 1e03a123649f1..d46a44c83cf4d 100644 --- a/source/extensions/filters/http/cdn_loop/config.h +++ b/source/extensions/filters/http/cdn_loop/config.h @@ -7,8 +7,8 @@ #include "envoy/http/filter.h" #include "envoy/server/factory_context.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cdn_loop/filter.cc b/source/extensions/filters/http/cdn_loop/filter.cc index 38158011502e7..544ad53dcaa77 100644 --- a/source/extensions/filters/http/cdn_loop/filter.cc +++ b/source/extensions/filters/http/cdn_loop/filter.cc @@ -1,13 +1,12 @@ -#include "extensions/filters/http/cdn_loop/filter.h" +#include "source/extensions/filters/http/cdn_loop/filter.h" #include "envoy/http/codes.h" #include "envoy/http/filter.h" #include "envoy/http/header_map.h" -#include "common/common/statusor.h" -#include "common/http/headers.h" - -#include "extensions/filters/http/cdn_loop/utils.h" +#include "source/common/common/statusor.h" +#include "source/common/http/headers.h" +#include "source/extensions/filters/http/cdn_loop/utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cdn_loop/filter.h b/source/extensions/filters/http/cdn_loop/filter.h index 77216b798d500..d65fa5c170045 100644 --- a/source/extensions/filters/http/cdn_loop/filter.h +++ b/source/extensions/filters/http/cdn_loop/filter.h @@ -5,7 +5,7 @@ #include "envoy/http/filter.h" #include "envoy/http/header_map.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cdn_loop/parser.cc b/source/extensions/filters/http/cdn_loop/parser.cc index 6f37ac5eb3fa7..db002350d6fb9 100644 --- a/source/extensions/filters/http/cdn_loop/parser.cc +++ b/source/extensions/filters/http/cdn_loop/parser.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/http/cdn_loop/parser.h" +#include "source/extensions/filters/http/cdn_loop/parser.h" -#include "common/common/statusor.h" +#include "source/common/common/statusor.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" diff --git a/source/extensions/filters/http/cdn_loop/parser.h b/source/extensions/filters/http/cdn_loop/parser.h index 5b9aad5175b26..625b4b454b395 100644 --- a/source/extensions/filters/http/cdn_loop/parser.h +++ b/source/extensions/filters/http/cdn_loop/parser.h @@ -2,7 +2,7 @@ #include -#include "common/common/statusor.h" +#include "source/common/common/statusor.h" #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/cdn_loop/utils.cc b/source/extensions/filters/http/cdn_loop/utils.cc index e7c4785099109..e2fffa92f298e 100644 --- a/source/extensions/filters/http/cdn_loop/utils.cc +++ b/source/extensions/filters/http/cdn_loop/utils.cc @@ -1,10 +1,9 @@ -#include "extensions/filters/http/cdn_loop/utils.h" +#include "source/extensions/filters/http/cdn_loop/utils.h" #include -#include "common/common/statusor.h" - -#include "extensions/filters/http/cdn_loop/parser.h" +#include "source/common/common/statusor.h" +#include "source/extensions/filters/http/cdn_loop/parser.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/cdn_loop/utils.h b/source/extensions/filters/http/cdn_loop/utils.h index ba486edadc160..c2813b424e653 100644 --- a/source/extensions/filters/http/cdn_loop/utils.h +++ b/source/extensions/filters/http/cdn_loop/utils.h @@ -1,6 +1,6 @@ #pragma once -#include "common/common/statusor.h" +#include "source/common/common/statusor.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/common/BUILD b/source/extensions/filters/http/common/BUILD index d9a7558fb38ed..d0825a13b0dfa 100644 --- a/source/extensions/filters/http/common/BUILD +++ b/source/extensions/filters/http/common/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( # A thin shim used by test and prod filters. visibility = ["//visibility:public"], deps = [ - "//include/envoy/server:filter_config_interface", + "//envoy/server:filter_config_interface", ], ) @@ -23,7 +23,7 @@ envoy_cc_library( hdrs = ["factory_base.h"], visibility = ["//visibility:public"], deps = [ - "//include/envoy/server:filter_config_interface", + "//envoy/server:filter_config_interface", ], ) @@ -35,7 +35,7 @@ envoy_cc_library( "jwt_verify_lib", ], deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/http:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], @@ -50,7 +50,7 @@ envoy_cc_library( "//test:__subpackages__", ], deps = [ - "//include/envoy/runtime:runtime_interface", + "//envoy/runtime:runtime_interface", "//source/common/common:macros", "//source/extensions/common:utility_lib", "//source/extensions/filters/http:well_known_names", @@ -62,9 +62,9 @@ envoy_cc_library( srcs = ["stream_rate_limiter.cc"], hdrs = ["stream_rate_limiter.h"], deps = [ - "//include/envoy/common:token_bucket_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", + "//envoy/common:token_bucket_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", "//source/common/buffer:watermark_buffer_lib", "//source/common/common:assert_lib", "//source/common/common:empty_string", diff --git a/source/extensions/filters/http/common/compressor/BUILD b/source/extensions/filters/http/common/compressor/BUILD index ec0648006b5c1..4b7c5fc58698f 100644 --- a/source/extensions/filters/http/common/compressor/BUILD +++ b/source/extensions/filters/http/common/compressor/BUILD @@ -14,9 +14,9 @@ envoy_cc_library( srcs = ["compressor.cc"], hdrs = ["compressor.h"], deps = [ - "//include/envoy/compression/compressor:compressor_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/stream_info:filter_state_interface", + "//envoy/compression/compressor:compressor_interface", + "//envoy/stats:stats_macros", + "//envoy/stream_info:filter_state_interface", "//source/common/buffer:buffer_lib", "//source/common/http:header_map_lib", "//source/common/http:utility_lib", diff --git a/source/extensions/filters/http/common/compressor/compressor.cc b/source/extensions/filters/http/common/compressor/compressor.cc index 7f9f5fe8e0a01..88b196147c0e3 100644 --- a/source/extensions/filters/http/common/compressor/compressor.cc +++ b/source/extensions/filters/http/common/compressor/compressor.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/http/common/compressor/compressor.h" +#include "source/extensions/filters/http/common/compressor/compressor.h" -#include "common/buffer/buffer_impl.h" -#include "common/http/header_map_impl.h" -#include "common/http/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/common/compressor/compressor.h b/source/extensions/filters/http/common/compressor/compressor.h index c18cc1aaccf91..c79f04fd30ef1 100644 --- a/source/extensions/filters/http/common/compressor/compressor.h +++ b/source/extensions/filters/http/common/compressor/compressor.h @@ -6,10 +6,9 @@ #include "envoy/stats/stats_macros.h" #include "envoy/stream_info/filter_state.h" -#include "common/protobuf/protobuf.h" -#include "common/runtime/runtime_protos.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/runtime/runtime_protos.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/common/jwks_fetcher.cc b/source/extensions/filters/http/common/jwks_fetcher.cc index 5aadb8c94bdff..b5f0048b10211 100644 --- a/source/extensions/filters/http/common/jwks_fetcher.cc +++ b/source/extensions/filters/http/common/jwks_fetcher.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/common/jwks_fetcher.h" +#include "source/extensions/filters/http/common/jwks_fetcher.h" #include "envoy/config/core/v3/http_uri.pb.h" -#include "common/common/enum_to_int.h" -#include "common/http/headers.h" -#include "common/http/utility.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" #include "jwt_verify_lib/status.h" diff --git a/source/extensions/filters/http/common/stream_rate_limiter.cc b/source/extensions/filters/http/common/stream_rate_limiter.cc index c5d39a28769fd..6763adbeb2414 100644 --- a/source/extensions/filters/http/common/stream_rate_limiter.cc +++ b/source/extensions/filters/http/common/stream_rate_limiter.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/http/common/stream_rate_limiter.h" +#include "source/extensions/filters/http/common/stream_rate_limiter.h" #include #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" -#include "common/common/assert.h" -#include "common/common/token_bucket_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/token_bucket_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/common/stream_rate_limiter.h b/source/extensions/filters/http/common/stream_rate_limiter.h index 406791497155b..b8aed9ac8a72a 100644 --- a/source/extensions/filters/http/common/stream_rate_limiter.h +++ b/source/extensions/filters/http/common/stream_rate_limiter.h @@ -8,7 +8,7 @@ #include "envoy/event/timer.h" #include "envoy/runtime/runtime.h" -#include "common/buffer/watermark_buffer.h" +#include "source/common/buffer/watermark_buffer.h" namespace Envoy { diff --git a/source/extensions/filters/http/common/utility.h b/source/extensions/filters/http/common/utility.h index b119e2db12b50..a6b4dd3d67b47 100644 --- a/source/extensions/filters/http/common/utility.h +++ b/source/extensions/filters/http/common/utility.h @@ -1,9 +1,8 @@ #pragma once -#include "common/common/macros.h" - -#include "extensions/common/utility.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/macros.h" +#include "source/extensions/common/utility.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/composite/BUILD b/source/extensions/filters/http/composite/BUILD index 63cb62a7c7b00..ba4055de5aac4 100644 --- a/source/extensions/filters/http/composite/BUILD +++ b/source/extensions/filters/http/composite/BUILD @@ -33,7 +33,7 @@ envoy_cc_library( ], deps = [ ":action_lib", - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/common/http:header_map_lib", "//source/common/http:headers_lib", "//source/common/matcher:matcher_lib", @@ -46,8 +46,8 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/composite:filter_lib", diff --git a/source/extensions/filters/http/composite/action.cc b/source/extensions/filters/http/composite/action.cc index 97aef4c0952d1..14935fa819dbc 100644 --- a/source/extensions/filters/http/composite/action.cc +++ b/source/extensions/filters/http/composite/action.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/composite/action.h" +#include "source/extensions/filters/http/composite/action.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/composite/action.h b/source/extensions/filters/http/composite/action.h index a10988f346810..1d2b822e79949 100644 --- a/source/extensions/filters/http/composite/action.h +++ b/source/extensions/filters/http/composite/action.h @@ -2,7 +2,7 @@ #include "envoy/extensions/filters/http/composite/v3/composite.pb.validate.h" -#include "common/matcher/matcher.h" +#include "source/common/matcher/matcher.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/composite/config.cc b/source/extensions/filters/http/composite/config.cc index 3d640a119a0f6..ca1697885ffa8 100644 --- a/source/extensions/filters/http/composite/config.cc +++ b/source/extensions/filters/http/composite/config.cc @@ -1,9 +1,9 @@ -#include "extensions/filters/http/composite/config.h" +#include "source/extensions/filters/http/composite/config.h" #include "envoy/common/exception.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/composite/filter.h" +#include "source/extensions/filters/http/composite/filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/composite/config.h b/source/extensions/filters/http/composite/config.h index a5fe8ed5536d2..c95245d52d0d0 100644 --- a/source/extensions/filters/http/composite/config.h +++ b/source/extensions/filters/http/composite/config.h @@ -7,11 +7,10 @@ #include "envoy/type/matcher/v3/http_inputs.pb.h" #include "envoy/type/matcher/v3/http_inputs.pb.validate.h" -#include "common/matcher/matcher.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/matcher/matcher.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/composite/factory_wrapper.cc b/source/extensions/filters/http/composite/factory_wrapper.cc index 41215b1d2c6ef..1ec4dab18f6a2 100644 --- a/source/extensions/filters/http/composite/factory_wrapper.cc +++ b/source/extensions/filters/http/composite/factory_wrapper.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/http/composite/factory_wrapper.h" +#include "source/extensions/filters/http/composite/factory_wrapper.h" -#include "extensions/filters/http/composite/filter.h" +#include "source/extensions/filters/http/composite/filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/composite/filter.cc b/source/extensions/filters/http/composite/filter.cc index d04ba6d430622..843ea55f1a8ea 100644 --- a/source/extensions/filters/http/composite/filter.cc +++ b/source/extensions/filters/http/composite/filter.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/http/composite/filter.h" +#include "source/extensions/filters/http/composite/filter.h" #include "envoy/http/filter.h" -#include "common/common/stl_helpers.h" +#include "source/common/common/stl_helpers.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/composite/filter.h b/source/extensions/filters/http/composite/filter.h index c46696f42a11f..5c790e4041309 100644 --- a/source/extensions/filters/http/composite/filter.h +++ b/source/extensions/filters/http/composite/filter.h @@ -4,9 +4,9 @@ #include "envoy/http/header_map.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" -#include "extensions/filters/http/composite/action.h" -#include "extensions/filters/http/composite/factory_wrapper.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/composite/action.h" +#include "source/extensions/filters/http/composite/factory_wrapper.h" #include "absl/types/variant.h" diff --git a/source/extensions/filters/http/compressor/BUILD b/source/extensions/filters/http/compressor/BUILD index ad18a973c8649..46df06be38db3 100644 --- a/source/extensions/filters/http/compressor/BUILD +++ b/source/extensions/filters/http/compressor/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( srcs = ["compressor_filter.cc"], hdrs = ["compressor_filter.h"], deps = [ - "//include/envoy/compression/compressor:compressor_factory_interface", + "//envoy/compression/compressor:compressor_factory_interface", "//source/extensions/filters/http/common/compressor:compressor_lib", "@envoy_api//envoy/extensions/filters/http/compressor/v3:pkg_cc_proto", ], @@ -29,7 +29,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":compressor_filter_lib", - "//include/envoy/compression/compressor:compressor_config_interface", + "//envoy/compression/compressor:compressor_config_interface", "//source/common/config:utility_lib", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/extensions/filters/http/compressor/compressor_filter.cc b/source/extensions/filters/http/compressor/compressor_filter.cc index 24e974e012e5c..20b6c3482a73f 100644 --- a/source/extensions/filters/http/compressor/compressor_filter.cc +++ b/source/extensions/filters/http/compressor/compressor_filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/compressor/compressor_filter.h" +#include "source/extensions/filters/http/compressor/compressor_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/compressor/compressor_filter.h b/source/extensions/filters/http/compressor/compressor_filter.h index 8d7347847f794..24f20dd1eafbb 100644 --- a/source/extensions/filters/http/compressor/compressor_filter.h +++ b/source/extensions/filters/http/compressor/compressor_filter.h @@ -3,7 +3,7 @@ #include "envoy/compression/compressor/factory.h" #include "envoy/extensions/filters/http/compressor/v3/compressor.pb.h" -#include "extensions/filters/http/common/compressor/compressor.h" +#include "source/extensions/filters/http/common/compressor/compressor.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/compressor/config.cc b/source/extensions/filters/http/compressor/config.cc index aff3ca5afe4cc..caec2e0fb10d5 100644 --- a/source/extensions/filters/http/compressor/config.cc +++ b/source/extensions/filters/http/compressor/config.cc @@ -1,10 +1,9 @@ -#include "extensions/filters/http/compressor/config.h" +#include "source/extensions/filters/http/compressor/config.h" #include "envoy/compression/compressor/config.h" -#include "common/config/utility.h" - -#include "extensions/filters/http/compressor/compressor_filter.h" +#include "source/common/config/utility.h" +#include "source/extensions/filters/http/compressor/compressor_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/compressor/config.h b/source/extensions/filters/http/compressor/config.h index 50127769f3b4f..bef488db16ca6 100644 --- a/source/extensions/filters/http/compressor/config.h +++ b/source/extensions/filters/http/compressor/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/compressor/v3/compressor.pb.h" #include "envoy/extensions/filters/http/compressor/v3/compressor.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cors/BUILD b/source/extensions/filters/http/cors/BUILD index 5eb4f63a57246..9fe8c075d572c 100644 --- a/source/extensions/filters/http/cors/BUILD +++ b/source/extensions/filters/http/cors/BUILD @@ -17,8 +17,8 @@ envoy_cc_library( srcs = ["cors_filter.cc"], hdrs = ["cors_filter.h"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:enum_to_int", @@ -31,13 +31,9 @@ envoy_cc_extension( name = "config", srcs = ["config.cc"], hdrs = ["config.h"], - # TODO(#9953) clean up. - extra_visibility = [ - "//test/integration:__subpackages__", - ], deps = [ - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/cors:cors_filter_lib", diff --git a/source/extensions/filters/http/cors/config.cc b/source/extensions/filters/http/cors/config.cc index 4a97416e714c2..22fbc4daa75ec 100644 --- a/source/extensions/filters/http/cors/config.cc +++ b/source/extensions/filters/http/cors/config.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/http/cors/config.h" +#include "source/extensions/filters/http/cors/config.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/cors/cors_filter.h" +#include "source/extensions/filters/http/cors/cors_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cors/config.h b/source/extensions/filters/http/cors/config.h index 96acf31a33a2b..203f11e5286e4 100644 --- a/source/extensions/filters/http/cors/config.h +++ b/source/extensions/filters/http/cors/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/cors/v3/cors.pb.h" #include "envoy/extensions/filters/http/cors/v3/cors.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cors/cors_filter.cc b/source/extensions/filters/http/cors/cors_filter.cc index e936b16c8f245..c7314a437a58f 100644 --- a/source/extensions/filters/http/cors/cors_filter.cc +++ b/source/extensions/filters/http/cors/cors_filter.cc @@ -1,13 +1,13 @@ -#include "extensions/filters/http/cors/cors_filter.h" +#include "source/extensions/filters/http/cors/cors_filter.h" #include "envoy/http/codes.h" #include "envoy/http/header_map.h" #include "envoy/stats/scope.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/cors/cors_filter.h b/source/extensions/filters/http/cors/cors_filter.h index 6603469055a76..5bcef49783f00 100644 --- a/source/extensions/filters/http/cors/cors_filter.h +++ b/source/extensions/filters/http/cors/cors_filter.h @@ -4,7 +4,7 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/csrf/BUILD b/source/extensions/filters/http/csrf/BUILD index e8e88ea6fa493..a31db01d1a37e 100644 --- a/source/extensions/filters/http/csrf/BUILD +++ b/source/extensions/filters/http/csrf/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( srcs = ["csrf_filter.cc"], hdrs = ["csrf_filter.h"], deps = [ - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/common/buffer:buffer_lib", "//source/common/common:matchers_lib", "//source/common/http:header_map_lib", @@ -34,7 +34,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/csrf:csrf_filter_lib", diff --git a/source/extensions/filters/http/csrf/config.cc b/source/extensions/filters/http/csrf/config.cc index 34e1fbd92f747..7a455c3c5e89b 100644 --- a/source/extensions/filters/http/csrf/config.cc +++ b/source/extensions/filters/http/csrf/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/csrf/config.h" +#include "source/extensions/filters/http/csrf/config.h" #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.h" #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/csrf/csrf_filter.h" +#include "source/extensions/filters/http/csrf/csrf_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/csrf/config.h b/source/extensions/filters/http/csrf/config.h index c480bc1ca4751..192e0f5cfee61 100644 --- a/source/extensions/filters/http/csrf/config.h +++ b/source/extensions/filters/http/csrf/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.h" #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/csrf/csrf_filter.cc b/source/extensions/filters/http/csrf/csrf_filter.cc index 01fe2f38127a9..1a85fb1c8c756 100644 --- a/source/extensions/filters/http/csrf/csrf_filter.cc +++ b/source/extensions/filters/http/csrf/csrf_filter.cc @@ -1,14 +1,13 @@ -#include "extensions/filters/http/csrf/csrf_filter.h" +#include "source/extensions/filters/http/csrf/csrf_filter.h" #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.h" #include "envoy/stats/scope.h" -#include "common/common/empty_string.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/utility.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/csrf/csrf_filter.h b/source/extensions/filters/http/csrf/csrf_filter.h index 69e88ff858b0e..5697cf99f59e4 100644 --- a/source/extensions/filters/http/csrf/csrf_filter.h +++ b/source/extensions/filters/http/csrf/csrf_filter.h @@ -6,8 +6,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/matchers.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/matchers.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/decompressor/BUILD b/source/extensions/filters/http/decompressor/BUILD index 78f76c5573f8f..bd9e426b0e963 100644 --- a/source/extensions/filters/http/decompressor/BUILD +++ b/source/extensions/filters/http/decompressor/BUILD @@ -17,9 +17,9 @@ envoy_cc_library( srcs = ["decompressor_filter.cc"], hdrs = ["decompressor_filter.h"], deps = [ - "//include/envoy/compression/decompressor:decompressor_config_interface", - "//include/envoy/compression/decompressor:decompressor_interface", - "//include/envoy/http:filter_interface", + "//envoy/compression/decompressor:decompressor_config_interface", + "//envoy/compression/decompressor:decompressor_interface", + "//envoy/http:filter_interface", "//source/common/buffer:buffer_lib", "//source/common/common:macros", "//source/common/http:headers_lib", @@ -35,7 +35,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":decompressor_filter_lib", - "//include/envoy/compression/decompressor:decompressor_config_interface", + "//envoy/compression/decompressor:decompressor_config_interface", "//source/common/config:utility_lib", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/extensions/filters/http/decompressor/config.cc b/source/extensions/filters/http/decompressor/config.cc index 988f76c758597..e15257c7d2e3b 100644 --- a/source/extensions/filters/http/decompressor/config.cc +++ b/source/extensions/filters/http/decompressor/config.cc @@ -1,10 +1,9 @@ -#include "extensions/filters/http/decompressor/config.h" +#include "source/extensions/filters/http/decompressor/config.h" #include "envoy/compression/decompressor/config.h" -#include "common/config/utility.h" - -#include "extensions/filters/http/decompressor/decompressor_filter.h" +#include "source/common/config/utility.h" +#include "source/extensions/filters/http/decompressor/decompressor_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/decompressor/config.h b/source/extensions/filters/http/decompressor/config.h index cdcef94a180e9..7cc698dcb5f7b 100644 --- a/source/extensions/filters/http/decompressor/config.h +++ b/source/extensions/filters/http/decompressor/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/decompressor/v3/decompressor.pb.h" #include "envoy/extensions/filters/http/decompressor/v3/decompressor.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/decompressor/decompressor_filter.cc b/source/extensions/filters/http/decompressor/decompressor_filter.cc index c30c5b1a93608..d632c356004bd 100644 --- a/source/extensions/filters/http/decompressor/decompressor_filter.cc +++ b/source/extensions/filters/http/decompressor/decompressor_filter.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/http/decompressor/decompressor_filter.h" +#include "source/extensions/filters/http/decompressor/decompressor_filter.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/empty_string.h" -#include "common/common/macros.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/macros.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/decompressor/decompressor_filter.h b/source/extensions/filters/http/decompressor/decompressor_filter.h index 601d170fe1367..5f13e6b3b13da 100644 --- a/source/extensions/filters/http/decompressor/decompressor_filter.h +++ b/source/extensions/filters/http/decompressor/decompressor_filter.h @@ -5,11 +5,10 @@ #include "envoy/extensions/filters/http/decompressor/v3/decompressor.pb.h" #include "envoy/http/filter.h" -#include "common/common/macros.h" -#include "common/http/headers.h" -#include "common/runtime/runtime_protos.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/common/macros.h" +#include "source/common/http/headers.h" +#include "source/common/runtime/runtime_protos.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/dynamic_forward_proxy/BUILD b/source/extensions/filters/http/dynamic_forward_proxy/BUILD index 561f3e250f5e0..030fae3712f4d 100644 --- a/source/extensions/filters/http/dynamic_forward_proxy/BUILD +++ b/source/extensions/filters/http/dynamic_forward_proxy/BUILD @@ -14,9 +14,8 @@ envoy_cc_library( srcs = ["proxy_filter.cc"], hdrs = ["proxy_filter.h"], deps = [ - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/common/http:header_utility_lib", - "//source/extensions/clusters:well_known_names", "//source/extensions/common/dynamic_forward_proxy:dns_cache_interface", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:pass_through_filter_lib", @@ -31,8 +30,8 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/common/dynamic_forward_proxy:dns_cache_manager_impl", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/extensions/filters/http/dynamic_forward_proxy/config.cc b/source/extensions/filters/http/dynamic_forward_proxy/config.cc index 1907801bfa1d0..eb7dd21633a97 100644 --- a/source/extensions/filters/http/dynamic_forward_proxy/config.cc +++ b/source/extensions/filters/http/dynamic_forward_proxy/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/dynamic_forward_proxy/config.h" +#include "source/extensions/filters/http/dynamic_forward_proxy/config.h" #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h" #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.validate.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" -#include "extensions/filters/http/dynamic_forward_proxy/proxy_filter.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" +#include "source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/dynamic_forward_proxy/config.h b/source/extensions/filters/http/dynamic_forward_proxy/config.h index 26fb6d0e13119..980d5a70552de 100644 --- a/source/extensions/filters/http/dynamic_forward_proxy/config.h +++ b/source/extensions/filters/http/dynamic_forward_proxy/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h" #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc index c1ee980393d50..837c0c734b0c8 100644 --- a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc +++ b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.cc @@ -1,14 +1,12 @@ -#include "extensions/filters/http/dynamic_forward_proxy/proxy_filter.h" +#include "source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h" #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h" -#include "common/http/utility.h" - -#include "extensions/clusters/well_known_names.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/http/utility.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { @@ -66,8 +64,7 @@ Http::FilterHeadersStatus ProxyFilter::decodeHeaders(Http::RequestHeaderMap& hea if (!cluster_type) { return Http::FilterHeadersStatus::Continue; } - if (cluster_type->name() != - Envoy::Extensions::Clusters::ClusterTypes::get().DynamicForwardProxy) { + if (cluster_type->name() != "envoy.clusters.dynamic_forward_proxy") { return Http::FilterHeadersStatus::Continue; } diff --git a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h index e4dccab636944..d97e3efeed54c 100644 --- a/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h +++ b/source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h" #include "envoy/upstream/cluster_manager.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/dynamo/BUILD b/source/extensions/filters/http/dynamo/BUILD index 0abf478922ff3..474528353b7ca 100644 --- a/source/extensions/filters/http/dynamo/BUILD +++ b/source/extensions/filters/http/dynamo/BUILD @@ -19,8 +19,8 @@ envoy_cc_library( deps = [ ":dynamo_request_parser_lib", ":dynamo_stats_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/runtime:runtime_interface", + "//envoy/http:filter_interface", + "//envoy/runtime:runtime_interface", "//source/common/buffer:buffer_lib", "//source/common/http:codes_lib", "//source/common/http:exception_lib", @@ -32,7 +32,7 @@ envoy_cc_library( srcs = ["dynamo_request_parser.cc"], hdrs = ["dynamo_request_parser.h"], deps = [ - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "//source/common/common:utility_lib", "//source/common/json:json_loader_lib", ], @@ -44,8 +44,8 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":dynamo_filter_lib", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "@envoy_api//envoy/extensions/filters/http/dynamo/v3:pkg_cc_proto", @@ -58,7 +58,7 @@ envoy_cc_library( hdrs = ["dynamo_stats.h"], deps = [ ":dynamo_request_parser_lib", - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", "//source/common/stats:symbol_table_lib", "//source/common/stats:utility_lib", ], diff --git a/source/extensions/filters/http/dynamo/config.cc b/source/extensions/filters/http/dynamo/config.cc index 128999520fc46..0850dc9b70836 100644 --- a/source/extensions/filters/http/dynamo/config.cc +++ b/source/extensions/filters/http/dynamo/config.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/http/dynamo/config.h" +#include "source/extensions/filters/http/dynamo/config.h" #include #include "envoy/extensions/filters/http/dynamo/v3/dynamo.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/dynamo/dynamo_filter.h" -#include "extensions/filters/http/dynamo/dynamo_stats.h" +#include "source/extensions/filters/http/dynamo/dynamo_filter.h" +#include "source/extensions/filters/http/dynamo/dynamo_stats.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/dynamo/config.h b/source/extensions/filters/http/dynamo/config.h index 551438e674545..939ba741e7380 100644 --- a/source/extensions/filters/http/dynamo/config.h +++ b/source/extensions/filters/http/dynamo/config.h @@ -6,8 +6,8 @@ #include "envoy/extensions/filters/http/dynamo/v3/dynamo.pb.validate.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/dynamo/dynamo_filter.cc b/source/extensions/filters/http/dynamo/dynamo_filter.cc index 4be293580b8b7..bb41e4dd9a5ed 100644 --- a/source/extensions/filters/http/dynamo/dynamo_filter.cc +++ b/source/extensions/filters/http/dynamo/dynamo_filter.cc @@ -1,20 +1,19 @@ -#include "extensions/filters/http/dynamo/dynamo_filter.h" +#include "source/extensions/filters/http/dynamo/dynamo_filter.h" #include #include #include #include -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/http/codes.h" -#include "common/http/exception.h" -#include "common/http/utility.h" -#include "common/json/json_loader.h" - -#include "extensions/filters/http/dynamo/dynamo_request_parser.h" -#include "extensions/filters/http/dynamo/dynamo_stats.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/http/codes.h" +#include "source/common/http/exception.h" +#include "source/common/http/utility.h" +#include "source/common/json/json_loader.h" +#include "source/extensions/filters/http/dynamo/dynamo_request_parser.h" +#include "source/extensions/filters/http/dynamo/dynamo_stats.h" #include "absl/container/fixed_array.h" diff --git a/source/extensions/filters/http/dynamo/dynamo_filter.h b/source/extensions/filters/http/dynamo/dynamo_filter.h index d341c801cad61..c7249f7fcdd5d 100644 --- a/source/extensions/filters/http/dynamo/dynamo_filter.h +++ b/source/extensions/filters/http/dynamo/dynamo_filter.h @@ -7,10 +7,9 @@ #include "envoy/runtime/runtime.h" #include "envoy/stats/scope.h" -#include "common/json/json_loader.h" - -#include "extensions/filters/http/dynamo/dynamo_request_parser.h" -#include "extensions/filters/http/dynamo/dynamo_stats.h" +#include "source/common/json/json_loader.h" +#include "source/extensions/filters/http/dynamo/dynamo_request_parser.h" +#include "source/extensions/filters/http/dynamo/dynamo_stats.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/dynamo/dynamo_request_parser.cc b/source/extensions/filters/http/dynamo/dynamo_request_parser.cc index 6fd0a1d42a843..e0d29327f03bd 100644 --- a/source/extensions/filters/http/dynamo/dynamo_request_parser.cc +++ b/source/extensions/filters/http/dynamo/dynamo_request_parser.cc @@ -1,11 +1,11 @@ -#include "extensions/filters/http/dynamo/dynamo_request_parser.h" +#include "source/extensions/filters/http/dynamo/dynamo_request_parser.h" #include #include #include #include -#include "common/common/utility.h" +#include "source/common/common/utility.h" #include "absl/strings/match.h" diff --git a/source/extensions/filters/http/dynamo/dynamo_request_parser.h b/source/extensions/filters/http/dynamo/dynamo_request_parser.h index 931d0a4835f89..39e8fcbb31ecf 100644 --- a/source/extensions/filters/http/dynamo/dynamo_request_parser.h +++ b/source/extensions/filters/http/dynamo/dynamo_request_parser.h @@ -6,7 +6,7 @@ #include "envoy/http/header_map.h" -#include "common/json/json_loader.h" +#include "source/common/json/json_loader.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/dynamo/dynamo_stats.cc b/source/extensions/filters/http/dynamo/dynamo_stats.cc index 06f3770a688e6..ba0e5d9355389 100644 --- a/source/extensions/filters/http/dynamo/dynamo_stats.cc +++ b/source/extensions/filters/http/dynamo/dynamo_stats.cc @@ -1,13 +1,12 @@ -#include "extensions/filters/http/dynamo/dynamo_stats.h" +#include "source/extensions/filters/http/dynamo/dynamo_stats.h" #include #include #include "envoy/stats/scope.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/filters/http/dynamo/dynamo_request_parser.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/filters/http/dynamo/dynamo_request_parser.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/dynamo/dynamo_stats.h b/source/extensions/filters/http/dynamo/dynamo_stats.h index 48399e4f4d23b..78bd72c728035 100644 --- a/source/extensions/filters/http/dynamo/dynamo_stats.h +++ b/source/extensions/filters/http/dynamo/dynamo_stats.h @@ -5,8 +5,8 @@ #include "envoy/stats/scope.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/utility.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_authz/BUILD b/source/extensions/filters/http/ext_authz/BUILD index 6314f305e97fa..f65fdf5f1ddde 100644 --- a/source/extensions/filters/http/ext_authz/BUILD +++ b/source/extensions/filters/http/ext_authz/BUILD @@ -17,8 +17,8 @@ envoy_cc_library( srcs = ["ext_authz.cc"], hdrs = ["ext_authz.h"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/stats:stats_macros", + "//envoy/http:codes_interface", + "//envoy/stats:stats_macros", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:empty_string", @@ -42,8 +42,8 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":ext_authz", - "//include/envoy/registry", - "//include/envoy/stats:stats_macros", + "//envoy/registry", + "//envoy/stats:stats_macros", "//source/common/config:utility_lib", "//source/common/grpc:google_async_client_cache", "//source/common/protobuf:utility_lib", diff --git a/source/extensions/filters/http/ext_authz/config.cc b/source/extensions/filters/http/ext_authz/config.cc index c99894009d9ab..9370b6c3c8439 100644 --- a/source/extensions/filters/http/ext_authz/config.cc +++ b/source/extensions/filters/http/ext_authz/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/ext_authz/config.h" +#include "source/extensions/filters/http/ext_authz/config.h" #include #include @@ -8,13 +8,12 @@ #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" -#include "common/grpc/google_async_client_cache.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" -#include "extensions/filters/common/ext_authz/ext_authz_http_impl.h" -#include "extensions/filters/http/ext_authz/ext_authz.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/google_async_client_cache.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_http_impl.h" +#include "source/extensions/filters/http/ext_authz/ext_authz.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_authz/config.h b/source/extensions/filters/http/ext_authz/config.h index 600c572f05070..f0f3aea5bba1f 100644 --- a/source/extensions/filters/http/ext_authz/config.h +++ b/source/extensions/filters/http/ext_authz/config.h @@ -3,9 +3,9 @@ #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.h" #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.validate.h" -#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_authz/ext_authz.cc b/source/extensions/filters/http/ext_authz/ext_authz.cc index 97ca3d7782062..46d9a967c7dd0 100644 --- a/source/extensions/filters/http/ext_authz/ext_authz.cc +++ b/source/extensions/filters/http/ext_authz/ext_authz.cc @@ -1,14 +1,13 @@ -#include "extensions/filters/http/ext_authz/ext_authz.h" +#include "source/extensions/filters/http/ext_authz/ext_authz.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/common/matchers.h" -#include "common/http/utility.h" -#include "common/router/config_impl.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/matchers.h" +#include "source/common/http/utility.h" +#include "source/common/router/config_impl.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_authz/ext_authz.h b/source/extensions/filters/http/ext_authz/ext_authz.h index 9b1aca32f97af..4ebde47703804 100644 --- a/source/extensions/filters/http/ext_authz/ext_authz.h +++ b/source/extensions/filters/http/ext_authz/ext_authz.h @@ -13,16 +13,15 @@ #include "envoy/stats/stats_macros.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/common/matchers.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/runtime/runtime_protos.h" - -#include "extensions/filters/common/ext_authz/ext_authz.h" -#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" -#include "extensions/filters/common/ext_authz/ext_authz_http_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/common/matchers.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/runtime/runtime_protos.h" +#include "source/extensions/filters/common/ext_authz/ext_authz.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_http_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_proc/BUILD b/source/extensions/filters/http/ext_proc/BUILD index 6f4e7a9c4928d..58e90e05eef88 100644 --- a/source/extensions/filters/http/ext_proc/BUILD +++ b/source/extensions/filters/http/ext_proc/BUILD @@ -22,10 +22,10 @@ envoy_cc_library( deps = [ ":client_interface", ":mutation_utils_lib", - "//include/envoy/event:timer_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/stats:stats_macros", + "//envoy/event:timer_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", + "//envoy/stats:stats_macros", "//source/common/buffer:buffer_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", "@com_google_absl//absl/strings:str_format", @@ -51,7 +51,7 @@ envoy_cc_library( name = "client_interface", hdrs = ["client.h"], deps = [ - "//include/envoy/grpc:status", + "//envoy/grpc:status", "@envoy_api//envoy/service/ext_proc/v3alpha:pkg_cc_proto", ], ) @@ -61,8 +61,8 @@ envoy_cc_library( srcs = ["mutation_utils.cc"], hdrs = ["mutation_utils.h"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/http:header_map_interface", + "//envoy/buffer:buffer_interface", + "//envoy/http:header_map_interface", "//source/common/http:header_utility_lib", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/service/ext_proc/v3alpha:pkg_cc_proto", @@ -75,9 +75,9 @@ envoy_cc_library( hdrs = ["client_impl.h"], deps = [ ":client_interface", - "//include/envoy/grpc:async_client_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/grpc:async_client_interface", + "//envoy/stats:stats_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/grpc:typed_async_client_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/service/ext_proc/v3alpha:pkg_cc_proto", diff --git a/source/extensions/filters/http/ext_proc/client_impl.cc b/source/extensions/filters/http/ext_proc/client_impl.cc index d5e2f0a5a0ae1..ca18cffcc0b65 100644 --- a/source/extensions/filters/http/ext_proc/client_impl.cc +++ b/source/extensions/filters/http/ext_proc/client_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/ext_proc/client_impl.h" +#include "source/extensions/filters/http/ext_proc/client_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_proc/client_impl.h b/source/extensions/filters/http/ext_proc/client_impl.h index dc2973ef109cb..fdce71ed1a173 100644 --- a/source/extensions/filters/http/ext_proc/client_impl.h +++ b/source/extensions/filters/http/ext_proc/client_impl.h @@ -8,9 +8,8 @@ #include "envoy/service/ext_proc/v3alpha/external_processor.pb.h" #include "envoy/stats/scope.h" -#include "common/grpc/typed_async_client.h" - -#include "extensions/filters/http/ext_proc/client.h" +#include "source/common/grpc/typed_async_client.h" +#include "source/extensions/filters/http/ext_proc/client.h" using envoy::service::ext_proc::v3alpha::ProcessingRequest; using envoy::service::ext_proc::v3alpha::ProcessingResponse; diff --git a/source/extensions/filters/http/ext_proc/config.cc b/source/extensions/filters/http/ext_proc/config.cc index 117f8f6eca6eb..221ebac44a969 100644 --- a/source/extensions/filters/http/ext_proc/config.cc +++ b/source/extensions/filters/http/ext_proc/config.cc @@ -1,9 +1,9 @@ -#include "extensions/filters/http/ext_proc/config.h" +#include "source/extensions/filters/http/ext_proc/config.h" #include -#include "extensions/filters/http/ext_proc/client_impl.h" -#include "extensions/filters/http/ext_proc/ext_proc.h" +#include "source/extensions/filters/http/ext_proc/client_impl.h" +#include "source/extensions/filters/http/ext_proc/ext_proc.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_proc/config.h b/source/extensions/filters/http/ext_proc/config.h index a3626a249e7ad..382ccda93b075 100644 --- a/source/extensions/filters/http/ext_proc/config.h +++ b/source/extensions/filters/http/ext_proc/config.h @@ -5,8 +5,8 @@ #include "envoy/extensions/filters/http/ext_proc/v3alpha/ext_proc.pb.h" #include "envoy/extensions/filters/http/ext_proc/v3alpha/ext_proc.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_proc/ext_proc.cc b/source/extensions/filters/http/ext_proc/ext_proc.cc index 3467dfd01fd2c..2e55d836ac4fc 100644 --- a/source/extensions/filters/http/ext_proc/ext_proc.cc +++ b/source/extensions/filters/http/ext_proc/ext_proc.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/http/ext_proc/ext_proc.h" +#include "source/extensions/filters/http/ext_proc/ext_proc.h" -#include "extensions/filters/http/ext_proc/mutation_utils.h" +#include "source/extensions/filters/http/ext_proc/mutation_utils.h" #include "absl/strings/str_format.h" diff --git a/source/extensions/filters/http/ext_proc/ext_proc.h b/source/extensions/filters/http/ext_proc/ext_proc.h index 0ccb231621131..a3754db99aba0 100644 --- a/source/extensions/filters/http/ext_proc/ext_proc.h +++ b/source/extensions/filters/http/ext_proc/ext_proc.h @@ -12,11 +12,10 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" - -#include "extensions/filters/http/common/pass_through_filter.h" -#include "extensions/filters/http/ext_proc/client.h" -#include "extensions/filters/http/ext_proc/processor_state.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/ext_proc/client.h" +#include "source/extensions/filters/http/ext_proc/processor_state.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_proc/mutation_utils.cc b/source/extensions/filters/http/ext_proc/mutation_utils.cc index e0a5602030a20..8fa43ade130de 100644 --- a/source/extensions/filters/http/ext_proc/mutation_utils.cc +++ b/source/extensions/filters/http/ext_proc/mutation_utils.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/ext_proc/mutation_utils.h" +#include "source/extensions/filters/http/ext_proc/mutation_utils.h" #include "envoy/http/header_map.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/protobuf/utility.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_proc/mutation_utils.h b/source/extensions/filters/http/ext_proc/mutation_utils.h index cb700019c5a78..14b28cf306e7d 100644 --- a/source/extensions/filters/http/ext_proc/mutation_utils.h +++ b/source/extensions/filters/http/ext_proc/mutation_utils.h @@ -4,7 +4,7 @@ #include "envoy/http/header_map.h" #include "envoy/service/ext_proc/v3alpha/external_processor.pb.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_proc/processor_state.cc b/source/extensions/filters/http/ext_proc/processor_state.cc index f02faf3e267a4..5fd79fa82d2f1 100644 --- a/source/extensions/filters/http/ext_proc/processor_state.cc +++ b/source/extensions/filters/http/ext_proc/processor_state.cc @@ -1,10 +1,9 @@ -#include "extensions/filters/http/ext_proc/processor_state.h" +#include "source/extensions/filters/http/ext_proc/processor_state.h" -#include "common/buffer/buffer_impl.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/ext_proc/ext_proc.h" -#include "extensions/filters/http/ext_proc/mutation_utils.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/ext_proc/ext_proc.h" +#include "source/extensions/filters/http/ext_proc/mutation_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ext_proc/processor_state.h b/source/extensions/filters/http/ext_proc/processor_state.h index fc3914c66c1d8..5a22c0ba26f96 100644 --- a/source/extensions/filters/http/ext_proc/processor_state.h +++ b/source/extensions/filters/http/ext_proc/processor_state.h @@ -7,7 +7,7 @@ #include "envoy/http/header_map.h" #include "envoy/service/ext_proc/v3alpha/external_processor.pb.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/fault/BUILD b/source/extensions/filters/http/fault/BUILD index 3cfe5b8ee205e..ae2c90f7999ac 100644 --- a/source/extensions/filters/http/fault/BUILD +++ b/source/extensions/filters/http/fault/BUILD @@ -17,13 +17,13 @@ envoy_cc_library( srcs = ["fault_filter.cc"], hdrs = ["fault_filter.h"], deps = [ - "//include/envoy/event:timer_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/event:timer_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", + "//envoy/runtime:runtime_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/buffer:watermark_buffer_lib", "//source/common/common:assert_lib", "//source/common/common:empty_string", @@ -47,7 +47,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/fault:fault_filter_lib", diff --git a/source/extensions/filters/http/fault/config.cc b/source/extensions/filters/http/fault/config.cc index 3810eaddfdb46..a4b20fa046657 100644 --- a/source/extensions/filters/http/fault/config.cc +++ b/source/extensions/filters/http/fault/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/fault/config.h" +#include "source/extensions/filters/http/fault/config.h" #include "envoy/extensions/filters/http/fault/v3/fault.pb.h" #include "envoy/extensions/filters/http/fault/v3/fault.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/fault/fault_filter.h" +#include "source/extensions/filters/http/fault/fault_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/fault/config.h b/source/extensions/filters/http/fault/config.h index 102511399bb53..b30ce426bca73 100644 --- a/source/extensions/filters/http/fault/config.h +++ b/source/extensions/filters/http/fault/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/fault/v3/fault.pb.h" #include "envoy/extensions/filters/http/fault/v3/fault.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/fault/fault_filter.cc b/source/extensions/filters/http/fault/fault_filter.cc index 8c21d85f19413..1a0fb3ecce61f 100644 --- a/source/extensions/filters/http/fault/fault_filter.cc +++ b/source/extensions/filters/http/fault/fault_filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/fault/fault_filter.h" +#include "source/extensions/filters/http/fault/fault_filter.h" #include #include @@ -12,17 +12,16 @@ #include "envoy/http/header_map.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" -#include "common/stats/utility.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stats/utility.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/fault/fault_filter.h b/source/extensions/filters/http/fault/fault_filter.h index fefea8bd06f51..f96756f16c133 100644 --- a/source/extensions/filters/http/fault/fault_filter.h +++ b/source/extensions/filters/http/fault/fault_filter.h @@ -13,13 +13,12 @@ #include "envoy/stats/stats_macros.h" #include "envoy/type/v3/percent.pb.h" -#include "common/buffer/watermark_buffer.h" -#include "common/common/token_bucket_impl.h" -#include "common/http/header_utility.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/filters/common/fault/fault_config.h" -#include "extensions/filters/http/common/stream_rate_limiter.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/common/token_bucket_impl.h" +#include "source/common/http/header_utility.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/filters/common/fault/fault_config.h" +#include "source/extensions/filters/http/common/stream_rate_limiter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_http1_bridge/BUILD b/source/extensions/filters/http/grpc_http1_bridge/BUILD index 4685a8d07c9d1..8598e63f403ed 100644 --- a/source/extensions/filters/http/grpc_http1_bridge/BUILD +++ b/source/extensions/filters/http/grpc_http1_bridge/BUILD @@ -17,9 +17,9 @@ envoy_cc_library( srcs = ["http1_bridge_filter.cc"], hdrs = ["http1_bridge_filter.h"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:enum_to_int", "//source/common/common:utility_lib", "//source/common/grpc:common_lib", @@ -40,8 +40,8 @@ envoy_cc_extension( "//test/server:__subpackages__", ], deps = [ - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/grpc_http1_bridge:http1_bridge_filter_lib", diff --git a/source/extensions/filters/http/grpc_http1_bridge/config.cc b/source/extensions/filters/http/grpc_http1_bridge/config.cc index 17f41987248f3..bc058d0d28bb7 100644 --- a/source/extensions/filters/http/grpc_http1_bridge/config.cc +++ b/source/extensions/filters/http/grpc_http1_bridge/config.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/http/grpc_http1_bridge/config.h" +#include "source/extensions/filters/http/grpc_http1_bridge/config.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h" +#include "source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_http1_bridge/config.h b/source/extensions/filters/http/grpc_http1_bridge/config.h index a431632da5621..6e340b760bb3a 100644 --- a/source/extensions/filters/http/grpc_http1_bridge/config.h +++ b/source/extensions/filters/http/grpc_http1_bridge/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/grpc_http1_bridge/v3/config.pb.h" #include "envoy/extensions/filters/http/grpc_http1_bridge/v3/config.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.cc b/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.cc index ae5332d3504af..5dc10045c3fc1 100644 --- a/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.cc +++ b/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h" +#include "source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h" #include #include @@ -6,12 +6,12 @@ #include "envoy/http/codes.h" -#include "common/common/enum_to_int.h" -#include "common/common/utility.h" -#include "common/grpc/common.h" -#include "common/grpc/context_impl.h" -#include "common/http/headers.h" -#include "common/http/http1/codec_impl.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/grpc/context_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/http1/codec_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h b/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h index 84b1ad18a4d01..948e2952eac97 100644 --- a/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h +++ b/source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h @@ -3,8 +3,8 @@ #include "envoy/http/filter.h" #include "envoy/upstream/cluster_manager.h" -#include "common/grpc/context_impl.h" -#include "common/runtime/runtime_features.h" +#include "source/common/grpc/context_impl.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD b/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD index c4f65adb09a95..36681152d9f96 100644 --- a/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD +++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( srcs = ["filter.cc"], hdrs = ["filter.h"], deps = [ - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/common/common:enum_to_int", "//source/common/grpc:codec_lib", "//source/common/grpc:common_lib", @@ -33,9 +33,9 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":filter_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "@envoy_api//envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3:pkg_cc_proto", diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc b/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc index da1269246d28c..a5cbcde53c6a7 100644 --- a/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc +++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/grpc_http1_reverse_bridge/config.h" +#include "source/extensions/filters/http/grpc_http1_reverse_bridge/config.h" #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.h" #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/grpc_http1_reverse_bridge/filter.h" +#include "source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/config.h b/source/extensions/filters/http/grpc_http1_reverse_bridge/config.h index c9579e3f13797..50a14c1e025f6 100644 --- a/source/extensions/filters/http/grpc_http1_reverse_bridge/config.h +++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/config.h @@ -4,8 +4,8 @@ #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.validate.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc b/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc index b8119639e8c1e..9036ebe6d02c3 100644 --- a/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc +++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.cc @@ -1,15 +1,14 @@ -#include "extensions/filters/http/grpc_http1_reverse_bridge/filter.h" +#include "source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h" #include "envoy/http/header_map.h" -#include "common/common/enum_to_int.h" -#include "common/grpc/codec.h" -#include "common/grpc/common.h" -#include "common/grpc/status.h" -#include "common/http/headers.h" -#include "common/http/utility.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/common.h" +#include "source/common/grpc/status.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h b/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h index 12707aac9f6c4..aed2ecdd34edf 100644 --- a/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h +++ b/source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h @@ -6,10 +6,9 @@ #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.h" #include "envoy/http/filter.h" -#include "common/buffer/buffer_impl.h" -#include "common/grpc/status.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/grpc/status.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_json_transcoder/BUILD b/source/extensions/filters/http/grpc_json_transcoder/BUILD index c1ae930c7fc88..38e1fc1fad375 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/BUILD +++ b/source/extensions/filters/http/grpc_json_transcoder/BUILD @@ -25,7 +25,7 @@ envoy_cc_library( deps = [ ":http_body_utils_lib", ":transcoder_input_stream_lib", - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/common/grpc:codec_lib", "//source/common/grpc:common_lib", "//source/common/http:headers_lib", @@ -63,7 +63,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/grpc_json_transcoder:json_transcoder_filter_lib", diff --git a/source/extensions/filters/http/grpc_json_transcoder/config.cc b/source/extensions/filters/http/grpc_json_transcoder/config.cc index f4386c97eeb7c..4b8850136c974 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/config.cc +++ b/source/extensions/filters/http/grpc_json_transcoder/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/grpc_json_transcoder/config.h" +#include "source/extensions/filters/http/grpc_json_transcoder/config.h" #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h" #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h" +#include "source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_json_transcoder/config.h b/source/extensions/filters/http/grpc_json_transcoder/config.h index a48b06dd75117..e67fc47b993e0 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/config.h +++ b/source/extensions/filters/http/grpc_json_transcoder/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h" #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.cc b/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.cc index 7741c98c06135..2c14539be75ba 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.cc +++ b/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/grpc_json_transcoder/http_body_utils.h" +#include "source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h" #include "google/api/httpbody.pb.h" diff --git a/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h b/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h index 82ef031ca35be..8847441c4732d 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h +++ b/source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h @@ -2,9 +2,9 @@ #include "envoy/buffer/buffer.h" -#include "common/buffer/buffer_impl.h" -#include "common/grpc/codec.h" -#include "common/protobuf/protobuf.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/grpc/codec.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc index a7d93f1b63429..2a14a74633bad 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc +++ b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h" +#include "source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h" #include #include @@ -7,18 +7,17 @@ #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h" #include "envoy/http/filter.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/common/utility.h" -#include "common/grpc/common.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_features.h" - -#include "extensions/filters/http/grpc_json_transcoder/http_body_utils.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_features.h" +#include "source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h" +#include "source/extensions/filters/http/well_known_names.h" #include "google/api/annotations.pb.h" #include "google/api/http.pb.h" diff --git a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h index 6b80e0cc5762e..727e9e39525c3 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h +++ b/source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h @@ -6,12 +6,11 @@ #include "envoy/http/filter.h" #include "envoy/http/header_map.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" -#include "common/grpc/codec.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/common/grpc/codec.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h" #include "google/api/http.pb.h" #include "grpc_transcoding/path_matcher.h" diff --git a/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.cc b/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.cc index f2dbe5983f612..7c220c004a641 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.cc +++ b/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h" +#include "source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h b/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h index ff342cfdb5c43..5c294d74ce609 100644 --- a/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h +++ b/source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h @@ -1,6 +1,6 @@ #pragma once -#include "common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" #include "grpc_transcoding/transcoder_input_stream.h" diff --git a/source/extensions/filters/http/grpc_stats/BUILD b/source/extensions/filters/http/grpc_stats/BUILD index 078b140e912eb..7a119258e8a45 100644 --- a/source/extensions/filters/http/grpc_stats/BUILD +++ b/source/extensions/filters/http/grpc_stats/BUILD @@ -15,9 +15,9 @@ envoy_cc_extension( srcs = ["grpc_stats_filter.cc"], hdrs = ["grpc_stats_filter.h"], deps = [ - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stream_info:filter_state_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", + "//envoy/stream_info:filter_state_interface", "//source/common/grpc:codec_lib", "//source/common/grpc:common_lib", "//source/common/grpc:context_lib", diff --git a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc index e71f7993f57dd..24861b1be852e 100644 --- a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc +++ b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.cc @@ -1,16 +1,15 @@ -#include "extensions/filters/http/grpc_stats/grpc_stats_filter.h" +#include "source/extensions/filters/http/grpc_stats/grpc_stats_filter.h" #include "envoy/extensions/filters/http/grpc_stats/v3/config.pb.h" #include "envoy/extensions/filters/http/grpc_stats/v3/config.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/grpc/codec.h" -#include "common/grpc/common.h" -#include "common/grpc/context_impl.h" -#include "common/runtime/runtime_impl.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/common.h" +#include "source/common/grpc/context_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.h b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.h index 0734d10e8d3d0..f66d23744b8f1 100644 --- a/source/extensions/filters/http/grpc_stats/grpc_stats_filter.h +++ b/source/extensions/filters/http/grpc_stats/grpc_stats_filter.h @@ -5,8 +5,8 @@ #include "envoy/server/filter_config.h" #include "envoy/stream_info/filter_state.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_web/BUILD b/source/extensions/filters/http/grpc_web/BUILD index f0f341b49708a..21fa6e4ac5d37 100644 --- a/source/extensions/filters/http/grpc_web/BUILD +++ b/source/extensions/filters/http/grpc_web/BUILD @@ -17,8 +17,8 @@ envoy_cc_library( srcs = ["grpc_web_filter.cc"], hdrs = ["grpc_web_filter.h"], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/http:filter_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:base64_lib", "//source/common/common:utility_lib", "//source/common/grpc:codec_lib", @@ -33,8 +33,8 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/grpc_web:grpc_web_filter_lib", diff --git a/source/extensions/filters/http/grpc_web/config.cc b/source/extensions/filters/http/grpc_web/config.cc index 28fb50f6fd4d3..c86c8bbcf50e8 100644 --- a/source/extensions/filters/http/grpc_web/config.cc +++ b/source/extensions/filters/http/grpc_web/config.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/http/grpc_web/config.h" +#include "source/extensions/filters/http/grpc_web/config.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/grpc_web/grpc_web_filter.h" +#include "source/extensions/filters/http/grpc_web/grpc_web_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_web/config.h b/source/extensions/filters/http/grpc_web/config.h index fccfe0d3a1e09..a14a734d7d411 100644 --- a/source/extensions/filters/http/grpc_web/config.h +++ b/source/extensions/filters/http/grpc_web/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/grpc_web/v3/grpc_web.pb.h" #include "envoy/extensions/filters/http/grpc_web/v3/grpc_web.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_web/grpc_web_filter.cc b/source/extensions/filters/http/grpc_web/grpc_web_filter.cc index 93953fe44efd7..ca474514a4508 100644 --- a/source/extensions/filters/http/grpc_web/grpc_web_filter.cc +++ b/source/extensions/filters/http/grpc_web/grpc_web_filter.cc @@ -1,19 +1,19 @@ -#include "extensions/filters/http/grpc_web/grpc_web_filter.h" +#include "source/extensions/filters/http/grpc_web/grpc_web_filter.h" #ifndef WIN32 #include #endif -#include "common/common/assert.h" -#include "common/common/base64.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/utility.h" -#include "common/grpc/common.h" -#include "common/grpc/context_impl.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/assert.h" +#include "source/common/common/base64.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/grpc/context_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/grpc_web/grpc_web_filter.h b/source/extensions/filters/http/grpc_web/grpc_web_filter.h index 01f4d59699b26..11c3a75a374d4 100644 --- a/source/extensions/filters/http/grpc_web/grpc_web_filter.h +++ b/source/extensions/filters/http/grpc_web/grpc_web_filter.h @@ -3,10 +3,10 @@ #include "envoy/http/filter.h" #include "envoy/upstream/cluster_manager.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/non_copyable.h" -#include "common/grpc/codec.h" -#include "common/grpc/context_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/non_copyable.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/context_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/gzip/config.cc b/source/extensions/filters/http/gzip/config.cc index e4344b8c9e352..ebfd4e192ce95 100644 --- a/source/extensions/filters/http/gzip/config.cc +++ b/source/extensions/filters/http/gzip/config.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/http/gzip/config.h" +#include "source/extensions/filters/http/gzip/config.h" -#include "extensions/filters/http/gzip/gzip_filter.h" +#include "source/extensions/filters/http/gzip/gzip_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/gzip/config.h b/source/extensions/filters/http/gzip/config.h index b91f55699430c..53addbfcacebf 100644 --- a/source/extensions/filters/http/gzip/config.h +++ b/source/extensions/filters/http/gzip/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/gzip/v3/gzip.pb.h" #include "envoy/extensions/filters/http/gzip/v3/gzip.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/gzip/gzip_filter.cc b/source/extensions/filters/http/gzip/gzip_filter.cc index 804c3b9bd337f..c1e6d529222a5 100644 --- a/source/extensions/filters/http/gzip/gzip_filter.cc +++ b/source/extensions/filters/http/gzip/gzip_filter.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/gzip/gzip_filter.h" +#include "source/extensions/filters/http/gzip/gzip_filter.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/http/headers.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/protobuf.h" +#include "source/common/http/headers.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/gzip/gzip_filter.h b/source/extensions/filters/http/gzip/gzip_filter.h index be30f081a043c..b0cd103be2666 100644 --- a/source/extensions/filters/http/gzip/gzip_filter.h +++ b/source/extensions/filters/http/gzip/gzip_filter.h @@ -2,8 +2,8 @@ #include "envoy/extensions/filters/http/gzip/v3/gzip.pb.h" -#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h" -#include "extensions/filters/http/common/compressor/compressor.h" +#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h" +#include "source/extensions/filters/http/common/compressor/compressor.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/header_to_metadata/BUILD b/source/extensions/filters/http/header_to_metadata/BUILD index f0e7a6a1c3d01..4bb0ab59aa48b 100644 --- a/source/extensions/filters/http/header_to_metadata/BUILD +++ b/source/extensions/filters/http/header_to_metadata/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( srcs = ["header_to_metadata_filter.cc"], hdrs = ["header_to_metadata_filter.h"], deps = [ - "//include/envoy/server:filter_config_interface", + "//envoy/server:filter_config_interface", "//source/common/common:base64_lib", "//source/common/http:header_utility_lib", "//source/common/http:utility_lib", @@ -31,7 +31,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/protobuf:utility_lib", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/extensions/filters/http/header_to_metadata/config.cc b/source/extensions/filters/http/header_to_metadata/config.cc index e51104c658da9..1412e662fbce6 100644 --- a/source/extensions/filters/http/header_to_metadata/config.cc +++ b/source/extensions/filters/http/header_to_metadata/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/header_to_metadata/config.h" +#include "source/extensions/filters/http/header_to_metadata/config.h" #include @@ -6,9 +6,8 @@ #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/header_to_metadata/header_to_metadata_filter.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/header_to_metadata/config.h b/source/extensions/filters/http/header_to_metadata/config.h index 247fa1c535e33..3c4798333b27c 100644 --- a/source/extensions/filters/http/header_to_metadata/config.h +++ b/source/extensions/filters/http/header_to_metadata/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.h" #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc b/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc index 2d5358f89aebe..52242f1120ea3 100644 --- a/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc +++ b/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.cc @@ -1,15 +1,14 @@ -#include "extensions/filters/http/header_to_metadata/header_to_metadata_filter.h" +#include "source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h" #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.h" -#include "common/common/base64.h" -#include "common/common/regex.h" -#include "common/config/well_known_names.h" -#include "common/http/header_utility.h" -#include "common/http/utility.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/base64.h" +#include "source/common/common/regex.h" +#include "source/common/config/well_known_names.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/http/well_known_names.h" #include "absl/strings/numbers.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h b/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h index a9bb0476f9661..b135f412bca81 100644 --- a/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h +++ b/source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h @@ -7,8 +7,8 @@ #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.h" #include "envoy/server/filter_config.h" -#include "common/common/logger.h" -#include "common/common/matchers.h" +#include "source/common/common/logger.h" +#include "source/common/common/matchers.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/health_check/BUILD b/source/extensions/filters/http/health_check/BUILD index 52c1554da2e06..ca01c4f01de08 100644 --- a/source/extensions/filters/http/health_check/BUILD +++ b/source/extensions/filters/http/health_check/BUILD @@ -17,11 +17,11 @@ envoy_cc_library( srcs = ["health_check.cc"], hdrs = ["health_check.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", + "//envoy/server:filter_config_interface", "//source/common/common:assert_lib", "//source/common/common:enum_to_int", "//source/common/http:codes_lib", @@ -44,7 +44,7 @@ envoy_cc_extension( "//test/server:__subpackages__", ], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/http:header_utility_lib", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/extensions/filters/http/health_check/config.cc b/source/extensions/filters/http/health_check/config.cc index 7baa31b01daa5..faad4fce070c3 100644 --- a/source/extensions/filters/http/health_check/config.cc +++ b/source/extensions/filters/http/health_check/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/health_check/config.h" +#include "source/extensions/filters/http/health_check/config.h" #include @@ -6,10 +6,9 @@ #include "envoy/extensions/filters/http/health_check/v3/health_check.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" - -#include "extensions/filters/http/health_check/health_check.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/extensions/filters/http/health_check/health_check.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/health_check/config.h b/source/extensions/filters/http/health_check/config.h index e42bdacd03b71..207e8a956a65c 100644 --- a/source/extensions/filters/http/health_check/config.h +++ b/source/extensions/filters/http/health_check/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/health_check/v3/health_check.pb.h" #include "envoy/extensions/filters/http/health_check/v3/health_check.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/health_check/health_check.cc b/source/extensions/filters/http/health_check/health_check.cc index 65713a721c1c4..4a15e62df9f95 100644 --- a/source/extensions/filters/http/health_check/health_check.cc +++ b/source/extensions/filters/http/health_check/health_check.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/health_check/health_check.h" +#include "source/extensions/filters/http/health_check/health_check.h" #include #include @@ -7,13 +7,13 @@ #include "envoy/event/timer.h" #include "envoy/http/header_map.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/health_check/health_check.h b/source/extensions/filters/http/health_check/health_check.h index d11f0d3a80a93..674ed59af58ee 100644 --- a/source/extensions/filters/http/health_check/health_check.h +++ b/source/extensions/filters/http/health_check/health_check.h @@ -9,7 +9,7 @@ #include "envoy/http/filter.h" #include "envoy/server/filter_config.h" -#include "common/http/header_utility.h" +#include "source/common/http/header_utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ip_tagging/BUILD b/source/extensions/filters/http/ip_tagging/BUILD index 443d168101f46..4d280597e6ed6 100644 --- a/source/extensions/filters/http/ip_tagging/BUILD +++ b/source/extensions/filters/http/ip_tagging/BUILD @@ -17,8 +17,8 @@ envoy_cc_library( srcs = ["ip_tagging_filter.cc"], hdrs = ["ip_tagging_filter.h"], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/runtime:runtime_interface", + "//envoy/http:filter_interface", + "//envoy/runtime:runtime_interface", "//source/common/common:assert_lib", "//source/common/http:header_map_lib", "//source/common/http:headers_lib", @@ -38,7 +38,7 @@ envoy_cc_extension( "//test/integration:__subpackages__", ], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/protobuf:utility_lib", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/extensions/filters/http/ip_tagging/config.cc b/source/extensions/filters/http/ip_tagging/config.cc index 4b66bb2d34a08..7ee7d5797fb2c 100644 --- a/source/extensions/filters/http/ip_tagging/config.cc +++ b/source/extensions/filters/http/ip_tagging/config.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/http/ip_tagging/config.h" +#include "source/extensions/filters/http/ip_tagging/config.h" #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.h" #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/ip_tagging/ip_tagging_filter.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/ip_tagging/ip_tagging_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ip_tagging/config.h b/source/extensions/filters/http/ip_tagging/config.h index b9d296096f1dc..4a4d09ab9eff8 100644 --- a/source/extensions/filters/http/ip_tagging/config.h +++ b/source/extensions/filters/http/ip_tagging/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.h" #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc index ed68cbe77144f..3d308294ecb01 100644 --- a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc +++ b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/ip_tagging/ip_tagging_filter.h" +#include "source/extensions/filters/http/ip_tagging/ip_tagging_filter.h" #include "envoy/config/core/v3/address.pb.h" #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" #include "absl/strings/str_join.h" diff --git a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h index a37c5b9006a87..3753122a3dff5 100644 --- a/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h +++ b/source/extensions/filters/http/ip_tagging/ip_tagging_filter.h @@ -12,9 +12,9 @@ #include "envoy/runtime/runtime.h" #include "envoy/stats/scope.h" -#include "common/network/cidr_range.h" -#include "common/network/lc_trie.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/network/cidr_range.h" +#include "source/common/network/lc_trie.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/jwt_authn/BUILD b/source/extensions/filters/http/jwt_authn/BUILD index d90c7cd27631e..20425aa8ebc8a 100644 --- a/source/extensions/filters/http/jwt_authn/BUILD +++ b/source/extensions/filters/http/jwt_authn/BUILD @@ -24,7 +24,7 @@ envoy_cc_library( name = "stats_lib", hdrs = ["stats.h"], deps = [ - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_macros", ], ) @@ -37,7 +37,7 @@ envoy_cc_library( ], deps = [ ":stats_lib", - "//include/envoy/server:factory_context_interface", + "//envoy/server:factory_context_interface", "//source/common/common:minimal_logger_lib", "//source/common/init:target_lib", "//source/common/protobuf:utility_lib", @@ -68,8 +68,8 @@ envoy_cc_library( deps = [ ":extractor_lib", ":jwks_cache_lib", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stats:stats_macros", + "//envoy/server:filter_config_interface", + "//envoy/stats:stats_macros", "//source/common/http:message_lib", "//source/common/tracing:http_tracer_lib", "//source/extensions/filters/http/common:jwks_fetcher_lib", @@ -86,7 +86,7 @@ envoy_cc_library( deps = [ ":filter_config_lib", ":matchers_lib", - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/common/http:headers_lib", "//source/extensions/filters/http:well_known_names", ], @@ -98,7 +98,7 @@ envoy_cc_extension( hdrs = ["filter_factory.h"], deps = [ ":filter_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "@envoy_api//envoy/extensions/filters/http/jwt_authn/v3:pkg_cc_proto", @@ -126,7 +126,7 @@ envoy_cc_library( deps = [ ":authenticator_lib", ":extractor_lib", - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "@envoy_api//envoy/extensions/filters/http/jwt_authn/v3:pkg_cc_proto", ], ) @@ -138,10 +138,10 @@ envoy_cc_library( deps = [ ":jwks_cache_lib", ":matchers_lib", - "//include/envoy/router:string_accessor_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/router:string_accessor_interface", + "//envoy/server:filter_config_interface", + "//envoy/stats:stats_macros", + "//envoy/thread_local:thread_local_interface", "@envoy_api//envoy/extensions/filters/http/jwt_authn/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/http/jwt_authn/authenticator.cc b/source/extensions/filters/http/jwt_authn/authenticator.cc index fd960636ac41d..ee5aa0b1cc007 100644 --- a/source/extensions/filters/http/jwt_authn/authenticator.cc +++ b/source/extensions/filters/http/jwt_authn/authenticator.cc @@ -1,14 +1,14 @@ -#include "extensions/filters/http/jwt_authn/authenticator.h" +#include "source/extensions/filters/http/jwt_authn/authenticator.h" #include "envoy/http/async_client.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/common/logger.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/protobuf/protobuf.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/logger.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/tracing/http_tracer_impl.h" #include "jwt_verify_lib/jwt.h" #include "jwt_verify_lib/verify.h" diff --git a/source/extensions/filters/http/jwt_authn/authenticator.h b/source/extensions/filters/http/jwt_authn/authenticator.h index 04ee62cede1e1..f8dd647c7f4f9 100644 --- a/source/extensions/filters/http/jwt_authn/authenticator.h +++ b/source/extensions/filters/http/jwt_authn/authenticator.h @@ -2,8 +2,8 @@ #include "envoy/server/filter_config.h" -#include "extensions/filters/http/jwt_authn/extractor.h" -#include "extensions/filters/http/jwt_authn/jwks_cache.h" +#include "source/extensions/filters/http/jwt_authn/extractor.h" +#include "source/extensions/filters/http/jwt_authn/jwks_cache.h" #include "jwt_verify_lib/check_audience.h" #include "jwt_verify_lib/status.h" diff --git a/source/extensions/filters/http/jwt_authn/extractor.cc b/source/extensions/filters/http/jwt_authn/extractor.cc index 68e338c6421a7..8b78af98d0a9b 100644 --- a/source/extensions/filters/http/jwt_authn/extractor.cc +++ b/source/extensions/filters/http/jwt_authn/extractor.cc @@ -1,14 +1,14 @@ -#include "extensions/filters/http/jwt_authn/extractor.h" +#include "source/extensions/filters/http/jwt_authn/extractor.h" #include #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "common/common/utility.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/singleton/const_singleton.h" +#include "source/common/common/utility.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/singleton/const_singleton.h" #include "absl/container/node_hash_set.h" #include "absl/strings/match.h" diff --git a/source/extensions/filters/http/jwt_authn/extractor.h b/source/extensions/filters/http/jwt_authn/extractor.h index 921e489e7c184..98fb637c05fb1 100644 --- a/source/extensions/filters/http/jwt_authn/extractor.h +++ b/source/extensions/filters/http/jwt_authn/extractor.h @@ -6,7 +6,7 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" #include "envoy/http/header_map.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/jwt_authn/filter.cc b/source/extensions/filters/http/jwt_authn/filter.cc index 343ebc1cbeff6..bc494c071d9ce 100644 --- a/source/extensions/filters/http/jwt_authn/filter.cc +++ b/source/extensions/filters/http/jwt_authn/filter.cc @@ -1,9 +1,8 @@ -#include "extensions/filters/http/jwt_authn/filter.h" +#include "source/extensions/filters/http/jwt_authn/filter.h" -#include "common/http/headers.h" -#include "common/http/utility.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/extensions/filters/http/well_known_names.h" #include "absl/strings/str_split.h" #include "jwt_verify_lib/status.h" diff --git a/source/extensions/filters/http/jwt_authn/filter.h b/source/extensions/filters/http/jwt_authn/filter.h index 732eb1ca913dd..f4d95f04d9004 100644 --- a/source/extensions/filters/http/jwt_authn/filter.h +++ b/source/extensions/filters/http/jwt_authn/filter.h @@ -2,12 +2,11 @@ #include "envoy/http/filter.h" -#include "common/common/lock_guard.h" -#include "common/common/logger.h" -#include "common/common/thread.h" - -#include "extensions/filters/http/jwt_authn/filter_config.h" -#include "extensions/filters/http/jwt_authn/matcher.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/extensions/filters/http/jwt_authn/filter_config.h" +#include "source/extensions/filters/http/jwt_authn/matcher.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/jwt_authn/filter_config.cc b/source/extensions/filters/http/jwt_authn/filter_config.cc index 475d993daaeca..8d2874290678f 100644 --- a/source/extensions/filters/http/jwt_authn/filter_config.cc +++ b/source/extensions/filters/http/jwt_authn/filter_config.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/http/jwt_authn/filter_config.h" +#include "source/extensions/filters/http/jwt_authn/filter_config.h" #include // std::sort -#include "common/common/empty_string.h" +#include "source/common/common/empty_string.h" using envoy::extensions::filters::http::jwt_authn::v3::RequirementRule; diff --git a/source/extensions/filters/http/jwt_authn/filter_config.h b/source/extensions/filters/http/jwt_authn/filter_config.h index 78f0e23d98783..b2508e4aa7046 100644 --- a/source/extensions/filters/http/jwt_authn/filter_config.h +++ b/source/extensions/filters/http/jwt_authn/filter_config.h @@ -8,9 +8,9 @@ #include "envoy/stats/stats_macros.h" #include "envoy/thread_local/thread_local.h" -#include "extensions/filters/http/jwt_authn/matcher.h" -#include "extensions/filters/http/jwt_authn/stats.h" -#include "extensions/filters/http/jwt_authn/verifier.h" +#include "source/extensions/filters/http/jwt_authn/matcher.h" +#include "source/extensions/filters/http/jwt_authn/stats.h" +#include "source/extensions/filters/http/jwt_authn/verifier.h" #include "absl/container/flat_hash_map.h" diff --git a/source/extensions/filters/http/jwt_authn/filter_factory.cc b/source/extensions/filters/http/jwt_authn/filter_factory.cc index 579571bd3d058..e2dc2b99ebb03 100644 --- a/source/extensions/filters/http/jwt_authn/filter_factory.cc +++ b/source/extensions/filters/http/jwt_authn/filter_factory.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/http/jwt_authn/filter_factory.h" +#include "source/extensions/filters/http/jwt_authn/filter_factory.h" #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/config/datasource.h" - -#include "extensions/filters/http/jwt_authn/filter.h" +#include "source/common/config/datasource.h" +#include "source/extensions/filters/http/jwt_authn/filter.h" #include "jwt_verify_lib/jwks.h" diff --git a/source/extensions/filters/http/jwt_authn/filter_factory.h b/source/extensions/filters/http/jwt_authn/filter_factory.h index c0398c71e4210..d2c537e2b0f4e 100644 --- a/source/extensions/filters/http/jwt_authn/filter_factory.h +++ b/source/extensions/filters/http/jwt_authn/filter_factory.h @@ -4,8 +4,8 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.validate.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.cc b/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.cc index 0ec5bbdce98f8..ddd7350d44d36 100644 --- a/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.cc +++ b/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.cc @@ -1,7 +1,7 @@ -#include "extensions/filters/http/jwt_authn/jwks_async_fetcher.h" +#include "source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h" -#include "common/protobuf/utility.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/tracing/http_tracer_impl.h" using envoy::extensions::filters::http::jwt_authn::v3::RemoteJwks; diff --git a/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h b/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h index c5909909b44ed..0d6247394ebac 100644 --- a/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h +++ b/source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h @@ -5,11 +5,10 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" #include "envoy/server/factory_context.h" -#include "common/common/logger.h" -#include "common/init/target_impl.h" - -#include "extensions/filters/http/common/jwks_fetcher.h" -#include "extensions/filters/http/jwt_authn/stats.h" +#include "source/common/common/logger.h" +#include "source/common/init/target_impl.h" +#include "source/extensions/filters/http/common/jwks_fetcher.h" +#include "source/extensions/filters/http/jwt_authn/stats.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/jwt_authn/jwks_cache.cc b/source/extensions/filters/http/jwt_authn/jwks_cache.cc index 48199f0f6d4ff..673b4f6823d8d 100644 --- a/source/extensions/filters/http/jwt_authn/jwks_cache.cc +++ b/source/extensions/filters/http/jwt_authn/jwks_cache.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/http/jwt_authn/jwks_cache.h" +#include "source/extensions/filters/http/jwt_authn/jwks_cache.h" #include #include "envoy/common/time.h" #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "common/common/logger.h" -#include "common/config/datasource.h" +#include "source/common/common/logger.h" +#include "source/common/config/datasource.h" #include "absl/container/node_hash_map.h" #include "jwt_verify_lib/check_audience.h" diff --git a/source/extensions/filters/http/jwt_authn/jwks_cache.h b/source/extensions/filters/http/jwt_authn/jwks_cache.h index 186401c44c965..0efcb23931362 100644 --- a/source/extensions/filters/http/jwt_authn/jwks_cache.h +++ b/source/extensions/filters/http/jwt_authn/jwks_cache.h @@ -6,9 +6,9 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" #include "envoy/thread_local/thread_local.h" -#include "extensions/filters/http/common/jwks_fetcher.h" -#include "extensions/filters/http/jwt_authn/jwks_async_fetcher.h" -#include "extensions/filters/http/jwt_authn/stats.h" +#include "source/extensions/filters/http/common/jwks_fetcher.h" +#include "source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h" +#include "source/extensions/filters/http/jwt_authn/stats.h" #include "jwt_verify_lib/jwks.h" diff --git a/source/extensions/filters/http/jwt_authn/matcher.cc b/source/extensions/filters/http/jwt_authn/matcher.cc index 7cc62471c63f5..7eb1cfcab9d85 100644 --- a/source/extensions/filters/http/jwt_authn/matcher.cc +++ b/source/extensions/filters/http/jwt_authn/matcher.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/http/jwt_authn/matcher.h" +#include "source/extensions/filters/http/jwt_authn/matcher.h" #include "envoy/config/route/v3/route_components.pb.h" #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "common/common/logger.h" -#include "common/common/matchers.h" -#include "common/common/regex.h" -#include "common/router/config_impl.h" +#include "source/common/common/logger.h" +#include "source/common/common/matchers.h" +#include "source/common/common/regex.h" +#include "source/common/router/config_impl.h" #include "absl/strings/match.h" diff --git a/source/extensions/filters/http/jwt_authn/verifier.cc b/source/extensions/filters/http/jwt_authn/verifier.cc index 83361c8edd7b8..c22c446cc98e7 100644 --- a/source/extensions/filters/http/jwt_authn/verifier.cc +++ b/source/extensions/filters/http/jwt_authn/verifier.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/jwt_authn/verifier.h" +#include "source/extensions/filters/http/jwt_authn/verifier.h" #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" diff --git a/source/extensions/filters/http/jwt_authn/verifier.h b/source/extensions/filters/http/jwt_authn/verifier.h index b66c157fb45e2..2b62ed4bcec90 100644 --- a/source/extensions/filters/http/jwt_authn/verifier.h +++ b/source/extensions/filters/http/jwt_authn/verifier.h @@ -2,7 +2,7 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "extensions/filters/http/jwt_authn/authenticator.h" +#include "source/extensions/filters/http/jwt_authn/authenticator.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/kill_request/BUILD b/source/extensions/filters/http/kill_request/BUILD index 2a7a21ef355e7..b7ad1487da429 100644 --- a/source/extensions/filters/http/kill_request/BUILD +++ b/source/extensions/filters/http/kill_request/BUILD @@ -14,9 +14,9 @@ envoy_cc_library( srcs = ["kill_request_filter.cc"], hdrs = ["kill_request_filter.h"], deps = [ - "//include/envoy/common:random_generator_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", + "//envoy/common:random_generator_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", "//source/common/http:header_map_lib", "//source/common/http:header_utility_lib", "//source/common/http:headers_lib", @@ -31,7 +31,7 @@ envoy_cc_extension( srcs = ["kill_request_config.cc"], hdrs = ["kill_request_config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/kill_request:kill_request_filter_lib", diff --git a/source/extensions/filters/http/kill_request/kill_request_config.cc b/source/extensions/filters/http/kill_request/kill_request_config.cc index cb371c098da22..ba74b8c16da9e 100644 --- a/source/extensions/filters/http/kill_request/kill_request_config.cc +++ b/source/extensions/filters/http/kill_request/kill_request_config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/kill_request/kill_request_config.h" +#include "source/extensions/filters/http/kill_request/kill_request_config.h" #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.h" #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/kill_request/kill_request_filter.h" +#include "source/extensions/filters/http/kill_request/kill_request_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/kill_request/kill_request_config.h b/source/extensions/filters/http/kill_request/kill_request_config.h index 4e56068d77500..1c757936532c5 100644 --- a/source/extensions/filters/http/kill_request/kill_request_config.h +++ b/source/extensions/filters/http/kill_request/kill_request_config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.h" #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/kill_request/kill_request_filter.cc b/source/extensions/filters/http/kill_request/kill_request_filter.cc index b6269db1593bd..d21c755330634 100644 --- a/source/extensions/filters/http/kill_request/kill_request_filter.cc +++ b/source/extensions/filters/http/kill_request/kill_request_filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/kill_request/kill_request_filter.h" +#include "source/extensions/filters/http/kill_request/kill_request_filter.h" #include #include @@ -6,10 +6,9 @@ #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.h" #include "envoy/http/header_map.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/kill_request/kill_request_filter.h b/source/extensions/filters/http/kill_request/kill_request_filter.h index be84624ea62fb..b97c66fa14b10 100644 --- a/source/extensions/filters/http/kill_request/kill_request_filter.h +++ b/source/extensions/filters/http/kill_request/kill_request_filter.h @@ -7,8 +7,8 @@ #include "envoy/http/filter.h" #include "envoy/http/header_map.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/local_ratelimit/BUILD b/source/extensions/filters/http/local_ratelimit/BUILD index d409a424fd6bf..e1842983b4664 100644 --- a/source/extensions/filters/http/local_ratelimit/BUILD +++ b/source/extensions/filters/http/local_ratelimit/BUILD @@ -17,9 +17,9 @@ envoy_cc_library( srcs = ["local_ratelimit.cc"], hdrs = ["local_ratelimit.h"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stats:stats_macros", + "//envoy/http:codes_interface", + "//envoy/server:filter_config_interface", + "//envoy/stats:stats_macros", "//source/common/common:utility_lib", "//source/common/http:header_utility_lib", "//source/common/http:headers_lib", @@ -38,7 +38,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":local_ratelimit_lib", - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/common/protobuf:utility_lib", "//source/extensions/filters/http/common:factory_base_lib", "@envoy_api//envoy/extensions/filters/http/local_ratelimit/v3:pkg_cc_proto", diff --git a/source/extensions/filters/http/local_ratelimit/config.cc b/source/extensions/filters/http/local_ratelimit/config.cc index a5e629d88055d..15c7107276960 100644 --- a/source/extensions/filters/http/local_ratelimit/config.cc +++ b/source/extensions/filters/http/local_ratelimit/config.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/http/local_ratelimit/config.h" +#include "source/extensions/filters/http/local_ratelimit/config.h" #include #include "envoy/registry/registry.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/local_ratelimit/local_ratelimit.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/local_ratelimit/local_ratelimit.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/local_ratelimit/config.h b/source/extensions/filters/http/local_ratelimit/config.h index 4ee849e368bea..96ae7caa5b892 100644 --- a/source/extensions/filters/http/local_ratelimit/config.h +++ b/source/extensions/filters/http/local_ratelimit/config.h @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.h" #include "envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/common/factory_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/local_ratelimit/local_ratelimit.cc b/source/extensions/filters/http/local_ratelimit/local_ratelimit.cc index 741ec1b3346c0..b216b15075af1 100644 --- a/source/extensions/filters/http/local_ratelimit/local_ratelimit.cc +++ b/source/extensions/filters/http/local_ratelimit/local_ratelimit.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/http/local_ratelimit/local_ratelimit.h" +#include "source/extensions/filters/http/local_ratelimit/local_ratelimit.h" #include #include #include "envoy/http/codes.h" -#include "common/http/utility.h" -#include "common/router/config_impl.h" +#include "source/common/http/utility.h" +#include "source/common/router/config_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/local_ratelimit/local_ratelimit.h b/source/extensions/filters/http/local_ratelimit/local_ratelimit.h index 380fd212a5052..5b485e6b999fb 100644 --- a/source/extensions/filters/http/local_ratelimit/local_ratelimit.h +++ b/source/extensions/filters/http/local_ratelimit/local_ratelimit.h @@ -12,14 +12,13 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/assert.h" -#include "common/http/header_map_impl.h" -#include "common/router/header_parser.h" -#include "common/runtime/runtime_protos.h" - -#include "extensions/filters/common/local_ratelimit/local_ratelimit_impl.h" -#include "extensions/filters/common/ratelimit/ratelimit.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/common/assert.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/router/header_parser.h" +#include "source/common/runtime/runtime_protos.h" +#include "source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h" +#include "source/extensions/filters/common/ratelimit/ratelimit.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/lua/BUILD b/source/extensions/filters/http/lua/BUILD index c4683e8263534..733ed65b6906a 100644 --- a/source/extensions/filters/http/lua/BUILD +++ b/source/extensions/filters/http/lua/BUILD @@ -18,9 +18,9 @@ envoy_cc_library( hdrs = ["lua_filter.h"], deps = [ ":wrappers_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/buffer:buffer_lib", "//source/common/common:enum_to_int", "//source/common/config:datasource_lib", @@ -40,8 +40,8 @@ envoy_cc_library( srcs = ["wrappers.cc"], hdrs = ["wrappers.h"], deps = [ - "//include/envoy/http:header_map_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/http:header_map_interface", + "//envoy/stream_info:stream_info_interface", "//source/common/crypto:utility_lib", "//source/common/http:header_utility_lib", "//source/common/http:utility_lib", @@ -56,7 +56,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/lua:lua_filter_lib", diff --git a/source/extensions/filters/http/lua/config.cc b/source/extensions/filters/http/lua/config.cc index 6bc518bf66595..6ed6ba6ddcd98 100644 --- a/source/extensions/filters/http/lua/config.cc +++ b/source/extensions/filters/http/lua/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/lua/config.h" +#include "source/extensions/filters/http/lua/config.h" #include "envoy/extensions/filters/http/lua/v3/lua.pb.h" #include "envoy/extensions/filters/http/lua/v3/lua.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/lua/lua_filter.h" +#include "source/extensions/filters/http/lua/lua_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/lua/config.h b/source/extensions/filters/http/lua/config.h index b2057c532f2b5..8516a94e9c0e0 100644 --- a/source/extensions/filters/http/lua/config.h +++ b/source/extensions/filters/http/lua/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/lua/v3/lua.pb.h" #include "envoy/extensions/filters/http/lua/v3/lua.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/lua/lua_filter.cc b/source/extensions/filters/http/lua/lua_filter.cc index 883101fa0efe8..03e5ae9a8b20c 100644 --- a/source/extensions/filters/http/lua/lua_filter.cc +++ b/source/extensions/filters/http/lua/lua_filter.cc @@ -1,16 +1,16 @@ -#include "extensions/filters/http/lua/lua_filter.h" +#include "source/extensions/filters/http/lua/lua_filter.h" #include #include #include "envoy/http/codes.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/config/datasource.h" -#include "common/crypto/utility.h" -#include "common/http/message_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/config/datasource.h" +#include "source/common/crypto/utility.h" +#include "source/common/http/message_impl.h" #include "absl/strings/escaping.h" diff --git a/source/extensions/filters/http/lua/lua_filter.h b/source/extensions/filters/http/lua/lua_filter.h index 5595eb72a41df..4e778a6e07149 100644 --- a/source/extensions/filters/http/lua/lua_filter.h +++ b/source/extensions/filters/http/lua/lua_filter.h @@ -4,14 +4,13 @@ #include "envoy/http/filter.h" #include "envoy/upstream/cluster_manager.h" -#include "common/crypto/utility.h" -#include "common/http/utility.h" - -#include "extensions/common/utility.h" -#include "extensions/filters/common/lua/wrappers.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/lua/wrappers.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/crypto/utility.h" +#include "source/common/http/utility.h" +#include "source/extensions/common/utility.h" +#include "source/extensions/filters/common/lua/wrappers.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/lua/wrappers.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/lua/wrappers.cc b/source/extensions/filters/http/lua/wrappers.cc index 04fa2842ea645..04bd6a7b3eac5 100644 --- a/source/extensions/filters/http/lua/wrappers.cc +++ b/source/extensions/filters/http/lua/wrappers.cc @@ -1,9 +1,8 @@ -#include "extensions/filters/http/lua/wrappers.h" +#include "source/extensions/filters/http/lua/wrappers.h" -#include "common/http/header_utility.h" -#include "common/http/utility.h" - -#include "extensions/filters/common/lua/wrappers.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/utility.h" +#include "source/extensions/filters/common/lua/wrappers.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/lua/wrappers.h b/source/extensions/filters/http/lua/wrappers.h index 7168fe7768c78..e04ca24f47392 100644 --- a/source/extensions/filters/http/lua/wrappers.h +++ b/source/extensions/filters/http/lua/wrappers.h @@ -3,11 +3,10 @@ #include "envoy/http/header_map.h" #include "envoy/stream_info/stream_info.h" -#include "common/crypto/utility.h" - -#include "extensions/common/crypto/crypto_impl.h" -#include "extensions/filters/common/lua/lua.h" -#include "extensions/filters/common/lua/wrappers.h" +#include "source/common/crypto/utility.h" +#include "source/extensions/common/crypto/crypto_impl.h" +#include "source/extensions/filters/common/lua/lua.h" +#include "source/extensions/filters/common/lua/wrappers.h" #include "openssl/evp.h" diff --git a/source/extensions/filters/http/oauth2/BUILD b/source/extensions/filters/http/oauth2/BUILD index d7ea3098c4498..705c83c10dbc2 100644 --- a/source/extensions/filters/http/oauth2/BUILD +++ b/source/extensions/filters/http/oauth2/BUILD @@ -29,8 +29,8 @@ envoy_cc_library( hdrs = ["oauth_client.h"], deps = [ ":oauth_response_cc_proto", - "//include/envoy/http:async_client_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/http:async_client_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/http:message_lib", "//source/common/http:utility_lib", "//source/common/protobuf:message_validator_lib", @@ -45,7 +45,7 @@ envoy_cc_library( hdrs = ["filter.h"], deps = [ ":oauth_client", - "//include/envoy/server:filter_config_interface", + "//envoy/server:filter_config_interface", "//source/common/common:assert_lib", "//source/common/common:empty_string", "//source/common/config:datasource_lib", @@ -65,7 +65,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":oauth_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "@envoy_api//envoy/api/v2/auth:pkg_cc_proto", diff --git a/source/extensions/filters/http/oauth2/config.cc b/source/extensions/filters/http/oauth2/config.cc index d51d798874e5b..ef8cfc364cb37 100644 --- a/source/extensions/filters/http/oauth2/config.cc +++ b/source/extensions/filters/http/oauth2/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/oauth2/config.h" +#include "source/extensions/filters/http/oauth2/config.h" #include #include @@ -13,11 +13,10 @@ #include "envoy/ssl/private_key/private_key.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/assert.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/oauth2/filter.h" -#include "extensions/filters/http/oauth2/oauth.h" +#include "source/common/common/assert.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/oauth2/filter.h" +#include "source/extensions/filters/http/oauth2/oauth.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/oauth2/config.h b/source/extensions/filters/http/oauth2/config.h index f9f9399f6500f..95200b4d7975c 100644 --- a/source/extensions/filters/http/oauth2/config.h +++ b/source/extensions/filters/http/oauth2/config.h @@ -5,8 +5,8 @@ #include "envoy/extensions/filters/http/oauth2/v3alpha/oauth.pb.h" #include "envoy/extensions/filters/http/oauth2/v3alpha/oauth.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/oauth2/filter.cc b/source/extensions/filters/http/oauth2/filter.cc index ee449c7ff4edd..f7731ee44d7a2 100644 --- a/source/extensions/filters/http/oauth2/filter.cc +++ b/source/extensions/filters/http/oauth2/filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/oauth2/filter.h" +#include "source/extensions/filters/http/oauth2/filter.h" #include #include @@ -6,19 +6,19 @@ #include #include -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/hex.h" -#include "common/common/matchers.h" -#include "common/crypto/utility.h" -#include "common/http/header_map_impl.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/hex.h" +#include "source/common/common/matchers.h" +#include "source/common/crypto/utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" #include "absl/strings/escaping.h" #include "absl/strings/match.h" diff --git a/source/extensions/filters/http/oauth2/filter.h b/source/extensions/filters/http/oauth2/filter.h index bd70be95ed2d7..e2e4b88be3b86 100644 --- a/source/extensions/filters/http/oauth2/filter.h +++ b/source/extensions/filters/http/oauth2/filter.h @@ -14,18 +14,17 @@ #include "envoy/stream_info/stream_info.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/assert.h" -#include "common/common/matchers.h" -#include "common/config/datasource.h" -#include "common/formatter/substitution_formatter.h" -#include "common/http/header_map_impl.h" -#include "common/http/header_utility.h" -#include "common/http/rest_api_fetcher.h" -#include "common/http/utility.h" - -#include "extensions/filters/http/common/pass_through_filter.h" -#include "extensions/filters/http/oauth2/oauth.h" -#include "extensions/filters/http/oauth2/oauth_client.h" +#include "source/common/common/assert.h" +#include "source/common/common/matchers.h" +#include "source/common/config/datasource.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/rest_api_fetcher.h" +#include "source/common/http/utility.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/oauth2/oauth.h" +#include "source/extensions/filters/http/oauth2/oauth_client.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/oauth2/oauth_client.cc b/source/extensions/filters/http/oauth2/oauth_client.cc index ec0793587448b..24335ff6c3909 100644 --- a/source/extensions/filters/http/oauth2/oauth_client.cc +++ b/source/extensions/filters/http/oauth2/oauth_client.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/oauth2/oauth_client.h" +#include "source/extensions/filters/http/oauth2/oauth_client.h" #include @@ -6,13 +6,12 @@ #include "envoy/http/message.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/fmt.h" -#include "common/common/logger.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" - +#include "source/common/common/fmt.h" +#include "source/common/common/logger.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" #include "source/extensions/filters/http/oauth2/oauth_response.pb.h" namespace Envoy { diff --git a/source/extensions/filters/http/oauth2/oauth_client.h b/source/extensions/filters/http/oauth2/oauth_client.h index e270c327236eb..acd680784f4e8 100644 --- a/source/extensions/filters/http/oauth2/oauth_client.h +++ b/source/extensions/filters/http/oauth2/oauth_client.h @@ -8,11 +8,10 @@ #include "envoy/http/message.h" #include "envoy/upstream/cluster_manager.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" - -#include "extensions/filters/http/oauth2/oauth.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/extensions/filters/http/oauth2/oauth.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/on_demand/BUILD b/source/extensions/filters/http/on_demand/BUILD index 5c66187881615..4a1b66d5210f1 100644 --- a/source/extensions/filters/http/on_demand/BUILD +++ b/source/extensions/filters/http/on_demand/BUILD @@ -16,9 +16,9 @@ envoy_cc_library( srcs = ["on_demand_update.cc"], hdrs = ["on_demand_update.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/event:dispatcher_interface", + "//envoy/http:filter_interface", + "//envoy/server:filter_config_interface", "//source/common/common:assert_lib", "//source/common/common:enum_to_int", "//source/common/http:codes_lib", @@ -36,7 +36,7 @@ envoy_cc_extension( "//test/integration:__subpackages__", ], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/on_demand:on_demand_update_lib", diff --git a/source/extensions/filters/http/on_demand/config.cc b/source/extensions/filters/http/on_demand/config.cc index 42d07ef4dca68..34fe2125354b0 100644 --- a/source/extensions/filters/http/on_demand/config.cc +++ b/source/extensions/filters/http/on_demand/config.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/http/on_demand/config.h" +#include "source/extensions/filters/http/on_demand/config.h" #include "envoy/extensions/filters/http/on_demand/v3/on_demand.pb.validate.h" -#include "extensions/filters/http/on_demand/on_demand_update.h" +#include "source/extensions/filters/http/on_demand/on_demand_update.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/on_demand/config.h b/source/extensions/filters/http/on_demand/config.h index eb48654ab34c4..2d321290bb8bf 100644 --- a/source/extensions/filters/http/on_demand/config.h +++ b/source/extensions/filters/http/on_demand/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/on_demand/v3/on_demand.pb.h" #include "envoy/extensions/filters/http/on_demand/v3/on_demand.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/on_demand/on_demand_update.cc b/source/extensions/filters/http/on_demand/on_demand_update.cc index 2e392846f3b0d..25c952fc386df 100644 --- a/source/extensions/filters/http/on_demand/on_demand_update.cc +++ b/source/extensions/filters/http/on_demand/on_demand_update.cc @@ -1,9 +1,9 @@ -#include "extensions/filters/http/on_demand/on_demand_update.h" +#include "source/extensions/filters/http/on_demand/on_demand_update.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/common/logger.h" -#include "common/http/codes.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/logger.h" +#include "source/common/http/codes.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/original_src/BUILD b/source/extensions/filters/http/original_src/BUILD index fe0c2adb6b64c..8b67b11fae92e 100644 --- a/source/extensions/filters/http/original_src/BUILD +++ b/source/extensions/filters/http/original_src/BUILD @@ -24,7 +24,7 @@ envoy_cc_library( hdrs = ["original_src.h"], deps = [ ":config_lib", - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/extensions/filters/common/original_src:socket_option_factory_lib", @@ -38,7 +38,7 @@ envoy_cc_extension( deps = [ ":config_lib", ":original_src_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "@envoy_api//envoy/extensions/filters/http/original_src/v3:pkg_cc_proto", diff --git a/source/extensions/filters/http/original_src/config.cc b/source/extensions/filters/http/original_src/config.cc index d5a28eaebe47b..1c1e4bae381ec 100644 --- a/source/extensions/filters/http/original_src/config.cc +++ b/source/extensions/filters/http/original_src/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/original_src/config.h" +#include "source/extensions/filters/http/original_src/config.h" #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h" diff --git a/source/extensions/filters/http/original_src/original_src.cc b/source/extensions/filters/http/original_src/original_src.cc index ef5f5214ef133..a4ef7d19aa50e 100644 --- a/source/extensions/filters/http/original_src/original_src.cc +++ b/source/extensions/filters/http/original_src/original_src.cc @@ -1,8 +1,7 @@ -#include "extensions/filters/http/original_src/original_src.h" +#include "source/extensions/filters/http/original_src/original_src.h" -#include "common/common/assert.h" - -#include "extensions/filters/common/original_src/socket_option_factory.h" +#include "source/common/common/assert.h" +#include "source/extensions/filters/common/original_src/socket_option_factory.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/original_src/original_src.h b/source/extensions/filters/http/original_src/original_src.h index 032f93ee63048..4d6ed7db1e815 100644 --- a/source/extensions/filters/http/original_src/original_src.h +++ b/source/extensions/filters/http/original_src/original_src.h @@ -3,9 +3,8 @@ #include "envoy/http/filter.h" #include "envoy/network/address.h" -#include "common/common/logger.h" - -#include "extensions/filters/http/original_src/config.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/http/original_src/config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/original_src/original_src_config_factory.cc b/source/extensions/filters/http/original_src/original_src_config_factory.cc index e49efec8596f0..34fbaf9ca6d54 100644 --- a/source/extensions/filters/http/original_src/original_src_config_factory.cc +++ b/source/extensions/filters/http/original_src/original_src_config_factory.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/http/original_src/original_src_config_factory.h" +#include "source/extensions/filters/http/original_src/original_src_config_factory.h" #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h" #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/original_src/config.h" -#include "extensions/filters/http/original_src/original_src.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/original_src/config.h" +#include "source/extensions/filters/http/original_src/original_src.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/original_src/original_src_config_factory.h b/source/extensions/filters/http/original_src/original_src_config_factory.h index e9c3b6dd39b23..61ea5d341a580 100644 --- a/source/extensions/filters/http/original_src/original_src_config_factory.h +++ b/source/extensions/filters/http/original_src/original_src_config_factory.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h" #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ratelimit/BUILD b/source/extensions/filters/http/ratelimit/BUILD index bc845c26ed5a7..db1f99e0f37b3 100644 --- a/source/extensions/filters/http/ratelimit/BUILD +++ b/source/extensions/filters/http/ratelimit/BUILD @@ -18,8 +18,8 @@ envoy_cc_library( hdrs = ["ratelimit.h"], deps = [ ":ratelimit_headers_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/ratelimit:ratelimit_interface", + "//envoy/http:codes_interface", + "//envoy/ratelimit:ratelimit_interface", "//source/common/common:assert_lib", "//source/common/common:empty_string", "//source/common/common:enum_to_int", @@ -47,7 +47,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":ratelimit_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", "//source/extensions/filters/common/ratelimit:ratelimit_client_interface", diff --git a/source/extensions/filters/http/ratelimit/config.cc b/source/extensions/filters/http/ratelimit/config.cc index c0c393b2aa758..0db542d17a9ac 100644 --- a/source/extensions/filters/http/ratelimit/config.cc +++ b/source/extensions/filters/http/ratelimit/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/ratelimit/config.h" +#include "source/extensions/filters/http/ratelimit/config.h" #include #include @@ -7,11 +7,10 @@ #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/common/ratelimit/ratelimit_impl.h" -#include "extensions/filters/http/ratelimit/ratelimit.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h" +#include "source/extensions/filters/http/ratelimit/ratelimit.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ratelimit/config.h b/source/extensions/filters/http/ratelimit/config.h index 82d22786acc5c..fa04571715383 100644 --- a/source/extensions/filters/http/ratelimit/config.h +++ b/source/extensions/filters/http/ratelimit/config.h @@ -3,9 +3,9 @@ #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.h" #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.validate.h" -#include "extensions/filters/common/ratelimit/ratelimit.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/common/ratelimit/ratelimit.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ratelimit/ratelimit.cc b/source/extensions/filters/http/ratelimit/ratelimit.cc index d97b6ea489cbb..2feebe4bfd923 100644 --- a/source/extensions/filters/http/ratelimit/ratelimit.cc +++ b/source/extensions/filters/http/ratelimit/ratelimit.cc @@ -1,19 +1,18 @@ -#include "extensions/filters/http/ratelimit/ratelimit.h" +#include "source/extensions/filters/http/ratelimit/ratelimit.h" #include #include #include "envoy/http/codes.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/http/codes.h" -#include "common/http/header_utility.h" -#include "common/router/config_impl.h" - -#include "extensions/filters/http/ratelimit/ratelimit_headers.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_utility.h" +#include "source/common/router/config_impl.h" +#include "source/extensions/filters/http/ratelimit/ratelimit_headers.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ratelimit/ratelimit.h b/source/extensions/filters/http/ratelimit/ratelimit.h index fc0341e050e39..bee2d04ff2e07 100644 --- a/source/extensions/filters/http/ratelimit/ratelimit.h +++ b/source/extensions/filters/http/ratelimit/ratelimit.h @@ -14,11 +14,10 @@ #include "envoy/stats/scope.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/assert.h" -#include "common/http/header_map_impl.h" - -#include "extensions/filters/common/ratelimit/ratelimit.h" -#include "extensions/filters/common/ratelimit/stat_names.h" +#include "source/common/common/assert.h" +#include "source/common/http/header_map_impl.h" +#include "source/extensions/filters/common/ratelimit/ratelimit.h" +#include "source/extensions/filters/common/ratelimit/stat_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/ratelimit/ratelimit_headers.cc b/source/extensions/filters/http/ratelimit/ratelimit_headers.cc index 097171b108f5b..76644be416df2 100644 --- a/source/extensions/filters/http/ratelimit/ratelimit_headers.cc +++ b/source/extensions/filters/http/ratelimit/ratelimit_headers.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/http/ratelimit/ratelimit_headers.h" +#include "source/extensions/filters/http/ratelimit/ratelimit_headers.h" -#include "common/http/header_map_impl.h" +#include "source/common/http/header_map_impl.h" #include "absl/strings/substitute.h" diff --git a/source/extensions/filters/http/ratelimit/ratelimit_headers.h b/source/extensions/filters/http/ratelimit/ratelimit_headers.h index 047bf495defcf..6717941426560 100644 --- a/source/extensions/filters/http/ratelimit/ratelimit_headers.h +++ b/source/extensions/filters/http/ratelimit/ratelimit_headers.h @@ -2,9 +2,8 @@ #include "envoy/http/header_map.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/filters/common/ratelimit/ratelimit.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/filters/common/ratelimit/ratelimit.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/rbac/BUILD b/source/extensions/filters/http/rbac/BUILD index a0ef997d5e736..34fcc947532ad 100644 --- a/source/extensions/filters/http/rbac/BUILD +++ b/source/extensions/filters/http/rbac/BUILD @@ -13,12 +13,8 @@ envoy_cc_extension( name = "config", srcs = ["config.cc"], hdrs = ["config.h"], - # TODO(#9953) clean up. - extra_visibility = [ - "//test/integration:__subpackages__", - ], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/rbac:rbac_filter_lib", @@ -31,8 +27,8 @@ envoy_cc_library( srcs = ["rbac_filter.cc"], hdrs = ["rbac_filter.h"], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/stats:stats_macros", + "//envoy/http:filter_interface", + "//envoy/stats:stats_macros", "//source/common/http:utility_lib", "//source/extensions/filters/common/rbac:engine_lib", "//source/extensions/filters/common/rbac:utility_lib", diff --git a/source/extensions/filters/http/rbac/config.cc b/source/extensions/filters/http/rbac/config.cc index 4ead41107d5c6..e389ee1030f13 100644 --- a/source/extensions/filters/http/rbac/config.cc +++ b/source/extensions/filters/http/rbac/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/rbac/config.h" +#include "source/extensions/filters/http/rbac/config.h" #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h" #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/rbac/rbac_filter.h" +#include "source/extensions/filters/http/rbac/rbac_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/rbac/config.h b/source/extensions/filters/http/rbac/config.h index b4b377d4a226e..b6cc2c959797d 100644 --- a/source/extensions/filters/http/rbac/config.h +++ b/source/extensions/filters/http/rbac/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h" #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/rbac/rbac_filter.cc b/source/extensions/filters/http/rbac/rbac_filter.cc index bd2b477b468c6..e966285520d82 100644 --- a/source/extensions/filters/http/rbac/rbac_filter.cc +++ b/source/extensions/filters/http/rbac/rbac_filter.cc @@ -1,11 +1,10 @@ -#include "extensions/filters/http/rbac/rbac_filter.h" +#include "source/extensions/filters/http/rbac/rbac_filter.h" #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h" #include "envoy/stats/scope.h" -#include "common/http/utility.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/http/utility.h" +#include "source/extensions/filters/http/well_known_names.h" #include "absl/strings/str_join.h" diff --git a/source/extensions/filters/http/rbac/rbac_filter.h b/source/extensions/filters/http/rbac/rbac_filter.h index f70df4c6e8eee..41d38a9a37c1e 100644 --- a/source/extensions/filters/http/rbac/rbac_filter.h +++ b/source/extensions/filters/http/rbac/rbac_filter.h @@ -7,10 +7,9 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" - -#include "extensions/filters/common/rbac/engine_impl.h" -#include "extensions/filters/common/rbac/utility.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/common/rbac/engine_impl.h" +#include "source/extensions/filters/common/rbac/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/router/BUILD b/source/extensions/filters/http/router/BUILD index 8e268cff166c3..e112cb2b87e69 100644 --- a/source/extensions/filters/http/router/BUILD +++ b/source/extensions/filters/http/router/BUILD @@ -18,7 +18,7 @@ envoy_cc_extension( # This is core Envoy config. visibility = ["//visibility:public"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/router:router_lib", "//source/common/router:shadow_writer_lib", "//source/extensions/filters/http:well_known_names", diff --git a/source/extensions/filters/http/router/config.cc b/source/extensions/filters/http/router/config.cc index 4e18fbe802fbf..75d4410ca9c1a 100644 --- a/source/extensions/filters/http/router/config.cc +++ b/source/extensions/filters/http/router/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/http/router/config.h" +#include "source/extensions/filters/http/router/config.h" #include "envoy/extensions/filters/http/router/v3/router.pb.h" #include "envoy/extensions/filters/http/router/v3/router.pb.validate.h" -#include "common/router/router.h" -#include "common/router/shadow_writer_impl.h" +#include "source/common/router/router.h" +#include "source/common/router/shadow_writer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/router/config.h b/source/extensions/filters/http/router/config.h index 604c3423481bf..30f72b0bcadba 100644 --- a/source/extensions/filters/http/router/config.h +++ b/source/extensions/filters/http/router/config.h @@ -4,10 +4,9 @@ #include "envoy/extensions/filters/http/router/v3/router.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/set_metadata/BUILD b/source/extensions/filters/http/set_metadata/BUILD index d4ea191e892d3..7ea6c51a0408f 100644 --- a/source/extensions/filters/http/set_metadata/BUILD +++ b/source/extensions/filters/http/set_metadata/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( srcs = ["set_metadata_filter.cc"], hdrs = ["set_metadata_filter.h"], deps = [ - "//include/envoy/server:filter_config_interface", + "//envoy/server:filter_config_interface", "//source/common/http:utility_lib", "//source/common/protobuf:utility_lib", "//source/extensions/filters/http:well_known_names", @@ -28,7 +28,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/protobuf:utility_lib", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/extensions/filters/http/set_metadata/config.cc b/source/extensions/filters/http/set_metadata/config.cc index 2d2f35cd2a7ca..cb3ef84cb2247 100644 --- a/source/extensions/filters/http/set_metadata/config.cc +++ b/source/extensions/filters/http/set_metadata/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/set_metadata/config.h" +#include "source/extensions/filters/http/set_metadata/config.h" #include @@ -6,9 +6,8 @@ #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/set_metadata/set_metadata_filter.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/set_metadata/set_metadata_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/set_metadata/config.h b/source/extensions/filters/http/set_metadata/config.h index 32350b0f6af56..322064407ab66 100644 --- a/source/extensions/filters/http/set_metadata/config.h +++ b/source/extensions/filters/http/set_metadata/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.h" #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/set_metadata/set_metadata_filter.cc b/source/extensions/filters/http/set_metadata/set_metadata_filter.cc index 98295d3cda3d8..bb0448610af77 100644 --- a/source/extensions/filters/http/set_metadata/set_metadata_filter.cc +++ b/source/extensions/filters/http/set_metadata/set_metadata_filter.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/http/set_metadata/set_metadata_filter.h" +#include "source/extensions/filters/http/set_metadata/set_metadata_filter.h" #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.h" -#include "common/config/well_known_names.h" -#include "common/http/utility.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/config/well_known_names.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/http/well_known_names.h" #include "absl/strings/str_format.h" @@ -27,7 +26,8 @@ SetMetadataFilter::~SetMetadataFilter() = default; Http::FilterHeadersStatus SetMetadataFilter::decodeHeaders(Http::RequestHeaderMap&, bool) { const absl::string_view metadata_namespace = config_->metadataNamespace(); auto& metadata = *decoder_callbacks_->streamInfo().dynamicMetadata().mutable_filter_metadata(); - ProtobufWkt::Struct& org_fields = metadata[metadata_namespace]; + ProtobufWkt::Struct& org_fields = + metadata[toStdStringView(metadata_namespace)]; // NOLINT(std::string_view) const ProtobufWkt::Struct& to_merge = config_->value(); StructUtil::update(org_fields, to_merge); diff --git a/source/extensions/filters/http/set_metadata/set_metadata_filter.h b/source/extensions/filters/http/set_metadata/set_metadata_filter.h index a5a0957a9f818..8611980117f2a 100644 --- a/source/extensions/filters/http/set_metadata/set_metadata_filter.h +++ b/source/extensions/filters/http/set_metadata/set_metadata_filter.h @@ -6,9 +6,8 @@ #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.h" -#include "common/common/logger.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/squash/BUILD b/source/extensions/filters/http/squash/BUILD index ef3c4ca805b8a..7798932f8cd78 100644 --- a/source/extensions/filters/http/squash/BUILD +++ b/source/extensions/filters/http/squash/BUILD @@ -17,11 +17,11 @@ envoy_cc_library( srcs = ["squash_filter.cc"], hdrs = ["squash_filter.h"], deps = [ - "//include/envoy/event:timer_interface", - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/event:timer_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:empty_string", "//source/common/common:enum_to_int", "//source/common/http:headers_lib", @@ -38,7 +38,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/protobuf:utility_lib", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", diff --git a/source/extensions/filters/http/squash/config.cc b/source/extensions/filters/http/squash/config.cc index 34dd36353a138..d2420a6bb8381 100644 --- a/source/extensions/filters/http/squash/config.cc +++ b/source/extensions/filters/http/squash/config.cc @@ -1,13 +1,12 @@ -#include "extensions/filters/http/squash/config.h" +#include "source/extensions/filters/http/squash/config.h" #include "envoy/extensions/filters/http/squash/v3/squash.pb.h" #include "envoy/extensions/filters/http/squash/v3/squash.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/squash/squash_filter.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/squash/squash_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/squash/config.h b/source/extensions/filters/http/squash/config.h index eb27a40880d77..4039e7b5dcc98 100644 --- a/source/extensions/filters/http/squash/config.h +++ b/source/extensions/filters/http/squash/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/squash/v3/squash.pb.h" #include "envoy/extensions/filters/http/squash/v3/squash.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/squash/squash_filter.cc b/source/extensions/filters/http/squash/squash_filter.cc index 4efc21a794017..d15077455483e 100644 --- a/source/extensions/filters/http/squash/squash_filter.cc +++ b/source/extensions/filters/http/squash/squash_filter.cc @@ -1,19 +1,19 @@ -#include "extensions/filters/http/squash/squash_filter.h" +#include "source/extensions/filters/http/squash/squash_filter.h" #include #include "envoy/extensions/filters/http/squash/v3/squash.pb.h" #include "envoy/http/codes.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/logger.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/json/json_loader.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/logger.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/json/json_loader.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "absl/container/fixed_array.h" diff --git a/source/extensions/filters/http/squash/squash_filter.h b/source/extensions/filters/http/squash/squash_filter.h index d654e7f220886..6786a6117a741 100644 --- a/source/extensions/filters/http/squash/squash_filter.h +++ b/source/extensions/filters/http/squash/squash_filter.h @@ -8,8 +8,8 @@ #include "envoy/json/json_object.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/logger.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/logger.h" +#include "source/common/protobuf/protobuf.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/http/tap/BUILD b/source/extensions/filters/http/tap/BUILD index e1e0f6407e30f..aa2a5656b3843 100644 --- a/source/extensions/filters/http/tap/BUILD +++ b/source/extensions/filters/http/tap/BUILD @@ -16,8 +16,8 @@ envoy_cc_library( name = "tap_config_interface", hdrs = ["tap_config.h"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/http:header_map_interface", + "//envoy/buffer:buffer_interface", + "//envoy/http:header_map_interface", "//source/extensions/common/tap:tap_interface", ], ) @@ -41,8 +41,8 @@ envoy_cc_library( hdrs = ["tap_filter.h"], deps = [ ":tap_config_interface", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/http:filter_interface", + "//envoy/access_log:access_log_interface", + "//envoy/http:filter_interface", "//source/extensions/common/tap:extension_config_base", "@envoy_api//envoy/extensions/filters/http/tap/v3:pkg_cc_proto", ], @@ -55,7 +55,7 @@ envoy_cc_extension( deps = [ ":tap_config_impl", ":tap_filter_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/common:factory_base_lib", "@envoy_api//envoy/config/tap/v3:pkg_cc_proto", diff --git a/source/extensions/filters/http/tap/config.cc b/source/extensions/filters/http/tap/config.cc index 1137022a7ff1f..ab992a89a40ce 100644 --- a/source/extensions/filters/http/tap/config.cc +++ b/source/extensions/filters/http/tap/config.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/http/tap/config.h" +#include "source/extensions/filters/http/tap/config.h" #include "envoy/config/tap/v3/common.pb.h" #include "envoy/extensions/filters/http/tap/v3/tap.pb.h" #include "envoy/extensions/filters/http/tap/v3/tap.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/tap/tap_config_impl.h" -#include "extensions/filters/http/tap/tap_filter.h" +#include "source/extensions/filters/http/tap/tap_config_impl.h" +#include "source/extensions/filters/http/tap/tap_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/tap/config.h b/source/extensions/filters/http/tap/config.h index 105ca1d552b5b..c4b2ed2aae0d2 100644 --- a/source/extensions/filters/http/tap/config.h +++ b/source/extensions/filters/http/tap/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/tap/v3/tap.pb.h" #include "envoy/extensions/filters/http/tap/v3/tap.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/tap/tap_config.h b/source/extensions/filters/http/tap/tap_config.h index 5bbbf97ba3223..7eadb86ba623d 100644 --- a/source/extensions/filters/http/tap/tap_config.h +++ b/source/extensions/filters/http/tap/tap_config.h @@ -4,7 +4,7 @@ #include "envoy/common/pure.h" #include "envoy/http/header_map.h" -#include "extensions/common/tap/tap.h" +#include "source/extensions/common/tap/tap.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/tap/tap_config_impl.cc b/source/extensions/filters/http/tap/tap_config_impl.cc index abcd825cc3307..7078e5f0438dc 100644 --- a/source/extensions/filters/http/tap/tap_config_impl.cc +++ b/source/extensions/filters/http/tap/tap_config_impl.cc @@ -1,11 +1,11 @@ -#include "extensions/filters/http/tap/tap_config_impl.h" +#include "source/extensions/filters/http/tap/tap_config_impl.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/config/tap/v3/common.pb.h" #include "envoy/data/tap/v3/http.pb.h" -#include "common/common/assert.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/assert.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/tap/tap_config_impl.h b/source/extensions/filters/http/tap/tap_config_impl.h index 1b579b633c0bf..d79ef4cc4842a 100644 --- a/source/extensions/filters/http/tap/tap_config_impl.h +++ b/source/extensions/filters/http/tap/tap_config_impl.h @@ -5,10 +5,9 @@ #include "envoy/data/tap/v3/http.pb.h" #include "envoy/http/header_map.h" -#include "common/common/logger.h" - -#include "extensions/common/tap/tap_config_base.h" -#include "extensions/filters/http/tap/tap_config.h" +#include "source/common/common/logger.h" +#include "source/extensions/common/tap/tap_config_base.h" +#include "source/extensions/filters/http/tap/tap_config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/tap/tap_filter.cc b/source/extensions/filters/http/tap/tap_filter.cc index 3e7cf36c193bf..d64b3407fde3a 100644 --- a/source/extensions/filters/http/tap/tap_filter.cc +++ b/source/extensions/filters/http/tap/tap_filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/tap/tap_filter.h" +#include "source/extensions/filters/http/tap/tap_filter.h" #include "envoy/extensions/filters/http/tap/v3/tap.pb.h" diff --git a/source/extensions/filters/http/tap/tap_filter.h b/source/extensions/filters/http/tap/tap_filter.h index 585d1af8b81f7..a6ea1a5059f22 100644 --- a/source/extensions/filters/http/tap/tap_filter.h +++ b/source/extensions/filters/http/tap/tap_filter.h @@ -6,8 +6,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "extensions/common/tap/extension_config_base.h" -#include "extensions/filters/http/tap/tap_config.h" +#include "source/extensions/common/tap/extension_config_base.h" +#include "source/extensions/filters/http/tap/tap_config.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/http/wasm/BUILD b/source/extensions/filters/http/wasm/BUILD index db3a6d09196ad..5688db36d75e6 100644 --- a/source/extensions/filters/http/wasm/BUILD +++ b/source/extensions/filters/http/wasm/BUILD @@ -17,9 +17,9 @@ envoy_cc_library( hdrs = ["wasm_filter.h"], visibility = ["//visibility:public"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/http:codes_interface", + "//envoy/server:filter_config_interface", + "//envoy/upstream:cluster_manager_interface", "//source/extensions/common/wasm:wasm_lib", "//source/extensions/filters/http:well_known_names", "@envoy_api//envoy/extensions/filters/http/wasm/v3:pkg_cc_proto", @@ -32,7 +32,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":wasm_filter_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/common/common:empty_string", "//source/common/config:datasource_lib", "//source/extensions/common/wasm:wasm_lib", diff --git a/source/extensions/filters/http/wasm/config.cc b/source/extensions/filters/http/wasm/config.cc index f46b7cf0692f0..06a02611e6cc7 100644 --- a/source/extensions/filters/http/wasm/config.cc +++ b/source/extensions/filters/http/wasm/config.cc @@ -1,13 +1,12 @@ -#include "extensions/filters/http/wasm/config.h" +#include "source/extensions/filters/http/wasm/config.h" #include "envoy/extensions/filters/http/wasm/v3/wasm.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/common/empty_string.h" -#include "common/config/datasource.h" - -#include "extensions/common/wasm/wasm.h" -#include "extensions/filters/http/wasm/wasm_filter.h" +#include "source/common/common/empty_string.h" +#include "source/common/config/datasource.h" +#include "source/extensions/common/wasm/wasm.h" +#include "source/extensions/filters/http/wasm/wasm_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/wasm/config.h b/source/extensions/filters/http/wasm/config.h index 319aee96f9ca5..a8b3d788fb95b 100644 --- a/source/extensions/filters/http/wasm/config.h +++ b/source/extensions/filters/http/wasm/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/wasm/v3/wasm.pb.h" #include "envoy/extensions/filters/http/wasm/v3/wasm.pb.validate.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/wasm/wasm_filter.cc b/source/extensions/filters/http/wasm/wasm_filter.cc index a8921975fe483..90cd4c6bacd7b 100644 --- a/source/extensions/filters/http/wasm/wasm_filter.cc +++ b/source/extensions/filters/http/wasm/wasm_filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/wasm/wasm_filter.h" +#include "source/extensions/filters/http/wasm/wasm_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/wasm/wasm_filter.h b/source/extensions/filters/http/wasm/wasm_filter.h index cd633e505f7d4..4adec781bce05 100644 --- a/source/extensions/filters/http/wasm/wasm_filter.h +++ b/source/extensions/filters/http/wasm/wasm_filter.h @@ -7,9 +7,9 @@ #include "envoy/server/filter_config.h" #include "envoy/upstream/cluster_manager.h" -#include "extensions/common/wasm/plugin.h" -#include "extensions/common/wasm/wasm.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/common/wasm/plugin.h" +#include "source/extensions/common/wasm/wasm.h" +#include "source/extensions/filters/http/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/http/well_known_names.h b/source/extensions/filters/http/well_known_names.h index 609e13f5bb496..c30ad55af493c 100644 --- a/source/extensions/filters/http/well_known_names.h +++ b/source/extensions/filters/http/well_known_names.h @@ -1,6 +1,6 @@ #pragma once -#include "common/config/well_known_names.h" +#include "source/common/config/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/http_inspector/BUILD b/source/extensions/filters/listener/http_inspector/BUILD index 8426d64e32bf2..9fae74fd8e66c 100644 --- a/source/extensions/filters/listener/http_inspector/BUILD +++ b/source/extensions/filters/listener/http_inspector/BUILD @@ -17,10 +17,10 @@ envoy_cc_library( hdrs = ["http_inspector.h"], external_deps = ["http_parser"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/network:listen_socket_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/network:filter_interface", + "//envoy/network:listen_socket_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:minimal_logger_lib", "//source/common/http:headers_lib", @@ -33,8 +33,8 @@ envoy_cc_extension( srcs = ["config.cc"], deps = [ ":http_inspector_lib", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/listener:well_known_names", "@envoy_api//envoy/extensions/filters/listener/http_inspector/v3:pkg_cc_proto", ], diff --git a/source/extensions/filters/listener/http_inspector/config.cc b/source/extensions/filters/listener/http_inspector/config.cc index 247e1f20a8072..503b04f47b1bf 100644 --- a/source/extensions/filters/listener/http_inspector/config.cc +++ b/source/extensions/filters/listener/http_inspector/config.cc @@ -3,8 +3,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/listener/http_inspector/http_inspector.h" -#include "extensions/filters/listener/well_known_names.h" +#include "source/extensions/filters/listener/http_inspector/http_inspector.h" +#include "source/extensions/filters/listener/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/http_inspector/http_inspector.cc b/source/extensions/filters/listener/http_inspector/http_inspector.cc index 3f3c2c4d24264..2a69f38c77714 100644 --- a/source/extensions/filters/listener/http_inspector/http_inspector.cc +++ b/source/extensions/filters/listener/http_inspector/http_inspector.cc @@ -1,14 +1,14 @@ -#include "extensions/filters/listener/http_inspector/http_inspector.h" +#include "source/extensions/filters/listener/http_inspector/http_inspector.h" #include "envoy/event/dispatcher.h" #include "envoy/network/listen_socket.h" #include "envoy/stats/scope.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/common/macros.h" -#include "common/http/headers.h" -#include "common/http/utility.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" #include "absl/strings/match.h" #include "absl/strings/str_split.h" diff --git a/source/extensions/filters/listener/http_inspector/http_inspector.h b/source/extensions/filters/listener/http_inspector/http_inspector.h index 796add803b8fa..b43422f9e66ed 100644 --- a/source/extensions/filters/listener/http_inspector/http_inspector.h +++ b/source/extensions/filters/listener/http_inspector/http_inspector.h @@ -8,7 +8,7 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "absl/container/flat_hash_set.h" diff --git a/source/extensions/filters/listener/original_dst/BUILD b/source/extensions/filters/listener/original_dst/BUILD index 7ee4f6e013c32..68c1a0c7108f7 100644 --- a/source/extensions/filters/listener/original_dst/BUILD +++ b/source/extensions/filters/listener/original_dst/BUILD @@ -17,8 +17,8 @@ envoy_cc_library( srcs = ["original_dst.cc"], hdrs = ["original_dst.h"], deps = [ - "//include/envoy/network:filter_interface", - "//include/envoy/network:listen_socket_interface", + "//envoy/network:filter_interface", + "//envoy/network:listen_socket_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/network:upstream_socket_options_filter_state_lib", @@ -35,8 +35,8 @@ envoy_cc_extension( ], deps = [ ":original_dst_lib", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/listener:well_known_names", "@envoy_api//envoy/extensions/filters/listener/original_dst/v3:pkg_cc_proto", ], diff --git a/source/extensions/filters/listener/original_dst/config.cc b/source/extensions/filters/listener/original_dst/config.cc index cad8e5cd044b3..f0f813450805c 100644 --- a/source/extensions/filters/listener/original_dst/config.cc +++ b/source/extensions/filters/listener/original_dst/config.cc @@ -5,8 +5,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/listener/original_dst/original_dst.h" -#include "extensions/filters/listener/well_known_names.h" +#include "source/extensions/filters/listener/original_dst/original_dst.h" +#include "source/extensions/filters/listener/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/original_dst/original_dst.cc b/source/extensions/filters/listener/original_dst/original_dst.cc index ba4741d6f8da4..f1465fad803e2 100644 --- a/source/extensions/filters/listener/original_dst/original_dst.cc +++ b/source/extensions/filters/listener/original_dst/original_dst.cc @@ -1,11 +1,11 @@ -#include "extensions/filters/listener/original_dst/original_dst.h" +#include "source/extensions/filters/listener/original_dst/original_dst.h" #include "envoy/network/listen_socket.h" -#include "common/common/assert.h" -#include "common/network/socket_option_factory.h" -#include "common/network/upstream_socket_options_filter_state.h" -#include "common/network/utility.h" +#include "source/common/common/assert.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/upstream_socket_options_filter_state.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/original_dst/original_dst.h b/source/extensions/filters/listener/original_dst/original_dst.h index f067bfed92a9c..1732fbffaa009 100644 --- a/source/extensions/filters/listener/original_dst/original_dst.h +++ b/source/extensions/filters/listener/original_dst/original_dst.h @@ -2,7 +2,7 @@ #include "envoy/network/filter.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/original_src/BUILD b/source/extensions/filters/listener/original_src/BUILD index 4b952500fa44f..08396b5b4d644 100644 --- a/source/extensions/filters/listener/original_src/BUILD +++ b/source/extensions/filters/listener/original_src/BUILD @@ -24,10 +24,10 @@ envoy_cc_library( hdrs = ["original_src.h"], deps = [ ":config_lib", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/network:address_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", + "//envoy/buffer:buffer_interface", + "//envoy/network:address_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/extensions/filters/common/original_src:socket_option_factory_lib", @@ -41,8 +41,8 @@ envoy_cc_extension( deps = [ ":config_lib", ":original_src_lib", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/listener:well_known_names", "@envoy_api//envoy/extensions/filters/listener/original_src/v3:pkg_cc_proto", ], diff --git a/source/extensions/filters/listener/original_src/config.cc b/source/extensions/filters/listener/original_src/config.cc index 10ec27e4a4c6c..6fa308bfd1313 100644 --- a/source/extensions/filters/listener/original_src/config.cc +++ b/source/extensions/filters/listener/original_src/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/listener/original_src/config.h" +#include "source/extensions/filters/listener/original_src/config.h" #include "envoy/extensions/filters/listener/original_src/v3/original_src.pb.h" diff --git a/source/extensions/filters/listener/original_src/original_src.cc b/source/extensions/filters/listener/original_src/original_src.cc index a8793761cfb1b..eefba846fcc8f 100644 --- a/source/extensions/filters/listener/original_src/original_src.cc +++ b/source/extensions/filters/listener/original_src/original_src.cc @@ -1,11 +1,10 @@ -#include "extensions/filters/listener/original_src/original_src.h" +#include "source/extensions/filters/listener/original_src/original_src.h" #include "envoy/buffer/buffer.h" #include "envoy/network/connection.h" -#include "common/common/assert.h" - -#include "extensions/filters/common/original_src/socket_option_factory.h" +#include "source/common/common/assert.h" +#include "source/extensions/filters/common/original_src/socket_option_factory.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/original_src/original_src.h b/source/extensions/filters/listener/original_src/original_src.h index f201644f88106..5aaf6988e3dc2 100644 --- a/source/extensions/filters/listener/original_src/original_src.h +++ b/source/extensions/filters/listener/original_src/original_src.h @@ -3,9 +3,8 @@ #include "envoy/network/address.h" #include "envoy/network/filter.h" -#include "common/common/logger.h" - -#include "extensions/filters/listener/original_src/config.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/listener/original_src/config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/original_src/original_src_config_factory.cc b/source/extensions/filters/listener/original_src/original_src_config_factory.cc index 157e1a92efdd0..77baa3fea072c 100644 --- a/source/extensions/filters/listener/original_src/original_src_config_factory.cc +++ b/source/extensions/filters/listener/original_src/original_src_config_factory.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/listener/original_src/original_src_config_factory.h" +#include "source/extensions/filters/listener/original_src/original_src_config_factory.h" #include "envoy/extensions/filters/listener/original_src/v3/original_src.pb.h" #include "envoy/extensions/filters/listener/original_src/v3/original_src.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/listener/original_src/config.h" -#include "extensions/filters/listener/original_src/original_src.h" -#include "extensions/filters/listener/well_known_names.h" +#include "source/extensions/filters/listener/original_src/config.h" +#include "source/extensions/filters/listener/original_src/original_src.h" +#include "source/extensions/filters/listener/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/original_src/original_src_config_factory.h b/source/extensions/filters/listener/original_src/original_src_config_factory.h index 94197935ab077..5bddfb52f90e0 100644 --- a/source/extensions/filters/listener/original_src/original_src_config_factory.h +++ b/source/extensions/filters/listener/original_src/original_src_config_factory.h @@ -3,7 +3,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/listener/well_known_names.h" +#include "source/extensions/filters/listener/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/proxy_protocol/BUILD b/source/extensions/filters/listener/proxy_protocol/BUILD index 6cff8506baed7..eef90aa458eb7 100644 --- a/source/extensions/filters/listener/proxy_protocol/BUILD +++ b/source/extensions/filters/listener/proxy_protocol/BUILD @@ -20,9 +20,9 @@ envoy_cc_library( ], visibility = ["//visibility:public"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/network:listen_socket_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:filter_interface", + "//envoy/network:listen_socket_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:empty_string", @@ -45,8 +45,8 @@ envoy_cc_extension( "//test/integration:__subpackages__", ], deps = [ - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/listener:well_known_names", "//source/extensions/filters/listener/proxy_protocol:proxy_protocol_lib", "@envoy_api//envoy/extensions/filters/listener/proxy_protocol/v3:pkg_cc_proto", diff --git a/source/extensions/filters/listener/proxy_protocol/config.cc b/source/extensions/filters/listener/proxy_protocol/config.cc index 4641fcd6c9bf6..d63cce1d2f63f 100644 --- a/source/extensions/filters/listener/proxy_protocol/config.cc +++ b/source/extensions/filters/listener/proxy_protocol/config.cc @@ -5,8 +5,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h" -#include "extensions/filters/listener/well_known_names.h" +#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h" +#include "source/extensions/filters/listener/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/proxy_protocol/proxy_protocol.cc b/source/extensions/filters/listener/proxy_protocol/proxy_protocol.cc index 320337fcba16a..dbe8d31442022 100644 --- a/source/extensions/filters/listener/proxy_protocol/proxy_protocol.cc +++ b/source/extensions/filters/listener/proxy_protocol/proxy_protocol.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h" +#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h" #include #include @@ -13,17 +13,16 @@ #include "envoy/network/listen_socket.h" #include "envoy/stats/scope.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/common/safe_memcpy.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" - -#include "extensions/common/proxy_protocol/proxy_protocol_header.h" -#include "extensions/filters/listener/well_known_names.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h" +#include "source/extensions/filters/listener/well_known_names.h" using Envoy::Extensions::Common::ProxyProtocol::PROXY_PROTO_V1_SIGNATURE; using Envoy::Extensions::Common::ProxyProtocol::PROXY_PROTO_V1_SIGNATURE_LEN; diff --git a/source/extensions/filters/listener/proxy_protocol/proxy_protocol.h b/source/extensions/filters/listener/proxy_protocol/proxy_protocol.h index 6255309c31234..469c838f9b83f 100644 --- a/source/extensions/filters/listener/proxy_protocol/proxy_protocol.h +++ b/source/extensions/filters/listener/proxy_protocol/proxy_protocol.h @@ -6,9 +6,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" - -#include "extensions/common/proxy_protocol/proxy_protocol_header.h" +#include "source/common/common/logger.h" +#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h" #include "absl/container/flat_hash_map.h" #include "proxy_protocol_header.h" diff --git a/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h b/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h index c451c8f5e1c7c..f72258ce0ff55 100644 --- a/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h +++ b/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h @@ -2,7 +2,7 @@ #include "envoy/network/address.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/tls_inspector/BUILD b/source/extensions/filters/listener/tls_inspector/BUILD index 109d783b2c4f0..cda19d6f83a60 100644 --- a/source/extensions/filters/listener/tls_inspector/BUILD +++ b/source/extensions/filters/listener/tls_inspector/BUILD @@ -22,10 +22,10 @@ envoy_cc_library( "//visibility:public", ], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/network:listen_socket_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/network:filter_interface", + "//envoy/network:listen_socket_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", @@ -40,8 +40,8 @@ envoy_cc_extension( "//test/integration:__subpackages__", ], deps = [ - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/listener:well_known_names", "//source/extensions/filters/listener/tls_inspector:tls_inspector_lib", "@envoy_api//envoy/extensions/filters/listener/tls_inspector/v3:pkg_cc_proto", diff --git a/source/extensions/filters/listener/tls_inspector/config.cc b/source/extensions/filters/listener/tls_inspector/config.cc index 058a5ddaf7c56..468fbe4962641 100644 --- a/source/extensions/filters/listener/tls_inspector/config.cc +++ b/source/extensions/filters/listener/tls_inspector/config.cc @@ -5,8 +5,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/listener/tls_inspector/tls_inspector.h" -#include "extensions/filters/listener/well_known_names.h" +#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h" +#include "source/extensions/filters/listener/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/listener/tls_inspector/tls_inspector.cc b/source/extensions/filters/listener/tls_inspector/tls_inspector.cc index f2adbaf36367e..c2798827f6c91 100644 --- a/source/extensions/filters/listener/tls_inspector/tls_inspector.cc +++ b/source/extensions/filters/listener/tls_inspector/tls_inspector.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/listener/tls_inspector/tls_inspector.h" +#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h" #include #include @@ -10,8 +10,8 @@ #include "envoy/network/listen_socket.h" #include "envoy/stats/scope.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" #include "absl/strings/str_join.h" #include "openssl/ssl.h" diff --git a/source/extensions/filters/listener/tls_inspector/tls_inspector.h b/source/extensions/filters/listener/tls_inspector/tls_inspector.h index 9784ea10b6417..a31e814ffc0e4 100644 --- a/source/extensions/filters/listener/tls_inspector/tls_inspector.h +++ b/source/extensions/filters/listener/tls_inspector/tls_inspector.h @@ -6,7 +6,7 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "openssl/ssl.h" diff --git a/source/extensions/filters/listener/well_known_names.h b/source/extensions/filters/listener/well_known_names.h index 56c86d52620cb..25966a56e43d7 100644 --- a/source/extensions/filters/listener/well_known_names.h +++ b/source/extensions/filters/listener/well_known_names.h @@ -2,7 +2,7 @@ #include -#include "common/singleton/const_singleton.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/client_ssl_auth/BUILD b/source/extensions/filters/network/client_ssl_auth/BUILD index de0b01ec4bab0..8c9169f3fc8e7 100644 --- a/source/extensions/filters/network/client_ssl_auth/BUILD +++ b/source/extensions/filters/network/client_ssl_auth/BUILD @@ -17,12 +17,12 @@ envoy_cc_library( srcs = ["client_ssl_auth.cc"], hdrs = ["client_ssl_auth.h"], deps = [ - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/runtime:runtime_interface", + "//envoy/stats:stats_macros", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:assert_lib", "//source/common/common:enum_to_int", "//source/common/http:headers_lib", @@ -42,7 +42,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":client_ssl_auth", - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", "@envoy_api//envoy/extensions/filters/network/client_ssl_auth/v3:pkg_cc_proto", diff --git a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc index bceb77b412ae7..1fb12918e1f7c 100644 --- a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc +++ b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/client_ssl_auth/client_ssl_auth.h" +#include "source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h" #include #include @@ -8,14 +8,14 @@ #include "envoy/network/connection.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/json/json_loader.h" -#include "common/network/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/json/json_loader.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h index 53422e5f48d89..19b3caea0a8e8 100644 --- a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h +++ b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h @@ -13,10 +13,10 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" -#include "common/http/rest_api_fetcher.h" -#include "common/network/cidr_range.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/http/rest_api_fetcher.h" +#include "source/common/network/cidr_range.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" #include "absl/container/node_hash_set.h" diff --git a/source/extensions/filters/network/client_ssl_auth/config.cc b/source/extensions/filters/network/client_ssl_auth/config.cc index 23a5d8dfa6c29..f974b275274fa 100644 --- a/source/extensions/filters/network/client_ssl_auth/config.cc +++ b/source/extensions/filters/network/client_ssl_auth/config.cc @@ -1,11 +1,11 @@ -#include "extensions/filters/network/client_ssl_auth/config.h" +#include "source/extensions/filters/network/client_ssl_auth/config.h" #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.h" #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.validate.h" #include "envoy/network/connection.h" #include "envoy/registry/registry.h" -#include "extensions/filters/network/client_ssl_auth/client_ssl_auth.h" +#include "source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/client_ssl_auth/config.h b/source/extensions/filters/network/client_ssl_auth/config.h index 2bb3d7a25dded..eaccae4f5d583 100644 --- a/source/extensions/filters/network/client_ssl_auth/config.h +++ b/source/extensions/filters/network/client_ssl_auth/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.h" #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/BUILD b/source/extensions/filters/network/common/BUILD index c8b8dd24f51f5..be7c50d2fa1f0 100644 --- a/source/extensions/filters/network/common/BUILD +++ b/source/extensions/filters/network/common/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( # Used by core. TODO(#9953) clean up. visibility = ["//visibility:public"], deps = [ - "//include/envoy/server:filter_config_interface", + "//envoy/server:filter_config_interface", "//source/extensions/common:utility_lib", ], ) @@ -25,7 +25,7 @@ envoy_cc_library( # Used by core. TODO(#9953) clean up. visibility = ["//visibility:public"], deps = [ - "//include/envoy/runtime:runtime_interface", + "//envoy/runtime:runtime_interface", "//source/common/common:macros", "//source/extensions/common:utility_lib", "//source/extensions/filters/network:well_known_names", diff --git a/source/extensions/filters/network/common/factory_base.h b/source/extensions/filters/network/common/factory_base.h index 9e818369b4a8e..20067d0c383c6 100644 --- a/source/extensions/filters/network/common/factory_base.h +++ b/source/extensions/filters/network/common/factory_base.h @@ -4,7 +4,7 @@ #include "envoy/server/transport_socket_config.h" #include "envoy/upstream/upstream.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/redis/BUILD b/source/extensions/filters/network/common/redis/BUILD index 497286700ff2b..4561a35a52e57 100644 --- a/source/extensions/filters/network/common/redis/BUILD +++ b/source/extensions/filters/network/common/redis/BUILD @@ -12,7 +12,7 @@ envoy_cc_library( name = "codec_interface", hdrs = ["codec.h"], deps = [ - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/common:assert_lib", ], ) @@ -49,7 +49,7 @@ envoy_cc_library( deps = [ ":codec_lib", ":redis_command_stats_lib", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", ], ) @@ -61,10 +61,10 @@ envoy_cc_library( ":client_interface", ":codec_lib", ":utility_lib", - "//include/envoy/router:router_interface", - "//include/envoy/stats:timespan_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/router:router_interface", + "//envoy/stats:timespan_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/network:filter_lib", @@ -92,8 +92,8 @@ envoy_cc_library( deps = [ ":codec_interface", ":supported_commands_lib", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:timespan_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:timespan_interface", "//source/common/common:utility_lib", "//source/common/stats:symbol_table_lib", "//source/common/stats:timespan_lib", @@ -116,8 +116,8 @@ envoy_cc_library( deps = [ ":codec_lib", ":fault_interface", - "//include/envoy/common:random_generator_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/common:random_generator_interface", + "//envoy/upstream:upstream_interface", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/extensions/filters/network/redis_proxy/v3:pkg_cc_proto", ], diff --git a/source/extensions/filters/network/common/redis/client.h b/source/extensions/filters/network/common/redis/client.h index f0c573f92f824..dbf3a0b317f15 100644 --- a/source/extensions/filters/network/common/redis/client.h +++ b/source/extensions/filters/network/common/redis/client.h @@ -4,8 +4,8 @@ #include "envoy/upstream/cluster_manager.h" -#include "extensions/filters/network/common/redis/codec_impl.h" -#include "extensions/filters/network/common/redis/redis_command_stats.h" +#include "source/extensions/filters/network/common/redis/codec_impl.h" +#include "source/extensions/filters/network/common/redis/redis_command_stats.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/redis/client_impl.cc b/source/extensions/filters/network/common/redis/client_impl.cc index 6cdc7b8ad0077..0efea010b9106 100644 --- a/source/extensions/filters/network/common/redis/client_impl.cc +++ b/source/extensions/filters/network/common/redis/client_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/common/redis/client_impl.h" +#include "source/extensions/filters/network/common/redis/client_impl.h" #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" diff --git a/source/extensions/filters/network/common/redis/client_impl.h b/source/extensions/filters/network/common/redis/client_impl.h index ca0eb5f21dbe6..2c5fc289cfb0e 100644 --- a/source/extensions/filters/network/common/redis/client_impl.h +++ b/source/extensions/filters/network/common/redis/client_impl.h @@ -7,16 +7,15 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/hash.h" -#include "common/network/filter_impl.h" -#include "common/protobuf/utility.h" -#include "common/singleton/const_singleton.h" -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/filters/network/common/redis/client.h" -#include "extensions/filters/network/common/redis/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/hash.h" +#include "source/common/network/filter_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/singleton/const_singleton.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/upstream_impl.h" +#include "source/extensions/filters/network/common/redis/client.h" +#include "source/extensions/filters/network/common/redis/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/redis/codec.h b/source/extensions/filters/network/common/redis/codec.h index fa256cd6dc4aa..c66c1136c8a9e 100644 --- a/source/extensions/filters/network/common/redis/codec.h +++ b/source/extensions/filters/network/common/redis/codec.h @@ -7,8 +7,8 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/redis/codec_impl.cc b/source/extensions/filters/network/common/redis/codec_impl.cc index a668a7868e263..83a7ecabcef38 100644 --- a/source/extensions/filters/network/common/redis/codec_impl.cc +++ b/source/extensions/filters/network/common/redis/codec_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/common/redis/codec_impl.h" +#include "source/extensions/filters/network/common/redis/codec_impl.h" #include #include @@ -7,9 +7,9 @@ #include "envoy/common/platform.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" #include "absl/container/fixed_array.h" diff --git a/source/extensions/filters/network/common/redis/codec_impl.h b/source/extensions/filters/network/common/redis/codec_impl.h index 125f703acf147..a55cfd695992c 100644 --- a/source/extensions/filters/network/common/redis/codec_impl.h +++ b/source/extensions/filters/network/common/redis/codec_impl.h @@ -5,9 +5,8 @@ #include #include -#include "common/common/logger.h" - -#include "extensions/filters/network/common/redis/codec.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/common/redis/codec.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/redis/fault_impl.cc b/source/extensions/filters/network/common/redis/fault_impl.cc index 02b4c5aba52ed..b5d00bb99ee76 100644 --- a/source/extensions/filters/network/common/redis/fault_impl.cc +++ b/source/extensions/filters/network/common/redis/fault_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/common/redis/fault_impl.h" +#include "source/extensions/filters/network/common/redis/fault_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/redis/fault_impl.h b/source/extensions/filters/network/common/redis/fault_impl.h index 2774c2798eb27..5ec3978bf7a23 100644 --- a/source/extensions/filters/network/common/redis/fault_impl.h +++ b/source/extensions/filters/network/common/redis/fault_impl.h @@ -8,10 +8,9 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" #include "envoy/upstream/upstream.h" -#include "common/protobuf/utility.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/filters/network/common/redis/fault.h" +#include "source/common/protobuf/utility.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/filters/network/common/redis/fault.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/redis/redis_command_stats.cc b/source/extensions/filters/network/common/redis/redis_command_stats.cc index 5a6509cf3ae6c..9e67ab1e2ce53 100644 --- a/source/extensions/filters/network/common/redis/redis_command_stats.cc +++ b/source/extensions/filters/network/common/redis/redis_command_stats.cc @@ -1,9 +1,8 @@ -#include "extensions/filters/network/common/redis/redis_command_stats.h" +#include "source/extensions/filters/network/common/redis/redis_command_stats.h" -#include "common/stats/timespan_impl.h" -#include "common/stats/utility.h" - -#include "extensions/filters/network/common/redis/supported_commands.h" +#include "source/common/stats/timespan_impl.h" +#include "source/common/stats/utility.h" +#include "source/extensions/filters/network/common/redis/supported_commands.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/redis/redis_command_stats.h b/source/extensions/filters/network/common/redis/redis_command_stats.h index 5dddb9f8303c9..fd80c5ac850c5 100644 --- a/source/extensions/filters/network/common/redis/redis_command_stats.h +++ b/source/extensions/filters/network/common/redis/redis_command_stats.h @@ -6,9 +6,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/timespan.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/filters/network/common/redis/codec.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/filters/network/common/redis/codec.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/redis/supported_commands.h b/source/extensions/filters/network/common/redis/supported_commands.h index 9e8a0f1aeafdb..5e0b5f26bb827 100644 --- a/source/extensions/filters/network/common/redis/supported_commands.h +++ b/source/extensions/filters/network/common/redis/supported_commands.h @@ -4,7 +4,7 @@ #include #include -#include "common/common/macros.h" +#include "source/common/common/macros.h" #include "absl/container/flat_hash_set.h" diff --git a/source/extensions/filters/network/common/redis/utility.cc b/source/extensions/filters/network/common/redis/utility.cc index 773196dd70e21..3eb644f3285ab 100644 --- a/source/extensions/filters/network/common/redis/utility.cc +++ b/source/extensions/filters/network/common/redis/utility.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/network/common/redis/utility.h" +#include "source/extensions/filters/network/common/redis/utility.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/redis/utility.h b/source/extensions/filters/network/common/redis/utility.h index ca5774d2d3a6c..7f98bfbb444f5 100644 --- a/source/extensions/filters/network/common/redis/utility.h +++ b/source/extensions/filters/network/common/redis/utility.h @@ -2,7 +2,7 @@ #include -#include "extensions/filters/network/common/redis/codec.h" +#include "source/extensions/filters/network/common/redis/codec.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/common/utility.h b/source/extensions/filters/network/common/utility.h index 54a458aa7b62e..1f43a2375c2ca 100644 --- a/source/extensions/filters/network/common/utility.h +++ b/source/extensions/filters/network/common/utility.h @@ -1,9 +1,8 @@ #pragma once -#include "common/common/macros.h" - -#include "extensions/common/utility.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/common/macros.h" +#include "source/extensions/common/utility.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/direct_response/BUILD b/source/extensions/filters/network/direct_response/BUILD index 5a4b40483b4fc..a80985231941c 100644 --- a/source/extensions/filters/network/direct_response/BUILD +++ b/source/extensions/filters/network/direct_response/BUILD @@ -17,8 +17,8 @@ envoy_cc_library( srcs = ["filter.cc"], hdrs = ["filter.h"], deps = [ - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", @@ -30,8 +30,8 @@ envoy_cc_extension( srcs = ["config.cc"], deps = [ ":filter", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/common/config:datasource_lib", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", diff --git a/source/extensions/filters/network/direct_response/config.cc b/source/extensions/filters/network/direct_response/config.cc index ff680dc835714..d06d7521d1a2d 100644 --- a/source/extensions/filters/network/direct_response/config.cc +++ b/source/extensions/filters/network/direct_response/config.cc @@ -3,11 +3,10 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/config/datasource.h" - -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/direct_response/filter.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/config/datasource.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/direct_response/filter.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/direct_response/filter.cc b/source/extensions/filters/network/direct_response/filter.cc index 25cc20206d152..78063c0624e68 100644 --- a/source/extensions/filters/network/direct_response/filter.cc +++ b/source/extensions/filters/network/direct_response/filter.cc @@ -1,7 +1,7 @@ -#include "extensions/filters/network/direct_response/filter.h" +#include "source/extensions/filters/network/direct_response/filter.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/direct_response/filter.h b/source/extensions/filters/network/direct_response/filter.h index e87dd07ae0186..ef6449ae0c0b1 100644 --- a/source/extensions/filters/network/direct_response/filter.h +++ b/source/extensions/filters/network/direct_response/filter.h @@ -3,7 +3,7 @@ #include "envoy/network/connection.h" #include "envoy/network/filter.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/BUILD b/source/extensions/filters/network/dubbo_proxy/BUILD index 49ac684e27208..78e9fccc36903 100644 --- a/source/extensions/filters/network/dubbo_proxy/BUILD +++ b/source/extensions/filters/network/dubbo_proxy/BUILD @@ -18,7 +18,7 @@ envoy_cc_library( "hessian2_codec_object_codec_lib", ], deps = [ - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/singleton:const_singleton", ], ) @@ -30,7 +30,7 @@ envoy_cc_library( ":message_lib", ":metadata_lib", ":serializer_interface", - "//include/envoy/config:typed_config_interface", + "//envoy/config:typed_config_interface", "//source/common/common:assert_lib", "//source/common/config:utility_lib", "//source/common/singleton:const_singleton", @@ -43,7 +43,7 @@ envoy_cc_library( hdrs = ["dubbo_protocol_impl.h"], deps = [ ":protocol_interface", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/singleton:const_singleton", ], ) @@ -58,8 +58,8 @@ envoy_cc_library( ":hessian_utils_lib", ":message_lib", ":metadata_lib", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/config:typed_config_interface", + "//envoy/buffer:buffer_interface", + "//envoy/config:typed_config_interface", "//source/common/common:assert_lib", "//source/common/config:utility_lib", "//source/common/singleton:const_singleton", @@ -98,9 +98,9 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":conn_manager_lib", - "//include/envoy/registry", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/registry", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/common:utility_lib", "//source/common/config:utility_lib", "//source/extensions/filters/network:well_known_names", @@ -146,8 +146,8 @@ envoy_cc_library( hdrs = ["decoder_event_handler.h"], deps = [ ":metadata_lib", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", "//source/common/buffer:buffer_lib", ], ) @@ -156,8 +156,8 @@ envoy_cc_library( name = "stats_lib", hdrs = ["stats.h"], deps = [ - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", ], ) @@ -170,7 +170,7 @@ envoy_cc_library( ":metadata_lib", ":protocol_interface", ":serializer_interface", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/buffer:buffer_lib", "//source/extensions/filters/network/dubbo_proxy/filters:filter_interface", ], @@ -184,7 +184,7 @@ envoy_cc_library( ":metadata_lib", ":protocol_interface", ":serializer_interface", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/extensions/filters/network/dubbo_proxy/filters:filter_interface", ], ) @@ -207,12 +207,12 @@ envoy_cc_library( ":dubbo_protocol_impl_lib", ":heartbeat_response_lib", ":stats_lib", - "//include/envoy/event:deferred_deletable", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:timespan_interface", + "//envoy/event:deferred_deletable", + "//envoy/event:dispatcher_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:timespan_interface", "//source/common/buffer:buffer_lib", "//source/common/buffer:watermark_buffer_lib", "//source/common/common:assert_lib", diff --git a/source/extensions/filters/network/dubbo_proxy/active_message.cc b/source/extensions/filters/network/dubbo_proxy/active_message.cc index e0818cf76b18c..8366759269eaa 100644 --- a/source/extensions/filters/network/dubbo_proxy/active_message.cc +++ b/source/extensions/filters/network/dubbo_proxy/active_message.cc @@ -1,9 +1,8 @@ -#include "extensions/filters/network/dubbo_proxy/active_message.h" +#include "source/extensions/filters/network/dubbo_proxy/active_message.h" -#include "common/stats/timespan_impl.h" - -#include "extensions/filters/network/dubbo_proxy/app_exception.h" -#include "extensions/filters/network/dubbo_proxy/conn_manager.h" +#include "source/common/stats/timespan_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/app_exception.h" +#include "source/extensions/filters/network/dubbo_proxy/conn_manager.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/active_message.h b/source/extensions/filters/network/dubbo_proxy/active_message.h index 2870e8d501d79..9a043d8656d2b 100644 --- a/source/extensions/filters/network/dubbo_proxy/active_message.h +++ b/source/extensions/filters/network/dubbo_proxy/active_message.h @@ -5,17 +5,16 @@ #include "envoy/network/filter.h" #include "envoy/stats/timespan.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" -#include "common/stream_info/stream_info_impl.h" - -#include "extensions/filters/network/dubbo_proxy/decoder.h" -#include "extensions/filters/network/dubbo_proxy/decoder_event_handler.h" -#include "extensions/filters/network/dubbo_proxy/filters/filter.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" -#include "extensions/filters/network/dubbo_proxy/router/router.h" -#include "extensions/filters/network/dubbo_proxy/stats.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/decoder.h" +#include "source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/router/router.h" +#include "source/extensions/filters/network/dubbo_proxy/stats.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/network/dubbo_proxy/app_exception.cc b/source/extensions/filters/network/dubbo_proxy/app_exception.cc index dc5a8a0830128..88047298999f6 100644 --- a/source/extensions/filters/network/dubbo_proxy/app_exception.cc +++ b/source/extensions/filters/network/dubbo_proxy/app_exception.cc @@ -1,8 +1,7 @@ -#include "extensions/filters/network/dubbo_proxy/app_exception.h" +#include "source/extensions/filters/network/dubbo_proxy/app_exception.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/dubbo_proxy/message.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/message.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/app_exception.h b/source/extensions/filters/network/dubbo_proxy/app_exception.h index 50419b57c6805..2073392ead6d9 100644 --- a/source/extensions/filters/network/dubbo_proxy/app_exception.h +++ b/source/extensions/filters/network/dubbo_proxy/app_exception.h @@ -2,12 +2,11 @@ #include "envoy/common/exception.h" -#include "common/common/utility.h" - -#include "extensions/filters/network/dubbo_proxy/filters/filter.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" -#include "extensions/filters/network/dubbo_proxy/protocol.h" -#include "extensions/filters/network/dubbo_proxy/serializer.h" +#include "source/common/common/utility.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/protocol.h" +#include "source/extensions/filters/network/dubbo_proxy/serializer.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/config.cc b/source/extensions/filters/network/dubbo_proxy/config.cc index 0a6f494921522..16e592128143c 100644 --- a/source/extensions/filters/network/dubbo_proxy/config.cc +++ b/source/extensions/filters/network/dubbo_proxy/config.cc @@ -1,15 +1,14 @@ -#include "extensions/filters/network/dubbo_proxy/config.h" +#include "source/extensions/filters/network/dubbo_proxy/config.h" #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.h" #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" - -#include "extensions/filters/network/dubbo_proxy/conn_manager.h" -#include "extensions/filters/network/dubbo_proxy/filters/factory_base.h" -#include "extensions/filters/network/dubbo_proxy/filters/well_known_names.h" -#include "extensions/filters/network/dubbo_proxy/stats.h" +#include "source/common/config/utility.h" +#include "source/extensions/filters/network/dubbo_proxy/conn_manager.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/factory_base.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h" +#include "source/extensions/filters/network/dubbo_proxy/stats.h" #include "absl/container/flat_hash_map.h" diff --git a/source/extensions/filters/network/dubbo_proxy/config.h b/source/extensions/filters/network/dubbo_proxy/config.h index df04009a2b02e..a3bfb453f8ffa 100644 --- a/source/extensions/filters/network/dubbo_proxy/config.h +++ b/source/extensions/filters/network/dubbo_proxy/config.h @@ -5,12 +5,12 @@ #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.h" #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/dubbo_proxy/conn_manager.h" -#include "extensions/filters/network/dubbo_proxy/filters/filter.h" -#include "extensions/filters/network/dubbo_proxy/router/route_matcher.h" -#include "extensions/filters/network/dubbo_proxy/router/router_impl.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/dubbo_proxy/conn_manager.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h" +#include "source/extensions/filters/network/dubbo_proxy/router/route_matcher.h" +#include "source/extensions/filters/network/dubbo_proxy/router/router_impl.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/conn_manager.cc b/source/extensions/filters/network/dubbo_proxy/conn_manager.cc index a21f6350bcaef..3e259a18a6cb7 100644 --- a/source/extensions/filters/network/dubbo_proxy/conn_manager.cc +++ b/source/extensions/filters/network/dubbo_proxy/conn_manager.cc @@ -1,15 +1,14 @@ -#include "extensions/filters/network/dubbo_proxy/conn_manager.h" +#include "source/extensions/filters/network/dubbo_proxy/conn_manager.h" #include #include "envoy/common/exception.h" -#include "common/common/fmt.h" - -#include "extensions/filters/network/dubbo_proxy/app_exception.h" -#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" -#include "extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h" -#include "extensions/filters/network/dubbo_proxy/heartbeat_response.h" +#include "source/common/common/fmt.h" +#include "source/extensions/filters/network/dubbo_proxy/app_exception.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/heartbeat_response.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/conn_manager.h b/source/extensions/filters/network/dubbo_proxy/conn_manager.h index f09ebfa1ac54e..827f74571f8fb 100644 --- a/source/extensions/filters/network/dubbo_proxy/conn_manager.h +++ b/source/extensions/filters/network/dubbo_proxy/conn_manager.h @@ -9,15 +9,14 @@ #include "envoy/stats/stats_macros.h" #include "envoy/stats/timespan.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/dubbo_proxy/active_message.h" -#include "extensions/filters/network/dubbo_proxy/decoder.h" -#include "extensions/filters/network/dubbo_proxy/decoder_event_handler.h" -#include "extensions/filters/network/dubbo_proxy/filters/filter.h" -#include "extensions/filters/network/dubbo_proxy/protocol.h" -#include "extensions/filters/network/dubbo_proxy/serializer.h" -#include "extensions/filters/network/dubbo_proxy/stats.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/dubbo_proxy/active_message.h" +#include "source/extensions/filters/network/dubbo_proxy/decoder.h" +#include "source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h" +#include "source/extensions/filters/network/dubbo_proxy/protocol.h" +#include "source/extensions/filters/network/dubbo_proxy/serializer.h" +#include "source/extensions/filters/network/dubbo_proxy/stats.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/decoder.cc b/source/extensions/filters/network/dubbo_proxy/decoder.cc index 3bd1e79097e23..8ffab1751d33e 100644 --- a/source/extensions/filters/network/dubbo_proxy/decoder.cc +++ b/source/extensions/filters/network/dubbo_proxy/decoder.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/network/dubbo_proxy/decoder.h" +#include "source/extensions/filters/network/dubbo_proxy/decoder.h" -#include "common/common/macros.h" +#include "source/common/common/macros.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/decoder.h b/source/extensions/filters/network/dubbo_proxy/decoder.h index d180ba13e4e0c..32d72f155c8f1 100644 --- a/source/extensions/filters/network/dubbo_proxy/decoder.h +++ b/source/extensions/filters/network/dubbo_proxy/decoder.h @@ -2,12 +2,11 @@ #include "envoy/buffer/buffer.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/dubbo_proxy/decoder_event_handler.h" -#include "extensions/filters/network/dubbo_proxy/protocol.h" -#include "extensions/filters/network/dubbo_proxy/serializer.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h" +#include "source/extensions/filters/network/dubbo_proxy/protocol.h" +#include "source/extensions/filters/network/dubbo_proxy/serializer.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h b/source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h index 0da2344ac1239..8d5b0497d7d4c 100644 --- a/source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h +++ b/source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h @@ -3,10 +3,9 @@ #include "envoy/common/pure.h" #include "envoy/network/filter.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/dubbo_proxy/message.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/message.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.cc b/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.cc index 32572652625fb..f9234ea5f3229 100644 --- a/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.cc +++ b/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/macros.h" - -#include "extensions/filters/network/dubbo_proxy/hessian_utils.h" -#include "extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" #include "hessian2/object.hpp" diff --git a/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h b/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h index 0bdb7697d15cb..c39fb51a01775 100644 --- a/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h +++ b/source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h @@ -1,7 +1,7 @@ #pragma once -#include "extensions/filters/network/dubbo_proxy/message_impl.h" -#include "extensions/filters/network/dubbo_proxy/serializer.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/serializer.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.cc b/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.cc index daaacfe2be4f9..01d86199fc64c 100644 --- a/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.cc +++ b/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.cc @@ -1,10 +1,9 @@ -#include "extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h" #include "envoy/registry/registry.h" -#include "common/common/assert.h" - -#include "extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/common/common/assert.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h b/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h index 47d4bb0062f25..4422a49bc0fc4 100644 --- a/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h +++ b/source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h @@ -1,6 +1,6 @@ #pragma once -#include "extensions/filters/network/dubbo_proxy/protocol.h" +#include "source/extensions/filters/network/dubbo_proxy/protocol.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/filters/BUILD b/source/extensions/filters/network/dubbo_proxy/filters/BUILD index d2c9fd1ff03c1..83e22a8518239 100644 --- a/source/extensions/filters/network/dubbo_proxy/filters/BUILD +++ b/source/extensions/filters/network/dubbo_proxy/filters/BUILD @@ -12,9 +12,9 @@ envoy_cc_library( name = "filter_interface", hdrs = ["filter.h"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/buffer:buffer_interface", + "//envoy/network:connection_interface", + "//envoy/stream_info:stream_info_interface", "//source/extensions/filters/network/dubbo_proxy:decoder_events_lib", "//source/extensions/filters/network/dubbo_proxy:metadata_lib", "//source/extensions/filters/network/dubbo_proxy:protocol_interface", @@ -28,8 +28,8 @@ envoy_cc_library( hdrs = ["filter_config.h"], deps = [ ":filter_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/config:typed_config_interface", + "//envoy/server:filter_config_interface", "//source/common/common:macros", "//source/common/protobuf:cc_wkt_protos", ], diff --git a/source/extensions/filters/network/dubbo_proxy/filters/factory_base.h b/source/extensions/filters/network/dubbo_proxy/filters/factory_base.h index 4591ca9aac823..b00d669dec079 100644 --- a/source/extensions/filters/network/dubbo_proxy/filters/factory_base.h +++ b/source/extensions/filters/network/dubbo_proxy/filters/factory_base.h @@ -5,9 +5,8 @@ #include "envoy/common/pure.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/dubbo_proxy/filters/filter_config.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/filter_config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/filters/filter.h b/source/extensions/filters/network/dubbo_proxy/filters/filter.h index 7ff4cbf5a0301..14324e48df230 100644 --- a/source/extensions/filters/network/dubbo_proxy/filters/filter.h +++ b/source/extensions/filters/network/dubbo_proxy/filters/filter.h @@ -8,12 +8,12 @@ #include "envoy/network/connection.h" #include "envoy/stream_info/stream_info.h" -#include "extensions/filters/network/dubbo_proxy/decoder_event_handler.h" -#include "extensions/filters/network/dubbo_proxy/message.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" -#include "extensions/filters/network/dubbo_proxy/protocol.h" -#include "extensions/filters/network/dubbo_proxy/router/router.h" -#include "extensions/filters/network/dubbo_proxy/serializer.h" +#include "source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h" +#include "source/extensions/filters/network/dubbo_proxy/message.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/protocol.h" +#include "source/extensions/filters/network/dubbo_proxy/router/router.h" +#include "source/extensions/filters/network/dubbo_proxy/serializer.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/filters/filter_config.h b/source/extensions/filters/network/dubbo_proxy/filters/filter_config.h index 2138d44bb062b..9d1fa415baa43 100644 --- a/source/extensions/filters/network/dubbo_proxy/filters/filter_config.h +++ b/source/extensions/filters/network/dubbo_proxy/filters/filter_config.h @@ -6,10 +6,9 @@ #include "envoy/config/typed_config.h" #include "envoy/server/filter_config.h" -#include "common/common/macros.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/network/dubbo_proxy/filters/filter.h" +#include "source/common/common/macros.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h b/source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h index 45528e57e3736..bc88a5e0af3d7 100644 --- a/source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h +++ b/source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h @@ -2,7 +2,7 @@ #include -#include "common/singleton/const_singleton.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/heartbeat_response.cc b/source/extensions/filters/network/dubbo_proxy/heartbeat_response.cc index 69df071a35271..138c5646f8845 100644 --- a/source/extensions/filters/network/dubbo_proxy/heartbeat_response.cc +++ b/source/extensions/filters/network/dubbo_proxy/heartbeat_response.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/dubbo_proxy/heartbeat_response.h" +#include "source/extensions/filters/network/dubbo_proxy/heartbeat_response.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/heartbeat_response.h b/source/extensions/filters/network/dubbo_proxy/heartbeat_response.h index 7c76f6c0d6746..9164262c6679e 100644 --- a/source/extensions/filters/network/dubbo_proxy/heartbeat_response.h +++ b/source/extensions/filters/network/dubbo_proxy/heartbeat_response.h @@ -1,9 +1,9 @@ #pragma once -#include "extensions/filters/network/dubbo_proxy/filters/filter.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" -#include "extensions/filters/network/dubbo_proxy/protocol.h" -#include "extensions/filters/network/dubbo_proxy/serializer.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/protocol.h" +#include "source/extensions/filters/network/dubbo_proxy/serializer.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc b/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc index c75a7427c0c74..9ba4a958066ba 100644 --- a/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc +++ b/source/extensions/filters/network/dubbo_proxy/hessian_utils.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/dubbo_proxy/hessian_utils.h" +#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/message.h b/source/extensions/filters/network/dubbo_proxy/message.h index 3aa194a8c922a..5f36d05b808b2 100644 --- a/source/extensions/filters/network/dubbo_proxy/message.h +++ b/source/extensions/filters/network/dubbo_proxy/message.h @@ -5,7 +5,7 @@ #include "envoy/common/pure.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "absl/container/node_hash_map.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/network/dubbo_proxy/message_impl.cc b/source/extensions/filters/network/dubbo_proxy/message_impl.cc index 5e76711ee832b..73f5e68e14c70 100644 --- a/source/extensions/filters/network/dubbo_proxy/message_impl.cc +++ b/source/extensions/filters/network/dubbo_proxy/message_impl.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" -#include "common/http/header_map_impl.h" +#include "source/common/http/header_map_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/message_impl.h b/source/extensions/filters/network/dubbo_proxy/message_impl.h index 952cbb3dc5c80..2b9092d41c579 100644 --- a/source/extensions/filters/network/dubbo_proxy/message_impl.h +++ b/source/extensions/filters/network/dubbo_proxy/message_impl.h @@ -2,8 +2,8 @@ #include "envoy/http/header_map.h" -#include "extensions/filters/network/dubbo_proxy/hessian_utils.h" -#include "extensions/filters/network/dubbo_proxy/message.h" +#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h" +#include "source/extensions/filters/network/dubbo_proxy/message.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/metadata.h b/source/extensions/filters/network/dubbo_proxy/metadata.h index 698b50283ec6b..647c412d2cefb 100644 --- a/source/extensions/filters/network/dubbo_proxy/metadata.h +++ b/source/extensions/filters/network/dubbo_proxy/metadata.h @@ -3,11 +3,10 @@ #include #include -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/http/header_map_impl.h" - -#include "extensions/filters/network/dubbo_proxy/message.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/header_map_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/message.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/network/dubbo_proxy/protocol.h b/source/extensions/filters/network/dubbo_proxy/protocol.h index 09f16d4420da5..aa3d1192bd6ca 100644 --- a/source/extensions/filters/network/dubbo_proxy/protocol.h +++ b/source/extensions/filters/network/dubbo_proxy/protocol.h @@ -5,14 +5,13 @@ #include "envoy/buffer/buffer.h" #include "envoy/config/typed_config.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/config/utility.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/filters/network/dubbo_proxy/message.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" -#include "extensions/filters/network/dubbo_proxy/serializer.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/config/utility.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/filters/network/dubbo_proxy/message.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/serializer.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/protocol_constants.h b/source/extensions/filters/network/dubbo_proxy/protocol_constants.h index e7b787831e37c..6bad4ff29c0d4 100644 --- a/source/extensions/filters/network/dubbo_proxy/protocol_constants.h +++ b/source/extensions/filters/network/dubbo_proxy/protocol_constants.h @@ -1,10 +1,9 @@ #pragma once -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/filters/network/dubbo_proxy/message.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/filters/network/dubbo_proxy/message.h" #include "absl/container/node_hash_map.h" diff --git a/source/extensions/filters/network/dubbo_proxy/router/BUILD b/source/extensions/filters/network/dubbo_proxy/router/BUILD index 4227ca25fcf5a..2b79d6b1adf3a 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/BUILD +++ b/source/extensions/filters/network/dubbo_proxy/router/BUILD @@ -12,7 +12,7 @@ envoy_cc_library( name = "router_interface", hdrs = ["router.h"], deps = [ - "//include/envoy/router:router_interface", + "//envoy/router:router_interface", "//source/extensions/filters/network/dubbo_proxy:metadata_lib", ], ) @@ -22,8 +22,8 @@ envoy_cc_library( hdrs = ["route.h"], deps = [ ":router_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/config:typed_config_interface", + "//envoy/server:filter_config_interface", "//source/common/config:utility_lib", "//source/common/singleton:const_singleton", "//source/extensions/filters/network/dubbo_proxy:metadata_lib", @@ -38,7 +38,7 @@ envoy_cc_library( deps = [ ":route_matcher_interface", ":router_interface", - "//include/envoy/router:router_interface", + "//envoy/router:router_interface", "//source/common/common:logger_lib", "//source/common/common:matchers_lib", "//source/common/http:header_utility_lib", @@ -57,7 +57,7 @@ envoy_cc_library( hdrs = ["config.h"], deps = [ ":router_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/network/dubbo_proxy/filters:factory_base_lib", "//source/extensions/filters/network/dubbo_proxy/filters:filter_config_interface", "//source/extensions/filters/network/dubbo_proxy/filters:well_known_names", @@ -71,10 +71,10 @@ envoy_cc_library( hdrs = ["router_impl.h"], deps = [ ":router_interface", - "//include/envoy/tcp:conn_pool_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:load_balancer_interface", - "//include/envoy/upstream:thread_local_cluster_interface", + "//envoy/tcp:conn_pool_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:load_balancer_interface", + "//envoy/upstream:thread_local_cluster_interface", "//source/common/common:logger_lib", "//source/common/http:header_utility_lib", "//source/common/router:metadatamatchcriteria_lib", diff --git a/source/extensions/filters/network/dubbo_proxy/router/config.cc b/source/extensions/filters/network/dubbo_proxy/router/config.cc index b82e9bd02768b..c89cbc3788e87 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/config.cc +++ b/source/extensions/filters/network/dubbo_proxy/router/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/dubbo_proxy/router/config.h" +#include "source/extensions/filters/network/dubbo_proxy/router/config.h" #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.h" #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/network/dubbo_proxy/router/router_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/router/router_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/router/config.h b/source/extensions/filters/network/dubbo_proxy/router/config.h index 2406514fdca35..99391f8ca4d04 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/config.h +++ b/source/extensions/filters/network/dubbo_proxy/router/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.h" #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.validate.h" -#include "extensions/filters/network/dubbo_proxy/filters/factory_base.h" -#include "extensions/filters/network/dubbo_proxy/filters/well_known_names.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/factory_base.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/router/route.h b/source/extensions/filters/network/dubbo_proxy/router/route.h index 247cdf480f161..f4346afda93ba 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/route.h +++ b/source/extensions/filters/network/dubbo_proxy/router/route.h @@ -8,11 +8,10 @@ #include "envoy/router/router.h" #include "envoy/server/filter_config.h" -#include "common/config/utility.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/filters/network/dubbo_proxy/metadata.h" -#include "extensions/filters/network/dubbo_proxy/router/router.h" +#include "source/common/config/utility.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/router/router.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc index 7a5f5d26f944d..904d7d1eb77b8 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc +++ b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.cc @@ -1,9 +1,9 @@ -#include "extensions/filters/network/dubbo_proxy/router/route_matcher.h" +#include "source/extensions/filters/network/dubbo_proxy/router/route_matcher.h" #include "envoy/config/route/v3/route_components.pb.h" #include "envoy/extensions/filters/network/dubbo_proxy/v3/route.pb.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h index 79ab71db3b135..1a36230b8c5b3 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h +++ b/source/extensions/filters/network/dubbo_proxy/router/route_matcher.h @@ -8,15 +8,14 @@ #include "envoy/extensions/filters/network/dubbo_proxy/v3/route.pb.h" #include "envoy/type/v3/range.pb.h" -#include "common/common/logger.h" -#include "common/common/matchers.h" -#include "common/http/header_utility.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/network/dubbo_proxy/message_impl.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" -#include "extensions/filters/network/dubbo_proxy/router/route.h" -#include "extensions/filters/network/dubbo_proxy/router/router.h" +#include "source/common/common/logger.h" +#include "source/common/common/matchers.h" +#include "source/common/http/header_utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/router/route.h" +#include "source/extensions/filters/network/dubbo_proxy/router/router.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/network/dubbo_proxy/router/router.h b/source/extensions/filters/network/dubbo_proxy/router/router.h index 37887be6058de..e9f2ce15374d3 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/router.h +++ b/source/extensions/filters/network/dubbo_proxy/router/router.h @@ -5,7 +5,7 @@ #include "envoy/router/router.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc b/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc index 17e57fd49989a..05eaa49570fdc 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc +++ b/source/extensions/filters/network/dubbo_proxy/router/router_impl.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/dubbo_proxy/router/router_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/router/router_impl.h" #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/thread_local_cluster.h" -#include "extensions/filters/network/dubbo_proxy/app_exception.h" -#include "extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/app_exception.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" namespace Envoy { namespace Extensions { @@ -65,9 +65,8 @@ FilterStatus Router::onMessageDecoded(MessageMetadataSharedPtr metadata, Context return FilterStatus::StopIteration; } - Tcp::ConnectionPool::Instance* conn_pool = - cluster->tcpConnPool(Upstream::ResourcePriority::Default, this); - if (!conn_pool) { + auto conn_pool_data = cluster->tcpConnPool(Upstream::ResourcePriority::Default, this); + if (!conn_pool_data) { callbacks_->sendLocalReply( AppException( ResponseStatus::ServerError, @@ -112,8 +111,9 @@ FilterStatus Router::onMessageDecoded(MessageMetadataSharedPtr metadata, Context upstream_request_buffer_.move(ctx->originMessage(), ctx->messageSize()); } - upstream_request_ = std::make_unique( - *this, *conn_pool, metadata, callbacks_->serializationType(), callbacks_->protocolType()); + upstream_request_ = std::make_unique(*this, *conn_pool_data, metadata, + callbacks_->serializationType(), + callbacks_->protocolType()); return upstream_request_->start(); } @@ -188,11 +188,11 @@ void Router::cleanup() { } } -Router::UpstreamRequest::UpstreamRequest(Router& parent, Tcp::ConnectionPool::Instance& pool, +Router::UpstreamRequest::UpstreamRequest(Router& parent, Upstream::TcpPoolData& pool_data, MessageMetadataSharedPtr& metadata, SerializationType serialization_type, ProtocolType protocol_type) - : parent_(parent), conn_pool_(pool), metadata_(metadata), + : parent_(parent), conn_pool_data_(pool_data), metadata_(metadata), protocol_( NamedProtocolConfigFactory::getFactory(protocol_type).createProtocol(serialization_type)), request_complete_(false), response_started_(false), response_complete_(false), @@ -201,7 +201,7 @@ Router::UpstreamRequest::UpstreamRequest(Router& parent, Tcp::ConnectionPool::In Router::UpstreamRequest::~UpstreamRequest() = default; FilterStatus Router::UpstreamRequest::start() { - Tcp::ConnectionPool::Cancellable* handle = conn_pool_.newConnection(*this); + Tcp::ConnectionPool::Cancellable* handle = conn_pool_data_.newConnection(*this); if (handle) { // Pause while we wait for a connection. conn_pool_handle_ = handle; diff --git a/source/extensions/filters/network/dubbo_proxy/router/router_impl.h b/source/extensions/filters/network/dubbo_proxy/router/router_impl.h index 84a746d1f8a9a..65f4500843798 100644 --- a/source/extensions/filters/network/dubbo_proxy/router/router_impl.h +++ b/source/extensions/filters/network/dubbo_proxy/router/router_impl.h @@ -6,11 +6,10 @@ #include "envoy/buffer/buffer.h" #include "envoy/tcp/conn_pool.h" -#include "common/common/logger.h" -#include "common/upstream/load_balancer_impl.h" - -#include "extensions/filters/network/dubbo_proxy/filters/filter.h" -#include "extensions/filters/network/dubbo_proxy/router/router.h" +#include "source/common/common/logger.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h" +#include "source/extensions/filters/network/dubbo_proxy/router/router.h" namespace Envoy { namespace Extensions { @@ -47,7 +46,7 @@ class Router : public Tcp::ConnectionPool::UpstreamCallbacks, private: struct UpstreamRequest : public Tcp::ConnectionPool::Callbacks { - UpstreamRequest(Router& parent, Tcp::ConnectionPool::Instance& pool, + UpstreamRequest(Router& parent, Upstream::TcpPoolData& pool_data, MessageMetadataSharedPtr& metadata, SerializationType serialization_type, ProtocolType protocol_type); ~UpstreamRequest() override; @@ -69,7 +68,7 @@ class Router : public Tcp::ConnectionPool::UpstreamCallbacks, void onResetStream(ConnectionPool::PoolFailureReason reason); Router& parent_; - Tcp::ConnectionPool::Instance& conn_pool_; + Upstream::TcpPoolData conn_pool_data_; MessageMetadataSharedPtr metadata_; Tcp::ConnectionPool::Cancellable* conn_pool_handle_{}; diff --git a/source/extensions/filters/network/dubbo_proxy/serializer.h b/source/extensions/filters/network/dubbo_proxy/serializer.h index 8b12ccd43dc4b..753c49b0fb2d5 100644 --- a/source/extensions/filters/network/dubbo_proxy/serializer.h +++ b/source/extensions/filters/network/dubbo_proxy/serializer.h @@ -5,13 +5,12 @@ #include "envoy/buffer/buffer.h" #include "envoy/config/typed_config.h" -#include "common/common/assert.h" -#include "common/config/utility.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/filters/network/dubbo_proxy/message.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" -#include "extensions/filters/network/dubbo_proxy/protocol_constants.h" +#include "source/common/common/assert.h" +#include "source/common/config/utility.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/filters/network/dubbo_proxy/message.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/protocol_constants.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/echo/BUILD b/source/extensions/filters/network/echo/BUILD index 2352cb8089531..e0a91ea30b2c9 100644 --- a/source/extensions/filters/network/echo/BUILD +++ b/source/extensions/filters/network/echo/BUILD @@ -17,9 +17,9 @@ envoy_cc_library( srcs = ["echo.cc"], hdrs = ["echo.h"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", + "//envoy/buffer:buffer_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", ], @@ -34,8 +34,8 @@ envoy_cc_extension( ], deps = [ ":echo", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", "@envoy_api//envoy/extensions/filters/network/echo/v3:pkg_cc_proto", diff --git a/source/extensions/filters/network/echo/config.cc b/source/extensions/filters/network/echo/config.cc index 119b1252d8931..f15984e24199b 100644 --- a/source/extensions/filters/network/echo/config.cc +++ b/source/extensions/filters/network/echo/config.cc @@ -3,9 +3,9 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/echo/echo.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/echo/echo.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/echo/echo.cc b/source/extensions/filters/network/echo/echo.cc index 60baf5f694bd5..674e162450518 100644 --- a/source/extensions/filters/network/echo/echo.cc +++ b/source/extensions/filters/network/echo/echo.cc @@ -1,9 +1,9 @@ -#include "extensions/filters/network/echo/echo.h" +#include "source/extensions/filters/network/echo/echo.h" #include "envoy/buffer/buffer.h" #include "envoy/network/connection.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/echo/echo.h b/source/extensions/filters/network/echo/echo.h index 64957aa827830..7d51e2b294aab 100644 --- a/source/extensions/filters/network/echo/echo.h +++ b/source/extensions/filters/network/echo/echo.h @@ -2,7 +2,7 @@ #include "envoy/network/filter.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/ext_authz/BUILD b/source/extensions/filters/network/ext_authz/BUILD index 7ceb93fa7b805..ec33b570f98b5 100644 --- a/source/extensions/filters/network/ext_authz/BUILD +++ b/source/extensions/filters/network/ext_authz/BUILD @@ -17,11 +17,11 @@ envoy_cc_library( srcs = ["ext_authz.cc"], hdrs = ["ext_authz.h"], deps = [ - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/runtime:runtime_interface", + "//envoy/stats:stats_macros", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:assert_lib", "//source/common/common:matchers_lib", "//source/common/tracing:http_tracer_lib", @@ -38,7 +38,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", "//source/extensions/filters/network:well_known_names", diff --git a/source/extensions/filters/network/ext_authz/config.cc b/source/extensions/filters/network/ext_authz/config.cc index 65e852f6a181f..a8447f45342a1 100644 --- a/source/extensions/filters/network/ext_authz/config.cc +++ b/source/extensions/filters/network/ext_authz/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/ext_authz/config.h" +#include "source/extensions/filters/network/ext_authz/config.h" #include #include @@ -9,12 +9,11 @@ #include "envoy/network/connection.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/common/ext_authz/ext_authz.h" -#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" -#include "extensions/filters/network/ext_authz/ext_authz.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/common/ext_authz/ext_authz.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" +#include "source/extensions/filters/network/ext_authz/ext_authz.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/ext_authz/config.h b/source/extensions/filters/network/ext_authz/config.h index 84ff872df5b96..17dc86e184a25 100644 --- a/source/extensions/filters/network/ext_authz/config.h +++ b/source/extensions/filters/network/ext_authz/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.h" #include "envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/ext_authz/ext_authz.cc b/source/extensions/filters/network/ext_authz/ext_authz.cc index f19cd3bb0eb90..7b187472a3548 100644 --- a/source/extensions/filters/network/ext_authz/ext_authz.cc +++ b/source/extensions/filters/network/ext_authz/ext_authz.cc @@ -1,14 +1,13 @@ -#include "extensions/filters/network/ext_authz/ext_authz.h" +#include "source/extensions/filters/network/ext_authz/ext_authz.h" #include #include #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/filters/network/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/ext_authz/ext_authz.h b/source/extensions/filters/network/ext_authz/ext_authz.h index 89aa7b36892dc..d055d493f524f 100644 --- a/source/extensions/filters/network/ext_authz/ext_authz.h +++ b/source/extensions/filters/network/ext_authz/ext_authz.h @@ -14,10 +14,9 @@ #include "envoy/stats/stats_macros.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/matchers.h" - -#include "extensions/filters/common/ext_authz/ext_authz.h" -#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" +#include "source/common/common/matchers.h" +#include "source/extensions/filters/common/ext_authz/ext_authz.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/http_connection_manager/BUILD b/source/extensions/filters/network/http_connection_manager/BUILD index 46867ac644bbc..5751aa3967848 100644 --- a/source/extensions/filters/network/http_connection_manager/BUILD +++ b/source/extensions/filters/network/http_connection_manager/BUILD @@ -22,17 +22,17 @@ envoy_cc_extension( visibility = ["//visibility:public"], deps = [ ":dependency_manager", - "//include/envoy/config:config_provider_manager_interface", - "//include/envoy/filesystem:filesystem_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/http:original_ip_detection_interface", - "//include/envoy/http:request_id_extension_interface", - "//include/envoy/registry", - "//include/envoy/router:route_config_provider_manager_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:options_interface", - "//include/envoy/stats:stats_interface", + "//envoy/config:config_provider_manager_interface", + "//envoy/filesystem:filesystem_interface", + "//envoy/http:codec_interface", + "//envoy/http:filter_interface", + "//envoy/http:original_ip_detection_interface", + "//envoy/http:request_id_extension_interface", + "//envoy/registry", + "//envoy/router:route_config_provider_manager_interface", + "//envoy/server:admin_interface", + "//envoy/server:options_interface", + "//envoy/stats:stats_interface", "//source/common/access_log:access_log_lib", "//source/common/common:minimal_logger_lib", "//source/common/config:utility_lib", diff --git a/source/extensions/filters/network/http_connection_manager/config.cc b/source/extensions/filters/network/http_connection_manager/config.cc index 9995ac7e7fea2..c30836230797f 100644 --- a/source/extensions/filters/network/http_connection_manager/config.cc +++ b/source/extensions/filters/network/http_connection_manager/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/http_connection_manager/config.h" +#include "source/extensions/filters/network/http_connection_manager/config.h" #include #include @@ -17,31 +17,31 @@ #include "envoy/type/tracing/v3/custom_tag.pb.h" #include "envoy/type/v3/percent.pb.h" -#include "common/access_log/access_log_impl.h" -#include "common/common/fmt.h" -#include "common/config/utility.h" -#include "common/filter/http/filter_config_discovery_impl.h" -#include "common/http/conn_manager_config.h" -#include "common/http/conn_manager_utility.h" -#include "common/http/default_server_string.h" -#include "common/http/http1/codec_impl.h" -#include "common/http/http1/settings.h" -#include "common/http/http2/codec_impl.h" -#include "common/http/request_id_extension_impl.h" -#include "common/http/utility.h" -#include "common/local_reply/local_reply.h" -#include "common/protobuf/utility.h" -#include "common/router/rds_impl.h" -#include "common/router/scoped_rds.h" -#include "common/runtime/runtime_impl.h" -#include "common/tracing/http_tracer_manager_impl.h" -#include "common/tracing/tracer_config_impl.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/config/utility.h" +#include "source/common/filter/http/filter_config_discovery_impl.h" +#include "source/common/http/conn_manager_config.h" +#include "source/common/http/conn_manager_utility.h" +#include "source/common/http/default_server_string.h" +#include "source/common/http/http1/codec_impl.h" +#include "source/common/http/http1/settings.h" +#include "source/common/http/http2/codec_impl.h" +#include "source/common/http/request_id_extension_impl.h" +#include "source/common/http/utility.h" +#include "source/common/local_reply/local_reply.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/rds_impl.h" +#include "source/common/router/scoped_rds.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/tracing/http_tracer_manager_impl.h" +#include "source/common/tracing/tracer_config_impl.h" #ifdef ENVOY_ENABLE_QUIC -#include "common/quic/codec_impl.h" +#include "source/common/quic/codec_impl.h" #endif -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/http_connection_manager/config.h b/source/extensions/filters/network/http_connection_manager/config.h index 1e4e93445f61d..b2b8ae2a9e275 100644 --- a/source/extensions/filters/network/http_connection_manager/config.h +++ b/source/extensions/filters/network/http_connection_manager/config.h @@ -18,22 +18,21 @@ #include "envoy/router/route_config_provider_manager.h" #include "envoy/tracing/http_tracer_manager.h" -#include "common/common/logger.h" -#include "common/http/conn_manager_config.h" -#include "common/http/conn_manager_impl.h" -#include "common/http/date_provider_impl.h" -#include "common/http/http1/codec_stats.h" -#include "common/http/http2/codec_stats.h" -#include "common/http/http3/codec_stats.h" -#include "common/json/json_loader.h" -#include "common/local_reply/local_reply.h" -#include "common/router/rds_impl.h" -#include "common/router/scoped_rds.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/http_connection_manager/dependency_manager.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/common/logger.h" +#include "source/common/http/conn_manager_config.h" +#include "source/common/http/conn_manager_impl.h" +#include "source/common/http/date_provider_impl.h" +#include "source/common/http/http1/codec_stats.h" +#include "source/common/http/http2/codec_stats.h" +#include "source/common/http/http3/codec_stats.h" +#include "source/common/json/json_loader.h" +#include "source/common/local_reply/local_reply.h" +#include "source/common/router/rds_impl.h" +#include "source/common/router/scoped_rds.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/http_connection_manager/dependency_manager.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/http_connection_manager/dependency_manager.cc b/source/extensions/filters/network/http_connection_manager/dependency_manager.cc index d84e117557f7c..526fa46d60628 100644 --- a/source/extensions/filters/network/http_connection_manager/dependency_manager.cc +++ b/source/extensions/filters/network/http_connection_manager/dependency_manager.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/http_connection_manager/dependency_manager.h" +#include "source/extensions/filters/network/http_connection_manager/dependency_manager.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/substitute.h" diff --git a/source/extensions/filters/network/kafka/BUILD b/source/extensions/filters/network/kafka/BUILD index ccc2401ace47e..a6f2677a6075d 100644 --- a/source/extensions/filters/network/kafka/BUILD +++ b/source/extensions/filters/network/kafka/BUILD @@ -37,9 +37,9 @@ envoy_cc_library( deps = [ ":kafka_request_codec_lib", ":kafka_response_codec_lib", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", + "//envoy/buffer:buffer_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", ], @@ -226,7 +226,7 @@ envoy_cc_library( ], deps = [ ":kafka_types_lib", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/common:byte_order_lib", "//source/common/common:safe_memcpy_lib", ], diff --git a/source/extensions/filters/network/kafka/broker/config.cc b/source/extensions/filters/network/kafka/broker/config.cc index a90922243f145..5e8620728f66c 100644 --- a/source/extensions/filters/network/kafka/broker/config.cc +++ b/source/extensions/filters/network/kafka/broker/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/kafka/broker/config.h" +#include "source/extensions/filters/network/kafka/broker/config.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" #include "envoy/stats/scope.h" -#include "extensions/filters/network/kafka/broker/filter.h" +#include "source/extensions/filters/network/kafka/broker/filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/broker/config.h b/source/extensions/filters/network/kafka/broker/config.h index 38fb1e01861e0..62ed619aedece 100644 --- a/source/extensions/filters/network/kafka/broker/config.h +++ b/source/extensions/filters/network/kafka/broker/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.h" #include "envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/broker/filter.cc b/source/extensions/filters/network/kafka/broker/filter.cc index e55f4f1b29ba9..88427ea6f35d8 100644 --- a/source/extensions/filters/network/kafka/broker/filter.cc +++ b/source/extensions/filters/network/kafka/broker/filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/broker/filter.h" +#include "source/extensions/filters/network/kafka/broker/filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/broker/filter.h b/source/extensions/filters/network/kafka/broker/filter.h index dc2c4eef3990b..57c63de0dcf04 100644 --- a/source/extensions/filters/network/kafka/broker/filter.h +++ b/source/extensions/filters/network/kafka/broker/filter.h @@ -3,13 +3,12 @@ #include "envoy/network/filter.h" #include "envoy/stats/scope.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/kafka/external/request_metrics.h" -#include "extensions/filters/network/kafka/external/response_metrics.h" -#include "extensions/filters/network/kafka/parser.h" -#include "extensions/filters/network/kafka/request_codec.h" -#include "extensions/filters/network/kafka/response_codec.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/kafka/external/request_metrics.h" +#include "source/extensions/filters/network/kafka/external/response_metrics.h" +#include "source/extensions/filters/network/kafka/parser.h" +#include "source/extensions/filters/network/kafka/request_codec.h" +#include "source/extensions/filters/network/kafka/response_codec.h" #include "absl/container/flat_hash_map.h" diff --git a/source/extensions/filters/network/kafka/kafka_request.h b/source/extensions/filters/network/kafka/kafka_request.h index ff9f57282af36..3c9cc414083e0 100644 --- a/source/extensions/filters/network/kafka/kafka_request.h +++ b/source/extensions/filters/network/kafka/kafka_request.h @@ -2,9 +2,9 @@ #include "envoy/common/exception.h" -#include "extensions/filters/network/kafka/external/serialization_composite.h" -#include "extensions/filters/network/kafka/serialization.h" -#include "extensions/filters/network/kafka/tagged_fields.h" +#include "source/extensions/filters/network/kafka/external/serialization_composite.h" +#include "source/extensions/filters/network/kafka/serialization.h" +#include "source/extensions/filters/network/kafka/tagged_fields.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/kafka_request_parser.cc b/source/extensions/filters/network/kafka/kafka_request_parser.cc index 811c051182c3c..c713dad186a39 100644 --- a/source/extensions/filters/network/kafka/kafka_request_parser.cc +++ b/source/extensions/filters/network/kafka/kafka_request_parser.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/kafka_request_parser.h" +#include "source/extensions/filters/network/kafka/kafka_request_parser.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/kafka_request_parser.h b/source/extensions/filters/network/kafka/kafka_request_parser.h index 15d304b8d187f..8afdc769de085 100644 --- a/source/extensions/filters/network/kafka/kafka_request_parser.h +++ b/source/extensions/filters/network/kafka/kafka_request_parser.h @@ -4,11 +4,10 @@ #include "envoy/common/exception.h" -#include "common/common/assert.h" - -#include "extensions/filters/network/kafka/kafka_request.h" -#include "extensions/filters/network/kafka/parser.h" -#include "extensions/filters/network/kafka/tagged_fields.h" +#include "source/common/common/assert.h" +#include "source/extensions/filters/network/kafka/kafka_request.h" +#include "source/extensions/filters/network/kafka/parser.h" +#include "source/extensions/filters/network/kafka/tagged_fields.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/kafka_response.h b/source/extensions/filters/network/kafka/kafka_response.h index e53ae70de0dad..805d46defb698 100644 --- a/source/extensions/filters/network/kafka/kafka_response.h +++ b/source/extensions/filters/network/kafka/kafka_response.h @@ -1,8 +1,8 @@ #pragma once -#include "extensions/filters/network/kafka/external/serialization_composite.h" -#include "extensions/filters/network/kafka/serialization.h" -#include "extensions/filters/network/kafka/tagged_fields.h" +#include "source/extensions/filters/network/kafka/external/serialization_composite.h" +#include "source/extensions/filters/network/kafka/serialization.h" +#include "source/extensions/filters/network/kafka/tagged_fields.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/kafka_response_parser.cc b/source/extensions/filters/network/kafka/kafka_response_parser.cc index 3adbb1b287779..dc0a8a9b1f983 100644 --- a/source/extensions/filters/network/kafka/kafka_response_parser.cc +++ b/source/extensions/filters/network/kafka/kafka_response_parser.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/kafka_response_parser.h" +#include "source/extensions/filters/network/kafka/kafka_response_parser.h" #include "absl/strings/str_cat.h" diff --git a/source/extensions/filters/network/kafka/kafka_response_parser.h b/source/extensions/filters/network/kafka/kafka_response_parser.h index 428511bac592c..ab3fd2d66b1df 100644 --- a/source/extensions/filters/network/kafka/kafka_response_parser.h +++ b/source/extensions/filters/network/kafka/kafka_response_parser.h @@ -3,9 +3,9 @@ #include #include -#include "extensions/filters/network/kafka/kafka_response.h" -#include "extensions/filters/network/kafka/parser.h" -#include "extensions/filters/network/kafka/tagged_fields.h" +#include "source/extensions/filters/network/kafka/kafka_response.h" +#include "source/extensions/filters/network/kafka/parser.h" +#include "source/extensions/filters/network/kafka/tagged_fields.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/parser.h b/source/extensions/filters/network/kafka/parser.h index f131a32426599..a9cb67458be78 100644 --- a/source/extensions/filters/network/kafka/parser.h +++ b/source/extensions/filters/network/kafka/parser.h @@ -2,7 +2,7 @@ #include -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/network/kafka/protocol/kafka_request_resolver_cc.j2 b/source/extensions/filters/network/kafka/protocol/kafka_request_resolver_cc.j2 index d82c23864fd73..0d2da9aaa7c50 100644 --- a/source/extensions/filters/network/kafka/protocol/kafka_request_resolver_cc.j2 +++ b/source/extensions/filters/network/kafka/protocol/kafka_request_resolver_cc.j2 @@ -3,9 +3,9 @@ Defines default Kafka request resolver, that uses request parsers in (also generated) 'requests.h'. #} -#include "extensions/filters/network/kafka/external/requests.h" -#include "extensions/filters/network/kafka/kafka_request_parser.h" -#include "extensions/filters/network/kafka/parser.h" +#include "source/extensions/filters/network/kafka/external/requests.h" +#include "source/extensions/filters/network/kafka/kafka_request_parser.h" +#include "source/extensions/filters/network/kafka/parser.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/protocol/kafka_response_resolver_cc.j2 b/source/extensions/filters/network/kafka/protocol/kafka_response_resolver_cc.j2 index b89df698a5d79..0256e370dca6d 100644 --- a/source/extensions/filters/network/kafka/protocol/kafka_response_resolver_cc.j2 +++ b/source/extensions/filters/network/kafka/protocol/kafka_response_resolver_cc.j2 @@ -3,8 +3,8 @@ Defines default Kafka response resolver, that uses response parsers in (also generated) 'responses.h'. #} -#include "extensions/filters/network/kafka/external/responses.h" -#include "extensions/filters/network/kafka/kafka_response_parser.h" +#include "source/extensions/filters/network/kafka/external/responses.h" +#include "source/extensions/filters/network/kafka/kafka_response_parser.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/protocol/requests_h.j2 b/source/extensions/filters/network/kafka/protocol/requests_h.j2 index ff85d19410d07..e6b4fd42976c4 100644 --- a/source/extensions/filters/network/kafka/protocol/requests_h.j2 +++ b/source/extensions/filters/network/kafka/protocol/requests_h.j2 @@ -22,8 +22,8 @@ (because partition data is present in every FetchRequestTopic version). #} #pragma once -#include "extensions/filters/network/kafka/kafka_request.h" -#include "extensions/filters/network/kafka/kafka_request_parser.h" +#include "source/extensions/filters/network/kafka/kafka_request.h" +#include "source/extensions/filters/network/kafka/kafka_request_parser.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/protocol/responses_h.j2 b/source/extensions/filters/network/kafka/protocol/responses_h.j2 index d7a3d6a63391a..099e6c014c03b 100644 --- a/source/extensions/filters/network/kafka/protocol/responses_h.j2 +++ b/source/extensions/filters/network/kafka/protocol/responses_h.j2 @@ -23,8 +23,8 @@ - AbortedTransaction & its Deserializers (starting with version 4). #} #pragma once -#include "extensions/filters/network/kafka/kafka_response.h" -#include "extensions/filters/network/kafka/kafka_response_parser.h" +#include "source/extensions/filters/network/kafka/kafka_response.h" +#include "source/extensions/filters/network/kafka/kafka_response_parser.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/request_codec.cc b/source/extensions/filters/network/kafka/request_codec.cc index 398f0116131ce..f389cecad74b9 100644 --- a/source/extensions/filters/network/kafka/request_codec.cc +++ b/source/extensions/filters/network/kafka/request_codec.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/network/kafka/request_codec.h" +#include "source/extensions/filters/network/kafka/request_codec.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/network/kafka/request_codec.h b/source/extensions/filters/network/kafka/request_codec.h index 1c69637029ae1..07fa4b2b90e0d 100644 --- a/source/extensions/filters/network/kafka/request_codec.h +++ b/source/extensions/filters/network/kafka/request_codec.h @@ -3,10 +3,10 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/pure.h" -#include "extensions/filters/network/kafka/codec.h" -#include "extensions/filters/network/kafka/kafka_request.h" -#include "extensions/filters/network/kafka/kafka_request_parser.h" -#include "extensions/filters/network/kafka/parser.h" +#include "source/extensions/filters/network/kafka/codec.h" +#include "source/extensions/filters/network/kafka/kafka_request.h" +#include "source/extensions/filters/network/kafka/kafka_request_parser.h" +#include "source/extensions/filters/network/kafka/parser.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/response_codec.cc b/source/extensions/filters/network/kafka/response_codec.cc index 8c41f407da8eb..ccde039bb9514 100644 --- a/source/extensions/filters/network/kafka/response_codec.cc +++ b/source/extensions/filters/network/kafka/response_codec.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/network/kafka/response_codec.h" +#include "source/extensions/filters/network/kafka/response_codec.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/response_codec.h b/source/extensions/filters/network/kafka/response_codec.h index 767426c4b7df5..688defdc75b1b 100644 --- a/source/extensions/filters/network/kafka/response_codec.h +++ b/source/extensions/filters/network/kafka/response_codec.h @@ -1,7 +1,7 @@ #pragma once -#include "extensions/filters/network/kafka/codec.h" -#include "extensions/filters/network/kafka/kafka_response_parser.h" +#include "source/extensions/filters/network/kafka/codec.h" +#include "source/extensions/filters/network/kafka/kafka_response_parser.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/serialization.cc b/source/extensions/filters/network/kafka/serialization.cc index 1f1d2643f3a8b..f34f6b0d652a2 100644 --- a/source/extensions/filters/network/kafka/serialization.cc +++ b/source/extensions/filters/network/kafka/serialization.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/serialization.h" +#include "source/extensions/filters/network/kafka/serialization.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/kafka/serialization.h b/source/extensions/filters/network/kafka/serialization.h index 6e2fe85f145b1..cab81a0acf238 100644 --- a/source/extensions/filters/network/kafka/serialization.h +++ b/source/extensions/filters/network/kafka/serialization.h @@ -9,12 +9,11 @@ #include "envoy/common/exception.h" #include "envoy/common/pure.h" -#include "common/common/byte_order.h" -#include "common/common/fmt.h" -#include "common/common/safe_memcpy.h" -#include "common/common/utility.h" - -#include "extensions/filters/network/kafka/kafka_types.h" +#include "source/common/common/byte_order.h" +#include "source/common/common/fmt.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/common/utility.h" +#include "source/extensions/filters/network/kafka/kafka_types.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/network/kafka/serialization/serialization_composite_h.j2 b/source/extensions/filters/network/kafka/serialization/serialization_composite_h.j2 index 83a7be7a25f35..0f4e7065c41cb 100644 --- a/source/extensions/filters/network/kafka/serialization/serialization_composite_h.j2 +++ b/source/extensions/filters/network/kafka/serialization/serialization_composite_h.j2 @@ -16,11 +16,11 @@ #include "envoy/common/exception.h" #include "envoy/common/pure.h" -#include "common/common/byte_order.h" -#include "common/common/fmt.h" +#include "source/common/common/byte_order.h" +#include "source/common/common/fmt.h" -#include "extensions/filters/network/kafka/kafka_types.h" -#include "extensions/filters/network/kafka/serialization.h" +#include "source/extensions/filters/network/kafka/kafka_types.h" +#include "source/extensions/filters/network/kafka/serialization.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/network/kafka/tagged_fields.h b/source/extensions/filters/network/kafka/tagged_fields.h index 0678d9053f326..6ace5ce2fccad 100644 --- a/source/extensions/filters/network/kafka/tagged_fields.h +++ b/source/extensions/filters/network/kafka/tagged_fields.h @@ -2,7 +2,7 @@ #include -#include "extensions/filters/network/kafka/serialization.h" +#include "source/extensions/filters/network/kafka/serialization.h" /** * This header file provides serialization support for tagged fields structure added in 2.4. diff --git a/source/extensions/filters/network/local_ratelimit/BUILD b/source/extensions/filters/network/local_ratelimit/BUILD index c0b757dc8c6e1..9bcc59be68831 100644 --- a/source/extensions/filters/network/local_ratelimit/BUILD +++ b/source/extensions/filters/network/local_ratelimit/BUILD @@ -17,11 +17,11 @@ envoy_cc_library( srcs = ["local_ratelimit.cc"], hdrs = ["local_ratelimit.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/stats:stats_macros", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/network:filter_interface", + "//envoy/runtime:runtime_interface", + "//envoy/stats:stats_macros", "//source/common/protobuf:utility_lib", "//source/common/runtime:runtime_lib", "//source/extensions/filters/common/local_ratelimit:local_ratelimit_lib", diff --git a/source/extensions/filters/network/local_ratelimit/config.cc b/source/extensions/filters/network/local_ratelimit/config.cc index e8b7e05d3d685..e9d2c907bd102 100644 --- a/source/extensions/filters/network/local_ratelimit/config.cc +++ b/source/extensions/filters/network/local_ratelimit/config.cc @@ -1,9 +1,9 @@ -#include "extensions/filters/network/local_ratelimit/config.h" +#include "source/extensions/filters/network/local_ratelimit/config.h" #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h" #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.validate.h" -#include "extensions/filters/network/local_ratelimit/local_ratelimit.h" +#include "source/extensions/filters/network/local_ratelimit/local_ratelimit.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/local_ratelimit/config.h b/source/extensions/filters/network/local_ratelimit/config.h index ca03d81d9398b..d96fb762e8f59 100644 --- a/source/extensions/filters/network/local_ratelimit/config.h +++ b/source/extensions/filters/network/local_ratelimit/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h" #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/local_ratelimit/local_ratelimit.cc b/source/extensions/filters/network/local_ratelimit/local_ratelimit.cc index 2876797639276..9f462aa9b289f 100644 --- a/source/extensions/filters/network/local_ratelimit/local_ratelimit.cc +++ b/source/extensions/filters/network/local_ratelimit/local_ratelimit.cc @@ -1,9 +1,9 @@ -#include "extensions/filters/network/local_ratelimit/local_ratelimit.h" +#include "source/extensions/filters/network/local_ratelimit/local_ratelimit.h" #include "envoy/event/dispatcher.h" #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/local_ratelimit/local_ratelimit.h b/source/extensions/filters/network/local_ratelimit/local_ratelimit.h index f8ac072724594..61166d1991dba 100644 --- a/source/extensions/filters/network/local_ratelimit/local_ratelimit.h +++ b/source/extensions/filters/network/local_ratelimit/local_ratelimit.h @@ -6,10 +6,9 @@ #include "envoy/runtime/runtime.h" #include "envoy/stats/stats_macros.h" -#include "common/common/thread_synchronizer.h" -#include "common/runtime/runtime_protos.h" - -#include "extensions/filters/common/local_ratelimit/local_ratelimit_impl.h" +#include "source/common/common/thread_synchronizer.h" +#include "source/common/runtime/runtime_protos.h" +#include "source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/BUILD b/source/extensions/filters/network/mongo_proxy/BUILD index 04a32f0729016..651d4d6ed20f2 100644 --- a/source/extensions/filters/network/mongo_proxy/BUILD +++ b/source/extensions/filters/network/mongo_proxy/BUILD @@ -15,7 +15,7 @@ envoy_extension_package() envoy_cc_library( name = "bson_interface", hdrs = ["bson.h"], - deps = ["//include/envoy/buffer:buffer_interface"], + deps = ["//envoy/buffer:buffer_interface"], ) envoy_cc_library( @@ -30,7 +30,7 @@ envoy_cc_library( hdrs = ["bson_impl.h"], deps = [ ":bson_interface", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/common:assert_lib", "//source/common/common:byte_order_lib", "//source/common/common:hex_lib", @@ -46,7 +46,7 @@ envoy_cc_library( deps = [ ":bson_lib", ":codec_interface", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", ], @@ -61,15 +61,15 @@ envoy_cc_library( ":codec_lib", ":mongo_stats_lib", ":utility_lib", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/common:time_interface", - "//include/envoy/filesystem:filesystem_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:drain_decision_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/access_log:access_log_interface", + "//envoy/common:time_interface", + "//envoy/filesystem:filesystem_interface", + "//envoy/network:connection_interface", + "//envoy/network:drain_decision_interface", + "//envoy/network:filter_interface", + "//envoy/runtime:runtime_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", @@ -87,7 +87,7 @@ envoy_cc_library( srcs = ["mongo_stats.cc"], hdrs = ["mongo_stats.h"], deps = [ - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", "//source/common/stats:symbol_table_lib", "//source/common/stats:utility_lib", ], @@ -109,7 +109,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":proxy_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", "@envoy_api//envoy/extensions/filters/network/mongo_proxy/v3:pkg_cc_proto", diff --git a/source/extensions/filters/network/mongo_proxy/bson_impl.cc b/source/extensions/filters/network/mongo_proxy/bson_impl.cc index de0b9170b22b9..3f6d10d827c7c 100644 --- a/source/extensions/filters/network/mongo_proxy/bson_impl.cc +++ b/source/extensions/filters/network/mongo_proxy/bson_impl.cc @@ -1,14 +1,14 @@ -#include "extensions/filters/network/mongo_proxy/bson_impl.h" +#include "source/extensions/filters/network/mongo_proxy/bson_impl.h" #include #include #include -#include "common/common/assert.h" -#include "common/common/byte_order.h" -#include "common/common/fmt.h" -#include "common/common/hex.h" -#include "common/common/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/byte_order.h" +#include "source/common/common/fmt.h" +#include "source/common/common/hex.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/bson_impl.h b/source/extensions/filters/network/mongo_proxy/bson_impl.h index 57e44c951d443..38bc2b91bc297 100644 --- a/source/extensions/filters/network/mongo_proxy/bson_impl.h +++ b/source/extensions/filters/network/mongo_proxy/bson_impl.h @@ -7,10 +7,9 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/exception.h" -#include "common/common/logger.h" -#include "common/common/utility.h" - -#include "extensions/filters/network/mongo_proxy/bson.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" +#include "source/extensions/filters/network/mongo_proxy/bson.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/codec.h b/source/extensions/filters/network/mongo_proxy/codec.h index b6221ba30bd07..8588b86b36e2c 100644 --- a/source/extensions/filters/network/mongo_proxy/codec.h +++ b/source/extensions/filters/network/mongo_proxy/codec.h @@ -5,7 +5,7 @@ #include #include -#include "extensions/filters/network/mongo_proxy/bson.h" +#include "source/extensions/filters/network/mongo_proxy/bson.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/codec_impl.cc b/source/extensions/filters/network/mongo_proxy/codec_impl.cc index d56fe7ff4e319..8a4ad294284f6 100644 --- a/source/extensions/filters/network/mongo_proxy/codec_impl.cc +++ b/source/extensions/filters/network/mongo_proxy/codec_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/mongo_proxy/codec_impl.h" +#include "source/extensions/filters/network/mongo_proxy/codec_impl.h" #include #include @@ -9,10 +9,9 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" - -#include "extensions/filters/network/mongo_proxy/bson_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/extensions/filters/network/mongo_proxy/bson_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/codec_impl.h b/source/extensions/filters/network/mongo_proxy/codec_impl.h index 4a404d14089ea..6041dbcdf4c65 100644 --- a/source/extensions/filters/network/mongo_proxy/codec_impl.h +++ b/source/extensions/filters/network/mongo_proxy/codec_impl.h @@ -5,9 +5,8 @@ #include #include -#include "common/common/logger.h" - -#include "extensions/filters/network/mongo_proxy/codec.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/mongo_proxy/codec.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/config.cc b/source/extensions/filters/network/mongo_proxy/config.cc index ecdc60644888e..79597c01087ed 100644 --- a/source/extensions/filters/network/mongo_proxy/config.cc +++ b/source/extensions/filters/network/mongo_proxy/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/mongo_proxy/config.h" +#include "source/extensions/filters/network/mongo_proxy/config.h" #include @@ -7,9 +7,8 @@ #include "envoy/network/connection.h" #include "envoy/registry/registry.h" -#include "common/common/fmt.h" - -#include "extensions/filters/network/mongo_proxy/proxy.h" +#include "source/common/common/fmt.h" +#include "source/extensions/filters/network/mongo_proxy/proxy.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/config.h b/source/extensions/filters/network/mongo_proxy/config.h index f5819c39b453b..59448bfe01e78 100644 --- a/source/extensions/filters/network/mongo_proxy/config.h +++ b/source/extensions/filters/network/mongo_proxy/config.h @@ -5,8 +5,8 @@ #include "envoy/extensions/filters/network/mongo_proxy/v3/mongo_proxy.pb.h" #include "envoy/extensions/filters/network/mongo_proxy/v3/mongo_proxy.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/mongo_stats.cc b/source/extensions/filters/network/mongo_proxy/mongo_stats.cc index aca9ffaf35fd1..fd362d35af42b 100644 --- a/source/extensions/filters/network/mongo_proxy/mongo_stats.cc +++ b/source/extensions/filters/network/mongo_proxy/mongo_stats.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/mongo_proxy/mongo_stats.h" +#include "source/extensions/filters/network/mongo_proxy/mongo_stats.h" #include #include @@ -6,7 +6,7 @@ #include "envoy/stats/scope.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/mongo_stats.h b/source/extensions/filters/network/mongo_proxy/mongo_stats.h index 3df51affd0a4f..5dee147145997 100644 --- a/source/extensions/filters/network/mongo_proxy/mongo_stats.h +++ b/source/extensions/filters/network/mongo_proxy/mongo_stats.h @@ -6,8 +6,8 @@ #include "envoy/stats/scope.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/utility.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/proxy.cc b/source/extensions/filters/network/mongo_proxy/proxy.cc index 8a8042ede4250..86db1078f6599 100644 --- a/source/extensions/filters/network/mongo_proxy/proxy.cc +++ b/source/extensions/filters/network/mongo_proxy/proxy.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/mongo_proxy/proxy.h" +#include "source/extensions/filters/network/mongo_proxy/proxy.h" #include #include @@ -10,12 +10,11 @@ #include "envoy/runtime/runtime.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" - -#include "extensions/filters/network/mongo_proxy/codec_impl.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/extensions/filters/network/mongo_proxy/codec_impl.h" +#include "source/extensions/filters/network/well_known_names.h" #include "absl/strings/str_split.h" diff --git a/source/extensions/filters/network/mongo_proxy/proxy.h b/source/extensions/filters/network/mongo_proxy/proxy.h index 773d4714aa7fa..f049c6d4d6dd8 100644 --- a/source/extensions/filters/network/mongo_proxy/proxy.h +++ b/source/extensions/filters/network/mongo_proxy/proxy.h @@ -16,16 +16,15 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" -#include "common/network/filter_impl.h" -#include "common/protobuf/utility.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/filters/common/fault/fault_config.h" -#include "extensions/filters/network/mongo_proxy/codec.h" -#include "extensions/filters/network/mongo_proxy/mongo_stats.h" -#include "extensions/filters/network/mongo_proxy/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/common/network/filter_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/filters/common/fault/fault_config.h" +#include "source/extensions/filters/network/mongo_proxy/codec.h" +#include "source/extensions/filters/network/mongo_proxy/mongo_stats.h" +#include "source/extensions/filters/network/mongo_proxy/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/utility.cc b/source/extensions/filters/network/mongo_proxy/utility.cc index bb45377442887..421eceaa9b641 100644 --- a/source/extensions/filters/network/mongo_proxy/utility.cc +++ b/source/extensions/filters/network/mongo_proxy/utility.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/mongo_proxy/utility.h" +#include "source/extensions/filters/network/mongo_proxy/utility.h" #include #include "envoy/common/exception.h" -#include "common/json/json_loader.h" +#include "source/common/json/json_loader.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mongo_proxy/utility.h b/source/extensions/filters/network/mongo_proxy/utility.h index 3b8a6773601cf..4394640c9e361 100644 --- a/source/extensions/filters/network/mongo_proxy/utility.h +++ b/source/extensions/filters/network/mongo_proxy/utility.h @@ -2,7 +2,7 @@ #include -#include "extensions/filters/network/mongo_proxy/codec.h" +#include "source/extensions/filters/network/mongo_proxy/codec.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/BUILD b/source/extensions/filters/network/mysql_proxy/BUILD index 43d66bdf11c5b..8c2f9316138ac 100644 --- a/source/extensions/filters/network/mysql_proxy/BUILD +++ b/source/extensions/filters/network/mysql_proxy/BUILD @@ -23,10 +23,10 @@ envoy_cc_library( deps = [ ":codec_lib", ":decoder_lib", - "//include/envoy/network:filter_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/network:filter_interface", + "//envoy/server:filter_config_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/network:filter_lib", "//source/extensions/filters/network:well_known_names", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec.h b/source/extensions/filters/network/mysql_proxy/mysql_codec.h index 5cc863eb8f765..d040ab3fb6dbd 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_codec.h @@ -2,8 +2,8 @@ #include "envoy/common/platform.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc index f8bbab1160c1d..be4739d909f93 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc +++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.cc @@ -1,7 +1,7 @@ -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h index c6714e1fd8124..fbf3f7b22a723 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h @@ -1,9 +1,8 @@ #pragma once #include "envoy/buffer/buffer.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc index 3e204058e5dfb..8847de47baf0f 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc +++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" #include "envoy/buffer/buffer.h" -#include "common/common/assert.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h index 37f882003e421..a843e0c85b623 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h @@ -4,10 +4,9 @@ #include "envoy/buffer/buffer.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc b/source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc index 8642a12126aa3..4e515381760ae 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc +++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_command.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/network/mysql_proxy/mysql_codec_command.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h" #include "envoy/buffer/buffer.h" -#include "common/common/logger.h" -#include "common/common/macros.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/common/common/logger.h" +#include "source/common/common/macros.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.h b/source/extensions/filters/network/mysql_proxy/mysql_codec_command.h index 3d76c31d9ccb2..4764770e07040 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_command.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_command.h @@ -1,9 +1,8 @@ #pragma once #include "envoy/buffer/buffer.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc b/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc index 90ecd487b48cd..88b2ba5f1ec1b 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc +++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.cc @@ -1,9 +1,9 @@ -#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" #include "envoy/buffer/buffer.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h b/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h index 8f33d5eb5ecfa..a507a5ec89398 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h @@ -1,7 +1,6 @@ #pragma once -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc b/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc index 0aec54525de71..120669c5f2883 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc +++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.cc @@ -1,11 +1,10 @@ -#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" #include "envoy/buffer/buffer.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h b/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h index ccf2f91debf48..f6128191e3721 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h @@ -1,8 +1,7 @@ #pragma once -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_config.cc b/source/extensions/filters/network/mysql_proxy/mysql_config.cc index f2c536e9fd64d..39a68f5f8d267 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_config.cc +++ b/source/extensions/filters/network/mysql_proxy/mysql_config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/mysql_proxy/mysql_config.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_config.h" #include @@ -7,9 +7,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/mysql_proxy/mysql_filter.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_config.h b/source/extensions/filters/network/mysql_proxy/mysql_config.h index d0a90364832f2..66e459f901449 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_config.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_config.h @@ -3,9 +3,9 @@ #include "envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.h" #include "envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/mysql_proxy/mysql_filter.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_filter.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_decoder.h b/source/extensions/filters/network/mysql_proxy/mysql_decoder.h index 6b813e2248f19..6b4f83a2c8cc6 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_decoder.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_decoder.h @@ -1,12 +1,12 @@ #pragma once -#include "extensions/common/sqlutils/sqlutils.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_command.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" -#include "extensions/filters/network/mysql_proxy/mysql_session.h" +#include "source/extensions/common/sqlutils/sqlutils.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_session.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.cc b/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.cc index aac9e3a6366a1..f958f22aefd27 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.cc +++ b/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.cc @@ -1,10 +1,9 @@ -#include "extensions/filters/network/mysql_proxy/mysql_decoder_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h b/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h index 3159e298a66e1..ae787ba777c04 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h @@ -1,5 +1,5 @@ #pragma once -#include "extensions/filters/network/mysql_proxy/mysql_decoder.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_decoder.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_filter.cc b/source/extensions/filters/network/mysql_proxy/mysql_filter.cc index 602d1e0e8c2cb..a1f6a1da95f50 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_filter.cc +++ b/source/extensions/filters/network/mysql_proxy/mysql_filter.cc @@ -1,15 +1,14 @@ -#include "extensions/filters/network/mysql_proxy/mysql_filter.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_filter.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" -#include "extensions/filters/network/mysql_proxy/mysql_decoder_impl.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_decoder_impl.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_filter.h b/source/extensions/filters/network/mysql_proxy/mysql_filter.h index daabb165dde62..6b83b13770f0b 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_filter.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_filter.h @@ -7,16 +7,15 @@ #include "envoy/stats/stats.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_command.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" -#include "extensions/filters/network/mysql_proxy/mysql_decoder.h" -#include "extensions/filters/network/mysql_proxy/mysql_session.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_decoder.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_session.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_session.h b/source/extensions/filters/network/mysql_proxy/mysql_session.h index 41655b7adc6a3..691d582633b11 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_session.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_session.h @@ -1,5 +1,5 @@ #pragma once -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_utils.cc b/source/extensions/filters/network/mysql_proxy/mysql_utils.cc index d72fe8e06d852..d2574cc94fbf7 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_utils.cc +++ b/source/extensions/filters/network/mysql_proxy/mysql_utils.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/mysql_proxy/mysql_utils.h b/source/extensions/filters/network/mysql_proxy/mysql_utils.h index 2a60feb49763b..d8548eed24f01 100644 --- a/source/extensions/filters/network/mysql_proxy/mysql_utils.h +++ b/source/extensions/filters/network/mysql_proxy/mysql_utils.h @@ -3,11 +3,10 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/platform.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/byte_order.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/byte_order.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/postgres_proxy/BUILD b/source/extensions/filters/network/postgres_proxy/BUILD index 1367aa5c048a0..89c26a2cf94fa 100644 --- a/source/extensions/filters/network/postgres_proxy/BUILD +++ b/source/extensions/filters/network/postgres_proxy/BUILD @@ -29,10 +29,10 @@ envoy_cc_library( ], repository = "@envoy", deps = [ - "//include/envoy/network:filter_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/network:filter_interface", + "//envoy/server:filter_config_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/buffer:buffer_lib", "//source/common/network:filter_lib", "//source/extensions/common/sqlutils:sqlutils_lib", diff --git a/source/extensions/filters/network/postgres_proxy/config.cc b/source/extensions/filters/network/postgres_proxy/config.cc index 4e0eeb8c05b15..a1e148da6396b 100644 --- a/source/extensions/filters/network/postgres_proxy/config.cc +++ b/source/extensions/filters/network/postgres_proxy/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/postgres_proxy/config.h" +#include "source/extensions/filters/network/postgres_proxy/config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/postgres_proxy/config.h b/source/extensions/filters/network/postgres_proxy/config.h index eada27fed6184..7edb63852575e 100644 --- a/source/extensions/filters/network/postgres_proxy/config.h +++ b/source/extensions/filters/network/postgres_proxy/config.h @@ -3,9 +3,9 @@ #include "envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.h" #include "envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/postgres_proxy/postgres_filter.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/postgres_proxy/postgres_filter.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/postgres_proxy/postgres_decoder.cc b/source/extensions/filters/network/postgres_proxy/postgres_decoder.cc index f5d144dc48835..7af15c8d305b1 100644 --- a/source/extensions/filters/network/postgres_proxy/postgres_decoder.cc +++ b/source/extensions/filters/network/postgres_proxy/postgres_decoder.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/postgres_proxy/postgres_decoder.h" +#include "source/extensions/filters/network/postgres_proxy/postgres_decoder.h" #include diff --git a/source/extensions/filters/network/postgres_proxy/postgres_decoder.h b/source/extensions/filters/network/postgres_proxy/postgres_decoder.h index b8326aaf8bc60..bed146c097a90 100644 --- a/source/extensions/filters/network/postgres_proxy/postgres_decoder.h +++ b/source/extensions/filters/network/postgres_proxy/postgres_decoder.h @@ -3,12 +3,11 @@ #include "envoy/common/platform.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" - -#include "extensions/common/sqlutils/sqlutils.h" -#include "extensions/filters/network/postgres_proxy/postgres_message.h" -#include "extensions/filters/network/postgres_proxy/postgres_session.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/extensions/common/sqlutils/sqlutils.h" +#include "source/extensions/filters/network/postgres_proxy/postgres_message.h" +#include "source/extensions/filters/network/postgres_proxy/postgres_session.h" #include "absl/container/flat_hash_map.h" diff --git a/source/extensions/filters/network/postgres_proxy/postgres_filter.cc b/source/extensions/filters/network/postgres_proxy/postgres_filter.cc index accc59117c484..71e3388718b17 100644 --- a/source/extensions/filters/network/postgres_proxy/postgres_filter.cc +++ b/source/extensions/filters/network/postgres_proxy/postgres_filter.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/postgres_proxy/postgres_filter.h" +#include "source/extensions/filters/network/postgres_proxy/postgres_filter.h" #include "envoy/buffer/buffer.h" #include "envoy/network/connection.h" -#include "extensions/filters/network/postgres_proxy/postgres_decoder.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/postgres_proxy/postgres_decoder.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/postgres_proxy/postgres_filter.h b/source/extensions/filters/network/postgres_proxy/postgres_filter.h index f6740b3536ab4..cb89499d47c4f 100644 --- a/source/extensions/filters/network/postgres_proxy/postgres_filter.h +++ b/source/extensions/filters/network/postgres_proxy/postgres_filter.h @@ -5,10 +5,9 @@ #include "envoy/stats/stats.h" #include "envoy/stats/stats_macros.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/postgres_proxy/postgres_decoder.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/postgres_proxy/postgres_decoder.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/postgres_proxy/postgres_message.cc b/source/extensions/filters/network/postgres_proxy/postgres_message.cc index 5f7c1f27d8143..340092d489105 100644 --- a/source/extensions/filters/network/postgres_proxy/postgres_message.cc +++ b/source/extensions/filters/network/postgres_proxy/postgres_message.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/postgres_proxy/postgres_message.h" +#include "source/extensions/filters/network/postgres_proxy/postgres_message.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/postgres_proxy/postgres_message.h b/source/extensions/filters/network/postgres_proxy/postgres_message.h index 697a2e84ef473..948167892b148 100644 --- a/source/extensions/filters/network/postgres_proxy/postgres_message.h +++ b/source/extensions/filters/network/postgres_proxy/postgres_message.h @@ -1,6 +1,6 @@ #pragma once -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" diff --git a/source/extensions/filters/network/postgres_proxy/postgres_session.h b/source/extensions/filters/network/postgres_proxy/postgres_session.h index 46d8632530bc3..b8282d008e168 100644 --- a/source/extensions/filters/network/postgres_proxy/postgres_session.h +++ b/source/extensions/filters/network/postgres_proxy/postgres_session.h @@ -1,7 +1,7 @@ #pragma once #include -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/ratelimit/BUILD b/source/extensions/filters/network/ratelimit/BUILD index 35694dc418b8f..50f8ef0368984 100644 --- a/source/extensions/filters/network/ratelimit/BUILD +++ b/source/extensions/filters/network/ratelimit/BUILD @@ -23,11 +23,11 @@ envoy_cc_library( "//test/extensions:__subpackages__", ], deps = [ - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/ratelimit:ratelimit_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/stats:stats_macros", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/ratelimit:ratelimit_interface", + "//envoy/runtime:runtime_interface", + "//envoy/stats:stats_macros", "//source/common/tracing:http_tracer_lib", "//source/extensions/filters/common/ratelimit:ratelimit_client_interface", "//source/extensions/filters/network:well_known_names", @@ -40,7 +40,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", "//source/extensions/filters/common/ratelimit:ratelimit_client_interface", diff --git a/source/extensions/filters/network/ratelimit/config.cc b/source/extensions/filters/network/ratelimit/config.cc index 1274275f77477..fdf84987e9ff2 100644 --- a/source/extensions/filters/network/ratelimit/config.cc +++ b/source/extensions/filters/network/ratelimit/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/ratelimit/config.h" +#include "source/extensions/filters/network/ratelimit/config.h" #include #include @@ -7,11 +7,10 @@ #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/common/ratelimit/ratelimit_impl.h" -#include "extensions/filters/network/ratelimit/ratelimit.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h" +#include "source/extensions/filters/network/ratelimit/ratelimit.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/ratelimit/config.h b/source/extensions/filters/network/ratelimit/config.h index 616696c61b041..8156613a49053 100644 --- a/source/extensions/filters/network/ratelimit/config.h +++ b/source/extensions/filters/network/ratelimit/config.h @@ -3,9 +3,9 @@ #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.h" #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.validate.h" -#include "extensions/filters/common/ratelimit/ratelimit.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/common/ratelimit/ratelimit.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/ratelimit/ratelimit.cc b/source/extensions/filters/network/ratelimit/ratelimit.cc index 1ac7accd7d112..1714f5a4f8ad7 100644 --- a/source/extensions/filters/network/ratelimit/ratelimit.cc +++ b/source/extensions/filters/network/ratelimit/ratelimit.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/ratelimit/ratelimit.h" +#include "source/extensions/filters/network/ratelimit/ratelimit.h" #include #include @@ -6,10 +6,9 @@ #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.h" #include "envoy/stats/scope.h" -#include "common/common/fmt.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/filters/network/well_known_names.h" +#include "source/common/common/fmt.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/ratelimit/ratelimit.h b/source/extensions/filters/network/ratelimit/ratelimit.h index 168be8008ff55..fac416280945c 100644 --- a/source/extensions/filters/network/ratelimit/ratelimit.h +++ b/source/extensions/filters/network/ratelimit/ratelimit.h @@ -13,7 +13,7 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "extensions/filters/common/ratelimit/ratelimit.h" +#include "source/extensions/filters/common/ratelimit/ratelimit.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rbac/BUILD b/source/extensions/filters/network/rbac/BUILD index be7137d0f8d58..200ea6327282d 100644 --- a/source/extensions/filters/network/rbac/BUILD +++ b/source/extensions/filters/network/rbac/BUILD @@ -15,8 +15,8 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":rbac_filter", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", "@envoy_api//envoy/config/rbac/v3:pkg_cc_proto", @@ -29,9 +29,9 @@ envoy_cc_library( srcs = ["rbac_filter.cc"], hdrs = ["rbac_filter.h"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", + "//envoy/buffer:buffer_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", "//source/common/common:minimal_logger_lib", "//source/extensions/filters/common/rbac:engine_lib", "//source/extensions/filters/common/rbac:utility_lib", diff --git a/source/extensions/filters/network/rbac/config.cc b/source/extensions/filters/network/rbac/config.cc index f50e490ba378c..b5fc803f5202e 100644 --- a/source/extensions/filters/network/rbac/config.cc +++ b/source/extensions/filters/network/rbac/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/rbac/config.h" +#include "source/extensions/filters/network/rbac/config.h" #include "envoy/config/rbac/v3/rbac.pb.h" #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h" @@ -6,8 +6,8 @@ #include "envoy/network/connection.h" #include "envoy/registry/registry.h" -#include "extensions/filters/network/rbac/rbac_filter.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/rbac/rbac_filter.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rbac/config.h b/source/extensions/filters/network/rbac/config.h index 2555df7bc7a22..ec3ab751627f8 100644 --- a/source/extensions/filters/network/rbac/config.h +++ b/source/extensions/filters/network/rbac/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h" #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rbac/rbac_filter.cc b/source/extensions/filters/network/rbac/rbac_filter.cc index 3892600c77dcd..705ecf0d417f2 100644 --- a/source/extensions/filters/network/rbac/rbac_filter.cc +++ b/source/extensions/filters/network/rbac/rbac_filter.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/rbac/rbac_filter.h" +#include "source/extensions/filters/network/rbac/rbac_filter.h" #include "envoy/buffer/buffer.h" #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h" #include "envoy/network/connection.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/well_known_names.h" #include "absl/strings/str_join.h" diff --git a/source/extensions/filters/network/rbac/rbac_filter.h b/source/extensions/filters/network/rbac/rbac_filter.h index 1faee7c498fdf..d5eabcc2b4737 100644 --- a/source/extensions/filters/network/rbac/rbac_filter.h +++ b/source/extensions/filters/network/rbac/rbac_filter.h @@ -5,10 +5,9 @@ #include "envoy/network/filter.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" - -#include "extensions/filters/common/rbac/engine_impl.h" -#include "extensions/filters/common/rbac/utility.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/common/rbac/engine_impl.h" +#include "source/extensions/filters/common/rbac/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/redis_proxy/BUILD b/source/extensions/filters/network/redis_proxy/BUILD index 3d70b7f7c3504..0902220618ac6 100644 --- a/source/extensions/filters/network/redis_proxy/BUILD +++ b/source/extensions/filters/network/redis_proxy/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( name = "command_splitter_interface", hdrs = ["command_splitter.h"], deps = [ - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "//source/extensions/filters/network/common/redis:codec_interface", ], ) @@ -38,7 +38,7 @@ envoy_cc_library( name = "conn_pool_interface", hdrs = ["conn_pool.h"], deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", "//source/extensions/filters/network/common/redis:client_interface", "//source/extensions/filters/network/common/redis:codec_interface", ], @@ -58,8 +58,8 @@ envoy_cc_library( ":command_splitter_interface", ":conn_pool_lib", ":router_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/stats:timespan_interface", + "//envoy/stats:stats_macros", + "//envoy/stats:timespan_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/common:utility_lib", @@ -78,9 +78,9 @@ envoy_cc_library( deps = [ ":config_interface", ":conn_pool_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/stats:stats_macros", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/network:address_lib", @@ -104,9 +104,9 @@ envoy_cc_library( hdrs = ["proxy_filter.h"], deps = [ ":command_splitter_interface", - "//include/envoy/network:drain_decision_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/network:drain_decision_interface", + "//envoy/network:filter_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/config:datasource_lib", @@ -125,7 +125,7 @@ envoy_cc_extension( "//test/integration:__subpackages__", ], deps = [ - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:upstream_interface", "//source/extensions/common/redis:cluster_refresh_manager_lib", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", @@ -147,8 +147,8 @@ envoy_cc_library( hdrs = ["router_impl.h"], deps = [ ":router_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", "//source/extensions/filters/network/common/redis:codec_lib", "//source/extensions/filters/network/common/redis:supported_commands_lib", "//source/extensions/filters/network/common/redis:utility_lib", diff --git a/source/extensions/filters/network/redis_proxy/command_splitter.h b/source/extensions/filters/network/redis_proxy/command_splitter.h index 019ae429459ad..b6905db242e39 100644 --- a/source/extensions/filters/network/redis_proxy/command_splitter.h +++ b/source/extensions/filters/network/redis_proxy/command_splitter.h @@ -5,7 +5,7 @@ #include "envoy/common/pure.h" #include "envoy/event/dispatcher.h" -#include "extensions/filters/network/common/redis/codec.h" +#include "source/extensions/filters/network/common/redis/codec.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc b/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc index 8b5aa8317cbab..65552d8ae523c 100644 --- a/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc +++ b/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc @@ -1,8 +1,7 @@ -#include "extensions/filters/network/redis_proxy/command_splitter_impl.h" +#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/common/redis/supported_commands.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/common/redis/supported_commands.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/redis_proxy/command_splitter_impl.h b/source/extensions/filters/network/redis_proxy/command_splitter_impl.h index 301daf2450dc9..9c765ea10e3cc 100644 --- a/source/extensions/filters/network/redis_proxy/command_splitter_impl.h +++ b/source/extensions/filters/network/redis_proxy/command_splitter_impl.h @@ -8,16 +8,15 @@ #include "envoy/stats/stats_macros.h" #include "envoy/stats/timespan.h" -#include "common/common/logger.h" -#include "common/common/utility.h" -#include "common/stats/timespan_impl.h" - -#include "extensions/filters/network/common/redis/client_impl.h" -#include "extensions/filters/network/common/redis/fault_impl.h" -#include "extensions/filters/network/common/redis/utility.h" -#include "extensions/filters/network/redis_proxy/command_splitter.h" -#include "extensions/filters/network/redis_proxy/conn_pool_impl.h" -#include "extensions/filters/network/redis_proxy/router.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" +#include "source/common/stats/timespan_impl.h" +#include "source/extensions/filters/network/common/redis/client_impl.h" +#include "source/extensions/filters/network/common/redis/fault_impl.h" +#include "source/extensions/filters/network/common/redis/utility.h" +#include "source/extensions/filters/network/redis_proxy/command_splitter.h" +#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h" +#include "source/extensions/filters/network/redis_proxy/router.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/redis_proxy/config.cc b/source/extensions/filters/network/redis_proxy/config.cc index d10e951e7b853..4a6790b7569de 100644 --- a/source/extensions/filters/network/redis_proxy/config.cc +++ b/source/extensions/filters/network/redis_proxy/config.cc @@ -1,14 +1,14 @@ -#include "extensions/filters/network/redis_proxy/config.h" +#include "source/extensions/filters/network/redis_proxy/config.h" #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h" -#include "extensions/common/redis/cluster_refresh_manager_impl.h" -#include "extensions/filters/network/common/redis/client_impl.h" -#include "extensions/filters/network/common/redis/fault_impl.h" -#include "extensions/filters/network/redis_proxy/command_splitter_impl.h" -#include "extensions/filters/network/redis_proxy/proxy_filter.h" -#include "extensions/filters/network/redis_proxy/router_impl.h" +#include "source/extensions/common/redis/cluster_refresh_manager_impl.h" +#include "source/extensions/filters/network/common/redis/client_impl.h" +#include "source/extensions/filters/network/common/redis/fault_impl.h" +#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h" +#include "source/extensions/filters/network/redis_proxy/proxy_filter.h" +#include "source/extensions/filters/network/redis_proxy/router_impl.h" #include "absl/container/flat_hash_set.h" diff --git a/source/extensions/filters/network/redis_proxy/config.h b/source/extensions/filters/network/redis_proxy/config.h index c3237934fcea1..fc32de5163bcd 100644 --- a/source/extensions/filters/network/redis_proxy/config.h +++ b/source/extensions/filters/network/redis_proxy/config.h @@ -8,11 +8,10 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h" #include "envoy/upstream/upstream.h" -#include "common/common/empty_string.h" -#include "common/config/datasource.h" - -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/common/empty_string.h" +#include "source/common/config/datasource.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/redis_proxy/conn_pool.h b/source/extensions/filters/network/redis_proxy/conn_pool.h index 385fac2eb5278..4c9246d63838b 100644 --- a/source/extensions/filters/network/redis_proxy/conn_pool.h +++ b/source/extensions/filters/network/redis_proxy/conn_pool.h @@ -6,8 +6,8 @@ #include "envoy/upstream/cluster_manager.h" -#include "extensions/filters/network/common/redis/client.h" -#include "extensions/filters/network/common/redis/codec.h" +#include "source/extensions/filters/network/common/redis/client.h" +#include "source/extensions/filters/network/common/redis/codec.h" #include "absl/types/variant.h" diff --git a/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc b/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc index 83c04e7bdb89f..56a06c67e0753 100644 --- a/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc +++ b/source/extensions/filters/network/redis_proxy/conn_pool_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/redis_proxy/conn_pool_impl.h" +#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h" #include #include @@ -11,11 +11,10 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h" -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/stats/utility.h" - -#include "extensions/filters/network/redis_proxy/config.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/stats/utility.h" +#include "source/extensions/filters/network/redis_proxy/config.h" namespace Envoy { namespace Extensions { @@ -153,8 +152,7 @@ void InstanceImpl::ThreadLocalPool::onClusterAddOrUpdateNonVirtual( Upstream::ClusterInfoConstSharedPtr info = cluster_->info(); const auto& cluster_type = info->clusterType(); is_redis_cluster_ = info->lbType() == Upstream::LoadBalancerType::ClusterProvided && - cluster_type.has_value() && - cluster_type->name() == Extensions::Clusters::ClusterTypes::get().Redis; + cluster_type.has_value() && cluster_type->name() == "envoy.clusters.redis"; } void InstanceImpl::ThreadLocalPool::onClusterRemoval(const std::string& cluster_name) { diff --git a/source/extensions/filters/network/redis_proxy/conn_pool_impl.h b/source/extensions/filters/network/redis_proxy/conn_pool_impl.h index 60c27afe1c224..76373d33fe9c6 100644 --- a/source/extensions/filters/network/redis_proxy/conn_pool_impl.h +++ b/source/extensions/filters/network/redis_proxy/conn_pool_impl.h @@ -12,22 +12,20 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/address_impl.h" -#include "common/network/filter_impl.h" -#include "common/protobuf/utility.h" -#include "common/singleton/const_singleton.h" -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/upstream_impl.h" - +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/filter_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/singleton/const_singleton.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "source/extensions/clusters/redis/redis_cluster_lb.h" - -#include "extensions/common/redis/cluster_refresh_manager.h" -#include "extensions/filters/network/common/redis/client.h" -#include "extensions/filters/network/common/redis/client_impl.h" -#include "extensions/filters/network/common/redis/codec_impl.h" -#include "extensions/filters/network/common/redis/utility.h" -#include "extensions/filters/network/redis_proxy/conn_pool.h" +#include "source/extensions/common/redis/cluster_refresh_manager.h" +#include "source/extensions/filters/network/common/redis/client.h" +#include "source/extensions/filters/network/common/redis/client_impl.h" +#include "source/extensions/filters/network/common/redis/codec_impl.h" +#include "source/extensions/filters/network/common/redis/utility.h" +#include "source/extensions/filters/network/redis_proxy/conn_pool.h" #include "absl/container/node_hash_map.h" diff --git a/source/extensions/filters/network/redis_proxy/proxy_filter.cc b/source/extensions/filters/network/redis_proxy/proxy_filter.cc index 54e029813ef07..cbc1be8302c0c 100644 --- a/source/extensions/filters/network/redis_proxy/proxy_filter.cc +++ b/source/extensions/filters/network/redis_proxy/proxy_filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/redis_proxy/proxy_filter.h" +#include "source/extensions/filters/network/redis_proxy/proxy_filter.h" #include #include @@ -6,10 +6,10 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/config/datasource.h" -#include "common/config/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/config/datasource.h" +#include "source/common/config/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/redis_proxy/proxy_filter.h b/source/extensions/filters/network/redis_proxy/proxy_filter.h index 103e7c33c9e65..12fbc92555497 100644 --- a/source/extensions/filters/network/redis_proxy/proxy_filter.h +++ b/source/extensions/filters/network/redis_proxy/proxy_filter.h @@ -11,10 +11,9 @@ #include "envoy/stats/scope.h" #include "envoy/upstream/cluster_manager.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/common/redis/codec.h" -#include "extensions/filters/network/redis_proxy/command_splitter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/common/redis/codec.h" +#include "source/extensions/filters/network/redis_proxy/command_splitter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/redis_proxy/router.h b/source/extensions/filters/network/redis_proxy/router.h index d1090be1ed8d4..339a672ef6458 100644 --- a/source/extensions/filters/network/redis_proxy/router.h +++ b/source/extensions/filters/network/redis_proxy/router.h @@ -6,7 +6,7 @@ #include "envoy/common/pure.h" -#include "extensions/filters/network/redis_proxy/conn_pool.h" +#include "source/extensions/filters/network/redis_proxy/conn_pool.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/redis_proxy/router_impl.cc b/source/extensions/filters/network/redis_proxy/router_impl.cc index bccb472c8e3af..3e5048737ef1d 100644 --- a/source/extensions/filters/network/redis_proxy/router_impl.cc +++ b/source/extensions/filters/network/redis_proxy/router_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/redis_proxy/router_impl.h" +#include "source/extensions/filters/network/redis_proxy/router_impl.h" #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" #include "envoy/type/v3/percent.pb.h" diff --git a/source/extensions/filters/network/redis_proxy/router_impl.h b/source/extensions/filters/network/redis_proxy/router_impl.h index e60552c5c8791..47a04f9adec86 100644 --- a/source/extensions/filters/network/redis_proxy/router_impl.h +++ b/source/extensions/filters/network/redis_proxy/router_impl.h @@ -13,9 +13,9 @@ #include "envoy/type/v3/percent.pb.h" #include "envoy/upstream/cluster_manager.h" -#include "extensions/filters/network/common/redis/supported_commands.h" -#include "extensions/filters/network/redis_proxy/conn_pool_impl.h" -#include "extensions/filters/network/redis_proxy/router.h" +#include "source/extensions/filters/network/common/redis/supported_commands.h" +#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h" +#include "source/extensions/filters/network/redis_proxy/router.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/BUILD b/source/extensions/filters/network/rocketmq_proxy/BUILD index fe9ba3ab5022f..f9ea690d242d8 100644 --- a/source/extensions/filters/network/rocketmq_proxy/BUILD +++ b/source/extensions/filters/network/rocketmq_proxy/BUILD @@ -19,8 +19,8 @@ envoy_cc_library( name = "stats_interface", hdrs = ["stats.h"], deps = [ - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", ], ) @@ -74,7 +74,7 @@ envoy_cc_library( ], deps = [ ":protocol_lib", - "//include/envoy/network:filter_interface", + "//envoy/network:filter_interface", "//source/common/protobuf:utility_lib", ], ) @@ -95,11 +95,11 @@ envoy_cc_library( ":rocketmq_lib", ":stats_interface", ":well_known_names", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/tcp:conn_pool_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/buffer:buffer_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:connection_interface", + "//envoy/tcp:conn_pool_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:empty_string", @@ -124,8 +124,8 @@ envoy_cc_extension( ], deps = [ ":conn_manager_lib", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/common/common:logger_lib", "//source/common/common:minimal_logger_lib", "//source/common/config:utility_lib", diff --git a/source/extensions/filters/network/rocketmq_proxy/active_message.cc b/source/extensions/filters/network/rocketmq_proxy/active_message.cc index 2a263fe752bbf..772806a5829c1 100644 --- a/source/extensions/filters/network/rocketmq_proxy/active_message.cc +++ b/source/extensions/filters/network/rocketmq_proxy/active_message.cc @@ -1,15 +1,14 @@ -#include "extensions/filters/network/rocketmq_proxy/active_message.h" +#include "source/extensions/filters/network/rocketmq_proxy/active_message.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "extensions/filters/network/rocketmq_proxy/topic_route.h" -#include "extensions/filters/network/rocketmq_proxy/well_known_names.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" +#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h" +#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" +#include "source/extensions/filters/network/well_known_names.h" #include "absl/strings/match.h" diff --git a/source/extensions/filters/network/rocketmq_proxy/active_message.h b/source/extensions/filters/network/rocketmq_proxy/active_message.h index 1cb83453755c0..cbec9f1071280 100644 --- a/source/extensions/filters/network/rocketmq_proxy/active_message.h +++ b/source/extensions/filters/network/rocketmq_proxy/active_message.h @@ -5,14 +5,13 @@ #include "envoy/network/filter.h" #include "envoy/stats/timespan.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/rocketmq_proxy/codec.h" -#include "extensions/filters/network/rocketmq_proxy/protocol.h" -#include "extensions/filters/network/rocketmq_proxy/router/router.h" -#include "extensions/filters/network/rocketmq_proxy/topic_route.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/rocketmq_proxy/codec.h" +#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" +#include "source/extensions/filters/network/rocketmq_proxy/router/router.h" +#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/network/rocketmq_proxy/codec.cc b/source/extensions/filters/network/rocketmq_proxy/codec.cc index eabf762cdf19d..8255de59d3e1c 100644 --- a/source/extensions/filters/network/rocketmq_proxy/codec.cc +++ b/source/extensions/filters/network/rocketmq_proxy/codec.cc @@ -1,13 +1,12 @@ -#include "extensions/filters/network/rocketmq_proxy/codec.h" +#include "source/extensions/filters/network/rocketmq_proxy/codec.h" #include -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/rocketmq_proxy/protocol.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/codec.h b/source/extensions/filters/network/rocketmq_proxy/codec.h index 3f307b8500bbd..5459c380370e6 100644 --- a/source/extensions/filters/network/rocketmq_proxy/codec.h +++ b/source/extensions/filters/network/rocketmq_proxy/codec.h @@ -7,11 +7,10 @@ #include "envoy/common/platform.h" #include "envoy/network/filter.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/rocketmq_proxy/protocol.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/config.cc b/source/extensions/filters/network/rocketmq_proxy/config.cc index f4fdbfbaf65a3..938c79edaa716 100644 --- a/source/extensions/filters/network/rocketmq_proxy/config.cc +++ b/source/extensions/filters/network/rocketmq_proxy/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/rocketmq_proxy/config.h" +#include "source/extensions/filters/network/rocketmq_proxy/config.h" #include @@ -6,9 +6,9 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "extensions/filters/network/rocketmq_proxy/stats.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" +#include "source/extensions/filters/network/rocketmq_proxy/stats.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/config.h b/source/extensions/filters/network/rocketmq_proxy/config.h index 5597a27c08019..5ff3d7e98966a 100644 --- a/source/extensions/filters/network/rocketmq_proxy/config.h +++ b/source/extensions/filters/network/rocketmq_proxy/config.h @@ -6,11 +6,11 @@ #include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" #include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "extensions/filters/network/rocketmq_proxy/router/route_matcher.h" -#include "extensions/filters/network/rocketmq_proxy/router/router_impl.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" +#include "source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h" +#include "source/extensions/filters/network/rocketmq_proxy/router/router_impl.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/conn_manager.cc b/source/extensions/filters/network/rocketmq_proxy/conn_manager.cc index f25b57eac0964..8f5ba509f6db4 100644 --- a/source/extensions/filters/network/rocketmq_proxy/conn_manager.cc +++ b/source/extensions/filters/network/rocketmq_proxy/conn_manager.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/rocketmq_proxy/conn_manager.h" +#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" #include "envoy/buffer/buffer.h" #include "envoy/network/connection.h" -#include "common/common/enum_to_int.h" -#include "common/protobuf/utility.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/conn_manager.h b/source/extensions/filters/network/rocketmq_proxy/conn_manager.h index 29f3faf48ad57..e724b15b3393c 100644 --- a/source/extensions/filters/network/rocketmq_proxy/conn_manager.h +++ b/source/extensions/filters/network/rocketmq_proxy/conn_manager.h @@ -13,12 +13,11 @@ #include "envoy/stats/timespan.h" #include "envoy/upstream/thread_local_cluster.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/rocketmq_proxy/active_message.h" -#include "extensions/filters/network/rocketmq_proxy/codec.h" -#include "extensions/filters/network/rocketmq_proxy/stats.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/rocketmq_proxy/active_message.h" +#include "source/extensions/filters/network/rocketmq_proxy/codec.h" +#include "source/extensions/filters/network/rocketmq_proxy/stats.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/network/rocketmq_proxy/metadata.h b/source/extensions/filters/network/rocketmq_proxy/metadata.h index db71356b8064f..a2efeb031bbc5 100644 --- a/source/extensions/filters/network/rocketmq_proxy/metadata.h +++ b/source/extensions/filters/network/rocketmq_proxy/metadata.h @@ -2,7 +2,7 @@ #include -#include "common/http/header_map_impl.h" +#include "source/common/http/header_map_impl.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/network/rocketmq_proxy/protocol.cc b/source/extensions/filters/network/rocketmq_proxy/protocol.cc index d3bb8a48d598c..f35a5f68d64fa 100644 --- a/source/extensions/filters/network/rocketmq_proxy/protocol.cc +++ b/source/extensions/filters/network/rocketmq_proxy/protocol.cc @@ -1,9 +1,8 @@ -#include "extensions/filters/network/rocketmq_proxy/protocol.h" +#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" - -#include "extensions/filters/network/rocketmq_proxy/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/protocol.h b/source/extensions/filters/network/rocketmq_proxy/protocol.h index 151785193546d..c6a0855627993 100644 --- a/source/extensions/filters/network/rocketmq_proxy/protocol.h +++ b/source/extensions/filters/network/rocketmq_proxy/protocol.h @@ -6,11 +6,10 @@ #include "envoy/common/pure.h" #include "envoy/common/time.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/network/rocketmq_proxy/metadata.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/network/rocketmq_proxy/metadata.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/network/rocketmq_proxy/router/BUILD b/source/extensions/filters/network/rocketmq_proxy/router/BUILD index 8f303861daae2..396e5bc401323 100644 --- a/source/extensions/filters/network/rocketmq_proxy/router/BUILD +++ b/source/extensions/filters/network/rocketmq_proxy/router/BUILD @@ -12,8 +12,8 @@ envoy_cc_library( name = "router_interface", hdrs = ["router.h"], deps = [ - "//include/envoy/tcp:conn_pool_interface", - "//include/envoy/upstream:load_balancer_interface", + "//envoy/tcp:conn_pool_interface", + "//envoy/upstream:load_balancer_interface", "//source/common/upstream:load_balancer_lib", ], ) @@ -24,8 +24,8 @@ envoy_cc_library( hdrs = ["router_impl.h"], deps = [ ":router_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:thread_local_cluster_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:thread_local_cluster_interface", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/rocketmq_proxy:conn_manager_lib", ], @@ -37,8 +37,8 @@ envoy_cc_library( hdrs = ["route_matcher.h"], deps = [ ":router_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/config:typed_config_interface", + "//envoy/server:filter_config_interface", "//source/common/common:logger_lib", "//source/common/common:matchers_lib", "//source/common/http:header_utility_lib", diff --git a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.cc b/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.cc index 91c66e5887c72..4bb961f5fa391 100644 --- a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.cc +++ b/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.cc @@ -1,9 +1,8 @@ -#include "extensions/filters/network/rocketmq_proxy/router/route_matcher.h" +#include "source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h" -#include "common/router/metadatamatchcriteria_impl.h" - -#include "extensions/filters/network/rocketmq_proxy/metadata.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/router/metadatamatchcriteria_impl.h" +#include "source/extensions/filters/network/rocketmq_proxy/metadata.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h b/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h index 6c98427f5a126..06aec7221d250 100644 --- a/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h +++ b/source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h @@ -6,11 +6,10 @@ #include "envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.h" #include "envoy/server/filter_config.h" -#include "common/common/logger.h" -#include "common/common/matchers.h" -#include "common/http/header_utility.h" - -#include "extensions/filters/network/rocketmq_proxy/router/router.h" +#include "source/common/common/logger.h" +#include "source/common/common/matchers.h" +#include "source/common/http/header_utility.h" +#include "source/extensions/filters/network/rocketmq_proxy/router/router.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/router/router.h b/source/extensions/filters/network/rocketmq_proxy/router/router.h index 7ab07d310a976..7a4f9c60db9fd 100644 --- a/source/extensions/filters/network/rocketmq_proxy/router/router.h +++ b/source/extensions/filters/network/rocketmq_proxy/router/router.h @@ -2,7 +2,7 @@ #include "envoy/tcp/conn_pool.h" -#include "common/upstream/load_balancer_impl.h" +#include "source/common/upstream/load_balancer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc b/source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc index 8cfb40a7cdfa5..5086f685d7f63 100644 --- a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc +++ b/source/extensions/filters/network/rocketmq_proxy/router/router_impl.cc @@ -1,13 +1,12 @@ -#include "extensions/filters/network/rocketmq_proxy/router/router_impl.h" +#include "source/extensions/filters/network/rocketmq_proxy/router/router_impl.h" -#include "common/common/enum_to_int.h" - -#include "extensions/filters/network/rocketmq_proxy/active_message.h" -#include "extensions/filters/network/rocketmq_proxy/codec.h" -#include "extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "extensions/filters/network/rocketmq_proxy/protocol.h" -#include "extensions/filters/network/rocketmq_proxy/well_known_names.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/common/enum_to_int.h" +#include "source/extensions/filters/network/rocketmq_proxy/active_message.h" +#include "source/extensions/filters/network/rocketmq_proxy/codec.h" +#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" +#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" +#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { @@ -35,27 +34,25 @@ void RouterImpl::onBelowWriteBufferLowWatermark() { } void RouterImpl::onEvent(Network::ConnectionEvent event) { - switch (event) { + switch (event) case Network::ConnectionEvent::RemoteClose: { ENVOY_LOG(error, "Connection to upstream: {} is closed by remote peer", upstream_host_->address()->asString()); // Send local reply to downstream active_message_->onError("Connection to upstream is closed by remote peer"); break; - } - case Network::ConnectionEvent::LocalClose: { + case Network::ConnectionEvent::LocalClose: ENVOY_LOG(error, "Connection to upstream: {} has been closed", upstream_host_->address()->asString()); // Send local reply to downstream active_message_->onError("Connection to upstream has been closed"); break; - } default: // Ignore other events for now ENVOY_LOG(trace, "Ignore event type"); return; } - active_message_->onReset(); + active_message_->onReset(); } const Envoy::Router::MetadataMatchCriteria* RouterImpl::metadataMatchCriteria() { @@ -106,9 +103,8 @@ void RouterImpl::sendRequestToUpstream(ActiveMessage& active_message) { return; } - Tcp::ConnectionPool::Instance* conn_pool = - cluster->tcpConnPool(Upstream::ResourcePriority::Default, this); - if (!conn_pool) { + auto data = cluster->tcpConnPool(Upstream::ResourcePriority::Default, this); + if (!data) { ENVOY_LOG(warn, "No host available for cluster {}. Opaque: {}", cluster_name, opaque); active_message.onError("No host available"); reset(); @@ -116,7 +112,7 @@ void RouterImpl::sendRequestToUpstream(ActiveMessage& active_message) { } upstream_request_ = std::make_unique(*this); - Tcp::ConnectionPool::Cancellable* cancellable = conn_pool->newConnection(*upstream_request_); + Tcp::ConnectionPool::Cancellable* cancellable = data.value().newConnection(*upstream_request_); if (cancellable) { handle_ = cancellable; ENVOY_LOG(trace, "No connection is available for now. Create a cancellable handle. Opaque: {}", diff --git a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.h b/source/extensions/filters/network/rocketmq_proxy/router/router_impl.h index b56960266b286..30e0cdbe07d62 100644 --- a/source/extensions/filters/network/rocketmq_proxy/router/router_impl.h +++ b/source/extensions/filters/network/rocketmq_proxy/router/router_impl.h @@ -4,10 +4,9 @@ #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/thread_local_cluster.h" -#include "common/common/logger.h" -#include "common/upstream/load_balancer_impl.h" - -#include "extensions/filters/network/rocketmq_proxy/router/router.h" +#include "source/common/common/logger.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/extensions/filters/network/rocketmq_proxy/router/router.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/topic_route.cc b/source/extensions/filters/network/rocketmq_proxy/topic_route.cc index 17a00e3879e90..afe0a828d0adb 100644 --- a/source/extensions/filters/network/rocketmq_proxy/topic_route.cc +++ b/source/extensions/filters/network/rocketmq_proxy/topic_route.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/rocketmq_proxy/topic_route.h" +#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/rocketmq_proxy/topic_route.h b/source/extensions/filters/network/rocketmq_proxy/topic_route.h index 01958aef9a515..6d5622e24366b 100644 --- a/source/extensions/filters/network/rocketmq_proxy/topic_route.h +++ b/source/extensions/filters/network/rocketmq_proxy/topic_route.h @@ -3,7 +3,7 @@ #include #include -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" #include "absl/container/node_hash_map.h" diff --git a/source/extensions/filters/network/rocketmq_proxy/well_known_names.h b/source/extensions/filters/network/rocketmq_proxy/well_known_names.h index 7a02dda1a50db..3c04eed8a30a1 100644 --- a/source/extensions/filters/network/rocketmq_proxy/well_known_names.h +++ b/source/extensions/filters/network/rocketmq_proxy/well_known_names.h @@ -2,7 +2,7 @@ #include -#include "common/singleton/const_singleton.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/sni_cluster/BUILD b/source/extensions/filters/network/sni_cluster/BUILD index f730bd9c49ca6..8c83a5a9c9687 100644 --- a/source/extensions/filters/network/sni_cluster/BUILD +++ b/source/extensions/filters/network/sni_cluster/BUILD @@ -14,8 +14,8 @@ envoy_cc_library( srcs = ["sni_cluster.cc"], hdrs = ["sni_cluster.h"], deps = [ - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/tcp_proxy", @@ -28,8 +28,8 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":sni_cluster", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/network:well_known_names", "@envoy_api//envoy/extensions/filters/network/sni_cluster/v3:pkg_cc_proto", ], diff --git a/source/extensions/filters/network/sni_cluster/config.cc b/source/extensions/filters/network/sni_cluster/config.cc index 96bf6ffa28449..5bf4bc53b5044 100644 --- a/source/extensions/filters/network/sni_cluster/config.cc +++ b/source/extensions/filters/network/sni_cluster/config.cc @@ -1,11 +1,11 @@ -#include "extensions/filters/network/sni_cluster/config.h" +#include "source/extensions/filters/network/sni_cluster/config.h" #include "envoy/extensions/filters/network/sni_cluster/v3/sni_cluster.pb.h" #include "envoy/extensions/filters/network/sni_cluster/v3/sni_cluster.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/network/sni_cluster/sni_cluster.h" +#include "source/extensions/filters/network/sni_cluster/sni_cluster.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/sni_cluster/config.h b/source/extensions/filters/network/sni_cluster/config.h index 9091e76854010..b2c18d98ef0c1 100644 --- a/source/extensions/filters/network/sni_cluster/config.h +++ b/source/extensions/filters/network/sni_cluster/config.h @@ -2,7 +2,7 @@ #include "envoy/server/filter_config.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/sni_cluster/sni_cluster.cc b/source/extensions/filters/network/sni_cluster/sni_cluster.cc index 876eca758a942..6fea2639de93f 100644 --- a/source/extensions/filters/network/sni_cluster/sni_cluster.cc +++ b/source/extensions/filters/network/sni_cluster/sni_cluster.cc @@ -1,9 +1,9 @@ -#include "extensions/filters/network/sni_cluster/sni_cluster.h" +#include "source/extensions/filters/network/sni_cluster/sni_cluster.h" #include "envoy/network/connection.h" -#include "common/common/assert.h" -#include "common/tcp_proxy/tcp_proxy.h" +#include "source/common/common/assert.h" +#include "source/common/tcp_proxy/tcp_proxy.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/sni_cluster/sni_cluster.h b/source/extensions/filters/network/sni_cluster/sni_cluster.h index d062368ac6664..d5dc62edcc95d 100644 --- a/source/extensions/filters/network/sni_cluster/sni_cluster.h +++ b/source/extensions/filters/network/sni_cluster/sni_cluster.h @@ -2,7 +2,7 @@ #include "envoy/network/filter.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/sni_dynamic_forward_proxy/BUILD b/source/extensions/filters/network/sni_dynamic_forward_proxy/BUILD index ae0181f77f7fa..335b62d0192ca 100644 --- a/source/extensions/filters/network/sni_dynamic_forward_proxy/BUILD +++ b/source/extensions/filters/network/sni_dynamic_forward_proxy/BUILD @@ -14,8 +14,8 @@ envoy_cc_library( srcs = ["proxy_filter.cc"], hdrs = ["proxy_filter.h"], deps = [ - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/tcp_proxy", diff --git a/source/extensions/filters/network/sni_dynamic_forward_proxy/config.cc b/source/extensions/filters/network/sni_dynamic_forward_proxy/config.cc index 97924d6086c6a..54a7ef5a05a59 100644 --- a/source/extensions/filters/network/sni_dynamic_forward_proxy/config.cc +++ b/source/extensions/filters/network/sni_dynamic_forward_proxy/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/sni_dynamic_forward_proxy/config.h" +#include "source/extensions/filters/network/sni_dynamic_forward_proxy/config.h" #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" -#include "extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" +#include "source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/sni_dynamic_forward_proxy/config.h b/source/extensions/filters/network/sni_dynamic_forward_proxy/config.h index c54dc6d569376..f2aea2c4b85fa 100644 --- a/source/extensions/filters/network/sni_dynamic_forward_proxy/config.h +++ b/source/extensions/filters/network/sni_dynamic_forward_proxy/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/sni_dynamic_forward_proxy.pb.h" #include "envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/sni_dynamic_forward_proxy.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.cc b/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.cc index 01089bfca0940..3c8f6e0798906 100644 --- a/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.cc +++ b/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.cc @@ -1,11 +1,11 @@ -#include "extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h" +#include "source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h" #include "envoy/network/connection.h" #include "envoy/network/filter.h" #include "envoy/upstream/thread_local_cluster.h" -#include "common/common/assert.h" -#include "common/tcp_proxy/tcp_proxy.h" +#include "source/common/common/assert.h" +#include "source/common/tcp_proxy/tcp_proxy.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h b/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h index 0839fe0641898..e7f0de159d20d 100644 --- a/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h +++ b/source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h @@ -4,9 +4,8 @@ #include "envoy/network/filter.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/logger.h" - -#include "extensions/common/dynamic_forward_proxy/dns_cache.h" +#include "source/common/common/logger.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/tcp_proxy/BUILD b/source/extensions/filters/network/tcp_proxy/BUILD index ea7360966c411..723dec1481120 100644 --- a/source/extensions/filters/network/tcp_proxy/BUILD +++ b/source/extensions/filters/network/tcp_proxy/BUILD @@ -18,7 +18,7 @@ envoy_cc_extension( # This is core Envoy config. visibility = ["//visibility:public"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/tcp_proxy", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", diff --git a/source/extensions/filters/network/tcp_proxy/config.cc b/source/extensions/filters/network/tcp_proxy/config.cc index 9543c5683f644..ccdc6e7a69da4 100644 --- a/source/extensions/filters/network/tcp_proxy/config.cc +++ b/source/extensions/filters/network/tcp_proxy/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/tcp_proxy/config.h" +#include "source/extensions/filters/network/tcp_proxy/config.h" #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h" #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/tcp_proxy/tcp_proxy.h" +#include "source/common/tcp_proxy/tcp_proxy.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/tcp_proxy/config.h b/source/extensions/filters/network/tcp_proxy/config.h index e4ded4263d925..7c0c4fba6a36a 100644 --- a/source/extensions/filters/network/tcp_proxy/config.h +++ b/source/extensions/filters/network/tcp_proxy/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h" #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/BUILD b/source/extensions/filters/network/thrift_proxy/BUILD index 37defe986a917..b1fdbe06264ae 100644 --- a/source/extensions/filters/network/thrift_proxy/BUILD +++ b/source/extensions/filters/network/thrift_proxy/BUILD @@ -16,7 +16,7 @@ envoy_cc_library( deps = [ ":protocol_interface", ":thrift_lib", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", ], ) @@ -49,7 +49,7 @@ envoy_cc_extension( ":protocol_interface", ":twitter_protocol_lib", ":unframed_transport_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/common/config:utility_lib", "//source/extensions/filters/network:well_known_names", "//source/extensions/filters/network/common:factory_base_lib", @@ -72,12 +72,12 @@ envoy_cc_library( ":protocol_interface", ":stats_lib", ":transport_interface", - "//include/envoy/event:deferred_deletable", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:timespan_interface", + "//envoy/event:deferred_deletable", + "//envoy/event:dispatcher_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:timespan_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:linked_object", @@ -119,7 +119,7 @@ envoy_cc_library( deps = [ ":thrift_lib", ":tracing_interface", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "//source/common/common:macros", "//source/common/http:header_map_lib", ], @@ -140,7 +140,7 @@ envoy_cc_library( deps = [ ":decoder_events_lib", ":protocol_interface", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", ], ) @@ -157,9 +157,9 @@ envoy_cc_library( ":thrift_lib", ":thrift_object_interface", ":transport_interface", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/registry", + "//envoy/buffer:buffer_interface", + "//envoy/config:typed_config_interface", + "//envoy/registry", "//source/common/common:assert_lib", "//source/common/config:utility_lib", "//source/common/singleton:const_singleton", @@ -236,8 +236,8 @@ envoy_cc_library( name = "stats_lib", hdrs = ["stats.h"], deps = [ - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", ], ) @@ -249,9 +249,9 @@ envoy_cc_library( ":buffer_helper_lib", ":metadata_lib", ":thrift_lib", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/registry", + "//envoy/buffer:buffer_interface", + "//envoy/config:typed_config_interface", + "//envoy/registry", "//source/common/common:assert_lib", "//source/common/config:utility_lib", "//source/common/singleton:const_singleton", @@ -262,7 +262,7 @@ envoy_cc_library( name = "conn_state_lib", hdrs = ["conn_state.h"], deps = [ - "//include/envoy/tcp:conn_pool_interface", + "//envoy/tcp:conn_pool_interface", ], ) @@ -280,7 +280,7 @@ envoy_cc_library( hdrs = ["thrift_object.h"], deps = [ ":thrift_lib", - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", ], ) diff --git a/source/extensions/filters/network/thrift_proxy/app_exception_impl.cc b/source/extensions/filters/network/thrift_proxy/app_exception_impl.cc index 33e8d248d2156..6437de01a410d 100644 --- a/source/extensions/filters/network/thrift_proxy/app_exception_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/app_exception_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/thrift_proxy/app_exception_impl.h" +#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/app_exception_impl.h b/source/extensions/filters/network/thrift_proxy/app_exception_impl.h index 6ca0012bcaeca..fffacd783d959 100644 --- a/source/extensions/filters/network/thrift_proxy/app_exception_impl.h +++ b/source/extensions/filters/network/thrift_proxy/app_exception_impl.h @@ -2,9 +2,9 @@ #include "envoy/common/exception.h" -#include "extensions/filters/network/thrift_proxy/metadata.h" -#include "extensions/filters/network/thrift_proxy/protocol.h" -#include "extensions/filters/network/thrift_proxy/thrift.h" +#include "source/extensions/filters/network/thrift_proxy/metadata.h" +#include "source/extensions/filters/network/thrift_proxy/protocol.h" +#include "source/extensions/filters/network/thrift_proxy/thrift.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.cc b/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.cc index be1c42bbcfa9e..908560c394477 100644 --- a/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.cc @@ -1,17 +1,16 @@ -#include "extensions/filters/network/thrift_proxy/auto_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h" #include #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/byte_order.h" -#include "common/common/macros.h" - -#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h" -#include "extensions/filters/network/thrift_proxy/buffer_helper.h" -#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h" -#include "extensions/filters/network/thrift_proxy/twitter_protocol_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/byte_order.h" +#include "source/common/common/macros.h" +#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h" +#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h b/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h index 51492e804c2d1..c15d50e3de9d2 100644 --- a/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h +++ b/source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h @@ -4,9 +4,8 @@ #include "envoy/buffer/buffer.h" -#include "common/common/fmt.h" - -#include "extensions/filters/network/thrift_proxy/protocol.h" +#include "source/common/common/fmt.h" +#include "source/extensions/filters/network/thrift_proxy/protocol.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/auto_transport_impl.cc b/source/extensions/filters/network/thrift_proxy/auto_transport_impl.cc index 022c711cbae20..9cad6091a586d 100644 --- a/source/extensions/filters/network/thrift_proxy/auto_transport_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/auto_transport_impl.cc @@ -1,15 +1,14 @@ -#include "extensions/filters/network/thrift_proxy/auto_transport_impl.h" +#include "source/extensions/filters/network/thrift_proxy/auto_transport_impl.h" #include "envoy/common/exception.h" -#include "common/common/assert.h" - -#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h" -#include "extensions/filters/network/thrift_proxy/buffer_helper.h" -#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h" -#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h" -#include "extensions/filters/network/thrift_proxy/header_transport_impl.h" -#include "extensions/filters/network/thrift_proxy/unframed_transport_impl.h" +#include "source/common/common/assert.h" +#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h" +#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h" +#include "source/extensions/filters/network/thrift_proxy/header_transport_impl.h" +#include "source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/auto_transport_impl.h b/source/extensions/filters/network/thrift_proxy/auto_transport_impl.h index 4db0109c88b20..65d8be0c76688 100644 --- a/source/extensions/filters/network/thrift_proxy/auto_transport_impl.h +++ b/source/extensions/filters/network/thrift_proxy/auto_transport_impl.h @@ -4,9 +4,8 @@ #include "envoy/buffer/buffer.h" -#include "common/common/fmt.h" - -#include "extensions/filters/network/thrift_proxy/transport.h" +#include "source/common/common/fmt.h" +#include "source/extensions/filters/network/thrift_proxy/transport.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.cc b/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.cc index 556380f1af440..805ec973e0213 100644 --- a/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.cc @@ -1,14 +1,13 @@ -#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h" #include #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/macros.h" - -#include "extensions/filters/network/thrift_proxy/buffer_helper.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/macros.h" +#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h b/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h index cfd687ba1878a..a3497aa70a6dd 100644 --- a/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h +++ b/source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h @@ -5,7 +5,7 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/pure.h" -#include "extensions/filters/network/thrift_proxy/protocol.h" +#include "source/extensions/filters/network/thrift_proxy/protocol.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/buffer_helper.cc b/source/extensions/filters/network/thrift_proxy/buffer_helper.cc index 48167e024bede..ca3d209f423bc 100644 --- a/source/extensions/filters/network/thrift_proxy/buffer_helper.cc +++ b/source/extensions/filters/network/thrift_proxy/buffer_helper.cc @@ -1,7 +1,7 @@ -#include "extensions/filters/network/thrift_proxy/buffer_helper.h" +#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h" -#include "common/common/byte_order.h" -#include "common/common/safe_memcpy.h" +#include "source/common/common/byte_order.h" +#include "source/common/common/safe_memcpy.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/buffer_helper.h b/source/extensions/filters/network/thrift_proxy/buffer_helper.h index 90acf982edf0d..c4999001f5aed 100644 --- a/source/extensions/filters/network/thrift_proxy/buffer_helper.h +++ b/source/extensions/filters/network/thrift_proxy/buffer_helper.h @@ -3,7 +3,7 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/exception.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.cc b/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.cc index f496db6850bfe..4bab4da2e625f 100644 --- a/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.cc @@ -1,14 +1,13 @@ -#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h" #include #include "envoy/common/exception.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/macros.h" - -#include "extensions/filters/network/thrift_proxy/buffer_helper.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/macros.h" +#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h b/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h index 5d69037d68e25..fb89e613ece3e 100644 --- a/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h +++ b/source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h @@ -6,7 +6,7 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/pure.h" -#include "extensions/filters/network/thrift_proxy/protocol.h" +#include "source/extensions/filters/network/thrift_proxy/protocol.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/network/thrift_proxy/config.cc b/source/extensions/filters/network/thrift_proxy/config.cc index dd835c7cf48d2..30dd817e5908b 100644 --- a/source/extensions/filters/network/thrift_proxy/config.cc +++ b/source/extensions/filters/network/thrift_proxy/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/thrift_proxy/config.h" +#include "source/extensions/filters/network/thrift_proxy/config.h" #include #include @@ -8,18 +8,17 @@ #include "envoy/network/connection.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" - -#include "extensions/filters/network/thrift_proxy/auto_protocol_impl.h" -#include "extensions/filters/network/thrift_proxy/auto_transport_impl.h" -#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h" -#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h" -#include "extensions/filters/network/thrift_proxy/decoder.h" -#include "extensions/filters/network/thrift_proxy/filters/filter_config.h" -#include "extensions/filters/network/thrift_proxy/filters/well_known_names.h" -#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h" -#include "extensions/filters/network/thrift_proxy/stats.h" -#include "extensions/filters/network/thrift_proxy/unframed_transport_impl.h" +#include "source/common/config/utility.h" +#include "source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/auto_transport_impl.h" +#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/decoder.h" +#include "source/extensions/filters/network/thrift_proxy/filters/filter_config.h" +#include "source/extensions/filters/network/thrift_proxy/filters/well_known_names.h" +#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h" +#include "source/extensions/filters/network/thrift_proxy/stats.h" +#include "source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/config.h b/source/extensions/filters/network/thrift_proxy/config.h index de2cd2bb4e292..8cc5d722071f4 100644 --- a/source/extensions/filters/network/thrift_proxy/config.h +++ b/source/extensions/filters/network/thrift_proxy/config.h @@ -6,11 +6,11 @@ #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h" #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/thrift_proxy/conn_manager.h" -#include "extensions/filters/network/thrift_proxy/filters/filter.h" -#include "extensions/filters/network/thrift_proxy/router/router_impl.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/thrift_proxy/conn_manager.h" +#include "source/extensions/filters/network/thrift_proxy/filters/filter.h" +#include "source/extensions/filters/network/thrift_proxy/router/router_impl.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/conn_manager.cc b/source/extensions/filters/network/thrift_proxy/conn_manager.cc index 078f3a8ccbf62..c3de018f2dfda 100644 --- a/source/extensions/filters/network/thrift_proxy/conn_manager.cc +++ b/source/extensions/filters/network/thrift_proxy/conn_manager.cc @@ -1,11 +1,11 @@ -#include "extensions/filters/network/thrift_proxy/conn_manager.h" +#include "source/extensions/filters/network/thrift_proxy/conn_manager.h" #include "envoy/common/exception.h" #include "envoy/event/dispatcher.h" -#include "extensions/filters/network/thrift_proxy/app_exception_impl.h" -#include "extensions/filters/network/thrift_proxy/protocol.h" -#include "extensions/filters/network/thrift_proxy/transport.h" +#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h" +#include "source/extensions/filters/network/thrift_proxy/protocol.h" +#include "source/extensions/filters/network/thrift_proxy/transport.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/conn_manager.h b/source/extensions/filters/network/thrift_proxy/conn_manager.h index eb056aaed1221..f4e19152d0aa1 100644 --- a/source/extensions/filters/network/thrift_proxy/conn_manager.h +++ b/source/extensions/filters/network/thrift_proxy/conn_manager.h @@ -7,18 +7,17 @@ #include "envoy/network/filter.h" #include "envoy/stats/timespan.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/linked_object.h" -#include "common/common/logger.h" -#include "common/stats/timespan_impl.h" -#include "common/stream_info/stream_info_impl.h" - -#include "extensions/filters/network/thrift_proxy/decoder.h" -#include "extensions/filters/network/thrift_proxy/filters/filter.h" -#include "extensions/filters/network/thrift_proxy/protocol.h" -#include "extensions/filters/network/thrift_proxy/protocol_converter.h" -#include "extensions/filters/network/thrift_proxy/stats.h" -#include "extensions/filters/network/thrift_proxy/transport.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/logger.h" +#include "source/common/stats/timespan_impl.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/extensions/filters/network/thrift_proxy/decoder.h" +#include "source/extensions/filters/network/thrift_proxy/filters/filter.h" +#include "source/extensions/filters/network/thrift_proxy/protocol.h" +#include "source/extensions/filters/network/thrift_proxy/protocol_converter.h" +#include "source/extensions/filters/network/thrift_proxy/stats.h" +#include "source/extensions/filters/network/thrift_proxy/transport.h" #include "absl/types/any.h" diff --git a/source/extensions/filters/network/thrift_proxy/decoder.cc b/source/extensions/filters/network/thrift_proxy/decoder.cc index 55f23af6ef88e..111703e63da55 100644 --- a/source/extensions/filters/network/thrift_proxy/decoder.cc +++ b/source/extensions/filters/network/thrift_proxy/decoder.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/network/thrift_proxy/decoder.h" +#include "source/extensions/filters/network/thrift_proxy/decoder.h" #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/macros.h" - -#include "extensions/filters/network/thrift_proxy/app_exception_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" +#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/decoder.h b/source/extensions/filters/network/thrift_proxy/decoder.h index 6c8b8bef57551..99739221c5104 100644 --- a/source/extensions/filters/network/thrift_proxy/decoder.h +++ b/source/extensions/filters/network/thrift_proxy/decoder.h @@ -2,12 +2,11 @@ #include "envoy/buffer/buffer.h" -#include "common/common/assert.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/thrift_proxy/filters/filter.h" -#include "extensions/filters/network/thrift_proxy/protocol.h" -#include "extensions/filters/network/thrift_proxy/transport.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/thrift_proxy/filters/filter.h" +#include "source/extensions/filters/network/thrift_proxy/protocol.h" +#include "source/extensions/filters/network/thrift_proxy/transport.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/decoder_events.h b/source/extensions/filters/network/thrift_proxy/decoder_events.h index b5981d6bc1dfb..342f65ece6856 100644 --- a/source/extensions/filters/network/thrift_proxy/decoder_events.h +++ b/source/extensions/filters/network/thrift_proxy/decoder_events.h @@ -1,7 +1,7 @@ #pragma once -#include "extensions/filters/network/thrift_proxy/metadata.h" -#include "extensions/filters/network/thrift_proxy/thrift.h" +#include "source/extensions/filters/network/thrift_proxy/metadata.h" +#include "source/extensions/filters/network/thrift_proxy/thrift.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/filters/BUILD b/source/extensions/filters/network/thrift_proxy/filters/BUILD index 36e94c0a648cf..29870cc5a9823 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/BUILD +++ b/source/extensions/filters/network/thrift_proxy/filters/BUILD @@ -13,8 +13,8 @@ envoy_cc_library( hdrs = ["filter_config.h"], deps = [ ":filter_interface", - "//include/envoy/config:typed_config_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/config:typed_config_interface", + "//envoy/server:filter_config_interface", "//source/common/common:macros", "//source/common/protobuf:cc_wkt_protos", ], @@ -33,9 +33,9 @@ envoy_cc_library( name = "filter_interface", hdrs = ["filter.h"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/buffer:buffer_interface", + "//envoy/network:connection_interface", + "//envoy/stream_info:stream_info_interface", "//source/extensions/filters/network/thrift_proxy:decoder_events_lib", "//source/extensions/filters/network/thrift_proxy:protocol_interface", "//source/extensions/filters/network/thrift_proxy:thrift_lib", diff --git a/source/extensions/filters/network/thrift_proxy/filters/factory_base.h b/source/extensions/filters/network/thrift_proxy/filters/factory_base.h index 3f6f1b144d114..ee75cb7316ae0 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/factory_base.h +++ b/source/extensions/filters/network/thrift_proxy/filters/factory_base.h @@ -1,8 +1,7 @@ #pragma once -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/thrift_proxy/filters/filter_config.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/thrift_proxy/filters/filter_config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/filters/filter.h b/source/extensions/filters/network/thrift_proxy/filters/filter.h index b8b73ddf517b5..4a75fecad7504 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/filter.h +++ b/source/extensions/filters/network/thrift_proxy/filters/filter.h @@ -8,11 +8,11 @@ #include "envoy/network/connection.h" #include "envoy/stream_info/stream_info.h" -#include "extensions/filters/network/thrift_proxy/decoder_events.h" -#include "extensions/filters/network/thrift_proxy/protocol.h" -#include "extensions/filters/network/thrift_proxy/router/router.h" -#include "extensions/filters/network/thrift_proxy/thrift.h" -#include "extensions/filters/network/thrift_proxy/transport.h" +#include "source/extensions/filters/network/thrift_proxy/decoder_events.h" +#include "source/extensions/filters/network/thrift_proxy/protocol.h" +#include "source/extensions/filters/network/thrift_proxy/router/router.h" +#include "source/extensions/filters/network/thrift_proxy/thrift.h" +#include "source/extensions/filters/network/thrift_proxy/transport.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/filters/filter_config.h b/source/extensions/filters/network/thrift_proxy/filters/filter_config.h index 62d900a8b1d6c..f87669990fd60 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/filter_config.h +++ b/source/extensions/filters/network/thrift_proxy/filters/filter_config.h @@ -3,10 +3,9 @@ #include "envoy/config/typed_config.h" #include "envoy/server/filter_config.h" -#include "common/common/macros.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/network/thrift_proxy/filters/filter.h" +#include "source/common/common/macros.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/network/thrift_proxy/filters/filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h b/source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h index dfcdebb8888c1..5858ff46e6c16 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h +++ b/source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h @@ -1,6 +1,6 @@ #pragma once -#include "extensions/filters/network/thrift_proxy/filters/filter.h" +#include "source/extensions/filters/network/thrift_proxy/filters/filter.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD index 0d8f61fe19f83..a3b4fa59564ba 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD +++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( srcs = ["ratelimit.cc"], hdrs = ["ratelimit.h"], deps = [ - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_macros", "//source/common/protobuf:utility_lib", "//source/common/tracing:http_tracer_lib", "//source/extensions/filters/common/ratelimit:ratelimit_client_interface", @@ -34,7 +34,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":ratelimit_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", "//source/extensions/filters/common/ratelimit:ratelimit_client_interface", diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc index a3e442de6347a..82217079c8e9a 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc +++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/thrift_proxy/filters/ratelimit/config.h" +#include "source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h" #include #include @@ -7,11 +7,10 @@ #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/common/ratelimit/ratelimit_impl.h" -#include "extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h" +#include "source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h index aba657fbe6052..b828f30ef8357 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h +++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h @@ -3,9 +3,9 @@ #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.h" #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.validate.h" -#include "extensions/filters/common/ratelimit/ratelimit.h" -#include "extensions/filters/network/thrift_proxy/filters/factory_base.h" -#include "extensions/filters/network/thrift_proxy/filters/well_known_names.h" +#include "source/extensions/filters/common/ratelimit/ratelimit.h" +#include "source/extensions/filters/network/thrift_proxy/filters/factory_base.h" +#include "source/extensions/filters/network/thrift_proxy/filters/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.cc b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.cc index 7fcfef1f0817d..38107f04d3fc4 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.cc +++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.cc @@ -1,11 +1,10 @@ -#include "extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h" +#include "source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/filters/network/thrift_proxy/app_exception_impl.h" -#include "extensions/filters/network/thrift_proxy/filters/well_known_names.h" -#include "extensions/filters/network/thrift_proxy/router/router.h" -#include "extensions/filters/network/thrift_proxy/router/router_ratelimit.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h" +#include "source/extensions/filters/network/thrift_proxy/filters/well_known_names.h" +#include "source/extensions/filters/network/thrift_proxy/router/router.h" +#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h index 8fe178752c12b..d796044555e54 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h +++ b/source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h @@ -9,11 +9,10 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/filters/common/ratelimit/ratelimit.h" -#include "extensions/filters/common/ratelimit/stat_names.h" -#include "extensions/filters/network/thrift_proxy/filters/pass_through_filter.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/filters/common/ratelimit/ratelimit.h" +#include "source/extensions/filters/common/ratelimit/stat_names.h" +#include "source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/filters/well_known_names.h b/source/extensions/filters/network/thrift_proxy/filters/well_known_names.h index 83f672c524f1c..0ae7a352a402c 100644 --- a/source/extensions/filters/network/thrift_proxy/filters/well_known_names.h +++ b/source/extensions/filters/network/thrift_proxy/filters/well_known_names.h @@ -2,7 +2,7 @@ #include -#include "common/singleton/const_singleton.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/framed_transport_impl.cc b/source/extensions/filters/network/thrift_proxy/framed_transport_impl.cc index b2dfcf1e3b091..40ee57bc3393b 100644 --- a/source/extensions/filters/network/thrift_proxy/framed_transport_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/framed_transport_impl.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h" +#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h" #include "envoy/common/exception.h" -#include "extensions/filters/network/thrift_proxy/buffer_helper.h" +#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/framed_transport_impl.h b/source/extensions/filters/network/thrift_proxy/framed_transport_impl.h index 786bfce0680b5..4984bb197922a 100644 --- a/source/extensions/filters/network/thrift_proxy/framed_transport_impl.h +++ b/source/extensions/filters/network/thrift_proxy/framed_transport_impl.h @@ -4,7 +4,7 @@ #include "envoy/buffer/buffer.h" -#include "extensions/filters/network/thrift_proxy/transport.h" +#include "source/extensions/filters/network/thrift_proxy/transport.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/header_transport_impl.cc b/source/extensions/filters/network/thrift_proxy/header_transport_impl.cc index 0a548452c8200..cbfb42b0dc08b 100644 --- a/source/extensions/filters/network/thrift_proxy/header_transport_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/header_transport_impl.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/network/thrift_proxy/header_transport_impl.h" +#include "source/extensions/filters/network/thrift_proxy/header_transport_impl.h" #include #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/buffer_helper.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h" #include "absl/strings/str_replace.h" diff --git a/source/extensions/filters/network/thrift_proxy/header_transport_impl.h b/source/extensions/filters/network/thrift_proxy/header_transport_impl.h index e7eb6d3e18ac9..b1b48ab9c9ed5 100644 --- a/source/extensions/filters/network/thrift_proxy/header_transport_impl.h +++ b/source/extensions/filters/network/thrift_proxy/header_transport_impl.h @@ -4,10 +4,10 @@ #include "envoy/buffer/buffer.h" -#include "extensions/filters/network/thrift_proxy/app_exception_impl.h" -#include "extensions/filters/network/thrift_proxy/metadata.h" -#include "extensions/filters/network/thrift_proxy/thrift.h" -#include "extensions/filters/network/thrift_proxy/transport.h" +#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h" +#include "source/extensions/filters/network/thrift_proxy/metadata.h" +#include "source/extensions/filters/network/thrift_proxy/thrift.h" +#include "source/extensions/filters/network/thrift_proxy/transport.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/network/thrift_proxy/metadata.h b/source/extensions/filters/network/thrift_proxy/metadata.h index f99be53d812b5..560952003f92f 100644 --- a/source/extensions/filters/network/thrift_proxy/metadata.h +++ b/source/extensions/filters/network/thrift_proxy/metadata.h @@ -8,11 +8,10 @@ #include "envoy/buffer/buffer.h" -#include "common/common/macros.h" -#include "common/http/header_map_impl.h" - -#include "extensions/filters/network/thrift_proxy/thrift.h" -#include "extensions/filters/network/thrift_proxy/tracing.h" +#include "source/common/common/macros.h" +#include "source/common/http/header_map_impl.h" +#include "source/extensions/filters/network/thrift_proxy/thrift.h" +#include "source/extensions/filters/network/thrift_proxy/tracing.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/network/thrift_proxy/protocol.h b/source/extensions/filters/network/thrift_proxy/protocol.h index 3a76799229da8..a9eae7779e1ec 100644 --- a/source/extensions/filters/network/thrift_proxy/protocol.h +++ b/source/extensions/filters/network/thrift_proxy/protocol.h @@ -8,16 +8,15 @@ #include "envoy/config/typed_config.h" #include "envoy/registry/registry.h" -#include "common/common/assert.h" -#include "common/config/utility.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/filters/network/thrift_proxy/conn_state.h" -#include "extensions/filters/network/thrift_proxy/decoder_events.h" -#include "extensions/filters/network/thrift_proxy/metadata.h" -#include "extensions/filters/network/thrift_proxy/thrift.h" -#include "extensions/filters/network/thrift_proxy/thrift_object.h" -#include "extensions/filters/network/thrift_proxy/transport.h" +#include "source/common/common/assert.h" +#include "source/common/config/utility.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/filters/network/thrift_proxy/conn_state.h" +#include "source/extensions/filters/network/thrift_proxy/decoder_events.h" +#include "source/extensions/filters/network/thrift_proxy/metadata.h" +#include "source/extensions/filters/network/thrift_proxy/thrift.h" +#include "source/extensions/filters/network/thrift_proxy/thrift_object.h" +#include "source/extensions/filters/network/thrift_proxy/transport.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/filters/network/thrift_proxy/protocol_converter.h b/source/extensions/filters/network/thrift_proxy/protocol_converter.h index 16a2d41115416..62de1a1f9fa75 100644 --- a/source/extensions/filters/network/thrift_proxy/protocol_converter.h +++ b/source/extensions/filters/network/thrift_proxy/protocol_converter.h @@ -2,8 +2,8 @@ #include "envoy/buffer/buffer.h" -#include "extensions/filters/network/thrift_proxy/decoder_events.h" -#include "extensions/filters/network/thrift_proxy/protocol.h" +#include "source/extensions/filters/network/thrift_proxy/decoder_events.h" +#include "source/extensions/filters/network/thrift_proxy/protocol.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/router/BUILD b/source/extensions/filters/network/thrift_proxy/router/BUILD index a16abad3aeb90..0f15b690aa650 100644 --- a/source/extensions/filters/network/thrift_proxy/router/BUILD +++ b/source/extensions/filters/network/thrift_proxy/router/BUILD @@ -15,7 +15,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":router_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/filters/network/thrift_proxy/filters:factory_base_lib", "//source/extensions/filters/network/thrift_proxy/filters:filter_config_interface", "//source/extensions/filters/network/thrift_proxy/filters:well_known_names", @@ -28,7 +28,7 @@ envoy_cc_library( hdrs = ["router.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/router:router_interface", + "//envoy/router:router_interface", "//source/extensions/filters/network/thrift_proxy:metadata_lib", ], ) @@ -38,7 +38,7 @@ envoy_cc_library( hdrs = ["router_ratelimit.h"], deps = [ ":router_interface", - "//include/envoy/router:router_ratelimit_interface", + "//envoy/router:router_ratelimit_interface", "//source/extensions/filters/network/thrift_proxy:metadata_lib", ], ) @@ -50,10 +50,10 @@ envoy_cc_library( deps = [ ":router_interface", ":router_ratelimit_lib", - "//include/envoy/tcp:conn_pool_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:load_balancer_interface", - "//include/envoy/upstream:thread_local_cluster_interface", + "//envoy/tcp:conn_pool_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:load_balancer_interface", + "//envoy/upstream:thread_local_cluster_interface", "//source/common/common:logger_lib", "//source/common/http:header_utility_lib", "//source/common/router:metadatamatchcriteria_lib", diff --git a/source/extensions/filters/network/thrift_proxy/router/config.cc b/source/extensions/filters/network/thrift_proxy/router/config.cc index b6a055445aa66..ef94242c89b8d 100644 --- a/source/extensions/filters/network/thrift_proxy/router/config.cc +++ b/source/extensions/filters/network/thrift_proxy/router/config.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/thrift_proxy/router/config.h" +#include "source/extensions/filters/network/thrift_proxy/router/config.h" #include "envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.h" #include "envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/network/thrift_proxy/router/router_impl.h" +#include "source/extensions/filters/network/thrift_proxy/router/router_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/router/config.h b/source/extensions/filters/network/thrift_proxy/router/config.h index 7c712d8621ccb..1ae1a499202b7 100644 --- a/source/extensions/filters/network/thrift_proxy/router/config.h +++ b/source/extensions/filters/network/thrift_proxy/router/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.h" #include "envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.validate.h" -#include "extensions/filters/network/thrift_proxy/filters/factory_base.h" -#include "extensions/filters/network/thrift_proxy/filters/well_known_names.h" +#include "source/extensions/filters/network/thrift_proxy/filters/factory_base.h" +#include "source/extensions/filters/network/thrift_proxy/filters/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/router/router.h b/source/extensions/filters/network/thrift_proxy/router/router.h index 26d2074c6fc0c..d5155cb0c2960 100644 --- a/source/extensions/filters/network/thrift_proxy/router/router.h +++ b/source/extensions/filters/network/thrift_proxy/router/router.h @@ -5,7 +5,7 @@ #include "envoy/router/router.h" -#include "extensions/filters/network/thrift_proxy/metadata.h" +#include "source/extensions/filters/network/thrift_proxy/metadata.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/router/router_impl.cc b/source/extensions/filters/network/thrift_proxy/router/router_impl.cc index 5712ea8dd171e..7d8580b714e69 100644 --- a/source/extensions/filters/network/thrift_proxy/router/router_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/router/router_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/thrift_proxy/router/router_impl.h" +#include "source/extensions/filters/network/thrift_proxy/router/router_impl.h" #include @@ -6,11 +6,10 @@ #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/thread_local_cluster.h" -#include "common/common/utility.h" -#include "common/router/metadatamatchcriteria_impl.h" - -#include "extensions/filters/network/thrift_proxy/app_exception_impl.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/common/utility.h" +#include "source/common/router/metadatamatchcriteria_impl.h" +#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h" +#include "source/extensions/filters/network/well_known_names.h" #include "absl/strings/match.h" @@ -281,9 +280,8 @@ FilterStatus Router::messageBegin(MessageMetadataSharedPtr metadata) { passthrough_supported_ = true; } - Tcp::ConnectionPool::Instance* conn_pool = - cluster->tcpConnPool(Upstream::ResourcePriority::Default, this); - if (!conn_pool) { + auto conn_pool_data = cluster->tcpConnPool(Upstream::ResourcePriority::Default, this); + if (!conn_pool_data) { stats_.no_healthy_upstream_.inc(); callbacks_->sendLocalReply( AppException(AppExceptionType::InternalError, @@ -303,7 +301,7 @@ FilterStatus Router::messageBegin(MessageMetadataSharedPtr metadata) { } upstream_request_ = - std::make_unique(*this, *conn_pool, metadata, transport, protocol); + std::make_unique(*this, *conn_pool_data, metadata, transport, protocol); return upstream_request_->start(); } @@ -432,10 +430,10 @@ void Router::convertMessageBegin(MessageMetadataSharedPtr metadata) { void Router::cleanup() { upstream_request_.reset(); } -Router::UpstreamRequest::UpstreamRequest(Router& parent, Tcp::ConnectionPool::Instance& pool, +Router::UpstreamRequest::UpstreamRequest(Router& parent, Upstream::TcpPoolData& pool_data, MessageMetadataSharedPtr& metadata, TransportType transport_type, ProtocolType protocol_type) - : parent_(parent), conn_pool_(pool), metadata_(metadata), + : parent_(parent), conn_pool_data_(pool_data), metadata_(metadata), transport_(NamedTransportConfigFactory::getFactory(transport_type).createTransport()), protocol_(NamedProtocolConfigFactory::getFactory(protocol_type).createProtocol()), request_complete_(false), response_started_(false), response_complete_(false) {} @@ -447,7 +445,7 @@ Router::UpstreamRequest::~UpstreamRequest() { } FilterStatus Router::UpstreamRequest::start() { - Tcp::ConnectionPool::Cancellable* handle = conn_pool_.newConnection(*this); + Tcp::ConnectionPool::Cancellable* handle = conn_pool_data_.newConnection(*this); if (handle) { // Pause while we wait for a connection. conn_pool_handle_ = handle; diff --git a/source/extensions/filters/network/thrift_proxy/router/router_impl.h b/source/extensions/filters/network/thrift_proxy/router/router_impl.h index c12a0a34df8d5..69d2e3a03d475 100644 --- a/source/extensions/filters/network/thrift_proxy/router/router_impl.h +++ b/source/extensions/filters/network/thrift_proxy/router/router_impl.h @@ -11,15 +11,14 @@ #include "envoy/tcp/conn_pool.h" #include "envoy/upstream/load_balancer.h" -#include "common/common/logger.h" -#include "common/http/header_utility.h" -#include "common/upstream/load_balancer_impl.h" - -#include "extensions/filters/network/thrift_proxy/conn_manager.h" -#include "extensions/filters/network/thrift_proxy/filters/filter.h" -#include "extensions/filters/network/thrift_proxy/router/router.h" -#include "extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h" -#include "extensions/filters/network/thrift_proxy/thrift_object.h" +#include "source/common/common/logger.h" +#include "source/common/http/header_utility.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/conn_manager.h" +#include "source/extensions/filters/network/thrift_proxy/filters/filter.h" +#include "source/extensions/filters/network/thrift_proxy/router/router.h" +#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h" +#include "source/extensions/filters/network/thrift_proxy/thrift_object.h" #include "absl/types/optional.h" @@ -224,7 +223,7 @@ class Router : public Tcp::ConnectionPool::UpstreamCallbacks, private: struct UpstreamRequest : public Tcp::ConnectionPool::Callbacks { - UpstreamRequest(Router& parent, Tcp::ConnectionPool::Instance& pool, + UpstreamRequest(Router& parent, Upstream::TcpPoolData& pool_data, MessageMetadataSharedPtr& metadata, TransportType transport_type, ProtocolType protocol_type); ~UpstreamRequest() override; @@ -247,7 +246,7 @@ class Router : public Tcp::ConnectionPool::UpstreamCallbacks, void chargeResponseTiming(); Router& parent_; - Tcp::ConnectionPool::Instance& conn_pool_; + Upstream::TcpPoolData& conn_pool_data_; MessageMetadataSharedPtr metadata_; Tcp::ConnectionPool::Cancellable* conn_pool_handle_{}; diff --git a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h index aca46cd330361..181d644b905bc 100644 --- a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h +++ b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h @@ -8,8 +8,8 @@ #include "envoy/http/header_map.h" #include "envoy/ratelimit/ratelimit.h" -#include "extensions/filters/network/thrift_proxy/metadata.h" -#include "extensions/filters/network/thrift_proxy/router/router.h" +#include "source/extensions/filters/network/thrift_proxy/metadata.h" +#include "source/extensions/filters/network/thrift_proxy/router/router.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc index 01d4154a4d087..b510ac9e303b6 100644 --- a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h" +#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h" #include "envoy/common/exception.h" #include "envoy/config/route/v3/route_components.pb.h" #include "envoy/ratelimit/ratelimit.h" -#include "extensions/filters/network/thrift_proxy/router/router.h" +#include "source/extensions/filters/network/thrift_proxy/router/router.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h index 48f3a4f860c7b..3bdcdadc54c96 100644 --- a/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h +++ b/source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h @@ -7,11 +7,10 @@ #include "envoy/config/route/v3/route_components.pb.h" -#include "common/http/header_utility.h" - -#include "extensions/filters/network/thrift_proxy/metadata.h" -#include "extensions/filters/network/thrift_proxy/router/router.h" -#include "extensions/filters/network/thrift_proxy/router/router_ratelimit.h" +#include "source/common/http/header_utility.h" +#include "source/extensions/filters/network/thrift_proxy/metadata.h" +#include "source/extensions/filters/network/thrift_proxy/router/router.h" +#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/thrift.h b/source/extensions/filters/network/thrift_proxy/thrift.h index e42f1338adc69..3092bceb11b7e 100644 --- a/source/extensions/filters/network/thrift_proxy/thrift.h +++ b/source/extensions/filters/network/thrift_proxy/thrift.h @@ -1,7 +1,7 @@ #pragma once -#include "common/common/assert.h" -#include "common/singleton/const_singleton.h" +#include "source/common/common/assert.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/thrift_object.h b/source/extensions/filters/network/thrift_proxy/thrift_object.h index 6c4d9f3555101..ae8ff24067ba9 100644 --- a/source/extensions/filters/network/thrift_proxy/thrift_object.h +++ b/source/extensions/filters/network/thrift_proxy/thrift_object.h @@ -6,9 +6,8 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/exception.h" -#include "common/common/utility.h" - -#include "extensions/filters/network/thrift_proxy/thrift.h" +#include "source/common/common/utility.h" +#include "source/extensions/filters/network/thrift_proxy/thrift.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/thrift_object_impl.cc b/source/extensions/filters/network/thrift_proxy/thrift_object_impl.cc index 0008f3f58495d..0c02f11a02306 100644 --- a/source/extensions/filters/network/thrift_proxy/thrift_object_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/thrift_object_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/thrift_proxy/thrift_object_impl.h" +#include "source/extensions/filters/network/thrift_proxy/thrift_object_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/thrift_object_impl.h b/source/extensions/filters/network/thrift_proxy/thrift_object_impl.h index 700e6b2238393..c9a5386d6fe6d 100644 --- a/source/extensions/filters/network/thrift_proxy/thrift_object_impl.h +++ b/source/extensions/filters/network/thrift_proxy/thrift_object_impl.h @@ -1,8 +1,8 @@ #pragma once -#include "extensions/filters/network/thrift_proxy/decoder.h" -#include "extensions/filters/network/thrift_proxy/filters/filter.h" -#include "extensions/filters/network/thrift_proxy/thrift_object.h" +#include "source/extensions/filters/network/thrift_proxy/decoder.h" +#include "source/extensions/filters/network/thrift_proxy/filters/filter.h" +#include "source/extensions/filters/network/thrift_proxy/thrift_object.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/transport.h b/source/extensions/filters/network/thrift_proxy/transport.h index d8393cef6870d..64f755df4b1a0 100644 --- a/source/extensions/filters/network/thrift_proxy/transport.h +++ b/source/extensions/filters/network/thrift_proxy/transport.h @@ -7,11 +7,10 @@ #include "envoy/config/typed_config.h" #include "envoy/registry/registry.h" -#include "common/common/assert.h" -#include "common/config/utility.h" -#include "common/singleton/const_singleton.h" - -#include "extensions/filters/network/thrift_proxy/metadata.h" +#include "source/common/common/assert.h" +#include "source/common/config/utility.h" +#include "source/common/singleton/const_singleton.h" +#include "source/extensions/filters/network/thrift_proxy/metadata.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.cc b/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.cc index 7f1ca57592cdb..b46c87f188045 100644 --- a/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/network/thrift_proxy/twitter_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h" #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/buffer_helper.h" -#include "extensions/filters/network/thrift_proxy/thrift_object_impl.h" -#include "extensions/filters/network/thrift_proxy/unframed_transport_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h" +#include "source/extensions/filters/network/thrift_proxy/thrift_object_impl.h" +#include "source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h" #include "absl/strings/str_replace.h" diff --git a/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h b/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h index 101f016f6b33a..e63ba7545258b 100644 --- a/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h +++ b/source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h @@ -5,9 +5,8 @@ #include "envoy/buffer/buffer.h" #include "envoy/common/pure.h" -#include "common/common/macros.h" - -#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h" +#include "source/common/common/macros.h" +#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.cc b/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.cc index 14a47af80f76f..d85e91fed073e 100644 --- a/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.cc +++ b/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/thrift_proxy/unframed_transport_impl.h" +#include "source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h b/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h index 5266d1eaad7e0..bd6280cff19b4 100644 --- a/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h +++ b/source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h @@ -4,7 +4,7 @@ #include "envoy/buffer/buffer.h" -#include "extensions/filters/network/thrift_proxy/transport.h" +#include "source/extensions/filters/network/thrift_proxy/transport.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/wasm/BUILD b/source/extensions/filters/network/wasm/BUILD index e8a47db2acc8a..6633576aa7a15 100644 --- a/source/extensions/filters/network/wasm/BUILD +++ b/source/extensions/filters/network/wasm/BUILD @@ -16,8 +16,8 @@ envoy_cc_library( srcs = ["wasm_filter.cc"], hdrs = ["wasm_filter.h"], deps = [ - "//include/envoy/server:filter_config_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/server:filter_config_interface", + "//envoy/upstream:cluster_manager_interface", "//source/extensions/common/wasm:wasm_lib", "//source/extensions/filters/network:well_known_names", "@envoy_api//envoy/extensions/filters/network/wasm/v3:pkg_cc_proto", @@ -30,7 +30,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":wasm_filter_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/common/common:empty_string", "//source/common/config:datasource_lib", "//source/extensions/common/wasm:wasm_lib", diff --git a/source/extensions/filters/network/wasm/config.cc b/source/extensions/filters/network/wasm/config.cc index 05f8f1abb854e..925e538cb67eb 100644 --- a/source/extensions/filters/network/wasm/config.cc +++ b/source/extensions/filters/network/wasm/config.cc @@ -1,13 +1,12 @@ -#include "extensions/filters/network/wasm/config.h" +#include "source/extensions/filters/network/wasm/config.h" #include "envoy/extensions/filters/network/wasm/v3/wasm.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/common/empty_string.h" -#include "common/config/datasource.h" - -#include "extensions/common/wasm/wasm.h" -#include "extensions/filters/network/wasm/wasm_filter.h" +#include "source/common/common/empty_string.h" +#include "source/common/config/datasource.h" +#include "source/extensions/common/wasm/wasm.h" +#include "source/extensions/filters/network/wasm/wasm_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/wasm/config.h b/source/extensions/filters/network/wasm/config.h index 12201c56b1874..306bc51918258 100644 --- a/source/extensions/filters/network/wasm/config.h +++ b/source/extensions/filters/network/wasm/config.h @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/wasm/v3/wasm.pb.h" #include "envoy/extensions/filters/network/wasm/v3/wasm.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/wasm/wasm_filter.cc b/source/extensions/filters/network/wasm/wasm_filter.cc index 4aa922071c4a4..862382d10ee13 100644 --- a/source/extensions/filters/network/wasm/wasm_filter.cc +++ b/source/extensions/filters/network/wasm/wasm_filter.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/wasm/wasm_filter.h" +#include "source/extensions/filters/network/wasm/wasm_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/wasm/wasm_filter.h b/source/extensions/filters/network/wasm/wasm_filter.h index 4c482af432e36..ad0d99e5a4a67 100644 --- a/source/extensions/filters/network/wasm/wasm_filter.h +++ b/source/extensions/filters/network/wasm/wasm_filter.h @@ -7,8 +7,8 @@ #include "envoy/server/filter_config.h" #include "envoy/upstream/cluster_manager.h" -#include "extensions/common/wasm/wasm.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/common/wasm/wasm.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/well_known_names.h b/source/extensions/filters/network/well_known_names.h index 7f62193c78969..f73be61a444cf 100644 --- a/source/extensions/filters/network/well_known_names.h +++ b/source/extensions/filters/network/well_known_names.h @@ -1,6 +1,6 @@ #pragma once -#include "common/config/well_known_names.h" +#include "source/common/config/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/zookeeper_proxy/BUILD b/source/extensions/filters/network/zookeeper_proxy/BUILD index 9c72e9961dfe9..b71fbf09d5465 100644 --- a/source/extensions/filters/network/zookeeper_proxy/BUILD +++ b/source/extensions/filters/network/zookeeper_proxy/BUILD @@ -25,10 +25,10 @@ envoy_cc_library( "utils.h", ], deps = [ - "//include/envoy/network:filter_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/network:filter_interface", + "//envoy/server:filter_config_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/buffer:buffer_lib", "//source/common/common:enum_to_int", "//source/common/network:filter_lib", diff --git a/source/extensions/filters/network/zookeeper_proxy/config.cc b/source/extensions/filters/network/zookeeper_proxy/config.cc index 33016ac1e3fef..0a980cf96152d 100644 --- a/source/extensions/filters/network/zookeeper_proxy/config.cc +++ b/source/extensions/filters/network/zookeeper_proxy/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/zookeeper_proxy/config.h" +#include "source/extensions/filters/network/zookeeper_proxy/config.h" #include @@ -7,9 +7,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/zookeeper_proxy/filter.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/zookeeper_proxy/filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/zookeeper_proxy/config.h b/source/extensions/filters/network/zookeeper_proxy/config.h index c72e28d347c2e..10164f9094e74 100644 --- a/source/extensions/filters/network/zookeeper_proxy/config.h +++ b/source/extensions/filters/network/zookeeper_proxy/config.h @@ -3,9 +3,9 @@ #include "envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.h" #include "envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/filters/network/well_known_names.h" -#include "extensions/filters/network/zookeeper_proxy/filter.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/zookeeper_proxy/filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/zookeeper_proxy/decoder.cc b/source/extensions/filters/network/zookeeper_proxy/decoder.cc index 56877b8ac82ef..adfb593afb74a 100644 --- a/source/extensions/filters/network/zookeeper_proxy/decoder.cc +++ b/source/extensions/filters/network/zookeeper_proxy/decoder.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/network/zookeeper_proxy/decoder.h" +#include "source/extensions/filters/network/zookeeper_proxy/decoder.h" #include -#include "common/common/enum_to_int.h" +#include "source/common/common/enum_to_int.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/zookeeper_proxy/decoder.h b/source/extensions/filters/network/zookeeper_proxy/decoder.h index 85b99fdffbf73..62ca20885c5ee 100644 --- a/source/extensions/filters/network/zookeeper_proxy/decoder.h +++ b/source/extensions/filters/network/zookeeper_proxy/decoder.h @@ -5,10 +5,9 @@ #include "envoy/common/platform.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" - -#include "extensions/filters/network/zookeeper_proxy/utils.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/network/zookeeper_proxy/utils.h" #include "absl/container/node_hash_map.h" diff --git a/source/extensions/filters/network/zookeeper_proxy/filter.cc b/source/extensions/filters/network/zookeeper_proxy/filter.cc index b6c38c0ec2971..a32c5052d06ad 100644 --- a/source/extensions/filters/network/zookeeper_proxy/filter.cc +++ b/source/extensions/filters/network/zookeeper_proxy/filter.cc @@ -1,18 +1,17 @@ -#include "extensions/filters/network/zookeeper_proxy/filter.h" +#include "source/extensions/filters/network/zookeeper_proxy/filter.h" #include #include #include "envoy/config/core/v3/base.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/logger.h" -#include "common/stats/utility.h" - -#include "extensions/filters/network/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/logger.h" +#include "source/common/stats/utility.h" +#include "source/extensions/filters/network/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/zookeeper_proxy/filter.h b/source/extensions/filters/network/zookeeper_proxy/filter.h index dc932764b1569..46c4f0ea8da31 100644 --- a/source/extensions/filters/network/zookeeper_proxy/filter.h +++ b/source/extensions/filters/network/zookeeper_proxy/filter.h @@ -11,10 +11,9 @@ #include "envoy/stats/stats.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/filters/network/zookeeper_proxy/decoder.h" +#include "source/common/common/logger.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/filters/network/zookeeper_proxy/decoder.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/zookeeper_proxy/utils.cc b/source/extensions/filters/network/zookeeper_proxy/utils.cc index ed79ecba75bac..cf1c77a8bf190 100644 --- a/source/extensions/filters/network/zookeeper_proxy/utils.cc +++ b/source/extensions/filters/network/zookeeper_proxy/utils.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/zookeeper_proxy/utils.h" +#include "source/extensions/filters/network/zookeeper_proxy/utils.h" #include diff --git a/source/extensions/filters/network/zookeeper_proxy/utils.h b/source/extensions/filters/network/zookeeper_proxy/utils.h index 7ce749ed86411..dc699afaf548a 100644 --- a/source/extensions/filters/network/zookeeper_proxy/utils.h +++ b/source/extensions/filters/network/zookeeper_proxy/utils.h @@ -5,9 +5,9 @@ #include "envoy/common/platform.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/byte_order.h" -#include "common/common/logger.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/byte_order.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/udp/dns_filter/BUILD b/source/extensions/filters/udp/dns_filter/BUILD index ab44521fdd408..d1445d1f9a40d 100644 --- a/source/extensions/filters/udp/dns_filter/BUILD +++ b/source/extensions/filters/udp/dns_filter/BUILD @@ -26,12 +26,12 @@ envoy_cc_library( ], external_deps = ["ares"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:address_interface", - "//include/envoy/network:dns_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/network:listener_interface", + "//envoy/buffer:buffer_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:address_interface", + "//envoy/network:dns_interface", + "//envoy/network:filter_interface", + "//envoy/network:listener_interface", "//source/common/buffer:buffer_lib", "//source/common/common:empty_string", "//source/common/common:matchers_lib", @@ -54,8 +54,8 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":dns_filter_lib", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "@envoy_api//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/udp/dns_filter/config.cc b/source/extensions/filters/udp/dns_filter/config.cc index 242bbab75e9c3..28f00e6a445f2 100644 --- a/source/extensions/filters/udp/dns_filter/config.cc +++ b/source/extensions/filters/udp/dns_filter/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/udp/dns_filter/config.h" +#include "source/extensions/filters/udp/dns_filter/config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/udp/dns_filter/config.h b/source/extensions/filters/udp/dns_filter/config.h index 421feb7866754..9278199a26d68 100644 --- a/source/extensions/filters/udp/dns_filter/config.h +++ b/source/extensions/filters/udp/dns_filter/config.h @@ -4,7 +4,7 @@ #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.validate.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/udp/dns_filter/dns_filter.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/udp/dns_filter/dns_filter.cc b/source/extensions/filters/udp/dns_filter/dns_filter.cc index 206a264f28b46..6e4e523397bd4 100644 --- a/source/extensions/filters/udp/dns_filter/dns_filter.cc +++ b/source/extensions/filters/udp/dns_filter/dns_filter.cc @@ -1,13 +1,12 @@ -#include "extensions/filters/udp/dns_filter/dns_filter.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter.h" #include "envoy/network/listener.h" #include "envoy/type/matcher/v3/string.pb.h" -#include "common/config/datasource.h" -#include "common/network/address_impl.h" -#include "common/protobuf/message_validator_impl.h" - -#include "extensions/filters/udp/dns_filter/dns_filter_utils.h" +#include "source/common/config/datasource.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h" namespace Envoy { namespace Extensions { @@ -140,15 +139,18 @@ DnsFilterEnvoyConfig::DnsFilterEnvoyConfig( forward_queries_ = config.has_client_config(); if (forward_queries_) { const auto& client_config = config.client_config(); - const auto& upstream_resolvers = client_config.upstream_resolvers(); - resolvers_.reserve(upstream_resolvers.size()); - for (const auto& resolver : upstream_resolvers) { - auto ipaddr = Network::Utility::protobufAddressToAddress(resolver); - resolvers_.emplace_back(std::move(ipaddr)); + if (client_config.has_dns_resolution_config()) { + dns_resolver_options_.CopyFrom(client_config.dns_resolution_config().dns_resolver_options()); + if (!client_config.dns_resolution_config().resolvers().empty()) { + const auto& resolver_addrs = client_config.dns_resolution_config().resolvers(); + resolvers_.reserve(resolver_addrs.size()); + for (const auto& resolver_addr : resolver_addrs) { + resolvers_.push_back(Network::Utility::protobufAddressToAddress(resolver_addr)); + } + } } resolver_timeout_ = std::chrono::milliseconds(PROTOBUF_GET_MS_OR_DEFAULT( client_config, resolver_timeout, DEFAULT_RESOLVER_TIMEOUT.count())); - max_pending_lookups_ = client_config.max_pending_lookups(); } } @@ -220,9 +222,9 @@ DnsFilter::DnsFilter(Network::UdpReadFilterCallbacks& callbacks, sendDnsResponse(std::move(context)); }; - resolver_ = std::make_unique(resolver_callback_, config->resolvers(), - config->resolverTimeout(), listener_.dispatcher(), - config->maxPendingLookups()); + resolver_ = std::make_unique( + resolver_callback_, config->resolvers(), config->resolverTimeout(), listener_.dispatcher(), + config->maxPendingLookups(), config->dnsResolverOptions()); } void DnsFilter::onData(Network::UdpRecvData& client_request) { diff --git a/source/extensions/filters/udp/dns_filter/dns_filter.h b/source/extensions/filters/udp/dns_filter/dns_filter.h index 3a02f39db20aa..618013a0a87bd 100644 --- a/source/extensions/filters/udp/dns_filter/dns_filter.h +++ b/source/extensions/filters/udp/dns_filter/dns_filter.h @@ -5,13 +5,12 @@ #include "envoy/network/dns.h" #include "envoy/network/filter.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/matchers.h" -#include "common/config/config_provider_impl.h" -#include "common/network/utility.h" - -#include "extensions/filters/udp/dns_filter/dns_filter_resolver.h" -#include "extensions/filters/udp/dns_filter/dns_parser.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/matchers.h" +#include "source/common/config/config_provider_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter_resolver.h" +#include "source/extensions/filters/udp/dns_filter/dns_parser.h" #include "absl/container/flat_hash_set.h" @@ -93,6 +92,9 @@ class DnsFilterEnvoyConfig : public Logger::Loggable { uint64_t retryCount() const { return retry_count_; } Random::RandomGenerator& random() const { return random_; } uint64_t maxPendingLookups() const { return max_pending_lookups_; } + const envoy::config::core::v3::DnsResolverOptions& dnsResolverOptions() const { + return dns_resolver_options_; + } private: static DnsFilterStats generateStats(const std::string& stat_prefix, Stats::Scope& scope) { @@ -120,6 +122,7 @@ class DnsFilterEnvoyConfig : public Logger::Loggable { std::chrono::milliseconds resolver_timeout_; Random::RandomGenerator& random_; uint64_t max_pending_lookups_; + envoy::config::core::v3::DnsResolverOptions dns_resolver_options_; }; using DnsFilterEnvoyConfigSharedPtr = std::shared_ptr; diff --git a/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc b/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc index 2ca86479c3820..76160c4974348 100644 --- a/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc +++ b/source/extensions/filters/udp/dns_filter/dns_filter_resolver.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/udp/dns_filter/dns_filter_resolver.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter_resolver.h" -#include "common/network/utility.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/udp/dns_filter/dns_filter_resolver.h b/source/extensions/filters/udp/dns_filter/dns_filter_resolver.h index 23372871a618f..3a32da841c196 100644 --- a/source/extensions/filters/udp/dns_filter/dns_filter_resolver.h +++ b/source/extensions/filters/udp/dns_filter/dns_filter_resolver.h @@ -3,7 +3,7 @@ #include "envoy/event/dispatcher.h" #include "envoy/network/dns.h" -#include "extensions/filters/udp/dns_filter/dns_parser.h" +#include "source/extensions/filters/udp/dns_filter/dns_parser.h" namespace Envoy { namespace Extensions { @@ -20,9 +20,10 @@ class DnsFilterResolver : Logger::Loggable { public: DnsFilterResolver(DnsFilterResolverCallback& callback, AddressConstPtrVec resolvers, std::chrono::milliseconds timeout, Event::Dispatcher& dispatcher, - uint64_t max_pending_lookups) + uint64_t max_pending_lookups, + const envoy::config::core::v3::DnsResolverOptions& dns_resolver_options) : timeout_(timeout), dispatcher_(dispatcher), - resolver_(dispatcher.createDnsResolver(resolvers, false /* use_tcp_for_dns_lookups */)), + resolver_(dispatcher.createDnsResolver(resolvers, dns_resolver_options)), callback_(callback), max_pending_lookups_(max_pending_lookups) {} /** * @brief entry point to resolve the name in a DnsQueryRecord diff --git a/source/extensions/filters/udp/dns_filter/dns_filter_utils.cc b/source/extensions/filters/udp/dns_filter/dns_filter_utils.cc index cb22c4483fb3c..97cc6bea985df 100644 --- a/source/extensions/filters/udp/dns_filter/dns_filter_utils.cc +++ b/source/extensions/filters/udp/dns_filter/dns_filter_utils.cc @@ -1,12 +1,12 @@ -#include "extensions/filters/udp/dns_filter/dns_filter_utils.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h" #include #include "envoy/common/platform.h" -#include "common/common/empty_string.h" -#include "common/common/logger.h" -#include "common/network/address_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/logger.h" +#include "source/common/network/address_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/udp/dns_filter/dns_filter_utils.h b/source/extensions/filters/udp/dns_filter/dns_filter_utils.h index 47f63952b6d2f..f76c9a36aa342 100644 --- a/source/extensions/filters/udp/dns_filter/dns_filter_utils.h +++ b/source/extensions/filters/udp/dns_filter/dns_filter_utils.h @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.h" #include "envoy/network/address.h" -#include "extensions/filters/udp/dns_filter/dns_filter_constants.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter_constants.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" diff --git a/source/extensions/filters/udp/dns_filter/dns_parser.cc b/source/extensions/filters/udp/dns_filter/dns_parser.cc index 26899ea8ad134..65397af75c19e 100644 --- a/source/extensions/filters/udp/dns_filter/dns_parser.cc +++ b/source/extensions/filters/udp/dns_filter/dns_parser.cc @@ -1,12 +1,11 @@ -#include "extensions/filters/udp/dns_filter/dns_parser.h" +#include "source/extensions/filters/udp/dns_filter/dns_parser.h" #include "envoy/network/address.h" -#include "common/common/safe_memcpy.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" - -#include "extensions/filters/udp/dns_filter/dns_filter_utils.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h" #include "ares.h" diff --git a/source/extensions/filters/udp/dns_filter/dns_parser.h b/source/extensions/filters/udp/dns_filter/dns_parser.h index d604f0784ba74..e6a12019d0422 100644 --- a/source/extensions/filters/udp/dns_filter/dns_parser.h +++ b/source/extensions/filters/udp/dns_filter/dns_parser.h @@ -7,12 +7,11 @@ #include "envoy/network/dns.h" #include "envoy/network/listener.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/empty_string.h" -#include "common/runtime/runtime_impl.h" -#include "common/stats/timespan_impl.h" - -#include "extensions/filters/udp/dns_filter/dns_filter_constants.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/stats/timespan_impl.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter_constants.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/udp/udp_proxy/BUILD b/source/extensions/filters/udp/udp_proxy/BUILD index bd8fa7e6b3550..331e28323819e 100644 --- a/source/extensions/filters/udp/udp_proxy/BUILD +++ b/source/extensions/filters/udp/udp_proxy/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( srcs = ["hash_policy_impl.cc"], hdrs = ["hash_policy_impl.h"], deps = [ - "//include/envoy/udp:hash_policy_interface", + "//envoy/udp:hash_policy_interface", "//source/common/common:assert_lib", "//source/common/common:hash_lib", "@envoy_api//envoy/extensions/filters/udp/udp_proxy/v3:pkg_cc_proto", @@ -27,11 +27,11 @@ envoy_cc_library( hdrs = ["udp_proxy_filter.h"], deps = [ ":hash_policy_lib", - "//include/envoy/event:file_event_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/network:listener_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/event:file_event_interface", + "//envoy/event:timer_interface", + "//envoy/network:filter_interface", + "//envoy/network:listener_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/api:os_sys_calls_lib", "//source/common/network:socket_lib", "//source/common/network:socket_option_factory_lib", @@ -47,8 +47,8 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":udp_proxy_filter_lib", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "@envoy_api//envoy/extensions/filters/udp/udp_proxy/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/filters/udp/udp_proxy/config.cc b/source/extensions/filters/udp/udp_proxy/config.cc index 43324d8ced9a1..aa46a14114e10 100644 --- a/source/extensions/filters/udp/udp_proxy/config.cc +++ b/source/extensions/filters/udp/udp_proxy/config.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/udp/udp_proxy/config.h" +#include "source/extensions/filters/udp/udp_proxy/config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/udp/udp_proxy/config.h b/source/extensions/filters/udp/udp_proxy/config.h index 36dc5e2b75503..ef3ab1074e4bc 100644 --- a/source/extensions/filters/udp/udp_proxy/config.h +++ b/source/extensions/filters/udp/udp_proxy/config.h @@ -4,7 +4,7 @@ #include "envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.validate.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/udp/udp_proxy/udp_proxy_filter.h" +#include "source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/udp/udp_proxy/hash_policy_impl.cc b/source/extensions/filters/udp/udp_proxy/hash_policy_impl.cc index 5f6551c521e41..4e6a0a6897d28 100644 --- a/source/extensions/filters/udp/udp_proxy/hash_policy_impl.cc +++ b/source/extensions/filters/udp/udp_proxy/hash_policy_impl.cc @@ -1,7 +1,7 @@ -#include "extensions/filters/udp/udp_proxy/hash_policy_impl.h" +#include "source/extensions/filters/udp/udp_proxy/hash_policy_impl.h" -#include "common/common/assert.h" -#include "common/common/macros.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/udp/udp_proxy/hash_policy_impl.h b/source/extensions/filters/udp/udp_proxy/hash_policy_impl.h index faae9e3ed4672..9cb9fb3e486ee 100644 --- a/source/extensions/filters/udp/udp_proxy/hash_policy_impl.h +++ b/source/extensions/filters/udp/udp_proxy/hash_policy_impl.h @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.h" #include "envoy/udp/hash_policy.h" -#include "common/common/hash.h" +#include "source/common/common/hash.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.cc b/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.cc index 9d21d784ba575..4ee826eeb3f77 100644 --- a/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.cc +++ b/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/udp/udp_proxy/udp_proxy_filter.h" +#include "source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h" #include "envoy/network/listener.h" -#include "common/network/socket_option_factory.h" +#include "source/common/network/socket_option_factory.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h b/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h index 28f037882cbc2..fd20e7025dd2f 100644 --- a/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h +++ b/source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h @@ -6,14 +6,13 @@ #include "envoy/network/filter.h" #include "envoy/upstream/cluster_manager.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/network/socket_impl.h" -#include "common/network/socket_interface.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" -#include "common/upstream/load_balancer_impl.h" - -#include "extensions/filters/udp/udp_proxy/hash_policy_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/network/socket_impl.h" +#include "source/common/network/socket_interface.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/extensions/filters/udp/udp_proxy/hash_policy_impl.h" #include "absl/container/flat_hash_set.h" diff --git a/source/extensions/grpc_credentials/aws_iam/BUILD b/source/extensions/grpc_credentials/aws_iam/BUILD index fa66cc2353992..ac63c34674e6e 100644 --- a/source/extensions/grpc_credentials/aws_iam/BUILD +++ b/source/extensions/grpc_credentials/aws_iam/BUILD @@ -16,8 +16,8 @@ envoy_cc_extension( hdrs = ["config.h"], external_deps = ["grpc"], deps = [ - "//include/envoy/grpc:google_grpc_creds_interface", - "//include/envoy/registry", + "//envoy/grpc:google_grpc_creds_interface", + "//envoy/registry", "//source/common/common:assert_lib", "//source/common/config:utility_lib", "//source/common/grpc:google_grpc_creds_lib", diff --git a/source/extensions/grpc_credentials/aws_iam/config.cc b/source/extensions/grpc_credentials/aws_iam/config.cc index 454e6265204e3..c70140a437cbf 100644 --- a/source/extensions/grpc_credentials/aws_iam/config.cc +++ b/source/extensions/grpc_credentials/aws_iam/config.cc @@ -1,4 +1,4 @@ -#include "extensions/grpc_credentials/aws_iam/config.h" +#include "source/extensions/grpc_credentials/aws_iam/config.h" #include "envoy/common/exception.h" #include "envoy/config/core/v3/grpc_service.pb.h" @@ -7,15 +7,14 @@ #include "envoy/grpc/google_grpc_creds.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" -#include "common/grpc/google_grpc_creds_impl.h" -#include "common/http/utility.h" -#include "common/protobuf/message_validator_impl.h" - -#include "extensions/common/aws/credentials_provider_impl.h" -#include "extensions/common/aws/region_provider_impl.h" -#include "extensions/common/aws/signer_impl.h" -#include "extensions/common/aws/utility.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/google_grpc_creds_impl.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/extensions/common/aws/credentials_provider_impl.h" +#include "source/extensions/common/aws/region_provider_impl.h" +#include "source/extensions/common/aws/signer_impl.h" +#include "source/extensions/common/aws/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/grpc_credentials/aws_iam/config.h b/source/extensions/grpc_credentials/aws_iam/config.h index 819a45598ac36..f07ae3fe00296 100644 --- a/source/extensions/grpc_credentials/aws_iam/config.h +++ b/source/extensions/grpc_credentials/aws_iam/config.h @@ -5,9 +5,8 @@ #include "envoy/grpc/google_grpc_creds.h" #include "envoy/http/header_map.h" -#include "common/http/message_impl.h" - -#include "extensions/common/aws/signer.h" +#include "source/common/http/message_impl.h" +#include "source/extensions/common/aws/signer.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/grpc_credentials/example/BUILD b/source/extensions/grpc_credentials/example/BUILD index 582844968ee51..01c0e4e8ea23a 100644 --- a/source/extensions/grpc_credentials/example/BUILD +++ b/source/extensions/grpc_credentials/example/BUILD @@ -22,8 +22,8 @@ envoy_cc_library( "//test/extensions:__subpackages__", ], deps = [ - "//include/envoy/grpc:google_grpc_creds_interface", - "//include/envoy/registry", + "//envoy/grpc:google_grpc_creds_interface", + "//envoy/registry", "//source/common/common:assert_lib", "//source/common/grpc:google_grpc_creds_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/source/extensions/grpc_credentials/example/config.cc b/source/extensions/grpc_credentials/example/config.cc index 8ce8c7891d24d..2645fb07deea3 100644 --- a/source/extensions/grpc_credentials/example/config.cc +++ b/source/extensions/grpc_credentials/example/config.cc @@ -1,10 +1,10 @@ -#include "extensions/grpc_credentials/example/config.h" +#include "source/extensions/grpc_credentials/example/config.h" #include "envoy/config/core/v3/grpc_service.pb.h" #include "envoy/grpc/google_grpc_creds.h" #include "envoy/registry/registry.h" -#include "common/grpc/google_grpc_creds_impl.h" +#include "source/common/grpc/google_grpc_creds_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/grpc_credentials/file_based_metadata/BUILD b/source/extensions/grpc_credentials/file_based_metadata/BUILD index 5ffe31ce30b08..ffaa5554b5ce3 100644 --- a/source/extensions/grpc_credentials/file_based_metadata/BUILD +++ b/source/extensions/grpc_credentials/file_based_metadata/BUILD @@ -16,8 +16,8 @@ envoy_cc_extension( hdrs = ["config.h"], external_deps = ["grpc"], deps = [ - "//include/envoy/grpc:google_grpc_creds_interface", - "//include/envoy/registry", + "//envoy/grpc:google_grpc_creds_interface", + "//envoy/registry", "//source/common/config:utility_lib", "//source/common/grpc:common_lib", "//source/common/grpc:google_grpc_creds_lib", diff --git a/source/extensions/grpc_credentials/file_based_metadata/config.cc b/source/extensions/grpc_credentials/file_based_metadata/config.cc index c05f7cc6d611b..81fa4aa783435 100644 --- a/source/extensions/grpc_credentials/file_based_metadata/config.cc +++ b/source/extensions/grpc_credentials/file_based_metadata/config.cc @@ -1,4 +1,4 @@ -#include "extensions/grpc_credentials/file_based_metadata/config.h" +#include "source/extensions/grpc_credentials/file_based_metadata/config.h" #include "envoy/config/core/v3/grpc_service.pb.h" #include "envoy/config/grpc_credential/v3/file_based_metadata.pb.h" @@ -6,11 +6,11 @@ #include "envoy/grpc/google_grpc_creds.h" #include "envoy/registry/registry.h" -#include "common/config/datasource.h" -#include "common/config/utility.h" -#include "common/grpc/google_grpc_creds_impl.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" +#include "source/common/config/datasource.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/google_grpc_creds_impl.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/grpc_credentials/file_based_metadata/config.h b/source/extensions/grpc_credentials/file_based_metadata/config.h index 7b844e356500b..2ff1c54a161f8 100644 --- a/source/extensions/grpc_credentials/file_based_metadata/config.h +++ b/source/extensions/grpc_credentials/file_based_metadata/config.h @@ -4,7 +4,7 @@ #include "envoy/config/grpc_credential/v3/file_based_metadata.pb.h" #include "envoy/grpc/google_grpc_creds.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/health_checkers/redis/BUILD b/source/extensions/health_checkers/redis/BUILD index 58d1ad4812a3f..0fd615b9d044e 100644 --- a/source/extensions/health_checkers/redis/BUILD +++ b/source/extensions/health_checkers/redis/BUILD @@ -34,8 +34,8 @@ envoy_cc_extension( deps = [ ":redis", ":utility", - "//include/envoy/registry", - "//include/envoy/server:health_checker_config_interface", + "//envoy/registry", + "//envoy/server:health_checker_config_interface", "//source/common/common:assert_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/redis_proxy/v3:pkg_cc_proto", diff --git a/source/extensions/health_checkers/redis/config.cc b/source/extensions/health_checkers/redis/config.cc index b36a2b6f0118b..880c2b34de770 100644 --- a/source/extensions/health_checkers/redis/config.cc +++ b/source/extensions/health_checkers/redis/config.cc @@ -1,13 +1,12 @@ -#include "extensions/health_checkers/redis/config.h" +#include "source/extensions/health_checkers/redis/config.h" #include "envoy/config/core/v3/health_check.pb.h" #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" - -#include "extensions/health_checkers/redis/utility.h" +#include "source/common/config/utility.h" +#include "source/extensions/health_checkers/redis/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/health_checkers/redis/config.h b/source/extensions/health_checkers/redis/config.h index 919bd158be0b6..ea8820e87b354 100644 --- a/source/extensions/health_checkers/redis/config.h +++ b/source/extensions/health_checkers/redis/config.h @@ -7,7 +7,7 @@ #include "envoy/extensions/health_checkers/redis/v3/redis.pb.validate.h" #include "envoy/server/health_checker_config.h" -#include "extensions/health_checkers/redis/redis.h" +#include "source/extensions/health_checkers/redis/redis.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/health_checkers/redis/redis.cc b/source/extensions/health_checkers/redis/redis.cc index 6d188c5e2b06b..29241d2cf1779 100644 --- a/source/extensions/health_checkers/redis/redis.cc +++ b/source/extensions/health_checkers/redis/redis.cc @@ -1,4 +1,4 @@ -#include "extensions/health_checkers/redis/redis.h" +#include "source/extensions/health_checkers/redis/redis.h" #include "envoy/config/core/v3/health_check.pb.h" #include "envoy/data/core/v3/health_check_event.pb.h" diff --git a/source/extensions/health_checkers/redis/redis.h b/source/extensions/health_checkers/redis/redis.h index 1639e98e9c140..9f7be5bf197c4 100644 --- a/source/extensions/health_checkers/redis/redis.h +++ b/source/extensions/health_checkers/redis/redis.h @@ -9,11 +9,10 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h" #include "envoy/extensions/health_checkers/redis/v3/redis.pb.h" -#include "common/upstream/health_checker_base_impl.h" - -#include "extensions/filters/network/common/redis/client_impl.h" -#include "extensions/filters/network/redis_proxy/config.h" -#include "extensions/filters/network/redis_proxy/conn_pool_impl.h" +#include "source/common/upstream/health_checker_base_impl.h" +#include "source/extensions/filters/network/common/redis/client_impl.h" +#include "source/extensions/filters/network/redis_proxy/config.h" +#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/health_checkers/redis/utility.h b/source/extensions/health_checkers/redis/utility.h index 25bfd98873092..b9c5de5848c2a 100644 --- a/source/extensions/health_checkers/redis/utility.h +++ b/source/extensions/health_checkers/redis/utility.h @@ -4,9 +4,9 @@ #include "envoy/extensions/health_checkers/redis/v3/redis.pb.h" #include "envoy/extensions/health_checkers/redis/v3/redis.pb.validate.h" -#include "common/config/utility.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/http/header_formatters/preserve_case/BUILD b/source/extensions/http/header_formatters/preserve_case/BUILD index fffdd69fbf5e5..5233d48e41147 100644 --- a/source/extensions/http/header_formatters/preserve_case/BUILD +++ b/source/extensions/http/header_formatters/preserve_case/BUILD @@ -13,7 +13,7 @@ envoy_cc_extension( srcs = ["preserve_case_formatter.cc"], hdrs = ["preserve_case_formatter.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "@envoy_api//envoy/extensions/http/header_formatters/preserve_case/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.cc b/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.cc index 38d72824a9833..a27b35478f1e9 100644 --- a/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.cc +++ b/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.cc @@ -1,4 +1,4 @@ -#include "extensions/http/header_formatters/preserve_case/preserve_case_formatter.h" +#include "source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h" #include "envoy/extensions/http/header_formatters/preserve_case/v3/preserve_case.pb.h" #include "envoy/extensions/http/header_formatters/preserve_case/v3/preserve_case.pb.validate.h" diff --git a/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h b/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h index ca78e0a5e2607..d2e3f7da00ff7 100644 --- a/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h +++ b/source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h @@ -2,7 +2,7 @@ #include "envoy/http/header_formatter.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/http/original_ip_detection/custom_header/BUILD b/source/extensions/http/original_ip_detection/custom_header/BUILD index 53c86cdc4afbb..1792aec58707a 100644 --- a/source/extensions/http/original_ip_detection/custom_header/BUILD +++ b/source/extensions/http/original_ip_detection/custom_header/BUILD @@ -16,7 +16,7 @@ envoy_cc_library( # This extension is used from core tests. visibility = ["//visibility:public"], deps = [ - "//include/envoy/http:original_ip_detection_interface", + "//envoy/http:original_ip_detection_interface", "//source/common/network:utility_lib", "@envoy_api//envoy/extensions/http/original_ip_detection/custom_header/v3:pkg_cc_proto", ], @@ -30,8 +30,8 @@ envoy_cc_extension( visibility = ["//visibility:public"], deps = [ ":custom_header_lib", - "//include/envoy/http:original_ip_detection_interface", - "//include/envoy/registry", + "//envoy/http:original_ip_detection_interface", + "//envoy/registry", "//source/common/config:utility_lib", "@envoy_api//envoy/extensions/http/original_ip_detection/custom_header/v3:pkg_cc_proto", ], diff --git a/source/extensions/http/original_ip_detection/custom_header/config.cc b/source/extensions/http/original_ip_detection/custom_header/config.cc index 9dc57e1fefa3d..12a6feef49ef4 100644 --- a/source/extensions/http/original_ip_detection/custom_header/config.cc +++ b/source/extensions/http/original_ip_detection/custom_header/config.cc @@ -1,12 +1,11 @@ -#include "extensions/http/original_ip_detection/custom_header/config.h" +#include "source/extensions/http/original_ip_detection/custom_header/config.h" #include "envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.h" #include "envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.validate.h" #include "envoy/http/original_ip_detection.h" -#include "common/config/utility.h" - -#include "extensions/http/original_ip_detection/custom_header/custom_header.h" +#include "source/common/config/utility.h" +#include "source/extensions/http/original_ip_detection/custom_header/custom_header.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/http/original_ip_detection/custom_header/config.h b/source/extensions/http/original_ip_detection/custom_header/config.h index ca09b267c5d21..4c460c3a1caaf 100644 --- a/source/extensions/http/original_ip_detection/custom_header/config.h +++ b/source/extensions/http/original_ip_detection/custom_header/config.h @@ -4,7 +4,7 @@ #include "envoy/http/original_ip_detection.h" #include "envoy/registry/registry.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/http/original_ip_detection/custom_header/custom_header.cc b/source/extensions/http/original_ip_detection/custom_header/custom_header.cc index 9e7d9d7e8bcb8..b750651119817 100644 --- a/source/extensions/http/original_ip_detection/custom_header/custom_header.cc +++ b/source/extensions/http/original_ip_detection/custom_header/custom_header.cc @@ -1,6 +1,6 @@ -#include "extensions/http/original_ip_detection/custom_header/custom_header.h" +#include "source/extensions/http/original_ip_detection/custom_header/custom_header.h" -#include "common/network/utility.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/http/original_ip_detection/xff/BUILD b/source/extensions/http/original_ip_detection/xff/BUILD index 546ba74421664..a3519bca646a1 100644 --- a/source/extensions/http/original_ip_detection/xff/BUILD +++ b/source/extensions/http/original_ip_detection/xff/BUILD @@ -16,7 +16,7 @@ envoy_cc_library( # This extension is core code. visibility = ["//visibility:public"], deps = [ - "//include/envoy/http:original_ip_detection_interface", + "//envoy/http:original_ip_detection_interface", "//source/common/http:utility_lib", "@envoy_api//envoy/extensions/http/original_ip_detection/xff/v3:pkg_cc_proto", ], @@ -30,8 +30,8 @@ envoy_cc_extension( visibility = ["//visibility:public"], deps = [ ":xff_lib", - "//include/envoy/http:original_ip_detection_interface", - "//include/envoy/registry", + "//envoy/http:original_ip_detection_interface", + "//envoy/registry", "//source/common/config:utility_lib", "@envoy_api//envoy/extensions/http/original_ip_detection/xff/v3:pkg_cc_proto", ], diff --git a/source/extensions/http/original_ip_detection/xff/config.cc b/source/extensions/http/original_ip_detection/xff/config.cc index 449db7f4c0f75..0f657239e3e8b 100644 --- a/source/extensions/http/original_ip_detection/xff/config.cc +++ b/source/extensions/http/original_ip_detection/xff/config.cc @@ -1,12 +1,11 @@ -#include "extensions/http/original_ip_detection/xff/config.h" +#include "source/extensions/http/original_ip_detection/xff/config.h" #include "envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.h" #include "envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.validate.h" #include "envoy/http/original_ip_detection.h" -#include "common/config/utility.h" - -#include "extensions/http/original_ip_detection/xff/xff.h" +#include "source/common/config/utility.h" +#include "source/extensions/http/original_ip_detection/xff/xff.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/http/original_ip_detection/xff/config.h b/source/extensions/http/original_ip_detection/xff/config.h index 5a3cc31e52af7..ce04edbbc0d43 100644 --- a/source/extensions/http/original_ip_detection/xff/config.h +++ b/source/extensions/http/original_ip_detection/xff/config.h @@ -4,7 +4,7 @@ #include "envoy/http/original_ip_detection.h" #include "envoy/registry/registry.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/http/original_ip_detection/xff/xff.cc b/source/extensions/http/original_ip_detection/xff/xff.cc index 70f142bb52dfc..7dd6740d543b4 100644 --- a/source/extensions/http/original_ip_detection/xff/xff.cc +++ b/source/extensions/http/original_ip_detection/xff/xff.cc @@ -1,6 +1,6 @@ -#include "extensions/http/original_ip_detection/xff/xff.h" +#include "source/extensions/http/original_ip_detection/xff/xff.h" -#include "common/http/utility.h" +#include "source/common/http/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/internal_redirect/allow_listed_routes/BUILD b/source/extensions/internal_redirect/allow_listed_routes/BUILD index 2d39fb0cc0d93..bb6a1f6091dbd 100644 --- a/source/extensions/internal_redirect/allow_listed_routes/BUILD +++ b/source/extensions/internal_redirect/allow_listed_routes/BUILD @@ -13,8 +13,8 @@ envoy_cc_library( name = "allow_listed_routes_lib", hdrs = ["allow_listed_routes.h"], deps = [ - "//include/envoy/router:internal_redirect_interface", - "//include/envoy/stream_info:filter_state_interface", + "//envoy/router:internal_redirect_interface", + "//envoy/stream_info:filter_state_interface", "@envoy_api//envoy/extensions/internal_redirect/allow_listed_routes/v3:pkg_cc_proto", ], ) @@ -29,8 +29,8 @@ envoy_cc_extension( ], deps = [ ":allow_listed_routes_lib", - "//include/envoy/registry", - "//include/envoy/router:internal_redirect_interface", + "//envoy/registry", + "//envoy/router:internal_redirect_interface", "@envoy_api//envoy/extensions/internal_redirect/allow_listed_routes/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/internal_redirect/allow_listed_routes/config.cc b/source/extensions/internal_redirect/allow_listed_routes/config.cc index 55c2d5af81cec..75d517cd9c53b 100644 --- a/source/extensions/internal_redirect/allow_listed_routes/config.cc +++ b/source/extensions/internal_redirect/allow_listed_routes/config.cc @@ -1,4 +1,4 @@ -#include "extensions/internal_redirect/allow_listed_routes/config.h" +#include "source/extensions/internal_redirect/allow_listed_routes/config.h" #include "envoy/registry/registry.h" #include "envoy/router/internal_redirect.h" diff --git a/source/extensions/internal_redirect/allow_listed_routes/config.h b/source/extensions/internal_redirect/allow_listed_routes/config.h index 5f5f1d391df75..8f4a5b1515385 100644 --- a/source/extensions/internal_redirect/allow_listed_routes/config.h +++ b/source/extensions/internal_redirect/allow_listed_routes/config.h @@ -4,10 +4,9 @@ #include "envoy/extensions/internal_redirect/allow_listed_routes/v3/allow_listed_routes_config.pb.validate.h" #include "envoy/router/internal_redirect.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" - -#include "extensions/internal_redirect/allow_listed_routes/allow_listed_routes.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/internal_redirect/allow_listed_routes/allow_listed_routes.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/internal_redirect/previous_routes/BUILD b/source/extensions/internal_redirect/previous_routes/BUILD index da43ff408995e..969d1ac9a13b6 100644 --- a/source/extensions/internal_redirect/previous_routes/BUILD +++ b/source/extensions/internal_redirect/previous_routes/BUILD @@ -14,8 +14,8 @@ envoy_cc_library( srcs = ["previous_routes.cc"], hdrs = ["previous_routes.h"], deps = [ - "//include/envoy/router:internal_redirect_interface", - "//include/envoy/stream_info:filter_state_interface", + "//envoy/router:internal_redirect_interface", + "//envoy/stream_info:filter_state_interface", ], ) @@ -29,8 +29,8 @@ envoy_cc_extension( ], deps = [ ":previous_routes_lib", - "//include/envoy/registry", - "//include/envoy/router:internal_redirect_interface", + "//envoy/registry", + "//envoy/router:internal_redirect_interface", "@envoy_api//envoy/extensions/internal_redirect/previous_routes/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/internal_redirect/previous_routes/config.cc b/source/extensions/internal_redirect/previous_routes/config.cc index d5d4b67c491ec..5070b9379aaef 100644 --- a/source/extensions/internal_redirect/previous_routes/config.cc +++ b/source/extensions/internal_redirect/previous_routes/config.cc @@ -1,4 +1,4 @@ -#include "extensions/internal_redirect/previous_routes/config.h" +#include "source/extensions/internal_redirect/previous_routes/config.h" #include "envoy/registry/registry.h" #include "envoy/router/internal_redirect.h" diff --git a/source/extensions/internal_redirect/previous_routes/config.h b/source/extensions/internal_redirect/previous_routes/config.h index 1fa00bb19a3ae..54f947b02ee6d 100644 --- a/source/extensions/internal_redirect/previous_routes/config.h +++ b/source/extensions/internal_redirect/previous_routes/config.h @@ -4,7 +4,7 @@ #include "envoy/extensions/internal_redirect/previous_routes/v3/previous_routes_config.pb.validate.h" #include "envoy/router/internal_redirect.h" -#include "extensions/internal_redirect/previous_routes/previous_routes.h" +#include "source/extensions/internal_redirect/previous_routes/previous_routes.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/internal_redirect/previous_routes/previous_routes.cc b/source/extensions/internal_redirect/previous_routes/previous_routes.cc index a29187e29d43c..5194255b5d49c 100644 --- a/source/extensions/internal_redirect/previous_routes/previous_routes.cc +++ b/source/extensions/internal_redirect/previous_routes/previous_routes.cc @@ -1,4 +1,4 @@ -#include "extensions/internal_redirect/previous_routes/previous_routes.h" +#include "source/extensions/internal_redirect/previous_routes/previous_routes.h" #include "envoy/router/internal_redirect.h" #include "envoy/stream_info/filter_state.h" diff --git a/source/extensions/internal_redirect/safe_cross_scheme/BUILD b/source/extensions/internal_redirect/safe_cross_scheme/BUILD index 690fa27f64abc..bc464c310b148 100644 --- a/source/extensions/internal_redirect/safe_cross_scheme/BUILD +++ b/source/extensions/internal_redirect/safe_cross_scheme/BUILD @@ -13,8 +13,8 @@ envoy_cc_library( name = "safe_cross_scheme_lib", hdrs = ["safe_cross_scheme.h"], deps = [ - "//include/envoy/router:internal_redirect_interface", - "//include/envoy/stream_info:filter_state_interface", + "//envoy/router:internal_redirect_interface", + "//envoy/stream_info:filter_state_interface", ], ) @@ -28,8 +28,8 @@ envoy_cc_extension( ], deps = [ ":safe_cross_scheme_lib", - "//include/envoy/registry", - "//include/envoy/router:internal_redirect_interface", + "//envoy/registry", + "//envoy/router:internal_redirect_interface", "@envoy_api//envoy/extensions/internal_redirect/safe_cross_scheme/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/internal_redirect/safe_cross_scheme/config.cc b/source/extensions/internal_redirect/safe_cross_scheme/config.cc index 43b7664fd7ffc..b3e2d16cfba70 100644 --- a/source/extensions/internal_redirect/safe_cross_scheme/config.cc +++ b/source/extensions/internal_redirect/safe_cross_scheme/config.cc @@ -1,4 +1,4 @@ -#include "extensions/internal_redirect/safe_cross_scheme/config.h" +#include "source/extensions/internal_redirect/safe_cross_scheme/config.h" #include "envoy/registry/registry.h" #include "envoy/router/internal_redirect.h" diff --git a/source/extensions/internal_redirect/safe_cross_scheme/config.h b/source/extensions/internal_redirect/safe_cross_scheme/config.h index 63171db70e4f4..36c8385cbce8c 100644 --- a/source/extensions/internal_redirect/safe_cross_scheme/config.h +++ b/source/extensions/internal_redirect/safe_cross_scheme/config.h @@ -3,7 +3,7 @@ #include "envoy/extensions/internal_redirect/safe_cross_scheme/v3/safe_cross_scheme_config.pb.h" #include "envoy/router/internal_redirect.h" -#include "extensions/internal_redirect/safe_cross_scheme/safe_cross_scheme.h" +#include "source/extensions/internal_redirect/safe_cross_scheme/safe_cross_scheme.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/io_socket/user_space/BUILD b/source/extensions/io_socket/user_space/BUILD index c430f95989417..334fe51a916e4 100644 --- a/source/extensions/io_socket/user_space/BUILD +++ b/source/extensions/io_socket/user_space/BUILD @@ -36,7 +36,7 @@ envoy_cc_library( ], deps = [ ":io_handle_lib", - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", ], ) diff --git a/source/extensions/io_socket/user_space/file_event_impl.cc b/source/extensions/io_socket/user_space/file_event_impl.cc index 6f116d809bcb8..dcb89c659529d 100644 --- a/source/extensions/io_socket/user_space/file_event_impl.cc +++ b/source/extensions/io_socket/user_space/file_event_impl.cc @@ -1,8 +1,7 @@ -#include "extensions/io_socket/user_space/file_event_impl.h" +#include "source/extensions/io_socket/user_space/file_event_impl.h" -#include "common/common/assert.h" - -#include "extensions/io_socket/user_space/io_handle.h" +#include "source/common/common/assert.h" +#include "source/extensions/io_socket/user_space/io_handle.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/io_socket/user_space/file_event_impl.h b/source/extensions/io_socket/user_space/file_event_impl.h index 870339aacf8a1..f02a80689e571 100644 --- a/source/extensions/io_socket/user_space/file_event_impl.h +++ b/source/extensions/io_socket/user_space/file_event_impl.h @@ -5,9 +5,8 @@ #include "envoy/event/dispatcher.h" #include "envoy/event/file_event.h" -#include "common/common/assert.h" - -#include "extensions/io_socket/user_space/io_handle.h" +#include "source/common/common/assert.h" +#include "source/extensions/io_socket/user_space/io_handle.h" namespace Envoy { diff --git a/source/extensions/io_socket/user_space/io_handle_impl.cc b/source/extensions/io_socket/user_space/io_handle_impl.cc index 4c487cf5fa9e6..bbdb37e3b09ef 100644 --- a/source/extensions/io_socket/user_space/io_handle_impl.cc +++ b/source/extensions/io_socket/user_space/io_handle_impl.cc @@ -1,14 +1,13 @@ -#include "extensions/io_socket/user_space/io_handle_impl.h" +#include "source/extensions/io_socket/user_space/io_handle_impl.h" #include "envoy/buffer/buffer.h" #include "envoy/common/platform.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" - -#include "extensions/io_socket/user_space/file_event_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/io_socket/user_space/file_event_impl.h" #include "absl/types/optional.h" diff --git a/source/extensions/io_socket/user_space/io_handle_impl.h b/source/extensions/io_socket/user_space/io_handle_impl.h index d0ceab1d5cf84..71d3248d47223 100644 --- a/source/extensions/io_socket/user_space/io_handle_impl.h +++ b/source/extensions/io_socket/user_space/io_handle_impl.h @@ -9,12 +9,11 @@ #include "envoy/network/address.h" #include "envoy/network/io_handle.h" -#include "common/buffer/watermark_buffer.h" -#include "common/common/logger.h" -#include "common/network/io_socket_error_impl.h" - -#include "extensions/io_socket/user_space/file_event_impl.h" -#include "extensions/io_socket/user_space/io_handle.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/common/logger.h" +#include "source/common/network/io_socket_error_impl.h" +#include "source/extensions/io_socket/user_space/file_event_impl.h" +#include "source/extensions/io_socket/user_space/io_handle.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/matching/common_inputs/environment_variable/BUILD b/source/extensions/matching/common_inputs/environment_variable/BUILD index 2dacd62538db4..52a146857ad8d 100644 --- a/source/extensions/matching/common_inputs/environment_variable/BUILD +++ b/source/extensions/matching/common_inputs/environment_variable/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( name = "input_lib", hdrs = ["input.h"], deps = [ - "//include/envoy/matcher:matcher_interface", + "//envoy/matcher:matcher_interface", "//source/common/common:hash_lib", ], ) @@ -24,9 +24,9 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":input_lib", - "//include/envoy/matcher:matcher_interface", - "//include/envoy/registry", - "//include/envoy/server:factory_context_interface", + "//envoy/matcher:matcher_interface", + "//envoy/registry", + "//envoy/server:factory_context_interface", "@envoy_api//envoy/extensions/matching/common_inputs/environment_variable/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/matching/common_inputs/environment_variable/config.cc b/source/extensions/matching/common_inputs/environment_variable/config.cc index a7716e0b0748d..114ebc9e60306 100644 --- a/source/extensions/matching/common_inputs/environment_variable/config.cc +++ b/source/extensions/matching/common_inputs/environment_variable/config.cc @@ -1,4 +1,4 @@ -#include "extensions/matching/common_inputs/environment_variable/config.h" +#include "source/extensions/matching/common_inputs/environment_variable/config.h" #include diff --git a/source/extensions/matching/common_inputs/environment_variable/config.h b/source/extensions/matching/common_inputs/environment_variable/config.h index a583785a31011..b4e66cace2271 100644 --- a/source/extensions/matching/common_inputs/environment_variable/config.h +++ b/source/extensions/matching/common_inputs/environment_variable/config.h @@ -5,9 +5,8 @@ #include "envoy/matcher/matcher.h" #include "envoy/server/factory_context.h" -#include "common/protobuf/utility.h" - -#include "extensions/matching/common_inputs/environment_variable/input.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/matching/common_inputs/environment_variable/input.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/matching/common_inputs/environment_variable/input.h b/source/extensions/matching/common_inputs/environment_variable/input.h index 240869d9c9d09..07b2d67ccffb1 100644 --- a/source/extensions/matching/common_inputs/environment_variable/input.h +++ b/source/extensions/matching/common_inputs/environment_variable/input.h @@ -12,7 +12,7 @@ class Input : public Matcher::CommonProtocolInput { public: explicit Input(absl::optional&& value) : storage_(std::move(value)) {} - absl::optional get() override { return storage_; } + absl::optional get() override { return storage_; } private: const absl::optional storage_; diff --git a/source/extensions/matching/input_matchers/consistent_hashing/BUILD b/source/extensions/matching/input_matchers/consistent_hashing/BUILD index 0e72af550db3f..a5fc295998e47 100644 --- a/source/extensions/matching/input_matchers/consistent_hashing/BUILD +++ b/source/extensions/matching/input_matchers/consistent_hashing/BUILD @@ -13,8 +13,8 @@ envoy_cc_library( name = "consistent_hashing_lib", hdrs = ["matcher.h"], deps = [ - "//include/envoy/matcher:matcher_interface", - "//include/envoy/upstream:retry_interface", + "//envoy/matcher:matcher_interface", + "//envoy/upstream:retry_interface", "//source/common/common:hash_lib", ], ) @@ -25,9 +25,9 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":consistent_hashing_lib", - "//include/envoy/matcher:matcher_interface", - "//include/envoy/registry", - "//include/envoy/server:factory_context_interface", + "//envoy/matcher:matcher_interface", + "//envoy/registry", + "//envoy/server:factory_context_interface", "@envoy_api//envoy/extensions/matching/input_matchers/consistent_hashing/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/matching/input_matchers/consistent_hashing/config.cc b/source/extensions/matching/input_matchers/consistent_hashing/config.cc index 6b9e2e7f7aca6..b493bcec88683 100644 --- a/source/extensions/matching/input_matchers/consistent_hashing/config.cc +++ b/source/extensions/matching/input_matchers/consistent_hashing/config.cc @@ -1,4 +1,4 @@ -#include "extensions/matching/input_matchers/consistent_hashing/config.h" +#include "source/extensions/matching/input_matchers/consistent_hashing/config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/matching/input_matchers/consistent_hashing/config.h b/source/extensions/matching/input_matchers/consistent_hashing/config.h index ec0f666491902..eb410b0f5b609 100644 --- a/source/extensions/matching/input_matchers/consistent_hashing/config.h +++ b/source/extensions/matching/input_matchers/consistent_hashing/config.h @@ -5,9 +5,8 @@ #include "envoy/matcher/matcher.h" #include "envoy/server/factory_context.h" -#include "common/protobuf/utility.h" - -#include "extensions/matching/input_matchers/consistent_hashing/matcher.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/matching/input_matchers/consistent_hashing/matcher.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/matching/input_matchers/consistent_hashing/matcher.h b/source/extensions/matching/input_matchers/consistent_hashing/matcher.h index d55e795f3b657..4ef0f6eaa20db 100644 --- a/source/extensions/matching/input_matchers/consistent_hashing/matcher.h +++ b/source/extensions/matching/input_matchers/consistent_hashing/matcher.h @@ -2,7 +2,7 @@ #include "envoy/matcher/matcher.h" -#include "common/common/hash.h" +#include "source/common/common/hash.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/rate_limit_descriptors/expr/BUILD b/source/extensions/rate_limit_descriptors/expr/BUILD index a1f4dc89d881c..35c818a82cd4a 100644 --- a/source/extensions/rate_limit_descriptors/expr/BUILD +++ b/source/extensions/rate_limit_descriptors/expr/BUILD @@ -19,8 +19,8 @@ envoy_cc_extension( ], }), deps = [ - "//include/envoy/ratelimit:ratelimit_interface", - "//include/envoy/registry", + "//envoy/ratelimit:ratelimit_interface", + "//envoy/registry", "//source/common/protobuf:utility_lib", "//source/extensions/filters/common/expr:evaluator_lib", "@envoy_api//envoy/extensions/rate_limit_descriptors/expr/v3:pkg_cc_proto", diff --git a/source/extensions/rate_limit_descriptors/expr/config.cc b/source/extensions/rate_limit_descriptors/expr/config.cc index 57aeda76b92ef..e780574ec813f 100644 --- a/source/extensions/rate_limit_descriptors/expr/config.cc +++ b/source/extensions/rate_limit_descriptors/expr/config.cc @@ -1,9 +1,9 @@ -#include "extensions/rate_limit_descriptors/expr/config.h" +#include "source/extensions/rate_limit_descriptors/expr/config.h" #include "envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.h" #include "envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.validate.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" #if defined(USE_CEL_PARSER) #include "parser/parser.h" diff --git a/source/extensions/rate_limit_descriptors/expr/config.h b/source/extensions/rate_limit_descriptors/expr/config.h index 6d3967bb82856..da50da1ab14bd 100644 --- a/source/extensions/rate_limit_descriptors/expr/config.h +++ b/source/extensions/rate_limit_descriptors/expr/config.h @@ -3,7 +3,7 @@ #include "envoy/ratelimit/ratelimit.h" #include "envoy/registry/registry.h" -#include "extensions/filters/common/expr/evaluator.h" +#include "source/extensions/filters/common/expr/evaluator.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/request_id/uuid/BUILD b/source/extensions/request_id/uuid/BUILD index feb49f7a39014..b358c1e32fc29 100644 --- a/source/extensions/request_id/uuid/BUILD +++ b/source/extensions/request_id/uuid/BUILD @@ -18,8 +18,8 @@ envoy_cc_extension( ], visibility = ["//visibility:public"], deps = [ - "//include/envoy/http:request_id_extension_interface", - "//include/envoy/server:request_id_extension_config_interface", + "//envoy/http:request_id_extension_interface", + "//envoy/server:request_id_extension_config_interface", "//source/common/common:random_generator_lib", "@envoy_api//envoy/extensions/request_id/uuid/v3:pkg_cc_proto", ], diff --git a/source/extensions/request_id/uuid/config.cc b/source/extensions/request_id/uuid/config.cc index dbddb4c8422bd..9423d8a275649 100644 --- a/source/extensions/request_id/uuid/config.cc +++ b/source/extensions/request_id/uuid/config.cc @@ -1,10 +1,10 @@ -#include "extensions/request_id/uuid/config.h" +#include "source/extensions/request_id/uuid/config.h" #include "envoy/http/header_map.h" #include "envoy/tracing/http_tracer.h" -#include "common/common/random_generator.h" -#include "common/common/utility.h" +#include "source/common/common/random_generator.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/resource_monitors/BUILD b/source/extensions/resource_monitors/BUILD index 40a5e79b39d3b..90e061ad8da39 100644 --- a/source/extensions/resource_monitors/BUILD +++ b/source/extensions/resource_monitors/BUILD @@ -1,19 +1,8 @@ load( "//bazel:envoy_build_system.bzl", - "envoy_cc_library", "envoy_extension_package", ) licenses(["notice"]) # Apache 2 envoy_extension_package() - -envoy_cc_library( - name = "well_known_names", - hdrs = ["well_known_names.h"], - # well known names files are public as long as they exist. - visibility = ["//visibility:public"], - deps = [ - "//source/common/singleton:const_singleton", - ], -) diff --git a/source/extensions/resource_monitors/common/BUILD b/source/extensions/resource_monitors/common/BUILD index a17f10b5c3780..0f8e19c757df1 100644 --- a/source/extensions/resource_monitors/common/BUILD +++ b/source/extensions/resource_monitors/common/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( # This resource monitoring library is considered core code. visibility = ["//visibility:public"], deps = [ - "//include/envoy/server:resource_monitor_config_interface", + "//envoy/server:resource_monitor_config_interface", "//source/common/protobuf:utility_lib", ], ) diff --git a/source/extensions/resource_monitors/common/factory_base.h b/source/extensions/resource_monitors/common/factory_base.h index 403200a47432b..13bd2e86aa156 100644 --- a/source/extensions/resource_monitors/common/factory_base.h +++ b/source/extensions/resource_monitors/common/factory_base.h @@ -2,7 +2,7 @@ #include "envoy/server/resource_monitor_config.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/resource_monitors/fixed_heap/BUILD b/source/extensions/resource_monitors/fixed_heap/BUILD index f1ce7fa600253..108be4816bbe7 100644 --- a/source/extensions/resource_monitors/fixed_heap/BUILD +++ b/source/extensions/resource_monitors/fixed_heap/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( srcs = ["fixed_heap_monitor.cc"], hdrs = ["fixed_heap_monitor.h"], deps = [ - "//include/envoy/server:resource_monitor_config_interface", + "//envoy/server:resource_monitor_config_interface", "//source/common/common:assert_lib", "//source/common/memory:stats_lib", "@envoy_api//envoy/extensions/resource_monitors/fixed_heap/v3:pkg_cc_proto", @@ -27,9 +27,8 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":fixed_heap_monitor", - "//include/envoy/registry", + "//envoy/registry", "//source/common/common:assert_lib", - "//source/extensions/resource_monitors:well_known_names", "//source/extensions/resource_monitors/common:factory_base_lib", "@envoy_api//envoy/extensions/resource_monitors/fixed_heap/v3:pkg_cc_proto", ], diff --git a/source/extensions/resource_monitors/fixed_heap/config.cc b/source/extensions/resource_monitors/fixed_heap/config.cc index df498656e2187..c622892e5d939 100644 --- a/source/extensions/resource_monitors/fixed_heap/config.cc +++ b/source/extensions/resource_monitors/fixed_heap/config.cc @@ -1,12 +1,11 @@ -#include "extensions/resource_monitors/fixed_heap/config.h" +#include "source/extensions/resource_monitors/fixed_heap/config.h" #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.h" #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/protobuf/utility.h" - -#include "extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/resource_monitors/fixed_heap/config.h b/source/extensions/resource_monitors/fixed_heap/config.h index 4c822719abeac..06eb587a50ea2 100644 --- a/source/extensions/resource_monitors/fixed_heap/config.h +++ b/source/extensions/resource_monitors/fixed_heap/config.h @@ -4,8 +4,7 @@ #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.validate.h" #include "envoy/server/resource_monitor_config.h" -#include "extensions/resource_monitors/common/factory_base.h" -#include "extensions/resource_monitors/well_known_names.h" +#include "source/extensions/resource_monitors/common/factory_base.h" namespace Envoy { namespace Extensions { @@ -16,7 +15,7 @@ class FixedHeapMonitorFactory : public Common::FactoryBase< envoy::extensions::resource_monitors::fixed_heap::v3::FixedHeapConfig> { public: - FixedHeapMonitorFactory() : FactoryBase(ResourceMonitorNames::get().FixedHeap) {} + FixedHeapMonitorFactory() : FactoryBase("envoy.resource_monitors.fixed_heap") {} private: Server::ResourceMonitorPtr createResourceMonitorFromProtoTyped( diff --git a/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc b/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc index b97227e35bea1..106c44620b68d 100644 --- a/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc +++ b/source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.cc @@ -1,9 +1,9 @@ -#include "extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h" +#include "source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h" #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.h" -#include "common/common/assert.h" -#include "common/memory/stats.h" +#include "source/common/common/assert.h" +#include "source/common/memory/stats.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/resource_monitors/injected_resource/BUILD b/source/extensions/resource_monitors/injected_resource/BUILD index 50453d2a1bdcf..5f63612599414 100644 --- a/source/extensions/resource_monitors/injected_resource/BUILD +++ b/source/extensions/resource_monitors/injected_resource/BUILD @@ -14,9 +14,9 @@ envoy_cc_library( srcs = ["injected_resource_monitor.cc"], hdrs = ["injected_resource_monitor.h"], deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/filesystem:filesystem_interface", - "//include/envoy/server:resource_monitor_config_interface", + "//envoy/api:api_interface", + "//envoy/filesystem:filesystem_interface", + "//envoy/server:resource_monitor_config_interface", "//source/common/common:assert_lib", "@envoy_api//envoy/extensions/resource_monitors/injected_resource/v3:pkg_cc_proto", ], @@ -26,16 +26,10 @@ envoy_cc_extension( name = "config", srcs = ["config.cc"], hdrs = ["config.h"], - # TODO(#9953) clean up. - extra_visibility = [ - "//test/integration:__subpackages__", - "//test/common/quic/integration:__subpackages__", - ], deps = [ ":injected_resource_monitor", - "//include/envoy/registry", + "//envoy/registry", "//source/common/common:assert_lib", - "//source/extensions/resource_monitors:well_known_names", "//source/extensions/resource_monitors/common:factory_base_lib", "@envoy_api//envoy/extensions/resource_monitors/injected_resource/v3:pkg_cc_proto", ], diff --git a/source/extensions/resource_monitors/injected_resource/config.cc b/source/extensions/resource_monitors/injected_resource/config.cc index 2db6abd8b8a9a..df579888074c4 100644 --- a/source/extensions/resource_monitors/injected_resource/config.cc +++ b/source/extensions/resource_monitors/injected_resource/config.cc @@ -1,12 +1,11 @@ -#include "extensions/resource_monitors/injected_resource/config.h" +#include "source/extensions/resource_monitors/injected_resource/config.h" #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.h" #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/protobuf/utility.h" - -#include "extensions/resource_monitors/injected_resource/injected_resource_monitor.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/resource_monitors/injected_resource/injected_resource_monitor.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/resource_monitors/injected_resource/config.h b/source/extensions/resource_monitors/injected_resource/config.h index cbbd5abd49a77..a9336b988d9f5 100644 --- a/source/extensions/resource_monitors/injected_resource/config.h +++ b/source/extensions/resource_monitors/injected_resource/config.h @@ -4,8 +4,7 @@ #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.validate.h" #include "envoy/server/resource_monitor_config.h" -#include "extensions/resource_monitors/common/factory_base.h" -#include "extensions/resource_monitors/well_known_names.h" +#include "source/extensions/resource_monitors/common/factory_base.h" namespace Envoy { namespace Extensions { @@ -16,7 +15,7 @@ class InjectedResourceMonitorFactory : public Common::FactoryBase< envoy::extensions::resource_monitors::injected_resource::v3::InjectedResourceConfig> { public: - InjectedResourceMonitorFactory() : FactoryBase(ResourceMonitorNames::get().InjectedResource) {} + InjectedResourceMonitorFactory() : FactoryBase("envoy.resource_monitors.injected_resource") {} private: Server::ResourceMonitorPtr createResourceMonitorFromProtoTyped( diff --git a/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc b/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc index 46277bff65529..6aa0aeb76858d 100644 --- a/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc +++ b/source/extensions/resource_monitors/injected_resource/injected_resource_monitor.cc @@ -1,8 +1,8 @@ -#include "extensions/resource_monitors/injected_resource/injected_resource_monitor.h" +#include "source/extensions/resource_monitors/injected_resource/injected_resource_monitor.h" #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/strings/numbers.h" diff --git a/source/extensions/resource_monitors/well_known_names.h b/source/extensions/resource_monitors/well_known_names.h deleted file mode 100644 index 7828997ed7829..0000000000000 --- a/source/extensions/resource_monitors/well_known_names.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once -#include - -#include "common/singleton/const_singleton.h" - -namespace Envoy { -namespace Extensions { -namespace ResourceMonitors { - -/** - * Well-known resource monitor names. - * NOTE: New resource monitors should use the well known name: envoy.resource_monitors.name. - */ -class ResourceMonitorNameValues { -public: - // Heap monitor with statically configured max. - const std::string FixedHeap = "envoy.resource_monitors.fixed_heap"; - - // File-based injected resource monitor. - const std::string InjectedResource = "envoy.resource_monitors.injected_resource"; -}; - -using ResourceMonitorNames = ConstSingleton; - -} // namespace ResourceMonitors -} // namespace Extensions -} // namespace Envoy diff --git a/source/extensions/retry/host/omit_canary_hosts/BUILD b/source/extensions/retry/host/omit_canary_hosts/BUILD index 8e3f446d0848b..6cf826b484f4b 100644 --- a/source/extensions/retry/host/omit_canary_hosts/BUILD +++ b/source/extensions/retry/host/omit_canary_hosts/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( name = "omit_canary_hosts_predicate_lib", hdrs = ["omit_canary_hosts.h"], deps = [ - "//include/envoy/upstream:retry_interface", + "//envoy/upstream:retry_interface", ], ) @@ -23,8 +23,8 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":omit_canary_hosts_predicate_lib", - "//include/envoy/registry", - "//include/envoy/upstream:retry_interface", + "//envoy/registry", + "//envoy/upstream:retry_interface", "@envoy_api//envoy/extensions/retry/host/omit_canary_hosts/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/retry/host/omit_canary_hosts/config.cc b/source/extensions/retry/host/omit_canary_hosts/config.cc index 495790ecc7311..24a965d65bb65 100644 --- a/source/extensions/retry/host/omit_canary_hosts/config.cc +++ b/source/extensions/retry/host/omit_canary_hosts/config.cc @@ -1,4 +1,4 @@ -#include "extensions/retry/host/omit_canary_hosts/config.h" +#include "source/extensions/retry/host/omit_canary_hosts/config.h" #include "envoy/registry/registry.h" #include "envoy/upstream/retry.h" diff --git a/source/extensions/retry/host/omit_canary_hosts/config.h b/source/extensions/retry/host/omit_canary_hosts/config.h index 3f493a9bee7c1..8a5bea9a6a3bb 100644 --- a/source/extensions/retry/host/omit_canary_hosts/config.h +++ b/source/extensions/retry/host/omit_canary_hosts/config.h @@ -3,7 +3,7 @@ #include "envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.pb.validate.h" #include "envoy/upstream/retry.h" -#include "extensions/retry/host/omit_canary_hosts/omit_canary_hosts.h" +#include "source/extensions/retry/host/omit_canary_hosts/omit_canary_hosts.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/retry/host/omit_host_metadata/BUILD b/source/extensions/retry/host/omit_host_metadata/BUILD index 92a916dfa28f1..a40fe7d642ae7 100644 --- a/source/extensions/retry/host/omit_host_metadata/BUILD +++ b/source/extensions/retry/host/omit_host_metadata/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( srcs = ["omit_host_metadata.cc"], hdrs = ["omit_host_metadata.h"], deps = [ - "//include/envoy/upstream:retry_interface", + "//envoy/upstream:retry_interface", "//source/common/config:well_known_names", ], ) @@ -25,8 +25,8 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":omit_host_metadata_predicate_lib", - "//include/envoy/registry", - "//include/envoy/upstream:retry_interface", + "//envoy/registry", + "//envoy/upstream:retry_interface", "//source/common/protobuf", "@envoy_api//envoy/extensions/retry/host/omit_host_metadata/v3:pkg_cc_proto", ], diff --git a/source/extensions/retry/host/omit_host_metadata/config.cc b/source/extensions/retry/host/omit_host_metadata/config.cc index 035fe69173a15..689c4628ad073 100644 --- a/source/extensions/retry/host/omit_host_metadata/config.cc +++ b/source/extensions/retry/host/omit_host_metadata/config.cc @@ -1,10 +1,10 @@ -#include "extensions/retry/host/omit_host_metadata/config.h" +#include "source/extensions/retry/host/omit_host_metadata/config.h" #include "envoy/extensions/retry/host/omit_host_metadata/v3/omit_host_metadata_config.pb.h" #include "envoy/registry/registry.h" #include "envoy/upstream/retry.h" -#include "common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/message_validator_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/retry/host/omit_host_metadata/config.h b/source/extensions/retry/host/omit_host_metadata/config.h index 85cb0734692d3..c7242498e2b52 100644 --- a/source/extensions/retry/host/omit_host_metadata/config.h +++ b/source/extensions/retry/host/omit_host_metadata/config.h @@ -4,7 +4,7 @@ #include "envoy/extensions/retry/host/omit_host_metadata/v3/omit_host_metadata_config.pb.validate.h" #include "envoy/upstream/retry.h" -#include "extensions/retry/host/omit_host_metadata/omit_host_metadata.h" +#include "source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.cc b/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.cc index 91559571ef2e9..6c6e8b6481fb2 100644 --- a/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.cc +++ b/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.cc @@ -1,6 +1,6 @@ -#include "extensions/retry/host/omit_host_metadata/omit_host_metadata.h" +#include "source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h" -#include "common/config/metadata.h" +#include "source/common/config/metadata.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h b/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h index e0e1477cd1622..19ec5c659ebee 100644 --- a/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h +++ b/source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h @@ -3,7 +3,7 @@ #include "envoy/upstream/retry.h" #include "envoy/upstream/upstream.h" -#include "common/config/well_known_names.h" +#include "source/common/config/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/retry/host/previous_hosts/BUILD b/source/extensions/retry/host/previous_hosts/BUILD index ae6e4dd7859b3..700069ecd9f83 100644 --- a/source/extensions/retry/host/previous_hosts/BUILD +++ b/source/extensions/retry/host/previous_hosts/BUILD @@ -13,7 +13,7 @@ envoy_cc_library( name = "previous_hosts_predicate_lib", hdrs = ["previous_hosts.h"], deps = [ - "//include/envoy/upstream:retry_interface", + "//envoy/upstream:retry_interface", ], ) @@ -23,8 +23,8 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":previous_hosts_predicate_lib", - "//include/envoy/registry", - "//include/envoy/upstream:retry_interface", + "//envoy/registry", + "//envoy/upstream:retry_interface", "@envoy_api//envoy/extensions/retry/host/previous_hosts/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/retry/host/previous_hosts/config.cc b/source/extensions/retry/host/previous_hosts/config.cc index af216ca4baad2..876f70a02cf05 100644 --- a/source/extensions/retry/host/previous_hosts/config.cc +++ b/source/extensions/retry/host/previous_hosts/config.cc @@ -1,4 +1,4 @@ -#include "extensions/retry/host/previous_hosts/config.h" +#include "source/extensions/retry/host/previous_hosts/config.h" #include "envoy/registry/registry.h" #include "envoy/upstream/retry.h" diff --git a/source/extensions/retry/host/previous_hosts/config.h b/source/extensions/retry/host/previous_hosts/config.h index 1622242b11021..b57dc57328477 100644 --- a/source/extensions/retry/host/previous_hosts/config.h +++ b/source/extensions/retry/host/previous_hosts/config.h @@ -3,7 +3,7 @@ #include "envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.pb.validate.h" #include "envoy/upstream/retry.h" -#include "extensions/retry/host/previous_hosts/previous_hosts.h" +#include "source/extensions/retry/host/previous_hosts/previous_hosts.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/retry/priority/previous_priorities/BUILD b/source/extensions/retry/priority/previous_priorities/BUILD index 9867c5903fe62..0df95fe8f405d 100644 --- a/source/extensions/retry/priority/previous_priorities/BUILD +++ b/source/extensions/retry/priority/previous_priorities/BUILD @@ -14,7 +14,7 @@ envoy_cc_library( srcs = ["previous_priorities.cc"], hdrs = ["previous_priorities.h"], deps = [ - "//include/envoy/upstream:retry_interface", + "//envoy/upstream:retry_interface", "//source/common/upstream:load_balancer_lib", ], ) @@ -25,8 +25,8 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":previous_priorities_lib", - "//include/envoy/registry", - "//include/envoy/upstream:retry_interface", + "//envoy/registry", + "//envoy/upstream:retry_interface", "//source/common/protobuf", "@envoy_api//envoy/extensions/retry/priority/previous_priorities/v3:pkg_cc_proto", ], diff --git a/source/extensions/retry/priority/previous_priorities/config.cc b/source/extensions/retry/priority/previous_priorities/config.cc index 39756f51ff86f..7d8e16eb2b073 100644 --- a/source/extensions/retry/priority/previous_priorities/config.cc +++ b/source/extensions/retry/priority/previous_priorities/config.cc @@ -1,4 +1,4 @@ -#include "extensions/retry/priority/previous_priorities/config.h" +#include "source/extensions/retry/priority/previous_priorities/config.h" #include "envoy/extensions/retry/priority/previous_priorities/v3/previous_priorities_config.pb.h" #include "envoy/extensions/retry/priority/previous_priorities/v3/previous_priorities_config.pb.validate.h" diff --git a/source/extensions/retry/priority/previous_priorities/config.h b/source/extensions/retry/priority/previous_priorities/config.h index e6c64b94ebf79..b2c47e4f864d7 100644 --- a/source/extensions/retry/priority/previous_priorities/config.h +++ b/source/extensions/retry/priority/previous_priorities/config.h @@ -3,9 +3,8 @@ #include "envoy/extensions/retry/priority/previous_priorities/v3/previous_priorities_config.pb.h" #include "envoy/upstream/retry.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/retry/priority/previous_priorities/previous_priorities.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/retry/priority/previous_priorities/previous_priorities.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/retry/priority/previous_priorities/previous_priorities.cc b/source/extensions/retry/priority/previous_priorities/previous_priorities.cc index e01028e7fc3b2..5599cb66d7155 100644 --- a/source/extensions/retry/priority/previous_priorities/previous_priorities.cc +++ b/source/extensions/retry/priority/previous_priorities/previous_priorities.cc @@ -1,4 +1,4 @@ -#include "extensions/retry/priority/previous_priorities/previous_priorities.h" +#include "source/extensions/retry/priority/previous_priorities/previous_priorities.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/retry/priority/previous_priorities/previous_priorities.h b/source/extensions/retry/priority/previous_priorities/previous_priorities.h index f626f664a04ca..5cceb5f8fbae8 100644 --- a/source/extensions/retry/priority/previous_priorities/previous_priorities.h +++ b/source/extensions/retry/priority/previous_priorities/previous_priorities.h @@ -2,7 +2,7 @@ #include "envoy/upstream/retry.h" -#include "common/upstream/load_balancer_impl.h" +#include "source/common/upstream/load_balancer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/common/statsd/BUILD b/source/extensions/stat_sinks/common/statsd/BUILD index 5e3d6a771d21e..eb244b17cca61 100644 --- a/source/extensions/stat_sinks/common/statsd/BUILD +++ b/source/extensions/stat_sinks/common/statsd/BUILD @@ -13,12 +13,12 @@ envoy_cc_library( srcs = ["statsd.cc"], hdrs = ["statsd.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/event:dispatcher_interface", + "//envoy/local_info:local_info_interface", + "//envoy/network:connection_interface", + "//envoy/stats:stats_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:utility_lib", diff --git a/source/extensions/stat_sinks/common/statsd/statsd.cc b/source/extensions/stat_sinks/common/statsd/statsd.cc index ae37b96f0548c..07b1a5f0fe1f5 100644 --- a/source/extensions/stat_sinks/common/statsd/statsd.cc +++ b/source/extensions/stat_sinks/common/statsd/statsd.cc @@ -1,4 +1,4 @@ -#include "extensions/stat_sinks/common/statsd/statsd.h" +#include "source/extensions/stat_sinks/common/statsd/statsd.h" #include #include @@ -11,15 +11,15 @@ #include "envoy/stats/scope.h" #include "envoy/upstream/cluster_manager.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/config/utility.h" -#include "common/network/socket_interface.h" -#include "common/network/utility.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/config/utility.h" +#include "source/common/network/socket_interface.h" +#include "source/common/network/utility.h" +#include "source/common/stats/symbol_table_impl.h" #include "absl/strings/str_join.h" diff --git a/source/extensions/stat_sinks/common/statsd/statsd.h b/source/extensions/stat_sinks/common/statsd/statsd.h index 6abc53bc06611..e93c5aa1c9b86 100644 --- a/source/extensions/stat_sinks/common/statsd/statsd.h +++ b/source/extensions/stat_sinks/common/statsd/statsd.h @@ -12,9 +12,9 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/macros.h" -#include "common/network/io_socket_handle_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/macros.h" +#include "source/common/network/io_socket_handle_impl.h" #include "absl/types/optional.h" diff --git a/source/extensions/stat_sinks/dog_statsd/BUILD b/source/extensions/stat_sinks/dog_statsd/BUILD index 7105afc19f24d..ce75b191dedde 100644 --- a/source/extensions/stat_sinks/dog_statsd/BUILD +++ b/source/extensions/stat_sinks/dog_statsd/BUILD @@ -16,7 +16,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/network:address_lib", "//source/common/network:resolver_lib", "//source/extensions/stat_sinks:well_known_names", diff --git a/source/extensions/stat_sinks/dog_statsd/config.cc b/source/extensions/stat_sinks/dog_statsd/config.cc index 985eb3e255b05..e31ac22f68e12 100644 --- a/source/extensions/stat_sinks/dog_statsd/config.cc +++ b/source/extensions/stat_sinks/dog_statsd/config.cc @@ -1,4 +1,4 @@ -#include "extensions/stat_sinks/dog_statsd/config.h" +#include "source/extensions/stat_sinks/dog_statsd/config.h" #include @@ -6,10 +6,9 @@ #include "envoy/config/metrics/v3/stats.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/network/resolver_impl.h" - -#include "extensions/stat_sinks/common/statsd/statsd.h" -#include "extensions/stat_sinks/well_known_names.h" +#include "source/common/network/resolver_impl.h" +#include "source/extensions/stat_sinks/common/statsd/statsd.h" +#include "source/extensions/stat_sinks/well_known_names.h" #include "absl/types/optional.h" diff --git a/source/extensions/stat_sinks/dog_statsd/config.h b/source/extensions/stat_sinks/dog_statsd/config.h index 037dd4476eff4..69806524bbe6a 100644 --- a/source/extensions/stat_sinks/dog_statsd/config.h +++ b/source/extensions/stat_sinks/dog_statsd/config.h @@ -2,7 +2,7 @@ #include "envoy/server/instance.h" -#include "server/configuration_impl.h" +#include "source/server/configuration_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/hystrix/BUILD b/source/extensions/stat_sinks/hystrix/BUILD index 58fa5ed5ea4b4..3908e49d32724 100644 --- a/source/extensions/stat_sinks/hystrix/BUILD +++ b/source/extensions/stat_sinks/hystrix/BUILD @@ -17,7 +17,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":hystrix_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/common/network:address_lib", "//source/common/network:resolver_lib", "//source/extensions/stat_sinks:well_known_names", @@ -31,9 +31,9 @@ envoy_cc_library( srcs = ["hystrix.cc"], hdrs = ["hystrix.h"], deps = [ - "//include/envoy/server:admin_interface", - "//include/envoy/server:instance_interface", - "//include/envoy/stats:stats_interface", + "//envoy/server:admin_interface", + "//envoy/server:instance_interface", + "//envoy/stats:stats_interface", "//source/common/buffer:buffer_lib", "//source/common/common:logger_lib", "//source/common/config:well_known_names", diff --git a/source/extensions/stat_sinks/hystrix/config.cc b/source/extensions/stat_sinks/hystrix/config.cc index 4997231b8be89..b9ae021fb9af3 100644 --- a/source/extensions/stat_sinks/hystrix/config.cc +++ b/source/extensions/stat_sinks/hystrix/config.cc @@ -1,4 +1,4 @@ -#include "extensions/stat_sinks/hystrix/config.h" +#include "source/extensions/stat_sinks/hystrix/config.h" #include @@ -6,10 +6,9 @@ #include "envoy/config/metrics/v3/stats.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/network/resolver_impl.h" - -#include "extensions/stat_sinks/hystrix/hystrix.h" -#include "extensions/stat_sinks/well_known_names.h" +#include "source/common/network/resolver_impl.h" +#include "source/extensions/stat_sinks/hystrix/hystrix.h" +#include "source/extensions/stat_sinks/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/hystrix/config.h b/source/extensions/stat_sinks/hystrix/config.h index cff7ede28a177..1bf144323381b 100644 --- a/source/extensions/stat_sinks/hystrix/config.h +++ b/source/extensions/stat_sinks/hystrix/config.h @@ -4,7 +4,7 @@ #include "envoy/server/instance.h" -#include "server/configuration_impl.h" +#include "source/server/configuration_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/hystrix/hystrix.cc b/source/extensions/stat_sinks/hystrix/hystrix.cc index dae271c85d0e0..57a22f7e63a7e 100644 --- a/source/extensions/stat_sinks/hystrix/hystrix.cc +++ b/source/extensions/stat_sinks/hystrix/hystrix.cc @@ -1,4 +1,4 @@ -#include "extensions/stat_sinks/hystrix/hystrix.h" +#include "source/extensions/stat_sinks/hystrix/hystrix.h" #include #include @@ -7,11 +7,11 @@ #include "envoy/stats/scope.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" -#include "common/config/well_known_names.h" -#include "common/http/headers.h" -#include "common/stats/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/common/config/well_known_names.h" +#include "source/common/http/headers.h" +#include "source/common/stats/utility.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" diff --git a/source/extensions/stat_sinks/hystrix/hystrix.h b/source/extensions/stat_sinks/hystrix/hystrix.h index 796e72d1f97a5..97c5b2b2e7f54 100644 --- a/source/extensions/stat_sinks/hystrix/hystrix.h +++ b/source/extensions/stat_sinks/hystrix/hystrix.h @@ -9,7 +9,7 @@ #include "envoy/stats/histogram.h" #include "envoy/stats/sink.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/metrics_service/BUILD b/source/extensions/stat_sinks/metrics_service/BUILD index 9b95a7760ae4e..11ffe31b018a1 100644 --- a/source/extensions/stat_sinks/metrics_service/BUILD +++ b/source/extensions/stat_sinks/metrics_service/BUILD @@ -16,10 +16,10 @@ envoy_cc_library( srcs = ["grpc_metrics_service_impl.cc"], hdrs = ["grpc_metrics_service_impl.h"], deps = [ - "//include/envoy/grpc:async_client_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/singleton:instance_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/grpc:async_client_interface", + "//envoy/local_info:local_info_interface", + "//envoy/singleton:instance_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:assert_lib", "//source/common/grpc:async_client_lib", "@envoy_api//envoy/service/metrics/v3:pkg_cc_proto", @@ -44,7 +44,7 @@ envoy_cc_extension( srcs = ["config.cc"], hdrs = ["config.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/common:assert_lib", "//source/common/config:utility_lib", "//source/extensions/stat_sinks:well_known_names", diff --git a/source/extensions/stat_sinks/metrics_service/config.cc b/source/extensions/stat_sinks/metrics_service/config.cc index a17539df4e6fc..a711335b01f75 100644 --- a/source/extensions/stat_sinks/metrics_service/config.cc +++ b/source/extensions/stat_sinks/metrics_service/config.cc @@ -1,17 +1,16 @@ -#include "extensions/stat_sinks/metrics_service/config.h" +#include "source/extensions/stat_sinks/metrics_service/config.h" #include "envoy/config/metrics/v3/metrics_service.pb.h" #include "envoy/config/metrics/v3/metrics_service.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/common/assert.h" -#include "common/config/utility.h" -#include "common/grpc/async_client_impl.h" -#include "common/network/resolver_impl.h" - -#include "extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.h" -#include "extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h" -#include "extensions/stat_sinks/well_known_names.h" +#include "source/common/common/assert.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/async_client_impl.h" +#include "source/common/network/resolver_impl.h" +#include "source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.h" +#include "source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h" +#include "source/extensions/stat_sinks/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/metrics_service/config.h b/source/extensions/stat_sinks/metrics_service/config.h index f67eeb2cb538e..aff8e19fa2fc6 100644 --- a/source/extensions/stat_sinks/metrics_service/config.h +++ b/source/extensions/stat_sinks/metrics_service/config.h @@ -3,7 +3,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/instance.h" -#include "server/configuration_impl.h" +#include "source/server/configuration_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc b/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc index 16793caef4800..3987969712f28 100644 --- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc +++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.cc @@ -1,12 +1,12 @@ -#include "extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.h" +#include "source/extensions/stat_sinks/metrics_service/grpc_metrics_proto_descriptors.h" #include "envoy/config/metrics/v2/metrics_service.pb.h" #include "envoy/service/metrics/v2/metrics_service.pb.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/config/api_version.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/config/api_version.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc index 14d0d2043bb48..80ba3889bd7f6 100644 --- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc +++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h" +#include "source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h" #include @@ -9,9 +9,9 @@ #include "envoy/stats/stats.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/assert.h" -#include "common/common/utility.h" -#include "common/config/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/common/config/utility.h" namespace Envoy { namespace Extensions { @@ -59,19 +59,19 @@ MetricsPtr MetricsFlusher::flush(Stats::MetricSnapshot& snapshot) const { snapshot.snapshotTime().time_since_epoch()) .count(); for (const auto& counter : snapshot.counters()) { - if (counter.counter_.get().used()) { + if (predicate_(counter.counter_.get())) { flushCounter(*metrics->Add(), counter, snapshot_time_ms); } } for (const auto& gauge : snapshot.gauges()) { - if (gauge.get().used()) { + if (predicate_(gauge)) { flushGauge(*metrics->Add(), gauge.get(), snapshot_time_ms); } } for (const auto& histogram : snapshot.histograms()) { - if (histogram.get().used()) { + if (predicate_(histogram.get())) { flushHistogram(*metrics->Add(), *metrics->Add(), histogram.get(), snapshot_time_ms); } } diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h index 7baef22c5bc07..e2b74d61cbc41 100644 --- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h +++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h @@ -12,8 +12,8 @@ #include "envoy/stats/stats.h" #include "envoy/upstream/cluster_manager.h" -#include "common/buffer/buffer_impl.h" -#include "common/grpc/typed_async_client.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/grpc/typed_async_client.h" namespace Envoy { namespace Extensions { @@ -82,8 +82,12 @@ using GrpcMetricsStreamerImplPtr = std::unique_ptr; class MetricsFlusher { public: - MetricsFlusher(bool report_counters_as_deltas, bool emit_labels) - : report_counters_as_deltas_(report_counters_as_deltas), emit_labels_(emit_labels) {} + MetricsFlusher( + bool report_counters_as_deltas, bool emit_labels, + std::function predicate = + [](const auto& metric) { return metric.used(); }) + : report_counters_as_deltas_(report_counters_as_deltas), emit_labels_(emit_labels), + predicate_(predicate) {} MetricsPtr flush(Stats::MetricSnapshot& snapshot) const; @@ -105,6 +109,7 @@ class MetricsFlusher { const bool report_counters_as_deltas_; const bool emit_labels_; + const std::function predicate_; }; /** diff --git a/source/extensions/stat_sinks/statsd/BUILD b/source/extensions/stat_sinks/statsd/BUILD index cdfaddf114db5..8ac0182eba9dd 100644 --- a/source/extensions/stat_sinks/statsd/BUILD +++ b/source/extensions/stat_sinks/statsd/BUILD @@ -16,7 +16,7 @@ envoy_cc_extension( hdrs = ["config.h"], # Legacy test use. TODO(#9953) clean up. deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/network:address_lib", "//source/common/network:resolver_lib", "//source/extensions/stat_sinks:well_known_names", diff --git a/source/extensions/stat_sinks/statsd/config.cc b/source/extensions/stat_sinks/statsd/config.cc index 3cbea7f511a26..e9656bfdb8e01 100644 --- a/source/extensions/stat_sinks/statsd/config.cc +++ b/source/extensions/stat_sinks/statsd/config.cc @@ -1,4 +1,4 @@ -#include "extensions/stat_sinks/statsd/config.h" +#include "source/extensions/stat_sinks/statsd/config.h" #include @@ -6,10 +6,9 @@ #include "envoy/config/metrics/v3/stats.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/network/resolver_impl.h" - -#include "extensions/stat_sinks/common/statsd/statsd.h" -#include "extensions/stat_sinks/well_known_names.h" +#include "source/common/network/resolver_impl.h" +#include "source/extensions/stat_sinks/common/statsd/statsd.h" +#include "source/extensions/stat_sinks/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/statsd/config.h b/source/extensions/stat_sinks/statsd/config.h index 3a709715b2bdb..dbce694b7a79c 100644 --- a/source/extensions/stat_sinks/statsd/config.h +++ b/source/extensions/stat_sinks/statsd/config.h @@ -2,7 +2,7 @@ #include "envoy/server/instance.h" -#include "server/configuration_impl.h" +#include "source/server/configuration_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/wasm/BUILD b/source/extensions/stat_sinks/wasm/BUILD index e8ee99ab1f29b..1747789d6c7a0 100644 --- a/source/extensions/stat_sinks/wasm/BUILD +++ b/source/extensions/stat_sinks/wasm/BUILD @@ -17,9 +17,9 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":wasm_stat_sink_lib", - "//include/envoy/registry", - "//include/envoy/server:factory_context_interface", - "//include/envoy/server:instance_interface", + "//envoy/registry", + "//envoy/server:factory_context_interface", + "//envoy/server:instance_interface", "//source/extensions/common/wasm:wasm_lib", "//source/extensions/stat_sinks:well_known_names", "//source/server:configuration_lib", @@ -31,7 +31,7 @@ envoy_cc_library( name = "wasm_stat_sink_lib", hdrs = ["wasm_stat_sink_impl.h"], deps = [ - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", "//source/extensions/common/wasm:wasm_lib", "@envoy_api//envoy/extensions/filters/network/wasm/v3:pkg_cc_proto", ], diff --git a/source/extensions/stat_sinks/wasm/config.cc b/source/extensions/stat_sinks/wasm/config.cc index edc89aa62a685..8e1ffd9274d47 100644 --- a/source/extensions/stat_sinks/wasm/config.cc +++ b/source/extensions/stat_sinks/wasm/config.cc @@ -1,4 +1,4 @@ -#include "extensions/stat_sinks/wasm/config.h" +#include "source/extensions/stat_sinks/wasm/config.h" #include @@ -6,9 +6,9 @@ #include "envoy/registry/registry.h" #include "envoy/server/factory_context.h" -#include "extensions/common/wasm/wasm.h" -#include "extensions/stat_sinks/wasm/wasm_stat_sink_impl.h" -#include "extensions/stat_sinks/well_known_names.h" +#include "source/extensions/common/wasm/wasm.h" +#include "source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h" +#include "source/extensions/stat_sinks/well_known_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/wasm/config.h b/source/extensions/stat_sinks/wasm/config.h index 4fbd3d72937a7..8887e7b6ab45d 100644 --- a/source/extensions/stat_sinks/wasm/config.h +++ b/source/extensions/stat_sinks/wasm/config.h @@ -5,9 +5,8 @@ #include "envoy/server/factory_context.h" #include "envoy/server/instance.h" -#include "common/config/datasource.h" - -#include "server/configuration_impl.h" +#include "source/common/config/datasource.h" +#include "source/server/configuration_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h b/source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h index ce3eea40dcd6d..e3099b85874e2 100644 --- a/source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h +++ b/source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h @@ -5,7 +5,7 @@ #include "envoy/extensions/filters/network/wasm/v3/wasm.pb.validate.h" #include "envoy/stats/sink.h" -#include "extensions/common/wasm/wasm.h" +#include "source/extensions/common/wasm/wasm.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/stat_sinks/well_known_names.h b/source/extensions/stat_sinks/well_known_names.h index a1f5c7965d03c..a9d663a994a90 100644 --- a/source/extensions/stat_sinks/well_known_names.h +++ b/source/extensions/stat_sinks/well_known_names.h @@ -2,7 +2,7 @@ #include -#include "common/singleton/const_singleton.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/common/BUILD b/source/extensions/tracers/common/BUILD index 450aef98b536f..89e447c456fc6 100644 --- a/source/extensions/tracers/common/BUILD +++ b/source/extensions/tracers/common/BUILD @@ -12,7 +12,7 @@ envoy_cc_library( name = "factory_base_lib", hdrs = ["factory_base.h"], deps = [ - "//include/envoy/server:tracer_config_interface", + "//envoy/server:tracer_config_interface", "//source/common/config:utility_lib", ], ) diff --git a/source/extensions/tracers/common/ot/BUILD b/source/extensions/tracers/common/ot/BUILD index c8b386d0c3c87..c07fd828a0d75 100644 --- a/source/extensions/tracers/common/ot/BUILD +++ b/source/extensions/tracers/common/ot/BUILD @@ -18,10 +18,10 @@ envoy_cc_library( ], external_deps = ["opentracing"], deps = [ - "//include/envoy/runtime:runtime_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/tracing:trace_driver_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/runtime:runtime_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/tracing:trace_driver_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:base64_lib", "//source/common/common:empty_string", "//source/common/http:header_map_lib", diff --git a/source/extensions/tracers/common/ot/opentracing_driver_impl.cc b/source/extensions/tracers/common/ot/opentracing_driver_impl.cc index 92a6b07d634f6..aeeb94a489af2 100644 --- a/source/extensions/tracers/common/ot/opentracing_driver_impl.cc +++ b/source/extensions/tracers/common/ot/opentracing_driver_impl.cc @@ -1,15 +1,15 @@ -#include "extensions/tracers/common/ot/opentracing_driver_impl.h" +#include "source/extensions/tracers/common/ot/opentracing_driver_impl.h" #include #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/base64.h" -#include "common/common/utility.h" -#include "common/http/header_map_impl.h" -#include "common/tracing/common_values.h" -#include "common/tracing/null_span_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/base64.h" +#include "source/common/common/utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/tracing/common_values.h" +#include "source/common/tracing/null_span_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/common/ot/opentracing_driver_impl.h b/source/extensions/tracers/common/ot/opentracing_driver_impl.h index d214d967a287e..582e31ed31d54 100644 --- a/source/extensions/tracers/common/ot/opentracing_driver_impl.h +++ b/source/extensions/tracers/common/ot/opentracing_driver_impl.h @@ -5,9 +5,9 @@ #include "envoy/stats/scope.h" #include "envoy/tracing/trace_driver.h" -#include "common/common/empty_string.h" -#include "common/common/logger.h" -#include "common/singleton/const_singleton.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/logger.h" +#include "source/common/singleton/const_singleton.h" #include "opentracing/ext/tags.h" #include "opentracing/tracer.h" diff --git a/source/extensions/tracers/datadog/config.cc b/source/extensions/tracers/datadog/config.cc index cdfcafdddf38f..562df5f645b15 100644 --- a/source/extensions/tracers/datadog/config.cc +++ b/source/extensions/tracers/datadog/config.cc @@ -1,12 +1,11 @@ -#include "extensions/tracers/datadog/config.h" +#include "source/extensions/tracers/datadog/config.h" #include "envoy/config/trace/v3/datadog.pb.h" #include "envoy/config/trace/v3/datadog.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/common/utility.h" - -#include "extensions/tracers/datadog/datadog_tracer_impl.h" +#include "source/common/common/utility.h" +#include "source/extensions/tracers/datadog/datadog_tracer_impl.h" #include "datadog/opentracing.h" diff --git a/source/extensions/tracers/datadog/config.h b/source/extensions/tracers/datadog/config.h index 1808fddff0033..f836916fca63e 100644 --- a/source/extensions/tracers/datadog/config.h +++ b/source/extensions/tracers/datadog/config.h @@ -5,7 +5,7 @@ #include "envoy/config/trace/v3/datadog.pb.h" #include "envoy/config/trace/v3/datadog.pb.validate.h" -#include "extensions/tracers/common/factory_base.h" +#include "source/extensions/tracers/common/factory_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/datadog/datadog_tracer_impl.cc b/source/extensions/tracers/datadog/datadog_tracer_impl.cc index d2806d741ab25..8956afea8351c 100644 --- a/source/extensions/tracers/datadog/datadog_tracer_impl.cc +++ b/source/extensions/tracers/datadog/datadog_tracer_impl.cc @@ -1,14 +1,14 @@ -#include "extensions/tracers/datadog/datadog_tracer_impl.h" +#include "source/extensions/tracers/datadog/datadog_tracer_impl.h" #include "envoy/config/trace/v3/datadog.pb.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/config/utility.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/version/version.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/config/utility.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/version/version.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/datadog/datadog_tracer_impl.h b/source/extensions/tracers/datadog/datadog_tracer_impl.h index 5649c3ef5594b..57276a103c3b7 100644 --- a/source/extensions/tracers/datadog/datadog_tracer_impl.h +++ b/source/extensions/tracers/datadog/datadog_tracer_impl.h @@ -8,12 +8,11 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" -#include "common/http/async_client_utility.h" -#include "common/http/header_map_impl.h" -#include "common/json/json_loader.h" -#include "common/upstream/cluster_update_tracker.h" - -#include "extensions/tracers/common/ot/opentracing_driver_impl.h" +#include "source/common/http/async_client_utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/json/json_loader.h" +#include "source/common/upstream/cluster_update_tracker.h" +#include "source/extensions/tracers/common/ot/opentracing_driver_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/dynamic_ot/config.cc b/source/extensions/tracers/dynamic_ot/config.cc index aabcbba91bbc2..bcecdc2d1db16 100644 --- a/source/extensions/tracers/dynamic_ot/config.cc +++ b/source/extensions/tracers/dynamic_ot/config.cc @@ -1,12 +1,11 @@ -#include "extensions/tracers/dynamic_ot/config.h" +#include "source/extensions/tracers/dynamic_ot/config.h" #include "envoy/config/trace/v3/dynamic_ot.pb.h" #include "envoy/config/trace/v3/dynamic_ot.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/common/utility.h" - -#include "extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h" +#include "source/common/common/utility.h" +#include "source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/dynamic_ot/config.h b/source/extensions/tracers/dynamic_ot/config.h index 4b9a761a262ea..61be3be55c27f 100644 --- a/source/extensions/tracers/dynamic_ot/config.h +++ b/source/extensions/tracers/dynamic_ot/config.h @@ -3,7 +3,7 @@ #include "envoy/config/trace/v3/dynamic_ot.pb.h" #include "envoy/config/trace/v3/dynamic_ot.pb.validate.h" -#include "extensions/tracers/common/factory_base.h" +#include "source/extensions/tracers/common/factory_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.cc b/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.cc index 10b1a0e79cf35..583fbfd6bb6fe 100644 --- a/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.cc +++ b/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.cc @@ -1,6 +1,6 @@ -#include "extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h" +#include "source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h b/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h index 668e3f99ad739..712283919b365 100644 --- a/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h +++ b/source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h @@ -4,7 +4,7 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" -#include "extensions/tracers/common/ot/opentracing_driver_impl.h" +#include "source/extensions/tracers/common/ot/opentracing_driver_impl.h" #include "opentracing/dynamic_load.h" diff --git a/source/extensions/tracers/lightstep/config.cc b/source/extensions/tracers/lightstep/config.cc index 49aa98ccaf4a5..3e1c029614a9c 100644 --- a/source/extensions/tracers/lightstep/config.cc +++ b/source/extensions/tracers/lightstep/config.cc @@ -1,13 +1,12 @@ -#include "extensions/tracers/lightstep/config.h" +#include "source/extensions/tracers/lightstep/config.h" #include "envoy/config/trace/v3/lightstep.pb.h" #include "envoy/config/trace/v3/lightstep.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/common/utility.h" -#include "common/config/datasource.h" - -#include "extensions/tracers/lightstep/lightstep_tracer_impl.h" +#include "source/common/common/utility.h" +#include "source/common/config/datasource.h" +#include "source/extensions/tracers/lightstep/lightstep_tracer_impl.h" #include "lightstep/tracer.h" diff --git a/source/extensions/tracers/lightstep/config.h b/source/extensions/tracers/lightstep/config.h index 33cec8da3d605..9f29aa4860cc5 100644 --- a/source/extensions/tracers/lightstep/config.h +++ b/source/extensions/tracers/lightstep/config.h @@ -3,7 +3,7 @@ #include "envoy/config/trace/v3/lightstep.pb.h" #include "envoy/config/trace/v3/lightstep.pb.validate.h" -#include "extensions/tracers/common/factory_base.h" +#include "source/extensions/tracers/common/factory_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc b/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc index 952d24e4284fc..64b07a562963c 100644 --- a/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc +++ b/source/extensions/tracers/lightstep/lightstep_tracer_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/tracers/lightstep/lightstep_tracer_impl.h" +#include "source/extensions/tracers/lightstep/lightstep_tracer_impl.h" #include #include @@ -7,14 +7,14 @@ #include "envoy/config/trace/v3/lightstep.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/common/base64.h" -#include "common/common/fmt.h" -#include "common/config/utility.h" -#include "common/grpc/common.h" -#include "common/http/message_impl.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/common/base64.h" +#include "source/common/common/fmt.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/http/message_impl.h" +#include "source/common/tracing/http_tracer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/lightstep/lightstep_tracer_impl.h b/source/extensions/tracers/lightstep/lightstep_tracer_impl.h index 10820e4a3601e..6c7c131245a7f 100644 --- a/source/extensions/tracers/lightstep/lightstep_tracer_impl.h +++ b/source/extensions/tracers/lightstep/lightstep_tracer_impl.h @@ -9,16 +9,15 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" -#include "common/buffer/buffer_impl.h" -#include "common/grpc/context_impl.h" -#include "common/http/header_map_impl.h" -#include "common/http/message_impl.h" -#include "common/json/json_loader.h" -#include "common/protobuf/protobuf.h" -#include "common/stats/symbol_table_impl.h" -#include "common/upstream/cluster_update_tracker.h" - -#include "extensions/tracers/common/ot/opentracing_driver_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/grpc/context_impl.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/message_impl.h" +#include "source/common/json/json_loader.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/upstream/cluster_update_tracker.h" +#include "source/extensions/tracers/common/ot/opentracing_driver_impl.h" #include "lightstep/tracer.h" #include "lightstep/transporter.h" diff --git a/source/extensions/tracers/opencensus/config.cc b/source/extensions/tracers/opencensus/config.cc index ae6756e9bbfff..bf33e76de2480 100644 --- a/source/extensions/tracers/opencensus/config.cc +++ b/source/extensions/tracers/opencensus/config.cc @@ -1,10 +1,10 @@ -#include "extensions/tracers/opencensus/config.h" +#include "source/extensions/tracers/opencensus/config.h" #include "envoy/config/trace/v3/opencensus.pb.h" #include "envoy/config/trace/v3/opencensus.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/tracers/opencensus/opencensus_tracer_impl.h" +#include "source/extensions/tracers/opencensus/opencensus_tracer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/opencensus/config.h b/source/extensions/tracers/opencensus/config.h index 5b853f9b9e1dd..da3d534e36256 100644 --- a/source/extensions/tracers/opencensus/config.h +++ b/source/extensions/tracers/opencensus/config.h @@ -5,7 +5,7 @@ #include "envoy/config/trace/v3/opencensus.pb.h" #include "envoy/config/trace/v3/opencensus.pb.validate.h" -#include "extensions/tracers/common/factory_base.h" +#include "source/extensions/tracers/common/factory_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc b/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc index ee0fc31e53ee6..82ea4b3c39083 100644 --- a/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc +++ b/source/extensions/tracers/opencensus/opencensus_tracer_impl.cc @@ -1,12 +1,12 @@ -#include "extensions/tracers/opencensus/opencensus_tracer_impl.h" +#include "source/extensions/tracers/opencensus/opencensus_tracer_impl.h" #include #include "envoy/config/trace/v3/opencensus.pb.h" #include "envoy/http/header_map.h" -#include "common/common/base64.h" -#include "common/common/empty_string.h" +#include "source/common/common/base64.h" +#include "source/common/common/empty_string.h" #include "absl/strings/str_cat.h" #include "google/devtools/cloudtrace/v2/tracing.grpc.pb.h" @@ -25,7 +25,7 @@ #include "opencensus/trace/trace_params.h" #ifdef ENVOY_GOOGLE_GRPC -#include "common/grpc/google_grpc_utils.h" +#include "source/common/grpc/google_grpc_utils.h" #endif namespace Envoy { diff --git a/source/extensions/tracers/opencensus/opencensus_tracer_impl.h b/source/extensions/tracers/opencensus/opencensus_tracer_impl.h index 3d4cbf7cdae91..ab0c14d1c5efc 100644 --- a/source/extensions/tracers/opencensus/opencensus_tracer_impl.h +++ b/source/extensions/tracers/opencensus/opencensus_tracer_impl.h @@ -5,7 +5,7 @@ #include "envoy/local_info/local_info.h" #include "envoy/tracing/trace_driver.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/skywalking/BUILD b/source/extensions/tracers/skywalking/BUILD index 1265cd752cfaf..a35573f7d0bed 100644 --- a/source/extensions/tracers/skywalking/BUILD +++ b/source/extensions/tracers/skywalking/BUILD @@ -20,7 +20,7 @@ envoy_cc_library( ], deps = [ ":skywalking_stats_lib", - "//include/envoy/grpc:async_client_manager_interface", + "//envoy/grpc:async_client_manager_interface", "//source/common/common:backoff_lib", "//source/common/grpc:async_client_lib", "@envoy_api//envoy/config/trace/v3:pkg_cc_proto", @@ -42,9 +42,9 @@ envoy_cc_library( ], deps = [ ":trace_segment_reporter_lib", - "//include/envoy/common:time_interface", - "//include/envoy/server:tracer_config_interface", - "//include/envoy/tracing:http_tracer_interface", + "//envoy/common:time_interface", + "//envoy/server:tracer_config_interface", + "//envoy/tracing:http_tracer_interface", "//source/common/common:macros", "//source/common/http:header_map_lib", "//source/common/runtime:runtime_lib", @@ -59,7 +59,7 @@ envoy_cc_library( "skywalking_stats.h", ], deps = [ - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_macros", ], ) diff --git a/source/extensions/tracers/skywalking/config.cc b/source/extensions/tracers/skywalking/config.cc index 12e1b43c01579..eca304c41d4c1 100644 --- a/source/extensions/tracers/skywalking/config.cc +++ b/source/extensions/tracers/skywalking/config.cc @@ -1,12 +1,11 @@ -#include "extensions/tracers/skywalking/config.h" +#include "source/extensions/tracers/skywalking/config.h" #include "envoy/config/trace/v3/skywalking.pb.h" #include "envoy/config/trace/v3/skywalking.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/common/utility.h" - -#include "extensions/tracers/skywalking/skywalking_tracer_impl.h" +#include "source/common/common/utility.h" +#include "source/extensions/tracers/skywalking/skywalking_tracer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/skywalking/config.h b/source/extensions/tracers/skywalking/config.h index 0fc1ad8dc9671..26d4fca522ba0 100644 --- a/source/extensions/tracers/skywalking/config.h +++ b/source/extensions/tracers/skywalking/config.h @@ -3,7 +3,7 @@ #include "envoy/config/trace/v3/skywalking.pb.h" #include "envoy/config/trace/v3/skywalking.pb.validate.h" -#include "extensions/tracers/common/factory_base.h" +#include "source/extensions/tracers/common/factory_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/skywalking/skywalking_tracer_impl.cc b/source/extensions/tracers/skywalking/skywalking_tracer_impl.cc index fa40d5469717e..716db5434ee10 100644 --- a/source/extensions/tracers/skywalking/skywalking_tracer_impl.cc +++ b/source/extensions/tracers/skywalking/skywalking_tracer_impl.cc @@ -1,10 +1,10 @@ -#include "extensions/tracers/skywalking/skywalking_tracer_impl.h" +#include "source/extensions/tracers/skywalking/skywalking_tracer_impl.h" #include -#include "common/common/macros.h" -#include "common/common/utility.h" -#include "common/http/path_utility.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/common/http/path_utility.h" #include "cpp2sky/propagation.h" @@ -62,7 +62,8 @@ Tracing::SpanPtr Driver::startSpan(const Tracing::Config& config, } else { auto header_value_string = propagation_header[0]->value().getStringView(); try { - SpanContextPtr span_context = createSpanContext(header_value_string); + SpanContextPtr span_context = + createSpanContext(toStdStringView(header_value_string)); // NOLINT(std::string_view) tracing_context = tracing_context_factory_->create(span_context); } catch (TracerException& e) { ENVOY_LOG(warn, "New SkyWalking Span/Segment cannot be created for error: {}", e.what()); diff --git a/source/extensions/tracers/skywalking/skywalking_tracer_impl.h b/source/extensions/tracers/skywalking/skywalking_tracer_impl.h index a2443f10d2ba8..aeb4f91434fb5 100644 --- a/source/extensions/tracers/skywalking/skywalking_tracer_impl.h +++ b/source/extensions/tracers/skywalking/skywalking_tracer_impl.h @@ -5,10 +5,9 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/tracing/trace_driver.h" +#include "source/extensions/tracers/skywalking/tracer.h" #include "source/tracing_context_impl.h" -#include "extensions/tracers/skywalking/tracer.h" - #include "cpp2sky/exception.h" namespace Envoy { diff --git a/source/extensions/tracers/skywalking/trace_segment_reporter.cc b/source/extensions/tracers/skywalking/trace_segment_reporter.cc index 5d81ac68f240f..27fd24fd2522d 100644 --- a/source/extensions/tracers/skywalking/trace_segment_reporter.cc +++ b/source/extensions/tracers/skywalking/trace_segment_reporter.cc @@ -1,4 +1,4 @@ -#include "extensions/tracers/skywalking/trace_segment_reporter.h" +#include "source/extensions/tracers/skywalking/trace_segment_reporter.h" #include "envoy/http/header_map.h" diff --git a/source/extensions/tracers/skywalking/trace_segment_reporter.h b/source/extensions/tracers/skywalking/trace_segment_reporter.h index a54885a756714..db198d2e0c1d8 100644 --- a/source/extensions/tracers/skywalking/trace_segment_reporter.h +++ b/source/extensions/tracers/skywalking/trace_segment_reporter.h @@ -5,10 +5,9 @@ #include "envoy/config/trace/v3/skywalking.pb.h" #include "envoy/grpc/async_client_manager.h" -#include "common/common/backoff_strategy.h" -#include "common/grpc/async_client_impl.h" - -#include "extensions/tracers/skywalking/skywalking_stats.h" +#include "source/common/common/backoff_strategy.h" +#include "source/common/grpc/async_client_impl.h" +#include "source/extensions/tracers/skywalking/skywalking_stats.h" #include "cpp2sky/tracing_context.h" diff --git a/source/extensions/tracers/skywalking/tracer.cc b/source/extensions/tracers/skywalking/tracer.cc index bcca619fb886c..3f803c4c09657 100644 --- a/source/extensions/tracers/skywalking/tracer.cc +++ b/source/extensions/tracers/skywalking/tracer.cc @@ -1,4 +1,4 @@ -#include "extensions/tracers/skywalking/tracer.h" +#include "source/extensions/tracers/skywalking/tracer.h" #include diff --git a/source/extensions/tracers/skywalking/tracer.h b/source/extensions/tracers/skywalking/tracer.h index 52e2a24fb18d1..d0e1887277c65 100644 --- a/source/extensions/tracers/skywalking/tracer.h +++ b/source/extensions/tracers/skywalking/tracer.h @@ -4,10 +4,9 @@ #include "envoy/tracing/trace_driver.h" -#include "common/tracing/common_values.h" -#include "common/tracing/null_span_impl.h" - -#include "extensions/tracers/skywalking/trace_segment_reporter.h" +#include "source/common/tracing/common_values.h" +#include "source/common/tracing/null_span_impl.h" +#include "source/extensions/tracers/skywalking/trace_segment_reporter.h" #include "cpp2sky/tracing_context.h" #include "cpp2sky/well_known_names.h" diff --git a/source/extensions/tracers/xray/BUILD b/source/extensions/tracers/xray/BUILD index 8048e35897e55..a0824d8ea9bce 100644 --- a/source/extensions/tracers/xray/BUILD +++ b/source/extensions/tracers/xray/BUILD @@ -39,9 +39,9 @@ envoy_cc_library( external_deps = [], deps = [ ":daemon_cc_proto", - "//include/envoy/common:time_interface", - "//include/envoy/server:tracer_config_interface", - "//include/envoy/tracing:trace_driver_interface", + "//envoy/common:time_interface", + "//envoy/server:tracer_config_interface", + "//envoy/tracing:trace_driver_interface", "//source/common/common:hex_lib", "//source/common/common:macros", "//source/common/common:random_generator_lib", diff --git a/source/extensions/tracers/xray/config.cc b/source/extensions/tracers/xray/config.cc index ff9bd156ea7f3..f297c5c7d8417 100644 --- a/source/extensions/tracers/xray/config.cc +++ b/source/extensions/tracers/xray/config.cc @@ -1,4 +1,4 @@ -#include "extensions/tracers/xray/config.h" +#include "source/extensions/tracers/xray/config.h" #include @@ -7,10 +7,9 @@ #include "envoy/config/trace/v3/xray.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/common/utility.h" -#include "common/config/datasource.h" - -#include "extensions/tracers/xray/xray_tracer_impl.h" +#include "source/common/common/utility.h" +#include "source/common/config/datasource.h" +#include "source/extensions/tracers/xray/xray_tracer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/xray/config.h b/source/extensions/tracers/xray/config.h index 00c5b3d5fa8ef..2115608f9eba6 100644 --- a/source/extensions/tracers/xray/config.h +++ b/source/extensions/tracers/xray/config.h @@ -2,9 +2,8 @@ #include "envoy/config/trace/v3/xray.pb.h" -#include "common/common/logger.h" - -#include "extensions/tracers/common/factory_base.h" +#include "source/common/common/logger.h" +#include "source/extensions/tracers/common/factory_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/xray/daemon_broker.cc b/source/extensions/tracers/xray/daemon_broker.cc index 7af0945220fef..2734996be51f8 100644 --- a/source/extensions/tracers/xray/daemon_broker.cc +++ b/source/extensions/tracers/xray/daemon_broker.cc @@ -1,12 +1,11 @@ -#include "extensions/tracers/xray/daemon_broker.h" +#include "source/extensions/tracers/xray/daemon_broker.h" #include "envoy/network/address.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/socket_interface.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" - +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/socket_interface.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" #include "source/extensions/tracers/xray/daemon.pb.h" namespace Envoy { diff --git a/source/extensions/tracers/xray/daemon_broker.h b/source/extensions/tracers/xray/daemon_broker.h index ce261a3c2b79b..35d2e0ee82442 100644 --- a/source/extensions/tracers/xray/daemon_broker.h +++ b/source/extensions/tracers/xray/daemon_broker.h @@ -6,7 +6,7 @@ #include "envoy/common/pure.h" #include "envoy/network/address.h" -#include "common/network/io_socket_handle_impl.h" +#include "source/common/network/io_socket_handle_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/xray/localized_sampling.cc b/source/extensions/tracers/xray/localized_sampling.cc index b16b3929898aa..e56cfc52b3934 100644 --- a/source/extensions/tracers/xray/localized_sampling.cc +++ b/source/extensions/tracers/xray/localized_sampling.cc @@ -1,9 +1,8 @@ -#include "extensions/tracers/xray/localized_sampling.h" +#include "source/extensions/tracers/xray/localized_sampling.h" -#include "common/http/exception.h" -#include "common/protobuf/utility.h" - -#include "extensions/tracers/xray/util.h" +#include "source/common/http/exception.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/tracers/xray/util.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/xray/localized_sampling.h b/source/extensions/tracers/xray/localized_sampling.h index f95a3da8fdd14..dc9cde196047a 100644 --- a/source/extensions/tracers/xray/localized_sampling.h +++ b/source/extensions/tracers/xray/localized_sampling.h @@ -6,11 +6,10 @@ #include "envoy/common/time.h" -#include "common/common/logger.h" -#include "common/common/random_generator.h" - -#include "extensions/tracers/xray/reservoir.h" -#include "extensions/tracers/xray/sampling_strategy.h" +#include "source/common/common/logger.h" +#include "source/common/common/random_generator.h" +#include "source/extensions/tracers/xray/reservoir.h" +#include "source/extensions/tracers/xray/sampling_strategy.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/tracers/xray/reservoir.h b/source/extensions/tracers/xray/reservoir.h index fc8da633c471f..1230354127cf0 100644 --- a/source/extensions/tracers/xray/reservoir.h +++ b/source/extensions/tracers/xray/reservoir.h @@ -4,8 +4,8 @@ #include "envoy/common/time.h" -#include "common/common/lock_guard.h" -#include "common/common/thread.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/thread.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/xray/sampling_strategy.h b/source/extensions/tracers/xray/sampling_strategy.h index 908c28c6414e1..4d744aaef02e4 100644 --- a/source/extensions/tracers/xray/sampling_strategy.h +++ b/source/extensions/tracers/xray/sampling_strategy.h @@ -5,7 +5,7 @@ #include "envoy/common/pure.h" #include "envoy/common/random_generator.h" -#include "common/common/macros.h" +#include "source/common/common/macros.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/tracers/xray/tracer.cc b/source/extensions/tracers/xray/tracer.cc index 684f36b8b5ea3..b7e1f603fcd62 100644 --- a/source/extensions/tracers/xray/tracer.cc +++ b/source/extensions/tracers/xray/tracer.cc @@ -1,4 +1,4 @@ -#include "extensions/tracers/xray/tracer.h" +#include "source/extensions/tracers/xray/tracer.h" #include #include @@ -7,10 +7,9 @@ #include "envoy/http/header_map.h" #include "envoy/network/listener.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/protobuf/utility.h" - +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/protobuf/utility.h" #include "source/extensions/tracers/xray/daemon.pb.validate.h" namespace Envoy { diff --git a/source/extensions/tracers/xray/tracer.h b/source/extensions/tracers/xray/tracer.h index 07c6f04bd2b27..7e252f7cfc295 100644 --- a/source/extensions/tracers/xray/tracer.h +++ b/source/extensions/tracers/xray/tracer.h @@ -7,14 +7,13 @@ #include "envoy/common/time.h" #include "envoy/tracing/http_tracer.h" -#include "common/common/empty_string.h" -#include "common/common/hex.h" -#include "common/common/random_generator.h" -#include "common/protobuf/utility.h" - -#include "extensions/tracers/xray/daemon_broker.h" -#include "extensions/tracers/xray/sampling_strategy.h" -#include "extensions/tracers/xray/xray_configuration.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/hex.h" +#include "source/common/common/random_generator.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/tracers/xray/daemon_broker.h" +#include "source/extensions/tracers/xray/sampling_strategy.h" +#include "source/extensions/tracers/xray/xray_configuration.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/tracers/xray/util.cc b/source/extensions/tracers/xray/util.cc index 65b052d483006..32730fbf6a4b7 100644 --- a/source/extensions/tracers/xray/util.cc +++ b/source/extensions/tracers/xray/util.cc @@ -1,4 +1,4 @@ -#include "extensions/tracers/xray/util.h" +#include "source/extensions/tracers/xray/util.h" #include "absl/strings/ascii.h" diff --git a/source/extensions/tracers/xray/xray_configuration.h b/source/extensions/tracers/xray/xray_configuration.h index 3abcdadd8cd04..104ca39cbc359 100644 --- a/source/extensions/tracers/xray/xray_configuration.h +++ b/source/extensions/tracers/xray/xray_configuration.h @@ -1,7 +1,7 @@ #pragma once #include -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "absl/container/flat_hash_map.h" diff --git a/source/extensions/tracers/xray/xray_tracer_impl.cc b/source/extensions/tracers/xray/xray_tracer_impl.cc index 77e240c783a23..22bba12bf348a 100644 --- a/source/extensions/tracers/xray/xray_tracer_impl.cc +++ b/source/extensions/tracers/xray/xray_tracer_impl.cc @@ -1,11 +1,10 @@ -#include "extensions/tracers/xray/xray_tracer_impl.h" +#include "source/extensions/tracers/xray/xray_tracer_impl.h" -#include "common/common/macros.h" -#include "common/common/utility.h" - -#include "extensions/tracers/xray/localized_sampling.h" -#include "extensions/tracers/xray/tracer.h" -#include "extensions/tracers/xray/xray_configuration.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/extensions/tracers/xray/localized_sampling.h" +#include "source/extensions/tracers/xray/tracer.h" +#include "source/extensions/tracers/xray/xray_configuration.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/xray/xray_tracer_impl.h b/source/extensions/tracers/xray/xray_tracer_impl.h index 8985cc83ccef9..37357dfff8e03 100644 --- a/source/extensions/tracers/xray/xray_tracer_impl.h +++ b/source/extensions/tracers/xray/xray_tracer_impl.h @@ -4,8 +4,8 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/tracing/trace_driver.h" -#include "extensions/tracers/xray/tracer.h" -#include "extensions/tracers/xray/xray_configuration.h" +#include "source/extensions/tracers/xray/tracer.h" +#include "source/extensions/tracers/xray/xray_configuration.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/BUILD b/source/extensions/tracers/zipkin/BUILD index 0c39a41bf535a..e7ee5ee6b0c75 100644 --- a/source/extensions/tracers/zipkin/BUILD +++ b/source/extensions/tracers/zipkin/BUILD @@ -38,13 +38,13 @@ envoy_cc_library( "abseil_optional", ], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/network:address_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/tracing:http_tracer_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/common:time_interface", + "//envoy/local_info:local_info_interface", + "//envoy/network:address_interface", + "//envoy/runtime:runtime_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/tracing:http_tracer_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:enum_to_int", "//source/common/common:hex_lib", "//source/common/common:utility_lib", diff --git a/source/extensions/tracers/zipkin/config.cc b/source/extensions/tracers/zipkin/config.cc index b77ab83f4812d..b79a47a4598b2 100644 --- a/source/extensions/tracers/zipkin/config.cc +++ b/source/extensions/tracers/zipkin/config.cc @@ -1,12 +1,11 @@ -#include "extensions/tracers/zipkin/config.h" +#include "source/extensions/tracers/zipkin/config.h" #include "envoy/config/trace/v3/zipkin.pb.h" #include "envoy/config/trace/v3/zipkin.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/common/utility.h" - -#include "extensions/tracers/zipkin/zipkin_tracer_impl.h" +#include "source/common/common/utility.h" +#include "source/extensions/tracers/zipkin/zipkin_tracer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/config.h b/source/extensions/tracers/zipkin/config.h index 8c879e64f5243..8c32693e1a256 100644 --- a/source/extensions/tracers/zipkin/config.h +++ b/source/extensions/tracers/zipkin/config.h @@ -3,7 +3,7 @@ #include "envoy/config/trace/v3/zipkin.pb.h" #include "envoy/config/trace/v3/zipkin.pb.validate.h" -#include "extensions/tracers/common/factory_base.h" +#include "source/extensions/tracers/common/factory_base.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/span_buffer.cc b/source/extensions/tracers/zipkin/span_buffer.cc index df1682e7881ae..e5ab41876cca8 100644 --- a/source/extensions/tracers/zipkin/span_buffer.cc +++ b/source/extensions/tracers/zipkin/span_buffer.cc @@ -1,12 +1,11 @@ -#include "extensions/tracers/zipkin/span_buffer.h" +#include "source/extensions/tracers/zipkin/span_buffer.h" #include "envoy/config/trace/v3/zipkin.pb.h" -#include "common/protobuf/utility.h" - -#include "extensions/tracers/zipkin/util.h" -#include "extensions/tracers/zipkin/zipkin_core_constants.h" -#include "extensions/tracers/zipkin/zipkin_json_field_names.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/tracers/zipkin/util.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/extensions/tracers/zipkin/zipkin_json_field_names.h" #include "absl/strings/str_join.h" #include "absl/strings/str_replace.h" diff --git a/source/extensions/tracers/zipkin/span_buffer.h b/source/extensions/tracers/zipkin/span_buffer.h index a2267c7b724ff..c1667c609078a 100644 --- a/source/extensions/tracers/zipkin/span_buffer.h +++ b/source/extensions/tracers/zipkin/span_buffer.h @@ -2,10 +2,9 @@ #include "envoy/config/trace/v3/zipkin.pb.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/tracers/zipkin/tracer_interface.h" -#include "extensions/tracers/zipkin/zipkin_core_types.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/tracers/zipkin/tracer_interface.h" +#include "source/extensions/tracers/zipkin/zipkin_core_types.h" #include "zipkin.pb.h" diff --git a/source/extensions/tracers/zipkin/span_context.cc b/source/extensions/tracers/zipkin/span_context.cc index 20841648992b1..aac074542fbbb 100644 --- a/source/extensions/tracers/zipkin/span_context.cc +++ b/source/extensions/tracers/zipkin/span_context.cc @@ -1,9 +1,8 @@ -#include "extensions/tracers/zipkin/span_context.h" +#include "source/extensions/tracers/zipkin/span_context.h" -#include "common/common/macros.h" -#include "common/common/utility.h" - -#include "extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/span_context.h b/source/extensions/tracers/zipkin/span_context.h index c06381272cbe7..615c81e1d0e4a 100644 --- a/source/extensions/tracers/zipkin/span_context.h +++ b/source/extensions/tracers/zipkin/span_context.h @@ -2,9 +2,9 @@ #include -#include "extensions/tracers/zipkin/util.h" -#include "extensions/tracers/zipkin/zipkin_core_constants.h" -#include "extensions/tracers/zipkin/zipkin_core_types.h" +#include "source/extensions/tracers/zipkin/util.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/extensions/tracers/zipkin/zipkin_core_types.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/span_context_extractor.cc b/source/extensions/tracers/zipkin/span_context_extractor.cc index a9b67503ffd19..a452636587b94 100644 --- a/source/extensions/tracers/zipkin/span_context_extractor.cc +++ b/source/extensions/tracers/zipkin/span_context_extractor.cc @@ -1,10 +1,9 @@ -#include "extensions/tracers/zipkin/span_context_extractor.h" +#include "source/extensions/tracers/zipkin/span_context_extractor.h" -#include "common/common/assert.h" -#include "common/common/utility.h" - -#include "extensions/tracers/zipkin/span_context.h" -#include "extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/extensions/tracers/zipkin/span_context.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/span_context_extractor.h b/source/extensions/tracers/zipkin/span_context_extractor.h index 425a0d59973cc..b364d6e528c38 100644 --- a/source/extensions/tracers/zipkin/span_context_extractor.h +++ b/source/extensions/tracers/zipkin/span_context_extractor.h @@ -3,7 +3,7 @@ #include "envoy/common/exception.h" #include "envoy/tracing/http_tracer.h" -#include "common/http/header_map_impl.h" +#include "source/common/http/header_map_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/tracer.cc b/source/extensions/tracers/zipkin/tracer.cc index 90f1f1d72f495..cb156d36b6d50 100644 --- a/source/extensions/tracers/zipkin/tracer.cc +++ b/source/extensions/tracers/zipkin/tracer.cc @@ -1,12 +1,11 @@ -#include "extensions/tracers/zipkin/tracer.h" +#include "source/extensions/tracers/zipkin/tracer.h" #include -#include "common/common/utility.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/tracers/zipkin/util.h" -#include "extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/common/common/utility.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/tracers/zipkin/util.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/tracer.h b/source/extensions/tracers/zipkin/tracer.h index 109982af7ff08..e29c5446f9aa7 100644 --- a/source/extensions/tracers/zipkin/tracer.h +++ b/source/extensions/tracers/zipkin/tracer.h @@ -5,10 +5,10 @@ #include "envoy/common/time.h" #include "envoy/tracing/http_tracer.h" -#include "extensions/tracers/zipkin/span_context.h" -#include "extensions/tracers/zipkin/tracer_interface.h" -#include "extensions/tracers/zipkin/zipkin_core_constants.h" -#include "extensions/tracers/zipkin/zipkin_core_types.h" +#include "source/extensions/tracers/zipkin/span_context.h" +#include "source/extensions/tracers/zipkin/tracer_interface.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/extensions/tracers/zipkin/zipkin_core_types.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/util.cc b/source/extensions/tracers/zipkin/util.cc index 5263eec00ecc4..53763443576f6 100644 --- a/source/extensions/tracers/zipkin/util.cc +++ b/source/extensions/tracers/zipkin/util.cc @@ -1,11 +1,11 @@ -#include "extensions/tracers/zipkin/util.h" +#include "source/extensions/tracers/zipkin/util.h" #include #include #include -#include "common/common/hex.h" -#include "common/common/utility.h" +#include "source/common/common/hex.h" +#include "source/common/common/utility.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" diff --git a/source/extensions/tracers/zipkin/util.h b/source/extensions/tracers/zipkin/util.h index 0c9158a36423e..80303986034fe 100644 --- a/source/extensions/tracers/zipkin/util.h +++ b/source/extensions/tracers/zipkin/util.h @@ -5,8 +5,8 @@ #include "envoy/common/time.h" -#include "common/common/byte_order.h" -#include "common/protobuf/utility.h" +#include "source/common/common/byte_order.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/zipkin_core_constants.h b/source/extensions/tracers/zipkin/zipkin_core_constants.h index 0401c39fb142d..03e1ba63a40b6 100644 --- a/source/extensions/tracers/zipkin/zipkin_core_constants.h +++ b/source/extensions/tracers/zipkin/zipkin_core_constants.h @@ -4,7 +4,7 @@ #include "envoy/http/header_map.h" -#include "common/singleton/const_singleton.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/zipkin_core_types.cc b/source/extensions/tracers/zipkin/zipkin_core_types.cc index 3128a82586f8b..eb6c17c8382a2 100644 --- a/source/extensions/tracers/zipkin/zipkin_core_types.cc +++ b/source/extensions/tracers/zipkin/zipkin_core_types.cc @@ -1,13 +1,12 @@ -#include "extensions/tracers/zipkin/zipkin_core_types.h" +#include "source/extensions/tracers/zipkin/zipkin_core_types.h" #include -#include "common/common/utility.h" - -#include "extensions/tracers/zipkin/span_context.h" -#include "extensions/tracers/zipkin/util.h" -#include "extensions/tracers/zipkin/zipkin_core_constants.h" -#include "extensions/tracers/zipkin/zipkin_json_field_names.h" +#include "source/common/common/utility.h" +#include "source/extensions/tracers/zipkin/span_context.h" +#include "source/extensions/tracers/zipkin/util.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/extensions/tracers/zipkin/zipkin_json_field_names.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/zipkin_core_types.h b/source/extensions/tracers/zipkin/zipkin_core_types.h index b87573c8f7bf3..ae70ddff7adc7 100644 --- a/source/extensions/tracers/zipkin/zipkin_core_types.h +++ b/source/extensions/tracers/zipkin/zipkin_core_types.h @@ -6,12 +6,11 @@ #include "envoy/common/time.h" #include "envoy/network/address.h" -#include "common/common/assert.h" -#include "common/common/hex.h" -#include "common/protobuf/utility.h" - -#include "extensions/tracers/zipkin/tracer_interface.h" -#include "extensions/tracers/zipkin/util.h" +#include "source/common/common/assert.h" +#include "source/common/common/hex.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/tracers/zipkin/tracer_interface.h" +#include "source/extensions/tracers/zipkin/util.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_replace.h" diff --git a/source/extensions/tracers/zipkin/zipkin_json_field_names.h b/source/extensions/tracers/zipkin/zipkin_json_field_names.h index 95e401992db75..0d178d8203342 100644 --- a/source/extensions/tracers/zipkin/zipkin_json_field_names.h +++ b/source/extensions/tracers/zipkin/zipkin_json_field_names.h @@ -2,7 +2,7 @@ #include -#include "common/singleton/const_singleton.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc b/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc index d25f143cec47e..77c7944550adf 100644 --- a/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc +++ b/source/extensions/tracers/zipkin/zipkin_tracer_impl.cc @@ -1,19 +1,18 @@ -#include "extensions/tracers/zipkin/zipkin_tracer_impl.h" +#include "source/extensions/tracers/zipkin/zipkin_tracer_impl.h" #include "envoy/config/trace/v3/zipkin.pb.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/config/utility.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/tracers/zipkin/span_context_extractor.h" -#include "extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/config/utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/tracers/zipkin/span_context_extractor.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/tracers/zipkin/zipkin_tracer_impl.h b/source/extensions/tracers/zipkin/zipkin_tracer_impl.h index 2649825a3635f..7def3ced8e491 100644 --- a/source/extensions/tracers/zipkin/zipkin_tracer_impl.h +++ b/source/extensions/tracers/zipkin/zipkin_tracer_impl.h @@ -8,17 +8,16 @@ #include "envoy/tracing/trace_driver.h" #include "envoy/upstream/cluster_manager.h" -#include "common/common/empty_string.h" -#include "common/http/async_client_utility.h" -#include "common/http/header_map_impl.h" -#include "common/json/json_loader.h" -#include "common/tracing/common_values.h" -#include "common/tracing/null_span_impl.h" -#include "common/upstream/cluster_update_tracker.h" - -#include "extensions/tracers/zipkin/span_buffer.h" -#include "extensions/tracers/zipkin/tracer.h" -#include "extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/async_client_utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/json/json_loader.h" +#include "source/common/tracing/common_values.h" +#include "source/common/tracing/null_span_impl.h" +#include "source/common/upstream/cluster_update_tracker.h" +#include "source/extensions/tracers/zipkin/span_buffer.h" +#include "source/extensions/tracers/zipkin/tracer.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/BUILD b/source/extensions/transport_sockets/BUILD deleted file mode 100644 index 40a5e79b39d3b..0000000000000 --- a/source/extensions/transport_sockets/BUILD +++ /dev/null @@ -1,19 +0,0 @@ -load( - "//bazel:envoy_build_system.bzl", - "envoy_cc_library", - "envoy_extension_package", -) - -licenses(["notice"]) # Apache 2 - -envoy_extension_package() - -envoy_cc_library( - name = "well_known_names", - hdrs = ["well_known_names.h"], - # well known names files are public as long as they exist. - visibility = ["//visibility:public"], - deps = [ - "//source/common/singleton:const_singleton", - ], -) diff --git a/source/extensions/transport_sockets/alts/BUILD b/source/extensions/transport_sockets/alts/BUILD index 3e393a3781cc8..2086ef77546e2 100644 --- a/source/extensions/transport_sockets/alts/BUILD +++ b/source/extensions/transport_sockets/alts/BUILD @@ -40,8 +40,8 @@ envoy_cc_extension( deps = [ ":tsi_handshaker", ":tsi_socket", - "//include/envoy/registry", - "//include/envoy/server:transport_socket_config_interface", + "//envoy/registry", + "//envoy/server:transport_socket_config_interface", "//source/common/grpc:google_grpc_context_lib", "@envoy_api//envoy/extensions/transport_sockets/alts/v3:pkg_cc_proto", ], @@ -71,7 +71,7 @@ envoy_cc_library( ], deps = [ ":grpc_tsi_wrapper", - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "//source/common/buffer:buffer_lib", ], ) @@ -88,8 +88,8 @@ envoy_cc_library( ":noop_transport_socket_callbacks_lib", ":tsi_frame_protector", ":tsi_handshaker", - "//include/envoy/network:io_handle_interface", - "//include/envoy/network:transport_socket_interface", + "//envoy/network:io_handle_interface", + "//envoy/network:transport_socket_interface", "//source/common/buffer:buffer_lib", "//source/common/buffer:watermark_buffer_lib", "//source/common/common:cleanup_lib", @@ -104,7 +104,7 @@ envoy_cc_library( name = "noop_transport_socket_callbacks_lib", hdrs = ["noop_transport_socket_callbacks.h"], deps = [ - "//include/envoy/network:io_handle_interface", - "//include/envoy/network:transport_socket_interface", + "//envoy/network:io_handle_interface", + "//envoy/network:transport_socket_interface", ], ) diff --git a/source/extensions/transport_sockets/alts/config.cc b/source/extensions/transport_sockets/alts/config.cc index 90494996aafe9..59f66580110af 100644 --- a/source/extensions/transport_sockets/alts/config.cc +++ b/source/extensions/transport_sockets/alts/config.cc @@ -1,17 +1,16 @@ -#include "extensions/transport_sockets/alts/config.h" +#include "source/extensions/transport_sockets/alts/config.h" #include "envoy/extensions/transport_sockets/alts/v3/alts.pb.h" #include "envoy/extensions/transport_sockets/alts/v3/alts.pb.validate.h" #include "envoy/registry/registry.h" #include "envoy/server/transport_socket_config.h" -#include "common/common/assert.h" -#include "common/grpc/google_grpc_context.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" - -#include "extensions/transport_sockets/alts/grpc_tsi.h" -#include "extensions/transport_sockets/alts/tsi_socket.h" +#include "source/common/common/assert.h" +#include "source/common/grpc/google_grpc_context.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/transport_sockets/alts/grpc_tsi.h" +#include "source/extensions/transport_sockets/alts/tsi_socket.h" #include "absl/container/node_hash_set.h" #include "absl/strings/str_join.h" diff --git a/source/extensions/transport_sockets/alts/grpc_tsi.h b/source/extensions/transport_sockets/alts/grpc_tsi.h index 1acecac58d4de..4b280f0420f93 100644 --- a/source/extensions/transport_sockets/alts/grpc_tsi.h +++ b/source/extensions/transport_sockets/alts/grpc_tsi.h @@ -22,7 +22,7 @@ #pragma GCC diagnostic pop #endif -#include "common/common/c_smart_ptr.h" +#include "source/common/common/c_smart_ptr.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/alts/tsi_frame_protector.cc b/source/extensions/transport_sockets/alts/tsi_frame_protector.cc index 2739f2029a981..6e06411f07517 100644 --- a/source/extensions/transport_sockets/alts/tsi_frame_protector.cc +++ b/source/extensions/transport_sockets/alts/tsi_frame_protector.cc @@ -1,7 +1,7 @@ -#include "extensions/transport_sockets/alts/tsi_frame_protector.h" +#include "source/extensions/transport_sockets/alts/tsi_frame_protector.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/source/extensions/transport_sockets/alts/tsi_frame_protector.h b/source/extensions/transport_sockets/alts/tsi_frame_protector.h index 5ea60bb5a0c76..3b7bfab2bf70a 100644 --- a/source/extensions/transport_sockets/alts/tsi_frame_protector.h +++ b/source/extensions/transport_sockets/alts/tsi_frame_protector.h @@ -2,7 +2,7 @@ #include "envoy/buffer/buffer.h" -#include "extensions/transport_sockets/alts/grpc_tsi.h" +#include "source/extensions/transport_sockets/alts/grpc_tsi.h" #include "grpc/slice_buffer.h" diff --git a/source/extensions/transport_sockets/alts/tsi_handshaker.cc b/source/extensions/transport_sockets/alts/tsi_handshaker.cc index 08f14967f40fc..4440fc4011f62 100644 --- a/source/extensions/transport_sockets/alts/tsi_handshaker.cc +++ b/source/extensions/transport_sockets/alts/tsi_handshaker.cc @@ -1,7 +1,7 @@ -#include "extensions/transport_sockets/alts/tsi_handshaker.h" +#include "source/extensions/transport_sockets/alts/tsi_handshaker.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/alts/tsi_handshaker.h b/source/extensions/transport_sockets/alts/tsi_handshaker.h index 71cd6989e71a9..9408a67bfa68a 100644 --- a/source/extensions/transport_sockets/alts/tsi_handshaker.h +++ b/source/extensions/transport_sockets/alts/tsi_handshaker.h @@ -5,9 +5,8 @@ #include "envoy/buffer/buffer.h" #include "envoy/event/dispatcher.h" -#include "common/common/c_smart_ptr.h" - -#include "extensions/transport_sockets/alts/grpc_tsi.h" +#include "source/common/common/c_smart_ptr.h" +#include "source/extensions/transport_sockets/alts/grpc_tsi.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/alts/tsi_socket.cc b/source/extensions/transport_sockets/alts/tsi_socket.cc index ce2316921ce79..1e69e0559294a 100644 --- a/source/extensions/transport_sockets/alts/tsi_socket.cc +++ b/source/extensions/transport_sockets/alts/tsi_socket.cc @@ -1,9 +1,9 @@ -#include "extensions/transport_sockets/alts/tsi_socket.h" +#include "source/extensions/transport_sockets/alts/tsi_socket.h" -#include "common/common/assert.h" -#include "common/common/cleanup.h" -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" +#include "source/common/common/assert.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/alts/tsi_socket.h b/source/extensions/transport_sockets/alts/tsi_socket.h index 2d74b293d048f..1b4e5def1fc54 100644 --- a/source/extensions/transport_sockets/alts/tsi_socket.h +++ b/source/extensions/transport_sockets/alts/tsi_socket.h @@ -2,13 +2,12 @@ #include "envoy/network/transport_socket.h" -#include "common/buffer/buffer_impl.h" -#include "common/buffer/watermark_buffer.h" -#include "common/network/raw_buffer_socket.h" - -#include "extensions/transport_sockets/alts/noop_transport_socket_callbacks.h" -#include "extensions/transport_sockets/alts/tsi_frame_protector.h" -#include "extensions/transport_sockets/alts/tsi_handshaker.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/extensions/transport_sockets/alts/noop_transport_socket_callbacks.h" +#include "source/extensions/transport_sockets/alts/tsi_frame_protector.h" +#include "source/extensions/transport_sockets/alts/tsi_handshaker.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/common/BUILD b/source/extensions/transport_sockets/common/BUILD index eee229da12fb2..d333c0993f442 100644 --- a/source/extensions/transport_sockets/common/BUILD +++ b/source/extensions/transport_sockets/common/BUILD @@ -13,8 +13,8 @@ envoy_cc_library( srcs = ["passthrough.cc"], hdrs = ["passthrough.h"], deps = [ - "//include/envoy/network:connection_interface", - "//include/envoy/network:transport_socket_interface", + "//envoy/network:connection_interface", + "//envoy/network:transport_socket_interface", "//source/common/buffer:buffer_lib", ], ) diff --git a/source/extensions/transport_sockets/common/passthrough.cc b/source/extensions/transport_sockets/common/passthrough.cc index 86fc282ed3e36..ba4f61d113e3c 100644 --- a/source/extensions/transport_sockets/common/passthrough.cc +++ b/source/extensions/transport_sockets/common/passthrough.cc @@ -1,9 +1,9 @@ -#include "extensions/transport_sockets/common/passthrough.h" +#include "source/extensions/transport_sockets/common/passthrough.h" #include "envoy/network/connection.h" #include "envoy/network/transport_socket.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/common/passthrough.h b/source/extensions/transport_sockets/common/passthrough.h index 5c338af425a08..ed633024040c2 100644 --- a/source/extensions/transport_sockets/common/passthrough.h +++ b/source/extensions/transport_sockets/common/passthrough.h @@ -3,7 +3,7 @@ #include "envoy/network/connection.h" #include "envoy/network/transport_socket.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/proxy_protocol/BUILD b/source/extensions/transport_sockets/proxy_protocol/BUILD index 403fb996e900c..c84e1932ebc6c 100644 --- a/source/extensions/transport_sockets/proxy_protocol/BUILD +++ b/source/extensions/transport_sockets/proxy_protocol/BUILD @@ -15,9 +15,9 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":upstream_proxy_protocol", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/registry", - "//include/envoy/server:transport_socket_config_interface", + "//envoy/network:transport_socket_interface", + "//envoy/registry", + "//envoy/server:transport_socket_config_interface", "//source/common/config:utility_lib", "@envoy_api//envoy/extensions/transport_sockets/proxy_protocol/v3:pkg_cc_proto", ], @@ -28,8 +28,8 @@ envoy_cc_library( srcs = ["proxy_protocol.cc"], hdrs = ["proxy_protocol.h"], deps = [ - "//include/envoy/network:connection_interface", - "//include/envoy/network:transport_socket_interface", + "//envoy/network:connection_interface", + "//envoy/network:transport_socket_interface", "//source/common/buffer:buffer_lib", "//source/common/network:address_lib", "//source/extensions/common/proxy_protocol:proxy_protocol_header_lib", diff --git a/source/extensions/transport_sockets/proxy_protocol/config.cc b/source/extensions/transport_sockets/proxy_protocol/config.cc index e037263c8a4a5..860fdb637c32a 100644 --- a/source/extensions/transport_sockets/proxy_protocol/config.cc +++ b/source/extensions/transport_sockets/proxy_protocol/config.cc @@ -1,12 +1,11 @@ -#include "extensions/transport_sockets/proxy_protocol/config.h" +#include "source/extensions/transport_sockets/proxy_protocol/config.h" #include "envoy/extensions/transport_sockets/proxy_protocol/v3/upstream_proxy_protocol.pb.h" #include "envoy/extensions/transport_sockets/proxy_protocol/v3/upstream_proxy_protocol.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" - -#include "extensions/transport_sockets/proxy_protocol/proxy_protocol.h" +#include "source/common/config/utility.h" +#include "source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.cc b/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.cc index 8ce993c8d30d7..503c7898981db 100644 --- a/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.cc +++ b/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.cc @@ -1,14 +1,13 @@ -#include "extensions/transport_sockets/proxy_protocol/proxy_protocol.h" +#include "source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h" #include #include "envoy/config/core/v3/proxy_protocol.pb.h" #include "envoy/network/transport_socket.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/address_impl.h" - -#include "extensions/common/proxy_protocol/proxy_protocol_header.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h" using envoy::config::core::v3::ProxyProtocolConfig; using envoy::config::core::v3::ProxyProtocolConfig_Version; diff --git a/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h b/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h index c4c9a80f629e9..05d787fcea8b6 100644 --- a/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h +++ b/source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h @@ -4,10 +4,9 @@ #include "envoy/network/connection.h" #include "envoy/network/transport_socket.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" - -#include "extensions/transport_sockets/common/passthrough.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/extensions/transport_sockets/common/passthrough.h" using envoy::config::core::v3::ProxyProtocolConfig; using envoy::config::core::v3::ProxyProtocolConfig_Version; diff --git a/source/extensions/transport_sockets/raw_buffer/BUILD b/source/extensions/transport_sockets/raw_buffer/BUILD index 9c9ad99107d71..5f27c78663ccf 100644 --- a/source/extensions/transport_sockets/raw_buffer/BUILD +++ b/source/extensions/transport_sockets/raw_buffer/BUILD @@ -17,9 +17,9 @@ envoy_cc_extension( # This is core Envoy config. visibility = ["//visibility:public"], deps = [ - "//include/envoy/network:transport_socket_interface", - "//include/envoy/registry", - "//include/envoy/server:transport_socket_config_interface", + "//envoy/network:transport_socket_interface", + "//envoy/registry", + "//envoy/server:transport_socket_config_interface", "//source/common/network:raw_buffer_socket_lib", "@envoy_api//envoy/extensions/transport_sockets/raw_buffer/v3:pkg_cc_proto", ], diff --git a/source/extensions/transport_sockets/raw_buffer/config.cc b/source/extensions/transport_sockets/raw_buffer/config.cc index b77df99bc96b9..04dc896635301 100644 --- a/source/extensions/transport_sockets/raw_buffer/config.cc +++ b/source/extensions/transport_sockets/raw_buffer/config.cc @@ -1,11 +1,11 @@ -#include "extensions/transport_sockets/raw_buffer/config.h" +#include "source/extensions/transport_sockets/raw_buffer/config.h" #include #include "envoy/extensions/transport_sockets/raw_buffer/v3/raw_buffer.pb.h" #include "envoy/extensions/transport_sockets/raw_buffer/v3/raw_buffer.pb.validate.h" -#include "common/network/raw_buffer_socket.h" +#include "source/common/network/raw_buffer_socket.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/starttls/BUILD b/source/extensions/transport_sockets/starttls/BUILD index 31b016d9d97cc..31fcfef60a367 100644 --- a/source/extensions/transport_sockets/starttls/BUILD +++ b/source/extensions/transport_sockets/starttls/BUILD @@ -18,9 +18,9 @@ envoy_cc_extension( visibility = ["//visibility:public"], deps = [ ":starttls_socket_lib", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/registry", - "//include/envoy/server:transport_socket_config_interface", + "//envoy/network:transport_socket_interface", + "//envoy/registry", + "//envoy/server:transport_socket_config_interface", "//source/common/config:utility_lib", "@envoy_api//envoy/extensions/transport_sockets/starttls/v3:pkg_cc_proto", ], @@ -36,9 +36,9 @@ envoy_cc_library( "ssl", ], deps = [ - "//include/envoy/network:connection_interface", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/stats:stats_macros", + "//envoy/network:connection_interface", + "//envoy/network:transport_socket_interface", + "//envoy/stats:stats_macros", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:empty_string", diff --git a/source/extensions/transport_sockets/starttls/config.cc b/source/extensions/transport_sockets/starttls/config.cc index 2e06edd4ad4d1..f4911dd3b89d1 100644 --- a/source/extensions/transport_sockets/starttls/config.cc +++ b/source/extensions/transport_sockets/starttls/config.cc @@ -1,6 +1,6 @@ -#include "extensions/transport_sockets/starttls/config.h" +#include "source/extensions/transport_sockets/starttls/config.h" -#include "extensions/transport_sockets/starttls/starttls_socket.h" +#include "source/extensions/transport_sockets/starttls/starttls_socket.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/starttls/config.h b/source/extensions/transport_sockets/starttls/config.h index 2b5edbbef6d00..d60c9dbf0a50c 100644 --- a/source/extensions/transport_sockets/starttls/config.h +++ b/source/extensions/transport_sockets/starttls/config.h @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/transport_socket_config.h" -#include "common/config/utility.h" +#include "source/common/config/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/starttls/starttls_socket.cc b/source/extensions/transport_sockets/starttls/starttls_socket.cc index c87df0748d766..17c73aec17fd0 100644 --- a/source/extensions/transport_sockets/starttls/starttls_socket.cc +++ b/source/extensions/transport_sockets/starttls/starttls_socket.cc @@ -1,4 +1,4 @@ -#include "extensions/transport_sockets/starttls/starttls_socket.h" +#include "source/extensions/transport_sockets/starttls/starttls_socket.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/starttls/starttls_socket.h b/source/extensions/transport_sockets/starttls/starttls_socket.h index 616502b08bfa8..6583cc6a4e85f 100644 --- a/source/extensions/transport_sockets/starttls/starttls_socket.h +++ b/source/extensions/transport_sockets/starttls/starttls_socket.h @@ -6,8 +6,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tap/BUILD b/source/extensions/transport_sockets/tap/BUILD index 6875dfe77b82e..47437466ea2c4 100644 --- a/source/extensions/transport_sockets/tap/BUILD +++ b/source/extensions/transport_sockets/tap/BUILD @@ -15,7 +15,7 @@ envoy_cc_library( name = "tap_config_interface", hdrs = ["tap_config.h"], deps = [ - "//include/envoy/network:connection_interface", + "//envoy/network:connection_interface", "//source/extensions/common/tap:tap_interface", ], ) @@ -39,7 +39,7 @@ envoy_cc_library( hdrs = ["tap.h"], deps = [ ":tap_config_interface", - "//include/envoy/network:transport_socket_interface", + "//envoy/network:transport_socket_interface", "//source/common/buffer:buffer_lib", "//source/extensions/common/tap:extension_config_base", "//source/extensions/transport_sockets/common:passthrough_lib", @@ -54,14 +54,14 @@ envoy_cc_extension( # TODO(#9953) clean up. extra_visibility = [ "//test/common/access_log:__subpackages__", - "//test/integration:__subpackages__", + "//test/extensions/transport_sockets/tls/integration:__subpackages__", ], deps = [ ":tap_config_impl", ":tap_lib", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/registry", - "//include/envoy/server:transport_socket_config_interface", + "//envoy/network:transport_socket_interface", + "//envoy/registry", + "//envoy/server:transport_socket_config_interface", "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/config/tap/v3:pkg_cc_proto", diff --git a/source/extensions/transport_sockets/tap/config.cc b/source/extensions/transport_sockets/tap/config.cc index 9c49f2b8a3bce..f389c8633c22d 100644 --- a/source/extensions/transport_sockets/tap/config.cc +++ b/source/extensions/transport_sockets/tap/config.cc @@ -1,15 +1,14 @@ -#include "extensions/transport_sockets/tap/config.h" +#include "source/extensions/transport_sockets/tap/config.h" #include "envoy/config/tap/v3/common.pb.h" #include "envoy/extensions/transport_sockets/tap/v3/tap.pb.h" #include "envoy/extensions/transport_sockets/tap/v3/tap.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" -#include "common/protobuf/utility.h" - -#include "extensions/transport_sockets/tap/tap.h" -#include "extensions/transport_sockets/tap/tap_config_impl.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/transport_sockets/tap/tap.h" +#include "source/extensions/transport_sockets/tap/tap_config_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tap/tap.cc b/source/extensions/transport_sockets/tap/tap.cc index 2f58c23703ce7..4d69a01bda958 100644 --- a/source/extensions/transport_sockets/tap/tap.cc +++ b/source/extensions/transport_sockets/tap/tap.cc @@ -1,8 +1,8 @@ -#include "extensions/transport_sockets/tap/tap.h" +#include "source/extensions/transport_sockets/tap/tap.h" #include "envoy/extensions/transport_sockets/tap/v3/tap.pb.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tap/tap.h b/source/extensions/transport_sockets/tap/tap.h index 2971c3e846ba6..745b8f0a8c4e1 100644 --- a/source/extensions/transport_sockets/tap/tap.h +++ b/source/extensions/transport_sockets/tap/tap.h @@ -4,9 +4,9 @@ #include "envoy/extensions/transport_sockets/tap/v3/tap.pb.h" #include "envoy/network/transport_socket.h" -#include "extensions/common/tap/extension_config_base.h" -#include "extensions/transport_sockets/common/passthrough.h" -#include "extensions/transport_sockets/tap/tap_config.h" +#include "source/extensions/common/tap/extension_config_base.h" +#include "source/extensions/transport_sockets/common/passthrough.h" +#include "source/extensions/transport_sockets/tap/tap_config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tap/tap_config.h b/source/extensions/transport_sockets/tap/tap_config.h index 8cbd431db0fe9..da0436eb8126a 100644 --- a/source/extensions/transport_sockets/tap/tap_config.h +++ b/source/extensions/transport_sockets/tap/tap_config.h @@ -2,7 +2,7 @@ #include "envoy/network/connection.h" -#include "extensions/common/tap/tap.h" +#include "source/extensions/common/tap/tap.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tap/tap_config_impl.cc b/source/extensions/transport_sockets/tap/tap_config_impl.cc index 4e817ebba294a..7855df9273ff2 100644 --- a/source/extensions/transport_sockets/tap/tap_config_impl.cc +++ b/source/extensions/transport_sockets/tap/tap_config_impl.cc @@ -1,9 +1,9 @@ -#include "extensions/transport_sockets/tap/tap_config_impl.h" +#include "source/extensions/transport_sockets/tap/tap_config_impl.h" #include "envoy/data/tap/v3/transport.pb.h" -#include "common/common/assert.h" -#include "common/network/utility.h" +#include "source/common/common/assert.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tap/tap_config_impl.h b/source/extensions/transport_sockets/tap/tap_config_impl.h index fc883bffa5b76..cf715c3df9733 100644 --- a/source/extensions/transport_sockets/tap/tap_config_impl.h +++ b/source/extensions/transport_sockets/tap/tap_config_impl.h @@ -4,8 +4,8 @@ #include "envoy/data/tap/v3/transport.pb.h" #include "envoy/event/timer.h" -#include "extensions/common/tap/tap_config_base.h" -#include "extensions/transport_sockets/tap/tap_config.h" +#include "source/extensions/common/tap/tap_config_base.h" +#include "source/extensions/transport_sockets/tap/tap_config.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tls/BUILD b/source/extensions/transport_sockets/tls/BUILD index 766ba6ff34914..91deb5c164bf1 100644 --- a/source/extensions/transport_sockets/tls/BUILD +++ b/source/extensions/transport_sockets/tls/BUILD @@ -19,9 +19,9 @@ envoy_cc_extension( visibility = ["//visibility:public"], deps = [ ":ssl_socket_lib", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/registry", - "//include/envoy/server:transport_socket_config_interface", + "//envoy/network:transport_socket_interface", + "//envoy/registry", + "//envoy/server:transport_socket_config_interface", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", ], ) @@ -34,14 +34,14 @@ envoy_cc_library( deps = [ ":context_lib", ":utility_lib", - "//include/envoy/network:connection_interface", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/ssl:handshaker_interface", - "//include/envoy/ssl:ssl_socket_extended_info_interface", - "//include/envoy/ssl:ssl_socket_state", - "//include/envoy/ssl/private_key:private_key_callbacks_interface", - "//include/envoy/ssl/private_key:private_key_interface", - "//include/envoy/stats:stats_macros", + "//envoy/network:connection_interface", + "//envoy/network:transport_socket_interface", + "//envoy/ssl:handshaker_interface", + "//envoy/ssl:ssl_socket_extended_info_interface", + "//envoy/ssl:ssl_socket_state", + "//envoy/ssl/private_key:private_key_callbacks_interface", + "//envoy/ssl/private_key:private_key_interface", + "//envoy/stats:stats_macros", "//source/common/common:assert_lib", "//source/common/common:empty_string", "//source/common/common:minimal_logger_lib", @@ -56,8 +56,8 @@ envoy_cc_library( hdrs = ["io_handle_bio.h"], external_deps = ["ssl"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/network:io_handle_interface", + "//envoy/buffer:buffer_interface", + "//envoy/network:io_handle_interface", ], ) @@ -80,14 +80,14 @@ envoy_cc_library( ":io_handle_bio_lib", ":ssl_handshaker_lib", ":utility_lib", - "//include/envoy/network:connection_interface", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/ssl:handshaker_interface", - "//include/envoy/ssl:ssl_socket_extended_info_interface", - "//include/envoy/ssl:ssl_socket_state", - "//include/envoy/ssl/private_key:private_key_callbacks_interface", - "//include/envoy/ssl/private_key:private_key_interface", - "//include/envoy/stats:stats_macros", + "//envoy/network:connection_interface", + "//envoy/network:transport_socket_interface", + "//envoy/ssl:handshaker_interface", + "//envoy/ssl:ssl_socket_extended_info_interface", + "//envoy/ssl:ssl_socket_state", + "//envoy/ssl/private_key:private_key_callbacks_interface", + "//envoy/ssl/private_key:private_key_interface", + "//envoy/stats:stats_macros", "//source/common/common:assert_lib", "//source/common/common:empty_string", "//source/common/common:minimal_logger_lib", @@ -107,10 +107,10 @@ envoy_cc_library( visibility = ["//visibility:public"], deps = [ ":ssl_handshaker_lib", - "//include/envoy/secret:secret_callbacks_interface", - "//include/envoy/secret:secret_provider_interface", - "//include/envoy/server:transport_socket_config_interface", - "//include/envoy/ssl:context_config_interface", + "//envoy/secret:secret_callbacks_interface", + "//envoy/secret:secret_provider_interface", + "//envoy/server:transport_socket_config_interface", + "//envoy/ssl:context_config_interface", "//source/common/common:assert_lib", "//source/common/common:empty_string", "//source/common/common:matchers_lib", @@ -144,13 +144,13 @@ envoy_cc_library( deps = [ ":stats_lib", ":utility_lib", - "//include/envoy/ssl:context_config_interface", - "//include/envoy/ssl:context_interface", - "//include/envoy/ssl:context_manager_interface", - "//include/envoy/ssl:ssl_socket_extended_info_interface", - "//include/envoy/ssl/private_key:private_key_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/ssl:context_config_interface", + "//envoy/ssl:context_interface", + "//envoy/ssl:context_manager_interface", + "//envoy/ssl:ssl_socket_extended_info_interface", + "//envoy/ssl/private_key:private_key_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/common:assert_lib", "//source/common/common:base64_lib", "//source/common/common:hex_lib", @@ -176,8 +176,8 @@ envoy_cc_library( "ssl", ], deps = [ - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_interface", + "//envoy/stats:stats_macros", "//source/common/stats:symbol_table_lib", "//source/common/stats:utility_lib", ], diff --git a/source/extensions/transport_sockets/tls/cert_validator/BUILD b/source/extensions/transport_sockets/tls/cert_validator/BUILD index de0fbd42c08ca..6fcffd4d9e5f9 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/BUILD +++ b/source/extensions/transport_sockets/tls/cert_validator/BUILD @@ -20,7 +20,6 @@ envoy_cc_library( "default_validator.h", "factory.h", "utility.h", - "well_known_names.h", ], external_deps = [ "ssl", @@ -29,8 +28,8 @@ envoy_cc_library( ], visibility = ["//visibility:public"], deps = [ - "//include/envoy/ssl:context_config_interface", - "//include/envoy/ssl:ssl_socket_extended_info_interface", + "//envoy/ssl:context_config_interface", + "//envoy/ssl:ssl_socket_extended_info_interface", "//source/common/common:assert_lib", "//source/common/common:base64_lib", "//source/common/common:hex_lib", diff --git a/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h b/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h index 9b55c1cf6fa1e..efec7cb3aa4e3 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h +++ b/source/extensions/transport_sockets/tls/cert_validator/cert_validator.h @@ -13,10 +13,9 @@ #include "envoy/ssl/private_key/private_key.h" #include "envoy/ssl/ssl_socket_extended_info.h" -#include "common/common/matchers.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/transport_sockets/tls/stats.h" +#include "source/common/common/matchers.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/transport_sockets/tls/stats.h" #include "openssl/ssl.h" #include "openssl/x509v3.h" diff --git a/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc b/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc index 001f93286d820..cf4463f6e5a5e 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc +++ b/source/extensions/transport_sockets/tls/cert_validator/default_validator.cc @@ -1,4 +1,4 @@ -#include "extensions/transport_sockets/tls/cert_validator/default_validator.h" +#include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h" #include #include @@ -12,24 +12,22 @@ #include "envoy/ssl/private_key/private_key.h" #include "envoy/ssl/ssl_socket_extended_info.h" -#include "common/common/assert.h" -#include "common/common/base64.h" -#include "common/common/fmt.h" -#include "common/common/hex.h" -#include "common/common/matchers.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_features.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/utility.h" - -#include "extensions/transport_sockets/tls/cert_validator/cert_validator.h" -#include "extensions/transport_sockets/tls/cert_validator/factory.h" -#include "extensions/transport_sockets/tls/cert_validator/utility.h" -#include "extensions/transport_sockets/tls/cert_validator/well_known_names.h" -#include "extensions/transport_sockets/tls/stats.h" -#include "extensions/transport_sockets/tls/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/base64.h" +#include "source/common/common/fmt.h" +#include "source/common/common/hex.h" +#include "source/common/common/matchers.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/utility.h" +#include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h" +#include "source/extensions/transport_sockets/tls/cert_validator/factory.h" +#include "source/extensions/transport_sockets/tls/cert_validator/utility.h" +#include "source/extensions/transport_sockets/tls/stats.h" +#include "source/extensions/transport_sockets/tls/utility.h" #include "absl/synchronization/mutex.h" #include "openssl/ssl.h" @@ -472,7 +470,7 @@ class DefaultCertValidatorFactory : public CertValidatorFactory { return std::make_unique(config, stats, time_source); } - absl::string_view name() override { return CertValidatorNames::get().Default; } + absl::string_view name() override { return "envoy.tls.cert_validator.default"; } }; REGISTER_FACTORY(DefaultCertValidatorFactory, CertValidatorFactory); diff --git a/source/extensions/transport_sockets/tls/cert_validator/default_validator.h b/source/extensions/transport_sockets/tls/cert_validator/default_validator.h index ee5f655bae3f1..03a037ef33df7 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/default_validator.h +++ b/source/extensions/transport_sockets/tls/cert_validator/default_validator.h @@ -14,11 +14,10 @@ #include "envoy/ssl/private_key/private_key.h" #include "envoy/ssl/ssl_socket_extended_info.h" -#include "common/common/matchers.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/transport_sockets/tls/cert_validator/cert_validator.h" -#include "extensions/transport_sockets/tls/stats.h" +#include "source/common/common/matchers.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h" +#include "source/extensions/transport_sockets/tls/stats.h" #include "absl/synchronization/mutex.h" #include "openssl/ssl.h" diff --git a/source/extensions/transport_sockets/tls/cert_validator/factory.cc b/source/extensions/transport_sockets/tls/cert_validator/factory.cc index 349b04e260b44..b17d5b338536d 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/factory.cc +++ b/source/extensions/transport_sockets/tls/cert_validator/factory.cc @@ -1,9 +1,7 @@ -#include "extensions/transport_sockets/tls/cert_validator/factory.h" +#include "source/extensions/transport_sockets/tls/cert_validator/factory.h" #include "envoy/ssl/context_config.h" -#include "extensions/transport_sockets/tls/cert_validator/well_known_names.h" - namespace Envoy { namespace Extensions { namespace TransportSockets { @@ -12,7 +10,7 @@ namespace Tls { std::string getCertValidatorName(const Envoy::Ssl::CertificateValidationContextConfig* config) { return config != nullptr && config->customValidatorConfig().has_value() ? config->customValidatorConfig().value().name() - : CertValidatorNames::get().Default; + : "envoy.tls.cert_validator.default"; }; } // namespace Tls diff --git a/source/extensions/transport_sockets/tls/cert_validator/factory.h b/source/extensions/transport_sockets/tls/cert_validator/factory.h index 590bf15fcde95..9a1689ab17138 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/factory.h +++ b/source/extensions/transport_sockets/tls/cert_validator/factory.h @@ -3,10 +3,9 @@ #include "envoy/common/pure.h" #include "envoy/ssl/context_config.h" -#include "common/common/utility.h" - -#include "extensions/transport_sockets/tls/cert_validator/cert_validator.h" -#include "extensions/transport_sockets/tls/stats.h" +#include "source/common/common/utility.h" +#include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h" +#include "source/extensions/transport_sockets/tls/stats.h" #include "absl/strings/string_view.h" diff --git a/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD b/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD index 812d2f17b7d1c..a0723eb783f29 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD +++ b/source/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD @@ -23,8 +23,8 @@ envoy_cc_extension( ], visibility = ["//visibility:public"], deps = [ - "//include/envoy/ssl:context_config_interface", - "//include/envoy/ssl:ssl_socket_extended_info_interface", + "//envoy/ssl:context_config_interface", + "//envoy/ssl:ssl_socket_extended_info_interface", "//source/common/common:assert_lib", "//source/common/common:base64_lib", "//source/common/common:c_smart_ptr_lib", diff --git a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc index f7d5639d40277..bebf2a3067f98 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc +++ b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.cc @@ -1,4 +1,4 @@ -#include "extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h" +#include "source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h" #include "envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.pb.h" #include "envoy/network/transport_socket.h" @@ -6,16 +6,14 @@ #include "envoy/ssl/context_config.h" #include "envoy/ssl/ssl_socket_extended_info.h" -#include "common/config/datasource.h" -#include "common/config/utility.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/transport_sockets/tls/cert_validator/factory.h" -#include "extensions/transport_sockets/tls/cert_validator/utility.h" -#include "extensions/transport_sockets/tls/cert_validator/well_known_names.h" -#include "extensions/transport_sockets/tls/stats.h" -#include "extensions/transport_sockets/tls/utility.h" +#include "source/common/config/datasource.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/transport_sockets/tls/cert_validator/factory.h" +#include "source/extensions/transport_sockets/tls/cert_validator/utility.h" +#include "source/extensions/transport_sockets/tls/stats.h" +#include "source/extensions/transport_sockets/tls/utility.h" #include "openssl/ssl.h" #include "openssl/x509v3.h" @@ -285,7 +283,7 @@ class SPIFFEValidatorFactory : public CertValidatorFactory { return std::make_unique(config, stats, time_source); } - absl::string_view name() override { return CertValidatorNames::get().SPIFFE; } + absl::string_view name() override { return "envoy.tls.cert_validator.spiffe"; } }; REGISTER_FACTORY(SPIFFEValidatorFactory, CertValidatorFactory); diff --git a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h index 55b2fa3cc05b3..fc3a045d02558 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h +++ b/source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h @@ -13,12 +13,11 @@ #include "envoy/ssl/private_key/private_key.h" #include "envoy/ssl/ssl_socket_extended_info.h" -#include "common/common/c_smart_ptr.h" -#include "common/common/matchers.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/transport_sockets/tls/cert_validator/cert_validator.h" -#include "extensions/transport_sockets/tls/stats.h" +#include "source/common/common/c_smart_ptr.h" +#include "source/common/common/matchers.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h" +#include "source/extensions/transport_sockets/tls/stats.h" #include "openssl/ssl.h" #include "openssl/x509v3.h" diff --git a/source/extensions/transport_sockets/tls/cert_validator/utility.cc b/source/extensions/transport_sockets/tls/cert_validator/utility.cc index 53a3fd41ecea5..fac07fe3aeacd 100644 --- a/source/extensions/transport_sockets/tls/cert_validator/utility.cc +++ b/source/extensions/transport_sockets/tls/cert_validator/utility.cc @@ -1,4 +1,4 @@ -#include "extensions/transport_sockets/tls/cert_validator/utility.h" +#include "source/extensions/transport_sockets/tls/cert_validator/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tls/cert_validator/well_known_names.h b/source/extensions/transport_sockets/tls/cert_validator/well_known_names.h deleted file mode 100644 index 226830cd514c2..0000000000000 --- a/source/extensions/transport_sockets/tls/cert_validator/well_known_names.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include - -#include "common/singleton/const_singleton.h" - -namespace Envoy { -namespace Extensions { -namespace TransportSockets { -namespace Tls { - -/** - * Well-known certificate validator's names. - */ -class CertValidatorValues { -public: - // default certificate validator - const std::string Default = "envoy.tls.cert_validator.default"; - - // SPIFFE(https://github.com/spiffe/spiffe) - const std::string SPIFFE = "envoy.tls.cert_validator.spiffe"; -}; - -using CertValidatorNames = ConstSingleton; - -} // namespace Tls -} // namespace TransportSockets -} // namespace Extensions -} // namespace Envoy diff --git a/source/extensions/transport_sockets/tls/config.cc b/source/extensions/transport_sockets/tls/config.cc index c743f5f6def86..4f4d46526c1f4 100644 --- a/source/extensions/transport_sockets/tls/config.cc +++ b/source/extensions/transport_sockets/tls/config.cc @@ -1,12 +1,11 @@ -#include "extensions/transport_sockets/tls/config.h" +#include "source/extensions/transport_sockets/tls/config.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" #include "envoy/extensions/transport_sockets/tls/v3/tls.pb.validate.h" -#include "common/protobuf/utility.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tls/context_config_impl.cc b/source/extensions/transport_sockets/tls/context_config_impl.cc index d20f55d817e84..4dae255fa1c37 100644 --- a/source/extensions/transport_sockets/tls/context_config_impl.cc +++ b/source/extensions/transport_sockets/tls/context_config_impl.cc @@ -1,18 +1,17 @@ -#include "extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" #include #include #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/config/datasource.h" -#include "common/protobuf/utility.h" -#include "common/secret/sds_api.h" -#include "common/ssl/certificate_validation_context_config_impl.h" - -#include "extensions/transport_sockets/tls/ssl_handshaker.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/config/datasource.h" +#include "source/common/protobuf/utility.h" +#include "source/common/secret/sds_api.h" +#include "source/common/ssl/certificate_validation_context_config_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_handshaker.h" #include "openssl/ssl.h" diff --git a/source/extensions/transport_sockets/tls/context_config_impl.h b/source/extensions/transport_sockets/tls/context_config_impl.h index 549575aa0937e..7dcbb0ea8681e 100644 --- a/source/extensions/transport_sockets/tls/context_config_impl.h +++ b/source/extensions/transport_sockets/tls/context_config_impl.h @@ -9,9 +9,9 @@ #include "envoy/server/transport_socket_config.h" #include "envoy/ssl/context_config.h" -#include "common/common/empty_string.h" -#include "common/json/json_loader.h" -#include "common/ssl/tls_certificate_config_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/json/json_loader.h" +#include "source/common/ssl/tls_certificate_config_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tls/context_impl.cc b/source/extensions/transport_sockets/tls/context_impl.cc index 29c82704c8ea4..378097a1aca7a 100644 --- a/source/extensions/transport_sockets/tls/context_impl.cc +++ b/source/extensions/transport_sockets/tls/context_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/transport_sockets/tls/context_impl.h" +#include "source/extensions/transport_sockets/tls/context_impl.h" #include #include @@ -12,19 +12,18 @@ #include "envoy/stats/scope.h" #include "envoy/type/matcher/v3/string.pb.h" -#include "common/common/assert.h" -#include "common/common/base64.h" -#include "common/common/fmt.h" -#include "common/common/hex.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_features.h" -#include "common/stats/utility.h" - -#include "extensions/transport_sockets/tls/cert_validator/factory.h" -#include "extensions/transport_sockets/tls/stats.h" -#include "extensions/transport_sockets/tls/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/base64.h" +#include "source/common/common/fmt.h" +#include "source/common/common/hex.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/stats/utility.h" +#include "source/extensions/transport_sockets/tls/cert_validator/factory.h" +#include "source/extensions/transport_sockets/tls/stats.h" +#include "source/extensions/transport_sockets/tls/utility.h" #include "absl/container/node_hash_set.h" #include "absl/strings/match.h" diff --git a/source/extensions/transport_sockets/tls/context_impl.h b/source/extensions/transport_sockets/tls/context_impl.h index 87c830184fe3a..a3b981b68eb6b 100644 --- a/source/extensions/transport_sockets/tls/context_impl.h +++ b/source/extensions/transport_sockets/tls/context_impl.h @@ -14,13 +14,12 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/matchers.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/transport_sockets/tls/cert_validator/cert_validator.h" -#include "extensions/transport_sockets/tls/context_manager_impl.h" -#include "extensions/transport_sockets/tls/ocsp/ocsp.h" -#include "extensions/transport_sockets/tls/stats.h" +#include "source/common/common/matchers.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/transport_sockets/tls/cert_validator/cert_validator.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/extensions/transport_sockets/tls/ocsp/ocsp.h" +#include "source/extensions/transport_sockets/tls/stats.h" #include "absl/synchronization/mutex.h" #include "openssl/ssl.h" diff --git a/source/extensions/transport_sockets/tls/context_manager_impl.cc b/source/extensions/transport_sockets/tls/context_manager_impl.cc index fd0eefe761ea6..7c83121892f2d 100644 --- a/source/extensions/transport_sockets/tls/context_manager_impl.cc +++ b/source/extensions/transport_sockets/tls/context_manager_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include #include @@ -6,9 +6,8 @@ #include "envoy/stats/scope.h" -#include "common/common/assert.h" - -#include "extensions/transport_sockets/tls/context_impl.h" +#include "source/common/common/assert.h" +#include "source/extensions/transport_sockets/tls/context_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tls/context_manager_impl.h b/source/extensions/transport_sockets/tls/context_manager_impl.h index 3b680fc91c754..eb8914fc0009d 100644 --- a/source/extensions/transport_sockets/tls/context_manager_impl.h +++ b/source/extensions/transport_sockets/tls/context_manager_impl.h @@ -8,7 +8,7 @@ #include "envoy/ssl/private_key/private_key.h" #include "envoy/stats/scope.h" -#include "extensions/transport_sockets/tls/private_key/private_key_manager_impl.h" +#include "source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tls/io_handle_bio.cc b/source/extensions/transport_sockets/tls/io_handle_bio.cc index e4867e95c6237..f7ede00cd45a7 100644 --- a/source/extensions/transport_sockets/tls/io_handle_bio.cc +++ b/source/extensions/transport_sockets/tls/io_handle_bio.cc @@ -1,4 +1,4 @@ -#include "extensions/transport_sockets/tls/io_handle_bio.h" +#include "source/extensions/transport_sockets/tls/io_handle_bio.h" #include "envoy/buffer/buffer.h" #include "envoy/network/io_handle.h" diff --git a/source/extensions/transport_sockets/tls/ocsp/BUILD b/source/extensions/transport_sockets/tls/ocsp/BUILD index e2995afd45cdf..70b250cffe15e 100644 --- a/source/extensions/transport_sockets/tls/ocsp/BUILD +++ b/source/extensions/transport_sockets/tls/ocsp/BUILD @@ -15,8 +15,8 @@ envoy_cc_library( repository = "", deps = [ ":asn1_utility_lib", - "//include/envoy/common:time_interface", - "//include/envoy/ssl:context_config_interface", + "//envoy/common:time_interface", + "//envoy/ssl:context_config_interface", "//source/extensions/transport_sockets/tls:utility_lib", ], ) @@ -27,8 +27,8 @@ envoy_cc_library( hdrs = ["asn1_utility.h"], repository = "", deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/ssl:context_config_interface", + "//envoy/common:time_interface", + "//envoy/ssl:context_config_interface", "//source/common/common:c_smart_ptr_lib", ], ) diff --git a/source/extensions/transport_sockets/tls/ocsp/asn1_utility.cc b/source/extensions/transport_sockets/tls/ocsp/asn1_utility.cc index 3da51ed7e9f3f..e152cf8d0f1fd 100644 --- a/source/extensions/transport_sockets/tls/ocsp/asn1_utility.cc +++ b/source/extensions/transport_sockets/tls/ocsp/asn1_utility.cc @@ -1,6 +1,6 @@ -#include "extensions/transport_sockets/tls/ocsp/asn1_utility.h" +#include "source/extensions/transport_sockets/tls/ocsp/asn1_utility.h" -#include "common/common/c_smart_ptr.h" +#include "source/common/common/c_smart_ptr.h" #include "absl/strings/ascii.h" diff --git a/source/extensions/transport_sockets/tls/ocsp/asn1_utility.h b/source/extensions/transport_sockets/tls/ocsp/asn1_utility.h index 05bea0c2d19b8..061b0fc5f7a9f 100644 --- a/source/extensions/transport_sockets/tls/ocsp/asn1_utility.h +++ b/source/extensions/transport_sockets/tls/ocsp/asn1_utility.h @@ -7,7 +7,7 @@ #include "envoy/common/exception.h" #include "envoy/common/time.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/types/optional.h" #include "absl/types/variant.h" diff --git a/source/extensions/transport_sockets/tls/ocsp/ocsp.cc b/source/extensions/transport_sockets/tls/ocsp/ocsp.cc index 32410365916fb..0e493685ab70c 100644 --- a/source/extensions/transport_sockets/tls/ocsp/ocsp.cc +++ b/source/extensions/transport_sockets/tls/ocsp/ocsp.cc @@ -1,9 +1,8 @@ -#include "extensions/transport_sockets/tls/ocsp/ocsp.h" +#include "source/extensions/transport_sockets/tls/ocsp/ocsp.h" -#include "common/common/utility.h" - -#include "extensions/transport_sockets/tls/ocsp/asn1_utility.h" -#include "extensions/transport_sockets/tls/utility.h" +#include "source/common/common/utility.h" +#include "source/extensions/transport_sockets/tls/ocsp/asn1_utility.h" +#include "source/extensions/transport_sockets/tls/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/transport_sockets/tls/private_key/BUILD b/source/extensions/transport_sockets/tls/private_key/BUILD index f6163ca640126..3d9a42a78c76d 100644 --- a/source/extensions/transport_sockets/tls/private_key/BUILD +++ b/source/extensions/transport_sockets/tls/private_key/BUILD @@ -17,10 +17,10 @@ envoy_cc_library( "private_key_manager_impl.h", ], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/registry", - "//include/envoy/ssl/private_key:private_key_config_interface", - "//include/envoy/ssl/private_key:private_key_interface", + "//envoy/event:dispatcher_interface", + "//envoy/registry", + "//envoy/ssl/private_key:private_key_config_interface", + "//envoy/ssl/private_key:private_key_interface", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", ], ) diff --git a/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc b/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc index b7103768ce9c1..f886beeaa96ed 100644 --- a/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc +++ b/source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.cc @@ -1,4 +1,4 @@ -#include "extensions/transport_sockets/tls/private_key/private_key_manager_impl.h" +#include "source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" #include "envoy/registry/registry.h" diff --git a/source/extensions/transport_sockets/tls/ssl_handshaker.cc b/source/extensions/transport_sockets/tls/ssl_handshaker.cc index 766454bbd8794..5361d7b42bc4e 100644 --- a/source/extensions/transport_sockets/tls/ssl_handshaker.cc +++ b/source/extensions/transport_sockets/tls/ssl_handshaker.cc @@ -1,13 +1,12 @@ -#include "extensions/transport_sockets/tls/ssl_handshaker.h" +#include "source/extensions/transport_sockets/tls/ssl_handshaker.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/hex.h" -#include "common/http/headers.h" - -#include "extensions/transport_sockets/tls/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/hex.h" +#include "source/common/http/headers.h" +#include "source/extensions/transport_sockets/tls/utility.h" #include "absl/strings/str_replace.h" #include "openssl/err.h" diff --git a/source/extensions/transport_sockets/tls/ssl_handshaker.h b/source/extensions/transport_sockets/tls/ssl_handshaker.h index ec43d5a784d56..81577c8181744 100644 --- a/source/extensions/transport_sockets/tls/ssl_handshaker.h +++ b/source/extensions/transport_sockets/tls/ssl_handshaker.h @@ -13,9 +13,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" - -#include "extensions/transport_sockets/tls/utility.h" +#include "source/common/common/logger.h" +#include "source/extensions/transport_sockets/tls/utility.h" #include "absl/container/node_hash_map.h" #include "absl/synchronization/mutex.h" diff --git a/source/extensions/transport_sockets/tls/ssl_socket.cc b/source/extensions/transport_sockets/tls/ssl_socket.cc index b7d8a85635124..98c2989b57bf7 100644 --- a/source/extensions/transport_sockets/tls/ssl_socket.cc +++ b/source/extensions/transport_sockets/tls/ssl_socket.cc @@ -1,16 +1,15 @@ -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/hex.h" -#include "common/http/headers.h" -#include "common/runtime/runtime_features.h" - -#include "extensions/transport_sockets/tls/io_handle_bio.h" -#include "extensions/transport_sockets/tls/ssl_handshaker.h" -#include "extensions/transport_sockets/tls/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/hex.h" +#include "source/common/http/headers.h" +#include "source/common/runtime/runtime_features.h" +#include "source/extensions/transport_sockets/tls/io_handle_bio.h" +#include "source/extensions/transport_sockets/tls/ssl_handshaker.h" +#include "source/extensions/transport_sockets/tls/utility.h" #include "absl/strings/str_replace.h" #include "openssl/err.h" diff --git a/source/extensions/transport_sockets/tls/ssl_socket.h b/source/extensions/transport_sockets/tls/ssl_socket.h index 203fbe7078493..217c7abcff06e 100644 --- a/source/extensions/transport_sockets/tls/ssl_socket.h +++ b/source/extensions/transport_sockets/tls/ssl_socket.h @@ -13,11 +13,10 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" -#include "common/common/logger.h" - -#include "extensions/transport_sockets/tls/context_impl.h" -#include "extensions/transport_sockets/tls/ssl_handshaker.h" -#include "extensions/transport_sockets/tls/utility.h" +#include "source/common/common/logger.h" +#include "source/extensions/transport_sockets/tls/context_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_handshaker.h" +#include "source/extensions/transport_sockets/tls/utility.h" #include "absl/container/node_hash_map.h" #include "absl/synchronization/mutex.h" diff --git a/source/extensions/transport_sockets/tls/stats.cc b/source/extensions/transport_sockets/tls/stats.cc index f162e9db75129..5a5cdc86c0541 100644 --- a/source/extensions/transport_sockets/tls/stats.cc +++ b/source/extensions/transport_sockets/tls/stats.cc @@ -1,4 +1,4 @@ -#include "extensions/transport_sockets/tls/stats.h" +#include "source/extensions/transport_sockets/tls/stats.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" diff --git a/source/extensions/transport_sockets/tls/utility.cc b/source/extensions/transport_sockets/tls/utility.cc index 1dfa5df48b696..cbc6739c02996 100644 --- a/source/extensions/transport_sockets/tls/utility.cc +++ b/source/extensions/transport_sockets/tls/utility.cc @@ -1,10 +1,10 @@ -#include "extensions/transport_sockets/tls/utility.h" +#include "source/extensions/transport_sockets/tls/utility.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/safe_memcpy.h" -#include "common/network/address_impl.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/utility.h" #include "absl/strings/str_join.h" #include "openssl/x509v3.h" diff --git a/source/extensions/transport_sockets/tls/utility.h b/source/extensions/transport_sockets/tls/utility.h index 3bb48b2aa1481..76824328d46ba 100644 --- a/source/extensions/transport_sockets/tls/utility.h +++ b/source/extensions/transport_sockets/tls/utility.h @@ -5,7 +5,7 @@ #include "envoy/ssl/context.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" #include "absl/types/optional.h" #include "openssl/ssl.h" diff --git a/source/extensions/transport_sockets/well_known_names.h b/source/extensions/transport_sockets/well_known_names.h deleted file mode 100644 index ef6e85361feed..0000000000000 --- a/source/extensions/transport_sockets/well_known_names.h +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once - -#include - -#include "common/singleton/const_singleton.h" - -namespace Envoy { -namespace Extensions { -namespace TransportSockets { - -/** - * Well-known transport socket names. - * NOTE: New transport sockets should use the well known name: envoy.transport_sockets.name. - */ -class TransportSocketNameValues { -public: - const std::string Alts = "envoy.transport_sockets.alts"; - const std::string Quic = "envoy.transport_sockets.quic"; - const std::string RawBuffer = "envoy.transport_sockets.raw_buffer"; - const std::string Tap = "envoy.transport_sockets.tap"; - const std::string Tls = "envoy.transport_sockets.tls"; - const std::string UpstreamProxyProtocol = "envoy.transport_sockets.upstream_proxy_protocol"; - const std::string StartTls = "envoy.transport_sockets.starttls"; -}; - -using TransportSocketNames = ConstSingleton; - -/** - * Well-known transport protocol names. - */ -class TransportProtocolNameValues { -public: - const std::string Tls = "tls"; - const std::string RawBuffer = "raw_buffer"; - const std::string Quic = "quic"; - const std::string StartTls = "starttls"; -}; - -// TODO(lizan): Find a better place to have this singleton. -using TransportProtocolNames = ConstSingleton; - -} // namespace TransportSockets -} // namespace Extensions -} // namespace Envoy diff --git a/source/extensions/upstreams/http/BUILD b/source/extensions/upstreams/http/BUILD index 247274b2fa85b..bf6272398e7b5 100644 --- a/source/extensions/upstreams/http/BUILD +++ b/source/extensions/upstreams/http/BUILD @@ -15,7 +15,7 @@ envoy_cc_extension( # This is core Envoy config. visibility = ["//visibility:public"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/common:minimal_logger_lib", "//source/common/config:utility_lib", "//source/common/http:utility_lib", diff --git a/source/extensions/upstreams/http/config.cc b/source/extensions/upstreams/http/config.cc index fd204bfd75d84..29cde124642b0 100644 --- a/source/extensions/upstreams/http/config.cc +++ b/source/extensions/upstreams/http/config.cc @@ -1,4 +1,4 @@ -#include "extensions/upstreams/http/config.h" +#include "source/extensions/upstreams/http/config.h" #include #include @@ -9,10 +9,10 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/upstream/upstream.h" -#include "common/config/utility.h" -#include "common/http/http1/settings.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/config/utility.h" +#include "source/common/http/http1/settings.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/upstreams/http/config.h b/source/extensions/upstreams/http/config.h index 4668c5d1a38a7..7ae4479c63d2b 100644 --- a/source/extensions/upstreams/http/config.h +++ b/source/extensions/upstreams/http/config.h @@ -15,8 +15,8 @@ #include "envoy/server/filter_config.h" #include "envoy/server/transport_socket_config.h" -#include "common/common/logger.h" -#include "common/protobuf/message_validator_impl.h" +#include "source/common/common/logger.h" +#include "source/common/protobuf/message_validator_impl.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/upstreams/http/generic/config.cc b/source/extensions/upstreams/http/generic/config.cc index caedb4babd786..b2b02e28ac56a 100644 --- a/source/extensions/upstreams/http/generic/config.cc +++ b/source/extensions/upstreams/http/generic/config.cc @@ -1,7 +1,7 @@ -#include "extensions/upstreams/http/generic/config.h" +#include "source/extensions/upstreams/http/generic/config.h" -#include "extensions/upstreams/http/http/upstream_request.h" -#include "extensions/upstreams/http/tcp/upstream_request.h" +#include "source/extensions/upstreams/http/http/upstream_request.h" +#include "source/extensions/upstreams/http/tcp/upstream_request.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/upstreams/http/http/BUILD b/source/extensions/upstreams/http/http/BUILD index 4a4bd1be575f0..d53b9a92a9dd5 100644 --- a/source/extensions/upstreams/http/http/BUILD +++ b/source/extensions/upstreams/http/http/BUILD @@ -34,11 +34,11 @@ envoy_cc_library( ], visibility = ["//visibility:public"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/http:conn_pool_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/http:codes_interface", + "//envoy/http:conn_pool_interface", + "//envoy/http:filter_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/http:codes_lib", diff --git a/source/extensions/upstreams/http/http/config.cc b/source/extensions/upstreams/http/http/config.cc index a6084a1219d81..620915a11d66b 100644 --- a/source/extensions/upstreams/http/http/config.cc +++ b/source/extensions/upstreams/http/http/config.cc @@ -1,6 +1,6 @@ -#include "extensions/upstreams/http/http/config.h" +#include "source/extensions/upstreams/http/http/config.h" -#include "extensions/upstreams/http/http/upstream_request.h" +#include "source/extensions/upstreams/http/http/upstream_request.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/upstreams/http/http/upstream_request.cc b/source/extensions/upstreams/http/http/upstream_request.cc index f41b081f8b188..4f9c42448d8d2 100644 --- a/source/extensions/upstreams/http/http/upstream_request.cc +++ b/source/extensions/upstreams/http/http/upstream_request.cc @@ -1,4 +1,4 @@ -#include "extensions/upstreams/http/http/upstream_request.h" +#include "source/extensions/upstreams/http/http/upstream_request.h" #include #include @@ -10,13 +10,13 @@ #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/upstream.h" -#include "common/common/utility.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/router/router.h" +#include "source/common/common/utility.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/router/router.h" using Envoy::Router::GenericConnectionPoolCallbacks; @@ -32,7 +32,7 @@ void HttpConnPool::newStream(GenericConnectionPoolCallbacks* callbacks) { // might get deleted inline as well. Only write the returned handle out if it is not nullptr to // deal with this case. Envoy::Http::ConnectionPool::Cancellable* handle = - conn_pool_->newStream(callbacks->upstreamToDownstream(), *this); + pool_data_.value().newStream(callbacks->upstreamToDownstream(), *this); if (handle) { conn_pool_stream_handle_ = handle; } diff --git a/source/extensions/upstreams/http/http/upstream_request.h b/source/extensions/upstreams/http/http/upstream_request.h index c36dbb4f1a97a..a49dc28758904 100644 --- a/source/extensions/upstreams/http/http/upstream_request.h +++ b/source/extensions/upstreams/http/http/upstream_request.h @@ -7,10 +7,10 @@ #include "envoy/http/conn_pool.h" #include "envoy/upstream/thread_local_cluster.h" -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/config/well_known_names.h" -#include "common/router/upstream_request.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/config/well_known_names.h" +#include "source/common/router/upstream_request.h" namespace Envoy { namespace Extensions { @@ -26,7 +26,7 @@ class HttpConnPool : public Router::GenericConnPool, public Envoy::Http::Connect absl::optional downstream_protocol, Upstream::LoadBalancerContext* ctx) { ASSERT(!is_connect); - conn_pool_ = + pool_data_ = thread_local_cluster.httpConnPool(route_entry.priority(), downstream_protocol, ctx); } ~HttpConnPool() override { @@ -42,13 +42,15 @@ class HttpConnPool : public Router::GenericConnPool, public Envoy::Http::Connect void onPoolReady(Envoy::Http::RequestEncoder& callbacks_encoder, Upstream::HostDescriptionConstSharedPtr host, const StreamInfo::StreamInfo& info, absl::optional protocol) override; - Upstream::HostDescriptionConstSharedPtr host() const override { return conn_pool_->host(); } + Upstream::HostDescriptionConstSharedPtr host() const override { + return pool_data_.value().host(); + } - bool valid() { return conn_pool_ != nullptr; } + bool valid() { return pool_data_.has_value(); } protected: // Points to the actual connection pool to create streams from. - Envoy::Http::ConnectionPool::Instance* conn_pool_{}; + absl::optional pool_data_{}; Envoy::Http::ConnectionPool::Cancellable* conn_pool_stream_handle_{}; Router::GenericConnectionPoolCallbacks* callbacks_{}; }; diff --git a/source/extensions/upstreams/http/tcp/BUILD b/source/extensions/upstreams/http/tcp/BUILD index 95b2d94dbae47..869c0ee5ec6a8 100644 --- a/source/extensions/upstreams/http/tcp/BUILD +++ b/source/extensions/upstreams/http/tcp/BUILD @@ -34,9 +34,9 @@ envoy_cc_library( ], visibility = ["//visibility:public"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/common:utility_lib", diff --git a/source/extensions/upstreams/http/tcp/config.cc b/source/extensions/upstreams/http/tcp/config.cc index 8f0df971dc9f8..b0773c0a95359 100644 --- a/source/extensions/upstreams/http/tcp/config.cc +++ b/source/extensions/upstreams/http/tcp/config.cc @@ -1,6 +1,6 @@ -#include "extensions/upstreams/http/tcp/config.h" +#include "source/extensions/upstreams/http/tcp/config.h" -#include "extensions/upstreams/http/tcp/upstream_request.h" +#include "source/extensions/upstreams/http/tcp/upstream_request.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/upstreams/http/tcp/upstream_request.cc b/source/extensions/upstreams/http/tcp/upstream_request.cc index 3ec33c73284ea..17d291a1a437a 100644 --- a/source/extensions/upstreams/http/tcp/upstream_request.cc +++ b/source/extensions/upstreams/http/tcp/upstream_request.cc @@ -1,20 +1,19 @@ -#include "extensions/upstreams/http/tcp/upstream_request.h" +#include "source/extensions/upstreams/http/tcp/upstream_request.h" #include #include #include "envoy/upstream/upstream.h" -#include "common/common/assert.h" -#include "common/common/utility.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/router/router.h" - -#include "extensions/common/proxy_protocol/proxy_protocol_header.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/router/router.h" +#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/upstreams/http/tcp/upstream_request.h b/source/extensions/upstreams/http/tcp/upstream_request.h index bffc7ee447d1d..7cdd070f041a7 100644 --- a/source/extensions/upstreams/http/tcp/upstream_request.h +++ b/source/extensions/upstreams/http/tcp/upstream_request.h @@ -7,12 +7,12 @@ #include "envoy/tcp/conn_pool.h" #include "envoy/upstream/thread_local_cluster.h" -#include "common/buffer/watermark_buffer.h" -#include "common/common/cleanup.h" -#include "common/common/logger.h" -#include "common/config/well_known_names.h" -#include "common/router/upstream_request.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/logger.h" +#include "source/common/config/well_known_names.h" +#include "source/common/router/upstream_request.h" +#include "source/common/stream_info/stream_info_impl.h" namespace Envoy { namespace Extensions { @@ -26,11 +26,11 @@ class TcpConnPool : public Router::GenericConnPool, public Envoy::Tcp::Connectio const Router::RouteEntry& route_entry, absl::optional, Upstream::LoadBalancerContext* ctx) { ASSERT(is_connect); - conn_pool_ = thread_local_cluster.tcpConnPool(route_entry.priority(), ctx); + conn_pool_data_ = thread_local_cluster.tcpConnPool(route_entry.priority(), ctx); } void newStream(Router::GenericConnectionPoolCallbacks* callbacks) override { callbacks_ = callbacks; - upstream_handle_ = conn_pool_->newConnection(*this); + upstream_handle_ = conn_pool_data_.value().newConnection(*this); } bool cancelAnyPendingStream() override { @@ -41,9 +41,11 @@ class TcpConnPool : public Router::GenericConnPool, public Envoy::Tcp::Connectio } return false; } - Upstream::HostDescriptionConstSharedPtr host() const override { return conn_pool_->host(); } + Upstream::HostDescriptionConstSharedPtr host() const override { + return conn_pool_data_.value().host(); + } - bool valid() { return conn_pool_ != nullptr; } + bool valid() { return conn_pool_data_.has_value(); } // Tcp::ConnectionPool::Callbacks void onPoolFailure(ConnectionPool::PoolFailureReason reason, @@ -56,7 +58,7 @@ class TcpConnPool : public Router::GenericConnPool, public Envoy::Tcp::Connectio Upstream::HostDescriptionConstSharedPtr host) override; private: - Envoy::Tcp::ConnectionPool::Instance* conn_pool_; + absl::optional conn_pool_data_; Envoy::Tcp::ConnectionPool::Cancellable* upstream_handle_{}; Router::GenericConnectionPoolCallbacks* callbacks_{}; }; diff --git a/source/extensions/upstreams/tcp/generic/config.cc b/source/extensions/upstreams/tcp/generic/config.cc index 7d708c4a666a1..77625e5fd0404 100644 --- a/source/extensions/upstreams/tcp/generic/config.cc +++ b/source/extensions/upstreams/tcp/generic/config.cc @@ -1,9 +1,9 @@ -#include "extensions/upstreams/tcp/generic/config.h" +#include "source/extensions/upstreams/tcp/generic/config.h" #include "envoy/upstream/cluster_manager.h" -#include "common/http/codec_client.h" -#include "common/tcp_proxy/upstream.h" +#include "source/common/http/codec_client.h" +#include "source/common/tcp_proxy/upstream.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/wasm_runtime/null/BUILD b/source/extensions/wasm_runtime/null/BUILD index 1dbb4846e20b4..d47a3c211516b 100644 --- a/source/extensions/wasm_runtime/null/BUILD +++ b/source/extensions/wasm_runtime/null/BUILD @@ -12,7 +12,7 @@ envoy_cc_extension( name = "config", srcs = ["config.cc"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/common/wasm:wasm_runtime_factory_interface", "@proxy_wasm_cpp_host//:null_lib", ], diff --git a/source/extensions/wasm_runtime/null/config.cc b/source/extensions/wasm_runtime/null/config.cc index e281a24deb748..62de7669608db 100644 --- a/source/extensions/wasm_runtime/null/config.cc +++ b/source/extensions/wasm_runtime/null/config.cc @@ -1,6 +1,6 @@ #include "envoy/registry/registry.h" -#include "extensions/common/wasm/wasm_runtime_factory.h" +#include "source/extensions/common/wasm/wasm_runtime_factory.h" #include "include/proxy-wasm/null.h" diff --git a/source/extensions/wasm_runtime/v8/BUILD b/source/extensions/wasm_runtime/v8/BUILD index 45dd6833558f5..708c38aa04481 100644 --- a/source/extensions/wasm_runtime/v8/BUILD +++ b/source/extensions/wasm_runtime/v8/BUILD @@ -13,7 +13,7 @@ envoy_cc_extension( name = "config", srcs = ["config.cc"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/common/wasm:wasm_runtime_factory_interface", ] + envoy_select_wasm_v8([ "@proxy_wasm_cpp_host//:v8_lib", diff --git a/source/extensions/wasm_runtime/v8/config.cc b/source/extensions/wasm_runtime/v8/config.cc index 0aabca1fdd08e..c4d77714a9fa9 100644 --- a/source/extensions/wasm_runtime/v8/config.cc +++ b/source/extensions/wasm_runtime/v8/config.cc @@ -1,6 +1,6 @@ #include "envoy/registry/registry.h" -#include "extensions/common/wasm/wasm_runtime_factory.h" +#include "source/extensions/common/wasm/wasm_runtime_factory.h" #include "include/proxy-wasm/v8.h" diff --git a/source/extensions/wasm_runtime/wamr/BUILD b/source/extensions/wasm_runtime/wamr/BUILD index 69766fad9e4ce..fdf3bc67d150d 100644 --- a/source/extensions/wasm_runtime/wamr/BUILD +++ b/source/extensions/wasm_runtime/wamr/BUILD @@ -13,7 +13,7 @@ envoy_cc_extension( name = "config", srcs = ["config.cc"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/common/wasm:wasm_runtime_factory_interface", ] + envoy_select_wasm_wamr([ "@proxy_wasm_cpp_host//:wamr_lib", diff --git a/source/extensions/wasm_runtime/wamr/config.cc b/source/extensions/wasm_runtime/wamr/config.cc index 5b6afb04a197e..4c34aede55558 100644 --- a/source/extensions/wasm_runtime/wamr/config.cc +++ b/source/extensions/wasm_runtime/wamr/config.cc @@ -1,6 +1,6 @@ #include "envoy/registry/registry.h" -#include "extensions/common/wasm/wasm_runtime_factory.h" +#include "source/extensions/common/wasm/wasm_runtime_factory.h" #include "include/proxy-wasm/wamr.h" diff --git a/source/extensions/wasm_runtime/wasmtime/BUILD b/source/extensions/wasm_runtime/wasmtime/BUILD index 83ee6552fe39a..4db207bd2f4ea 100644 --- a/source/extensions/wasm_runtime/wasmtime/BUILD +++ b/source/extensions/wasm_runtime/wasmtime/BUILD @@ -13,7 +13,7 @@ envoy_cc_extension( name = "config", srcs = ["config.cc"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/common/wasm:wasm_runtime_factory_interface", ] + envoy_select_wasm_wasmtime([ "@proxy_wasm_cpp_host//:wasmtime_lib", diff --git a/source/extensions/wasm_runtime/wasmtime/config.cc b/source/extensions/wasm_runtime/wasmtime/config.cc index 9e25ce8e15480..331504f2e44b9 100644 --- a/source/extensions/wasm_runtime/wasmtime/config.cc +++ b/source/extensions/wasm_runtime/wasmtime/config.cc @@ -1,6 +1,6 @@ #include "envoy/registry/registry.h" -#include "extensions/common/wasm/wasm_runtime_factory.h" +#include "source/extensions/common/wasm/wasm_runtime_factory.h" #include "include/proxy-wasm/wasmtime.h" diff --git a/source/extensions/wasm_runtime/wavm/BUILD b/source/extensions/wasm_runtime/wavm/BUILD index cca25e7aaace4..132957c1ee597 100644 --- a/source/extensions/wasm_runtime/wavm/BUILD +++ b/source/extensions/wasm_runtime/wavm/BUILD @@ -13,7 +13,7 @@ envoy_cc_extension( name = "config", srcs = ["config.cc"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/common/wasm:wasm_runtime_factory_interface", ] + envoy_select_wasm_wavm([ "@proxy_wasm_cpp_host//:wavm_lib", diff --git a/source/extensions/wasm_runtime/wavm/config.cc b/source/extensions/wasm_runtime/wavm/config.cc index be53e31f523b1..3a94ccc8831a3 100644 --- a/source/extensions/wasm_runtime/wavm/config.cc +++ b/source/extensions/wasm_runtime/wavm/config.cc @@ -1,6 +1,6 @@ #include "envoy/registry/registry.h" -#include "extensions/common/wasm/wasm_runtime_factory.h" +#include "source/extensions/common/wasm/wasm_runtime_factory.h" #include "include/proxy-wasm/wavm.h" diff --git a/source/extensions/watchdog/profile_action/BUILD b/source/extensions/watchdog/profile_action/BUILD index 6c0ab2f392d6a..1de6bb89d0755 100644 --- a/source/extensions/watchdog/profile_action/BUILD +++ b/source/extensions/watchdog/profile_action/BUILD @@ -17,11 +17,11 @@ envoy_cc_library( "abseil_optional", ], deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/common:time_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/server:guarddog_config_interface", - "//include/envoy/thread:thread_interface", + "//envoy/api:api_interface", + "//envoy/common:time_interface", + "//envoy/event:timer_interface", + "//envoy/server:guarddog_config_interface", + "//envoy/thread:thread_interface", "//source/common/profiler:profiler_lib", "//source/common/protobuf:utility_lib", "//source/common/stats:symbol_table_lib", @@ -35,7 +35,7 @@ envoy_cc_extension( hdrs = ["config.h"], deps = [ ":profile_action_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/common/common:assert_lib", "//source/common/config:utility_lib", "//source/common/protobuf", diff --git a/source/extensions/watchdog/profile_action/config.cc b/source/extensions/watchdog/profile_action/config.cc index 035fa17641e02..ebf4dfa24e08f 100644 --- a/source/extensions/watchdog/profile_action/config.cc +++ b/source/extensions/watchdog/profile_action/config.cc @@ -1,11 +1,10 @@ -#include "extensions/watchdog/profile_action/config.h" +#include "source/extensions/watchdog/profile_action/config.h" #include "envoy/registry/registry.h" -#include "common/config/utility.h" -#include "common/protobuf/message_validator_impl.h" - -#include "extensions/watchdog/profile_action/profile_action.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/extensions/watchdog/profile_action/profile_action.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/watchdog/profile_action/config.h b/source/extensions/watchdog/profile_action/config.h index 0ccce8a03b7cd..de821d48fcedd 100644 --- a/source/extensions/watchdog/profile_action/config.h +++ b/source/extensions/watchdog/profile_action/config.h @@ -3,7 +3,7 @@ #include "envoy/extensions/watchdog/profile_action/v3alpha/profile_action.pb.h" #include "envoy/server/guarddog_config.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/source/extensions/watchdog/profile_action/profile_action.cc b/source/extensions/watchdog/profile_action/profile_action.cc index d324f45da39d8..3d1fc5adc4653 100644 --- a/source/extensions/watchdog/profile_action/profile_action.cc +++ b/source/extensions/watchdog/profile_action/profile_action.cc @@ -1,12 +1,12 @@ -#include "extensions/watchdog/profile_action/profile_action.h" +#include "source/extensions/watchdog/profile_action/profile_action.h" #include #include "envoy/thread/thread.h" -#include "common/profiler/profiler.h" -#include "common/protobuf/utility.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/profiler/profiler.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stats/symbol_table_impl.h" #include "absl/strings/str_format.h" diff --git a/source/server/BUILD b/source/server/BUILD index bd71a70146747..dc5d9ad5a8fb6 100644 --- a/source/server/BUILD +++ b/source/server/BUILD @@ -31,16 +31,16 @@ envoy_cc_library( srcs = ["configuration_impl.cc"], hdrs = ["configuration_impl.h"], deps = [ - "//include/envoy/config:typed_config_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/server:configuration_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/server:instance_interface", - "//include/envoy/server:tracer_config_interface", - "//include/envoy/ssl:context_manager_interface", + "//envoy/config:typed_config_interface", + "//envoy/http:filter_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/runtime:runtime_interface", + "//envoy/server:configuration_interface", + "//envoy/server:filter_config_interface", + "//envoy/server:instance_interface", + "//envoy/server:tracer_config_interface", + "//envoy/ssl:context_manager_interface", "//source/common/access_log:access_log_lib", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", @@ -78,16 +78,16 @@ envoy_cc_library( ], deps = [ ":active_tcp_listener", - "//include/envoy/common:time_interface", - "//include/envoy/event:deferred_deletable", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:connection_handler_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/network:listen_socket_interface", - "//include/envoy/network:listener_interface", - "//include/envoy/server:listener_manager_interface", - "//include/envoy/stats:timespan_interface", + "//envoy/common:time_interface", + "//envoy/event:deferred_deletable", + "//envoy/event:dispatcher_interface", + "//envoy/network:connection_handler_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/network:listen_socket_interface", + "//envoy/network:listener_interface", + "//envoy/server:listener_manager_interface", + "//envoy/stats:timespan_interface", "//source/common/common:linked_object", "//source/common/common:non_copyable", "//source/common/event:deferred_task", @@ -102,9 +102,9 @@ envoy_cc_library( "active_listener_base.h", ], deps = [ - "//include/envoy/network:connection_handler_interface", - "//include/envoy/network:listener_interface", - "//include/envoy/stats:timespan_interface", + "//envoy/network:connection_handler_interface", + "//envoy/network:listener_interface", + "//envoy/stats:timespan_interface", "//source/common/stats:timespan_lib", ], ) @@ -116,17 +116,18 @@ envoy_cc_library( "active_tcp_listener.h", ], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/event:deferred_deletable", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:connection_handler_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/network:listen_socket_interface", - "//include/envoy/network:listener_interface", - "//include/envoy/server:listener_manager_interface", - "//include/envoy/stats:timespan_interface", + "//envoy/common:time_interface", + "//envoy/event:deferred_deletable", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/network:connection_handler_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/network:listen_socket_interface", + "//envoy/network:listener_interface", + "//envoy/server:listener_manager_interface", + "//envoy/stats:timespan_interface", + "//source/common/common:assert_lib", "//source/common/common:linked_object", "//source/common/common:non_copyable", "//source/common/common:safe_memcpy_lib", @@ -145,13 +146,13 @@ envoy_cc_library( "active_udp_listener.h", ], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:connection_handler_interface", - "//include/envoy/network:exception_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/network:listen_socket_interface", - "//include/envoy/network:listener_interface", - "//include/envoy/server:listener_manager_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:connection_handler_interface", + "//envoy/network:exception_interface", + "//envoy/network:filter_interface", + "//envoy/network:listen_socket_interface", + "//envoy/network:listener_interface", + "//envoy/server:listener_manager_interface", "//source/server:connection_handler_impl", ], ) @@ -163,11 +164,11 @@ envoy_cc_library( "drain_manager_impl.h", ], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/server:drain_manager_interface", - "//include/envoy/server:instance_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/runtime:runtime_interface", + "//envoy/server:drain_manager_interface", + "//envoy/server:instance_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", @@ -181,16 +182,16 @@ envoy_cc_library( external_deps = ["abseil_optional"], deps = [ ":watchdog_lib", - "//include/envoy/api:api_interface", - "//include/envoy/common:time_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/server:configuration_interface", - "//include/envoy/server:guarddog_config_interface", - "//include/envoy/server:guarddog_interface", - "//include/envoy/server:watchdog_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/thread:thread_interface", + "//envoy/api:api_interface", + "//envoy/common:time_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/server:configuration_interface", + "//envoy/server:guarddog_config_interface", + "//envoy/server:guarddog_interface", + "//envoy/server:watchdog_interface", + "//envoy/stats:stats_interface", + "//envoy/thread:thread_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/common:thread_lib", @@ -215,13 +216,13 @@ envoy_cc_library( hdrs = envoy_select_hot_restart(["hot_restarting_base.h"]), deps = [ ":hot_restart_cc_proto", - "//include/envoy/api:os_sys_calls_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:file_event_interface", - "//include/envoy/server:hot_restart_interface", - "//include/envoy/server:instance_interface", - "//include/envoy/server:options_interface", - "//include/envoy/stats:stats_interface", + "//envoy/api:os_sys_calls_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:file_event_interface", + "//envoy/server:hot_restart_interface", + "//envoy/server:instance_interface", + "//envoy/server:options_interface", + "//envoy/stats:stats_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/common:mem_block_builder_lib", @@ -263,12 +264,12 @@ envoy_cc_library( deps = [ ":hot_restarting_child", ":hot_restarting_parent", - "//include/envoy/api:os_sys_calls_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:file_event_interface", - "//include/envoy/server:hot_restart_interface", - "//include/envoy/server:instance_interface", - "//include/envoy/server:options_interface", + "//envoy/api:os_sys_calls_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:file_event_interface", + "//envoy/server:hot_restart_interface", + "//envoy/server:instance_interface", + "//envoy/server:options_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//source/common/stats:allocator_lib", @@ -279,7 +280,7 @@ envoy_cc_library( name = "hot_restart_nop_lib", hdrs = ["hot_restart_nop_impl.h"], deps = [ - "//include/envoy/server:hot_restart_interface", + "//envoy/server:hot_restart_interface", "//source/common/stats:allocator_lib", ], ) @@ -307,10 +308,10 @@ envoy_cc_library( copts = ["-DHAVE_LONG_LONG"], external_deps = ["tclap"], deps = [ - "//include/envoy/network:address_interface", - "//include/envoy/registry", - "//include/envoy/server:options_interface", - "//include/envoy/stats:stats_interface", + "//envoy/network:address_interface", + "//envoy/registry", + "//envoy/server:options_interface", + "//envoy/stats:stats_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:logger_lib", "//source/common/common:macros", @@ -326,9 +327,9 @@ envoy_cc_library( srcs = ["overload_manager_impl.cc"], hdrs = ["overload_manager_impl.h"], deps = [ - "//include/envoy/server/overload:overload_manager_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/server/overload:overload_manager_interface", + "//envoy/stats:stats_interface", + "//envoy/thread_local:thread_local_interface", "//source/common/common:logger_lib", "//source/common/config:utility_lib", "//source/common/event:scaled_range_timer_manager_lib", @@ -343,10 +344,10 @@ envoy_cc_library( srcs = ["lds_api.cc"], hdrs = ["lds_api.h"], deps = [ - "//include/envoy/config:subscription_factory_interface", - "//include/envoy/config:subscription_interface", - "//include/envoy/init:manager_interface", - "//include/envoy/server:listener_manager_interface", + "//envoy/config:subscription_factory_interface", + "//envoy/config:subscription_interface", + "//envoy/init:manager_interface", + "//envoy/server:listener_manager_interface", "//source/common/common:cleanup_lib", "//source/common/config:api_version_lib", "//source/common/config:subscription_base_interface", @@ -383,13 +384,13 @@ envoy_cc_library( ":filter_chain_manager_lib", ":lds_api_lib", ":transport_socket_config_lib", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/server:api_listener_interface", - "//include/envoy/server:filter_config_interface", - "//include/envoy/server:listener_manager_interface", - "//include/envoy/server:transport_socket_config_interface", - "//include/envoy/server:worker_interface", + "//envoy/access_log:access_log_interface", + "//envoy/network:connection_interface", + "//envoy/server:api_listener_interface", + "//envoy/server:filter_config_interface", + "//envoy/server:listener_manager_interface", + "//envoy/server:transport_socket_config_interface", + "//envoy/server:worker_interface", "//source/common/access_log:access_log_lib", "//source/common/common:basic_resource_lib", "//source/common/common:empty_string", @@ -421,6 +422,7 @@ envoy_cc_library( "//source/common/quic:quic_factory_lib", "//source/common/quic:quic_transport_socket_factory_lib", "//source/common/quic:udp_gso_batch_writer_lib", + "//source/common/quic:quic_stat_names_lib", ]), ) @@ -430,9 +432,9 @@ envoy_cc_library( hdrs = ["filter_chain_manager_impl.h"], deps = [ ":filter_chain_factory_context_callback", - "//include/envoy/server:instance_interface", - "//include/envoy/server:listener_manager_interface", - "//include/envoy/server:transport_socket_config_interface", + "//envoy/server:instance_interface", + "//envoy/server:listener_manager_interface", + "//envoy/server:transport_socket_config_interface", "//source/common/common:empty_string", "//source/common/config:utility_lib", "//source/common/init:manager_lib", @@ -446,7 +448,7 @@ envoy_cc_library( envoy_cc_library( name = "process_context_lib", hdrs = ["process_context_impl.h"], - deps = ["//include/envoy/server:process_context_interface"], + deps = ["//envoy/server:process_context_interface"], ) envoy_cc_library( @@ -464,7 +466,7 @@ envoy_cc_library( name = "resource_monitor_config_lib", hdrs = ["resource_monitor_config_impl.h"], deps = [ - "//include/envoy/server:resource_monitor_config_interface", + "//envoy/server:resource_monitor_config_interface", ], ) @@ -485,21 +487,21 @@ envoy_cc_library( ":listener_manager_lib", ":ssl_context_manager_lib", ":worker_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:signal_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:dns_interface", - "//include/envoy/server:bootstrap_extension_config_interface", - "//include/envoy/server:configuration_interface", - "//include/envoy/server:drain_manager_interface", - "//include/envoy/server:fatal_action_interface", - "//include/envoy/server:instance_interface", - "//include/envoy/server:listener_manager_interface", - "//include/envoy/server:options_interface", - "//include/envoy/server:process_context_interface", - "//include/envoy/stats:stats_macros", - "//include/envoy/tracing:http_tracer_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:signal_interface", + "//envoy/event:timer_interface", + "//envoy/network:dns_interface", + "//envoy/server:bootstrap_extension_config_interface", + "//envoy/server:configuration_interface", + "//envoy/server:drain_manager_interface", + "//envoy/server:fatal_action_interface", + "//envoy/server:instance_interface", + "//envoy/server:listener_manager_interface", + "//envoy/server:options_interface", + "//envoy/server:process_context_interface", + "//envoy/stats:stats_macros", + "//envoy/tracing:http_tracer_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/access_log:access_log_manager_lib", "//source/common/api:api_lib", "//source/common/common:cleanup_lib", @@ -539,8 +541,8 @@ envoy_cc_library( srcs = ["ssl_context_manager.cc"], hdrs = ["ssl_context_manager.h"], deps = [ - "//include/envoy/registry", - "//include/envoy/ssl:context_manager_interface", + "//envoy/registry", + "//envoy/ssl:context_manager_interface", ], ) @@ -553,8 +555,8 @@ envoy_cc_library( name = "watchdog_lib", hdrs = ["watchdog_impl.h"], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/server:watchdog_interface", + "//envoy/common:time_interface", + "//envoy/server:watchdog_interface", "//source/common/common:assert_lib", ], ) @@ -566,16 +568,16 @@ envoy_cc_library( deps = [ ":connection_handler_lib", ":listener_hooks_lib", - "//include/envoy/api:api_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:exception_interface", - "//include/envoy/server:configuration_interface", - "//include/envoy/server:guarddog_interface", - "//include/envoy/server:listener_manager_interface", - "//include/envoy/server:worker_interface", - "//include/envoy/thread:thread_interface", - "//include/envoy/thread_local:thread_local_interface", + "//envoy/api:api_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", + "//envoy/network:exception_interface", + "//envoy/server:configuration_interface", + "//envoy/server:guarddog_interface", + "//envoy/server:listener_manager_interface", + "//envoy/server:worker_interface", + "//envoy/thread:thread_interface", + "//envoy/thread_local:thread_local_interface", ], ) @@ -583,7 +585,7 @@ envoy_cc_library( name = "transport_socket_config_lib", hdrs = ["transport_socket_config_impl.h"], deps = [ - "//include/envoy/server:transport_socket_config_interface", + "//envoy/server:transport_socket_config_interface", ], ) @@ -593,7 +595,7 @@ envoy_cc_library( hdrs = ["active_raw_udp_listener_config.h"], deps = [ ":connection_handler_lib", - "//include/envoy/registry", + "//envoy/registry", ], ) @@ -601,7 +603,7 @@ envoy_cc_library( name = "filter_chain_factory_context_callback", hdrs = ["filter_chain_factory_context_callback.h"], deps = [ - "//include/envoy/server:filter_config_interface", + "//envoy/server:filter_config_interface", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", ], ) diff --git a/source/server/active_raw_udp_listener_config.cc b/source/server/active_raw_udp_listener_config.cc index 28abfe2ceb314..86de0c3053b07 100644 --- a/source/server/active_raw_udp_listener_config.cc +++ b/source/server/active_raw_udp_listener_config.cc @@ -1,10 +1,10 @@ -#include "server/active_raw_udp_listener_config.h" +#include "source/server/active_raw_udp_listener_config.h" #include #include -#include "server/active_udp_listener.h" -#include "server/connection_handler_impl.h" +#include "source/server/active_udp_listener.h" +#include "source/server/connection_handler_impl.h" namespace Envoy { namespace Server { diff --git a/source/server/active_tcp_listener.cc b/source/server/active_tcp_listener.cc index bcf5cae34d836..880f234c8a7ba 100644 --- a/source/server/active_tcp_listener.cc +++ b/source/server/active_tcp_listener.cc @@ -1,4 +1,4 @@ -#include "server/active_tcp_listener.h" +#include "source/server/active_tcp_listener.h" #include @@ -7,10 +7,11 @@ #include "envoy/network/filter.h" #include "envoy/stats/scope.h" -#include "common/event/deferred_task.h" -#include "common/network/connection_impl.h" -#include "common/network/utility.h" -#include "common/stats/timespan_impl.h" +#include "source/common/common/assert.h" +#include "source/common/event/deferred_task.h" +#include "source/common/network/connection_impl.h" +#include "source/common/network/utility.h" +#include "source/common/stats/timespan_impl.h" namespace Envoy { namespace Server { @@ -210,8 +211,9 @@ void ActiveTcpSocket::newConnection() { void ActiveTcpListener::onAccept(Network::ConnectionSocketPtr&& socket) { if (listenerConnectionLimitReached()) { - ENVOY_LOG(trace, "closing connection: listener connection limit reached for {}", - config_->name()); + RELEASE_ASSERT(socket->addressProvider().remoteAddress() != nullptr, ""); + ENVOY_LOG(trace, "closing connection from {}: listener connection limit reached for {}", + socket->addressProvider().remoteAddress()->asString(), config_->name()); socket->close(); stats_.downstream_cx_overflow_.inc(); return; @@ -288,7 +290,9 @@ void ActiveTcpListener::newConnection(Network::ConnectionSocketPtr&& socket, // Find matching filter chain. const auto filter_chain = config_->filterChainManager().findFilterChain(*socket); if (filter_chain == nullptr) { - ENVOY_LOG(debug, "closing connection: no matching filter chain found"); + RELEASE_ASSERT(socket->addressProvider().remoteAddress() != nullptr, ""); + ENVOY_LOG(debug, "closing connection from {}: no matching filter chain found", + socket->addressProvider().remoteAddress()->asString()); stats_.no_filter_chain_match_.inc(); stream_info->setResponseFlag(StreamInfo::ResponseFlag::NoRouteFound); stream_info->setResponseCodeDetails(StreamInfo::ResponseCodeDetails::get().FilterChainNotFound); @@ -307,21 +311,26 @@ void ActiveTcpListener::newConnection(Network::ConnectionSocketPtr&& socket, timeout != std::chrono::milliseconds::zero()) { server_conn_ptr->setTransportSocketConnectTimeout(timeout); } + ActiveTcpConnectionPtr active_connection( new ActiveTcpConnection(active_connections, std::move(server_conn_ptr), parent_.dispatcher().timeSource(), std::move(stream_info))); active_connection->connection_->setBufferLimits(config_->perConnectionBufferLimitBytes()); + RELEASE_ASSERT(active_connection->connection_->addressProvider().remoteAddress() != nullptr, ""); + const bool empty_filter_chain = !config_->filterChainFactory().createNetworkFilterChain( *active_connection->connection_, filter_chain->networkFilterFactories()); if (empty_filter_chain) { - ENVOY_CONN_LOG(debug, "closing connection: no filters", *active_connection->connection_); + ENVOY_CONN_LOG(debug, "closing connection from {}: no filters", *active_connection->connection_, + active_connection->connection_->addressProvider().remoteAddress()->asString()); active_connection->connection_->close(Network::ConnectionCloseType::NoFlush); } // If the connection is already closed, we can just let this connection immediately die. if (active_connection->connection_->state() != Network::Connection::State::Closed) { - ENVOY_CONN_LOG(debug, "new connection", *active_connection->connection_); + ENVOY_CONN_LOG(debug, "new connection from {}", *active_connection->connection_, + active_connection->connection_->addressProvider().remoteAddress()->asString()); active_connection->connection_->addConnectionCallbacks(*active_connection); LinkedList::moveIntoList(std::move(active_connection), active_connections.connections_); } diff --git a/source/server/active_tcp_listener.h b/source/server/active_tcp_listener.h index c698faaa06058..469e1677c999e 100644 --- a/source/server/active_tcp_listener.h +++ b/source/server/active_tcp_listener.h @@ -4,10 +4,9 @@ #include "envoy/event/timer.h" #include "envoy/stats/timespan.h" -#include "common/common/linked_object.h" -#include "common/stream_info/stream_info_impl.h" - -#include "server/active_listener_base.h" +#include "source/common/common/linked_object.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/server/active_listener_base.h" namespace Envoy { namespace Server { diff --git a/source/server/active_udp_listener.cc b/source/server/active_udp_listener.cc index ceb01bbcd14e9..c20d2809aa07f 100644 --- a/source/server/active_udp_listener.cc +++ b/source/server/active_udp_listener.cc @@ -1,10 +1,10 @@ -#include "server/active_udp_listener.h" +#include "source/server/active_udp_listener.h" #include "envoy/network/exception.h" #include "envoy/server/listener_manager.h" #include "envoy/stats/scope.h" -#include "common/network/utility.h" +#include "source/common/network/utility.h" #include "spdlog/spdlog.h" diff --git a/source/server/active_udp_listener.h b/source/server/active_udp_listener.h index 08472bc853c57..520663ac4ddf8 100644 --- a/source/server/active_udp_listener.h +++ b/source/server/active_udp_listener.h @@ -8,9 +8,8 @@ #include "envoy/network/listen_socket.h" #include "envoy/network/listener.h" -#include "common/network/utility.h" - -#include "server/active_listener_base.h" +#include "source/common/network/utility.h" +#include "source/server/active_listener_base.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/BUILD b/source/server/admin/BUILD index 1df8446d2a17f..533e22849b45f 100644 --- a/source/server/admin/BUILD +++ b/source/server/admin/BUILD @@ -26,15 +26,15 @@ envoy_cc_library( ":server_info_handler_lib", ":stats_handler_lib", ":utils_lib", - "//include/envoy/filesystem:filesystem_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/network:listen_socket_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:hot_restart_interface", - "//include/envoy/server:instance_interface", - "//include/envoy/server:listener_manager_interface", - "//include/envoy/server:options_interface", + "//envoy/filesystem:filesystem_interface", + "//envoy/http:filter_interface", + "//envoy/network:filter_interface", + "//envoy/network:listen_socket_interface", + "//envoy/server:admin_interface", + "//envoy/server:hot_restart_interface", + "//envoy/server:instance_interface", + "//envoy/server:listener_manager_interface", + "//envoy/server:options_interface", "//source/common/access_log:access_log_lib", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", @@ -73,8 +73,8 @@ envoy_cc_library( hdrs = ["admin_filter.h"], deps = [ ":utils_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/server:admin_interface", + "//envoy/http:filter_interface", + "//envoy/server:admin_interface", "//source/common/buffer:buffer_lib", "//source/common/common:minimal_logger_lib", "//source/common/http:codes_lib", @@ -87,7 +87,7 @@ envoy_cc_library( name = "handler_ctx_lib", hdrs = ["handler_ctx.h"], deps = [ - "//include/envoy/server:instance_interface", + "//envoy/server:instance_interface", ], ) @@ -99,9 +99,9 @@ envoy_cc_library( ":handler_ctx_lib", ":prometheus_stats_lib", ":utils_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:instance_interface", + "//envoy/http:codes_interface", + "//envoy/server:admin_interface", + "//envoy/server:instance_interface", "//source/common/buffer:buffer_lib", "//source/common/html:utility_lib", "//source/common/http:codes_lib", @@ -129,9 +129,9 @@ envoy_cc_library( deps = [ ":handler_ctx_lib", ":utils_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:instance_interface", + "//envoy/http:codes_interface", + "//envoy/server:admin_interface", + "//envoy/server:instance_interface", "//source/common/buffer:buffer_lib", "//source/common/http:codes_lib", "//source/common/http:header_map_lib", @@ -146,9 +146,9 @@ envoy_cc_library( deps = [ ":handler_ctx_lib", ":utils_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:instance_interface", + "//envoy/http:codes_interface", + "//envoy/server:admin_interface", + "//envoy/server:instance_interface", "//source/common/buffer:buffer_lib", "//source/common/http:codes_lib", "//source/common/http:header_map_lib", @@ -162,9 +162,9 @@ envoy_cc_library( deps = [ ":handler_ctx_lib", ":utils_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:instance_interface", + "//envoy/http:codes_interface", + "//envoy/server:admin_interface", + "//envoy/server:instance_interface", "//source/common/buffer:buffer_lib", "//source/common/common:minimal_logger_lib", "//source/common/http:codes_lib", @@ -178,8 +178,8 @@ envoy_cc_library( hdrs = ["profiling_handler.h"], deps = [ ":utils_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/server:admin_interface", + "//envoy/http:codes_interface", + "//envoy/server:admin_interface", "//source/common/buffer:buffer_lib", "//source/common/http:codes_lib", "//source/common/http:header_map_lib", @@ -194,9 +194,9 @@ envoy_cc_library( deps = [ ":handler_ctx_lib", ":utils_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:instance_interface", + "//envoy/http:codes_interface", + "//envoy/server:admin_interface", + "//envoy/server:instance_interface", "//source/common/buffer:buffer_lib", "//source/common/http:codes_lib", "//source/common/http:header_map_lib", @@ -210,9 +210,9 @@ envoy_cc_library( deps = [ ":handler_ctx_lib", ":utils_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:instance_interface", + "//envoy/http:codes_interface", + "//envoy/server:admin_interface", + "//envoy/server:instance_interface", "//source/common/buffer:buffer_lib", "//source/common/http:codes_lib", "//source/common/http:header_map_lib", @@ -229,9 +229,9 @@ envoy_cc_library( deps = [ ":handler_ctx_lib", ":utils_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:instance_interface", + "//envoy/http:codes_interface", + "//envoy/server:admin_interface", + "//envoy/server:instance_interface", "//source/common/buffer:buffer_lib", "//source/common/http:codes_lib", "//source/common/http:header_map_lib", @@ -248,9 +248,9 @@ envoy_cc_library( ":config_tracker_lib", ":handler_ctx_lib", ":utils_lib", - "//include/envoy/http:codes_interface", - "//include/envoy/server:admin_interface", - "//include/envoy/server:instance_interface", + "//envoy/http:codes_interface", + "//envoy/server:admin_interface", + "//envoy/server:instance_interface", "//source/common/buffer:buffer_lib", "//source/common/http:codes_lib", "//source/common/http:header_map_lib", @@ -267,8 +267,8 @@ envoy_cc_library( deps = [ ":handler_ctx_lib", ":utils_lib", - "//include/envoy/server:admin_interface", - "//include/envoy/server:instance_interface", + "//envoy/server:admin_interface", + "//envoy/server:instance_interface", "//source/common/http:codes_lib", "//source/common/http:header_map_lib", "@envoy_api//envoy/admin/v3:pkg_cc_proto", @@ -280,7 +280,7 @@ envoy_cc_library( srcs = ["utils.cc"], hdrs = ["utils.h"], deps = [ - "//include/envoy/init:manager_interface", + "//envoy/init:manager_interface", "//source/common/common:enum_to_int", "//source/common/http:codes_lib", "//source/common/http:header_map_lib", @@ -294,7 +294,7 @@ envoy_cc_library( srcs = ["config_tracker_impl.cc"], hdrs = ["config_tracker_impl.h"], deps = [ - "//include/envoy/server:config_tracker_interface", + "//envoy/server:config_tracker_interface", "//source/common/common:assert_lib", "//source/common/common:macros", ], diff --git a/source/server/admin/admin.cc b/source/server/admin/admin.cc index fbfe86bd22463..4e3ee65c2813a 100644 --- a/source/server/admin/admin.cc +++ b/source/server/admin/admin.cc @@ -1,4 +1,4 @@ -#include "server/admin/admin.h" +#include "source/server/admin/admin.h" #include #include @@ -15,29 +15,27 @@ #include "envoy/upstream/outlier_detection.h" #include "envoy/upstream/upstream.h" -#include "common/access_log/access_log_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/common/mutex_tracer_impl.h" -#include "common/common/utility.h" -#include "common/formatter/substitution_formatter.h" -#include "common/html/utility.h" -#include "common/http/codes.h" -#include "common/http/conn_manager_utility.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/memory/utils.h" -#include "common/network/listen_socket_impl.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/router/config_impl.h" - -#include "server/admin/utils.h" -#include "server/listener_impl.h" - -#include "extensions/request_id/uuid/config.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/common/mutex_tracer_impl.h" +#include "source/common/common/utility.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/common/html/utility.h" +#include "source/common/http/codes.h" +#include "source/common/http/conn_manager_utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/memory/utils.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/config_impl.h" +#include "source/extensions/request_id/uuid/config.h" +#include "source/server/admin/utils.h" +#include "source/server/listener_impl.h" #include "absl/strings/str_join.h" #include "absl/strings/str_replace.h" diff --git a/source/server/admin/admin.h b/source/server/admin/admin.h index 5faa06b141438..5fcaa5ddcf603 100644 --- a/source/server/admin/admin.h +++ b/source/server/admin/admin.h @@ -18,38 +18,36 @@ #include "envoy/upstream/outlier_detection.h" #include "envoy/upstream/resource_manager.h" -#include "common/common/assert.h" -#include "common/common/basic_resource_impl.h" -#include "common/common/empty_string.h" -#include "common/common/logger.h" -#include "common/common/macros.h" -#include "common/http/conn_manager_config.h" -#include "common/http/conn_manager_impl.h" -#include "common/http/date_provider_impl.h" -#include "common/http/default_server_string.h" -#include "common/http/http1/codec_stats.h" -#include "common/http/http2/codec_stats.h" -#include "common/http/request_id_extension_impl.h" -#include "common/http/utility.h" -#include "common/network/connection_balancer_impl.h" -#include "common/network/raw_buffer_socket.h" -#include "common/router/scoped_config_impl.h" -#include "common/stats/isolated_store_impl.h" - -#include "server/admin/admin_filter.h" -#include "server/admin/clusters_handler.h" -#include "server/admin/config_dump_handler.h" -#include "server/admin/config_tracker_impl.h" -#include "server/admin/init_dump_handler.h" -#include "server/admin/listeners_handler.h" -#include "server/admin/logs_handler.h" -#include "server/admin/profiling_handler.h" -#include "server/admin/runtime_handler.h" -#include "server/admin/server_cmd_handler.h" -#include "server/admin/server_info_handler.h" -#include "server/admin/stats_handler.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/common/assert.h" +#include "source/common/common/basic_resource_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/logger.h" +#include "source/common/common/macros.h" +#include "source/common/http/conn_manager_config.h" +#include "source/common/http/conn_manager_impl.h" +#include "source/common/http/date_provider_impl.h" +#include "source/common/http/default_server_string.h" +#include "source/common/http/http1/codec_stats.h" +#include "source/common/http/http2/codec_stats.h" +#include "source/common/http/request_id_extension_impl.h" +#include "source/common/http/utility.h" +#include "source/common/network/connection_balancer_impl.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/common/router/scoped_config_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" +#include "source/server/admin/admin_filter.h" +#include "source/server/admin/clusters_handler.h" +#include "source/server/admin/config_dump_handler.h" +#include "source/server/admin/config_tracker_impl.h" +#include "source/server/admin/init_dump_handler.h" +#include "source/server/admin/listeners_handler.h" +#include "source/server/admin/logs_handler.h" +#include "source/server/admin/profiling_handler.h" +#include "source/server/admin/runtime_handler.h" +#include "source/server/admin/server_cmd_handler.h" +#include "source/server/admin/server_info_handler.h" +#include "source/server/admin/stats_handler.h" #include "absl/strings/string_view.h" diff --git a/source/server/admin/admin_filter.cc b/source/server/admin/admin_filter.cc index c9227f2c725db..ecd5fa6e95624 100644 --- a/source/server/admin/admin_filter.cc +++ b/source/server/admin/admin_filter.cc @@ -1,6 +1,6 @@ -#include "server/admin/admin_filter.h" +#include "source/server/admin/admin_filter.h" -#include "server/admin/utils.h" +#include "source/server/admin/utils.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/admin_filter.h b/source/server/admin/admin_filter.h index 000279f8ff793..0cc9da6069ef3 100644 --- a/source/server/admin/admin_filter.h +++ b/source/server/admin/admin_filter.h @@ -6,12 +6,11 @@ #include "envoy/http/filter.h" #include "envoy/server/admin.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "absl/strings/string_view.h" diff --git a/source/server/admin/clusters_handler.cc b/source/server/admin/clusters_handler.cc index 77523012e0dc8..a0425e40c6747 100644 --- a/source/server/admin/clusters_handler.cc +++ b/source/server/admin/clusters_handler.cc @@ -1,13 +1,12 @@ -#include "server/admin/clusters_handler.h" +#include "source/server/admin/clusters_handler.h" #include "envoy/admin/v3/clusters.pb.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/network/utility.h" -#include "common/upstream/host_utility.h" - -#include "server/admin/utils.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/host_utility.h" +#include "source/server/admin/utils.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/clusters_handler.h b/source/server/admin/clusters_handler.h index efb00e3b2cca7..7786755cbeb6e 100644 --- a/source/server/admin/clusters_handler.h +++ b/source/server/admin/clusters_handler.h @@ -6,7 +6,7 @@ #include "envoy/server/admin.h" #include "envoy/server/instance.h" -#include "server/admin/handler_ctx.h" +#include "source/server/admin/handler_ctx.h" #include "absl/strings/string_view.h" diff --git a/source/server/admin/config_dump_handler.cc b/source/server/admin/config_dump_handler.cc index 766b86bbe9d2a..69c685d8a6939 100644 --- a/source/server/admin/config_dump_handler.cc +++ b/source/server/admin/config_dump_handler.cc @@ -1,13 +1,12 @@ -#include "server/admin/config_dump_handler.h" +#include "source/server/admin/config_dump_handler.h" #include "envoy/config/core/v3/health_check.pb.h" #include "envoy/config/endpoint/v3/endpoint.pb.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/network/utility.h" - -#include "server/admin/utils.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/network/utility.h" +#include "source/server/admin/utils.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/config_dump_handler.h b/source/server/admin/config_dump_handler.h index f8b77c4a2e6fb..f1531ddee04a1 100644 --- a/source/server/admin/config_dump_handler.h +++ b/source/server/admin/config_dump_handler.h @@ -9,8 +9,8 @@ #include "envoy/server/admin.h" #include "envoy/server/instance.h" -#include "server/admin/config_tracker_impl.h" -#include "server/admin/handler_ctx.h" +#include "source/server/admin/config_tracker_impl.h" +#include "source/server/admin/handler_ctx.h" #include "absl/strings/string_view.h" diff --git a/source/server/admin/config_tracker_impl.cc b/source/server/admin/config_tracker_impl.cc index da1bc875a6ee3..dcd4cf67818eb 100644 --- a/source/server/admin/config_tracker_impl.cc +++ b/source/server/admin/config_tracker_impl.cc @@ -1,4 +1,4 @@ -#include "server/admin/config_tracker_impl.h" +#include "source/server/admin/config_tracker_impl.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/config_tracker_impl.h b/source/server/admin/config_tracker_impl.h index 3c8ab1c156bfb..9d57ec41cfd4f 100644 --- a/source/server/admin/config_tracker_impl.h +++ b/source/server/admin/config_tracker_impl.h @@ -2,8 +2,8 @@ #include "envoy/server/config_tracker.h" -#include "common/common/assert.h" -#include "common/common/macros.h" +#include "source/common/common/assert.h" +#include "source/common/common/macros.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/init_dump_handler.cc b/source/server/admin/init_dump_handler.cc index 11e40cd4a4668..837625d161804 100644 --- a/source/server/admin/init_dump_handler.cc +++ b/source/server/admin/init_dump_handler.cc @@ -1,10 +1,9 @@ -#include "server/admin/init_dump_handler.h" +#include "source/server/admin/init_dump_handler.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/network/utility.h" - -#include "server/admin/utils.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/network/utility.h" +#include "source/server/admin/utils.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/init_dump_handler.h b/source/server/admin/init_dump_handler.h index bb3683f74ca7a..26156c4e91222 100644 --- a/source/server/admin/init_dump_handler.h +++ b/source/server/admin/init_dump_handler.h @@ -7,7 +7,7 @@ #include "envoy/server/admin.h" #include "envoy/server/instance.h" -#include "server/admin/handler_ctx.h" +#include "source/server/admin/handler_ctx.h" #include "absl/strings/string_view.h" diff --git a/source/server/admin/listeners_handler.cc b/source/server/admin/listeners_handler.cc index 510393a17b31c..9e6ddbbc746bc 100644 --- a/source/server/admin/listeners_handler.cc +++ b/source/server/admin/listeners_handler.cc @@ -1,12 +1,11 @@ -#include "server/admin/listeners_handler.h" +#include "source/server/admin/listeners_handler.h" #include "envoy/admin/v3/listeners.pb.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/network/utility.h" - -#include "server/admin/utils.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/network/utility.h" +#include "source/server/admin/utils.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/listeners_handler.h b/source/server/admin/listeners_handler.h index bf48f86419e58..52d52ea0298b9 100644 --- a/source/server/admin/listeners_handler.h +++ b/source/server/admin/listeners_handler.h @@ -6,7 +6,7 @@ #include "envoy/server/admin.h" #include "envoy/server/instance.h" -#include "server/admin/handler_ctx.h" +#include "source/server/admin/handler_ctx.h" #include "absl/strings/string_view.h" diff --git a/source/server/admin/logs_handler.cc b/source/server/admin/logs_handler.cc index 353a517947456..e5bc7a54a69f8 100644 --- a/source/server/admin/logs_handler.cc +++ b/source/server/admin/logs_handler.cc @@ -1,11 +1,10 @@ -#include "server/admin/logs_handler.h" +#include "source/server/admin/logs_handler.h" #include -#include "common/common/fancy_logger.h" -#include "common/common/logger.h" - -#include "server/admin/utils.h" +#include "source/common/common/fancy_logger.h" +#include "source/common/common/logger.h" +#include "source/server/admin/utils.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/logs_handler.h b/source/server/admin/logs_handler.h index 1eea995d88ba2..21359c27c5a8b 100644 --- a/source/server/admin/logs_handler.h +++ b/source/server/admin/logs_handler.h @@ -6,7 +6,7 @@ #include "envoy/server/admin.h" #include "envoy/server/instance.h" -#include "server/admin/handler_ctx.h" +#include "source/server/admin/handler_ctx.h" #include "absl/strings/string_view.h" diff --git a/source/server/admin/profiling_handler.cc b/source/server/admin/profiling_handler.cc index 243b8292a0af6..e0a3892f23368 100644 --- a/source/server/admin/profiling_handler.cc +++ b/source/server/admin/profiling_handler.cc @@ -1,8 +1,7 @@ -#include "server/admin/profiling_handler.h" +#include "source/server/admin/profiling_handler.h" -#include "common/profiler/profiler.h" - -#include "server/admin/utils.h" +#include "source/common/profiler/profiler.h" +#include "source/server/admin/utils.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/prometheus_stats.cc b/source/server/admin/prometheus_stats.cc index a82d59878d93e..b0b01dc9759ac 100644 --- a/source/server/admin/prometheus_stats.cc +++ b/source/server/admin/prometheus_stats.cc @@ -1,8 +1,8 @@ -#include "server/admin/prometheus_stats.h" +#include "source/server/admin/prometheus_stats.h" -#include "common/common/empty_string.h" -#include "common/common/macros.h" -#include "common/stats/histogram_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/macros.h" +#include "source/common/stats/histogram_impl.h" #include "absl/strings/str_cat.h" diff --git a/source/server/admin/runtime_handler.cc b/source/server/admin/runtime_handler.cc index a827d8a0994be..1aa3b922b98d8 100644 --- a/source/server/admin/runtime_handler.cc +++ b/source/server/admin/runtime_handler.cc @@ -1,13 +1,12 @@ -#include "server/admin/runtime_handler.h" +#include "source/server/admin/runtime_handler.h" #include #include -#include "common/common/empty_string.h" -#include "common/http/headers.h" -#include "common/http/utility.h" - -#include "server/admin/utils.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/server/admin/utils.h" #include "absl/container/node_hash_map.h" diff --git a/source/server/admin/runtime_handler.h b/source/server/admin/runtime_handler.h index 306a356574b3d..30400bec83d1c 100644 --- a/source/server/admin/runtime_handler.h +++ b/source/server/admin/runtime_handler.h @@ -6,7 +6,7 @@ #include "envoy/server/admin.h" #include "envoy/server/instance.h" -#include "server/admin/handler_ctx.h" +#include "source/server/admin/handler_ctx.h" #include "absl/strings/string_view.h" diff --git a/source/server/admin/server_cmd_handler.cc b/source/server/admin/server_cmd_handler.cc index dfa66a41ee84d..de48307c4daab 100644 --- a/source/server/admin/server_cmd_handler.cc +++ b/source/server/admin/server_cmd_handler.cc @@ -1,4 +1,4 @@ -#include "server/admin/server_cmd_handler.h" +#include "source/server/admin/server_cmd_handler.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/server_cmd_handler.h b/source/server/admin/server_cmd_handler.h index cddfb94b39176..7d1a9fc33cd18 100644 --- a/source/server/admin/server_cmd_handler.h +++ b/source/server/admin/server_cmd_handler.h @@ -6,7 +6,7 @@ #include "envoy/server/admin.h" #include "envoy/server/instance.h" -#include "server/admin/handler_ctx.h" +#include "source/server/admin/handler_ctx.h" #include "absl/strings/string_view.h" diff --git a/source/server/admin/server_info_handler.cc b/source/server/admin/server_info_handler.cc index 8f5e357970191..4a3d35f916bfd 100644 --- a/source/server/admin/server_info_handler.cc +++ b/source/server/admin/server_info_handler.cc @@ -1,11 +1,10 @@ -#include "server/admin/server_info_handler.h" +#include "source/server/admin/server_info_handler.h" #include "envoy/admin/v3/memory.pb.h" -#include "common/memory/stats.h" -#include "common/version/version.h" - -#include "server/admin/utils.h" +#include "source/common/memory/stats.h" +#include "source/common/version/version.h" +#include "source/server/admin/utils.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/server_info_handler.h b/source/server/admin/server_info_handler.h index 6a2a29abf3acf..b87c00e0822bb 100644 --- a/source/server/admin/server_info_handler.h +++ b/source/server/admin/server_info_handler.h @@ -6,7 +6,7 @@ #include "envoy/server/admin.h" #include "envoy/server/instance.h" -#include "server/admin/handler_ctx.h" +#include "source/server/admin/handler_ctx.h" #include "absl/strings/string_view.h" diff --git a/source/server/admin/stats_handler.cc b/source/server/admin/stats_handler.cc index 00837e2e393ed..0a9bd56257a43 100644 --- a/source/server/admin/stats_handler.cc +++ b/source/server/admin/stats_handler.cc @@ -1,14 +1,13 @@ -#include "server/admin/stats_handler.h" +#include "source/server/admin/stats_handler.h" #include "envoy/admin/v3/mutex_stats.pb.h" -#include "common/common/empty_string.h" -#include "common/html/utility.h" -#include "common/http/headers.h" -#include "common/http/utility.h" - -#include "server/admin/prometheus_stats.h" -#include "server/admin/utils.h" +#include "source/common/common/empty_string.h" +#include "source/common/html/utility.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/server/admin/prometheus_stats.h" +#include "source/server/admin/utils.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/stats_handler.h b/source/server/admin/stats_handler.h index abdb656ed2c94..7934c19c11d1c 100644 --- a/source/server/admin/stats_handler.h +++ b/source/server/admin/stats_handler.h @@ -9,9 +9,8 @@ #include "envoy/server/admin.h" #include "envoy/server/instance.h" -#include "common/stats/histogram_impl.h" - -#include "server/admin/handler_ctx.h" +#include "source/common/stats/histogram_impl.h" +#include "source/server/admin/handler_ctx.h" #include "absl/strings/string_view.h" diff --git a/source/server/admin/utils.cc b/source/server/admin/utils.cc index 2402afc47ec2f..109e70fbb39b5 100644 --- a/source/server/admin/utils.cc +++ b/source/server/admin/utils.cc @@ -1,7 +1,7 @@ -#include "server/admin/utils.h" +#include "source/server/admin/utils.h" -#include "common/common/enum_to_int.h" -#include "common/http/headers.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/http/headers.h" namespace Envoy { namespace Server { diff --git a/source/server/admin/utils.h b/source/server/admin/utils.h index fc091467450a6..2bbe6d2c20918 100644 --- a/source/server/admin/utils.h +++ b/source/server/admin/utils.h @@ -5,9 +5,9 @@ #include "envoy/admin/v3/server_info.pb.h" #include "envoy/init/manager.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/utility.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/utility.h" namespace Envoy { namespace Server { diff --git a/source/server/api_listener_impl.cc b/source/server/api_listener_impl.cc index e2bdddd6c445f..7005ec11d0f25 100644 --- a/source/server/api_listener_impl.cc +++ b/source/server/api_listener_impl.cc @@ -1,16 +1,14 @@ -#include "server/api_listener_impl.h" +#include "source/server/api_listener_impl.h" #include "envoy/config/listener/v3/listener.pb.h" #include "envoy/stats/scope.h" -#include "common/http/conn_manager_impl.h" -#include "common/network/resolver_impl.h" -#include "common/protobuf/utility.h" - -#include "server/drain_manager_impl.h" -#include "server/listener_manager_impl.h" - -#include "extensions/filters/network/http_connection_manager/config.h" +#include "source/common/http/conn_manager_impl.h" +#include "source/common/network/resolver_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/http_connection_manager/config.h" +#include "source/server/drain_manager_impl.h" +#include "source/server/listener_manager_impl.h" namespace Envoy { namespace Server { diff --git a/source/server/api_listener_impl.h b/source/server/api_listener_impl.h index ca792e83ebdde..c0e2d0bc7c6c0 100644 --- a/source/server/api_listener_impl.h +++ b/source/server/api_listener_impl.h @@ -14,14 +14,13 @@ #include "envoy/server/listener_manager.h" #include "envoy/stats/scope.h" -#include "common/common/empty_string.h" -#include "common/common/logger.h" -#include "common/http/conn_manager_impl.h" -#include "common/init/manager_impl.h" -#include "common/network/socket_impl.h" -#include "common/stream_info/stream_info_impl.h" - -#include "server/filter_chain_manager_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/logger.h" +#include "source/common/http/conn_manager_impl.h" +#include "source/common/init/manager_impl.h" +#include "source/common/network/socket_impl.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/server/filter_chain_manager_impl.h" namespace Envoy { namespace Server { @@ -146,7 +145,7 @@ class ApiListenerImplBase : public ApiListener, bool startSecureTransport() override { NOT_IMPLEMENTED_GCOVR_EXCL_LINE; } absl::optional lastRoundTripTime() const override { return {}; }; // ScopeTrackedObject - void dumpState(std::ostream&, int) const override { NOT_IMPLEMENTED_GCOVR_EXCL_LINE; } + void dumpState(std::ostream& os, int) const override { os << "SyntheticConnection"; } SyntheticReadCallbacks& parent_; Network::SocketAddressSetterSharedPtr address_provider_; diff --git a/source/server/backtrace.cc b/source/server/backtrace.cc index 46ca057ee8a96..60602aabfacfc 100644 --- a/source/server/backtrace.cc +++ b/source/server/backtrace.cc @@ -1,4 +1,4 @@ -#include "server/backtrace.h" +#include "source/server/backtrace.h" #include diff --git a/source/server/backtrace.h b/source/server/backtrace.h index fd391a691c813..21976bf12e889 100644 --- a/source/server/backtrace.h +++ b/source/server/backtrace.h @@ -2,8 +2,8 @@ #include -#include "common/common/logger.h" -#include "common/version/version.h" +#include "source/common/common/logger.h" +#include "source/common/version/version.h" #include "absl/debugging/stacktrace.h" #include "absl/debugging/symbolize.h" diff --git a/source/server/config_validation/BUILD b/source/server/config_validation/BUILD index bcf753dcf197c..f1c14f54e4f0d 100644 --- a/source/server/config_validation/BUILD +++ b/source/server/config_validation/BUILD @@ -9,8 +9,8 @@ envoy_cc_library( srcs = ["admin.cc"], hdrs = ["admin.h"], deps = [ - "//include/envoy/network:listen_socket_interface", - "//include/envoy/server:admin_interface", + "//envoy/network:listen_socket_interface", + "//envoy/server:admin_interface", "//source/common/common:assert_lib", "//source/common/network:listen_socket_lib", "//source/server/admin:config_tracker_lib", @@ -23,8 +23,8 @@ envoy_cc_library( hdrs = ["api.h"], deps = [ ":dispatcher_lib", - "//include/envoy/api:api_interface", - "//include/envoy/filesystem:filesystem_interface", + "//envoy/api:api_interface", + "//envoy/filesystem:filesystem_interface", "//source/common/api:api_lib", ], ) @@ -34,7 +34,7 @@ envoy_cc_library( srcs = ["cluster_manager.cc"], hdrs = ["cluster_manager.h"], deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:utility_lib", "//source/common/http:context_lib", "//source/common/upstream:cluster_manager_lib", @@ -52,8 +52,8 @@ envoy_cc_library( "dns.h", ], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:connection_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:connection_interface", "//source/common/common:assert_lib", "//source/common/event:dispatcher_lib", ], @@ -64,8 +64,8 @@ envoy_cc_library( srcs = ["dns.cc"], hdrs = ["dns.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:dns_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:dns_interface", ], ) @@ -79,10 +79,10 @@ envoy_cc_library( ":api_lib", ":cluster_manager_lib", ":dns_lib", - "//include/envoy/server:drain_manager_interface", - "//include/envoy/server:instance_interface", - "//include/envoy/ssl:context_manager_interface", - "//include/envoy/tracing:http_tracer_interface", + "//envoy/server:drain_manager_interface", + "//envoy/server:instance_interface", + "//envoy/ssl:context_manager_interface", + "//envoy/tracing:http_tracer_interface", "//source/common/access_log:access_log_manager_lib", "//source/common/common:assert_lib", "//source/common/common:utility_lib", diff --git a/source/server/config_validation/admin.cc b/source/server/config_validation/admin.cc index 8a0874ee0e119..a7ba41394788a 100644 --- a/source/server/config_validation/admin.cc +++ b/source/server/config_validation/admin.cc @@ -1,4 +1,4 @@ -#include "server/config_validation/admin.h" +#include "source/server/config_validation/admin.h" namespace Envoy { namespace Server { diff --git a/source/server/config_validation/admin.h b/source/server/config_validation/admin.h index 68a309aee4bb9..45fc2a224f796 100644 --- a/source/server/config_validation/admin.h +++ b/source/server/config_validation/admin.h @@ -3,10 +3,9 @@ #include "envoy/network/listen_socket.h" #include "envoy/server/admin.h" -#include "common/common/assert.h" -#include "common/network/listen_socket_impl.h" - -#include "server/admin/config_tracker_impl.h" +#include "source/common/common/assert.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/server/admin/config_tracker_impl.h" namespace Envoy { namespace Server { diff --git a/source/server/config_validation/api.cc b/source/server/config_validation/api.cc index bcf28c69172b1..75f8e755797c2 100644 --- a/source/server/config_validation/api.cc +++ b/source/server/config_validation/api.cc @@ -1,8 +1,7 @@ -#include "server/config_validation/api.h" +#include "source/server/config_validation/api.h" -#include "common/common/assert.h" - -#include "server/config_validation/dispatcher.h" +#include "source/common/common/assert.h" +#include "source/server/config_validation/dispatcher.h" namespace Envoy { namespace Api { diff --git a/source/server/config_validation/api.h b/source/server/config_validation/api.h index 2d44022c191a3..6725362caa733 100644 --- a/source/server/config_validation/api.h +++ b/source/server/config_validation/api.h @@ -4,7 +4,7 @@ #include "envoy/event/timer.h" #include "envoy/filesystem/filesystem.h" -#include "common/api/api_impl.h" +#include "source/common/api/api_impl.h" namespace Envoy { namespace Api { diff --git a/source/server/config_validation/cluster_manager.cc b/source/server/config_validation/cluster_manager.cc index e54aa866f1837..16ab99e868fc0 100644 --- a/source/server/config_validation/cluster_manager.cc +++ b/source/server/config_validation/cluster_manager.cc @@ -1,9 +1,9 @@ -#include "server/config_validation/cluster_manager.h" +#include "source/server/config_validation/cluster_manager.h" #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/config/core/v3/config_source.pb.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Upstream { diff --git a/source/server/config_validation/cluster_manager.h b/source/server/config_validation/cluster_manager.h index 7d9d42d323bfe..60c801a5260da 100644 --- a/source/server/config_validation/cluster_manager.h +++ b/source/server/config_validation/cluster_manager.h @@ -6,8 +6,8 @@ #include "envoy/server/options.h" #include "envoy/upstream/cluster_manager.h" -#include "common/http/context_impl.h" -#include "common/upstream/cluster_manager_impl.h" +#include "source/common/http/context_impl.h" +#include "source/common/upstream/cluster_manager_impl.h" namespace Envoy { namespace Upstream { diff --git a/source/server/config_validation/connection.h b/source/server/config_validation/connection.h index 6fb9839ff890b..c7b2dfc9f8b4b 100644 --- a/source/server/config_validation/connection.h +++ b/source/server/config_validation/connection.h @@ -1,8 +1,7 @@ #pragma once -#include "common/network/connection_impl.h" - -#include "server/config_validation/dispatcher.h" +#include "source/common/network/connection_impl.h" +#include "source/server/config_validation/dispatcher.h" namespace Envoy { namespace Network { diff --git a/source/server/config_validation/dispatcher.cc b/source/server/config_validation/dispatcher.cc index 3316f58065c2b..a4aacf9dd25e7 100644 --- a/source/server/config_validation/dispatcher.cc +++ b/source/server/config_validation/dispatcher.cc @@ -1,8 +1,7 @@ -#include "server/config_validation/dispatcher.h" +#include "source/server/config_validation/dispatcher.h" -#include "common/common/assert.h" - -#include "server/config_validation/connection.h" +#include "source/common/common/assert.h" +#include "source/server/config_validation/connection.h" namespace Envoy { namespace Event { @@ -17,7 +16,8 @@ Network::ClientConnectionPtr ValidationDispatcher::createClientConnection( } Network::DnsResolverSharedPtr ValidationDispatcher::createDnsResolver( - const std::vector&, const bool) { + const std::vector&, + const envoy::config::core::v3::DnsResolverOptions&) { return dns_resolver_; } diff --git a/source/server/config_validation/dispatcher.h b/source/server/config_validation/dispatcher.h index b5deea61f58db..5857df0811d7e 100644 --- a/source/server/config_validation/dispatcher.h +++ b/source/server/config_validation/dispatcher.h @@ -2,7 +2,7 @@ #include "envoy/event/dispatcher.h" -#include "common/event/dispatcher_impl.h" +#include "source/common/event/dispatcher_impl.h" #include "dns.h" @@ -23,9 +23,9 @@ class ValidationDispatcher : public DispatcherImpl { createClientConnection(Network::Address::InstanceConstSharedPtr, Network::Address::InstanceConstSharedPtr, Network::TransportSocketPtr&&, const Network::ConnectionSocket::OptionsSharedPtr& options) override; - Network::DnsResolverSharedPtr - createDnsResolver(const std::vector& resolvers, - const bool use_tcp_for_dns_lookups) override; + Network::DnsResolverSharedPtr createDnsResolver( + const std::vector& resolvers, + const envoy::config::core::v3::DnsResolverOptions& dns_resolver_options) override; Network::ListenerPtr createListener(Network::SocketSharedPtr&&, Network::TcpListenerCallbacks&, bool bind_to_port, uint32_t backlog_size) override; diff --git a/source/server/config_validation/dns.cc b/source/server/config_validation/dns.cc index e9b4f19c46505..c590bf181133b 100644 --- a/source/server/config_validation/dns.cc +++ b/source/server/config_validation/dns.cc @@ -1,4 +1,4 @@ -#include "server/config_validation/dns.h" +#include "source/server/config_validation/dns.h" namespace Envoy { namespace Network { diff --git a/source/server/config_validation/server.cc b/source/server/config_validation/server.cc index 100647275b8c7..11ab271ccda32 100644 --- a/source/server/config_validation/server.cc +++ b/source/server/config_validation/server.cc @@ -1,18 +1,17 @@ -#include "server/config_validation/server.h" +#include "source/server/config_validation/server.h" #include #include "envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "common/common/utility.h" -#include "common/config/utility.h" -#include "common/event/real_time_system.h" -#include "common/local_info/local_info_impl.h" -#include "common/protobuf/utility.h" -#include "common/singleton/manager_impl.h" -#include "common/version/version.h" - -#include "server/ssl_context_manager.h" +#include "source/common/common/utility.h" +#include "source/common/config/utility.h" +#include "source/common/event/real_time_system.h" +#include "source/common/local_info/local_info_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/version/version.h" +#include "source/server/ssl_context_manager.h" namespace Envoy { namespace Server { diff --git a/source/server/config_validation/server.h b/source/server/config_validation/server.h index 1919a6643ad85..c86de87e278b9 100644 --- a/source/server/config_validation/server.h +++ b/source/server/config_validation/server.h @@ -11,24 +11,23 @@ #include "envoy/ssl/context_manager.h" #include "envoy/tracing/http_tracer.h" -#include "common/access_log/access_log_manager_impl.h" -#include "common/common/assert.h" -#include "common/common/random_generator.h" -#include "common/grpc/common.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/router/context_impl.h" -#include "common/router/rds_impl.h" -#include "common/runtime/runtime_impl.h" -#include "common/secret/secret_manager_impl.h" -#include "common/thread_local/thread_local_impl.h" - -#include "server/admin/admin.h" -#include "server/config_validation/admin.h" -#include "server/config_validation/api.h" -#include "server/config_validation/cluster_manager.h" -#include "server/config_validation/dns.h" -#include "server/listener_manager_impl.h" -#include "server/server.h" +#include "source/common/access_log/access_log_manager_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/random_generator.h" +#include "source/common/grpc/common.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/router/context_impl.h" +#include "source/common/router/rds_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/secret/secret_manager_impl.h" +#include "source/common/thread_local/thread_local_impl.h" +#include "source/server/admin/admin.h" +#include "source/server/config_validation/admin.h" +#include "source/server/config_validation/api.h" +#include "source/server/config_validation/cluster_manager.h" +#include "source/server/config_validation/dns.h" +#include "source/server/listener_manager_impl.h" +#include "source/server/server.h" #include "absl/types/optional.h" @@ -75,7 +74,7 @@ class ValidationInstance final : Logger::Loggable, Ssl::ContextManager& sslContextManager() override { return *ssl_context_manager_; } Event::Dispatcher& dispatcher() override { return *dispatcher_; } Network::DnsResolverSharedPtr dnsResolver() override { - return dispatcher().createDnsResolver({}, false); + return dispatcher().createDnsResolver({}, envoy::config::core::v3::DnsResolverOptions()); } void drainListeners() override { NOT_IMPLEMENTED_GCOVR_EXCL_LINE; } DrainManager& drainManager() override { NOT_IMPLEMENTED_GCOVR_EXCL_LINE; } diff --git a/source/server/configuration_impl.cc b/source/server/configuration_impl.cc index debbfef503d25..f09586440b423 100644 --- a/source/server/configuration_impl.cc +++ b/source/server/configuration_impl.cc @@ -1,4 +1,4 @@ -#include "server/configuration_impl.h" +#include "source/server/configuration_impl.h" #include #include @@ -16,15 +16,14 @@ #include "envoy/server/tracer_config.h" #include "envoy/ssl/context_manager.h" -#include "common/access_log/access_log_impl.h" -#include "common/common/assert.h" -#include "common/common/utility.h" -#include "common/config/runtime_utility.h" -#include "common/config/utility.h" -#include "common/network/socket_option_factory.h" -#include "common/protobuf/utility.h" - -#include "extensions/access_loggers/common/file_access_log_impl.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/common/config/runtime_utility.h" +#include "source/common/config/utility.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/access_loggers/common/file_access_log_impl.h" namespace Envoy { namespace Server { diff --git a/source/server/configuration_impl.h b/source/server/configuration_impl.h index 5cbdec23bf6a1..58a7474a58723 100644 --- a/source/server/configuration_impl.h +++ b/source/server/configuration_impl.h @@ -17,9 +17,9 @@ #include "envoy/server/filter_config.h" #include "envoy/server/instance.h" -#include "common/common/logger.h" -#include "common/network/resolver_impl.h" -#include "common/network/utility.h" +#include "source/common/common/logger.h" +#include "source/common/network/resolver_impl.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Server { diff --git a/source/server/connection_handler_impl.cc b/source/server/connection_handler_impl.cc index 84ea2bbc416fc..e13ca96dbffff 100644 --- a/source/server/connection_handler_impl.cc +++ b/source/server/connection_handler_impl.cc @@ -1,14 +1,13 @@ -#include "server/connection_handler_impl.h" +#include "source/server/connection_handler_impl.h" #include #include "envoy/event/dispatcher.h" #include "envoy/network/filter.h" -#include "common/event/deferred_task.h" -#include "common/network/utility.h" - -#include "server/active_tcp_listener.h" +#include "source/common/event/deferred_task.h" +#include "source/common/network/utility.h" +#include "source/server/active_tcp_listener.h" namespace Envoy { namespace Server { diff --git a/source/server/connection_handler_impl.h b/source/server/connection_handler_impl.h index 4d73ba79fe219..24ff9cffafde0 100644 --- a/source/server/connection_handler_impl.h +++ b/source/server/connection_handler_impl.h @@ -12,7 +12,7 @@ #include "envoy/server/listener_manager.h" #include "envoy/stats/scope.h" -#include "common/common/non_copyable.h" +#include "source/common/common/non_copyable.h" #include "spdlog/spdlog.h" diff --git a/source/server/drain_manager_impl.cc b/source/server/drain_manager_impl.cc index 132108b95eaf0..41e8b8db6decb 100644 --- a/source/server/drain_manager_impl.cc +++ b/source/server/drain_manager_impl.cc @@ -1,4 +1,4 @@ -#include "server/drain_manager_impl.h" +#include "source/server/drain_manager_impl.h" #include #include @@ -7,7 +7,7 @@ #include "envoy/config/listener/v3/listener.pb.h" #include "envoy/event/timer.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Server { diff --git a/source/server/drain_manager_impl.h b/source/server/drain_manager_impl.h index c8056f22396cd..352d0669b38ae 100644 --- a/source/server/drain_manager_impl.h +++ b/source/server/drain_manager_impl.h @@ -8,7 +8,7 @@ #include "envoy/server/drain_manager.h" #include "envoy/server/instance.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Server { diff --git a/source/server/filter_chain_manager_impl.cc b/source/server/filter_chain_manager_impl.cc index f95fd064d6a8b..427b3cb0eeef8 100644 --- a/source/server/filter_chain_manager_impl.cc +++ b/source/server/filter_chain_manager_impl.cc @@ -1,15 +1,14 @@ -#include "server/filter_chain_manager_impl.h" +#include "source/server/filter_chain_manager_impl.h" #include "envoy/config/listener/v3/listener_components.pb.h" -#include "common/common/cleanup.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/config/utility.h" -#include "common/network/socket_interface.h" -#include "common/protobuf/utility.h" - -#include "server/configuration_impl.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/config/utility.h" +#include "source/common/network/socket_interface.h" +#include "source/common/protobuf/utility.h" +#include "source/server/configuration_impl.h" #include "absl/container/node_hash_map.h" #include "absl/strings/match.h" diff --git a/source/server/filter_chain_manager_impl.h b/source/server/filter_chain_manager_impl.h index f1ef81e98bbca..bb7b9cd32af0b 100644 --- a/source/server/filter_chain_manager_impl.h +++ b/source/server/filter_chain_manager_impl.h @@ -12,12 +12,11 @@ #include "envoy/server/transport_socket_config.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/logger.h" -#include "common/init/manager_impl.h" -#include "common/network/cidr_range.h" -#include "common/network/lc_trie.h" - -#include "server/filter_chain_factory_context_callback.h" +#include "source/common/common/logger.h" +#include "source/common/init/manager_impl.h" +#include "source/common/network/cidr_range.h" +#include "source/common/network/lc_trie.h" +#include "source/server/filter_chain_factory_context_callback.h" #include "absl/container/flat_hash_map.h" diff --git a/source/server/guarddog_impl.cc b/source/server/guarddog_impl.cc index fbc3e59a46822..d3c08388b4bd8 100644 --- a/source/server/guarddog_impl.cc +++ b/source/server/guarddog_impl.cc @@ -1,4 +1,4 @@ -#include "server/guarddog_impl.h" +#include "source/server/guarddog_impl.h" #include @@ -15,15 +15,14 @@ #include "envoy/stats/scope.h" #include "envoy/watchdog/v3alpha/abort_action.pb.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/lock_guard.h" -#include "common/common/logger.h" -#include "common/config/utility.h" -#include "common/protobuf/utility.h" -#include "common/stats/symbol_table_impl.h" - -#include "server/watchdog_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/logger.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/server/watchdog_impl.h" #include "absl/synchronization/mutex.h" diff --git a/source/server/guarddog_impl.h b/source/server/guarddog_impl.h index b6a4fb4759774..065fa66c9e180 100644 --- a/source/server/guarddog_impl.h +++ b/source/server/guarddog_impl.h @@ -13,12 +13,11 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats.h" -#include "common/common/lock_guard.h" -#include "common/common/logger.h" -#include "common/common/thread.h" -#include "common/event/libevent.h" - -#include "server/watchdog_impl.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/common/event/libevent.h" +#include "source/server/watchdog_impl.h" #include "absl/types/optional.h" diff --git a/source/server/hot_restart_impl.cc b/source/server/hot_restart_impl.cc index 56db575789856..ab9e28f38618a 100644 --- a/source/server/hot_restart_impl.cc +++ b/source/server/hot_restart_impl.cc @@ -1,4 +1,4 @@ -#include "server/hot_restart_impl.h" +#include "source/server/hot_restart_impl.h" #include #include @@ -13,10 +13,10 @@ #include "envoy/event/file_event.h" #include "envoy/server/instance.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/api/os_sys_calls_impl_hot_restart.h" -#include "common/common/fmt.h" -#include "common/common/lock_guard.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/api/os_sys_calls_impl_hot_restart.h" +#include "source/common/common/fmt.h" +#include "source/common/common/lock_guard.h" #include "absl/strings/string_view.h" diff --git a/source/server/hot_restart_impl.h b/source/server/hot_restart_impl.h index 309b6e766484f..63545c8fd1b0c 100644 --- a/source/server/hot_restart_impl.h +++ b/source/server/hot_restart_impl.h @@ -11,11 +11,10 @@ #include "envoy/common/platform.h" #include "envoy/server/hot_restart.h" -#include "common/common/assert.h" -#include "common/stats/allocator_impl.h" - -#include "server/hot_restarting_child.h" -#include "server/hot_restarting_parent.h" +#include "source/common/common/assert.h" +#include "source/common/stats/allocator_impl.h" +#include "source/server/hot_restarting_child.h" +#include "source/server/hot_restarting_parent.h" namespace Envoy { namespace Server { diff --git a/source/server/hot_restart_nop_impl.h b/source/server/hot_restart_nop_impl.h index 5e52501855827..28369b3b1ac6e 100644 --- a/source/server/hot_restart_nop_impl.h +++ b/source/server/hot_restart_nop_impl.h @@ -4,8 +4,8 @@ #include "envoy/server/hot_restart.h" -#include "common/common/thread.h" -#include "common/stats/allocator_impl.h" +#include "source/common/common/thread.h" +#include "source/common/stats/allocator_impl.h" namespace Envoy { namespace Server { diff --git a/source/server/hot_restarting_base.cc b/source/server/hot_restarting_base.cc index ea8424f1778ec..22e8286ca02d2 100644 --- a/source/server/hot_restarting_base.cc +++ b/source/server/hot_restarting_base.cc @@ -1,11 +1,11 @@ -#include "server/hot_restarting_base.h" - -#include "common/api/os_sys_calls_impl.h" -#include "common/common/mem_block_builder.h" -#include "common/common/safe_memcpy.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/stats/utility.h" +#include "source/server/hot_restarting_base.h" + +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/mem_block_builder.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/stats/utility.h" namespace Envoy { namespace Server { diff --git a/source/server/hot_restarting_base.h b/source/server/hot_restarting_base.h index 1d1fac8c921c3..16eefe9392829 100644 --- a/source/server/hot_restarting_base.h +++ b/source/server/hot_restarting_base.h @@ -15,7 +15,7 @@ #include "envoy/server/options.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Server { diff --git a/source/server/hot_restarting_child.cc b/source/server/hot_restarting_child.cc index cd673303475b6..ff49a173d5e0e 100644 --- a/source/server/hot_restarting_child.cc +++ b/source/server/hot_restarting_child.cc @@ -1,6 +1,6 @@ -#include "server/hot_restarting_child.h" +#include "source/server/hot_restarting_child.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" namespace Envoy { namespace Server { diff --git a/source/server/hot_restarting_child.h b/source/server/hot_restarting_child.h index 4ac03e4182c01..f2a7056874d2d 100644 --- a/source/server/hot_restarting_child.h +++ b/source/server/hot_restarting_child.h @@ -1,8 +1,7 @@ #pragma once -#include "common/stats/stat_merger.h" - -#include "server/hot_restarting_base.h" +#include "source/common/stats/stat_merger.h" +#include "source/server/hot_restarting_base.h" namespace Envoy { namespace Server { diff --git a/source/server/hot_restarting_parent.cc b/source/server/hot_restarting_parent.cc index 6898c0db9999e..d399bc7b16ac9 100644 --- a/source/server/hot_restarting_parent.cc +++ b/source/server/hot_restarting_parent.cc @@ -1,14 +1,13 @@ -#include "server/hot_restarting_parent.h" +#include "source/server/hot_restarting_parent.h" #include "envoy/server/instance.h" -#include "common/memory/stats.h" -#include "common/network/utility.h" -#include "common/stats/stat_merger.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/utility.h" - -#include "server/listener_impl.h" +#include "source/common/memory/stats.h" +#include "source/common/network/utility.h" +#include "source/common/stats/stat_merger.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/utility.h" +#include "source/server/listener_impl.h" namespace Envoy { namespace Server { diff --git a/source/server/hot_restarting_parent.h b/source/server/hot_restarting_parent.h index 298ff426aea11..d838d8e72ac58 100644 --- a/source/server/hot_restarting_parent.h +++ b/source/server/hot_restarting_parent.h @@ -1,8 +1,7 @@ #pragma once -#include "common/common/hash.h" - -#include "server/hot_restarting_base.h" +#include "source/common/common/hash.h" +#include "source/server/hot_restarting_base.h" namespace Envoy { namespace Server { diff --git a/source/server/lds_api.cc b/source/server/lds_api.cc index f6a16585fa43d..1a1f9f9aed988 100644 --- a/source/server/lds_api.cc +++ b/source/server/lds_api.cc @@ -1,4 +1,4 @@ -#include "server/lds_api.h" +#include "source/server/lds_api.h" #include "envoy/admin/v3/config_dump.pb.h" #include "envoy/config/core/v3/config_source.pb.h" @@ -7,11 +7,11 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/cleanup.h" -#include "common/config/api_version.h" -#include "common/config/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/cleanup.h" +#include "source/common/config/api_version.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" #include "absl/container/node_hash_set.h" #include "absl/strings/str_join.h" diff --git a/source/server/lds_api.h b/source/server/lds_api.h index 3474a50389040..05a4db0a29f56 100644 --- a/source/server/lds_api.h +++ b/source/server/lds_api.h @@ -12,9 +12,9 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/scope.h" -#include "common/common/logger.h" -#include "common/config/subscription_base.h" -#include "common/init/target_impl.h" +#include "source/common/common/logger.h" +#include "source/common/config/subscription_base.h" +#include "source/common/init/target_impl.h" namespace Envoy { namespace Server { diff --git a/source/server/listener_impl.cc b/source/server/listener_impl.cc index 405937f7cf7b1..3192d28392502 100644 --- a/source/server/listener_impl.cc +++ b/source/server/listener_impl.cc @@ -1,4 +1,4 @@ -#include "server/listener_impl.h" +#include "source/server/listener_impl.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/config/listener/v3/listener.pb.h" @@ -10,32 +10,30 @@ #include "envoy/server/transport_socket_config.h" #include "envoy/stats/scope.h" -#include "common/access_log/access_log_impl.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/config/utility.h" -#include "common/network/connection_balancer_impl.h" -#include "common/network/resolver_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/socket_option_impl.h" -#include "common/network/udp_listener_impl.h" -#include "common/network/udp_packet_writer_handler_impl.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_features.h" - -#include "server/active_raw_udp_listener_config.h" -#include "server/configuration_impl.h" -#include "server/drain_manager_impl.h" -#include "server/filter_chain_manager_impl.h" -#include "server/listener_manager_impl.h" -#include "server/transport_socket_config_impl.h" - -#include "extensions/filters/listener/well_known_names.h" - -#if defined(ENVOY_ENABLE_QUIC) -#include "common/quic/active_quic_listener.h" -#include "common/quic/udp_gso_batch_writer.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/config/utility.h" +#include "source/common/network/connection_balancer_impl.h" +#include "source/common/network/resolver_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/udp_listener_impl.h" +#include "source/common/network/udp_packet_writer_handler_impl.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_features.h" +#include "source/extensions/filters/listener/well_known_names.h" +#include "source/server/active_raw_udp_listener_config.h" +#include "source/server/configuration_impl.h" +#include "source/server/drain_manager_impl.h" +#include "source/server/filter_chain_manager_impl.h" +#include "source/server/listener_manager_impl.h" +#include "source/server/transport_socket_config_impl.h" + +#ifdef ENVOY_ENABLE_QUIC +#include "source/common/quic/active_quic_listener.h" +#include "source/common/quic/udp_gso_batch_writer.h" #endif namespace Envoy { @@ -289,15 +287,21 @@ ListenerImpl::ListenerImpl(const envoy::config::listener::v3::Listener& config, open_connections_(std::make_shared( std::numeric_limits::max(), listener_factory_context_->runtime(), cx_limit_runtime_key_)), - local_init_watcher_(fmt::format("Listener-local-init-watcher {}", name), [this] { - if (workers_started_) { - parent_.onListenerWarmed(*this); - } else { - // Notify Server that this listener is - // ready. - listener_init_target_.ready(); - } - }) { + local_init_watcher_(fmt::format("Listener-local-init-watcher {}", name), + [this] { + if (workers_started_) { + parent_.onListenerWarmed(*this); + } else { + // Notify Server that this listener is + // ready. + listener_init_target_.ready(); + } + }) +#ifdef ENVOY_ENABLE_QUIC + , + quic_stat_names_(parent_.quicStatNames()) +#endif +{ const absl::optional runtime_val = listener_factory_context_->runtime().snapshot().get(cx_limit_runtime_key_); @@ -360,10 +364,16 @@ ListenerImpl::ListenerImpl(ListenerImpl& origin, origin.listener_factory_context_->listener_factory_context_base_, this, *this)), filter_chain_manager_(address_, origin.listener_factory_context_->parentFactoryContext(), initManager(), origin.filter_chain_manager_), - local_init_watcher_(fmt::format("Listener-local-init-watcher {}", name), [this] { - ASSERT(workers_started_); - parent_.inPlaceFilterChainUpdate(*this); - }) { + local_init_watcher_(fmt::format("Listener-local-init-watcher {}", name), + [this] { + ASSERT(workers_started_); + parent_.inPlaceFilterChainUpdate(*this); + }) +#ifdef ENVOY_ENABLE_QUIC + , + quic_stat_names_(parent_.quicStatNames()) +#endif +{ buildAccessLog(); auto socket_type = Network::Utility::protobufAddressSocketType(config.address()); buildListenSocketOptions(socket_type); @@ -401,9 +411,9 @@ void ListenerImpl::buildUdpListenerFactory(Network::Socket::Type socket_type, udp_listener_config_ = std::make_unique(config_.udp_listener_config()); if (config_.udp_listener_config().has_quic_options()) { -#if defined(ENVOY_ENABLE_QUIC) +#ifdef ENVOY_ENABLE_QUIC udp_listener_config_->listener_factory_ = std::make_unique( - config_.udp_listener_config().quic_options(), concurrency); + config_.udp_listener_config().quic_options(), concurrency, quic_stat_names_); #if UDP_GSO_BATCH_WRITER_COMPILETIME_SUPPORT // TODO(mattklein123): We should be able to use GSO without QUICHE/QUIC. Right now this causes // non-QUIC integration tests to fail, which I haven't investigated yet. Additionally, from diff --git a/source/server/listener_impl.h b/source/server/listener_impl.h index 2f0b860bd1332..d04613f030692 100644 --- a/source/server/listener_impl.h +++ b/source/server/listener_impl.h @@ -13,15 +13,18 @@ #include "envoy/server/listener_manager.h" #include "envoy/stats/scope.h" -#include "common/common/basic_resource_impl.h" -#include "common/common/logger.h" -#include "common/init/manager_impl.h" -#include "common/init/target_impl.h" - -#include "server/filter_chain_manager_impl.h" +#include "source/common/common/basic_resource_impl.h" +#include "source/common/common/logger.h" +#include "source/common/init/manager_impl.h" +#include "source/common/init/target_impl.h" +#include "source/server/filter_chain_manager_impl.h" #include "absl/base/call_once.h" +#ifdef ENVOY_ENABLE_QUIC +#include "source/common/quic/quic_stat_names.h" +#endif + namespace Envoy { namespace Server { @@ -424,6 +427,10 @@ class ListenerImpl final : public Network::ListenerConfig, // callback during the destroy of ListenerImpl. Init::WatcherImpl local_init_watcher_; +#ifdef ENVOY_ENABLE_QUIC + Quic::QuicStatNames& quic_stat_names_; +#endif + // to access ListenerManagerImpl::factory_. friend class ListenerFilterChainFactoryBuilder; }; diff --git a/source/server/listener_manager_impl.cc b/source/server/listener_manager_impl.cc index c9fa407fd7912..1b7921886a70c 100644 --- a/source/server/listener_manager_impl.cc +++ b/source/server/listener_manager_impl.cc @@ -1,4 +1,4 @@ -#include "server/listener_manager_impl.h" +#include "source/server/listener_manager_impl.h" #include @@ -13,28 +13,28 @@ #include "envoy/server/transport_socket_config.h" #include "envoy/stats/scope.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" -#include "common/network/filter_matcher.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/network/filter_matcher.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" #if defined(ENVOY_ENABLE_QUIC) -#include "common/quic/quic_transport_socket_factory.h" +#include "source/common/quic/quic_transport_socket_factory.h" #endif -#include "server/api_listener_impl.h" -#include "server/configuration_impl.h" -#include "server/drain_manager_impl.h" -#include "server/filter_chain_manager_impl.h" -#include "server/transport_socket_config_impl.h" +#include "source/server/api_listener_impl.h" +#include "source/server/configuration_impl.h" +#include "source/server/drain_manager_impl.h" +#include "source/server/filter_chain_manager_impl.h" +#include "source/server/transport_socket_config_impl.h" -#include "extensions/filters/listener/well_known_names.h" +#include "source/extensions/filters/listener/well_known_names.h" namespace Envoy { namespace Server { diff --git a/source/server/listener_manager_impl.h b/source/server/listener_manager_impl.h index 045465f837cee..8b1ee3f1d8b65 100644 --- a/source/server/listener_manager_impl.h +++ b/source/server/listener_manager_impl.h @@ -18,10 +18,14 @@ #include "envoy/server/worker.h" #include "envoy/stats/scope.h" -#include "server/filter_chain_factory_context_callback.h" -#include "server/filter_chain_manager_impl.h" -#include "server/lds_api.h" -#include "server/listener_impl.h" +#include "source/server/filter_chain_factory_context_callback.h" +#include "source/server/filter_chain_manager_impl.h" +#include "source/server/lds_api.h" +#include "source/server/listener_impl.h" + +#ifdef ENVOY_ENABLE_QUIC +#include "source/common/quic/quic_stat_names.h" +#endif namespace Envoy { namespace Server { @@ -202,6 +206,10 @@ class ListenerManagerImpl : public ListenerManager, Logger::Loggable> error_state_tracker_; FailureStates overall_error_state_; +#ifdef ENVOY_ENABLE_QUIC + Quic::QuicStatNames quic_stat_names_ = Quic::QuicStatNames(server_.stats().symbolTable()); +#endif }; class ListenerFilterChainFactoryBuilder : public FilterChainFactoryBuilder { diff --git a/source/server/options_impl.cc b/source/server/options_impl.cc index a9b785e1f0b3b..57becc5a89e4a 100644 --- a/source/server/options_impl.cc +++ b/source/server/options_impl.cc @@ -1,4 +1,4 @@ -#include "server/options_impl.h" +#include "source/server/options_impl.h" #include #include @@ -7,13 +7,12 @@ #include "envoy/admin/v3/server_info.pb.h" -#include "common/common/fmt.h" -#include "common/common/logger.h" -#include "common/common/macros.h" -#include "common/protobuf/utility.h" -#include "common/version/version.h" - -#include "server/options_impl_platform.h" +#include "source/common/common/fmt.h" +#include "source/common/common/logger.h" +#include "source/common/common/macros.h" +#include "source/common/protobuf/utility.h" +#include "source/common/version/version.h" +#include "source/server/options_impl_platform.h" #include "absl/strings/str_replace.h" #include "absl/strings/str_split.h" diff --git a/source/server/options_impl.h b/source/server/options_impl.h index cd5ac7232e65c..3751747a56111 100644 --- a/source/server/options_impl.h +++ b/source/server/options_impl.h @@ -9,7 +9,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/options.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "spdlog/spdlog.h" diff --git a/source/server/options_impl_platform.h b/source/server/options_impl_platform.h index 7d628d3699025..cbdcb15f20506 100644 --- a/source/server/options_impl_platform.h +++ b/source/server/options_impl_platform.h @@ -2,7 +2,7 @@ #include -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { class OptionsImplPlatform : protected Logger::Loggable { diff --git a/source/server/options_impl_platform_default.cc b/source/server/options_impl_platform_default.cc index 3b4cbbe3118e9..2f526e178fbc1 100644 --- a/source/server/options_impl_platform_default.cc +++ b/source/server/options_impl_platform_default.cc @@ -1,8 +1,7 @@ #include -#include "common/common/logger.h" - -#include "server/options_impl_platform.h" +#include "source/common/common/logger.h" +#include "source/server/options_impl_platform.h" namespace Envoy { diff --git a/source/server/options_impl_platform_linux.cc b/source/server/options_impl_platform_linux.cc index 069c68ab83da1..9365614dc1840 100644 --- a/source/server/options_impl_platform_linux.cc +++ b/source/server/options_impl_platform_linux.cc @@ -2,15 +2,14 @@ #error "Linux platform file is part of non-Linux build." #endif -#include "server/options_impl_platform_linux.h" +#include "source/server/options_impl_platform_linux.h" #include #include -#include "common/api/os_sys_calls_impl_linux.h" - -#include "server/options_impl_platform.h" +#include "source/common/api/os_sys_calls_impl_linux.h" +#include "source/server/options_impl_platform.h" namespace Envoy { diff --git a/source/server/overload_manager_impl.cc b/source/server/overload_manager_impl.cc index 71be8f3c5699d..ee6e479a6d409 100644 --- a/source/server/overload_manager_impl.cc +++ b/source/server/overload_manager_impl.cc @@ -1,4 +1,4 @@ -#include "server/overload_manager_impl.h" +#include "source/server/overload_manager_impl.h" #include @@ -7,13 +7,12 @@ #include "envoy/config/overload/v3/overload.pb.validate.h" #include "envoy/stats/scope.h" -#include "common/common/fmt.h" -#include "common/config/utility.h" -#include "common/event/scaled_range_timer_manager_impl.h" -#include "common/protobuf/utility.h" -#include "common/stats/symbol_table_impl.h" - -#include "server/resource_monitor_config_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/config/utility.h" +#include "source/common/event/scaled_range_timer_manager_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/server/resource_monitor_config_impl.h" #include "absl/container/node_hash_map.h" #include "absl/strings/str_cat.h" diff --git a/source/server/overload_manager_impl.h b/source/server/overload_manager_impl.h index 730d4ae063913..784308b1f4b89 100644 --- a/source/server/overload_manager_impl.h +++ b/source/server/overload_manager_impl.h @@ -15,8 +15,8 @@ #include "envoy/stats/stats.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/logger.h" -#include "common/event/scaled_range_timer_manager_impl.h" +#include "source/common/common/logger.h" +#include "source/common/event/scaled_range_timer_manager_impl.h" #include "absl/container/node_hash_map.h" #include "absl/container/node_hash_set.h" diff --git a/source/server/proto_descriptors.cc b/source/server/proto_descriptors.cc index 2a71693eefe83..d7043ff18feb1 100644 --- a/source/server/proto_descriptors.cc +++ b/source/server/proto_descriptors.cc @@ -1,9 +1,9 @@ -#include "server/proto_descriptors.h" +#include "source/server/proto_descriptors.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/config/protobuf_link_hacks.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/config/protobuf_link_hacks.h" +#include "source/common/protobuf/protobuf.h" #include "absl/strings/str_cat.h" diff --git a/source/server/server.cc b/source/server/server.cc index 920bd37f55e41..5b8520e2fffc4 100644 --- a/source/server/server.cc +++ b/source/server/server.cc @@ -1,4 +1,4 @@ -#include "server/server.h" +#include "source/server/server.h" #include #include @@ -24,37 +24,36 @@ #include "envoy/server/options.h" #include "envoy/upstream/cluster_manager.h" -#include "common/api/api_impl.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/enum_to_int.h" -#include "common/common/mutex_tracer_impl.h" -#include "common/common/utility.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" -#include "common/config/xds_resource.h" -#include "common/http/codes.h" -#include "common/local_info/local_info_impl.h" -#include "common/memory/stats.h" -#include "common/network/address_impl.h" -#include "common/network/socket_interface.h" -#include "common/network/socket_interface_impl.h" -#include "common/network/tcp_listener_impl.h" -#include "common/protobuf/utility.h" -#include "common/router/rds_impl.h" -#include "common/runtime/runtime_impl.h" -#include "common/signal/fatal_error_handler.h" -#include "common/singleton/manager_impl.h" -#include "common/stats/thread_local_store.h" -#include "common/stats/timespan_impl.h" -#include "common/upstream/cluster_manager_impl.h" -#include "common/version/version.h" - -#include "server/admin/utils.h" -#include "server/configuration_impl.h" -#include "server/connection_handler_impl.h" -#include "server/guarddog_impl.h" -#include "server/listener_hooks.h" -#include "server/ssl_context_manager.h" +#include "source/common/api/api_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/common/mutex_tracer_impl.h" +#include "source/common/common/utility.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/config/xds_resource.h" +#include "source/common/http/codes.h" +#include "source/common/local_info/local_info_impl.h" +#include "source/common/memory/stats.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_interface.h" +#include "source/common/network/socket_interface_impl.h" +#include "source/common/network/tcp_listener_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/rds_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/signal/fatal_error_handler.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/stats/thread_local_store.h" +#include "source/common/stats/timespan_impl.h" +#include "source/common/upstream/cluster_manager_impl.h" +#include "source/common/version/version.h" +#include "source/server/admin/utils.h" +#include "source/server/configuration_impl.h" +#include "source/server/connection_handler_impl.h" +#include "source/server/guarddog_impl.h" +#include "source/server/listener_hooks.h" +#include "source/server/ssl_context_manager.h" namespace Envoy { namespace Server { @@ -412,9 +411,27 @@ void InstanceImpl::initialize(const Options& options, server_compilation_settings_stats_->fips_mode_.set(1); } - bootstrap_.mutable_node()->set_hidden_envoy_deprecated_build_version(VersionInfo::version()); - bootstrap_.mutable_node()->set_user_agent_name("envoy"); - *bootstrap_.mutable_node()->mutable_user_agent_build_version() = VersionInfo::buildVersion(); + // If user has set user_agent_name in the bootstrap config, use it. + // Default to "envoy" if unset. + if (bootstrap_.node().user_agent_name().empty()) { + bootstrap_.mutable_node()->set_user_agent_name("envoy"); + } + + // If user has set user_agent_version in the bootstrap config, use it. + // Default to the internal server version. + if (!bootstrap_.node().user_agent_version().empty()) { + std::string user_agent_version = bootstrap_.node().user_agent_version(); + bootstrap_.mutable_node()->set_hidden_envoy_deprecated_build_version(user_agent_version); + } else { + bootstrap_.mutable_node()->set_hidden_envoy_deprecated_build_version(VersionInfo::version()); + } + + // If user has set user_agent_build_version in the bootstrap config, use it. + // Default to the internal server version. + if (!bootstrap_.node().user_agent_build_version().has_version()) { + *bootstrap_.mutable_node()->mutable_user_agent_build_version() = VersionInfo::buildVersion(); + } + for (const auto& ext : Envoy::Registry::FactoryCategoryRegistry::registeredFactories()) { for (const auto& name : ext.second->allRegisteredNames()) { auto* extension = bootstrap_.mutable_node()->add_extensions(); @@ -543,8 +560,23 @@ void InstanceImpl::initialize(const Options& options, // Once we have runtime we can initialize the SSL context manager. ssl_context_manager_ = createContextManager("ssl_context_manager", time_source_); - const bool use_tcp_for_dns_lookups = bootstrap_.use_tcp_for_dns_lookups(); - dns_resolver_ = dispatcher_->createDnsResolver({}, use_tcp_for_dns_lookups); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + std::vector resolvers; + if (bootstrap_.has_dns_resolution_config()) { + dns_resolver_options.CopyFrom(bootstrap_.dns_resolution_config().dns_resolver_options()); + if (!bootstrap_.dns_resolution_config().resolvers().empty()) { + const auto& resolver_addrs = bootstrap_.dns_resolution_config().resolvers(); + resolvers.reserve(resolver_addrs.size()); + for (const auto& resolver_addr : resolver_addrs) { + resolvers.push_back(Network::Address::resolveProtoAddress(resolver_addr)); + } + } + } else { + // Field bool `use_tcp_for_dns_lookups` will be deprecated in future. To be backward compatible + // utilize bootstrap_.use_tcp_for_dns_lookups() if `bootstrap_.dns_resolver_options` is not set. + dns_resolver_options.set_use_tcp_for_dns_lookups(bootstrap_.use_tcp_for_dns_lookups()); + } + dns_resolver_ = dispatcher_->createDnsResolver(resolvers, dns_resolver_options); cluster_manager_factory_ = std::make_unique( *admin_, Runtime::LoaderSingleton::get(), stats_store_, thread_local_, dns_resolver_, diff --git a/source/server/server.h b/source/server/server.h index 066fb07a844ca..f40d31880d5b2 100644 --- a/source/server/server.h +++ b/source/server/server.h @@ -23,27 +23,26 @@ #include "envoy/stats/timespan.h" #include "envoy/tracing/http_tracer.h" -#include "common/access_log/access_log_manager_impl.h" -#include "common/common/assert.h" -#include "common/common/cleanup.h" -#include "common/common/logger_delegates.h" -#include "common/grpc/async_client_manager_impl.h" -#include "common/grpc/context_impl.h" -#include "common/http/context_impl.h" -#include "common/init/manager_impl.h" -#include "common/memory/heap_shrinker.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/router/context_impl.h" -#include "common/runtime/runtime_impl.h" -#include "common/secret/secret_manager_impl.h" -#include "common/upstream/health_discovery_service.h" - -#include "server/admin/admin.h" -#include "server/configuration_impl.h" -#include "server/listener_hooks.h" -#include "server/listener_manager_impl.h" -#include "server/overload_manager_impl.h" -#include "server/worker_impl.h" +#include "source/common/access_log/access_log_manager_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/cleanup.h" +#include "source/common/common/logger_delegates.h" +#include "source/common/grpc/async_client_manager_impl.h" +#include "source/common/grpc/context_impl.h" +#include "source/common/http/context_impl.h" +#include "source/common/init/manager_impl.h" +#include "source/common/memory/heap_shrinker.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/router/context_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/secret/secret_manager_impl.h" +#include "source/common/upstream/health_discovery_service.h" +#include "source/server/admin/admin.h" +#include "source/server/configuration_impl.h" +#include "source/server/listener_hooks.h" +#include "source/server/listener_manager_impl.h" +#include "source/server/overload_manager_impl.h" +#include "source/server/worker_impl.h" #include "absl/container/node_hash_map.h" #include "absl/types/optional.h" diff --git a/source/server/ssl_context_manager.cc b/source/server/ssl_context_manager.cc index 4df41234cd43a..0189da0c6d04e 100644 --- a/source/server/ssl_context_manager.cc +++ b/source/server/ssl_context_manager.cc @@ -1,4 +1,4 @@ -#include "server/ssl_context_manager.h" +#include "source/server/ssl_context_manager.h" #include "envoy/common/exception.h" #include "envoy/registry/registry.h" diff --git a/source/server/worker_impl.cc b/source/server/worker_impl.cc index 68fd72defdb99..45e595d457d7e 100644 --- a/source/server/worker_impl.cc +++ b/source/server/worker_impl.cc @@ -1,4 +1,4 @@ -#include "server/worker_impl.h" +#include "source/server/worker_impl.h" #include #include @@ -9,7 +9,7 @@ #include "envoy/server/configuration.h" #include "envoy/thread_local/thread_local.h" -#include "server/connection_handler_impl.h" +#include "source/server/connection_handler_impl.h" namespace Envoy { namespace Server { diff --git a/source/server/worker_impl.h b/source/server/worker_impl.h index 22513b594e5d1..ecf1728bfc783 100644 --- a/source/server/worker_impl.h +++ b/source/server/worker_impl.h @@ -10,9 +10,8 @@ #include "envoy/server/worker.h" #include "envoy/thread_local/thread_local.h" -#include "common/common/logger.h" - -#include "server/listener_hooks.h" +#include "source/common/common/logger.h" +#include "source/server/listener_hooks.h" namespace Envoy { namespace Server { diff --git a/support/hooks/pre-push b/support/hooks/pre-push index 9ebaf62eb5a4a..42e31df9e6d2e 100755 --- a/support/hooks/pre-push +++ b/support/hooks/pre-push @@ -12,6 +12,7 @@ DUMMY_SHA=0000000000000000000000000000000000000000 echo "Running pre-push check; to skip this step use 'push --no-verify'" +AUTHOR=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/\1/p') # shellcheck disable=SC2034 while read -r LOCAL_REF LOCAL_SHA REMOTE_REF REMOTE_SHA @@ -37,8 +38,8 @@ do # # In general, we can't assume that the commits are signed off by author # pushing, so we settle for just checking that there is a signoff at all. - SIGNED_OFF=$(git rev-list --no-merges --grep "^Signed-off-by: " "$RANGE") - NOT_SIGNED_OFF=$(git rev-list --no-merges "$RANGE" | grep -Fxv "$SIGNED_OFF") + SIGNED_OFF=$(git rev-list --no-merges --author "$AUTHOR" --grep "^Signed-off-by: " "$RANGE") + NOT_SIGNED_OFF=$(git rev-list --no-merges --author "$AUTHOR" "$RANGE" | grep -Fxv "$SIGNED_OFF") if [ -n "$NOT_SIGNED_OFF" ] then echo >&2 "ERROR: The following commits do not have DCO signoff:" diff --git a/test/benchmark/main.cc b/test/benchmark/main.cc index 311d1de569869..6ab63fb6a51d7 100644 --- a/test/benchmark/main.cc +++ b/test/benchmark/main.cc @@ -2,8 +2,8 @@ // This is an Envoy driver for benchmarks. #include "test/benchmark/main.h" -#include "common/common/logger.h" -#include "common/common/thread.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" #include "test/test_common/environment.h" #include "test/test_common/test_runtime.h" diff --git a/test/common/access_log/access_log_impl_test.cc b/test/common/access_log/access_log_impl_test.cc index 495b27f1f2add..a6461165fde22 100644 --- a/test/common/access_log/access_log_impl_test.cc +++ b/test/common/access_log/access_log_impl_test.cc @@ -8,11 +8,11 @@ #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/upstream.h" -#include "common/access_log/access_log_impl.h" -#include "common/config/utility.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/runtime/runtime_impl.h" -#include "common/stream_info/utility.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/stream_info/utility.h" #include "test/common/stream_info/test_util.h" #include "test/common/upstream/utility.h" diff --git a/test/common/access_log/access_log_manager_impl_test.cc b/test/common/access_log/access_log_manager_impl_test.cc index b5de178505d64..3aea8cae6d402 100644 --- a/test/common/access_log/access_log_manager_impl_test.cc +++ b/test/common/access_log/access_log_manager_impl_test.cc @@ -1,7 +1,7 @@ #include -#include "common/access_log/access_log_manager_impl.h" -#include "common/filesystem/file_shared_impl.h" +#include "source/common/access_log/access_log_manager_impl.h" +#include "source/common/filesystem/file_shared_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/access_log/mocks.h" diff --git a/test/common/buffer/buffer_fuzz.cc b/test/common/buffer/buffer_fuzz.cc index 1e8faab75182f..46241032beff0 100644 --- a/test/common/buffer/buffer_fuzz.cc +++ b/test/common/buffer/buffer_fuzz.cc @@ -4,11 +4,11 @@ #include "envoy/common/platform.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/memory/stats.h" -#include "common/network/io_socket_handle_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/memory/stats.h" +#include "source/common/network/io_socket_handle_impl.h" #include "test/fuzz/utility.h" diff --git a/test/common/buffer/buffer_speed_test.cc b/test/common/buffer/buffer_speed_test.cc index 653a5bea770ad..458a92098aa00 100644 --- a/test/common/buffer/buffer_speed_test.cc +++ b/test/common/buffer/buffer_speed_test.cc @@ -1,5 +1,5 @@ -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" #include "absl/strings/string_view.h" #include "benchmark/benchmark.h" diff --git a/test/common/buffer/buffer_test.cc b/test/common/buffer/buffer_test.cc index d301d634ce6fa..57d7e402a7d47 100644 --- a/test/common/buffer/buffer_test.cc +++ b/test/common/buffer/buffer_test.cc @@ -2,7 +2,7 @@ #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "test/common/buffer/utility.h" #include "test/test_common/printers.h" diff --git a/test/common/buffer/owned_impl_test.cc b/test/common/buffer/owned_impl_test.cc index 667d37460e306..ea5cf249ae1dd 100644 --- a/test/common/buffer/owned_impl_test.cc +++ b/test/common/buffer/owned_impl_test.cc @@ -2,8 +2,8 @@ #include "envoy/api/io_error.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/io_socket_handle_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/io_socket_handle_impl.h" #include "test/common/buffer/utility.h" #include "test/mocks/api/mocks.h" diff --git a/test/common/buffer/utility.h b/test/common/buffer/utility.h index 868427de465ad..27913ecf025d5 100644 --- a/test/common/buffer/utility.h +++ b/test/common/buffer/utility.h @@ -2,7 +2,7 @@ #include -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "gtest/gtest.h" diff --git a/test/common/buffer/watermark_buffer_test.cc b/test/common/buffer/watermark_buffer_test.cc index 70ddb07d98005..548318a8065ab 100644 --- a/test/common/buffer/watermark_buffer_test.cc +++ b/test/common/buffer/watermark_buffer_test.cc @@ -1,9 +1,9 @@ #include -#include "common/api/os_sys_calls_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/buffer/watermark_buffer.h" -#include "common/network/io_socket_handle_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/network/io_socket_handle_impl.h" #include "test/common/buffer/utility.h" #include "test/test_common/test_runtime.h" diff --git a/test/common/buffer/zero_copy_input_stream_test.cc b/test/common/buffer/zero_copy_input_stream_test.cc index 9ff0ffd6683ef..7b20ec1b1634e 100644 --- a/test/common/buffer/zero_copy_input_stream_test.cc +++ b/test/common/buffer/zero_copy_input_stream_test.cc @@ -1,5 +1,5 @@ -#include "common/buffer/buffer_impl.h" -#include "common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" #include "test/common/buffer/utility.h" diff --git a/test/common/common/api_version_test.cc b/test/common/common/api_version_test.cc index 10682206b58b5..8d386ebee601b 100644 --- a/test/common/common/api_version_test.cc +++ b/test/common/common/api_version_test.cc @@ -1,4 +1,4 @@ -#include "common/version/api_version.h" +#include "source/common/version/api_version.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/common/common/assert2_test.cc b/test/common/common/assert2_test.cc index 00aa17e957989..99e5f9119ce9b 100644 --- a/test/common/common/assert2_test.cc +++ b/test/common/common/assert2_test.cc @@ -1,4 +1,4 @@ -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "test/test_common/logging.h" #include "test/test_common/utility.h" diff --git a/test/common/common/assert_test.cc b/test/common/common/assert_test.cc index 878c71523efec..d655233e669b5 100644 --- a/test/common/common/assert_test.cc +++ b/test/common/common/assert_test.cc @@ -1,4 +1,4 @@ -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "test/test_common/logging.h" #include "test/test_common/utility.h" diff --git a/test/common/common/backoff_strategy_test.cc b/test/common/common/backoff_strategy_test.cc index bfc540234c7bf..67225242cde97 100644 --- a/test/common/common/backoff_strategy_test.cc +++ b/test/common/common/backoff_strategy_test.cc @@ -1,4 +1,4 @@ -#include "common/common/backoff_strategy.h" +#include "source/common/common/backoff_strategy.h" #include "test/mocks/common.h" diff --git a/test/common/common/base64_fuzz_test.cc b/test/common/common/base64_fuzz_test.cc index bf56f713cdfc4..d6a3ef4e3e159 100644 --- a/test/common/common/base64_fuzz_test.cc +++ b/test/common/common/base64_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "common/common/base64.h" +#include "source/common/common/base64.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/common/base64_test.cc b/test/common/common/base64_test.cc index 04ad1dfb24b9e..3c6bf92a05740 100644 --- a/test/common/common/base64_test.cc +++ b/test/common/common/base64_test.cc @@ -1,7 +1,7 @@ #include -#include "common/buffer/buffer_impl.h" -#include "common/common/base64.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/base64.h" #include "test/test_common/printers.h" diff --git a/test/common/common/basic_resource_impl_test.cc b/test/common/common/basic_resource_impl_test.cc index 60481535d06cd..4a54303bcf1df 100644 --- a/test/common/common/basic_resource_impl_test.cc +++ b/test/common/common/basic_resource_impl_test.cc @@ -1,6 +1,6 @@ #include -#include "common/common/basic_resource_impl.h" +#include "source/common/common/basic_resource_impl.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/common/common/callback_impl_test.cc b/test/common/common/callback_impl_test.cc index e9a451c8d15ed..6261766e2a2e5 100644 --- a/test/common/common/callback_impl_test.cc +++ b/test/common/common/callback_impl_test.cc @@ -1,4 +1,4 @@ -#include "common/common/callback_impl.h" +#include "source/common/common/callback_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/common/common/cleanup_test.cc b/test/common/common/cleanup_test.cc index d76faf78e4453..c000a6ed2b94c 100644 --- a/test/common/common/cleanup_test.cc +++ b/test/common/common/cleanup_test.cc @@ -1,4 +1,4 @@ -#include "common/common/cleanup.h" +#include "source/common/common/cleanup.h" #include "gtest/gtest.h" diff --git a/test/common/common/containers_test.cc b/test/common/common/containers_test.cc index 5bc2c5aec62d8..69128a225d25b 100644 --- a/test/common/common/containers_test.cc +++ b/test/common/common/containers_test.cc @@ -1,4 +1,4 @@ -#include "common/common/containers.h" +#include "source/common/common/containers.h" #include "gtest/gtest.h" diff --git a/test/common/common/fmt_test.cc b/test/common/common/fmt_test.cc index f5b8fd45d9536..73809fad4cf34 100644 --- a/test/common/common/fmt_test.cc +++ b/test/common/common/fmt_test.cc @@ -1,5 +1,5 @@ -#include "common/common/fmt.h" -#include "common/common/logger.h" +#include "source/common/common/fmt.h" +#include "source/common/common/logger.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" diff --git a/test/common/common/hash_fuzz_test.cc b/test/common/common/hash_fuzz_test.cc index c9d84205831e4..4245ffbc7ec2c 100644 --- a/test/common/common/hash_fuzz_test.cc +++ b/test/common/common/hash_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "common/common/hash.h" +#include "source/common/common/hash.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/common/hash_test.cc b/test/common/common/hash_test.cc index 1d3681568d50a..38447086ba842 100644 --- a/test/common/common/hash_test.cc +++ b/test/common/common/hash_test.cc @@ -1,4 +1,4 @@ -#include "common/common/hash.h" +#include "source/common/common/hash.h" #include "gtest/gtest.h" diff --git a/test/common/common/hex_test.cc b/test/common/common/hex_test.cc index ba0829dbe92db..7e012b6fc5dbb 100644 --- a/test/common/common/hex_test.cc +++ b/test/common/common/hex_test.cc @@ -3,7 +3,7 @@ #include "envoy/common/exception.h" -#include "common/common/hex.h" +#include "source/common/common/hex.h" #include "gtest/gtest.h" diff --git a/test/common/common/interval_value_test.cc b/test/common/common/interval_value_test.cc index 41a6c3fbc0778..42a3b5594a89e 100644 --- a/test/common/common/interval_value_test.cc +++ b/test/common/common/interval_value_test.cc @@ -1,4 +1,4 @@ -#include "common/common/interval_value.h" +#include "source/common/common/interval_value.h" #include "gtest/gtest.h" diff --git a/test/common/common/linked_object_test.cc b/test/common/common/linked_object_test.cc index 351f2f340d3f8..4152c754f32da 100644 --- a/test/common/common/linked_object_test.cc +++ b/test/common/common/linked_object_test.cc @@ -1,4 +1,4 @@ -#include "common/common/linked_object.h" +#include "source/common/common/linked_object.h" #include "gtest/gtest.h" diff --git a/test/common/common/lock_guard_test.cc b/test/common/common/lock_guard_test.cc index 01b677c8dc48c..be786f0738830 100644 --- a/test/common/common/lock_guard_test.cc +++ b/test/common/common/lock_guard_test.cc @@ -1,5 +1,5 @@ -#include "common/common/lock_guard.h" -#include "common/common/thread.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/thread.h" #include "gtest/gtest.h" diff --git a/test/common/common/log_macros_test.cc b/test/common/common/log_macros_test.cc index 58087c6a46f3a..fb5520ff8b3dc 100644 --- a/test/common/common/log_macros_test.cc +++ b/test/common/common/log_macros_test.cc @@ -4,8 +4,8 @@ #include #include -#include "common/common/fancy_logger.h" -#include "common/common/logger.h" +#include "source/common/common/fancy_logger.h" +#include "source/common/common/logger.h" #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/common/common/logger_fuzz_test.cc b/test/common/common/logger_fuzz_test.cc index 0fcfb601556b9..a6a86651bf6d5 100644 --- a/test/common/common/logger_fuzz_test.cc +++ b/test/common/common/logger_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/common/logger_speed_test.cc b/test/common/common/logger_speed_test.cc index 55f4275db251c..880eb450a9f7c 100644 --- a/test/common/common/logger_speed_test.cc +++ b/test/common/common/logger_speed_test.cc @@ -1,8 +1,8 @@ #include #include -#include "common/common/fancy_logger.h" -#include "common/common/logger.h" +#include "source/common/common/fancy_logger.h" +#include "source/common/common/logger.h" #include "benchmark/benchmark.h" diff --git a/test/common/common/logger_test.cc b/test/common/common/logger_test.cc index 199285aa5ec4a..62fe85f33e811 100644 --- a/test/common/common/logger_test.cc +++ b/test/common/common/logger_test.cc @@ -1,8 +1,8 @@ #include #include -#include "common/common/json_escape_string.h" -#include "common/common/logger.h" +#include "source/common/common/json_escape_string.h" +#include "source/common/common/logger.h" #include "test/test_common/environment.h" diff --git a/test/common/common/matchers_test.cc b/test/common/common/matchers_test.cc index bf7d6732fc95a..bcdf34441acc7 100644 --- a/test/common/common/matchers_test.cc +++ b/test/common/common/matchers_test.cc @@ -4,9 +4,9 @@ #include "envoy/type/matcher/v3/string.pb.h" #include "envoy/type/matcher/v3/value.pb.h" -#include "common/common/matchers.h" -#include "common/config/metadata.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/matchers.h" +#include "source/common/config/metadata.h" +#include "source/common/protobuf/protobuf.h" #include "test/test_common/utility.h" diff --git a/test/common/common/mem_block_builder_test.cc b/test/common/common/mem_block_builder_test.cc index 0fbcdff18be4f..de82a3adc36ec 100644 --- a/test/common/common/mem_block_builder_test.cc +++ b/test/common/common/mem_block_builder_test.cc @@ -1,6 +1,6 @@ #include -#include "common/common/mem_block_builder.h" +#include "source/common/common/mem_block_builder.h" #include "gtest/gtest.h" diff --git a/test/common/common/mutex_tracer_test.cc b/test/common/common/mutex_tracer_test.cc index e72fc3a995b94..b86bc848c810c 100644 --- a/test/common/common/mutex_tracer_test.cc +++ b/test/common/common/mutex_tracer_test.cc @@ -1,8 +1,8 @@ #include #include -#include "common/common/lock_guard.h" -#include "common/common/mutex_tracer_impl.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/mutex_tracer_impl.h" #include "test/test_common/contention.h" #include "test/test_common/utility.h" diff --git a/test/common/common/perf_annotation_disabled_test.cc b/test/common/common/perf_annotation_disabled_test.cc index b5f67aa756d56..9b7762305cb95 100644 --- a/test/common/common/perf_annotation_disabled_test.cc +++ b/test/common/common/perf_annotation_disabled_test.cc @@ -4,7 +4,7 @@ #undef ENVOY_PERF_ANNOTATION #endif -#include "common/common/perf_annotation.h" +#include "source/common/common/perf_annotation.h" #include "gtest/gtest.h" diff --git a/test/common/common/perf_annotation_test.cc b/test/common/common/perf_annotation_test.cc index 0927ff9717490..78c745e7198f3 100644 --- a/test/common/common/perf_annotation_test.cc +++ b/test/common/common/perf_annotation_test.cc @@ -7,7 +7,7 @@ #define ENVOY_PERF_ANNOTATION #endif -#include "common/common/perf_annotation.h" +#include "source/common/common/perf_annotation.h" #include "gtest/gtest.h" diff --git a/test/common/common/phantom_test.cc b/test/common/common/phantom_test.cc index 482cf42de3c90..c878581870835 100644 --- a/test/common/common/phantom_test.cc +++ b/test/common/common/phantom_test.cc @@ -1,4 +1,4 @@ -#include "common/common/phantom.h" +#include "source/common/common/phantom.h" #include "gtest/gtest.h" diff --git a/test/common/common/random_generator_test.cc b/test/common/common/random_generator_test.cc index 7658080b116b9..249590446e706 100644 --- a/test/common/common/random_generator_test.cc +++ b/test/common/common/random_generator_test.cc @@ -1,7 +1,7 @@ #include -#include "common/common/interval_value.h" -#include "common/common/random_generator.h" +#include "source/common/common/interval_value.h" +#include "source/common/common/random_generator.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/common/common/re_speed_test.cc b/test/common/common/re_speed_test.cc index 0db62906e281e..4f2161df9fda1 100644 --- a/test/common/common/re_speed_test.cc +++ b/test/common/common/re_speed_test.cc @@ -3,7 +3,7 @@ #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/strings/string_view.h" #include "benchmark/benchmark.h" diff --git a/test/common/common/regex_test.cc b/test/common/common/regex_test.cc index e3d5a67eb89d7..5d33d23bafbdf 100644 --- a/test/common/common/regex_test.cc +++ b/test/common/common/regex_test.cc @@ -1,7 +1,7 @@ #include "envoy/common/exception.h" #include "envoy/type/matcher/v3/regex.pb.h" -#include "common/common/regex.h" +#include "source/common/common/regex.h" #include "test/test_common/logging.h" #include "test/test_common/test_runtime.h" diff --git a/test/common/common/safe_memcpy_test.cc b/test/common/common/safe_memcpy_test.cc index 1f5f39b5518ec..bd0da38da1828 100644 --- a/test/common/common/safe_memcpy_test.cc +++ b/test/common/common/safe_memcpy_test.cc @@ -1,10 +1,10 @@ #include -#include "common/common/safe_memcpy.h" -#include "common/grpc/common.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" +#include "source/common/common/safe_memcpy.h" +#include "source/common/grpc/common.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" #include "test/test_common/utility.h" diff --git a/test/common/common/scope_tracked_object_stack_test.cc b/test/common/common/scope_tracked_object_stack_test.cc index 984f66f39bcb1..46fa6908248bb 100644 --- a/test/common/common/scope_tracked_object_stack_test.cc +++ b/test/common/common/scope_tracked_object_stack_test.cc @@ -2,8 +2,8 @@ #include "envoy/common/scope_tracker.h" -#include "common/common/scope_tracked_object_stack.h" -#include "common/common/utility.h" +#include "source/common/common/scope_tracked_object_stack.h" +#include "source/common/common/utility.h" #include "test/test_common/utility.h" diff --git a/test/common/common/scope_tracker_test.cc b/test/common/common/scope_tracker_test.cc index ee53c88a537ce..12b7133a06164 100644 --- a/test/common/common/scope_tracker_test.cc +++ b/test/common/common/scope_tracker_test.cc @@ -1,8 +1,8 @@ #include -#include "common/api/api_impl.h" -#include "common/common/scope_tracker.h" -#include "common/event/dispatcher_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/common/scope_tracker.h" +#include "source/common/event/dispatcher_impl.h" #include "test/mocks/common.h" #include "test/test_common/utility.h" diff --git a/test/common/common/shared_token_bucket_impl_test.cc b/test/common/common/shared_token_bucket_impl_test.cc index 2a14019bdfc7d..bceb435fed6b1 100644 --- a/test/common/common/shared_token_bucket_impl_test.cc +++ b/test/common/common/shared_token_bucket_impl_test.cc @@ -1,6 +1,6 @@ #include -#include "common/common/shared_token_bucket_impl.h" +#include "source/common/common/shared_token_bucket_impl.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/common/common/statusor_test.cc b/test/common/common/statusor_test.cc index 2b42e3c6bf67a..dd07315ec5f4e 100644 --- a/test/common/common/statusor_test.cc +++ b/test/common/common/statusor_test.cc @@ -1,5 +1,5 @@ -#include "common/common/statusor.h" -#include "common/http/status.h" +#include "source/common/common/statusor.h" +#include "source/common/http/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/common/common/stl_helpers_test.cc b/test/common/common/stl_helpers_test.cc index 40915d4bba124..8f4b297c74055 100644 --- a/test/common/common/stl_helpers_test.cc +++ b/test/common/common/stl_helpers_test.cc @@ -1,6 +1,6 @@ #include -#include "common/common/stl_helpers.h" +#include "source/common/common/stl_helpers.h" #include "gtest/gtest.h" diff --git a/test/common/common/thread_id_test.cc b/test/common/common/thread_id_test.cc index 5c5687ecd4daa..1d03cd7dbc1a1 100644 --- a/test/common/common/thread_id_test.cc +++ b/test/common/common/thread_id_test.cc @@ -1,4 +1,4 @@ -#include "common/common/thread.h" +#include "source/common/common/thread.h" #include "test/test_common/thread_factory_for_test.h" diff --git a/test/common/common/thread_test.cc b/test/common/common/thread_test.cc index 9dac043921f72..8cfc1c6ac771b 100644 --- a/test/common/common/thread_test.cc +++ b/test/common/common/thread_test.cc @@ -1,7 +1,7 @@ #include -#include "common/common/thread.h" -#include "common/common/thread_synchronizer.h" +#include "source/common/common/thread.h" +#include "source/common/common/thread_synchronizer.h" #include "test/test_common/thread_factory_for_test.h" diff --git a/test/common/common/token_bucket_impl_test.cc b/test/common/common/token_bucket_impl_test.cc index 30e273c024075..c3d25a4c2b274 100644 --- a/test/common/common/token_bucket_impl_test.cc +++ b/test/common/common/token_bucket_impl_test.cc @@ -1,6 +1,6 @@ #include -#include "common/common/token_bucket_impl.h" +#include "source/common/common/token_bucket_impl.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/common/common/utility_fuzz_test.cc b/test/common/common/utility_fuzz_test.cc index c4f468c917257..049311dd7f974 100644 --- a/test/common/common/utility_fuzz_test.cc +++ b/test/common/common/utility_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "common/common/utility.h" +#include "source/common/common/utility.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/common/utility_speed_test.cc b/test/common/common/utility_speed_test.cc index a0563263b0768..ce9d8c790330b 100644 --- a/test/common/common/utility_speed_test.cc +++ b/test/common/common/utility_speed_test.cc @@ -3,8 +3,8 @@ #include -#include "common/common/assert.h" -#include "common/common/utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" #include "absl/strings/string_view.h" #include "benchmark/benchmark.h" diff --git a/test/common/common/utility_test.cc b/test/common/common/utility_test.cc index a69a00e3ae4fa..344f45aba0f0a 100644 --- a/test/common/common/utility_test.cc +++ b/test/common/common/utility_test.cc @@ -7,7 +7,7 @@ #include "envoy/common/exception.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" #include "test/common/stats/stat_test_utility.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/common/common/version_test.cc b/test/common/common/version_test.cc index 379d539b85ddb..dec9a8a26cb86 100644 --- a/test/common/common/version_test.cc +++ b/test/common/common/version_test.cc @@ -1,4 +1,4 @@ -#include "common/version/version.h" +#include "source/common/version/version.h" #include "absl/strings/str_cat.h" #include "gmock/gmock.h" diff --git a/test/common/config/BUILD b/test/common/config/BUILD index d0b7264f8d5dd..a7c5aaf0e4470 100644 --- a/test/common/config/BUILD +++ b/test/common/config/BUILD @@ -257,7 +257,7 @@ envoy_cc_test_library( srcs = ["http_subscription_test_harness.h"], deps = [ ":subscription_test_harness", - "//include/envoy/http:async_client_interface", + "//envoy/http:async_client_interface", "//source/common/common:utility_lib", "//source/common/config:http_subscription_lib", "//source/common/config:utility_lib", @@ -353,7 +353,7 @@ envoy_cc_test( name = "metadata_test", srcs = ["metadata_test.cc"], deps = [ - "//include/envoy/common:base_includes", + "//envoy/common:base_includes", "//source/common/config:metadata_lib", "//source/common/config:well_known_names", "//source/common/protobuf:utility_lib", @@ -403,7 +403,7 @@ envoy_cc_test( name = "registry_test", srcs = ["registry_test.cc"], deps = [ - "//include/envoy/config:typed_config_interface", + "//envoy/config:typed_config_interface", "//test/test_common:logging_lib", "//test/test_common:utility_lib", ], diff --git a/test/common/config/api_type_oracle_test.cc b/test/common/config/api_type_oracle_test.cc index 327d4dc32e541..97aa001ff5a1c 100644 --- a/test/common/config/api_type_oracle_test.cc +++ b/test/common/config/api_type_oracle_test.cc @@ -1,7 +1,7 @@ #include "envoy/config/filter/http/ip_tagging/v2/ip_tagging.pb.h" #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.h" -#include "common/config/api_type_oracle.h" +#include "source/common/config/api_type_oracle.h" #include "gtest/gtest.h" diff --git a/test/common/config/config_provider_impl_test.cc b/test/common/config/config_provider_impl_test.cc index b9d5070623847..6b3d6d36cc0f7 100644 --- a/test/common/config/config_provider_impl_test.cc +++ b/test/common/config/config_provider_impl_test.cc @@ -3,9 +3,9 @@ #include "envoy/config/core/v3/config_source.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/config/config_provider_impl.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/config/config_provider_impl.h" +#include "source/common/protobuf/utility.h" #include "test/common/config/dummy_config.pb.h" #include "test/mocks/server/instance.h" diff --git a/test/common/config/context_provider_impl_test.cc b/test/common/config/context_provider_impl_test.cc index 93142d769a400..48f90c5bcf968 100644 --- a/test/common/config/context_provider_impl_test.cc +++ b/test/common/config/context_provider_impl_test.cc @@ -1,4 +1,4 @@ -#include "common/config/context_provider_impl.h" +#include "source/common/config/context_provider_impl.h" #include "test/common/config/xds_test_utility.h" #include "test/test_common/utility.h" @@ -46,7 +46,7 @@ TEST(ContextProviderTest, DynamicContextParameters) { auto callback_handle = context_provider.addDynamicContextUpdateCallback( [&update_count, &last_updated_resource](absl::string_view resource_type_url) { ++update_count; - last_updated_resource = resource_type_url; + last_updated_resource = std::string(resource_type_url); }); // Default empty DCP for all types. diff --git a/test/common/config/datasource_test.cc b/test/common/config/datasource_test.cc index 8e2900b38c4a4..8a5d0a632c974 100644 --- a/test/common/config/datasource_test.cc +++ b/test/common/config/datasource_test.cc @@ -1,10 +1,10 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/config/core/v3/base.pb.validate.h" -#include "common/common/empty_string.h" -#include "common/config/datasource.h" -#include "common/http/message_impl.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/empty_string.h" +#include "source/common/config/datasource.h" +#include "source/common/http/message_impl.h" +#include "source/common/protobuf/protobuf.h" #include "test/mocks/event/mocks.h" #include "test/mocks/init/mocks.h" diff --git a/test/common/config/decoded_resource_impl_test.cc b/test/common/config/decoded_resource_impl_test.cc index 2bb1020869c7c..7ac26933f101d 100644 --- a/test/common/config/decoded_resource_impl_test.cc +++ b/test/common/config/decoded_resource_impl_test.cc @@ -1,4 +1,4 @@ -#include "common/config/decoded_resource_impl.h" +#include "source/common/config/decoded_resource_impl.h" #include "test/mocks/config/mocks.h" #include "test/test_common/utility.h" diff --git a/test/common/config/delta_subscription_impl_test.cc b/test/common/config/delta_subscription_impl_test.cc index 3498a57cf964d..92e11a0f7f214 100644 --- a/test/common/config/delta_subscription_impl_test.cc +++ b/test/common/config/delta_subscription_impl_test.cc @@ -3,8 +3,8 @@ #include "envoy/config/endpoint/v3/endpoint.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/config/api_version.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/config/api_version.h" #include "test/common/config/delta_subscription_test_harness.h" diff --git a/test/common/config/delta_subscription_state_test.cc b/test/common/config/delta_subscription_state_test.cc index cc33dc4a5758f..fea85b717740c 100644 --- a/test/common/config/delta_subscription_state_test.cc +++ b/test/common/config/delta_subscription_state_test.cc @@ -3,9 +3,9 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/delta_subscription_state.h" -#include "common/config/utility.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/config/delta_subscription_state.h" +#include "source/common/config/utility.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/mocks/config/mocks.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/config/delta_subscription_test_harness.h b/test/common/config/delta_subscription_test_harness.h index 080f7f29450f4..e74e33f40230e 100644 --- a/test/common/config/delta_subscription_test_harness.h +++ b/test/common/config/delta_subscription_test_harness.h @@ -7,10 +7,10 @@ #include "envoy/config/endpoint/v3/endpoint.pb.validate.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/grpc_subscription_impl.h" -#include "common/config/new_grpc_mux_impl.h" -#include "common/config/version_converter.h" -#include "common/grpc/common.h" +#include "source/common/config/grpc_subscription_impl.h" +#include "source/common/config/new_grpc_mux_impl.h" +#include "source/common/config/version_converter.h" +#include "source/common/grpc/common.h" #include "test/common/config/subscription_test_harness.h" #include "test/mocks/common.h" diff --git a/test/common/config/filesystem_subscription_test_harness.h b/test/common/config/filesystem_subscription_test_harness.h index 9c372725207ef..c516809ed16a2 100644 --- a/test/common/config/filesystem_subscription_test_harness.h +++ b/test/common/config/filesystem_subscription_test_harness.h @@ -6,10 +6,10 @@ #include "envoy/config/endpoint/v3/endpoint.pb.validate.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/filesystem_subscription_impl.h" -#include "common/config/utility.h" -#include "common/event/dispatcher_impl.h" -#include "common/protobuf/utility.h" +#include "source/common/config/filesystem_subscription_impl.h" +#include "source/common/config/utility.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/protobuf/utility.h" #include "test/common/config/subscription_test_harness.h" #include "test/mocks/config/mocks.h" diff --git a/test/common/config/grpc_mux_impl_test.cc b/test/common/config/grpc_mux_impl_test.cc index 8e1ac0945f698..a1bfef4722dbd 100644 --- a/test/common/config/grpc_mux_impl_test.cc +++ b/test/common/config/grpc_mux_impl_test.cc @@ -5,14 +5,14 @@ #include "envoy/config/endpoint/v3/endpoint.pb.validate.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/empty_string.h" -#include "common/config/api_version.h" -#include "common/config/grpc_mux_impl.h" -#include "common/config/protobuf_link_hacks.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" -#include "common/protobuf/protobuf.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/config/api_version.h" +#include "source/common/config/grpc_mux_impl.h" +#include "source/common/config/protobuf_link_hacks.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/common.h" diff --git a/test/common/config/grpc_stream_test.cc b/test/common/config/grpc_stream_test.cc index ecd38d75d0b63..5128a21b2a3bc 100644 --- a/test/common/config/grpc_stream_test.cc +++ b/test/common/config/grpc_stream_test.cc @@ -1,7 +1,7 @@ #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/grpc_stream.h" -#include "common/protobuf/protobuf.h" +#include "source/common/config/grpc_stream.h" +#include "source/common/protobuf/protobuf.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/common.h" diff --git a/test/common/config/grpc_subscription_test_harness.h b/test/common/config/grpc_subscription_test_harness.h index c105ec9d7ed8d..aa6aea0e5686c 100644 --- a/test/common/config/grpc_subscription_test_harness.h +++ b/test/common/config/grpc_subscription_test_harness.h @@ -8,11 +8,11 @@ #include "envoy/config/endpoint/v3/endpoint.pb.validate.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/hash.h" -#include "common/config/api_version.h" -#include "common/config/grpc_mux_impl.h" -#include "common/config/grpc_subscription_impl.h" -#include "common/config/version_converter.h" +#include "source/common/common/hash.h" +#include "source/common/config/api_version.h" +#include "source/common/config/grpc_mux_impl.h" +#include "source/common/config/grpc_subscription_impl.h" +#include "source/common/config/version_converter.h" #include "test/common/config/subscription_test_harness.h" #include "test/mocks/config/mocks.h" diff --git a/test/common/config/http_subscription_test_harness.h b/test/common/config/http_subscription_test_harness.h index cdb0266c5a926..b168ea3ab436b 100644 --- a/test/common/config/http_subscription_test_harness.h +++ b/test/common/config/http_subscription_test_harness.h @@ -8,12 +8,12 @@ #include "envoy/http/async_client.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/utility.h" -#include "common/config/http_subscription_impl.h" -#include "common/config/utility.h" -#include "common/http/message_impl.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/common/utility.h" +#include "source/common/config/http_subscription_impl.h" +#include "source/common/config/utility.h" +#include "source/common/http/message_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "test/common/config/subscription_test_harness.h" #include "test/mocks/config/mocks.h" diff --git a/test/common/config/metadata_test.cc b/test/common/config/metadata_test.cc index ee3c6b273ebf4..72ad06f6dfe71 100644 --- a/test/common/config/metadata_test.cc +++ b/test/common/config/metadata_test.cc @@ -1,9 +1,9 @@ #include "envoy/common/exception.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/config/metadata.h" -#include "common/config/well_known_names.h" -#include "common/protobuf/utility.h" +#include "source/common/config/metadata.h" +#include "source/common/config/well_known_names.h" +#include "source/common/protobuf/utility.h" #include "test/test_common/registry.h" #include "test/test_common/utility.h" diff --git a/test/common/config/new_grpc_mux_impl_test.cc b/test/common/config/new_grpc_mux_impl_test.cc index 3240986c1075e..ffb61f051dc4d 100644 --- a/test/common/config/new_grpc_mux_impl_test.cc +++ b/test/common/config/new_grpc_mux_impl_test.cc @@ -5,12 +5,12 @@ #include "envoy/event/timer.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/empty_string.h" -#include "common/config/new_grpc_mux_impl.h" -#include "common/config/protobuf_link_hacks.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/empty_string.h" +#include "source/common/config/new_grpc_mux_impl.h" +#include "source/common/config/protobuf_link_hacks.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/protobuf/protobuf.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/common.h" diff --git a/test/common/config/opaque_resource_decoder_impl_test.cc b/test/common/config/opaque_resource_decoder_impl_test.cc index 9aded46538bac..f36e20f614177 100644 --- a/test/common/config/opaque_resource_decoder_impl_test.cc +++ b/test/common/config/opaque_resource_decoder_impl_test.cc @@ -1,8 +1,8 @@ #include "envoy/config/endpoint/v3/endpoint.pb.h" #include "envoy/config/endpoint/v3/endpoint.pb.validate.h" -#include "common/config/opaque_resource_decoder_impl.h" -#include "common/protobuf/message_validator_impl.h" +#include "source/common/config/opaque_resource_decoder_impl.h" +#include "source/common/protobuf/message_validator_impl.h" #include "test/test_common/utility.h" diff --git a/test/common/config/pausable_ack_queue_test.cc b/test/common/config/pausable_ack_queue_test.cc index f817cc7ff52ae..f984193bf8371 100644 --- a/test/common/config/pausable_ack_queue_test.cc +++ b/test/common/config/pausable_ack_queue_test.cc @@ -1,4 +1,4 @@ -#include "common/config/pausable_ack_queue.h" +#include "source/common/config/pausable_ack_queue.h" #include "gtest/gtest.h" diff --git a/test/common/config/registry_test.cc b/test/common/config/registry_test.cc index be6ea155d8bd7..53d6979a42a69 100644 --- a/test/common/config/registry_test.cc +++ b/test/common/config/registry_test.cc @@ -3,7 +3,7 @@ #include "envoy/config/typed_config.h" #include "envoy/registry/registry.h" -#include "common/common/fmt.h" +#include "source/common/common/fmt.h" #include "test/test_common/logging.h" #include "test/test_common/utility.h" diff --git a/test/common/config/runtime_utility_test.cc b/test/common/config/runtime_utility_test.cc index 1e886ba80eb66..a479be40d55de 100644 --- a/test/common/config/runtime_utility_test.cc +++ b/test/common/config/runtime_utility_test.cc @@ -1,6 +1,6 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "common/config/runtime_utility.h" +#include "source/common/config/runtime_utility.h" #include "test/test_common/utility.h" diff --git a/test/common/config/subscription_factory_impl_test.cc b/test/common/config/subscription_factory_impl_test.cc index a9d7e7e0c1bb8..f41376504c025 100644 --- a/test/common/config/subscription_factory_impl_test.cc +++ b/test/common/config/subscription_factory_impl_test.cc @@ -8,8 +8,8 @@ #include "envoy/config/endpoint/v3/endpoint.pb.h" #include "envoy/stats/scope.h" -#include "common/config/subscription_factory_impl.h" -#include "common/config/xds_resource.h" +#include "source/common/config/subscription_factory_impl.h" +#include "source/common/config/xds_resource.h" #include "test/mocks/config/mocks.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/config/subscription_test_harness.h b/test/common/config/subscription_test_harness.h index 5b0fe24a49d2d..e1b5421da711d 100644 --- a/test/common/config/subscription_test_harness.h +++ b/test/common/config/subscription_test_harness.h @@ -1,6 +1,6 @@ #pragma once -#include "common/config/utility.h" +#include "source/common/config/utility.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/common/config/ttl_test.cc b/test/common/config/ttl_test.cc index 14e6edd6023a6..f96741ac720b1 100644 --- a/test/common/config/ttl_test.cc +++ b/test/common/config/ttl_test.cc @@ -1,6 +1,6 @@ #include -#include "common/config/ttl.h" +#include "source/common/config/ttl.h" #include "test/mocks/event/mocks.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/common/config/type_to_endpoint_test.cc b/test/common/config/type_to_endpoint_test.cc index f163d832218cd..1dd24c0c03083 100644 --- a/test/common/config/type_to_endpoint_test.cc +++ b/test/common/config/type_to_endpoint_test.cc @@ -1,7 +1,7 @@ #include "envoy/api/v2/rds.pb.h" #include "envoy/service/route/v3/rds.pb.h" -#include "common/config/type_to_endpoint.h" +#include "source/common/config/type_to_endpoint.h" #include "gtest/gtest.h" diff --git a/test/common/config/utility_test.cc b/test/common/config/utility_test.cc index 4f12e71d87a38..cd2ff60b96f36 100644 --- a/test/common/config/utility_test.cc +++ b/test/common/config/utility_test.cc @@ -6,11 +6,11 @@ #include "envoy/config/core/v3/grpc_service.pb.h" #include "envoy/extensions/filters/http/cors/v3/cors.pb.h" -#include "common/common/fmt.h" -#include "common/config/api_version.h" -#include "common/config/utility.h" -#include "common/config/well_known_names.h" -#include "common/protobuf/protobuf.h" +#include "source/common/common/fmt.h" +#include "source/common/config/api_version.h" +#include "source/common/config/utility.h" +#include "source/common/config/well_known_names.h" +#include "source/common/protobuf/protobuf.h" #include "test/mocks/config/mocks.h" #include "test/mocks/grpc/mocks.h" diff --git a/test/common/config/version_converter_test.cc b/test/common/config/version_converter_test.cc index 1c7e949fb6257..fd8689567c098 100644 --- a/test/common/config/version_converter_test.cc +++ b/test/common/config/version_converter_test.cc @@ -3,9 +3,9 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/api_version.h" -#include "common/config/version_converter.h" -#include "common/protobuf/well_known.h" +#include "source/common/config/api_version.h" +#include "source/common/config/version_converter.h" +#include "source/common/protobuf/well_known.h" #include "test/common/config/version_converter.pb.h" #include "test/test_common/utility.h" diff --git a/test/common/config/watch_map_test.cc b/test/common/config/watch_map_test.cc index 6443180110064..1d8398091b058 100644 --- a/test/common/config/watch_map_test.cc +++ b/test/common/config/watch_map_test.cc @@ -6,7 +6,7 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/scope.h" -#include "common/config/watch_map.h" +#include "source/common/config/watch_map.h" #include "test/mocks/config/mocks.h" #include "test/test_common/utility.h" diff --git a/test/common/config/watched_directory_test.cc b/test/common/config/watched_directory_test.cc index 8988306d4ad4d..b22dd7dbb9833 100644 --- a/test/common/config/watched_directory_test.cc +++ b/test/common/config/watched_directory_test.cc @@ -1,6 +1,6 @@ #include "envoy/filesystem/watcher.h" -#include "common/config/watched_directory.h" +#include "source/common/config/watched_directory.h" #include "test/mocks/event/mocks.h" #include "test/mocks/filesystem/mocks.h" diff --git a/test/common/config/xds_context_params_test.cc b/test/common/config/xds_context_params_test.cc index 50d96431f501c..825cc6b9b8b34 100644 --- a/test/common/config/xds_context_params_test.cc +++ b/test/common/config/xds_context_params_test.cc @@ -1,4 +1,4 @@ -#include "common/config/xds_context_params.h" +#include "source/common/config/xds_context_params.h" #include "test/common/config/xds_test_utility.h" #include "test/test_common/logging.h" diff --git a/test/common/config/xds_resource_test.cc b/test/common/config/xds_resource_test.cc index 4331f69d783f1..0cbe0954743f3 100644 --- a/test/common/config/xds_resource_test.cc +++ b/test/common/config/xds_resource_test.cc @@ -1,4 +1,4 @@ -#include "common/config/xds_resource.h" +#include "source/common/config/xds_resource.h" #include "test/common/config/xds_test_utility.h" #include "test/test_common/utility.h" diff --git a/test/common/conn_pool/conn_pool_base_test.cc b/test/common/conn_pool/conn_pool_base_test.cc index 4b756ede0d01e..5d8d64d359db3 100644 --- a/test/common/conn_pool/conn_pool_base_test.cc +++ b/test/common/conn_pool/conn_pool_base_test.cc @@ -1,4 +1,4 @@ -#include "common/conn_pool/conn_pool_base.h" +#include "source/common/conn_pool/conn_pool_base.h" #include "test/common/upstream/utility.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/crypto/get_sha_256_digest_fuzz_test.cc b/test/common/crypto/get_sha_256_digest_fuzz_test.cc index 085778d4e41c4..7440deab10312 100644 --- a/test/common/crypto/get_sha_256_digest_fuzz_test.cc +++ b/test/common/crypto/get_sha_256_digest_fuzz_test.cc @@ -1,5 +1,5 @@ -#include "common/buffer/buffer_impl.h" -#include "common/crypto/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/crypto/utility.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/crypto/utility_test.cc b/test/common/crypto/utility_test.cc index 53390d77ccee9..e30dda5bf7679 100644 --- a/test/common/crypto/utility_test.cc +++ b/test/common/crypto/utility_test.cc @@ -1,8 +1,7 @@ -#include "common/buffer/buffer_impl.h" -#include "common/common/hex.h" -#include "common/crypto/utility.h" - -#include "extensions/common/crypto/crypto_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/hex.h" +#include "source/common/crypto/utility.h" +#include "source/extensions/common/crypto/crypto_impl.h" #include "gtest/gtest.h" diff --git a/test/common/crypto/verify_signature_fuzz_test.cc b/test/common/crypto/verify_signature_fuzz_test.cc index c64fa2436ecb8..153c04d5f5dbf 100644 --- a/test/common/crypto/verify_signature_fuzz_test.cc +++ b/test/common/crypto/verify_signature_fuzz_test.cc @@ -1,5 +1,5 @@ -#include "common/common/hex.h" -#include "common/crypto/utility.h" +#include "source/common/common/hex.h" +#include "source/common/crypto/utility.h" #include "test/common/crypto/verify_signature_fuzz.pb.validate.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/event/BUILD b/test/common/event/BUILD index d5448366b593a..c42e8e1aff1ea 100644 --- a/test/common/event/BUILD +++ b/test/common/event/BUILD @@ -30,7 +30,7 @@ envoy_cc_test( name = "file_event_impl_test", srcs = ["file_event_impl_test.cc"], deps = [ - "//include/envoy/event:file_event_interface", + "//envoy/event:file_event_interface", "//source/common/event:dispatcher_includes", "//source/common/event:dispatcher_lib", "//source/common/stats:isolated_store_lib", diff --git a/test/common/event/dispatcher_impl_test.cc b/test/common/event/dispatcher_impl_test.cc index 9525ed6ad61c1..240a9485196fd 100644 --- a/test/common/event/dispatcher_impl_test.cc +++ b/test/common/event/dispatcher_impl_test.cc @@ -3,15 +3,15 @@ #include "envoy/common/scope_tracker.h" #include "envoy/thread/thread.h" -#include "common/api/api_impl.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/lock_guard.h" -#include "common/common/scope_tracker.h" -#include "common/common/utility.h" -#include "common/event/deferred_task.h" -#include "common/event/dispatcher_impl.h" -#include "common/event/timer_impl.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/scope_tracker.h" +#include "source/common/common/utility.h" +#include "source/common/event/deferred_task.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/event/timer_impl.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/mocks/common.h" #include "test/mocks/server/watch_dog.h" diff --git a/test/common/event/file_event_impl_test.cc b/test/common/event/file_event_impl_test.cc index 1dc8eae1984dd..67986afab8da6 100644 --- a/test/common/event/file_event_impl_test.cc +++ b/test/common/event/file_event_impl_test.cc @@ -2,9 +2,9 @@ #include "envoy/event/file_event.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/event/dispatcher_impl.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/mocks/common.h" #include "test/test_common/environment.h" diff --git a/test/common/event/scaled_range_timer_manager_impl_test.cc b/test/common/event/scaled_range_timer_manager_impl_test.cc index ca89c39fbd971..dbd7ca897a12f 100644 --- a/test/common/event/scaled_range_timer_manager_impl_test.cc +++ b/test/common/event/scaled_range_timer_manager_impl_test.cc @@ -3,8 +3,8 @@ #include "envoy/common/scope_tracker.h" #include "envoy/event/timer.h" -#include "common/event/dispatcher_impl.h" -#include "common/event/scaled_range_timer_manager_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/event/scaled_range_timer_manager_impl.h" #include "test/mocks/common.h" #include "test/mocks/event/wrapped_dispatcher.h" diff --git a/test/common/filesystem/directory_test.cc b/test/common/filesystem/directory_test.cc index 0efd2d81543f4..ec47699d6a895 100644 --- a/test/common/filesystem/directory_test.cc +++ b/test/common/filesystem/directory_test.cc @@ -3,7 +3,7 @@ #include #include -#include "common/filesystem/directory.h" +#include "source/common/filesystem/directory.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" diff --git a/test/common/filesystem/filesystem_impl_test.cc b/test/common/filesystem/filesystem_impl_test.cc index bc406b6d0f18f..fe21296388147 100644 --- a/test/common/filesystem/filesystem_impl_test.cc +++ b/test/common/filesystem/filesystem_impl_test.cc @@ -2,9 +2,9 @@ #include #include -#include "common/common/assert.h" -#include "common/common/utility.h" -#include "common/filesystem/filesystem_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/utility.h" +#include "source/common/filesystem/filesystem_impl.h" #include "test/test_common/environment.h" diff --git a/test/common/filesystem/watcher_impl_test.cc b/test/common/filesystem/watcher_impl_test.cc index 7928de7d2b4f7..d110ad4b8f256 100644 --- a/test/common/filesystem/watcher_impl_test.cc +++ b/test/common/filesystem/watcher_impl_test.cc @@ -1,9 +1,9 @@ #include #include -#include "common/common/assert.h" -#include "common/event/dispatcher_impl.h" -#include "common/filesystem/watcher_impl.h" +#include "source/common/common/assert.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/filesystem/watcher_impl.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" diff --git a/test/common/filter/http/filter_config_discovery_impl_test.cc b/test/common/filter/http/filter_config_discovery_impl_test.cc index 33cff50a28367..3446c4bc338fb 100644 --- a/test/common/filter/http/filter_config_discovery_impl_test.cc +++ b/test/common/filter/http/filter_config_discovery_impl_test.cc @@ -8,9 +8,9 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/scope.h" -#include "common/config/utility.h" -#include "common/filter/http/filter_config_discovery_impl.h" -#include "common/json/json_loader.h" +#include "source/common/config/utility.h" +#include "source/common/filter/http/filter_config_discovery_impl.h" +#include "source/common/json/json_loader.h" #include "test/mocks/init/mocks.h" #include "test/mocks/local_info/mocks.h" diff --git a/test/common/formatter/command_extension.cc b/test/common/formatter/command_extension.cc index 724650d1811a4..007a204f4f450 100644 --- a/test/common/formatter/command_extension.cc +++ b/test/common/formatter/command_extension.cc @@ -1,6 +1,6 @@ #include "test/common/formatter/command_extension.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Formatter { diff --git a/test/common/formatter/command_extension.h b/test/common/formatter/command_extension.h index 2abba003d9b2c..4a91f071630ae 100644 --- a/test/common/formatter/command_extension.h +++ b/test/common/formatter/command_extension.h @@ -5,7 +5,7 @@ #include "envoy/config/typed_config.h" #include "envoy/registry/registry.h" -#include "common/formatter/substitution_formatter.h" +#include "source/common/formatter/substitution_formatter.h" namespace Envoy { namespace Formatter { diff --git a/test/common/formatter/substitution_format_string_test.cc b/test/common/formatter/substitution_format_string_test.cc index 31924dbd19f44..017622bdd5cd8 100644 --- a/test/common/formatter/substitution_format_string_test.cc +++ b/test/common/formatter/substitution_format_string_test.cc @@ -1,6 +1,6 @@ #include "envoy/config/core/v3/substitution_format_string.pb.validate.h" -#include "common/formatter/substitution_format_string.h" +#include "source/common/formatter/substitution_format_string.h" #include "test/common/formatter/command_extension.h" #include "test/mocks/http/mocks.h" diff --git a/test/common/formatter/substitution_formatter_fuzz_test.cc b/test/common/formatter/substitution_formatter_fuzz_test.cc index afdbb48de80bc..f92a34885023d 100644 --- a/test/common/formatter/substitution_formatter_fuzz_test.cc +++ b/test/common/formatter/substitution_formatter_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "common/formatter/substitution_formatter.h" +#include "source/common/formatter/substitution_formatter.h" #include "test/common/formatter/substitution_formatter_fuzz.pb.validate.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/formatter/substitution_formatter_speed_test.cc b/test/common/formatter/substitution_formatter_speed_test.cc index 8fbb0573e8c5f..320bd7d8878fd 100644 --- a/test/common/formatter/substitution_formatter_speed_test.cc +++ b/test/common/formatter/substitution_formatter_speed_test.cc @@ -1,5 +1,5 @@ -#include "common/formatter/substitution_formatter.h" -#include "common/network/address_impl.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/common/network/address_impl.h" #include "test/common/stream_info/test_util.h" #include "test/mocks/http/mocks.h" diff --git a/test/common/formatter/substitution_formatter_test.cc b/test/common/formatter/substitution_formatter_test.cc index df374eaef4a8a..ed1d38fbbea91 100644 --- a/test/common/formatter/substitution_formatter_test.cc +++ b/test/common/formatter/substitution_formatter_test.cc @@ -7,14 +7,14 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/stream_info/stream_info.h" -#include "common/common/logger.h" -#include "common/common/utility.h" -#include "common/formatter/substitution_formatter.h" -#include "common/http/header_map_impl.h" -#include "common/json/json_loader.h" -#include "common/network/address_impl.h" -#include "common/protobuf/utility.h" -#include "common/router/string_accessor_impl.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" +#include "source/common/formatter/substitution_formatter.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/json/json_loader.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/string_accessor_impl.h" #include "test/common/formatter/command_extension.h" #include "test/mocks/api/mocks.h" @@ -1403,6 +1403,18 @@ TEST(SubstitutionFormatterTest, DynamicMetadataFormatter) { } { DynamicMetadataFormatter formatter("com.test", {"test_key"}, absl::optional()); + EXPECT_EQ("test_value", formatter.format(request_headers, response_headers, response_trailers, + stream_info, body)); + EXPECT_THAT(formatter.formatValue(request_headers, response_headers, response_trailers, + stream_info, body), + ProtoEq(ValueUtil::stringValue("test_value"))); + } + // Disable string value unquoting and expect the same result as above but quoted. + { + TestScopedRuntime scoped_runtime; + Runtime::LoaderSingleton::getExisting()->mergeValues( + {{"envoy.reloadable_features.unquote_log_string_values", "false"}}); + DynamicMetadataFormatter formatter("com.test", {"test_key"}, absl::optional()); EXPECT_EQ("\"test_value\"", formatter.format(request_headers, response_headers, response_trailers, stream_info, body)); EXPECT_THAT(formatter.formatValue(request_headers, response_headers, response_trailers, @@ -1425,8 +1437,8 @@ TEST(SubstitutionFormatterTest, DynamicMetadataFormatter) { { DynamicMetadataFormatter formatter("com.test", {"test_obj", "inner_key"}, absl::optional()); - EXPECT_EQ("\"inner_value\"", formatter.format(request_headers, response_headers, - response_trailers, stream_info, body)); + EXPECT_EQ("inner_value", formatter.format(request_headers, response_headers, response_trailers, + stream_info, body)); EXPECT_THAT(formatter.formatValue(request_headers, response_headers, response_trailers, stream_info, body), ProtoEq(ValueUtil::stringValue("inner_value"))); @@ -1462,8 +1474,8 @@ TEST(SubstitutionFormatterTest, DynamicMetadataFormatter) { // size limit { DynamicMetadataFormatter formatter("com.test", {"test_key"}, absl::optional(5)); - EXPECT_EQ("\"test", formatter.format(request_headers, response_headers, response_trailers, - stream_info, body)); + EXPECT_EQ("test_", formatter.format(request_headers, response_headers, response_trailers, + stream_info, body)); // N.B. Does not truncate. EXPECT_THAT(formatter.formatValue(request_headers, response_headers, response_trailers, @@ -2135,9 +2147,9 @@ TEST(SubstitutionFormatterTest, StructFormatterDynamicMetadataTest) { EXPECT_CALL(Const(stream_info), dynamicMetadata()).WillRepeatedly(ReturnRef(metadata)); absl::node_hash_map expected_json_map = { - {"test_key", "\"test_value\""}, + {"test_key", "test_value"}, {"test_obj", "{\"inner_key\":\"inner_value\"}"}, - {"test_obj.inner_key", "\"inner_value\""}}; + {"test_obj.inner_key", "inner_value"}}; ProtobufWkt::Struct key_mapping; TestUtility::loadFromYaml(R"EOF( @@ -2200,9 +2212,9 @@ TEST(SubstitutionFormatterTest, StructFormatterClusterMetadataTest) { EXPECT_CALL(Const(stream_info), upstreamClusterInfo()).WillRepeatedly(ReturnPointee(cluster)); absl::node_hash_map expected_json_map = { - {"test_key", "\"test_value\""}, + {"test_key", "test_value"}, {"test_obj", "{\"inner_key\":\"inner_value\"}"}, - {"test_obj.inner_key", "\"inner_value\""}, + {"test_obj.inner_key", "inner_value"}, {"test_obj.non_existing_key", "-"}, }; @@ -2648,7 +2660,7 @@ TEST(SubstitutionFormatterTest, CompositeFormatterSuccess) { FormatterImpl formatter(format, false); EXPECT_EQ( - "\"test_value\"|{\"inner_key\":\"inner_value\"}|\"inner_value\"", + "test_value|{\"inner_key\":\"inner_value\"}|inner_value", formatter.format(request_header, response_header, response_trailer, stream_info, body)); } diff --git a/test/common/grpc/async_client_impl_test.cc b/test/common/grpc/async_client_impl_test.cc index a2ef2f7a34204..0f67ac316d542 100644 --- a/test/common/grpc/async_client_impl_test.cc +++ b/test/common/grpc/async_client_impl_test.cc @@ -1,8 +1,8 @@ #include "envoy/config/core/v3/grpc_service.pb.h" -#include "common/grpc/async_client_impl.h" -#include "common/network/address_impl.h" -#include "common/network/socket_impl.h" +#include "source/common/grpc/async_client_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_impl.h" #include "test/mocks/http/mocks.h" #include "test/mocks/tracing/mocks.h" diff --git a/test/common/grpc/async_client_manager_impl_test.cc b/test/common/grpc/async_client_manager_impl_test.cc index 72d8507ed81e4..9f748cac04272 100644 --- a/test/common/grpc/async_client_manager_impl_test.cc +++ b/test/common/grpc/async_client_manager_impl_test.cc @@ -1,7 +1,7 @@ #include "envoy/config/core/v3/grpc_service.pb.h" -#include "common/api/api_impl.h" -#include "common/grpc/async_client_manager_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/grpc/async_client_manager_impl.h" #include "test/mocks/stats/mocks.h" #include "test/mocks/thread_local/mocks.h" diff --git a/test/common/grpc/codec_fuzz_test.cc b/test/common/grpc/codec_fuzz_test.cc index 782ab1b1eba53..1d75425e7bbcd 100644 --- a/test/common/grpc/codec_fuzz_test.cc +++ b/test/common/grpc/codec_fuzz_test.cc @@ -1,5 +1,5 @@ -#include "common/buffer/buffer_impl.h" -#include "common/grpc/codec.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/grpc/codec.h" #include "test/fuzz/fuzz_runner.h" #include "test/fuzz/utility.h" diff --git a/test/common/grpc/codec_test.cc b/test/common/grpc/codec_test.cc index e85b973be4a93..c028559bc828d 100644 --- a/test/common/grpc/codec_test.cc +++ b/test/common/grpc/codec_test.cc @@ -3,8 +3,8 @@ #include #include -#include "common/buffer/buffer_impl.h" -#include "common/grpc/codec.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/grpc/codec.h" #include "test/common/buffer/utility.h" #include "test/proto/helloworld.pb.h" diff --git a/test/common/grpc/common_test.cc b/test/common/grpc/common_test.cc index 4a54ee4b6bbbe..259f39a9797ff 100644 --- a/test/common/grpc/common_test.cc +++ b/test/common/grpc/common_test.cc @@ -1,9 +1,9 @@ #include "envoy/common/platform.h" -#include "common/grpc/common.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" #include "test/mocks/stream_info/mocks.h" #include "test/proto/helloworld.pb.h" diff --git a/test/common/grpc/context_impl_test.cc b/test/common/grpc/context_impl_test.cc index c7ccd34768039..02b76d8ac6c5c 100644 --- a/test/common/grpc/context_impl_test.cc +++ b/test/common/grpc/context_impl_test.cc @@ -1,11 +1,11 @@ #include "envoy/common/platform.h" -#include "common/grpc/common.h" -#include "common/grpc/context_impl.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/grpc/common.h" +#include "source/common/grpc/context_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/stats/symbol_table_impl.h" #include "test/mocks/upstream/cluster_info.h" #include "test/test_common/global.h" diff --git a/test/common/grpc/google_async_client_cache_test.cc b/test/common/grpc/google_async_client_cache_test.cc index 6d36ff2efb749..6646efc7bc499 100644 --- a/test/common/grpc/google_async_client_cache_test.cc +++ b/test/common/grpc/google_async_client_cache_test.cc @@ -1,4 +1,4 @@ -#include "common/grpc/google_async_client_cache.h" +#include "source/common/grpc/google_async_client_cache.h" #include "test/mocks/server/factory_context.h" diff --git a/test/common/grpc/google_async_client_impl_test.cc b/test/common/grpc/google_async_client_impl_test.cc index c54e2d2aea5b0..977d734e2fff3 100644 --- a/test/common/grpc/google_async_client_impl_test.cc +++ b/test/common/grpc/google_async_client_impl_test.cc @@ -1,12 +1,12 @@ #include "envoy/config/core/v3/grpc_service.pb.h" #include "envoy/stats/scope.h" -#include "common/api/api_impl.h" -#include "common/event/dispatcher_impl.h" -#include "common/grpc/google_async_client_impl.h" -#include "common/network/address_impl.h" -#include "common/stats/isolated_store_impl.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/grpc/google_async_client_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/stream_info/stream_info_impl.h" #include "test/mocks/grpc/mocks.h" #include "test/mocks/tracing/mocks.h" diff --git a/test/common/grpc/google_grpc_creds_test.cc b/test/common/grpc/google_grpc_creds_test.cc index 8c3b4efdefd48..e405adc834d79 100644 --- a/test/common/grpc/google_grpc_creds_test.cc +++ b/test/common/grpc/google_grpc_creds_test.cc @@ -2,7 +2,7 @@ #include "envoy/config/core/v3/grpc_service.pb.h" -#include "common/grpc/google_grpc_creds_impl.h" +#include "source/common/grpc/google_grpc_creds_impl.h" #include "test/common/grpc/utility.h" #include "test/mocks/stats/mocks.h" diff --git a/test/common/grpc/google_grpc_utils_test.cc b/test/common/grpc/google_grpc_utils_test.cc index 5bf3264a329a2..0724577e883e2 100644 --- a/test/common/grpc/google_grpc_utils_test.cc +++ b/test/common/grpc/google_grpc_utils_test.cc @@ -1,6 +1,6 @@ #include "envoy/common/platform.h" -#include "common/grpc/google_grpc_utils.h" +#include "source/common/grpc/google_grpc_utils.h" #include "test/proto/helloworld.pb.h" #include "test/test_common/utility.h" diff --git a/test/common/grpc/grpc_client_integration.h b/test/common/grpc/grpc_client_integration.h index 112b73f965456..0c559cf699242 100644 --- a/test/common/grpc/grpc_client_integration.h +++ b/test/common/grpc/grpc_client_integration.h @@ -2,7 +2,7 @@ #include "envoy/config/core/v3/grpc_service.pb.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" diff --git a/test/common/grpc/grpc_client_integration_test.cc b/test/common/grpc/grpc_client_integration_test.cc index 578f489b848b0..96be74c4871ac 100644 --- a/test/common/grpc/grpc_client_integration_test.cc +++ b/test/common/grpc/grpc_client_integration_test.cc @@ -1,7 +1,7 @@ #ifdef ENVOY_GOOGLE_GRPC #include "envoy/config/core/v3/grpc_service.pb.h" -#include "common/grpc/google_async_client_impl.h" +#include "source/common/grpc/google_async_client_impl.h" #endif diff --git a/test/common/grpc/grpc_client_integration_test_harness.h b/test/common/grpc/grpc_client_integration_test_harness.h index 3145e6b89b84a..619c2b4d13cb2 100644 --- a/test/common/grpc/grpc_client_integration_test_harness.h +++ b/test/common/grpc/grpc_client_integration_test_harness.h @@ -7,26 +7,26 @@ #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" #include "envoy/stats/scope.h" -#include "common/api/api_impl.h" -#include "common/event/dispatcher_impl.h" -#include "common/grpc/async_client_impl.h" -#include "common/grpc/context_impl.h" -#include "common/http/context_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/grpc/async_client_impl.h" +#include "source/common/grpc/context_impl.h" +#include "source/common/http/context_impl.h" #ifdef ENVOY_GOOGLE_GRPC -#include "common/grpc/google_async_client_impl.h" +#include "source/common/grpc/google_async_client_impl.h" #endif -#include "common/http/async_client_impl.h" -#include "common/http/codes.h" -#include "common/http/http2/conn_pool.h" -#include "common/network/connection_impl.h" -#include "common/network/raw_buffer_socket.h" -#include "common/router/context_impl.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/http/async_client_impl.h" +#include "source/common/http/codes.h" +#include "source/common/http/http2/conn_pool.h" +#include "source/common/network/connection_impl.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/common/router/context_impl.h" +#include "source/common/stats/symbol_table_impl.h" -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/common/grpc/utility.h" @@ -305,7 +305,7 @@ class GrpcClientIntegrationTest : public GrpcClientIntegrationParamTest { Upstream::ResourcePriority::Default, nullptr, nullptr, state_); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) - .WillRepeatedly(Return(http_conn_pool_.get())); + .WillRepeatedly(Return(Upstream::HttpPoolData([]() {}, http_conn_pool_.get()))); http_async_client_ = std::make_unique( cm_.thread_local_cluster_.cluster_.info_, *stats_store_, *dispatcher_, local_info_, cm_, runtime_, random_, std::move(shadow_writer_ptr_), http_context_, router_context_); diff --git a/test/common/html/utility_test.cc b/test/common/html/utility_test.cc index 8eb83bc3cc602..410e24b8bb22a 100644 --- a/test/common/html/utility_test.cc +++ b/test/common/html/utility_test.cc @@ -1,4 +1,4 @@ -#include "common/html/utility.h" +#include "source/common/html/utility.h" #include "gtest/gtest.h" diff --git a/test/common/http/BUILD b/test/common/http/BUILD index 615595df3b935..c677569328d2a 100644 --- a/test/common/http/BUILD +++ b/test/common/http/BUILD @@ -156,8 +156,8 @@ envoy_cc_test_library( srcs = ["common.cc"], hdrs = ["common.h"], deps = [ - "//include/envoy/http:conn_pool_interface", - "//include/envoy/http:header_map_interface", + "//envoy/http:conn_pool_interface", + "//envoy/http:header_map_interface", "//source/common/http:codec_client_lib", "//test/mocks:common_lib", "//test/mocks/event:event_mocks", diff --git a/test/common/http/alternate_protocols_cache_impl_test.cc b/test/common/http/alternate_protocols_cache_impl_test.cc index 88347e98bac3e..4abc98ddb5be4 100644 --- a/test/common/http/alternate_protocols_cache_impl_test.cc +++ b/test/common/http/alternate_protocols_cache_impl_test.cc @@ -1,4 +1,4 @@ -#include "common/http/alternate_protocols_cache_impl.h" +#include "source/common/http/alternate_protocols_cache_impl.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/common/http/alternate_protocols_cache_manager_test.cc b/test/common/http/alternate_protocols_cache_manager_test.cc index 7eb16ef48c8df..c26570eac76fa 100644 --- a/test/common/http/alternate_protocols_cache_manager_test.cc +++ b/test/common/http/alternate_protocols_cache_manager_test.cc @@ -1,5 +1,5 @@ -#include "common/http/alternate_protocols_cache_manager_impl.h" -#include "common/singleton/manager_impl.h" +#include "source/common/http/alternate_protocols_cache_manager_impl.h" +#include "source/common/singleton/manager_impl.h" #include "test/mocks/thread_local/mocks.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/common/http/async_client_impl_test.cc b/test/common/http/async_client_impl_test.cc index cbff548d733a8..ea82b2993aad9 100644 --- a/test/common/http/async_client_impl_test.cc +++ b/test/common/http/async_client_impl_test.cc @@ -6,12 +6,12 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/config/route/v3/route_components.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/http/async_client_impl.h" -#include "common/http/context_impl.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/router/context_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/async_client_impl.h" +#include "source/common/http/context_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/router/context_impl.h" #include "test/common/http/common.h" #include "test/mocks/buffer/mocks.h" @@ -311,12 +311,11 @@ TEST_F(AsyncClientImplTest, BasicHashPolicy) { })); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) .WillOnce( - Invoke([&](Upstream::ResourcePriority, auto, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { + Invoke([&](Upstream::ResourcePriority, auto, Upstream::LoadBalancerContext* context) { // this is the hash of :path header value "/" // the hash stability across releases is expected, so test the hash value directly here. EXPECT_EQ(16761507700594825962UL, context->computeHashKey().value()); - return &cm_.thread_local_cluster_.conn_pool_; + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); })); TestRequestHeaderMapImpl copy(message_->headers()); @@ -356,12 +355,11 @@ TEST_F(AsyncClientImplTest, WithoutMetadata) { })); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) - .WillOnce( - Invoke([&](Upstream::ResourcePriority, absl::optional, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { - EXPECT_EQ(context->metadataMatchCriteria(), nullptr); - return &cm_.thread_local_cluster_.conn_pool_; - })); + .WillOnce(Invoke([&](Upstream::ResourcePriority, absl::optional, + Upstream::LoadBalancerContext* context) { + EXPECT_EQ(context->metadataMatchCriteria(), nullptr); + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); + })); TestRequestHeaderMapImpl copy(message_->headers()); copy.addCopy("x-envoy-internal", "true"); @@ -400,14 +398,13 @@ TEST_F(AsyncClientImplTest, WithMetadata) { })); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) - .WillOnce( - Invoke([&](Upstream::ResourcePriority, absl::optional, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { - EXPECT_NE(context->metadataMatchCriteria(), nullptr); - EXPECT_EQ(context->metadataMatchCriteria()->metadataMatchCriteria().at(0)->name(), - "fake_test_key"); - return &cm_.thread_local_cluster_.conn_pool_; - })); + .WillOnce(Invoke([&](Upstream::ResourcePriority, absl::optional, + Upstream::LoadBalancerContext* context) { + EXPECT_NE(context->metadataMatchCriteria(), nullptr); + EXPECT_EQ(context->metadataMatchCriteria()->metadataMatchCriteria().at(0)->name(), + "fake_test_key"); + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); + })); TestRequestHeaderMapImpl copy(message_->headers()); copy.addCopy("x-envoy-internal", "true"); diff --git a/test/common/http/async_client_utility_test.cc b/test/common/http/async_client_utility_test.cc index afcfc0ef0d0e2..fc4e64bc793fd 100644 --- a/test/common/http/async_client_utility_test.cc +++ b/test/common/http/async_client_utility_test.cc @@ -1,4 +1,4 @@ -#include "common/http/async_client_utility.h" +#include "source/common/http/async_client_utility.h" #include "test/mocks/http/mocks.h" diff --git a/test/common/http/codec_client_test.cc b/test/common/http/codec_client_test.cc index 55e0b3c4d221a..25a854defb3bc 100644 --- a/test/common/http/codec_client_test.cc +++ b/test/common/http/codec_client_test.cc @@ -1,13 +1,13 @@ #include -#include "common/buffer/buffer_impl.h" -#include "common/event/dispatcher_impl.h" -#include "common/http/codec_client.h" -#include "common/http/exception.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/utility.h" -#include "common/stream_info/stream_info_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/http/codec_client.h" +#include "source/common/http/exception.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/utility.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/http/common.h" #include "test/common/upstream/utility.h" diff --git a/test/common/http/codec_impl_fuzz_test.cc b/test/common/http/codec_impl_fuzz_test.cc index 8471fed61f472..41453259059a3 100644 --- a/test/common/http/codec_impl_fuzz_test.cc +++ b/test/common/http/codec_impl_fuzz_test.cc @@ -9,13 +9,13 @@ #include -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/http/exception.h" -#include "common/http/header_map_impl.h" -#include "common/http/http1/codec_impl.h" -#include "common/http/http2/codec_impl.h" -#include "common/http/conn_manager_utility.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/http/exception.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/http1/codec_impl.h" +#include "source/common/http/http2/codec_impl.h" +#include "source/common/http/conn_manager_utility.h" #include "test/common/http/codec_impl_fuzz.pb.validate.h" #include "test/common/http/http2/codec_impl_test_util.h" diff --git a/test/common/http/codec_wrappers_test.cc b/test/common/http/codec_wrappers_test.cc index 02e47262da653..c2599039112f0 100644 --- a/test/common/http/codec_wrappers_test.cc +++ b/test/common/http/codec_wrappers_test.cc @@ -1,4 +1,4 @@ -#include "common/http/codec_wrappers.h" +#include "source/common/http/codec_wrappers.h" #include "test/mocks/http/mocks.h" #include "test/test_common/utility.h" diff --git a/test/common/http/codes_speed_test.cc b/test/common/http/codes_speed_test.cc index f6730603abc6a..c6ed25738f55c 100644 --- a/test/common/http/codes_speed_test.cc +++ b/test/common/http/codes_speed_test.cc @@ -8,9 +8,9 @@ #include "envoy/stats/stats.h" -#include "common/http/codes.h" -#include "common/stats/isolated_store_impl.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/http/codes.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/stats/symbol_table_impl.h" #include "benchmark/benchmark.h" diff --git a/test/common/http/codes_test.cc b/test/common/http/codes_test.cc index b55876a3e340a..dffc2f57ef81b 100644 --- a/test/common/http/codes_test.cc +++ b/test/common/http/codes_test.cc @@ -5,9 +5,9 @@ #include "envoy/stats/stats.h" -#include "common/common/empty_string.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/printers.h" diff --git a/test/common/http/common.h b/test/common/http/common.h index 06385cbc6c12a..b23c14535845c 100644 --- a/test/common/http/common.h +++ b/test/common/http/common.h @@ -4,7 +4,7 @@ #include "envoy/http/conn_pool.h" -#include "common/http/codec_client.h" +#include "source/common/http/codec_client.h" #include "test/mocks/common.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/http/conn_manager_impl_fuzz_test.cc b/test/common/http/conn_manager_impl_fuzz_test.cc index dd9c7e1525984..6af101e44ee98 100644 --- a/test/common/http/conn_manager_impl_fuzz_test.cc +++ b/test/common/http/conn_manager_impl_fuzz_test.cc @@ -14,14 +14,14 @@ // * Fuzz config settings #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/common/empty_string.h" -#include "common/http/conn_manager_impl.h" -#include "common/http/context_impl.h" -#include "common/http/date_provider_impl.h" -#include "common/http/exception.h" -#include "common/http/header_utility.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/conn_manager_impl.h" +#include "source/common/http/context_impl.h" +#include "source/common/http/date_provider_impl.h" +#include "source/common/http/exception.h" +#include "source/common/http/header_utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" #include "test/common/http/conn_manager_impl_fuzz.pb.validate.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/http/conn_manager_impl_test.cc b/test/common/http/conn_manager_impl_test.cc index 20d5abb112cde..08f56b0a338fb 100644 --- a/test/common/http/conn_manager_impl_test.cc +++ b/test/common/http/conn_manager_impl_test.cc @@ -290,6 +290,30 @@ TEST_F(HttpConnectionManagerImplTest, 100ContinueResponseWithDecoderPause) { EXPECT_EQ(2U, listener_stats_.downstream_rq_completed_.value()); } +// When create new stream, the stream info will be populated from the connection. +TEST_F(HttpConnectionManagerImplTest, PopulateStreamInfo) { + setup(true, "", false); + + absl::string_view server_name = "fake-server"; + EXPECT_CALL(filter_callbacks_.connection_, id()).WillRepeatedly(Return(1234)); + EXPECT_CALL(filter_callbacks_.connection_, requestedServerName()) + .WillRepeatedly(Return(server_name)); + + // Set up the codec. + Buffer::OwnedImpl fake_input("input"); + conn_manager_->createCodec(fake_input); + + decoder_ = &conn_manager_->newStream(response_encoder_); + + EXPECT_EQ(requestIDExtension().get(), decoder_->streamInfo().getRequestIDProvider()); + EXPECT_EQ(ssl_connection_, decoder_->streamInfo().downstreamSslConnection()); + EXPECT_EQ(1234U, decoder_->streamInfo().connectionID()); + EXPECT_EQ(server_name, decoder_->streamInfo().requestedServerName()); + + // Clean up. + filter_callbacks_.connection_.raiseEvent(Network::ConnectionEvent::RemoteClose); +} + // By default, Envoy will set the server header to the server name, here "custom-value" TEST_F(HttpConnectionManagerImplTest, ServerHeaderOverwritten) { setup(false, "custom-value", false); diff --git a/test/common/http/conn_manager_impl_test_base.cc b/test/common/http/conn_manager_impl_test_base.cc index 92e74ac4c97a5..5cce6546afe8a 100644 --- a/test/common/http/conn_manager_impl_test_base.cc +++ b/test/common/http/conn_manager_impl_test_base.cc @@ -1,6 +1,6 @@ #include "test/common/http/conn_manager_impl_test_base.h" -#include "extensions/request_id/uuid/config.h" +#include "source/extensions/request_id/uuid/config.h" #include "test/common/http/xff_extension.h" diff --git a/test/common/http/conn_manager_impl_test_base.h b/test/common/http/conn_manager_impl_test_base.h index 18b04e5176032..98a4b95b6e6f8 100644 --- a/test/common/http/conn_manager_impl_test_base.h +++ b/test/common/http/conn_manager_impl_test_base.h @@ -1,11 +1,10 @@ #pragma once -#include "common/http/conn_manager_impl.h" -#include "common/http/context_impl.h" -#include "common/http/date_provider_impl.h" -#include "common/network/address_impl.h" - -#include "extensions/access_loggers/common/file_access_log_impl.h" +#include "source/common/http/conn_manager_impl.h" +#include "source/common/http/context_impl.h" +#include "source/common/http/date_provider_impl.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/access_loggers/common/file_access_log_impl.h" #include "test/mocks/access_log/mocks.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/http/conn_manager_utility_test.cc b/test/common/http/conn_manager_utility_test.cc index a53c9fe67a090..7948e3d19def4 100644 --- a/test/common/http/conn_manager_utility_test.cc +++ b/test/common/http/conn_manager_utility_test.cc @@ -4,15 +4,14 @@ #include "envoy/http/request_id_extension.h" #include "envoy/type/v3/percent.pb.h" -#include "common/common/random_generator.h" -#include "common/http/conn_manager_utility.h" -#include "common/http/header_utility.h" -#include "common/http/headers.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" -#include "common/runtime/runtime_impl.h" - -#include "extensions/request_id/uuid/config.h" +#include "source/common/common/random_generator.h" +#include "source/common/http/conn_manager_utility.h" +#include "source/common/http/header_utility.h" +#include "source/common/http/headers.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/extensions/request_id/uuid/config.h" #include "test/common/http/custom_header_extension.h" #include "test/common/http/xff_extension.h" diff --git a/test/common/http/conn_pool_grid_test.cc b/test/common/http/conn_pool_grid_test.cc index d52fd391620af..e5cf18bcd986d 100644 --- a/test/common/http/conn_pool_grid_test.cc +++ b/test/common/http/conn_pool_grid_test.cc @@ -1,7 +1,7 @@ #include "envoy/http/alternate_protocols_cache.h" -#include "common/http/alternate_protocols_cache_impl.h" -#include "common/http/conn_pool_grid.h" +#include "source/common/http/alternate_protocols_cache_impl.h" +#include "source/common/http/conn_pool_grid.h" #include "test/common/http/common.h" #include "test/common/upstream/utility.h" @@ -597,7 +597,7 @@ TEST_F(ConnectivityGridWithAlternateProtocolsCacheImplTest, SuccessWithoutHttp3N } // namespace } // namespace Http } // namespace Envoy -#include "extensions/quic_listeners/quiche/quic_transport_socket_factory.h" +#include "source/extensions/quic_listeners/quiche/quic_transport_socket_factory.h" namespace Envoy { namespace Http { namespace { diff --git a/test/common/http/custom_header_extension.cc b/test/common/http/custom_header_extension.cc index 33bb73e363064..c49dcbac0f8ca 100644 --- a/test/common/http/custom_header_extension.cc +++ b/test/common/http/custom_header_extension.cc @@ -1,6 +1,6 @@ #include "test/common/http/custom_header_extension.h" -#include "extensions/http/original_ip_detection/custom_header/custom_header.h" +#include "source/extensions/http/original_ip_detection/custom_header/custom_header.h" namespace Envoy { diff --git a/test/common/http/date_provider_impl_test.cc b/test/common/http/date_provider_impl_test.cc index 42312ad6af6e2..176483304d16e 100644 --- a/test/common/http/date_provider_impl_test.cc +++ b/test/common/http/date_provider_impl_test.cc @@ -1,7 +1,7 @@ #include -#include "common/http/date_provider_impl.h" -#include "common/http/header_map_impl.h" +#include "source/common/http/date_provider_impl.h" +#include "source/common/http/header_map_impl.h" #include "test/mocks/event/mocks.h" #include "test/mocks/thread_local/mocks.h" diff --git a/test/common/http/filter_manager_test.cc b/test/common/http/filter_manager_test.cc index 477184462d001..8587b0f50ac85 100644 --- a/test/common/http/filter_manager_test.cc +++ b/test/common/http/filter_manager_test.cc @@ -4,12 +4,12 @@ #include "envoy/matcher/matcher.h" #include "envoy/stream_info/filter_state.h" -#include "common/http/filter_manager.h" -#include "common/http/matching/inputs.h" -#include "common/matcher/exact_map_matcher.h" -#include "common/matcher/matcher.h" -#include "common/stream_info/filter_state_impl.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/http/filter_manager.h" +#include "source/common/http/matching/inputs.h" +#include "source/common/matcher/exact_map_matcher.h" +#include "source/common/matcher/matcher.h" +#include "source/common/stream_info/filter_state_impl.h" +#include "source/common/stream_info/stream_info_impl.h" #include "test/mocks/event/mocks.h" #include "test/mocks/http/mocks.h" diff --git a/test/common/http/header_map_impl_fuzz_test.cc b/test/common/http/header_map_impl_fuzz_test.cc index abbe77e6ca1ce..d769eb2258796 100644 --- a/test/common/http/header_map_impl_fuzz_test.cc +++ b/test/common/http/header_map_impl_fuzz_test.cc @@ -1,8 +1,8 @@ #include -#include "common/common/assert.h" -#include "common/common/logger.h" -#include "common/http/header_map_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" +#include "source/common/http/header_map_impl.h" #include "test/common/http/header_map_impl_fuzz.pb.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/http/header_map_impl_speed_test.cc b/test/common/http/header_map_impl_speed_test.cc index b5a0d985387ff..e131ecd9e5e9b 100644 --- a/test/common/http/header_map_impl_speed_test.cc +++ b/test/common/http/header_map_impl_speed_test.cc @@ -1,5 +1,5 @@ -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" #include "benchmark/benchmark.h" diff --git a/test/common/http/header_map_impl_test.cc b/test/common/http/header_map_impl_test.cc index 9a1fef6241458..36ca86676e454 100644 --- a/test/common/http/header_map_impl_test.cc +++ b/test/common/http/header_map_impl_test.cc @@ -2,9 +2,9 @@ #include #include -#include "common/http/header_list_view.h" -#include "common/http/header_map_impl.h" -#include "common/http/header_utility.h" +#include "source/common/http/header_list_view.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/header_utility.h" #include "test/test_common/printers.h" #include "test/test_common/test_runtime.h" diff --git a/test/common/http/header_utility_test.cc b/test/common/http/header_utility_test.cc index ae873f46493f0..59a52bd5c3aef 100644 --- a/test/common/http/header_utility_test.cc +++ b/test/common/http/header_utility_test.cc @@ -5,8 +5,8 @@ #include "envoy/http/protocol.h" #include "envoy/json/json_object.h" -#include "common/http/header_utility.h" -#include "common/json/json_loader.h" +#include "source/common/http/header_utility.h" +#include "source/common/json/json_loader.h" #include "test/test_common/test_runtime.h" #include "test/test_common/utility.h" diff --git a/test/common/http/http1/BUILD b/test/common/http/http1/BUILD index bb66b74b8ffd8..200909ceeb1e0 100644 --- a/test/common/http/http1/BUILD +++ b/test/common/http/http1/BUILD @@ -20,8 +20,8 @@ envoy_cc_test( name = "codec_impl_test", srcs = ["codec_impl_test.cc"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/event:dispatcher_interface", + "//envoy/buffer:buffer_interface", + "//envoy/event:dispatcher_interface", "//source/common/buffer:buffer_lib", "//source/common/event:dispatcher_lib", "//source/common/http:exception_lib", diff --git a/test/common/http/http1/codec_impl_test.cc b/test/common/http/http1/codec_impl_test.cc index 5131df3481254..f73c17d08eacd 100644 --- a/test/common/http/http1/codec_impl_test.cc +++ b/test/common/http/http1/codec_impl_test.cc @@ -7,12 +7,12 @@ #include "envoy/event/dispatcher.h" #include "envoy/http/codec.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/utility.h" -#include "common/http/exception.h" -#include "common/http/header_map_impl.h" -#include "common/http/http1/codec_impl.h" -#include "common/runtime/runtime_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/utility.h" +#include "source/common/http/exception.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/http1/codec_impl.h" +#include "source/common/runtime/runtime_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/buffer/mocks.h" diff --git a/test/common/http/http1/conn_pool_test.cc b/test/common/http/http1/conn_pool_test.cc index 2c461685b04e7..809ceb21e5145 100644 --- a/test/common/http/http1/conn_pool_test.cc +++ b/test/common/http/http1/conn_pool_test.cc @@ -4,14 +4,14 @@ #include "envoy/http/codec.h" #include "envoy/network/transport_socket.h" -#include "common/buffer/buffer_impl.h" -#include "common/event/dispatcher_impl.h" -#include "common/http/codec_client.h" -#include "common/http/http1/conn_pool.h" -#include "common/http/utility.h" -#include "common/network/raw_buffer_socket.h" -#include "common/network/utility.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/http/codec_client.h" +#include "source/common/http/http1/conn_pool.h" +#include "source/common/http/utility.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/http/common.h" #include "test/common/upstream/utility.h" diff --git a/test/common/http/http1/header_formatter_test.cc b/test/common/http/http1/header_formatter_test.cc index d5ce38f1bfcf6..ba2abdf3e741c 100644 --- a/test/common/http/http1/header_formatter_test.cc +++ b/test/common/http/http1/header_formatter_test.cc @@ -1,4 +1,4 @@ -#include "common/http/http1/header_formatter.h" +#include "source/common/http/http1/header_formatter.h" #include "gtest/gtest.h" diff --git a/test/common/http/http2/BUILD b/test/common/http/http2/BUILD index e9648e1aebeaf..075f7607ea42d 100644 --- a/test/common/http/http2/BUILD +++ b/test/common/http/http2/BUILD @@ -81,7 +81,7 @@ envoy_cc_test_library( "nghttp2", ], deps = [ - "//include/envoy/http:metadata_interface_with_external_headers", + "//envoy/http:metadata_interface_with_external_headers", "//source/common/buffer:buffer_lib", "//source/common/common:assert_lib", "//source/common/common:hex_lib", @@ -144,7 +144,7 @@ envoy_cc_test( name = "http2_frame_test", srcs = ["http2_frame_test.cc"], deps = [ - "//include/envoy/http:metadata_interface", + "//envoy/http:metadata_interface", "//source/common/http/http2:metadata_encoder_lib", "//test/common/http/http2:http2_frame", ], diff --git a/test/common/http/http2/codec_impl_test.cc b/test/common/http/http2/codec_impl_test.cc index 0752c0796fff6..9f00436e71625 100644 --- a/test/common/http/http2/codec_impl_test.cc +++ b/test/common/http/http2/codec_impl_test.cc @@ -5,11 +5,11 @@ #include "envoy/http/codec.h" #include "envoy/stats/scope.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/utility.h" -#include "common/http/exception.h" -#include "common/http/header_map_impl.h" -#include "common/http/http2/codec_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/utility.h" +#include "source/common/http/exception.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/http2/codec_impl.h" #include "test/common/http/common.h" #include "test/common/http/http2/http2_frame.h" diff --git a/test/common/http/http2/codec_impl_test_util.h b/test/common/http/http2/codec_impl_test_util.h index 3273ad221f6a1..c95c7776a7068 100644 --- a/test/common/http/http2/codec_impl_test_util.h +++ b/test/common/http/http2/codec_impl_test_util.h @@ -2,8 +2,8 @@ #include "envoy/http/codec.h" -#include "common/http/http2/codec_impl.h" -#include "common/http/utility.h" +#include "source/common/http/http2/codec_impl.h" +#include "source/common/http/utility.h" #include "test/mocks/common.h" diff --git a/test/common/http/http2/conn_pool_test.cc b/test/common/http/http2/conn_pool_test.cc index f29d0d83209eb..e83eaabf94861 100644 --- a/test/common/http/http2/conn_pool_test.cc +++ b/test/common/http/http2/conn_pool_test.cc @@ -2,11 +2,11 @@ #include #include -#include "common/event/dispatcher_impl.h" -#include "common/http/http2/conn_pool.h" -#include "common/network/raw_buffer_socket.h" -#include "common/network/utility.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/http/http2/conn_pool.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/http/common.h" #include "test/common/upstream/utility.h" diff --git a/test/common/http/http2/frame_replay.cc b/test/common/http/http2/frame_replay.cc index b0aa61e14ff07..8a604884330fe 100644 --- a/test/common/http/http2/frame_replay.cc +++ b/test/common/http/http2/frame_replay.cc @@ -1,8 +1,8 @@ #include "test/common/http/http2/frame_replay.h" -#include "common/common/hex.h" -#include "common/common/macros.h" -#include "common/http/utility.h" +#include "source/common/common/hex.h" +#include "source/common/common/macros.h" +#include "source/common/http/utility.h" #include "test/common/http/common.h" #include "test/test_common/environment.h" diff --git a/test/common/http/http2/frame_replay.h b/test/common/http/http2/frame_replay.h index e07f18fa74367..17b2958f7f86a 100644 --- a/test/common/http/http2/frame_replay.h +++ b/test/common/http/http2/frame_replay.h @@ -4,7 +4,7 @@ #include #include -#include "common/stats/isolated_store_impl.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/mocks/common.h" #include "test/mocks/http/mocks.h" diff --git a/test/common/http/http2/frame_replay_test.cc b/test/common/http/http2/frame_replay_test.cc index 91a2ba4894e13..b9914633939ed 100644 --- a/test/common/http/http2/frame_replay_test.cc +++ b/test/common/http/http2/frame_replay_test.cc @@ -1,4 +1,4 @@ -#include "common/http/exception.h" +#include "source/common/http/exception.h" #include "test/common/http/common.h" #include "test/common/http/http2/codec_impl_test_util.h" diff --git a/test/common/http/http2/http2_frame.cc b/test/common/http/http2/http2_frame.cc index 266f7680dc45c..4a1c4b17b7673 100644 --- a/test/common/http/http2/http2_frame.cc +++ b/test/common/http/http2/http2_frame.cc @@ -4,7 +4,7 @@ #include "envoy/common/platform.h" -#include "common/common/hex.h" +#include "source/common/common/hex.h" #include "nghttp2/nghttp2.h" diff --git a/test/common/http/http2/http2_frame.h b/test/common/http/http2/http2_frame.h index 370316fc787cf..54f8fe5491bbf 100644 --- a/test/common/http/http2/http2_frame.h +++ b/test/common/http/http2/http2_frame.h @@ -6,7 +6,7 @@ #include "envoy/http/metadata_interface.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/strings/string_view.h" diff --git a/test/common/http/http2/http2_frame_test.cc b/test/common/http/http2/http2_frame_test.cc index 7de8769d8cd33..b559e5b640dd8 100644 --- a/test/common/http/http2/http2_frame_test.cc +++ b/test/common/http/http2/http2_frame_test.cc @@ -2,7 +2,7 @@ #include "envoy/http/metadata_interface.h" -#include "common/http/http2/metadata_encoder.h" +#include "source/common/http/http2/metadata_encoder.h" #include "test/common/http/http2/http2_frame.h" diff --git a/test/common/http/http2/metadata_encoder_decoder_test.cc b/test/common/http/http2/metadata_encoder_decoder_test.cc index ffcea4f852123..d954778be1719 100644 --- a/test/common/http/http2/metadata_encoder_decoder_test.cc +++ b/test/common/http/http2/metadata_encoder_decoder_test.cc @@ -1,10 +1,10 @@ #include "envoy/http/metadata_interface.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/logger.h" -#include "common/common/random_generator.h" -#include "common/http/http2/metadata_decoder.h" -#include "common/http/http2/metadata_encoder.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/logger.h" +#include "source/common/common/random_generator.h" +#include "source/common/http/http2/metadata_decoder.h" +#include "source/common/http/http2/metadata_encoder.h" #include "test/test_common/logging.h" diff --git a/test/common/http/http2/protocol_constraints_test.cc b/test/common/http/http2/protocol_constraints_test.cc index f3308759b9e96..c31c3a254a1cc 100644 --- a/test/common/http/http2/protocol_constraints_test.cc +++ b/test/common/http/http2/protocol_constraints_test.cc @@ -1,5 +1,5 @@ -#include "common/common/utility.h" -#include "common/http/http2/protocol_constraints.h" +#include "source/common/common/utility.h" +#include "source/common/http/http2/protocol_constraints.h" #include "test/common/stats/stat_test_utility.h" diff --git a/test/common/http/http2/request_header_fuzz_test.cc b/test/common/http/http2/request_header_fuzz_test.cc index 90b8cdd758e3d..dc8d2a094adf5 100644 --- a/test/common/http/http2/request_header_fuzz_test.cc +++ b/test/common/http/http2/request_header_fuzz_test.cc @@ -2,7 +2,7 @@ // stateless and focuses only on HEADERS. This technique also plays well with // uncompressed HEADERS fuzzing. -#include "common/http/exception.h" +#include "source/common/http/exception.h" #include "test/common/http/http2/codec_impl_test_util.h" #include "test/common/http/http2/frame_replay.h" diff --git a/test/common/http/http2/response_header_fuzz_test.cc b/test/common/http/http2/response_header_fuzz_test.cc index 93e1baff480bb..0935ab0017ef2 100644 --- a/test/common/http/http2/response_header_fuzz_test.cc +++ b/test/common/http/http2/response_header_fuzz_test.cc @@ -2,7 +2,7 @@ // stateless and focuses only on HEADERS. This technique also plays well with // uncompressed HEADERS fuzzing. -#include "common/http/exception.h" +#include "source/common/http/exception.h" #include "test/common/http/common.h" #include "test/common/http/http2/codec_impl_test_util.h" diff --git a/test/common/http/http3/conn_pool_test.cc b/test/common/http/http3/conn_pool_test.cc index 3c16ae1d6eb78..547aa28be636f 100644 --- a/test/common/http/http3/conn_pool_test.cc +++ b/test/common/http/http3/conn_pool_test.cc @@ -1,5 +1,5 @@ -#include "common/http/http3/conn_pool.h" -#include "common/quic/quic_transport_socket_factory.h" +#include "source/common/http/http3/conn_pool.h" +#include "source/common/quic/quic_transport_socket_factory.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" diff --git a/test/common/http/http3_status_tracker_test.cc b/test/common/http/http3_status_tracker_test.cc index 0fce5f482172d..774612a15fbfc 100644 --- a/test/common/http/http3_status_tracker_test.cc +++ b/test/common/http/http3_status_tracker_test.cc @@ -1,4 +1,4 @@ -#include "common/http/http3_status_tracker.h" +#include "source/common/http/http3_status_tracker.h" #include "test/mocks/common.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/http/match_wrapper/config_test.cc b/test/common/http/match_wrapper/config_test.cc index 3a79a21b01aee..db2681a143995 100644 --- a/test/common/http/match_wrapper/config_test.cc +++ b/test/common/http/match_wrapper/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/server/factory_context.h" #include "envoy/server/filter_config.h" -#include "common/http/match_wrapper/config.h" +#include "source/common/http/match_wrapper/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/registry.h" diff --git a/test/common/http/matching/inputs_test.cc b/test/common/http/matching/inputs_test.cc index e7697d2e83bcc..951b0bdda7dfd 100644 --- a/test/common/http/matching/inputs_test.cc +++ b/test/common/http/matching/inputs_test.cc @@ -1,7 +1,7 @@ #include "envoy/http/filter.h" -#include "common/http/matching/data_impl.h" -#include "common/http/matching/inputs.h" +#include "source/common/http/matching/data_impl.h" +#include "source/common/http/matching/inputs.h" #include "test/test_common/utility.h" @@ -9,16 +9,29 @@ namespace Envoy { namespace Http { namespace Matching { -// Provides test coverage for retrieving a header value multiple times from the same input class. -TEST(HttpHeadersDataInputBase, Idempotence) { +TEST(HttpHeadersDataInputBase, ReturnValueNotPersistedBetweenCalls) { HttpRequestHeadersDataInput input("header"); - HttpMatchingDataImpl data; - TestRequestHeaderMapImpl request_headers({{"header", "bar"}}); - data.onRequestHeaders(request_headers); - EXPECT_EQ(input.get(data).data_, "bar"); - EXPECT_EQ(input.get(data).data_, "bar"); + { + TestRequestHeaderMapImpl request_headers({{"header", "bar"}}); + data.onRequestHeaders(request_headers); + + EXPECT_EQ(input.get(data).data_, "bar"); + } + + { + TestRequestHeaderMapImpl request_headers({{"header", "baz"}}); + data.onRequestHeaders(request_headers); + EXPECT_EQ(input.get(data).data_, "baz"); + } + + TestRequestHeaderMapImpl request_headers({{"not-header", "baz"}}); + data.onRequestHeaders(request_headers); + auto result = input.get(data); + EXPECT_EQ(result.data_availability_, + Matcher::DataInputGetResult::DataAvailability::AllDataAvailable); + EXPECT_EQ(result.data_, absl::nullopt); } } // namespace Matching } // namespace Http diff --git a/test/common/http/mixed_conn_pool_test.cc b/test/common/http/mixed_conn_pool_test.cc index e5fa9c30887b7..3f22bfc5b876c 100644 --- a/test/common/http/mixed_conn_pool_test.cc +++ b/test/common/http/mixed_conn_pool_test.cc @@ -1,7 +1,7 @@ #include -#include "common/http/mixed_conn_pool.h" -#include "common/http/utility.h" +#include "source/common/http/mixed_conn_pool.h" +#include "source/common/http/utility.h" #include "test/common/http/common.h" #include "test/common/upstream/utility.h" diff --git a/test/common/http/path_utility_fuzz_test.cc b/test/common/http/path_utility_fuzz_test.cc index 3ae691e7ecf77..654ad5097369e 100644 --- a/test/common/http/path_utility_fuzz_test.cc +++ b/test/common/http/path_utility_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "common/http/path_utility.h" +#include "source/common/http/path_utility.h" #include "test/common/http/path_utility_fuzz.pb.validate.h" #include "test/fuzz/fuzz_runner.h" @@ -33,7 +33,7 @@ DEFINE_PROTO_FUZZER(const test::common::http::PathUtilityTestCase& input) { case test::common::http::PathUtilityTestCase::kRemoveQueryAndFragment: { auto path = input.remove_query_and_fragment().path(); auto sanitized_path = Http::PathUtil::removeQueryAndFragment(path); - ASSERT(path.find(sanitized_path) != std::string::npos); + ASSERT(path.find(std::string(sanitized_path)) != std::string::npos); break; } default: diff --git a/test/common/http/path_utility_test.cc b/test/common/http/path_utility_test.cc index 3934b1469ed5d..b1384e9573937 100644 --- a/test/common/http/path_utility_test.cc +++ b/test/common/http/path_utility_test.cc @@ -2,7 +2,7 @@ #include #include -#include "common/http/path_utility.h" +#include "source/common/http/path_utility.h" #include "test/test_common/utility.h" diff --git a/test/common/http/status_test.cc b/test/common/http/status_test.cc index 152cc1925fa64..1d70d91684ad3 100644 --- a/test/common/http/status_test.cc +++ b/test/common/http/status_test.cc @@ -1,4 +1,4 @@ -#include "common/http/status.h" +#include "source/common/http/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/common/http/user_agent_test.cc b/test/common/http/user_agent_test.cc index 26d01b81a4a13..2a9c40481216b 100644 --- a/test/common/http/user_agent_test.cc +++ b/test/common/http/user_agent_test.cc @@ -1,5 +1,5 @@ -#include "common/http/header_map_impl.h" -#include "common/http/user_agent.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/user_agent.h" #include "test/mocks/common.h" #include "test/mocks/stats/mocks.h" diff --git a/test/common/http/utility_fuzz_test.cc b/test/common/http/utility_fuzz_test.cc index 2b665893f50f3..ca362680fb9f6 100644 --- a/test/common/http/utility_fuzz_test.cc +++ b/test/common/http/utility_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "common/http/utility.h" +#include "source/common/http/utility.h" #include "test/common/http/utility_fuzz.pb.validate.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/http/utility_test.cc b/test/common/http/utility_test.cc index 75d1b72ca10ef..32149b467c395 100644 --- a/test/common/http/utility_test.cc +++ b/test/common/http/utility_test.cc @@ -6,12 +6,12 @@ #include "envoy/config/core/v3/protocol.pb.h" #include "envoy/config/core/v3/protocol.pb.validate.h" -#include "common/common/fmt.h" -#include "common/http/exception.h" -#include "common/http/header_map_impl.h" -#include "common/http/http1/settings.h" -#include "common/http/utility.h" -#include "common/network/address_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/http/exception.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/http1/settings.h" +#include "source/common/http/utility.h" +#include "source/common/network/address_impl.h" #include "test/mocks/http/mocks.h" #include "test/mocks/protobuf/mocks.h" @@ -1467,5 +1467,30 @@ TEST(PercentEncoding, Encoding) { EXPECT_EQ(Utility::PercentEncoding::encode("too%!large/", "%!/"), "too%25%21large%2F"); } +TEST(CheckRequiredHeaders, Request) { + EXPECT_EQ(Http::okStatus(), HeaderUtility::checkRequiredRequestHeaders( + TestRequestHeaderMapImpl{{":method", "GET"}, {":path", "/"}})); + EXPECT_EQ(Http::okStatus(), HeaderUtility::checkRequiredRequestHeaders(TestRequestHeaderMapImpl{ + {":method", "CONNECT"}, {":authority", "localhost:1234"}})); + EXPECT_EQ(absl::InvalidArgumentError("missing required header: :method"), + HeaderUtility::checkRequiredRequestHeaders(TestRequestHeaderMapImpl{})); + EXPECT_EQ( + absl::InvalidArgumentError("missing required header: :path"), + HeaderUtility::checkRequiredRequestHeaders(TestRequestHeaderMapImpl{{":method", "GET"}})); + EXPECT_EQ( + absl::InvalidArgumentError("missing required header: :authority"), + HeaderUtility::checkRequiredRequestHeaders(TestRequestHeaderMapImpl{{":method", "CONNECT"}})); +} + +TEST(CheckRequiredHeaders, Response) { + EXPECT_EQ(Http::okStatus(), HeaderUtility::checkRequiredResponseHeaders( + TestResponseHeaderMapImpl{{":status", "200"}})); + EXPECT_EQ(absl::InvalidArgumentError("missing required header: :status"), + HeaderUtility::checkRequiredResponseHeaders(TestResponseHeaderMapImpl{})); + EXPECT_EQ( + absl::InvalidArgumentError("missing required header: :status"), + HeaderUtility::checkRequiredResponseHeaders(TestResponseHeaderMapImpl{{":status", "abcd"}})); +} + } // namespace Http } // namespace Envoy diff --git a/test/common/http/xff_extension.cc b/test/common/http/xff_extension.cc index 3cca217790578..1c07e6804cef3 100644 --- a/test/common/http/xff_extension.cc +++ b/test/common/http/xff_extension.cc @@ -1,6 +1,6 @@ #include "test/common/http/xff_extension.h" -#include "extensions/http/original_ip_detection/xff/xff.h" +#include "source/extensions/http/original_ip_detection/xff/xff.h" namespace Envoy { diff --git a/test/common/init/manager_impl_test.cc b/test/common/init/manager_impl_test.cc index 28465b1d2a160..d2fc77f5a5894 100644 --- a/test/common/init/manager_impl_test.cc +++ b/test/common/init/manager_impl_test.cc @@ -1,4 +1,4 @@ -#include "common/init/manager_impl.h" +#include "source/common/init/manager_impl.h" #include "test/mocks/init/mocks.h" diff --git a/test/common/json/json_fuzz_test.cc b/test/common/json/json_fuzz_test.cc index 40087ae74355b..bcc062f3c460b 100644 --- a/test/common/json/json_fuzz_test.cc +++ b/test/common/json/json_fuzz_test.cc @@ -1,5 +1,5 @@ -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "test/fuzz/fuzz_runner.h" #include "test/fuzz/utility.h" diff --git a/test/common/json/json_loader_test.cc b/test/common/json/json_loader_test.cc index e26fa010c8353..232f4b57c4940 100644 --- a/test/common/json/json_loader_test.cc +++ b/test/common/json/json_loader_test.cc @@ -1,8 +1,8 @@ #include #include -#include "common/json/json_loader.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/json/json_loader.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/test_common/utility.h" diff --git a/test/common/local_info/local_info_impl_test.cc b/test/common/local_info/local_info_impl_test.cc index dbfcb45730866..87743f1384223 100644 --- a/test/common/local_info/local_info_impl_test.cc +++ b/test/common/local_info/local_info_impl_test.cc @@ -1,4 +1,4 @@ -#include "common/local_info/local_info_impl.h" +#include "source/common/local_info/local_info_impl.h" #include "test/common/stats/stat_test_utility.h" diff --git a/test/common/local_reply/local_reply_test.cc b/test/common/local_reply/local_reply_test.cc index 64afad622bd1a..854eb24bcb983 100644 --- a/test/common/local_reply/local_reply_test.cc +++ b/test/common/local_reply/local_reply_test.cc @@ -1,8 +1,8 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.validate.h" #include "envoy/http/codes.h" -#include "common/http/header_utility.h" -#include "common/local_reply/local_reply.h" +#include "source/common/http/header_utility.h" +#include "source/common/local_reply/local_reply.h" #include "test/mocks/http/mocks.h" #include "test/mocks/server/factory_context.h" diff --git a/test/common/matcher/exact_map_matcher_test.cc b/test/common/matcher/exact_map_matcher_test.cc index 0d7745a4cb95f..354ae67682c15 100644 --- a/test/common/matcher/exact_map_matcher_test.cc +++ b/test/common/matcher/exact_map_matcher_test.cc @@ -2,8 +2,8 @@ #include "envoy/config/core/v3/extension.pb.h" -#include "common/matcher/exact_map_matcher.h" -#include "common/matcher/matcher.h" +#include "source/common/matcher/exact_map_matcher.h" +#include "source/common/matcher/matcher.h" #include "test/common/matcher/test_utility.h" diff --git a/test/common/matcher/field_matcher_test.cc b/test/common/matcher/field_matcher_test.cc index 133da5ae8a4ff..44c40d8c86247 100644 --- a/test/common/matcher/field_matcher_test.cc +++ b/test/common/matcher/field_matcher_test.cc @@ -1,7 +1,7 @@ #include "envoy/matcher/matcher.h" -#include "common/matcher/field_matcher.h" -#include "common/matcher/matcher.h" +#include "source/common/matcher/field_matcher.h" +#include "source/common/matcher/matcher.h" #include "test/common/matcher/test_utility.h" diff --git a/test/common/matcher/list_matcher_test.cc b/test/common/matcher/list_matcher_test.cc index f9f4f3a89f6bd..760028756e811 100644 --- a/test/common/matcher/list_matcher_test.cc +++ b/test/common/matcher/list_matcher_test.cc @@ -1,6 +1,6 @@ #include "envoy/matcher/matcher.h" -#include "common/matcher/list_matcher.h" +#include "source/common/matcher/list_matcher.h" #include "test/common/matcher/test_utility.h" diff --git a/test/common/matcher/matcher_test.cc b/test/common/matcher/matcher_test.cc index 1bbc395806788..69d6d32ebf6cd 100644 --- a/test/common/matcher/matcher_test.cc +++ b/test/common/matcher/matcher_test.cc @@ -6,9 +6,9 @@ #include "envoy/matcher/matcher.h" #include "envoy/registry/registry.h" -#include "common/matcher/list_matcher.h" -#include "common/matcher/matcher.h" -#include "common/protobuf/utility.h" +#include "source/common/matcher/list_matcher.h" +#include "source/common/matcher/matcher.h" +#include "source/common/protobuf/utility.h" #include "test/common/matcher/test_utility.h" #include "test/mocks/matcher/mocks.h" diff --git a/test/common/matcher/test_utility.h b/test/common/matcher/test_utility.h index 46dcd4bf5935e..40453ffa4085f 100644 --- a/test/common/matcher/test_utility.h +++ b/test/common/matcher/test_utility.h @@ -3,7 +3,7 @@ #include "envoy/matcher/matcher.h" #include "envoy/protobuf/message_validator.h" -#include "common/matcher/matcher.h" +#include "source/common/matcher/matcher.h" #include "test/test_common/registry.h" #include "test/test_common/utility.h" @@ -19,7 +19,7 @@ struct TestData { // A CommonProtocolInput that returns the configured value every time. struct CommonProtocolTestInput : public CommonProtocolInput { explicit CommonProtocolTestInput(const std::string& data) : data_(data) {} - absl::optional get() override { return data_; } + absl::optional get() override { return data_; } const std::string data_; }; @@ -48,7 +48,7 @@ class TestCommonProtocolInputFactory : public CommonProtocolInputFactory { // A DataInput that returns the configured value every time. struct TestInput : public DataInput { explicit TestInput(DataInputGetResult result) : result_(result) {} - DataInputGetResult get(const TestData&) override { return result_; } + DataInputGetResult get(const TestData&) const override { return result_; } DataInputGetResult result_; }; @@ -158,7 +158,8 @@ createSingleMatcher(absl::optional input, DataInputGetResult::DataAvailability availability = DataInputGetResult::DataAvailability::AllDataAvailable) { return std::make_unique>( - std::make_unique(DataInputGetResult{availability, input}), + std::make_unique(DataInputGetResult{ + availability, input ? absl::make_optional(std::string(*input)) : absl::nullopt}), std::make_unique(predicate)); } diff --git a/test/common/matcher/value_input_matcher_test.cc b/test/common/matcher/value_input_matcher_test.cc index ebad39332489a..e9d080d31efc7 100644 --- a/test/common/matcher/value_input_matcher_test.cc +++ b/test/common/matcher/value_input_matcher_test.cc @@ -1,4 +1,4 @@ -#include "common/matcher/value_input_matcher.h" +#include "source/common/matcher/value_input_matcher.h" #include "gtest/gtest.h" diff --git a/test/common/memory/debug_test.cc b/test/common/memory/debug_test.cc index bd33b91f51e19..ce137b79613ef 100644 --- a/test/common/memory/debug_test.cc +++ b/test/common/memory/debug_test.cc @@ -1,4 +1,4 @@ -#include "common/memory/stats.h" +#include "source/common/memory/stats.h" #include "gtest/gtest.h" diff --git a/test/common/memory/heap_shrinker_test.cc b/test/common/memory/heap_shrinker_test.cc index 346a74899ff97..c6c7780a53b8f 100644 --- a/test/common/memory/heap_shrinker_test.cc +++ b/test/common/memory/heap_shrinker_test.cc @@ -1,6 +1,6 @@ -#include "common/event/dispatcher_impl.h" -#include "common/memory/heap_shrinker.h" -#include "common/memory/stats.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/memory/heap_shrinker.h" +#include "source/common/memory/stats.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/network/BUILD b/test/common/network/BUILD index e38f0aa74ff2e..ce5f097cd5f5e 100644 --- a/test/common/network/BUILD +++ b/test/common/network/BUILD @@ -105,10 +105,10 @@ envoy_cc_test( }), external_deps = ["abseil_synchronization"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:dns_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:dns_interface", "//source/common/event:dispatcher_includes", - "//include/envoy/event:file_event_interface", + "//envoy/event:file_event_interface", "//source/common/stats:isolated_store_lib", "//source/common/event:dispatcher_lib", "//source/common/network:address_lib", @@ -139,9 +139,9 @@ envoy_cc_test( # https://gist.github.com/wrowe/24fe5b93b58bb444bce7ecc134905395 tags = ["fails_on_clang_cl"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:address_interface", - "//include/envoy/network:dns_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:address_interface", + "//envoy/network:dns_interface", "//source/common/buffer:buffer_lib", "//source/common/event:dispatcher_includes", "//source/common/event:dispatcher_lib", diff --git a/test/common/network/addr_family_aware_socket_option_impl_test.cc b/test/common/network/addr_family_aware_socket_option_impl_test.cc index 14a2ea9dd8081..cdea9a34f4801 100644 --- a/test/common/network/addr_family_aware_socket_option_impl_test.cc +++ b/test/common/network/addr_family_aware_socket_option_impl_test.cc @@ -1,10 +1,10 @@ #include "envoy/common/platform.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/network/addr_family_aware_socket_option_impl.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/socket_interface.h" -#include "common/network/utility.h" +#include "source/common/network/addr_family_aware_socket_option_impl.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/socket_interface.h" +#include "source/common/network/utility.h" #include "test/common/network/socket_option_test.h" diff --git a/test/common/network/address_impl_speed_test.cc b/test/common/network/address_impl_speed_test.cc index 2d7f61af838b9..c4005ac4c86c1 100644 --- a/test/common/network/address_impl_speed_test.cc +++ b/test/common/network/address_impl_speed_test.cc @@ -1,5 +1,5 @@ -#include "common/common/fmt.h" -#include "common/network/address_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/network/address_impl.h" #include "benchmark/benchmark.h" diff --git a/test/common/network/address_impl_test.cc b/test/common/network/address_impl_test.cc index 5284464bb165a..86af3022cc583 100644 --- a/test/common/network/address_impl_test.cc +++ b/test/common/network/address_impl_test.cc @@ -5,12 +5,12 @@ #include "envoy/common/exception.h" #include "envoy/common/platform.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/utility.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/utility.h" #include "test/mocks/api/mocks.h" #include "test/test_common/environment.h" diff --git a/test/common/network/apple_dns_impl_test.cc b/test/common/network/apple_dns_impl_test.cc index 66cc2921300bb..d2f00c15cdb29 100644 --- a/test/common/network/apple_dns_impl_test.cc +++ b/test/common/network/apple_dns_impl_test.cc @@ -10,11 +10,11 @@ #include "envoy/network/address.h" #include "envoy/network/dns.h" -#include "common/common/random_generator.h" -#include "common/network/address_impl.h" -#include "common/network/apple_dns_impl.h" -#include "common/network/utility.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/common/random_generator.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/apple_dns_impl.h" +#include "source/common/network/utility.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/mocks/event/mocks.h" #include "test/test_common/environment.h" @@ -62,7 +62,9 @@ class AppleDnsImplTest : public testing::Test { AppleDnsImplTest() : api_(Api::createApiForTest()), dispatcher_(api_->allocateDispatcher("test_thread")) {} - void SetUp() override { resolver_ = dispatcher_->createDnsResolver({}, false); } + void SetUp() override { + resolver_ = dispatcher_->createDnsResolver({}, envoy::config::core::v3::DnsResolverOptions()); + } ActiveDnsQuery* resolveWithExpectations(const std::string& address, const DnsLookupFamily lookup_family, @@ -118,12 +120,14 @@ class AppleDnsImplTest : public testing::Test { }; TEST_F(AppleDnsImplTest, InvalidConfigOptions) { + auto dns_resolver_options = envoy::config::core::v3::DnsResolverOptions(); EXPECT_DEATH( - dispatcher_->createDnsResolver({}, true), - "using TCP for DNS lookups is not possible when using Apple APIs for DNS resolution"); - EXPECT_DEATH( - dispatcher_->createDnsResolver({nullptr}, false), + dispatcher_->createDnsResolver({nullptr}, dns_resolver_options), "defining custom resolvers is not possible when using Apple APIs for DNS resolution"); + dns_resolver_options.set_use_tcp_for_dns_lookups(true); + EXPECT_DEATH( + dispatcher_->createDnsResolver({}, dns_resolver_options), + "using TCP for DNS lookups is not possible when using Apple APIs for DNS resolution"); } // Validate that when AppleDnsResolverImpl is destructed with outstanding requests, diff --git a/test/common/network/cidr_range_test.cc b/test/common/network/cidr_range_test.cc index 29e48106e8857..6232e910ddfbb 100644 --- a/test/common/network/cidr_range_test.cc +++ b/test/common/network/cidr_range_test.cc @@ -4,11 +4,11 @@ #include "envoy/common/exception.h" #include "envoy/common/platform.h" -#include "common/common/fmt.h" -#include "common/json/json_loader.h" -#include "common/network/address_impl.h" -#include "common/network/cidr_range.h" -#include "common/network/utility.h" +#include "source/common/common/fmt.h" +#include "source/common/json/json_loader.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/cidr_range.h" +#include "source/common/network/utility.h" #include "gtest/gtest.h" diff --git a/test/common/network/connection_impl_test.cc b/test/common/network/connection_impl_test.cc index b4109d17fb6fd..63f5a10898aef 100644 --- a/test/common/network/connection_impl_test.cc +++ b/test/common/network/connection_impl_test.cc @@ -7,18 +7,18 @@ #include "envoy/event/scaled_range_timer_manager.h" #include "envoy/network/address.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/empty_string.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/event/dispatcher_impl.h" -#include "common/network/address_impl.h" -#include "common/network/connection_impl.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/utility.h" -#include "common/runtime/runtime_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/connection_impl.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/utility.h" +#include "source/common/runtime/runtime_impl.h" #include "test/mocks/api/mocks.h" #include "test/mocks/buffer/mocks.h" diff --git a/test/common/network/dns_impl_test.cc b/test/common/network/dns_impl_test.cc index 47476fa76a32f..e3c1401c673b2 100644 --- a/test/common/network/dns_impl_test.cc +++ b/test/common/network/dns_impl_test.cc @@ -9,15 +9,15 @@ #include "envoy/network/address.h" #include "envoy/network/dns.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/utility.h" -#include "common/event/dispatcher_impl.h" -#include "common/network/address_impl.h" -#include "common/network/dns_impl.h" -#include "common/network/filter_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/utility.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/utility.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/dns_impl.h" +#include "source/common/network/filter_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/utility.h" +#include "source/common/stream_info/stream_info_impl.h" #include "test/mocks/network/mocks.h" #include "test/test_common/environment.h" @@ -348,6 +348,7 @@ class DnsImplConstructor : public testing::Test { Api::ApiPtr api_; Event::DispatcherPtr dispatcher_; + envoy::config::core::v3::DnsResolverOptions dns_resolver_options_; }; TEST_F(DnsImplConstructor, SupportsCustomResolvers) { @@ -357,7 +358,7 @@ TEST_F(DnsImplConstructor, SupportsCustomResolvers) { auto addr4 = Network::Utility::parseInternetAddressAndPort("127.0.0.1:54"); char addr6str[INET6_ADDRSTRLEN]; auto addr6 = Network::Utility::parseInternetAddressAndPort("[::1]:54"); - auto resolver = dispatcher_->createDnsResolver({addr4, addr6}, false); + auto resolver = dispatcher_->createDnsResolver({addr4, addr6}, dns_resolver_options_); auto peer = std::make_unique(dynamic_cast(resolver.get())); ares_addr_port_node* resolvers; int result = ares_get_servers_ports(peer->channel(), &resolvers); @@ -408,7 +409,7 @@ class CustomInstance : public Address::Instance { TEST_F(DnsImplConstructor, SupportCustomAddressInstances) { auto test_instance(std::make_shared("127.0.0.1", 45)); EXPECT_EQ(test_instance->asString(), "127.0.0.1:borked_port_45"); - auto resolver = dispatcher_->createDnsResolver({test_instance}, false); + auto resolver = dispatcher_->createDnsResolver({test_instance}, dns_resolver_options_); auto peer = std::make_unique(dynamic_cast(resolver.get())); ares_addr_port_node* resolvers; int result = ares_get_servers_ports(peer->channel(), &resolvers); @@ -424,8 +425,8 @@ TEST_F(DnsImplConstructor, BadCustomResolvers) { envoy::config::core::v3::Address pipe_address; pipe_address.mutable_pipe()->set_path("foo"); auto pipe_instance = Network::Utility::protobufAddressToAddress(pipe_address); - EXPECT_THROW_WITH_MESSAGE(dispatcher_->createDnsResolver({pipe_instance}, false), EnvoyException, - "DNS resolver 'foo' is not an IP address"); + EXPECT_THROW_WITH_MESSAGE(dispatcher_->createDnsResolver({pipe_instance}, dns_resolver_options_), + EnvoyException, "DNS resolver 'foo' is not an IP address"); } class DnsImplTest : public testing::TestWithParam { @@ -439,12 +440,12 @@ class DnsImplTest : public testing::TestWithParam { socket_ = std::make_shared( Network::Test::getCanonicalLoopbackAddress(GetParam()), nullptr, true); listener_ = dispatcher_->createListener(socket_, *server_, true, ENVOY_TCP_BACKLOG_SIZE); - + updateDnsResolverOptions(); if (setResolverInConstructor()) { resolver_ = dispatcher_->createDnsResolver({socket_->addressProvider().localAddress()}, - useTcpForDnsLookups()); + dns_resolver_options_); } else { - resolver_ = dispatcher_->createDnsResolver({}, useTcpForDnsLookups()); + resolver_ = dispatcher_->createDnsResolver({}, dns_resolver_options_); } // Point c-ares at the listener with no search domains and TCP-only. @@ -547,7 +548,7 @@ class DnsImplTest : public testing::TestWithParam { // Should the DnsResolverImpl use a zero timeout for c-ares queries? virtual bool zeroTimeout() const { return false; } virtual bool tcpOnly() const { return true; } - virtual bool useTcpForDnsLookups() const { return false; } + virtual void updateDnsResolverOptions(){}; virtual bool setResolverInConstructor() const { return false; } std::unique_ptr server_; std::unique_ptr peer_; @@ -556,6 +557,7 @@ class DnsImplTest : public testing::TestWithParam { Api::ApiPtr api_; Event::DispatcherPtr dispatcher_; DnsResolverSharedPtr resolver_; + envoy::config::core::v3::DnsResolverOptions dns_resolver_options_; }; // Parameterize the DNS test server socket address. @@ -876,7 +878,7 @@ TEST_P(DnsImplTest, PendingTimerEnable) { Event::MockDispatcher dispatcher; Event::MockTimer* timer = new NiceMock(); EXPECT_CALL(dispatcher, createTimer_(_)).WillOnce(Return(timer)); - resolver_ = std::make_shared(dispatcher, vec, false); + resolver_ = std::make_shared(dispatcher, vec, dns_resolver_options_); Event::FileEvent* file_event = new NiceMock(); EXPECT_CALL(dispatcher, createFileEvent_(_, _, _, _)).WillOnce(Return(file_event)); EXPECT_CALL(*timer, enableTimer(_, _)); @@ -907,7 +909,9 @@ TEST_P(DnsImplZeroTimeoutTest, Timeout) { class DnsImplAresFlagsForTcpTest : public DnsImplTest { protected: bool tcpOnly() const override { return false; } - bool useTcpForDnsLookups() const override { return true; } + void updateDnsResolverOptions() override { + dns_resolver_options_.set_use_tcp_for_dns_lookups(true); + } }; // Parameterize the DNS test server socket address. @@ -918,14 +922,41 @@ INSTANTIATE_TEST_SUITE_P(IpVersions, DnsImplAresFlagsForTcpTest, // Validate that c_ares flag `ARES_FLAG_USEVC` is set when boolean property // `use_tcp_for_dns_lookups` is enabled. TEST_P(DnsImplAresFlagsForTcpTest, TcpLookupsEnabled) { - server_->addCName("root.cnam.domain", "result.cname.domain"); + server_->addCName("root.cname.domain", "result.cname.domain"); server_->addHosts("result.cname.domain", {"201.134.56.7"}, RecordType::A); ares_options opts{}; int optmask = 0; EXPECT_EQ(ARES_SUCCESS, ares_save_options(peer_->channel(), &opts, &optmask)); EXPECT_TRUE((opts.flags & ARES_FLAG_USEVC) == ARES_FLAG_USEVC); EXPECT_NE(nullptr, - resolveWithUnreferencedParameters("root.cnam.domain", DnsLookupFamily::Auto, true)); + resolveWithUnreferencedParameters("root.cname.domain", DnsLookupFamily::Auto, true)); + ares_destroy_options(&opts); +} + +class DnsImplAresFlagsForNoDefaultSearchDomainTest : public DnsImplTest { +protected: + bool tcpOnly() const override { return false; } + void updateDnsResolverOptions() override { + dns_resolver_options_.set_no_default_search_domain(true); + } +}; + +// Parameterize the DNS test server socket address. +INSTANTIATE_TEST_SUITE_P(IpVersions, DnsImplAresFlagsForNoDefaultSearchDomainTest, + testing::ValuesIn(TestEnvironment::getIpVersionsForTest()), + TestUtility::ipTestParamsToString); + +// Validate that c_ares flag `ARES_FLAG_NOSEARCH` is set when boolean property +// `no_default_search_domain` is enabled. +TEST_P(DnsImplAresFlagsForNoDefaultSearchDomainTest, NoDefaultSearchDomainSet) { + server_->addCName("root.cname.domain", "result.cname.domain"); + server_->addHosts("result.cname.domain", {"201.134.56.7"}, RecordType::A); + ares_options opts{}; + int optmask = 0; + EXPECT_EQ(ARES_SUCCESS, ares_save_options(peer_->channel(), &opts, &optmask)); + EXPECT_TRUE((opts.flags & ARES_FLAG_NOSEARCH) == ARES_FLAG_NOSEARCH); + EXPECT_NE(nullptr, + resolveWithUnreferencedParameters("root.cname.domain", DnsLookupFamily::Auto, true)); ares_destroy_options(&opts); } @@ -942,20 +973,47 @@ INSTANTIATE_TEST_SUITE_P(IpVersions, DnsImplAresFlagsForUdpTest, // Validate that c_ares flag `ARES_FLAG_USEVC` is not set when boolean property // `use_tcp_for_dns_lookups` is disabled. TEST_P(DnsImplAresFlagsForUdpTest, UdpLookupsEnabled) { - server_->addCName("root.cnam.domain", "result.cname.domain"); + server_->addCName("root.cname.domain", "result.cname.domain"); server_->addHosts("result.cname.domain", {"201.134.56.7"}, RecordType::A); ares_options opts{}; int optmask = 0; EXPECT_EQ(ARES_SUCCESS, ares_save_options(peer_->channel(), &opts, &optmask)); EXPECT_FALSE((opts.flags & ARES_FLAG_USEVC) == ARES_FLAG_USEVC); EXPECT_NE(nullptr, - resolveWithUnreferencedParameters("root.cnam.domain", DnsLookupFamily::Auto, true)); + resolveWithUnreferencedParameters("root.cname.domain", DnsLookupFamily::Auto, true)); + ares_destroy_options(&opts); +} + +class DnsImplAresFlagsForDefaultSearchDomainTest : public DnsImplTest { +protected: + bool tcpOnly() const override { return false; } + void updateDnsResolverOptions() override {} +}; + +// Parameterize the DNS test server socket address. +INSTANTIATE_TEST_SUITE_P(IpVersions, DnsImplAresFlagsForDefaultSearchDomainTest, + testing::ValuesIn(TestEnvironment::getIpVersionsForTest()), + TestUtility::ipTestParamsToString); + +// Validate that c_ares flag `ARES_FLAG_NOSEARCH` is not set when boolean property +// `no_default_search_domain` is disabled. +TEST_P(DnsImplAresFlagsForDefaultSearchDomainTest, NoDefaultSearchDomainNotSet) { + server_->addCName("root.cname.domain", "result.cname.domain"); + server_->addHosts("result.cname.domain", {"201.134.56.7"}, RecordType::A); + ares_options opts{}; + int optmask = 0; + EXPECT_EQ(ARES_SUCCESS, ares_save_options(peer_->channel(), &opts, &optmask)); + EXPECT_FALSE((opts.flags & ARES_FLAG_NOSEARCH) == ARES_FLAG_NOSEARCH); + EXPECT_NE(nullptr, + resolveWithUnreferencedParameters("root.cname.domain", DnsLookupFamily::Auto, true)); ares_destroy_options(&opts); } class DnsImplCustomResolverTest : public DnsImplTest { bool tcpOnly() const override { return false; } - bool useTcpForDnsLookups() const override { return true; } + void updateDnsResolverOptions() override { + dns_resolver_options_.set_use_tcp_for_dns_lookups(true); + } bool setResolverInConstructor() const override { return true; } }; diff --git a/test/common/network/filter_manager_impl_test.cc b/test/common/network/filter_manager_impl_test.cc index 34c7e407d2030..4016b3ae82a4d 100644 --- a/test/common/network/filter_manager_impl_test.cc +++ b/test/common/network/filter_manager_impl_test.cc @@ -4,12 +4,11 @@ #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.h" #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/filter_manager_impl.h" -#include "common/tcp_proxy/tcp_proxy.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/filters/network/ratelimit/ratelimit.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/filter_manager_impl.h" +#include "source/common/tcp_proxy/tcp_proxy.h" +#include "source/common/upstream/upstream_impl.h" +#include "source/extensions/filters/network/ratelimit/ratelimit.h" #include "test/common/upstream/utility.h" #include "test/extensions/filters/common/ratelimit/mocks.h" @@ -416,7 +415,7 @@ stat_prefix: name EXPECT_EQ(manager.initializeReadFilters(), true); EXPECT_CALL(factory_context.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(Return(&conn_pool)); + .WillOnce(Return(Upstream::TcpPoolData([]() {}, &conn_pool))); request_callbacks->complete(Extensions::Filters::Common::RateLimit::LimitStatus::OK, nullptr, nullptr, nullptr, "", nullptr); diff --git a/test/common/network/filter_matcher_test.cc b/test/common/network/filter_matcher_test.cc index 0039642c0cba4..30208c83dc79b 100644 --- a/test/common/network/filter_matcher_test.cc +++ b/test/common/network/filter_matcher_test.cc @@ -1,5 +1,5 @@ -#include "common/network/address_impl.h" -#include "common/network/filter_matcher.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/filter_matcher.h" #include "test/mocks/network/mocks.h" diff --git a/test/common/network/io_socket_handle_impl_integration_test.cc b/test/common/network/io_socket_handle_impl_integration_test.cc index 93d563999ab8a..31d8ac67de946 100644 --- a/test/common/network/io_socket_handle_impl_integration_test.cc +++ b/test/common/network/io_socket_handle_impl_integration_test.cc @@ -1,5 +1,5 @@ -#include "common/network/address_impl.h" -#include "common/network/listen_socket_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/listen_socket_impl.h" #include "test/test_common/environment.h" diff --git a/test/common/network/io_socket_handle_impl_test.cc b/test/common/network/io_socket_handle_impl_test.cc index 86bdd8df5d189..6ce655b63029a 100644 --- a/test/common/network/io_socket_handle_impl_test.cc +++ b/test/common/network/io_socket_handle_impl_test.cc @@ -1,8 +1,8 @@ -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/network/io_socket_error_impl.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/listen_socket_impl.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/io_socket_error_impl.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/listen_socket_impl.h" #include "test/mocks/api/mocks.h" #include "test/test_common/environment.h" diff --git a/test/common/network/lc_trie_speed_test.cc b/test/common/network/lc_trie_speed_test.cc index 24d52fe0fcaab..7a524fe0f135b 100644 --- a/test/common/network/lc_trie_speed_test.cc +++ b/test/common/network/lc_trie_speed_test.cc @@ -1,5 +1,5 @@ -#include "common/network/lc_trie.h" -#include "common/network/utility.h" +#include "source/common/network/lc_trie.h" +#include "source/common/network/utility.h" #include "benchmark/benchmark.h" diff --git a/test/common/network/lc_trie_test.cc b/test/common/network/lc_trie_test.cc index e0cf9ac43532c..c2da7417c96df 100644 --- a/test/common/network/lc_trie_test.cc +++ b/test/common/network/lc_trie_test.cc @@ -1,9 +1,9 @@ #include -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/network/cidr_range.h" -#include "common/network/lc_trie.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/cidr_range.h" +#include "source/common/network/lc_trie.h" #include "test/test_common/utility.h" diff --git a/test/common/network/listen_socket_impl_test.cc b/test/common/network/listen_socket_impl_test.cc index 789441ca571f8..7e787507020fe 100644 --- a/test/common/network/listen_socket_impl_test.cc +++ b/test/common/network/listen_socket_impl_test.cc @@ -1,12 +1,15 @@ +#include + #include "envoy/common/platform.h" #include "envoy/config/core/v3/base.pb.h" #include "envoy/network/exception.h" #include "envoy/network/socket.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/utility.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/socket_interface_impl.h" +#include "source/common/network/utility.h" #include "test/mocks/network/mocks.h" #include "test/test_common/environment.h" @@ -22,6 +25,18 @@ namespace Envoy { namespace Network { namespace { +class MockSingleFamilySocketInterface : public SocketInterfaceImpl { +public: + explicit MockSingleFamilySocketInterface(Address::IpVersion version) : version_(version) {} + MOCK_METHOD(IoHandlePtr, socket, (Socket::Type, Address::Type, Address::IpVersion, bool), + (const)); + MOCK_METHOD(IoHandlePtr, socket, (Socket::Type, const Address::InstanceConstSharedPtr), (const)); + bool ipFamilySupported(int domain) override { + return (version_ == Address::IpVersion::v4) ? domain == AF_INET : domain == AF_INET6; + } + const Address::IpVersion version_; +}; + TEST(ConnectionSocketImplTest, LowerCaseRequestedServerName) { absl::string_view serverName("www.EXAMPLE.com"); absl::string_view expectedServerName("www.example.com"); @@ -182,6 +197,40 @@ TEST_P(ListenSocketImplTestTcp, CheckIpVersionWithNullLocalAddress) { EXPECT_EQ(Address::IpVersion::v4, socket.ipVersion()); } +TEST_P(ListenSocketImplTestTcp, SupportedIpFamilyVirtualSocketIsCreatedWithNoBsdSocketCreated) { + auto mock_interface = std::make_unique(version_); + auto* mock_interface_ptr = mock_interface.get(); + auto any_address = version_ == Address::IpVersion::v4 ? Utility::getIpv4AnyAddress() + : Utility::getIpv6AnyAddress(); + + StackedScopedInjectableLoader new_interface(std::move(mock_interface)); + + { + EXPECT_CALL(*mock_interface_ptr, socket(_, _)).Times(0); + EXPECT_CALL(*mock_interface_ptr, socket(_, _, _, _)).Times(0); + TcpListenSocket virtual_listener_socket(any_address, nullptr, + /*bind_to_port*/ false); + } +} + +TEST_P(ListenSocketImplTestTcp, DeathAtUnSupportedIpFamilyListenSocket) { + auto mock_interface = std::make_unique(version_); + auto* mock_interface_ptr = mock_interface.get(); + auto the_other_address = version_ == Address::IpVersion::v4 ? Utility::getIpv6AnyAddress() + : Utility::getIpv4AnyAddress(); + StackedScopedInjectableLoader new_interface(std::move(mock_interface)); + { + EXPECT_CALL(*mock_interface_ptr, socket(_, _)).Times(0); + EXPECT_CALL(*mock_interface_ptr, socket(_, _, _, _)).Times(0); + EXPECT_DEATH( + { + TcpListenSocket virtual_listener_socket(the_other_address, nullptr, + /*bind_to_port*/ false); + }, + ".*"); + } +} + TEST_P(ListenSocketImplTestUdp, BindSpecificPort) { testBindSpecificPort(); } // Validate that we get port allocation when binding to port zero. diff --git a/test/common/network/listener_impl_test.cc b/test/common/network/listener_impl_test.cc index cea2b1ed13f01..15deae2a43210 100644 --- a/test/common/network/listener_impl_test.cc +++ b/test/common/network/listener_impl_test.cc @@ -3,10 +3,10 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/network/exception.h" -#include "common/network/address_impl.h" -#include "common/network/tcp_listener_impl.h" -#include "common/network/utility.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/tcp_listener_impl.h" +#include "source/common/network/utility.h" +#include "source/common/stream_info/stream_info_impl.h" #include "test/common/network/listener_impl_test_base.h" #include "test/mocks/network/mocks.h" diff --git a/test/common/network/listener_impl_test_base.h b/test/common/network/listener_impl_test_base.h index 8f3ee21b87278..a00ae01b67b54 100644 --- a/test/common/network/listener_impl_test_base.h +++ b/test/common/network/listener_impl_test_base.h @@ -1,8 +1,8 @@ #pragma once -#include "common/event/dispatcher_impl.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" #include "test/test_common/network_utility.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/common/network/raw_buffer_socket_test.cc b/test/common/network/raw_buffer_socket_test.cc index f28e54f53bc98..4304277b1b2d8 100644 --- a/test/common/network/raw_buffer_socket_test.cc +++ b/test/common/network/raw_buffer_socket_test.cc @@ -1,4 +1,4 @@ -#include "common/network/raw_buffer_socket.h" +#include "source/common/network/raw_buffer_socket.h" #include "test/test_common/network_utility.h" diff --git a/test/common/network/resolver_impl_test.cc b/test/common/network/resolver_impl_test.cc index c9d9b3fce9019..77b0ec2583148 100644 --- a/test/common/network/resolver_impl_test.cc +++ b/test/common/network/resolver_impl_test.cc @@ -7,9 +7,9 @@ #include "envoy/network/resolver.h" #include "envoy/registry/registry.h" -#include "common/common/thread.h" -#include "common/network/address_impl.h" -#include "common/network/resolver_impl.h" +#include "source/common/common/thread.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/resolver_impl.h" #include "test/mocks/network/mocks.h" #include "test/test_common/environment.h" diff --git a/test/common/network/socket_option_factory_test.cc b/test/common/network/socket_option_factory_test.cc index 30ee22cd15c15..a32fae30b85a7 100644 --- a/test/common/network/socket_option_factory_test.cc +++ b/test/common/network/socket_option_factory_test.cc @@ -1,8 +1,8 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/network/address_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/socket_option_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/socket_option_impl.h" #include "test/mocks/api/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/common/network/socket_option_test.h b/test/common/network/socket_option_test.h index e780c3e2ec2a3..c2a60bc1bf372 100644 --- a/test/common/network/socket_option_test.h +++ b/test/common/network/socket_option_test.h @@ -2,9 +2,9 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/network/address_impl.h" -#include "common/network/socket_option_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_option_impl.h" #include "test/mocks/api/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/common/network/transport_socket_options_impl_test.cc b/test/common/network/transport_socket_options_impl_test.cc index 213c6778b0373..8bf0b4bd2f164 100644 --- a/test/common/network/transport_socket_options_impl_test.cc +++ b/test/common/network/transport_socket_options_impl_test.cc @@ -1,10 +1,10 @@ -#include "common/http/utility.h" -#include "common/network/address_impl.h" -#include "common/network/application_protocol.h" -#include "common/network/proxy_protocol_filter_state.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/network/upstream_server_name.h" -#include "common/stream_info/filter_state_impl.h" +#include "source/common/http/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/application_protocol.h" +#include "source/common/network/proxy_protocol_filter_state.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/network/upstream_server_name.h" +#include "source/common/stream_info/filter_state_impl.h" #include "gtest/gtest.h" diff --git a/test/common/network/udp_fuzz.cc b/test/common/network/udp_fuzz.cc index ca1d2d41c3be5..f1768976306fc 100644 --- a/test/common/network/udp_fuzz.cc +++ b/test/common/network/udp_fuzz.cc @@ -2,13 +2,13 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/network/address_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/socket_option_impl.h" -#include "common/network/udp_listener_impl.h" -#include "common/network/udp_packet_writer_handler_impl.h" -#include "common/network/utility.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/udp_listener_impl.h" +#include "source/common/network/udp_packet_writer_handler_impl.h" +#include "source/common/network/utility.h" #include "test/common/network/udp_listener_impl_test_base.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/network/udp_listener_impl_batch_writer_test.cc b/test/common/network/udp_listener_impl_batch_writer_test.cc index f69c3146a9654..43197a66ecc27 100644 --- a/test/common/network/udp_listener_impl_batch_writer_test.cc +++ b/test/common/network/udp_listener_impl_batch_writer_test.cc @@ -21,13 +21,13 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/network/address_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/socket_option_impl.h" -#include "common/network/udp_listener_impl.h" -#include "common/network/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/udp_listener_impl.h" +#include "source/common/network/utility.h" -#include "common/quic/udp_gso_batch_writer.h" +#include "source/common/quic/udp_gso_batch_writer.h" #include "test/common/network/udp_listener_impl_test_base.h" #include "test/mocks/api/mocks.h" diff --git a/test/common/network/udp_listener_impl_test.cc b/test/common/network/udp_listener_impl_test.cc index 1ac4dcb2936f5..5cdfa54c831ca 100644 --- a/test/common/network/udp_listener_impl_test.cc +++ b/test/common/network/udp_listener_impl_test.cc @@ -6,13 +6,13 @@ #include "envoy/api/os_sys_calls.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/network/address_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/socket_option_impl.h" -#include "common/network/udp_listener_impl.h" -#include "common/network/udp_packet_writer_handler_impl.h" -#include "common/network/utility.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/udp_listener_impl.h" +#include "source/common/network/udp_packet_writer_handler_impl.h" +#include "source/common/network/utility.h" #include "test/common/network/udp_listener_impl_test_base.h" #include "test/mocks/api/mocks.h" diff --git a/test/common/network/udp_listener_impl_test_base.h b/test/common/network/udp_listener_impl_test_base.h index 671a30b563709..527018259cfa4 100644 --- a/test/common/network/udp_listener_impl_test_base.h +++ b/test/common/network/udp_listener_impl_test_base.h @@ -7,12 +7,12 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/network/address_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/socket_option_impl.h" -#include "common/network/udp_listener_impl.h" -#include "common/network/udp_packet_writer_handler_impl.h" -#include "common/network/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/udp_listener_impl.h" +#include "source/common/network/udp_packet_writer_handler_impl.h" +#include "source/common/network/utility.h" #include "test/common/network/listener_impl_test_base.h" #include "test/mocks/api/mocks.h" diff --git a/test/common/network/utility_fuzz_test.cc b/test/common/network/utility_fuzz_test.cc index 8d49667a24e0e..1302614c7a8fb 100644 --- a/test/common/network/utility_fuzz_test.cc +++ b/test/common/network/utility_fuzz_test.cc @@ -1,7 +1,7 @@ #include "envoy/config/core/v3/address.pb.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/network/utility_test.cc b/test/common/network/utility_test.cc index 45c196f56314a..33b3eb8490858 100644 --- a/test/common/network/utility_test.cc +++ b/test/common/network/utility_test.cc @@ -6,9 +6,9 @@ #include "envoy/common/exception.h" #include "envoy/config/core/v3/address.pb.h" -#include "common/common/thread.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" +#include "source/common/common/thread.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" #include "test/mocks/api/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/common/network/win32_redirect_records_option_test.cc b/test/common/network/win32_redirect_records_option_test.cc index 643cfd4fab328..405e7df3a9361 100644 --- a/test/common/network/win32_redirect_records_option_test.cc +++ b/test/common/network/win32_redirect_records_option_test.cc @@ -1,8 +1,8 @@ -#include "common/common/scalar_to_byte_vector.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/socket_interface.h" -#include "common/network/utility.h" -#include "common/network/win32_redirect_records_option_impl.h" +#include "source/common/common/scalar_to_byte_vector.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/socket_interface.h" +#include "source/common/network/utility.h" +#include "source/common/network/win32_redirect_records_option_impl.h" #include "test/common/network/socket_option_test.h" diff --git a/test/common/protobuf/message_validator_impl_test.cc b/test/common/protobuf/message_validator_impl_test.cc index d558799cc4406..73dd2dbcba6b9 100644 --- a/test/common/protobuf/message_validator_impl_test.cc +++ b/test/common/protobuf/message_validator_impl_test.cc @@ -1,7 +1,7 @@ #include "envoy/common/exception.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/test_common/logging.h" diff --git a/test/common/protobuf/utility_test.cc b/test/common/protobuf/utility_test.cc index 45983670a0035..92480788872d5 100644 --- a/test/common/protobuf/utility_test.cc +++ b/test/common/protobuf/utility_test.cc @@ -14,12 +14,12 @@ #include "envoy/extensions/health_checkers/redis/v3/redis.pb.validate.h" #include "envoy/type/v3/percent.pb.h" -#include "common/common/base64.h" -#include "common/config/api_version.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_impl.h" +#include "source/common/common/base64.h" +#include "source/common/config/api_version.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/init/mocks.h" diff --git a/test/common/protobuf/value_util_fuzz_test.cc b/test/common/protobuf/value_util_fuzz_test.cc index fec766f9e505f..1999427d5ca9a 100644 --- a/test/common/protobuf/value_util_fuzz_test.cc +++ b/test/common/protobuf/value_util_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/quic/BUILD b/test/common/quic/BUILD index 9f432b55c200a..03d1e625d5e10 100644 --- a/test/common/quic/BUILD +++ b/test/common/quic/BUILD @@ -54,6 +54,18 @@ envoy_cc_test( ], ) +envoy_cc_test( + name = "quic_stat_names_test", + srcs = ["quic_stat_names_test.cc"], + tags = ["nofips"], + deps = [ + "//source/common/quic:quic_stat_names_lib", + "//source/common/stats:stats_lib", + "//test/mocks/stats:stats_mocks", + "//test/test_common:utility_lib", + ], +) + envoy_cc_test( name = "envoy_quic_session_cache_test", srcs = ["envoy_quic_session_cache_test.cc"], @@ -129,7 +141,7 @@ envoy_cc_test( ":quic_test_utils_for_envoy_lib", ":test_proof_source_lib", ":test_utils_lib", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_macros", "//source/common/quic:codec_lib", "//source/common/quic:envoy_quic_alarm_factory_lib", "//source/common/quic:envoy_quic_connection_helper_lib", @@ -157,7 +169,7 @@ envoy_cc_test( deps = [ ":quic_test_utils_for_envoy_lib", ":test_utils_lib", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_macros", "//source/common/quic:codec_lib", "//source/common/quic:envoy_quic_alarm_factory_lib", "//source/common/quic:envoy_quic_client_connection_lib", @@ -202,7 +214,7 @@ envoy_cc_test( ":quic_test_utils_for_envoy_lib", ":test_proof_source_lib", ":test_utils_lib", - "//include/envoy/stats:stats_macros", + "//envoy/stats:stats_macros", "//source/common/quic:envoy_quic_alarm_factory_lib", "//source/common/quic:envoy_quic_connection_helper_lib", "//source/common/quic:envoy_quic_dispatcher_lib", diff --git a/test/common/quic/active_quic_listener_test.cc b/test/common/quic/active_quic_listener_test.cc index ffb12a05b56bf..37599ed769dbc 100644 --- a/test/common/quic/active_quic_listener_test.cc +++ b/test/common/quic/active_quic_listener_test.cc @@ -20,14 +20,14 @@ #pragma GCC diagnostic pop #endif -#include "server/configuration_impl.h" -#include "common/common/logger.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/udp_packet_writer_handler_impl.h" -#include "common/runtime/runtime_impl.h" -#include "common/quic/active_quic_listener.h" -#include "common/http/utility.h" +#include "source/server/configuration_impl.h" +#include "source/common/common/logger.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/udp_packet_writer_handler_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/quic/active_quic_listener.h" +#include "source/common/http/utility.h" #include "test/common/quic/test_utils.h" #include "test/common/quic/test_proof_source.h" #include "test/test_common/simulated_time_system.h" @@ -40,9 +40,9 @@ #include "absl/time/time.h" #include "gtest/gtest.h" #include "gmock/gmock.h" -#include "common/quic/platform/envoy_quic_clock.h" -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/udp_gso_batch_writer.h" +#include "source/common/quic/platform/envoy_quic_clock.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/udp_gso_batch_writer.h" using testing::Return; using testing::ReturnRef; @@ -87,7 +87,8 @@ class ActiveQuicListenerTest : public QuicMultiVersionTest { bool use_http3 = GetParam().second == QuicVersionType::Iquic; SetQuicReloadableFlag(quic_disable_version_draft_29, !use_http3); return quic::CurrentSupportedVersions(); - }()[0]) {} + }()[0]), + quic_stat_names_(listener_config_.listenerScope().symbolTable()) {} template std::unique_ptr staticUniquePointerCast(std::unique_ptr&& source) { @@ -155,7 +156,8 @@ class ActiveQuicListenerTest : public QuicMultiVersionTest { Network::ActiveUdpListenerFactoryPtr createQuicListenerFactory(const std::string& yaml) { envoy::config::listener::v3::QuicProtocolOptions options; TestUtility::loadFromYamlAndValidate(yaml, options); - return std::make_unique(options, /*concurrency=*/1); + return std::make_unique(options, /*concurrency=*/1, + quic_stat_names_); } void maybeConfigureMocks(int connection_count) { @@ -311,6 +313,7 @@ class ActiveQuicListenerTest : public QuicMultiVersionTest { quic::ParsedQuicVersion quic_version_; uint32_t connection_window_size_{1024u}; uint32_t stream_window_size_{1024u}; + QuicStatNames quic_stat_names_; }; INSTANTIATE_TEST_SUITE_P(ActiveQuicListenerTests, ActiveQuicListenerTest, @@ -329,7 +332,7 @@ TEST_P(ActiveQuicListenerTest, FailSocketOptionUponCreation) { listener_config_, quic_config_, options, false, ActiveQuicListenerFactoryPeer::runtimeEnabled( static_cast(listener_factory_.get())), - 32u), + quic_stat_names_, 32u), Network::CreateListenerException, "Failed to apply socket options."); } diff --git a/test/common/quic/client_connection_factory_impl_test.cc b/test/common/quic/client_connection_factory_impl_test.cc index b7d26e2e2f40c..ed2eabe9b5fdf 100644 --- a/test/common/quic/client_connection_factory_impl_test.cc +++ b/test/common/quic/client_connection_factory_impl_test.cc @@ -1,5 +1,5 @@ -#include "common/quic/client_connection_factory_impl.h" -#include "common/quic/quic_transport_socket_factory.h" +#include "source/common/quic/client_connection_factory_impl.h" +#include "source/common/quic/quic_transport_socket_factory.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" @@ -8,6 +8,8 @@ #include "test/mocks/ssl/mocks.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/host.h" +#include "test/test_common/environment.h" +#include "test/test_common/network_utility.h" #include "test/test_common/simulated_time_system.h" using testing::Return; @@ -18,6 +20,10 @@ namespace Quic { class QuicNetworkConnectionTest : public Event::TestUsingSimulatedTime, public testing::Test { protected: void initialize() { + test_address_ = Network::Utility::resolveUrl(absl::StrCat( + "tcp://", + Network::Test::getLoopbackAddressString(TestEnvironment::getIpVersionsForTest()[0]), + ":30")); Ssl::ClientContextSharedPtr context{new Ssl::MockClientContext()}; EXPECT_CALL(context_.context_manager_, createSslClientContext(_, _, _)) .WillOnce(Return(context)); @@ -36,8 +42,7 @@ class QuicNetworkConnectionTest : public Event::TestUsingSimulatedTime, public t Upstream::HostSharedPtr host_{new NiceMock}; NiceMock random_; Upstream::ClusterConnectivityState state_; - Network::Address::InstanceConstSharedPtr test_address_ = - Network::Utility::resolveUrl("tcp://127.0.0.1:3000"); + Network::Address::InstanceConstSharedPtr test_address_; NiceMock context_; std::unique_ptr factory_; }; diff --git a/test/common/quic/envoy_quic_alarm_test.cc b/test/common/quic/envoy_quic_alarm_test.cc index 53fe6108bc5b4..f90f8eb2a4e69 100644 --- a/test/common/quic/envoy_quic_alarm_test.cc +++ b/test/common/quic/envoy_quic_alarm_test.cc @@ -1,6 +1,6 @@ -#include "common/quic/envoy_quic_alarm.h" -#include "common/quic/envoy_quic_alarm_factory.h" -#include "common/quic/platform/envoy_quic_clock.h" +#include "source/common/quic/envoy_quic_alarm.h" +#include "source/common/quic/envoy_quic_alarm_factory.h" +#include "source/common/quic/platform/envoy_quic_clock.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/utility.h" diff --git a/test/common/quic/envoy_quic_client_session_test.cc b/test/common/quic/envoy_quic_client_session_test.cc index fbcc51df8c5c5..cca2f306f0610 100644 --- a/test/common/quic/envoy_quic_client_session_test.cc +++ b/test/common/quic/envoy_quic_client_session_test.cc @@ -12,12 +12,12 @@ #pragma GCC diagnostic pop #endif -#include "common/quic/envoy_quic_client_session.h" -#include "common/quic/envoy_quic_client_connection.h" -#include "common/quic/codec_impl.h" -#include "common/quic/envoy_quic_connection_helper.h" -#include "common/quic/envoy_quic_alarm_factory.h" -#include "common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_client_session.h" +#include "source/common/quic/envoy_quic_client_connection.h" +#include "source/common/quic/codec_impl.h" +#include "source/common/quic/envoy_quic_connection_helper.h" +#include "source/common/quic/envoy_quic_alarm_factory.h" +#include "source/common/quic/envoy_quic_utils.h" #include "test/common/quic/test_utils.h" #include "envoy/stats/stats_macros.h" diff --git a/test/common/quic/envoy_quic_client_stream_test.cc b/test/common/quic/envoy_quic_client_stream_test.cc index 23b3f8aa8d774..47046ddd1d85b 100644 --- a/test/common/quic/envoy_quic_client_stream_test.cc +++ b/test/common/quic/envoy_quic_client_stream_test.cc @@ -1,8 +1,8 @@ -#include "common/quic/envoy_quic_alarm_factory.h" -#include "common/quic/envoy_quic_client_connection.h" -#include "common/quic/envoy_quic_client_stream.h" -#include "common/quic/envoy_quic_connection_helper.h" -#include "common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_alarm_factory.h" +#include "source/common/quic/envoy_quic_client_connection.h" +#include "source/common/quic/envoy_quic_client_stream.h" +#include "source/common/quic/envoy_quic_connection_helper.h" +#include "source/common/quic/envoy_quic_utils.h" #include "test/common/quic/test_utils.h" #include "test/mocks/http/mocks.h" diff --git a/test/common/quic/envoy_quic_dispatcher_test.cc b/test/common/quic/envoy_quic_dispatcher_test.cc index f46bac22788c2..43e0aba25394a 100644 --- a/test/common/quic/envoy_quic_dispatcher_test.cc +++ b/test/common/quic/envoy_quic_dispatcher_test.cc @@ -18,22 +18,22 @@ #include -#include "common/quic/envoy_quic_connection_helper.h" -#include "common/network/listen_socket_impl.h" +#include "source/common/quic/envoy_quic_connection_helper.h" +#include "source/common/network/listen_socket_impl.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/environment.h" #include "test/mocks/network/mocks.h" #include "test/test_common/utility.h" #include "test/test_common/network_utility.h" -#include "common/quic/platform/envoy_quic_clock.h" -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/envoy_quic_dispatcher.h" -#include "common/quic/envoy_quic_server_session.h" +#include "source/common/quic/platform/envoy_quic_clock.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_dispatcher.h" +#include "source/common/quic/envoy_quic_server_session.h" #include "test/common/quic/test_proof_source.h" #include "test/common/quic/test_utils.h" -#include "common/quic/envoy_quic_alarm_factory.h" -#include "common/quic/envoy_quic_utils.h" -#include "server/configuration_impl.h" +#include "source/common/quic/envoy_quic_alarm_factory.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/server/configuration_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -76,13 +76,14 @@ class EnvoyQuicDispatcherTest : public QuicMultiVersionTest, per_worker_stats_({ALL_PER_HANDLER_LISTENER_STATS( POOL_COUNTER_PREFIX(listener_config_.listenerScope(), "worker."), POOL_GAUGE_PREFIX(listener_config_.listenerScope(), "worker."))}), + quic_stat_names_(listener_config_.listenerScope().symbolTable()), connection_handler_(*dispatcher_, absl::nullopt), envoy_quic_dispatcher_( &crypto_config_, quic_config_, &version_manager_, std::make_unique(*dispatcher_), std::make_unique(*dispatcher_, *connection_helper_.GetClock()), quic::kQuicDefaultConnectionIdLength, connection_handler_, listener_config_, - listener_stats_, per_worker_stats_, *dispatcher_, *listen_socket_), + listener_stats_, per_worker_stats_, *dispatcher_, *listen_socket_, quic_stat_names_), connection_id_(quic::test::TestConnectionId(1)) { auto writer = new testing::NiceMock(); envoy_quic_dispatcher_.InitializeWithWriter(writer); @@ -252,6 +253,7 @@ class EnvoyQuicDispatcherTest : public QuicMultiVersionTest, testing::NiceMock listener_config_; Server::ListenerStats listener_stats_; Server::PerHandlerListenerStats per_worker_stats_; + QuicStatNames quic_stat_names_; Server::ConnectionHandlerImpl connection_handler_; EnvoyQuicDispatcher envoy_quic_dispatcher_; const quic::QuicConnectionId connection_id_; diff --git a/test/common/quic/envoy_quic_proof_source_test.cc b/test/common/quic/envoy_quic_proof_source_test.cc index 960d385d2b2f7..30837b4fddc05 100644 --- a/test/common/quic/envoy_quic_proof_source_test.cc +++ b/test/common/quic/envoy_quic_proof_source_test.cc @@ -2,11 +2,10 @@ #include #include -#include "common/quic/envoy_quic_proof_source.h" -#include "common/quic/envoy_quic_proof_verifier.h" -#include "common/quic/envoy_quic_utils.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" +#include "source/common/quic/envoy_quic_proof_source.h" +#include "source/common/quic/envoy_quic_proof_verifier.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" #include "test/mocks/network/mocks.h" #include "test/mocks/ssl/mocks.h" diff --git a/test/common/quic/envoy_quic_proof_verifier_test.cc b/test/common/quic/envoy_quic_proof_verifier_test.cc index 6b42341fa685d..49dd9696e2fb8 100644 --- a/test/common/quic/envoy_quic_proof_verifier_test.cc +++ b/test/common/quic/envoy_quic_proof_verifier_test.cc @@ -1,9 +1,8 @@ #include #include -#include "common/quic/envoy_quic_proof_verifier.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" +#include "source/common/quic/envoy_quic_proof_verifier.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/stats/mocks.h" diff --git a/test/common/quic/envoy_quic_server_session_test.cc b/test/common/quic/envoy_quic_server_session_test.cc index 6f13cf9359b0c..211145b465f6a 100644 --- a/test/common/quic/envoy_quic_server_session_test.cc +++ b/test/common/quic/envoy_quic_server_session_test.cc @@ -21,19 +21,19 @@ #include -#include "common/quic/envoy_quic_server_session.h" -#include "common/quic/envoy_quic_server_stream.h" -#include "common/quic/envoy_quic_server_connection.h" -#include "common/quic/codec_impl.h" -#include "common/quic/envoy_quic_connection_helper.h" -#include "common/quic/envoy_quic_alarm_factory.h" -#include "common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_server_session.h" +#include "source/common/quic/envoy_quic_server_stream.h" +#include "source/common/quic/envoy_quic_server_connection.h" +#include "source/common/quic/codec_impl.h" +#include "source/common/quic/envoy_quic_connection_helper.h" +#include "source/common/quic/envoy_quic_alarm_factory.h" +#include "source/common/quic/envoy_quic_utils.h" #include "test/common/quic/test_proof_source.h" #include "test/common/quic/test_utils.h" #include "envoy/stats/stats_macros.h" -#include "common/event/libevent_scheduler.h" -#include "server/configuration_impl.h" +#include "source/common/event/libevent_scheduler.h" +#include "source/server/configuration_impl.h" #include "test/mocks/event/mocks.h" #include "test/mocks/http/stream_decoder.h" #include "test/mocks/http/mocks.h" diff --git a/test/common/quic/envoy_quic_server_stream_test.cc b/test/common/quic/envoy_quic_server_stream_test.cc index 31738861bbd2c..70a7e075fb5ad 100644 --- a/test/common/quic/envoy_quic_server_stream_test.cc +++ b/test/common/quic/envoy_quic_server_stream_test.cc @@ -14,15 +14,15 @@ #pragma GCC diagnostic pop #endif -#include "common/event/libevent_scheduler.h" -#include "common/http/headers.h" -#include "server/active_listener_base.h" - -#include "common/quic/envoy_quic_alarm_factory.h" -#include "common/quic/envoy_quic_connection_helper.h" -#include "common/quic/envoy_quic_server_connection.h" -#include "common/quic/envoy_quic_server_session.h" -#include "common/quic/envoy_quic_server_stream.h" +#include "source/common/event/libevent_scheduler.h" +#include "source/common/http/headers.h" +#include "source/server/active_listener_base.h" + +#include "source/common/quic/envoy_quic_alarm_factory.h" +#include "source/common/quic/envoy_quic_connection_helper.h" +#include "source/common/quic/envoy_quic_server_connection.h" +#include "source/common/quic/envoy_quic_server_session.h" +#include "source/common/quic/envoy_quic_server_stream.h" #include "test/common/quic/test_utils.h" #include "test/mocks/http/mocks.h" diff --git a/test/common/quic/envoy_quic_session_cache_test.cc b/test/common/quic/envoy_quic_session_cache_test.cc index d2129d14cf105..5490b0d491afa 100644 --- a/test/common/quic/envoy_quic_session_cache_test.cc +++ b/test/common/quic/envoy_quic_session_cache_test.cc @@ -1,4 +1,4 @@ -#include "common/quic/envoy_quic_session_cache.h" +#include "source/common/quic/envoy_quic_session_cache.h" #include "absl/strings/escaping.h" #include "gmock/gmock.h" diff --git a/test/common/quic/envoy_quic_simulated_watermark_buffer_test.cc b/test/common/quic/envoy_quic_simulated_watermark_buffer_test.cc index 8ef33da4392cc..431c3de997eed 100644 --- a/test/common/quic/envoy_quic_simulated_watermark_buffer_test.cc +++ b/test/common/quic/envoy_quic_simulated_watermark_buffer_test.cc @@ -1,4 +1,4 @@ -#include "common/quic/envoy_quic_simulated_watermark_buffer.h" +#include "source/common/quic/envoy_quic_simulated_watermark_buffer.h" #include "gtest/gtest.h" diff --git a/test/common/quic/envoy_quic_utils_test.cc b/test/common/quic/envoy_quic_utils_test.cc index 7d032b4253717..20a1dfe989690 100644 --- a/test/common/quic/envoy_quic_utils_test.cc +++ b/test/common/quic/envoy_quic_utils_test.cc @@ -1,4 +1,4 @@ -#include "common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_utils.h" #if defined(__GNUC__) #pragma GCC diagnostic push diff --git a/test/common/quic/envoy_quic_writer_test.cc b/test/common/quic/envoy_quic_writer_test.cc index 87c345962c332..4e8d47cf6a829 100644 --- a/test/common/quic/envoy_quic_writer_test.cc +++ b/test/common/quic/envoy_quic_writer_test.cc @@ -3,10 +3,10 @@ #include #include -#include "common/network/address_impl.h" -#include "common/network/io_socket_error_impl.h" -#include "common/network/udp_packet_writer_handler_impl.h" -#include "common/quic/envoy_quic_packet_writer.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/io_socket_error_impl.h" +#include "source/common/network/udp_packet_writer_handler_impl.h" +#include "source/common/quic/envoy_quic_packet_writer.h" #include "test/mocks/api/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/common/quic/platform/BUILD b/test/common/quic/platform/BUILD index 56d9684c40343..4abda32750b67 100644 --- a/test/common/quic/platform/BUILD +++ b/test/common/quic/platform/BUILD @@ -90,7 +90,7 @@ envoy_cc_test_library( deps = [ ":quic_platform_expect_bug_impl_lib", ":quic_platform_thread_impl_lib", - "//include/envoy/network:address_interface", + "//envoy/network:address_interface", "//source/common/quic/platform:quic_platform_base_impl_lib", "//test/test_common:environment_lib", ], @@ -143,7 +143,7 @@ envoy_cc_test_library( hdrs = ["quic_test_mem_slice_vector_impl.h"], tags = ["nofips"], deps = [ - "//include/envoy/buffer:buffer_interface", + "//envoy/buffer:buffer_interface", "@com_googlesource_quiche//:quic_platform_mem_slice_span", ], ) @@ -166,7 +166,7 @@ envoy_cc_test_library( hdrs = ["quic_thread_impl.h"], tags = ["nofips"], deps = [ - "//include/envoy/thread:thread_interface", + "//envoy/thread:thread_interface", "//source/common/common:assert_lib", "//test/test_common:thread_factory_for_test_lib", ], diff --git a/test/common/quic/platform/envoy_quic_clock_test.cc b/test/common/quic/platform/envoy_quic_clock_test.cc index 8f5f7da8bb902..cc21b603ec00a 100644 --- a/test/common/quic/platform/envoy_quic_clock_test.cc +++ b/test/common/quic/platform/envoy_quic_clock_test.cc @@ -1,6 +1,6 @@ #include -#include "common/quic/platform/envoy_quic_clock.h" +#include "source/common/quic/platform/envoy_quic_clock.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/test_time.h" diff --git a/test/common/quic/platform/epoll_bug_impl.h b/test/common/quic/platform/epoll_bug_impl.h index 82af224c5f3d7..f8620b6f949a9 100644 --- a/test/common/quic/platform/epoll_bug_impl.h +++ b/test/common/quic/platform/epoll_bug_impl.h @@ -6,6 +6,6 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quiche_bug_tracker_impl.h" +#include "source/common/quic/platform/quiche_bug_tracker_impl.h" #define EPOLL_BUG_IMPL QUICHE_BUG_IMPL diff --git a/test/common/quic/platform/epoll_logging_impl.h b/test/common/quic/platform/epoll_logging_impl.h index 6e71f936d8002..60d79a5f37379 100644 --- a/test/common/quic/platform/epoll_logging_impl.h +++ b/test/common/quic/platform/epoll_logging_impl.h @@ -6,7 +6,7 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/quic/platform/quic_logging_impl.h" +#include "source/common/quic/platform/quic_logging_impl.h" namespace epoll_server { diff --git a/test/common/quic/platform/http2_platform_test.cc b/test/common/quic/platform/http2_platform_test.cc index 07d9ba0117624..c25c0e1c0a845 100644 --- a/test/common/quic/platform/http2_platform_test.cc +++ b/test/common/quic/platform/http2_platform_test.cc @@ -7,7 +7,7 @@ #include #include -#include "common/quic/platform/quiche_flags_impl.h" +#include "source/common/quic/platform/quiche_flags_impl.h" #include "test/test_common/logging.h" diff --git a/test/common/quic/platform/quic_mock_log_impl.h b/test/common/quic/platform/quic_mock_log_impl.h index 7af284120362b..10970412086d2 100644 --- a/test/common/quic/platform/quic_mock_log_impl.h +++ b/test/common/quic/platform/quic_mock_log_impl.h @@ -8,7 +8,7 @@ #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "gmock/gmock.h" #include "quiche/quic/platform/api/quic_logging.h" diff --git a/test/common/quic/platform/quic_platform_test.cc b/test/common/quic/platform/quic_platform_test.cc index 22f8f9c21adc4..3a94398280bf0 100644 --- a/test/common/quic/platform/quic_platform_test.cc +++ b/test/common/quic/platform/quic_platform_test.cc @@ -8,10 +8,10 @@ #include -#include "common/memory/stats.h" -#include "common/network/socket_impl.h" -#include "common/network/utility.h" -#include "common/quic/platform/quiche_flags_impl.h" +#include "source/common/memory/stats.h" +#include "source/common/network/socket_impl.h" +#include "source/common/network/utility.h" +#include "source/common/quic/platform/quiche_flags_impl.h" #include "test/common/buffer/utility.h" #include "test/common/quic/platform/quic_epoll_clock.h" diff --git a/test/common/quic/platform/quic_port_utils_impl.cc b/test/common/quic/platform/quic_port_utils_impl.cc index 75f8709fb3930..c67686bcc52f0 100644 --- a/test/common/quic/platform/quic_port_utils_impl.cc +++ b/test/common/quic/platform/quic_port_utils_impl.cc @@ -8,8 +8,8 @@ #include "envoy/network/address.h" -#include "common/common/assert.h" -#include "common/network/utility.h" +#include "source/common/common/assert.h" +#include "source/common/network/utility.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" diff --git a/test/common/quic/platform/quic_test_impl.h b/test/common/quic/platform/quic_test_impl.h index 3782acc9d8fff..8de91ce0e1e39 100644 --- a/test/common/quic/platform/quic_test_impl.h +++ b/test/common/quic/platform/quic_test_impl.h @@ -2,7 +2,7 @@ #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/common/quic/platform/quic_test_mem_slice_vector_impl.h b/test/common/quic/platform/quic_test_mem_slice_vector_impl.h index a2c5595b7bc4e..1f727111d2563 100644 --- a/test/common/quic/platform/quic_test_mem_slice_vector_impl.h +++ b/test/common/quic/platform/quic_test_mem_slice_vector_impl.h @@ -6,8 +6,8 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "common/buffer/buffer_impl.h" -#include "common/quic/platform/quic_mem_slice_span_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/quic/platform/quic_mem_slice_span_impl.h" namespace quic { namespace test { diff --git a/test/common/quic/platform/quic_thread_impl.h b/test/common/quic/platform/quic_thread_impl.h index e2d87917b1c33..0f692cc1e3d98 100644 --- a/test/common/quic/platform/quic_thread_impl.h +++ b/test/common/quic/platform/quic_thread_impl.h @@ -10,7 +10,7 @@ #include "envoy/thread/thread.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "test/test_common/thread_factory_for_test.h" diff --git a/test/common/quic/platform/spdy_platform_test.cc b/test/common/quic/platform/spdy_platform_test.cc index d79e1d86f0ae2..a33572c1a6971 100644 --- a/test/common/quic/platform/spdy_platform_test.cc +++ b/test/common/quic/platform/spdy_platform_test.cc @@ -1,7 +1,7 @@ #include #include -#include "common/quic/platform/quiche_flags_impl.h" +#include "source/common/quic/platform/quiche_flags_impl.h" #include "test/test_common/logging.h" diff --git a/test/common/quic/quic_io_handle_wrapper_test.cc b/test/common/quic/quic_io_handle_wrapper_test.cc index 2ef58610f06f8..899f7903d5892 100644 --- a/test/common/quic/quic_io_handle_wrapper_test.cc +++ b/test/common/quic/quic_io_handle_wrapper_test.cc @@ -3,8 +3,8 @@ #include "envoy/common/platform.h" -#include "common/network/address_impl.h" -#include "common/quic/quic_io_handle_wrapper.h" +#include "source/common/network/address_impl.h" +#include "source/common/quic/quic_io_handle_wrapper.h" #include "test/mocks/api/mocks.h" #include "test/mocks/network/io_handle.h" diff --git a/test/common/quic/quic_stat_names_test.cc b/test/common/quic/quic_stat_names_test.cc new file mode 100644 index 0000000000000..a330050792de7 --- /dev/null +++ b/test/common/quic/quic_stat_names_test.cc @@ -0,0 +1,40 @@ +#include + +#include "source/common/quic/quic_stat_names.h" + +#include "test/mocks/stats/mocks.h" + +#include "gtest/gtest.h" + +namespace Envoy { +namespace Quic { + +class QuicStatNamesTest : public testing::Test { +public: + QuicStatNamesTest() : scope_(*symbol_table_), quic_stat_names_(*symbol_table_) {} + + Stats::TestUtil::TestSymbolTable symbol_table_; + Stats::TestUtil::TestStore scope_; + QuicStatNames quic_stat_names_; +}; + +TEST_F(QuicStatNamesTest, QuicConnectionCloseStats) { + quic_stat_names_.chargeQuicConnectionCloseStats(scope_, quic::QUIC_NO_ERROR, + quic::ConnectionCloseSource::FROM_SELF, false); + EXPECT_EQ( + 1U, + scope_.counter("http3.downstream.tx.quic_connection_close_error_code_QUIC_NO_ERROR").value()); +} + +TEST_F(QuicStatNamesTest, OutOfRangeQuicConnectionCloseStats) { + uint64_t bad_error_code = quic::QUIC_LAST_ERROR + 1; + quic_stat_names_.chargeQuicConnectionCloseStats(scope_, + static_cast(bad_error_code), + quic::ConnectionCloseSource::FROM_SELF, false); + EXPECT_EQ(1U, + scope_.counter("http3.downstream.tx.quic_connection_close_error_code_QUIC_LAST_ERROR") + .value()); +} + +} // namespace Quic +} // namespace Envoy diff --git a/test/common/quic/test_proof_source.h b/test/common/quic/test_proof_source.h index 9fd60b6ec8df6..b4a8a8348223b 100644 --- a/test/common/quic/test_proof_source.h +++ b/test/common/quic/test_proof_source.h @@ -16,7 +16,7 @@ #include #include "test/mocks/network/mocks.h" -#include "common/quic/envoy_quic_proof_source_base.h" +#include "source/common/quic/envoy_quic_proof_source_base.h" namespace Envoy { namespace Quic { diff --git a/test/common/quic/test_proof_verifier.h b/test/common/quic/test_proof_verifier.h index eeb8e12124dea..3a0596a87b310 100644 --- a/test/common/quic/test_proof_verifier.h +++ b/test/common/quic/test_proof_verifier.h @@ -1,6 +1,6 @@ #pragma once -#include "common/quic/envoy_quic_proof_verifier_base.h" +#include "source/common/quic/envoy_quic_proof_verifier_base.h" namespace Envoy { namespace Quic { diff --git a/test/common/quic/test_utils.h b/test/common/quic/test_utils.h index 0c54ed2eb4d8a..ec7249ffd39e0 100644 --- a/test/common/quic/test_utils.h +++ b/test/common/quic/test_utils.h @@ -1,8 +1,8 @@ #pragma once -#include "common/quic/envoy_quic_client_connection.h" -#include "common/quic/envoy_quic_server_connection.h" -#include "common/quic/quic_filter_manager_connection_impl.h" +#include "source/common/quic/envoy_quic_client_connection.h" +#include "source/common/quic/envoy_quic_server_connection.h" +#include "source/common/quic/quic_filter_manager_connection_impl.h" #if defined(__GNUC__) #pragma GCC diagnostic push @@ -24,7 +24,7 @@ #pragma GCC diagnostic pop #endif -#include "common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_utils.h" #include "test/test_common/environment.h" namespace Envoy { diff --git a/test/common/router/BUILD b/test/common/router/BUILD index eabd2de01e82d..d3be91e2bf11d 100644 --- a/test/common/router/BUILD +++ b/test/common/router/BUILD @@ -135,8 +135,8 @@ envoy_cc_test( "abseil_strings", ], deps = [ - "//include/envoy/config:subscription_interface", - "//include/envoy/init:manager_interface", + "//envoy/config:subscription_interface", + "//envoy/init:manager_interface", "//source/common/config:api_version_lib", "//source/common/config:utility_lib", "//source/common/http:message_lib", diff --git a/test/common/router/config_impl_headermap_benchmark_test.cc b/test/common/router/config_impl_headermap_benchmark_test.cc index 2e8bd3fcd2fab..755f858c88378 100644 --- a/test/common/router/config_impl_headermap_benchmark_test.cc +++ b/test/common/router/config_impl_headermap_benchmark_test.cc @@ -2,8 +2,8 @@ #include "envoy/config/route/v3/route.pb.validate.h" #include "envoy/config/route/v3/route_components.pb.h" -#include "common/http/header_map_impl.h" -#include "common/router/config_impl.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/router/config_impl.h" #include "test/mocks/server/mocks.h" #include "test/test_common/utility.h" diff --git a/test/common/router/config_impl_speed_test.cc b/test/common/router/config_impl_speed_test.cc index 0405138615654..8361844e80271 100644 --- a/test/common/router/config_impl_speed_test.cc +++ b/test/common/router/config_impl_speed_test.cc @@ -1,8 +1,8 @@ #include "envoy/config/route/v3/route.pb.h" #include "envoy/config/route/v3/route.pb.validate.h" -#include "common/common/assert.h" -#include "common/router/config_impl.h" +#include "source/common/common/assert.h" +#include "source/common/router/config_impl.h" #include "test/mocks/server/instance.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/common/router/config_impl_test.cc b/test/common/router/config_impl_test.cc index 9068e78cacaa2..38f3f0d65387d 100644 --- a/test/common/router/config_impl_test.cc +++ b/test/common/router/config_impl_test.cc @@ -12,14 +12,14 @@ #include "envoy/server/filter_config.h" #include "envoy/type/v3/percent.pb.h" -#include "common/config/metadata.h" -#include "common/config/well_known_names.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/network/address_impl.h" -#include "common/router/config_impl.h" -#include "common/router/string_accessor_impl.h" -#include "common/stream_info/filter_state_impl.h" +#include "source/common/config/metadata.h" +#include "source/common/config/well_known_names.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/network/address_impl.h" +#include "source/common/router/config_impl.h" +#include "source/common/router/string_accessor_impl.h" +#include "source/common/stream_info/filter_state_impl.h" #include "test/common/router/route_fuzz.pb.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" @@ -2201,7 +2201,7 @@ TEST_F(RouterMatcherHashPolicyTest, HashHeadersWithMultipleValues) { EXPECT_FALSE(generateHash({})); EXPECT_TRUE(generateHash({"bar"})); - EXPECT_NE(0, generateHash({"bar", "foo"})); + EXPECT_NE(0UL, generateHash({"bar", "foo"})); EXPECT_EQ(generateHash({"bar", "foo"}), generateHash({"bar", "foo"})); // deterministic EXPECT_EQ(generateHash({"bar", "foo"}), generateHash({"foo", "bar"})); // order independent EXPECT_NE(generateHash({"abcd", "ef"}), generateHash({"abc", "def"})); @@ -2250,7 +2250,7 @@ TEST_F(RouterMatcherHashPolicyTest, HashHeadersRegexSubstitutionWithMultipleValu EXPECT_FALSE(generateHash({})); EXPECT_TRUE(generateHash({"/bar"})); - EXPECT_NE(0, generateHash({"/bar", "/foo"})); + EXPECT_NE(0UL, generateHash({"/bar", "/foo"})); EXPECT_EQ(generateHash({"bar", "foo"}), generateHash({"/bar", "/foo"})); // deterministic EXPECT_EQ(generateHash({"bar", "foo"}), generateHash({"/foo", "/bar"})); // order independent EXPECT_NE(generateHash({"abcd", "ef"}), generateHash({"/abc", "/def"})); diff --git a/test/common/router/header_formatter_test.cc b/test/common/router/header_formatter_test.cc index 47385fb9dad99..f9ec6d274c757 100644 --- a/test/common/router/header_formatter_test.cc +++ b/test/common/router/header_formatter_test.cc @@ -6,14 +6,14 @@ #include "envoy/config/route/v3/route_components.pb.h" #include "envoy/http/protocol.h" -#include "common/config/metadata.h" -#include "common/config/utility.h" -#include "common/http/header_utility.h" -#include "common/network/address_impl.h" -#include "common/router/header_formatter.h" -#include "common/router/header_parser.h" -#include "common/router/string_accessor_impl.h" -#include "common/stream_info/filter_state_impl.h" +#include "source/common/config/metadata.h" +#include "source/common/config/utility.h" +#include "source/common/http/header_utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/router/header_formatter.h" +#include "source/common/router/header_parser.h" +#include "source/common/router/string_accessor_impl.h" +#include "source/common/stream_info/filter_state_impl.h" #include "test/common/stream_info/test_int_accessor.h" #include "test/mocks/api/mocks.h" diff --git a/test/common/router/header_parser_fuzz_test.cc b/test/common/router/header_parser_fuzz_test.cc index 172e67da9415e..528846cf0691f 100644 --- a/test/common/router/header_parser_fuzz_test.cc +++ b/test/common/router/header_parser_fuzz_test.cc @@ -1,5 +1,5 @@ -#include "common/http/header_map_impl.h" -#include "common/router/header_parser.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/router/header_parser.h" #include "test/common/router/header_parser_fuzz.pb.validate.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/router/rds_impl_test.cc b/test/common/router/rds_impl_test.cc index e6fba0e46f5a5..551593ca21e52 100644 --- a/test/common/router/rds_impl_test.cc +++ b/test/common/router/rds_impl_test.cc @@ -9,11 +9,10 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/scope.h" -#include "common/config/utility.h" -#include "common/json/json_loader.h" -#include "common/router/rds_impl.h" - -#include "server/admin/admin.h" +#include "source/common/config/utility.h" +#include "source/common/json/json_loader.h" +#include "source/common/router/rds_impl.h" +#include "source/server/admin/admin.h" #include "test/mocks/init/mocks.h" #include "test/mocks/local_info/mocks.h" diff --git a/test/common/router/reset_header_parser_test.cc b/test/common/router/reset_header_parser_test.cc index bb6135390db47..059dcc861fd22 100644 --- a/test/common/router/reset_header_parser_test.cc +++ b/test/common/router/reset_header_parser_test.cc @@ -2,8 +2,8 @@ #include "envoy/http/protocol.h" #include "envoy/json/json_object.h" -#include "common/json/json_loader.h" -#include "common/router/reset_header_parser.h" +#include "source/common/json/json_loader.h" +#include "source/common/router/reset_header_parser.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/utility.h" diff --git a/test/common/router/retry_state_impl_test.cc b/test/common/router/retry_state_impl_test.cc index 05221252b26ef..fd0ed209c656d 100644 --- a/test/common/router/retry_state_impl_test.cc +++ b/test/common/router/retry_state_impl_test.cc @@ -3,10 +3,10 @@ #include "envoy/config/route/v3/route_components.pb.h" #include "envoy/stats/stats.h" -#include "common/http/header_map_impl.h" -#include "common/router/reset_header_parser.h" -#include "common/router/retry_state_impl.h" -#include "common/upstream/resource_manager_impl.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/router/reset_header_parser.h" +#include "source/common/router/retry_state_impl.h" +#include "source/common/upstream/resource_manager_impl.h" #include "test/mocks/common.h" #include "test/mocks/router/mocks.h" diff --git a/test/common/router/route_fuzz_test.cc b/test/common/router/route_fuzz_test.cc index 2ab76c31756b0..e74cbc4d233a2 100644 --- a/test/common/router/route_fuzz_test.cc +++ b/test/common/router/route_fuzz_test.cc @@ -2,7 +2,7 @@ #include "envoy/config/route/v3/route.pb.validate.h" #include "envoy/config/route/v3/route_components.pb.h" -#include "common/router/config_impl.h" +#include "source/common/router/config_impl.h" #include "test/common/router/route_fuzz.pb.validate.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/router/router_2_test.cc b/test/common/router/router_2_test.cc index 450683b9410ad..7374f26837923 100644 --- a/test/common/router/router_2_test.cc +++ b/test/common/router/router_2_test.cc @@ -1,4 +1,4 @@ -#include "common/tracing/http_tracer_impl.h" +#include "source/common/tracing/http_tracer_impl.h" #include "test/common/router/router_test_base.h" diff --git a/test/common/router/router_ratelimit_test.cc b/test/common/router/router_ratelimit_test.cc index 7532eeecade74..01127c1a07971 100644 --- a/test/common/router/router_ratelimit_test.cc +++ b/test/common/router/router_ratelimit_test.cc @@ -6,11 +6,11 @@ #include "envoy/config/route/v3/route_components.pb.h" #include "envoy/config/route/v3/route_components.pb.validate.h" -#include "common/http/header_map_impl.h" -#include "common/network/address_impl.h" -#include "common/protobuf/utility.h" -#include "common/router/config_impl.h" -#include "common/router/router_ratelimit.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/config_impl.h" +#include "source/common/router/router_ratelimit.h" #include "test/mocks/http/mocks.h" #include "test/mocks/ratelimit/mocks.h" diff --git a/test/common/router/router_test.cc b/test/common/router/router_test.cc index dfac7ba12c36b..1b58a3dfdecac 100644 --- a/test/common/router/router_test.cc +++ b/test/common/router/router_test.cc @@ -11,24 +11,24 @@ #include "envoy/extensions/upstreams/tcp/generic/v3/generic_connection_pool.pb.h" #include "envoy/type/v3/percent.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/empty_string.h" -#include "common/config/metadata.h" -#include "common/config/well_known_names.h" -#include "common/http/context_impl.h" -#include "common/network/application_protocol.h" -#include "common/network/socket_option_factory.h" -#include "common/network/upstream_server_name.h" -#include "common/network/upstream_socket_options_filter_state.h" -#include "common/network/upstream_subject_alt_names.h" -#include "common/network/utility.h" -#include "common/network/win32_redirect_records_option_impl.h" -#include "common/router/config_impl.h" -#include "common/router/debug_config.h" -#include "common/router/router.h" -#include "common/stream_info/uint32_accessor_impl.h" -#include "common/tracing/http_tracer_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/config/metadata.h" +#include "source/common/config/well_known_names.h" +#include "source/common/http/context_impl.h" +#include "source/common/network/application_protocol.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/upstream_server_name.h" +#include "source/common/network/upstream_socket_options_filter_state.h" +#include "source/common/network/upstream_subject_alt_names.h" +#include "source/common/network/utility.h" +#include "source/common/network/win32_redirect_records_option_impl.h" +#include "source/common/router/config_impl.h" +#include "source/common/router/debug_config.h" +#include "source/common/router/router.h" +#include "source/common/stream_info/uint32_accessor_impl.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/http/common.h" #include "test/common/router/router_test_base.h" @@ -165,12 +165,13 @@ TEST_F(RouterTest, MissingRequiredHeaders) { EXPECT_CALL(encoder, encodeHeaders(_, _)) .WillOnce(Invoke([](const Http::RequestHeaderMap& headers, bool) -> Http::Status { - return Http::HeaderUtility::checkRequiredHeaders(headers); + return Http::HeaderUtility::checkRequiredRequestHeaders(headers); })); - EXPECT_CALL(callbacks_, - sendLocalReply(Http::Code::ServiceUnavailable, - testing::Eq("missing required header: :method"), _, _, - "filter_removed_required_headers{missing required header: :method}")) + EXPECT_CALL( + callbacks_, + sendLocalReply(Http::Code::ServiceUnavailable, + testing::Eq("missing required header: :method"), _, _, + "filter_removed_required_request_headers{missing required header: :method}")) .WillOnce(testing::InvokeWithoutArgs([] {})); router_.decodeHeaders(headers, true); router_.onDestroy(); @@ -343,12 +344,11 @@ TEST_F(RouterTest, HashPolicy) { EXPECT_CALL(callbacks_.route_->route_entry_.hash_policy_, generateHash(_, _, _, _)) .WillOnce(Return(absl::optional(10))); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) - .WillOnce( - Invoke([&](Upstream::ResourcePriority, absl::optional, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { - EXPECT_EQ(10UL, context->computeHashKey().value()); - return &cm_.thread_local_cluster_.conn_pool_; - })); + .WillOnce(Invoke([&](Upstream::ResourcePriority, absl::optional, + Upstream::LoadBalancerContext* context) { + EXPECT_EQ(10UL, context->computeHashKey().value()); + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); + })); EXPECT_CALL(cm_.thread_local_cluster_.conn_pool_, newStream(_, _)) .WillOnce(Return(&cancellable_)); expectResponseTimerCreate(); @@ -371,12 +371,11 @@ TEST_F(RouterTest, HashPolicyNoHash) { EXPECT_CALL(callbacks_.route_->route_entry_.hash_policy_, generateHash(_, _, _, _)) .WillOnce(Return(absl::optional())); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, &router_)) - .WillOnce( - Invoke([&](Upstream::ResourcePriority, absl::optional, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { - EXPECT_FALSE(context->computeHashKey()); - return &cm_.thread_local_cluster_.conn_pool_; - })); + .WillOnce(Invoke([&](Upstream::ResourcePriority, absl::optional, + Upstream::LoadBalancerContext* context) { + EXPECT_FALSE(context->computeHashKey()); + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); + })); EXPECT_CALL(cm_.thread_local_cluster_.conn_pool_, newStream(_, _)) .WillOnce(Return(&cancellable_)); expectResponseTimerCreate(); @@ -415,12 +414,11 @@ TEST_F(RouterTest, AddCookie) { })); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) - .WillOnce( - Invoke([&](Upstream::ResourcePriority, absl::optional, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { - EXPECT_EQ(10UL, context->computeHashKey().value()); - return &cm_.thread_local_cluster_.conn_pool_; - })); + .WillOnce(Invoke([&](Upstream::ResourcePriority, absl::optional, + Upstream::LoadBalancerContext* context) { + EXPECT_EQ(10UL, context->computeHashKey().value()); + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); + })); std::string cookie_value; EXPECT_CALL(callbacks_.route_->route_entry_.hash_policy_, generateHash(_, _, _, _)) @@ -468,12 +466,11 @@ TEST_F(RouterTest, AddCookieNoDuplicate) { })); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) - .WillOnce( - Invoke([&](Upstream::ResourcePriority, absl::optional, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { - EXPECT_EQ(10UL, context->computeHashKey().value()); - return &cm_.thread_local_cluster_.conn_pool_; - })); + .WillOnce(Invoke([&](Upstream::ResourcePriority, absl::optional, + Upstream::LoadBalancerContext* context) { + EXPECT_EQ(10UL, context->computeHashKey().value()); + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); + })); EXPECT_CALL(callbacks_.route_->route_entry_.hash_policy_, generateHash(_, _, _, _)) .WillOnce(Invoke([&](const Network::Address::Instance*, const Http::HeaderMap&, @@ -520,12 +517,11 @@ TEST_F(RouterTest, AddMultipleCookies) { })); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) - .WillOnce( - Invoke([&](Upstream::ResourcePriority, absl::optional, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { - EXPECT_EQ(10UL, context->computeHashKey().value()); - return &cm_.thread_local_cluster_.conn_pool_; - })); + .WillOnce(Invoke([&](Upstream::ResourcePriority, absl::optional, + Upstream::LoadBalancerContext* context) { + EXPECT_EQ(10UL, context->computeHashKey().value()); + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); + })); std::string choco_c, foo_c; EXPECT_CALL(callbacks_.route_->route_entry_.hash_policy_, generateHash(_, _, _, _)) @@ -568,13 +564,12 @@ TEST_F(RouterTest, MetadataMatchCriteria) { ON_CALL(callbacks_.route_->route_entry_, metadataMatchCriteria()) .WillByDefault(Return(&callbacks_.route_->route_entry_.metadata_matches_criteria_)); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) - .WillOnce( - Invoke([&](Upstream::ResourcePriority, absl::optional, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { - EXPECT_EQ(context->metadataMatchCriteria(), - &callbacks_.route_->route_entry_.metadata_matches_criteria_); - return &cm_.thread_local_cluster_.conn_pool_; - })); + .WillOnce(Invoke([&](Upstream::ResourcePriority, absl::optional, + Upstream::LoadBalancerContext* context) { + EXPECT_EQ(context->metadataMatchCriteria(), + &callbacks_.route_->route_entry_.metadata_matches_criteria_); + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); + })); EXPECT_CALL(cm_.thread_local_cluster_.conn_pool_, newStream(_, _)) .WillOnce(Return(&cancellable_)); expectResponseTimerCreate(); @@ -599,12 +594,11 @@ TEST_F(RouterTest, MetadataMatchCriteriaFromRequestNoRouteEntryMatch) { TEST_F(RouterTest, NoMetadataMatchCriteria) { ON_CALL(callbacks_.route_->route_entry_, metadataMatchCriteria()).WillByDefault(Return(nullptr)); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) - .WillOnce( - Invoke([&](Upstream::ResourcePriority, absl::optional, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { - EXPECT_EQ(context->metadataMatchCriteria(), nullptr); - return &cm_.thread_local_cluster_.conn_pool_; - })); + .WillOnce(Invoke([&](Upstream::ResourcePriority, absl::optional, + Upstream::LoadBalancerContext* context) { + EXPECT_EQ(context->metadataMatchCriteria(), nullptr); + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); + })); EXPECT_CALL(cm_.thread_local_cluster_.conn_pool_, newStream(_, _)) .WillOnce(Return(&cancellable_)); expectResponseTimerCreate(); @@ -636,7 +630,7 @@ TEST_F(RouterTest, CancelBeforeBoundToPool) { } TEST_F(RouterTest, NoHost) { - EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)).WillOnce(Return(nullptr)); + EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)).WillOnce(Return(absl::nullopt)); Http::TestResponseHeaderMapImpl response_headers{ {":status", "503"}, {"content-length", "19"}, {"content-type", "text/plain"}}; @@ -3143,7 +3137,7 @@ TEST_F(RouterTest, RetryNoneHealthy) { putResult(Upstream::Outlier::Result::LocalOriginConnectFailed, _)); encoder1.stream_.resetStream(Http::StreamResetReason::LocalReset); - EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)).WillOnce(Return(nullptr)); + EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)).WillOnce(Return(absl::nullopt)); Http::TestResponseHeaderMapImpl response_headers{ {":status", "503"}, {"content-length", "19"}, {"content-type", "text/plain"}}; EXPECT_CALL(callbacks_, encodeHeaders_(HeaderMapEqualRef(&response_headers), false)); @@ -5775,18 +5769,17 @@ TEST_F(RouterTest, ApplicationProtocols) { StreamInfo::FilterState::StateType::ReadOnly, StreamInfo::FilterState::LifeSpan::FilterChain); EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) - .WillOnce( - Invoke([&](Upstream::ResourcePriority, absl::optional, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { - Network::TransportSocketOptionsSharedPtr transport_socket_options = - context->upstreamTransportSocketOptions(); - EXPECT_NE(transport_socket_options, nullptr); - EXPECT_FALSE(transport_socket_options->applicationProtocolListOverride().empty()); - EXPECT_EQ(transport_socket_options->applicationProtocolListOverride().size(), 2); - EXPECT_EQ(transport_socket_options->applicationProtocolListOverride()[0], "foo"); - EXPECT_EQ(transport_socket_options->applicationProtocolListOverride()[1], "bar"); - return &cm_.thread_local_cluster_.conn_pool_; - })); + .WillOnce(Invoke([&](Upstream::ResourcePriority, absl::optional, + Upstream::LoadBalancerContext* context) { + Network::TransportSocketOptionsSharedPtr transport_socket_options = + context->upstreamTransportSocketOptions(); + EXPECT_NE(transport_socket_options, nullptr); + EXPECT_FALSE(transport_socket_options->applicationProtocolListOverride().empty()); + EXPECT_EQ(transport_socket_options->applicationProtocolListOverride().size(), 2); + EXPECT_EQ(transport_socket_options->applicationProtocolListOverride()[0], "foo"); + EXPECT_EQ(transport_socket_options->applicationProtocolListOverride()[1], "bar"); + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); + })); EXPECT_CALL(cm_.thread_local_cluster_.conn_pool_, newStream(_, _)) .WillOnce(Return(&cancellable_)); diff --git a/test/common/router/router_test_base.cc b/test/common/router/router_test_base.cc index 77e4fa378d6cd..d6e0f7df1420b 100644 --- a/test/common/router/router_test_base.cc +++ b/test/common/router/router_test_base.cc @@ -1,6 +1,6 @@ #include "test/common/router/router_test_base.h" -#include "common/router/debug_config.h" +#include "source/common/router/debug_config.h" namespace Envoy { namespace Router { @@ -98,31 +98,30 @@ void RouterTestBase::verifyMetadataMatchCriteriaFromRequest(bool route_entry_has } EXPECT_CALL(cm_.thread_local_cluster_, httpConnPool(_, _, _)) - .WillOnce( - Invoke([&](Upstream::ResourcePriority, absl::optional, - Upstream::LoadBalancerContext* context) -> Http::ConnectionPool::Instance* { - auto match = context->metadataMatchCriteria()->metadataMatchCriteria(); - EXPECT_EQ(match.size(), 2); - auto it = match.begin(); - - // Note: metadataMatchCriteria() keeps its entries sorted, so the order for checks - // below matters. - - // `stage` was only set by the request, not by the route entry. - EXPECT_EQ((*it)->name(), "stage"); - EXPECT_EQ((*it)->value().value().string_value(), "devel"); - it++; - - // `version` should be what came from the request, overriding the route entry. - EXPECT_EQ((*it)->name(), "version"); - EXPECT_EQ((*it)->value().value().string_value(), "v3.1"); - - // When metadataMatchCriteria() is computed from dynamic metadata, the result should - // be cached. - EXPECT_EQ(context->metadataMatchCriteria(), context->metadataMatchCriteria()); - - return &cm_.thread_local_cluster_.conn_pool_; - })); + .WillOnce(Invoke([&](Upstream::ResourcePriority, absl::optional, + Upstream::LoadBalancerContext* context) { + auto match = context->metadataMatchCriteria()->metadataMatchCriteria(); + EXPECT_EQ(match.size(), 2); + auto it = match.begin(); + + // Note: metadataMatchCriteria() keeps its entries sorted, so the order for checks + // below matters. + + // `stage` was only set by the request, not by the route entry. + EXPECT_EQ((*it)->name(), "stage"); + EXPECT_EQ((*it)->value().value().string_value(), "devel"); + it++; + + // `version` should be what came from the request, overriding the route entry. + EXPECT_EQ((*it)->name(), "version"); + EXPECT_EQ((*it)->value().value().string_value(), "v3.1"); + + // When metadataMatchCriteria() is computed from dynamic metadata, the result should + // be cached. + EXPECT_EQ(context->metadataMatchCriteria(), context->metadataMatchCriteria()); + + return Upstream::HttpPoolData([]() {}, &cm_.thread_local_cluster_.conn_pool_); + })); EXPECT_CALL(cm_.thread_local_cluster_.conn_pool_, newStream(_, _)) .WillOnce(Return(&cancellable_)); expectResponseTimerCreate(); diff --git a/test/common/router/router_test_base.h b/test/common/router/router_test_base.h index fdff1e8a0a283..846e84157bf1c 100644 --- a/test/common/router/router_test_base.h +++ b/test/common/router/router_test_base.h @@ -1,8 +1,8 @@ #pragma once -#include "common/http/context_impl.h" -#include "common/router/router.h" -#include "common/stream_info/uint32_accessor_impl.h" +#include "source/common/http/context_impl.h" +#include "source/common/router/router.h" +#include "source/common/stream_info/uint32_accessor_impl.h" #include "test/common/http/common.h" #include "test/mocks/common.h" diff --git a/test/common/router/router_upstream_log_test.cc b/test/common/router/router_upstream_log_test.cc index a16c05fd6ba26..e9d2260504d90 100644 --- a/test/common/router/router_upstream_log_test.cc +++ b/test/common/router/router_upstream_log_test.cc @@ -6,9 +6,9 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/extensions/filters/http/router/v3/router.pb.h" -#include "common/network/utility.h" -#include "common/router/router.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/network/utility.h" +#include "source/common/router/router.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/http/common.h" #include "test/mocks/access_log/mocks.h" diff --git a/test/common/router/scoped_config_impl_test.cc b/test/common/router/scoped_config_impl_test.cc index cc7adfd1adcb1..adc94be82b900 100644 --- a/test/common/router/scoped_config_impl_test.cc +++ b/test/common/router/scoped_config_impl_test.cc @@ -4,7 +4,7 @@ #include "envoy/config/route/v3/scoped_route.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/router/scoped_config_impl.h" +#include "source/common/router/scoped_config_impl.h" #include "test/mocks/router/mocks.h" #include "test/test_common/utility.h" diff --git a/test/common/router/scoped_rds_test.cc b/test/common/router/scoped_rds_test.cc index db6a538785872..60808295f024e 100644 --- a/test/common/router/scoped_rds_test.cc +++ b/test/common/router/scoped_rds_test.cc @@ -13,10 +13,10 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/scope.h" -#include "common/config/api_version.h" -#include "common/config/grpc_mux_impl.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/router/scoped_rds.h" +#include "source/common/config/api_version.h" +#include "source/common/config/grpc_mux_impl.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/router/scoped_rds.h" #include "test/mocks/config/mocks.h" #include "test/mocks/protobuf/mocks.h" diff --git a/test/common/router/shadow_writer_impl_test.cc b/test/common/router/shadow_writer_impl_test.cc index 7a5f000ebc5ae..e1e680e36b271 100644 --- a/test/common/router/shadow_writer_impl_test.cc +++ b/test/common/router/shadow_writer_impl_test.cc @@ -1,9 +1,9 @@ #include #include -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/router/shadow_writer_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/router/shadow_writer_impl.h" #include "test/mocks/upstream/cluster_manager.h" diff --git a/test/common/router/string_accessor_impl_test.cc b/test/common/router/string_accessor_impl_test.cc index 558782b4b8452..57ba334da1639 100644 --- a/test/common/router/string_accessor_impl_test.cc +++ b/test/common/router/string_accessor_impl_test.cc @@ -1,4 +1,4 @@ -#include "common/router/string_accessor_impl.h" +#include "source/common/router/string_accessor_impl.h" #include "absl/strings/string_view.h" #include "gtest/gtest.h" diff --git a/test/common/router/upstream_request_test.cc b/test/common/router/upstream_request_test.cc index 638249e92c7be..4b38122ed075f 100644 --- a/test/common/router/upstream_request_test.cc +++ b/test/common/router/upstream_request_test.cc @@ -1,6 +1,6 @@ -#include "common/common/utility.h" -#include "common/network/utility.h" -#include "common/router/upstream_request.h" +#include "source/common/common/utility.h" +#include "source/common/network/utility.h" +#include "source/common/router/upstream_request.h" #include "test/common/http/common.h" #include "test/mocks/router/router_filter_interface.h" diff --git a/test/common/router/vhds_test.cc b/test/common/router/vhds_test.cc index e819381f1e2a7..28e933675b189 100644 --- a/test/common/router/vhds_test.cc +++ b/test/common/router/vhds_test.cc @@ -7,11 +7,10 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/scope.h" -#include "common/config/utility.h" -#include "common/protobuf/protobuf.h" -#include "common/router/rds_impl.h" - -#include "server/admin/admin.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/router/rds_impl.h" +#include "source/server/admin/admin.h" #include "test/mocks/config/mocks.h" #include "test/mocks/init/mocks.h" diff --git a/test/common/runtime/runtime_flag_override_noop_test.cc b/test/common/runtime/runtime_flag_override_noop_test.cc index ab19fac7293bf..47dc3c61ded58 100644 --- a/test/common/runtime/runtime_flag_override_noop_test.cc +++ b/test/common/runtime/runtime_flag_override_noop_test.cc @@ -1,4 +1,4 @@ -#include "common/runtime/runtime_features.h" +#include "source/common/runtime/runtime_features.h" #include "gmock/gmock.h" diff --git a/test/common/runtime/runtime_flag_override_test.cc b/test/common/runtime/runtime_flag_override_test.cc index 6d90407e38573..19d64c30fe5a6 100644 --- a/test/common/runtime/runtime_flag_override_test.cc +++ b/test/common/runtime/runtime_flag_override_test.cc @@ -1,4 +1,4 @@ -#include "common/runtime/runtime_features.h" +#include "source/common/runtime/runtime_features.h" #include "gmock/gmock.h" diff --git a/test/common/runtime/runtime_impl_test.cc b/test/common/runtime/runtime_impl_test.cc index 0f220455ef218..1a47f278903d9 100644 --- a/test/common/runtime/runtime_impl_test.cc +++ b/test/common/runtime/runtime_impl_test.cc @@ -7,9 +7,9 @@ #include "envoy/service/runtime/v3/rtds.pb.h" #include "envoy/type/v3/percent.pb.h" -#include "common/config/runtime_utility.h" -#include "common/runtime/runtime_features.h" -#include "common/runtime/runtime_impl.h" +#include "source/common/config/runtime_utility.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/runtime/runtime_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/common.h" @@ -29,7 +29,7 @@ #include "gtest/gtest.h" #ifdef ENVOY_ENABLE_QUIC -#include "common/quic/envoy_quic_utils.h" +#include "source/common/quic/envoy_quic_utils.h" #endif using testing::_; diff --git a/test/common/runtime/runtime_protos_test.cc b/test/common/runtime/runtime_protos_test.cc index 95cdf87dee84a..bc0e4d956ba7b 100644 --- a/test/common/runtime/runtime_protos_test.cc +++ b/test/common/runtime/runtime_protos_test.cc @@ -4,7 +4,7 @@ #include "envoy/config/core/v3/base.pb.validate.h" #include "envoy/type/v3/percent.pb.h" -#include "common/runtime/runtime_protos.h" +#include "source/common/runtime/runtime_protos.h" #include "test/mocks/runtime/mocks.h" #include "test/test_common/utility.h" diff --git a/test/common/runtime/utility.h b/test/common/runtime/utility.h index ba1bb9f1b3981..a61b28a8ee19a 100644 --- a/test/common/runtime/utility.h +++ b/test/common/runtime/utility.h @@ -1,7 +1,7 @@ #pragma once -#include "common/runtime/runtime_features.h" -#include "common/runtime/runtime_impl.h" +#include "source/common/runtime/runtime_features.h" +#include "source/common/runtime/runtime_impl.h" namespace Envoy { namespace Runtime { diff --git a/test/common/secret/sds_api_test.cc b/test/common/secret/sds_api_test.cc index 1c8b495fd6a5b..84e0d6159153c 100644 --- a/test/common/secret/sds_api_test.cc +++ b/test/common/secret/sds_api_test.cc @@ -6,11 +6,11 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/service/secret/v3/sds.pb.h" -#include "common/config/datasource.h" -#include "common/config/filesystem_subscription_impl.h" -#include "common/secret/sds_api.h" -#include "common/ssl/certificate_validation_context_config_impl.h" -#include "common/ssl/tls_certificate_config_impl.h" +#include "source/common/config/datasource.h" +#include "source/common/config/filesystem_subscription_impl.h" +#include "source/common/secret/sds_api.h" +#include "source/common/ssl/certificate_validation_context_config_impl.h" +#include "source/common/ssl/tls_certificate_config_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/config/mocks.h" diff --git a/test/common/secret/secret_manager_impl_test.cc b/test/common/secret/secret_manager_impl_test.cc index aab0883268ad5..cf9d9fb2d9604 100644 --- a/test/common/secret/secret_manager_impl_test.cc +++ b/test/common/secret/secret_manager_impl_test.cc @@ -6,13 +6,13 @@ #include "envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" -#include "common/common/base64.h" -#include "common/common/logger.h" -#include "common/config/api_version.h" -#include "common/secret/sds_api.h" -#include "common/secret/secret_manager_impl.h" -#include "common/ssl/certificate_validation_context_config_impl.h" -#include "common/ssl/tls_certificate_config_impl.h" +#include "source/common/common/base64.h" +#include "source/common/common/logger.h" +#include "source/common/config/api_version.h" +#include "source/common/secret/sds_api.h" +#include "source/common/secret/secret_manager_impl.h" +#include "source/common/ssl/certificate_validation_context_config_impl.h" +#include "source/common/ssl/tls_certificate_config_impl.h" #include "test/mocks/event/mocks.h" #include "test/mocks/server/config_tracker.h" diff --git a/test/common/shared_pool/shared_pool_test.cc b/test/common/shared_pool/shared_pool_test.cc index 8fbb564188523..c82f6d2dcfda8 100644 --- a/test/common/shared_pool/shared_pool_test.cc +++ b/test/common/shared_pool/shared_pool_test.cc @@ -1,7 +1,7 @@ #include -#include "common/event/timer_impl.h" -#include "common/shared_pool/shared_pool.h" +#include "source/common/event/timer_impl.h" +#include "source/common/shared_pool/shared_pool.h" #include "test/mocks/event/mocks.h" #include "test/test_common/thread_factory_for_test.h" diff --git a/test/common/signal/fatal_action_test.cc b/test/common/signal/fatal_action_test.cc index 1e276f016e4a7..5565c592eee5f 100644 --- a/test/common/signal/fatal_action_test.cc +++ b/test/common/signal/fatal_action_test.cc @@ -3,8 +3,8 @@ #include "envoy/common/scope_tracker.h" #include "envoy/server/fatal_action_config.h" -#include "common/signal/fatal_action.h" -#include "common/signal/fatal_error_handler.h" +#include "source/common/signal/fatal_action.h" +#include "source/common/signal/fatal_error_handler.h" #include "test/mocks/server/instance.h" #include "test/test_common/utility.h" diff --git a/test/common/signal/signals_test.cc b/test/common/signal/signals_test.cc index f2e5ddde8c8dc..6595959000211 100644 --- a/test/common/signal/signals_test.cc +++ b/test/common/signal/signals_test.cc @@ -5,8 +5,8 @@ #include "envoy/common/scope_tracker.h" -#include "common/signal/fatal_error_handler.h" -#include "common/signal/signal_action.h" +#include "source/common/signal/fatal_error_handler.h" +#include "source/common/signal/signal_action.h" #include "test/common/stats/stat_test_utility.h" #include "test/test_common/utility.h" diff --git a/test/common/singleton/manager_impl_test.cc b/test/common/singleton/manager_impl_test.cc index aa5796ae79c1b..d3184bae8f580 100644 --- a/test/common/singleton/manager_impl_test.cc +++ b/test/common/singleton/manager_impl_test.cc @@ -1,6 +1,6 @@ #include "envoy/registry/registry.h" -#include "common/singleton/manager_impl.h" +#include "source/common/singleton/manager_impl.h" #include "test/test_common/utility.h" diff --git a/test/common/singleton/threadsafe_singleton_test.cc b/test/common/singleton/threadsafe_singleton_test.cc index a6dba199526ed..3ec2bfe718bd3 100644 --- a/test/common/singleton/threadsafe_singleton_test.cc +++ b/test/common/singleton/threadsafe_singleton_test.cc @@ -1,9 +1,9 @@ #include -#include "common/common/lock_guard.h" -#include "common/common/thread.h" -#include "common/singleton/threadsafe_singleton.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/thread.h" +#include "source/common/singleton/threadsafe_singleton.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/test_common/threadsafe_singleton_injector.h" #include "test/test_common/utility.h" diff --git a/test/common/stats/BUILD b/test/common/stats/BUILD index 53f7d41fc4466..e7b87df994711 100644 --- a/test/common/stats/BUILD +++ b/test/common/stats/BUILD @@ -99,7 +99,7 @@ envoy_cc_test_library( "abseil_strings", ], deps = [ - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", "//source/common/common:assert_lib", "//source/common/memory:stats_lib", "//source/common/stats:isolated_store_lib", @@ -131,7 +131,7 @@ envoy_cc_test( envoy_cc_test( name = "refcount_ptr_test", srcs = ["refcount_ptr_test.cc"], - deps = ["//include/envoy/stats:refcount_ptr_interface"], + deps = ["//envoy/stats:refcount_ptr_interface"], ) envoy_cc_test( diff --git a/test/common/stats/allocator_impl_test.cc b/test/common/stats/allocator_impl_test.cc index 571e53fd6810d..83fb85d68ea8d 100644 --- a/test/common/stats/allocator_impl_test.cc +++ b/test/common/stats/allocator_impl_test.cc @@ -1,6 +1,6 @@ #include -#include "common/stats/allocator_impl.h" +#include "source/common/stats/allocator_impl.h" #include "test/test_common/logging.h" #include "test/test_common/thread_factory_for_test.h" diff --git a/test/common/stats/histogram_impl_test.cc b/test/common/stats/histogram_impl_test.cc index 085e3d9a5a1ad..b55f25c83497f 100644 --- a/test/common/stats/histogram_impl_test.cc +++ b/test/common/stats/histogram_impl_test.cc @@ -1,6 +1,6 @@ #include "envoy/config/metrics/v3/stats.pb.h" -#include "common/stats/histogram_impl.h" +#include "source/common/stats/histogram_impl.h" #include "test/test_common/utility.h" diff --git a/test/common/stats/isolated_store_impl_test.cc b/test/common/stats/isolated_store_impl_test.cc index 3e2c6dd083a1e..f3a3e0a31dcd2 100644 --- a/test/common/stats/isolated_store_impl_test.cc +++ b/test/common/stats/isolated_store_impl_test.cc @@ -2,9 +2,9 @@ #include "envoy/stats/stats_macros.h" -#include "common/stats/isolated_store_impl.h" -#include "common/stats/null_counter.h" -#include "common/stats/null_gauge.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/stats/null_counter.h" +#include "source/common/stats/null_gauge.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" diff --git a/test/common/stats/make_elements_helper.cc b/test/common/stats/make_elements_helper.cc index d7d4538248040..2999ade8dcf45 100644 --- a/test/common/stats/make_elements_helper.cc +++ b/test/common/stats/make_elements_helper.cc @@ -1,4 +1,4 @@ -#include "common/stats/utility.h" +#include "source/common/stats/utility.h" namespace Envoy { namespace Stats { diff --git a/test/common/stats/make_elements_helper.h b/test/common/stats/make_elements_helper.h index 218fa6f7aec6d..bf08331cd9af3 100644 --- a/test/common/stats/make_elements_helper.h +++ b/test/common/stats/make_elements_helper.h @@ -1,6 +1,6 @@ #pragma once -#include "common/stats/utility.h" +#include "source/common/stats/utility.h" namespace Envoy { namespace Stats { diff --git a/test/common/stats/metric_impl_test.cc b/test/common/stats/metric_impl_test.cc index 30f20a61ee3af..dfa2656696d35 100644 --- a/test/common/stats/metric_impl_test.cc +++ b/test/common/stats/metric_impl_test.cc @@ -1,7 +1,7 @@ #include -#include "common/stats/allocator_impl.h" -#include "common/stats/utility.h" +#include "source/common/stats/allocator_impl.h" +#include "source/common/stats/utility.h" #include "test/test_common/logging.h" diff --git a/test/common/stats/recent_lookups_speed_test.cc b/test/common/stats/recent_lookups_speed_test.cc index 2d3c0f5e4ef3d..a39327db0875b 100644 --- a/test/common/stats/recent_lookups_speed_test.cc +++ b/test/common/stats/recent_lookups_speed_test.cc @@ -20,9 +20,9 @@ // BM_LookupsNoEvictions 45662 ns 45662 ns 15329 // BM_LookupsAllEvictions 83015 ns 83015 ns 8435 -#include "common/common/random_generator.h" -#include "common/runtime/runtime_impl.h" -#include "common/stats/recent_lookups.h" +#include "source/common/common/random_generator.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/stats/recent_lookups.h" #include "absl/strings/str_cat.h" #include "benchmark/benchmark.h" diff --git a/test/common/stats/recent_lookups_test.cc b/test/common/stats/recent_lookups_test.cc index 3e9bed9ff2368..1ac2e7ffeb0a1 100644 --- a/test/common/stats/recent_lookups_test.cc +++ b/test/common/stats/recent_lookups_test.cc @@ -1,8 +1,8 @@ #include #include -#include "common/common/utility.h" -#include "common/stats/recent_lookups.h" +#include "source/common/common/utility.h" +#include "source/common/stats/recent_lookups.h" #include "test/test_common/logging.h" diff --git a/test/common/stats/stat_merger_fuzz_test.cc b/test/common/stats/stat_merger_fuzz_test.cc index bd3e6b2dbc071..947c484a1ff59 100644 --- a/test/common/stats/stat_merger_fuzz_test.cc +++ b/test/common/stats/stat_merger_fuzz_test.cc @@ -1,6 +1,6 @@ #include -#include "common/stats/stat_merger.h" +#include "source/common/stats/stat_merger.h" #include "test/common/stats/stat_test_utility.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/stats/stat_merger_test.cc b/test/common/stats/stat_merger_test.cc index 092fc531597b3..ae9ff052dab1f 100644 --- a/test/common/stats/stat_merger_test.cc +++ b/test/common/stats/stat_merger_test.cc @@ -1,8 +1,8 @@ #include -#include "common/stats/isolated_store_impl.h" -#include "common/stats/stat_merger.h" -#include "common/stats/thread_local_store.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/stats/stat_merger.h" +#include "source/common/stats/thread_local_store.h" #include "test/test_common/utility.h" diff --git a/test/common/stats/stat_test_utility.cc b/test/common/stats/stat_test_utility.cc index 4b8b678a115e8..9f9438a7bf9a5 100644 --- a/test/common/stats/stat_test_utility.cc +++ b/test/common/stats/stat_test_utility.cc @@ -1,7 +1,7 @@ #include "test/common/stats/stat_test_utility.h" -#include "common/common/assert.h" -#include "common/memory/stats.h" +#include "source/common/common/assert.h" +#include "source/common/memory/stats.h" namespace Envoy { namespace Stats { diff --git a/test/common/stats/stat_test_utility.h b/test/common/stats/stat_test_utility.h index 745f4900f2178..213775d4bb218 100644 --- a/test/common/stats/stat_test_utility.h +++ b/test/common/stats/stat_test_utility.h @@ -2,9 +2,9 @@ #include "envoy/stats/store.h" -#include "common/common/logger.h" -#include "common/memory/stats.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/common/logger.h" +#include "source/common/memory/stats.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/test_common/global.h" diff --git a/test/common/stats/stats_matcher_impl_test.cc b/test/common/stats/stats_matcher_impl_test.cc index e51bf335462f7..87b806cd9f133 100644 --- a/test/common/stats/stats_matcher_impl_test.cc +++ b/test/common/stats/stats_matcher_impl_test.cc @@ -1,7 +1,7 @@ #include "envoy/config/metrics/v3/stats.pb.h" #include "envoy/type/matcher/v3/string.pb.h" -#include "common/stats/stats_matcher_impl.h" +#include "source/common/stats/stats_matcher_impl.h" #include "test/test_common/utility.h" diff --git a/test/common/stats/symbol_table_fuzz_test.cc b/test/common/stats/symbol_table_fuzz_test.cc index 3d5ac4df99bc3..cab1bda492c27 100644 --- a/test/common/stats/symbol_table_fuzz_test.cc +++ b/test/common/stats/symbol_table_fuzz_test.cc @@ -1,8 +1,8 @@ #include -#include "common/common/assert.h" -#include "common/common/base64.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/base64.h" +#include "source/common/stats/symbol_table_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/stats/symbol_table_impl_test.cc b/test/common/stats/symbol_table_impl_test.cc index 7fd540803a151..0f8dd73fedae5 100644 --- a/test/common/stats/symbol_table_impl_test.cc +++ b/test/common/stats/symbol_table_impl_test.cc @@ -1,9 +1,9 @@ #include -#include "common/common/macros.h" -#include "common/common/mutex_tracer_impl.h" -#include "common/memory/stats.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/common/macros.h" +#include "source/common/common/mutex_tracer_impl.h" +#include "source/common/memory/stats.h" +#include "source/common/stats/symbol_table_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/test_common/logging.h" diff --git a/test/common/stats/symbol_table_speed_test.cc b/test/common/stats/symbol_table_speed_test.cc index f5806c69964ed..c5450bb98a5f5 100644 --- a/test/common/stats/symbol_table_speed_test.cc +++ b/test/common/stats/symbol_table_speed_test.cc @@ -3,11 +3,11 @@ // // NOLINT(namespace-envoy) -#include "common/common/logger.h" -#include "common/common/thread.h" -#include "common/stats/isolated_store_impl.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/utility.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/utility.h" #include "test/common/stats/make_elements_helper.h" #include "test/test_common/utility.h" diff --git a/test/common/stats/tag_extractor_impl_speed_test.cc b/test/common/stats/tag_extractor_impl_speed_test.cc index b9dd469db7541..d391a96f1b8fd 100644 --- a/test/common/stats/tag_extractor_impl_speed_test.cc +++ b/test/common/stats/tag_extractor_impl_speed_test.cc @@ -42,9 +42,9 @@ #include "envoy/config/metrics/v3/stats.pb.h" -#include "common/common/assert.h" -#include "common/config/well_known_names.h" -#include "common/stats/tag_producer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/config/well_known_names.h" +#include "source/common/stats/tag_producer_impl.h" #include "benchmark/benchmark.h" diff --git a/test/common/stats/tag_extractor_impl_test.cc b/test/common/stats/tag_extractor_impl_test.cc index e798c0df9522b..b259b461663b6 100644 --- a/test/common/stats/tag_extractor_impl_test.cc +++ b/test/common/stats/tag_extractor_impl_test.cc @@ -3,9 +3,9 @@ #include "envoy/common/exception.h" #include "envoy/config/metrics/v3/stats.pb.h" -#include "common/config/well_known_names.h" -#include "common/stats/tag_extractor_impl.h" -#include "common/stats/tag_producer_impl.h" +#include "source/common/config/well_known_names.h" +#include "source/common/stats/tag_extractor_impl.h" +#include "source/common/stats/tag_producer_impl.h" #include "test/test_common/utility.h" diff --git a/test/common/stats/tag_producer_impl_test.cc b/test/common/stats/tag_producer_impl_test.cc index 9ac1902354fac..db7be62da02f5 100644 --- a/test/common/stats/tag_producer_impl_test.cc +++ b/test/common/stats/tag_producer_impl_test.cc @@ -1,7 +1,7 @@ #include "envoy/config/metrics/v3/stats.pb.h" -#include "common/config/well_known_names.h" -#include "common/stats/tag_producer_impl.h" +#include "source/common/config/well_known_names.h" +#include "source/common/stats/tag_producer_impl.h" #include "test/test_common/utility.h" diff --git a/test/common/stats/thread_local_store_speed_test.cc b/test/common/stats/thread_local_store_speed_test.cc index 20aa7f503a29a..8ce08a84d052e 100644 --- a/test/common/stats/thread_local_store_speed_test.cc +++ b/test/common/stats/thread_local_store_speed_test.cc @@ -3,14 +3,14 @@ #include "envoy/config/metrics/v3/stats.pb.h" -#include "common/common/logger.h" -#include "common/common/thread.h" -#include "common/event/dispatcher_impl.h" -#include "common/stats/allocator_impl.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/tag_producer_impl.h" -#include "common/stats/thread_local_store.h" -#include "common/thread_local/thread_local_impl.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/stats/allocator_impl.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/tag_producer_impl.h" +#include "source/common/stats/thread_local_store.h" +#include "source/common/thread_local/thread_local_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/common/stats/thread_local_store_test.cc b/test/common/stats/thread_local_store_test.cc index 68733239e5b09..b6ee2c6a1a4ff 100644 --- a/test/common/stats/thread_local_store_test.cc +++ b/test/common/stats/thread_local_store_test.cc @@ -5,14 +5,14 @@ #include "envoy/config/metrics/v3/stats.pb.h" #include "envoy/stats/histogram.h" -#include "common/common/c_smart_ptr.h" -#include "common/event/dispatcher_impl.h" -#include "common/memory/stats.h" -#include "common/stats/stats_matcher_impl.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/tag_producer_impl.h" -#include "common/stats/thread_local_store.h" -#include "common/thread_local/thread_local_impl.h" +#include "source/common/common/c_smart_ptr.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/memory/stats.h" +#include "source/common/stats/stats_matcher_impl.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/tag_producer_impl.h" +#include "source/common/stats/thread_local_store.h" +#include "source/common/thread_local/thread_local_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/stats/utility_fuzz_test.cc b/test/common/stats/utility_fuzz_test.cc index eebdceab396d0..7c302624c740b 100644 --- a/test/common/stats/utility_fuzz_test.cc +++ b/test/common/stats/utility_fuzz_test.cc @@ -1,8 +1,8 @@ #include #include -#include "common/stats/isolated_store_impl.h" -#include "common/stats/utility.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/stats/utility.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/common/stats/utility_test.cc b/test/common/stats/utility_test.cc index 3c4bda7d122d1..ccd88004e0000 100644 --- a/test/common/stats/utility_test.cc +++ b/test/common/stats/utility_test.cc @@ -2,10 +2,10 @@ #include "envoy/stats/stats_macros.h" -#include "common/stats/isolated_store_impl.h" -#include "common/stats/null_counter.h" -#include "common/stats/null_gauge.h" -#include "common/stats/thread_local_store.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/stats/null_counter.h" +#include "source/common/stats/null_gauge.h" +#include "source/common/stats/thread_local_store.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" diff --git a/test/common/stream_info/BUILD b/test/common/stream_info/BUILD index 8f2a194a22cdf..92d905fa1c828 100644 --- a/test/common/stream_info/BUILD +++ b/test/common/stream_info/BUILD @@ -23,8 +23,8 @@ envoy_cc_test( srcs = ["stream_info_impl_test.cc"], deps = [ ":test_int_accessor_lib", - "//include/envoy/http:protocol_interface", - "//include/envoy/upstream:host_description_interface", + "//envoy/http:protocol_interface", + "//envoy/upstream:host_description_interface", "//source/common/stream_info:stream_info_lib", "//test/mocks/router:router_mocks", "//test/mocks/ssl:ssl_mocks", @@ -38,7 +38,7 @@ envoy_cc_test_library( name = "test_int_accessor_lib", hdrs = ["test_int_accessor.h"], deps = [ - "//include/envoy/stream_info:filter_state_interface", + "//envoy/stream_info:filter_state_interface", ], ) @@ -46,8 +46,8 @@ envoy_cc_test_library( name = "test_util", hdrs = ["test_util.h"], deps = [ - "//include/envoy/http:request_id_extension_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/http:request_id_extension_interface", + "//envoy/stream_info:stream_info_interface", "//source/common/common:assert_lib", "//source/common/common:random_generator_lib", "//source/common/runtime:runtime_lib", diff --git a/test/common/stream_info/filter_state_impl_test.cc b/test/common/stream_info/filter_state_impl_test.cc index 24590fa7c3715..f9e6a538d8e5b 100644 --- a/test/common/stream_info/filter_state_impl_test.cc +++ b/test/common/stream_info/filter_state_impl_test.cc @@ -1,6 +1,6 @@ #include "envoy/common/exception.h" -#include "common/stream_info/filter_state_impl.h" +#include "source/common/stream_info/filter_state_impl.h" #include "test/test_common/utility.h" diff --git a/test/common/stream_info/stream_info_impl_test.cc b/test/common/stream_info/stream_info_impl_test.cc index c9dce6241f3d7..88b2c04fb38c9 100644 --- a/test/common/stream_info/stream_info_impl_test.cc +++ b/test/common/stream_info/stream_info_impl_test.cc @@ -5,9 +5,9 @@ #include "envoy/stream_info/filter_state.h" #include "envoy/upstream/host_description.h" -#include "common/common/fmt.h" -#include "common/protobuf/utility.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stream_info/stream_info_impl.h" #include "test/common/stream_info/test_int_accessor.h" #include "test/mocks/router/mocks.h" diff --git a/test/common/stream_info/test_util.h b/test/common/stream_info/test_util.h index ba4324645ee33..8335d6317b749 100644 --- a/test/common/stream_info/test_util.h +++ b/test/common/stream_info/test_util.h @@ -3,12 +3,11 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/stream_info/stream_info.h" -#include "common/common/assert.h" -#include "common/common/random_generator.h" -#include "common/network/socket_impl.h" -#include "common/stream_info/filter_state_impl.h" - -#include "extensions/request_id/uuid/config.h" +#include "source/common/common/assert.h" +#include "source/common/common/random_generator.h" +#include "source/common/network/socket_impl.h" +#include "source/common/stream_info/filter_state_impl.h" +#include "source/extensions/request_id/uuid/config.h" #include "test/test_common/simulated_time_system.h" @@ -225,7 +224,7 @@ class TestStreamInfo : public StreamInfo::StreamInfo { absl::optional connectionID() const override { return connection_id_; } void setFilterChainName(absl::string_view filter_chain_name) override { - filter_chain_name_ = filter_chain_name; + filter_chain_name_ = std::string(filter_chain_name); } const std::string& filterChainName() const override { return filter_chain_name_; } diff --git a/test/common/stream_info/uint32_accessor_impl_test.cc b/test/common/stream_info/uint32_accessor_impl_test.cc index f9979892dbd35..156d89a3e3ca7 100644 --- a/test/common/stream_info/uint32_accessor_impl_test.cc +++ b/test/common/stream_info/uint32_accessor_impl_test.cc @@ -1,4 +1,4 @@ -#include "common/stream_info/uint32_accessor_impl.h" +#include "source/common/stream_info/uint32_accessor_impl.h" #include "gtest/gtest.h" diff --git a/test/common/stream_info/utility_test.cc b/test/common/stream_info/utility_test.cc index 05ace21094334..2cf533db85607 100644 --- a/test/common/stream_info/utility_test.cc +++ b/test/common/stream_info/utility_test.cc @@ -1,5 +1,5 @@ -#include "common/network/address_impl.h" -#include "common/stream_info/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/stream_info/utility.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/common/tcp/conn_pool_test.cc b/test/common/tcp/conn_pool_test.cc index 1b7796b8e6fc2..1399e589cc96f 100644 --- a/test/common/tcp/conn_pool_test.cc +++ b/test/common/tcp/conn_pool_test.cc @@ -1,12 +1,12 @@ #include #include -#include "common/event/dispatcher_impl.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/network/utility.h" -#include "common/tcp/conn_pool.h" -#include "common/tcp/original_conn_pool.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/network/utility.h" +#include "source/common/tcp/conn_pool.h" +#include "source/common/tcp/original_conn_pool.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" diff --git a/test/common/tcp_proxy/BUILD b/test/common/tcp_proxy/BUILD index b84cdb0c6d6a4..4105647647b6d 100644 --- a/test/common/tcp_proxy/BUILD +++ b/test/common/tcp_proxy/BUILD @@ -26,7 +26,6 @@ envoy_cc_test_library( "//source/common/tcp_proxy", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", - "//source/extensions/access_loggers:well_known_names", "//source/extensions/access_loggers/file:config", "//source/extensions/upstreams/http/generic:config", "//test/common/upstream:utility_lib", diff --git a/test/common/tcp_proxy/config_test.cc b/test/common/tcp_proxy/config_test.cc index 98f29fdbfb867..5ea8c2c3a3e3f 100644 --- a/test/common/tcp_proxy/config_test.cc +++ b/test/common/tcp_proxy/config_test.cc @@ -773,7 +773,7 @@ TEST(ConfigTest, HashWithSourceIpDefaultConfig) { TEST(ConfigTest, AccessLogConfig) { envoy::extensions::filters::network::tcp_proxy::v3::TcpProxy config; envoy::config::accesslog::v3::AccessLog* log = config.mutable_access_log()->Add(); - log->set_name(Extensions::AccessLoggers::AccessLogNames::get().File); + log->set_name("envoy.access_loggers.file"); { envoy::extensions::access_loggers::file::v3::FileAccessLog file_access_log; file_access_log.set_path("some_path"); @@ -783,7 +783,7 @@ TEST(ConfigTest, AccessLogConfig) { } log = config.mutable_access_log()->Add(); - log->set_name(Extensions::AccessLoggers::AccessLogNames::get().File); + log->set_name("envoy.access_loggers.file"); { envoy::extensions::access_loggers::file::v3::FileAccessLog file_access_log; file_access_log.set_path("another path"); @@ -847,7 +847,7 @@ TEST_F(TcpProxyRoutingTest, DEPRECATED_FEATURE_TEST(NonRoutableConnection)) { // Expect filter to try to open a connection to the fallback cluster. EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(Return(nullptr)); + .WillOnce(Return(absl::nullopt)); filter_->onNewConnection(); @@ -870,7 +870,7 @@ TEST_F(TcpProxyRoutingTest, DEPRECATED_FEATURE_TEST(RoutableConnection)) { // Expect filter to try to open a connection to specified cluster. EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(Return(nullptr)); + .WillOnce(Return(absl::nullopt)); filter_->onNewConnection(); @@ -891,7 +891,7 @@ TEST_F(TcpProxyRoutingTest, DEPRECATED_FEATURE_TEST(UseClusterFromPerConnectionC // Expect filter to try to open a connection to specified cluster. EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(Return(nullptr)); + .WillOnce(Return(absl::nullopt)); filter_->onNewConnection(); } @@ -910,16 +910,14 @@ TEST_F(TcpProxyRoutingTest, DEPRECATED_FEATURE_TEST(UpstreamServerName)) { // Expect filter to try to open a connection to a cluster with the transport socket options with // override-server-name EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce( - Invoke([](Upstream::ResourcePriority, - Upstream::LoadBalancerContext* context) -> Tcp::ConnectionPool::Instance* { - Network::TransportSocketOptionsSharedPtr transport_socket_options = - context->upstreamTransportSocketOptions(); - EXPECT_NE(transport_socket_options, nullptr); - EXPECT_TRUE(transport_socket_options->serverNameOverride().has_value()); - EXPECT_EQ(transport_socket_options->serverNameOverride().value(), "www.example.com"); - return nullptr; - })); + .WillOnce(Invoke([](Upstream::ResourcePriority, Upstream::LoadBalancerContext* context) { + Network::TransportSocketOptionsSharedPtr transport_socket_options = + context->upstreamTransportSocketOptions(); + EXPECT_NE(transport_socket_options, nullptr); + EXPECT_TRUE(transport_socket_options->serverNameOverride().has_value()); + EXPECT_EQ(transport_socket_options->serverNameOverride().value(), "www.example.com"); + return absl::nullopt; + })); // Port 9999 is within the specified destination port range. connection_.stream_info_.downstream_address_provider_->setLocalAddress( @@ -942,18 +940,16 @@ TEST_F(TcpProxyRoutingTest, DEPRECATED_FEATURE_TEST(ApplicationProtocols)) { // Expect filter to try to open a connection to a cluster with the transport socket options with // override-application-protocol EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce( - Invoke([](Upstream::ResourcePriority, - Upstream::LoadBalancerContext* context) -> Tcp::ConnectionPool::Instance* { - Network::TransportSocketOptionsSharedPtr transport_socket_options = - context->upstreamTransportSocketOptions(); - EXPECT_NE(transport_socket_options, nullptr); - EXPECT_FALSE(transport_socket_options->applicationProtocolListOverride().empty()); - EXPECT_EQ(transport_socket_options->applicationProtocolListOverride().size(), 2); - EXPECT_EQ(transport_socket_options->applicationProtocolListOverride()[0], "foo"); - EXPECT_EQ(transport_socket_options->applicationProtocolListOverride()[1], "bar"); - return nullptr; - })); + .WillOnce(Invoke([](Upstream::ResourcePriority, Upstream::LoadBalancerContext* context) { + Network::TransportSocketOptionsSharedPtr transport_socket_options = + context->upstreamTransportSocketOptions(); + EXPECT_NE(transport_socket_options, nullptr); + EXPECT_FALSE(transport_socket_options->applicationProtocolListOverride().empty()); + EXPECT_EQ(transport_socket_options->applicationProtocolListOverride().size(), 2); + EXPECT_EQ(transport_socket_options->applicationProtocolListOverride()[0], "foo"); + EXPECT_EQ(transport_socket_options->applicationProtocolListOverride()[1], "bar"); + return absl::nullopt; + })); // Port 9999 is within the specified destination port range. connection_.stream_info_.downstream_address_provider_->setLocalAddress( @@ -986,7 +982,7 @@ TEST_F(TcpProxyNonDeprecatedConfigRoutingTest, ClusterNameSet) { // Expect filter to try to open a connection to specified cluster. EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(Return(nullptr)); + .WillOnce(Return(absl::nullopt)); absl::optional cluster_info; EXPECT_CALL(connection_.stream_info_, setUpstreamClusterInfo(_)) .WillOnce( @@ -1036,12 +1032,10 @@ TEST_F(TcpProxyHashingTest, HashWithSourceIp) { setup(); initializeFilter(); EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce( - Invoke([](Upstream::ResourcePriority, - Upstream::LoadBalancerContext* context) -> Tcp::ConnectionPool::Instance* { - EXPECT_TRUE(context->computeHashKey().has_value()); - return nullptr; - })); + .WillOnce(Invoke([](Upstream::ResourcePriority, Upstream::LoadBalancerContext* context) { + EXPECT_TRUE(context->computeHashKey().has_value()); + return absl::nullopt; + })); connection_.stream_info_.downstream_address_provider_->setRemoteAddress( std::make_shared("1.2.3.4", 1111)); diff --git a/test/common/tcp_proxy/tcp_proxy_test.cc b/test/common/tcp_proxy/tcp_proxy_test.cc index 43447d35a4119..3fd3d169f2904 100644 --- a/test/common/tcp_proxy/tcp_proxy_test.cc +++ b/test/common/tcp_proxy/tcp_proxy_test.cc @@ -12,19 +12,17 @@ #include "envoy/extensions/upstreams/http/generic/v3/generic_connection_pool.pb.h" #include "envoy/extensions/upstreams/tcp/generic/v3/generic_connection_pool.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/address_impl.h" -#include "common/network/application_protocol.h" -#include "common/network/socket_option_factory.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/network/upstream_server_name.h" -#include "common/network/upstream_socket_options_filter_state.h" -#include "common/network/win32_redirect_records_option_impl.h" -#include "common/router/metadatamatchcriteria_impl.h" -#include "common/tcp_proxy/tcp_proxy.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/access_loggers/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/application_protocol.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/network/upstream_server_name.h" +#include "source/common/network/upstream_socket_options_filter_state.h" +#include "source/common/network/win32_redirect_records_option_impl.h" +#include "source/common/router/metadatamatchcriteria_impl.h" +#include "source/common/tcp_proxy/tcp_proxy.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/tcp_proxy/tcp_proxy_test_base.h" #include "test/common/upstream/utility.h" @@ -86,7 +84,7 @@ class TcpProxyTest : public TcpProxyTestBase { testing::InSequence sequence; for (uint32_t i = 0; i < connections; i++) { EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(Return(&conn_pool_)) + .WillOnce(Return(Upstream::TcpPoolData([]() {}, &conn_pool_))) .RetiresOnSaturation(); EXPECT_CALL(conn_pool_, newConnection(_)) .WillOnce(Invoke( @@ -98,7 +96,7 @@ class TcpProxyTest : public TcpProxyTestBase { .RetiresOnSaturation(); } EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillRepeatedly(Return(nullptr)); + .WillRepeatedly(Return(absl::nullopt)); } { @@ -553,7 +551,7 @@ TEST_F(TcpProxyTest, WeightedClusterWithMetadataMatch) { EXPECT_CALL(factory_context_.api_.random_, random()).WillOnce(Return(0)); EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(DoAll(SaveArg<1>(&context), Return(nullptr))); + .WillOnce(DoAll(SaveArg<1>(&context), Return(absl::nullopt))); EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onNewConnection()); EXPECT_NE(nullptr, context); @@ -577,7 +575,7 @@ TEST_F(TcpProxyTest, WeightedClusterWithMetadataMatch) { EXPECT_CALL(factory_context_.api_.random_, random()).WillOnce(Return(2)); EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(DoAll(SaveArg<1>(&context), Return(nullptr))); + .WillOnce(DoAll(SaveArg<1>(&context), Return(absl::nullopt))); EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onNewConnection()); EXPECT_NE(nullptr, context); @@ -616,7 +614,7 @@ TEST_F(TcpProxyTest, StreamInfoDynamicMetadata) { Upstream::LoadBalancerContext* context; EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(DoAll(SaveArg<1>(&context), Return(nullptr))); + .WillOnce(DoAll(SaveArg<1>(&context), Return(absl::nullopt))); EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onNewConnection()); EXPECT_NE(nullptr, context); @@ -670,7 +668,7 @@ TEST_F(TcpProxyTest, StreamInfoDynamicMetadataAndConfigMerged) { Upstream::LoadBalancerContext* context; EXPECT_CALL(factory_context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(DoAll(SaveArg<1>(&context), Return(nullptr))); + .WillOnce(DoAll(SaveArg<1>(&context), Return(absl::nullopt))); EXPECT_EQ(Network::FilterStatus::StopIteration, filter_->onNewConnection()); EXPECT_NE(nullptr, context); diff --git a/test/common/tcp_proxy/tcp_proxy_test_base.h b/test/common/tcp_proxy/tcp_proxy_test_base.h index 7c3d5d7176709..cb1c62a9a59d5 100644 --- a/test/common/tcp_proxy/tcp_proxy_test_base.h +++ b/test/common/tcp_proxy/tcp_proxy_test_base.h @@ -14,16 +14,14 @@ #include "envoy/extensions/upstreams/http/generic/v3/generic_connection_pool.pb.h" #include "envoy/extensions/upstreams/tcp/generic/v3/generic_connection_pool.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/address_impl.h" -#include "common/network/application_protocol.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/network/upstream_server_name.h" -#include "common/router/metadatamatchcriteria_impl.h" -#include "common/tcp_proxy/tcp_proxy.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/access_loggers/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/application_protocol.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/network/upstream_server_name.h" +#include "source/common/router/metadatamatchcriteria_impl.h" +#include "source/common/tcp_proxy/tcp_proxy.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/buffer/mocks.h" @@ -110,7 +108,7 @@ class TcpProxyTestBase : public testing::Test { accessLogConfig(const std::string& access_log_format) { envoy::extensions::filters::network::tcp_proxy::v3::TcpProxy config = defaultConfig(); envoy::config::accesslog::v3::AccessLog* access_log = config.mutable_access_log()->Add(); - access_log->set_name(Extensions::AccessLoggers::AccessLogNames::get().File); + access_log->set_name("envoy.access_loggers.file"); envoy::extensions::access_loggers::file::v3::FileAccessLog file_access_log; file_access_log.set_path("unused"); file_access_log.mutable_log_format()->mutable_text_format_source()->set_inline_string( diff --git a/test/common/tcp_proxy/upstream_test.cc b/test/common/tcp_proxy/upstream_test.cc index d1fd2972886a1..ce4184067be55 100644 --- a/test/common/tcp_proxy/upstream_test.cc +++ b/test/common/tcp_proxy/upstream_test.cc @@ -1,6 +1,6 @@ #include -#include "common/tcp_proxy/upstream.h" +#include "source/common/tcp_proxy/upstream.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/http/mocks.h" diff --git a/test/common/thread_local/thread_local_impl_test.cc b/test/common/thread_local/thread_local_impl_test.cc index 89a13a6263efa..f6937240803d4 100644 --- a/test/common/thread_local/thread_local_impl_test.cc +++ b/test/common/thread_local/thread_local_impl_test.cc @@ -1,7 +1,7 @@ -#include "common/common/thread.h" -#include "common/event/dispatcher_impl.h" -#include "common/stats/isolated_store_impl.h" -#include "common/thread_local/thread_local_impl.h" +#include "source/common/common/thread.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/thread_local/thread_local_impl.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/tracing/http_tracer_impl_test.cc b/test/common/tracing/http_tracer_impl_test.cc index 7942815006ec6..256270dffe70a 100644 --- a/test/common/tracing/http_tracer_impl_test.cc +++ b/test/common/tracing/http_tracer_impl_test.cc @@ -5,13 +5,13 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/type/tracing/v3/custom_tag.pb.h" -#include "common/common/base64.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" -#include "common/tracing/http_tracer_impl.h" +#include "source/common/common/base64.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/common/tracing/http_tracer_impl.h" #include "test/mocks/http/mocks.h" #include "test/mocks/local_info/mocks.h" diff --git a/test/common/tracing/http_tracer_manager_impl_test.cc b/test/common/tracing/http_tracer_manager_impl_test.cc index 2b49433879b45..a7c564d4eb2f2 100644 --- a/test/common/tracing/http_tracer_manager_impl_test.cc +++ b/test/common/tracing/http_tracer_manager_impl_test.cc @@ -1,6 +1,6 @@ -#include "common/tracing/http_tracer_impl.h" -#include "common/tracing/http_tracer_manager_impl.h" -#include "common/tracing/tracer_config_impl.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/common/tracing/http_tracer_manager_impl.h" +#include "source/common/tracing/tracer_config_impl.h" #include "test/mocks/server/instance.h" #include "test/mocks/server/tracer_factory.h" diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index c4964177d10fb..16fd761aa7394 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -71,7 +71,7 @@ envoy_cc_test( name = "conn_pool_map_impl_test", srcs = ["conn_pool_map_impl_test.cc"], deps = [ - "//include/envoy/http:conn_pool_interface", + "//envoy/http:conn_pool_interface", "//source/common/upstream:conn_pool_map_impl_lib", "//test/mocks:common_lib", "//test/mocks/event:event_mocks", @@ -210,7 +210,7 @@ envoy_cc_test( name = "host_stats_test", srcs = ["host_stats_test.cc"], deps = [ - "//include/envoy/upstream:host_description_interface", + "//envoy/upstream:host_description_interface", ], ) @@ -425,7 +425,7 @@ envoy_cc_test( external_deps = ["abseil_optional"], deps = [ ":utility_lib", - "//include/envoy/common:time_interface", + "//envoy/common:time_interface", "//source/common/network:utility_lib", "//source/common/upstream:outlier_detection_lib", "//source/common/upstream:upstream_includes", @@ -449,7 +449,7 @@ envoy_cc_test( name = "priority_conn_pool_map_impl_test", srcs = ["priority_conn_pool_map_impl_test.cc"], deps = [ - "//include/envoy/http:conn_pool_interface", + "//envoy/http:conn_pool_interface", "//source/common/upstream:priority_conn_pool_map_impl_lib", "//test/mocks:common_lib", "//test/mocks/event:event_mocks", @@ -463,7 +463,7 @@ envoy_cc_test( name = "resource_manager_impl_test", srcs = ["resource_manager_impl_test.cc"], deps = [ - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:upstream_interface", "//source/common/upstream:resource_manager_lib", "//test/mocks/runtime:runtime_mocks", "//test/mocks/stats:stats_mocks", @@ -475,7 +475,7 @@ envoy_cc_test( srcs = ["ring_hash_lb_test.cc"], deps = [ ":utility_lib", - "//include/envoy/router:router_interface", + "//envoy/router:router_interface", "//source/common/network:utility_lib", "//source/common/upstream:ring_hash_lb_lib", "//source/common/upstream:upstream_includes", @@ -574,7 +574,7 @@ envoy_cc_test( name = "transport_socket_matcher_test", srcs = ["transport_socket_matcher_test.cc"], deps = [ - "//include/envoy/api:api_interface", + "//envoy/api:api_interface", "//source/common/config:metadata_lib", "//source/common/network:transport_socket_options_lib", "//source/common/upstream:transport_socket_match_lib", @@ -598,9 +598,9 @@ envoy_cc_test( "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", - "//include/envoy/api:api_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/api:api_interface", + "//envoy/http:codec_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/config:metadata_lib", "//source/common/event:dispatcher_lib", "//source/common/network:utility_lib", @@ -635,7 +635,7 @@ envoy_cc_test_library( name = "utility_lib", hdrs = ["utility.h"], deps = [ - "//include/envoy/stats:stats_interface", + "//envoy/stats:stats_interface", "//source/common/json:json_loader_lib", "//source/common/network:utility_lib", "//source/common/stats:stats_lib", @@ -654,8 +654,8 @@ envoy_cc_test_library( hdrs = ["test_cluster_manager.h"], deps = [ ":utility_lib", - "//include/envoy/stats:stats_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/stats:stats_interface", + "//envoy/upstream:upstream_interface", "//source/common/api:api_lib", "//source/common/config:utility_lib", "//source/common/event:dispatcher_lib", @@ -698,10 +698,10 @@ envoy_cc_test( srcs = ["cluster_factory_impl_test.cc"], deps = [ ":utility_lib", - "//include/envoy/api:api_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/upstream:cluster_factory_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/api:api_interface", + "//envoy/http:codec_interface", + "//envoy/upstream:cluster_factory_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/config:metadata_lib", "//source/common/event:dispatcher_lib", "//source/common/json:json_loader_lib", diff --git a/test/common/upstream/bounded_load_hlb_test.cc b/test/common/upstream/bounded_load_hlb_test.cc index 312d45fc34b95..c9d0b9a7899b3 100644 --- a/test/common/upstream/bounded_load_hlb_test.cc +++ b/test/common/upstream/bounded_load_hlb_test.cc @@ -2,7 +2,7 @@ #include "envoy/config/cluster/v3/cluster.pb.h" -#include "common/upstream/thread_aware_lb_impl.h" +#include "source/common/upstream/thread_aware_lb_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/upstream/mocks.h" diff --git a/test/common/upstream/cds_api_impl_test.cc b/test/common/upstream/cds_api_impl_test.cc index 9fd535fa72041..33eaee18fa92d 100644 --- a/test/common/upstream/cds_api_impl_test.cc +++ b/test/common/upstream/cds_api_impl_test.cc @@ -7,9 +7,9 @@ #include "envoy/config/core/v3/config_source.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/utility.h" -#include "common/protobuf/utility.h" -#include "common/upstream/cds_api_impl.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/upstream/cds_api_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/protobuf/mocks.h" diff --git a/test/common/upstream/cluster_factory_impl_test.cc b/test/common/upstream/cluster_factory_impl_test.cc index 883bd761f012b..8ae0c5cad5f5c 100644 --- a/test/common/upstream/cluster_factory_impl_test.cc +++ b/test/common/upstream/cluster_factory_impl_test.cc @@ -10,11 +10,10 @@ #include "envoy/http/codec.h" #include "envoy/upstream/cluster_manager.h" -#include "common/network/utility.h" -#include "common/singleton/manager_impl.h" -#include "common/upstream/cluster_factory_impl.h" - -#include "server/transport_socket_config_impl.h" +#include "source/common/network/utility.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/server/transport_socket_config_impl.h" #include "test/common/upstream/utility.h" #include "test/integration/clusters/cluster_factory_config.pb.validate.h" diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index d15250242ab6b..4357ca2dccfc9 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -4,12 +4,13 @@ #include "envoy/config/cluster/v3/cluster.pb.validate.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/network/raw_buffer_socket.h" -#include "common/router/context_impl.h" - -#include "extensions/transport_sockets/raw_buffer/config.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/common/network/resolver_impl.h" +#include "source/common/router/context_impl.h" +#include "source/extensions/transport_sockets/raw_buffer/config.h" #include "test/common/upstream/test_cluster_manager.h" +#include "test/mocks/http/conn_pool.h" #include "test/mocks/upstream/cds_api.h" #include "test/mocks/upstream/cluster_priority_set.h" #include "test/mocks/upstream/cluster_real_priority_set.h" @@ -21,6 +22,23 @@ namespace Envoy { namespace Upstream { + +class HttpPoolDataPeer { +public: + static Http::ConnectionPool::MockInstance* getPool(absl::optional data) { + ASSERT(data.has_value()); + return dynamic_cast(data.value().pool_); + } +}; + +class TcpPoolDataPeer { +public: + static Tcp::ConnectionPool::MockInstance* getPool(absl::optional data) { + ASSERT(data.has_value()); + return dynamic_cast(data.value().pool_); + } +}; + namespace { using ::testing::_; @@ -155,6 +173,10 @@ class ClusterManagerImplTest : public testing::Test { Router::ContextImpl router_context_; }; +MATCHER_P(CustomDnsResolversSizeEquals, expectedResolvers, "") { + return expectedResolvers.size() == arg.size(); +} + envoy::config::bootstrap::v3::Bootstrap defaultConfig() { const std::string yaml = R"EOF( static_resources: @@ -1604,13 +1626,14 @@ TEST_F(ClusterManagerImplTest, DynamicAddRemove) { EXPECT_EQ(1UL, cluster_manager_->clusters().active_clusters_.size()); Http::ConnectionPool::MockInstance* cp = new Http::ConnectionPool::MockInstance(); EXPECT_CALL(factory_, allocateConnPool_(_, _, _, _, _)).WillOnce(Return(cp)); - EXPECT_EQ(cp, cluster_manager_->getThreadLocalCluster("fake_cluster") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); + EXPECT_EQ(cp, HttpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("fake_cluster") + ->httpConnPool(ResourcePriority::Default, + Http::Protocol::Http11, nullptr))); Tcp::ConnectionPool::MockInstance* cp2 = new Tcp::ConnectionPool::MockInstance(); EXPECT_CALL(factory_, allocateTcpConnPool_(_)).WillOnce(Return(cp2)); - EXPECT_EQ(cp2, cluster_manager_->getThreadLocalCluster("fake_cluster") - ->tcpConnPool(ResourcePriority::Default, nullptr)); + EXPECT_EQ(cp2, TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("fake_cluster") + ->tcpConnPool(ResourcePriority::Default, nullptr))); Network::MockClientConnection* connection = new Network::MockClientConnection(); ON_CALL(*cluster2->info_, features()) @@ -1991,10 +2014,11 @@ TEST_F(ClusterManagerImplTest, DynamicHostRemove) { connect_timeout: 0.250s type: STRICT_DNS lb_policy: ROUND_ROBIN - dns_resolvers: - - socket_address: - address: 1.2.3.4 - port_value: 80 + dns_resolution_config: + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 load_assignment: cluster_name: cluster_1 endpoints: @@ -2039,16 +2063,16 @@ TEST_F(ClusterManagerImplTest, DynamicHostRemove) { .WillRepeatedly(ReturnNew()); // This should provide us a CP for each of the above hosts. - Http::ConnectionPool::MockInstance* cp1 = dynamic_cast( + Http::ConnectionPool::MockInstance* cp1 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - Http::ConnectionPool::MockInstance* cp2 = dynamic_cast( + Http::ConnectionPool::MockInstance* cp2 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - Http::ConnectionPool::MockInstance* cp1_high = dynamic_cast( + Http::ConnectionPool::MockInstance* cp1_high = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::High, Http::Protocol::Http11, nullptr)); - Http::ConnectionPool::MockInstance* cp2_high = dynamic_cast( + Http::ConnectionPool::MockInstance* cp2_high = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::High, Http::Protocol::Http11, nullptr)); @@ -2066,18 +2090,18 @@ TEST_F(ClusterManagerImplTest, DynamicHostRemove) { .WillRepeatedly(ReturnNew()); // This should provide us a CP for each of the above hosts. - Tcp::ConnectionPool::MockInstance* tcp1 = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp2 = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp1_high = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::High, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp2_high = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::High, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp1 = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp2 = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp1_high = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::High, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp2_high = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::High, nullptr)); EXPECT_NE(tcp1, tcp2); EXPECT_NE(tcp1_high, tcp2_high); @@ -2103,21 +2127,21 @@ TEST_F(ClusterManagerImplTest, DynamicHostRemove) { tcp_drained_cb_high = nullptr; // Make sure we get back the same connection pool for the 2nd host as we did before the change. - Http::ConnectionPool::MockInstance* cp3 = dynamic_cast( + Http::ConnectionPool::MockInstance* cp3 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - Http::ConnectionPool::MockInstance* cp3_high = dynamic_cast( + Http::ConnectionPool::MockInstance* cp3_high = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::High, Http::Protocol::Http11, nullptr)); EXPECT_EQ(cp2, cp3); EXPECT_EQ(cp2_high, cp3_high); - Tcp::ConnectionPool::MockInstance* tcp3 = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp3_high = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::High, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp3 = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp3_high = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::High, nullptr)); EXPECT_EQ(tcp2, tcp3); EXPECT_EQ(tcp2_high, tcp3_high); @@ -2136,10 +2160,11 @@ TEST_F(ClusterManagerImplTest, DynamicHostRemoveWithTls) { - name: cluster_1 connect_timeout: 0.250s type: STRICT_DNS - dns_resolvers: - - socket_address: - address: 1.2.3.4 - port_value: 80 + dns_resolution_config: + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 lb_policy: ROUND_ROBIN load_assignment: cluster_name: cluster_1 @@ -2203,16 +2228,16 @@ TEST_F(ClusterManagerImplTest, DynamicHostRemoveWithTls) { .WillRepeatedly(ReturnNew()); // This should provide us a CP for each of the above hosts. - Http::ConnectionPool::MockInstance* cp1 = dynamic_cast( + Http::ConnectionPool::MockInstance* cp1 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - Http::ConnectionPool::MockInstance* cp2 = dynamic_cast( + Http::ConnectionPool::MockInstance* cp2 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - Http::ConnectionPool::MockInstance* cp1_high = dynamic_cast( + Http::ConnectionPool::MockInstance* cp1_high = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::High, Http::Protocol::Http11, nullptr)); - Http::ConnectionPool::MockInstance* cp2_high = dynamic_cast( + Http::ConnectionPool::MockInstance* cp2_high = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::High, Http::Protocol::Http11, nullptr)); @@ -2230,36 +2255,32 @@ TEST_F(ClusterManagerImplTest, DynamicHostRemoveWithTls) { .WillRepeatedly(ReturnNew()); // This should provide us a CP for each of the above hosts, and for different SNIs - Tcp::ConnectionPool::MockInstance* tcp1 = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp2 = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp1_high = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::High, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp2_high = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::High, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp1 = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp2 = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp1_high = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::High, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp2_high = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::High, nullptr)); Tcp::ConnectionPool::MockInstance* tcp1_example_com = - dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, &example_com_context)); + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, &example_com_context)); Tcp::ConnectionPool::MockInstance* tcp2_example_com = - dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, &example_com_context)); + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, &example_com_context)); Tcp::ConnectionPool::MockInstance* tcp1_ibm_com = - dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, &ibm_com_context)); + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, &ibm_com_context)); Tcp::ConnectionPool::MockInstance* tcp2_ibm_com = - dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, &ibm_com_context)); + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, &ibm_com_context)); EXPECT_NE(tcp1, tcp2); EXPECT_NE(tcp1_high, tcp2_high); @@ -2322,38 +2343,34 @@ TEST_F(ClusterManagerImplTest, DynamicHostRemoveWithTls) { tcp_drained_cb_ibm_com = nullptr; // Make sure we get back the same connection pool for the 2nd host as we did before the change. - Http::ConnectionPool::MockInstance* cp3 = dynamic_cast( + Http::ConnectionPool::MockInstance* cp3 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - Http::ConnectionPool::MockInstance* cp3_high = dynamic_cast( + Http::ConnectionPool::MockInstance* cp3_high = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::High, Http::Protocol::Http11, nullptr)); EXPECT_EQ(cp2, cp3); EXPECT_EQ(cp2_high, cp3_high); - Tcp::ConnectionPool::MockInstance* tcp3 = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp3_high = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::High, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp3 = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp3_high = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::High, nullptr)); Tcp::ConnectionPool::MockInstance* tcp3_example_com = - dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, &example_com_context)); - Tcp::ConnectionPool::MockInstance* tcp3_example_com_with_san = - dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, &example_com_context_with_san)); - Tcp::ConnectionPool::MockInstance* tcp3_example_com_with_san2 = - dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, &example_com_context_with_san2)); + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, &example_com_context)); + Tcp::ConnectionPool::MockInstance* tcp3_example_com_with_san = TcpPoolDataPeer::getPool( + cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, &example_com_context_with_san)); + Tcp::ConnectionPool::MockInstance* tcp3_example_com_with_san2 = TcpPoolDataPeer::getPool( + cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, &example_com_context_with_san2)); Tcp::ConnectionPool::MockInstance* tcp3_ibm_com = - dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, &ibm_com_context)); + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, &ibm_com_context)); EXPECT_EQ(tcp2, tcp3); EXPECT_EQ(tcp2_high, tcp3_high); @@ -2374,10 +2391,14 @@ TEST_F(ClusterManagerImplTest, DynamicHostRemoveWithTls) { } // Test that default DNS resolver with TCP lookups is used, when there are no DNS custom resolvers -// configured per cluster and `use_tcp_for_dns_lookups` is set in bootstrap config. +// configured per cluster and `dns_resolver_options.use_tcp_for_dns_lookups` is set in bootstrap +// config. TEST_F(ClusterManagerImplTest, UseTcpInDefaultDnsResolver) { const std::string yaml = R"EOF( - use_tcp_for_dns_lookups: true + dns_resolution_config: + dns_resolver_options: + use_tcp_for_dns_lookups: true + no_default_search_domain: true static_resources: clusters: - name: cluster_1 @@ -2398,9 +2419,9 @@ TEST_F(ClusterManagerImplTest, UseTcpInDefaultDnsResolver) { factory_.tls_.shutdownThread(); } -// Test that custom DNS resolver with UDP lookups is used, when custom resolver is configured -// per cluster and `use_tcp_for_dns_lookups` is not specified. -TEST_F(ClusterManagerImplTest, UseUdpWithCustomDnsResolver) { +// Test that custom DNS resolver is used, when custom resolver is configured +// per cluster and deprecated field `dns_resolvers` is specified. +TEST_F(ClusterManagerImplTest, CustomDnsResolverSpecifiedViaDeprecatedField) { const std::string yaml = R"EOF( static_resources: clusters: @@ -2414,8 +2435,53 @@ TEST_F(ClusterManagerImplTest, UseUdpWithCustomDnsResolver) { )EOF"; std::shared_ptr dns_resolver(new Network::MockDnsResolver()); - // `false` here stands for using udp - EXPECT_CALL(factory_.dispatcher_, createDnsResolver(_, false)).WillOnce(Return(dns_resolver)); + auto resolvers = envoy::config::core::v3::Address(); + resolvers.mutable_socket_address()->set_address("1.2.3.4"); + resolvers.mutable_socket_address()->set_port_value(80); + std::vector expectedDnsResolvers; + expectedDnsResolvers.push_back(Network::Address::resolveProtoAddress(resolvers)); + + // As custom resolver is specified via deprecated field `dns_resolvers` in clusters + // config, the method `createDnsResolver` is called once. + EXPECT_CALL(factory_.dispatcher_, + createDnsResolver(CustomDnsResolversSizeEquals(expectedDnsResolvers), _)) + .WillOnce(Return(dns_resolver)); + + Network::DnsResolver::ResolveCb dns_callback; + Network::MockActiveDnsQuery active_dns_query; + EXPECT_CALL(*dns_resolver, resolve(_, _, _)) + .WillRepeatedly(DoAll(SaveArg<2>(&dns_callback), Return(&active_dns_query))); + create(parseBootstrapFromV3Yaml(yaml)); + factory_.tls_.shutdownThread(); +} + +// Test that custom DNS resolver is used, when custom resolver is configured per cluster. +TEST_F(ClusterManagerImplTest, CustomDnsResolverSpecified) { + const std::string yaml = R"EOF( + static_resources: + clusters: + - name: cluster_1 + connect_timeout: 0.250s + type: STRICT_DNS + dns_resolution_config: + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 + )EOF"; + + std::shared_ptr dns_resolver(new Network::MockDnsResolver()); + auto resolvers = envoy::config::core::v3::Address(); + resolvers.mutable_socket_address()->set_address("1.2.3.4"); + resolvers.mutable_socket_address()->set_port_value(80); + std::vector expectedDnsResolvers; + expectedDnsResolvers.push_back(Network::Address::resolveProtoAddress(resolvers)); + + // As custom resolver is specified via field `dns_resolution_config.resolvers` in clusters + // config, the method `createDnsResolver` is called once. + EXPECT_CALL(factory_.dispatcher_, + createDnsResolver(CustomDnsResolversSizeEquals(expectedDnsResolvers), _)) + .WillOnce(Return(dns_resolver)); Network::DnsResolver::ResolveCb dns_callback; Network::MockActiveDnsQuery active_dns_query; @@ -2425,9 +2491,40 @@ TEST_F(ClusterManagerImplTest, UseUdpWithCustomDnsResolver) { factory_.tls_.shutdownThread(); } +// Test that custom DNS resolver with UDP lookups is used, when custom resolver is configured +// per cluster and `use_tcp_for_dns_lookups` is not specified. +TEST_F(ClusterManagerImplTest, UseUdpWithCustomDnsResolver) { + const std::string yaml = R"EOF( + static_resources: + clusters: + - name: cluster_1 + connect_timeout: 0.250s + type: STRICT_DNS + dns_resolution_config: + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 + )EOF"; + + std::shared_ptr dns_resolver(new Network::MockDnsResolver()); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(factory_.dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(dns_resolver))); + + Network::DnsResolver::ResolveCb dns_callback; + Network::MockActiveDnsQuery active_dns_query; + EXPECT_CALL(*dns_resolver, resolve(_, _, _)) + .WillRepeatedly(DoAll(SaveArg<2>(&dns_callback), Return(&active_dns_query))); + create(parseBootstrapFromV3Yaml(yaml)); + // `false` here means use_tcp_for_dns_lookups is not being set via bootstrap config + EXPECT_EQ(false, dns_resolver_options.use_tcp_for_dns_lookups()); + factory_.tls_.shutdownThread(); +} + // Test that custom DNS resolver with TCP lookups is used, when custom resolver is configured -// per cluster and `use_tcp_for_dns_lookups` is enabled for that cluster. -TEST_F(ClusterManagerImplTest, UseTcpWithCustomDnsResolver) { +// per cluster and `use_tcp_for_dns_lookups` (deprecated field) is specified as true. +TEST_F(ClusterManagerImplTest, UseTcpWithCustomDnsResolverViaDeprecatedField) { const std::string yaml = R"EOF( static_resources: clusters: @@ -2442,14 +2539,218 @@ TEST_F(ClusterManagerImplTest, UseTcpWithCustomDnsResolver) { )EOF"; std::shared_ptr dns_resolver(new Network::MockDnsResolver()); - // `true` here stands for using tcp - EXPECT_CALL(factory_.dispatcher_, createDnsResolver(_, true)).WillOnce(Return(dns_resolver)); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(factory_.dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(dns_resolver))); + + Network::DnsResolver::ResolveCb dns_callback; + Network::MockActiveDnsQuery active_dns_query; + EXPECT_CALL(*dns_resolver, resolve(_, _, _)) + .WillRepeatedly(DoAll(SaveArg<2>(&dns_callback), Return(&active_dns_query))); + create(parseBootstrapFromV3Yaml(yaml)); + // `true` here means use_tcp_for_dns_lookups is set to true + EXPECT_EQ(true, dns_resolver_options.use_tcp_for_dns_lookups()); + factory_.tls_.shutdownThread(); +} + +// Test that custom DNS resolver with UDP lookups is used, when custom resolver is configured +// per cluster and `use_tcp_for_dns_lookups` is specified as true but is overridden +// by dns_resolution_config.dns_resolver_options.use_tcp_for_dns_lookups which is set as false. +TEST_F(ClusterManagerImplTest, UseUdpWithCustomDnsResolverDeprecatedFieldOverridden) { + const std::string yaml = R"EOF( + static_resources: + clusters: + - name: cluster_1 + use_tcp_for_dns_lookups: true + connect_timeout: 0.250s + type: STRICT_DNS + dns_resolution_config: + dns_resolver_options: + use_tcp_for_dns_lookups: false + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 + )EOF"; + + std::shared_ptr dns_resolver(new Network::MockDnsResolver()); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(factory_.dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(dns_resolver))); Network::DnsResolver::ResolveCb dns_callback; Network::MockActiveDnsQuery active_dns_query; EXPECT_CALL(*dns_resolver, resolve(_, _, _)) .WillRepeatedly(DoAll(SaveArg<2>(&dns_callback), Return(&active_dns_query))); create(parseBootstrapFromV3Yaml(yaml)); + // `false` here means dns_resolver_options.use_tcp_for_dns_lookups is set to false. + EXPECT_EQ(false, dns_resolver_options.use_tcp_for_dns_lookups()); + factory_.tls_.shutdownThread(); +} + +// Test that custom DNS resolver with TCP lookups is used, when custom resolver is configured +// per cluster and `use_tcp_for_dns_lookups` is specified as false but is overridden +// by dns_resolution_config.dns_resolver_options.use_tcp_for_dns_lookups which is specified as true. +TEST_F(ClusterManagerImplTest, UseTcpWithCustomDnsResolverDeprecatedFieldOverridden) { + const std::string yaml = R"EOF( + static_resources: + clusters: + - name: cluster_1 + use_tcp_for_dns_lookups: false + connect_timeout: 0.250s + type: STRICT_DNS + dns_resolution_config: + dns_resolver_options: + use_tcp_for_dns_lookups: true + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 + )EOF"; + + std::shared_ptr dns_resolver(new Network::MockDnsResolver()); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(factory_.dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(dns_resolver))); + + Network::DnsResolver::ResolveCb dns_callback; + Network::MockActiveDnsQuery active_dns_query; + EXPECT_CALL(*dns_resolver, resolve(_, _, _)) + .WillRepeatedly(DoAll(SaveArg<2>(&dns_callback), Return(&active_dns_query))); + create(parseBootstrapFromV3Yaml(yaml)); + // `true` here means dns_resolver_options.use_tcp_for_dns_lookups is set to true. + EXPECT_EQ(true, dns_resolver_options.use_tcp_for_dns_lookups()); + factory_.tls_.shutdownThread(); +} + +// Test that custom DNS resolver with TCP lookups is used, when custom resolver is configured +// per cluster and `dns_resolution_config.dns_resolver_options.use_tcp_for_dns_lookups` is enabled +// for that cluster. +TEST_F(ClusterManagerImplTest, UseTcpWithCustomDnsResolver) { + const std::string yaml = R"EOF( + static_resources: + clusters: + - name: cluster_1 + connect_timeout: 0.250s + type: STRICT_DNS + dns_resolution_config: + dns_resolver_options: + use_tcp_for_dns_lookups: true + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 + )EOF"; + + std::shared_ptr dns_resolver(new Network::MockDnsResolver()); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(factory_.dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(dns_resolver))); + + Network::DnsResolver::ResolveCb dns_callback; + Network::MockActiveDnsQuery active_dns_query; + EXPECT_CALL(*dns_resolver, resolve(_, _, _)) + .WillRepeatedly(DoAll(SaveArg<2>(&dns_callback), Return(&active_dns_query))); + create(parseBootstrapFromV3Yaml(yaml)); + // `true` here means dns_resolver_options.use_tcp_for_dns_lookups is set to true. + EXPECT_EQ(true, dns_resolver_options.use_tcp_for_dns_lookups()); + factory_.tls_.shutdownThread(); +} + +// Test that custom DNS resolver with default search domain, when custom resolver is configured +// per cluster and `no_default_search_domain` is not specified. +TEST_F(ClusterManagerImplTest, DefaultSearchDomainWithCustomDnsResolver) { + const std::string yaml = R"EOF( + static_resources: + clusters: + - name: cluster_1 + connect_timeout: 0.250s + type: STRICT_DNS + dns_resolution_config: + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 + )EOF"; + + std::shared_ptr dns_resolver(new Network::MockDnsResolver()); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(factory_.dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(dns_resolver))); + + Network::DnsResolver::ResolveCb dns_callback; + Network::MockActiveDnsQuery active_dns_query; + EXPECT_CALL(*dns_resolver, resolve(_, _, _)) + .WillRepeatedly(DoAll(SaveArg<2>(&dns_callback), Return(&active_dns_query))); + create(parseBootstrapFromV3Yaml(yaml)); + // `false` here means no_default_search_domain is not being set via bootstrap config + EXPECT_EQ(false, dns_resolver_options.no_default_search_domain()); + factory_.tls_.shutdownThread(); +} + +// Test that custom DNS resolver with default search domain, when custom resolver is configured +// per cluster and `no_default_search_domain` is specified as false. +TEST_F(ClusterManagerImplTest, DefaultSearchDomainWithCustomDnsResolverWithConfig) { + const std::string yaml = R"EOF( + static_resources: + clusters: + - name: cluster_1 + connect_timeout: 0.250s + type: STRICT_DNS + dns_resolution_config: + dns_resolver_options: + no_default_search_domain: false + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 + )EOF"; + + std::shared_ptr dns_resolver(new Network::MockDnsResolver()); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(factory_.dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(dns_resolver))); + + Network::DnsResolver::ResolveCb dns_callback; + Network::MockActiveDnsQuery active_dns_query; + EXPECT_CALL(*dns_resolver, resolve(_, _, _)) + .WillRepeatedly(DoAll(SaveArg<2>(&dns_callback), Return(&active_dns_query))); + create(parseBootstrapFromV3Yaml(yaml)); + // `false` here means dns_resolver_options.no_default_search_domain is set to false. + EXPECT_EQ(false, dns_resolver_options.no_default_search_domain()); + factory_.tls_.shutdownThread(); +} + +// Test that custom DNS resolver with no default search domain, when custom resolver is +// configured per cluster and `no_default_search_domain` is specified as true. +TEST_F(ClusterManagerImplTest, NoDefaultSearchDomainWithCustomDnsResolver) { + const std::string yaml = R"EOF( + static_resources: + clusters: + - name: cluster_1 + connect_timeout: 0.250s + type: STRICT_DNS + dns_resolution_config: + dns_resolver_options: + no_default_search_domain: true + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 + )EOF"; + + std::shared_ptr dns_resolver(new Network::MockDnsResolver()); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(factory_.dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(dns_resolver))); + + Network::DnsResolver::ResolveCb dns_callback; + Network::MockActiveDnsQuery active_dns_query; + EXPECT_CALL(*dns_resolver, resolve(_, _, _)) + .WillRepeatedly(DoAll(SaveArg<2>(&dns_callback), Return(&active_dns_query))); + create(parseBootstrapFromV3Yaml(yaml)); + // `true` here means dns_resolver_options.no_default_search_domain is set to true. + EXPECT_EQ(true, dns_resolver_options.no_default_search_domain()); factory_.tls_.shutdownThread(); } @@ -2464,10 +2765,11 @@ TEST_F(ClusterManagerImplTest, DynamicHostRemoveDefaultPriority) { - name: cluster_1 connect_timeout: 0.250s type: STRICT_DNS - dns_resolvers: - - socket_address: - address: 1.2.3.4 - port_value: 80 + dns_resolution_config: + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 lb_policy: ROUND_ROBIN load_assignment: cluster_name: cluster_1 @@ -2504,13 +2806,13 @@ TEST_F(ClusterManagerImplTest, DynamicHostRemoveDefaultPriority) { EXPECT_CALL(factory_, allocateTcpConnPool_(_)) .WillOnce(ReturnNew()); - Http::ConnectionPool::MockInstance* cp = dynamic_cast( + Http::ConnectionPool::MockInstance* cp = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); // Immediate drain, since this can happen with the HTTP codecs. EXPECT_CALL(*cp, addDrainedCallback(_)) @@ -2550,10 +2852,11 @@ TEST_F(ClusterManagerImplTest, ConnPoolDestroyWithDraining) { - name: cluster_1 connect_timeout: 0.250s type: STRICT_DNS - dns_resolvers: - - socket_address: - address: 1.2.3.4 - port_value: 80 + dns_resolution_config: + resolvers: + - socket_address: + address: 1.2.3.4 + port_value: 80 lb_policy: ROUND_ROBIN load_assignment: cluster_name: cluster_1 @@ -2590,13 +2893,13 @@ TEST_F(ClusterManagerImplTest, ConnPoolDestroyWithDraining) { MockTcpConnPoolWithDestroy* mock_tcp = new MockTcpConnPoolWithDestroy(); EXPECT_CALL(factory_, allocateTcpConnPool_(_)).WillOnce(Return(mock_tcp)); - Http::ConnectionPool::MockInstance* cp = dynamic_cast( + Http::ConnectionPool::MockInstance* cp = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); // Remove the first host, this should lead to the cp being drained. Http::ConnectionPool::Instance::DrainedCb drained_cb; @@ -2641,11 +2944,11 @@ TEST_F(ClusterManagerImplTest, OriginalDstInitialization) { EXPECT_FALSE(all_clusters.active_clusters_.at("cluster_1").get().info()->addedViaApi()); // Test for no hosts returning the correct values before we have hosts. - EXPECT_EQ(nullptr, + EXPECT_EQ(absl::nullopt, cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - EXPECT_EQ(nullptr, cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); + EXPECT_EQ(absl::nullopt, cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); EXPECT_EQ(nullptr, cluster_manager_->getThreadLocalCluster("cluster_1")->tcpConn(nullptr).connection_); EXPECT_EQ(3UL, factory_.stats_.counter("cluster.cluster_1.upstream_cx_none_healthy").value()); @@ -3041,9 +3344,9 @@ TEST_F(ClusterManagerImplTest, UpstreamSocketOptionsPassedToTcpConnPool) { EXPECT_CALL(context, upstreamSocketOptions()).WillOnce(Return(options_to_return)); EXPECT_CALL(factory_, allocateTcpConnPool_(_)).WillOnce(Return(to_create)); - Tcp::ConnectionPool::Instance* cp = cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, &context); - EXPECT_NE(nullptr, cp); + auto opt_cp = cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, &context); + EXPECT_TRUE(opt_cp.has_value()); } TEST_F(ClusterManagerImplTest, UpstreamSocketOptionsPassedToConnPool) { @@ -3057,11 +3360,9 @@ TEST_F(ClusterManagerImplTest, UpstreamSocketOptionsPassedToConnPool) { EXPECT_CALL(context, upstreamSocketOptions()).WillOnce(Return(options_to_return)); EXPECT_CALL(factory_, allocateConnPool_(_, _, _, _, _)).WillOnce(Return(to_create)); - Http::ConnectionPool::Instance* cp = - cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context); - - EXPECT_NE(nullptr, cp); + auto opt_cp = cluster_manager_->getThreadLocalCluster("cluster_1") + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context); + EXPECT_TRUE(opt_cp.has_value()); } TEST_F(ClusterManagerImplTest, UpstreamSocketOptionsUsedInConnPoolHash) { @@ -3080,21 +3381,23 @@ TEST_F(ClusterManagerImplTest, UpstreamSocketOptionsUsedInConnPoolHash) { EXPECT_CALL(context2, upstreamSocketOptions()).WillRepeatedly(Return(options2)); EXPECT_CALL(factory_, allocateConnPool_(_, _, _, _, _)).WillOnce(Return(to_create1)); - Http::ConnectionPool::Instance* cp1 = + Http::ConnectionPool::Instance* cp1 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context1); + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context1)); EXPECT_CALL(factory_, allocateConnPool_(_, _, _, _, _)).WillOnce(Return(to_create2)); - Http::ConnectionPool::Instance* cp2 = + Http::ConnectionPool::Instance* cp2 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context2); + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context2)); - Http::ConnectionPool::Instance* should_be_cp1 = + Http::ConnectionPool::Instance* should_be_cp1 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context1); - Http::ConnectionPool::Instance* should_be_cp2 = + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context1)); + EXPECT_NE(nullptr, cp1); + EXPECT_NE(nullptr, cp2); + Http::ConnectionPool::Instance* should_be_cp2 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context2); + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context2)); // The different upstream options should lead to different hashKeys, thus different pools. EXPECT_NE(cp1, cp2); @@ -3114,11 +3417,9 @@ TEST_F(ClusterManagerImplTest, UpstreamSocketOptionsNullIsOkay) { EXPECT_CALL(context, upstreamSocketOptions()).WillOnce(Return(options_to_return)); EXPECT_CALL(factory_, allocateConnPool_(_, _, _, _, _)).WillOnce(Return(to_create)); - Http::ConnectionPool::Instance* cp = - cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context); - - EXPECT_NE(nullptr, cp); + auto opt_cp = cluster_manager_->getThreadLocalCluster("cluster_1") + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &context); + EXPECT_TRUE(opt_cp.has_value()); } class TestUpstreamNetworkFilter : public Network::WriteFilter { @@ -4002,11 +4303,11 @@ TEST_F(ClusterManagerImplTest, ConnPoolsDrainedOnHostSetChange) { EXPECT_FALSE(all_clusters.active_clusters_.at("cluster_1").get().info()->addedViaApi()); // Verify that we get no hosts when the HostSet is empty. - EXPECT_EQ(nullptr, + EXPECT_EQ(absl::nullopt, cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - EXPECT_EQ(nullptr, cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); + EXPECT_EQ(absl::nullopt, cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); EXPECT_EQ(nullptr, cluster_manager_->getThreadLocalCluster("cluster_1")->tcpConn(nullptr).connection_); @@ -4037,21 +4338,21 @@ TEST_F(ClusterManagerImplTest, ConnPoolsDrainedOnHostSetChange) { .WillRepeatedly(ReturnNew()); // This should provide us a CP for each of the above hosts. - Http::ConnectionPool::MockInstance* cp1 = dynamic_cast( + Http::ConnectionPool::MockInstance* cp1 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); // Create persistent connection for host2. - Http::ConnectionPool::MockInstance* cp2 = dynamic_cast( + Http::ConnectionPool::MockInstance* cp2 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http2, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp1 = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp1 = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp2 = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp2 = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); EXPECT_NE(cp1, cp2); EXPECT_NE(tcp1, tcp2); @@ -4077,13 +4378,12 @@ TEST_F(ClusterManagerImplTest, ConnPoolsDrainedOnHostSetChange) { hosts_removed, 100); // Recreate connection pool for host1. - cp1 = dynamic_cast( + cp1 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - tcp1 = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); + tcp1 = TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); HostSharedPtr host3 = makeTestHost(cluster.info(), "tcp://127.0.0.1:82", time_system_); @@ -4145,13 +4445,13 @@ TEST_F(ClusterManagerImplTest, ConnPoolsNotDrainedOnHostSetChange) { .WillRepeatedly(ReturnNew()); // This should provide us a CP for each of the above hosts. - Http::ConnectionPool::MockInstance* cp1 = dynamic_cast( + Http::ConnectionPool::MockInstance* cp1 = HttpPoolDataPeer::getPool( cluster_manager_->getThreadLocalCluster("cluster_1") ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr)); - Tcp::ConnectionPool::MockInstance* tcp1 = dynamic_cast( - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr)); + Tcp::ConnectionPool::MockInstance* tcp1 = + TcpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr)); HostSharedPtr host2 = makeTestHost(cluster.info(), "tcp://127.0.0.1:82", time_system_); HostVector hosts_added; @@ -4279,8 +4579,9 @@ TEST_F(ClusterManagerImplTest, ConnectionPoolPerDownstreamConnection) { EXPECT_CALL(downstream_connection, hashKey) .WillOnce(Invoke([i](std::vector& hash_key) { hash_key.push_back(i); })); EXPECT_EQ(conn_pool_vector.back(), - cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &lb_context)); + HttpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->httpConnPool(ResourcePriority::Default, + Http::Protocol::Http11, &lb_context))); } // Check that the first entry is still in the pool map @@ -4288,8 +4589,9 @@ TEST_F(ClusterManagerImplTest, ConnectionPoolPerDownstreamConnection) { hash_key.push_back(0); })); EXPECT_EQ(conn_pool_vector.front(), - cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, &lb_context)); + HttpPoolDataPeer::getPool(cluster_manager_->getThreadLocalCluster("cluster_1") + ->httpConnPool(ResourcePriority::Default, + Http::Protocol::Http11, &lb_context))); } class PreconnectTest : public ClusterManagerImplTest { @@ -4346,6 +4648,9 @@ class PreconnectTest : public ClusterManagerImplTest { HostSharedPtr host2_; HostSharedPtr host3_; HostSharedPtr host4_; + Http::MockResponseDecoder decoder_; + Http::ConnectionPool::MockCallbacks http_callbacks_; + Tcp::ConnectionPool::MockCallbacks tcp_callbacks_; }; TEST_F(PreconnectTest, PreconnectOff) { @@ -4354,33 +4659,39 @@ TEST_F(PreconnectTest, PreconnectOff) { initialize(0); EXPECT_CALL(factory_, allocateConnPool_(_, _, _, _, _)) .Times(1) - .WillRepeatedly(ReturnNew()); - cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + .WillRepeatedly(ReturnNew>()); + auto http_handle = cluster_manager_->getThreadLocalCluster("cluster_1") + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + http_handle.value().newStream(decoder_, http_callbacks_); EXPECT_CALL(factory_, allocateTcpConnPool_(_)) .Times(1) - .WillRepeatedly(ReturnNew()); - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr); + .WillRepeatedly(ReturnNew>()); + auto tcp_handle = cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr); + ASSERT_TRUE(tcp_handle.has_value()); + tcp_handle.value().newConnection(tcp_callbacks_); } TEST_F(PreconnectTest, PreconnectOn) { - // With preconnect set to 1.1, each request for a connection pool will kick off + // With preconnect set to 1.1, maybePreconnect will kick off // preconnecting, so create the pool for both the current connection and the // anticipated one. initialize(1.1); EXPECT_CALL(factory_, allocateConnPool_(_, _, _, _, _)) .Times(2) .WillRepeatedly(ReturnNew>()); - cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + auto http_handle = cluster_manager_->getThreadLocalCluster("cluster_1") + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + http_handle.value().newStream(decoder_, http_callbacks_); EXPECT_CALL(factory_, allocateTcpConnPool_(_)) .Times(2) .WillRepeatedly(ReturnNew>()); - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr); + auto tcp_handle = cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr); + ASSERT_TRUE(tcp_handle.has_value()); + tcp_handle.value().newConnection(tcp_callbacks_); } TEST_F(PreconnectTest, PreconnectHighHttp) { @@ -4397,8 +4708,9 @@ TEST_F(PreconnectTest, PreconnectHighHttp) { })); return ret; })); - cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + auto http_handle = cluster_manager_->getThreadLocalCluster("cluster_1") + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + http_handle.value().newStream(decoder_, http_callbacks_); // Expect preconnect to be called 3 times across the four hosts. EXPECT_EQ(3, http_preconnect); } @@ -4417,8 +4729,9 @@ TEST_F(PreconnectTest, PreconnectHighTcp) { })); return ret; })); - cluster_manager_->getThreadLocalCluster("cluster_1") - ->tcpConnPool(ResourcePriority::Default, nullptr); + auto tcp_handle = cluster_manager_->getThreadLocalCluster("cluster_1") + ->tcpConnPool(ResourcePriority::Default, nullptr); + tcp_handle.value().newConnection(tcp_callbacks_); // Expect preconnect to be called 3 times across the four hosts. EXPECT_EQ(3, tcp_preconnect); } @@ -4437,8 +4750,9 @@ TEST_F(PreconnectTest, PreconnectCappedAt3) { })); return ret; })); - cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + auto http_handle = cluster_manager_->getThreadLocalCluster("cluster_1") + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + http_handle.value().newStream(decoder_, http_callbacks_); // Expect preconnect to be called 3 times across the four hosts. EXPECT_EQ(3, http_preconnect); @@ -4447,8 +4761,9 @@ TEST_F(PreconnectTest, PreconnectCappedAt3) { // do the full 3 as the number of outstanding preconnects is limited by the // number of healthy hosts. http_preconnect = 0; - cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + http_handle = cluster_manager_->getThreadLocalCluster("cluster_1") + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + http_handle.value().newStream(decoder_, http_callbacks_); EXPECT_EQ(2, http_preconnect); } @@ -4467,8 +4782,9 @@ TEST_F(PreconnectTest, PreconnectCappedByMaybePreconnect) { })); return ret; })); - cluster_manager_->getThreadLocalCluster("cluster_1") - ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + auto http_handle = cluster_manager_->getThreadLocalCluster("cluster_1") + ->httpConnPool(ResourcePriority::Default, Http::Protocol::Http11, nullptr); + http_handle.value().newStream(decoder_, http_callbacks_); // Expect preconnect to be called once and then preconnecting is stopped. EXPECT_EQ(1, http_preconnect_calls); } diff --git a/test/common/upstream/cluster_update_tracker_test.cc b/test/common/upstream/cluster_update_tracker_test.cc index 7081841e0ae79..c97ac7831db18 100644 --- a/test/common/upstream/cluster_update_tracker_test.cc +++ b/test/common/upstream/cluster_update_tracker_test.cc @@ -1,4 +1,4 @@ -#include "common/upstream/cluster_update_tracker.h" +#include "source/common/upstream/cluster_update_tracker.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/mocks/upstream/thread_local_cluster.h" diff --git a/test/common/upstream/conn_pool_map_impl_test.cc b/test/common/upstream/conn_pool_map_impl_test.cc index 64c518b2fc687..6ce14d2becd6a 100644 --- a/test/common/upstream/conn_pool_map_impl_test.cc +++ b/test/common/upstream/conn_pool_map_impl_test.cc @@ -3,7 +3,7 @@ #include "envoy/http/conn_pool.h" -#include "common/upstream/conn_pool_map_impl.h" +#include "source/common/upstream/conn_pool_map_impl.h" #include "test/mocks/common.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/upstream/edf_scheduler_test.cc b/test/common/upstream/edf_scheduler_test.cc index a0f0b92168c89..7eac13bc8153e 100644 --- a/test/common/upstream/edf_scheduler_test.cc +++ b/test/common/upstream/edf_scheduler_test.cc @@ -1,4 +1,4 @@ -#include "common/upstream/edf_scheduler.h" +#include "source/common/upstream/edf_scheduler.h" #include "gtest/gtest.h" diff --git a/test/common/upstream/eds_speed_test.cc b/test/common/upstream/eds_speed_test.cc index 32e94e7d1e44c..e6da3c12a1ec2 100644 --- a/test/common/upstream/eds_speed_test.cc +++ b/test/common/upstream/eds_speed_test.cc @@ -8,14 +8,13 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/scope.h" -#include "common/config/grpc_mux_impl.h" -#include "common/config/grpc_subscription_impl.h" -#include "common/config/protobuf_link_hacks.h" -#include "common/config/utility.h" -#include "common/singleton/manager_impl.h" -#include "common/upstream/eds.h" - -#include "server/transport_socket_config_impl.h" +#include "source/common/config/grpc_mux_impl.h" +#include "source/common/config/grpc_subscription_impl.h" +#include "source/common/config/protobuf_link_hacks.h" +#include "source/common/config/utility.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/upstream/eds.h" +#include "source/server/transport_socket_config_impl.h" #include "test/benchmark/main.h" #include "test/common/upstream/utility.h" diff --git a/test/common/upstream/eds_test.cc b/test/common/upstream/eds_test.cc index 0a25e8436edab..93a31a2b6095c 100644 --- a/test/common/upstream/eds_test.cc +++ b/test/common/upstream/eds_test.cc @@ -7,11 +7,10 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/scope.h" -#include "common/config/utility.h" -#include "common/singleton/manager_impl.h" -#include "common/upstream/eds.h" - -#include "server/transport_socket_config_impl.h" +#include "source/common/config/utility.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/upstream/eds.h" +#include "source/server/transport_socket_config_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/common/upstream/utility.h" diff --git a/test/common/upstream/hds_test.cc b/test/common/upstream/hds_test.cc index 0dfa0fc64af69..7f0801af4a6f8 100644 --- a/test/common/upstream/hds_test.cc +++ b/test/common/upstream/hds_test.cc @@ -5,13 +5,12 @@ #include "envoy/service/health/v3/hds.pb.h" #include "envoy/type/v3/http.pb.h" -#include "common/protobuf/protobuf.h" -#include "common/singleton/manager_impl.h" -#include "common/upstream/health_discovery_service.h" -#include "common/upstream/transport_socket_match_impl.h" - -#include "extensions/transport_sockets/raw_buffer/config.h" -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/upstream/health_discovery_service.h" +#include "source/common/upstream/transport_socket_match_impl.h" +#include "source/extensions/transport_sockets/raw_buffer/config.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "test/mocks/access_log/mocks.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/upstream/health_check_fuzz.cc b/test/common/upstream/health_check_fuzz.cc index 6a14b35fe3b9c..e0f3d3ad094a7 100644 --- a/test/common/upstream/health_check_fuzz.cc +++ b/test/common/upstream/health_check_fuzz.cc @@ -3,7 +3,7 @@ #include #include -#include "common/grpc/common.h" +#include "source/common/grpc/common.h" #include "test/common/upstream/utility.h" #include "test/fuzz/utility.h" diff --git a/test/common/upstream/health_check_fuzz_test_utils.h b/test/common/upstream/health_check_fuzz_test_utils.h index 833df01ad95ec..936e51cc53224 100644 --- a/test/common/upstream/health_check_fuzz_test_utils.h +++ b/test/common/upstream/health_check_fuzz_test_utils.h @@ -2,7 +2,7 @@ #include -#include "common/upstream/health_checker_impl.h" +#include "source/common/upstream/health_checker_impl.h" #include "test/common/http/common.h" #include "test/mocks/common.h" diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc index 5cba4b980a27c..35e224aa28752 100644 --- a/test/common/upstream/health_checker_impl_test.cc +++ b/test/common/upstream/health_checker_impl_test.cc @@ -10,15 +10,15 @@ #include "envoy/data/core/v3/health_check_event.pb.h" #include "envoy/upstream/health_check_host_monitor.h" -#include "common/buffer/buffer_impl.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/grpc/common.h" -#include "common/http/headers.h" -#include "common/json/json_loader.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" -#include "common/upstream/health_checker_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/grpc/common.h" +#include "source/common/http/headers.h" +#include "source/common/json/json_loader.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/upstream/health_checker_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/http/common.h" #include "test/common/upstream/utility.h" diff --git a/test/common/upstream/host_utility_test.cc b/test/common/upstream/host_utility_test.cc index 3e4e81d7bbb18..f31ee62514ce2 100644 --- a/test/common/upstream/host_utility_test.cc +++ b/test/common/upstream/host_utility_test.cc @@ -1,6 +1,6 @@ -#include "common/network/utility.h" -#include "common/upstream/host_utility.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/host_utility.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" diff --git a/test/common/upstream/load_balancer_benchmark.cc b/test/common/upstream/load_balancer_benchmark.cc index 4d536e187b646..22f58f0f9337e 100644 --- a/test/common/upstream/load_balancer_benchmark.cc +++ b/test/common/upstream/load_balancer_benchmark.cc @@ -4,12 +4,12 @@ #include "envoy/config/cluster/v3/cluster.pb.h" -#include "common/common/random_generator.h" -#include "common/memory/stats.h" -#include "common/upstream/maglev_lb.h" -#include "common/upstream/ring_hash_lb.h" -#include "common/upstream/subset_lb.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/common/random_generator.h" +#include "source/common/memory/stats.h" +#include "source/common/upstream/maglev_lb.h" +#include "source/common/upstream/ring_hash_lb.h" +#include "source/common/upstream/subset_lb.h" +#include "source/common/upstream/upstream_impl.h" #include "test/benchmark/main.h" #include "test/common/upstream/utility.h" @@ -538,7 +538,7 @@ class SubsetLbTester : public BaseTester { envoy::config::cluster::v3::Cluster::LbSubsetConfig::ANY_ENDPOINT); auto* selector = subset_config.mutable_subset_selectors()->Add(); selector->set_single_host_per_subset(single_host_per_subset); - *selector->mutable_keys()->Add() = metadata_key; + *selector->mutable_keys()->Add() = std::string(metadata_key); subset_info_ = std::make_unique(subset_config); lb_ = std::make_unique(LoadBalancerType::Random, priority_set_, diff --git a/test/common/upstream/load_balancer_fuzz_base.h b/test/common/upstream/load_balancer_fuzz_base.h index d478cffcf3c0a..727da689047b5 100644 --- a/test/common/upstream/load_balancer_fuzz_base.h +++ b/test/common/upstream/load_balancer_fuzz_base.h @@ -2,7 +2,7 @@ #include "envoy/config/cluster/v3/cluster.pb.h" -#include "common/upstream/load_balancer_impl.h" +#include "source/common/upstream/load_balancer_impl.h" #include "test/common/upstream/load_balancer_fuzz.pb.validate.h" #include "test/fuzz/random.h" diff --git a/test/common/upstream/load_balancer_impl_test.cc b/test/common/upstream/load_balancer_impl_test.cc index 6135f6f9534a2..77b391e6e090b 100644 --- a/test/common/upstream/load_balancer_impl_test.cc +++ b/test/common/upstream/load_balancer_impl_test.cc @@ -6,9 +6,9 @@ #include "envoy/config/cluster/v3/cluster.pb.h" -#include "common/network/utility.h" -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" diff --git a/test/common/upstream/load_balancer_simulation_test.cc b/test/common/upstream/load_balancer_simulation_test.cc index ef431232f63bd..28ded32dd029a 100644 --- a/test/common/upstream/load_balancer_simulation_test.cc +++ b/test/common/upstream/load_balancer_simulation_test.cc @@ -7,11 +7,11 @@ #include "envoy/config/core/v3/health_check.pb.h" #include "envoy/config/endpoint/v3/endpoint_components.pb.h" -#include "common/common/fmt.h" -#include "common/common/random_generator.h" -#include "common/network/utility.h" -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/common/random_generator.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" diff --git a/test/common/upstream/load_stats_reporter_test.cc b/test/common/upstream/load_stats_reporter_test.cc index 46105592c00a3..81edc2ed4377a 100644 --- a/test/common/upstream/load_stats_reporter_test.cc +++ b/test/common/upstream/load_stats_reporter_test.cc @@ -3,7 +3,7 @@ #include "envoy/config/endpoint/v3/load_report.pb.h" #include "envoy/service/load_stats/v3/lrs.pb.h" -#include "common/upstream/load_stats_reporter.h" +#include "source/common/upstream/load_stats_reporter.h" #include "test/mocks/event/mocks.h" #include "test/mocks/grpc/mocks.h" diff --git a/test/common/upstream/logical_dns_cluster_test.cc b/test/common/upstream/logical_dns_cluster_test.cc index 095ec4974c30c..ce94bf6e2184a 100644 --- a/test/common/upstream/logical_dns_cluster_test.cc +++ b/test/common/upstream/logical_dns_cluster_test.cc @@ -10,11 +10,10 @@ #include "envoy/stats/scope.h" #include "envoy/upstream/health_check_host_monitor.h" -#include "common/network/utility.h" -#include "common/singleton/manager_impl.h" -#include "common/upstream/logical_dns_cluster.h" - -#include "server/transport_socket_config_impl.h" +#include "source/common/network/utility.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/upstream/logical_dns_cluster.h" +#include "source/server/transport_socket_config_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" diff --git a/test/common/upstream/maglev_lb_test.cc b/test/common/upstream/maglev_lb_test.cc index 8dd1de142c543..46315da016dbf 100644 --- a/test/common/upstream/maglev_lb_test.cc +++ b/test/common/upstream/maglev_lb_test.cc @@ -2,7 +2,7 @@ #include "envoy/config/cluster/v3/cluster.pb.h" -#include "common/upstream/maglev_lb.h" +#include "source/common/upstream/maglev_lb.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" diff --git a/test/common/upstream/original_dst_cluster_test.cc b/test/common/upstream/original_dst_cluster_test.cc index 1a9743ebd595e..440a2aa25b58c 100644 --- a/test/common/upstream/original_dst_cluster_test.cc +++ b/test/common/upstream/original_dst_cluster_test.cc @@ -8,13 +8,12 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/stats/scope.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" -#include "common/singleton/manager_impl.h" -#include "common/upstream/original_dst_cluster.h" -#include "common/upstream/upstream_impl.h" - -#include "server/transport_socket_config_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/upstream/original_dst_cluster.h" +#include "source/common/upstream/upstream_impl.h" +#include "source/server/transport_socket_config_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" diff --git a/test/common/upstream/outlier_detection_impl_test.cc b/test/common/upstream/outlier_detection_impl_test.cc index a5641f643f220..46e3166c77a7d 100644 --- a/test/common/upstream/outlier_detection_impl_test.cc +++ b/test/common/upstream/outlier_detection_impl_test.cc @@ -8,9 +8,9 @@ #include "envoy/config/cluster/v3/outlier_detection.pb.h" #include "envoy/data/cluster/v3/outlier_detection_event.pb.h" -#include "common/network/utility.h" -#include "common/upstream/outlier_detection_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/outlier_detection_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/access_log/mocks.h" diff --git a/test/common/upstream/priority_conn_pool_map_impl_test.cc b/test/common/upstream/priority_conn_pool_map_impl_test.cc index fbe98e4d17e1c..60252e332c58c 100644 --- a/test/common/upstream/priority_conn_pool_map_impl_test.cc +++ b/test/common/upstream/priority_conn_pool_map_impl_test.cc @@ -2,7 +2,7 @@ #include "envoy/http/conn_pool.h" -#include "common/upstream/priority_conn_pool_map_impl.h" +#include "source/common/upstream/priority_conn_pool_map_impl.h" #include "test/mocks/common.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/upstream/resource_manager_impl_test.cc b/test/common/upstream/resource_manager_impl_test.cc index f92cf3009d63c..726a7f41eb74e 100644 --- a/test/common/upstream/resource_manager_impl_test.cc +++ b/test/common/upstream/resource_manager_impl_test.cc @@ -1,7 +1,7 @@ #include "envoy/stats/stats.h" #include "envoy/upstream/upstream.h" -#include "common/upstream/resource_manager_impl.h" +#include "source/common/upstream/resource_manager_impl.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/stats/mocks.h" diff --git a/test/common/upstream/ring_hash_lb_test.cc b/test/common/upstream/ring_hash_lb_test.cc index 7e8ff95141ab5..e9071eb1f5a25 100644 --- a/test/common/upstream/ring_hash_lb_test.cc +++ b/test/common/upstream/ring_hash_lb_test.cc @@ -6,9 +6,9 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/router/router.h" -#include "common/network/utility.h" -#include "common/upstream/ring_hash_lb.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/ring_hash_lb.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" diff --git a/test/common/upstream/subset_lb_test.cc b/test/common/upstream/subset_lb_test.cc index 3ab29348bc9d8..8d5204287ea5d 100644 --- a/test/common/upstream/subset_lb_test.cc +++ b/test/common/upstream/subset_lb_test.cc @@ -8,10 +8,10 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/common/logger.h" -#include "common/config/metadata.h" -#include "common/upstream/subset_lb.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/common/logger.h" +#include "source/common/config/metadata.h" +#include "source/common/upstream/subset_lb.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/access_log/mocks.h" diff --git a/test/common/upstream/test_cluster_manager.h b/test/common/upstream/test_cluster_manager.h index 55b51ee3e01fd..03a7cf951d4c8 100644 --- a/test/common/upstream/test_cluster_manager.h +++ b/test/common/upstream/test_cluster_manager.h @@ -10,20 +10,19 @@ #include "envoy/network/listen_socket.h" #include "envoy/upstream/upstream.h" -#include "common/api/api_impl.h" -#include "common/config/utility.h" -#include "common/http/context_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/socket_option_impl.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" -#include "common/singleton/manager_impl.h" -#include "common/upstream/cluster_factory_impl.h" -#include "common/upstream/cluster_manager_impl.h" -#include "common/upstream/subset_lb.h" - -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/config/utility.h" +#include "source/common/http/context_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/common/upstream/cluster_manager_impl.h" +#include "source/common/upstream/subset_lb.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/common/upstream/utility.h" diff --git a/test/common/upstream/transport_socket_matcher_test.cc b/test/common/upstream/transport_socket_matcher_test.cc index b564192f860eb..caa0adc9c73e1 100644 --- a/test/common/upstream/transport_socket_matcher_test.cc +++ b/test/common/upstream/transport_socket_matcher_test.cc @@ -8,11 +8,10 @@ #include "envoy/network/transport_socket.h" #include "envoy/stats/scope.h" -#include "common/config/metadata.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/upstream/transport_socket_match_impl.h" - -#include "server/transport_socket_config_impl.h" +#include "source/common/config/metadata.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/upstream/transport_socket_match_impl.h" +#include "source/server/transport_socket_config_impl.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/transport_socket_factory_context.h" diff --git a/test/common/upstream/upstream_impl_test.cc b/test/common/upstream/upstream_impl_test.cc index ef1e342c7a7d0..a0036c035e4f2 100644 --- a/test/common/upstream/upstream_impl_test.cc +++ b/test/common/upstream/upstream_impl_test.cc @@ -16,13 +16,12 @@ #include "envoy/upstream/health_check_host_monitor.h" #include "envoy/upstream/upstream.h" -#include "common/config/metadata.h" -#include "common/network/utility.h" -#include "common/singleton/manager_impl.h" -#include "common/upstream/static_cluster.h" -#include "common/upstream/strict_dns_cluster.h" - -#include "server/transport_socket_config_impl.h" +#include "source/common/config/metadata.h" +#include "source/common/network/utility.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/upstream/static_cluster.h" +#include "source/common/upstream/strict_dns_cluster.h" +#include "source/server/transport_socket_config_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/common/upstream/utility.h" @@ -2343,22 +2342,22 @@ TEST_F(ClusterInfoImplTest, RetryBudgetDefaultPopulation) { std::tie(budget_percent, min_retry_concurrency) = RetryBudgetTestClusterInfo::getRetryBudgetParams(threshold[1]); EXPECT_EQ(budget_percent, 20.0); - EXPECT_EQ(min_retry_concurrency, 3); + EXPECT_EQ(min_retry_concurrency, 3UL); std::tie(budget_percent, min_retry_concurrency) = RetryBudgetTestClusterInfo::getRetryBudgetParams(threshold[2]); EXPECT_EQ(budget_percent, 20.0); - EXPECT_EQ(min_retry_concurrency, 3); + EXPECT_EQ(min_retry_concurrency, 3UL); std::tie(budget_percent, min_retry_concurrency) = RetryBudgetTestClusterInfo::getRetryBudgetParams(threshold[3]); EXPECT_EQ(budget_percent, 42.0); - EXPECT_EQ(min_retry_concurrency, 3); + EXPECT_EQ(min_retry_concurrency, 3UL); std::tie(budget_percent, min_retry_concurrency) = RetryBudgetTestClusterInfo::getRetryBudgetParams(threshold[4]); EXPECT_EQ(budget_percent, 20.0); - EXPECT_EQ(min_retry_concurrency, 123); + EXPECT_EQ(min_retry_concurrency, 123UL); } // Eds service_name is populated. diff --git a/test/common/upstream/utility.h b/test/common/upstream/utility.h index 3ea7b61391351..e3f3a18a11f72 100644 --- a/test/common/upstream/utility.h +++ b/test/common/upstream/utility.h @@ -8,12 +8,12 @@ #include "envoy/config/endpoint/v3/endpoint_components.pb.h" #include "envoy/upstream/upstream.h" -#include "common/common/utility.h" -#include "common/config/metadata.h" -#include "common/config/well_known_names.h" -#include "common/json/json_loader.h" -#include "common/network/utility.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/common/utility.h" +#include "source/common/config/metadata.h" +#include "source/common/config/well_known_names.h" +#include "source/common/json/json_loader.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/upstream_impl.h" #include "test/test_common/utility.h" diff --git a/test/common/watchdog/BUILD b/test/common/watchdog/BUILD index 85edbe118222e..e1539697f6670 100644 --- a/test/common/watchdog/BUILD +++ b/test/common/watchdog/BUILD @@ -15,9 +15,9 @@ envoy_cc_test( "abseil_synchronization", ], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/registry", - "//include/envoy/server:guarddog_config_interface", + "//envoy/common:time_interface", + "//envoy/registry", + "//envoy/server:guarddog_config_interface", "//source/common/watchdog:abort_action_config", "//source/common/watchdog:abort_action_lib", "//test/common/stats:stat_test_utility_lib", @@ -31,8 +31,8 @@ envoy_cc_test( name = "abort_action_config_test", srcs = ["abort_action_config_test.cc"], deps = [ - "//include/envoy/registry", - "//include/envoy/server:guarddog_config_interface", + "//envoy/registry", + "//envoy/server:guarddog_config_interface", "//source/common/watchdog:abort_action_config", "//source/common/watchdog:abort_action_lib", "//test/common/stats:stat_test_utility_lib", diff --git a/test/common/watchdog/abort_action_config_test.cc b/test/common/watchdog/abort_action_config_test.cc index 9bec9ec8133a4..f456687abc02d 100644 --- a/test/common/watchdog/abort_action_config_test.cc +++ b/test/common/watchdog/abort_action_config_test.cc @@ -2,7 +2,7 @@ #include "envoy/server/guarddog_config.h" #include "envoy/watchdog/v3alpha/abort_action.pb.h" -#include "common/watchdog/abort_action_config.h" +#include "source/common/watchdog/abort_action_config.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/event/mocks.h" diff --git a/test/common/watchdog/abort_action_test.cc b/test/common/watchdog/abort_action_test.cc index 7f2f1bf4606e1..ebdbb8c870312 100644 --- a/test/common/watchdog/abort_action_test.cc +++ b/test/common/watchdog/abort_action_test.cc @@ -8,8 +8,8 @@ #include "envoy/thread/thread.h" #include "envoy/watchdog/v3alpha/abort_action.pb.h" -#include "common/watchdog/abort_action.h" -#include "common/watchdog/abort_action_config.h" +#include "source/common/watchdog/abort_action.h" +#include "source/common/watchdog/abort_action_config.h" #include "test/common/stats/stat_test_utility.h" #include "test/test_common/utility.h" diff --git a/test/config/utility.cc b/test/config/utility.cc index 0ce0a4313b5aa..6357327f5b171 100644 --- a/test/config/utility.cc +++ b/test/config/utility.cc @@ -15,9 +15,9 @@ #include "envoy/http/codec.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/common/assert.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" #include "test/config/integration/certs/client_ecdsacert_hash.h" #include "test/config/integration/certs/clientcert_hash.h" @@ -1384,6 +1384,27 @@ void ConfigHelper::adjustUpstreamTimeoutForTsan( timeout->set_seconds(TSAN_TIMEOUT_FACTOR * timeout_ms / 1000); } +envoy::config::core::v3::Http3ProtocolOptions ConfigHelper::http2ToHttp3ProtocolOptions( + const envoy::config::core::v3::Http2ProtocolOptions& http2_options, + size_t http3_max_stream_receive_window) { + envoy::config::core::v3::Http3ProtocolOptions http3_options; + if (http2_options.has_initial_stream_window_size() && + http2_options.initial_stream_window_size().value() < http3_max_stream_receive_window) { + // Set http3 stream flow control window only if the configured http2 stream flow control + // window is smaller than the upper limit of flow control window supported by QUICHE which is + // also the default for http3 streams. + http3_options.mutable_quic_protocol_options()->mutable_initial_stream_window_size()->set_value( + http2_options.initial_stream_window_size().value()); + } + if (http2_options.has_override_stream_error_on_invalid_http_message()) { + http3_options.mutable_override_stream_error_on_invalid_http_message()->set_value( + http2_options.override_stream_error_on_invalid_http_message().value()); + } else if (http2_options.stream_error_on_invalid_http_messaging()) { + http3_options.mutable_override_stream_error_on_invalid_http_message()->set_value(true); + } + return http3_options; +} + CdsHelper::CdsHelper() : cds_path_(TestEnvironment::writeStringToFileForTest("cds.pb_text", "")) {} void CdsHelper::setCds(const std::vector& clusters) { diff --git a/test/config/utility.h b/test/config/utility.h index f2b6ccc38b284..1953fd9832e95 100644 --- a/test/config/utility.h +++ b/test/config/utility.h @@ -17,10 +17,10 @@ #include "envoy/extensions/upstreams/http/v3/http_protocol_options.pb.h" #include "envoy/http/codes.h" -#include "common/config/api_version.h" -#include "common/network/address_impl.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/config/api_version.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "test/integration/server_stats.h" @@ -328,6 +328,11 @@ class ConfigHelper { HttpProtocolOptions& protocol_options); static void setHttp2(envoy::config::cluster::v3::Cluster& cluster); + // Populate and return a Http3ProtocolOptions instance based on http2_options. + static envoy::config::core::v3::Http3ProtocolOptions + http2ToHttp3ProtocolOptions(const envoy::config::core::v3::Http2ProtocolOptions& http2_options, + size_t http3_max_stream_receive_window); + private: static bool shouldBoost(envoy::config::core::v3::ApiVersion api_version) { return api_version == envoy::config::core::v3::ApiVersion::V2; diff --git a/test/config_test/config_test.cc b/test/config_test/config_test.cc index 61cb500c1253f..3c8acc2592c68 100644 --- a/test/config_test/config_test.cc +++ b/test/config_test/config_test.cc @@ -6,13 +6,12 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/config/listener/v3/listener_components.pb.h" -#include "common/common/fmt.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_features.h" - -#include "server/config_validation/server.h" -#include "server/configuration_impl.h" -#include "server/options_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_features.h" +#include "source/server/config_validation/server.h" +#include "source/server/configuration_impl.h" +#include "source/server/options_impl.h" #include "test/integration/server.h" #include "test/mocks/server/instance.h" @@ -214,7 +213,7 @@ uint32_t run(const std::string& directory) { ENVOY_LOG_MISC(info, "testing {}.\n", filename); if (std::find_if(unsuported_win32_configs.begin(), unsuported_win32_configs.end(), [filename](const absl::string_view& s) { - return filename.find(s) != std::string::npos; + return filename.find(std::string(s)) != std::string::npos; }) == unsuported_win32_configs.end()) { OptionsImpl options( Envoy::Server::createTestOptionsImpl(filename, "", Network::Address::IpVersion::v6)); diff --git a/test/config_test/example_configs_test.cc b/test/config_test/example_configs_test.cc index ca52b4b768ba3..37e0d561d8dc1 100644 --- a/test/config_test/example_configs_test.cc +++ b/test/config_test/example_configs_test.cc @@ -1,4 +1,4 @@ -#include "common/filesystem/filesystem_impl.h" +#include "source/common/filesystem/filesystem_impl.h" #include "test/config_test/config_test.h" #include "test/test_common/environment.h" diff --git a/test/exe/main_common_test.cc b/test/exe/main_common_test.cc index c814950b3771a..70c3ad4a4b2c1 100644 --- a/test/exe/main_common_test.cc +++ b/test/exe/main_common_test.cc @@ -1,15 +1,13 @@ #include "envoy/common/platform.h" -#include "common/common/lock_guard.h" -#include "common/common/mutex_tracer_impl.h" -#include "common/common/random_generator.h" -#include "common/common/thread.h" -#include "common/runtime/runtime_impl.h" - -#include "exe/main_common.h" -#include "exe/platform_impl.h" - -#include "server/options_impl.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/mutex_tracer_impl.h" +#include "source/common/common/random_generator.h" +#include "source/common/common/thread.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/exe/main_common.h" +#include "source/exe/platform_impl.h" +#include "source/server/options_impl.h" #include "test/mocks/common.h" #include "test/test_common/contention.h" @@ -20,7 +18,7 @@ #include "gtest/gtest.h" #ifdef ENVOY_HANDLE_SIGNALS -#include "common/signal/signal_action.h" +#include "source/common/signal/signal_action.h" #endif #include "absl/synchronization/notification.h" diff --git a/test/exe/platform_impl_test.cc b/test/exe/platform_impl_test.cc index 955a55710eb84..862631309b357 100644 --- a/test/exe/platform_impl_test.cc +++ b/test/exe/platform_impl_test.cc @@ -1,4 +1,4 @@ -#include "exe/platform_impl.h" +#include "source/exe/platform_impl.h" #include "test/mocks/common.h" #include "test/test_common/utility.h" diff --git a/test/exe/terminate_handler_test.cc b/test/exe/terminate_handler_test.cc index d48782242ae99..501f8218ccafa 100644 --- a/test/exe/terminate_handler_test.cc +++ b/test/exe/terminate_handler_test.cc @@ -1,4 +1,4 @@ -#include "exe/terminate_handler.h" +#include "source/exe/terminate_handler.h" #include "test/test_common/utility.h" diff --git a/test/extensions/access_loggers/common/access_log_base_test.cc b/test/extensions/access_loggers/common/access_log_base_test.cc index 4b43d05dfbaf2..0214596696165 100644 --- a/test/extensions/access_loggers/common/access_log_base_test.cc +++ b/test/extensions/access_loggers/common/access_log_base_test.cc @@ -1,4 +1,4 @@ -#include "extensions/access_loggers/common/access_log_base.h" +#include "source/extensions/access_loggers/common/access_log_base.h" #include "test/mocks/access_log/mocks.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/extensions/access_loggers/common/grpc_access_logger_test.cc b/test/extensions/access_loggers/common/grpc_access_logger_test.cc index 74ad5a13345f3..992803c3fd7e3 100644 --- a/test/extensions/access_loggers/common/grpc_access_logger_test.cc +++ b/test/extensions/access_loggers/common/grpc_access_logger_test.cc @@ -5,12 +5,11 @@ #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" #include "envoy/service/accesslog/v3/als.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/grpc/typed_async_client.h" -#include "common/network/address_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/access_loggers/common/grpc_access_logger.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/grpc/typed_async_client.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/access_loggers/common/grpc_access_logger.h" #include "test/mocks/access_log/mocks.h" #include "test/mocks/grpc/mocks.h" diff --git a/test/extensions/access_loggers/file/config_test.cc b/test/extensions/access_loggers/file/config_test.cc index 3cdaeca9c7b92..4126b865e7ef5 100644 --- a/test/extensions/access_loggers/file/config_test.cc +++ b/test/extensions/access_loggers/file/config_test.cc @@ -2,12 +2,10 @@ #include "envoy/extensions/access_loggers/file/v3/file.pb.h" #include "envoy/registry/registry.h" -#include "common/access_log/access_log_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/access_loggers/common/file_access_log_impl.h" -#include "extensions/access_loggers/file/config.h" -#include "extensions/access_loggers/well_known_names.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/access_loggers/common/file_access_log_impl.h" +#include "source/extensions/access_loggers/file/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc b/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc index e470423856dbe..65fe0cd6185b5 100644 --- a/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc +++ b/test/extensions/access_loggers/grpc/grpc_access_log_impl_test.cc @@ -5,9 +5,8 @@ #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" #include "envoy/service/accesslog/v3/als.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" - -#include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h" #include "test/mocks/grpc/mocks.h" #include "test/mocks/local_info/mocks.h" diff --git a/test/extensions/access_loggers/grpc/grpc_access_log_utils_test.cc b/test/extensions/access_loggers/grpc/grpc_access_log_utils_test.cc index e24d70df36b0c..53b655b54c778 100644 --- a/test/extensions/access_loggers/grpc/grpc_access_log_utils_test.cc +++ b/test/extensions/access_loggers/grpc/grpc_access_log_utils_test.cc @@ -1,6 +1,6 @@ #include "envoy/data/accesslog/v3/accesslog.pb.h" -#include "extensions/access_loggers/grpc/grpc_access_log_utils.h" +#include "source/extensions/access_loggers/grpc/grpc_access_log_utils.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/extensions/access_loggers/grpc/http_config_test.cc b/test/extensions/access_loggers/grpc/http_config_test.cc index 1b4a1956a3415..c4d7db133a78a 100644 --- a/test/extensions/access_loggers/grpc/http_config_test.cc +++ b/test/extensions/access_loggers/grpc/http_config_test.cc @@ -4,8 +4,7 @@ #include "envoy/server/access_log_config.h" #include "envoy/stats/scope.h" -#include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" +#include "source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h" #include "test/mocks/server/factory_context.h" @@ -26,7 +25,7 @@ class HttpGrpcAccessLogConfigTest : public testing::Test { void SetUp() override { factory_ = Registry::FactoryRegistry::getFactory( - AccessLogNames::get().HttpGrpc); + "envoy.access_loggers.http_grpc"); ASSERT_NE(nullptr, factory_); message_ = factory_->createEmptyConfigProto(); diff --git a/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc b/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc index b475d85155a3e..42969c35dfa4e 100644 --- a/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc +++ b/test/extensions/access_loggers/grpc/http_grpc_access_log_impl_test.cc @@ -3,12 +3,11 @@ #include "envoy/data/accesslog/v3/accesslog.pb.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/network/address_impl.h" -#include "common/router/string_accessor_impl.h" -#include "common/stream_info/uint32_accessor_impl.h" - -#include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/router/string_accessor_impl.h" +#include "source/common/stream_info/uint32_accessor_impl.h" +#include "source/extensions/access_loggers/grpc/http_grpc_access_log_impl.h" #include "test/mocks/access_log/mocks.h" #include "test/mocks/grpc/mocks.h" diff --git a/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc b/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc index f2daefe122107..0699fc5e81f9d 100644 --- a/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc +++ b/test/extensions/access_loggers/grpc/http_grpc_access_log_integration_test.cc @@ -3,10 +3,10 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/service/accesslog/v3/als.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/grpc/codec.h" -#include "common/grpc/common.h" -#include "common/version/version.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/common.h" +#include "source/common/version/version.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc b/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc index 0e700eb4603ea..2bec4fd81fcce 100644 --- a/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc +++ b/test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc @@ -4,10 +4,10 @@ #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h" #include "envoy/service/accesslog/v3/als.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/grpc/codec.h" -#include "common/grpc/common.h" -#include "common/version/version.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/common.h" +#include "source/common/version/version.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/access_loggers/open_telemetry/BUILD b/test/extensions/access_loggers/open_telemetry/BUILD index 12b6b55caf82e..765d9005a9673 100644 --- a/test/extensions/access_loggers/open_telemetry/BUILD +++ b/test/extensions/access_loggers/open_telemetry/BUILD @@ -33,7 +33,7 @@ envoy_extension_cc_test( srcs = ["access_log_impl_test.cc"], extension_name = "envoy.access_loggers.open_telemetry", deps = [ - "//include/envoy/common:time_interface", + "//envoy/common:time_interface", "//source/common/protobuf", "//source/common/router:string_accessor_lib", "//source/extensions/access_loggers/open_telemetry:access_log_lib", diff --git a/test/extensions/access_loggers/open_telemetry/access_log_impl_test.cc b/test/extensions/access_loggers/open_telemetry/access_log_impl_test.cc index 5cce3f6e8f0f8..933daaf8ed710 100644 --- a/test/extensions/access_loggers/open_telemetry/access_log_impl_test.cc +++ b/test/extensions/access_loggers/open_telemetry/access_log_impl_test.cc @@ -5,12 +5,11 @@ #include "envoy/data/accesslog/v3/accesslog.pb.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/network/address_impl.h" -#include "common/protobuf/protobuf.h" -#include "common/router/string_accessor_impl.h" - -#include "extensions/access_loggers/open_telemetry/access_log_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/router/string_accessor_impl.h" +#include "source/extensions/access_loggers/open_telemetry/access_log_impl.h" #include "test/mocks/access_log/mocks.h" #include "test/mocks/grpc/mocks.h" diff --git a/test/extensions/access_loggers/open_telemetry/access_log_integration_test.cc b/test/extensions/access_loggers/open_telemetry/access_log_integration_test.cc index eead9606d55b1..66c62fccf311f 100644 --- a/test/extensions/access_loggers/open_telemetry/access_log_integration_test.cc +++ b/test/extensions/access_loggers/open_telemetry/access_log_integration_test.cc @@ -3,10 +3,10 @@ #include "envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/grpc/codec.h" -#include "common/grpc/common.h" -#include "common/version/version.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/common.h" +#include "source/common/version/version.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/access_loggers/open_telemetry/config_test.cc b/test/extensions/access_loggers/open_telemetry/config_test.cc index ed7070680c8e4..35017d2831544 100644 --- a/test/extensions/access_loggers/open_telemetry/config_test.cc +++ b/test/extensions/access_loggers/open_telemetry/config_test.cc @@ -4,9 +4,8 @@ #include "envoy/server/access_log_config.h" #include "envoy/stats/scope.h" -#include "extensions/access_loggers/open_telemetry/access_log_impl.h" -#include "extensions/access_loggers/open_telemetry/config.h" -#include "extensions/access_loggers/well_known_names.h" +#include "source/extensions/access_loggers/open_telemetry/access_log_impl.h" +#include "source/extensions/access_loggers/open_telemetry/config.h" #include "test/mocks/server/factory_context.h" @@ -27,7 +26,7 @@ class OpenTelemetryAccessLogConfigTest : public testing::Test { void SetUp() override { factory_ = Registry::FactoryRegistry::getFactory( - AccessLogNames::get().OpenTelemetry); + "envoy.access_loggers.open_telemetry"); ASSERT_NE(nullptr, factory_); message_ = factory_->createEmptyConfigProto(); diff --git a/test/extensions/access_loggers/open_telemetry/grpc_access_log_impl_test.cc b/test/extensions/access_loggers/open_telemetry/grpc_access_log_impl_test.cc index 5a5c9e70a8857..4b42d1e5de54c 100644 --- a/test/extensions/access_loggers/open_telemetry/grpc_access_log_impl_test.cc +++ b/test/extensions/access_loggers/open_telemetry/grpc_access_log_impl_test.cc @@ -3,9 +3,8 @@ #include "envoy/config/core/v3/grpc_service.pb.h" #include "envoy/extensions/access_loggers/grpc/v3/als.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" - -#include "extensions/access_loggers/open_telemetry/grpc_access_log_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/extensions/access_loggers/open_telemetry/grpc_access_log_impl.h" #include "test/mocks/grpc/mocks.h" #include "test/mocks/local_info/mocks.h" diff --git a/test/extensions/access_loggers/stream/stream_test_base.h b/test/extensions/access_loggers/stream/stream_test_base.h index 57b1c04f1e82a..6a55c3c81f034 100644 --- a/test/extensions/access_loggers/stream/stream_test_base.h +++ b/test/extensions/access_loggers/stream/stream_test_base.h @@ -1,12 +1,10 @@ #include "envoy/extensions/access_loggers/stream/v3/stream.pb.h" #include "envoy/registry/registry.h" -#include "common/access_log/access_log_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/access_loggers/common/file_access_log_impl.h" -#include "extensions/access_loggers/stream/config.h" -#include "extensions/access_loggers/well_known_names.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/access_loggers/common/file_access_log_impl.h" +#include "source/extensions/access_loggers/stream/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/access_loggers/wasm/config_test.cc b/test/extensions/access_loggers/wasm/config_test.cc index 85cdde6141e0f..690834d707a84 100644 --- a/test/extensions/access_loggers/wasm/config_test.cc +++ b/test/extensions/access_loggers/wasm/config_test.cc @@ -1,13 +1,11 @@ #include "envoy/extensions/access_loggers/wasm/v3/wasm.pb.h" #include "envoy/registry/registry.h" -#include "common/access_log/access_log_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/access_loggers/wasm/config.h" -#include "extensions/access_loggers/wasm/wasm_access_log_impl.h" -#include "extensions/access_loggers/well_known_names.h" -#include "extensions/common/wasm/wasm.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/access_loggers/wasm/config.h" +#include "source/extensions/access_loggers/wasm/wasm_access_log_impl.h" +#include "source/extensions/common/wasm/wasm.h" #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/server/mocks.h" @@ -42,7 +40,7 @@ INSTANTIATE_TEST_SUITE_P(Runtimes, WasmAccessLogConfigTest, TEST_P(WasmAccessLogConfigTest, CreateWasmFromEmpty) { auto factory = Registry::FactoryRegistry::getFactory( - AccessLogNames::get().Wasm); + "envoy.access_loggers.wasm"); ASSERT_NE(factory, nullptr); ProtobufTypes::MessagePtr message = factory->createEmptyConfigProto(); @@ -66,7 +64,7 @@ TEST_P(WasmAccessLogConfigTest, CreateWasmFromWASM) { #endif auto factory = Registry::FactoryRegistry::getFactory( - AccessLogNames::get().Wasm); + "envoy.access_loggers.wasm"); ASSERT_NE(factory, nullptr); envoy::extensions::access_loggers::wasm::v3::WasmAccessLog config; diff --git a/test/extensions/bootstrap/wasm/BUILD b/test/extensions/bootstrap/wasm/BUILD index e5fa8e7895d2e..39623df4f7692 100644 --- a/test/extensions/bootstrap/wasm/BUILD +++ b/test/extensions/bootstrap/wasm/BUILD @@ -71,7 +71,7 @@ envoy_extension_cc_test( ]), extension_name = "envoy.bootstrap.wasm", deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/stats:isolated_store_lib", "//source/extensions/bootstrap/wasm:config", "//source/extensions/common/wasm:wasm_lib", diff --git a/test/extensions/bootstrap/wasm/config_test.cc b/test/extensions/bootstrap/wasm/config_test.cc index c956e3abec49f..2995eedc00ebe 100644 --- a/test/extensions/bootstrap/wasm/config_test.cc +++ b/test/extensions/bootstrap/wasm/config_test.cc @@ -2,9 +2,8 @@ #include "envoy/extensions/wasm/v3/wasm.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/bootstrap/wasm/config.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/bootstrap/wasm/config.h" #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/event/mocks.h" diff --git a/test/extensions/bootstrap/wasm/wasm_integration_test.cc b/test/extensions/bootstrap/wasm/wasm_integration_test.cc index 28b8b9dbb31c0..e2bff1c817be2 100644 --- a/test/extensions/bootstrap/wasm/wasm_integration_test.cc +++ b/test/extensions/bootstrap/wasm/wasm_integration_test.cc @@ -1,4 +1,4 @@ -#include "extensions/common/wasm/wasm.h" +#include "source/extensions/common/wasm/wasm.h" #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/integration/http_protocol_integration.h" diff --git a/test/extensions/bootstrap/wasm/wasm_speed_test.cc b/test/extensions/bootstrap/wasm/wasm_speed_test.cc index db5acab7a2d87..cfbe216a790a2 100644 --- a/test/extensions/bootstrap/wasm/wasm_speed_test.cc +++ b/test/extensions/bootstrap/wasm/wasm_speed_test.cc @@ -4,10 +4,9 @@ * Run with: * `bazel run --config=libc++ -c opt //test/extensions/bootstrap/wasm:wasm_speed_test` */ -#include "common/event/dispatcher_impl.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/common/wasm/wasm.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/common/wasm/wasm.h" #include "test/mocks/server/mocks.h" #include "test/mocks/upstream/mocks.h" @@ -33,8 +32,8 @@ class TestRoot : public Envoy::Extensions::Common::Wasm::Context { : Envoy::Extensions::Common::Wasm::Context(wasm, plugin) {} using Envoy::Extensions::Common::Wasm::Context::log; - proxy_wasm::WasmResult log(uint32_t level, absl::string_view message) override { - log_(static_cast(level), message); + proxy_wasm::WasmResult log(uint32_t level, std::string_view message) override { + log_(static_cast(level), toAbslStringView(message)); return proxy_wasm::WasmResult::Ok; } MOCK_METHOD(void, log_, (spdlog::level::level_enum level, absl::string_view message)); @@ -66,7 +65,8 @@ static void bmWasmSimpleCallSpeedTest(benchmark::State& state, std::string test, TestEnvironment::runfilesPath("test/extensions/bootstrap/wasm/test_data/speed_cpp.wasm")); } EXPECT_FALSE(code.empty()); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); wasm->setCreateContextForTesting( nullptr, [](Extensions::Common::Wasm::Wasm* wasm, diff --git a/test/extensions/bootstrap/wasm/wasm_test.cc b/test/extensions/bootstrap/wasm/wasm_test.cc index 3550045fd555e..f073c62893227 100644 --- a/test/extensions/bootstrap/wasm/wasm_test.cc +++ b/test/extensions/bootstrap/wasm/wasm_test.cc @@ -1,7 +1,6 @@ -#include "common/event/dispatcher_impl.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/common/wasm/wasm.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/common/wasm/wasm.h" #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/server/mocks.h" @@ -27,9 +26,9 @@ class TestContext : public Extensions::Common::Wasm::Context { : Extensions::Common::Wasm::Context(wasm, plugin) {} ~TestContext() override = default; using Extensions::Common::Wasm::Context::log; - proxy_wasm::WasmResult log(uint32_t level, absl::string_view message) override { - std::cerr << std::string(message) << "\n"; - log_(static_cast(level), message); + proxy_wasm::WasmResult log(uint32_t level, std::string_view message) override { + std::cerr << message << "\n"; + log_(static_cast(level), toAbslStringView(message)); return proxy_wasm::WasmResult::Ok; } MOCK_METHOD(void, log_, (spdlog::level::level_enum level, absl::string_view message)); @@ -105,7 +104,8 @@ class WasmNullTest : public WasmTestBase, public testing::TestWithParaminitialize(code, false)); + EXPECT_TRUE(wasm_->load(code, false)); + EXPECT_TRUE(wasm_->initialize()); } }; @@ -142,7 +142,8 @@ TEST_P(WasmTestMatrix, LoggingWithEnvVars) { auto wasm_weak = std::weak_ptr(wasm_); auto wasm_handler = std::make_unique(std::move(wasm_)); - EXPECT_TRUE(wasm_weak.lock()->initialize(code_, false)); + EXPECT_TRUE(wasm_weak.lock()->load(code_, false)); + EXPECT_TRUE(wasm_weak.lock()->initialize()); auto context = static_cast(wasm_weak.lock()->start(plugin_)); if (std::get<1>(GetParam()) == "cpp") { EXPECT_CALL(*context, log_(spdlog::level::info, Eq("printf stdout test"))); @@ -179,7 +180,8 @@ TEST_P(WasmTest, BadSignature) { const auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( "{{ test_rundir }}/test/extensions/bootstrap/wasm/test_data/bad_signature_cpp.wasm")); EXPECT_FALSE(code.empty()); - EXPECT_FALSE(wasm_->initialize(code, false)); + EXPECT_TRUE(wasm_->load(code, false)); + EXPECT_FALSE(wasm_->initialize()); EXPECT_TRUE(wasm_->isFailed()); } @@ -194,7 +196,8 @@ TEST_P(WasmTest, Segv) { const auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( "{{ test_rundir }}/test/extensions/bootstrap/wasm/test_data/segv_cpp.wasm")); EXPECT_FALSE(code.empty()); - EXPECT_TRUE(wasm_->initialize(code, false)); + EXPECT_TRUE(wasm_->load(code, false)); + EXPECT_TRUE(wasm_->initialize()); auto context = static_cast(wasm_->start(plugin_)); EXPECT_CALL(*context, log_(spdlog::level::err, Eq("before badptr"))); EXPECT_FALSE(wasm_->configure(context, plugin_)); @@ -212,7 +215,8 @@ TEST_P(WasmTest, DivByZero) { const auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( "{{ test_rundir }}/test/extensions/bootstrap/wasm/test_data/segv_cpp.wasm")); EXPECT_FALSE(code.empty()); - EXPECT_TRUE(wasm_->initialize(code, false)); + EXPECT_TRUE(wasm_->load(code, false)); + EXPECT_TRUE(wasm_->initialize()); auto context = static_cast(wasm_->start(plugin_)); EXPECT_CALL(*context, log_(spdlog::level::err, Eq("before div by zero"))); context->onLog(); @@ -230,7 +234,8 @@ TEST_P(WasmTest, IntrinsicGlobals) { const auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( "{{ test_rundir }}/test/extensions/bootstrap/wasm/test_data/emscripten_cpp.wasm")); EXPECT_FALSE(code.empty()); - EXPECT_TRUE(wasm_->initialize(code, false)); + EXPECT_TRUE(wasm_->load(code, false)); + EXPECT_TRUE(wasm_->initialize()); auto context = static_cast(wasm_->start(plugin_)); EXPECT_CALL(*context, log_(spdlog::level::info, Eq("NaN nan"))); EXPECT_CALL(*context, log_(spdlog::level::warn, Eq("inf inf"))).Times(3); @@ -254,7 +259,8 @@ TEST_P(WasmTest, Asm2Wasm) { const auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( "{{ test_rundir }}/test/extensions/bootstrap/wasm/test_data/asm2wasm_cpp.wasm")); EXPECT_FALSE(code.empty()); - EXPECT_TRUE(wasm_->initialize(code, false)); + EXPECT_TRUE(wasm_->load(code, false)); + EXPECT_TRUE(wasm_->initialize()); auto context = static_cast(wasm_->start(plugin_)); EXPECT_CALL(*context, log_(spdlog::level::info, Eq("out 0 0 0"))); EXPECT_TRUE(wasm_->configure(context, plugin_)); diff --git a/test/extensions/clusters/aggregate/cluster_integration_test.cc b/test/extensions/clusters/aggregate/cluster_integration_test.cc index b2181452bca61..e7dbaecfbbccb 100644 --- a/test/extensions/clusters/aggregate/cluster_integration_test.cc +++ b/test/extensions/clusters/aggregate/cluster_integration_test.cc @@ -2,9 +2,9 @@ #include "envoy/grpc/status.h" #include "envoy/stats/scope.h" -#include "common/config/protobuf_link_hacks.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/config/protobuf_link_hacks.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/clusters/aggregate/cluster_test.cc b/test/extensions/clusters/aggregate/cluster_test.cc index 02e765cae956c..4842befab521f 100644 --- a/test/extensions/clusters/aggregate/cluster_test.cc +++ b/test/extensions/clusters/aggregate/cluster_test.cc @@ -2,9 +2,8 @@ #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.h" #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.validate.h" -#include "common/singleton/manager_impl.h" - -#include "extensions/clusters/aggregate/cluster.h" +#include "source/common/singleton/manager_impl.h" +#include "source/extensions/clusters/aggregate/cluster.h" #include "test/common/upstream/utility.h" #include "test/mocks/protobuf/mocks.h" diff --git a/test/extensions/clusters/aggregate/cluster_update_test.cc b/test/extensions/clusters/aggregate/cluster_update_test.cc index 853793ddfa60c..90e23cc8ee680 100644 --- a/test/extensions/clusters/aggregate/cluster_update_test.cc +++ b/test/extensions/clusters/aggregate/cluster_update_test.cc @@ -2,12 +2,11 @@ #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.h" #include "envoy/extensions/clusters/aggregate/v3/cluster.pb.validate.h" -#include "common/router/context_impl.h" -#include "common/singleton/manager_impl.h" -#include "common/upstream/cluster_factory_impl.h" -#include "common/upstream/cluster_manager_impl.h" - -#include "extensions/clusters/aggregate/cluster.h" +#include "source/common/router/context_impl.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/common/upstream/cluster_manager_impl.h" +#include "source/extensions/clusters/aggregate/cluster.h" #include "test/common/upstream/test_cluster_manager.h" #include "test/common/upstream/utility.h" diff --git a/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc b/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc index 875be42f3e1f2..0544523a3be1f 100644 --- a/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc +++ b/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc @@ -2,10 +2,9 @@ #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.h" #include "envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.validate.h" -#include "common/singleton/manager_impl.h" -#include "common/upstream/cluster_factory_impl.h" - -#include "extensions/clusters/dynamic_forward_proxy/cluster.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/extensions/clusters/dynamic_forward_proxy/cluster.h" #include "test/common/upstream/utility.h" #include "test/extensions/common/dynamic_forward_proxy/mocks.h" diff --git a/test/extensions/clusters/redis/BUILD b/test/extensions/clusters/redis/BUILD index 47ee1e321d2ae..1da66450566d4 100644 --- a/test/extensions/clusters/redis/BUILD +++ b/test/extensions/clusters/redis/BUILD @@ -56,7 +56,7 @@ envoy_extension_cc_test( srcs = ["redis_cluster_lb_test.cc"], extension_name = "envoy.clusters.redis", deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/event:dispatcher_lib", "//source/common/network:utility_lib", "//source/common/upstream:cluster_factory_lib", @@ -107,7 +107,7 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:upstream_interface", "//source/common/upstream:cluster_factory_lib", "//source/common/upstream:upstream_lib", "//source/extensions/clusters/redis:redis_cluster", diff --git a/test/extensions/clusters/redis/redis_cluster_integration_test.cc b/test/extensions/clusters/redis/redis_cluster_integration_test.cc index a91ba22a32061..960c8d1f9338c 100644 --- a/test/extensions/clusters/redis/redis_cluster_integration_test.cc +++ b/test/extensions/clusters/redis/redis_cluster_integration_test.cc @@ -3,9 +3,8 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "common/common/macros.h" - -#include "extensions/filters/network/redis_proxy/command_splitter_impl.h" +#include "source/common/common/macros.h" +#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h" #include "test/integration/integration.h" diff --git a/test/extensions/clusters/redis/redis_cluster_lb_test.cc b/test/extensions/clusters/redis/redis_cluster_lb_test.cc index 1b7abc6bb9420..bcf65ba833766 100644 --- a/test/extensions/clusters/redis/redis_cluster_lb_test.cc +++ b/test/extensions/clusters/redis/redis_cluster_lb_test.cc @@ -1,8 +1,7 @@ #include #include "source/extensions/clusters/redis/redis_cluster_lb.h" - -#include "extensions/filters/network/common/redis/client.h" +#include "source/extensions/filters/network/common/redis/client.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" diff --git a/test/extensions/clusters/redis/redis_cluster_test.cc b/test/extensions/clusters/redis/redis_cluster_test.cc index a42aed2c05898..4bc85dd7150fe 100644 --- a/test/extensions/clusters/redis/redis_cluster_test.cc +++ b/test/extensions/clusters/redis/redis_cluster_test.cc @@ -11,10 +11,9 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h" #include "envoy/stats/scope.h" -#include "common/network/utility.h" -#include "common/singleton/manager_impl.h" -#include "common/upstream/logical_dns_cluster.h" - +#include "source/common/network/utility.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/upstream/logical_dns_cluster.h" #include "source/extensions/clusters/redis/redis_cluster.h" #include "test/common/upstream/utility.h" diff --git a/test/extensions/common/aws/aws_metadata_fetcher_integration_test.cc b/test/extensions/common/aws/aws_metadata_fetcher_integration_test.cc index a180f9ef16a83..ee2c035950805 100644 --- a/test/extensions/common/aws/aws_metadata_fetcher_integration_test.cc +++ b/test/extensions/common/aws/aws_metadata_fetcher_integration_test.cc @@ -1,6 +1,5 @@ -#include "common/common/fmt.h" - -#include "extensions/common/aws/utility.h" +#include "source/common/common/fmt.h" +#include "source/extensions/common/aws/utility.h" #include "test/integration/integration.h" #include "test/integration/utility.h" diff --git a/test/extensions/common/aws/credentials_provider_impl_test.cc b/test/extensions/common/aws/credentials_provider_impl_test.cc index 8c92d9e3b9f13..6e4cc0819c9c0 100644 --- a/test/extensions/common/aws/credentials_provider_impl_test.cc +++ b/test/extensions/common/aws/credentials_provider_impl_test.cc @@ -1,4 +1,4 @@ -#include "extensions/common/aws/credentials_provider_impl.h" +#include "source/extensions/common/aws/credentials_provider_impl.h" #include "test/extensions/common/aws/mocks.h" #include "test/mocks/api/mocks.h" diff --git a/test/extensions/common/aws/credentials_provider_test.cc b/test/extensions/common/aws/credentials_provider_test.cc index e2aff11b2f52c..8a4ee220f3f64 100644 --- a/test/extensions/common/aws/credentials_provider_test.cc +++ b/test/extensions/common/aws/credentials_provider_test.cc @@ -1,4 +1,4 @@ -#include "extensions/common/aws/credentials_provider.h" +#include "source/extensions/common/aws/credentials_provider.h" #include "gtest/gtest.h" diff --git a/test/extensions/common/aws/mocks.h b/test/extensions/common/aws/mocks.h index 05f7562197107..d990409b4327e 100644 --- a/test/extensions/common/aws/mocks.h +++ b/test/extensions/common/aws/mocks.h @@ -1,7 +1,7 @@ #pragma once -#include "extensions/common/aws/credentials_provider.h" -#include "extensions/common/aws/signer.h" +#include "source/extensions/common/aws/credentials_provider.h" +#include "source/extensions/common/aws/signer.h" #include "gmock/gmock.h" diff --git a/test/extensions/common/aws/region_provider_impl_test.cc b/test/extensions/common/aws/region_provider_impl_test.cc index 8ab728258616f..8ea7b6386817f 100644 --- a/test/extensions/common/aws/region_provider_impl_test.cc +++ b/test/extensions/common/aws/region_provider_impl_test.cc @@ -1,4 +1,4 @@ -#include "extensions/common/aws/region_provider_impl.h" +#include "source/extensions/common/aws/region_provider_impl.h" #include "test/test_common/environment.h" diff --git a/test/extensions/common/aws/signer_impl_test.cc b/test/extensions/common/aws/signer_impl_test.cc index fb8625febbfc8..b3c060529ff85 100644 --- a/test/extensions/common/aws/signer_impl_test.cc +++ b/test/extensions/common/aws/signer_impl_test.cc @@ -1,8 +1,7 @@ -#include "common/buffer/buffer_impl.h" -#include "common/http/message_impl.h" - -#include "extensions/common/aws/signer_impl.h" -#include "extensions/common/aws/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/message_impl.h" +#include "source/extensions/common/aws/signer_impl.h" +#include "source/extensions/common/aws/utility.h" #include "test/extensions/common/aws/mocks.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/common/aws/utility_test.cc b/test/extensions/common/aws/utility_test.cc index 040bca0272fdd..1f115d9baff27 100644 --- a/test/extensions/common/aws/utility_test.cc +++ b/test/extensions/common/aws/utility_test.cc @@ -1,4 +1,4 @@ -#include "extensions/common/aws/utility.h" +#include "source/extensions/common/aws/utility.h" #include "test/test_common/utility.h" diff --git a/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc b/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc index ad5b0c5272146..25f4b42fc4c6d 100644 --- a/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc +++ b/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc @@ -2,11 +2,10 @@ #include "envoy/config/core/v3/resolver.pb.h" #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h" -#include "common/config/utility.h" -#include "common/network/resolver_impl.h" - -#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" +#include "source/common/config/utility.h" +#include "source/common/network/resolver_impl.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_manager_impl.h" #include "test/extensions/common/dynamic_forward_proxy/mocks.h" #include "test/mocks/network/mocks.h" @@ -16,6 +15,7 @@ #include "test/test_common/test_runtime.h" #include "test/test_common/utility.h" +using testing::DoAll; using testing::InSequence; using testing::Return; using testing::SaveArg; @@ -726,32 +726,61 @@ TEST_F(DnsCacheImplTest, DnsCacheCircuitBreakersOverflow) { EXPECT_EQ(1, TestUtility::findCounter(store_, "dns_cache.foo.dns_rq_pending_overflow")->value()); } -TEST(DnsCacheImplOptionsTest, UseTcpForDnsLookupsOptionSet) { - NiceMock dispatcher; - std::shared_ptr resolver{std::make_shared()}; - NiceMock tls; - NiceMock random; - NiceMock loader; - Stats::IsolatedStoreImpl store; +TEST_F(DnsCacheImplTest, UseTcpForDnsLookupsOptionSetDeprecatedField) { + initialize(); + config_.set_use_tcp_for_dns_lookups(true); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(resolver_))); + DnsCacheImpl dns_cache_(dispatcher_, tls_, random_, loader_, store_, config_); + // `true` here means dns_resolver_options.use_tcp_for_dns_lookups is set to true. + EXPECT_EQ(true, dns_resolver_options.use_tcp_for_dns_lookups()); +} - envoy::extensions::common::dynamic_forward_proxy::v3::DnsCacheConfig config; - config.set_use_tcp_for_dns_lookups(true); - EXPECT_CALL(dispatcher, createDnsResolver(_, true)).WillOnce(Return(resolver)); - DnsCacheImpl dns_cache_(dispatcher, tls, random, loader, store, config); +TEST_F(DnsCacheImplTest, UseTcpForDnsLookupsOptionSet) { + initialize(); + config_.mutable_dns_resolution_config() + ->mutable_dns_resolver_options() + ->set_use_tcp_for_dns_lookups(true); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(resolver_))); + DnsCacheImpl dns_cache_(dispatcher_, tls_, random_, loader_, store_, config_); + // `true` here means dns_resolver_options.use_tcp_for_dns_lookups is set to true. + EXPECT_EQ(true, dns_resolver_options.use_tcp_for_dns_lookups()); } -TEST(DnsCacheImplOptionsTest, UseTcpForDnsLookupsOptionUnSet) { - NiceMock dispatcher; - std::shared_ptr resolver{std::make_shared()}; - NiceMock tls; - NiceMock random; - NiceMock loader; - Stats::IsolatedStoreImpl store; +TEST_F(DnsCacheImplTest, NoDefaultSearchDomainOptionSet) { + initialize(); + config_.mutable_dns_resolution_config() + ->mutable_dns_resolver_options() + ->set_no_default_search_domain(true); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(resolver_))); + DnsCacheImpl dns_cache_(dispatcher_, tls_, random_, loader_, store_, config_); + // `true` here means dns_resolver_options.no_default_search_domain is set to true. + EXPECT_EQ(true, dns_resolver_options.no_default_search_domain()); +} - envoy::extensions::common::dynamic_forward_proxy::v3::DnsCacheConfig config; - config.set_use_tcp_for_dns_lookups(false); - EXPECT_CALL(dispatcher, createDnsResolver(_, false)).WillOnce(Return(resolver)); - DnsCacheImpl dns_cache_(dispatcher, tls, random, loader, store, config); +TEST_F(DnsCacheImplTest, UseTcpForDnsLookupsOptionUnSet) { + initialize(); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(resolver_))); + DnsCacheImpl dns_cache_(dispatcher_, tls_, random_, loader_, store_, config_); + // `false` here means dns_resolver_options.use_tcp_for_dns_lookups is set to false. + EXPECT_EQ(false, dns_resolver_options.use_tcp_for_dns_lookups()); +} + +TEST_F(DnsCacheImplTest, NoDefaultSearchDomainOptionUnSet) { + initialize(); + envoy::config::core::v3::DnsResolverOptions dns_resolver_options; + EXPECT_CALL(dispatcher_, createDnsResolver(_, _)) + .WillOnce(DoAll(SaveArg<1>(&dns_resolver_options), Return(resolver_))); + DnsCacheImpl dns_cache_(dispatcher_, tls_, random_, loader_, store_, config_); + // `false` here means dns_resolver_options.no_default_search_domain is set to false. + EXPECT_EQ(false, dns_resolver_options.no_default_search_domain()); } // DNS cache manager config tests. @@ -786,7 +815,7 @@ TEST(DnsCacheManagerImplTest, LoadViaConfig) { "config specified DNS cache 'foo' with different settings"); } -TEST(DnsCacheConfigOptionsTest, EmtpyDnsResolverConfig) { +TEST(DnsCacheConfigOptionsTest, EmtpyDnsResolutionConfig) { NiceMock dispatcher; std::shared_ptr resolver{std::make_shared()}; NiceMock tls; @@ -795,13 +824,13 @@ TEST(DnsCacheConfigOptionsTest, EmtpyDnsResolverConfig) { Stats::IsolatedStoreImpl store; envoy::extensions::common::dynamic_forward_proxy::v3::DnsCacheConfig config; - std::vector expectedEmptyDnsResolvers; - EXPECT_CALL(dispatcher, createDnsResolver(expectedEmptyDnsResolvers, _)) + std::vector expected_empty_dns_resolvers; + EXPECT_CALL(dispatcher, createDnsResolver(expected_empty_dns_resolvers, _)) .WillOnce(Return(resolver)); DnsCacheImpl dns_cache_(dispatcher, tls, random, loader, store, config); } -TEST(DnsCacheConfigOptionsTest, NonEmptyDnsResolverConfig) { +TEST(DnsCacheConfigOptionsTest, NonEmptyDnsResolutionConfig) { NiceMock dispatcher; std::shared_ptr resolver{std::make_shared()}; NiceMock tls; @@ -810,14 +839,15 @@ TEST(DnsCacheConfigOptionsTest, NonEmptyDnsResolverConfig) { Stats::IsolatedStoreImpl store; envoy::extensions::common::dynamic_forward_proxy::v3::DnsCacheConfig config; - envoy::config::core::v3::Address* dns_resolvers = config.mutable_dns_resolver()->add_resolvers(); + envoy::config::core::v3::Address* dns_resolvers = + config.mutable_dns_resolution_config()->add_resolvers(); dns_resolvers->mutable_socket_address()->set_address("1.2.3.4"); dns_resolvers->mutable_socket_address()->set_port_value(8080); - std::vector expected_dns_resolver_config; - expected_dns_resolver_config.push_back(Network::Address::resolveProtoAddress(*dns_resolvers)); + std::vector expected_dns_resolvers; + expected_dns_resolvers.push_back(Network::Address::resolveProtoAddress(*dns_resolvers)); EXPECT_CALL(dispatcher, - createDnsResolver(CustomDnsResolversSizeEquals(expected_dns_resolver_config), _)) + createDnsResolver(CustomDnsResolversSizeEquals(expected_dns_resolvers), _)) .WillOnce(Return(resolver)); DnsCacheImpl dns_cache_(dispatcher, tls, random, loader, store, config); } diff --git a/test/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager_test.cc b/test/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager_test.cc index 5ed57a7b46069..d6b07242ee0e5 100644 --- a/test/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager_test.cc +++ b/test/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager_test.cc @@ -1,9 +1,8 @@ #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h" -#include "common/config/utility.h" - -#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h" +#include "source/common/config/utility.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_resource_manager.h" #include "test/extensions/common/dynamic_forward_proxy/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/extensions/common/dynamic_forward_proxy/mocks.h b/test/extensions/common/dynamic_forward_proxy/mocks.h index 064864f93f827..d65583e21c596 100644 --- a/test/extensions/common/dynamic_forward_proxy/mocks.h +++ b/test/extensions/common/dynamic_forward_proxy/mocks.h @@ -2,7 +2,7 @@ #include "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h" #include "test/mocks/upstream/basic_resource_limit.h" diff --git a/test/extensions/common/matcher/matcher_test.cc b/test/extensions/common/matcher/matcher_test.cc index 28f6752eb24a0..6531884fe8300 100644 --- a/test/extensions/common/matcher/matcher_test.cc +++ b/test/extensions/common/matcher/matcher_test.cc @@ -1,8 +1,7 @@ #include "envoy/config/common/matcher/v3/matcher.pb.h" -#include "common/protobuf/utility.h" - -#include "extensions/common/matcher/matcher.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/common/matcher/matcher.h" #include "test/test_common/utility.h" diff --git a/test/extensions/common/proxy_protocol/proxy_protocol_header_test.cc b/test/extensions/common/proxy_protocol/proxy_protocol_header_test.cc index 86461d5107811..ca334234a4ef1 100644 --- a/test/extensions/common/proxy_protocol/proxy_protocol_header_test.cc +++ b/test/extensions/common/proxy_protocol/proxy_protocol_header_test.cc @@ -1,8 +1,7 @@ #include "envoy/network/address.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/common/proxy_protocol/proxy_protocol_header.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h" #include "test/mocks/network/connection.h" #include "test/test_common/utility.h" diff --git a/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc b/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc index 537665926a91c..f739c187f0da0 100644 --- a/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc +++ b/test/extensions/common/proxy_protocol/proxy_protocol_regression_test.cc @@ -1,15 +1,13 @@ #include "envoy/network/address.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/basic_resource_impl.h" -#include "common/event/dispatcher_impl.h" -#include "common/network/connection_balancer_impl.h" -#include "common/network/listen_socket_impl.h" - -#include "server/connection_handler_impl.h" - -#include "extensions/common/proxy_protocol/proxy_protocol_header.h" -#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/basic_resource_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/network/connection_balancer_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h" +#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h" +#include "source/server/connection_handler_impl.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/common/redis/cluster_refresh_manager_test.cc b/test/extensions/common/redis/cluster_refresh_manager_test.cc index ea07e16243847..e54c77037d82f 100644 --- a/test/extensions/common/redis/cluster_refresh_manager_test.cc +++ b/test/extensions/common/redis/cluster_refresh_manager_test.cc @@ -1,12 +1,10 @@ #include #include -#include "common/common/lock_guard.h" -#include "common/common/thread.h" - -#include "exe/platform_impl.h" - -#include "extensions/common/redis/cluster_refresh_manager_impl.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/thread.h" +#include "source/exe/platform_impl.h" +#include "source/extensions/common/redis/cluster_refresh_manager_impl.h" #include "test/extensions/filters/network/common/redis/mocks.h" #include "test/extensions/filters/network/redis_proxy/mocks.h" diff --git a/test/extensions/common/redis/mocks.h b/test/extensions/common/redis/mocks.h index 9c90c98703e78..7c90754f9948b 100644 --- a/test/extensions/common/redis/mocks.h +++ b/test/extensions/common/redis/mocks.h @@ -1,6 +1,6 @@ #pragma once -#include "extensions/common/redis/cluster_refresh_manager.h" +#include "source/extensions/common/redis/cluster_refresh_manager.h" #include "gmock/gmock.h" diff --git a/test/extensions/common/sqlutils/sqlutils_test.cc b/test/extensions/common/sqlutils/sqlutils_test.cc index 2ab95360367fa..ad73ebe47bb7a 100644 --- a/test/extensions/common/sqlutils/sqlutils_test.cc +++ b/test/extensions/common/sqlutils/sqlutils_test.cc @@ -1,4 +1,4 @@ -#include "extensions/common/sqlutils/sqlutils.h" +#include "source/extensions/common/sqlutils/sqlutils.h" #include "gtest/gtest.h" diff --git a/test/extensions/common/tap/admin_test.cc b/test/extensions/common/tap/admin_test.cc index 020f563600d5f..58cfe3da4d941 100644 --- a/test/extensions/common/tap/admin_test.cc +++ b/test/extensions/common/tap/admin_test.cc @@ -1,6 +1,6 @@ #include "envoy/config/tap/v3/common.pb.h" -#include "extensions/common/tap/admin.h" +#include "source/extensions/common/tap/admin.h" #include "test/mocks/server/admin.h" #include "test/mocks/server/admin_stream.h" diff --git a/test/extensions/common/tap/common.h b/test/extensions/common/tap/common.h index 6429527f1a9a9..6e5cdfcb75b4b 100644 --- a/test/extensions/common/tap/common.h +++ b/test/extensions/common/tap/common.h @@ -2,9 +2,8 @@ #include "envoy/data/tap/v3/wrapper.pb.h" -#include "common/protobuf/utility.h" - -#include "extensions/common/tap/tap.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/common/tap/tap.h" #include "test/test_common/utility.h" diff --git a/test/extensions/common/tap/tap_config_base_test.cc b/test/extensions/common/tap/tap_config_base_test.cc index 75ccec5a1595f..1216a756fd3a2 100644 --- a/test/extensions/common/tap/tap_config_base_test.cc +++ b/test/extensions/common/tap/tap_config_base_test.cc @@ -4,9 +4,8 @@ #include "envoy/data/tap/v3/common.pb.h" #include "envoy/data/tap/v3/wrapper.pb.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/common/tap/tap_config_base.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/common/tap/tap_config_base.h" #include "gtest/gtest.h" diff --git a/test/extensions/common/utility_test.cc b/test/extensions/common/utility_test.cc index 562a195370421..7a61dc4863028 100644 --- a/test/extensions/common/utility_test.cc +++ b/test/extensions/common/utility_test.cc @@ -1,4 +1,4 @@ -#include "extensions/common/utility.h" +#include "source/extensions/common/utility.h" #include "test/mocks/runtime/mocks.h" #include "test/test_common/logging.h" diff --git a/test/extensions/common/wasm/plugin_test.cc b/test/extensions/common/wasm/plugin_test.cc index 2b219066935f0..b5c15da516050 100644 --- a/test/extensions/common/wasm/plugin_test.cc +++ b/test/extensions/common/wasm/plugin_test.cc @@ -2,7 +2,7 @@ #include "envoy/common/exception.h" -#include "extensions/common/wasm/plugin.h" +#include "source/extensions/common/wasm/plugin.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" diff --git a/test/extensions/common/wasm/test_data/test_context_cpp.cc b/test/extensions/common/wasm/test_data/test_context_cpp.cc index 07d9d418f26d5..e790fd1011b35 100644 --- a/test/extensions/common/wasm/test_data/test_context_cpp.cc +++ b/test/extensions/common/wasm/test_data/test_context_cpp.cc @@ -8,7 +8,7 @@ #include "proxy_wasm_intrinsics.h" #include "source/extensions/common/wasm/ext/envoy_proxy_wasm_api.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #endif START_WASM_PLUGIN(CommonWasmTestContextCpp) diff --git a/test/extensions/common/wasm/wasm_speed_test.cc b/test/extensions/common/wasm/wasm_speed_test.cc index a71102453f954..d9e65579547db 100644 --- a/test/extensions/common/wasm/wasm_speed_test.cc +++ b/test/extensions/common/wasm/wasm_speed_test.cc @@ -1,7 +1,6 @@ -#include "common/common/thread.h" -#include "common/common/thread_synchronizer.h" - -#include "extensions/common/wasm/wasm.h" +#include "source/common/common/thread.h" +#include "source/common/common/thread_synchronizer.h" +#include "source/extensions/common/wasm/wasm.h" #include "test/mocks/server/mocks.h" #include "test/mocks/upstream/mocks.h" diff --git a/test/extensions/common/wasm/wasm_test.cc b/test/extensions/common/wasm/wasm_test.cc index 795ab9f77fd63..6f99411c10c63 100644 --- a/test/extensions/common/wasm/wasm_test.cc +++ b/test/extensions/common/wasm/wasm_test.cc @@ -1,10 +1,9 @@ #include "envoy/server/lifecycle_notifier.h" -#include "common/common/hex.h" -#include "common/event/dispatcher_impl.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/common/wasm/wasm.h" +#include "source/common/common/hex.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/common/wasm/wasm.h" #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/server/mocks.h" @@ -73,9 +72,9 @@ class TestContext : public ::Envoy::Extensions::Common::Wasm::Context { using ::Envoy::Extensions::Common::Wasm::Context::Context; ~TestContext() override = default; using ::Envoy::Extensions::Common::Wasm::Context::log; - proxy_wasm::WasmResult log(uint32_t level, absl::string_view message) override { - std::cerr << std::string(message) << "\n"; - log_(static_cast(level), message); + proxy_wasm::WasmResult log(uint32_t level, std::string_view message) override { + std::cerr << message << "\n"; + log_(static_cast(level), toAbslStringView(message)); Extensions::Common::Wasm::Context::log(static_cast(level), message); return proxy_wasm::WasmResult::Ok; } @@ -203,7 +202,8 @@ TEST_P(WasmCommonTest, Logging) { EXPECT_EQ(std::unique_ptr(wasm->createContext(plugin)), nullptr); auto wasm_weak = std::weak_ptr(wasm); auto wasm_handle = std::make_shared(std::move(wasm)); - EXPECT_TRUE(wasm_weak.lock()->initialize(code, false)); + EXPECT_TRUE(wasm_weak.lock()->load(code, false)); + EXPECT_TRUE(wasm_weak.lock()->initialize()); auto thread_local_wasm = std::make_shared(wasm_handle, *dispatcher); thread_local_wasm.reset(); @@ -269,7 +269,8 @@ TEST_P(WasmCommonTest, BadSignature) { auto wasm = std::make_unique(plugin->wasmConfig(), vm_key, scope, cluster_manager, *dispatcher); - EXPECT_FALSE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_FALSE(wasm->initialize()); EXPECT_TRUE(wasm->isFailed()); } @@ -303,7 +304,8 @@ TEST_P(WasmCommonTest, Segv) { auto vm_key = proxy_wasm::makeVmKey("", vm_configuration, code); auto wasm = std::make_unique(plugin->wasmConfig(), vm_key, scope, cluster_manager, *dispatcher); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); TestContext* root_context = nullptr; wasm->setCreateContextForTesting( nullptr, [&root_context](Wasm* wasm, const std::shared_ptr& plugin) -> ContextBase* { @@ -354,7 +356,8 @@ TEST_P(WasmCommonTest, DivByZero) { cluster_manager, *dispatcher); EXPECT_NE(wasm, nullptr); auto context = std::make_unique(wasm.get()); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); wasm->setCreateContextForTesting( nullptr, [](Wasm* wasm, const std::shared_ptr& plugin) -> ContextBase* { auto root_context = new TestContext(wasm, plugin); @@ -398,7 +401,8 @@ TEST_P(WasmCommonTest, IntrinsicGlobals) { cluster_manager, *dispatcher); EXPECT_NE(wasm, nullptr); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); wasm->setCreateContextForTesting( nullptr, [](Wasm* wasm, const std::shared_ptr& plugin) -> ContextBase* { auto root_context = new TestContext(wasm, plugin); @@ -443,7 +447,8 @@ TEST_P(WasmCommonTest, Utilities) { cluster_manager, *dispatcher); EXPECT_NE(wasm, nullptr); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); wasm->setCreateContextForTesting( nullptr, [](Wasm* wasm, const std::shared_ptr& plugin) -> ContextBase* { auto root_context = new TestContext(wasm, plugin); @@ -516,7 +521,8 @@ TEST_P(WasmCommonTest, Stats) { cluster_manager, *dispatcher); EXPECT_NE(wasm, nullptr); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); wasm->setCreateContextForTesting( nullptr, [](Wasm* wasm, const std::shared_ptr& plugin) -> ContextBase* { auto root_context = new TestContext(wasm, plugin); @@ -564,7 +570,8 @@ TEST_P(WasmCommonTest, Foreign) { code = "CommonWasmTestCpp"; } EXPECT_FALSE(code.empty()); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); wasm->setCreateContextForTesting( nullptr, [](Wasm* wasm, const std::shared_ptr& plugin) -> ContextBase* { auto root_context = new TestContext(wasm, plugin); @@ -613,7 +620,8 @@ TEST_P(WasmCommonTest, OnForeign) { code = "CommonWasmTestCpp"; } EXPECT_FALSE(code.empty()); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); TestContext* test_context = nullptr; wasm->setCreateContextForTesting( nullptr, [&test_context](Wasm* wasm, const std::shared_ptr& plugin) -> ContextBase* { @@ -664,7 +672,8 @@ TEST_P(WasmCommonTest, WASI) { code = "CommonWasmTestCpp"; } EXPECT_FALSE(code.empty()); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); wasm->setCreateContextForTesting( nullptr, [](Wasm* wasm, const std::shared_ptr& plugin) -> ContextBase* { auto root_context = new TestContext(wasm, plugin); @@ -1057,7 +1066,8 @@ TEST_P(WasmCommonTest, RestrictCapabilities) { EXPECT_NE(wasm, nullptr); auto context = std::make_unique(wasm.get()); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); // expect no call because proxy_on_vm_start is restricted wasm->setCreateContextForTesting( @@ -1114,7 +1124,8 @@ TEST_P(WasmCommonTest, AllowOnVmStart) { EXPECT_NE(wasm, nullptr); auto context = std::make_unique(wasm.get()); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); // proxy_on_vm_start will trigger proxy_log and fd_write, but expect no call because both are // restricted @@ -1177,7 +1188,8 @@ TEST_P(WasmCommonTest, AllowLog) { EXPECT_NE(wasm, nullptr); auto context = std::make_unique(wasm.get()); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); // Expect proxy_log since allowed, but no call to WASI since restricted wasm->setCreateContextForTesting( @@ -1235,7 +1247,8 @@ TEST_P(WasmCommonTest, AllowWASI) { EXPECT_NE(wasm, nullptr); auto context = std::make_unique(wasm.get()); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); wasm->setCreateContextForTesting( nullptr, [](Wasm* wasm, const std::shared_ptr& plugin) -> ContextBase* { @@ -1294,7 +1307,8 @@ TEST_P(WasmCommonTest, AllowOnContextCreate) { EXPECT_NE(wasm, nullptr); auto context = std::make_unique(wasm.get()); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); // Expect two calls to proxy_log, from proxy_on_vm_start and from proxy_on_context_create wasm->setCreateContextForTesting( @@ -1353,14 +1367,15 @@ TEST_P(WasmCommonTest, ThreadLocalCopyRetainsEnforcement) { EXPECT_NE(wasm, nullptr); auto context = std::make_unique(wasm.get()); - EXPECT_TRUE(wasm->initialize(code, false)); + EXPECT_TRUE(wasm->load(code, false)); + EXPECT_TRUE(wasm->initialize()); auto wasm_handle = std::make_shared(std::move(wasm)); auto thread_local_wasm = std::make_shared(wasm_handle, *dispatcher); EXPECT_NE(thread_local_wasm, nullptr); context = std::make_unique(thread_local_wasm.get()); - EXPECT_TRUE(thread_local_wasm->initialize(code, false)); + EXPECT_TRUE(thread_local_wasm->initialize()); EXPECT_TRUE(thread_local_wasm->capabilityAllowed("proxy_on_vm_start")); EXPECT_FALSE(thread_local_wasm->capabilityAllowed("proxy_log")); diff --git a/test/extensions/common/wasm/wasm_vm_test.cc b/test/extensions/common/wasm/wasm_vm_test.cc index 46edd6dfe3ca2..cc55c5f3e6cc0 100644 --- a/test/extensions/common/wasm/wasm_vm_test.cc +++ b/test/extensions/common/wasm/wasm_vm_test.cc @@ -1,14 +1,14 @@ #include "envoy/registry/registry.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/common/wasm/wasm_vm.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/common/wasm/wasm_vm.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "include/proxy-wasm/bytecode_util.h" #include "include/proxy-wasm/null_vm_plugin.h" using proxy_wasm::Cloneable; // NOLINT @@ -125,152 +125,169 @@ class WasmVmTest : public testing::TestWithParam { } void TearDown() override { delete g_host_functions; } + bool init(std::string code = {}) { + wasm_vm_ = createWasmVm("envoy.wasm.runtime.v8"); + if (wasm_vm_.get() == nullptr) { + return false; + } + + if (code.empty()) { + code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( + "{{ test_rundir }}/test/extensions/common/wasm/test_data/test_rust.wasm")); + } + + // clang-format off + std::string_view precompiled = {}; + // clang-format on + + // Load precompiled module on Linux-x86_64, since it's only support there. +#if defined(__linux__) && defined(__x86_64__) + if (GetParam() /* allow_precompiled */) { + // Section name is expected to be available in the tested runtimes. + const auto section_name = wasm_vm_->getPrecompiledSectionName(); + if (section_name.empty()) { + return false; + } + if (!proxy_wasm::BytecodeUtil::getCustomSection(code, section_name, precompiled)) { + return false; + } + // Precompiled module is expected to be available in the test file. + if (precompiled.empty()) { + return false; + } + } +#endif + + std::string stripped; + if (!proxy_wasm::BytecodeUtil::getStrippedSource(code, stripped)) { + return false; + } + + return wasm_vm_->load(stripped, precompiled, {}); + } + protected: Stats::IsolatedStoreImpl stats_store; Stats::ScopeSharedPtr scope_; + WasmVmPtr wasm_vm_; }; -INSTANTIATE_TEST_SUITE_P(AllowPrecompiled, WasmVmTest, testing::Values(false, true)); - -TEST_P(WasmVmTest, V8BadCode) { - auto wasm_vm = createWasmVm("envoy.wasm.runtime.v8"); - ASSERT_TRUE(wasm_vm != nullptr); - - EXPECT_FALSE(wasm_vm->load("bad code", GetParam())); -} - -TEST_P(WasmVmTest, V8Code) { - auto wasm_vm = createWasmVm("envoy.wasm.runtime.v8"); - ASSERT_TRUE(wasm_vm != nullptr); - EXPECT_TRUE(wasm_vm->runtime() == "v8"); +INSTANTIATE_TEST_SUITE_P(AllowPrecompiled, WasmVmTest, +#if defined(__linux__) && defined(__x86_64__) + testing::Values(false, true) +#else + testing::Values(false) +#endif +); - auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( - "{{ test_rundir }}/test/extensions/common/wasm/test_data/test_rust.wasm")); - EXPECT_TRUE(wasm_vm->load(code, GetParam())); +TEST_P(WasmVmTest, V8BadCode) { ASSERT_FALSE(init("bad code")); } - EXPECT_TRUE(wasm_vm->cloneable() == Cloneable::CompiledBytecode); - EXPECT_TRUE(wasm_vm->clone() != nullptr); +TEST_P(WasmVmTest, V8Load) { + ASSERT_TRUE(init()); + EXPECT_TRUE(wasm_vm_->runtime() == "v8"); + EXPECT_TRUE(wasm_vm_->cloneable() == Cloneable::CompiledBytecode); + EXPECT_TRUE(wasm_vm_->clone() != nullptr); } TEST_P(WasmVmTest, V8BadHostFunctions) { - auto wasm_vm = createWasmVm("envoy.wasm.runtime.v8"); - ASSERT_TRUE(wasm_vm != nullptr); - - auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( - "{{ test_rundir }}/test/extensions/common/wasm/test_data/test_rust.wasm")); - EXPECT_TRUE(wasm_vm->load(code, GetParam())); + ASSERT_TRUE(init()); - wasm_vm->registerCallback("env", "random", &random, CONVERT_FUNCTION_WORD_TO_UINT32(random)); - EXPECT_FALSE(wasm_vm->link("test")); + wasm_vm_->registerCallback("env", "random", &random, CONVERT_FUNCTION_WORD_TO_UINT32(random)); + EXPECT_FALSE(wasm_vm_->link("test")); - wasm_vm->registerCallback("env", "pong", &bad_pong1, CONVERT_FUNCTION_WORD_TO_UINT32(bad_pong1)); - EXPECT_FALSE(wasm_vm->link("test")); + wasm_vm_->registerCallback("env", "pong", &bad_pong1, CONVERT_FUNCTION_WORD_TO_UINT32(bad_pong1)); + EXPECT_FALSE(wasm_vm_->link("test")); - wasm_vm->registerCallback("env", "pong", &bad_pong2, CONVERT_FUNCTION_WORD_TO_UINT32(bad_pong2)); - EXPECT_FALSE(wasm_vm->link("test")); + wasm_vm_->registerCallback("env", "pong", &bad_pong2, CONVERT_FUNCTION_WORD_TO_UINT32(bad_pong2)); + EXPECT_FALSE(wasm_vm_->link("test")); - wasm_vm->registerCallback("env", "pong", &bad_pong3, CONVERT_FUNCTION_WORD_TO_UINT32(bad_pong3)); - EXPECT_FALSE(wasm_vm->link("test")); + wasm_vm_->registerCallback("env", "pong", &bad_pong3, CONVERT_FUNCTION_WORD_TO_UINT32(bad_pong3)); + EXPECT_FALSE(wasm_vm_->link("test")); } TEST_P(WasmVmTest, V8BadModuleFunctions) { - auto wasm_vm = createWasmVm("envoy.wasm.runtime.v8"); - ASSERT_TRUE(wasm_vm != nullptr); + ASSERT_TRUE(init()); - auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( - "{{ test_rundir }}/test/extensions/common/wasm/test_data/test_rust.wasm")); - EXPECT_TRUE(wasm_vm->load(code, GetParam())); - - wasm_vm->registerCallback("env", "pong", &pong, CONVERT_FUNCTION_WORD_TO_UINT32(pong)); - wasm_vm->registerCallback("env", "random", &random, CONVERT_FUNCTION_WORD_TO_UINT32(random)); - wasm_vm->link("test"); + wasm_vm_->registerCallback("env", "pong", &pong, CONVERT_FUNCTION_WORD_TO_UINT32(pong)); + wasm_vm_->registerCallback("env", "random", &random, CONVERT_FUNCTION_WORD_TO_UINT32(random)); + wasm_vm_->link("test"); WasmCallVoid<1> ping; WasmCallWord<3> sum; - wasm_vm->getFunction("nonexistent", &ping); + wasm_vm_->getFunction("nonexistent", &ping); EXPECT_TRUE(ping == nullptr); - wasm_vm->getFunction("nonexistent", &sum); + wasm_vm_->getFunction("nonexistent", &sum); EXPECT_TRUE(sum == nullptr); - wasm_vm->getFunction("ping", &sum); - EXPECT_TRUE(wasm_vm->isFailed()); + wasm_vm_->getFunction("ping", &sum); + EXPECT_TRUE(wasm_vm_->isFailed()); - wasm_vm->getFunction("sum", &ping); - EXPECT_TRUE(wasm_vm->isFailed()); + wasm_vm_->getFunction("sum", &ping); + EXPECT_TRUE(wasm_vm_->isFailed()); } TEST_P(WasmVmTest, V8FunctionCalls) { - auto wasm_vm = createWasmVm("envoy.wasm.runtime.v8"); - ASSERT_TRUE(wasm_vm != nullptr); - - auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( - "{{ test_rundir }}/test/extensions/common/wasm/test_data/test_rust.wasm")); - EXPECT_TRUE(wasm_vm->load(code, GetParam())); + ASSERT_TRUE(init()); - wasm_vm->registerCallback("env", "pong", &pong, CONVERT_FUNCTION_WORD_TO_UINT32(pong)); - wasm_vm->registerCallback("env", "random", &random, CONVERT_FUNCTION_WORD_TO_UINT32(random)); - wasm_vm->link("test"); + wasm_vm_->registerCallback("env", "pong", &pong, CONVERT_FUNCTION_WORD_TO_UINT32(pong)); + wasm_vm_->registerCallback("env", "random", &random, CONVERT_FUNCTION_WORD_TO_UINT32(random)); + wasm_vm_->link("test"); WasmCallVoid<1> ping; - wasm_vm->getFunction("ping", &ping); + wasm_vm_->getFunction("ping", &ping); EXPECT_CALL(*g_host_functions, pong(42)); ping(nullptr /* no context */, 42); WasmCallWord<1> lucky; - wasm_vm->getFunction("lucky", &lucky); + wasm_vm_->getFunction("lucky", &lucky); EXPECT_CALL(*g_host_functions, random()).WillRepeatedly(Return(42)); EXPECT_EQ(0, lucky(nullptr /* no context */, 1).u64_); EXPECT_EQ(1, lucky(nullptr /* no context */, 42).u64_); WasmCallWord<3> sum; - wasm_vm->getFunction("sum", &sum); + wasm_vm_->getFunction("sum", &sum); EXPECT_EQ(42, sum(nullptr /* no context */, 13, 14, 15).u64_); WasmCallWord<2> div; - wasm_vm->getFunction("div", &div); + wasm_vm_->getFunction("div", &div); div(nullptr /* no context */, 42, 0); - EXPECT_TRUE(wasm_vm->isFailed()); + EXPECT_TRUE(wasm_vm_->isFailed()); WasmCallVoid<0> abort; - wasm_vm->getFunction("abort", &abort); + wasm_vm_->getFunction("abort", &abort); abort(nullptr /* no context */); - EXPECT_TRUE(wasm_vm->isFailed()); + EXPECT_TRUE(wasm_vm_->isFailed()); } TEST_P(WasmVmTest, V8Memory) { - auto wasm_vm = createWasmVm("envoy.wasm.runtime.v8"); - ASSERT_TRUE(wasm_vm != nullptr); - - auto code = TestEnvironment::readFileToStringForTest(TestEnvironment::substitute( - "{{ test_rundir }}/test/extensions/common/wasm/test_data/test_rust.wasm")); - EXPECT_TRUE(wasm_vm->load(code, GetParam())); + ASSERT_TRUE(init()); - wasm_vm->registerCallback("env", "pong", &pong, CONVERT_FUNCTION_WORD_TO_UINT32(pong)); - wasm_vm->registerCallback("env", "random", &random, CONVERT_FUNCTION_WORD_TO_UINT32(random)); - wasm_vm->link("test"); + wasm_vm_->registerCallback("env", "pong", &pong, CONVERT_FUNCTION_WORD_TO_UINT32(pong)); + wasm_vm_->registerCallback("env", "random", &random, CONVERT_FUNCTION_WORD_TO_UINT32(random)); + wasm_vm_->link("test"); - EXPECT_EQ(wasm_vm->getMemorySize(), 65536 /* stack size requested at the build-time */); + EXPECT_EQ(wasm_vm_->getMemorySize(), 65536 /* stack size requested at the build-time */); const uint64_t test_addr = 128; std::string set = "test"; - EXPECT_TRUE(wasm_vm->setMemory(test_addr, set.size(), set.data())); - auto got = wasm_vm->getMemory(test_addr, set.size()).value(); + EXPECT_TRUE(wasm_vm_->setMemory(test_addr, set.size(), set.data())); + auto got = wasm_vm_->getMemory(test_addr, set.size()).value(); EXPECT_EQ(sizeof("test") - 1, got.size()); EXPECT_STREQ("test", got.data()); - EXPECT_FALSE(wasm_vm->setMemory(1024 * 1024 /* out of bound */, 1 /* size */, nullptr)); - EXPECT_FALSE(wasm_vm->getMemory(1024 * 1024 /* out of bound */, 1 /* size */).has_value()); + EXPECT_FALSE(wasm_vm_->setMemory(1024 * 1024 /* out of bound */, 1 /* size */, nullptr)); + EXPECT_FALSE(wasm_vm_->getMemory(1024 * 1024 /* out of bound */, 1 /* size */).has_value()); Word word(0); - EXPECT_TRUE(wasm_vm->setWord(test_addr, std::numeric_limits::max())); - EXPECT_TRUE(wasm_vm->getWord(test_addr, &word)); + EXPECT_TRUE(wasm_vm_->setWord(test_addr, std::numeric_limits::max())); + EXPECT_TRUE(wasm_vm_->getWord(test_addr, &word)); EXPECT_EQ(std::numeric_limits::max(), word.u64_); - EXPECT_FALSE(wasm_vm->setWord(1024 * 1024 /* out of bound */, 1)); - EXPECT_FALSE(wasm_vm->getWord(1024 * 1024 /* out of bound */, &word)); + EXPECT_FALSE(wasm_vm_->setWord(1024 * 1024 /* out of bound */, 1)); + EXPECT_FALSE(wasm_vm_->getWord(1024 * 1024 /* out of bound */, &word)); } #endif diff --git a/test/extensions/compression/brotli/compressor/brotli_compressor_impl_test.cc b/test/extensions/compression/brotli/compressor/brotli_compressor_impl_test.cc index 8a26cd53e1251..1e6949eb89188 100644 --- a/test/extensions/compression/brotli/compressor/brotli_compressor_impl_test.cc +++ b/test/extensions/compression/brotli/compressor/brotli_compressor_impl_test.cc @@ -1,8 +1,7 @@ -#include "common/buffer/buffer_impl.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/compression/brotli/compressor/config.h" -#include "extensions/compression/brotli/decompressor/brotli_decompressor_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/compression/brotli/compressor/config.h" +#include "source/extensions/compression/brotli/decompressor/brotli_decompressor_impl.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/compression/brotli/decompressor/brotli_decompressor_impl_test.cc b/test/extensions/compression/brotli/decompressor/brotli_decompressor_impl_test.cc index cd5d3ee1fd2a3..c03884f35f9f8 100644 --- a/test/extensions/compression/brotli/decompressor/brotli_decompressor_impl_test.cc +++ b/test/extensions/compression/brotli/decompressor/brotli_decompressor_impl_test.cc @@ -1,8 +1,7 @@ -#include "common/buffer/buffer_impl.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/compression/brotli/compressor/brotli_compressor_impl.h" -#include "extensions/compression/brotli/decompressor/config.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/compression/brotli/compressor/brotli_compressor_impl.h" +#include "source/extensions/compression/brotli/decompressor/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/compression/gzip/compressor/zlib_compressor_impl_test.cc b/test/extensions/compression/gzip/compressor/zlib_compressor_impl_test.cc index 7d5046e1c7447..2e4670913ba02 100644 --- a/test/extensions/compression/gzip/compressor/zlib_compressor_impl_test.cc +++ b/test/extensions/compression/gzip/compressor/zlib_compressor_impl_test.cc @@ -1,8 +1,7 @@ -#include "common/buffer/buffer_impl.h" -#include "common/common/hex.h" - -#include "extensions/compression/gzip/compressor/config.h" -#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/hex.h" +#include "source/extensions/compression/gzip/compressor/config.h" +#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h" #include "test/test_common/utility.h" diff --git a/test/extensions/compression/gzip/compressor_fuzz_test.cc b/test/extensions/compression/gzip/compressor_fuzz_test.cc index bdaa5283e53af..73c592cb1f812 100644 --- a/test/extensions/compression/gzip/compressor_fuzz_test.cc +++ b/test/extensions/compression/gzip/compressor_fuzz_test.cc @@ -1,9 +1,8 @@ -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h" -#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h" +#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/extensions/compression/gzip/decompressor/zlib_decompressor_impl_test.cc b/test/extensions/compression/gzip/decompressor/zlib_decompressor_impl_test.cc index 43ae89d42fd0b..0346118a2b224 100644 --- a/test/extensions/compression/gzip/decompressor/zlib_decompressor_impl_test.cc +++ b/test/extensions/compression/gzip/decompressor/zlib_decompressor_impl_test.cc @@ -1,9 +1,8 @@ -#include "common/buffer/buffer_impl.h" -#include "common/common/hex.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h" -#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/hex.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h" +#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/common/expr/context_test.cc b/test/extensions/filters/common/expr/context_test.cc index 5d949add5b933..dc3e58b62bbb1 100644 --- a/test/extensions/filters/common/expr/context_test.cc +++ b/test/extensions/filters/common/expr/context_test.cc @@ -1,10 +1,9 @@ -#include "common/network/utility.h" -#include "common/protobuf/protobuf.h" -#include "common/router/string_accessor_impl.h" -#include "common/stream_info/filter_state_impl.h" - -#include "extensions/filters/common/expr/cel_state.h" -#include "extensions/filters/common/expr/context.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/router/string_accessor_impl.h" +#include "source/common/stream_info/filter_state_impl.h" +#include "source/extensions/filters/common/expr/cel_state.h" +#include "source/extensions/filters/common/expr/context.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/extensions/filters/common/expr/evaluator_fuzz_test.cc b/test/extensions/filters/common/expr/evaluator_fuzz_test.cc index 6c3867747eded..108e7211a36dd 100644 --- a/test/extensions/filters/common/expr/evaluator_fuzz_test.cc +++ b/test/extensions/filters/common/expr/evaluator_fuzz_test.cc @@ -1,6 +1,5 @@ -#include "common/network/utility.h" - -#include "extensions/filters/common/expr/evaluator.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/common/expr/evaluator.h" #include "test/common/stream_info/test_util.h" #include "test/extensions/filters/common/expr/evaluator_fuzz.pb.validate.h" diff --git a/test/extensions/filters/common/expr/evaluator_test.cc b/test/extensions/filters/common/expr/evaluator_test.cc index ab4da05f04f7b..784462960246d 100644 --- a/test/extensions/filters/common/expr/evaluator_test.cc +++ b/test/extensions/filters/common/expr/evaluator_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/common/expr/evaluator.h" +#include "source/extensions/filters/common/expr/evaluator.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/common/ext_authz/check_request_utils_test.cc b/test/extensions/filters/common/ext_authz/check_request_utils_test.cc index ff72b173d61ea..b85ae8e15b24e 100644 --- a/test/extensions/filters/common/ext_authz/check_request_utils_test.cc +++ b/test/extensions/filters/common/ext_authz/check_request_utils_test.cc @@ -1,10 +1,9 @@ #include "envoy/service/auth/v3/external_auth.pb.h" -#include "common/network/address_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/common/ext_authz/check_request_utils.h" -#include "extensions/filters/common/ext_authz/ext_authz.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/common/ext_authz/check_request_utils.h" +#include "source/extensions/filters/common/ext_authz/ext_authz.h" #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc b/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc index 2601533b8d701..f771573698d1e 100644 --- a/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc +++ b/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc @@ -1,11 +1,10 @@ #include "envoy/service/auth/v3/external_auth.pb.h" #include "envoy/type/v3/http_status.pb.h" -#include "common/grpc/common.h" -#include "common/http/headers.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" +#include "source/common/grpc/common.h" +#include "source/common/http/headers.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" #include "test/extensions/filters/common/ext_authz/mocks.h" #include "test/extensions/filters/common/ext_authz/test_common.h" diff --git a/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc b/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc index 97e51e11a505c..96d0be2f7b171 100644 --- a/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc +++ b/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc @@ -1,13 +1,12 @@ #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.h" #include "envoy/service/auth/v3/external_auth.pb.h" -#include "common/common/empty_string.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/protobuf/protobuf.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/filters/common/ext_authz/ext_authz_http_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_http_impl.h" #include "test/extensions/filters/common/ext_authz/mocks.h" #include "test/extensions/filters/common/ext_authz/test_common.h" diff --git a/test/extensions/filters/common/ext_authz/mocks.h b/test/extensions/filters/common/ext_authz/mocks.h index 900d64d7d0fdf..1a3462d532f64 100644 --- a/test/extensions/filters/common/ext_authz/mocks.h +++ b/test/extensions/filters/common/ext_authz/mocks.h @@ -5,7 +5,7 @@ #include "envoy/service/auth/v3/external_auth.pb.h" -#include "extensions/filters/common/ext_authz/ext_authz.h" +#include "source/extensions/filters/common/ext_authz/ext_authz.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/common/ext_authz/test_common.h b/test/extensions/filters/common/ext_authz/test_common.h index 358f3a9a5fb8e..5d1e72222713d 100644 --- a/test/extensions/filters/common/ext_authz/test_common.h +++ b/test/extensions/filters/common/ext_authz/test_common.h @@ -4,9 +4,8 @@ #include "envoy/service/auth/v3/external_auth.pb.h" #include "envoy/type/v3/http_status.pb.h" -#include "common/http/headers.h" - -#include "extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" +#include "source/common/http/headers.h" +#include "source/extensions/filters/common/ext_authz/ext_authz_grpc_impl.h" #include "test/extensions/filters/common/ext_authz/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/common/fault/fault_config_test.cc b/test/extensions/filters/common/fault/fault_config_test.cc index 784aa2d88ab46..053d10284274d 100644 --- a/test/extensions/filters/common/fault/fault_config_test.cc +++ b/test/extensions/filters/common/fault/fault_config_test.cc @@ -1,6 +1,6 @@ #include "envoy/extensions/filters/common/fault/v3/fault.pb.h" -#include "extensions/filters/common/fault/fault_config.h" +#include "source/extensions/filters/common/fault/fault_config.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/common/local_ratelimit/local_ratelimit_test.cc b/test/extensions/filters/common/local_ratelimit/local_ratelimit_test.cc index f35cf5b325b53..c857bbe74a1ca 100644 --- a/test/extensions/filters/common/local_ratelimit/local_ratelimit_test.cc +++ b/test/extensions/filters/common/local_ratelimit/local_ratelimit_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/common/local_ratelimit/local_ratelimit_impl.h" +#include "source/extensions/filters/common/local_ratelimit/local_ratelimit_impl.h" #include "test/mocks/event/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/common/lua/lua_test.cc b/test/extensions/filters/common/lua/lua_test.cc index ab7ef7da3bafd..473a280022a64 100644 --- a/test/extensions/filters/common/lua/lua_test.cc +++ b/test/extensions/filters/common/lua/lua_test.cc @@ -1,8 +1,7 @@ #include -#include "common/thread_local/thread_local_impl.h" - -#include "extensions/filters/common/lua/lua.h" +#include "source/common/thread_local/thread_local_impl.h" +#include "source/extensions/filters/common/lua/lua.h" #include "test/mocks/common.h" #include "test/mocks/thread_local/mocks.h" diff --git a/test/extensions/filters/common/lua/lua_wrappers.h b/test/extensions/filters/common/lua/lua_wrappers.h index c129f34544cf4..b7c1dfb4bb50b 100644 --- a/test/extensions/filters/common/lua/lua_wrappers.h +++ b/test/extensions/filters/common/lua/lua_wrappers.h @@ -2,7 +2,7 @@ #include -#include "extensions/filters/common/lua/lua.h" +#include "source/extensions/filters/common/lua/lua.h" #include "test/mocks/thread_local/mocks.h" diff --git a/test/extensions/filters/common/lua/wrappers_test.cc b/test/extensions/filters/common/lua/wrappers_test.cc index bbb334ef4d3dc..565843d7e14c0 100644 --- a/test/extensions/filters/common/lua/wrappers_test.cc +++ b/test/extensions/filters/common/lua/wrappers_test.cc @@ -1,8 +1,7 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/common/lua/wrappers.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/common/lua/wrappers.h" #include "test/extensions/filters/common/lua/lua_wrappers.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/common/original_src/original_src_socket_option_test.cc b/test/extensions/filters/common/original_src/original_src_socket_option_test.cc index eed0724bc198c..7159e32273659 100644 --- a/test/extensions/filters/common/original_src/original_src_socket_option_test.cc +++ b/test/extensions/filters/common/original_src/original_src_socket_option_test.cc @@ -1,9 +1,8 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/network/address.h" -#include "common/network/utility.h" - -#include "extensions/filters/common/original_src/original_src_socket_option.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/common/original_src/original_src_socket_option.h" #include "test/mocks/common.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/common/ratelimit/BUILD b/test/extensions/filters/common/ratelimit/BUILD index 8a11ca96f8e6d..ace59c86ebd86 100644 --- a/test/extensions/filters/common/ratelimit/BUILD +++ b/test/extensions/filters/common/ratelimit/BUILD @@ -29,7 +29,7 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/ratelimit:ratelimit_interface", + "//envoy/ratelimit:ratelimit_interface", "//source/extensions/filters/common/ratelimit:ratelimit_client_interface", ], ) diff --git a/test/extensions/filters/common/ratelimit/mocks.h b/test/extensions/filters/common/ratelimit/mocks.h index 325f61cc79d74..57b5246d69be3 100644 --- a/test/extensions/filters/common/ratelimit/mocks.h +++ b/test/extensions/filters/common/ratelimit/mocks.h @@ -6,7 +6,7 @@ #include "envoy/ratelimit/ratelimit.h" #include "envoy/stream_info/stream_info.h" -#include "extensions/filters/common/ratelimit/ratelimit.h" +#include "source/extensions/filters/common/ratelimit/ratelimit.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc b/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc index c4cd2b9d420e8..00c87f500904a 100644 --- a/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc +++ b/test/extensions/filters/common/ratelimit/ratelimit_impl_test.cc @@ -6,11 +6,10 @@ #include "envoy/service/ratelimit/v3/rls.pb.h" #include "envoy/stats/scope.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/filters/common/ratelimit/ratelimit_impl.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h" #include "test/mocks/grpc/mocks.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/extensions/filters/common/rbac/engine_impl_test.cc b/test/extensions/filters/common/rbac/engine_impl_test.cc index ec9f787f35754..87e10cfb23d62 100644 --- a/test/extensions/filters/common/rbac/engine_impl_test.cc +++ b/test/extensions/filters/common/rbac/engine_impl_test.cc @@ -2,9 +2,8 @@ #include "envoy/config/rbac/v3/rbac.pb.h" #include "envoy/config/rbac/v3/rbac.pb.validate.h" -#include "common/network/utility.h" - -#include "extensions/filters/common/rbac/engine_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/common/rbac/engine_impl.h" #include "test/mocks/network/mocks.h" #include "test/mocks/ssl/mocks.h" diff --git a/test/extensions/filters/common/rbac/matchers_test.cc b/test/extensions/filters/common/rbac/matchers_test.cc index 5b1293b4677d3..ed39ff132283d 100644 --- a/test/extensions/filters/common/rbac/matchers_test.cc +++ b/test/extensions/filters/common/rbac/matchers_test.cc @@ -4,10 +4,9 @@ #include "envoy/config/route/v3/route_components.pb.h" #include "envoy/type/matcher/v3/metadata.pb.h" -#include "common/network/utility.h" - -#include "extensions/filters/common/expr/evaluator.h" -#include "extensions/filters/common/rbac/matchers.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/common/expr/evaluator.h" +#include "source/extensions/filters/common/rbac/matchers.h" #include "test/mocks/network/mocks.h" #include "test/mocks/ssl/mocks.h" diff --git a/test/extensions/filters/common/rbac/mocks.h b/test/extensions/filters/common/rbac/mocks.h index a99e97aa9ea69..354a1e5dab153 100644 --- a/test/extensions/filters/common/rbac/mocks.h +++ b/test/extensions/filters/common/rbac/mocks.h @@ -2,7 +2,7 @@ #include "envoy/config/rbac/v3/rbac.pb.h" -#include "extensions/filters/common/rbac/engine_impl.h" +#include "source/extensions/filters/common/rbac/engine_impl.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/common/rbac/utility_test.cc b/test/extensions/filters/common/rbac/utility_test.cc index 35e3aad87140a..1bc4f7de17547 100644 --- a/test/extensions/filters/common/rbac/utility_test.cc +++ b/test/extensions/filters/common/rbac/utility_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/common/rbac/utility.h" +#include "source/extensions/filters/common/rbac/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_integration_test.cc b/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_integration_test.cc index 893512059cf52..4d1231966960e 100644 --- a/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_integration_test.cc +++ b/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_integration_test.cc @@ -1,6 +1,6 @@ #include "test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_integration_test.h" -#include "common/http/header_map_impl.h" +#include "source/common/http/header_map_impl.h" #include "test/integration/http_integration.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc b/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc index e05cbea0ce56d..c8df10baca50e 100644 --- a/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc +++ b/test/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter_test.cc @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.h" #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.validate.h" -#include "extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h" -#include "extensions/filters/http/adaptive_concurrency/controller/controller.h" +#include "source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h" +#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h" #include "test/mocks/http/mocks.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/extensions/filters/http/adaptive_concurrency/controller/gradient_controller_test.cc b/test/extensions/filters/http/adaptive_concurrency/controller/gradient_controller_test.cc index 43246c1c3df09..9dbe2187e50e9 100644 --- a/test/extensions/filters/http/adaptive_concurrency/controller/gradient_controller_test.cc +++ b/test/extensions/filters/http/adaptive_concurrency/controller/gradient_controller_test.cc @@ -5,11 +5,10 @@ #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.h" #include "envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.validate.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h" -#include "extensions/filters/http/adaptive_concurrency/controller/controller.h" -#include "extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/filters/http/adaptive_concurrency/adaptive_concurrency_filter.h" +#include "source/extensions/filters/http/adaptive_concurrency/controller/controller.h" +#include "source/extensions/filters/http/adaptive_concurrency/controller/gradient_controller.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/common.h" diff --git a/test/extensions/filters/http/admission_control/admission_control_filter_test.cc b/test/extensions/filters/http/admission_control/admission_control_filter_test.cc index 847c0c0bb8a9b..a26dedf252da8 100644 --- a/test/extensions/filters/http/admission_control/admission_control_filter_test.cc +++ b/test/extensions/filters/http/admission_control/admission_control_filter_test.cc @@ -4,12 +4,11 @@ #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h" #include "envoy/grpc/status.h" -#include "common/common/enum_to_int.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/filters/http/admission_control/admission_control.h" -#include "extensions/filters/http/admission_control/evaluators/response_evaluator.h" -#include "extensions/filters/http/admission_control/thread_local_controller.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/filters/http/admission_control/admission_control.h" +#include "source/extensions/filters/http/admission_control/evaluators/response_evaluator.h" +#include "source/extensions/filters/http/admission_control/thread_local_controller.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/admission_control/admission_control_integration_test.cc b/test/extensions/filters/http/admission_control/admission_control_integration_test.cc index a7e8d83f97cfb..5ac69fef7e1fe 100644 --- a/test/extensions/filters/http/admission_control/admission_control_integration_test.cc +++ b/test/extensions/filters/http/admission_control/admission_control_integration_test.cc @@ -1,4 +1,4 @@ -#include "common/grpc/common.h" +#include "source/common/grpc/common.h" #include "test/integration/autonomous_upstream.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/filters/http/admission_control/config_test.cc b/test/extensions/filters/http/admission_control/config_test.cc index 13d73551462ea..2ce74fa135f1c 100644 --- a/test/extensions/filters/http/admission_control/config_test.cc +++ b/test/extensions/filters/http/admission_control/config_test.cc @@ -3,11 +3,10 @@ #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h" #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/filters/http/admission_control/admission_control.h" -#include "extensions/filters/http/admission_control/config.h" -#include "extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/filters/http/admission_control/admission_control.h" +#include "source/extensions/filters/http/admission_control/config.h" +#include "source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/admission_control/controller_test.cc b/test/extensions/filters/http/admission_control/controller_test.cc index bf88a7037431d..8c9593501fe18 100644 --- a/test/extensions/filters/http/admission_control/controller_test.cc +++ b/test/extensions/filters/http/admission_control/controller_test.cc @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h" #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h" -#include "extensions/filters/http/admission_control/thread_local_controller.h" +#include "source/extensions/filters/http/admission_control/thread_local_controller.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/admission_control/success_criteria_evaluator_test.cc b/test/extensions/filters/http/admission_control/success_criteria_evaluator_test.cc index 888497a1363e9..7e3725daed477 100644 --- a/test/extensions/filters/http/admission_control/success_criteria_evaluator_test.cc +++ b/test/extensions/filters/http/admission_control/success_criteria_evaluator_test.cc @@ -3,10 +3,9 @@ #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.h" #include "envoy/extensions/filters/http/admission_control/v3alpha/admission_control.pb.validate.h" -#include "common/common/enum_to_int.h" - -#include "extensions/filters/http/admission_control/admission_control.h" -#include "extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h" +#include "source/common/common/enum_to_int.h" +#include "source/extensions/filters/http/admission_control/admission_control.h" +#include "source/extensions/filters/http/admission_control/evaluators/success_criteria_evaluator.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/aws_lambda/arn_test.cc b/test/extensions/filters/http/aws_lambda/arn_test.cc index 8f20f9af7767e..f8b580c5ed6b2 100644 --- a/test/extensions/filters/http/aws_lambda/arn_test.cc +++ b/test/extensions/filters/http/aws_lambda/arn_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/aws_lambda/aws_lambda_filter.h" +#include "source/extensions/filters/http/aws_lambda/aws_lambda_filter.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" diff --git a/test/extensions/filters/http/aws_lambda/aws_lambda_filter_test.cc b/test/extensions/filters/http/aws_lambda/aws_lambda_filter_test.cc index ccc8114a45e3e..a9d74ea695f6c 100644 --- a/test/extensions/filters/http/aws_lambda/aws_lambda_filter_test.cc +++ b/test/extensions/filters/http/aws_lambda/aws_lambda_filter_test.cc @@ -3,10 +3,9 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/http/filter.h" +#include "source/extensions/filters/http/aws_lambda/aws_lambda_filter.h" #include "source/extensions/filters/http/aws_lambda/request_response.pb.validate.h" - -#include "extensions/filters/http/aws_lambda/aws_lambda_filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/extensions/common/aws/mocks.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/aws_lambda/config_test.cc b/test/extensions/filters/http/aws_lambda/config_test.cc index 752f763292b61..c889caec26597 100644 --- a/test/extensions/filters/http/aws_lambda/config_test.cc +++ b/test/extensions/filters/http/aws_lambda/config_test.cc @@ -1,8 +1,8 @@ #include "envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.h" #include "envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.validate.h" -#include "extensions/filters/http/aws_lambda/aws_lambda_filter.h" -#include "extensions/filters/http/aws_lambda/config.h" +#include "source/extensions/filters/http/aws_lambda/aws_lambda_filter.h" +#include "source/extensions/filters/http/aws_lambda/config.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" diff --git a/test/extensions/filters/http/aws_request_signing/aws_request_signing_filter_test.cc b/test/extensions/filters/http/aws_request_signing/aws_request_signing_filter_test.cc index 2e730a8a70406..a8343b6d37229 100644 --- a/test/extensions/filters/http/aws_request_signing/aws_request_signing_filter_test.cc +++ b/test/extensions/filters/http/aws_request_signing/aws_request_signing_filter_test.cc @@ -1,7 +1,7 @@ #include "envoy/http/filter.h" -#include "extensions/common/aws/signer.h" -#include "extensions/filters/http/aws_request_signing/aws_request_signing_filter.h" +#include "source/extensions/common/aws/signer.h" +#include "source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h" #include "test/extensions/common/aws/mocks.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/aws_request_signing/config_test.cc b/test/extensions/filters/http/aws_request_signing/config_test.cc index 7d86e759b77e3..58842ca8fd4d6 100644 --- a/test/extensions/filters/http/aws_request_signing/config_test.cc +++ b/test/extensions/filters/http/aws_request_signing/config_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.h" #include "envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.validate.h" -#include "extensions/filters/http/aws_request_signing/config.h" +#include "source/extensions/filters/http/aws_request_signing/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/bandwidth_limit/config_test.cc b/test/extensions/filters/http/bandwidth_limit/config_test.cc index 29675d090fa9b..b98ea7ca4d67f 100644 --- a/test/extensions/filters/http/bandwidth_limit/config_test.cc +++ b/test/extensions/filters/http/bandwidth_limit/config_test.cc @@ -1,5 +1,5 @@ -#include "extensions/filters/http/bandwidth_limit/bandwidth_limit.h" -#include "extensions/filters/http/bandwidth_limit/config.h" +#include "source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h" +#include "source/extensions/filters/http/bandwidth_limit/config.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/filters/http/bandwidth_limit/filter_test.cc b/test/extensions/filters/http/bandwidth_limit/filter_test.cc index 497a9472f8d3e..daffe9076ea34 100644 --- a/test/extensions/filters/http/bandwidth_limit/filter_test.cc +++ b/test/extensions/filters/http/bandwidth_limit/filter_test.cc @@ -1,6 +1,6 @@ #include "envoy/extensions/filters/http/bandwidth_limit/v3alpha/bandwidth_limit.pb.h" -#include "extensions/filters/http/bandwidth_limit/bandwidth_limit.h" +#include "source/extensions/filters/http/bandwidth_limit/bandwidth_limit.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/buffer/BUILD b/test/extensions/filters/http/buffer/BUILD index e635afb7ce098..cf7467c62b2bc 100644 --- a/test/extensions/filters/http/buffer/BUILD +++ b/test/extensions/filters/http/buffer/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( srcs = ["buffer_filter_test.cc"], extension_name = "envoy.filters.http.buffer", deps = [ - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "//source/common/http:header_map_lib", "//source/common/stats:stats_lib", "//source/extensions/filters/http/buffer:buffer_filter_lib", diff --git a/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc b/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc index 48f58baed8e79..cb910c2d17798 100644 --- a/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc +++ b/test/extensions/filters/http/buffer/buffer_filter_integration_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" #include "test/integration/http_protocol_integration.h" diff --git a/test/extensions/filters/http/buffer/buffer_filter_test.cc b/test/extensions/filters/http/buffer/buffer_filter_test.cc index 34ce1e2211b6d..49ba8fbfd6bfe 100644 --- a/test/extensions/filters/http/buffer/buffer_filter_test.cc +++ b/test/extensions/filters/http/buffer/buffer_filter_test.cc @@ -4,11 +4,10 @@ #include "envoy/event/dispatcher.h" #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h" -#include "common/http/header_map_impl.h" -#include "common/runtime/runtime_impl.h" - -#include "extensions/filters/http/buffer/buffer_filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/extensions/filters/http/buffer/buffer_filter.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/buffer/config_test.cc b/test/extensions/filters/http/buffer/config_test.cc index 268fe142931b8..912210a0df4b6 100644 --- a/test/extensions/filters/http/buffer/config_test.cc +++ b/test/extensions/filters/http/buffer/config_test.cc @@ -1,8 +1,8 @@ #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h" #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.validate.h" -#include "extensions/filters/http/buffer/buffer_filter.h" -#include "extensions/filters/http/buffer/config.h" +#include "source/extensions/filters/http/buffer/buffer_filter.h" +#include "source/extensions/filters/http/buffer/config.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" diff --git a/test/extensions/filters/http/cache/BUILD b/test/extensions/filters/http/cache/BUILD index 5b5398ab23aac..38c7a634ffce2 100644 --- a/test/extensions/filters/http/cache/BUILD +++ b/test/extensions/filters/http/cache/BUILD @@ -24,7 +24,7 @@ envoy_extension_cc_test( extension_name = "envoy.filters.http.cache", deps = [ ":common", - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "//source/common/http:header_map_lib", "//source/extensions/filters/http/cache:cache_headers_utils_lib", "//test/test_common:simulated_time_system_lib", diff --git a/test/extensions/filters/http/cache/cache_custom_headers_test.cc b/test/extensions/filters/http/cache/cache_custom_headers_test.cc index 2b939613b16e2..f7d54b16cb43a 100644 --- a/test/extensions/filters/http/cache/cache_custom_headers_test.cc +++ b/test/extensions/filters/http/cache/cache_custom_headers_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/cache/cache_custom_headers.h" +#include "source/extensions/filters/http/cache/cache_custom_headers.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/cache/cache_filter_test.cc b/test/extensions/filters/http/cache/cache_filter_test.cc index 1a75379b0c990..ff8357b0d4f00 100644 --- a/test/extensions/filters/http/cache/cache_filter_test.cc +++ b/test/extensions/filters/http/cache/cache_filter_test.cc @@ -1,9 +1,8 @@ #include "envoy/event/dispatcher.h" -#include "common/http/headers.h" - -#include "extensions/filters/http/cache/cache_filter.h" -#include "extensions/filters/http/cache/simple_http_cache/simple_http_cache.h" +#include "source/common/http/headers.h" +#include "source/extensions/filters/http/cache/cache_filter.h" +#include "source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h" #include "test/extensions/filters/http/cache/common.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/cache/cache_headers_utils_test.cc b/test/extensions/filters/http/cache/cache_headers_utils_test.cc index 14a2c10282ce6..2c0795195efee 100644 --- a/test/extensions/filters/http/cache/cache_headers_utils_test.cc +++ b/test/extensions/filters/http/cache/cache_headers_utils_test.cc @@ -4,12 +4,11 @@ #include "envoy/common/time.h" -#include "common/common/macros.h" -#include "common/common/utility.h" -#include "common/http/header_map_impl.h" -#include "common/http/header_utility.h" - -#include "extensions/filters/http/cache/cache_headers_utils.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/header_utility.h" +#include "source/extensions/filters/http/cache/cache_headers_utils.h" #include "test/extensions/filters/http/cache/common.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/filters/http/cache/cacheability_utils_test.cc b/test/extensions/filters/http/cache/cacheability_utils_test.cc index 797f8e6858037..79b4b3f836a95 100644 --- a/test/extensions/filters/http/cache/cacheability_utils_test.cc +++ b/test/extensions/filters/http/cache/cacheability_utils_test.cc @@ -1,6 +1,6 @@ #include "envoy/http/header_map.h" -#include "extensions/filters/http/cache/cacheability_utils.h" +#include "source/extensions/filters/http/cache/cacheability_utils.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/cache/common.h b/test/extensions/filters/http/cache/common.h index d5c9c2bdd40e8..7b81ac7618c07 100644 --- a/test/extensions/filters/http/cache/common.h +++ b/test/extensions/filters/http/cache/common.h @@ -1,8 +1,8 @@ #pragma once -#include "extensions/filters/http/cache/cache_headers_utils.h" -#include "extensions/filters/http/cache/http_cache.h" -#include "extensions/filters/http/cache/simple_http_cache/simple_http_cache.h" +#include "source/extensions/filters/http/cache/cache_headers_utils.h" +#include "source/extensions/filters/http/cache/http_cache.h" +#include "source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/cache/config_test.cc b/test/extensions/filters/http/cache/config_test.cc index e254044455a00..0991f842a2f7d 100644 --- a/test/extensions/filters/http/cache/config_test.cc +++ b/test/extensions/filters/http/cache/config_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/cache/simple_http_cache/v3alpha/config.pb.h" -#include "extensions/filters/http/cache/cache_filter.h" -#include "extensions/filters/http/cache/config.h" +#include "source/extensions/filters/http/cache/cache_filter.h" +#include "source/extensions/filters/http/cache/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/cache/http_cache_test.cc b/test/extensions/filters/http/cache/http_cache_test.cc index a68708da301cc..9ccc413033f9e 100644 --- a/test/extensions/filters/http/cache/http_cache_test.cc +++ b/test/extensions/filters/http/cache/http_cache_test.cc @@ -1,8 +1,8 @@ #include #include -#include "extensions/filters/http/cache/cache_headers_utils.h" -#include "extensions/filters/http/cache/http_cache.h" +#include "source/extensions/filters/http/cache/cache_headers_utils.h" +#include "source/extensions/filters/http/cache/http_cache.h" #include "test/extensions/filters/http/cache/common.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/cache/simple_http_cache/simple_http_cache_test.cc b/test/extensions/filters/http/cache/simple_http_cache/simple_http_cache_test.cc index cd534b1c6fe3f..0e895d0c6efae 100644 --- a/test/extensions/filters/http/cache/simple_http_cache/simple_http_cache_test.cc +++ b/test/extensions/filters/http/cache/simple_http_cache/simple_http_cache_test.cc @@ -1,10 +1,9 @@ #include "envoy/http/header_map.h" #include "envoy/registry/registry.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/http/cache/cache_headers_utils.h" -#include "extensions/filters/http/cache/simple_http_cache/simple_http_cache.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/http/cache/cache_headers_utils.h" +#include "source/extensions/filters/http/cache/simple_http_cache/simple_http_cache.h" #include "test/extensions/filters/http/cache/common.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/filters/http/cdn_loop/BUILD b/test/extensions/filters/http/cdn_loop/BUILD index d39c244e72a97..288d89e90399e 100644 --- a/test/extensions/filters/http/cdn_loop/BUILD +++ b/test/extensions/filters/http/cdn_loop/BUILD @@ -42,8 +42,8 @@ envoy_cc_test( name = "filter_test", srcs = ["filter_test.cc"], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/http:filter_interface", + "//envoy/http:codes_interface", + "//envoy/http:filter_interface", "//source/extensions/filters/http/cdn_loop:filter_lib", "//test/mocks/http:http_mocks", "//test/test_common:utility_lib", diff --git a/test/extensions/filters/http/cdn_loop/config_test.cc b/test/extensions/filters/http/cdn_loop/config_test.cc index 288936bb2abb3..ffcc776c9004b 100644 --- a/test/extensions/filters/http/cdn_loop/config_test.cc +++ b/test/extensions/filters/http/cdn_loop/config_test.cc @@ -2,8 +2,8 @@ #include "envoy/extensions/filters/http/cdn_loop/v3alpha/cdn_loop.pb.h" -#include "extensions/filters/http/cdn_loop/config.h" -#include "extensions/filters/http/cdn_loop/filter.h" +#include "source/extensions/filters/http/cdn_loop/config.h" +#include "source/extensions/filters/http/cdn_loop/filter.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/cdn_loop/filter_test.cc b/test/extensions/filters/http/cdn_loop/filter_test.cc index a4bd33ef3d043..e71661ee5a371 100644 --- a/test/extensions/filters/http/cdn_loop/filter_test.cc +++ b/test/extensions/filters/http/cdn_loop/filter_test.cc @@ -1,7 +1,7 @@ #include "envoy/http/codes.h" #include "envoy/http/filter.h" -#include "extensions/filters/http/cdn_loop/filter.h" +#include "source/extensions/filters/http/cdn_loop/filter.h" #include "test/mocks/http/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/cdn_loop/parser_fuzz_test.cc b/test/extensions/filters/http/cdn_loop/parser_fuzz_test.cc index 7d5f53f8bbc42..cac7480dab7fd 100644 --- a/test/extensions/filters/http/cdn_loop/parser_fuzz_test.cc +++ b/test/extensions/filters/http/cdn_loop/parser_fuzz_test.cc @@ -1,6 +1,5 @@ -#include "common/common/statusor.h" - -#include "extensions/filters/http/cdn_loop/parser.h" +#include "source/common/common/statusor.h" +#include "source/extensions/filters/http/cdn_loop/parser.h" #include "test/fuzz/fuzz_runner.h" #include "test/fuzz/utility.h" diff --git a/test/extensions/filters/http/cdn_loop/parser_test.cc b/test/extensions/filters/http/cdn_loop/parser_test.cc index cdd43ebfa224c..0adbf02a2cfc7 100644 --- a/test/extensions/filters/http/cdn_loop/parser_test.cc +++ b/test/extensions/filters/http/cdn_loop/parser_test.cc @@ -1,6 +1,6 @@ #include -#include "extensions/filters/http/cdn_loop/parser.h" +#include "source/extensions/filters/http/cdn_loop/parser.h" #include "test/test_common/status_utility.h" diff --git a/test/extensions/filters/http/cdn_loop/utils_test.cc b/test/extensions/filters/http/cdn_loop/utils_test.cc index 95a4ab1415a36..a27ee285baa15 100644 --- a/test/extensions/filters/http/cdn_loop/utils_test.cc +++ b/test/extensions/filters/http/cdn_loop/utils_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/cdn_loop/utils.h" +#include "source/extensions/filters/http/cdn_loop/utils.h" #include "test/test_common/status_utility.h" diff --git a/test/extensions/filters/http/common/BUILD b/test/extensions/filters/http/common/BUILD index 2462cf2b78577..94ac2e75954b9 100644 --- a/test/extensions/filters/http/common/BUILD +++ b/test/extensions/filters/http/common/BUILD @@ -32,7 +32,7 @@ envoy_cc_test_library( name = "empty_http_filter_config_lib", hdrs = ["empty_http_filter_config.h"], deps = [ - "//include/envoy/server:filter_config_interface", + "//envoy/server:filter_config_interface", ], ) @@ -56,7 +56,7 @@ envoy_cc_test( name = "stream_rate_limiter_test", srcs = ["stream_rate_limiter_test.cc"], deps = [ - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "//source/common/buffer:buffer_lib", "//source/common/common:empty_string", "//source/common/http:header_map_lib", diff --git a/test/extensions/filters/http/common/compressor/compressor_filter_speed_test.cc b/test/extensions/filters/http/common/compressor/compressor_filter_speed_test.cc index 9056ddc0ac3d7..e23253457845b 100644 --- a/test/extensions/filters/http/common/compressor/compressor_filter_speed_test.cc +++ b/test/extensions/filters/http/common/compressor/compressor_filter_speed_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/http/compressor/v3/compressor.pb.h" -#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h" -#include "extensions/filters/http/common/compressor/compressor.h" +#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h" +#include "source/extensions/filters/http/common/compressor/compressor.h" #include "test/mocks/http/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/extensions/filters/http/common/compressor/compressor_filter_test.cc b/test/extensions/filters/http/common/compressor/compressor_filter_test.cc index 37513d45a968a..8df7d9580a6cb 100644 --- a/test/extensions/filters/http/common/compressor/compressor_filter_test.cc +++ b/test/extensions/filters/http/common/compressor/compressor_filter_test.cc @@ -2,9 +2,8 @@ #include "envoy/extensions/filters/http/compressor/v3/compressor.pb.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/common/compressor/compressor.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/common/compressor/compressor.h" #include "test/mocks/compression/compressor/mocks.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/common/compressor/compressor_integration_tests.cc b/test/extensions/filters/http/common/compressor/compressor_integration_tests.cc index fc351d6994e56..7a69927526ee1 100644 --- a/test/extensions/filters/http/common/compressor/compressor_integration_tests.cc +++ b/test/extensions/filters/http/common/compressor/compressor_integration_tests.cc @@ -5,8 +5,8 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/http/header_map_impl.h" -#include "common/protobuf/utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/protobuf/utility.h" #include "test/integration/utility.h" #include "test/test_common/network_utility.h" diff --git a/test/extensions/filters/http/common/empty_http_filter_config.h b/test/extensions/filters/http/common/empty_http_filter_config.h index 1baa88a905048..45f59857829dc 100644 --- a/test/extensions/filters/http/common/empty_http_filter_config.h +++ b/test/extensions/filters/http/common/empty_http_filter_config.h @@ -4,7 +4,7 @@ #include "envoy/server/filter_config.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/common/fuzz/BUILD b/test/extensions/filters/http/common/fuzz/BUILD index e647e4354c4bf..6e761a6e627f8 100644 --- a/test/extensions/filters/http/common/fuzz/BUILD +++ b/test/extensions/filters/http/common/fuzz/BUILD @@ -27,7 +27,7 @@ envoy_cc_test_library( name = "http_filter_fuzzer_lib", hdrs = ["http_filter_fuzzer.h"], deps = [ - "//include/envoy/http:filter_interface", + "//envoy/http:filter_interface", "//source/common/http:utility_lib", "//test/fuzz:common_proto_cc_proto", "//test/fuzz:utility_lib", diff --git a/test/extensions/filters/http/common/fuzz/filter_fuzz_test.cc b/test/extensions/filters/http/common/fuzz/filter_fuzz_test.cc index 429e34191ba16..0257fbd6fd21c 100644 --- a/test/extensions/filters/http/common/fuzz/filter_fuzz_test.cc +++ b/test/extensions/filters/http/common/fuzz/filter_fuzz_test.cc @@ -1,7 +1,6 @@ -#include "common/config/utility.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/config/utility.h" #include "test/extensions/filters/http/common/fuzz/filter_fuzz.pb.validate.h" diff --git a/test/extensions/filters/http/common/fuzz/http_filter_fuzzer.h b/test/extensions/filters/http/common/fuzz/http_filter_fuzzer.h index dba20989d343d..861c50f4220a8 100644 --- a/test/extensions/filters/http/common/fuzz/http_filter_fuzzer.h +++ b/test/extensions/filters/http/common/fuzz/http_filter_fuzzer.h @@ -2,7 +2,7 @@ #include "envoy/http/filter.h" -#include "common/http/utility.h" +#include "source/common/http/utility.h" #include "test/fuzz/common.pb.h" #include "test/fuzz/utility.h" diff --git a/test/extensions/filters/http/common/fuzz/uber_filter.cc b/test/extensions/filters/http/common/fuzz/uber_filter.cc index d43c2f403c772..748c84b311cc6 100644 --- a/test/extensions/filters/http/common/fuzz/uber_filter.cc +++ b/test/extensions/filters/http/common/fuzz/uber_filter.cc @@ -1,11 +1,11 @@ #include "test/extensions/filters/http/common/fuzz/uber_filter.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" -#include "common/http/message_impl.h" -#include "common/http/utility.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/http/message_impl.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/common/fuzz/uber_per_filter.cc b/test/extensions/filters/http/common/fuzz/uber_per_filter.cc index 11a2c7bc1a1f6..b6436058bf275 100644 --- a/test/extensions/filters/http/common/fuzz/uber_per_filter.cc +++ b/test/extensions/filters/http/common/fuzz/uber_per_filter.cc @@ -3,10 +3,9 @@ #include "envoy/extensions/filters/http/squash/v3/squash.pb.h" #include "envoy/extensions/filters/http/tap/v3/tap.pb.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/filters/http/common/utility.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/filters/http/common/utility.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/extensions/filters/http/common/fuzz/uber_filter.h" #include "test/proto/bookstore.pb.h" diff --git a/test/extensions/filters/http/common/jwks_fetcher_test.cc b/test/extensions/filters/http/common/jwks_fetcher_test.cc index cd3604aa40bf5..aad2ac07b636c 100644 --- a/test/extensions/filters/http/common/jwks_fetcher_test.cc +++ b/test/extensions/filters/http/common/jwks_fetcher_test.cc @@ -3,10 +3,9 @@ #include "envoy/config/core/v3/http_uri.pb.h" -#include "common/http/message_impl.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/common/jwks_fetcher.h" +#include "source/common/http/message_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/common/jwks_fetcher.h" #include "test/extensions/filters/http/common/mock.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/common/mock.h b/test/extensions/filters/http/common/mock.h index 53b35de15b100..3aa0bb3b2b04d 100644 --- a/test/extensions/filters/http/common/mock.h +++ b/test/extensions/filters/http/common/mock.h @@ -2,9 +2,8 @@ #include "envoy/config/core/v3/http_uri.pb.h" -#include "common/http/message_impl.h" - -#include "extensions/filters/http/common/jwks_fetcher.h" +#include "source/common/http/message_impl.h" +#include "source/extensions/filters/http/common/jwks_fetcher.h" #include "test/mocks/upstream/mocks.h" diff --git a/test/extensions/filters/http/common/stream_rate_limiter_test.cc b/test/extensions/filters/http/common/stream_rate_limiter_test.cc index 3048add956433..97f18f5957ca1 100644 --- a/test/extensions/filters/http/common/stream_rate_limiter_test.cc +++ b/test/extensions/filters/http/common/stream_rate_limiter_test.cc @@ -1,9 +1,8 @@ #include "envoy/event/dispatcher.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/empty_string.h" - -#include "extensions/filters/http/common/stream_rate_limiter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/empty_string.h" +#include "source/extensions/filters/http/common/stream_rate_limiter.h" #include "test/common/http/common.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/common/utility_test.cc b/test/extensions/filters/http/common/utility_test.cc index 7b8923309180d..ac70604ea55ec 100644 --- a/test/extensions/filters/http/common/utility_test.cc +++ b/test/extensions/filters/http/common/utility_test.cc @@ -1,5 +1,5 @@ -#include "extensions/filters/http/common/utility.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/common/utility.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/mocks/runtime/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/composite/filter_test.cc b/test/extensions/filters/http/composite/filter_test.cc index 019d303aae294..cb608c7094017 100644 --- a/test/extensions/filters/http/composite/filter_test.cc +++ b/test/extensions/filters/http/composite/filter_test.cc @@ -2,7 +2,7 @@ #include "envoy/http/metadata_interface.h" -#include "extensions/filters/http/composite/filter.h" +#include "source/extensions/filters/http/composite/filter.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/compressor/compressor_filter_integration_test.cc b/test/extensions/filters/http/compressor/compressor_filter_integration_test.cc index a95e6accf74f4..598870b32f867 100644 --- a/test/extensions/filters/http/compressor/compressor_filter_integration_test.cc +++ b/test/extensions/filters/http/compressor/compressor_filter_integration_test.cc @@ -1,6 +1,6 @@ #include "envoy/event/timer.h" -#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" +#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" #include "test/integration/http_integration.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/filters/http/compressor/compressor_filter_test.cc b/test/extensions/filters/http/compressor/compressor_filter_test.cc index 7f209da033ef8..54ba0bbd58bdd 100644 --- a/test/extensions/filters/http/compressor/compressor_filter_test.cc +++ b/test/extensions/filters/http/compressor/compressor_filter_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/compressor/compressor_filter.h" +#include "source/extensions/filters/http/compressor/compressor_filter.h" #include "test/mocks/compression/compressor/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/extensions/filters/http/compressor/config_test.cc b/test/extensions/filters/http/compressor/config_test.cc index aec2806eb9b3a..66a2fe10b4e15 100644 --- a/test/extensions/filters/http/compressor/config_test.cc +++ b/test/extensions/filters/http/compressor/config_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/compressor/config.h" +#include "source/extensions/filters/http/compressor/config.h" #include "test/extensions/filters/http/compressor/mock_compressor_library.pb.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/cors/cors_filter_test.cc b/test/extensions/filters/http/cors/cors_filter_test.cc index 85e7f92a1389e..116b45c00ae2f 100644 --- a/test/extensions/filters/http/cors/cors_filter_test.cc +++ b/test/extensions/filters/http/cors/cors_filter_test.cc @@ -1,9 +1,8 @@ #include "envoy/type/matcher/v3/string.pb.h" -#include "common/common/matchers.h" -#include "common/http/header_map_impl.h" - -#include "extensions/filters/http/cors/cors_filter.h" +#include "source/common/common/matchers.h" +#include "source/common/http/header_map_impl.h" +#include "source/extensions/filters/http/cors/cors_filter.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/csrf/csrf_filter_test.cc b/test/extensions/filters/http/csrf/csrf_filter_test.cc index cf38c0d858c25..0db5cd8376fe6 100644 --- a/test/extensions/filters/http/csrf/csrf_filter_test.cc +++ b/test/extensions/filters/http/csrf/csrf_filter_test.cc @@ -1,9 +1,8 @@ #include "envoy/extensions/filters/http/csrf/v3/csrf.pb.h" #include "envoy/type/v3/percent.pb.h" -#include "common/http/header_map_impl.h" - -#include "extensions/filters/http/csrf/csrf_filter.h" +#include "source/common/http/header_map_impl.h" +#include "source/extensions/filters/http/csrf/csrf_filter.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/decompressor/decompressor_filter_integration_test.cc b/test/extensions/filters/http/decompressor/decompressor_filter_integration_test.cc index be1cb8384aa95..30c6f5117ee75 100644 --- a/test/extensions/filters/http/decompressor/decompressor_filter_integration_test.cc +++ b/test/extensions/filters/http/decompressor/decompressor_filter_integration_test.cc @@ -1,6 +1,6 @@ #include "envoy/event/timer.h" -#include "extensions/compression/gzip/compressor/config.h" +#include "source/extensions/compression/gzip/compressor/config.h" #include "test/integration/http_integration.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/decompressor/decompressor_filter_test.cc b/test/extensions/filters/http/decompressor/decompressor_filter_test.cc index bd8f8891d3ec3..f29fc45142b57 100644 --- a/test/extensions/filters/http/decompressor/decompressor_filter_test.cc +++ b/test/extensions/filters/http/decompressor/decompressor_filter_test.cc @@ -1,9 +1,8 @@ #include "envoy/extensions/filters/http/decompressor/v3/decompressor.pb.h" -#include "common/http/headers.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/decompressor/decompressor_filter.h" +#include "source/common/http/headers.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/decompressor/decompressor_filter.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/compression/decompressor/mocks.h" diff --git a/test/extensions/filters/http/dynamic_forward_proxy/BUILD b/test/extensions/filters/http/dynamic_forward_proxy/BUILD index 85b2553f2e339..f507231642e9b 100644 --- a/test/extensions/filters/http/dynamic_forward_proxy/BUILD +++ b/test/extensions/filters/http/dynamic_forward_proxy/BUILD @@ -29,7 +29,6 @@ envoy_extension_cc_test( extension_name = "envoy.filters.http.dynamic_forward_proxy", deps = [ "//source/common/stats:isolated_store_lib", - "//source/extensions/clusters:well_known_names", "//source/extensions/common/dynamic_forward_proxy:dns_cache_impl", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/dynamic_forward_proxy:config", diff --git a/test/extensions/filters/http/dynamic_forward_proxy/config_test.cc b/test/extensions/filters/http/dynamic_forward_proxy/config_test.cc index 8ee82c862744d..56430a51168d7 100644 --- a/test/extensions/filters/http/dynamic_forward_proxy/config_test.cc +++ b/test/extensions/filters/http/dynamic_forward_proxy/config_test.cc @@ -1,8 +1,8 @@ #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h" #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.validate.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h" -#include "extensions/filters/http/dynamic_forward_proxy/config.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h" +#include "source/extensions/filters/http/dynamic_forward_proxy/config.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" diff --git a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc index b7d8a69818960..297fb4f33538d 100644 --- a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc +++ b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_integration_test.cc @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/integration/http_integration.h" #include "test/integration/ssl_utility.h" diff --git a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc index 1b912fe1329f9..d0102583ef900 100644 --- a/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc +++ b/test/extensions/filters/http/dynamic_forward_proxy/proxy_filter_test.cc @@ -1,10 +1,9 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.h" -#include "extensions/clusters/well_known_names.h" -#include "extensions/common/dynamic_forward_proxy/dns_cache_impl.h" -#include "extensions/filters/http/dynamic_forward_proxy/proxy_filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/common/dynamic_forward_proxy/dns_cache_impl.h" +#include "source/extensions/filters/http/dynamic_forward_proxy/proxy_filter.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/extensions/common/dynamic_forward_proxy/mocks.h" #include "test/mocks/http/mocks.h" @@ -53,7 +52,7 @@ class ProxyFilterTest : public testing::Test, // Configure upstream cluster to be a Dynamic Forward Proxy since that's the // kind we need to do DNS entries for. CustomClusterType cluster_type; - cluster_type.set_name(Envoy::Extensions::Clusters::ClusterTypes::get().DynamicForwardProxy); + cluster_type.set_name("envoy.clusters.dynamic_forward_proxy"); cm_.thread_local_cluster_.cluster_.info_->cluster_type_ = cluster_type; // Configure max pending to 1 so we can test circuit breaking. @@ -262,7 +261,7 @@ TEST_F(ProxyFilterTest, NoClusterType) { // Cluster that isn't a dynamic forward proxy cluster TEST_F(ProxyFilterTest, NonDynamicForwardProxy) { CustomClusterType cluster_type; - cluster_type.set_name(Envoy::Extensions::Clusters::ClusterTypes::get().Static); + cluster_type.set_name("envoy.cluster.static"); cm_.thread_local_cluster_.cluster_.info_->cluster_type_ = cluster_type; InSequence s; diff --git a/test/extensions/filters/http/dynamo/config_test.cc b/test/extensions/filters/http/dynamo/config_test.cc index e1ed56fbcb8a0..aca5c3a776546 100644 --- a/test/extensions/filters/http/dynamo/config_test.cc +++ b/test/extensions/filters/http/dynamo/config_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/http/dynamo/v3/dynamo.pb.h" #include "envoy/extensions/filters/http/dynamo/v3/dynamo.pb.validate.h" -#include "extensions/filters/http/dynamo/config.h" +#include "source/extensions/filters/http/dynamo/config.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/dynamo/dynamo_filter_test.cc b/test/extensions/filters/http/dynamo/dynamo_filter_test.cc index 7519814552c69..612537e8c1578 100644 --- a/test/extensions/filters/http/dynamo/dynamo_filter_test.cc +++ b/test/extensions/filters/http/dynamo/dynamo_filter_test.cc @@ -1,10 +1,9 @@ #include #include -#include "common/buffer/buffer_impl.h" -#include "common/http/header_map_impl.h" - -#include "extensions/filters/http/dynamo/dynamo_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/header_map_impl.h" +#include "source/extensions/filters/http/dynamo/dynamo_filter.h" #include "test/mocks/http/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/extensions/filters/http/dynamo/dynamo_request_parser_test.cc b/test/extensions/filters/http/dynamo/dynamo_request_parser_test.cc index 69d616ddebc6d..eb215ad9b8410 100644 --- a/test/extensions/filters/http/dynamo/dynamo_request_parser_test.cc +++ b/test/extensions/filters/http/dynamo/dynamo_request_parser_test.cc @@ -1,10 +1,9 @@ #include #include -#include "common/http/header_map_impl.h" -#include "common/json/json_loader.h" - -#include "extensions/filters/http/dynamo/dynamo_request_parser.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/json/json_loader.h" +#include "source/extensions/filters/http/dynamo/dynamo_request_parser.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/dynamo/dynamo_stats_test.cc b/test/extensions/filters/http/dynamo/dynamo_stats_test.cc index d479f4a1092fe..f8fbc1c1a4c7f 100644 --- a/test/extensions/filters/http/dynamo/dynamo_stats_test.cc +++ b/test/extensions/filters/http/dynamo/dynamo_stats_test.cc @@ -1,6 +1,6 @@ #include -#include "extensions/filters/http/dynamo/dynamo_stats.h" +#include "source/extensions/filters/http/dynamo/dynamo_stats.h" #include "test/mocks/stats/mocks.h" diff --git a/test/extensions/filters/http/ext_authz/BUILD b/test/extensions/filters/http/ext_authz/BUILD index 65ea7d623b81a..68483ff45ba7c 100644 --- a/test/extensions/filters/http/ext_authz/BUILD +++ b/test/extensions/filters/http/ext_authz/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( srcs = ["ext_authz_test.cc"], extension_name = "envoy.filters.http.ext_authz", deps = [ - "//include/envoy/http:codes_interface", + "//envoy/http:codes_interface", "//source/common/buffer:buffer_lib", "//source/common/common:empty_string", "//source/common/http:context_lib", diff --git a/test/extensions/filters/http/ext_authz/config_test.cc b/test/extensions/filters/http/ext_authz/config_test.cc index 2204f4985327b..34605409d7a2a 100644 --- a/test/extensions/filters/http/ext_authz/config_test.cc +++ b/test/extensions/filters/http/ext_authz/config_test.cc @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.validate.h" #include "envoy/stats/scope.h" -#include "extensions/filters/http/ext_authz/config.h" +#include "source/extensions/filters/http/ext_authz/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/test_runtime.h" diff --git a/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc b/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc index 21b3ec0438ac3..7d851c33e4380 100644 --- a/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc +++ b/test/extensions/filters/http/ext_authz/ext_authz_integration_test.cc @@ -3,9 +3,8 @@ #include "envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.h" #include "envoy/service/auth/v3/external_auth.pb.h" -#include "common/common/macros.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/macros.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/filters/http/ext_authz/ext_authz_test.cc b/test/extensions/filters/http/ext_authz/ext_authz_test.cc index 2544068ff083f..a2d5b70aaf78c 100644 --- a/test/extensions/filters/http/ext_authz/ext_authz_test.cc +++ b/test/extensions/filters/http/ext_authz/ext_authz_test.cc @@ -9,16 +9,15 @@ #include "envoy/service/auth/v3/external_auth.pb.h" #include "envoy/type/v3/percent.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/empty_string.h" -#include "common/http/context_impl.h" -#include "common/http/headers.h" -#include "common/json/json_loader.h" -#include "common/network/address_impl.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/ext_authz/ext_authz.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/context_impl.h" +#include "source/common/http/headers.h" +#include "source/common/json/json_loader.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/ext_authz/ext_authz.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/extensions/filters/common/ext_authz/mocks.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/ext_proc/BUILD b/test/extensions/filters/http/ext_proc/BUILD index 898226637fad4..cf71d4bf2dfde 100644 --- a/test/extensions/filters/http/ext_proc/BUILD +++ b/test/extensions/filters/http/ext_proc/BUILD @@ -115,7 +115,7 @@ envoy_extension_cc_test_library( hdrs = ["utils.h"], extension_name = "envoy.filters.http.ext_proc", deps = [ - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "//test/test_common:utility_lib", "@com_google_absl//absl/strings:str_format", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/extensions/filters/http/ext_proc/client_test.cc b/test/extensions/filters/http/ext_proc/client_test.cc index 8612f937e2d19..4e7d3b0c0eb78 100644 --- a/test/extensions/filters/http/ext_proc/client_test.cc +++ b/test/extensions/filters/http/ext_proc/client_test.cc @@ -1,9 +1,8 @@ #include "envoy/config/core/v3/grpc_service.pb.h" -#include "common/grpc/common.h" -#include "common/http/header_map_impl.h" - -#include "extensions/filters/http/ext_proc/client_impl.h" +#include "source/common/grpc/common.h" +#include "source/common/http/header_map_impl.h" +#include "source/extensions/filters/http/ext_proc/client_impl.h" #include "test/mocks/grpc/mocks.h" #include "test/mocks/stats/mocks.h" diff --git a/test/extensions/filters/http/ext_proc/config_test.cc b/test/extensions/filters/http/ext_proc/config_test.cc index df07f8b25c789..bb87b9fb6545d 100644 --- a/test/extensions/filters/http/ext_proc/config_test.cc +++ b/test/extensions/filters/http/ext_proc/config_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/ext_proc/config.h" +#include "source/extensions/filters/http/ext_proc/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc b/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc index 0b9150a3ecaa0..a730287d6519e 100644 --- a/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc +++ b/test/extensions/filters/http/ext_proc/ext_proc_integration_test.cc @@ -4,7 +4,7 @@ #include "envoy/network/address.h" #include "envoy/service/ext_proc/v3alpha/external_processor.pb.h" -#include "extensions/filters/http/ext_proc/config.h" +#include "source/extensions/filters/http/ext_proc/config.h" #include "test/common/http/common.h" #include "test/extensions/filters/http/ext_proc/utils.h" diff --git a/test/extensions/filters/http/ext_proc/filter_test.cc b/test/extensions/filters/http/ext_proc/filter_test.cc index 804d1cb4ba4cb..73640c79af78b 100644 --- a/test/extensions/filters/http/ext_proc/filter_test.cc +++ b/test/extensions/filters/http/ext_proc/filter_test.cc @@ -1,6 +1,6 @@ #include "envoy/service/ext_proc/v3alpha/external_processor.pb.h" -#include "extensions/filters/http/ext_proc/ext_proc.h" +#include "source/extensions/filters/http/ext_proc/ext_proc.h" #include "test/common/http/common.h" #include "test/extensions/filters/http/ext_proc/mock_server.h" diff --git a/test/extensions/filters/http/ext_proc/mock_server.h b/test/extensions/filters/http/ext_proc/mock_server.h index 07d0b1aeb259e..bb479d175e290 100644 --- a/test/extensions/filters/http/ext_proc/mock_server.h +++ b/test/extensions/filters/http/ext_proc/mock_server.h @@ -1,6 +1,6 @@ #pragma once -#include "extensions/filters/http/ext_proc/client.h" +#include "source/extensions/filters/http/ext_proc/client.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/http/ext_proc/mutation_utils_test.cc b/test/extensions/filters/http/ext_proc/mutation_utils_test.cc index 4096fcc68a267..abed79419dae1 100644 --- a/test/extensions/filters/http/ext_proc/mutation_utils_test.cc +++ b/test/extensions/filters/http/ext_proc/mutation_utils_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/ext_proc/mutation_utils.h" +#include "source/extensions/filters/http/ext_proc/mutation_utils.h" #include "test/extensions/filters/http/ext_proc/utils.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/ext_proc/ordering_test.cc b/test/extensions/filters/http/ext_proc/ordering_test.cc index 0ae4543296dfb..7d5437049051b 100644 --- a/test/extensions/filters/http/ext_proc/ordering_test.cc +++ b/test/extensions/filters/http/ext_proc/ordering_test.cc @@ -1,6 +1,6 @@ #include "envoy/http/header_map.h" -#include "extensions/filters/http/ext_proc/ext_proc.h" +#include "source/extensions/filters/http/ext_proc/ext_proc.h" #include "test/common/http/common.h" #include "test/extensions/filters/http/ext_proc/mock_server.h" diff --git a/test/extensions/filters/http/fault/BUILD b/test/extensions/filters/http/fault/BUILD index e100845921d59..189fa95ded56b 100644 --- a/test/extensions/filters/http/fault/BUILD +++ b/test/extensions/filters/http/fault/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( extension_name = "envoy.filters.http.fault", deps = [ ":utility_lib", - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "//source/common/buffer:buffer_lib", "//source/common/common:empty_string", "//source/common/http:header_map_lib", diff --git a/test/extensions/filters/http/fault/config_test.cc b/test/extensions/filters/http/fault/config_test.cc index 080e5a3e41de7..440bd0ccae85b 100644 --- a/test/extensions/filters/http/fault/config_test.cc +++ b/test/extensions/filters/http/fault/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/extensions/filters/http/fault/v3/fault.pb.validate.h" #include "envoy/type/v3/percent.pb.h" -#include "extensions/filters/http/fault/config.h" +#include "source/extensions/filters/http/fault/config.h" #include "test/extensions/filters/http/fault/utility.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/fault/fault_filter_test.cc b/test/extensions/filters/http/fault/fault_filter_test.cc index 07d16bd6d41af..7ce69276d0300 100644 --- a/test/extensions/filters/http/fault/fault_filter_test.cc +++ b/test/extensions/filters/http/fault/fault_filter_test.cc @@ -9,13 +9,12 @@ #include "envoy/extensions/filters/http/fault/v3/fault.pb.validate.h" #include "envoy/type/v3/percent.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/empty_string.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" - -#include "extensions/filters/http/fault/fault_filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/extensions/filters/http/fault/fault_filter.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/common/http/common.h" #include "test/extensions/filters/http/fault/utility.h" diff --git a/test/extensions/filters/http/grpc_http1_bridge/config_test.cc b/test/extensions/filters/http/grpc_http1_bridge/config_test.cc index 8c890afcaf7eb..b1dd30299e995 100644 --- a/test/extensions/filters/http/grpc_http1_bridge/config_test.cc +++ b/test/extensions/filters/http/grpc_http1_bridge/config_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/grpc_http1_bridge/config.h" +#include "source/extensions/filters/http/grpc_http1_bridge/config.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc b/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc index 6c7d238247950..96f7fb3aac75a 100644 --- a/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc +++ b/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc @@ -1,9 +1,8 @@ -#include "common/buffer/buffer_impl.h" -#include "common/grpc/common.h" -#include "common/http/header_map_impl.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/grpc/common.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter.h" #include "test/mocks/http/mocks.h" #include "test/test_common/global.h" diff --git a/test/extensions/filters/http/grpc_http1_reverse_bridge/config_test.cc b/test/extensions/filters/http/grpc_http1_reverse_bridge/config_test.cc index 33acd2fef2563..a23d934f7465d 100644 --- a/test/extensions/filters/http/grpc_http1_reverse_bridge/config_test.cc +++ b/test/extensions/filters/http/grpc_http1_reverse_bridge/config_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.h" -#include "extensions/filters/http/grpc_http1_reverse_bridge/config.h" -#include "extensions/filters/http/grpc_http1_reverse_bridge/filter.h" +#include "source/extensions/filters/http/grpc_http1_reverse_bridge/config.h" +#include "source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" diff --git a/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_integration_test.cc b/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_integration_test.cc index 43cb6339eef46..fa637080f754b 100644 --- a/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_integration_test.cc +++ b/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_integration_test.cc @@ -2,9 +2,8 @@ #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.h" -#include "common/http/message_impl.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/http/message_impl.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/integration/http_integration.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc b/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc index 8f0f31ca60d4c..0a404a3c611ae 100644 --- a/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc +++ b/test/extensions/filters/http/grpc_http1_reverse_bridge/reverse_bridge_test.cc @@ -3,13 +3,12 @@ #include "envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/grpc/codec.h" -#include "common/http/header_map_impl.h" -#include "common/http/utility.h" - -#include "extensions/filters/http/grpc_http1_reverse_bridge/filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/grpc/codec.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/utility.h" +#include "source/extensions/filters/http/grpc_http1_reverse_bridge/filter.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/mocks/http/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/extensions/filters/http/grpc_json_transcoder/config_test.cc b/test/extensions/filters/http/grpc_json_transcoder/config_test.cc index 164649e3228ab..05186021d7606 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/config_test.cc +++ b/test/extensions/filters/http/grpc_json_transcoder/config_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h" #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.validate.h" -#include "extensions/filters/http/grpc_json_transcoder/config.h" +#include "source/extensions/filters/http/grpc_json_transcoder/config.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc b/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc index 065d599f1fdd8..c255c138a8c50 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc +++ b/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc @@ -1,11 +1,10 @@ #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h" -#include "common/grpc/codec.h" -#include "common/grpc/common.h" -#include "common/http/message_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/common.h" +#include "source/common/http/message_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/integration/http_integration.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/grpc_json_transcoder/http_body_utils_test.cc b/test/extensions/filters/http/grpc_json_transcoder/http_body_utils_test.cc index 6a69e0770cd1c..0db9a705508ed 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/http_body_utils_test.cc +++ b/test/extensions/filters/http/grpc_json_transcoder/http_body_utils_test.cc @@ -1,7 +1,6 @@ -#include "common/buffer/buffer_impl.h" -#include "common/buffer/zero_copy_input_stream_impl.h" - -#include "extensions/filters/http/grpc_json_transcoder/http_body_utils.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/extensions/filters/http/grpc_json_transcoder/http_body_utils.h" #include "test/proto/bookstore.pb.h" diff --git a/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc b/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc index 1de0a48874d59..8e194cfb2b648 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc +++ b/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc @@ -4,14 +4,13 @@ #include "envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/grpc/codec.h" -#include "common/grpc/common.h" -#include "common/http/header_map_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/common.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/mocks/http/mocks.h" #include "test/proto/bookstore.pb.h" diff --git a/test/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_test.cc b/test/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_test.cc index e72c8beaa24ff..263ef7e1db617 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_test.cc +++ b/test/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_test.cc @@ -1,6 +1,5 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/http/grpc_json_transcoder/transcoder_input_stream_impl.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/http/grpc_stats/config_test.cc b/test/extensions/filters/http/grpc_stats/config_test.cc index 3b4f1cdb00ad5..5ebeaadd07330 100644 --- a/test/extensions/filters/http/grpc_stats/config_test.cc +++ b/test/extensions/filters/http/grpc_stats/config_test.cc @@ -1,9 +1,8 @@ #include "envoy/extensions/filters/http/grpc_stats/v3/config.pb.h" #include "envoy/extensions/filters/http/grpc_stats/v3/config.pb.validate.h" -#include "common/grpc/common.h" - -#include "extensions/filters/http/grpc_stats/grpc_stats_filter.h" +#include "source/common/grpc/common.h" +#include "source/extensions/filters/http/grpc_stats/grpc_stats_filter.h" #include "test/common/buffer/utility.h" #include "test/common/stream_info/test_util.h" diff --git a/test/extensions/filters/http/grpc_web/config_test.cc b/test/extensions/filters/http/grpc_web/config_test.cc index 0ad9da56c86f5..32c7d656ec78c 100644 --- a/test/extensions/filters/http/grpc_web/config_test.cc +++ b/test/extensions/filters/http/grpc_web/config_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/grpc_web/config.h" +#include "source/extensions/filters/http/grpc_web/config.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/grpc_web/grpc_web_filter_integration_test.cc b/test/extensions/filters/http/grpc_web/grpc_web_filter_integration_test.cc index 701f97662a9e5..057875885b730 100644 --- a/test/extensions/filters/http/grpc_web/grpc_web_filter_integration_test.cc +++ b/test/extensions/filters/http/grpc_web/grpc_web_filter_integration_test.cc @@ -1,8 +1,7 @@ #include -#include "common/common/base64.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/base64.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc b/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc index bbc401405cf97..243815d0b282f 100644 --- a/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc +++ b/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc @@ -1,16 +1,15 @@ #include "envoy/http/filter.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/base64.h" -#include "common/common/empty_string.h" -#include "common/common/utility.h" -#include "common/grpc/common.h" -#include "common/http/codes.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/filters/http/grpc_web/grpc_web_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/base64.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/common.h" +#include "source/common/http/codes.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/filters/http/grpc_web/grpc_web_filter.h" #include "test/mocks/http/mocks.h" #include "test/test_common/global.h" diff --git a/test/extensions/filters/http/gzip/gzip_filter_integration_test.cc b/test/extensions/filters/http/gzip/gzip_filter_integration_test.cc index e17b55409ec89..3b4ee572bce9b 100644 --- a/test/extensions/filters/http/gzip/gzip_filter_integration_test.cc +++ b/test/extensions/filters/http/gzip/gzip_filter_integration_test.cc @@ -1,6 +1,6 @@ #include "envoy/event/timer.h" -#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" +#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" #include "test/integration/http_integration.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/filters/http/gzip/gzip_filter_test.cc b/test/extensions/filters/http/gzip/gzip_filter_test.cc index b138cae4520ef..49150c7a80114 100644 --- a/test/extensions/filters/http/gzip/gzip_filter_test.cc +++ b/test/extensions/filters/http/gzip/gzip_filter_test.cc @@ -2,13 +2,12 @@ #include "envoy/extensions/filters/http/gzip/v3/gzip.pb.h" -#include "common/common/hex.h" -#include "common/protobuf/utility.h" - -#include "extensions/compression/gzip/compressor/zlib_compressor_impl.h" -#include "extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" -#include "extensions/filters/http/gzip/config.h" -#include "extensions/filters/http/gzip/gzip_filter.h" +#include "source/common/common/hex.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/compression/gzip/compressor/zlib_compressor_impl.h" +#include "source/extensions/compression/gzip/decompressor/zlib_decompressor_impl.h" +#include "source/extensions/filters/http/gzip/config.h" +#include "source/extensions/filters/http/gzip/gzip_filter.h" #include "test/mocks/http/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/extensions/filters/http/header_to_metadata/config_test.cc b/test/extensions/filters/http/header_to_metadata/config_test.cc index 3b7771b4ce231..1bdabcc02a472 100644 --- a/test/extensions/filters/http/header_to_metadata/config_test.cc +++ b/test/extensions/filters/http/header_to_metadata/config_test.cc @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.h" #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.validate.h" -#include "extensions/filters/http/header_to_metadata/config.h" -#include "extensions/filters/http/header_to_metadata/header_to_metadata_filter.h" +#include "source/extensions/filters/http/header_to_metadata/config.h" +#include "source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" diff --git a/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc b/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc index 9a88da9ee0500..ac4e978ec9b93 100644 --- a/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc +++ b/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc @@ -2,12 +2,11 @@ #include "envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.h" -#include "common/common/base64.h" -#include "common/http/header_map_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/http/header_to_metadata/header_to_metadata_filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/base64.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/http/header_to_metadata/header_to_metadata_filter.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/mocks/http/mocks.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/extensions/filters/http/health_check/config_test.cc b/test/extensions/filters/http/health_check/config_test.cc index dcf4e37fb0c88..d3e697276fb29 100644 --- a/test/extensions/filters/http/health_check/config_test.cc +++ b/test/extensions/filters/http/health_check/config_test.cc @@ -4,7 +4,7 @@ #include "envoy/extensions/filters/http/health_check/v3/health_check.pb.h" #include "envoy/extensions/filters/http/health_check/v3/health_check.pb.validate.h" -#include "extensions/filters/http/health_check/config.h" +#include "source/extensions/filters/http/health_check/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/health_check/health_check_test.cc b/test/extensions/filters/http/health_check/health_check_test.cc index 47693910d0cd6..b61685e8d6776 100644 --- a/test/extensions/filters/http/health_check/health_check_test.cc +++ b/test/extensions/filters/http/health_check/health_check_test.cc @@ -3,11 +3,10 @@ #include "envoy/config/route/v3/route_components.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/http/header_utility.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/filters/http/health_check/health_check.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/header_utility.h" +#include "source/common/upstream/upstream_impl.h" +#include "source/extensions/filters/http/health_check/health_check.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/upstream/cluster_info.h" diff --git a/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc b/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc index d6af41e9a4f25..a19ac094a9a82 100644 --- a/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc +++ b/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc @@ -2,11 +2,10 @@ #include "envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" - -#include "extensions/filters/http/ip_tagging/ip_tagging_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/http/ip_tagging/ip_tagging_filter.h" #include "test/mocks/http/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/extensions/filters/http/jwt_authn/all_verifier_test.cc b/test/extensions/filters/http/jwt_authn/all_verifier_test.cc index 55a4ed14cc67f..b0f17d751e411 100644 --- a/test/extensions/filters/http/jwt_authn/all_verifier_test.cc +++ b/test/extensions/filters/http/jwt_authn/all_verifier_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "extensions/filters/http/jwt_authn/filter_config.h" -#include "extensions/filters/http/jwt_authn/verifier.h" +#include "source/extensions/filters/http/jwt_authn/filter_config.h" +#include "source/extensions/filters/http/jwt_authn/verifier.h" #include "test/extensions/filters/http/jwt_authn/mock.h" #include "test/extensions/filters/http/jwt_authn/test_common.h" diff --git a/test/extensions/filters/http/jwt_authn/authenticator_test.cc b/test/extensions/filters/http/jwt_authn/authenticator_test.cc index 41d7d2253cbd3..f5cbb8a66e327 100644 --- a/test/extensions/filters/http/jwt_authn/authenticator_test.cc +++ b/test/extensions/filters/http/jwt_authn/authenticator_test.cc @@ -1,12 +1,11 @@ #include "envoy/config/core/v3/http_uri.pb.h" #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "common/http/message_impl.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/common/jwks_fetcher.h" -#include "extensions/filters/http/jwt_authn/authenticator.h" -#include "extensions/filters/http/jwt_authn/filter_config.h" +#include "source/common/http/message_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/common/jwks_fetcher.h" +#include "source/extensions/filters/http/jwt_authn/authenticator.h" +#include "source/extensions/filters/http/jwt_authn/filter_config.h" #include "test/extensions/filters/http/common/mock.h" #include "test/extensions/filters/http/jwt_authn/mock.h" diff --git a/test/extensions/filters/http/jwt_authn/extractor_test.cc b/test/extensions/filters/http/jwt_authn/extractor_test.cc index 849d331f38808..b7dee6776f559 100644 --- a/test/extensions/filters/http/jwt_authn/extractor_test.cc +++ b/test/extensions/filters/http/jwt_authn/extractor_test.cc @@ -1,8 +1,7 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/jwt_authn/extractor.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/jwt_authn/extractor.h" #include "test/extensions/filters/http/jwt_authn/test_common.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/jwt_authn/filter_config_test.cc b/test/extensions/filters/http/jwt_authn/filter_config_test.cc index f221bc089f778..c651c932e6db6 100644 --- a/test/extensions/filters/http/jwt_authn/filter_config_test.cc +++ b/test/extensions/filters/http/jwt_authn/filter_config_test.cc @@ -1,9 +1,8 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "common/router/string_accessor_impl.h" -#include "common/stream_info/filter_state_impl.h" - -#include "extensions/filters/http/jwt_authn/filter_config.h" +#include "source/common/router/string_accessor_impl.h" +#include "source/common/stream_info/filter_state_impl.h" +#include "source/extensions/filters/http/jwt_authn/filter_config.h" #include "test/extensions/filters/http/jwt_authn/test_common.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/jwt_authn/filter_factory_test.cc b/test/extensions/filters/http/jwt_authn/filter_factory_test.cc index c9e3a406a1e02..5159fa09af7df 100644 --- a/test/extensions/filters/http/jwt_authn/filter_factory_test.cc +++ b/test/extensions/filters/http/jwt_authn/filter_factory_test.cc @@ -1,8 +1,8 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.validate.h" -#include "extensions/filters/http/jwt_authn/filter_config.h" -#include "extensions/filters/http/jwt_authn/filter_factory.h" +#include "source/extensions/filters/http/jwt_authn/filter_config.h" +#include "source/extensions/filters/http/jwt_authn/filter_factory.h" #include "test/extensions/filters/http/jwt_authn/test_common.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/jwt_authn/filter_integration_test.cc b/test/extensions/filters/http/jwt_authn/filter_integration_test.cc index 0a5792d1c1f76..ccc0b181f87c0 100644 --- a/test/extensions/filters/http/jwt_authn/filter_integration_test.cc +++ b/test/extensions/filters/http/jwt_authn/filter_integration_test.cc @@ -2,10 +2,9 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/router/string_accessor_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/router/string_accessor_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/extensions/filters/http/jwt_authn/test_common.h" diff --git a/test/extensions/filters/http/jwt_authn/filter_test.cc b/test/extensions/filters/http/jwt_authn/filter_test.cc index 8983d94aafd2e..d5249b74107f1 100644 --- a/test/extensions/filters/http/jwt_authn/filter_test.cc +++ b/test/extensions/filters/http/jwt_authn/filter_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "extensions/filters/http/jwt_authn/filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/jwt_authn/filter.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/extensions/filters/http/jwt_authn/mock.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/jwt_authn/group_verifier_test.cc b/test/extensions/filters/http/jwt_authn/group_verifier_test.cc index 0ccbe3aac770f..d68164e6ae11a 100644 --- a/test/extensions/filters/http/jwt_authn/group_verifier_test.cc +++ b/test/extensions/filters/http/jwt_authn/group_verifier_test.cc @@ -1,6 +1,6 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "extensions/filters/http/jwt_authn/verifier.h" +#include "source/extensions/filters/http/jwt_authn/verifier.h" #include "test/extensions/filters/http/jwt_authn/mock.h" #include "test/extensions/filters/http/jwt_authn/test_common.h" diff --git a/test/extensions/filters/http/jwt_authn/jwks_async_fetcher_test.cc b/test/extensions/filters/http/jwt_authn/jwks_async_fetcher_test.cc index 1d21e254d7f94..7973c40f05790 100644 --- a/test/extensions/filters/http/jwt_authn/jwks_async_fetcher_test.cc +++ b/test/extensions/filters/http/jwt_authn/jwks_async_fetcher_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/jwt_authn/jwks_async_fetcher.h" +#include "source/extensions/filters/http/jwt_authn/jwks_async_fetcher.h" #include "test/extensions/filters/http/jwt_authn/test_common.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc b/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc index 6c22ec49a54bc..1c98f2ec7606d 100644 --- a/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc +++ b/test/extensions/filters/http/jwt_authn/jwks_cache_test.cc @@ -3,10 +3,9 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "common/protobuf/utility.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/filters/http/jwt_authn/jwks_cache.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/filters/http/jwt_authn/jwks_cache.h" #include "test/extensions/filters/http/jwt_authn/test_common.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/jwt_authn/matcher_test.cc b/test/extensions/filters/http/jwt_authn/matcher_test.cc index a48933e5fbf5e..3718832e80237 100644 --- a/test/extensions/filters/http/jwt_authn/matcher_test.cc +++ b/test/extensions/filters/http/jwt_authn/matcher_test.cc @@ -1,8 +1,7 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/jwt_authn/matcher.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/jwt_authn/matcher.h" #include "test/extensions/filters/http/jwt_authn/mock.h" #include "test/extensions/filters/http/jwt_authn/test_common.h" diff --git a/test/extensions/filters/http/jwt_authn/mock.h b/test/extensions/filters/http/jwt_authn/mock.h index bf06cd0b2f190..a4924033d4587 100644 --- a/test/extensions/filters/http/jwt_authn/mock.h +++ b/test/extensions/filters/http/jwt_authn/mock.h @@ -2,10 +2,9 @@ #include -#include "common/http/message_impl.h" - -#include "extensions/filters/http/jwt_authn/authenticator.h" -#include "extensions/filters/http/jwt_authn/verifier.h" +#include "source/common/http/message_impl.h" +#include "source/extensions/filters/http/jwt_authn/authenticator.h" +#include "source/extensions/filters/http/jwt_authn/verifier.h" #include "test/mocks/upstream/cluster_manager.h" diff --git a/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc b/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc index becc7e3daa835..bdf518ea2c7b8 100644 --- a/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc +++ b/test/extensions/filters/http/jwt_authn/provider_verifier_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/http/jwt_authn/v3/config.pb.h" -#include "extensions/filters/http/jwt_authn/filter_config.h" -#include "extensions/filters/http/jwt_authn/verifier.h" +#include "source/extensions/filters/http/jwt_authn/filter_config.h" +#include "source/extensions/filters/http/jwt_authn/verifier.h" #include "test/extensions/filters/http/jwt_authn/mock.h" #include "test/extensions/filters/http/jwt_authn/test_common.h" diff --git a/test/extensions/filters/http/kill_request/BUILD b/test/extensions/filters/http/kill_request/BUILD index 0d724b113f116..624937a925abb 100644 --- a/test/extensions/filters/http/kill_request/BUILD +++ b/test/extensions/filters/http/kill_request/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( srcs = ["kill_request_filter_test.cc"], extension_name = "envoy.filters.http.kill_request", deps = [ - "//include/envoy/http:metadata_interface", + "//envoy/http:metadata_interface", "//source/common/buffer:buffer_lib", "//source/extensions/filters/http:well_known_names", "//source/extensions/filters/http/kill_request:kill_request_filter_lib", diff --git a/test/extensions/filters/http/kill_request/kill_request_config_test.cc b/test/extensions/filters/http/kill_request/kill_request_config_test.cc index f4f6a62aab64e..af20c428f1e9f 100644 --- a/test/extensions/filters/http/kill_request/kill_request_config_test.cc +++ b/test/extensions/filters/http/kill_request/kill_request_config_test.cc @@ -2,7 +2,7 @@ #include "envoy/extensions/filters/http/kill_request/v3/kill_request.pb.validate.h" #include "envoy/type/v3/percent.pb.h" -#include "extensions/filters/http/kill_request/kill_request_config.h" +#include "source/extensions/filters/http/kill_request/kill_request_config.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/kill_request/kill_request_filter_test.cc b/test/extensions/filters/http/kill_request/kill_request_filter_test.cc index 2b9483bdc0256..75044710a7e88 100644 --- a/test/extensions/filters/http/kill_request/kill_request_filter_test.cc +++ b/test/extensions/filters/http/kill_request/kill_request_filter_test.cc @@ -2,10 +2,9 @@ #include "envoy/http/metadata_interface.h" #include "envoy/type/v3/percent.pb.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/http/kill_request/kill_request_filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/http/kill_request/kill_request_filter.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/mocks/common.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/local_ratelimit/config_test.cc b/test/extensions/filters/http/local_ratelimit/config_test.cc index 55cc18229969f..d10e3963d9987 100644 --- a/test/extensions/filters/http/local_ratelimit/config_test.cc +++ b/test/extensions/filters/http/local_ratelimit/config_test.cc @@ -1,5 +1,5 @@ -#include "extensions/filters/http/local_ratelimit/config.h" -#include "extensions/filters/http/local_ratelimit/local_ratelimit.h" +#include "source/extensions/filters/http/local_ratelimit/config.h" +#include "source/extensions/filters/http/local_ratelimit/local_ratelimit.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/filters/http/local_ratelimit/filter_test.cc b/test/extensions/filters/http/local_ratelimit/filter_test.cc index 1614b0520aaa1..939cebf025baf 100644 --- a/test/extensions/filters/http/local_ratelimit/filter_test.cc +++ b/test/extensions/filters/http/local_ratelimit/filter_test.cc @@ -1,6 +1,6 @@ #include "envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.h" -#include "extensions/filters/http/local_ratelimit/local_ratelimit.h" +#include "source/extensions/filters/http/local_ratelimit/local_ratelimit.h" #include "test/mocks/http/mocks.h" #include "test/mocks/local_info/mocks.h" diff --git a/test/extensions/filters/http/lua/config_test.cc b/test/extensions/filters/http/lua/config_test.cc index c01772b2a2222..7cb6dbd44dbad 100644 --- a/test/extensions/filters/http/lua/config_test.cc +++ b/test/extensions/filters/http/lua/config_test.cc @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/http/lua/v3/lua.pb.h" #include "envoy/extensions/filters/http/lua/v3/lua.pb.validate.h" -#include "extensions/filters/http/lua/config.h" +#include "source/extensions/filters/http/lua/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/lua/lua_filter_test.cc b/test/extensions/filters/http/lua/lua_filter_test.cc index 0471c8745845e..cb7cf9807d7a9 100644 --- a/test/extensions/filters/http/lua/lua_filter_test.cc +++ b/test/extensions/filters/http/lua/lua_filter_test.cc @@ -3,11 +3,10 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/http/message_impl.h" -#include "common/stream_info/stream_info_impl.h" - -#include "extensions/filters/http/lua/lua_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/message_impl.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/extensions/filters/http/lua/lua_filter.h" #include "test/mocks/api/mocks.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/lua/lua_integration_test.cc b/test/extensions/filters/http/lua/lua_integration_test.cc index d7197868d842e..49ba0f0a82758 100644 --- a/test/extensions/filters/http/lua/lua_integration_test.cc +++ b/test/extensions/filters/http/lua/lua_integration_test.cc @@ -1,7 +1,7 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/integration/http_integration.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/lua/wrappers_test.cc b/test/extensions/filters/http/lua/wrappers_test.cc index 2097b2696452d..ca10e89bf79b9 100644 --- a/test/extensions/filters/http/lua/wrappers_test.cc +++ b/test/extensions/filters/http/lua/wrappers_test.cc @@ -1,10 +1,9 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/http/utility.h" -#include "common/network/address_impl.h" -#include "common/stream_info/stream_info_impl.h" - -#include "extensions/filters/http/lua/wrappers.h" +#include "source/common/http/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/extensions/filters/http/lua/wrappers.h" #include "test/extensions/filters/common/lua/lua_wrappers.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/extensions/filters/http/oauth2/config_test.cc b/test/extensions/filters/http/oauth2/config_test.cc index bbe7860802c35..74dfe5daa6c42 100644 --- a/test/extensions/filters/http/oauth2/config_test.cc +++ b/test/extensions/filters/http/oauth2/config_test.cc @@ -3,11 +3,10 @@ #include "envoy/extensions/filters/http/oauth2/v3alpha/oauth.pb.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" -#include "common/secret/secret_provider_impl.h" - -#include "extensions/filters/http/oauth2/config.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/secret/secret_provider_impl.h" +#include "source/extensions/filters/http/oauth2/config.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/oauth2/filter_test.cc b/test/extensions/filters/http/oauth2/filter_test.cc index 521d28dff3cb2..9179db9d6686f 100644 --- a/test/extensions/filters/http/oauth2/filter_test.cc +++ b/test/extensions/filters/http/oauth2/filter_test.cc @@ -6,13 +6,12 @@ #include "envoy/http/async_client.h" #include "envoy/http/message.h" -#include "common/common/macros.h" -#include "common/http/message_impl.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" -#include "common/secret/secret_manager_impl.h" - -#include "extensions/filters/http/oauth2/filter.h" +#include "source/common/common/macros.h" +#include "source/common/http/message_impl.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/secret/secret_manager_impl.h" +#include "source/extensions/filters/http/oauth2/filter.h" #include "test/mocks/http/mocks.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/filters/http/oauth2/oauth_integration_test.cc b/test/extensions/filters/http/oauth2/oauth_integration_test.cc index fe2cc0649334a..34198a73eb15e 100644 --- a/test/extensions/filters/http/oauth2/oauth_integration_test.cc +++ b/test/extensions/filters/http/oauth2/oauth_integration_test.cc @@ -1,11 +1,9 @@ -#include "common/crypto/utility.h" -#include "common/http/utility.h" -#include "common/protobuf/utility.h" - +#include "source/common/crypto/utility.h" +#include "source/common/http/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/oauth2/filter.h" #include "source/extensions/filters/http/oauth2/oauth_response.pb.h" -#include "extensions/filters/http/oauth2/filter.h" - #include "test/integration/http_integration.h" #include "absl/strings/escaping.h" diff --git a/test/extensions/filters/http/oauth2/oauth_test.cc b/test/extensions/filters/http/oauth2/oauth_test.cc index f0a72cdfd4b2d..d7f9a29d443b8 100644 --- a/test/extensions/filters/http/oauth2/oauth_test.cc +++ b/test/extensions/filters/http/oauth2/oauth_test.cc @@ -1,11 +1,10 @@ #include #include -#include "common/http/message_impl.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/oauth2/oauth.h" -#include "extensions/filters/http/oauth2/oauth_client.h" +#include "source/common/http/message_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/oauth2/oauth.h" +#include "source/extensions/filters/http/oauth2/oauth_client.h" #include "test/mocks/http/mocks.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/filters/http/on_demand/on_demand_filter_test.cc b/test/extensions/filters/http/on_demand/on_demand_filter_test.cc index d2978064b2d9b..fffb9ea7c7b14 100644 --- a/test/extensions/filters/http/on_demand/on_demand_filter_test.cc +++ b/test/extensions/filters/http/on_demand/on_demand_filter_test.cc @@ -1,8 +1,7 @@ #include -#include "common/http/header_map_impl.h" - -#include "extensions/filters/http/on_demand/on_demand_update.h" +#include "source/common/http/header_map_impl.h" +#include "source/extensions/filters/http/on_demand/on_demand_update.h" #include "test/mocks/http/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/extensions/filters/http/original_src/config_test.cc b/test/extensions/filters/http/original_src/config_test.cc index 1b805e1f6c9e7..6607f387e11a3 100644 --- a/test/extensions/filters/http/original_src/config_test.cc +++ b/test/extensions/filters/http/original_src/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h" -#include "extensions/filters/http/original_src/config.h" +#include "source/extensions/filters/http/original_src/config.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/http/original_src/original_src_config_factory_test.cc b/test/extensions/filters/http/original_src/original_src_config_factory_test.cc index 4967371847dd8..8830e2d0a1e7f 100644 --- a/test/extensions/filters/http/original_src/original_src_config_factory_test.cc +++ b/test/extensions/filters/http/original_src/original_src_config_factory_test.cc @@ -1,9 +1,9 @@ #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h" #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.validate.h" -#include "extensions/filters/http/original_src/config.h" -#include "extensions/filters/http/original_src/original_src.h" -#include "extensions/filters/http/original_src/original_src_config_factory.h" +#include "source/extensions/filters/http/original_src/config.h" +#include "source/extensions/filters/http/original_src/original_src.h" +#include "source/extensions/filters/http/original_src/original_src_config_factory.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/http/original_src/original_src_test.cc b/test/extensions/filters/http/original_src/original_src_test.cc index 3fb9abc51e988..c8b9d1c5c5983 100644 --- a/test/extensions/filters/http/original_src/original_src_test.cc +++ b/test/extensions/filters/http/original_src/original_src_test.cc @@ -1,10 +1,9 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/extensions/filters/http/original_src/v3/original_src.pb.h" -#include "common/network/socket_option_impl.h" -#include "common/network/utility.h" - -#include "extensions/filters/http/original_src/original_src.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/http/original_src/original_src.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/common.h" diff --git a/test/extensions/filters/http/ratelimit/config_test.cc b/test/extensions/filters/http/ratelimit/config_test.cc index 232dcebf416f4..17d7bfd7db45b 100644 --- a/test/extensions/filters/http/ratelimit/config_test.cc +++ b/test/extensions/filters/http/ratelimit/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.h" #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.validate.h" -#include "extensions/filters/http/ratelimit/config.h" +#include "source/extensions/filters/http/ratelimit/config.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" diff --git a/test/extensions/filters/http/ratelimit/ratelimit_headers_test.cc b/test/extensions/filters/http/ratelimit/ratelimit_headers_test.cc index 9acc0ca72cbaa..9fba19f41da66 100644 --- a/test/extensions/filters/http/ratelimit/ratelimit_headers_test.cc +++ b/test/extensions/filters/http/ratelimit/ratelimit_headers_test.cc @@ -1,7 +1,7 @@ #include #include -#include "extensions/filters/http/ratelimit/ratelimit_headers.h" +#include "source/extensions/filters/http/ratelimit/ratelimit_headers.h" #include "test/extensions/filters/common/ratelimit/utils.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/ratelimit/ratelimit_integration_test.cc b/test/extensions/filters/http/ratelimit/ratelimit_integration_test.cc index aab0ff2a93e32..c54b35a01d02e 100644 --- a/test/extensions/filters/http/ratelimit/ratelimit_integration_test.cc +++ b/test/extensions/filters/http/ratelimit/ratelimit_integration_test.cc @@ -5,12 +5,11 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/service/ratelimit/v3/rls.pb.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/grpc/codec.h" -#include "common/grpc/common.h" - -#include "extensions/filters/http/ratelimit/config.h" -#include "extensions/filters/http/ratelimit/ratelimit_headers.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/common.h" +#include "source/extensions/filters/http/ratelimit/config.h" +#include "source/extensions/filters/http/ratelimit/ratelimit_headers.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/extensions/filters/common/ratelimit/utils.h" diff --git a/test/extensions/filters/http/ratelimit/ratelimit_test.cc b/test/extensions/filters/http/ratelimit/ratelimit_test.cc index 1dccd4f065384..0c79a7512cd17 100644 --- a/test/extensions/filters/http/ratelimit/ratelimit_test.cc +++ b/test/extensions/filters/http/ratelimit/ratelimit_test.cc @@ -4,13 +4,12 @@ #include "envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/empty_string.h" -#include "common/http/context_impl.h" -#include "common/http/headers.h" - -#include "extensions/filters/http/ratelimit/ratelimit.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/context_impl.h" +#include "source/common/http/headers.h" +#include "source/extensions/filters/http/ratelimit/ratelimit.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/extensions/filters/common/ratelimit/mocks.h" #include "test/extensions/filters/common/ratelimit/utils.h" diff --git a/test/extensions/filters/http/rbac/config_test.cc b/test/extensions/filters/http/rbac/config_test.cc index 318a6e2f10334..8871521627f5c 100644 --- a/test/extensions/filters/http/rbac/config_test.cc +++ b/test/extensions/filters/http/rbac/config_test.cc @@ -2,8 +2,8 @@ #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h" #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.validate.h" -#include "extensions/filters/common/rbac/engine.h" -#include "extensions/filters/http/rbac/config.h" +#include "source/extensions/filters/common/rbac/engine.h" +#include "source/extensions/filters/http/rbac/config.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" diff --git a/test/extensions/filters/http/rbac/mocks.h b/test/extensions/filters/http/rbac/mocks.h index f888cd06e4f02..7932a02fea4dc 100644 --- a/test/extensions/filters/http/rbac/mocks.h +++ b/test/extensions/filters/http/rbac/mocks.h @@ -2,8 +2,8 @@ #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h" -#include "extensions/filters/common/rbac/utility.h" -#include "extensions/filters/http/rbac/rbac_filter.h" +#include "source/extensions/filters/common/rbac/utility.h" +#include "source/extensions/filters/http/rbac/rbac_filter.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc b/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc index 0913b37ba4cbc..248764e2138bc 100644 --- a/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc +++ b/test/extensions/filters/http/rbac/rbac_filter_integration_test.cc @@ -1,9 +1,8 @@ #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/http/well_known_names.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/integration/http_protocol_integration.h" diff --git a/test/extensions/filters/http/rbac/rbac_filter_test.cc b/test/extensions/filters/http/rbac/rbac_filter_test.cc index dbc99bce28391..286b8bc7826ea 100644 --- a/test/extensions/filters/http/rbac/rbac_filter_test.cc +++ b/test/extensions/filters/http/rbac/rbac_filter_test.cc @@ -1,12 +1,11 @@ #include "envoy/config/rbac/v3/rbac.pb.h" #include "envoy/extensions/filters/http/rbac/v3/rbac.pb.h" -#include "common/config/metadata.h" -#include "common/network/utility.h" - -#include "extensions/filters/common/rbac/utility.h" -#include "extensions/filters/http/rbac/rbac_filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/config/metadata.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/common/rbac/utility.h" +#include "source/extensions/filters/http/rbac/rbac_filter.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/extensions/filters/common/rbac/mocks.h" #include "test/extensions/filters/http/rbac/mocks.h" diff --git a/test/extensions/filters/http/router/auto_sni_integration_test.cc b/test/extensions/filters/http/router/auto_sni_integration_test.cc index 6515e1aff0007..25328614681fe 100644 --- a/test/extensions/filters/http/router/auto_sni_integration_test.cc +++ b/test/extensions/filters/http/router/auto_sni_integration_test.cc @@ -5,8 +5,8 @@ #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" #include "envoy/upstream/upstream.h" -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/filters/http/router/config_test.cc b/test/extensions/filters/http/router/config_test.cc index 6b6aaeca8d7c8..af752c3192d4f 100644 --- a/test/extensions/filters/http/router/config_test.cc +++ b/test/extensions/filters/http/router/config_test.cc @@ -4,7 +4,7 @@ #include "envoy/extensions/filters/http/router/v3/router.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/router/config.h" +#include "source/extensions/filters/http/router/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/set_metadata/config_test.cc b/test/extensions/filters/http/set_metadata/config_test.cc index f702cabd708b4..11cc4ba63bb47 100644 --- a/test/extensions/filters/http/set_metadata/config_test.cc +++ b/test/extensions/filters/http/set_metadata/config_test.cc @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.h" #include "envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.validate.h" -#include "extensions/filters/http/set_metadata/config.h" -#include "extensions/filters/http/set_metadata/set_metadata_filter.h" +#include "source/extensions/filters/http/set_metadata/config.h" +#include "source/extensions/filters/http/set_metadata/set_metadata_filter.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" diff --git a/test/extensions/filters/http/set_metadata/set_metadata_filter_test.cc b/test/extensions/filters/http/set_metadata/set_metadata_filter_test.cc index ad644a71e419b..cbe351e458a5f 100644 --- a/test/extensions/filters/http/set_metadata/set_metadata_filter_test.cc +++ b/test/extensions/filters/http/set_metadata/set_metadata_filter_test.cc @@ -1,9 +1,8 @@ #include -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/http/set_metadata/set_metadata_filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/http/set_metadata/set_metadata_filter.h" +#include "source/extensions/filters/http/well_known_names.h" #include "test/mocks/http/mocks.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/extensions/filters/http/squash/BUILD b/test/extensions/filters/http/squash/BUILD index b3930a3e2bfb0..93034042f372e 100644 --- a/test/extensions/filters/http/squash/BUILD +++ b/test/extensions/filters/http/squash/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( srcs = ["squash_filter_test.cc"], extension_name = "envoy.filters.http.squash", deps = [ - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "//source/common/http:header_map_lib", "//source/common/stats:stats_lib", "//source/extensions/filters/http/squash:squash_filter_lib", diff --git a/test/extensions/filters/http/squash/config_test.cc b/test/extensions/filters/http/squash/config_test.cc index 814421f72cbe5..8964bb665308c 100644 --- a/test/extensions/filters/http/squash/config_test.cc +++ b/test/extensions/filters/http/squash/config_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/http/squash/v3/squash.pb.h" #include "envoy/extensions/filters/http/squash/v3/squash.pb.validate.h" -#include "extensions/filters/http/squash/config.h" +#include "source/extensions/filters/http/squash/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/squash/squash_filter_integration_test.cc b/test/extensions/filters/http/squash/squash_filter_integration_test.cc index 06c87e4e5e314..83f10a7069c66 100644 --- a/test/extensions/filters/http/squash/squash_filter_integration_test.cc +++ b/test/extensions/filters/http/squash/squash_filter_integration_test.cc @@ -2,7 +2,7 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "test/integration/autonomous_upstream.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/filters/http/squash/squash_filter_test.cc b/test/extensions/filters/http/squash/squash_filter_test.cc index 260ba53ca2a14..be5d8d852bfe3 100644 --- a/test/extensions/filters/http/squash/squash_filter_test.cc +++ b/test/extensions/filters/http/squash/squash_filter_test.cc @@ -5,10 +5,9 @@ #include "envoy/common/scope_tracker.h" #include "envoy/extensions/filters/http/squash/v3/squash.pb.h" -#include "common/http/message_impl.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/http/squash/squash_filter.h" +#include "source/common/http/message_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/http/squash/squash_filter.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/upstream/cluster_manager.h" diff --git a/test/extensions/filters/http/tap/common.h b/test/extensions/filters/http/tap/common.h index babcf8282df43..cef4d148677db 100644 --- a/test/extensions/filters/http/tap/common.h +++ b/test/extensions/filters/http/tap/common.h @@ -1,6 +1,6 @@ #pragma once -#include "extensions/filters/http/tap/tap_config.h" +#include "source/extensions/filters/http/tap/tap_config.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/http/tap/tap_config_impl_test.cc b/test/extensions/filters/http/tap/tap_config_impl_test.cc index 4e3763e9520e0..7f6d813c158d3 100644 --- a/test/extensions/filters/http/tap/tap_config_impl_test.cc +++ b/test/extensions/filters/http/tap/tap_config_impl_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/http/tap/tap_config_impl.h" +#include "source/extensions/filters/http/tap/tap_config_impl.h" #include "test/extensions/common/tap/common.h" #include "test/extensions/filters/http/tap/common.h" diff --git a/test/extensions/filters/http/tap/tap_filter_test.cc b/test/extensions/filters/http/tap/tap_filter_test.cc index 7ed0f1afb77fe..06ca5fcbff38b 100644 --- a/test/extensions/filters/http/tap/tap_filter_test.cc +++ b/test/extensions/filters/http/tap/tap_filter_test.cc @@ -1,5 +1,5 @@ -#include "extensions/filters/http/tap/config.h" -#include "extensions/filters/http/tap/tap_filter.h" +#include "source/extensions/filters/http/tap/config.h" +#include "source/extensions/filters/http/tap/tap_filter.h" #include "test/extensions/filters/http/tap/common.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/wasm/config_test.cc b/test/extensions/filters/http/wasm/config_test.cc index 35be66bca4743..346b2ebac2930 100644 --- a/test/extensions/filters/http/wasm/config_test.cc +++ b/test/extensions/filters/http/wasm/config_test.cc @@ -2,14 +2,13 @@ #include "envoy/extensions/filters/http/wasm/v3/wasm.pb.validate.h" -#include "common/common/base64.h" -#include "common/common/hex.h" -#include "common/crypto/utility.h" -#include "common/http/message_impl.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/common/wasm/wasm.h" -#include "extensions/filters/http/wasm/config.h" +#include "source/common/common/base64.h" +#include "source/common/common/hex.h" +#include "source/common/crypto/utility.h" +#include "source/common/http/message_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/common/wasm/wasm.h" +#include "source/extensions/filters/http/wasm/config.h" #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/http/wasm/test_data/test_async_call_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_async_call_cpp.cc index bdaf73f7f5654..9d16ab30a81e3 100644 --- a/test/extensions/filters/http/wasm/test_data/test_async_call_cpp.cc +++ b/test/extensions/filters/http/wasm/test_data/test_async_call_cpp.cc @@ -6,7 +6,7 @@ #ifndef NULL_PLUGIN #include "proxy_wasm_intrinsics_lite.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #endif START_WASM_PLUGIN(HttpWasmTestCpp) diff --git a/test/extensions/filters/http/wasm/test_data/test_body_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_body_cpp.cc index 27d0e0626ff43..b93d60b7a0c22 100644 --- a/test/extensions/filters/http/wasm/test_data/test_body_cpp.cc +++ b/test/extensions/filters/http/wasm/test_data/test_body_cpp.cc @@ -6,7 +6,7 @@ #ifndef NULL_PLUGIN #include "proxy_wasm_intrinsics_lite.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #endif START_WASM_PLUGIN(HttpWasmTestCpp) diff --git a/test/extensions/filters/http/wasm/test_data/test_close_stream_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_close_stream_cpp.cc index 7aa7c7d687a2e..7c861dbc9f924 100644 --- a/test/extensions/filters/http/wasm/test_data/test_close_stream_cpp.cc +++ b/test/extensions/filters/http/wasm/test_data/test_close_stream_cpp.cc @@ -6,7 +6,7 @@ #ifndef NULL_PLUGIN #include "proxy_wasm_intrinsics_lite.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #endif START_WASM_PLUGIN(HttpWasmTestCpp) diff --git a/test/extensions/filters/http/wasm/test_data/test_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_cpp.cc index 69f19e2c8b53d..f049ee8bc6b69 100644 --- a/test/extensions/filters/http/wasm/test_data/test_cpp.cc +++ b/test/extensions/filters/http/wasm/test_data/test_cpp.cc @@ -9,7 +9,7 @@ #include "source/extensions/common/wasm/ext/envoy_proxy_wasm_api.h" #include "source/extensions/common/wasm/ext/declare_property.pb.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #include "absl/base/casts.h" #endif diff --git a/test/extensions/filters/http/wasm/test_data/test_grpc_call_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_grpc_call_cpp.cc index 1c85aaf6592a1..e80830f05c256 100644 --- a/test/extensions/filters/http/wasm/test_data/test_grpc_call_cpp.cc +++ b/test/extensions/filters/http/wasm/test_data/test_grpc_call_cpp.cc @@ -6,7 +6,7 @@ #ifndef NULL_PLUGIN #include "proxy_wasm_intrinsics_lite.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #endif START_WASM_PLUGIN(HttpWasmTestCpp) diff --git a/test/extensions/filters/http/wasm/test_data/test_grpc_stream_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_grpc_stream_cpp.cc index 30d85abc4a2dc..e0ebbe048ca2d 100644 --- a/test/extensions/filters/http/wasm/test_data/test_grpc_stream_cpp.cc +++ b/test/extensions/filters/http/wasm/test_data/test_grpc_stream_cpp.cc @@ -6,7 +6,7 @@ #ifndef NULL_PLUGIN #include "proxy_wasm_intrinsics_lite.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #endif START_WASM_PLUGIN(HttpWasmTestCpp) diff --git a/test/extensions/filters/http/wasm/test_data/test_panic_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_panic_cpp.cc index 44fa5e19f9892..bd32bb4691d82 100644 --- a/test/extensions/filters/http/wasm/test_data/test_panic_cpp.cc +++ b/test/extensions/filters/http/wasm/test_data/test_panic_cpp.cc @@ -6,7 +6,7 @@ #ifndef NULL_PLUGIN #include "proxy_wasm_intrinsics_lite.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #endif START_WASM_PLUGIN(HttpWasmTestCpp) diff --git a/test/extensions/filters/http/wasm/test_data/test_resume_call_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_resume_call_cpp.cc index f557eb143859c..2ce27d3398404 100644 --- a/test/extensions/filters/http/wasm/test_data/test_resume_call_cpp.cc +++ b/test/extensions/filters/http/wasm/test_data/test_resume_call_cpp.cc @@ -6,7 +6,7 @@ #ifndef NULL_PLUGIN #include "proxy_wasm_intrinsics_lite.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #endif START_WASM_PLUGIN(HttpWasmTestCpp) diff --git a/test/extensions/filters/http/wasm/test_data/test_shared_data_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_shared_data_cpp.cc index 6ecf802903d9b..d3b9e51fe8d31 100644 --- a/test/extensions/filters/http/wasm/test_data/test_shared_data_cpp.cc +++ b/test/extensions/filters/http/wasm/test_data/test_shared_data_cpp.cc @@ -6,7 +6,7 @@ #ifndef NULL_PLUGIN #include "proxy_wasm_intrinsics_lite.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #endif START_WASM_PLUGIN(HttpWasmTestCpp) diff --git a/test/extensions/filters/http/wasm/test_data/test_shared_queue_cpp.cc b/test/extensions/filters/http/wasm/test_data/test_shared_queue_cpp.cc index 454932b9f556b..e6b61cc79c861 100644 --- a/test/extensions/filters/http/wasm/test_data/test_shared_queue_cpp.cc +++ b/test/extensions/filters/http/wasm/test_data/test_shared_queue_cpp.cc @@ -6,7 +6,7 @@ #ifndef NULL_PLUGIN #include "proxy_wasm_intrinsics_lite.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #endif START_WASM_PLUGIN(HttpWasmTestCpp) diff --git a/test/extensions/filters/http/wasm/wasm_filter_test.cc b/test/extensions/filters/http/wasm/wasm_filter_test.cc index 57c62919f32b9..eb27bc111d040 100644 --- a/test/extensions/filters/http/wasm/wasm_filter_test.cc +++ b/test/extensions/filters/http/wasm/wasm_filter_test.cc @@ -1,6 +1,5 @@ -#include "common/http/message_impl.h" - -#include "extensions/filters/http/wasm/wasm_filter.h" +#include "source/common/http/message_impl.h" +#include "source/extensions/filters/http/wasm/wasm_filter.h" #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/network/connection.h" diff --git a/test/extensions/filters/listener/common/fuzz/BUILD b/test/extensions/filters/listener/common/fuzz/BUILD index 556c46b372950..760575dbe87fa 100644 --- a/test/extensions/filters/listener/common/fuzz/BUILD +++ b/test/extensions/filters/listener/common/fuzz/BUILD @@ -22,7 +22,7 @@ envoy_cc_test_library( deps = [ ":listener_filter_fakes", ":listener_filter_fuzzer_proto_cc_proto", - "//include/envoy/network:filter_interface", + "//envoy/network:filter_interface", "//test/mocks/network:network_mocks", "//test/test_common:threadsafe_singleton_injector_lib", ], diff --git a/test/extensions/filters/listener/common/fuzz/listener_filter_fakes.h b/test/extensions/filters/listener/common/fuzz/listener_filter_fakes.h index 94df5757a3c00..602202240eb36 100644 --- a/test/extensions/filters/listener/common/fuzz/listener_filter_fakes.h +++ b/test/extensions/filters/listener/common/fuzz/listener_filter_fakes.h @@ -1,7 +1,7 @@ #pragma once -#include "common/api/os_sys_calls_impl.h" -#include "common/network/io_socket_handle_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/network/io_socket_handle_impl.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc b/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc index 97e76d527d958..5db28f3b92760 100644 --- a/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc +++ b/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc @@ -1,5 +1,5 @@ -#include "extensions/filters/listener/http_inspector/http_inspector.h" -#include "extensions/filters/listener/well_known_names.h" +#include "source/extensions/filters/listener/http_inspector/http_inspector.h" +#include "source/extensions/filters/listener/well_known_names.h" #include "test/mocks/server/listener_factory_context.h" diff --git a/test/extensions/filters/listener/http_inspector/http_inspector_fuzz_test.cc b/test/extensions/filters/listener/http_inspector/http_inspector_fuzz_test.cc index bf581af093f4f..624475651551d 100644 --- a/test/extensions/filters/listener/http_inspector/http_inspector_fuzz_test.cc +++ b/test/extensions/filters/listener/http_inspector/http_inspector_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/listener/http_inspector/http_inspector.h" +#include "source/extensions/filters/listener/http_inspector/http_inspector.h" #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h" #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.pb.validate.h" diff --git a/test/extensions/filters/listener/http_inspector/http_inspector_test.cc b/test/extensions/filters/listener/http_inspector/http_inspector_test.cc index d0216ef9a71bc..8499c8e3428d4 100644 --- a/test/extensions/filters/listener/http_inspector/http_inspector_test.cc +++ b/test/extensions/filters/listener/http_inspector/http_inspector_test.cc @@ -1,8 +1,7 @@ -#include "common/common/hex.h" -#include "common/http/utility.h" -#include "common/network/io_socket_handle_impl.h" - -#include "extensions/filters/listener/http_inspector/http_inspector.h" +#include "source/common/common/hex.h" +#include "source/common/http/utility.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/extensions/filters/listener/http_inspector/http_inspector.h" #include "test/mocks/api/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc b/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc index 820310876c589..49ccc85a71e3a 100644 --- a/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc +++ b/test/extensions/filters/listener/original_dst/original_dst_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/listener/original_dst/original_dst.h" +#include "source/extensions/filters/listener/original_dst/original_dst.h" #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h" #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.pb.validate.h" diff --git a/test/extensions/filters/listener/original_src/config_test.cc b/test/extensions/filters/listener/original_src/config_test.cc index 30c7e74c98f0d..6c0bd7563c6cb 100644 --- a/test/extensions/filters/listener/original_src/config_test.cc +++ b/test/extensions/filters/listener/original_src/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/extensions/filters/listener/original_src/v3/original_src.pb.h" -#include "extensions/filters/listener/original_src/config.h" +#include "source/extensions/filters/listener/original_src/config.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc b/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc index eac36949aa96d..a2febfc6f7f3d 100644 --- a/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc +++ b/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/listener/original_src/config.h" -#include "extensions/filters/listener/original_src/original_src.h" -#include "extensions/filters/listener/original_src/original_src_config_factory.h" +#include "source/extensions/filters/listener/original_src/config.h" +#include "source/extensions/filters/listener/original_src/original_src.h" +#include "source/extensions/filters/listener/original_src/original_src_config_factory.h" #include "test/mocks/server/listener_factory_context.h" diff --git a/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc b/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc index 4e1ec600aa883..2e3c8dc5a646a 100644 --- a/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc +++ b/test/extensions/filters/listener/original_src/original_src_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/listener/original_src/original_src.h" +#include "source/extensions/filters/listener/original_src/original_src.h" #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h" #include "test/extensions/filters/listener/original_src/original_src_fuzz_test.pb.validate.h" diff --git a/test/extensions/filters/listener/original_src/original_src_test.cc b/test/extensions/filters/listener/original_src/original_src_test.cc index 212d16331aa3c..ede0069b8876e 100644 --- a/test/extensions/filters/listener/original_src/original_src_test.cc +++ b/test/extensions/filters/listener/original_src/original_src_test.cc @@ -1,10 +1,9 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/extensions/filters/listener/original_src/v3/original_src.pb.h" -#include "common/network/socket_option_impl.h" -#include "common/network/utility.h" - -#include "extensions/filters/listener/original_src/original_src.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/listener/original_src/original_src.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/common.h" diff --git a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_fuzz_test.cc b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_fuzz_test.cc index 8129d8fb8721e..4e0cbced1409c 100644 --- a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_fuzz_test.cc +++ b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h" +#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h" #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h" #include "test/extensions/filters/listener/proxy_protocol/proxy_protocol_fuzz_test.pb.validate.h" diff --git a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc index 2ab7186e8b163..d85d973b94de7 100644 --- a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc +++ b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc @@ -6,19 +6,17 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/stats/scope.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/event/dispatcher_impl.h" -#include "common/network/connection_balancer_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/raw_buffer_socket.h" -#include "common/network/tcp_listener_impl.h" -#include "common/network/utility.h" - -#include "server/connection_handler_impl.h" - -#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h" -#include "extensions/filters/listener/well_known_names.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/network/connection_balancer_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/common/network/tcp_listener_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h" +#include "source/extensions/filters/listener/well_known_names.h" +#include "source/server/connection_handler_impl.h" #include "test/mocks/api/mocks.h" #include "test/mocks/buffer/mocks.h" diff --git a/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc b/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc index 00f1e37aa50c8..15426aa9aff58 100644 --- a/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc +++ b/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc @@ -1,11 +1,10 @@ #include -#include "common/api/os_sys_calls_impl.h" -#include "common/http/utility.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/listen_socket_impl.h" - -#include "extensions/filters/listener/tls_inspector/tls_inspector.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/http/utility.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h" #include "test/extensions/filters/listener/tls_inspector/tls_utility.h" #include "test/mocks/api/mocks.h" diff --git a/test/extensions/filters/listener/tls_inspector/tls_inspector_fuzz_test.cc b/test/extensions/filters/listener/tls_inspector/tls_inspector_fuzz_test.cc index 8b801582d7256..fc4b4f1ae2620 100644 --- a/test/extensions/filters/listener/tls_inspector/tls_inspector_fuzz_test.cc +++ b/test/extensions/filters/listener/tls_inspector/tls_inspector_fuzz_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/listener/tls_inspector/tls_inspector.h" +#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h" #include "test/extensions/filters/listener/common/fuzz/listener_filter_fuzzer.h" #include "test/extensions/filters/listener/tls_inspector/tls_inspector_fuzz_test.pb.validate.h" diff --git a/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc b/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc index 82f9d48112668..6e119c87dcd92 100644 --- a/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc +++ b/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc @@ -1,7 +1,6 @@ -#include "common/http/utility.h" -#include "common/network/io_socket_handle_impl.h" - -#include "extensions/filters/listener/tls_inspector/tls_inspector.h" +#include "source/common/http/utility.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h" #include "test/extensions/filters/listener/tls_inspector/tls_utility.h" #include "test/mocks/api/mocks.h" diff --git a/test/extensions/filters/listener/tls_inspector/tls_utility.cc b/test/extensions/filters/listener/tls_inspector/tls_utility.cc index 70ed11b1f48cd..c3777c479fdf2 100644 --- a/test/extensions/filters/listener/tls_inspector/tls_utility.cc +++ b/test/extensions/filters/listener/tls_inspector/tls_utility.cc @@ -1,6 +1,6 @@ #include "test/extensions/filters/listener/tls_inspector/tls_utility.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "openssl/ssl.h" diff --git a/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc b/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc index 7bb1cda809942..bad7675a9e2c3 100644 --- a/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc +++ b/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc @@ -5,10 +5,9 @@ #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.h" #include "envoy/runtime/runtime.h" -#include "common/http/message_impl.h" -#include "common/network/address_impl.h" - -#include "extensions/filters/network/client_ssl_auth/client_ssl_auth.h" +#include "source/common/http/message_impl.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h" #include "test/mocks/network/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/extensions/filters/network/client_ssl_auth/config_test.cc b/test/extensions/filters/network/client_ssl_auth/config_test.cc index b7c3d9fa5cc74..7c03c47be47b0 100644 --- a/test/extensions/filters/network/client_ssl_auth/config_test.cc +++ b/test/extensions/filters/network/client_ssl_auth/config_test.cc @@ -2,10 +2,9 @@ #include "envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/client_ssl_auth/config.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/client_ssl_auth/config.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/network/common/fuzz/network_readfilter_fuzz_test.cc b/test/extensions/filters/network/common/fuzz/network_readfilter_fuzz_test.cc index 2582fe207c09f..03d6ba34f76c3 100644 --- a/test/extensions/filters/network/common/fuzz/network_readfilter_fuzz_test.cc +++ b/test/extensions/filters/network/common/fuzz/network_readfilter_fuzz_test.cc @@ -1,7 +1,6 @@ -#include "common/config/utility.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/well_known_names.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/config/utility.h" #include "test/extensions/filters/network/common/fuzz/network_readfilter_fuzz.pb.validate.h" diff --git a/test/extensions/filters/network/common/fuzz/network_writefilter_fuzz_test.cc b/test/extensions/filters/network/common/fuzz/network_writefilter_fuzz_test.cc index c2f203091707a..e7eb67c58ebb4 100644 --- a/test/extensions/filters/network/common/fuzz/network_writefilter_fuzz_test.cc +++ b/test/extensions/filters/network/common/fuzz/network_writefilter_fuzz_test.cc @@ -1,7 +1,6 @@ -#include "common/config/utility.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/well_known_names.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/config/utility.h" #include "test/extensions/filters/network/common/fuzz/network_writefilter_fuzz.pb.validate.h" diff --git a/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc b/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc index e1b845312e554..2fa4d315176d1 100644 --- a/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc +++ b/test/extensions/filters/network/common/fuzz/uber_per_readfilter.cc @@ -2,9 +2,9 @@ #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h" #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h" -#include "extensions/filters/common/ratelimit/ratelimit_impl.h" -#include "extensions/filters/network/common/utility.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/common/ratelimit/ratelimit_impl.h" +#include "source/extensions/filters/network/common/utility.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/extensions/filters/common/ext_authz/test_common.h" #include "test/extensions/filters/network/common/fuzz/uber_readfilter.h" diff --git a/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc b/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc index 911caa250c522..350673901bfef 100644 --- a/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc +++ b/test/extensions/filters/network/common/fuzz/uber_per_writefilter.cc @@ -1,5 +1,5 @@ -#include "extensions/filters/network/common/utility.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/utility.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/extensions/filters/network/common/fuzz/uber_writefilter.h" diff --git a/test/extensions/filters/network/common/fuzz/uber_readfilter.cc b/test/extensions/filters/network/common/fuzz/uber_readfilter.cc index 4d126b8d1cdc7..2179484abcda6 100644 --- a/test/extensions/filters/network/common/fuzz/uber_readfilter.cc +++ b/test/extensions/filters/network/common/fuzz/uber_readfilter.cc @@ -1,8 +1,8 @@ #include "test/extensions/filters/network/common/fuzz/uber_readfilter.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" -#include "common/network/address_impl.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" +#include "source/common/network/address_impl.h" using testing::Return; diff --git a/test/extensions/filters/network/common/fuzz/uber_readfilter.h b/test/extensions/filters/network/common/fuzz/uber_readfilter.h index 62415490aa5fc..eee06955fce8e 100644 --- a/test/extensions/filters/network/common/fuzz/uber_readfilter.h +++ b/test/extensions/filters/network/common/fuzz/uber_readfilter.h @@ -2,7 +2,7 @@ #include "envoy/network/filter.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "test/extensions/filters/network/common/fuzz/network_readfilter_fuzz.pb.validate.h" #include "test/extensions/filters/network/common/fuzz/utils/fakes.h" diff --git a/test/extensions/filters/network/common/fuzz/uber_writefilter.cc b/test/extensions/filters/network/common/fuzz/uber_writefilter.cc index b1c99c4fd8465..da4979656e822 100644 --- a/test/extensions/filters/network/common/fuzz/uber_writefilter.cc +++ b/test/extensions/filters/network/common/fuzz/uber_writefilter.cc @@ -1,7 +1,7 @@ #include "test/extensions/filters/network/common/fuzz/uber_writefilter.h" -#include "common/config/utility.h" -#include "common/config/version_converter.h" +#include "source/common/config/utility.h" +#include "source/common/config/version_converter.h" using testing::_; using testing::Return; diff --git a/test/extensions/filters/network/common/fuzz/uber_writefilter.h b/test/extensions/filters/network/common/fuzz/uber_writefilter.h index 135d3e7d23f53..788e7858cbd53 100644 --- a/test/extensions/filters/network/common/fuzz/uber_writefilter.h +++ b/test/extensions/filters/network/common/fuzz/uber_writefilter.h @@ -2,7 +2,7 @@ #include "envoy/network/filter.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "test/extensions/filters/network/common/fuzz/network_writefilter_fuzz.pb.validate.h" #include "test/extensions/filters/network/common/fuzz/utils/fakes.h" diff --git a/test/extensions/filters/network/common/redis/client_impl_test.cc b/test/extensions/filters/network/common/redis/client_impl_test.cc index 953aa9374fbd5..8096c08cc7f03 100644 --- a/test/extensions/filters/network/common/redis/client_impl_test.cc +++ b/test/extensions/filters/network/common/redis/client_impl_test.cc @@ -2,12 +2,11 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/utility.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/filters/network/common/redis/client_impl.h" -#include "extensions/filters/network/common/redis/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/upstream_impl.h" +#include "source/extensions/filters/network/common/redis/client_impl.h" +#include "source/extensions/filters/network/common/redis/utility.h" #include "test/extensions/filters/network/common/redis/mocks.h" #include "test/extensions/filters/network/common/redis/test_utils.h" diff --git a/test/extensions/filters/network/common/redis/codec_impl_test.cc b/test/extensions/filters/network/common/redis/codec_impl_test.cc index f1a919380cd5f..7d5097db8858b 100644 --- a/test/extensions/filters/network/common/redis/codec_impl_test.cc +++ b/test/extensions/filters/network/common/redis/codec_impl_test.cc @@ -1,9 +1,8 @@ #include -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" - -#include "extensions/filters/network/common/redis/codec_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/extensions/filters/network/common/redis/codec_impl.h" #include "test/extensions/filters/network/common/redis/mocks.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/common/redis/fault_test.cc b/test/extensions/filters/network/common/redis/fault_test.cc index a80caf5c2d2a3..da80a05d7a9f5 100644 --- a/test/extensions/filters/network/common/redis/fault_test.cc +++ b/test/extensions/filters/network/common/redis/fault_test.cc @@ -1,8 +1,7 @@ #include "envoy/common/random_generator.h" -#include "common/common/assert.h" - -#include "extensions/filters/network/common/redis/fault_impl.h" +#include "source/common/common/assert.h" +#include "source/extensions/filters/network/common/redis/fault_impl.h" #include "test/extensions/filters/network/common/redis/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/extensions/filters/network/common/redis/mocks.cc b/test/extensions/filters/network/common/redis/mocks.cc index 0def373cffade..419137b413ebe 100644 --- a/test/extensions/filters/network/common/redis/mocks.cc +++ b/test/extensions/filters/network/common/redis/mocks.cc @@ -2,7 +2,7 @@ #include -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/common/redis/mocks.h b/test/extensions/filters/network/common/redis/mocks.h index 4f8f11bdaa4b5..e79464e5baef9 100644 --- a/test/extensions/filters/network/common/redis/mocks.h +++ b/test/extensions/filters/network/common/redis/mocks.h @@ -4,8 +4,8 @@ #include #include -#include "extensions/filters/network/common/redis/client_impl.h" -#include "extensions/filters/network/common/redis/codec_impl.h" +#include "source/extensions/filters/network/common/redis/client_impl.h" +#include "source/extensions/filters/network/common/redis/codec_impl.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/common/redis/test_utils.h b/test/extensions/filters/network/common/redis/test_utils.h index 7afb3a214bdc4..6d18e9dfb9719 100644 --- a/test/extensions/filters/network/common/redis/test_utils.h +++ b/test/extensions/filters/network/common/redis/test_utils.h @@ -6,7 +6,7 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/common/utility_test.cc b/test/extensions/filters/network/common/utility_test.cc index cf9cd19868099..05c6e9d815a7f 100644 --- a/test/extensions/filters/network/common/utility_test.cc +++ b/test/extensions/filters/network/common/utility_test.cc @@ -1,5 +1,5 @@ -#include "extensions/filters/network/common/utility.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/common/utility.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/mocks/runtime/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/network/direct_response/direct_response_test.cc b/test/extensions/filters/network/direct_response/direct_response_test.cc index f6d92d4e03526..061e39d25920c 100644 --- a/test/extensions/filters/network/direct_response/direct_response_test.cc +++ b/test/extensions/filters/network/direct_response/direct_response_test.cc @@ -1,6 +1,6 @@ #include "envoy/extensions/filters/network/direct_response/v3/config.pb.validate.h" -#include "extensions/filters/network/direct_response/filter.h" +#include "source/extensions/filters/network/direct_response/filter.h" #include "test/mocks/api/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/network/dubbo_proxy/app_exception_test.cc b/test/extensions/filters/network/dubbo_proxy/app_exception_test.cc index 49403617d9f91..94ec6b6acceec 100644 --- a/test/extensions/filters/network/dubbo_proxy/app_exception_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/app_exception_test.cc @@ -1,10 +1,10 @@ -#include "extensions/filters/network/dubbo_proxy/app_exception.h" -#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" -#include "extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h" -#include "extensions/filters/network/dubbo_proxy/filters/filter.h" -#include "extensions/filters/network/dubbo_proxy/hessian_utils.h" -#include "extensions/filters/network/dubbo_proxy/message_impl.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/app_exception.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h" +#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" #include "test/extensions/filters/network/dubbo_proxy/mocks.h" diff --git a/test/extensions/filters/network/dubbo_proxy/config_test.cc b/test/extensions/filters/network/dubbo_proxy/config_test.cc index d98fe3feef351..ef59a8fb49c1a 100644 --- a/test/extensions/filters/network/dubbo_proxy/config_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/config_test.cc @@ -1,8 +1,8 @@ #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.h" #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.validate.h" -#include "extensions/filters/network/dubbo_proxy/config.h" -#include "extensions/filters/network/dubbo_proxy/filters/filter_config.h" +#include "source/extensions/filters/network/dubbo_proxy/config.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/filter_config.h" #include "test/extensions/filters/network/dubbo_proxy/mocks.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/network/dubbo_proxy/conn_manager_test.cc b/test/extensions/filters/network/dubbo_proxy/conn_manager_test.cc index 44240f4c48845..1c0e9b10e3723 100644 --- a/test/extensions/filters/network/dubbo_proxy/conn_manager_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/conn_manager_test.cc @@ -1,14 +1,13 @@ #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.h" #include "envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.validate.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/dubbo_proxy/app_exception.h" -#include "extensions/filters/network/dubbo_proxy/config.h" -#include "extensions/filters/network/dubbo_proxy/conn_manager.h" -#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" -#include "extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h" -#include "extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/app_exception.h" +#include "source/extensions/filters/network/dubbo_proxy/config.h" +#include "source/extensions/filters/network/dubbo_proxy/conn_manager.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/extensions/filters/network/dubbo_proxy/mocks.h" diff --git a/test/extensions/filters/network/dubbo_proxy/decoder_test.cc b/test/extensions/filters/network/dubbo_proxy/decoder_test.cc index c18cb691c9ebc..396cc35188cc7 100644 --- a/test/extensions/filters/network/dubbo_proxy/decoder_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/decoder_test.cc @@ -1,7 +1,7 @@ -#include "extensions/filters/network/dubbo_proxy/decoder.h" -#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" -#include "extensions/filters/network/dubbo_proxy/message_impl.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/decoder.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" #include "test/extensions/filters/network/dubbo_proxy/mocks.h" #include "test/extensions/filters/network/dubbo_proxy/utility.h" diff --git a/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc b/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc index 19113bba6b5b2..142d5400e2dd3 100644 --- a/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl_test.cc @@ -1,6 +1,6 @@ -#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" -#include "extensions/filters/network/dubbo_proxy/hessian_utils.h" -#include "extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" #include "test/extensions/filters/network/dubbo_proxy/mocks.h" #include "test/extensions/filters/network/dubbo_proxy/utility.h" diff --git a/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc b/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc index 2501f0adfabac..9f57e392df534 100644 --- a/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl_test.cc @@ -1,5 +1,5 @@ -#include "extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h" -#include "extensions/filters/network/dubbo_proxy/protocol.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_protocol_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/protocol.h" #include "test/extensions/filters/network/dubbo_proxy/mocks.h" #include "test/extensions/filters/network/dubbo_proxy/utility.h" diff --git a/test/extensions/filters/network/dubbo_proxy/heartbeat_response_test.cc b/test/extensions/filters/network/dubbo_proxy/heartbeat_response_test.cc index 1313da2da0669..30fc8a976a50a 100644 --- a/test/extensions/filters/network/dubbo_proxy/heartbeat_response_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/heartbeat_response_test.cc @@ -1,7 +1,7 @@ -#include "extensions/filters/network/dubbo_proxy/heartbeat_response.h" -#include "extensions/filters/network/dubbo_proxy/hessian_utils.h" -#include "extensions/filters/network/dubbo_proxy/message_impl.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/heartbeat_response.h" +#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" #include "test/extensions/filters/network/dubbo_proxy/mocks.h" diff --git a/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc b/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc index daf167ef1deac..e291687293dc1 100644 --- a/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/hessian_utils_test.cc @@ -1,6 +1,6 @@ #include "envoy/common/exception.h" -#include "extensions/filters/network/dubbo_proxy/hessian_utils.h" +#include "source/extensions/filters/network/dubbo_proxy/hessian_utils.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/network/dubbo_proxy/message_impl_test.cc b/test/extensions/filters/network/dubbo_proxy/message_impl_test.cc index 82767f6cb8db4..24c4feaa5e20f 100644 --- a/test/extensions/filters/network/dubbo_proxy/message_impl_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/message_impl_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/network/dubbo_proxy/metadata_test.cc b/test/extensions/filters/network/dubbo_proxy/metadata_test.cc index c014b7ff5611c..bd2e2acc56d8b 100644 --- a/test/extensions/filters/network/dubbo_proxy/metadata_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/metadata_test.cc @@ -1,5 +1,5 @@ -#include "extensions/filters/network/dubbo_proxy/message_impl.h" -#include "extensions/filters/network/dubbo_proxy/metadata.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/metadata.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/dubbo_proxy/mocks.cc b/test/extensions/filters/network/dubbo_proxy/mocks.cc index 4cd21e654dc9f..f42a21a3ee129 100644 --- a/test/extensions/filters/network/dubbo_proxy/mocks.cc +++ b/test/extensions/filters/network/dubbo_proxy/mocks.cc @@ -2,8 +2,8 @@ #include -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/dubbo_proxy/mocks.h b/test/extensions/filters/network/dubbo_proxy/mocks.h index fa741daa20932..cee1ae8aa0bbe 100644 --- a/test/extensions/filters/network/dubbo_proxy/mocks.h +++ b/test/extensions/filters/network/dubbo_proxy/mocks.h @@ -1,14 +1,13 @@ #pragma once -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/dubbo_proxy/decoder.h" -#include "extensions/filters/network/dubbo_proxy/decoder_event_handler.h" -#include "extensions/filters/network/dubbo_proxy/filters/factory_base.h" -#include "extensions/filters/network/dubbo_proxy/filters/filter.h" -#include "extensions/filters/network/dubbo_proxy/protocol.h" -#include "extensions/filters/network/dubbo_proxy/router/router.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/dubbo_proxy/decoder.h" +#include "source/extensions/filters/network/dubbo_proxy/decoder_event_handler.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/factory_base.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/filter.h" +#include "source/extensions/filters/network/dubbo_proxy/protocol.h" +#include "source/extensions/filters/network/dubbo_proxy/router/router.h" #include "test/mocks/network/mocks.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc b/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc index 31a4ef785cee5..a523468d69a2e 100644 --- a/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc @@ -3,10 +3,9 @@ #include "envoy/extensions/filters/network/dubbo_proxy/v3/route.pb.h" #include "envoy/extensions/filters/network/dubbo_proxy/v3/route.pb.validate.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/network/dubbo_proxy/message_impl.h" -#include "extensions/filters/network/dubbo_proxy/router/route_matcher.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/router/route_matcher.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc b/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc index 6f9c65ffb4290..38bdbac682682 100644 --- a/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/router_filter_config_test.cc @@ -1,8 +1,8 @@ #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.h" #include "envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.validate.h" -#include "extensions/filters/network/dubbo_proxy/filters/well_known_names.h" -#include "extensions/filters/network/dubbo_proxy/router/config.h" +#include "source/extensions/filters/network/dubbo_proxy/filters/well_known_names.h" +#include "source/extensions/filters/network/dubbo_proxy/router/config.h" #include "test/extensions/filters/network/dubbo_proxy/mocks.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/network/dubbo_proxy/router_test.cc b/test/extensions/filters/network/dubbo_proxy/router_test.cc index e8945775b3ea9..81d1f37280d4e 100644 --- a/test/extensions/filters/network/dubbo_proxy/router_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/router_test.cc @@ -1,10 +1,10 @@ #include -#include "extensions/filters/network/dubbo_proxy/app_exception.h" -#include "extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" -#include "extensions/filters/network/dubbo_proxy/message_impl.h" -#include "extensions/filters/network/dubbo_proxy/protocol.h" -#include "extensions/filters/network/dubbo_proxy/router/router_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/app_exception.h" +#include "source/extensions/filters/network/dubbo_proxy/dubbo_hessian2_serializer_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/message_impl.h" +#include "source/extensions/filters/network/dubbo_proxy/protocol.h" +#include "source/extensions/filters/network/dubbo_proxy/router/router_impl.h" #include "test/extensions/filters/network/dubbo_proxy/mocks.h" #include "test/extensions/filters/network/dubbo_proxy/utility.h" @@ -335,7 +335,7 @@ TEST_F(DubboRouterTest, NoHealthyHosts) { EXPECT_CALL(*route_, routeEntry()).WillOnce(Return(&route_entry_)); EXPECT_CALL(route_entry_, clusterName()).WillRepeatedly(ReturnRef(cluster_name_)); EXPECT_CALL(context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(Return(nullptr)); + .WillOnce(Return(absl::nullopt)); EXPECT_CALL(callbacks_, sendLocalReply(_, _)) .WillOnce(Invoke([&](const DubboFilters::DirectResponse& response, bool end_stream) -> void { diff --git a/test/extensions/filters/network/dubbo_proxy/utility.h b/test/extensions/filters/network/dubbo_proxy/utility.h index 5005a44af2cca..302266a06935f 100644 --- a/test/extensions/filters/network/dubbo_proxy/utility.h +++ b/test/extensions/filters/network/dubbo_proxy/utility.h @@ -2,8 +2,8 @@ #include -#include "common/buffer/buffer_impl.h" -#include "common/common/byte_order.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/byte_order.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/ext_authz/config_test.cc b/test/extensions/filters/network/ext_authz/config_test.cc index 9cdb483aa7ac4..5960ec93088bf 100644 --- a/test/extensions/filters/network/ext_authz/config_test.cc +++ b/test/extensions/filters/network/ext_authz/config_test.cc @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.validate.h" #include "envoy/stats/scope.h" -#include "extensions/filters/network/ext_authz/config.h" +#include "source/extensions/filters/network/ext_authz/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/test_runtime.h" diff --git a/test/extensions/filters/network/ext_authz/ext_authz_fuzz_test.cc b/test/extensions/filters/network/ext_authz/ext_authz_fuzz_test.cc index 5760a2d4805c6..93f55a7f85b29 100644 --- a/test/extensions/filters/network/ext_authz/ext_authz_fuzz_test.cc +++ b/test/extensions/filters/network/ext_authz/ext_authz_fuzz_test.cc @@ -1,9 +1,8 @@ #include "envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/address_impl.h" - -#include "extensions/filters/network/ext_authz/ext_authz.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/filters/network/ext_authz/ext_authz.h" #include "test/extensions/filters/common/ext_authz/mocks.h" #include "test/extensions/filters/network/ext_authz/ext_authz_fuzz.pb.validate.h" diff --git a/test/extensions/filters/network/ext_authz/ext_authz_test.cc b/test/extensions/filters/network/ext_authz/ext_authz_test.cc index 053d84d3c04a2..b3b30010f320b 100644 --- a/test/extensions/filters/network/ext_authz/ext_authz_test.cc +++ b/test/extensions/filters/network/ext_authz/ext_authz_test.cc @@ -6,13 +6,12 @@ #include "envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.validate.h" #include "envoy/stats/stats.h" -#include "common/buffer/buffer_impl.h" -#include "common/json/json_loader.h" -#include "common/network/address_impl.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/ext_authz/ext_authz.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/json/json_loader.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/ext_authz/ext_authz.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/extensions/filters/common/ext_authz/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc b/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc index 4764d75b92280..3c0e659844a28 100644 --- a/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/http_connection_manager/config.h" +#include "source/extensions/filters/network/http_connection_manager/config.h" #include "test/extensions/filters/network/http_connection_manager/config_test_base.h" #include "test/mocks/config/mocks.h" diff --git a/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc b/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc index e9bc5386ede34..e3bc4a6b5f63c 100644 --- a/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc @@ -1,6 +1,6 @@ #include "envoy/extensions/filters/common/dependency/v3/dependency.pb.h" -#include "extensions/filters/network/http_connection_manager/config.h" +#include "source/extensions/filters/network/http_connection_manager/config.h" #include "test/extensions/filters/network/http_connection_manager/config_test_base.h" #include "test/mocks/config/mocks.h" diff --git a/test/extensions/filters/network/http_connection_manager/config_test.cc b/test/extensions/filters/network/http_connection_manager/config_test.cc index 6137c357640e7..2477db6bf4fc2 100644 --- a/test/extensions/filters/network/http_connection_manager/config_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_test.cc @@ -7,10 +7,9 @@ #include "envoy/server/request_id_extension_config.h" #include "envoy/type/v3/percent.pb.h" -#include "common/network/address_impl.h" - -#include "extensions/filters/network/http_connection_manager/config.h" -#include "extensions/request_id/uuid/config.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/filters/network/http_connection_manager/config.h" +#include "source/extensions/request_id/uuid/config.h" #include "test/extensions/filters/network/http_connection_manager/config.pb.h" #include "test/extensions/filters/network/http_connection_manager/config.pb.validate.h" diff --git a/test/extensions/filters/network/http_connection_manager/config_test_base.h b/test/extensions/filters/network/http_connection_manager/config_test_base.h index a4554a42d6703..1737bd1622531 100644 --- a/test/extensions/filters/network/http_connection_manager/config_test_base.h +++ b/test/extensions/filters/network/http_connection_manager/config_test_base.h @@ -1,12 +1,11 @@ #pragma once -#include "common/filter/http/filter_config_discovery_impl.h" -#include "common/http/date_provider_impl.h" -#include "common/network/address_impl.h" - -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/common/pass_through_filter.h" -#include "extensions/filters/network/http_connection_manager/config.h" +#include "source/common/filter/http/filter_config_discovery_impl.h" +#include "source/common/http/date_provider_impl.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/network/http_connection_manager/config.h" #include "test/extensions/filters/network/http_connection_manager/config.pb.h" #include "test/extensions/filters/network/http_connection_manager/config.pb.validate.h" diff --git a/test/extensions/filters/network/http_connection_manager/dependency_manager_test.cc b/test/extensions/filters/network/http_connection_manager/dependency_manager_test.cc index f1b6275227418..a4404666356a1 100644 --- a/test/extensions/filters/network/http_connection_manager/dependency_manager_test.cc +++ b/test/extensions/filters/network/http_connection_manager/dependency_manager_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/http_connection_manager/dependency_manager.h" +#include "source/extensions/filters/network/http_connection_manager/dependency_manager.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/kafka/broker/BUILD b/test/extensions/filters/network/kafka/broker/BUILD index cc64251e3f593..f6f4fae2df47c 100644 --- a/test/extensions/filters/network/kafka/broker/BUILD +++ b/test/extensions/filters/network/kafka/broker/BUILD @@ -26,7 +26,7 @@ envoy_extension_cc_test( srcs = ["filter_unit_test.cc"], extension_name = "envoy.filters.network.kafka_broker", deps = [ - "//include/envoy/event:timer_interface", + "//envoy/event:timer_interface", "//source/extensions/filters/network/kafka:kafka_broker_filter_lib", "//test/mocks/network:network_mocks", "//test/mocks/stats:stats_mocks", diff --git a/test/extensions/filters/network/kafka/broker/config_unit_test.cc b/test/extensions/filters/network/kafka/broker/config_unit_test.cc index e464acad0b960..4d447883174e7 100644 --- a/test/extensions/filters/network/kafka/broker/config_unit_test.cc +++ b/test/extensions/filters/network/kafka/broker/config_unit_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/broker/config.h" +#include "source/extensions/filters/network/kafka/broker/config.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/network/kafka/broker/filter_protocol_test.cc b/test/extensions/filters/network/kafka/broker/filter_protocol_test.cc index 2c0606ae91e9f..17ef7a3f084a2 100644 --- a/test/extensions/filters/network/kafka/broker/filter_protocol_test.cc +++ b/test/extensions/filters/network/kafka/broker/filter_protocol_test.cc @@ -3,12 +3,11 @@ * messages properly. */ -#include "common/common/utility.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/filters/network/kafka/broker/filter.h" -#include "extensions/filters/network/kafka/external/requests.h" -#include "extensions/filters/network/kafka/external/responses.h" +#include "source/common/common/utility.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/filters/network/kafka/broker/filter.h" +#include "source/extensions/filters/network/kafka/external/requests.h" +#include "source/extensions/filters/network/kafka/external/responses.h" #include "test/common/stats/stat_test_utility.h" #include "test/extensions/filters/network/kafka/buffer_based_test.h" diff --git a/test/extensions/filters/network/kafka/broker/filter_unit_test.cc b/test/extensions/filters/network/kafka/broker/filter_unit_test.cc index 0555fe75f625e..d62ca8a68700a 100644 --- a/test/extensions/filters/network/kafka/broker/filter_unit_test.cc +++ b/test/extensions/filters/network/kafka/broker/filter_unit_test.cc @@ -1,7 +1,7 @@ #include "envoy/event/timer.h" -#include "extensions/filters/network/kafka/broker/filter.h" -#include "extensions/filters/network/kafka/external/requests.h" +#include "source/extensions/filters/network/kafka/broker/filter.h" +#include "source/extensions/filters/network/kafka/external/requests.h" #include "test/mocks/network/mocks.h" #include "test/mocks/stats/mocks.h" diff --git a/test/extensions/filters/network/kafka/buffer_based_test.h b/test/extensions/filters/network/kafka/buffer_based_test.h index 612f484df5bae..a762fb3a9ec74 100644 --- a/test/extensions/filters/network/kafka/buffer_based_test.h +++ b/test/extensions/filters/network/kafka/buffer_based_test.h @@ -1,8 +1,7 @@ #pragma once -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/kafka/serialization.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/kafka/serialization.h" #include "absl/container/fixed_array.h" #include "absl/strings/string_view.h" diff --git a/test/extensions/filters/network/kafka/kafka_request_parser_test.cc b/test/extensions/filters/network/kafka/kafka_request_parser_test.cc index cb20b878098f6..deeb6309bea91 100644 --- a/test/extensions/filters/network/kafka/kafka_request_parser_test.cc +++ b/test/extensions/filters/network/kafka/kafka_request_parser_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/kafka_request_parser.h" +#include "source/extensions/filters/network/kafka/kafka_request_parser.h" #include "test/extensions/filters/network/kafka/buffer_based_test.h" #include "test/extensions/filters/network/kafka/serialization_utilities.h" diff --git a/test/extensions/filters/network/kafka/kafka_response_parser_test.cc b/test/extensions/filters/network/kafka/kafka_response_parser_test.cc index b905fc326f449..17615be344ff8 100644 --- a/test/extensions/filters/network/kafka/kafka_response_parser_test.cc +++ b/test/extensions/filters/network/kafka/kafka_response_parser_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/kafka_response_parser.h" +#include "source/extensions/filters/network/kafka/kafka_response_parser.h" #include "test/extensions/filters/network/kafka/buffer_based_test.h" #include "test/extensions/filters/network/kafka/serialization_utilities.h" diff --git a/test/extensions/filters/network/kafka/message_utilities.h b/test/extensions/filters/network/kafka/message_utilities.h index 4aabb18d1dba8..6fc0e1728b21e 100644 --- a/test/extensions/filters/network/kafka/message_utilities.h +++ b/test/extensions/filters/network/kafka/message_utilities.h @@ -2,8 +2,8 @@ #include -#include "extensions/filters/network/kafka/kafka_request.h" -#include "extensions/filters/network/kafka/kafka_response.h" +#include "source/extensions/filters/network/kafka/kafka_request.h" +#include "source/extensions/filters/network/kafka/kafka_response.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/kafka/metrics_integration_test.cc b/test/extensions/filters/network/kafka/metrics_integration_test.cc index 252644485c994..84a331a76003f 100644 --- a/test/extensions/filters/network/kafka/metrics_integration_test.cc +++ b/test/extensions/filters/network/kafka/metrics_integration_test.cc @@ -1,5 +1,5 @@ -#include "extensions/filters/network/kafka/external/request_metrics.h" -#include "extensions/filters/network/kafka/external/response_metrics.h" +#include "source/extensions/filters/network/kafka/external/request_metrics.h" +#include "source/extensions/filters/network/kafka/external/response_metrics.h" #include "test/common/stats/stat_test_utility.h" #include "test/extensions/filters/network/kafka/message_utilities.h" diff --git a/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2 index 4c29ff3730766..99b32400be79a 100644 --- a/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2 +++ b/test/extensions/filters/network/kafka/protocol/request_codec_request_test_cc.j2 @@ -9,8 +9,8 @@ - capture messages received in callback, - verify that captured messages are identical to the ones sent. #} -#include "extensions/filters/network/kafka/external/requests.h" -#include "extensions/filters/network/kafka/request_codec.h" +#include "source/extensions/filters/network/kafka/external/requests.h" +#include "source/extensions/filters/network/kafka/request_codec.h" #include "test/extensions/filters/network/kafka/buffer_based_test.h" #include "test/extensions/filters/network/kafka/serialization_utilities.h" diff --git a/test/extensions/filters/network/kafka/protocol/request_utilities_cc.j2 b/test/extensions/filters/network/kafka/protocol/request_utilities_cc.j2 index f43926d575870..90a3ab46c8947 100644 --- a/test/extensions/filters/network/kafka/protocol/request_utilities_cc.j2 +++ b/test/extensions/filters/network/kafka/protocol/request_utilities_cc.j2 @@ -5,7 +5,7 @@ #include "test/extensions/filters/network/kafka/message_utilities.h" -#include "extensions/filters/network/kafka/external/requests.h" +#include "source/extensions/filters/network/kafka/external/requests.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2 index ec96a4d90047c..4157eec181d24 100644 --- a/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2 +++ b/test/extensions/filters/network/kafka/protocol/requests_test_cc.j2 @@ -3,8 +3,8 @@ For every request, we want to check if it can be serialized and deserialized properly. #} -#include "extensions/filters/network/kafka/external/requests.h" -#include "extensions/filters/network/kafka/request_codec.h" +#include "source/extensions/filters/network/kafka/external/requests.h" +#include "source/extensions/filters/network/kafka/request_codec.h" #include "test/extensions/filters/network/kafka/buffer_based_test.h" diff --git a/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2 index f366452cf19f6..d03e40e2b8537 100644 --- a/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2 +++ b/test/extensions/filters/network/kafka/protocol/response_codec_response_test_cc.j2 @@ -9,8 +9,8 @@ - capture messages received in callback, - verify that captured messages are identical to the ones sent. #} -#include "extensions/filters/network/kafka/external/responses.h" -#include "extensions/filters/network/kafka/response_codec.h" +#include "source/extensions/filters/network/kafka/external/responses.h" +#include "source/extensions/filters/network/kafka/response_codec.h" #include "test/extensions/filters/network/kafka/buffer_based_test.h" #include "test/extensions/filters/network/kafka/serialization_utilities.h" diff --git a/test/extensions/filters/network/kafka/protocol/response_utilities_cc.j2 b/test/extensions/filters/network/kafka/protocol/response_utilities_cc.j2 index 783299f9f95b2..af412270c1858 100644 --- a/test/extensions/filters/network/kafka/protocol/response_utilities_cc.j2 +++ b/test/extensions/filters/network/kafka/protocol/response_utilities_cc.j2 @@ -5,7 +5,7 @@ #include "test/extensions/filters/network/kafka/message_utilities.h" -#include "extensions/filters/network/kafka/external/responses.h" +#include "source/extensions/filters/network/kafka/external/responses.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2 b/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2 index 84fff592eb344..cf5d552721acf 100644 --- a/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2 +++ b/test/extensions/filters/network/kafka/protocol/responses_test_cc.j2 @@ -3,8 +3,8 @@ For every response, we want to check if it can be serialized and deserialized properly. #} -#include "extensions/filters/network/kafka/external/responses.h" -#include "extensions/filters/network/kafka/response_codec.h" +#include "source/extensions/filters/network/kafka/external/responses.h" +#include "source/extensions/filters/network/kafka/response_codec.h" #include "test/extensions/filters/network/kafka/buffer_based_test.h" diff --git a/test/extensions/filters/network/kafka/request_codec_integration_test.cc b/test/extensions/filters/network/kafka/request_codec_integration_test.cc index 8a7ae9b7a7a36..ceb475b450630 100644 --- a/test/extensions/filters/network/kafka/request_codec_integration_test.cc +++ b/test/extensions/filters/network/kafka/request_codec_integration_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/request_codec.h" +#include "source/extensions/filters/network/kafka/request_codec.h" #include "test/extensions/filters/network/kafka/buffer_based_test.h" #include "test/extensions/filters/network/kafka/serialization_utilities.h" diff --git a/test/extensions/filters/network/kafka/request_codec_unit_test.cc b/test/extensions/filters/network/kafka/request_codec_unit_test.cc index 9d9c0734262f5..0e6ad23ce5f06 100644 --- a/test/extensions/filters/network/kafka/request_codec_unit_test.cc +++ b/test/extensions/filters/network/kafka/request_codec_unit_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/request_codec.h" +#include "source/extensions/filters/network/kafka/request_codec.h" #include "test/extensions/filters/network/kafka/buffer_based_test.h" diff --git a/test/extensions/filters/network/kafka/response_codec_integration_test.cc b/test/extensions/filters/network/kafka/response_codec_integration_test.cc index 287ba9f1855a7..191d738297f2b 100644 --- a/test/extensions/filters/network/kafka/response_codec_integration_test.cc +++ b/test/extensions/filters/network/kafka/response_codec_integration_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/response_codec.h" +#include "source/extensions/filters/network/kafka/response_codec.h" #include "test/extensions/filters/network/kafka/buffer_based_test.h" #include "test/extensions/filters/network/kafka/serialization_utilities.h" diff --git a/test/extensions/filters/network/kafka/response_codec_unit_test.cc b/test/extensions/filters/network/kafka/response_codec_unit_test.cc index 07dc116aab068..d05f42e9a9a25 100644 --- a/test/extensions/filters/network/kafka/response_codec_unit_test.cc +++ b/test/extensions/filters/network/kafka/response_codec_unit_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/response_codec.h" +#include "source/extensions/filters/network/kafka/response_codec.h" #include "test/extensions/filters/network/kafka/buffer_based_test.h" diff --git a/test/extensions/filters/network/kafka/serialization/serialization_composite_test_cc.j2 b/test/extensions/filters/network/kafka/serialization/serialization_composite_test_cc.j2 index 84a27de86c3d9..884f5dcfd81c7 100644 --- a/test/extensions/filters/network/kafka/serialization/serialization_composite_test_cc.j2 +++ b/test/extensions/filters/network/kafka/serialization/serialization_composite_test_cc.j2 @@ -5,7 +5,7 @@ Covers the corner case of 0 delegates, and then uses templating to create tests for 1..N cases. #} -#include "extensions/filters/network/kafka/external/serialization_composite.h" +#include "source/extensions/filters/network/kafka/external/serialization_composite.h" #include "test/extensions/filters/network/kafka/serialization_utilities.h" diff --git a/test/extensions/filters/network/kafka/serialization_test.cc b/test/extensions/filters/network/kafka/serialization_test.cc index c7e28d14ca879..41306d143ee3d 100644 --- a/test/extensions/filters/network/kafka/serialization_test.cc +++ b/test/extensions/filters/network/kafka/serialization_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/kafka/tagged_fields.h" +#include "source/extensions/filters/network/kafka/tagged_fields.h" #include "test/extensions/filters/network/kafka/serialization_utilities.h" diff --git a/test/extensions/filters/network/kafka/serialization_utilities.h b/test/extensions/filters/network/kafka/serialization_utilities.h index 5c252ab4a8709..d2fb902b8294d 100644 --- a/test/extensions/filters/network/kafka/serialization_utilities.h +++ b/test/extensions/filters/network/kafka/serialization_utilities.h @@ -1,8 +1,7 @@ #pragma once -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/kafka/serialization.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/kafka/serialization.h" #include "absl/container/fixed_array.h" #include "absl/strings/string_view.h" diff --git a/test/extensions/filters/network/local_ratelimit/local_ratelimit_fuzz_test.cc b/test/extensions/filters/network/local_ratelimit/local_ratelimit_fuzz_test.cc index 5e597bb552ade..c13c03b5f8760 100644 --- a/test/extensions/filters/network/local_ratelimit/local_ratelimit_fuzz_test.cc +++ b/test/extensions/filters/network/local_ratelimit/local_ratelimit_fuzz_test.cc @@ -1,10 +1,9 @@ #include "envoy/common/exception.h" #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/filters/network/local_ratelimit/local_ratelimit.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/filters/network/local_ratelimit/local_ratelimit.h" #include "test/extensions/filters/network/local_ratelimit/local_ratelimit_fuzz.pb.validate.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/extensions/filters/network/local_ratelimit/local_ratelimit_test.cc b/test/extensions/filters/network/local_ratelimit/local_ratelimit_test.cc index d764a1bab8ec3..50568d622f69c 100644 --- a/test/extensions/filters/network/local_ratelimit/local_ratelimit_test.cc +++ b/test/extensions/filters/network/local_ratelimit/local_ratelimit_test.cc @@ -1,9 +1,8 @@ #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.h" #include "envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.validate.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/filters/network/local_ratelimit/local_ratelimit.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/filters/network/local_ratelimit/local_ratelimit.h" #include "test/mocks/event/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/network/mongo_proxy/bson_impl_test.cc b/test/extensions/filters/network/mongo_proxy/bson_impl_test.cc index 9bbe1a1bbc660..9738daeb121a1 100644 --- a/test/extensions/filters/network/mongo_proxy/bson_impl_test.cc +++ b/test/extensions/filters/network/mongo_proxy/bson_impl_test.cc @@ -1,8 +1,7 @@ #include -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mongo_proxy/bson_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mongo_proxy/bson_impl.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/mongo_proxy/codec_impl_test.cc b/test/extensions/filters/network/mongo_proxy/codec_impl_test.cc index 1c960dd871501..c92c68cd1630e 100644 --- a/test/extensions/filters/network/mongo_proxy/codec_impl_test.cc +++ b/test/extensions/filters/network/mongo_proxy/codec_impl_test.cc @@ -1,10 +1,9 @@ #include -#include "common/buffer/buffer_impl.h" -#include "common/json/json_loader.h" - -#include "extensions/filters/network/mongo_proxy/bson_impl.h" -#include "extensions/filters/network/mongo_proxy/codec_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/json/json_loader.h" +#include "source/extensions/filters/network/mongo_proxy/bson_impl.h" +#include "source/extensions/filters/network/mongo_proxy/codec_impl.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/mongo_proxy/config_test.cc b/test/extensions/filters/network/mongo_proxy/config_test.cc index dd852f46445df..58b289a9176f2 100644 --- a/test/extensions/filters/network/mongo_proxy/config_test.cc +++ b/test/extensions/filters/network/mongo_proxy/config_test.cc @@ -4,7 +4,7 @@ #include "envoy/extensions/filters/network/mongo_proxy/v3/mongo_proxy.pb.validate.h" #include "envoy/type/v3/percent.pb.h" -#include "extensions/filters/network/mongo_proxy/config.h" +#include "source/extensions/filters/network/mongo_proxy/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/network/mongo_proxy/proxy_test.cc b/test/extensions/filters/network/mongo_proxy/proxy_test.cc index 82c777a0288ab..b59f4cc2bfebc 100644 --- a/test/extensions/filters/network/mongo_proxy/proxy_test.cc +++ b/test/extensions/filters/network/mongo_proxy/proxy_test.cc @@ -7,11 +7,11 @@ #include "envoy/stats/stats.h" #include "envoy/type/v3/percent.pb.h" -#include "extensions/filters/network/mongo_proxy/bson_impl.h" -#include "extensions/filters/network/mongo_proxy/codec_impl.h" -#include "extensions/filters/network/mongo_proxy/mongo_stats.h" -#include "extensions/filters/network/mongo_proxy/proxy.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/mongo_proxy/bson_impl.h" +#include "source/extensions/filters/network/mongo_proxy/codec_impl.h" +#include "source/extensions/filters/network/mongo_proxy/mongo_stats.h" +#include "source/extensions/filters/network/mongo_proxy/proxy.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/common/stream_info/test_util.h" #include "test/mocks/access_log/mocks.h" diff --git a/test/extensions/filters/network/mongo_proxy/utility_test.cc b/test/extensions/filters/network/mongo_proxy/utility_test.cc index db1ad741325cd..39c834b834913 100644 --- a/test/extensions/filters/network/mongo_proxy/utility_test.cc +++ b/test/extensions/filters/network/mongo_proxy/utility_test.cc @@ -1,8 +1,8 @@ #include -#include "extensions/filters/network/mongo_proxy/bson_impl.h" -#include "extensions/filters/network/mongo_proxy/codec_impl.h" -#include "extensions/filters/network/mongo_proxy/utility.h" +#include "source/extensions/filters/network/mongo_proxy/bson_impl.h" +#include "source/extensions/filters/network/mongo_proxy/codec_impl.h" +#include "source/extensions/filters/network/mongo_proxy/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_auth_switch_resp_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_auth_switch_resp_test.cc index de44f2f75683f..7529af8de0c5e 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_auth_switch_resp_test.cc +++ b/test/extensions/filters/network/mysql_proxy/mysql_auth_switch_resp_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" #include "gtest/gtest.h" #include "mysql_test_utils.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_clogin_resp_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_clogin_resp_test.cc index eb302970e10f4..60a064b5d46ca 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_clogin_resp_test.cc +++ b/test/extensions/filters/network/mysql_proxy/mysql_clogin_resp_test.cc @@ -1,7 +1,6 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" #include "gtest/gtest.h" #include "mysql_test_utils.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_clogin_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_clogin_test.cc index 0c02dd9dfacb1..d06aad773f1d2 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_clogin_test.cc +++ b/test/extensions/filters/network/mysql_proxy/mysql_clogin_test.cc @@ -1,7 +1,6 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" #include "gtest/gtest.h" #include "mysql_test_utils.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_codec_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_codec_test.cc index 807182dfa86e9..3d1add37faf0c 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_codec_test.cc +++ b/test/extensions/filters/network/mysql_proxy/mysql_codec_test.cc @@ -1,7 +1,6 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec_command.h" -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" #include "gtest/gtest.h" #include "mysql_test_utils.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_command_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_command_test.cc index 73ca39b616bc5..906d6f2b55303 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_command_test.cc +++ b/test/extensions/filters/network/mysql_proxy/mysql_command_test.cc @@ -1,11 +1,10 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_command.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_command.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_filter_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_filter_test.cc index d4fcee04b9eb1..c2d9c346a1227 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_filter_test.cc +++ b/test/extensions/filters/network/mysql_proxy/mysql_filter_test.cc @@ -1,8 +1,7 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_filter.h" -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_filter.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_greet_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_greet_test.cc index cb47a0fdf61fb..185198aa85875 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_greet_test.cc +++ b/test/extensions/filters/network/mysql_proxy/mysql_greet_test.cc @@ -1,7 +1,6 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" #include "gtest/gtest.h" #include "mysql_test_utils.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_integration_test.cc b/test/extensions/filters/network/mysql_proxy/mysql_integration_test.cc index 0a9ddd0a8e246..f2799c5fb2308 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_integration_test.cc +++ b/test/extensions/filters/network/mysql_proxy/mysql_integration_test.cc @@ -1,8 +1,8 @@ -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" #include "test/integration/fake_upstream.h" #include "test/integration/integration.h" diff --git a/test/extensions/filters/network/mysql_proxy/mysql_test_utils.cc b/test/extensions/filters/network/mysql_proxy/mysql_test_utils.cc index 7f19ebabab7bd..989e0ebef708a 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_test_utils.cc +++ b/test/extensions/filters/network/mysql_proxy/mysql_test_utils.cc @@ -1,13 +1,12 @@ #include "mysql_test_utils.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" -#include "extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" -#include "extensions/filters/network/mysql_proxy/mysql_utils.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_clogin_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_greeting.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec_switch_resp.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_utils.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/mysql_proxy/mysql_test_utils.h b/test/extensions/filters/network/mysql_proxy/mysql_test_utils.h index e83c2dec0e026..996cc92ff918c 100644 --- a/test/extensions/filters/network/mysql_proxy/mysql_test_utils.h +++ b/test/extensions/filters/network/mysql_proxy/mysql_test_utils.h @@ -1,5 +1,5 @@ #pragma once -#include "extensions/filters/network/mysql_proxy/mysql_codec.h" +#include "source/extensions/filters/network/mysql_proxy/mysql_codec.h" #include "fmt/format.h" diff --git a/test/extensions/filters/network/postgres_proxy/postgres_decoder_test.cc b/test/extensions/filters/network/postgres_proxy/postgres_decoder_test.cc index 9170a69e84844..cc7f65cdcd035 100644 --- a/test/extensions/filters/network/postgres_proxy/postgres_decoder_test.cc +++ b/test/extensions/filters/network/postgres_proxy/postgres_decoder_test.cc @@ -1,7 +1,7 @@ #include #include -#include "extensions/filters/network/postgres_proxy/postgres_decoder.h" +#include "source/extensions/filters/network/postgres_proxy/postgres_decoder.h" #include "test/extensions/filters/network/postgres_proxy/postgres_test_utils.h" diff --git a/test/extensions/filters/network/postgres_proxy/postgres_filter_test.cc b/test/extensions/filters/network/postgres_proxy/postgres_filter_test.cc index 0b09e50bea60a..1214dc4c661e3 100644 --- a/test/extensions/filters/network/postgres_proxy/postgres_filter_test.cc +++ b/test/extensions/filters/network/postgres_proxy/postgres_filter_test.cc @@ -3,8 +3,8 @@ #include -#include "extensions/filters/network/postgres_proxy/postgres_filter.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/postgres_proxy/postgres_filter.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/extensions/filters/network/postgres_proxy/postgres_test_utils.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/network/postgres_proxy/postgres_message_test.cc b/test/extensions/filters/network/postgres_proxy/postgres_message_test.cc index 3500083442f47..ec7b8e1b713ba 100644 --- a/test/extensions/filters/network/postgres_proxy/postgres_message_test.cc +++ b/test/extensions/filters/network/postgres_proxy/postgres_message_test.cc @@ -1,9 +1,8 @@ #include #include -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/postgres_proxy/postgres_message.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/postgres_proxy/postgres_message.h" #include "fmt/printf.h" diff --git a/test/extensions/filters/network/postgres_proxy/postgres_test_utils.h b/test/extensions/filters/network/postgres_proxy/postgres_test_utils.h index adabc27e8d2c4..0ee1614ec180f 100644 --- a/test/extensions/filters/network/postgres_proxy/postgres_test_utils.h +++ b/test/extensions/filters/network/postgres_proxy/postgres_test_utils.h @@ -1,6 +1,6 @@ #pragma once -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/ratelimit/config_test.cc b/test/extensions/filters/network/ratelimit/config_test.cc index 279dafdf000ec..f26e832f62551 100644 --- a/test/extensions/filters/network/ratelimit/config_test.cc +++ b/test/extensions/filters/network/ratelimit/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.h" #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.validate.h" -#include "extensions/filters/network/ratelimit/config.h" +#include "source/extensions/filters/network/ratelimit/config.h" #include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" diff --git a/test/extensions/filters/network/ratelimit/ratelimit_test.cc b/test/extensions/filters/network/ratelimit/ratelimit_test.cc index d0a5741b5c2d8..c59ba01e37a19 100644 --- a/test/extensions/filters/network/ratelimit/ratelimit_test.cc +++ b/test/extensions/filters/network/ratelimit/ratelimit_test.cc @@ -5,10 +5,9 @@ #include "envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.h" #include "envoy/stats/stats.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/ratelimit/ratelimit.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/ratelimit/ratelimit.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/extensions/filters/common/ratelimit/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/network/rbac/config_test.cc b/test/extensions/filters/network/rbac/config_test.cc index ace7d65fb7b15..134392d492652 100644 --- a/test/extensions/filters/network/rbac/config_test.cc +++ b/test/extensions/filters/network/rbac/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h" #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.validate.h" -#include "extensions/filters/network/rbac/config.h" +#include "source/extensions/filters/network/rbac/config.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/network/rbac/filter_test.cc b/test/extensions/filters/network/rbac/filter_test.cc index 218a0f22e774a..0bcf52baa8d6f 100644 --- a/test/extensions/filters/network/rbac/filter_test.cc +++ b/test/extensions/filters/network/rbac/filter_test.cc @@ -3,11 +3,10 @@ #include "envoy/config/rbac/v3/rbac.pb.h" #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h" -#include "common/network/utility.h" - -#include "extensions/filters/common/rbac/utility.h" -#include "extensions/filters/network/rbac/rbac_filter.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/common/rbac/utility.h" +#include "source/extensions/filters/network/rbac/rbac_filter.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/network/rbac/integration_test.cc b/test/extensions/filters/network/rbac/integration_test.cc index ba77509e45aab..39bf4386bdd99 100644 --- a/test/extensions/filters/network/rbac/integration_test.cc +++ b/test/extensions/filters/network/rbac/integration_test.cc @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.h" #include "envoy/extensions/filters/network/rbac/v3/rbac.pb.validate.h" -#include "extensions/filters/network/rbac/config.h" +#include "source/extensions/filters/network/rbac/config.h" #include "test/integration/integration.h" #include "test/test_common/environment.h" diff --git a/test/extensions/filters/network/redis_proxy/command_lookup_speed_test.cc b/test/extensions/filters/network/redis_proxy/command_lookup_speed_test.cc index 3b6dee686f250..7cafe805d3c63 100644 --- a/test/extensions/filters/network/redis_proxy/command_lookup_speed_test.cc +++ b/test/extensions/filters/network/redis_proxy/command_lookup_speed_test.cc @@ -5,12 +5,11 @@ #include #include -#include "common/common/fmt.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/filters/network/common/redis/client_impl.h" -#include "extensions/filters/network/common/redis/supported_commands.h" -#include "extensions/filters/network/redis_proxy/command_splitter_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/filters/network/common/redis/client_impl.h" +#include "source/extensions/filters/network/common/redis/supported_commands.h" +#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h" #include "test/extensions/filters/network/redis_proxy/mocks.h" #include "test/mocks/event/mocks.h" diff --git a/test/extensions/filters/network/redis_proxy/command_split_speed_test.cc b/test/extensions/filters/network/redis_proxy/command_split_speed_test.cc index 794b4b8b41b42..0feefb51b924a 100644 --- a/test/extensions/filters/network/redis_proxy/command_split_speed_test.cc +++ b/test/extensions/filters/network/redis_proxy/command_split_speed_test.cc @@ -5,13 +5,12 @@ #include #include -#include "common/common/fmt.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/filters/network/common/redis/client_impl.h" -#include "extensions/filters/network/common/redis/supported_commands.h" -#include "extensions/filters/network/redis_proxy/command_splitter_impl.h" -#include "extensions/filters/network/redis_proxy/router_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/filters/network/common/redis/client_impl.h" +#include "source/extensions/filters/network/common/redis/supported_commands.h" +#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h" +#include "source/extensions/filters/network/redis_proxy/router_impl.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc b/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc index f0d8177a6f9ae..9d56735abdce3 100644 --- a/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc +++ b/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc @@ -3,12 +3,11 @@ #include #include -#include "common/common/fmt.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/filters/network/common/redis/fault_impl.h" -#include "extensions/filters/network/common/redis/supported_commands.h" -#include "extensions/filters/network/redis_proxy/command_splitter_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/filters/network/common/redis/fault_impl.h" +#include "source/extensions/filters/network/common/redis/supported_commands.h" +#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h" #include "test/extensions/filters/network/common/redis/mocks.h" #include "test/extensions/filters/network/redis_proxy/mocks.h" diff --git a/test/extensions/filters/network/redis_proxy/config_test.cc b/test/extensions/filters/network/redis_proxy/config_test.cc index 798c8f573fda7..b57c1c772549e 100644 --- a/test/extensions/filters/network/redis_proxy/config_test.cc +++ b/test/extensions/filters/network/redis_proxy/config_test.cc @@ -1,9 +1,8 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/redis_proxy/config.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/redis_proxy/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/test_runtime.h" diff --git a/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc b/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc index 1963c3ab2b20e..594771b5a098b 100644 --- a/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc +++ b/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc @@ -6,11 +6,10 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h" -#include "common/network/utility.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/filters/network/common/redis/utility.h" -#include "extensions/filters/network/redis_proxy/conn_pool_impl.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/upstream_impl.h" +#include "source/extensions/filters/network/common/redis/utility.h" +#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h" #include "test/extensions/clusters/redis/mocks.h" #include "test/extensions/common/redis/mocks.h" diff --git a/test/extensions/filters/network/redis_proxy/mocks.h b/test/extensions/filters/network/redis_proxy/mocks.h index e90842bba06da..0bbb1e1931d03 100644 --- a/test/extensions/filters/network/redis_proxy/mocks.h +++ b/test/extensions/filters/network/redis_proxy/mocks.h @@ -4,13 +4,13 @@ #include #include -#include "extensions/common/redis/cluster_refresh_manager.h" -#include "extensions/filters/network/common/redis/client.h" -#include "extensions/filters/network/common/redis/codec_impl.h" -#include "extensions/filters/network/common/redis/fault.h" -#include "extensions/filters/network/redis_proxy/command_splitter.h" -#include "extensions/filters/network/redis_proxy/conn_pool.h" -#include "extensions/filters/network/redis_proxy/router.h" +#include "source/extensions/common/redis/cluster_refresh_manager.h" +#include "source/extensions/filters/network/common/redis/client.h" +#include "source/extensions/filters/network/common/redis/codec_impl.h" +#include "source/extensions/filters/network/common/redis/fault.h" +#include "source/extensions/filters/network/redis_proxy/command_splitter.h" +#include "source/extensions/filters/network/redis_proxy/conn_pool.h" +#include "source/extensions/filters/network/redis_proxy/router.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc b/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc index 1dba30ee201e4..36face2a38742 100644 --- a/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc +++ b/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" -#include "extensions/filters/network/redis_proxy/proxy_filter.h" +#include "source/extensions/filters/network/redis_proxy/proxy_filter.h" #include "test/common/stats/stat_test_utility.h" #include "test/extensions/filters/network/common/redis/mocks.h" diff --git a/test/extensions/filters/network/redis_proxy/redis_proxy_integration_test.cc b/test/extensions/filters/network/redis_proxy/redis_proxy_integration_test.cc index 4b014fc08c1be..404651366b7cc 100644 --- a/test/extensions/filters/network/redis_proxy/redis_proxy_integration_test.cc +++ b/test/extensions/filters/network/redis_proxy/redis_proxy_integration_test.cc @@ -1,10 +1,9 @@ #include #include -#include "common/common/fmt.h" - -#include "extensions/filters/network/common/redis/fault_impl.h" -#include "extensions/filters/network/redis_proxy/command_splitter_impl.h" +#include "source/common/common/fmt.h" +#include "source/extensions/filters/network/common/redis/fault_impl.h" +#include "source/extensions/filters/network/redis_proxy/command_splitter_impl.h" #include "test/integration/integration.h" diff --git a/test/extensions/filters/network/redis_proxy/router_impl_test.cc b/test/extensions/filters/network/redis_proxy/router_impl_test.cc index 6e9f402ae0289..87e5b704a2f18 100644 --- a/test/extensions/filters/network/redis_proxy/router_impl_test.cc +++ b/test/extensions/filters/network/redis_proxy/router_impl_test.cc @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" #include "envoy/type/v3/percent.pb.h" -#include "extensions/filters/network/redis_proxy/conn_pool_impl.h" -#include "extensions/filters/network/redis_proxy/router_impl.h" +#include "source/extensions/filters/network/redis_proxy/conn_pool_impl.h" +#include "source/extensions/filters/network/redis_proxy/router_impl.h" #include "test/extensions/filters/network/common/redis/mocks.h" #include "test/extensions/filters/network/redis_proxy/mocks.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/active_message_test.cc b/test/extensions/filters/network/rocketmq_proxy/active_message_test.cc index 3dfc65ca1ee18..3720074f1b576 100644 --- a/test/extensions/filters/network/rocketmq_proxy/active_message_test.cc +++ b/test/extensions/filters/network/rocketmq_proxy/active_message_test.cc @@ -1,10 +1,9 @@ -#include "common/network/address_impl.h" - -#include "extensions/filters/network/rocketmq_proxy/active_message.h" -#include "extensions/filters/network/rocketmq_proxy/config.h" -#include "extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "extensions/filters/network/rocketmq_proxy/protocol.h" -#include "extensions/filters/network/rocketmq_proxy/well_known_names.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/filters/network/rocketmq_proxy/active_message.h" +#include "source/extensions/filters/network/rocketmq_proxy/config.h" +#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" +#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" +#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" #include "test/extensions/filters/network/rocketmq_proxy/utility.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/codec_test.cc b/test/extensions/filters/network/rocketmq_proxy/codec_test.cc index 902584b5b3fc5..9c8fe92beb238 100644 --- a/test/extensions/filters/network/rocketmq_proxy/codec_test.cc +++ b/test/extensions/filters/network/rocketmq_proxy/codec_test.cc @@ -1,9 +1,8 @@ -#include "common/common/empty_string.h" -#include "common/common/enum_to_int.h" -#include "common/network/address_impl.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/rocketmq_proxy/codec.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/enum_to_int.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/rocketmq_proxy/codec.h" #include "test/extensions/filters/network/rocketmq_proxy/utility.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/config_test.cc b/test/extensions/filters/network/rocketmq_proxy/config_test.cc index 3030522c9eb72..592ae5de01f83 100644 --- a/test/extensions/filters/network/rocketmq_proxy/config_test.cc +++ b/test/extensions/filters/network/rocketmq_proxy/config_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.h" #include "envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.h" -#include "extensions/filters/network/rocketmq_proxy/config.h" +#include "source/extensions/filters/network/rocketmq_proxy/config.h" #include "test/mocks/local_info/mocks.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/conn_manager_test.cc b/test/extensions/filters/network/rocketmq_proxy/conn_manager_test.cc index 272706d89f951..44e3c1a9d64e3 100644 --- a/test/extensions/filters/network/rocketmq_proxy/conn_manager_test.cc +++ b/test/extensions/filters/network/rocketmq_proxy/conn_manager_test.cc @@ -1,8 +1,8 @@ #include "envoy/network/connection.h" -#include "extensions/filters/network/rocketmq_proxy/config.h" -#include "extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "extensions/filters/network/rocketmq_proxy/well_known_names.h" +#include "source/extensions/filters/network/rocketmq_proxy/config.h" +#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" +#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" #include "test/common/stats/stat_test_utility.h" #include "test/common/upstream/utility.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/mocks.cc b/test/extensions/filters/network/rocketmq_proxy/mocks.cc index 80d4fe73291c8..aea79d23d4e11 100644 --- a/test/extensions/filters/network/rocketmq_proxy/mocks.cc +++ b/test/extensions/filters/network/rocketmq_proxy/mocks.cc @@ -1,6 +1,6 @@ #include "test/extensions/filters/network/rocketmq_proxy/mocks.h" -#include "extensions/filters/network/rocketmq_proxy/router/router_impl.h" +#include "source/extensions/filters/network/rocketmq_proxy/router/router_impl.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/mocks.h b/test/extensions/filters/network/rocketmq_proxy/mocks.h index 8debb71f82170..23302611dc287 100644 --- a/test/extensions/filters/network/rocketmq_proxy/mocks.h +++ b/test/extensions/filters/network/rocketmq_proxy/mocks.h @@ -1,7 +1,7 @@ #pragma once -#include "extensions/filters/network/rocketmq_proxy/active_message.h" -#include "extensions/filters/network/rocketmq_proxy/conn_manager.h" +#include "source/extensions/filters/network/rocketmq_proxy/active_message.h" +#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" #include "test/mocks/upstream/cluster_manager.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/protocol_test.cc b/test/extensions/filters/network/rocketmq_proxy/protocol_test.cc index d22099f24fc6f..057b6dcc10d76 100644 --- a/test/extensions/filters/network/rocketmq_proxy/protocol_test.cc +++ b/test/extensions/filters/network/rocketmq_proxy/protocol_test.cc @@ -1,6 +1,5 @@ -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/rocketmq_proxy/protocol.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/rocketmq_proxy/protocol.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/route_matcher_test.cc b/test/extensions/filters/network/rocketmq_proxy/route_matcher_test.cc index 947e67481f9bc..620fb5432124d 100644 --- a/test/extensions/filters/network/rocketmq_proxy/route_matcher_test.cc +++ b/test/extensions/filters/network/rocketmq_proxy/route_matcher_test.cc @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.h" #include "envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.validate.h" -#include "extensions/filters/network/rocketmq_proxy/metadata.h" -#include "extensions/filters/network/rocketmq_proxy/router/route_matcher.h" +#include "source/extensions/filters/network/rocketmq_proxy/metadata.h" +#include "source/extensions/filters/network/rocketmq_proxy/router/route_matcher.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/router_test.cc b/test/extensions/filters/network/rocketmq_proxy/router_test.cc index 4041fb54fe2ac..49521a9c4763f 100644 --- a/test/extensions/filters/network/rocketmq_proxy/router_test.cc +++ b/test/extensions/filters/network/rocketmq_proxy/router_test.cc @@ -1,7 +1,7 @@ -#include "extensions/filters/network/rocketmq_proxy/config.h" -#include "extensions/filters/network/rocketmq_proxy/conn_manager.h" -#include "extensions/filters/network/rocketmq_proxy/router/router.h" -#include "extensions/filters/network/rocketmq_proxy/well_known_names.h" +#include "source/extensions/filters/network/rocketmq_proxy/config.h" +#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" +#include "source/extensions/filters/network/rocketmq_proxy/router/router.h" +#include "source/extensions/filters/network/rocketmq_proxy/well_known_names.h" #include "test/extensions/filters/network/rocketmq_proxy/mocks.h" #include "test/extensions/filters/network/rocketmq_proxy/utility.h" @@ -246,7 +246,7 @@ TEST_F(RocketmqRouterTest, NoHealthyHosts) { EXPECT_THAT(error_message, ContainsRegex(".*No host available*.")); })); EXPECT_CALL(context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(Return(nullptr)); + .WillOnce(Return(absl::nullopt)); EXPECT_CALL(*active_message_, onReset()); startRequest(); diff --git a/test/extensions/filters/network/rocketmq_proxy/topic_route_test.cc b/test/extensions/filters/network/rocketmq_proxy/topic_route_test.cc index 5cc9af4b845bc..e1c64375c7407 100644 --- a/test/extensions/filters/network/rocketmq_proxy/topic_route_test.cc +++ b/test/extensions/filters/network/rocketmq_proxy/topic_route_test.cc @@ -1,6 +1,5 @@ -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/rocketmq_proxy/topic_route.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/rocketmq_proxy/topic_route.h" #include "absl/container/node_hash_map.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/rocketmq_proxy/utility.h b/test/extensions/filters/network/rocketmq_proxy/utility.h index df702e09aadcd..ffbc286bc18b1 100644 --- a/test/extensions/filters/network/rocketmq_proxy/utility.h +++ b/test/extensions/filters/network/rocketmq_proxy/utility.h @@ -1,7 +1,7 @@ #pragma once -#include "extensions/filters/network/rocketmq_proxy/config.h" -#include "extensions/filters/network/rocketmq_proxy/conn_manager.h" +#include "source/extensions/filters/network/rocketmq_proxy/config.h" +#include "source/extensions/filters/network/rocketmq_proxy/conn_manager.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/sni_cluster/sni_cluster_test.cc b/test/extensions/filters/network/sni_cluster/sni_cluster_test.cc index 61c9a79ee681c..198bdee679592 100644 --- a/test/extensions/filters/network/sni_cluster/sni_cluster_test.cc +++ b/test/extensions/filters/network/sni_cluster/sni_cluster_test.cc @@ -1,7 +1,6 @@ -#include "common/tcp_proxy/tcp_proxy.h" - -#include "extensions/filters/network/sni_cluster/config.h" -#include "extensions/filters/network/sni_cluster/sni_cluster.h" +#include "source/common/tcp_proxy/tcp_proxy.h" +#include "source/extensions/filters/network/sni_cluster/config.h" +#include "source/extensions/filters/network/sni_cluster/sni_cluster.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_integration_test.cc b/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_integration_test.cc index ef4d92e831372..8a6d9c62a224e 100644 --- a/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_integration_test.cc +++ b/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_integration_test.cc @@ -3,8 +3,8 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/integration/http_integration.h" #include "test/integration/ssl_utility.h" diff --git a/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_test.cc b/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_test.cc index 4d9d35cb87ce4..5eda1b49de6b9 100644 --- a/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_test.cc +++ b/test/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter_test.cc @@ -1,8 +1,8 @@ #include "envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/sni_dynamic_forward_proxy.pb.h" #include "envoy/network/connection.h" -#include "extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/sni_dynamic_forward_proxy/proxy_filter.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/extensions/common/dynamic_forward_proxy/mocks.h" #include "test/mocks/http/mocks.h" diff --git a/test/extensions/filters/network/tcp_proxy/config_test.cc b/test/extensions/filters/network/tcp_proxy/config_test.cc index 1de0240088ee4..201379a7ce6b0 100644 --- a/test/extensions/filters/network/tcp_proxy/config_test.cc +++ b/test/extensions/filters/network/tcp_proxy/config_test.cc @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h" #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.h" -#include "extensions/filters/network/tcp_proxy/config.h" +#include "source/extensions/filters/network/tcp_proxy/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/test_runtime.h" diff --git a/test/extensions/filters/network/thrift_proxy/BUILD b/test/extensions/filters/network/thrift_proxy/BUILD index b4bb10f1d2d2d..7ae593821a98f 100644 --- a/test/extensions/filters/network/thrift_proxy/BUILD +++ b/test/extensions/filters/network/thrift_proxy/BUILD @@ -286,7 +286,7 @@ envoy_extension_cc_test( deps = [ ":mocks", ":utility_lib", - "//include/envoy/common:base_includes", + "//envoy/common:base_includes", "//source/common/network:address_lib", "//source/extensions/filters/network/thrift_proxy:config", "//source/extensions/filters/network/thrift_proxy/router:config", diff --git a/test/extensions/filters/network/thrift_proxy/app_exception_impl_test.cc b/test/extensions/filters/network/thrift_proxy/app_exception_impl_test.cc index 245ecd9423abb..fe93f96cbcc60 100644 --- a/test/extensions/filters/network/thrift_proxy/app_exception_impl_test.cc +++ b/test/extensions/filters/network/thrift_proxy/app_exception_impl_test.cc @@ -1,6 +1,5 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/app_exception_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" diff --git a/test/extensions/filters/network/thrift_proxy/auto_protocol_impl_test.cc b/test/extensions/filters/network/thrift_proxy/auto_protocol_impl_test.cc index cec16c3a59486..9b5bde2c707bc 100644 --- a/test/extensions/filters/network/thrift_proxy/auto_protocol_impl_test.cc +++ b/test/extensions/filters/network/thrift_proxy/auto_protocol_impl_test.cc @@ -1,11 +1,10 @@ #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/auto_protocol_impl.h" -#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h" -#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h" -#include "extensions/filters/network/thrift_proxy/twitter_protocol_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/auto_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" diff --git a/test/extensions/filters/network/thrift_proxy/auto_transport_impl_test.cc b/test/extensions/filters/network/thrift_proxy/auto_transport_impl_test.cc index e451dbdd6f85f..024dcb5fc3eb7 100644 --- a/test/extensions/filters/network/thrift_proxy/auto_transport_impl_test.cc +++ b/test/extensions/filters/network/thrift_proxy/auto_transport_impl_test.cc @@ -1,8 +1,7 @@ #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/auto_transport_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/auto_transport_impl.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" diff --git a/test/extensions/filters/network/thrift_proxy/binary_protocol_impl_test.cc b/test/extensions/filters/network/thrift_proxy/binary_protocol_impl_test.cc index a3ea1d80a0cbc..e828b0b346df9 100644 --- a/test/extensions/filters/network/thrift_proxy/binary_protocol_impl_test.cc +++ b/test/extensions/filters/network/thrift_proxy/binary_protocol_impl_test.cc @@ -1,8 +1,7 @@ #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/thrift_proxy/buffer_helper_test.cc b/test/extensions/filters/network/thrift_proxy/buffer_helper_test.cc index 0f2a1b0cdb3ad..1b0e133b1a24b 100644 --- a/test/extensions/filters/network/thrift_proxy/buffer_helper_test.cc +++ b/test/extensions/filters/network/thrift_proxy/buffer_helper_test.cc @@ -2,9 +2,8 @@ #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/buffer_helper.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/thrift_proxy/compact_protocol_impl_test.cc b/test/extensions/filters/network/thrift_proxy/compact_protocol_impl_test.cc index 9033c7e124143..a4e32077836a9 100644 --- a/test/extensions/filters/network/thrift_proxy/compact_protocol_impl_test.cc +++ b/test/extensions/filters/network/thrift_proxy/compact_protocol_impl_test.cc @@ -1,8 +1,7 @@ #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/compact_protocol_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/compact_protocol_impl.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/thrift_proxy/config_test.cc b/test/extensions/filters/network/thrift_proxy/config_test.cc index aa52a2143ed4b..9ff67f65ef2b9 100644 --- a/test/extensions/filters/network/thrift_proxy/config_test.cc +++ b/test/extensions/filters/network/thrift_proxy/config_test.cc @@ -1,8 +1,8 @@ #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h" #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.validate.h" -#include "extensions/filters/network/thrift_proxy/config.h" -#include "extensions/filters/network/thrift_proxy/filters/factory_base.h" +#include "source/extensions/filters/network/thrift_proxy/config.h" +#include "source/extensions/filters/network/thrift_proxy/filters/factory_base.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc b/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc index d02028fd90e03..7ac6ee7bf94b8 100644 --- a/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc +++ b/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc @@ -3,14 +3,13 @@ #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h" #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.validate.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/binary_protocol_impl.h" -#include "extensions/filters/network/thrift_proxy/buffer_helper.h" -#include "extensions/filters/network/thrift_proxy/config.h" -#include "extensions/filters/network/thrift_proxy/conn_manager.h" -#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h" -#include "extensions/filters/network/thrift_proxy/header_transport_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/binary_protocol_impl.h" +#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h" +#include "source/extensions/filters/network/thrift_proxy/config.h" +#include "source/extensions/filters/network/thrift_proxy/conn_manager.h" +#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h" +#include "source/extensions/filters/network/thrift_proxy/header_transport_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" diff --git a/test/extensions/filters/network/thrift_proxy/conn_state_test.cc b/test/extensions/filters/network/thrift_proxy/conn_state_test.cc index 5a875e9cc9875..bdbe9e504bff7 100644 --- a/test/extensions/filters/network/thrift_proxy/conn_state_test.cc +++ b/test/extensions/filters/network/thrift_proxy/conn_state_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/thrift_proxy/conn_state.h" +#include "source/extensions/filters/network/thrift_proxy/conn_state.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/thrift_proxy/decoder_test.cc b/test/extensions/filters/network/thrift_proxy/decoder_test.cc index 87f505b06e2c4..a0ef74a6d207a 100644 --- a/test/extensions/filters/network/thrift_proxy/decoder_test.cc +++ b/test/extensions/filters/network/thrift_proxy/decoder_test.cc @@ -1,7 +1,6 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/app_exception_impl.h" -#include "extensions/filters/network/thrift_proxy/decoder.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h" +#include "source/extensions/filters/network/thrift_proxy/decoder.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" diff --git a/test/extensions/filters/network/thrift_proxy/filters/pass_through_filter_test.cc b/test/extensions/filters/network/thrift_proxy/filters/pass_through_filter_test.cc index bd0952258bbce..abf5a15bc569e 100644 --- a/test/extensions/filters/network/thrift_proxy/filters/pass_through_filter_test.cc +++ b/test/extensions/filters/network/thrift_proxy/filters/pass_through_filter_test.cc @@ -1,7 +1,7 @@ #include #include -#include "extensions/filters/network/thrift_proxy/filters/pass_through_filter.h" +#include "source/extensions/filters/network/thrift_proxy/filters/pass_through_filter.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc index 30c4f38d12c8d..6a374d68fb5d5 100644 --- a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc +++ b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.h" #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.validate.h" -#include "extensions/filters/network/thrift_proxy/filters/ratelimit/config.h" +#include "source/extensions/filters/network/thrift_proxy/filters/ratelimit/config.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc index 07db070f0d77f..b4bda29851fef 100644 --- a/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc +++ b/test/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit_test.cc @@ -4,13 +4,12 @@ #include "envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/empty_string.h" -#include "common/http/headers.h" - -#include "extensions/filters/network/thrift_proxy/app_exception_impl.h" -#include "extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h" -#include "extensions/filters/network/thrift_proxy/filters/well_known_names.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/http/headers.h" +#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h" +#include "source/extensions/filters/network/thrift_proxy/filters/ratelimit/ratelimit.h" +#include "source/extensions/filters/network/thrift_proxy/filters/well_known_names.h" #include "test/extensions/filters/common/ratelimit/mocks.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" diff --git a/test/extensions/filters/network/thrift_proxy/framed_transport_impl_test.cc b/test/extensions/filters/network/thrift_proxy/framed_transport_impl_test.cc index f3afa26d2f101..37b4c164039a0 100644 --- a/test/extensions/filters/network/thrift_proxy/framed_transport_impl_test.cc +++ b/test/extensions/filters/network/thrift_proxy/framed_transport_impl_test.cc @@ -1,8 +1,7 @@ #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/thrift_proxy/header_transport_impl_test.cc b/test/extensions/filters/network/thrift_proxy/header_transport_impl_test.cc index 73a60b91ec5d5..33cc7e7fb4f6c 100644 --- a/test/extensions/filters/network/thrift_proxy/header_transport_impl_test.cc +++ b/test/extensions/filters/network/thrift_proxy/header_transport_impl_test.cc @@ -1,8 +1,7 @@ #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/header_transport_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/header_transport_impl.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" diff --git a/test/extensions/filters/network/thrift_proxy/integration.h b/test/extensions/filters/network/thrift_proxy/integration.h index 6010c6e64fbe5..977348c1863b5 100644 --- a/test/extensions/filters/network/thrift_proxy/integration.h +++ b/test/extensions/filters/network/thrift_proxy/integration.h @@ -3,7 +3,7 @@ #include #include -#include "extensions/filters/network/thrift_proxy/thrift.h" +#include "source/extensions/filters/network/thrift_proxy/thrift.h" #include "test/integration/integration.h" diff --git a/test/extensions/filters/network/thrift_proxy/integration_test.cc b/test/extensions/filters/network/thrift_proxy/integration_test.cc index 16dddb2b31635..5f7cb2c41b158 100644 --- a/test/extensions/filters/network/thrift_proxy/integration_test.cc +++ b/test/extensions/filters/network/thrift_proxy/integration_test.cc @@ -1,6 +1,6 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "extensions/filters/network/thrift_proxy/buffer_helper.h" +#include "source/extensions/filters/network/thrift_proxy/buffer_helper.h" #include "test/extensions/filters/network/thrift_proxy/integration.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" diff --git a/test/extensions/filters/network/thrift_proxy/metadata_test.cc b/test/extensions/filters/network/thrift_proxy/metadata_test.cc index 17bd4a0aaeb8c..6ca84143e6dce 100644 --- a/test/extensions/filters/network/thrift_proxy/metadata_test.cc +++ b/test/extensions/filters/network/thrift_proxy/metadata_test.cc @@ -1,4 +1,4 @@ -#include "extensions/filters/network/thrift_proxy/metadata.h" +#include "source/extensions/filters/network/thrift_proxy/metadata.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/network/thrift_proxy/mocks.cc b/test/extensions/filters/network/thrift_proxy/mocks.cc index 0f177cc79e506..8e93ace6f0c3e 100644 --- a/test/extensions/filters/network/thrift_proxy/mocks.cc +++ b/test/extensions/filters/network/thrift_proxy/mocks.cc @@ -2,7 +2,7 @@ #include -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/thrift_proxy/mocks.h b/test/extensions/filters/network/thrift_proxy/mocks.h index 7db68172d259a..b55d4bc466a9c 100644 --- a/test/extensions/filters/network/thrift_proxy/mocks.h +++ b/test/extensions/filters/network/thrift_proxy/mocks.h @@ -2,15 +2,15 @@ #include "envoy/router/router.h" -#include "extensions/filters/network/thrift_proxy/conn_manager.h" -#include "extensions/filters/network/thrift_proxy/conn_state.h" -#include "extensions/filters/network/thrift_proxy/filters/factory_base.h" -#include "extensions/filters/network/thrift_proxy/filters/filter.h" -#include "extensions/filters/network/thrift_proxy/metadata.h" -#include "extensions/filters/network/thrift_proxy/protocol.h" -#include "extensions/filters/network/thrift_proxy/router/router.h" -#include "extensions/filters/network/thrift_proxy/router/router_ratelimit.h" -#include "extensions/filters/network/thrift_proxy/transport.h" +#include "source/extensions/filters/network/thrift_proxy/conn_manager.h" +#include "source/extensions/filters/network/thrift_proxy/conn_state.h" +#include "source/extensions/filters/network/thrift_proxy/filters/factory_base.h" +#include "source/extensions/filters/network/thrift_proxy/filters/filter.h" +#include "source/extensions/filters/network/thrift_proxy/metadata.h" +#include "source/extensions/filters/network/thrift_proxy/protocol.h" +#include "source/extensions/filters/network/thrift_proxy/router/router.h" +#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit.h" +#include "source/extensions/filters/network/thrift_proxy/transport.h" #include "test/mocks/network/mocks.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc b/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc index 079f646d3a913..d7623f2418d28 100644 --- a/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc +++ b/test/extensions/filters/network/thrift_proxy/route_matcher_test.cc @@ -3,10 +3,9 @@ #include "envoy/extensions/filters/network/thrift_proxy/v3/route.pb.h" #include "envoy/extensions/filters/network/thrift_proxy/v3/route.pb.validate.h" -#include "common/config/metadata.h" - -#include "extensions/filters/network/thrift_proxy/router/config.h" -#include "extensions/filters/network/thrift_proxy/router/router_impl.h" +#include "source/common/config/metadata.h" +#include "source/extensions/filters/network/thrift_proxy/router/config.h" +#include "source/extensions/filters/network/thrift_proxy/router/router_impl.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc b/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc index 57b205f02981d..9e5c6a1bcb01f 100644 --- a/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc +++ b/test/extensions/filters/network/thrift_proxy/router_ratelimit_test.cc @@ -6,12 +6,11 @@ #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.validate.h" #include "envoy/ratelimit/ratelimit.h" -#include "common/network/address_impl.h" -#include "common/protobuf/utility.h" - -#include "extensions/filters/network/thrift_proxy/config.h" -#include "extensions/filters/network/thrift_proxy/metadata.h" -#include "extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/filters/network/thrift_proxy/config.h" +#include "source/extensions/filters/network/thrift_proxy/metadata.h" +#include "source/extensions/filters/network/thrift_proxy/router/router_ratelimit_impl.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" #include "test/mocks/ratelimit/mocks.h" diff --git a/test/extensions/filters/network/thrift_proxy/router_test.cc b/test/extensions/filters/network/thrift_proxy/router_test.cc index d17758c682bd5..a072c214b57ab 100644 --- a/test/extensions/filters/network/thrift_proxy/router_test.cc +++ b/test/extensions/filters/network/thrift_proxy/router_test.cc @@ -4,12 +4,11 @@ #include "envoy/config/filter/thrift/router/v2alpha1/router.pb.validate.h" #include "envoy/tcp/conn_pool.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/app_exception_impl.h" -#include "extensions/filters/network/thrift_proxy/config.h" -#include "extensions/filters/network/thrift_proxy/router/config.h" -#include "extensions/filters/network/thrift_proxy/router/router_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/app_exception_impl.h" +#include "source/extensions/filters/network/thrift_proxy/config.h" +#include "source/extensions/filters/network/thrift_proxy/router/config.h" +#include "source/extensions/filters/network/thrift_proxy/router/router_impl.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" @@ -577,7 +576,7 @@ TEST_F(ThriftRouterTest, NoHealthyHosts) { EXPECT_CALL(*route_, routeEntry()).WillOnce(Return(&route_entry_)); EXPECT_CALL(route_entry_, clusterName()).WillRepeatedly(ReturnRef(cluster_name_)); EXPECT_CALL(context_.cluster_manager_.thread_local_cluster_, tcpConnPool(_, _)) - .WillOnce(Return(nullptr)); + .WillOnce(Return(absl::nullopt)); EXPECT_CALL(callbacks_, sendLocalReply(_, _)) .WillOnce(Invoke([&](const DirectResponse& response, bool end_stream) -> void { diff --git a/test/extensions/filters/network/thrift_proxy/thrift_object_impl_test.cc b/test/extensions/filters/network/thrift_proxy/thrift_object_impl_test.cc index a79d30505644e..9d9a206c1f87c 100644 --- a/test/extensions/filters/network/thrift_proxy/thrift_object_impl_test.cc +++ b/test/extensions/filters/network/thrift_proxy/thrift_object_impl_test.cc @@ -1,6 +1,5 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/thrift_object_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/thrift_object_impl.h" #include "test/extensions/filters/network/thrift_proxy/mocks.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" diff --git a/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc b/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc index 0c50426b0fef6..9bead20a44bae 100644 --- a/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc +++ b/test/extensions/filters/network/thrift_proxy/translation_integration_test.cc @@ -1,7 +1,7 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h" -#include "extensions/filters/network/well_known_names.h" +#include "source/extensions/filters/network/well_known_names.h" #include "test/extensions/filters/network/thrift_proxy/integration.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" diff --git a/test/extensions/filters/network/thrift_proxy/twitter_protocol_impl_test.cc b/test/extensions/filters/network/thrift_proxy/twitter_protocol_impl_test.cc index 061fbe1ddb1b0..266991ccade2d 100644 --- a/test/extensions/filters/network/thrift_proxy/twitter_protocol_impl_test.cc +++ b/test/extensions/filters/network/thrift_proxy/twitter_protocol_impl_test.cc @@ -2,10 +2,9 @@ #include "envoy/common/exception.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/framed_transport_impl.h" -#include "extensions/filters/network/thrift_proxy/twitter_protocol_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/framed_transport_impl.h" +#include "source/extensions/filters/network/thrift_proxy/twitter_protocol_impl.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/thrift_proxy/unframed_transport_impl_test.cc b/test/extensions/filters/network/thrift_proxy/unframed_transport_impl_test.cc index 48097a6f1c2a6..76a23f643c8bf 100644 --- a/test/extensions/filters/network/thrift_proxy/unframed_transport_impl_test.cc +++ b/test/extensions/filters/network/thrift_proxy/unframed_transport_impl_test.cc @@ -1,6 +1,5 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/thrift_proxy/unframed_transport_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/thrift_proxy/unframed_transport_impl.h" #include "test/extensions/filters/network/thrift_proxy/utility.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/network/thrift_proxy/utility.h b/test/extensions/filters/network/thrift_proxy/utility.h index e19bfdf869e58..a19f9ef1b057e 100644 --- a/test/extensions/filters/network/thrift_proxy/utility.h +++ b/test/extensions/filters/network/thrift_proxy/utility.h @@ -4,10 +4,9 @@ #include "envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/byte_order.h" - -#include "extensions/filters/network/thrift_proxy/thrift.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/byte_order.h" +#include "source/extensions/filters/network/thrift_proxy/thrift.h" #include "test/common/buffer/utility.h" diff --git a/test/extensions/filters/network/wasm/config_test.cc b/test/extensions/filters/network/wasm/config_test.cc index 103068ba279a1..c7bb849f8ae6a 100644 --- a/test/extensions/filters/network/wasm/config_test.cc +++ b/test/extensions/filters/network/wasm/config_test.cc @@ -1,12 +1,11 @@ #include "envoy/extensions/filters/network/wasm/v3/wasm.pb.validate.h" -#include "common/common/base64.h" -#include "common/common/hex.h" -#include "common/crypto/utility.h" - -#include "extensions/common/wasm/wasm.h" -#include "extensions/filters/network/wasm/config.h" -#include "extensions/filters/network/wasm/wasm_filter.h" +#include "source/common/common/base64.h" +#include "source/common/common/hex.h" +#include "source/common/crypto/utility.h" +#include "source/extensions/common/wasm/wasm.h" +#include "source/extensions/filters/network/wasm/config.h" +#include "source/extensions/filters/network/wasm/wasm_filter.h" #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/filters/network/wasm/wasm_filter_test.cc b/test/extensions/filters/network/wasm/wasm_filter_test.cc index f0ab349395019..4203cc9de8fc9 100644 --- a/test/extensions/filters/network/wasm/wasm_filter_test.cc +++ b/test/extensions/filters/network/wasm/wasm_filter_test.cc @@ -1,8 +1,8 @@ #include "envoy/network/transport_socket.h" #include "envoy/server/lifecycle_notifier.h" -#include "extensions/common/wasm/wasm.h" -#include "extensions/filters/network/wasm/wasm_filter.h" +#include "source/extensions/common/wasm/wasm.h" +#include "source/extensions/filters/network/wasm/wasm_filter.h" #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/filters/network/zookeeper_proxy/config_test.cc b/test/extensions/filters/network/zookeeper_proxy/config_test.cc index b133a8f5075b2..e88dbacd1ab06 100644 --- a/test/extensions/filters/network/zookeeper_proxy/config_test.cc +++ b/test/extensions/filters/network/zookeeper_proxy/config_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.h" #include "envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.validate.h" -#include "extensions/filters/network/zookeeper_proxy/config.h" +#include "source/extensions/filters/network/zookeeper_proxy/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/network/zookeeper_proxy/filter_test.cc b/test/extensions/filters/network/zookeeper_proxy/filter_test.cc index 3a6eefd8e28bb..fec443f62bf45 100644 --- a/test/extensions/filters/network/zookeeper_proxy/filter_test.cc +++ b/test/extensions/filters/network/zookeeper_proxy/filter_test.cc @@ -1,7 +1,6 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/zookeeper_proxy/decoder.h" -#include "extensions/filters/network/zookeeper_proxy/filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/zookeeper_proxy/decoder.h" +#include "source/extensions/filters/network/zookeeper_proxy/filter.h" #include "test/mocks/network/mocks.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_fuzz_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_fuzz_test.cc index 193173020d693..5963d50ebf1a7 100644 --- a/test/extensions/filters/udp/dns_filter/dns_filter_fuzz_test.cc +++ b/test/extensions/filters/udp/dns_filter/dns_filter_fuzz_test.cc @@ -1,6 +1,5 @@ -#include "common/common/logger.h" - -#include "extensions/filters/udp/dns_filter/dns_filter.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter.h" #include "test/fuzz/fuzz_runner.h" #include "test/fuzz/utility.h" diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_integration_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_integration_test.cc index ec160f1a584ab..0da3872a1ab95 100644 --- a/test/extensions/filters/udp/dns_filter/dns_filter_integration_test.cc +++ b/test/extensions/filters/udp/dns_filter/dns_filter_integration_test.cc @@ -1,6 +1,6 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "extensions/filters/udp/dns_filter/dns_filter.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter.h" #include "test/integration/integration.h" #include "test/test_common/network_utility.h" @@ -88,10 +88,14 @@ reuse_port: true stat_prefix: "my_prefix" client_config: resolver_timeout: 1s - upstream_resolvers: - - socket_address: - address: {} - port_value: {} + dns_resolution_config: + resolvers: + - socket_address: + address: {} + port_value: {} + dns_resolver_options: + use_tcp_for_dns_lookups: false + no_default_search_domain: false max_pending_lookups: 256 server_config: inline_dns_table: diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_test.cc index c4e0ca81177af..8643b4b4ff289 100644 --- a/test/extensions/filters/udp/dns_filter/dns_filter_test.cc +++ b/test/extensions/filters/udp/dns_filter/dns_filter_test.cc @@ -1,10 +1,9 @@ #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.h" #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.validate.h" -#include "common/common/logger.h" - -#include "extensions/filters/udp/dns_filter/dns_filter_constants.h" -#include "extensions/filters/udp/dns_filter/dns_filter_utils.h" +#include "source/common/common/logger.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter_constants.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h" #include "test/mocks/event/mocks.h" #include "test/mocks/server/instance.h" @@ -18,6 +17,7 @@ using testing::AnyNumber; using testing::AtLeast; +using testing::DoAll; using testing::InSequence; using testing::Mock; using testing::Return; @@ -77,7 +77,8 @@ class DnsFilterTest : public testing::Test, public Event::TestUsingSimulatedTime ON_CALL(listener_factory_, random()).WillByDefault(ReturnRef(random_)); resolver_ = std::make_shared(); - ON_CALL(dispatcher_, createDnsResolver(_, _)).WillByDefault(Return(resolver_)); + ON_CALL(dispatcher_, createDnsResolver(_, _)) + .WillByDefault(DoAll(SaveArg<1>(&dns_resolver_options_), Return(resolver_))); config_ = std::make_shared(listener_factory_, config); filter_ = std::make_unique(callbacks_, config_); @@ -93,6 +94,7 @@ class DnsFilterTest : public testing::Test, public Event::TestUsingSimulatedTime } const Network::Address::InstanceConstSharedPtr listener_address_; + envoy::config::core::v3::DnsResolverOptions dns_resolver_options_; NiceMock random_; Api::ApiPtr api_; DnsFilterEnvoyConfigSharedPtr config_; @@ -180,16 +182,17 @@ stat_prefix: "my_prefix" stat_prefix: "my_prefix" client_config: resolver_timeout: 1s - upstream_resolvers: - - socket_address: - address: "1.1.1.1" - port_value: 53 - - socket_address: - address: "8.8.8.8" - port_value: 53 - - socket_address: - address: "8.8.4.4" - port_value: 53 + dns_resolution_config: + resolvers: + - socket_address: + address: "1.1.1.1" + port_value: 53 + - socket_address: + address: "8.8.8.8" + port_value: 53 + - socket_address: + address: "8.8.4.4" + port_value: 53 max_pending_lookups: 1 server_config: inline_dns_table: @@ -209,10 +212,62 @@ stat_prefix: "my_prefix" stat_prefix: "my_prefix" client_config: resolver_timeout: 1s - upstream_resolvers: - - socket_address: - address: "1.1.1.1" - port_value: 53 + dns_resolution_config: + resolvers: + - socket_address: + address: "1.1.1.1" + port_value: 53 + max_pending_lookups: 256 +server_config: + external_dns_table: + filename: {} +)EOF"; + + const std::string dns_resolver_options_config_not_set = R"EOF( +stat_prefix: "my_prefix" +client_config: + resolver_timeout: 1s + dns_resolution_config: + resolvers: + - socket_address: + address: "1.1.1.1" + port_value: 53 + max_pending_lookups: 256 +server_config: + external_dns_table: + filename: {} +)EOF"; + + const std::string dns_resolver_options_config_set_false = R"EOF( +stat_prefix: "my_prefix" +client_config: + resolver_timeout: 1s + dns_resolution_config: + dns_resolver_options: + use_tcp_for_dns_lookups: false + no_default_search_domain: false + resolvers: + - socket_address: + address: "1.1.1.1" + port_value: 53 + max_pending_lookups: 256 +server_config: + external_dns_table: + filename: {} +)EOF"; + + const std::string dns_resolver_options_config_set_true = R"EOF( +stat_prefix: "my_prefix" +client_config: + resolver_timeout: 1s + dns_resolution_config: + dns_resolver_options: + use_tcp_for_dns_lookups: true + no_default_search_domain: true + resolvers: + - socket_address: + address: "1.1.1.1" + port_value: 53 max_pending_lookups: 256 server_config: external_dns_table: @@ -2034,6 +2089,47 @@ TEST_F(DnsFilterTest, SrvQueryMaxRecords) { EXPECT_LT(exact_matches, hosts.size()); } +TEST_F(DnsFilterTest, DnsResolverOptionsNotSet) { + InSequence s; + + std::string temp_path = + TestEnvironment::writeStringToFileForTest("dns_table.yaml", max_records_table_yaml); + std::string config_to_use = fmt::format(dns_resolver_options_config_not_set, temp_path); + setup(config_to_use); + // `false` here means use_tcp_for_dns_lookups is not set via dns filter config + EXPECT_EQ(false, dns_resolver_options_.use_tcp_for_dns_lookups()); + // `false` here means no_default_search_domain is not set via dns filter config + EXPECT_EQ(false, dns_resolver_options_.no_default_search_domain()); +} + +TEST_F(DnsFilterTest, DnsResolverOptionsSetTrue) { + InSequence s; + + std::string temp_path = + TestEnvironment::writeStringToFileForTest("dns_table.yaml", max_records_table_yaml); + std::string config_to_use = fmt::format(dns_resolver_options_config_set_true, temp_path); + setup(config_to_use); + + // `true` here means use_tcp_for_dns_lookups is set true + EXPECT_EQ(true, dns_resolver_options_.use_tcp_for_dns_lookups()); + // `true` here means no_default_search_domain is set true + EXPECT_EQ(true, dns_resolver_options_.no_default_search_domain()); +} + +TEST_F(DnsFilterTest, DnsResolverOptionsSetFalse) { + InSequence s; + + std::string temp_path = + TestEnvironment::writeStringToFileForTest("dns_table.yaml", max_records_table_yaml); + std::string config_to_use = fmt::format(dns_resolver_options_config_set_false, temp_path); + setup(config_to_use); + + // `false` here means use_tcp_for_dns_lookups is set true + EXPECT_EQ(false, dns_resolver_options_.use_tcp_for_dns_lookups()); + // `false` here means no_default_search_domain is set true + EXPECT_EQ(false, dns_resolver_options_.no_default_search_domain()); +} + } // namespace } // namespace DnsFilter } // namespace UdpFilters diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.cc b/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.cc index b6a50496a7f31..e6226227a6153 100644 --- a/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.cc +++ b/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.cc @@ -1,6 +1,6 @@ #include "dns_filter_test_utils.h" -#include "common/common/random_generator.h" +#include "source/common/common/random_generator.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.h b/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.h index 378abbe431860..c0d2aea785149 100644 --- a/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.h +++ b/test/extensions/filters/udp/dns_filter/dns_filter_test_utils.h @@ -1,7 +1,7 @@ #pragma once -#include "extensions/filters/udp/dns_filter/dns_filter.h" -#include "extensions/filters/udp/dns_filter/dns_filter_constants.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter_constants.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_utils_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_utils_test.cc index f891e0f8402ff..856ba795d293b 100644 --- a/test/extensions/filters/udp/dns_filter/dns_filter_utils_test.cc +++ b/test/extensions/filters/udp/dns_filter/dns_filter_utils_test.cc @@ -1,9 +1,8 @@ #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.h" #include "envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.pb.validate.h" -#include "common/network/address_impl.h" - -#include "extensions/filters/udp/dns_filter/dns_filter_utils.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h" #include "test/test_common/environment.h" diff --git a/test/extensions/filters/udp/udp_proxy/hash_policy_impl_test.cc b/test/extensions/filters/udp/udp_proxy/hash_policy_impl_test.cc index 5090f38f09efa..c9e739d22c62f 100644 --- a/test/extensions/filters/udp/udp_proxy/hash_policy_impl_test.cc +++ b/test/extensions/filters/udp/udp_proxy/hash_policy_impl_test.cc @@ -2,10 +2,9 @@ #include "envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.h" -#include "common/common/hash.h" -#include "common/network/utility.h" - -#include "extensions/filters/udp/udp_proxy/hash_policy_impl.h" +#include "source/common/common/hash.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/udp/udp_proxy/hash_policy_impl.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc b/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc index c0f78a1b9b744..8e56df53c6cec 100644 --- a/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc +++ b/test/extensions/filters/udp/udp_proxy/udp_proxy_filter_test.cc @@ -1,11 +1,10 @@ #include "envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.h" #include "envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.validate.h" -#include "common/common/hash.h" -#include "common/network/socket_impl.h" -#include "common/network/socket_option_impl.h" - -#include "extensions/filters/udp/udp_proxy/udp_proxy_filter.h" +#include "source/common/common/hash.h" +#include "source/common/network/socket_impl.h" +#include "source/common/network/socket_option_impl.h" +#include "source/extensions/filters/udp/udp_proxy/udp_proxy_filter.h" #include "test/mocks/api/mocks.h" #include "test/mocks/network/socket.h" diff --git a/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc b/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc index 09bfe76927176..e5d0768530c79 100644 --- a/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc +++ b/test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc @@ -1,9 +1,9 @@ #include "envoy/config/core/v3/grpc_service.pb.h" #include "envoy/config/grpc_credential/v3/aws_iam.pb.h" -#include "common/common/fmt.h" -#include "common/common/utility.h" -#include "common/grpc/google_async_client_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/common/utility.h" +#include "source/common/grpc/google_async_client_impl.h" #include "test/common/grpc/grpc_client_integration_test_harness.h" #include "test/integration/fake_upstream.h" diff --git a/test/extensions/grpc_credentials/file_based_metadata/integration_test.cc b/test/extensions/grpc_credentials/file_based_metadata/integration_test.cc index 6016c8c6df31f..f47cb58056a5d 100644 --- a/test/extensions/grpc_credentials/file_based_metadata/integration_test.cc +++ b/test/extensions/grpc_credentials/file_based_metadata/integration_test.cc @@ -3,10 +3,9 @@ #include "envoy/config/core/v3/grpc_service.pb.h" #include "envoy/config/grpc_credential/v3/file_based_metadata.pb.h" -#include "common/common/fmt.h" -#include "common/grpc/google_async_client_impl.h" - -#include "extensions/grpc_credentials/file_based_metadata/config.h" +#include "source/common/common/fmt.h" +#include "source/common/grpc/google_async_client_impl.h" +#include "source/extensions/grpc_credentials/file_based_metadata/config.h" #include "test/common/grpc/grpc_client_integration_test_harness.h" #include "test/integration/fake_upstream.h" diff --git a/test/extensions/health_checkers/redis/config_test.cc b/test/extensions/health_checkers/redis/config_test.cc index e248faebf51af..fbd5db3ee52e0 100644 --- a/test/extensions/health_checkers/redis/config_test.cc +++ b/test/extensions/health_checkers/redis/config_test.cc @@ -1,9 +1,8 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h" -#include "common/upstream/health_checker_impl.h" - -#include "extensions/health_checkers/redis/config.h" +#include "source/common/upstream/health_checker_impl.h" +#include "source/extensions/health_checkers/redis/config.h" #include "test/common/upstream/utility.h" #include "test/mocks/access_log/mocks.h" diff --git a/test/extensions/health_checkers/redis/redis_test.cc b/test/extensions/health_checkers/redis/redis_test.cc index f1beb870b5818..a5c012bbf8bbf 100644 --- a/test/extensions/health_checkers/redis/redis_test.cc +++ b/test/extensions/health_checkers/redis/redis_test.cc @@ -4,8 +4,8 @@ #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.h" #include "envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.h" -#include "extensions/health_checkers/redis/redis.h" -#include "extensions/health_checkers/redis/utility.h" +#include "source/extensions/health_checkers/redis/redis.h" +#include "source/extensions/health_checkers/redis/utility.h" #include "test/common/upstream/utility.h" #include "test/extensions/filters/network/common/redis/mocks.h" diff --git a/test/extensions/http/header_formatters/preserve_case/BUILD b/test/extensions/http/header_formatters/preserve_case/BUILD index bc19822cacd0a..7116f4617f85e 100644 --- a/test/extensions/http/header_formatters/preserve_case/BUILD +++ b/test/extensions/http/header_formatters/preserve_case/BUILD @@ -28,6 +28,8 @@ envoy_extension_cc_test( "preserve_case_formatter_integration_test.cc", ], extension_name = "envoy.http.stateful_header_formatters.preserve_case", + # Broken until bazel 5.0.0 fix to shorten resulting paths for SymInitialize() failure + tags = ["skip_on_windows"], deps = [ "//source/extensions/http/header_formatters/preserve_case:preserve_case_formatter", "//test/integration:http_integration_lib", diff --git a/test/extensions/http/header_formatters/preserve_case/preserve_case_formatter_test.cc b/test/extensions/http/header_formatters/preserve_case/preserve_case_formatter_test.cc index ca7ba4c5a8943..053425ec8835c 100644 --- a/test/extensions/http/header_formatters/preserve_case/preserve_case_formatter_test.cc +++ b/test/extensions/http/header_formatters/preserve_case/preserve_case_formatter_test.cc @@ -1,4 +1,4 @@ -#include "extensions/http/header_formatters/preserve_case/preserve_case_formatter.h" +#include "source/extensions/http/header_formatters/preserve_case/preserve_case_formatter.h" #include "gtest/gtest.h" diff --git a/test/extensions/http/original_ip_detection/custom_header/BUILD b/test/extensions/http/original_ip_detection/custom_header/BUILD index 7a02e5ec778f1..955c20b4e62c7 100644 --- a/test/extensions/http/original_ip_detection/custom_header/BUILD +++ b/test/extensions/http/original_ip_detection/custom_header/BUILD @@ -28,7 +28,7 @@ envoy_extension_cc_test( srcs = ["config_test.cc"], extension_name = "envoy.http.original_ip_detection.custom_header", deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/http/original_ip_detection/custom_header:config", "//source/extensions/http/original_ip_detection/custom_header:custom_header_lib", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/http/original_ip_detection/custom_header/config_test.cc b/test/extensions/http/original_ip_detection/custom_header/config_test.cc index 54e42644c053b..83346697de765 100644 --- a/test/extensions/http/original_ip_detection/custom_header/config_test.cc +++ b/test/extensions/http/original_ip_detection/custom_header/config_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.h" #include "envoy/registry/registry.h" -#include "extensions/http/original_ip_detection/custom_header/config.h" +#include "source/extensions/http/original_ip_detection/custom_header/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/http/original_ip_detection/custom_header/custom_header_test.cc b/test/extensions/http/original_ip_detection/custom_header/custom_header_test.cc index e1a14c133d73d..1ef2722a602a1 100644 --- a/test/extensions/http/original_ip_detection/custom_header/custom_header_test.cc +++ b/test/extensions/http/original_ip_detection/custom_header/custom_header_test.cc @@ -1,8 +1,7 @@ #include "envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.h" -#include "common/network/utility.h" - -#include "extensions/http/original_ip_detection/custom_header/custom_header.h" +#include "source/common/network/utility.h" +#include "source/extensions/http/original_ip_detection/custom_header/custom_header.h" #include "test/test_common/utility.h" diff --git a/test/extensions/http/original_ip_detection/xff/BUILD b/test/extensions/http/original_ip_detection/xff/BUILD index 14d79ac5cb50d..90bcb1b5eef25 100644 --- a/test/extensions/http/original_ip_detection/xff/BUILD +++ b/test/extensions/http/original_ip_detection/xff/BUILD @@ -28,7 +28,7 @@ envoy_extension_cc_test( srcs = ["config_test.cc"], extension_name = "envoy.http.original_ip_detection.xff", deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/http/original_ip_detection/xff:config", "//source/extensions/http/original_ip_detection/xff:xff_lib", "//test/mocks/server:factory_context_mocks", diff --git a/test/extensions/http/original_ip_detection/xff/config_test.cc b/test/extensions/http/original_ip_detection/xff/config_test.cc index 0f7f1ace9632d..5a8ebaa3783ba 100644 --- a/test/extensions/http/original_ip_detection/xff/config_test.cc +++ b/test/extensions/http/original_ip_detection/xff/config_test.cc @@ -1,7 +1,7 @@ #include "envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.h" #include "envoy/registry/registry.h" -#include "extensions/http/original_ip_detection/xff/config.h" +#include "source/extensions/http/original_ip_detection/xff/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" diff --git a/test/extensions/http/original_ip_detection/xff/xff_test.cc b/test/extensions/http/original_ip_detection/xff/xff_test.cc index f03ac1a307ca7..9920d4a6d5ce9 100644 --- a/test/extensions/http/original_ip_detection/xff/xff_test.cc +++ b/test/extensions/http/original_ip_detection/xff/xff_test.cc @@ -1,6 +1,6 @@ #include "envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.h" -#include "extensions/http/original_ip_detection/xff/xff.h" +#include "source/extensions/http/original_ip_detection/xff/xff.h" #include "test/test_common/utility.h" diff --git a/test/extensions/internal_redirect/previous_routes/config_test.cc b/test/extensions/internal_redirect/previous_routes/config_test.cc index 076b1069e4e4d..244792e950812 100644 --- a/test/extensions/internal_redirect/previous_routes/config_test.cc +++ b/test/extensions/internal_redirect/previous_routes/config_test.cc @@ -2,9 +2,8 @@ #include "envoy/registry/registry.h" #include "envoy/router/internal_redirect.h" -#include "common/stream_info/filter_state_impl.h" - -#include "extensions/internal_redirect/previous_routes/config.h" +#include "source/common/stream_info/filter_state_impl.h" +#include "source/extensions/internal_redirect/previous_routes/config.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/io_socket/user_space/BUILD b/test/extensions/io_socket/user_space/BUILD index dc9dc2bdc90dd..e06b8c87b40b4 100644 --- a/test/extensions/io_socket/user_space/BUILD +++ b/test/extensions/io_socket/user_space/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( srcs = ["file_event_impl_test.cc"], extension_name = "envoy.io_socket.user_space", deps = [ - "//include/envoy/event:file_event_interface", + "//envoy/event:file_event_interface", "//source/common/event:dispatcher_includes", "//source/common/event:dispatcher_lib", "//source/extensions/io_socket/user_space:file_event_lib", diff --git a/test/extensions/io_socket/user_space/file_event_impl_test.cc b/test/extensions/io_socket/user_space/file_event_impl_test.cc index 5d136b2bb0264..56bf7d51ab689 100644 --- a/test/extensions/io_socket/user_space/file_event_impl_test.cc +++ b/test/extensions/io_socket/user_space/file_event_impl_test.cc @@ -2,10 +2,9 @@ #include "envoy/event/file_event.h" -#include "common/event/dispatcher_impl.h" - -#include "extensions/io_socket/user_space/file_event_impl.h" -#include "extensions/io_socket/user_space/io_handle.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/extensions/io_socket/user_space/file_event_impl.h" +#include "source/extensions/io_socket/user_space/io_handle.h" #include "test/mocks/common.h" #include "test/test_common/environment.h" diff --git a/test/extensions/io_socket/user_space/io_handle_impl_test.cc b/test/extensions/io_socket/user_space/io_handle_impl_test.cc index 790c7a0734ed4..83f8cd0ee3e72 100644 --- a/test/extensions/io_socket/user_space/io_handle_impl_test.cc +++ b/test/extensions/io_socket/user_space/io_handle_impl_test.cc @@ -1,11 +1,10 @@ #include "envoy/buffer/buffer.h" #include "envoy/event/file_event.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/fancy_logger.h" -#include "common/network/address_impl.h" - -#include "extensions/io_socket/user_space/io_handle_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/fancy_logger.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/io_socket/user_space/io_handle_impl.h" #include "test/mocks/event/mocks.h" @@ -738,7 +737,7 @@ TEST_F(IoHandleImplTest, Close) { should_close = true; break; } else { - accumulator += absl::string_view(buf_.data(), result.rc_); + accumulator += std::string(buf_.data(), result.rc_); } } else if (result.err_->getErrorCode() == Api::IoError::IoErrorCode::Again) { ENVOY_LOG_MISC(debug, "read returns EAGAIN"); @@ -793,7 +792,7 @@ TEST_F(IoHandleImplTest, ShutDownRaiseEvent) { if (events & Event::FileReadyType::Read) { auto result = io_handle_->recv(buf_.data(), buf_.size(), 0); if (result.ok()) { - accumulator += absl::string_view(buf_.data(), result.rc_); + accumulator += std::string(buf_.data(), result.rc_); } else if (result.err_->getErrorCode() == Api::IoError::IoErrorCode::Again) { ENVOY_LOG_MISC(debug, "read returns EAGAIN"); } else { @@ -833,7 +832,7 @@ TEST_F(IoHandleImplTest, WriteScheduleWritableEvent) { auto slice = reservation.slice(); auto result = handle->readv(1024, &slice, 1); if (result.ok()) { - accumulator += absl::string_view(static_cast(slice.mem_), result.rc_); + accumulator += std::string(static_cast(slice.mem_), result.rc_); } else if (result.err_->getErrorCode() == Api::IoError::IoErrorCode::Again) { ENVOY_LOG_MISC(debug, "read returns EAGAIN"); } else { @@ -873,7 +872,7 @@ TEST_F(IoHandleImplTest, WritevScheduleWritableEvent) { auto slice = reservation.slice(); auto result = handle->readv(1024, &slice, 1); if (result.ok()) { - accumulator += absl::string_view(static_cast(slice.mem_), result.rc_); + accumulator += std::string(static_cast(slice.mem_), result.rc_); } else if (result.err_->getErrorCode() == Api::IoError::IoErrorCode::Again) { ENVOY_LOG_MISC(debug, "read returns EAGAIN"); } else { @@ -917,7 +916,7 @@ TEST_F(IoHandleImplTest, ReadAfterShutdownWrite) { if (result.rc_ == 0) { should_close = true; } else { - accumulator += absl::string_view(static_cast(slice.mem_), result.rc_); + accumulator += std::string(static_cast(slice.mem_), result.rc_); } } else if (result.err_->getErrorCode() == Api::IoError::IoErrorCode::Again) { ENVOY_LOG_MISC(debug, "read returns EAGAIN"); diff --git a/test/extensions/matching/common_inputs/environment_variable/config_test.cc b/test/extensions/matching/common_inputs/environment_variable/config_test.cc index f8a697979c9e2..75262a46e3325 100644 --- a/test/extensions/matching/common_inputs/environment_variable/config_test.cc +++ b/test/extensions/matching/common_inputs/environment_variable/config_test.cc @@ -1,6 +1,5 @@ -#include "common/config/utility.h" - -#include "extensions/matching/common_inputs/environment_variable/config.h" +#include "source/common/config/utility.h" +#include "source/extensions/matching/common_inputs/environment_variable/config.h" #include "test/mocks/server/factory_context.h" #include "test/test_common/environment.h" diff --git a/test/extensions/matching/common_inputs/environment_variable/input_test.cc b/test/extensions/matching/common_inputs/environment_variable/input_test.cc index 7c0bcc9768c1d..dbc874448e043 100644 --- a/test/extensions/matching/common_inputs/environment_variable/input_test.cc +++ b/test/extensions/matching/common_inputs/environment_variable/input_test.cc @@ -1,4 +1,4 @@ -#include "extensions/matching/common_inputs/environment_variable/input.h" +#include "source/extensions/matching/common_inputs/environment_variable/input.h" #include "gtest/gtest.h" diff --git a/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc b/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc index 21722bed990f7..06eaab24b53c2 100644 --- a/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc +++ b/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc @@ -1,4 +1,4 @@ -#include "extensions/matching/input_matchers/consistent_hashing/config.h" +#include "source/extensions/matching/input_matchers/consistent_hashing/config.h" #include "test/mocks/server/factory_context.h" diff --git a/test/extensions/matching/input_matchers/consistent_hashing/matcher_test.cc b/test/extensions/matching/input_matchers/consistent_hashing/matcher_test.cc index c070a2c3c7299..98d4ea3a92735 100644 --- a/test/extensions/matching/input_matchers/consistent_hashing/matcher_test.cc +++ b/test/extensions/matching/input_matchers/consistent_hashing/matcher_test.cc @@ -1,4 +1,4 @@ -#include "extensions/matching/input_matchers/consistent_hashing/matcher.h" +#include "source/extensions/matching/input_matchers/consistent_hashing/matcher.h" #include "gtest/gtest.h" diff --git a/test/extensions/rate_limit_descriptors/expr/config_test.cc b/test/extensions/rate_limit_descriptors/expr/config_test.cc index d68981ede37d2..57094c6805e62 100644 --- a/test/extensions/rate_limit_descriptors/expr/config_test.cc +++ b/test/extensions/rate_limit_descriptors/expr/config_test.cc @@ -3,10 +3,9 @@ #include "envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.h" #include "envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.validate.h" -#include "common/protobuf/utility.h" -#include "common/router/router_ratelimit.h" - -#include "extensions/rate_limit_descriptors/expr/config.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/router_ratelimit.h" +#include "source/extensions/rate_limit_descriptors/expr/config.h" #include "test/mocks/http/mocks.h" #include "test/mocks/ratelimit/mocks.h" diff --git a/test/extensions/request_id/uuid/config_test.cc b/test/extensions/request_id/uuid/config_test.cc index 346c88b4c1a97..1e31e1a40c259 100644 --- a/test/extensions/request_id/uuid/config_test.cc +++ b/test/extensions/request_id/uuid/config_test.cc @@ -1,8 +1,7 @@ #include -#include "common/common/random_generator.h" - -#include "extensions/request_id/uuid/config.h" +#include "source/common/common/random_generator.h" +#include "source/extensions/request_id/uuid/config.h" #include "test/mocks/common.h" #include "test/test_common/utility.h" diff --git a/test/extensions/resource_monitors/fixed_heap/BUILD b/test/extensions/resource_monitors/fixed_heap/BUILD index e4a1cd62d61cd..430aa5a151cd0 100644 --- a/test/extensions/resource_monitors/fixed_heap/BUILD +++ b/test/extensions/resource_monitors/fixed_heap/BUILD @@ -27,7 +27,7 @@ envoy_extension_cc_test( srcs = ["config_test.cc"], extension_name = "envoy.resource_monitors.fixed_heap", deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/stats:isolated_store_lib", "//source/extensions/resource_monitors/fixed_heap:config", "//source/server:resource_monitor_config_lib", diff --git a/test/extensions/resource_monitors/fixed_heap/config_test.cc b/test/extensions/resource_monitors/fixed_heap/config_test.cc index 39fc8333b003d..c26aa094cf441 100644 --- a/test/extensions/resource_monitors/fixed_heap/config_test.cc +++ b/test/extensions/resource_monitors/fixed_heap/config_test.cc @@ -2,9 +2,8 @@ #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.validate.h" #include "envoy/registry/registry.h" -#include "server/resource_monitor_config_impl.h" - -#include "extensions/resource_monitors/fixed_heap/config.h" +#include "source/extensions/resource_monitors/fixed_heap/config.h" +#include "source/server/resource_monitor_config_impl.h" #include "test/mocks/event/mocks.h" #include "test/mocks/server/options.h" diff --git a/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc b/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc index 1d5eb84c22c86..24b451ee6fe72 100644 --- a/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc +++ b/test/extensions/resource_monitors/fixed_heap/fixed_heap_monitor_test.cc @@ -1,6 +1,6 @@ #include "envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.h" -#include "extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h" +#include "source/extensions/resource_monitors/fixed_heap/fixed_heap_monitor.h" #include "absl/types/optional.h" #include "gmock/gmock.h" diff --git a/test/extensions/resource_monitors/injected_resource/BUILD b/test/extensions/resource_monitors/injected_resource/BUILD index 998b7af987b5c..c76b0e2d06beb 100644 --- a/test/extensions/resource_monitors/injected_resource/BUILD +++ b/test/extensions/resource_monitors/injected_resource/BUILD @@ -12,6 +12,21 @@ licenses(["notice"]) # Apache 2 envoy_package() +envoy_cc_test( + name = "injected_resource_monitor_integration_test", + srcs = ["injected_resource_monitor_integration_test.cc"], + # Broken until bazel 5.0.0 fix to shorten resulting paths for SymInitialize() failure + tags = ["skip_on_windows"], + deps = [ + "//source/extensions/resource_monitors/injected_resource:config", + "//test/common/config:dummy_config_proto_cc_proto", + "//test/integration:http_protocol_integration_lib", + "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", + "@envoy_api//envoy/config/overload/v3:pkg_cc_proto", + "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", + ], +) + envoy_cc_test( name = "injected_resource_monitor_test", srcs = ["injected_resource_monitor_test.cc"], @@ -32,7 +47,7 @@ envoy_extension_cc_test( srcs = ["config_test.cc"], extension_name = "envoy.resource_monitors.injected_resource", deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/event:dispatcher_lib", "//source/common/stats:isolated_store_lib", "//source/extensions/resource_monitors/injected_resource:config", diff --git a/test/extensions/resource_monitors/injected_resource/config_test.cc b/test/extensions/resource_monitors/injected_resource/config_test.cc index f2fbeb7ecb9f8..c0ffe5118cab1 100644 --- a/test/extensions/resource_monitors/injected_resource/config_test.cc +++ b/test/extensions/resource_monitors/injected_resource/config_test.cc @@ -2,11 +2,9 @@ #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/event/dispatcher_impl.h" - -#include "server/resource_monitor_config_impl.h" - -#include "extensions/resource_monitors/injected_resource/config.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/extensions/resource_monitors/injected_resource/config.h" +#include "source/server/resource_monitor_config_impl.h" #include "test/mocks/server/options.h" #include "test/test_common/environment.h" diff --git a/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_integration_test.cc b/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_integration_test.cc index c50a8617c10cc..dc1292401c5e0 100644 --- a/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_integration_test.cc +++ b/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_integration_test.cc @@ -6,21 +6,32 @@ #include "envoy/config/overload/v3/overload.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" + +#include "test/config/integration/certs/clientcert_hash.h" #include "test/config/utility.h" #include "test/integration/http_integration.h" #include "test/test_common/utility.h" +#if defined(ENVOY_CONFIG_COVERAGE) +#define DISABLE_UNDER_COVERAGE return +#else +#define DISABLE_UNDER_COVERAGE \ + do { \ + } while (0) +#endif + namespace Envoy { void updateResource(AtomicFileUpdater& updater, double pressure) { updater.update(absl::StrCat(pressure)); } -// A test that sets up its own client connection with customized quic version and connection ID. -class OverloadIntegrationTest : public HttpIntegrationTest { +class OverloadIntegrationTest : public testing::TestWithParam, + public HttpIntegrationTest { public: OverloadIntegrationTest() - : HttpIntegrationTest(Http::CodecClient::Type::HTTP2, GetParam().first), + : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam()), injected_resource_filename_1_(TestEnvironment::temporaryPath("injected_resource_1")), injected_resource_filename_2_(TestEnvironment::temporaryPath("injected_resource_2")), file_updater_1_(injected_resource_filename_1_), @@ -28,8 +39,6 @@ class OverloadIntegrationTest : public HttpIntegrationTest { ~OverloadIntegrationTest() override { cleanupUpstreamAndDownstream(); - // Release the client before destroying |conn_helper_|. No such need once |conn_helper_| is - // moved into a client connection factory in the base test class. codec_client_.reset(); } @@ -38,11 +47,6 @@ class OverloadIntegrationTest : public HttpIntegrationTest { absl::optional http2_options) override { IntegrationCodecClientPtr codec = HttpIntegrationTest::makeRawHttpConnection(std::move(conn), http2_options); - if (!codec->disconnected()) { - codec->setCodecClientCallbacks(client_codec_callback_); - EXPECT_EQ(transport_socket_factory_->clientContextConfig().serverNameIndication(), - codec->connection()->requestedServerName()); - } return codec; } @@ -83,23 +87,14 @@ class OverloadIntegrationTest : public HttpIntegrationTest { *bootstrap.mutable_overload_manager() = TestUtility::parseYaml(overload_config); }); - config_helper_.addConfigModifier( - [](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager& - hcm) { - hcm.mutable_drain_timeout()->clear_seconds(); - hcm.mutable_drain_timeout()->set_nanos(500 * 1000 * 1000); - EXPECT_EQ(hcm.codec_type(), envoy::extensions::filters::network::http_connection_manager:: - v3::HttpConnectionManager::HTTP3); - }); updateResource(file_updater_1_, 0); updateResource(file_updater_2_, 0); HttpIntegrationTest::initialize(); - // registerTestServerPorts({"http"}); + registerTestServerPorts({"http"}); } protected: - CodecClientCallbacksForTest client_codec_callback_; Network::Address::InstanceConstSharedPtr server_addr_; const std::string injected_resource_filename_1_; const std::string injected_resource_filename_2_; @@ -107,46 +102,38 @@ class OverloadIntegrationTest : public HttpIntegrationTest { AtomicFileUpdater file_updater_2_; }; -INSTANTIATE_TEST_SUITE_P(OverloadIntegrationTests, OverloadIntegrationTest, - testing::ValuesIn(generateTestParam()), testParamsToString); +INSTANTIATE_TEST_SUITE_P(IpVersions, OverloadIntegrationTest, + testing::ValuesIn(TestEnvironment::getIpVersionsForTest()), + TestUtility::ipTestParamsToString); TEST_P(OverloadIntegrationTest, StopAcceptingConnectionsWhenOverloaded) { initialize(); - // Put envoy in overloaded state and check that it doesn't accept the new client connection. - updateResource(file_updater_1_, 0.9); + updateResource(file_updater_1_, 0.95); test_server_->waitForGaugeEq("overload.envoy.overload_actions.stop_accepting_connections.active", 1); - codec_client_ = makeRawHttpConnection(makeClientConnection((lookupPort("http"))), absl::nullopt); - EXPECT_TRUE(codec_client_->disconnected()); + IntegrationStreamDecoderPtr response; + // For HTTP/2 and below, excess connection won't be accepted, but will hang out + // in a pending state and resume below. + codec_client_ = makeHttpConnection(makeClientConnection((lookupPort("http")))); + response = codec_client_->makeRequestWithBody(default_request_headers_, 10); + EXPECT_FALSE(fake_upstreams_[0]->waitForHttpConnection(*dispatcher_, fake_upstream_connection_, + std::chrono::milliseconds(1000))); - // Reduce load a little to allow the connection to be accepted connection. + // Reduce load a little to allow the connection to be accepted. updateResource(file_updater_1_, 0.8); test_server_->waitForGaugeEq("overload.envoy.overload_actions.stop_accepting_connections.active", 0); - codec_client_ = makeHttpConnection(makeClientConnection((lookupPort("http")))); - auto response = codec_client_->makeHeaderOnlyRequest(default_request_headers_); - waitForNextUpstreamRequest(0); - // Send response headers, but hold response body for now. - upstream_request_->encodeHeaders(default_response_headers_, /*end_stream=*/false); - - updateResource(file_updater_1_, 0.95); - test_server_->waitForGaugeEq("overload.envoy.overload_actions.stop_accepting_requests.active", 1); - // Existing request should be able to finish. - upstream_request_->encodeData(10, true); + EXPECT_TRUE(fake_upstreams_[0]->waitForHttpConnection(*dispatcher_, fake_upstream_connection_)); + EXPECT_TRUE(fake_upstream_connection_->waitForNewStream(*dispatcher_, upstream_request_)); + ASSERT_TRUE(upstream_request_->waitForHeadersComplete()); + ASSERT_TRUE(upstream_request_->waitForData(*dispatcher_, 10)); + upstream_request_->encodeHeaders(Http::TestResponseHeaderMapImpl{{":status", "202"}}, true); ASSERT_TRUE(response->waitForEndStream()); - EXPECT_TRUE(response->complete()); - EXPECT_EQ("200", response->headers().getStatusValue()); - // New request should be rejected. - auto response2 = codec_client_->makeHeaderOnlyRequest(default_request_headers_); - ASSERT_TRUE(response2->waitForEndStream()); - EXPECT_EQ("503", response2->headers().getStatusValue()); - EXPECT_EQ("envoy overloaded", response2->body()); + EXPECT_TRUE(response->complete()); + EXPECT_EQ("202", response->headers().getStatusValue()); codec_client_->close(); - - EXPECT_TRUE(makeRawHttpConnection(makeClientConnection((lookupPort("http"))), absl::nullopt) - ->disconnected()); } TEST_P(OverloadIntegrationTest, NoNewStreamsWhenOverloaded) { @@ -175,7 +162,6 @@ TEST_P(OverloadIntegrationTest, NoNewStreamsWhenOverloaded) { response2->waitForHeaders(); EXPECT_TRUE(codec_client_->waitForDisconnect()); - EXPECT_TRUE(codec_client_->sawGoAway()); codec_client_->close(); } diff --git a/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc b/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc index 1391893d97932..400f97a4d11b2 100644 --- a/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc +++ b/test/extensions/resource_monitors/injected_resource/injected_resource_monitor_test.cc @@ -1,11 +1,9 @@ #include "envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.h" -#include "common/event/dispatcher_impl.h" -#include "common/stats/isolated_store_impl.h" - -#include "server/resource_monitor_config_impl.h" - -#include "extensions/resource_monitors/injected_resource/injected_resource_monitor.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/resource_monitors/injected_resource/injected_resource_monitor.h" +#include "source/server/resource_monitor_config_impl.h" #include "test/mocks/server/options.h" #include "test/test_common/environment.h" diff --git a/test/extensions/retry/host/omit_canary_hosts/config_test.cc b/test/extensions/retry/host/omit_canary_hosts/config_test.cc index ad08812c97950..aae083d6ac8f7 100644 --- a/test/extensions/retry/host/omit_canary_hosts/config_test.cc +++ b/test/extensions/retry/host/omit_canary_hosts/config_test.cc @@ -1,7 +1,7 @@ #include "envoy/registry/registry.h" #include "envoy/upstream/retry.h" -#include "extensions/retry/host/omit_canary_hosts/config.h" +#include "source/extensions/retry/host/omit_canary_hosts/config.h" #include "test/mocks/upstream/host.h" diff --git a/test/extensions/retry/host/omit_host_metadata/config_test.cc b/test/extensions/retry/host/omit_host_metadata/config_test.cc index 399ab587b57aa..9ea84a3a35bfb 100644 --- a/test/extensions/retry/host/omit_host_metadata/config_test.cc +++ b/test/extensions/retry/host/omit_host_metadata/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/registry/registry.h" #include "envoy/upstream/retry.h" -#include "extensions/retry/host/omit_host_metadata/omit_host_metadata.h" +#include "source/extensions/retry/host/omit_host_metadata/omit_host_metadata.h" #include "test/mocks/upstream/host.h" #include "test/test_common/utility.h" diff --git a/test/extensions/retry/host/previous_hosts/config_test.cc b/test/extensions/retry/host/previous_hosts/config_test.cc index a706e2665489d..5e24b59fc2895 100644 --- a/test/extensions/retry/host/previous_hosts/config_test.cc +++ b/test/extensions/retry/host/previous_hosts/config_test.cc @@ -1,9 +1,8 @@ #include "envoy/registry/registry.h" #include "envoy/upstream/retry.h" -#include "common/network/address_impl.h" - -#include "extensions/retry/host/previous_hosts/config.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/retry/host/previous_hosts/config.h" #include "test/mocks/upstream/host.h" diff --git a/test/extensions/retry/host/previous_hosts/integration_test.cc b/test/extensions/retry/host/previous_hosts/integration_test.cc index 12925d0906d7b..a433ad4e224b6 100644 --- a/test/extensions/retry/host/previous_hosts/integration_test.cc +++ b/test/extensions/retry/host/previous_hosts/integration_test.cc @@ -1,5 +1,5 @@ -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/retry/priority/previous_priorities/config_test.cc b/test/extensions/retry/priority/previous_priorities/config_test.cc index 2b7e88d8cacd3..c4ce6d6386d18 100644 --- a/test/extensions/retry/priority/previous_priorities/config_test.cc +++ b/test/extensions/retry/priority/previous_priorities/config_test.cc @@ -2,9 +2,8 @@ #include "envoy/registry/registry.h" #include "envoy/upstream/retry.h" -#include "common/protobuf/message_validator_impl.h" - -#include "extensions/retry/priority/previous_priorities/config.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/extensions/retry/priority/previous_priorities/config.h" #include "test/mocks/upstream/host.h" #include "test/mocks/upstream/host_set.h" diff --git a/test/extensions/stats_sinks/common/statsd/statsd_test.cc b/test/extensions/stats_sinks/common/statsd/statsd_test.cc index df6d10b649bbe..bdcb16fb02389 100644 --- a/test/extensions/stats_sinks/common/statsd/statsd_test.cc +++ b/test/extensions/stats_sinks/common/statsd/statsd_test.cc @@ -2,10 +2,9 @@ #include #include -#include "common/network/utility.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/stat_sinks/common/statsd/statsd.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/upstream_impl.h" +#include "source/extensions/stat_sinks/common/statsd/statsd.h" #include "test/common/upstream/utility.h" #include "test/mocks/buffer/mocks.h" diff --git a/test/extensions/stats_sinks/common/statsd/udp_statsd_test.cc b/test/extensions/stats_sinks/common/statsd/udp_statsd_test.cc index 8d80c48b1d4dc..2b38075aa0622 100644 --- a/test/extensions/stats_sinks/common/statsd/udp_statsd_test.cc +++ b/test/extensions/stats_sinks/common/statsd/udp_statsd_test.cc @@ -3,12 +3,11 @@ #include #include -#include "common/api/os_sys_calls_impl.h" -#include "common/network/address_impl.h" -#include "common/network/socket_impl.h" -#include "common/network/utility.h" - -#include "extensions/stat_sinks/common/statsd/statsd.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/stat_sinks/common/statsd/statsd.h" #include "test/mocks/stats/mocks.h" #include "test/mocks/thread_local/mocks.h" diff --git a/test/extensions/stats_sinks/dog_statsd/BUILD b/test/extensions/stats_sinks/dog_statsd/BUILD index a9a0057336fac..ee4ba39c66a10 100644 --- a/test/extensions/stats_sinks/dog_statsd/BUILD +++ b/test/extensions/stats_sinks/dog_statsd/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( srcs = ["config_test.cc"], extension_name = "envoy.stat_sinks.dog_statsd", deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/protobuf:utility_lib", "//source/extensions/stat_sinks/dog_statsd:config", "//test/mocks/server:instance_mocks", diff --git a/test/extensions/stats_sinks/dog_statsd/config_test.cc b/test/extensions/stats_sinks/dog_statsd/config_test.cc index cdb68d6e938b9..6a7e285bf5f11 100644 --- a/test/extensions/stats_sinks/dog_statsd/config_test.cc +++ b/test/extensions/stats_sinks/dog_statsd/config_test.cc @@ -2,12 +2,11 @@ #include "envoy/config/metrics/v3/stats.pb.h" #include "envoy/registry/registry.h" -#include "common/config/well_known_names.h" -#include "common/protobuf/utility.h" - -#include "extensions/stat_sinks/common/statsd/statsd.h" -#include "extensions/stat_sinks/dog_statsd/config.h" -#include "extensions/stat_sinks/well_known_names.h" +#include "source/common/config/well_known_names.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/stat_sinks/common/statsd/statsd.h" +#include "source/extensions/stat_sinks/dog_statsd/config.h" +#include "source/extensions/stat_sinks/well_known_names.h" #include "test/mocks/server/instance.h" #include "test/test_common/environment.h" diff --git a/test/extensions/stats_sinks/hystrix/BUILD b/test/extensions/stats_sinks/hystrix/BUILD index 766094848f2a5..f00954626dbe4 100644 --- a/test/extensions/stats_sinks/hystrix/BUILD +++ b/test/extensions/stats_sinks/hystrix/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( srcs = ["config_test.cc"], extension_name = "envoy.stat_sinks.hystrix", deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/protobuf:utility_lib", "//source/extensions/stat_sinks/hystrix:config", "//test/mocks/server:instance_mocks", diff --git a/test/extensions/stats_sinks/hystrix/config_test.cc b/test/extensions/stats_sinks/hystrix/config_test.cc index 5a3c4c007e9f3..9a5b78b7024f9 100644 --- a/test/extensions/stats_sinks/hystrix/config_test.cc +++ b/test/extensions/stats_sinks/hystrix/config_test.cc @@ -1,11 +1,10 @@ #include "envoy/config/metrics/v3/stats.pb.h" #include "envoy/registry/registry.h" -#include "common/protobuf/utility.h" - -#include "extensions/stat_sinks/hystrix/config.h" -#include "extensions/stat_sinks/hystrix/hystrix.h" -#include "extensions/stat_sinks/well_known_names.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/stat_sinks/hystrix/config.h" +#include "source/extensions/stat_sinks/hystrix/hystrix.h" +#include "source/extensions/stat_sinks/well_known_names.h" #include "test/mocks/server/instance.h" #include "test/test_common/environment.h" diff --git a/test/extensions/stats_sinks/hystrix/hystrix_test.cc b/test/extensions/stats_sinks/hystrix/hystrix_test.cc index c6b72f1a5078c..59d205a387731 100644 --- a/test/extensions/stats_sinks/hystrix/hystrix_test.cc +++ b/test/extensions/stats_sinks/hystrix/hystrix_test.cc @@ -2,9 +2,8 @@ #include #include -#include "common/json/json_loader.h" - -#include "extensions/stat_sinks/hystrix/hystrix.h" +#include "source/common/json/json_loader.h" +#include "source/extensions/stat_sinks/hystrix/hystrix.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/admin.h" diff --git a/test/extensions/stats_sinks/metrics_service/BUILD b/test/extensions/stats_sinks/metrics_service/BUILD index 20c0b58c158ac..3e666619dbb38 100644 --- a/test/extensions/stats_sinks/metrics_service/BUILD +++ b/test/extensions/stats_sinks/metrics_service/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( srcs = ["config_test.cc"], extension_name = "envoy.stat_sinks.metrics_service", deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/extensions/stat_sinks/metrics_service:config", "//test/test_common:utility_lib", ], diff --git a/test/extensions/stats_sinks/metrics_service/config_test.cc b/test/extensions/stats_sinks/metrics_service/config_test.cc index 0813088261b39..a9d557639e077 100644 --- a/test/extensions/stats_sinks/metrics_service/config_test.cc +++ b/test/extensions/stats_sinks/metrics_service/config_test.cc @@ -1,6 +1,6 @@ #include "envoy/registry/registry.h" -#include "extensions/stat_sinks/metrics_service/config.h" +#include "source/extensions/stat_sinks/metrics_service/config.h" #include "test/test_common/utility.h" diff --git a/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc b/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc index 3b77c71ceaed2..769983b8e1437 100644 --- a/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc +++ b/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc @@ -1,6 +1,6 @@ #include "envoy/service/metrics/v3/metrics_service.pb.h" -#include "extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h" +#include "source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h" #include "test/mocks/common.h" #include "test/mocks/grpc/mocks.h" @@ -101,9 +101,35 @@ class MockGrpcMetricsStreamer class MetricsServiceSinkTest : public testing::Test { public: - MetricsServiceSinkTest() = default; + void addCounterToSnapshot(const std::string& name, uint64_t delta, uint64_t value, + bool used = true) { + counter_storage_.emplace_back(std::make_unique>()); + counter_storage_.back()->name_ = name; + counter_storage_.back()->value_ = value; + counter_storage_.back()->used_ = used; + + snapshot_.counters_.push_back({delta, *counter_storage_.back()}); + } + void addGaugeToSnapshot(const std::string& name, uint64_t value, bool used = true) { + gauge_storage_.emplace_back(std::make_unique>()); + gauge_storage_.back()->name_ = name; + gauge_storage_.back()->value_ = value; + gauge_storage_.back()->used_ = used; + + snapshot_.gauges_.push_back(*gauge_storage_.back()); + } + void addHistogramToSnapshot(const std::string& name, bool used = true) { + histogram_storage_.emplace_back(std::make_unique>()); + histogram_storage_.back()->name_ = name; + histogram_storage_.back()->used_ = used; + + snapshot_.histograms_.push_back(*histogram_storage_.back()); + } NiceMock snapshot_; + std::vector>> counter_storage_; + std::vector>> gauge_storage_; + std::vector>> histogram_storage_; std::shared_ptr streamer_{new MockGrpcMetricsStreamer( Grpc::AsyncClientFactoryPtr{new NiceMock()})}; }; @@ -113,21 +139,9 @@ TEST_F(MetricsServiceSinkTest, CheckSendCall) { envoy::service::metrics::v3::StreamMetricsResponse> sink(streamer_, false, false); - auto counter = std::make_shared>(); - counter->name_ = "test_counter"; - counter->latch_ = 1; - counter->used_ = true; - snapshot_.counters_.push_back({1, *counter}); - - auto gauge = std::make_shared>(); - gauge->name_ = "test_gauge"; - gauge->value_ = 1; - gauge->used_ = true; - snapshot_.gauges_.push_back(*gauge); - - auto histogram = std::make_shared>(); - histogram->name_ = "test_histogram"; - histogram->used_ = true; + addCounterToSnapshot("test_counter", 1, 1); + addGaugeToSnapshot("test_gauge", 1); + addHistogramToSnapshot("test_histogram"); EXPECT_CALL(*streamer_, send(_)); @@ -139,17 +153,8 @@ TEST_F(MetricsServiceSinkTest, CheckStatsCount) { envoy::service::metrics::v3::StreamMetricsResponse> sink(streamer_, false, false); - auto counter = std::make_shared>(); - counter->name_ = "test_counter"; - counter->value_ = 100; - counter->used_ = true; - snapshot_.counters_.push_back({1, *counter}); - - auto gauge = std::make_shared>(); - gauge->name_ = "test_gauge"; - gauge->value_ = 1; - gauge->used_ = true; - snapshot_.gauges_.push_back(*gauge); + addCounterToSnapshot("test_counter", 1, 100); + addGaugeToSnapshot("test_gauge", 1); EXPECT_CALL(*streamer_, send(_)).WillOnce(Invoke([](MetricsPtr&& metrics) { EXPECT_EQ(2, metrics->size()); @@ -157,7 +162,7 @@ TEST_F(MetricsServiceSinkTest, CheckStatsCount) { sink.flush(snapshot_); // Verify only newly added metrics come after endFlush call. - gauge->used_ = false; + gauge_storage_.back()->used_ = false; EXPECT_CALL(*streamer_, send(_)).WillOnce(Invoke([](MetricsPtr&& metrics) { EXPECT_EQ(1, metrics->size()); })); @@ -170,11 +175,7 @@ TEST_F(MetricsServiceSinkTest, ReportCountersValues) { envoy::service::metrics::v3::StreamMetricsResponse> sink(streamer_, false, false); - auto counter = std::make_shared>(); - counter->name_ = "test_counter"; - counter->value_ = 100; - counter->used_ = true; - snapshot_.counters_.push_back({1, *counter}); + addCounterToSnapshot("test_counter", 1, 100); EXPECT_CALL(*streamer_, send(_)).WillOnce(Invoke([](MetricsPtr&& metrics) { EXPECT_EQ(1, metrics->size()); @@ -189,11 +190,7 @@ TEST_F(MetricsServiceSinkTest, ReportCountersAsDeltas) { envoy::service::metrics::v3::StreamMetricsResponse> sink(streamer_, true, false); - auto counter = std::make_shared>(); - counter->name_ = "test_counter"; - counter->value_ = 100; - counter->used_ = true; - snapshot_.counters_.push_back({1, *counter}); + addCounterToSnapshot("test_counter", 1, 100); EXPECT_CALL(*streamer_, send(_)).WillOnce(Invoke([](MetricsPtr&& metrics) { EXPECT_EQ(1, metrics->size()); @@ -204,28 +201,17 @@ TEST_F(MetricsServiceSinkTest, ReportCountersAsDeltas) { // Test the behavior of tag emission based on the emit_tags_as_label flag. TEST_F(MetricsServiceSinkTest, ReportMetricsWithTags) { - auto counter = std::make_shared>(); - counter->name_ = "full-counter-name"; - counter->value_ = 100; - counter->used_ = true; - counter->setTagExtractedName("tag-counter-name"); - counter->setTags({{"a", "b"}}); - snapshot_.counters_.push_back({1, *counter}); - - auto gauge = std::make_shared>(); - gauge->name_ = "full-gauge-name"; - gauge->value_ = 100; - gauge->used_ = true; - gauge->setTagExtractedName("tag-gauge-name"); - gauge->setTags({{"a", "b"}}); - snapshot_.gauges_.push_back({*gauge}); - - auto histogram = std::make_shared>(); - histogram->name_ = "full-histogram-name"; - histogram->used_ = true; - histogram->setTagExtractedName("tag-histogram-name"); - histogram->setTags({{"a", "b"}}); - snapshot_.histograms_.push_back({*histogram}); + addCounterToSnapshot("full-counter-name", 1, 100); + counter_storage_.back()->setTagExtractedName("tag-counter-name"); + counter_storage_.back()->setTags({{"a", "b"}}); + + addGaugeToSnapshot("full-gauge-name", 100); + gauge_storage_.back()->setTagExtractedName("tag-gauge-name"); + gauge_storage_.back()->setTags({{"a", "b"}}); + + addHistogramToSnapshot("full-histogram-name"); + histogram_storage_.back()->setTagExtractedName("tag-histogram-name"); + histogram_storage_.back()->setTags({{"a", "b"}}); { // When the emit_tags flag is false, we don't emit the tags and use the full name. @@ -282,6 +268,30 @@ TEST_F(MetricsServiceSinkTest, ReportMetricsWithTags) { sink.flush(snapshot_); } +TEST_F(MetricsServiceSinkTest, FlushPredicate) { + addCounterToSnapshot("used_counter", 100, 1); + addCounterToSnapshot("unused_counter", 100, 1, false); + + // Default predicate only accepts used metrics. + { + MetricsFlusher flusher(true, true); + auto metrics = flusher.flush(snapshot_); + EXPECT_EQ(1, metrics->size()); + } + + // Using a predicate that accepts all metrics, we'd flush both metrics. + { + MetricsFlusher flusher(true, true, [](const auto&) { return true; }); + auto metrics = flusher.flush(snapshot_); + EXPECT_EQ(2, metrics->size()); + } + + // Using a predicate that rejects all metrics, we'd flush no metrics. + MetricsFlusher flusher(true, true, [](const auto&) { return false; }); + auto metrics = flusher.flush(snapshot_); + EXPECT_EQ(0, metrics->size()); +} + } // namespace } // namespace MetricsService } // namespace StatSinks diff --git a/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc b/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc index a66de95bf8573..2f43d87e8cc77 100644 --- a/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc +++ b/test/extensions/stats_sinks/metrics_service/metrics_service_integration_test.cc @@ -2,10 +2,10 @@ #include "envoy/config/metrics/v3/metrics_service.pb.h" #include "envoy/service/metrics/v3/metrics_service.pb.h" -#include "common/grpc/codec.h" -#include "common/grpc/common.h" -#include "common/stats/histogram_impl.h" -#include "common/version/version.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/common.h" +#include "source/common/stats/histogram_impl.h" +#include "source/common/version/version.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/http_integration.h" diff --git a/test/extensions/stats_sinks/statsd/BUILD b/test/extensions/stats_sinks/statsd/BUILD index b1c56f0466d8b..763e189dd5237 100644 --- a/test/extensions/stats_sinks/statsd/BUILD +++ b/test/extensions/stats_sinks/statsd/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( srcs = ["config_test.cc"], extension_name = "envoy.stat_sinks.statsd", deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/protobuf:utility_lib", "//source/extensions/stat_sinks/statsd:config", "//test/mocks/server:instance_mocks", diff --git a/test/extensions/stats_sinks/statsd/config_test.cc b/test/extensions/stats_sinks/statsd/config_test.cc index 398ec890fc566..cbf1c02d6030c 100644 --- a/test/extensions/stats_sinks/statsd/config_test.cc +++ b/test/extensions/stats_sinks/statsd/config_test.cc @@ -3,12 +3,11 @@ #include "envoy/network/address.h" #include "envoy/registry/registry.h" -#include "common/config/well_known_names.h" -#include "common/protobuf/utility.h" - -#include "extensions/stat_sinks/common/statsd/statsd.h" -#include "extensions/stat_sinks/statsd/config.h" -#include "extensions/stat_sinks/well_known_names.h" +#include "source/common/config/well_known_names.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/stat_sinks/common/statsd/statsd.h" +#include "source/extensions/stat_sinks/statsd/config.h" +#include "source/extensions/stat_sinks/well_known_names.h" #include "test/mocks/server/instance.h" #include "test/test_common/environment.h" diff --git a/test/extensions/stats_sinks/wasm/config_test.cc b/test/extensions/stats_sinks/wasm/config_test.cc index 04d159cf541b6..0887d1b1ecb14 100644 --- a/test/extensions/stats_sinks/wasm/config_test.cc +++ b/test/extensions/stats_sinks/wasm/config_test.cc @@ -1,12 +1,11 @@ #include "envoy/extensions/stat_sinks/wasm/v3/wasm.pb.validate.h" #include "envoy/registry/registry.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/common/wasm/wasm.h" -#include "extensions/stat_sinks/wasm/config.h" -#include "extensions/stat_sinks/wasm/wasm_stat_sink_impl.h" -#include "extensions/stat_sinks/well_known_names.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/common/wasm/wasm.h" +#include "source/extensions/stat_sinks/wasm/config.h" +#include "source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h" +#include "source/extensions/stat_sinks/well_known_names.h" #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/server/mocks.h" diff --git a/test/extensions/stats_sinks/wasm/test_data/test_context_cpp.cc b/test/extensions/stats_sinks/wasm/test_data/test_context_cpp.cc index 1491d1512464b..7350cca93f3c6 100644 --- a/test/extensions/stats_sinks/wasm/test_data/test_context_cpp.cc +++ b/test/extensions/stats_sinks/wasm/test_data/test_context_cpp.cc @@ -7,7 +7,7 @@ #include "proxy_wasm_intrinsics.h" #include "source/extensions/common/wasm/ext/envoy_proxy_wasm_api.h" #else -#include "extensions/common/wasm/ext/envoy_null_plugin.h" +#include "source/extensions/common/wasm/ext/envoy_null_plugin.h" #endif START_WASM_PLUGIN(CommonWasmTestContextCpp) diff --git a/test/extensions/stats_sinks/wasm/wasm_stat_sink_test.cc b/test/extensions/stats_sinks/wasm/wasm_stat_sink_test.cc index a87170efe6924..4bda7d8e9d970 100644 --- a/test/extensions/stats_sinks/wasm/wasm_stat_sink_test.cc +++ b/test/extensions/stats_sinks/wasm/wasm_stat_sink_test.cc @@ -1,6 +1,6 @@ #include "envoy/server/lifecycle_notifier.h" -#include "extensions/common/wasm/wasm.h" +#include "source/extensions/common/wasm/wasm.h" #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/upstream/mocks.h" @@ -22,9 +22,9 @@ class TestContext : public ::Envoy::Extensions::Common::Wasm::Context { using ::Envoy::Extensions::Common::Wasm::Context::Context; ~TestContext() override = default; using ::Envoy::Extensions::Common::Wasm::Context::log; - proxy_wasm::WasmResult log(uint32_t level, absl::string_view message) override { - std::cerr << std::string(message) << "\n"; - log_(static_cast(level), message); + proxy_wasm::WasmResult log(uint32_t level, std::string_view message) override { + std::cerr << message << "\n"; + log_(static_cast(level), toAbslStringView(message)); Extensions::Common::Wasm::Context::log(static_cast(level), message); return proxy_wasm::WasmResult::Ok; } diff --git a/test/extensions/tracers/common/ot/opentracing_driver_impl_test.cc b/test/extensions/tracers/common/ot/opentracing_driver_impl_test.cc index 1c7a49fe42556..f0cda348224e7 100644 --- a/test/extensions/tracers/common/ot/opentracing_driver_impl_test.cc +++ b/test/extensions/tracers/common/ot/opentracing_driver_impl_test.cc @@ -1,6 +1,6 @@ #include -#include "extensions/tracers/common/ot/opentracing_driver_impl.h" +#include "source/extensions/tracers/common/ot/opentracing_driver_impl.h" #include "test/mocks/http/mocks.h" #include "test/mocks/stats/mocks.h" diff --git a/test/extensions/tracers/datadog/config_test.cc b/test/extensions/tracers/datadog/config_test.cc index b591004204317..38b39d11439e9 100644 --- a/test/extensions/tracers/datadog/config_test.cc +++ b/test/extensions/tracers/datadog/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/config/trace/v3/datadog.pb.validate.h" #include "envoy/config/trace/v3/http_tracer.pb.h" -#include "extensions/tracers/datadog/config.h" +#include "source/extensions/tracers/datadog/config.h" #include "test/mocks/server/tracer_factory.h" #include "test/mocks/server/tracer_factory_context.h" diff --git a/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc b/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc index 6ab6d15075aaa..9018a16bd4977 100644 --- a/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc +++ b/test/extensions/tracers/datadog/datadog_tracer_impl_test.cc @@ -5,14 +5,13 @@ #include "envoy/config/trace/v3/datadog.pb.h" -#include "common/common/base64.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/runtime/runtime_impl.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/tracers/datadog/datadog_tracer_impl.h" +#include "source/common/common/base64.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/tracers/datadog/datadog_tracer_impl.h" #include "test/mocks/http/mocks.h" #include "test/mocks/local_info/mocks.h" diff --git a/test/extensions/tracers/dynamic_ot/config_test.cc b/test/extensions/tracers/dynamic_ot/config_test.cc index 3ccabd8b3a3b7..52b3dd02aa211 100644 --- a/test/extensions/tracers/dynamic_ot/config_test.cc +++ b/test/extensions/tracers/dynamic_ot/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/config/trace/v3/dynamic_ot.pb.validate.h" #include "envoy/config/trace/v3/http_tracer.pb.h" -#include "extensions/tracers/dynamic_ot/config.h" +#include "source/extensions/tracers/dynamic_ot/config.h" #include "test/mocks/server/tracer_factory.h" #include "test/mocks/server/tracer_factory_context.h" diff --git a/test/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl_test.cc b/test/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl_test.cc index 775270a09b698..49c64a013ce34 100644 --- a/test/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl_test.cc +++ b/test/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl_test.cc @@ -1,8 +1,7 @@ #include -#include "common/http/header_map_impl.h" - -#include "extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h" +#include "source/common/http/header_map_impl.h" +#include "source/extensions/tracers/dynamic_ot/dynamic_opentracing_driver_impl.h" #include "test/mocks/http/mocks.h" #include "test/mocks/stats/mocks.h" diff --git a/test/extensions/tracers/lightstep/config_test.cc b/test/extensions/tracers/lightstep/config_test.cc index 94ff62d27dce2..2e290d88edde1 100644 --- a/test/extensions/tracers/lightstep/config_test.cc +++ b/test/extensions/tracers/lightstep/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/config/trace/v3/lightstep.pb.h" #include "envoy/config/trace/v3/lightstep.pb.validate.h" -#include "extensions/tracers/lightstep/config.h" +#include "source/extensions/tracers/lightstep/config.h" #include "test/mocks/server/tracer_factory.h" #include "test/mocks/server/tracer_factory_context.h" diff --git a/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc b/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc index 8f3a869325a4c..5fce7e07e4d58 100644 --- a/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc +++ b/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc @@ -5,16 +5,15 @@ #include "envoy/config/trace/v3/lightstep.pb.h" -#include "common/common/base64.h" -#include "common/grpc/common.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/runtime/runtime_impl.h" -#include "common/stats/symbol_table_impl.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/tracers/lightstep/lightstep_tracer_impl.h" +#include "source/common/common/base64.h" +#include "source/common/grpc/common.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/tracers/lightstep/lightstep_tracer_impl.h" #include "test/mocks/http/mocks.h" #include "test/mocks/local_info/mocks.h" diff --git a/test/extensions/tracers/opencensus/config_test.cc b/test/extensions/tracers/opencensus/config_test.cc index ecb6b5d99c1c4..e6fe23920dbb9 100644 --- a/test/extensions/tracers/opencensus/config_test.cc +++ b/test/extensions/tracers/opencensus/config_test.cc @@ -3,7 +3,7 @@ #include "envoy/config/trace/v3/opencensus.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/tracers/opencensus/config.h" +#include "source/extensions/tracers/opencensus/config.h" #include "test/mocks/server/tracer_factory.h" #include "test/mocks/server/tracer_factory_context.h" diff --git a/test/extensions/tracers/opencensus/tracer_test.cc b/test/extensions/tracers/opencensus/tracer_test.cc index 67cba33bfb85a..b642bfac2d6ff 100644 --- a/test/extensions/tracers/opencensus/tracer_test.cc +++ b/test/extensions/tracers/opencensus/tracer_test.cc @@ -7,9 +7,8 @@ #include "envoy/config/trace/v3/opencensus.pb.h" -#include "common/common/base64.h" - -#include "extensions/tracers/opencensus/opencensus_tracer_impl.h" +#include "source/common/common/base64.h" +#include "source/extensions/tracers/opencensus/opencensus_tracer_impl.h" #include "test/mocks/http/mocks.h" #include "test/mocks/local_info/mocks.h" diff --git a/test/extensions/tracers/skywalking/config_test.cc b/test/extensions/tracers/skywalking/config_test.cc index f865525e09a3b..a81b1d376900d 100644 --- a/test/extensions/tracers/skywalking/config_test.cc +++ b/test/extensions/tracers/skywalking/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/config/trace/v3/skywalking.pb.h" #include "envoy/config/trace/v3/skywalking.pb.validate.h" -#include "extensions/tracers/skywalking/config.h" +#include "source/extensions/tracers/skywalking/config.h" #include "test/mocks/server/tracer_factory.h" #include "test/mocks/server/tracer_factory_context.h" diff --git a/test/extensions/tracers/skywalking/skywalking_test_helper.h b/test/extensions/tracers/skywalking/skywalking_test_helper.h index 51b25531d2d0d..7af27e5a0c077 100644 --- a/test/extensions/tracers/skywalking/skywalking_test_helper.h +++ b/test/extensions/tracers/skywalking/skywalking_test_helper.h @@ -1,8 +1,7 @@ #pragma once -#include "common/common/base64.h" -#include "common/common/hex.h" - +#include "source/common/common/base64.h" +#include "source/common/common/hex.h" #include "source/tracing_context_impl.h" #include "test/test_common/utility.h" diff --git a/test/extensions/tracers/skywalking/skywalking_tracer_impl_test.cc b/test/extensions/tracers/skywalking/skywalking_tracer_impl_test.cc index 985c366ea1b92..83efd4ed11807 100644 --- a/test/extensions/tracers/skywalking/skywalking_tracer_impl_test.cc +++ b/test/extensions/tracers/skywalking/skywalking_tracer_impl_test.cc @@ -1,4 +1,4 @@ -#include "extensions/tracers/skywalking/skywalking_tracer_impl.h" +#include "source/extensions/tracers/skywalking/skywalking_tracer_impl.h" #include "test/extensions/tracers/skywalking/skywalking_test_helper.h" #include "test/mocks/common.h" diff --git a/test/extensions/tracers/skywalking/trace_segment_reporter_test.cc b/test/extensions/tracers/skywalking/trace_segment_reporter_test.cc index 8026d8d6d7af6..51f41313caa75 100644 --- a/test/extensions/tracers/skywalking/trace_segment_reporter_test.cc +++ b/test/extensions/tracers/skywalking/trace_segment_reporter_test.cc @@ -1,4 +1,4 @@ -#include "extensions/tracers/skywalking/trace_segment_reporter.h" +#include "source/extensions/tracers/skywalking/trace_segment_reporter.h" #include "test/extensions/tracers/skywalking/skywalking_test_helper.h" #include "test/mocks/common.h" diff --git a/test/extensions/tracers/skywalking/tracer_test.cc b/test/extensions/tracers/skywalking/tracer_test.cc index 26b68d4c73fa0..53f6a1d66eb31 100644 --- a/test/extensions/tracers/skywalking/tracer_test.cc +++ b/test/extensions/tracers/skywalking/tracer_test.cc @@ -1,6 +1,5 @@ -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/tracers/skywalking/tracer.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/tracers/skywalking/tracer.h" #include "test/extensions/tracers/skywalking/skywalking_test_helper.h" #include "test/mocks/common.h" diff --git a/test/extensions/tracers/xray/config_test.cc b/test/extensions/tracers/xray/config_test.cc index 26b613eaec3a9..ef146def35bb2 100644 --- a/test/extensions/tracers/xray/config_test.cc +++ b/test/extensions/tracers/xray/config_test.cc @@ -3,7 +3,7 @@ #include "envoy/config/trace/v3/xray.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/tracers/xray/config.h" +#include "source/extensions/tracers/xray/config.h" #include "test/mocks/server/instance.h" #include "test/mocks/server/tracer_factory.h" diff --git a/test/extensions/tracers/xray/fuzz_test.cc b/test/extensions/tracers/xray/fuzz_test.cc index cbec8697ea8bb..f338be4080c73 100644 --- a/test/extensions/tracers/xray/fuzz_test.cc +++ b/test/extensions/tracers/xray/fuzz_test.cc @@ -1,4 +1,4 @@ -#include "extensions/tracers/xray/util.h" +#include "source/extensions/tracers/xray/util.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/extensions/tracers/xray/localized_sampling_test.cc b/test/extensions/tracers/xray/localized_sampling_test.cc index d6056d7c6a3a0..c52fc80703fb5 100644 --- a/test/extensions/tracers/xray/localized_sampling_test.cc +++ b/test/extensions/tracers/xray/localized_sampling_test.cc @@ -1,4 +1,4 @@ -#include "extensions/tracers/xray/localized_sampling.h" +#include "source/extensions/tracers/xray/localized_sampling.h" #include "test/mocks/common.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/tracers/xray/tracer_test.cc b/test/extensions/tracers/xray/tracer_test.cc index 3ff68ddbdddca..51c8a5ef66cd1 100644 --- a/test/extensions/tracers/xray/tracer_test.cc +++ b/test/extensions/tracers/xray/tracer_test.cc @@ -3,12 +3,10 @@ #include "envoy/common/time.h" -#include "common/protobuf/utility.h" - +#include "source/common/protobuf/utility.h" #include "source/extensions/tracers/xray/daemon.pb.h" - -#include "extensions/tracers/xray/tracer.h" -#include "extensions/tracers/xray/xray_configuration.h" +#include "source/extensions/tracers/xray/tracer.h" +#include "source/extensions/tracers/xray/xray_configuration.h" #include "test/mocks/server/instance.h" #include "test/mocks/tracing/mocks.h" diff --git a/test/extensions/tracers/xray/util_test.cc b/test/extensions/tracers/xray/util_test.cc index 9a5622dd4653c..9e06ad8828d35 100644 --- a/test/extensions/tracers/xray/util_test.cc +++ b/test/extensions/tracers/xray/util_test.cc @@ -1,4 +1,4 @@ -#include "extensions/tracers/xray/util.h" +#include "source/extensions/tracers/xray/util.h" #include "gtest/gtest.h" diff --git a/test/extensions/tracers/xray/xray_tracer_impl_test.cc b/test/extensions/tracers/xray/xray_tracer_impl_test.cc index ecfcd97767fc4..ba64f355aa97b 100644 --- a/test/extensions/tracers/xray/xray_tracer_impl_test.cc +++ b/test/extensions/tracers/xray/xray_tracer_impl_test.cc @@ -1,8 +1,8 @@ #include -#include "extensions/tracers/xray/tracer.h" -#include "extensions/tracers/xray/xray_configuration.h" -#include "extensions/tracers/xray/xray_tracer_impl.h" +#include "source/extensions/tracers/xray/tracer.h" +#include "source/extensions/tracers/xray/xray_configuration.h" +#include "source/extensions/tracers/xray/xray_tracer_impl.h" #include "test/mocks/server/tracer_factory_context.h" #include "test/mocks/thread_local/mocks.h" diff --git a/test/extensions/tracers/zipkin/BUILD b/test/extensions/tracers/zipkin/BUILD index 9bd108b3801fd..81e5dcae4c080 100644 --- a/test/extensions/tracers/zipkin/BUILD +++ b/test/extensions/tracers/zipkin/BUILD @@ -23,8 +23,8 @@ envoy_extension_cc_test( extension_name = "envoy.tracers.zipkin", external_deps = ["abseil_optional"], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/runtime:runtime_interface", + "//envoy/common:time_interface", + "//envoy/runtime:runtime_interface", "//source/common/common:hex_lib", "//source/common/common:utility_lib", "//source/common/network:address_lib", diff --git a/test/extensions/tracers/zipkin/config_test.cc b/test/extensions/tracers/zipkin/config_test.cc index 945a0e172d446..c3f9a71e46e68 100644 --- a/test/extensions/tracers/zipkin/config_test.cc +++ b/test/extensions/tracers/zipkin/config_test.cc @@ -3,7 +3,7 @@ #include "envoy/config/trace/v3/zipkin.pb.validate.h" #include "envoy/registry/registry.h" -#include "extensions/tracers/zipkin/config.h" +#include "source/extensions/tracers/zipkin/config.h" #include "test/mocks/server/tracer_factory.h" #include "test/mocks/server/tracer_factory_context.h" diff --git a/test/extensions/tracers/zipkin/span_buffer_test.cc b/test/extensions/tracers/zipkin/span_buffer_test.cc index 9af90529a713a..9ccb9c7b3fc03 100644 --- a/test/extensions/tracers/zipkin/span_buffer_test.cc +++ b/test/extensions/tracers/zipkin/span_buffer_test.cc @@ -1,10 +1,9 @@ #include "envoy/config/trace/v3/zipkin.pb.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" - -#include "extensions/tracers/zipkin/span_buffer.h" -#include "extensions/tracers/zipkin/util.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/extensions/tracers/zipkin/span_buffer.h" +#include "source/extensions/tracers/zipkin/util.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/utility.h" diff --git a/test/extensions/tracers/zipkin/span_context_extractor_test.cc b/test/extensions/tracers/zipkin/span_context_extractor_test.cc index 17977d4451c9f..1b6f41bf6ea01 100644 --- a/test/extensions/tracers/zipkin/span_context_extractor_test.cc +++ b/test/extensions/tracers/zipkin/span_context_extractor_test.cc @@ -1,7 +1,6 @@ -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/tracers/zipkin/span_context.h" -#include "extensions/tracers/zipkin/span_context_extractor.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/tracers/zipkin/span_context.h" +#include "source/extensions/tracers/zipkin/span_context_extractor.h" #include "test/test_common/utility.h" diff --git a/test/extensions/tracers/zipkin/tracer_test.cc b/test/extensions/tracers/zipkin/tracer_test.cc index 0aa869154e4fe..5ec104e2679c2 100644 --- a/test/extensions/tracers/zipkin/tracer_test.cc +++ b/test/extensions/tracers/zipkin/tracer_test.cc @@ -1,11 +1,10 @@ -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" -#include "common/runtime/runtime_impl.h" - -#include "extensions/tracers/zipkin/tracer.h" -#include "extensions/tracers/zipkin/util.h" -#include "extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/extensions/tracers/zipkin/tracer.h" +#include "source/extensions/tracers/zipkin/util.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" #include "test/mocks/common.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/extensions/tracers/zipkin/zipkin_core_types_test.cc b/test/extensions/tracers/zipkin/zipkin_core_types_test.cc index cc4470820f24a..c31407a161e58 100644 --- a/test/extensions/tracers/zipkin/zipkin_core_types_test.cc +++ b/test/extensions/tracers/zipkin/zipkin_core_types_test.cc @@ -1,9 +1,8 @@ -#include "common/common/utility.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" - -#include "extensions/tracers/zipkin/zipkin_core_constants.h" -#include "extensions/tracers/zipkin/zipkin_core_types.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/extensions/tracers/zipkin/zipkin_core_types.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/utility.h" diff --git a/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc b/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc index 451637ce50c3c..059fb6063a0b7 100644 --- a/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc +++ b/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc @@ -5,14 +5,13 @@ #include "envoy/config/trace/v3/zipkin.pb.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/message_impl.h" -#include "common/runtime/runtime_impl.h" -#include "common/tracing/http_tracer_impl.h" - -#include "extensions/tracers/zipkin/zipkin_core_constants.h" -#include "extensions/tracers/zipkin/zipkin_tracer_impl.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/message_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/tracing/http_tracer_impl.h" +#include "source/extensions/tracers/zipkin/zipkin_core_constants.h" +#include "source/extensions/tracers/zipkin/zipkin_tracer_impl.h" #include "test/mocks/http/mocks.h" #include "test/mocks/local_info/mocks.h" diff --git a/test/extensions/transport_sockets/alts/BUILD b/test/extensions/transport_sockets/alts/BUILD index 3c3234d59ebb9..2abf137535c3c 100644 --- a/test/extensions/transport_sockets/alts/BUILD +++ b/test/extensions/transport_sockets/alts/BUILD @@ -40,7 +40,7 @@ envoy_extension_cc_test( srcs = ["tsi_handshaker_test.cc"], extension_name = "envoy.transport_sockets.alts", deps = [ - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "//source/extensions/transport_sockets/alts:tsi_handshaker", "//test/mocks/buffer:buffer_mocks", "//test/mocks/event:event_mocks", @@ -52,7 +52,7 @@ envoy_extension_cc_test( srcs = ["tsi_socket_test.cc"], extension_name = "envoy.transport_sockets.alts", deps = [ - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", "//source/extensions/transport_sockets/alts:tsi_socket", "//test/mocks/buffer:buffer_mocks", "//test/mocks/event:event_mocks", diff --git a/test/extensions/transport_sockets/alts/alts_integration_test.cc b/test/extensions/transport_sockets/alts/alts_integration_test.cc index 92624f9181271..7571ef6560ab1 100644 --- a/test/extensions/transport_sockets/alts/alts_integration_test.cc +++ b/test/extensions/transport_sockets/alts/alts_integration_test.cc @@ -1,10 +1,9 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/extensions/transport_sockets/alts/v3/alts.pb.h" -#include "common/common/thread.h" - -#include "extensions/transport_sockets/alts/config.h" -#include "extensions/transport_sockets/alts/tsi_socket.h" +#include "source/common/common/thread.h" +#include "source/extensions/transport_sockets/alts/config.h" +#include "source/extensions/transport_sockets/alts/tsi_socket.h" #ifdef major #undef major diff --git a/test/extensions/transport_sockets/alts/config_test.cc b/test/extensions/transport_sockets/alts/config_test.cc index a3c233ad78224..625994ba5404e 100644 --- a/test/extensions/transport_sockets/alts/config_test.cc +++ b/test/extensions/transport_sockets/alts/config_test.cc @@ -1,7 +1,6 @@ -#include "common/protobuf/protobuf.h" -#include "common/singleton/manager_impl.h" - -#include "extensions/transport_sockets/alts/config.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/singleton/manager_impl.h" +#include "source/extensions/transport_sockets/alts/config.h" #include "test/mocks/server/transport_socket_factory_context.h" diff --git a/test/extensions/transport_sockets/alts/noop_transport_socket_callbacks_test.cc b/test/extensions/transport_sockets/alts/noop_transport_socket_callbacks_test.cc index 5f3f31307192a..a0179d1a651a5 100644 --- a/test/extensions/transport_sockets/alts/noop_transport_socket_callbacks_test.cc +++ b/test/extensions/transport_sockets/alts/noop_transport_socket_callbacks_test.cc @@ -1,8 +1,7 @@ #include "envoy/network/transport_socket.h" -#include "common/network/io_socket_handle_impl.h" - -#include "extensions/transport_sockets/alts/noop_transport_socket_callbacks.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/extensions/transport_sockets/alts/noop_transport_socket_callbacks.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc b/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc index 26e4941a626cd..186fc012b4113 100644 --- a/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc +++ b/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc @@ -1,6 +1,5 @@ -#include "common/buffer/buffer_impl.h" - -#include "extensions/transport_sockets/alts/tsi_frame_protector.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/transport_sockets/alts/tsi_frame_protector.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc b/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc index 0b1afa2e0acce..ded6f76c69b97 100644 --- a/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc +++ b/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc @@ -1,4 +1,4 @@ -#include "extensions/transport_sockets/alts/tsi_handshaker.h" +#include "source/extensions/transport_sockets/alts/tsi_handshaker.h" #include "test/mocks/event/mocks.h" diff --git a/test/extensions/transport_sockets/alts/tsi_socket_test.cc b/test/extensions/transport_sockets/alts/tsi_socket_test.cc index 046ff9d4032ae..b41069b6d6bc9 100644 --- a/test/extensions/transport_sockets/alts/tsi_socket_test.cc +++ b/test/extensions/transport_sockets/alts/tsi_socket_test.cc @@ -1,6 +1,6 @@ -#include "extensions/transport_sockets/alts/tsi_socket.h" +#include "source/extensions/transport_sockets/alts/tsi_socket.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/transport_sockets/common/passthrough_test.cc b/test/extensions/transport_sockets/common/passthrough_test.cc index cc983e0900e53..6dd45ae0f689f 100644 --- a/test/extensions/transport_sockets/common/passthrough_test.cc +++ b/test/extensions/transport_sockets/common/passthrough_test.cc @@ -1,4 +1,4 @@ -#include "extensions/transport_sockets/common/passthrough.h" +#include "source/extensions/transport_sockets/common/passthrough.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/transport_sockets/proxy_protocol/BUILD b/test/extensions/transport_sockets/proxy_protocol/BUILD index fe2198041e436..4f9e6c504b665 100644 --- a/test/extensions/transport_sockets/proxy_protocol/BUILD +++ b/test/extensions/transport_sockets/proxy_protocol/BUILD @@ -16,7 +16,7 @@ envoy_extension_cc_test( srcs = ["proxy_protocol_test.cc"], extension_name = "envoy.transport_sockets.upstream_proxy_protocol", deps = [ - "//include/envoy/network:proxy_protocol_options_lib", + "//envoy/network:proxy_protocol_options_lib", "//source/extensions/common/proxy_protocol:proxy_protocol_header_lib", "//source/extensions/transport_sockets/proxy_protocol:upstream_proxy_protocol", "//test/mocks/buffer:buffer_mocks", diff --git a/test/extensions/transport_sockets/proxy_protocol/proxy_protocol_test.cc b/test/extensions/transport_sockets/proxy_protocol/proxy_protocol_test.cc index d23ad4a8961fc..eed0cc8ee1f7e 100644 --- a/test/extensions/transport_sockets/proxy_protocol/proxy_protocol_test.cc +++ b/test/extensions/transport_sockets/proxy_protocol/proxy_protocol_test.cc @@ -1,12 +1,11 @@ #include "envoy/config/core/v3/proxy_protocol.pb.h" #include "envoy/network/proxy_protocol.h" -#include "common/buffer/buffer_impl.h" -#include "common/network/address_impl.h" -#include "common/network/transport_socket_options_impl.h" - -#include "extensions/common/proxy_protocol/proxy_protocol_header.h" -#include "extensions/transport_sockets/proxy_protocol/proxy_protocol.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h" +#include "source/extensions/transport_sockets/proxy_protocol/proxy_protocol.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/network/io_handle.h" diff --git a/test/extensions/transport_sockets/starttls/starttls_integration_test.cc b/test/extensions/transport_sockets/starttls/starttls_integration_test.cc index 54394a8881ec2..9ee6e9ad3b3f9 100644 --- a/test/extensions/transport_sockets/starttls/starttls_integration_test.cc +++ b/test/extensions/transport_sockets/starttls/starttls_integration_test.cc @@ -3,10 +3,9 @@ #include "envoy/network/filter.h" #include "envoy/server/filter_config.h" -#include "common/network/connection_impl.h" - -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/transport_sockets/raw_buffer/config.h" +#include "source/common/network/connection_impl.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/transport_sockets/raw_buffer/config.h" #include "test/config/utility.h" #include "test/extensions/transport_sockets/starttls/starttls_integration_test.pb.h" diff --git a/test/extensions/transport_sockets/starttls/starttls_socket_test.cc b/test/extensions/transport_sockets/starttls/starttls_socket_test.cc index 28f51201395b0..4a69c58f17a32 100644 --- a/test/extensions/transport_sockets/starttls/starttls_socket_test.cc +++ b/test/extensions/transport_sockets/starttls/starttls_socket_test.cc @@ -5,9 +5,8 @@ #include "envoy/extensions/transport_sockets/starttls/v3/starttls.pb.validate.h" #include "envoy/network/connection.h" -#include "common/network/transport_socket_options_impl.h" - -#include "extensions/transport_sockets/starttls/starttls_socket.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/extensions/transport_sockets/starttls/starttls_socket.h" #include "test/mocks/network/mocks.h" #include "test/mocks/network/transport_socket.h" diff --git a/test/extensions/transport_sockets/starttls/upstream_starttls_integration_test.cc b/test/extensions/transport_sockets/starttls/upstream_starttls_integration_test.cc index d00af9e2389a0..ef6fa8c257c94 100644 --- a/test/extensions/transport_sockets/starttls/upstream_starttls_integration_test.cc +++ b/test/extensions/transport_sockets/starttls/upstream_starttls_integration_test.cc @@ -1,12 +1,11 @@ #include "envoy/network/filter.h" #include "envoy/server/filter_config.h" -#include "common/network/connection_impl.h" - -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/transport_sockets/starttls/starttls_socket.h" -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/network/connection_impl.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/transport_sockets/starttls/starttls_socket.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/config/utility.h" #include "test/extensions/transport_sockets/starttls/starttls_integration_test.pb.h" diff --git a/test/extensions/transport_sockets/tap/tap_config_impl_test.cc b/test/extensions/transport_sockets/tap/tap_config_impl_test.cc index b753b610f8201..3ed31cd6c2d62 100644 --- a/test/extensions/transport_sockets/tap/tap_config_impl_test.cc +++ b/test/extensions/transport_sockets/tap/tap_config_impl_test.cc @@ -1,6 +1,5 @@ -#include "common/network/address_impl.h" - -#include "extensions/transport_sockets/tap/tap_config_impl.h" +#include "source/common/network/address_impl.h" +#include "source/extensions/transport_sockets/tap/tap_config_impl.h" #include "test/extensions/common/tap/common.h" #include "test/mocks/network/mocks.h" diff --git a/test/extensions/transport_sockets/tls/BUILD b/test/extensions/transport_sockets/tls/BUILD index 46a64c50bbdfc..5c40298b8bc7d 100644 --- a/test/extensions/transport_sockets/tls/BUILD +++ b/test/extensions/transport_sockets/tls/BUILD @@ -28,7 +28,7 @@ envoy_cc_test( shard_count = 4, deps = [ ":test_private_key_method_provider_test_lib", - "//include/envoy/network:transport_socket_interface", + "//envoy/network:transport_socket_interface", "//source/common/buffer:buffer_lib", "//source/common/common:empty_string", "//source/common/event:dispatcher_includes", @@ -151,11 +151,11 @@ envoy_cc_test_library( ], external_deps = ["ssl"], deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/server:transport_socket_config_interface", - "//include/envoy/ssl/private_key:private_key_config_interface", - "//include/envoy/ssl/private_key:private_key_interface", + "//envoy/api:api_interface", + "//envoy/event:dispatcher_interface", + "//envoy/server:transport_socket_config_interface", + "//envoy/ssl/private_key:private_key_config_interface", + "//envoy/ssl/private_key:private_key_interface", "//source/common/config:utility_lib", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", diff --git a/test/extensions/transport_sockets/tls/cert_validator/BUILD b/test/extensions/transport_sockets/tls/cert_validator/BUILD index b16c619783155..7fd2c97084a17 100644 --- a/test/extensions/transport_sockets/tls/cert_validator/BUILD +++ b/test/extensions/transport_sockets/tls/cert_validator/BUILD @@ -51,8 +51,8 @@ envoy_cc_test_library( name = "test_common", hdrs = ["test_common.h"], deps = [ - "//include/envoy/ssl:context_config_interface", - "//include/envoy/ssl:ssl_socket_extended_info_interface", + "//envoy/ssl:context_config_interface", + "//envoy/ssl:ssl_socket_extended_info_interface", "//source/common/common:macros", "//test/test_common:utility_lib", ], diff --git a/test/extensions/transport_sockets/tls/cert_validator/default_validator_test.cc b/test/extensions/transport_sockets/tls/cert_validator/default_validator_test.cc index 6dcad995b36cd..44f8ff0e4e355 100644 --- a/test/extensions/transport_sockets/tls/cert_validator/default_validator_test.cc +++ b/test/extensions/transport_sockets/tls/cert_validator/default_validator_test.cc @@ -1,7 +1,7 @@ #include #include -#include "extensions/transport_sockets/tls/cert_validator/default_validator.h" +#include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h" #include "test/extensions/transport_sockets/tls/ssl_test_utility.h" #include "test/test_common/environment.h" diff --git a/test/extensions/transport_sockets/tls/cert_validator/factory_test.cc b/test/extensions/transport_sockets/tls/cert_validator/factory_test.cc index c06317b92f7b5..94cf5e7063fa4 100644 --- a/test/extensions/transport_sockets/tls/cert_validator/factory_test.cc +++ b/test/extensions/transport_sockets/tls/cert_validator/factory_test.cc @@ -1,6 +1,6 @@ #include -#include "extensions/transport_sockets/tls/cert_validator/factory.h" +#include "source/extensions/transport_sockets/tls/cert_validator/factory.h" #include "test/extensions/transport_sockets/tls/cert_validator/test_common.h" diff --git a/test/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD b/test/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD index 30d18f86c4710..c25d8a8107335 100644 --- a/test/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD +++ b/test/extensions/transport_sockets/tls/cert_validator/spiffe/BUILD @@ -42,6 +42,8 @@ envoy_extension_cc_test( "//test/extensions/transport_sockets/tls/test_data:certs", ], extension_name = "envoy.tls.cert_validator.spiffe", + # Broken until bazel 5.0.0 fix to shorten resulting paths for SymInitialize() failure + tags = ["skip_on_windows"], deps = [ "//source/extensions/transport_sockets/tls/cert_validator/spiffe:config", "//test/integration:http_integration_lib", diff --git a/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_integration_test.cc b/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_integration_test.cc index caacf4ba6b851..47acf98c4f533 100644 --- a/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_integration_test.cc +++ b/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_integration_test.cc @@ -2,7 +2,7 @@ #include -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "test/integration/integration.h" diff --git a/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_test.cc b/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_test.cc index 3d014605254d7..cf77bdf3737a8 100644 --- a/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_test.cc +++ b/test/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator_test.cc @@ -5,11 +5,10 @@ #include "envoy/common/exception.h" -#include "common/common/c_smart_ptr.h" -#include "common/event/real_time_system.h" - -#include "extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h" -#include "extensions/transport_sockets/tls/stats.h" +#include "source/common/common/c_smart_ptr.h" +#include "source/common/event/real_time_system.h" +#include "source/extensions/transport_sockets/tls/cert_validator/spiffe/spiffe_validator.h" +#include "source/extensions/transport_sockets/tls/stats.h" #include "test/extensions/transport_sockets/tls/cert_validator/test_common.h" #include "test/extensions/transport_sockets/tls/ssl_test_utility.h" diff --git a/test/extensions/transport_sockets/tls/cert_validator/test_common.h b/test/extensions/transport_sockets/tls/cert_validator/test_common.h index 9dac1b35cfb1b..c0cc7f28425fd 100644 --- a/test/extensions/transport_sockets/tls/cert_validator/test_common.h +++ b/test/extensions/transport_sockets/tls/cert_validator/test_common.h @@ -3,8 +3,8 @@ #include "envoy/ssl/context_config.h" #include "envoy/ssl/ssl_socket_extended_info.h" -#include "common/common/macros.h" -#include "common/common/matchers.h" +#include "source/common/common/macros.h" +#include "source/common/common/matchers.h" #include "test/test_common/utility.h" diff --git a/test/extensions/transport_sockets/tls/cert_validator/utility_test.cc b/test/extensions/transport_sockets/tls/cert_validator/utility_test.cc index d97d0f161f1e0..842fa24509ad1 100644 --- a/test/extensions/transport_sockets/tls/cert_validator/utility_test.cc +++ b/test/extensions/transport_sockets/tls/cert_validator/utility_test.cc @@ -1,6 +1,5 @@ -#include "common/common/c_smart_ptr.h" - -#include "extensions/transport_sockets/tls/cert_validator/utility.h" +#include "source/common/common/c_smart_ptr.h" +#include "source/extensions/transport_sockets/tls/cert_validator/utility.h" #include "gtest/gtest.h" #include "openssl/ssl.h" diff --git a/test/extensions/transport_sockets/tls/context_impl_test.cc b/test/extensions/transport_sockets/tls/context_impl_test.cc index 6cb28fcd05f10..72bff36b463bd 100644 --- a/test/extensions/transport_sockets/tls/context_impl_test.cc +++ b/test/extensions/transport_sockets/tls/context_impl_test.cc @@ -6,14 +6,13 @@ #include "envoy/extensions/transport_sockets/tls/v3/tls.pb.validate.h" #include "envoy/type/matcher/v3/string.pb.h" -#include "common/common/base64.h" -#include "common/json/json_loader.h" -#include "common/secret/sds_api.h" -#include "common/stats/isolated_store_impl.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/context_impl.h" -#include "extensions/transport_sockets/tls/utility.h" +#include "source/common/common/base64.h" +#include "source/common/json/json_loader.h" +#include "source/common/secret/sds_api.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_impl.h" +#include "source/extensions/transport_sockets/tls/utility.h" #include "test/extensions/transport_sockets/tls/ssl_certs_test.h" #include "test/extensions/transport_sockets/tls/ssl_test_utility.h" @@ -669,13 +668,13 @@ TEST_F(SslServerContextImplOcspTest, TestGetCertInformationWithOCSP) { for (const auto& detail : ocsp_text_details) { std::string::size_type pos = detail.find(this_update); if (pos != std::string::npos) { - valid_from = detail.substr(pos + this_update.size()); + valid_from = std::string(detail.substr(pos + this_update.size())); continue; } pos = detail.find(next_update); if (pos != std::string::npos) { - expiration = detail.substr(pos + next_update.size()); + expiration = std::string(detail.substr(pos + next_update.size())); continue; } } diff --git a/test/extensions/transport_sockets/tls/handshaker_factory_test.cc b/test/extensions/transport_sockets/tls/handshaker_factory_test.cc index ef430d0d3db04..23903a2b73fa9 100644 --- a/test/extensions/transport_sockets/tls/handshaker_factory_test.cc +++ b/test/extensions/transport_sockets/tls/handshaker_factory_test.cc @@ -3,14 +3,12 @@ #include "envoy/network/transport_socket.h" #include "envoy/ssl/handshaker.h" -#include "common/stream_info/stream_info_impl.h" - -#include "server/process_context_impl.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/context_manager_impl.h" -#include "extensions/transport_sockets/tls/ssl_handshaker.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_handshaker.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" +#include "source/server/process_context_impl.h" #include "test/mocks/network/connection.h" #include "test/mocks/server/transport_socket_factory_context.h" diff --git a/test/extensions/transport_sockets/tls/handshaker_test.cc b/test/extensions/transport_sockets/tls/handshaker_test.cc index 82484f56dda0c..514109e2c70be 100644 --- a/test/extensions/transport_sockets/tls/handshaker_test.cc +++ b/test/extensions/transport_sockets/tls/handshaker_test.cc @@ -3,9 +3,8 @@ #include "envoy/network/transport_socket.h" #include "envoy/ssl/handshaker.h" -#include "common/stream_info/stream_info_impl.h" - -#include "extensions/transport_sockets/tls/ssl_handshaker.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_handshaker.h" #include "test/extensions/transport_sockets/tls/ssl_certs_test.h" #include "test/mocks/network/connection.h" diff --git a/test/extensions/transport_sockets/tls/integration/BUILD b/test/extensions/transport_sockets/tls/integration/BUILD index 7486ec63da9d6..d8cf60b4f1e1b 100644 --- a/test/extensions/transport_sockets/tls/integration/BUILD +++ b/test/extensions/transport_sockets/tls/integration/BUILD @@ -22,6 +22,7 @@ envoy_cc_test( "//source/common/event:dispatcher_lib", "//source/common/network:connection_lib", "//source/common/network:utility_lib", + "//source/extensions/transport_sockets/tap:config", "//source/extensions/transport_sockets/tls:config", "//source/extensions/transport_sockets/tls:context_config_lib", "//source/extensions/transport_sockets/tls:context_lib", diff --git a/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc b/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc index ff3a3212ef033..02d5e1240a025 100644 --- a/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc +++ b/test/extensions/transport_sockets/tls/integration/ssl_integration_test.cc @@ -12,13 +12,12 @@ #include "envoy/extensions/transport_sockets/tap/v3/tap.pb.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" -#include "common/event/dispatcher_impl.h" -#include "common/network/connection_impl.h" -#include "common/network/utility.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/context_manager_impl.h" -#include "extensions/transport_sockets/tls/ssl_handshaker.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/network/connection_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_handshaker.h" #include "test/extensions/common/tap/common.h" #include "test/integration/autonomous_upstream.h" diff --git a/test/extensions/transport_sockets/tls/io_handle_bio_test.cc b/test/extensions/transport_sockets/tls/io_handle_bio_test.cc index d0e845e44ad8a..155e8c0b07086 100644 --- a/test/extensions/transport_sockets/tls/io_handle_bio_test.cc +++ b/test/extensions/transport_sockets/tls/io_handle_bio_test.cc @@ -1,6 +1,5 @@ -#include "common/network/io_socket_error_impl.h" - -#include "extensions/transport_sockets/tls/io_handle_bio.h" +#include "source/common/network/io_socket_error_impl.h" +#include "source/extensions/transport_sockets/tls/io_handle_bio.h" #include "test/mocks/network/io_handle.h" diff --git a/test/extensions/transport_sockets/tls/ocsp/asn1_utility_test.cc b/test/extensions/transport_sockets/tls/ocsp/asn1_utility_test.cc index 85f0024627e30..163f3248e72c1 100644 --- a/test/extensions/transport_sockets/tls/ocsp/asn1_utility_test.cc +++ b/test/extensions/transport_sockets/tls/ocsp/asn1_utility_test.cc @@ -1,6 +1,6 @@ #include -#include "extensions/transport_sockets/tls/ocsp/asn1_utility.h" +#include "source/extensions/transport_sockets/tls/ocsp/asn1_utility.h" #include "test/test_common/utility.h" diff --git a/test/extensions/transport_sockets/tls/ocsp/ocsp_test.cc b/test/extensions/transport_sockets/tls/ocsp/ocsp_test.cc index 78e813060d867..56acea5b0730a 100644 --- a/test/extensions/transport_sockets/tls/ocsp/ocsp_test.cc +++ b/test/extensions/transport_sockets/tls/ocsp/ocsp_test.cc @@ -1,7 +1,6 @@ -#include "common/filesystem/filesystem_impl.h" - -#include "extensions/transport_sockets/tls/ocsp/ocsp.h" -#include "extensions/transport_sockets/tls/utility.h" +#include "source/common/filesystem/filesystem_impl.h" +#include "source/extensions/transport_sockets/tls/ocsp/ocsp.h" +#include "source/extensions/transport_sockets/tls/utility.h" #include "test/extensions/transport_sockets/tls/ssl_test_utility.h" #include "test/test_common/environment.h" diff --git a/test/extensions/transport_sockets/tls/ssl_socket_test.cc b/test/extensions/transport_sockets/tls/ssl_socket_test.cc index 6ef7400a757ad..432216c5daa09 100644 --- a/test/extensions/transport_sockets/tls/ssl_socket_test.cc +++ b/test/extensions/transport_sockets/tls/ssl_socket_test.cc @@ -7,20 +7,19 @@ #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" #include "envoy/network/transport_socket.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/empty_string.h" -#include "common/event/dispatcher_impl.h" -#include "common/json/json_loader.h" -#include "common/network/address_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/transport_socket_options_impl.h" -#include "common/network/utility.h" -#include "common/stream_info/stream_info_impl.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/context_impl.h" -#include "extensions/transport_sockets/tls/private_key/private_key_manager_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/empty_string.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/json/json_loader.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/transport_socket_options_impl.h" +#include "source/common/network/utility.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_impl.h" +#include "source/extensions/transport_sockets/tls/private_key/private_key_manager_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/extensions/transport_sockets/tls/ssl_certs_test.h" #include "test/extensions/transport_sockets/tls/test_data/ca_cert_info.h" diff --git a/test/extensions/transport_sockets/tls/test_private_key_method_provider.h b/test/extensions/transport_sockets/tls/test_private_key_method_provider.h index 44bcece41f1f8..efe94936d2f3a 100644 --- a/test/extensions/transport_sockets/tls/test_private_key_method_provider.h +++ b/test/extensions/transport_sockets/tls/test_private_key_method_provider.h @@ -6,8 +6,8 @@ #include "envoy/ssl/private_key/private_key.h" #include "envoy/ssl/private_key/private_key_config.h" -#include "common/config/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/config/utility.h" +#include "source/common/protobuf/utility.h" namespace Envoy { namespace Extensions { diff --git a/test/extensions/transport_sockets/tls/tls_throughput_benchmark.cc b/test/extensions/transport_sockets/tls/tls_throughput_benchmark.cc index f1e90313b0ca8..690909fb9ac67 100644 --- a/test/extensions/transport_sockets/tls/tls_throughput_benchmark.cc +++ b/test/extensions/transport_sockets/tls/tls_throughput_benchmark.cc @@ -1,4 +1,4 @@ -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "test/test_common/environment.h" diff --git a/test/extensions/transport_sockets/tls/utility_test.cc b/test/extensions/transport_sockets/tls/utility_test.cc index 32077060c04fc..531599c01be59 100644 --- a/test/extensions/transport_sockets/tls/utility_test.cc +++ b/test/extensions/transport_sockets/tls/utility_test.cc @@ -1,7 +1,7 @@ #include #include -#include "extensions/transport_sockets/tls/utility.h" +#include "source/extensions/transport_sockets/tls/utility.h" #include "test/extensions/transport_sockets/tls/ssl_test_utility.h" #include "test/extensions/transport_sockets/tls/test_data/long_validity_cert_info.h" diff --git a/test/extensions/upstreams/http/config_test.cc b/test/extensions/upstreams/http/config_test.cc index ee7e055953313..cd91d8c55f675 100644 --- a/test/extensions/upstreams/http/config_test.cc +++ b/test/extensions/upstreams/http/config_test.cc @@ -1,4 +1,4 @@ -#include "extensions/upstreams/http/config.h" +#include "source/extensions/upstreams/http/config.h" #include "test/mocks/protobuf/mocks.h" diff --git a/test/extensions/upstreams/http/tcp/upstream_request_test.cc b/test/extensions/upstreams/http/tcp/upstream_request_test.cc index 555f93a6e7501..fad02b44fe118 100644 --- a/test/extensions/upstreams/http/tcp/upstream_request_test.cc +++ b/test/extensions/upstreams/http/tcp/upstream_request_test.cc @@ -1,11 +1,10 @@ -#include "common/buffer/buffer_impl.h" -#include "common/network/address_impl.h" -#include "common/router/config_impl.h" -#include "common/router/router.h" -#include "common/router/upstream_request.h" - -#include "extensions/common/proxy_protocol/proxy_protocol_header.h" -#include "extensions/upstreams/http/tcp/upstream_request.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/router/config_impl.h" +#include "source/common/router/router.h" +#include "source/common/router/upstream_request.h" +#include "source/extensions/common/proxy_protocol/proxy_protocol_header.h" +#include "source/extensions/upstreams/http/tcp/upstream_request.h" #include "test/common/http/common.h" #include "test/mocks/common.h" @@ -39,7 +38,8 @@ class TcpConnPoolTest : public ::testing::Test { NiceMock route_entry; NiceMock cm; cm.initializeThreadLocalClusters({"fake_cluster"}); - EXPECT_CALL(cm.thread_local_cluster_, tcpConnPool(_, _)).WillOnce(Return(&mock_pool_)); + EXPECT_CALL(cm.thread_local_cluster_, tcpConnPool(_, _)) + .WillOnce(Return(Upstream::TcpPoolData([]() {}, &mock_pool_))); conn_pool_ = std::make_unique(cm.thread_local_cluster_, true, route_entry, Envoy::Http::Protocol::Http11, nullptr); } diff --git a/test/extensions/upstreams/tcp/generic/config_test.cc b/test/extensions/upstreams/tcp/generic/config_test.cc index ffc603614491e..2e8a638356db5 100644 --- a/test/extensions/upstreams/tcp/generic/config_test.cc +++ b/test/extensions/upstreams/tcp/generic/config_test.cc @@ -1,4 +1,4 @@ -#include "extensions/upstreams/tcp/generic/config.h" +#include "source/extensions/upstreams/tcp/generic/config.h" #include "test/mocks/tcp/mocks.h" #include "test/mocks/upstream/cluster_manager.h" @@ -26,7 +26,7 @@ class TcpConnPoolTest : public ::testing::Test { TEST_F(TcpConnPoolTest, TestNoConnPool) { envoy::extensions::filters::network::tcp_proxy::v3::TcpProxy_TunnelingConfig config; config.set_hostname("host"); - EXPECT_CALL(thread_local_cluster_, httpConnPool(_, _, _)).WillOnce(Return(nullptr)); + EXPECT_CALL(thread_local_cluster_, httpConnPool(_, _, _)).WillOnce(Return(absl::nullopt)); EXPECT_EQ(nullptr, factory_.createGenericConnPool(thread_local_cluster_, config, nullptr, callbacks_)); } diff --git a/test/extensions/watchdog/profile_action/BUILD b/test/extensions/watchdog/profile_action/BUILD index fb8c662ea7bc7..866d8b63d747a 100644 --- a/test/extensions/watchdog/profile_action/BUILD +++ b/test/extensions/watchdog/profile_action/BUILD @@ -19,9 +19,9 @@ envoy_extension_cc_test( "abseil_synchronization", ], deps = [ - "//include/envoy/common:time_interface", - "//include/envoy/registry", - "//include/envoy/server:guarddog_config_interface", + "//envoy/common:time_interface", + "//envoy/registry", + "//envoy/server:guarddog_config_interface", "//source/common/filesystem:directory_lib", "//source/common/profiler:profiler_lib", "//source/extensions/watchdog/profile_action:config", @@ -41,8 +41,8 @@ envoy_extension_cc_test( srcs = ["config_test.cc"], extension_name = "envoy.watchdog.profile_action", deps = [ - "//include/envoy/registry", - "//include/envoy/server:guarddog_config_interface", + "//envoy/registry", + "//envoy/server:guarddog_config_interface", "//source/extensions/watchdog/profile_action:config", "//source/extensions/watchdog/profile_action:profile_action_lib", "//test/common/stats:stat_test_utility_lib", diff --git a/test/extensions/watchdog/profile_action/config_test.cc b/test/extensions/watchdog/profile_action/config_test.cc index 2603eeec2f57c..157128a62af99 100644 --- a/test/extensions/watchdog/profile_action/config_test.cc +++ b/test/extensions/watchdog/profile_action/config_test.cc @@ -2,7 +2,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/guarddog_config.h" -#include "extensions/watchdog/profile_action/config.h" +#include "source/extensions/watchdog/profile_action/config.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/event/mocks.h" diff --git a/test/extensions/watchdog/profile_action/profile_action_test.cc b/test/extensions/watchdog/profile_action/profile_action_test.cc index 40f9085eff04b..d35bea645dc18 100644 --- a/test/extensions/watchdog/profile_action/profile_action_test.cc +++ b/test/extensions/watchdog/profile_action/profile_action_test.cc @@ -8,12 +8,11 @@ #include "envoy/server/guarddog_config.h" #include "envoy/thread/thread.h" -#include "common/common/assert.h" -#include "common/filesystem/directory.h" -#include "common/profiler/profiler.h" - -#include "extensions/watchdog/profile_action/config.h" -#include "extensions/watchdog/profile_action/profile_action.h" +#include "source/common/common/assert.h" +#include "source/common/filesystem/directory.h" +#include "source/common/profiler/profiler.h" +#include "source/extensions/watchdog/profile_action/config.h" +#include "source/extensions/watchdog/profile_action/profile_action.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/event/mocks.h" diff --git a/test/fuzz/BUILD b/test/fuzz/BUILD index 6c3ef4f966961..6a8ea1e891d59 100644 --- a/test/fuzz/BUILD +++ b/test/fuzz/BUILD @@ -78,7 +78,7 @@ envoy_cc_test_library( name = "random_lib", hdrs = ["random.h"], deps = [ - "//include/envoy/common:random_generator_interface", + "//envoy/common:random_generator_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", ], diff --git a/test/fuzz/fuzz_runner.cc b/test/fuzz/fuzz_runner.cc index bda9446b39e9c..618116a2f382d 100644 --- a/test/fuzz/fuzz_runner.cc +++ b/test/fuzz/fuzz_runner.cc @@ -1,11 +1,10 @@ #include "test/fuzz/fuzz_runner.h" -#include "common/common/thread.h" -#include "common/common/utility.h" -#include "common/event/libevent.h" -#include "common/http/http2/codec_impl.h" - -#include "exe/process_wide.h" +#include "source/common/common/thread.h" +#include "source/common/common/utility.h" +#include "source/common/event/libevent.h" +#include "source/common/http/http2/codec_impl.h" +#include "source/exe/process_wide.h" #include "test/test_common/environment.h" diff --git a/test/fuzz/main.cc b/test/fuzz/main.cc index d1c98eb6eed9f..b339336620de3 100644 --- a/test/fuzz/main.cc +++ b/test/fuzz/main.cc @@ -12,8 +12,8 @@ // neat, as we get features likes --gtest_filter to select over the corpus // and the reporting features of gtest. -#include "common/common/assert.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" #include "test/fuzz/fuzz_runner.h" #include "test/test_common/environment.h" @@ -22,7 +22,7 @@ #include "absl/debugging/symbolize.h" #ifdef ENVOY_HANDLE_SIGNALS -#include "common/signal/signal_action.h" +#include "source/common/signal/signal_action.h" #endif #include "gtest/gtest.h" diff --git a/test/fuzz/random.h b/test/fuzz/random.h index 574f1f804f379..bcf738bf262fa 100644 --- a/test/fuzz/random.h +++ b/test/fuzz/random.h @@ -7,8 +7,8 @@ #include "envoy/common/random_generator.h" -#include "common/common/assert.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" namespace Envoy { namespace Random { diff --git a/test/fuzz/utility.h b/test/fuzz/utility.h index cfa95039e1149..002eab8571a74 100644 --- a/test/fuzz/utility.h +++ b/test/fuzz/utility.h @@ -2,10 +2,10 @@ #include "envoy/config/core/v3/base.pb.h" -#include "common/common/empty_string.h" -#include "common/network/resolver_impl.h" -#include "common/network/socket_impl.h" -#include "common/network/utility.h" +#include "source/common/common/empty_string.h" +#include "source/common/network/resolver_impl.h" +#include "source/common/network/socket_impl.h" +#include "source/common/network/utility.h" #include "test/common/stream_info/test_util.h" #include "test/fuzz/common.pb.h" diff --git a/test/integration/BUILD b/test/integration/BUILD index 1dfbc527eae75..dbea0c188ff02 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -179,7 +179,7 @@ envoy_cc_test( srcs = ["cluster_filter_integration_test.cc"], deps = [ ":integration_lib", - "//include/envoy/network:filter_interface", + "//envoy/network:filter_interface", "//source/extensions/filters/network/tcp_proxy:config", "//test/config:utility_lib", "//test/test_common:registry_lib", @@ -486,6 +486,7 @@ envoy_cc_test_library( "//test/integration/filters:local_reply_during_encoding_filter_lib", "//test/integration/filters:local_reply_with_metadata_filter_lib", "//test/integration/filters:random_pause_filter_lib", + "//test/integration/filters:remove_response_headers_lib", "//test/test_common:logging_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", @@ -536,7 +537,7 @@ envoy_cc_test( ], deps = [ ":http_protocol_integration_lib", - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "//source/common/stats:histogram_lib", "//source/common/stats:stats_matcher_lib", "//source/extensions/filters/http/buffer:config", @@ -557,7 +558,7 @@ envoy_cc_test_library( "test_host_predicate_config.h", ], deps = [ - "//include/envoy/upstream:retry_interface", + "//envoy/upstream:retry_interface", ], ) @@ -575,7 +576,7 @@ envoy_cc_test_library( deps = [ ":integration_lib", ":test_host_predicate_lib", - "//include/envoy/event:timer_interface", + "//envoy/event:timer_interface", "//source/common/common:thread_annotations", "//source/common/network:socket_option_lib", "//source/extensions/filters/http/on_demand:config", @@ -639,10 +640,10 @@ envoy_cc_test_library( "integration_stream_decoder.h", ], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/http:metadata_interface", + "//envoy/event:dispatcher_interface", + "//envoy/http:codec_interface", + "//envoy/http:header_map_interface", + "//envoy/http:metadata_interface", "//source/common/common:dump_state_utils", "//test/test_common:utility_lib", ], @@ -658,11 +659,11 @@ envoy_cc_test_library( ], deps = [ ":utility_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:address_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:listen_socket_interface", - "//include/envoy/network:socket_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:address_interface", + "//envoy/network:connection_interface", + "//envoy/network:listen_socket_interface", + "//envoy/network:socket_interface", "//test/mocks/buffer:buffer_mocks", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", @@ -678,13 +679,13 @@ envoy_cc_test_library( "fake_upstream.h", ], deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/grpc:status", - "//include/envoy/http:codec_interface", - "//include/envoy/network:connection_handler_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/stats:stats_interface", + "//envoy/api:api_interface", + "//envoy/grpc:status", + "//envoy/http:codec_interface", + "//envoy/network:connection_handler_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/stats:stats_interface", "//source/common/buffer:buffer_lib", "//source/common/buffer:zero_copy_input_stream_lib", "//source/common/common:basic_resource_lib", @@ -783,13 +784,13 @@ envoy_cc_test_library( deps = [ ":server_stats_interface", ":tcp_dump", - "//include/envoy/api:api_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/server:options_interface", - "//include/envoy/server:process_context_interface", - "//include/envoy/stats:stats_interface", + "//envoy/api:api_interface", + "//envoy/http:codec_interface", + "//envoy/http:header_map_interface", + "//envoy/network:filter_interface", + "//envoy/server:options_interface", + "//envoy/server:process_context_interface", + "//envoy/stats:stats_interface", "//source/common/api:api_lib", "//source/common/common:assert_lib", "//source/common/common:lock_guard_lib", @@ -846,19 +847,19 @@ envoy_cc_test_library( ":integration_stream_decoder_lib", ":integration_tcp_client_lib", ":utility_lib", - "//include/envoy/api:api_interface", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/grpc:status", - "//include/envoy/http:codec_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/server:configuration_interface", - "//include/envoy/server:hot_restart_interface", - "//include/envoy/server:options_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/thread:thread_interface", + "//envoy/api:api_interface", + "//envoy/buffer:buffer_interface", + "//envoy/event:dispatcher_interface", + "//envoy/grpc:status", + "//envoy/http:codec_interface", + "//envoy/http:header_map_interface", + "//envoy/network:connection_interface", + "//envoy/network:filter_interface", + "//envoy/server:configuration_interface", + "//envoy/server:hot_restart_interface", + "//envoy/server:options_interface", + "//envoy/stats:stats_interface", + "//envoy/thread:thread_interface", "//source/common/api:api_lib", "//source/common/buffer:buffer_lib", "//source/common/buffer:zero_copy_input_stream_lib", @@ -888,7 +889,6 @@ envoy_cc_test_library( "//source/extensions/access_loggers/file:config", "//source/extensions/access_loggers/stream:config", "//source/extensions/transport_sockets/raw_buffer:config", - "//source/extensions/transport_sockets/tap:config", "//source/server:connection_handler_lib", "//source/server:drain_manager_lib", "//source/server:hot_restart_nop_lib", @@ -924,7 +924,6 @@ envoy_cc_test( ":http_integration_lib", "//source/common/http:header_map_lib", "//source/common/http:headers_lib", - "//source/extensions/filters/http/cors:config", "//source/extensions/filters/http/grpc_http1_bridge:config", "//source/extensions/filters/http/health_check:config", "//test/integration/filters:clear_route_cache_filter_lib", @@ -1055,7 +1054,7 @@ envoy_cc_test( deps = [ ":http_integration_lib", ":integration_lib", - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:upstream_interface", "//source/common/config:metadata_lib", "//source/common/json:json_loader_lib", "//source/common/network:utility_lib", @@ -1085,6 +1084,7 @@ envoy_cc_test( envoy_cc_test( name = "overload_integration_test", srcs = ["overload_integration_test.cc"], + shard_count = 2, deps = [ ":http_protocol_integration_lib", "//test/common/config:dummy_config_proto_cc_proto", @@ -1146,8 +1146,8 @@ envoy_cc_test_library( name = "server_stats_interface", hdrs = ["server_stats.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/stats:stats_interface", + "//envoy/event:dispatcher_interface", + "//envoy/stats:stats_interface", ], ) @@ -1223,7 +1223,7 @@ envoy_cc_test( ], deps = [ ":http_integration_lib", - "//include/envoy/registry", + "//envoy/registry", "//source/common/grpc:common_lib", "//test/test_common:registry_lib", "//test/test_common:utility_lib", @@ -1298,8 +1298,8 @@ envoy_cc_test( ], deps = [ ":integration_lib", - "//include/envoy/server:filter_config_interface", - "//include/envoy/tcp:conn_pool_interface", + "//envoy/server:filter_config_interface", + "//envoy/tcp:conn_pool_interface", "//test/server:utility_lib", "//test/test_common:registry_lib", "//test/test_common:utility_lib", @@ -1632,8 +1632,8 @@ envoy_cc_test( srcs = ["cx_limit_integration_test.cc"], deps = [ ":http_integration_lib", - "//include/envoy/network:filter_interface", - "//include/envoy/registry", + "//envoy/network:filter_interface", + "//envoy/registry", "//source/extensions/filters/network/tcp_proxy:config", "//test/config:utility_lib", "//test/test_common:logging_lib", @@ -1752,7 +1752,6 @@ envoy_cc_test( "//source/common/quic:envoy_quic_connection_helper_lib", "//source/common/quic:envoy_quic_proof_verifier_lib", "//source/common/quic:quic_transport_socket_factory_lib", - "//source/extensions/resource_monitors/injected_resource:config", "//test/common/quic:quic_test_utils_for_envoy_lib", "//test/common/quic:test_utils_lib", "//test/integration/filters:encoder_decoder_buffer_filter_lib", diff --git a/test/integration/ads_integration.cc b/test/integration/ads_integration.cc index 5d19303690533..dfa3b81539b94 100644 --- a/test/integration/ads_integration.cc +++ b/test/integration/ads_integration.cc @@ -8,9 +8,9 @@ #include "envoy/config/route/v3/route.pb.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" -#include "common/config/protobuf_link_hacks.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/config/protobuf_link_hacks.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "test/test_common/network_utility.h" #include "test/test_common/resources.h" diff --git a/test/integration/ads_integration_test.cc b/test/integration/ads_integration_test.cc index 739b6d9f896b6..f8045c2ad55a7 100644 --- a/test/integration/ads_integration_test.cc +++ b/test/integration/ads_integration_test.cc @@ -6,11 +6,11 @@ #include "envoy/config/route/v3/route.pb.h" #include "envoy/grpc/status.h" -#include "common/config/protobuf_link_hacks.h" -#include "common/config/version_converter.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/version/version.h" +#include "source/common/config/protobuf_link_hacks.h" +#include "source/common/config/version_converter.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/version/version.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/ads_integration.h" diff --git a/test/integration/alpn_selection_integration_test.cc b/test/integration/alpn_selection_integration_test.cc index 052bc5e14f752..da784ec70e3cf 100644 --- a/test/integration/alpn_selection_integration_test.cc +++ b/test/integration/alpn_selection_integration_test.cc @@ -2,11 +2,10 @@ #include "envoy/config/route/v3/route_components.pb.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" -#include "common/http/utility.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/context_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/http/utility.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/integration/http_integration.h" diff --git a/test/integration/base_integration_test.cc b/test/integration/base_integration_test.cc index 012197a98f1fd..6ecfd4acd819d 100644 --- a/test/integration/base_integration_test.cc +++ b/test/integration/base_integration_test.cc @@ -15,15 +15,14 @@ #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/common/thread.h" -#include "common/config/api_version.h" -#include "common/event/libevent.h" -#include "common/network/utility.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/common/thread.h" +#include "source/common/config/api_version.h" +#include "source/common/event/libevent.h" +#include "source/common/network/utility.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/integration/autonomous_upstream.h" #include "test/integration/utility.h" diff --git a/test/integration/base_integration_test.h b/test/integration/base_integration_test.h index 37230364cd60a..0a76bb8da54e2 100644 --- a/test/integration/base_integration_test.h +++ b/test/integration/base_integration_test.h @@ -8,10 +8,9 @@ #include "envoy/server/process_context.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/api_version.h" -#include "common/config/version_converter.h" - -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/common/config/api_version.h" +#include "source/common/config/version_converter.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/config/utility.h" diff --git a/test/integration/buffer_accounting_integration_test.cc b/test/integration/buffer_accounting_integration_test.cc index 1ccfdb1121336..b11c916e568be 100644 --- a/test/integration/buffer_accounting_integration_test.cc +++ b/test/integration/buffer_accounting_integration_test.cc @@ -5,7 +5,7 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/network/address.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "test/integration/autonomous_upstream.h" #include "test/integration/tracked_watermark_buffer.h" diff --git a/test/integration/cds_integration_test.cc b/test/integration/cds_integration_test.cc index 0377cdcb1da2d..4b62e426f0215 100644 --- a/test/integration/cds_integration_test.cc +++ b/test/integration/cds_integration_test.cc @@ -3,9 +3,9 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/stats/scope.h" -#include "common/config/protobuf_link_hacks.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/config/protobuf_link_hacks.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/http_integration.h" diff --git a/test/integration/cluster_upstream_extension_integration_test.cc b/test/integration/cluster_upstream_extension_integration_test.cc index dfbc519933ddc..163d628a175bc 100644 --- a/test/integration/cluster_upstream_extension_integration_test.cc +++ b/test/integration/cluster_upstream_extension_integration_test.cc @@ -3,7 +3,7 @@ #include "envoy/registry/registry.h" #include "envoy/router/router.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "test/integration/fake_upstream.h" #include "test/integration/http_integration.h" diff --git a/test/integration/clusters/BUILD b/test/integration/clusters/BUILD index 97b137eb75f70..2279cb450a9d4 100644 --- a/test/integration/clusters/BUILD +++ b/test/integration/clusters/BUILD @@ -19,10 +19,10 @@ envoy_cc_test_library( ], deps = [ ":cluster_factory_config_proto_cc_proto", - "//include/envoy/api:api_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/upstream:cluster_factory_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/api:api_interface", + "//envoy/http:codec_interface", + "//envoy/upstream:cluster_factory_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/event:dispatcher_lib", "//source/common/network:utility_lib", "//source/common/singleton:manager_impl_lib", diff --git a/test/integration/clusters/custom_static_cluster.h b/test/integration/clusters/custom_static_cluster.h index 7b6c7dafa96ae..8b91386ac0d4f 100644 --- a/test/integration/clusters/custom_static_cluster.h +++ b/test/integration/clusters/custom_static_cluster.h @@ -11,10 +11,9 @@ #include "envoy/http/codec.h" #include "envoy/upstream/cluster_manager.h" -#include "common/network/address_impl.h" -#include "common/upstream/cluster_factory_impl.h" - -#include "server/transport_socket_config_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/upstream/cluster_factory_impl.h" +#include "source/server/transport_socket_config_impl.h" #include "test/common/upstream/utility.h" #include "test/integration/clusters/cluster_factory_config.pb.h" diff --git a/test/integration/custom_cluster_integration_test.cc b/test/integration/custom_cluster_integration_test.cc index ecd21ccddf05d..74e4b9d7eed8f 100644 --- a/test/integration/custom_cluster_integration_test.cc +++ b/test/integration/custom_cluster_integration_test.cc @@ -1,8 +1,8 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/config/cluster/v3/cluster.pb.h" -#include "common/network/address_impl.h" -#include "common/upstream/load_balancer_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/upstream/load_balancer_impl.h" #include "test/config/utility.h" #include "test/integration/clusters/cluster_factory_config.pb.h" diff --git a/test/integration/cx_limit_integration_test.cc b/test/integration/cx_limit_integration_test.cc index 7f0639bf95dd8..fd3c1bbb6fb1f 100644 --- a/test/integration/cx_limit_integration_test.cc +++ b/test/integration/cx_limit_integration_test.cc @@ -2,7 +2,7 @@ #include "envoy/network/filter.h" #include "envoy/registry/registry.h" -#include "common/network/utility.h" +#include "source/common/network/utility.h" #include "test/config/utility.h" #include "test/integration/integration.h" diff --git a/test/integration/dynamic_validation_integration_test.cc b/test/integration/dynamic_validation_integration_test.cc index d9cde92eeffec..e6f7c5dddc53d 100644 --- a/test/integration/dynamic_validation_integration_test.cc +++ b/test/integration/dynamic_validation_integration_test.cc @@ -3,7 +3,7 @@ #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h" #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.h" -#include "extensions/filters/network/common/factory_base.h" +#include "source/extensions/filters/network/common/factory_base.h" #include "test/integration/http_integration.h" #include "test/test_common/environment.h" diff --git a/test/integration/eds_integration_test.cc b/test/integration/eds_integration_test.cc index ddef6576eab4d..455f1f39e7337 100644 --- a/test/integration/eds_integration_test.cc +++ b/test/integration/eds_integration_test.cc @@ -5,7 +5,7 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/type/v3/http.pb.h" -#include "common/upstream/load_balancer_impl.h" +#include "source/common/upstream/load_balancer_impl.h" #include "test/config/utility.h" #include "test/integration/http_integration.h" diff --git a/test/integration/fake_upstream.cc b/test/integration/fake_upstream.cc index eea2fabc5cf2d..a945b00471128 100644 --- a/test/integration/fake_upstream.cc +++ b/test/integration/fake_upstream.cc @@ -5,21 +5,21 @@ #include #include -#include "common/buffer/buffer_impl.h" -#include "common/config/utility.h" -#include "common/http/header_map_impl.h" -#include "common/http/http1/codec_impl.h" -#include "common/http/http2/codec_impl.h" -#include "common/network/address_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/socket_option_factory.h" -#include "common/network/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/config/utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/http1/codec_impl.h" +#include "source/common/http/http2/codec_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/network/utility.h" #ifdef ENVOY_ENABLE_QUIC -#include "common/quic/codec_impl.h" +#include "source/common/quic/codec_impl.h" #endif -#include "server/connection_handler_impl.h" +#include "source/server/connection_handler_impl.h" #include "test/test_common/network_utility.h" #include "test/test_common/utility.h" diff --git a/test/integration/fake_upstream.h b/test/integration/fake_upstream.h index 184c2a7d96591..580da4db816b3 100644 --- a/test/integration/fake_upstream.h +++ b/test/integration/fake_upstream.h @@ -15,31 +15,32 @@ #include "envoy/network/filter.h" #include "envoy/stats/scope.h" -#include "common/buffer/buffer_impl.h" -#include "common/buffer/zero_copy_input_stream_impl.h" -#include "common/common/basic_resource_impl.h" -#include "common/common/callback_impl.h" -#include "common/common/linked_object.h" -#include "common/common/lock_guard.h" -#include "common/common/thread.h" -#include "common/config/utility.h" -#include "common/grpc/codec.h" -#include "common/grpc/common.h" -#include "common/http/http1/codec_impl.h" -#include "common/http/http2/codec_impl.h" -#include "common/http/http3/codec_stats.h" -#include "common/network/connection_balancer_impl.h" -#include "common/network/filter_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/udp_listener_impl.h" -#include "common/network/udp_packet_writer_handler_impl.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/buffer/zero_copy_input_stream_impl.h" +#include "source/common/common/basic_resource_impl.h" +#include "source/common/common/callback_impl.h" +#include "source/common/common/linked_object.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/thread.h" +#include "source/common/config/utility.h" +#include "source/common/grpc/codec.h" +#include "source/common/grpc/common.h" +#include "source/common/http/http1/codec_impl.h" +#include "source/common/http/http2/codec_impl.h" +#include "source/common/http/http3/codec_stats.h" +#include "source/common/network/connection_balancer_impl.h" +#include "source/common/network/filter_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/udp_listener_impl.h" +#include "source/common/network/udp_packet_writer_handler_impl.h" +#include "source/common/stats/isolated_store_impl.h" #if defined(ENVOY_ENABLE_QUIC) -#include "common/quic/active_quic_listener.h" +#include "source/common/quic/active_quic_listener.h" +#include "source/common/quic/quic_stat_names.h" #endif -#include "server/active_raw_udp_listener_config.h" +#include "source/server/active_raw_udp_listener_config.h" #include "test/mocks/common.h" #include "test/test_common/test_time_system.h" @@ -751,7 +752,7 @@ class FakeUpstream : Logger::Loggable, if (is_quic) { #if defined(ENVOY_ENABLE_QUIC) udp_listener_config_.listener_factory_ = std::make_unique( - envoy::config::listener::v3::QuicProtocolOptions(), 1); + envoy::config::listener::v3::QuicProtocolOptions(), 1, parent_.quic_stat_names_); #else ASSERT(false, "Running a test that requires QUIC without compiling QUIC"); #endif @@ -840,6 +841,9 @@ class FakeUpstream : Logger::Loggable, Http::Http1::CodecStats::AtomicPtr http1_codec_stats_; Http::Http2::CodecStats::AtomicPtr http2_codec_stats_; Http::Http3::CodecStats::AtomicPtr http3_codec_stats_; +#ifdef ENVOY_ENABLE_QUIC + Quic::QuicStatNames quic_stat_names_ = Quic::QuicStatNames(stats_store_.symbolTable()); +#endif }; using FakeUpstreamPtr = std::unique_ptr; diff --git a/test/integration/filter_manager_integration_test.cc b/test/integration/filter_manager_integration_test.cc index 2640f5a17472f..ee5db8d4674ca 100644 --- a/test/integration/filter_manager_integration_test.cc +++ b/test/integration/filter_manager_integration_test.cc @@ -9,9 +9,8 @@ #include "envoy/network/filter.h" #include "envoy/server/filter_config.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/network/common/factory_base.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/network/common/factory_base.h" #include "test/integration/filter_manager_integration_test.pb.h" #include "test/integration/filter_manager_integration_test.pb.validate.h" diff --git a/test/integration/filters/BUILD b/test/integration/filters/BUILD index 7285345d40549..52477e4957a21 100644 --- a/test/integration/filters/BUILD +++ b/test/integration/filters/BUILD @@ -16,9 +16,9 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -31,9 +31,9 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -46,9 +46,9 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -61,9 +61,9 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -76,9 +76,9 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -91,9 +91,9 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -106,9 +106,9 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -120,9 +120,9 @@ envoy_cc_test_library( "add_trailers_filter.cc", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -134,9 +134,9 @@ envoy_cc_test_library( "backpressure_filter.cc", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -149,9 +149,9 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -163,10 +163,10 @@ envoy_cc_test_library( "eds_ready_filter.cc", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/http:header_map_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/http:header_map_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/common/stats:symbol_table_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", @@ -179,9 +179,9 @@ envoy_cc_test_library( "modify_buffer_filter.cc", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -193,9 +193,9 @@ envoy_cc_test_library( "on_local_reply_filter.cc", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -208,9 +208,9 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -222,8 +222,8 @@ envoy_cc_test_library( "pause_filter.cc", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", + "//envoy/http:filter_interface", + "//envoy/registry", "//source/common/network:connection_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", @@ -237,8 +237,8 @@ envoy_cc_test_library( ], tags = ["nofips"], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", + "//envoy/http:filter_interface", + "//envoy/registry", "//source/common/quic:quic_filter_manager_connection_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", @@ -254,9 +254,9 @@ envoy_cc_test_library( "process_context_filter.h", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:process_context_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:process_context_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -269,8 +269,8 @@ envoy_cc_test_library( ], deps = [ ":set_response_code_filter_config_proto_cc_proto", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", + "//envoy/http:filter_interface", + "//envoy/registry", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", ], @@ -288,8 +288,8 @@ envoy_cc_test_library( ], deps = [ ":set_is_terminal_filter_config_proto_cc_proto", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", + "//envoy/http:filter_interface", + "//envoy/registry", "//source/extensions/filters/http/common:factory_base_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", ], @@ -312,9 +312,9 @@ envoy_cc_test_library( ], deps = [ ":stop_and_continue_filter_config_proto_cc_proto", - "//include/envoy/common:scope_tracker_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", + "//envoy/common:scope_tracker_interface", + "//envoy/http:filter_interface", + "//envoy/registry", "//source/common/common:scope_tracker", "//source/common/network:connection_lib", "//source/extensions/filters/http/common:factory_base_lib", @@ -329,8 +329,8 @@ envoy_cc_test_library( "common.h", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", + "//envoy/http:filter_interface", + "//envoy/registry", "//test/extensions/filters/http/common:empty_http_filter_config_lib", "//test/test_common:utility_lib", ], @@ -342,9 +342,9 @@ envoy_cc_test_library( "request_metadata_filter.cc", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -356,8 +356,8 @@ envoy_cc_test_library( "random_pause_filter.cc", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", + "//envoy/http:filter_interface", + "//envoy/registry", "//source/common/network:connection_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", @@ -371,9 +371,9 @@ envoy_cc_test_library( "response_metadata_filter.cc", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -386,10 +386,10 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/event:timer_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/event:timer_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -402,10 +402,10 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/event:timer_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/event:timer_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -418,10 +418,10 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/event:timer_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/event:timer_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -434,10 +434,10 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/event:timer_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/event:timer_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -449,9 +449,9 @@ envoy_cc_test_library( "encoder_decoder_buffer_filter.cc", ], deps = [ - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", ], @@ -466,7 +466,7 @@ envoy_cc_test_library( "test_socket_interface.h", ], deps = [ - "//include/envoy/network:socket_interface", + "//envoy/network:socket_interface", "//source/common/common:assert_lib", "//source/common/common:utility_lib", "//source/common/network:address_lib", @@ -483,9 +483,9 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/common/http:header_utility_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", @@ -499,10 +499,10 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/network:filter_interface", - "//include/envoy/network:listen_socket_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/network:filter_interface", + "//envoy/network:listen_socket_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/common/common:assert_lib", "//source/common/common:minimal_logger_lib", "//source/common/network:address_lib", @@ -518,12 +518,27 @@ envoy_cc_test_library( ], deps = [ ":common_lib", - "//include/envoy/http:filter_interface", - "//include/envoy/registry", - "//include/envoy/server:filter_config_interface", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", "//source/common/router:delegating_route_lib", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/extensions/filters/http/common:empty_http_filter_config_lib", "//test/test_common:delegating_route_utility_lib", ], ) + +envoy_cc_test_library( + name = "remove_response_headers_lib", + srcs = [ + "remove_response_headers.cc", + ], + deps = [ + ":common_lib", + "//envoy/http:filter_interface", + "//envoy/registry", + "//envoy/server:filter_config_interface", + "//source/extensions/filters/http/common:pass_through_filter_lib", + "//test/extensions/filters/http/common:empty_http_filter_config_lib", + ], +) diff --git a/test/integration/filters/add_body_filter.cc b/test/integration/filters/add_body_filter.cc index 51faeb1e7b198..0f8b968e1417a 100644 --- a/test/integration/filters/add_body_filter.cc +++ b/test/integration/filters/add_body_filter.cc @@ -4,9 +4,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/add_trailers_filter.cc b/test/integration/filters/add_trailers_filter.cc index 744750aa4a47e..f97b1ad5153b0 100644 --- a/test/integration/filters/add_trailers_filter.cc +++ b/test/integration/filters/add_trailers_filter.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/address_restore_listener_filter.cc b/test/integration/filters/address_restore_listener_filter.cc index c769994b9644d..f0d6945019760 100644 --- a/test/integration/filters/address_restore_listener_filter.cc +++ b/test/integration/filters/address_restore_listener_filter.cc @@ -4,8 +4,8 @@ #include "envoy/network/listen_socket.h" #include "envoy/server/filter_config.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" namespace Envoy { diff --git a/test/integration/filters/backpressure_filter.cc b/test/integration/filters/backpressure_filter.cc index e5eb9ec6ea9af..b45ec99917367 100644 --- a/test/integration/filters/backpressure_filter.cc +++ b/test/integration/filters/backpressure_filter.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/call_decodedata_once_filter.cc b/test/integration/filters/call_decodedata_once_filter.cc index 520dbad96b821..adecc086186f4 100644 --- a/test/integration/filters/call_decodedata_once_filter.cc +++ b/test/integration/filters/call_decodedata_once_filter.cc @@ -1,7 +1,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/clear_route_cache_filter.cc b/test/integration/filters/clear_route_cache_filter.cc index 31102ee3c7ebb..95d39a9611314 100644 --- a/test/integration/filters/clear_route_cache_filter.cc +++ b/test/integration/filters/clear_route_cache_filter.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/continue_after_local_reply_filter.cc b/test/integration/filters/continue_after_local_reply_filter.cc index be79f0c84ccf2..acad17b278fc0 100644 --- a/test/integration/filters/continue_after_local_reply_filter.cc +++ b/test/integration/filters/continue_after_local_reply_filter.cc @@ -1,7 +1,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/continue_headers_only_inject_body_filter.cc b/test/integration/filters/continue_headers_only_inject_body_filter.cc index 22f1519a3a14a..b26bb93a639b5 100644 --- a/test/integration/filters/continue_headers_only_inject_body_filter.cc +++ b/test/integration/filters/continue_headers_only_inject_body_filter.cc @@ -4,9 +4,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/decode_headers_return_stop_all_filter.cc b/test/integration/filters/decode_headers_return_stop_all_filter.cc index 91edadb751537..96481d7112e5a 100644 --- a/test/integration/filters/decode_headers_return_stop_all_filter.cc +++ b/test/integration/filters/decode_headers_return_stop_all_filter.cc @@ -6,9 +6,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/eds_ready_filter.cc b/test/integration/filters/eds_ready_filter.cc index 2eaaf0b8e43ab..4c78e2e5fa43d 100644 --- a/test/integration/filters/eds_ready_filter.cc +++ b/test/integration/filters/eds_ready_filter.cc @@ -6,9 +6,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/encode_headers_return_stop_all_filter.cc b/test/integration/filters/encode_headers_return_stop_all_filter.cc index 2254204ec1003..8d55d6c8252ef 100644 --- a/test/integration/filters/encode_headers_return_stop_all_filter.cc +++ b/test/integration/filters/encode_headers_return_stop_all_filter.cc @@ -6,9 +6,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/encoder_decoder_buffer_filter.cc b/test/integration/filters/encoder_decoder_buffer_filter.cc index 22050f5cfcf38..da1019e45220c 100644 --- a/test/integration/filters/encoder_decoder_buffer_filter.cc +++ b/test/integration/filters/encoder_decoder_buffer_filter.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/invalid_header_filter.cc b/test/integration/filters/invalid_header_filter.cc index 7c11203566624..ca3aef326c441 100644 --- a/test/integration/filters/invalid_header_filter.cc +++ b/test/integration/filters/invalid_header_filter.cc @@ -4,9 +4,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/http/header_utility.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/http/header_utility.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/local_reply_during_encoding_data_filter.cc b/test/integration/filters/local_reply_during_encoding_data_filter.cc index 34066ba57c83f..be325b1c1d21f 100644 --- a/test/integration/filters/local_reply_during_encoding_data_filter.cc +++ b/test/integration/filters/local_reply_during_encoding_data_filter.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/local_reply_during_encoding_filter.cc b/test/integration/filters/local_reply_during_encoding_filter.cc index 54a6fadce8e95..34f78c6baf607 100644 --- a/test/integration/filters/local_reply_during_encoding_filter.cc +++ b/test/integration/filters/local_reply_during_encoding_filter.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/local_reply_with_metadata_filter.cc b/test/integration/filters/local_reply_with_metadata_filter.cc index 07580be29c6af..68647dc3bbec6 100644 --- a/test/integration/filters/local_reply_with_metadata_filter.cc +++ b/test/integration/filters/local_reply_with_metadata_filter.cc @@ -1,7 +1,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/metadata_stop_all_filter.cc b/test/integration/filters/metadata_stop_all_filter.cc index c7da739574179..8289bc6a0ef52 100644 --- a/test/integration/filters/metadata_stop_all_filter.cc +++ b/test/integration/filters/metadata_stop_all_filter.cc @@ -6,9 +6,8 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/buffer/buffer_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/modify_buffer_filter.cc b/test/integration/filters/modify_buffer_filter.cc index 1124cb96052ae..daffa70497e77 100644 --- a/test/integration/filters/modify_buffer_filter.cc +++ b/test/integration/filters/modify_buffer_filter.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/on_local_reply_filter.cc b/test/integration/filters/on_local_reply_filter.cc index c47f053903c65..75a3b712b130a 100644 --- a/test/integration/filters/on_local_reply_filter.cc +++ b/test/integration/filters/on_local_reply_filter.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/passthrough_filter.cc b/test/integration/filters/passthrough_filter.cc index ee828a51d0f84..215446233dd99 100644 --- a/test/integration/filters/passthrough_filter.cc +++ b/test/integration/filters/passthrough_filter.cc @@ -1,7 +1,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/pause_filter.cc b/test/integration/filters/pause_filter.cc index b7f9aa1a3c360..307372a0def65 100644 --- a/test/integration/filters/pause_filter.cc +++ b/test/integration/filters/pause_filter.cc @@ -2,9 +2,8 @@ #include "envoy/registry/registry.h" -#include "common/network/connection_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/network/connection_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/pause_filter_for_quic.cc b/test/integration/filters/pause_filter_for_quic.cc index de63bd7e47d5f..d7d9943c2ca1f 100644 --- a/test/integration/filters/pause_filter_for_quic.cc +++ b/test/integration/filters/pause_filter_for_quic.cc @@ -2,9 +2,8 @@ #include "envoy/registry/registry.h" -#include "common/quic/quic_filter_manager_connection_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/quic/quic_filter_manager_connection_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/process_context_filter.cc b/test/integration/filters/process_context_filter.cc index 25772dac574db..74c9322bc978a 100644 --- a/test/integration/filters/process_context_filter.cc +++ b/test/integration/filters/process_context_filter.cc @@ -8,7 +8,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/random_pause_filter.cc b/test/integration/filters/random_pause_filter.cc index e1a370ca015ca..2a674237d92e9 100644 --- a/test/integration/filters/random_pause_filter.cc +++ b/test/integration/filters/random_pause_filter.cc @@ -2,9 +2,8 @@ #include "envoy/registry/registry.h" -#include "common/network/connection_impl.h" - -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/network/connection_impl.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/test_common/utility.h" diff --git a/test/integration/filters/remove_response_headers.cc b/test/integration/filters/remove_response_headers.cc new file mode 100644 index 0000000000000..b342d05419431 --- /dev/null +++ b/test/integration/filters/remove_response_headers.cc @@ -0,0 +1,33 @@ +#include "envoy/registry/registry.h" +#include "envoy/server/filter_config.h" + +#include "source/extensions/filters/http/common/pass_through_filter.h" + +#include "test/extensions/filters/http/common/empty_http_filter_config.h" +#include "test/integration/filters/common.h" + +namespace Envoy { + +// Registers the misbehaving filter which removes all response headers. +class RemoveResponseHeadersFilter : public Http::PassThroughFilter { +public: + constexpr static char name[] = "remove-response-headers-filter"; + Http::FilterHeadersStatus encodeHeaders(Http::ResponseHeaderMap& headers, bool) override { + std::vector keys; + headers.iterate([&keys](const Http::HeaderEntry& header) -> Http::HeaderMap::Iterate { + keys.push_back(std::string(header.key().getStringView())); + return Http::HeaderMap::Iterate::Continue; + }); + for (auto& k : keys) { + const Http::LowerCaseString lower_key{k}; + headers.remove(lower_key); + } + return Http::FilterHeadersStatus::Continue; + } +}; + +static Registry::RegisterFactory, + Server::Configuration::NamedHttpFilterConfigFactory> + register_; + +} // namespace Envoy diff --git a/test/integration/filters/request_metadata_filter.cc b/test/integration/filters/request_metadata_filter.cc index ff4e7ba2033e3..2f56f16592330 100644 --- a/test/integration/filters/request_metadata_filter.cc +++ b/test/integration/filters/request_metadata_filter.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/response_metadata_filter.cc b/test/integration/filters/response_metadata_filter.cc index a45aa8c7586b6..73fdee7008ec7 100644 --- a/test/integration/filters/response_metadata_filter.cc +++ b/test/integration/filters/response_metadata_filter.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" diff --git a/test/integration/filters/set_is_terminal_filter.cc b/test/integration/filters/set_is_terminal_filter.cc index bc693629451fb..6b8a835d4254e 100644 --- a/test/integration/filters/set_is_terminal_filter.cc +++ b/test/integration/filters/set_is_terminal_filter.cc @@ -3,8 +3,8 @@ #include "envoy/http/filter.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/integration/filters/set_is_terminal_filter_config.pb.h" #include "test/integration/filters/set_is_terminal_filter_config.pb.validate.h" diff --git a/test/integration/filters/set_response_code_filter.cc b/test/integration/filters/set_response_code_filter.cc index e9964b8a58e53..b18c4fe6a6923 100644 --- a/test/integration/filters/set_response_code_filter.cc +++ b/test/integration/filters/set_response_code_filter.cc @@ -3,8 +3,8 @@ #include "envoy/http/filter.h" #include "envoy/registry/registry.h" -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/integration/filters/set_response_code_filter_config.pb.h" #include "test/integration/filters/set_response_code_filter_config.pb.validate.h" diff --git a/test/integration/filters/set_route_filter.cc b/test/integration/filters/set_route_filter.cc index 04d8a4977ba39..cebf7d91ba0b2 100644 --- a/test/integration/filters/set_route_filter.cc +++ b/test/integration/filters/set_route_filter.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/filters/stop_iteration_and_continue_filter.cc b/test/integration/filters/stop_iteration_and_continue_filter.cc index 3a1f91be901a6..8a9f79873e794 100644 --- a/test/integration/filters/stop_iteration_and_continue_filter.cc +++ b/test/integration/filters/stop_iteration_and_continue_filter.cc @@ -6,10 +6,9 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/common/scope_tracker.h" - -#include "extensions/filters/http/common/factory_base.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/common/common/scope_tracker.h" +#include "source/extensions/filters/http/common/factory_base.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/integration/filters/stop_and_continue_filter_config.pb.h" #include "test/integration/filters/stop_and_continue_filter_config.pb.validate.h" diff --git a/test/integration/filters/test_socket_interface.cc b/test/integration/filters/test_socket_interface.cc index 5adde112b4fee..cf0c1aa8a0de5 100644 --- a/test/integration/filters/test_socket_interface.cc +++ b/test/integration/filters/test_socket_interface.cc @@ -6,9 +6,9 @@ #include "envoy/extensions/network/socket_interface/v3/default_socket_interface.pb.h" #include "envoy/network/socket.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/utility.h" -#include "common/network/address_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/utility.h" +#include "source/common/network/address_impl.h" namespace Envoy { namespace Network { diff --git a/test/integration/filters/test_socket_interface.h b/test/integration/filters/test_socket_interface.h index 07980b5a9e59a..905b227dae254 100644 --- a/test/integration/filters/test_socket_interface.h +++ b/test/integration/filters/test_socket_interface.h @@ -5,8 +5,8 @@ #include "envoy/network/address.h" #include "envoy/network/socket.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/socket_interface_impl.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/socket_interface_impl.h" #include "absl/types/optional.h" diff --git a/test/integration/filters/wait_for_whole_request_and_response.cc b/test/integration/filters/wait_for_whole_request_and_response.cc index c9fd346073250..8c6ef178e1194 100644 --- a/test/integration/filters/wait_for_whole_request_and_response.cc +++ b/test/integration/filters/wait_for_whole_request_and_response.cc @@ -4,7 +4,7 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/filters/common.h" diff --git a/test/integration/h1_fuzz.cc b/test/integration/h1_fuzz.cc index 892af55567773..6b3c1530868eb 100644 --- a/test/integration/h1_fuzz.cc +++ b/test/integration/h1_fuzz.cc @@ -2,8 +2,8 @@ #include -#include "common/common/assert.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" #include "test/integration/http_integration.h" #include "test/test_common/environment.h" diff --git a/test/integration/h1_fuzz.h b/test/integration/h1_fuzz.h index 2d993f6b49022..fac23385806cd 100644 --- a/test/integration/h1_fuzz.h +++ b/test/integration/h1_fuzz.h @@ -1,7 +1,7 @@ #pragma once -#include "common/common/assert.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" #include "test/fuzz/fuzz_runner.h" #include "test/integration/capture_fuzz.pb.h" diff --git a/test/integration/h2_fuzz.cc b/test/integration/h2_fuzz.cc index ba3c39adfc313..c08417c2b4fbe 100644 --- a/test/integration/h2_fuzz.cc +++ b/test/integration/h2_fuzz.cc @@ -2,9 +2,9 @@ #include -#include "common/common/assert.h" -#include "common/common/base64.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/base64.h" +#include "source/common/common/logger.h" #include "test/test_common/environment.h" diff --git a/test/integration/h2_fuzz.h b/test/integration/h2_fuzz.h index 97a19b9ebc272..c17f784f807e3 100644 --- a/test/integration/h2_fuzz.h +++ b/test/integration/h2_fuzz.h @@ -1,7 +1,7 @@ #pragma once -#include "common/common/assert.h" -#include "common/common/logger.h" +#include "source/common/common/assert.h" +#include "source/common/common/logger.h" #include "test/common/http/http2/http2_frame.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/integration/hds_integration_test.cc b/test/integration/hds_integration_test.cc index 15ef2c8f36d1e..0f137953f886a 100644 --- a/test/integration/hds_integration_test.cc +++ b/test/integration/hds_integration_test.cc @@ -7,11 +7,11 @@ #include "envoy/type/v3/http.pb.h" #include "envoy/upstream/upstream.h" -#include "common/config/metadata.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" -#include "common/upstream/health_checker_impl.h" -#include "common/upstream/health_discovery_service.h" +#include "source/common/config/metadata.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/upstream/health_checker_impl.h" +#include "source/common/upstream/health_discovery_service.h" #include "test/common/upstream/utility.h" #include "test/config/utility.h" diff --git a/test/integration/header_casing_integration_test.cc b/test/integration/header_casing_integration_test.cc index f16994578c98b..12fb3fc10ec3e 100644 --- a/test/integration/header_casing_integration_test.cc +++ b/test/integration/header_casing_integration_test.cc @@ -1,7 +1,7 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "test/integration/http_integration.h" diff --git a/test/integration/header_integration_test.cc b/test/integration/header_integration_test.cc index 0d6c37098d2cb..0abf8213f4d4e 100644 --- a/test/integration/header_integration_test.cc +++ b/test/integration/header_integration_test.cc @@ -6,10 +6,10 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/api_version.h" -#include "common/config/metadata.h" -#include "common/http/exception.h" -#include "common/protobuf/protobuf.h" +#include "source/common/config/api_version.h" +#include "source/common/config/metadata.h" +#include "source/common/http/exception.h" +#include "source/common/protobuf/protobuf.h" #include "test/integration/http_integration.h" #include "test/test_common/network_utility.h" diff --git a/test/integration/hotrestart_main.cc b/test/integration/hotrestart_main.cc index 75f72cc364366..2a52e812a92b1 100644 --- a/test/integration/hotrestart_main.cc +++ b/test/integration/hotrestart_main.cc @@ -1,6 +1,5 @@ -#include "common/stats/utility.h" - -#include "exe/main_common.h" +#include "source/common/stats/utility.h" +#include "source/exe/main_common.h" // NOLINT(namespace-envoy) diff --git a/test/integration/http2_flood_integration_test.cc b/test/integration/http2_flood_integration_test.cc index 31ceac494591f..2e20e34a56484 100644 --- a/test/integration/http2_flood_integration_test.cc +++ b/test/integration/http2_flood_integration_test.cc @@ -5,10 +5,10 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/random_generator.h" -#include "common/http/header_map_impl.h" -#include "common/network/socket_option_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/random_generator.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/network/socket_option_impl.h" #include "test/integration/autonomous_upstream.h" #include "test/integration/http_integration.h" diff --git a/test/integration/http_integration.cc b/test/integration/http_integration.cc index 96bec817e661e..d6cdb86a8e5a4 100644 --- a/test/integration/http_integration.cc +++ b/test/integration/http_integration.cc @@ -16,24 +16,24 @@ #include "envoy/network/address.h" #include "envoy/registry/registry.h" -#include "common/api/api_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/fmt.h" -#include "common/common/thread_annotations.h" -#include "common/http/headers.h" -#include "common/network/socket_option_impl.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/common/thread_annotations.h" +#include "source/common/http/headers.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/upstream/upstream_impl.h" #ifdef ENVOY_ENABLE_QUIC -#include "common/quic/client_connection_factory_impl.h" +#include "source/common/quic/client_connection_factory_impl.h" #endif -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/context_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/common/upstream/utility.h" #include "test/integration/autonomous_upstream.h" @@ -248,20 +248,18 @@ IntegrationCodecClientPtr HttpIntegrationTest::makeRawHttpConnection( absl::optional http2_options) { std::shared_ptr cluster{new NiceMock()}; cluster->max_response_headers_count_ = 200; - envoy::config::core::v3::Http3ProtocolOptions http3_options; if (!http2_options.has_value()) { http2_options = Http2::Utility::initializeAndValidateOptions( envoy::config::core::v3::Http2ProtocolOptions()); http2_options.value().set_allow_connect(true); http2_options.value().set_allow_metadata(true); - } else if (http2_options.value().has_override_stream_error_on_invalid_http_message()) { - http3_options.mutable_override_stream_error_on_invalid_http_message()->set_value( - http2_options.value().override_stream_error_on_invalid_http_message().value()); - } else if (http2_options.value().stream_error_on_invalid_http_messaging()) { - http3_options.mutable_override_stream_error_on_invalid_http_message()->set_value(true); +#ifdef ENVOY_ENABLE_QUIC + } else { + cluster->http3_options_ = ConfigHelper::http2ToHttp3ProtocolOptions( + http2_options.value(), quic::kStreamReceiveWindowLimit); +#endif } cluster->http2_options_ = http2_options.value(); - cluster->http3_options_ = http3_options; cluster->http1_settings_.enable_trailers_ = true; Upstream::HostDescriptionConstSharedPtr host_description{Upstream::makeTestHostDescription( cluster, fmt::format("tcp://{}:80", Network::Test::getLoopbackAddressUrlString(version_)), @@ -1000,20 +998,8 @@ void HttpIntegrationTest::testEnvoyProxying1xx(bool continue_before_upstream_com bool with_encoder_filter, bool with_multiple_1xx_headers) { if (with_encoder_filter) { - // Because 100-continue only affects encoder filters, make sure it plays well with one. - config_helper_.addFilter("name: envoy.filters.http.cors"); - config_helper_.addConfigModifier( - [&](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager& - hcm) -> void { - auto* route_config = hcm.mutable_route_config(); - auto* virtual_host = route_config->mutable_virtual_hosts(0); - { - auto* cors = virtual_host->mutable_cors(); - cors->mutable_allow_origin_string_match()->Add()->set_exact("*"); - cors->set_allow_headers("content-type,x-grpc-web"); - cors->set_allow_methods("GET,POST"); - } - }); + // Add a filter to make sure 100s play well with them. + config_helper_.addFilter("name: passthrough-filter"); } config_helper_.addConfigModifier( [&](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager& diff --git a/test/integration/http_integration.h b/test/integration/http_integration.h index c6f709aa189b5..d8a15756bc09f 100644 --- a/test/integration/http_integration.h +++ b/test/integration/http_integration.h @@ -4,9 +4,9 @@ #include #include -#include "common/http/codec_client.h" -#include "common/http/http3/quic_client_connection_factory.h" -#include "common/network/filter_impl.h" +#include "source/common/http/codec_client.h" +#include "source/common/http/http3/quic_client_connection_factory.h" +#include "source/common/network/filter_impl.h" #include "test/common/http/http2/http2_frame.h" #include "test/integration/integration.h" diff --git a/test/integration/integration_admin_test.cc b/test/integration/integration_admin_test.cc index 886de0503a204..65da9c1fb119a 100644 --- a/test/integration/integration_admin_test.cc +++ b/test/integration/integration_admin_test.cc @@ -9,11 +9,11 @@ #include "envoy/config/route/v3/route.pb.h" #include "envoy/http/header_map.h" -#include "common/common/fmt.h" -#include "common/config/api_version.h" -#include "common/profiler/profiler.h" -#include "common/stats/histogram_impl.h" -#include "common/stats/stats_matcher_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/config/api_version.h" +#include "source/common/profiler/profiler.h" +#include "source/common/stats/histogram_impl.h" +#include "source/common/stats/stats_matcher_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/integration/utility.h" diff --git a/test/integration/integration_admin_test.h b/test/integration/integration_admin_test.h index 487ac3b3c63ec..194c54d02ae00 100644 --- a/test/integration/integration_admin_test.h +++ b/test/integration/integration_admin_test.h @@ -3,7 +3,7 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/config/metrics/v3/stats.pb.h" -#include "common/json/json_loader.h" +#include "source/common/json/json_loader.h" #include "test/integration/http_protocol_integration.h" #include "test/test_common/utility.h" diff --git a/test/integration/integration_stream_decoder.cc b/test/integration/integration_stream_decoder.cc index bc40535a5fe47..b4cc939b87bfe 100644 --- a/test/integration/integration_stream_decoder.cc +++ b/test/integration/integration_stream_decoder.cc @@ -10,7 +10,7 @@ #include "envoy/event/dispatcher.h" #include "envoy/http/header_map.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/integration/integration_stream_decoder.h b/test/integration/integration_stream_decoder.h index 74d06a75e544c..317ea6e1c8473 100644 --- a/test/integration/integration_stream_decoder.h +++ b/test/integration/integration_stream_decoder.h @@ -9,7 +9,7 @@ #include "envoy/http/header_map.h" #include "envoy/http/metadata_interface.h" -#include "common/common/dump_state_utils.h" +#include "source/common/common/dump_state_utils.h" #include "test/test_common/utility.h" diff --git a/test/integration/integration_tcp_client.cc b/test/integration/integration_tcp_client.cc index aabf2a957d956..a6535265c00f3 100644 --- a/test/integration/integration_tcp_client.cc +++ b/test/integration/integration_tcp_client.cc @@ -12,9 +12,9 @@ #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/fmt.h" -#include "common/network/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/network/utility.h" #include "test/integration/utility.h" #include "test/mocks/buffer/mocks.h" diff --git a/test/integration/integration_test.cc b/test/integration/integration_test.cc index c2406ddb79ac5..ccc4850097cf7 100644 --- a/test/integration/integration_test.cc +++ b/test/integration/integration_test.cc @@ -7,11 +7,11 @@ #include "envoy/config/route/v3/route_components.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/network/socket_option_impl.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" #include "test/integration/autonomous_upstream.h" #include "test/integration/filters/process_context_filter.h" diff --git a/test/integration/listener_filter_integration_test.cc b/test/integration/listener_filter_integration_test.cc index 3a1ae8fd54847..558109f8fde34 100644 --- a/test/integration/listener_filter_integration_test.cc +++ b/test/integration/listener_filter_integration_test.cc @@ -5,11 +5,10 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/extensions/access_loggers/file/v3/file.pb.h" -#include "common/config/api_version.h" -#include "common/network/utility.h" - -#include "extensions/filters/listener/tls_inspector/tls_inspector.h" -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/common/config/api_version.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/listener/tls_inspector/tls_inspector.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "test/integration/integration.h" #include "test/integration/ssl_utility.h" diff --git a/test/integration/listener_lds_integration_test.cc b/test/integration/listener_lds_integration_test.cc index 5907b8216055a..498f9f2a22bba 100644 --- a/test/integration/listener_lds_integration_test.cc +++ b/test/integration/listener_lds_integration_test.cc @@ -8,8 +8,8 @@ #include "envoy/network/connection.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/api_version.h" -#include "common/config/version_converter.h" +#include "source/common/config/api_version.h" +#include "source/common/config/version_converter.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/http_integration.h" diff --git a/test/integration/multiplexed_integration_test.cc b/test/integration/multiplexed_integration_test.cc index fbd7588c8c4bf..cf9980620f788 100644 --- a/test/integration/multiplexed_integration_test.cc +++ b/test/integration/multiplexed_integration_test.cc @@ -7,9 +7,9 @@ #include "envoy/config/cluster/v3/cluster.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/random_generator.h" -#include "common/http/header_map_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/random_generator.h" +#include "source/common/http/header_map_impl.h" #include "test/integration/filters/stop_and_continue_filter_config.pb.h" #include "test/integration/utility.h" @@ -123,7 +123,7 @@ TEST_P(Http2IntegrationTest, LargeRequestTrailersRejected) { testLargeRequestTra // Verify downstream codec stream flush timeout. TEST_P(Http2IntegrationTest, CodecStreamIdleTimeout) { - EXCLUDE_DOWNSTREAM_HTTP3; + EXCLUDE_DOWNSTREAM_HTTP3; // Need to support stream_idle_timeout. config_helper_.setBufferLimits(1024, 1024); config_helper_.addConfigModifier( [&](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager& @@ -147,6 +147,7 @@ TEST_P(Http2IntegrationTest, CodecStreamIdleTimeout) { } TEST_P(Http2IntegrationTest, Http2DownstreamKeepalive) { + // TODO(#16751) Need to support keepalive. EXCLUDE_DOWNSTREAM_HTTP3; constexpr uint64_t interval_ms = 1; constexpr uint64_t timeout_ms = 250; @@ -889,6 +890,7 @@ TEST_P(Http2IntegrationTest, GrpcRetry) { testGrpcRetry(); } // Verify the case where there is an HTTP/2 codec/protocol error with an active stream. TEST_P(Http2IntegrationTest, CodecErrorAfterStreamStart) { + // TODO(#16757) Needs HTTP/3 "bad frame" equivalent. EXCLUDE_DOWNSTREAM_HTTP3; initialize(); codec_client_ = makeHttpConnection(lookupPort("http")); diff --git a/test/integration/multiplexed_upstream_integration_test.cc b/test/integration/multiplexed_upstream_integration_test.cc index 8118928ad1cca..694aebb9d41c7 100644 --- a/test/integration/multiplexed_upstream_integration_test.cc +++ b/test/integration/multiplexed_upstream_integration_test.cc @@ -5,7 +5,7 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/http/header_map_impl.h" +#include "source/common/http/header_map_impl.h" #include "test/integration/autonomous_upstream.h" #include "test/test_common/printers.h" @@ -17,17 +17,10 @@ namespace Envoy { INSTANTIATE_TEST_SUITE_P(Protocols, Http2UpstreamIntegrationTest, testing::ValuesIn(HttpProtocolIntegrationTest::getProtocolTestParams( - {Http::CodecType::HTTP2}, {Http::CodecType::HTTP2})), + {Http::CodecType::HTTP2}, + {Http::CodecType::HTTP2, Http::CodecType::HTTP3})), HttpProtocolIntegrationTest::protocolTestParamsToString); -// TODO(alyssawilk) move #defines into getProtocolTestParams in a follow-up -#ifdef ENVOY_ENABLE_QUIC -INSTANTIATE_TEST_SUITE_P(ProtocolsWithQuic, Http2UpstreamIntegrationTest, - testing::ValuesIn(HttpProtocolIntegrationTest::getProtocolTestParams( - {Http::CodecType::HTTP2}, {Http::CodecType::HTTP3})), - HttpProtocolIntegrationTest::protocolTestParamsToString); -#endif - TEST_P(Http2UpstreamIntegrationTest, RouterRequestAndResponseWithBodyNoBuffer) { testRouterRequestAndResponseWithBody(1024, 512, false); } @@ -333,6 +326,14 @@ TEST_P(Http2UpstreamIntegrationTest, ManyLargeSimultaneousRequestWithBufferLimit } TEST_P(Http2UpstreamIntegrationTest, ManyLargeSimultaneousRequestWithRandomBackup) { + if (upstreamProtocol() == Http::CodecType::HTTP3 && + downstreamProtocol() == Http::CodecType::HTTP2) { + // This test depends on fragile preconditions. + // With HTTP/2 downstream all the requests are processed before the + // responses are sent, then the connection read-disable results in not + // receiving flow control window updates. + return; + } config_helper_.addFilter( fmt::format(R"EOF( name: pause-filter{} diff --git a/test/integration/overload_integration_test.cc b/test/integration/overload_integration_test.cc index e284321697bea..33973434429c6 100644 --- a/test/integration/overload_integration_test.cc +++ b/test/integration/overload_integration_test.cc @@ -115,7 +115,10 @@ class OverloadIntegrationTest : public HttpProtocolIntegrationTest { }; INSTANTIATE_TEST_SUITE_P(Protocols, OverloadIntegrationTest, - testing::ValuesIn(HttpProtocolIntegrationTest::getProtocolTestParams()), + testing::ValuesIn(HttpProtocolIntegrationTest::getProtocolTestParams( + {Http::CodecClient::Type::HTTP1, Http::CodecClient::Type::HTTP2, + Http::CodecClient::Type::HTTP3}, + {FakeHttpConnection::Type::HTTP1, FakeHttpConnection::Type::HTTP2})), HttpProtocolIntegrationTest::protocolTestParamsToString); TEST_P(OverloadIntegrationTest, CloseStreamsWhenOverloaded) { @@ -221,17 +224,29 @@ TEST_P(OverloadIntegrationTest, StopAcceptingConnectionsWhenOverloaded) { updateResource(0.95); test_server_->waitForGaugeEq("overload.envoy.overload_actions.stop_accepting_connections.active", 1); - codec_client_ = makeHttpConnection(makeClientConnection((lookupPort("http")))); - Http::TestRequestHeaderMapImpl request_headers{ - {":method", "GET"}, {":path", "/test/long/url"}, {":scheme", "http"}, {":authority", "host"}}; - auto response = codec_client_->makeRequestWithBody(request_headers, 10); - EXPECT_FALSE(fake_upstreams_[0]->waitForHttpConnection(*dispatcher_, fake_upstream_connection_, - std::chrono::milliseconds(1000))); + IntegrationStreamDecoderPtr response; + if (downstreamProtocol() == Http::CodecClient::Type::HTTP3) { + // For HTTP/3, excess connections are force-rejected. + codec_client_ = + makeRawHttpConnection(makeClientConnection((lookupPort("http"))), absl::nullopt); + EXPECT_TRUE(codec_client_->disconnected()); + } else { + // For HTTP/2 and below, excess connection won't be accepted, but will hang out + // in a pending state and resume below. + codec_client_ = makeHttpConnection(makeClientConnection((lookupPort("http")))); + response = codec_client_->makeRequestWithBody(default_request_headers_, 10); + EXPECT_FALSE(fake_upstreams_[0]->waitForHttpConnection(*dispatcher_, fake_upstream_connection_, + std::chrono::milliseconds(1000))); + } // Reduce load a little to allow the connection to be accepted. updateResource(0.9); test_server_->waitForGaugeEq("overload.envoy.overload_actions.stop_accepting_connections.active", 0); + if (downstreamProtocol() == Http::CodecClient::Type::HTTP3) { + codec_client_ = makeHttpConnection(makeClientConnection((lookupPort("http")))); + response = codec_client_->makeRequestWithBody(default_request_headers_, 10); + } EXPECT_TRUE(fake_upstreams_[0]->waitForHttpConnection(*dispatcher_, fake_upstream_connection_)); EXPECT_TRUE(fake_upstream_connection_->waitForNewStream(*dispatcher_, upstream_request_)); ASSERT_TRUE(upstream_request_->waitForHeadersComplete()); diff --git a/test/integration/protocol_integration_test.cc b/test/integration/protocol_integration_test.cc index 13798f7509f0b..4b9e1cdf7732b 100644 --- a/test/integration/protocol_integration_test.cc +++ b/test/integration/protocol_integration_test.cc @@ -15,16 +15,16 @@ #include "envoy/http/header_map.h" #include "envoy/registry/registry.h" -#include "common/api/api_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/fmt.h" -#include "common/common/thread_annotations.h" -#include "common/http/headers.h" -#include "common/http/utility.h" -#include "common/network/utility.h" -#include "common/protobuf/utility.h" -#include "common/runtime/runtime_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/common/thread_annotations.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "test/common/http/http2/http2_frame.h" #include "test/common/upstream/utility.h" @@ -1920,8 +1920,6 @@ name: passthrough-filter // Tests encodeHeaders() returns StopAllIterationAndBuffer. TEST_P(DownstreamProtocolIntegrationTest, TestEncodeHeadersReturnsStopAll) { - // encodeMetadata() not supported in QUICHE. - EXCLUDE_DOWNSTREAM_HTTP3 config_helper_.addFilter(R"EOF( name: encode-headers-return-stop-all-filter )EOF"); @@ -1956,8 +1954,6 @@ name: encode-headers-return-stop-all-filter // Tests encodeHeaders() returns StopAllIterationAndWatermark. TEST_P(DownstreamProtocolIntegrationTest, TestEncodeHeadersReturnsStopAllWatermark) { - // Metadata is not supported in QUICHE. - EXCLUDE_DOWNSTREAM_HTTP3 config_helper_.addFilter(R"EOF( name: encode-headers-return-stop-all-filter )EOF"); @@ -2400,4 +2396,44 @@ TEST_P(DownstreamProtocolIntegrationTest, DisableStripTrailingHostDot) { EXPECT_EQ("404", response->headers().getStatusValue()); } +static std::string remove_response_headers_filter = R"EOF( +name: remove-response-headers-filter +typed_config: + "@type": type.googleapis.com/google.protobuf.Empty +)EOF"; + +TEST_P(ProtocolIntegrationTest, HeadersOnlyRequestWithRemoveResponseHeadersFilter) { + config_helper_.addFilter(remove_response_headers_filter); + initialize(); + codec_client_ = makeHttpConnection(lookupPort("http")); + + IntegrationStreamDecoderPtr response = + codec_client_->makeHeaderOnlyRequest(default_request_headers_); + waitForNextUpstreamRequest(); + upstream_request_->encodeHeaders(default_response_headers_, false); + ASSERT_TRUE(response->waitForEndStream()); + // If a filter chain removes :status from the response headers, then Envoy must reply with + // BadGateway and must not crash. + ASSERT_TRUE(codec_client_->connected()); + EXPECT_EQ("502", response->headers().getStatusValue()); + EXPECT_THAT(response->body(), HasSubstr("missing required header: :status")); +} + +TEST_P(ProtocolIntegrationTest, RemoveResponseHeadersFilter) { + config_helper_.addFilter(remove_response_headers_filter); + initialize(); + codec_client_ = makeHttpConnection(lookupPort("http")); + + IntegrationStreamDecoderPtr response = + codec_client_->makeRequestWithBody(default_request_headers_, 10); + waitForNextUpstreamRequest(); + upstream_request_->encodeHeaders(default_response_headers_, false); + ASSERT_TRUE(response->waitForEndStream()); + // If a filter chain removes :status from the response headers, then Envoy must reply with + // BadGateway and not crash. + ASSERT_TRUE(codec_client_->connected()); + EXPECT_EQ("502", response->headers().getStatusValue()); + EXPECT_THAT(response->body(), HasSubstr("missing required header: :status")); +} + } // namespace Envoy diff --git a/test/integration/proxy_proto_integration_test.cc b/test/integration/proxy_proto_integration_test.cc index 6a5f060303858..dc683f6772050 100644 --- a/test/integration/proxy_proto_integration_test.cc +++ b/test/integration/proxy_proto_integration_test.cc @@ -5,7 +5,7 @@ #include "envoy/extensions/access_loggers/file/v3/file.pb.h" #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "test/test_common/network_utility.h" #include "test/test_common/printers.h" @@ -56,7 +56,7 @@ TEST_P(ProxyProtoIntegrationTest, CaptureTlvToMetadata) { testRouterRequestAndResponseWithBody(1024, 512, false, false, &creator); cleanupUpstreamAndDownstream(); const std::string log_line = waitForAccessLog(listener_access_log_name_); - EXPECT_EQ(log_line, "\"foo.com\""); + EXPECT_EQ(log_line, "foo.com"); } TEST_P(ProxyProtoIntegrationTest, V1RouterRequestAndResponseWithBodyNoBuffer) { diff --git a/test/integration/proxy_proto_integration_test.h b/test/integration/proxy_proto_integration_test.h index 3a719ad44aaf0..cfce0d5534616 100644 --- a/test/integration/proxy_proto_integration_test.h +++ b/test/integration/proxy_proto_integration_test.h @@ -2,9 +2,8 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "common/http/codec_client.h" - -#include "extensions/filters/listener/proxy_protocol/proxy_protocol.h" +#include "source/common/http/codec_client.h" +#include "source/extensions/filters/listener/proxy_protocol/proxy_protocol.h" #include "test/integration/fake_upstream.h" #include "test/integration/http_integration.h" diff --git a/test/integration/quic_http_integration_test.cc b/test/integration/quic_http_integration_test.cc index 3790873bc89a6..1f774f1e69df8 100644 --- a/test/integration/quic_http_integration_test.cc +++ b/test/integration/quic_http_integration_test.cc @@ -27,18 +27,18 @@ #pragma GCC diagnostic pop #endif -#include "common/quic/client_connection_factory_impl.h" -#include "common/quic/envoy_quic_client_session.h" -#include "common/quic/envoy_quic_client_connection.h" -#include "common/quic/envoy_quic_proof_verifier.h" -#include "common/quic/envoy_quic_connection_helper.h" -#include "common/quic/envoy_quic_alarm_factory.h" -#include "common/quic/envoy_quic_packet_writer.h" -#include "common/quic/envoy_quic_utils.h" -#include "common/quic/quic_transport_socket_factory.h" +#include "source/common/quic/client_connection_factory_impl.h" +#include "source/common/quic/envoy_quic_client_session.h" +#include "source/common/quic/envoy_quic_client_connection.h" +#include "source/common/quic/envoy_quic_proof_verifier.h" +#include "source/common/quic/envoy_quic_connection_helper.h" +#include "source/common/quic/envoy_quic_alarm_factory.h" +#include "source/common/quic/envoy_quic_packet_writer.h" +#include "source/common/quic/envoy_quic_utils.h" +#include "source/common/quic/quic_transport_socket_factory.h" #include "test/common/quic/test_utils.h" #include "test/config/integration/certs/clientcert_hash.h" -#include "extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" #if defined(ENVOY_CONFIG_COVERAGE) #define DISABLE_UNDER_COVERAGE return @@ -62,10 +62,6 @@ class CodecClientCallbacksForTest : public Http::CodecClientCallbacks { Http::StreamResetReason last_stream_reset_reason_{Http::StreamResetReason::LocalReset}; }; -void updateResource(AtomicFileUpdater& updater, double pressure) { - updater.update(absl::StrCat(pressure)); -} - // A test that sets up its own client connection with customized quic version and connection ID. class QuicHttpIntegrationTest : public HttpIntegrationTest, public QuicMultiVersionTest { public: @@ -80,11 +76,7 @@ class QuicHttpIntegrationTest : public HttpIntegrationTest, public QuicMultiVers SetQuicReloadableFlag(quic_disable_version_draft_29, !use_http3); return quic::CurrentSupportedVersions(); }()), - conn_helper_(*dispatcher_), alarm_factory_(*dispatcher_, *conn_helper_.GetClock()), - injected_resource_filename_1_(TestEnvironment::temporaryPath("injected_resource_1")), - injected_resource_filename_2_(TestEnvironment::temporaryPath("injected_resource_2")), - file_updater_1_(injected_resource_filename_1_), - file_updater_2_(injected_resource_filename_2_) {} + conn_helper_(*dispatcher_), alarm_factory_(*dispatcher_, *conn_helper_.GetClock()) {} ~QuicHttpIntegrationTest() override { cleanupUpstreamAndDownstream(); @@ -144,42 +136,6 @@ class QuicHttpIntegrationTest : public HttpIntegrationTest, public QuicMultiVers } void initialize() override { - config_helper_.addConfigModifier([this](envoy::config::bootstrap::v3::Bootstrap& bootstrap) { - const std::string overload_config = - fmt::format(R"EOF( - refresh_interval: - seconds: 0 - nanos: 1000000 - resource_monitors: - - name: "envoy.resource_monitors.injected_resource_1" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.injected_resource.v3.InjectedResourceConfig - filename: "{}" - - name: "envoy.resource_monitors.injected_resource_2" - typed_config: - "@type": type.googleapis.com/envoy.extensions.resource_monitors.injected_resource.v3.InjectedResourceConfig - filename: "{}" - actions: - - name: "envoy.overload_actions.stop_accepting_requests" - triggers: - - name: "envoy.resource_monitors.injected_resource_1" - threshold: - value: 0.95 - - name: "envoy.overload_actions.stop_accepting_connections" - triggers: - - name: "envoy.resource_monitors.injected_resource_1" - threshold: - value: 0.9 - - name: "envoy.overload_actions.disable_http_keepalive" - triggers: - - name: "envoy.resource_monitors.injected_resource_2" - threshold: - value: 0.8 - )EOF", - injected_resource_filename_1_, injected_resource_filename_2_); - *bootstrap.mutable_overload_manager() = - TestUtility::parseYaml(overload_config); - }); config_helper_.addConfigModifier( [](envoy::extensions::filters::network::http_connection_manager::v3::HttpConnectionManager& hcm) { @@ -189,8 +145,6 @@ class QuicHttpIntegrationTest : public HttpIntegrationTest, public QuicMultiVers v3::HttpConnectionManager::HTTP3); }); - updateResource(file_updater_1_, 0); - updateResource(file_updater_2_, 0); HttpIntegrationTest::initialize(); // Latch quic_transport_socket_factory_ which is instantiated in initialize(). transport_socket_factory_ = @@ -270,10 +224,6 @@ class QuicHttpIntegrationTest : public HttpIntegrationTest, public QuicMultiVers CodecClientCallbacksForTest client_codec_callback_; Network::Address::InstanceConstSharedPtr server_addr_; EnvoyQuicClientConnection* quic_connection_{nullptr}; - const std::string injected_resource_filename_1_; - const std::string injected_resource_filename_2_; - AtomicFileUpdater file_updater_1_; - AtomicFileUpdater file_updater_2_; std::list designated_connection_ids_; Quic::QuicClientTransportSocketFactory* transport_socket_factory_{nullptr}; }; @@ -313,6 +263,16 @@ TEST_P(QuicHttpIntegrationTest, ZeroRtt) { ->EarlyDataAccepted()); // Close the second connection. codec_client_->close(); + if (GetParam().first == Network::Address::IpVersion::v4) { + test_server_->waitForCounterEq( + "listener.127.0.0.1_0.http3.downstream.rx.quic_connection_close_error_" + "code_QUIC_NO_ERROR", + 2u); + } else { + test_server_->waitForCounterEq("listener.[__1]_0.http3.downstream.rx.quic_connection_close_" + "error_code_QUIC_NO_ERROR", + 2u); + } } // Ensure multiple quic connections work, regardless of platform BPF support @@ -377,75 +337,6 @@ TEST_P(QuicHttpIntegrationTest, PortMigration) { cleanupUpstreamAndDownstream(); } -TEST_P(QuicHttpIntegrationTest, StopAcceptingConnectionsWhenOverloaded) { - initialize(); - - // Put envoy in overloaded state and check that it doesn't accept the new client connection. - updateResource(file_updater_1_, 0.9); - test_server_->waitForGaugeEq("overload.envoy.overload_actions.stop_accepting_connections.active", - 1); - codec_client_ = makeRawHttpConnection(makeClientConnection((lookupPort("http"))), absl::nullopt); - EXPECT_TRUE(codec_client_->disconnected()); - - // Reduce load a little to allow the connection to be accepted connection. - updateResource(file_updater_1_, 0.8); - test_server_->waitForGaugeEq("overload.envoy.overload_actions.stop_accepting_connections.active", - 0); - codec_client_ = makeHttpConnection(makeClientConnection((lookupPort("http")))); - auto response = codec_client_->makeHeaderOnlyRequest(default_request_headers_); - waitForNextUpstreamRequest(0); - // Send response headers, but hold response body for now. - upstream_request_->encodeHeaders(default_response_headers_, /*end_stream=*/false); - - updateResource(file_updater_1_, 0.95); - test_server_->waitForGaugeEq("overload.envoy.overload_actions.stop_accepting_requests.active", 1); - // Existing request should be able to finish. - upstream_request_->encodeData(10, true); - ASSERT_TRUE(response->waitForEndStream()); - EXPECT_TRUE(response->complete()); - EXPECT_EQ("200", response->headers().getStatusValue()); - - // New request should be rejected. - auto response2 = codec_client_->makeHeaderOnlyRequest(default_request_headers_); - ASSERT_TRUE(response2->waitForEndStream()); - EXPECT_EQ("503", response2->headers().getStatusValue()); - EXPECT_EQ("envoy overloaded", response2->body()); - codec_client_->close(); - - EXPECT_TRUE(makeRawHttpConnection(makeClientConnection((lookupPort("http"))), absl::nullopt) - ->disconnected()); -} - -TEST_P(QuicHttpIntegrationTest, NoNewStreamsWhenOverloaded) { - initialize(); - updateResource(file_updater_1_, 0.7); - - codec_client_ = makeHttpConnection(makeClientConnection((lookupPort("http")))); - - // Send a complete request and start a second. - auto response = codec_client_->makeHeaderOnlyRequest(default_request_headers_); - waitForNextUpstreamRequest(0); - upstream_request_->encodeHeaders(default_response_headers_, true); - ASSERT_TRUE(response->waitForEndStream()); - - auto response2 = codec_client_->makeHeaderOnlyRequest(default_request_headers_); - waitForNextUpstreamRequest(0); - - // Enable the disable-keepalive overload action. This should send a shutdown notice before - // encoding the headers. - updateResource(file_updater_2_, 0.9); - test_server_->waitForGaugeEq("overload.envoy.overload_actions.disable_http_keepalive.active", 1); - - upstream_request_->encodeHeaders(default_response_headers_, /*end_stream=*/false); - upstream_request_->encodeData(10, true); - - response2->waitForHeaders(); - EXPECT_TRUE(codec_client_->waitForDisconnect()); - - EXPECT_TRUE(codec_client_->sawGoAway()); - codec_client_->close(); -} - TEST_P(QuicHttpIntegrationTest, AdminDrainDrainsListeners) { testAdminDrain(Http::CodecType::HTTP1); } diff --git a/test/integration/scoped_rds_integration_test.cc b/test/integration/scoped_rds_integration_test.cc index 7a90c3e003df1..6daa40e230a84 100644 --- a/test/integration/scoped_rds_integration_test.cc +++ b/test/integration/scoped_rds_integration_test.cc @@ -6,8 +6,8 @@ #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/api_version.h" -#include "common/config/version_converter.h" +#include "source/common/config/api_version.h" +#include "source/common/config/version_converter.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/http_integration.h" diff --git a/test/integration/sds_dynamic_integration_test.cc b/test/integration/sds_dynamic_integration_test.cc index f4af19bc4f97e..e29fc1e9cf4b9 100644 --- a/test/integration/sds_dynamic_integration_test.cc +++ b/test/integration/sds_dynamic_integration_test.cc @@ -9,19 +9,19 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/service/secret/v3/sds.pb.h" -#include "common/config/api_version.h" -#include "common/event/dispatcher_impl.h" -#include "common/http/utility.h" -#include "common/network/connection_impl.h" -#include "common/network/utility.h" +#include "source/common/config/api_version.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/http/utility.h" +#include "source/common/network/connection_impl.h" +#include "source/common/network/utility.h" #ifdef ENVOY_ENABLE_QUIC -#include "common/quic/client_connection_factory_impl.h" +#include "source/common/quic/client_connection_factory_impl.h" #endif -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/context_manager_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/config/integration/certs/clientcert_hash.h" @@ -240,7 +240,7 @@ class SdsDynamicDownstreamIntegrationTest : public SdsDynamicIntegrationBaseTest secret_config_ecdsa->set_name(server_cert_ecdsa_); auto* config_source = secret_config_ecdsa->mutable_sds_config(); - constexpr absl::string_view sds_template = + const std::string sds_template = R"EOF( --- version_info: "0" diff --git a/test/integration/sds_generic_secret_integration_test.cc b/test/integration/sds_generic_secret_integration_test.cc index e830dce4a2344..581870cab2c74 100644 --- a/test/integration/sds_generic_secret_integration_test.cc +++ b/test/integration/sds_generic_secret_integration_test.cc @@ -6,8 +6,8 @@ #include "envoy/secret/secret_provider.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/config/datasource.h" -#include "common/grpc/common.h" +#include "source/common/config/datasource.h" +#include "source/common/grpc/common.h" #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/integration/http_integration.h" diff --git a/test/integration/sds_static_integration_test.cc b/test/integration/sds_static_integration_test.cc index 97636f2516201..47d19d59fa545 100644 --- a/test/integration/sds_static_integration_test.cc +++ b/test/integration/sds_static_integration_test.cc @@ -5,13 +5,12 @@ #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" #include "envoy/stats/scope.h" -#include "common/common/thread.h" -#include "common/event/dispatcher_impl.h" -#include "common/network/connection_impl.h" -#include "common/network/utility.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/common/common/thread.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/network/connection_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "test/config/integration/certs/clientcert_hash.h" #include "test/integration/http_integration.h" diff --git a/test/integration/server.cc b/test/integration/server.cc index 8ff6756b261aa..99a5ecbd0732b 100644 --- a/test/integration/server.cc +++ b/test/integration/server.cc @@ -5,16 +5,15 @@ #include "envoy/http/header_map.h" -#include "common/common/random_generator.h" -#include "common/common/thread.h" -#include "common/local_info/local_info_impl.h" -#include "common/network/utility.h" -#include "common/stats/thread_local_store.h" -#include "common/thread_local/thread_local_impl.h" - -#include "server/hot_restart_nop_impl.h" -#include "server/options_impl.h" -#include "server/process_context_impl.h" +#include "source/common/common/random_generator.h" +#include "source/common/common/thread.h" +#include "source/common/local_info/local_info_impl.h" +#include "source/common/network/utility.h" +#include "source/common/stats/thread_local_store.h" +#include "source/common/thread_local/thread_local_impl.h" +#include "source/server/hot_restart_nop_impl.h" +#include "source/server/options_impl.h" +#include "source/server/process_context_impl.h" #include "test/common/runtime/utility.h" #include "test/integration/utility.h" diff --git a/test/integration/server.h b/test/integration/server.h index b28b08aaac0e8..a192058fa6e0b 100644 --- a/test/integration/server.h +++ b/test/integration/server.h @@ -11,16 +11,15 @@ #include "envoy/server/process_context.h" #include "envoy/stats/stats.h" -#include "common/common/assert.h" -#include "common/common/lock_guard.h" -#include "common/common/logger.h" -#include "common/common/thread.h" -#include "common/stats/allocator_impl.h" - -#include "server/drain_manager_impl.h" -#include "server/listener_hooks.h" -#include "server/options_impl.h" -#include "server/server.h" +#include "source/common/common/assert.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/common/stats/allocator_impl.h" +#include "source/server/drain_manager_impl.h" +#include "source/server/listener_hooks.h" +#include "source/server/options_impl.h" +#include "source/server/server.h" #include "test/integration/server_stats.h" #include "test/integration/tcp_dump.h" diff --git a/test/integration/socket_interface_integration_test.cc b/test/integration/socket_interface_integration_test.cc index 235867e577399..63a531a415753 100644 --- a/test/integration/socket_interface_integration_test.cc +++ b/test/integration/socket_interface_integration_test.cc @@ -1,6 +1,6 @@ -#include "common/buffer/buffer_impl.h" -#include "common/network/address_impl.h" -#include "common/network/socket_interface.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/socket_interface.h" #include "test/integration/integration.h" #include "test/test_common/environment.h" diff --git a/test/integration/socket_interface_swap.h b/test/integration/socket_interface_swap.h index 77e4fbca342dd..ee4f84db47659 100644 --- a/test/integration/socket_interface_swap.h +++ b/test/integration/socket_interface_swap.h @@ -1,6 +1,6 @@ #pragma once -#include "common/network/socket_interface.h" +#include "source/common/network/socket_interface.h" #include "test/integration/filters/test_socket_interface.h" diff --git a/test/integration/ssl_utility.cc b/test/integration/ssl_utility.cc index 0cc1f7de4cfbc..36b93b6f81bca 100644 --- a/test/integration/ssl_utility.cc +++ b/test/integration/ssl_utility.cc @@ -2,13 +2,12 @@ #include "envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.h" -#include "common/http/utility.h" -#include "common/json/json_loader.h" -#include "common/network/utility.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/context_manager_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/http/utility.h" +#include "source/common/json/json_loader.h" +#include "source/common/network/utility.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/config/utility.h" #include "test/integration/server.h" diff --git a/test/integration/stats_integration_test.cc b/test/integration/stats_integration_test.cc index 7a6981a5d9a39..43ad25d1096a1 100644 --- a/test/integration/stats_integration_test.cc +++ b/test/integration/stats_integration_test.cc @@ -5,8 +5,8 @@ #include "envoy/stats/scope.h" #include "envoy/stats/stats.h" -#include "common/config/well_known_names.h" -#include "common/memory/stats.h" +#include "source/common/config/well_known_names.h" +#include "source/common/memory/stats.h" #include "test/common/stats/stat_test_utility.h" #include "test/config/utility.h" diff --git a/test/integration/tcp_conn_pool_integration_test.cc b/test/integration/tcp_conn_pool_integration_test.cc index bf02e97f5ccf0..a04f1f8f4d0e2 100644 --- a/test/integration/tcp_conn_pool_integration_test.cc +++ b/test/integration/tcp_conn_pool_integration_test.cc @@ -24,13 +24,13 @@ class TestFilter : public Network::ReadFilter { Network::FilterStatus onData(Buffer::Instance& data, bool end_stream) override { UNREFERENCED_PARAMETER(end_stream); - Tcp::ConnectionPool::Instance* pool = + absl::optional pool_data = cluster_manager_.getThreadLocalCluster("cluster_0") ->tcpConnPool(Upstream::ResourcePriority::Default, nullptr); - ASSERT(pool != nullptr); + ASSERT(pool_data.has_value()); requests_.emplace_back(*this, data); - pool->newConnection(requests_.back()); + pool_data.value().newConnection(requests_.back()); ASSERT(data.length() == 0); return Network::FilterStatus::StopIteration; diff --git a/test/integration/tcp_dump.cc b/test/integration/tcp_dump.cc index b8d7c84861568..bd31e60606ee1 100644 --- a/test/integration/tcp_dump.cc +++ b/test/integration/tcp_dump.cc @@ -7,8 +7,8 @@ #include "envoy/common/platform.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" namespace Envoy { diff --git a/test/integration/tcp_proxy_integration_test.cc b/test/integration/tcp_proxy_integration_test.cc index 532337a848dc7..687b6ab9241a6 100644 --- a/test/integration/tcp_proxy_integration_test.cc +++ b/test/integration/tcp_proxy_integration_test.cc @@ -9,11 +9,10 @@ #include "envoy/extensions/access_loggers/file/v3/file.pb.h" #include "envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.h" -#include "common/config/api_version.h" -#include "common/network/utility.h" - -#include "extensions/filters/network/common/factory_base.h" -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/common/config/api_version.h" +#include "source/common/network/utility.h" +#include "source/extensions/filters/network/common/factory_base.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "test/integration/ssl_utility.h" #include "test/integration/tcp_proxy_integration_test.pb.h" diff --git a/test/integration/tracked_watermark_buffer.cc b/test/integration/tracked_watermark_buffer.cc index 3bc07cb7a9252..61c74f79ac755 100644 --- a/test/integration/tracked_watermark_buffer.cc +++ b/test/integration/tracked_watermark_buffer.cc @@ -4,7 +4,7 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/thread_local/thread_local_object.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Buffer { diff --git a/test/integration/tracked_watermark_buffer.h b/test/integration/tracked_watermark_buffer.h index bc05db5d4ca03..b3402d3c643bd 100644 --- a/test/integration/tracked_watermark_buffer.h +++ b/test/integration/tracked_watermark_buffer.h @@ -3,8 +3,8 @@ #include "envoy/buffer/buffer.h" #include "envoy/server/instance.h" -#include "common/buffer/buffer_impl.h" -#include "common/buffer/watermark_buffer.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/buffer/watermark_buffer.h" #include "test/test_common/utility.h" diff --git a/test/integration/tracked_watermark_buffer_test.cc b/test/integration/tracked_watermark_buffer_test.cc index f38a2968dcc37..c6579bfcddbc1 100644 --- a/test/integration/tracked_watermark_buffer_test.cc +++ b/test/integration/tracked_watermark_buffer_test.cc @@ -3,7 +3,7 @@ #include "envoy/buffer/buffer.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "test/integration/tracked_watermark_buffer.h" #include "test/mocks/common.h" diff --git a/test/integration/uds_integration_test.cc b/test/integration/uds_integration_test.cc index b6cef5449b525..11cfcd10efacb 100644 --- a/test/integration/uds_integration_test.cc +++ b/test/integration/uds_integration_test.cc @@ -2,9 +2,9 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/event/dispatcher_impl.h" -#include "common/network/utility.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/network/utility.h" #include "test/test_common/network_utility.h" diff --git a/test/integration/uds_integration_test.h b/test/integration/uds_integration_test.h index f2961b62eb141..23df1ee7643f7 100644 --- a/test/integration/uds_integration_test.h +++ b/test/integration/uds_integration_test.h @@ -4,8 +4,8 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "common/common/fmt.h" -#include "common/http/codec_client.h" +#include "source/common/common/fmt.h" +#include "source/common/http/codec_client.h" #include "test/integration/fake_upstream.h" #include "test/integration/http_integration.h" diff --git a/test/integration/upstreams/BUILD b/test/integration/upstreams/BUILD index ddf0326374081..238f2fa3d4f4b 100644 --- a/test/integration/upstreams/BUILD +++ b/test/integration/upstreams/BUILD @@ -14,11 +14,11 @@ envoy_cc_library( "per_host_upstream_config.h", ], deps = [ - "//include/envoy/http:codes_interface", - "//include/envoy/http:conn_pool_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/http:codes_interface", + "//envoy/http:conn_pool_interface", + "//envoy/http:filter_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:assert_lib", "//source/common/http:header_map_lib", "//source/common/http:headers_lib", diff --git a/test/integration/upstreams/per_host_upstream_config.h b/test/integration/upstreams/per_host_upstream_config.h index bfa8ba5950333..e649aa087a8f6 100644 --- a/test/integration/upstreams/per_host_upstream_config.h +++ b/test/integration/upstreams/per_host_upstream_config.h @@ -7,11 +7,10 @@ #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/host_description.h" -#include "common/http/header_map_impl.h" -#include "common/router/router.h" -#include "common/router/upstream_request.h" - -#include "extensions/upstreams/http/http/upstream_request.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/router/router.h" +#include "source/common/router/upstream_request.h" +#include "source/extensions/upstreams/http/http/upstream_request.h" namespace Envoy { @@ -29,11 +28,12 @@ namespace { void addHeader(Envoy::Http::RequestHeaderMap& header_map, absl::string_view header_name, const envoy::config::core::v3::Metadata& metadata, absl::string_view key1, absl::string_view key2) { - if (auto filter_metadata = metadata.filter_metadata().find(key1); + if (auto filter_metadata = metadata.filter_metadata().find(std::string(key1)); filter_metadata != metadata.filter_metadata().end()) { const ProtobufWkt::Struct& data_struct = filter_metadata->second; const auto& fields = data_struct.fields(); - if (auto iter = fields.find(key2); iter != fields.end()) { + if (auto iter = fields.find(toStdStringView(key2)); // NOLINT(std::string_view) + iter != fields.end()) { if (iter->second.kind_case() == ProtobufWkt::Value::kStringValue) { header_map.setCopy(Envoy::Http::LowerCaseString(std::string(header_name)), iter->second.string_value()); diff --git a/test/integration/utility.cc b/test/integration/utility.cc index 3837236fe2568..e4767d4970288 100644 --- a/test/integration/utility.cc +++ b/test/integration/utility.cc @@ -9,20 +9,20 @@ #include "envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.h" #include "envoy/network/connection.h" -#include "common/api/api_impl.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/config/utility.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/http/http3/quic_client_connection_factory.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/config/utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/http3/quic_client_connection_factory.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/common/upstream/upstream_impl.h" #ifdef ENVOY_ENABLE_QUIC -#include "common/quic/client_connection_factory_impl.h" +#include "source/common/quic/client_connection_factory_impl.h" #endif #include "test/common/upstream/utility.h" diff --git a/test/integration/utility.h b/test/integration/utility.h index 6fb283dcb1a0e..8f7e36178c91c 100644 --- a/test/integration/utility.h +++ b/test/integration/utility.h @@ -11,11 +11,11 @@ #include "envoy/network/filter.h" #include "envoy/server/factory_context.h" -#include "common/common/assert.h" -#include "common/common/dump_state_utils.h" -#include "common/common/utility.h" -#include "common/http/codec_client.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/dump_state_utils.h" +#include "source/common/common/utility.h" +#include "source/common/http/codec_client.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/test_common/printers.h" #include "test/test_common/test_time.h" diff --git a/test/integration/vhds_integration_test.cc b/test/integration/vhds_integration_test.cc index d2798fe6e2fdc..3af21e7945fea 100644 --- a/test/integration/vhds_integration_test.cc +++ b/test/integration/vhds_integration_test.cc @@ -3,9 +3,9 @@ #include "envoy/grpc/status.h" #include "envoy/stats/scope.h" -#include "common/config/protobuf_link_hacks.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" +#include "source/common/config/protobuf_link_hacks.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" #include "test/common/grpc/grpc_client_integration.h" #include "test/integration/http_integration.h" diff --git a/test/integration/websocket_integration_test.cc b/test/integration/websocket_integration_test.cc index bf96e27d49683..c7159200ab9e0 100644 --- a/test/integration/websocket_integration_test.cc +++ b/test/integration/websocket_integration_test.cc @@ -5,8 +5,8 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/http/header_map_impl.h" -#include "common/protobuf/utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/protobuf/utility.h" #include "test/integration/utility.h" #include "test/test_common/network_utility.h" diff --git a/test/integration/xds_integration_test.cc b/test/integration/xds_integration_test.cc index c4dd65445a156..114359d2bda31 100644 --- a/test/integration/xds_integration_test.cc +++ b/test/integration/xds_integration_test.cc @@ -1,7 +1,7 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/buffer/buffer_impl.h" +#include "source/common/buffer/buffer_impl.h" #include "test/integration/http_integration.h" #include "test/integration/http_protocol_integration.h" diff --git a/test/integration/xfcc_integration_test.cc b/test/integration/xfcc_integration_test.cc index 820fb494bea60..19186660db21a 100644 --- a/test/integration/xfcc_integration_test.cc +++ b/test/integration/xfcc_integration_test.cc @@ -8,13 +8,12 @@ #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" #include "envoy/stats/scope.h" -#include "common/event/dispatcher_impl.h" -#include "common/http/header_map_impl.h" -#include "common/network/utility.h" - -#include "extensions/transport_sockets/tls/context_config_impl.h" -#include "extensions/transport_sockets/tls/context_manager_impl.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/network/utility.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/test_common/network_utility.h" #include "test/test_common/printers.h" diff --git a/test/mocks/BUILD b/test/mocks/BUILD index ca36c72a401a4..0e0967ddfab87 100644 --- a/test/mocks/BUILD +++ b/test/mocks/BUILD @@ -13,9 +13,9 @@ envoy_cc_test_library( srcs = ["common.cc"], hdrs = ["common.h"], deps = [ - "//include/envoy/common:conn_pool_interface", - "//include/envoy/common:random_generator_interface", - "//include/envoy/common:time_interface", + "//envoy/common:conn_pool_interface", + "//envoy/common:random_generator_interface", + "//envoy/common:time_interface", "//source/common/common:minimal_logger_lib", "//test/test_common:test_time_lib", ], diff --git a/test/mocks/access_log/BUILD b/test/mocks/access_log/BUILD index 6e2ad4141fece..8e43e64d55e97 100644 --- a/test/mocks/access_log/BUILD +++ b/test/mocks/access_log/BUILD @@ -13,8 +13,8 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/access_log:access_log_interface", - "//include/envoy/stream_info:stream_info_interface", + "//envoy/access_log:access_log_interface", + "//envoy/stream_info:stream_info_interface", "//test/mocks/filesystem:filesystem_mocks", ], ) diff --git a/test/mocks/api/BUILD b/test/mocks/api/BUILD index e4d44c573e553..c84309a97feb7 100644 --- a/test/mocks/api/BUILD +++ b/test/mocks/api/BUILD @@ -14,8 +14,8 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"] + envoy_select_hot_restart(["hot_restart.h"]), deps = [ - "//include/envoy/api:api_interface", - "//include/envoy/api:os_sys_calls_interface", + "//envoy/api:api_interface", + "//envoy/api:os_sys_calls_interface", "//source/common/api:os_sys_calls_lib", "//source/common/common:assert_lib", "//test/mocks/filesystem:filesystem_mocks", diff --git a/test/mocks/api/hot_restart.h b/test/mocks/api/hot_restart.h index b9d0504bacc80..dfaabd0efdf7c 100644 --- a/test/mocks/api/hot_restart.h +++ b/test/mocks/api/hot_restart.h @@ -2,7 +2,7 @@ #include "envoy/api/os_sys_calls.h" -#include "common/api/os_sys_calls_impl_hot_restart.h" +#include "source/common/api/os_sys_calls_impl_hot_restart.h" #include "gmock/gmock.h" diff --git a/test/mocks/api/mocks.cc b/test/mocks/api/mocks.cc index c402005a6dde5..dfd9345ae8063 100644 --- a/test/mocks/api/mocks.cc +++ b/test/mocks/api/mocks.cc @@ -1,7 +1,7 @@ #include "mocks.h" -#include "common/common/assert.h" -#include "common/common/lock_guard.h" +#include "source/common/common/assert.h" +#include "source/common/common/lock_guard.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/mocks/api/mocks.h b/test/mocks/api/mocks.h index 58f623354888c..94b5db59f99c2 100644 --- a/test/mocks/api/mocks.h +++ b/test/mocks/api/mocks.h @@ -8,10 +8,10 @@ #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" -#include "common/api/os_sys_calls_impl.h" +#include "source/common/api/os_sys_calls_impl.h" #if defined(__linux__) -#include "common/api/os_sys_calls_impl_linux.h" +#include "source/common/api/os_sys_calls_impl_linux.h" #endif #include "test/mocks/common.h" diff --git a/test/mocks/buffer/mocks.cc b/test/mocks/buffer/mocks.cc index 8328f870b0632..4f189a5f3400f 100644 --- a/test/mocks/buffer/mocks.cc +++ b/test/mocks/buffer/mocks.cc @@ -1,6 +1,6 @@ #include "test/mocks/buffer/mocks.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { diff --git a/test/mocks/buffer/mocks.h b/test/mocks/buffer/mocks.h index 18465118c4baf..cf6b7ef90d869 100644 --- a/test/mocks/buffer/mocks.h +++ b/test/mocks/buffer/mocks.h @@ -2,9 +2,9 @@ #include -#include "common/buffer/buffer_impl.h" -#include "common/buffer/watermark_buffer.h" -#include "common/network/io_socket_error_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/buffer/watermark_buffer.h" +#include "source/common/network/io_socket_error_impl.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" diff --git a/test/mocks/common.h b/test/mocks/common.h index 8cd79da8c53d7..d313358e1fb90 100644 --- a/test/mocks/common.h +++ b/test/mocks/common.h @@ -7,7 +7,7 @@ #include "envoy/common/scope_tracker.h" #include "envoy/common/time.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "test/test_common/test_time.h" diff --git a/test/mocks/compression/compressor/BUILD b/test/mocks/compression/compressor/BUILD index 855752e06a411..a4565c0fa688c 100644 --- a/test/mocks/compression/compressor/BUILD +++ b/test/mocks/compression/compressor/BUILD @@ -13,7 +13,7 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/compression/compressor:compressor_config_interface", - "//include/envoy/compression/compressor:compressor_interface", + "//envoy/compression/compressor:compressor_config_interface", + "//envoy/compression/compressor:compressor_interface", ], ) diff --git a/test/mocks/compression/decompressor/BUILD b/test/mocks/compression/decompressor/BUILD index 5e308cef1dede..23c012a13d7a4 100644 --- a/test/mocks/compression/decompressor/BUILD +++ b/test/mocks/compression/decompressor/BUILD @@ -13,7 +13,7 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/compression/decompressor:decompressor_config_interface", - "//include/envoy/compression/decompressor:decompressor_interface", + "//envoy/compression/decompressor:decompressor_config_interface", + "//envoy/compression/decompressor:decompressor_interface", ], ) diff --git a/test/mocks/config/BUILD b/test/mocks/config/BUILD index 9489eda5e1875..198c6c06d2933 100644 --- a/test/mocks/config/BUILD +++ b/test/mocks/config/BUILD @@ -13,9 +13,9 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/config:config_provider_manager_interface", - "//include/envoy/config:grpc_mux_interface", - "//include/envoy/config:subscription_interface", + "//envoy/config:config_provider_manager_interface", + "//envoy/config:grpc_mux_interface", + "//envoy/config:subscription_interface", "//source/common/common:callback_impl_lib", "//source/common/config:config_provider_lib", "//source/common/protobuf:utility_lib", diff --git a/test/mocks/config/mocks.h b/test/mocks/config/mocks.h index cf7574dc696a8..ae12fa665c6d5 100644 --- a/test/mocks/config/mocks.h +++ b/test/mocks/config/mocks.h @@ -8,9 +8,9 @@ #include "envoy/config/typed_config.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/common/callback_impl.h" -#include "common/config/config_provider_impl.h" -#include "common/protobuf/utility.h" +#include "source/common/common/callback_impl.h" +#include "source/common/config/config_provider_impl.h" +#include "source/common/protobuf/utility.h" #include "test/test_common/resources.h" #include "test/test_common/utility.h" diff --git a/test/mocks/event/BUILD b/test/mocks/event/BUILD index b7fd49f8c266f..3ce542748b737 100644 --- a/test/mocks/event/BUILD +++ b/test/mocks/event/BUILD @@ -14,17 +14,17 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/event:deferred_deletable", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:file_event_interface", - "//include/envoy/event:scaled_range_timer_manager_interface", - "//include/envoy/event:signal_interface", - "//include/envoy/event:timer_interface", - "//include/envoy/network:connection_handler_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:dns_interface", - "//include/envoy/network:listener_interface", - "//include/envoy/ssl:context_interface", + "//envoy/event:deferred_deletable", + "//envoy/event:dispatcher_interface", + "//envoy/event:file_event_interface", + "//envoy/event:scaled_range_timer_manager_interface", + "//envoy/event:signal_interface", + "//envoy/event:timer_interface", + "//envoy/network:connection_handler_interface", + "//envoy/network:connection_interface", + "//envoy/network:dns_interface", + "//envoy/network:listener_interface", + "//envoy/ssl:context_interface", "//test/mocks/buffer:buffer_mocks", "//test/test_common:test_time_lib", ], @@ -34,6 +34,6 @@ envoy_cc_test_library( name = "wrapped_dispatcher", hdrs = ["wrapped_dispatcher.h"], deps = [ - "//include/envoy/event:dispatcher_interface", + "//envoy/event:dispatcher_interface", ], ) diff --git a/test/mocks/event/mocks.h b/test/mocks/event/mocks.h index 36544bd2c1d2f..7943db8e9db44 100644 --- a/test/mocks/event/mocks.h +++ b/test/mocks/event/mocks.h @@ -19,7 +19,7 @@ #include "envoy/network/transport_socket.h" #include "envoy/ssl/context.h" -#include "common/common/scope_tracker.h" +#include "source/common/common/scope_tracker.h" #include "test/mocks/buffer/mocks.h" #include "test/test_common/test_time.h" @@ -132,7 +132,7 @@ class MockDispatcher : public Dispatcher { const Network::ConnectionSocket::OptionsSharedPtr& options)); MOCK_METHOD(Network::DnsResolverSharedPtr, createDnsResolver, (const std::vector& resolvers, - const bool use_tcp_for_dns_lookups)); + const envoy::config::core::v3::DnsResolverOptions& dns_resolver_options)); MOCK_METHOD(FileEvent*, createFileEvent_, (os_fd_t fd, FileReadyCb cb, FileTriggerType trigger, uint32_t events)); MOCK_METHOD(Filesystem::Watcher*, createFilesystemWatcher_, ()); diff --git a/test/mocks/event/wrapped_dispatcher.h b/test/mocks/event/wrapped_dispatcher.h index 776f0a5035ec5..56f5270e05ab9 100644 --- a/test/mocks/event/wrapped_dispatcher.h +++ b/test/mocks/event/wrapped_dispatcher.h @@ -50,10 +50,10 @@ class WrappedDispatcher : public Dispatcher { std::move(transport_socket), options); } - Network::DnsResolverSharedPtr - createDnsResolver(const std::vector& resolvers, - const bool use_tcp_for_dns_lookups) override { - return impl_.createDnsResolver(resolvers, use_tcp_for_dns_lookups); + Network::DnsResolverSharedPtr createDnsResolver( + const std::vector& resolvers, + const envoy::config::core::v3::DnsResolverOptions& dns_resolver_options) override { + return impl_.createDnsResolver(resolvers, dns_resolver_options); } FileEventPtr createFileEvent(os_fd_t fd, FileReadyCb cb, FileTriggerType trigger, diff --git a/test/mocks/filesystem/BUILD b/test/mocks/filesystem/BUILD index d4c58d07e808f..afb733e838ec6 100644 --- a/test/mocks/filesystem/BUILD +++ b/test/mocks/filesystem/BUILD @@ -13,8 +13,8 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/filesystem:filesystem_interface", - "//include/envoy/filesystem:watcher_interface", + "//envoy/filesystem:filesystem_interface", + "//envoy/filesystem:watcher_interface", "//source/common/common:thread_lib", ], ) diff --git a/test/mocks/filesystem/mocks.cc b/test/mocks/filesystem/mocks.cc index af5d9fcddc7cf..9ce4201006d6e 100644 --- a/test/mocks/filesystem/mocks.cc +++ b/test/mocks/filesystem/mocks.cc @@ -1,7 +1,7 @@ #include "test/mocks/filesystem/mocks.h" -#include "common/common/assert.h" -#include "common/common/lock_guard.h" +#include "source/common/common/assert.h" +#include "source/common/common/lock_guard.h" namespace Envoy { namespace Filesystem { diff --git a/test/mocks/filesystem/mocks.h b/test/mocks/filesystem/mocks.h index 71e57f9307bc4..982c0dfb73b76 100644 --- a/test/mocks/filesystem/mocks.h +++ b/test/mocks/filesystem/mocks.h @@ -6,7 +6,7 @@ #include "envoy/filesystem/filesystem.h" #include "envoy/filesystem/watcher.h" -#include "common/common/thread.h" +#include "source/common/common/thread.h" #include "gmock/gmock.h" diff --git a/test/mocks/grpc/BUILD b/test/mocks/grpc/BUILD index 972cba77fbe11..c61c03bf4f90b 100644 --- a/test/mocks/grpc/BUILD +++ b/test/mocks/grpc/BUILD @@ -13,8 +13,8 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/grpc:async_client_interface", - "//include/envoy/grpc:async_client_manager_interface", + "//envoy/grpc:async_client_interface", + "//envoy/grpc:async_client_manager_interface", "//source/common/grpc:typed_async_client_lib", "//test/mocks/http:http_mocks", "//test/test_common:utility_lib", diff --git a/test/mocks/grpc/mocks.h b/test/mocks/grpc/mocks.h index 476ba677f9453..8097d34f6af89 100644 --- a/test/mocks/grpc/mocks.h +++ b/test/mocks/grpc/mocks.h @@ -9,7 +9,7 @@ #include "envoy/grpc/async_client_manager.h" #include "envoy/stats/scope.h" -#include "common/grpc/typed_async_client.h" +#include "source/common/grpc/typed_async_client.h" #include "test/test_common/utility.h" diff --git a/test/mocks/http/BUILD b/test/mocks/http/BUILD index 9b807fe8f3cf3..51c6c7f2fae1d 100644 --- a/test/mocks/http/BUILD +++ b/test/mocks/http/BUILD @@ -14,7 +14,7 @@ envoy_cc_mock( srcs = ["alternate_protocols_cache.cc"], hdrs = ["alternate_protocols_cache.h"], deps = [ - "//include/envoy/http:alternate_protocols_cache_interface", + "//envoy/http:alternate_protocols_cache_interface", ], ) @@ -23,7 +23,7 @@ envoy_cc_mock( srcs = ["api_listener.cc"], hdrs = ["api_listener.h"], deps = [ - "//include/envoy/http:api_listener_interface", + "//envoy/http:api_listener_interface", ], ) @@ -32,7 +32,7 @@ envoy_cc_mock( srcs = ["conn_pool.cc"], hdrs = ["conn_pool.h"], deps = [ - "//include/envoy/http:conn_pool_interface", + "//envoy/http:conn_pool_interface", "//test/mocks:common_lib", "//test/mocks/upstream:host_mocks", ], @@ -50,15 +50,15 @@ envoy_cc_mock( ":stream_decoder_mock", ":stream_encoder_mock", ":stream_mock", - "//include/envoy/access_log:access_log_interface", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/http:async_client_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/http:conn_pool_interface", - "//include/envoy/http:filter_interface", - "//include/envoy/ssl:connection_interface", - "//include/envoy/tracing:http_tracer_interface", + "//envoy/access_log:access_log_interface", + "//envoy/buffer:buffer_interface", + "//envoy/event:dispatcher_interface", + "//envoy/http:async_client_interface", + "//envoy/http:codec_interface", + "//envoy/http:conn_pool_interface", + "//envoy/http:filter_interface", + "//envoy/ssl:connection_interface", + "//envoy/tracing:http_tracer_interface", "//source/common/http:conn_manager_config_interface", "//source/common/http:filter_manager_lib", "//source/common/http:header_map_lib", @@ -75,7 +75,7 @@ envoy_cc_mock( srcs = ["stream.cc"], hdrs = ["stream.h"], deps = [ - "//include/envoy/http:codec_interface", + "//envoy/http:codec_interface", ], ) @@ -84,7 +84,7 @@ envoy_cc_mock( srcs = ["stream_decoder.cc"], hdrs = ["stream_decoder.h"], deps = [ - "//include/envoy/http:codec_interface", + "//envoy/http:codec_interface", ], ) @@ -94,7 +94,7 @@ envoy_cc_mock( hdrs = ["stream_encoder.h"], deps = [ ":stream_mock", - "//include/envoy/http:codec_interface", + "//envoy/http:codec_interface", "//source/common/http:header_utility_lib", ], ) @@ -104,7 +104,7 @@ envoy_cc_test( srcs = ["mocks_test.cc"], deps = [ ":http_mocks", - "//include/envoy/http:header_map_interface", + "//envoy/http:header_map_interface", "//test/test_common:utility_lib", ], ) diff --git a/test/mocks/http/conn_pool.h b/test/mocks/http/conn_pool.h index 97d22e6bd6777..2f3d5b9352de2 100644 --- a/test/mocks/http/conn_pool.h +++ b/test/mocks/http/conn_pool.h @@ -13,6 +13,15 @@ namespace Envoy { namespace Http { namespace ConnectionPool { +class MockCallbacks : public Callbacks { + MOCK_METHOD(void, onPoolFailure, + (PoolFailureReason reason, absl::string_view transport_failure_reason, + Upstream::HostDescriptionConstSharedPtr host)); + MOCK_METHOD(void, onPoolReady, + (RequestEncoder & encoder, Upstream::HostDescriptionConstSharedPtr host, + const StreamInfo::StreamInfo& info, absl::optional protocol)); +}; + class MockInstance : public Instance { public: MockInstance(); diff --git a/test/mocks/http/mocks.h b/test/mocks/http/mocks.h index af7fd0b62e13a..ea45b0b6044ff 100644 --- a/test/mocks/http/mocks.h +++ b/test/mocks/http/mocks.h @@ -15,10 +15,10 @@ #include "envoy/matcher/matcher.h" #include "envoy/ssl/connection.h" -#include "common/http/conn_manager_config.h" -#include "common/http/filter_manager.h" -#include "common/http/header_map_impl.h" -#include "common/http/utility.h" +#include "source/common/http/conn_manager_config.h" +#include "source/common/http/filter_manager.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/utility.h" #include "test/mocks/common.h" #include "test/mocks/event/mocks.h" diff --git a/test/mocks/http/stream_encoder.cc b/test/mocks/http/stream_encoder.cc index 5d872c64db15f..f0fb89bcd66c6 100644 --- a/test/mocks/http/stream_encoder.cc +++ b/test/mocks/http/stream_encoder.cc @@ -1,6 +1,6 @@ #include "test/mocks/http/stream_encoder.h" -#include "common/http/header_utility.h" +#include "source/common/http/header_utility.h" using testing::_; using testing::Invoke; @@ -17,7 +17,7 @@ MockRequestEncoder::MockRequestEncoder() { .WillByDefault(Invoke([](const RequestHeaderMap& headers, bool) -> Status { // Check to see that method is not-null. Path can be null for CONNECT and authority can be // null at the codec level. - ASSERT(HeaderUtility::checkRequiredHeaders(headers).ok()); + ASSERT(HeaderUtility::checkRequiredRequestHeaders(headers).ok()); return okStatus(); })); } diff --git a/test/mocks/http/stream_encoder.h b/test/mocks/http/stream_encoder.h index 3277fe1d8a809..8f783e69b283c 100644 --- a/test/mocks/http/stream_encoder.h +++ b/test/mocks/http/stream_encoder.h @@ -2,7 +2,7 @@ #include "envoy/http/codec.h" -#include "common/http/status.h" +#include "source/common/http/status.h" #include "test/mocks/http/stream.h" diff --git a/test/mocks/init/BUILD b/test/mocks/init/BUILD index d2969531ecb67..fd433f677d444 100644 --- a/test/mocks/init/BUILD +++ b/test/mocks/init/BUILD @@ -13,7 +13,7 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/init:manager_interface", + "//envoy/init:manager_interface", "//source/common/init:target_lib", "//source/common/init:watcher_lib", ], diff --git a/test/mocks/init/mocks.h b/test/mocks/init/mocks.h index fc997e4030c49..eaecf0d4c9f14 100644 --- a/test/mocks/init/mocks.h +++ b/test/mocks/init/mocks.h @@ -2,8 +2,8 @@ #include "envoy/init/manager.h" -#include "common/init/target_impl.h" -#include "common/init/watcher_impl.h" +#include "source/common/init/target_impl.h" +#include "source/common/init/watcher_impl.h" #include "absl/container/flat_hash_map.h" #include "gmock/gmock.h" diff --git a/test/mocks/local_info/BUILD b/test/mocks/local_info/BUILD index cab27ccb858e5..3bfd32510c2dc 100644 --- a/test/mocks/local_info/BUILD +++ b/test/mocks/local_info/BUILD @@ -13,7 +13,7 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/local_info:local_info_interface", + "//envoy/local_info:local_info_interface", "//source/common/network:address_lib", "//test/common/stats:stat_test_utility_lib", "//test/mocks/config:config_mocks", diff --git a/test/mocks/local_info/mocks.cc b/test/mocks/local_info/mocks.cc index b719bad16b43e..ff6a03502cfb3 100644 --- a/test/mocks/local_info/mocks.cc +++ b/test/mocks/local_info/mocks.cc @@ -1,6 +1,6 @@ #include "mocks.h" -#include "common/network/address_impl.h" +#include "source/common/network/address_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/mocks/local_reply/mocks.h b/test/mocks/local_reply/mocks.h index 44676c92a0744..390c20d76cf53 100644 --- a/test/mocks/local_reply/mocks.h +++ b/test/mocks/local_reply/mocks.h @@ -1,6 +1,6 @@ #pragma once -#include "common/local_reply/local_reply.h" +#include "source/common/local_reply/local_reply.h" #include "gmock/gmock.h" diff --git a/test/mocks/matcher/mocks.h b/test/mocks/matcher/mocks.h index 8a93f6b850f64..3d4ebefa207b9 100644 --- a/test/mocks/matcher/mocks.h +++ b/test/mocks/matcher/mocks.h @@ -1,6 +1,6 @@ #pragma once -#include "common/matcher/matcher.h" +#include "source/common/matcher/matcher.h" #include "gmock/gmock.h" diff --git a/test/mocks/network/BUILD b/test/mocks/network/BUILD index e37c3a4ec633a..8bc9532c114d4 100644 --- a/test/mocks/network/BUILD +++ b/test/mocks/network/BUILD @@ -13,7 +13,7 @@ envoy_cc_mock( srcs = ["connection.cc"], hdrs = ["connection.h"], deps = [ - "//include/envoy/network:connection_interface", + "//envoy/network:connection_interface", "//source/common/network:filter_manager_lib", "//test/mocks/event:event_mocks", "//test/mocks/stream_info:stream_info_mocks", @@ -25,8 +25,8 @@ envoy_cc_mock( srcs = ["io_handle.cc"], hdrs = ["io_handle.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/network:io_handle_interface", + "//envoy/event:dispatcher_interface", + "//envoy/network:io_handle_interface", "//source/common/buffer:buffer_lib", ], ) @@ -37,7 +37,7 @@ envoy_cc_mock( hdrs = ["socket.h"], deps = [ ":io_handle_mocks", - "//include/envoy/network:socket_interface", + "//envoy/network:socket_interface", ], ) @@ -48,13 +48,13 @@ envoy_cc_mock( deps = [ ":connection_mocks", ":transport_socket_mocks", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/network:connection_interface", - "//include/envoy/network:drain_decision_interface", - "//include/envoy/network:filter_interface", - "//include/envoy/network:resolver_interface", - "//include/envoy/network:transport_socket_interface", - "//include/envoy/server:listener_manager_interface", + "//envoy/buffer:buffer_interface", + "//envoy/network:connection_interface", + "//envoy/network:drain_decision_interface", + "//envoy/network:filter_interface", + "//envoy/network:resolver_interface", + "//envoy/network:transport_socket_interface", + "//envoy/server:listener_manager_interface", "//source/common/network:address_lib", "//source/common/network:utility_lib", "//source/common/stats:isolated_store_lib", @@ -71,7 +71,7 @@ envoy_cc_mock( srcs = ["transport_socket.cc"], hdrs = ["transport_socket.h"], deps = [ - "//include/envoy/network:transport_socket_interface", + "//envoy/network:transport_socket_interface", "//source/common/network:utility_lib", ], ) diff --git a/test/mocks/network/connection.h b/test/mocks/network/connection.h index 24fe1ee7a3412..3ec78cb5d47b1 100644 --- a/test/mocks/network/connection.h +++ b/test/mocks/network/connection.h @@ -5,7 +5,7 @@ #include "envoy/network/connection.h" -#include "common/network/filter_manager_impl.h" +#include "source/common/network/filter_manager_impl.h" #include "test/mocks/event/mocks.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/mocks/network/mocks.cc b/test/mocks/network/mocks.cc index 5575eeb722bb6..71a61eb674eea 100644 --- a/test/mocks/network/mocks.cc +++ b/test/mocks/network/mocks.cc @@ -5,10 +5,10 @@ #include "envoy/buffer/buffer.h" #include "envoy/server/listener_manager.h" -#include "common/network/address_impl.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/udp_listener_impl.h" -#include "common/network/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/udp_listener_impl.h" +#include "source/common/network/utility.h" #include "test/test_common/printers.h" diff --git a/test/mocks/network/mocks.h b/test/mocks/network/mocks.h index 9b68638ea21a3..e8861636e9a1a 100644 --- a/test/mocks/network/mocks.h +++ b/test/mocks/network/mocks.h @@ -17,9 +17,9 @@ #include "envoy/network/transport_socket.h" #include "envoy/stats/scope.h" -#include "common/network/filter_manager_impl.h" -#include "common/network/socket_interface.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/network/filter_manager_impl.h" +#include "source/common/network/socket_interface.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/mocks/event/mocks.h" #include "test/mocks/network/connection.h" diff --git a/test/mocks/protobuf/BUILD b/test/mocks/protobuf/BUILD index 67b4c15cd6446..fd7416df7bfe2 100644 --- a/test/mocks/protobuf/BUILD +++ b/test/mocks/protobuf/BUILD @@ -13,6 +13,6 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/protobuf:message_validator_interface", + "//envoy/protobuf:message_validator_interface", ], ) diff --git a/test/mocks/ratelimit/BUILD b/test/mocks/ratelimit/BUILD index db30620b1edda..a21994defdacb 100644 --- a/test/mocks/ratelimit/BUILD +++ b/test/mocks/ratelimit/BUILD @@ -12,6 +12,6 @@ envoy_cc_mock( name = "ratelimit_mocks", hdrs = ["mocks.h"], deps = [ - "//include/envoy/ratelimit:ratelimit_interface", + "//envoy/ratelimit:ratelimit_interface", ], ) diff --git a/test/mocks/router/BUILD b/test/mocks/router/BUILD index 4bb335ea67a85..1cfbbf669bf75 100644 --- a/test/mocks/router/BUILD +++ b/test/mocks/router/BUILD @@ -13,19 +13,19 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/event:dispatcher_interface", - "//include/envoy/json:json_object_interface", - "//include/envoy/local_info:local_info_interface", - "//include/envoy/router:route_config_provider_manager_interface", - "//include/envoy/router:router_interface", - "//include/envoy/router:router_ratelimit_interface", - "//include/envoy/router:scopes_interface", - "//include/envoy/router:shadow_writer_interface", - "//include/envoy/runtime:runtime_interface", - "//include/envoy/stats:stats_interface", - "//include/envoy/stream_info:stream_info_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/event:dispatcher_interface", + "//envoy/json:json_object_interface", + "//envoy/local_info:local_info_interface", + "//envoy/router:route_config_provider_manager_interface", + "//envoy/router:router_interface", + "//envoy/router:router_ratelimit_interface", + "//envoy/router:scopes_interface", + "//envoy/router:shadow_writer_interface", + "//envoy/runtime:runtime_interface", + "//envoy/stats:stats_interface", + "//envoy/stream_info:stream_info_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", "//test/mocks:common_lib", "//test/mocks/stats:stats_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/mocks/router/mocks.h b/test/mocks/router/mocks.h index dde676d080283..141c3934886ab 100644 --- a/test/mocks/router/mocks.h +++ b/test/mocks/router/mocks.h @@ -29,7 +29,7 @@ #include "envoy/type/v3/percent.pb.h" #include "envoy/upstream/cluster_manager.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/global.h" diff --git a/test/mocks/router/router_filter_interface.h b/test/mocks/router/router_filter_interface.h index a37bf61cffce4..7ca27675a3d53 100644 --- a/test/mocks/router/router_filter_interface.h +++ b/test/mocks/router/router_filter_interface.h @@ -1,6 +1,6 @@ #pragma once -#include "common/router/router.h" +#include "source/common/router/router.h" #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/mocks/runtime/BUILD b/test/mocks/runtime/BUILD index a6af7e7570fe8..180056c3d5ac2 100644 --- a/test/mocks/runtime/BUILD +++ b/test/mocks/runtime/BUILD @@ -14,8 +14,8 @@ envoy_cc_mock( hdrs = ["mocks.h"], external_deps = ["abseil_optional"], deps = [ - "//include/envoy/runtime:runtime_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/runtime:runtime_interface", + "//envoy/upstream:cluster_manager_interface", "//test/mocks:common_lib", "//test/mocks/stats:stats_mocks", "@envoy_api//envoy/type/v3:pkg_cc_proto", diff --git a/test/mocks/secret/BUILD b/test/mocks/secret/BUILD index 92a80718db015..9537595a3b2a2 100644 --- a/test/mocks/secret/BUILD +++ b/test/mocks/secret/BUILD @@ -13,10 +13,10 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/secret:secret_callbacks_interface", - "//include/envoy/secret:secret_manager_interface", - "//include/envoy/server:transport_socket_config_interface", - "//include/envoy/ssl:tls_certificate_config_interface", + "//envoy/secret:secret_callbacks_interface", + "//envoy/secret:secret_manager_interface", + "//envoy/server:transport_socket_config_interface", + "//envoy/ssl:tls_certificate_config_interface", "//source/common/secret:secret_provider_impl_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", diff --git a/test/mocks/secret/mocks.cc b/test/mocks/secret/mocks.cc index 613cb30fa46fd..ecfc940e28305 100644 --- a/test/mocks/secret/mocks.cc +++ b/test/mocks/secret/mocks.cc @@ -2,7 +2,7 @@ #include "envoy/extensions/transport_sockets/tls/v3/cert.pb.h" -#include "common/secret/secret_provider_impl.h" +#include "source/common/secret/secret_provider_impl.h" using testing::_; using testing::Invoke; diff --git a/test/mocks/server/BUILD b/test/mocks/server/BUILD index 7f4408de326d1..679f3e6d1b2d2 100644 --- a/test/mocks/server/BUILD +++ b/test/mocks/server/BUILD @@ -13,7 +13,7 @@ envoy_cc_mock( srcs = ["config_tracker.cc"], hdrs = ["config_tracker.h"], deps = [ - "//include/envoy/server:configuration_interface", + "//envoy/server:configuration_interface", ], ) @@ -22,7 +22,7 @@ envoy_cc_mock( srcs = ["admin.cc"], hdrs = ["admin.h"], deps = [ - "//include/envoy/server:admin_interface", + "//envoy/server:admin_interface", "//test/mocks/network:socket_mocks", "//test/mocks/server:config_tracker_mocks", ], @@ -33,7 +33,7 @@ envoy_cc_mock( srcs = ["bootstrap_extension_factory.cc"], hdrs = ["bootstrap_extension_factory.h"], deps = [ - "//include/envoy/server:bootstrap_extension_config_interface", + "//envoy/server:bootstrap_extension_config_interface", ], ) @@ -41,7 +41,7 @@ envoy_cc_mock( name = "fatal_action_factory_mocks", hdrs = ["fatal_action_factory.h"], deps = [ - "//include/envoy/server:fatal_action_interface", + "//envoy/server:fatal_action_interface", ], ) @@ -50,7 +50,7 @@ envoy_cc_mock( srcs = ["options.cc"], hdrs = ["options.h"], deps = [ - "//include/envoy/server:options_interface", + "//envoy/server:options_interface", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", ], @@ -61,7 +61,7 @@ envoy_cc_mock( srcs = ["admin_stream.cc"], hdrs = ["admin_stream.h"], deps = [ - "//include/envoy/server:admin_interface", + "//envoy/server:admin_interface", "//test/mocks/http:http_mocks", ], ) @@ -71,7 +71,7 @@ envoy_cc_mock( srcs = ["drain_manager.cc"], hdrs = ["drain_manager.h"], deps = [ - "//include/envoy/server:drain_manager_interface", + "//envoy/server:drain_manager_interface", ], ) @@ -80,7 +80,7 @@ envoy_cc_mock( srcs = ["watch_dog.cc"], hdrs = ["watch_dog.h"], deps = [ - "//include/envoy/server:watchdog_interface", + "//envoy/server:watchdog_interface", ], ) @@ -89,7 +89,7 @@ envoy_cc_mock( srcs = ["watchdog_config.cc"], hdrs = ["watchdog_config.h"], deps = [ - "//include/envoy/server:configuration_interface", + "//envoy/server:configuration_interface", "//test/test_common:utility_lib", ], ) @@ -99,7 +99,7 @@ envoy_cc_mock( srcs = ["guard_dog.cc"], hdrs = ["guard_dog.h"], deps = [ - "//include/envoy/server:guarddog_interface", + "//envoy/server:guarddog_interface", "//test/mocks/server:watch_dog_mocks", ], ) @@ -109,7 +109,7 @@ envoy_cc_mock( srcs = ["hot_restart.cc"], hdrs = ["hot_restart.h"], deps = [ - "//include/envoy/server:instance_interface", + "//envoy/server:instance_interface", "//test/mocks/stats:stats_mocks", ], ) @@ -119,8 +119,8 @@ envoy_cc_mock( srcs = ["listener_component_factory.cc"], hdrs = ["listener_component_factory.h"], deps = [ - "//include/envoy/server:drain_manager_interface", - "//include/envoy/server:listener_manager_interface", + "//envoy/server:drain_manager_interface", + "//envoy/server:listener_manager_interface", "//test/mocks/network:network_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", @@ -132,7 +132,7 @@ envoy_cc_mock( srcs = ["listener_manager.cc"], hdrs = ["listener_manager.h"], deps = [ - "//include/envoy/server:listener_manager_interface", + "//envoy/server:listener_manager_interface", ], ) @@ -141,7 +141,7 @@ envoy_cc_mock( srcs = ["server_lifecycle_notifier.cc"], hdrs = ["server_lifecycle_notifier.h"], deps = [ - "//include/envoy/server:lifecycle_notifier_interface", + "//envoy/server:lifecycle_notifier_interface", ], ) @@ -150,7 +150,7 @@ envoy_cc_mock( srcs = ["worker_factory.cc"], hdrs = ["worker_factory.h"], deps = [ - "//include/envoy/server:worker_interface", + "//envoy/server:worker_interface", "//test/mocks/server:worker_mocks", ], ) @@ -160,7 +160,7 @@ envoy_cc_mock( srcs = ["worker.cc"], hdrs = ["worker.h"], deps = [ - "//include/envoy/server:worker_interface", + "//envoy/server:worker_interface", ], ) @@ -169,7 +169,7 @@ envoy_cc_mock( srcs = ["overload_manager.cc"], hdrs = ["overload_manager.h"], deps = [ - "//include/envoy/server/overload:overload_manager_interface", + "//envoy/server/overload:overload_manager_interface", "//test/mocks/event:event_mocks", ], ) @@ -179,7 +179,7 @@ envoy_cc_mock( srcs = ["instance.cc"], hdrs = ["instance.h"], deps = [ - "//include/envoy/server:instance_interface", + "//envoy/server:instance_interface", "//source/common/grpc:context_lib", "//source/common/http:context_lib", "//source/common/router:context_lib", @@ -215,8 +215,8 @@ envoy_cc_mock( name = "main_mocks", hdrs = ["main.h"], deps = [ - "//include/envoy/server:configuration_interface", - "//include/envoy/server/overload:overload_manager_interface", + "//envoy/server:configuration_interface", + "//envoy/server/overload:overload_manager_interface", ], ) @@ -238,7 +238,7 @@ envoy_cc_mock( srcs = ["transport_socket_factory_context.cc"], hdrs = ["transport_socket_factory_context.h"], deps = [ - "//include/envoy/server:tracer_config_interface", + "//envoy/server:tracer_config_interface", "//source/common/secret:secret_manager_impl_lib", "//test/mocks/api:api_mocks", "//test/mocks/server:config_tracker_mocks", @@ -252,7 +252,7 @@ envoy_cc_mock( srcs = ["listener_factory_context.cc"], hdrs = ["listener_factory_context.h"], deps = [ - "//include/envoy/server:listener_manager_interface", + "//envoy/server:listener_manager_interface", "//test/mocks/server:factory_context_mocks", ], ) @@ -262,7 +262,7 @@ envoy_cc_mock( srcs = ["health_checker_factory_context.cc"], hdrs = ["health_checker_factory_context.h"], deps = [ - "//include/envoy/server:health_checker_config_interface", + "//envoy/server:health_checker_config_interface", "//test/mocks:common_lib", "//test/mocks/api:api_mocks", "//test/mocks/event:event_mocks", @@ -280,7 +280,7 @@ envoy_cc_mock( srcs = ["filter_chain_factory_context.cc"], hdrs = ["filter_chain_factory_context.h"], deps = [ - "//include/envoy/server:filter_config_interface", + "//envoy/server:filter_config_interface", "//source/common/router:context_lib", "//test/mocks/server:factory_context_mocks", ], @@ -291,8 +291,8 @@ envoy_cc_mock( srcs = ["tracer_factory.cc"], hdrs = ["tracer_factory.h"], deps = [ - "//include/envoy/protobuf:message_validator_interface", - "//include/envoy/server:tracer_config_interface", + "//envoy/protobuf:message_validator_interface", + "//envoy/server:tracer_config_interface", ], ) @@ -301,7 +301,7 @@ envoy_cc_mock( srcs = ["tracer_factory_context.cc"], hdrs = ["tracer_factory_context.h"], deps = [ - "//include/envoy/server:configuration_interface", + "//envoy/server:configuration_interface", "//test/mocks/server:instance_mocks", "//test/mocks/server:tracer_factory_mocks", ], diff --git a/test/mocks/server/factory_context.cc b/test/mocks/server/factory_context.cc index 723019095c708..c8a3e082414cf 100644 --- a/test/mocks/server/factory_context.cc +++ b/test/mocks/server/factory_context.cc @@ -2,7 +2,7 @@ #include -#include "common/singleton/manager_impl.h" +#include "source/common/singleton/manager_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/mocks/server/factory_context.h b/test/mocks/server/factory_context.h index 8615ca5242ecc..41f3c20bf4400 100644 --- a/test/mocks/server/factory_context.h +++ b/test/mocks/server/factory_context.h @@ -2,9 +2,8 @@ #include "envoy/server/configuration.h" -#include "common/router/context_impl.h" - -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/common/router/context_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "admin.h" #include "drain_manager.h" diff --git a/test/mocks/server/instance.cc b/test/mocks/server/instance.cc index 9b1a728b76c00..ebd079c44b96b 100644 --- a/test/mocks/server/instance.cc +++ b/test/mocks/server/instance.cc @@ -1,6 +1,6 @@ #include "instance.h" -#include "common/singleton/manager_impl.h" +#include "source/common/singleton/manager_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/mocks/server/instance.h b/test/mocks/server/instance.h index 2fd4f2cc28b27..b7eb875363205 100644 --- a/test/mocks/server/instance.h +++ b/test/mocks/server/instance.h @@ -2,12 +2,11 @@ #include "envoy/server/instance.h" -#include "common/grpc/context_impl.h" -#include "common/http/context_impl.h" -#include "common/router/context_impl.h" -#include "common/stats/symbol_table_impl.h" - -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/common/grpc/context_impl.h" +#include "source/common/http/context_impl.h" +#include "source/common/router/context_impl.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "test/mocks/access_log/mocks.h" #include "test/mocks/api/mocks.h" diff --git a/test/mocks/server/listener_factory_context.cc b/test/mocks/server/listener_factory_context.cc index 10ec7dc48156e..bf2cc8992247c 100644 --- a/test/mocks/server/listener_factory_context.cc +++ b/test/mocks/server/listener_factory_context.cc @@ -2,7 +2,7 @@ #include -#include "common/singleton/manager_impl.h" +#include "source/common/singleton/manager_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/mocks/server/listener_factory_context.h b/test/mocks/server/listener_factory_context.h index 10e54c6291887..a72237a2eaf4e 100644 --- a/test/mocks/server/listener_factory_context.h +++ b/test/mocks/server/listener_factory_context.h @@ -3,7 +3,7 @@ #include "envoy/server/configuration.h" #include "envoy/server/listener_manager.h" -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" #include "admin.h" #include "drain_manager.h" diff --git a/test/mocks/server/transport_socket_factory_context.h b/test/mocks/server/transport_socket_factory_context.h index f14bdd0ac9fe1..ee98720c8d428 100644 --- a/test/mocks/server/transport_socket_factory_context.h +++ b/test/mocks/server/transport_socket_factory_context.h @@ -2,7 +2,7 @@ #include "envoy/server/transport_socket_config.h" -#include "common/secret/secret_manager_impl.h" +#include "source/common/secret/secret_manager_impl.h" #include "test/mocks/api/mocks.h" #include "test/mocks/ssl/mocks.h" diff --git a/test/mocks/ssl/BUILD b/test/mocks/ssl/BUILD index e79694f5224f8..caaa6483ee1eb 100644 --- a/test/mocks/ssl/BUILD +++ b/test/mocks/ssl/BUILD @@ -13,12 +13,12 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/ssl:certificate_validation_context_config_interface", - "//include/envoy/ssl:connection_interface", - "//include/envoy/ssl:context_config_interface", - "//include/envoy/ssl:context_interface", - "//include/envoy/ssl:context_manager_interface", - "//include/envoy/stats:stats_interface", + "//envoy/ssl:certificate_validation_context_config_interface", + "//envoy/ssl:connection_interface", + "//envoy/ssl:context_config_interface", + "//envoy/ssl:context_interface", + "//envoy/ssl:context_manager_interface", + "//envoy/stats:stats_interface", "//test/mocks/secret:secret_mocks", "@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg_cc_proto", ], diff --git a/test/mocks/stats/BUILD b/test/mocks/stats/BUILD index 2fbabbb328d05..039a42fbd9489 100644 --- a/test/mocks/stats/BUILD +++ b/test/mocks/stats/BUILD @@ -13,10 +13,10 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/stats:stats_interface", - "//include/envoy/stats:timespan_interface", - "//include/envoy/thread_local:thread_local_interface", - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/stats:stats_interface", + "//envoy/stats:timespan_interface", + "//envoy/thread_local:thread_local_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/stats:histogram_lib", "//source/common/stats:isolated_store_lib", "//source/common/stats:stats_lib", diff --git a/test/mocks/stats/mocks.cc b/test/mocks/stats/mocks.cc index 6af79f0743319..66ed44834fc12 100644 --- a/test/mocks/stats/mocks.cc +++ b/test/mocks/stats/mocks.cc @@ -2,7 +2,7 @@ #include -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/mocks/stats/mocks.h b/test/mocks/stats/mocks.h index bc43b8d61deae..b83dd3310c4cc 100644 --- a/test/mocks/stats/mocks.h +++ b/test/mocks/stats/mocks.h @@ -14,11 +14,11 @@ #include "envoy/thread_local/thread_local.h" #include "envoy/upstream/cluster_manager.h" -#include "common/stats/histogram_impl.h" -#include "common/stats/isolated_store_impl.h" -#include "common/stats/store_impl.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stats/timespan_impl.h" +#include "source/common/stats/histogram_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/stats/store_impl.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stats/timespan_impl.h" #include "test/common/stats/stat_test_utility.h" diff --git a/test/mocks/stream_info/BUILD b/test/mocks/stream_info/BUILD index da45abf717cee..ca80a08e3b4e7 100644 --- a/test/mocks/stream_info/BUILD +++ b/test/mocks/stream_info/BUILD @@ -13,9 +13,9 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/http:request_id_extension_interface", - "//include/envoy/stream_info:stream_info_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/http:request_id_extension_interface", + "//envoy/stream_info:stream_info_interface", + "//envoy/upstream:upstream_interface", "//test/mocks/upstream:host_mocks", "//test/test_common:simulated_time_system_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/mocks/stream_info/mocks.cc b/test/mocks/stream_info/mocks.cc index 17162d885a7bf..3907bb515f131 100644 --- a/test/mocks/stream_info/mocks.cc +++ b/test/mocks/stream_info/mocks.cc @@ -1,6 +1,6 @@ #include "test/mocks/stream_info/mocks.h" -#include "common/network/address_impl.h" +#include "source/common/network/address_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -31,8 +31,9 @@ MockStreamInfo::MockStreamInfo() response_code_details_ = std::string(details); })); ON_CALL(*this, setConnectionTerminationDetails(_)) - .WillByDefault( - Invoke([this](absl::string_view details) { connection_termination_details_ = details; })); + .WillByDefault(Invoke([this](absl::string_view details) { + connection_termination_details_ = std::string(details); + })); ON_CALL(*this, startTime()).WillByDefault(ReturnPointee(&start_time_)); ON_CALL(*this, startTimeMonotonic()).WillByDefault(ReturnPointee(&start_time_monotonic_)); ON_CALL(*this, lastDownstreamRxByteReceived()) diff --git a/test/mocks/stream_info/mocks.h b/test/mocks/stream_info/mocks.h index 62a377ecb97e8..1a0a81b36d9a5 100644 --- a/test/mocks/stream_info/mocks.h +++ b/test/mocks/stream_info/mocks.h @@ -4,8 +4,8 @@ #include "envoy/http/request_id_extension.h" #include "envoy/stream_info/stream_info.h" -#include "common/network/socket_impl.h" -#include "common/stream_info/filter_state_impl.h" +#include "source/common/network/socket_impl.h" +#include "source/common/stream_info/filter_state_impl.h" #include "test/mocks/upstream/host.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/mocks/tcp/BUILD b/test/mocks/tcp/BUILD index 263b2e49ba086..b3cbd6903f68f 100644 --- a/test/mocks/tcp/BUILD +++ b/test/mocks/tcp/BUILD @@ -13,8 +13,8 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/buffer:buffer_interface", - "//include/envoy/tcp:conn_pool_interface", + "//envoy/buffer:buffer_interface", + "//envoy/tcp:conn_pool_interface", "//test/mocks:common_lib", "//test/mocks/network:network_mocks", "//test/mocks/upstream:host_mocks", diff --git a/test/mocks/tcp/mocks.h b/test/mocks/tcp/mocks.h index b052e712353ac..04f0426eb303a 100644 --- a/test/mocks/tcp/mocks.h +++ b/test/mocks/tcp/mocks.h @@ -15,6 +15,13 @@ namespace Envoy { namespace Tcp { namespace ConnectionPool { +class MockCallbacks : public Callbacks { + MOCK_METHOD(void, onPoolFailure, + (PoolFailureReason reason, Upstream::HostDescriptionConstSharedPtr host)); + MOCK_METHOD(void, onPoolReady, + (ConnectionDataPtr && conn, Upstream::HostDescriptionConstSharedPtr host)); +}; + class MockUpstreamCallbacks : public UpstreamCallbacks { public: MockUpstreamCallbacks(); diff --git a/test/mocks/thread_local/BUILD b/test/mocks/thread_local/BUILD index e05b8f6f4b965..1928ad5ce567e 100644 --- a/test/mocks/thread_local/BUILD +++ b/test/mocks/thread_local/BUILD @@ -13,7 +13,7 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/thread_local:thread_local_interface", + "//envoy/thread_local:thread_local_interface", "//test/mocks/event:event_mocks", ], ) diff --git a/test/mocks/tracing/BUILD b/test/mocks/tracing/BUILD index 3f4eaf881d4d6..b89ea160d951b 100644 --- a/test/mocks/tracing/BUILD +++ b/test/mocks/tracing/BUILD @@ -13,7 +13,7 @@ envoy_cc_mock( srcs = ["mocks.cc"], hdrs = ["mocks.h"], deps = [ - "//include/envoy/tracing:http_tracer_interface", - "//include/envoy/tracing:http_tracer_manager_interface", + "//envoy/tracing:http_tracer_interface", + "//envoy/tracing:http_tracer_manager_interface", ], ) diff --git a/test/mocks/upstream/BUILD b/test/mocks/upstream/BUILD index 5ab7a4d101098..e7fcdef38adcf 100644 --- a/test/mocks/upstream/BUILD +++ b/test/mocks/upstream/BUILD @@ -14,8 +14,8 @@ envoy_cc_mock( hdrs = ["cluster_info.h"], deps = [ ":transport_socket_match_mocks", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:thread_lib", "//source/common/config:metadata_lib", "//source/common/http:utility_lib", @@ -37,7 +37,7 @@ envoy_cc_mock( hdrs = ["host.h"], deps = [ ":cluster_info_mocks", - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:upstream_interface", "//source/common/network:utility_lib", "//test/mocks/network:transport_socket_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -50,7 +50,7 @@ envoy_cc_mock( srcs = ["transport_socket_match.cc"], hdrs = ["transport_socket_match.h"], deps = [ - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:upstream_interface", "//source/common/network:raw_buffer_socket_lib", "//test/common/stats:stat_test_utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -62,7 +62,7 @@ envoy_cc_mock( srcs = ["load_balancer_context.cc"], hdrs = ["load_balancer_context.h"], deps = [ - "//include/envoy/upstream:load_balancer_interface", + "//envoy/upstream:load_balancer_interface", ], ) @@ -93,12 +93,12 @@ envoy_cc_mock( ":thread_aware_load_balancer_mocks", ":thread_local_cluster_mocks", ":transport_socket_match_mocks", - "//include/envoy/http:async_client_interface", - "//include/envoy/upstream:cluster_factory_interface", - "//include/envoy/upstream:cluster_manager_interface", - "//include/envoy/upstream:health_checker_interface", - "//include/envoy/upstream:load_balancer_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/http:async_client_interface", + "//envoy/upstream:cluster_factory_interface", + "//envoy/upstream:cluster_manager_interface", + "//envoy/upstream:health_checker_interface", + "//envoy/upstream:load_balancer_interface", + "//envoy/upstream:upstream_interface", "//source/common/http:header_utility_lib", "//source/common/upstream:cluster_factory_lib", "//source/common/upstream:health_discovery_service_lib", @@ -122,7 +122,7 @@ envoy_cc_mock( srcs = ["host_set.cc"], hdrs = ["host_set.h"], deps = [ - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:upstream_interface", "//source/common/common:callback_impl_lib", "//source/common/upstream:upstream_lib", ], @@ -133,7 +133,7 @@ envoy_cc_mock( srcs = ["priority_set.cc"], hdrs = ["priority_set.h"], deps = [ - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:upstream_interface", "//test/mocks/upstream:host_set_mocks", ], ) @@ -143,7 +143,7 @@ envoy_cc_mock( srcs = ["retry_priority.cc"], hdrs = ["retry_priority.h"], deps = [ - "//include/envoy/upstream:retry_interface", + "//envoy/upstream:retry_interface", ], ) @@ -151,7 +151,7 @@ envoy_cc_mock( name = "retry_priority_factory_mocks", hdrs = ["retry_priority_factory.h"], deps = [ - "//include/envoy/upstream:retry_interface", + "//envoy/upstream:retry_interface", "//test/mocks/upstream:retry_priority_mocks", ], ) @@ -161,7 +161,7 @@ envoy_cc_mock( srcs = ["cluster.cc"], hdrs = ["cluster.h"], deps = [ - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:upstream_interface", "//test/mocks/upstream:cluster_info_mocks", ], ) @@ -190,7 +190,7 @@ envoy_cc_mock( srcs = ["load_balancer.cc"], hdrs = ["load_balancer.h"], deps = [ - "//include/envoy/upstream:load_balancer_interface", + "//envoy/upstream:load_balancer_interface", "//test/mocks/upstream:host_mocks", ], ) @@ -200,7 +200,7 @@ envoy_cc_mock( srcs = ["thread_aware_load_balancer.cc"], hdrs = ["thread_aware_load_balancer.h"], deps = [ - "//include/envoy/upstream:load_balancer_interface", + "//envoy/upstream:load_balancer_interface", ], ) @@ -209,7 +209,7 @@ envoy_cc_mock( srcs = ["thread_local_cluster.cc"], hdrs = ["thread_local_cluster.h"], deps = [ - "//include/envoy/upstream:thread_local_cluster_interface", + "//envoy/upstream:thread_local_cluster_interface", "//test/mocks/http:conn_pool_mocks", "//test/mocks/http:http_mocks", "//test/mocks/tcp:tcp_mocks", @@ -223,7 +223,7 @@ envoy_cc_mock( srcs = ["cluster_manager_factory.cc"], hdrs = ["cluster_manager_factory.h"], deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", "//test/mocks/secret:secret_mocks", ], ) @@ -233,7 +233,7 @@ envoy_cc_mock( srcs = ["cluster_update_callbacks_handle.cc"], hdrs = ["cluster_update_callbacks_handle.h"], deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", ], ) @@ -242,7 +242,7 @@ envoy_cc_mock( srcs = ["cluster_manager.cc"], hdrs = ["cluster_manager.h"], deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", "//test/mocks/config:config_mocks", "//test/mocks/grpc:grpc_mocks", "//test/mocks/http:http_mocks", @@ -257,7 +257,7 @@ envoy_cc_mock( srcs = ["health_checker.cc"], hdrs = ["health_checker.h"], deps = [ - "//include/envoy/upstream:health_checker_interface", + "//envoy/upstream:health_checker_interface", ], ) @@ -265,7 +265,7 @@ envoy_cc_mock( name = "health_check_event_logger_mocks", hdrs = ["health_check_event_logger.h"], deps = [ - "//include/envoy/upstream:health_checker_interface", + "//envoy/upstream:health_checker_interface", "@envoy_api//envoy/data/core/v3:pkg_cc_proto", ], ) @@ -275,7 +275,7 @@ envoy_cc_mock( srcs = ["cds_api.cc"], hdrs = ["cds_api.h"], deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", ], ) @@ -284,7 +284,7 @@ envoy_cc_mock( srcs = ["cluster_update_callbacks.cc"], hdrs = ["cluster_update_callbacks.h"], deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", ], ) @@ -293,7 +293,7 @@ envoy_cc_mock( srcs = ["cluster_info_factory.cc"], hdrs = ["cluster_info_factory.h"], deps = [ - "//include/envoy/upstream:cluster_manager_interface", + "//envoy/upstream:cluster_manager_interface", "//source/common/common:minimal_logger_lib", ], ) @@ -303,7 +303,7 @@ envoy_cc_mock( srcs = ["retry_host_predicate.cc"], hdrs = ["retry_host_predicate.h"], deps = [ - "//include/envoy/upstream:retry_interface", + "//envoy/upstream:retry_interface", ], ) @@ -311,7 +311,7 @@ envoy_cc_mock( name = "test_retry_host_predicate_factory_mocks", hdrs = ["test_retry_host_predicate_factory.h"], deps = [ - "//include/envoy/upstream:retry_interface", + "//envoy/upstream:retry_interface", "//test/mocks/upstream:retry_host_predicate_mocks", ], ) @@ -321,6 +321,6 @@ envoy_cc_mock( srcs = ["basic_resource_limit.cc"], hdrs = ["basic_resource_limit.h"], deps = [ - "//include/envoy/common:resource_interface", + "//envoy/common:resource_interface", ], ) diff --git a/test/mocks/upstream/cluster_info.cc b/test/mocks/upstream/cluster_info.cc index 5e755e1851df0..c24c81d95bc27 100644 --- a/test/mocks/upstream/cluster_info.cc +++ b/test/mocks/upstream/cluster_info.cc @@ -6,10 +6,10 @@ #include "envoy/upstream/host_description.h" #include "envoy/upstream/upstream.h" -#include "common/config/metadata.h" -#include "common/http/utility.h" -#include "common/network/raw_buffer_socket.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/config/metadata.h" +#include "source/common/http/utility.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/common/upstream/upstream_impl.h" using testing::_; using testing::Invoke; diff --git a/test/mocks/upstream/cluster_info.h b/test/mocks/upstream/cluster_info.h index ab597fade7fa4..060806a376362 100644 --- a/test/mocks/upstream/cluster_info.h +++ b/test/mocks/upstream/cluster_info.h @@ -13,11 +13,11 @@ #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/upstream.h" -#include "common/common/thread.h" -#include "common/http/http1/codec_stats.h" -#include "common/http/http2/codec_stats.h" -#include "common/http/http3/codec_stats.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/common/thread.h" +#include "source/common/http/http1/codec_stats.h" +#include "source/common/http/http2/codec_stats.h" +#include "source/common/http/http3/codec_stats.h" +#include "source/common/upstream/upstream_impl.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/stats/mocks.h" diff --git a/test/mocks/upstream/cluster_info_factory.h b/test/mocks/upstream/cluster_info_factory.h index 08144c57154d4..f9f237e490d9e 100644 --- a/test/mocks/upstream/cluster_info_factory.h +++ b/test/mocks/upstream/cluster_info_factory.h @@ -2,7 +2,7 @@ #include "envoy/upstream/cluster_manager.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/mocks/upstream/host.cc b/test/mocks/upstream/host.cc index 0670abadd5c01..53cab64d27a4c 100644 --- a/test/mocks/upstream/host.cc +++ b/test/mocks/upstream/host.cc @@ -1,6 +1,6 @@ #include "test/mocks/upstream/host.h" -#include "common/network/utility.h" +#include "source/common/network/utility.h" using testing::_; using testing::Invoke; diff --git a/test/mocks/upstream/host.h b/test/mocks/upstream/host.h index 82ea4bd8e5df1..2ab0e07a1b0a9 100644 --- a/test/mocks/upstream/host.h +++ b/test/mocks/upstream/host.h @@ -9,7 +9,7 @@ #include "envoy/data/cluster/v3/outlier_detection_event.pb.h" #include "envoy/upstream/upstream.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/stats/symbol_table_impl.h" #include "test/mocks/network/transport_socket.h" #include "test/mocks/upstream/cluster_info.h" diff --git a/test/mocks/upstream/host_set.h b/test/mocks/upstream/host_set.h index 529d34d387f6e..7fd18d438f0d0 100644 --- a/test/mocks/upstream/host_set.h +++ b/test/mocks/upstream/host_set.h @@ -2,8 +2,8 @@ #include "envoy/upstream/upstream.h" -#include "common/common/callback_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/common/callback_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/mocks/upstream/mocks.h b/test/mocks/upstream/mocks.h index 879280b0aef13..433aec61f06e3 100644 --- a/test/mocks/upstream/mocks.h +++ b/test/mocks/upstream/mocks.h @@ -12,10 +12,10 @@ #include "envoy/upstream/health_checker.h" #include "envoy/upstream/upstream.h" -#include "common/common/callback_impl.h" -#include "common/upstream/health_discovery_service.h" -#include "common/upstream/load_balancer_impl.h" -#include "common/upstream/upstream_impl.h" +#include "source/common/common/callback_impl.h" +#include "source/common/upstream/health_discovery_service.h" +#include "source/common/upstream/load_balancer_impl.h" +#include "source/common/upstream/upstream_impl.h" #include "test/mocks/config/mocks.h" #include "test/mocks/grpc/mocks.h" diff --git a/test/mocks/upstream/thread_local_cluster.cc b/test/mocks/upstream/thread_local_cluster.cc index 9e0d9eedd33e4..5842f04d8807a 100644 --- a/test/mocks/upstream/thread_local_cluster.cc +++ b/test/mocks/upstream/thread_local_cluster.cc @@ -13,8 +13,10 @@ MockThreadLocalCluster::MockThreadLocalCluster() { ON_CALL(*this, prioritySet()).WillByDefault(ReturnRef(cluster_.priority_set_)); ON_CALL(*this, info()).WillByDefault(Return(cluster_.info_)); ON_CALL(*this, loadBalancer()).WillByDefault(ReturnRef(lb_)); - ON_CALL(*this, httpConnPool(_, _, _)).WillByDefault(Return(&conn_pool_)); - ON_CALL(*this, tcpConnPool(_, _)).WillByDefault(Return(&tcp_conn_pool_)); + ON_CALL(*this, httpConnPool(_, _, _)) + .WillByDefault(Return(Upstream::HttpPoolData([]() {}, &conn_pool_))); + ON_CALL(*this, tcpConnPool(_, _)) + .WillByDefault(Return(Upstream::TcpPoolData([]() {}, &tcp_conn_pool_))); ON_CALL(*this, httpAsyncClient()).WillByDefault(ReturnRef(async_client_)); } diff --git a/test/mocks/upstream/thread_local_cluster.h b/test/mocks/upstream/thread_local_cluster.h index d4900d18c4933..7057b07da8766 100644 --- a/test/mocks/upstream/thread_local_cluster.h +++ b/test/mocks/upstream/thread_local_cluster.h @@ -30,10 +30,10 @@ class MockThreadLocalCluster : public ThreadLocalCluster { MOCK_METHOD(const PrioritySet&, prioritySet, ()); MOCK_METHOD(ClusterInfoConstSharedPtr, info, ()); MOCK_METHOD(LoadBalancer&, loadBalancer, ()); - MOCK_METHOD(Http::ConnectionPool::Instance*, httpConnPool, + MOCK_METHOD(absl::optional, httpConnPool, (ResourcePriority priority, absl::optional downstream_protocol, LoadBalancerContext* context)); - MOCK_METHOD(Tcp::ConnectionPool::Instance*, tcpConnPool, + MOCK_METHOD(absl::optional, tcpConnPool, (ResourcePriority priority, LoadBalancerContext* context)); MOCK_METHOD(MockHost::MockCreateConnectionData, tcpConn_, (LoadBalancerContext * context)); MOCK_METHOD(Http::AsyncClient&, httpAsyncClient, ()); diff --git a/test/mocks/upstream/transport_socket_match.cc b/test/mocks/upstream/transport_socket_match.cc index 27a77289b64b5..0f12148f90d3a 100644 --- a/test/mocks/upstream/transport_socket_match.cc +++ b/test/mocks/upstream/transport_socket_match.cc @@ -1,6 +1,6 @@ #include "test/mocks/upstream/transport_socket_match.h" -#include "common/network/raw_buffer_socket.h" +#include "source/common/network/raw_buffer_socket.h" using testing::_; using testing::Return; diff --git a/test/server/BUILD b/test/server/BUILD index 498bc7ecef0bb..c35ef66fa63b9 100644 --- a/test/server/BUILD +++ b/test/server/BUILD @@ -125,7 +125,7 @@ envoy_cc_test( name = "filter_config_test", srcs = ["filter_config_test.cc"], deps = [ - "//include/envoy/server:filter_config_interface", + "//envoy/server:filter_config_interface", "//source/extensions/filters/http/common:pass_through_filter_lib", "//test/mocks/server:server_mocks", ], @@ -173,7 +173,7 @@ envoy_cc_test( size = "small", srcs = ["guarddog_impl_test.cc"], deps = [ - "//include/envoy/common:time_interface", + "//envoy/common:time_interface", "//source/common/api:api_lib", "//source/common/common:macros", "//source/common/common:utility_lib", @@ -193,8 +193,8 @@ envoy_cc_test( name = "options_impl_test", srcs = ["options_impl_test.cc"], deps = [ - "//include/envoy/config:typed_config_interface", - "//include/envoy/server:filter_config_interface", + "//envoy/config:typed_config_interface", + "//envoy/server:filter_config_interface", "//source/common/common:utility_lib", "//source/common/stats:stats_lib", "//source/extensions/filters/http:well_known_names", @@ -217,7 +217,7 @@ envoy_cc_test( name = "overload_manager_impl_test", srcs = ["overload_manager_impl_test.cc"], deps = [ - "//include/envoy/registry", + "//envoy/registry", "//source/common/stats:isolated_store_lib", "//source/extensions/resource_monitors/common:factory_base_lib", "//source/server:overload_manager_lib", diff --git a/test/server/active_tcp_listener_test.cc b/test/server/active_tcp_listener_test.cc index cc1e2710f9f2d..9d15d452475b6 100644 --- a/test/server/active_tcp_listener_test.cc +++ b/test/server/active_tcp_listener_test.cc @@ -4,12 +4,11 @@ #include "envoy/network/listener.h" #include "envoy/stats/scope.h" -#include "common/network/address_impl.h" -#include "common/network/connection_balancer_impl.h" -#include "common/network/raw_buffer_socket.h" -#include "common/network/utility.h" - -#include "server/active_tcp_listener.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/connection_balancer_impl.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/common/network/utility.h" +#include "source/server/active_tcp_listener.h" #include "test/mocks/api/mocks.h" #include "test/mocks/common.h" diff --git a/test/server/admin/BUILD b/test/server/admin/BUILD index 1952d5f6007f4..bd564a1540c6c 100644 --- a/test/server/admin/BUILD +++ b/test/server/admin/BUILD @@ -27,8 +27,8 @@ envoy_cc_test( srcs = ["admin_test.cc"], deps = [ ":admin_instance_lib", - "//include/envoy/json:json_object_interface", - "//include/envoy/runtime:runtime_interface", + "//envoy/json:json_object_interface", + "//envoy/runtime:runtime_interface", "//source/common/http:message_lib", "//source/common/json:json_loader_lib", "//source/common/protobuf", diff --git a/test/server/admin/admin_filter_test.cc b/test/server/admin/admin_filter_test.cc index ee51cdecc1698..d7b3cc2ef3de3 100644 --- a/test/server/admin/admin_filter_test.cc +++ b/test/server/admin/admin_filter_test.cc @@ -1,4 +1,4 @@ -#include "server/admin/admin_filter.h" +#include "source/server/admin/admin_filter.h" #include "test/mocks/server/instance.h" #include "test/test_common/environment.h" diff --git a/test/server/admin/admin_instance.cc b/test/server/admin/admin_instance.cc index e41695c4b0d4f..d63b0887c7467 100644 --- a/test/server/admin/admin_instance.cc +++ b/test/server/admin/admin_instance.cc @@ -1,8 +1,7 @@ #include "test/server/admin/admin_instance.h" -#include "common/access_log/access_log_impl.h" - -#include "extensions/access_loggers/common/file_access_log_impl.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/extensions/access_loggers/common/file_access_log_impl.h" namespace Envoy { namespace Server { diff --git a/test/server/admin/admin_instance.h b/test/server/admin/admin_instance.h index 7092d973c00e1..b087b926e2183 100644 --- a/test/server/admin/admin_instance.h +++ b/test/server/admin/admin_instance.h @@ -1,6 +1,6 @@ #pragma once -#include "server/admin/admin.h" +#include "source/server/admin/admin.h" #include "test/mocks/http/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/server/admin/admin_test.cc b/test/server/admin/admin_test.cc index fdcd42ac3e850..b0f8e4532248a 100644 --- a/test/server/admin/admin_test.cc +++ b/test/server/admin/admin_test.cc @@ -8,14 +8,13 @@ #include "envoy/upstream/outlier_detection.h" #include "envoy/upstream/upstream.h" -#include "common/access_log/access_log_impl.h" -#include "common/http/message_impl.h" -#include "common/json/json_loader.h" -#include "common/protobuf/protobuf.h" -#include "common/protobuf/utility.h" -#include "common/upstream/upstream_impl.h" - -#include "extensions/access_loggers/common/file_access_log_impl.h" +#include "source/common/access_log/access_log_impl.h" +#include "source/common/http/message_impl.h" +#include "source/common/json/json_loader.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/protobuf/utility.h" +#include "source/common/upstream/upstream_impl.h" +#include "source/extensions/access_loggers/common/file_access_log_impl.h" #include "test/server/admin/admin_instance.h" #include "test/test_common/logging.h" diff --git a/test/server/admin/config_tracker_impl_test.cc b/test/server/admin/config_tracker_impl_test.cc index 9388c2e2ef112..a666d59a1fbdd 100644 --- a/test/server/admin/config_tracker_impl_test.cc +++ b/test/server/admin/config_tracker_impl_test.cc @@ -1,4 +1,4 @@ -#include "server/admin/config_tracker_impl.h" +#include "source/server/admin/config_tracker_impl.h" #include "test/mocks/common.h" diff --git a/test/server/admin/logs_handler_test.cc b/test/server/admin/logs_handler_test.cc index 3103164bb24e4..1325af425d566 100644 --- a/test/server/admin/logs_handler_test.cc +++ b/test/server/admin/logs_handler_test.cc @@ -1,5 +1,5 @@ -#include "common/common/fancy_logger.h" -#include "common/common/logger.h" +#include "source/common/common/fancy_logger.h" +#include "source/common/common/logger.h" #include "test/server/admin/admin_instance.h" diff --git a/test/server/admin/profiling_handler_test.cc b/test/server/admin/profiling_handler_test.cc index 353bc780e87b7..709675e00a11f 100644 --- a/test/server/admin/profiling_handler_test.cc +++ b/test/server/admin/profiling_handler_test.cc @@ -1,4 +1,4 @@ -#include "common/profiler/profiler.h" +#include "source/common/profiler/profiler.h" #include "test/server/admin/admin_instance.h" #include "test/test_common/logging.h" diff --git a/test/server/admin/prometheus_stats_test.cc b/test/server/admin/prometheus_stats_test.cc index bd7ebd530d985..7824218e28bb7 100644 --- a/test/server/admin/prometheus_stats_test.cc +++ b/test/server/admin/prometheus_stats_test.cc @@ -1,6 +1,6 @@ #include -#include "server/admin/prometheus_stats.h" +#include "source/server/admin/prometheus_stats.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/utility.h" diff --git a/test/server/admin/server_info_handler_test.cc b/test/server/admin/server_info_handler_test.cc index 6bb8902890255..9b7e0fa3643f7 100644 --- a/test/server/admin/server_info_handler_test.cc +++ b/test/server/admin/server_info_handler_test.cc @@ -1,6 +1,6 @@ #include "envoy/admin/v3/memory.pb.h" -#include "extensions/transport_sockets/tls/context_config_impl.h" +#include "source/extensions/transport_sockets/tls/context_config_impl.h" #include "test/server/admin/admin_instance.h" #include "test/test_common/logging.h" diff --git a/test/server/admin/stats_handler_test.cc b/test/server/admin/stats_handler_test.cc index 2f3b02ff75369..cf1dc13118936 100644 --- a/test/server/admin/stats_handler_test.cc +++ b/test/server/admin/stats_handler_test.cc @@ -1,8 +1,7 @@ #include -#include "common/stats/thread_local_store.h" - -#include "server/admin/stats_handler.h" +#include "source/common/stats/thread_local_store.h" +#include "source/server/admin/stats_handler.h" #include "test/server/admin/admin_instance.h" #include "test/test_common/logging.h" diff --git a/test/server/api_listener_test.cc b/test/server/api_listener_test.cc index 477b36dc90694..4572e40a1ce6f 100644 --- a/test/server/api_listener_test.cc +++ b/test/server/api_listener_test.cc @@ -2,8 +2,8 @@ #include "envoy/config/listener/v3/listener.pb.h" -#include "server/api_listener_impl.h" -#include "server/listener_manager_impl.h" +#include "source/server/api_listener_impl.h" +#include "source/server/listener_manager_impl.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/instance.h" diff --git a/test/server/backtrace_test.cc b/test/server/backtrace_test.cc index a83ae4d9a4099..8ba11f5387173 100644 --- a/test/server/backtrace_test.cc +++ b/test/server/backtrace_test.cc @@ -1,4 +1,4 @@ -#include "server/backtrace.h" +#include "source/server/backtrace.h" #include "test/test_common/logging.h" diff --git a/test/server/config_validation/BUILD b/test/server/config_validation/BUILD index 0f33ffe205e3a..2292906cddb94 100644 --- a/test/server/config_validation/BUILD +++ b/test/server/config_validation/BUILD @@ -10,8 +10,8 @@ envoy_cc_test( name = "cluster_manager_test", srcs = ["cluster_manager_test.cc"], deps = [ - "//include/envoy/upstream:resource_manager_interface", - "//include/envoy/upstream:upstream_interface", + "//envoy/upstream:resource_manager_interface", + "//envoy/upstream:upstream_interface", "//source/common/api:api_lib", "//source/common/singleton:manager_impl_lib", "//source/common/stats:stats_lib", diff --git a/test/server/config_validation/cluster_manager_test.cc b/test/server/config_validation/cluster_manager_test.cc index 7f00522f25180..4a5ec1f4fd0d9 100644 --- a/test/server/config_validation/cluster_manager_test.cc +++ b/test/server/config_validation/cluster_manager_test.cc @@ -2,14 +2,12 @@ #include "envoy/upstream/resource_manager.h" #include "envoy/upstream/upstream.h" -#include "common/api/api_impl.h" -#include "common/grpc/context_impl.h" -#include "common/http/context_impl.h" -#include "common/singleton/manager_impl.h" - -#include "server/config_validation/cluster_manager.h" - -#include "extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/grpc/context_impl.h" +#include "source/common/http/context_impl.h" +#include "source/common/singleton/manager_impl.h" +#include "source/extensions/transport_sockets/tls/context_manager_impl.h" +#include "source/server/config_validation/cluster_manager.h" #include "test/mocks/access_log/mocks.h" #include "test/mocks/event/mocks.h" diff --git a/test/server/config_validation/config_fuzz_test.cc b/test/server/config_validation/config_fuzz_test.cc index e6ce91e4440d5..f2b197ba02eb1 100644 --- a/test/server/config_validation/config_fuzz_test.cc +++ b/test/server/config_validation/config_fuzz_test.cc @@ -2,10 +2,9 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "common/common/thread.h" -#include "common/network/address_impl.h" - -#include "server/config_validation/server.h" +#include "source/common/common/thread.h" +#include "source/common/network/address_impl.h" +#include "source/server/config_validation/server.h" #include "test/fuzz/fuzz_runner.h" #include "test/integration/server.h" diff --git a/test/server/config_validation/dispatcher_test.cc b/test/server/config_validation/dispatcher_test.cc index b8a60c1da7a17..608135be22ae0 100644 --- a/test/server/config_validation/dispatcher_test.cc +++ b/test/server/config_validation/dispatcher_test.cc @@ -1,13 +1,12 @@ #include -#include "common/common/thread.h" -#include "common/event/dispatcher_impl.h" -#include "common/event/libevent.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" -#include "common/stats/isolated_store_impl.h" - -#include "server/config_validation/api.h" +#include "source/common/common/thread.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/common/event/libevent.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/server/config_validation/api.h" #include "test/mocks/common.h" #include "test/test_common/environment.h" @@ -62,10 +61,13 @@ TEST_P(ConfigValidation, CreateScaledTimer) { // DNS resolver returns the same shared_ptr. TEST_F(ConfigValidation, SharedDnsResolver) { std::vector resolvers; + auto dns_resolver_options = envoy::config::core::v3::DnsResolverOptions(); - Network::DnsResolverSharedPtr dns1 = dispatcher_->createDnsResolver(resolvers, false); + Network::DnsResolverSharedPtr dns1 = + dispatcher_->createDnsResolver(resolvers, dns_resolver_options); long use_count = dns1.use_count(); - Network::DnsResolverSharedPtr dns2 = dispatcher_->createDnsResolver(resolvers, false); + Network::DnsResolverSharedPtr dns2 = + dispatcher_->createDnsResolver(resolvers, dns_resolver_options); EXPECT_EQ(dns1.get(), dns2.get()); // Both point to the same instance. EXPECT_EQ(use_count + 1, dns2.use_count()); // Each call causes ++ in use_count. diff --git a/test/server/config_validation/server_test.cc b/test/server/config_validation/server_test.cc index 8ec76fe3a9615..14611beda5a60 100644 --- a/test/server/config_validation/server_test.cc +++ b/test/server/config_validation/server_test.cc @@ -2,12 +2,13 @@ #include "envoy/server/filter_config.h" -#include "server/config_validation/server.h" +#include "source/server/config_validation/server.h" #include "test/integration/server.h" #include "test/mocks/server/options.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/environment.h" +#include "test/test_common/network_utility.h" #include "test/test_common/registry.h" #include "test/test_common/test_time.h" @@ -170,6 +171,20 @@ TEST_P(RuntimeFeatureValidationServerTest, ValidRuntimeLoaderSingleton) { Thread::threadFactoryForTest(), Filesystem::fileSystemForTest())); } +// Test the admin handler stubs used in validation +TEST(ValidationTest, Admin) { + auto local_address = + Network::Test::getCanonicalLoopbackAddress(TestEnvironment::getIpVersionsForTest()[0]); + + ValidationAdmin admin(local_address); + std::string empty = ""; + Server::Admin::HandlerCb cb; + EXPECT_TRUE(admin.addHandler(empty, empty, cb, false, false)); + EXPECT_TRUE(admin.removeHandler(empty)); + EXPECT_EQ(1, admin.concurrency()); + admin.socket(); +} + INSTANTIATE_TEST_SUITE_P( AllConfigs, RuntimeFeatureValidationServerTest, ::testing::ValuesIn(RuntimeFeatureValidationServerTest::getAllConfigFiles())); diff --git a/test/server/config_validation/xds_verifier.cc b/test/server/config_validation/xds_verifier.cc index 4107fd23eabe8..954e2793b249a 100644 --- a/test/server/config_validation/xds_verifier.cc +++ b/test/server/config_validation/xds_verifier.cc @@ -1,6 +1,6 @@ #include "test/server/config_validation/xds_verifier.h" -#include "common/common/logger.h" +#include "source/common/common/logger.h" namespace Envoy { diff --git a/test/server/config_validation/xds_verifier.h b/test/server/config_validation/xds_verifier.h index cfe8968563733..69425f1cd4038 100644 --- a/test/server/config_validation/xds_verifier.h +++ b/test/server/config_validation/xds_verifier.h @@ -8,7 +8,7 @@ #include "envoy/config/route/v3/route.pb.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "test/server/config_validation/xds_fuzz.pb.h" diff --git a/test/server/configuration_impl_test.cc b/test/server/configuration_impl_test.cc index 6abdd713c0798..d4625db963881 100644 --- a/test/server/configuration_impl_test.cc +++ b/test/server/configuration_impl_test.cc @@ -7,15 +7,13 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/config/metrics/v3/stats.pb.h" -#include "common/api/api_impl.h" -#include "common/config/well_known_names.h" -#include "common/json/json_loader.h" -#include "common/protobuf/utility.h" -#include "common/upstream/cluster_manager_impl.h" - -#include "server/configuration_impl.h" - -#include "extensions/stat_sinks/well_known_names.h" +#include "source/common/api/api_impl.h" +#include "source/common/config/well_known_names.h" +#include "source/common/json/json_loader.h" +#include "source/common/protobuf/utility.h" +#include "source/common/upstream/cluster_manager_impl.h" +#include "source/extensions/stat_sinks/well_known_names.h" +#include "source/server/configuration_impl.h" #include "test/common/upstream/utility.h" #include "test/mocks/common.h" diff --git a/test/server/connection_handler_test.cc b/test/server/connection_handler_test.cc index c15f984a4e943..b97a3d140c614 100644 --- a/test/server/connection_handler_test.cc +++ b/test/server/connection_handler_test.cc @@ -4,18 +4,17 @@ #include "envoy/network/filter.h" #include "envoy/stats/scope.h" -#include "common/common/utility.h" -#include "common/config/utility.h" -#include "common/network/address_impl.h" -#include "common/network/connection_balancer_impl.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/raw_buffer_socket.h" -#include "common/network/udp_listener_impl.h" -#include "common/network/udp_packet_writer_handler_impl.h" -#include "common/network/utility.h" - -#include "server/active_raw_udp_listener_config.h" -#include "server/connection_handler_impl.h" +#include "source/common/common/utility.h" +#include "source/common/config/utility.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/connection_balancer_impl.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/common/network/udp_listener_impl.h" +#include "source/common/network/udp_packet_writer_handler_impl.h" +#include "source/common/network/utility.h" +#include "source/server/active_raw_udp_listener_config.h" +#include "source/server/connection_handler_impl.h" #include "test/mocks/access_log/mocks.h" #include "test/mocks/api/mocks.h" diff --git a/test/server/drain_manager_impl_test.cc b/test/server/drain_manager_impl_test.cc index f5a5687af3660..eadddc978abe1 100644 --- a/test/server/drain_manager_impl_test.cc +++ b/test/server/drain_manager_impl_test.cc @@ -2,7 +2,7 @@ #include "envoy/config/listener/v3/listener.pb.h" -#include "server/drain_manager_impl.h" +#include "source/server/drain_manager_impl.h" #include "test/mocks/server/instance.h" diff --git a/test/server/filter_chain_benchmark_test.cc b/test/server/filter_chain_benchmark_test.cc index 07f12b7812a82..f14ab189beb71 100644 --- a/test/server/filter_chain_benchmark_test.cc +++ b/test/server/filter_chain_benchmark_test.cc @@ -7,9 +7,8 @@ #include "envoy/network/listen_socket.h" #include "envoy/protobuf/message_validator.h" -#include "common/network/socket_impl.h" - -#include "server/filter_chain_manager_impl.h" +#include "source/common/network/socket_impl.h" +#include "source/server/filter_chain_manager_impl.h" #include "test/benchmark/main.h" #include "test/mocks/network/mocks.h" diff --git a/test/server/filter_chain_manager_impl_test.cc b/test/server/filter_chain_manager_impl_test.cc index c66d80e868190..a329d6e86214c 100644 --- a/test/server/filter_chain_manager_impl_test.cc +++ b/test/server/filter_chain_manager_impl_test.cc @@ -9,20 +9,18 @@ #include "envoy/registry/registry.h" #include "envoy/server/filter_config.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/config/metadata.h" -#include "common/network/address_impl.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/socket_option_impl.h" -#include "common/network/utility.h" -#include "common/protobuf/protobuf.h" - -#include "server/configuration_impl.h" -#include "server/filter_chain_manager_impl.h" -#include "server/listener_manager_impl.h" - -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/config/metadata.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" +#include "source/server/configuration_impl.h" +#include "source/server/filter_chain_manager_impl.h" +#include "source/server/listener_manager_impl.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/drain_manager.h" diff --git a/test/server/filter_config_test.cc b/test/server/filter_config_test.cc index 15e89c590020d..71c1318be8f9b 100644 --- a/test/server/filter_config_test.cc +++ b/test/server/filter_config_test.cc @@ -1,6 +1,6 @@ #include "envoy/server/filter_config.h" -#include "extensions/filters/http/common/pass_through_filter.h" +#include "source/extensions/filters/http/common/pass_through_filter.h" #include "test/mocks/server/factory_context.h" diff --git a/test/server/guarddog_impl_test.cc b/test/server/guarddog_impl_test.cc index d5ff1f4698b4c..53b2dcc962e6a 100644 --- a/test/server/guarddog_impl_test.cc +++ b/test/server/guarddog_impl_test.cc @@ -10,12 +10,11 @@ #include "envoy/server/watchdog.h" #include "envoy/thread/thread.h" -#include "common/api/api_impl.h" -#include "common/common/macros.h" -#include "common/common/utility.h" -#include "common/protobuf/utility.h" - -#include "server/guarddog_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/common/protobuf/utility.h" +#include "source/server/guarddog_impl.h" #include "test/mocks/common.h" #include "test/mocks/event/mocks.h" diff --git a/test/server/hot_restart_impl_test.cc b/test/server/hot_restart_impl_test.cc index 3c61523ebfdf8..a1e29d04b513a 100644 --- a/test/server/hot_restart_impl_test.cc +++ b/test/server/hot_restart_impl_test.cc @@ -1,10 +1,9 @@ #include -#include "common/api/os_sys_calls_impl.h" -#include "common/api/os_sys_calls_impl_hot_restart.h" -#include "common/common/hex.h" - -#include "server/hot_restart_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/api/os_sys_calls_impl_hot_restart.h" +#include "source/common/common/hex.h" +#include "source/server/hot_restart_impl.h" #include "test/mocks/api/hot_restart.h" #include "test/mocks/api/mocks.h" diff --git a/test/server/hot_restarting_base_test.cc b/test/server/hot_restarting_base_test.cc index e9f326edf6e56..4bb851d2dfc60 100644 --- a/test/server/hot_restarting_base_test.cc +++ b/test/server/hot_restarting_base_test.cc @@ -1,4 +1,4 @@ -#include "server/hot_restarting_base.h" +#include "source/server/hot_restarting_base.h" #include "test/mocks/api/mocks.h" #include "test/mocks/network/mocks.h" diff --git a/test/server/hot_restarting_parent_test.cc b/test/server/hot_restarting_parent_test.cc index 32485e9640927..a403002c44783 100644 --- a/test/server/hot_restarting_parent_test.cc +++ b/test/server/hot_restarting_parent_test.cc @@ -1,7 +1,7 @@ #include -#include "server/hot_restarting_child.h" -#include "server/hot_restarting_parent.h" +#include "source/server/hot_restarting_child.h" +#include "source/server/hot_restarting_parent.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/instance.h" diff --git a/test/server/lds_api_test.cc b/test/server/lds_api_test.cc index 1bc639f3e0423..95045d81f2148 100644 --- a/test/server/lds_api_test.cc +++ b/test/server/lds_api_test.cc @@ -4,9 +4,8 @@ #include "envoy/config/listener/v3/listener.pb.h" #include "envoy/service/discovery/v3/discovery.pb.h" -#include "common/protobuf/utility.h" - -#include "server/lds_api.h" +#include "source/common/protobuf/utility.h" +#include "source/server/lds_api.h" #include "test/mocks/config/mocks.h" #include "test/mocks/init/mocks.h" diff --git a/test/server/listener_manager_impl_quic_only_test.cc b/test/server/listener_manager_impl_quic_only_test.cc index 52e1fee586ef5..60b923887514e 100644 --- a/test/server/listener_manager_impl_quic_only_test.cc +++ b/test/server/listener_manager_impl_quic_only_test.cc @@ -2,7 +2,7 @@ #include "envoy/config/listener/v3/listener.pb.h" #if defined(ENVOY_ENABLE_QUIC) -#include "common/quic/quic_transport_socket_factory.h" +#include "source/common/quic/quic_transport_socket_factory.h" #endif #include "test/server/listener_manager_impl_test.h" diff --git a/test/server/listener_manager_impl_test.cc b/test/server/listener_manager_impl_test.cc index 246579d4f1295..40ee2fecc83ff 100644 --- a/test/server/listener_manager_impl_test.cc +++ b/test/server/listener_manager_impl_test.cc @@ -15,16 +15,15 @@ #include "envoy/server/listener_manager.h" #include "envoy/stream_info/filter_state.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/config/metadata.h" -#include "common/init/manager_impl.h" -#include "common/network/address_impl.h" -#include "common/network/io_socket_handle_impl.h" -#include "common/network/utility.h" -#include "common/protobuf/protobuf.h" - -#include "extensions/filters/listener/original_dst/original_dst.h" -#include "extensions/transport_sockets/tls/ssl_socket.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/config/metadata.h" +#include "source/common/init/manager_impl.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/io_socket_handle_impl.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/protobuf.h" +#include "source/extensions/filters/listener/original_dst/original_dst.h" +#include "source/extensions/transport_sockets/tls/ssl_socket.h" #include "test/mocks/init/mocks.h" #include "test/server/utility.h" diff --git a/test/server/listener_manager_impl_test.h b/test/server/listener_manager_impl_test.h index 5dff439d8a6d6..26b19f70e672d 100644 --- a/test/server/listener_manager_impl_test.h +++ b/test/server/listener_manager_impl_test.h @@ -7,11 +7,10 @@ #include "envoy/config/listener/v3/listener.pb.h" #include "envoy/config/listener/v3/listener_components.pb.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/socket_option_impl.h" - -#include "server/configuration_impl.h" -#include "server/listener_manager_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/socket_option_impl.h" +#include "source/server/configuration_impl.h" +#include "source/server/listener_manager_impl.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/drain_manager.h" diff --git a/test/server/options_impl_test.cc b/test/server/options_impl_test.cc index 9ed6289c323e7..d02acf53bec35 100644 --- a/test/server/options_impl_test.cc +++ b/test/server/options_impl_test.cc @@ -13,16 +13,14 @@ #include "envoy/extensions/filters/http/buffer/v3/buffer.pb.h" #include "envoy/server/filter_config.h" -#include "common/common/utility.h" - -#include "server/options_impl.h" - -#include "extensions/filters/http/buffer/buffer_filter.h" -#include "extensions/filters/http/well_known_names.h" +#include "source/common/common/utility.h" +#include "source/extensions/filters/http/buffer/buffer_filter.h" +#include "source/extensions/filters/http/well_known_names.h" +#include "source/server/options_impl.h" #if defined(__linux__) #include -#include "server/options_impl_platform_linux.h" +#include "source/server/options_impl_platform_linux.h" #endif #include "test/mocks/api/mocks.h" #include "test/test_common/environment.h" diff --git a/test/server/overload_manager_impl_test.cc b/test/server/overload_manager_impl_test.cc index 394b6dc96b7d1..7bad384afdd99 100644 --- a/test/server/overload_manager_impl_test.cc +++ b/test/server/overload_manager_impl_test.cc @@ -8,11 +8,9 @@ #include "envoy/server/resource_monitor.h" #include "envoy/server/resource_monitor_config.h" -#include "common/stats/isolated_store_impl.h" - -#include "server/overload_manager_impl.h" - -#include "extensions/resource_monitors/common/factory_base.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/extensions/resource_monitors/common/factory_base.h" +#include "source/server/overload_manager_impl.h" #include "test/common/stats/stat_test_utility.h" #include "test/mocks/event/mocks.h" diff --git a/test/server/server_fuzz_test.cc b/test/server/server_fuzz_test.cc index b18dc694832c6..6c60493e65ec5 100644 --- a/test/server/server_fuzz_test.cc +++ b/test/server/server_fuzz_test.cc @@ -3,12 +3,11 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" #include "envoy/config/core/v3/address.pb.h" -#include "common/common/random_generator.h" -#include "common/network/address_impl.h" -#include "common/thread_local/thread_local_impl.h" - -#include "server/listener_hooks.h" -#include "server/server.h" +#include "source/common/common/random_generator.h" +#include "source/common/network/address_impl.h" +#include "source/common/thread_local/thread_local_impl.h" +#include "source/server/listener_hooks.h" +#include "source/server/server.h" #include "test/common/runtime/utility.h" #include "test/fuzz/fuzz_runner.h" diff --git a/test/server/server_test.cc b/test/server/server_test.cc index c7d8ef0692e6a..263e929758933 100644 --- a/test/server/server_test.cc +++ b/test/server/server_test.cc @@ -6,16 +6,15 @@ #include "envoy/server/bootstrap_extension_config.h" #include "envoy/server/fatal_action_config.h" -#include "common/common/assert.h" -#include "common/network/address_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/socket_option_impl.h" -#include "common/protobuf/protobuf.h" -#include "common/thread_local/thread_local_impl.h" -#include "common/version/version.h" - -#include "server/process_context_impl.h" -#include "server/server.h" +#include "source/common/common/assert.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/socket_option_impl.h" +#include "source/common/protobuf/protobuf.h" +#include "source/common/thread_local/thread_local_impl.h" +#include "source/common/version/version.h" +#include "source/server/process_context_impl.h" +#include "source/server/server.h" #include "test/common/config/dummy_config.pb.h" #include "test/common/stats/stat_test_utility.h" @@ -866,6 +865,23 @@ TEST_P(ServerInstanceImplTest, ZoneStatNameFromOption) { stats_store_.symbolTable().toString(server_->localInfo().zoneStatName())); } +// Validate user agent information from bootstrap Node. +TEST_P(ServerInstanceImplTest, UserAgentOverrideFromNode) { + initialize("test/server/test_data/server/node_bootstrap_agent_override.yaml"); + EXPECT_EQ("test-ci-user-agent", server_->localInfo().node().user_agent_name()); + EXPECT_TRUE(server_->localInfo().node().has_user_agent_build_version()); + EXPECT_EQ(9, server_->localInfo().node().user_agent_build_version().version().major_number()); + EXPECT_EQ(8, server_->localInfo().node().user_agent_build_version().version().minor_number()); + EXPECT_EQ(7, server_->localInfo().node().user_agent_build_version().version().patch()); +} + +// Validate deprecated user agent version field from bootstrap Node. +TEST_P(ServerInstanceImplTest, DEPRECATED_FEATURE_TEST(UserAgentBuildDeprecatedOverrideFromNode)) { + initialize("test/server/test_data/server/node_bootstrap_agent_deprecated_override.yaml"); + EXPECT_EQ("test-ci-user-agent", server_->localInfo().node().user_agent_name()); + EXPECT_EQ("test", server_->localInfo().node().hidden_envoy_deprecated_build_version()); +} + // Validate that bootstrap with v2 dynamic transport is rejected when --bootstrap-version is not // set. TEST_P(ServerInstanceImplTest, diff --git a/test/server/ssl_context_manager_test.cc b/test/server/ssl_context_manager_test.cc index 19257fdb9d071..70bc7d6c1a5ce 100644 --- a/test/server/ssl_context_manager_test.cc +++ b/test/server/ssl_context_manager_test.cc @@ -1,4 +1,4 @@ -#include "server/ssl_context_manager.h" +#include "source/server/ssl_context_manager.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/stats/mocks.h" diff --git a/test/server/test_data/server/node_bootstrap_agent_deprecated_override.yaml b/test/server/test_data/server/node_bootstrap_agent_deprecated_override.yaml new file mode 100644 index 0000000000000..595188e3ed5c3 --- /dev/null +++ b/test/server/test_data/server/node_bootstrap_agent_deprecated_override.yaml @@ -0,0 +1,11 @@ +node: + id: bootstrap_id + cluster: bootstrap_cluster + user_agent_name: test-ci-user-agent + user_agent_version: test +admin: + access_log_path: {{ null_device_path }} + address: + socket_address: + address: {{ ntop_ip_loopback_address }} + port_value: 0 diff --git a/test/server/test_data/server/node_bootstrap_agent_override.yaml b/test/server/test_data/server/node_bootstrap_agent_override.yaml new file mode 100644 index 0000000000000..cfad1e9fd2d69 --- /dev/null +++ b/test/server/test_data/server/node_bootstrap_agent_override.yaml @@ -0,0 +1,15 @@ +node: + id: bootstrap_id + cluster: bootstrap_cluster + user_agent_name: test-ci-user-agent + user_agent_build_version: + version: + major_number: 9 + minor_number: 8 + patch: 7 +admin: + access_log_path: {{ null_device_path }} + address: + socket_address: + address: {{ ntop_ip_loopback_address }} + port_value: 0 diff --git a/test/server/utility.h b/test/server/utility.h index 567388492280e..fc5139fff0a16 100644 --- a/test/server/utility.h +++ b/test/server/utility.h @@ -5,7 +5,7 @@ #include "envoy/config/listener/v3/listener.pb.h" #include "envoy/config/listener/v3/listener.pb.validate.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" #include "test/test_common/utility.h" diff --git a/test/server/worker_impl_test.cc b/test/server/worker_impl_test.cc index 6fd4291f2d9a2..cf73ebd0b79c5 100644 --- a/test/server/worker_impl_test.cc +++ b/test/server/worker_impl_test.cc @@ -1,9 +1,8 @@ #include "envoy/network/exception.h" -#include "common/api/api_impl.h" -#include "common/event/dispatcher_impl.h" - -#include "server/worker_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/event/dispatcher_impl.h" +#include "source/server/worker_impl.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/guard_dog.h" diff --git a/test/test_common/BUILD b/test/test_common/BUILD index 50b758d063539..75a5445637854 100644 --- a/test/test_common/BUILD +++ b/test/test_common/BUILD @@ -22,7 +22,7 @@ envoy_cc_test_library( ], deps = [ ":network_utility_lib", - "//include/envoy/server:options_interface", + "//envoy/server:options_interface", "//source/common/common:assert_lib", "//source/common/common:compiler_requirements_lib", "//source/common/common:macros", @@ -44,7 +44,7 @@ envoy_cc_test_library( hdrs = ["network_utility.h"], deps = [ ":utility_lib", - "//include/envoy/network:filter_interface", + "//envoy/network:filter_interface", "//source/common/common:assert_lib", "//source/common/network:address_lib", "//source/common/network:listen_socket_lib", @@ -81,7 +81,7 @@ envoy_cc_library( srcs = ["printers.cc"], hdrs = ["printers.h"], deps = [ - "//include/envoy/network:address_interface", + "//envoy/network:address_interface", "//source/common/buffer:buffer_lib", "//source/common/http:header_map_lib", ], @@ -91,7 +91,7 @@ envoy_cc_test_library( name = "registry_lib", hdrs = ["registry.h"], deps = [ - "//include/envoy/registry", + "//envoy/registry", ], ) @@ -115,9 +115,9 @@ envoy_cc_test_library( ":resources_lib", ":test_time_lib", ":thread_factory_for_test_lib", - "//include/envoy/buffer:buffer_interface", - "//include/envoy/http:codec_interface", - "//include/envoy/network:address_interface", + "//envoy/buffer:buffer_interface", + "//envoy/http:codec_interface", + "//envoy/network:address_interface", "//source/common/api:api_lib", "//source/common/common:empty_string", "//source/common/common:thread_lib", @@ -251,8 +251,8 @@ envoy_cc_test_library( deps = [ ":global_lib", ":only_one_thread_lib", - "//include/envoy/event:dispatcher_interface", - "//include/envoy/event:timer_interface", + "//envoy/event:dispatcher_interface", + "//envoy/event:timer_interface", "//source/common/common:thread_lib", ], ) diff --git a/test/test_common/contention.h b/test/test_common/contention.h index d90ab20d4eea0..e91bbfd61b88a 100644 --- a/test/test_common/contention.h +++ b/test/test_common/contention.h @@ -5,9 +5,9 @@ #include "envoy/api/api.h" -#include "common/common/lock_guard.h" -#include "common/common/mutex_tracer_impl.h" -#include "common/common/thread.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/mutex_tracer_impl.h" +#include "source/common/common/thread.h" #include "test/test_common/test_time.h" diff --git a/test/test_common/delegating_route_utility.h b/test/test_common/delegating_route_utility.h index a8d560c086e1d..2189f88946bbc 100644 --- a/test/test_common/delegating_route_utility.h +++ b/test/test_common/delegating_route_utility.h @@ -1,4 +1,4 @@ -#include "common/router/delegating_route_impl.h" +#include "source/common/router/delegating_route_impl.h" namespace Envoy { namespace Router { diff --git a/test/test_common/environment.cc b/test/test_common/environment.cc index 63fffcafc7fab..d2d33a73c4e71 100644 --- a/test/test_common/environment.cc +++ b/test/test_common/environment.cc @@ -9,20 +9,20 @@ #include "envoy/common/platform.h" -#include "common/common/assert.h" -#include "common/common/compiler_requirements.h" -#include "common/common/logger.h" -#include "common/common/macros.h" -#include "common/common/utility.h" -#include "common/filesystem/directory.h" +#include "source/common/common/assert.h" +#include "source/common/common/compiler_requirements.h" +#include "source/common/common/logger.h" +#include "source/common/common/macros.h" +#include "source/common/common/utility.h" +#include "source/common/filesystem/directory.h" #include "absl/container/node_hash_map.h" #ifdef ENVOY_HANDLE_SIGNALS -#include "common/signal/signal_action.h" +#include "source/common/signal/signal_action.h" #endif -#include "server/options_impl.h" +#include "source/server/options_impl.h" #include "test/test_common/file_system_for_test.h" #include "test/test_common/network_utility.h" diff --git a/test/test_common/environment.h b/test/test_common/environment.h index 935c495c95e55..0aa1cdd632d74 100644 --- a/test/test_common/environment.h +++ b/test/test_common/environment.h @@ -7,7 +7,7 @@ #include "envoy/network/address.h" #include "envoy/server/options.h" -#include "common/json/json_loader.h" +#include "source/common/json/json_loader.h" #include "absl/container/node_hash_map.h" #include "absl/strings/str_cat.h" diff --git a/test/test_common/file_system_for_test.cc b/test/test_common/file_system_for_test.cc index c00e82d5835b6..35ea2b1754ea6 100644 --- a/test/test_common/file_system_for_test.cc +++ b/test/test_common/file_system_for_test.cc @@ -1,6 +1,6 @@ #include "test/test_common/file_system_for_test.h" -#include "common/filesystem/filesystem_impl.h" +#include "source/common/filesystem/filesystem_impl.h" namespace Envoy { diff --git a/test/test_common/file_system_for_test.h b/test/test_common/file_system_for_test.h index d3f891e76cb4f..bd5abfcfd5020 100644 --- a/test/test_common/file_system_for_test.h +++ b/test/test_common/file_system_for_test.h @@ -2,7 +2,7 @@ #include "envoy/filesystem/filesystem.h" -#include "common/filesystem/file_shared_impl.h" +#include "source/common/filesystem/file_shared_impl.h" #include "absl/synchronization/mutex.h" @@ -35,7 +35,7 @@ class MemfileImpl : public FileSharedImpl { if (!flags_.test(File::Operation::Append)) { info_->data_.clear(); } - info_->data_.append(buffer); + info_->data_.append(std::string(buffer)); const ssize_t size = info_->data_.size(); return resultSuccess(size); } diff --git a/test/test_common/global.cc b/test/test_common/global.cc index 4c827922ee91f..1fdaf758fd6c6 100644 --- a/test/test_common/global.cc +++ b/test/test_common/global.cc @@ -1,6 +1,6 @@ #include "test/test_common/global.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" namespace Envoy { namespace Test { diff --git a/test/test_common/global.h b/test/test_common/global.h index 872f81e520eba..704bd412ff2f7 100644 --- a/test/test_common/global.h +++ b/test/test_common/global.h @@ -1,7 +1,7 @@ #pragma once -#include "common/common/lock_guard.h" -#include "common/common/thread.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/thread.h" #include "absl/container/flat_hash_map.h" diff --git a/test/test_common/logging.cc b/test/test_common/logging.cc index f014241fb198f..3663feb0c83dd 100644 --- a/test/test_common/logging.cc +++ b/test/test_common/logging.cc @@ -1,6 +1,6 @@ #include "test/test_common/logging.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "absl/synchronization/mutex.h" diff --git a/test/test_common/logging.h b/test/test_common/logging.h index 698fba241aad5..124f553fe7666 100644 --- a/test/test_common/logging.h +++ b/test/test_common/logging.h @@ -4,7 +4,7 @@ #include #include -#include "common/common/logger.h" +#include "source/common/common/logger.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" diff --git a/test/test_common/network_utility.cc b/test/test_common/network_utility.cc index 7e413e3ac5ce5..976f2e2205e65 100644 --- a/test/test_common/network_utility.cc +++ b/test/test_common/network_utility.cc @@ -5,15 +5,15 @@ #include "envoy/common/platform.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/assert.h" -#include "common/common/fmt.h" -#include "common/network/address_impl.h" -#include "common/network/listen_socket_impl.h" -#include "common/network/raw_buffer_socket.h" -#include "common/network/socket_interface.h" -#include "common/network/socket_option_factory.h" -#include "common/runtime/runtime_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/fmt.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/listen_socket_impl.h" +#include "source/common/network/raw_buffer_socket.h" +#include "source/common/network/socket_interface.h" +#include "source/common/network/socket_option_factory.h" +#include "source/common/runtime/runtime_impl.h" #include "test/test_common/utility.h" diff --git a/test/test_common/network_utility.h b/test/test_common/network_utility.h index 8970e790c6b81..47cea59e53ba7 100644 --- a/test/test_common/network_utility.h +++ b/test/test_common/network_utility.h @@ -8,7 +8,7 @@ #include "envoy/network/io_handle.h" #include "envoy/network/transport_socket.h" -#include "common/network/utility.h" +#include "source/common/network/utility.h" namespace Envoy { namespace Network { diff --git a/test/test_common/network_utility_test.cc b/test/test_common/network_utility_test.cc index dc40f1d28f2f3..e23575234fa49 100644 --- a/test/test_common/network_utility_test.cc +++ b/test/test_common/network_utility_test.cc @@ -1,6 +1,6 @@ #include -#include "common/api/os_sys_calls_impl.h" +#include "source/common/api/os_sys_calls_impl.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" diff --git a/test/test_common/only_one_thread.cc b/test/test_common/only_one_thread.cc index 06cc9855446d8..5b51f7664d408 100644 --- a/test/test_common/only_one_thread.cc +++ b/test/test_common/only_one_thread.cc @@ -2,7 +2,7 @@ #include "envoy/thread/thread.h" -#include "common/common/lock_guard.h" +#include "source/common/common/lock_guard.h" #include "test/test_common/thread_factory_for_test.h" diff --git a/test/test_common/only_one_thread.h b/test/test_common/only_one_thread.h index c726ae6d28fa5..fe2a4de752eb5 100644 --- a/test/test_common/only_one_thread.h +++ b/test/test_common/only_one_thread.h @@ -1,7 +1,7 @@ #pragma once -#include "common/common/assert.h" -#include "common/common/thread.h" +#include "source/common/common/assert.h" +#include "source/common/common/thread.h" namespace Envoy { namespace Thread { diff --git a/test/test_common/printers.cc b/test/test_common/printers.cc index 8a2ece63ad132..6d671b6696311 100644 --- a/test/test_common/printers.cc +++ b/test/test_common/printers.cc @@ -3,8 +3,8 @@ #include -#include "common/buffer/buffer_impl.h" -#include "common/http/header_map_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/header_map_impl.h" namespace Envoy { namespace Http { diff --git a/test/test_common/resources.h b/test/test_common/resources.h index e6508837f3cf9..9dcc8ec54b6be 100644 --- a/test/test_common/resources.h +++ b/test/test_common/resources.h @@ -2,7 +2,7 @@ #include -#include "common/singleton/const_singleton.h" +#include "source/common/singleton/const_singleton.h" namespace Envoy { namespace Config { diff --git a/test/test_common/simulated_time_system.cc b/test/test_common/simulated_time_system.cc index b01f13f6e0b35..de3b4e23db0fa 100644 --- a/test/test_common/simulated_time_system.cc +++ b/test/test_common/simulated_time_system.cc @@ -4,11 +4,11 @@ #include "envoy/event/dispatcher.h" -#include "common/common/assert.h" -#include "common/common/lock_guard.h" -#include "common/event/real_time_system.h" -#include "common/event/timer_impl.h" -#include "common/runtime/runtime_features.h" +#include "source/common/common/assert.h" +#include "source/common/common/lock_guard.h" +#include "source/common/event/real_time_system.h" +#include "source/common/event/timer_impl.h" +#include "source/common/runtime/runtime_features.h" namespace Envoy { namespace Event { diff --git a/test/test_common/simulated_time_system.h b/test/test_common/simulated_time_system.h index bdd860e13594f..16c09c67299f2 100644 --- a/test/test_common/simulated_time_system.h +++ b/test/test_common/simulated_time_system.h @@ -2,9 +2,9 @@ #include "envoy/event/timer.h" -#include "common/common/lock_guard.h" -#include "common/common/thread.h" -#include "common/common/utility.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/thread.h" +#include "source/common/common/utility.h" #include "test/test_common/test_time_system.h" #include "test/test_common/utility.h" diff --git a/test/test_common/simulated_time_system_test.cc b/test/test_common/simulated_time_system_test.cc index f518a1a249853..422669b0725e5 100644 --- a/test/test_common/simulated_time_system_test.cc +++ b/test/test_common/simulated_time_system_test.cc @@ -1,7 +1,7 @@ -#include "common/common/thread.h" -#include "common/event/libevent.h" -#include "common/event/libevent_scheduler.h" -#include "common/event/timer_impl.h" +#include "source/common/common/thread.h" +#include "source/common/event/libevent.h" +#include "source/common/event/libevent_scheduler.h" +#include "source/common/event/timer_impl.h" #include "test/mocks/common.h" #include "test/mocks/event/mocks.h" diff --git a/test/test_common/test_runtime.h b/test/test_common/test_runtime.h index 0f270c122d5a1..433292a4f5e0e 100644 --- a/test/test_common/test_runtime.h +++ b/test/test_common/test_runtime.h @@ -13,8 +13,8 @@ #include "envoy/config/bootstrap/v3/bootstrap.pb.h" -#include "common/runtime/runtime_impl.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/mocks/common.h" #include "test/mocks/event/mocks.h" diff --git a/test/test_common/test_time.cc b/test/test_common/test_time.cc index 98deac1a959d1..691c48ad8d34d 100644 --- a/test/test_common/test_time.cc +++ b/test/test_common/test_time.cc @@ -1,6 +1,6 @@ #include "test/test_common/test_time.h" -#include "common/common/utility.h" +#include "source/common/common/utility.h" #include "test/test_common/global.h" diff --git a/test/test_common/test_time.h b/test/test_common/test_time.h index 038a44e734c5e..8234584a2ef28 100644 --- a/test/test_common/test_time.h +++ b/test/test_common/test_time.h @@ -1,6 +1,6 @@ #pragma once -#include "common/event/real_time_system.h" +#include "source/common/event/real_time_system.h" #include "test/test_common/global.h" #include "test/test_common/test_time_system.h" diff --git a/test/test_common/test_time_system.cc b/test/test_common/test_time_system.cc index a24763e9c07db..3b81864402ca6 100644 --- a/test/test_common/test_time_system.cc +++ b/test/test_common/test_time_system.cc @@ -2,7 +2,7 @@ #include "envoy/event/timer.h" -#include "common/common/thread.h" +#include "source/common/common/thread.h" namespace Envoy { namespace Event { diff --git a/test/test_common/test_time_system.h b/test/test_common/test_time_system.h index 932f7083260d3..17a6ac3a7017f 100644 --- a/test/test_common/test_time_system.h +++ b/test/test_common/test_time_system.h @@ -4,8 +4,8 @@ #include "envoy/event/dispatcher.h" #include "envoy/event/timer.h" -#include "common/common/assert.h" -#include "common/common/thread.h" +#include "source/common/common/assert.h" +#include "source/common/common/thread.h" #include "test/test_common/global.h" #include "test/test_common/only_one_thread.h" diff --git a/test/test_common/thread_factory_for_test.cc b/test/test_common/thread_factory_for_test.cc index 38b966bae0663..55c4d84ed12b8 100644 --- a/test/test_common/thread_factory_for_test.cc +++ b/test/test_common/thread_factory_for_test.cc @@ -1,4 +1,4 @@ -#include "common/common/thread_impl.h" +#include "source/common/common/thread_impl.h" namespace Envoy { diff --git a/test/test_common/threadsafe_singleton_injector.h b/test/test_common/threadsafe_singleton_injector.h index b9a0020dc88a3..ae90022d77707 100644 --- a/test/test_common/threadsafe_singleton_injector.h +++ b/test/test_common/threadsafe_singleton_injector.h @@ -1,6 +1,6 @@ #pragma once -#include "common/singleton/threadsafe_singleton.h" +#include "source/common/singleton/threadsafe_singleton.h" namespace Envoy { diff --git a/test/test_common/utility.cc b/test/test_common/utility.cc index 1b22d4a14ec10..accd549af2031 100644 --- a/test/test_common/utility.cc +++ b/test/test_common/utility.cc @@ -20,17 +20,17 @@ #include "envoy/http/codec.h" #include "envoy/service/runtime/v3/rtds.pb.h" -#include "common/api/api_impl.h" -#include "common/common/fmt.h" -#include "common/common/lock_guard.h" -#include "common/common/thread_impl.h" -#include "common/common/utility.h" -#include "common/filesystem/directory.h" -#include "common/filesystem/filesystem_impl.h" -#include "common/http/header_utility.h" -#include "common/json/json_loader.h" -#include "common/network/address_impl.h" -#include "common/network/utility.h" +#include "source/common/api/api_impl.h" +#include "source/common/common/fmt.h" +#include "source/common/common/lock_guard.h" +#include "source/common/common/thread_impl.h" +#include "source/common/common/utility.h" +#include "source/common/filesystem/directory.h" +#include "source/common/filesystem/filesystem_impl.h" +#include "source/common/http/header_utility.h" +#include "source/common/json/json_loader.h" +#include "source/common/network/address_impl.h" +#include "source/common/network/utility.h" #include "test/mocks/common.h" #include "test/mocks/stats/mocks.h" diff --git a/test/test_common/utility.h b/test/test_common/utility.h index a3e79fd5593be..692b7248b768e 100644 --- a/test/test_common/utility.h +++ b/test/test_common/utility.h @@ -15,17 +15,17 @@ #include "envoy/type/matcher/v3/string.pb.h" #include "envoy/type/v3/percent.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/common/c_smart_ptr.h" -#include "common/common/empty_string.h" -#include "common/common/thread.h" -#include "common/config/decoded_resource_impl.h" -#include "common/config/opaque_resource_decoder_impl.h" -#include "common/config/version_converter.h" -#include "common/http/header_map_impl.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" -#include "common/stats/symbol_table_impl.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/common/c_smart_ptr.h" +#include "source/common/common/empty_string.h" +#include "source/common/common/thread.h" +#include "source/common/config/decoded_resource_impl.h" +#include "source/common/config/opaque_resource_decoder_impl.h" +#include "source/common/config/version_converter.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stats/symbol_table_impl.h" #include "test/test_common/file_system_for_test.h" #include "test/test_common/logging.h" diff --git a/test/test_common/wasm_base.h b/test/test_common/wasm_base.h index 775197c2ddfea..8231788e24ec3 100644 --- a/test/test_common/wasm_base.h +++ b/test/test_common/wasm_base.h @@ -5,12 +5,11 @@ #include "envoy/extensions/wasm/v3/wasm.pb.validate.h" #include "envoy/server/lifecycle_notifier.h" -#include "common/buffer/buffer_impl.h" -#include "common/http/message_impl.h" -#include "common/stats/isolated_store_impl.h" -#include "common/stream_info/stream_info_impl.h" - -#include "extensions/common/wasm/wasm.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/message_impl.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/common/stream_info/stream_info_impl.h" +#include "source/extensions/common/wasm/wasm.h" #include "test/mocks/grpc/mocks.h" #include "test/mocks/http/mocks.h" @@ -34,8 +33,8 @@ namespace Wasm { #define MOCK_CONTEXT_LOG_ \ using Context::log; \ - proxy_wasm::WasmResult log(uint32_t level, absl::string_view message) override { \ - log_(static_cast(level), message); \ + proxy_wasm::WasmResult log(uint32_t level, std::string_view message) override { \ + log_(static_cast(level), toAbslStringView(message)); \ return proxy_wasm::WasmResult::Ok; \ } \ MOCK_METHOD(void, log_, (spdlog::level::level_enum level, absl::string_view message)) diff --git a/test/test_listener.cc b/test/test_listener.cc index 61e6b6b12bf3c..12dba6668f813 100644 --- a/test/test_listener.cc +++ b/test/test_listener.cc @@ -1,6 +1,6 @@ #include "test/test_listener.h" -#include "common/common/assert.h" +#include "source/common/common/assert.h" #include "test/test_common/global.h" diff --git a/test/test_runner.cc b/test/test_runner.cc index d30a78b0b9e61..c910d4fb505af 100644 --- a/test/test_runner.cc +++ b/test/test_runner.cc @@ -2,15 +2,13 @@ #include -#include "common/common/logger.h" -#include "common/common/logger_delegates.h" -#include "common/common/thread.h" -#include "common/event/libevent.h" -#include "common/runtime/runtime_features.h" - -#include "exe/process_wide.h" - -#include "server/backtrace.h" +#include "source/common/common/logger.h" +#include "source/common/common/logger_delegates.h" +#include "source/common/common/thread.h" +#include "source/common/event/libevent.h" +#include "source/common/runtime/runtime_features.h" +#include "source/exe/process_wide.h" +#include "source/server/backtrace.h" #include "test/common/runtime/utility.h" #include "test/mocks/access_log/mocks.h" diff --git a/test/tools/config_load_check/config_load_check.cc b/test/tools/config_load_check/config_load_check.cc index 6b521c3340d46..5dfee0adc3b4d 100644 --- a/test/tools/config_load_check/config_load_check.cc +++ b/test/tools/config_load_check/config_load_check.cc @@ -3,11 +3,11 @@ #include #include -#include "common/common/fmt.h" -#include "common/common/logger.h" -#include "common/common/thread.h" -#include "common/config/protobuf_link_hacks.h" -#include "common/event/libevent.h" +#include "source/common/common/fmt.h" +#include "source/common/common/logger.h" +#include "source/common/common/thread.h" +#include "source/common/config/protobuf_link_hacks.h" +#include "source/common/event/libevent.h" #include "test/config_test/config_test.h" diff --git a/test/tools/router_check/router.cc b/test/tools/router_check/router.cc index 80441856af305..7da0acffffa7b 100644 --- a/test/tools/router_check/router.cc +++ b/test/tools/router_check/router.cc @@ -8,12 +8,12 @@ #include "envoy/config/route/v3/route.pb.h" #include "envoy/type/v3/percent.pb.h" -#include "common/common/random_generator.h" -#include "common/network/socket_impl.h" -#include "common/network/utility.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/common/random_generator.h" +#include "source/common/network/socket_impl.h" +#include "source/common/network/utility.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stream_info/stream_info_impl.h" #include "test/test_common/printers.h" diff --git a/test/tools/router_check/router.h b/test/tools/router_check/router.h index 337d54832abc5..3624efcb9cc4f 100644 --- a/test/tools/router_check/router.h +++ b/test/tools/router_check/router.h @@ -6,14 +6,14 @@ #include "envoy/config/route/v3/route.pb.h" #include "envoy/type/v3/percent.pb.h" -#include "common/common/logger.h" -#include "common/common/utility.h" -#include "common/http/header_map_impl.h" -#include "common/http/headers.h" -#include "common/json/json_loader.h" -#include "common/router/config_impl.h" -#include "common/stats/symbol_table_impl.h" -#include "common/stream_info/stream_info_impl.h" +#include "source/common/common/logger.h" +#include "source/common/common/utility.h" +#include "source/common/http/header_map_impl.h" +#include "source/common/http/headers.h" +#include "source/common/json/json_loader.h" +#include "source/common/router/config_impl.h" +#include "source/common/stats/symbol_table_impl.h" +#include "source/common/stream_info/stream_info_impl.h" #include "test/mocks/server/instance.h" #include "test/test_common/global.h" diff --git a/test/tools/router_check/router_check.cc b/test/tools/router_check/router_check.cc index fea89d3eca983..bba8b036b229e 100644 --- a/test/tools/router_check/router_check.cc +++ b/test/tools/router_check/router_check.cc @@ -2,7 +2,7 @@ #include #include -#include "exe/platform_impl.h" +#include "source/exe/platform_impl.h" #include "test/test_common/test_runtime.h" #include "test/tools/router_check/router.h" diff --git a/test/tools/schema_validator/BUILD b/test/tools/schema_validator/BUILD index c0d198f6f5d59..1891bb24a036c 100644 --- a/test/tools/schema_validator/BUILD +++ b/test/tools/schema_validator/BUILD @@ -25,7 +25,7 @@ envoy_cc_test_library( copts = ["-DHAVE_LONG_LONG"], external_deps = ["tclap"], deps = [ - "//include/envoy/api:api_interface", + "//envoy/api:api_interface", "//source/common/protobuf:utility_lib", "//source/common/stats:isolated_store_lib", "//test/test_common:utility_lib", diff --git a/test/tools/schema_validator/validator.cc b/test/tools/schema_validator/validator.cc index d6d24219cb566..28ab9316a8a19 100644 --- a/test/tools/schema_validator/validator.cc +++ b/test/tools/schema_validator/validator.cc @@ -5,7 +5,7 @@ #include "envoy/service/discovery/v3/discovery.pb.h" #include "envoy/service/discovery/v3/discovery.pb.validate.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" #include "tclap/CmdLine.h" diff --git a/test/tools/schema_validator/validator.h b/test/tools/schema_validator/validator.h index af2dcce0331a1..1e92cce035cb8 100644 --- a/test/tools/schema_validator/validator.h +++ b/test/tools/schema_validator/validator.h @@ -4,7 +4,7 @@ #include "envoy/api/api.h" -#include "common/stats/isolated_store_impl.h" +#include "source/common/stats/isolated_store_impl.h" #include "test/test_common/utility.h" diff --git a/tools/api_boost/testdata/BUILD b/tools/api_boost/testdata/BUILD index 148b1b5c47873..f3e1298ff05b8 100644 --- a/tools/api_boost/testdata/BUILD +++ b/tools/api_boost/testdata/BUILD @@ -59,7 +59,7 @@ envoy_cc_library( name = "validate", srcs = ["validate.cc"], deps = [ - "//include/envoy/protobuf:message_validator_interface", + "//envoy/protobuf:message_validator_interface", "//source/common/protobuf:utility_lib", "@envoy_api//envoy/api/v2:pkg_cc_proto", ], diff --git a/tools/api_boost/testdata/validate.cc b/tools/api_boost/testdata/validate.cc index 7de4b2b65acef..97fbd6bac35d9 100644 --- a/tools/api_boost/testdata/validate.cc +++ b/tools/api_boost/testdata/validate.cc @@ -2,7 +2,7 @@ #include "envoy/api/v2/cluster.pb.validate.h" #include "envoy/protobuf/message_validator.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" void foo(Envoy::ProtobufMessage::ValidationVisitor& validator) { envoy::api::v2::Cluster msg; diff --git a/tools/api_boost/testdata/validate.cc.gold b/tools/api_boost/testdata/validate.cc.gold index f358c7aec7158..5b991b7294e5e 100644 --- a/tools/api_boost/testdata/validate.cc.gold +++ b/tools/api_boost/testdata/validate.cc.gold @@ -2,7 +2,7 @@ #include "envoy/config/cluster/v4alpha/cluster.pb.validate.h" #include "envoy/protobuf/message_validator.h" -#include "common/protobuf/utility.h" +#include "source/common/protobuf/utility.h" void foo(Envoy::ProtobufMessage::ValidationVisitor& validator) { envoy::config::cluster::v4alpha::Cluster msg; diff --git a/tools/api_versioning/generate_api_version_header.py b/tools/api_versioning/generate_api_version_header.py index 7d8ab3342983a..a7519ecb02d33 100644 --- a/tools/api_versioning/generate_api_version_header.py +++ b/tools/api_versioning/generate_api_version_header.py @@ -9,7 +9,7 @@ FILE_TEMPLATE = string.Template( """#pragma once -#include "common/version/api_version_struct.h" +#include "source/common/version/api_version_struct.h" namespace Envoy { diff --git a/tools/bootstrap2pb.cc b/tools/bootstrap2pb.cc index 5cb2c6c3aeaa0..0c41fd948efb6 100644 --- a/tools/bootstrap2pb.cc +++ b/tools/bootstrap2pb.cc @@ -11,15 +11,14 @@ #include "envoy/config/bootstrap/v2/bootstrap.pb.h" -#include "common/api/api_impl.h" -#include "common/common/assert.h" -#include "common/common/random_generator.h" -#include "common/event/real_time_system.h" -#include "common/protobuf/message_validator_impl.h" -#include "common/protobuf/utility.h" -#include "common/stats/isolated_store_impl.h" - -#include "exe/platform_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/common/assert.h" +#include "source/common/common/random_generator.h" +#include "source/common/event/real_time_system.h" +#include "source/common/protobuf/message_validator_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/stats/isolated_store_impl.h" +#include "source/exe/platform_impl.h" // NOLINT(namespace-envoy) int main(int argc, char** argv) { diff --git a/tools/code_format/check_format.py b/tools/code_format/check_format.py index 3e24b50f261a6..f9594121db81b 100755 --- a/tools/code_format/check_format.py +++ b/tools/code_format/check_format.py @@ -123,6 +123,25 @@ "./source/common/network/utility.cc", ) +# These are entire files that are allowed to use std::string_view vs. individual exclusions. Right +# now this is just WASM which makes use of std::string_view heavily so we need to convert to +# absl::string_view internally. Everywhere else should be using absl::string_view for additional +# safety. +STD_STRING_VIEW_ALLOWLIST = ( + "./source/extensions/common/wasm/context.h", + "./source/extensions/common/wasm/context.cc", + "./source/extensions/common/wasm/foreign.cc", + "./source/extensions/common/wasm/wasm.h", + "./source/extensions/common/wasm/wasm.cc", + "./source/extensions/common/wasm/wasm_vm.h", + "./source/extensions/common/wasm/wasm_vm.cc", + "./test/extensions/bootstrap/wasm/wasm_speed_test.cc", + "./test/extensions/bootstrap/wasm/wasm_test.cc", + "./test/extensions/common/wasm/wasm_test.cc", + "./test/extensions/stats_sinks/wasm/wasm_stat_sink_test.cc", + "./test/test_common/wasm_base.h", +) + # Header files that can throw exceptions. These should be limited; the only # valid situation identified so far is template functions used for config # processing. @@ -438,6 +457,9 @@ def allow_listed_for_register_factory(self, file_path): def allow_listed_for_serialize_as_string(self, file_path): return file_path in SERIALIZE_AS_STRING_ALLOWLIST or file_path.endswith(DOCS_SUFFIX) + def allow_listed_for_std_string_view(self, file_path): + return file_path in STD_STRING_VIEW_ALLOWLIST + def allow_listed_for_json_string_to_message(self, file_path): return file_path in JSON_STRING_TO_MESSAGE_ALLOWLIST @@ -824,8 +846,12 @@ def check_source_line(self, line, file_path, report_error): report_error("Don't use std::monostate; use absl::monostate instead") if self.token_in_line("std::optional", line): report_error("Don't use std::optional; use absl::optional instead") - if self.token_in_line("std::string_view", line): - report_error("Don't use std::string_view; use absl::string_view instead") + if not self.allow_listed_for_std_string_view( + file_path) and not "NOLINT(std::string_view)" in line: + if self.token_in_line("std::string_view", line) or self.token_in_line("toStdStringView", + line): + report_error( + "Don't use std::string_view or toStdStringView; use absl::string_view instead") if self.token_in_line("std::variant", line): report_error("Don't use std::variant; use absl::variant instead") if self.token_in_line("std::visit", line): @@ -835,12 +861,12 @@ def check_source_line(self, line, file_path, report_error): report_error( "Don't use raw try, use TRY_ASSERT_MAIN_THREAD if on the main thread otherwise don't use exceptions." ) - if "__attribute__((packed))" in line and file_path != "./include/envoy/common/platform.h": + if "__attribute__((packed))" in line and file_path != "./envoy/common/platform.h": # __attribute__((packed)) is not supported by MSVC, we have a PACKED_STRUCT macro that # can be used instead report_error( "Don't use __attribute__((packed)), use the PACKED_STRUCT macro defined " - "in include/envoy/common/platform.h instead") + "in envoy/common/platform.h instead") if DESIGNATED_INITIALIZER_REGEX.search(line): # Designated initializers are not part of the C++14 standard and are not supported # by MSVC diff --git a/tools/code_format/check_format_test_helper.py b/tools/code_format/check_format_test_helper.py index 8f8d0ac8a31b0..057362709f760 100755 --- a/tools/code_format/check_format_test_helper.py +++ b/tools/code_format/check_format_test_helper.py @@ -265,7 +265,8 @@ def run_checks(): errors += check_unfixable_error( "std_optional.cc", "Don't use std::optional; use absl::optional instead") errors += check_unfixable_error( - "std_string_view.cc", "Don't use std::string_view; use absl::string_view instead") + "std_string_view.cc", + "Don't use std::string_view or toStdStringView; use absl::string_view instead") errors += check_unfixable_error( "std_variant.cc", "Don't use std::variant; use absl::variant instead") errors += check_unfixable_error("std_visit.cc", "Don't use std::visit; use absl::visit instead") diff --git a/tools/code_format/requirements.txt b/tools/code_format/requirements.txt index dbd09788cb030..1b6d092dbc63d 100644 --- a/tools/code_format/requirements.txt +++ b/tools/code_format/requirements.txt @@ -1,27 +1,36 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile --generate-hashes tools/code_format/requirements.txt +# +flake8-polyfill==1.0.2 \ + --hash=sha256:12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9 \ + --hash=sha256:e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda + # via pep8-naming flake8==3.9.2 \ - --hash=sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907 \ - --hash=sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b -importlib-metadata==4.4.0 \ - --hash=sha256:960d52ba7c21377c990412aca380bf3642d734c2eaab78a2c39319f67c6a5786 \ - --hash=sha256:e592faad8de1bda9fe920cf41e15261e7131bcf266c30306eec00e8e225c1dd5 + --hash=sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b \ + --hash=sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907 + # via + # -r tools/code_format/requirements.txt + # flake8-polyfill mccabe==0.6.1 \ --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \ --hash=sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f + # via flake8 +pep8-naming==0.11.1 \ + --hash=sha256:a1dd47dd243adfe8a83616e27cf03164960b507530f155db94e10b36a6cd6724 \ + --hash=sha256:f43bfe3eea7e0d73e8b5d07d6407ab47f2476ccaeff6937c84275cd30b016738 + # via -r tools/code_format/requirements.txt pycodestyle==2.7.0 \ --hash=sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068 \ --hash=sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef + # via flake8 pyflakes==2.3.1 \ --hash=sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3 \ --hash=sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db + # via flake8 yapf==0.31.0 \ - --hash=sha256:e3a234ba8455fe201eaa649cdac872d590089a18b661e39bbac7020978dd9c2e \ - --hash=sha256:408fb9a2b254c302f49db83c59f9aa0b4b0fd0ec25be3a5c51181327922ff63d -zipp==3.4.1 \ - --hash=sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098 \ - --hash=sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76 -pep8-naming==0.11.1 \ - --hash=sha256:f43bfe3eea7e0d73e8b5d07d6407ab47f2476ccaeff6937c84275cd30b016738 \ - --hash=sha256:a1dd47dd243adfe8a83616e27cf03164960b507530f155db94e10b36a6cd6724 -flake8-polyfill==1.0.2 \ - --hash=sha256:12be6a34ee3ab795b19ca73505e7b55826d5f6ad7230d31b18e106400169b9e9 \ - --hash=sha256:e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda + --hash=sha256:408fb9a2b254c302f49db83c59f9aa0b4b0fd0ec25be3a5c51181327922ff63d \ + --hash=sha256:e3a234ba8455fe201eaa649cdac872d590089a18b661e39bbac7020978dd9c2e + # via -r tools/code_format/requirements.txt diff --git a/tools/dependency/BUILD b/tools/dependency/BUILD index 3bbd85b8ce529..2e9942d3c2f83 100644 --- a/tools/dependency/BUILD +++ b/tools/dependency/BUILD @@ -1,4 +1,4 @@ -load("@rules_python//python:defs.bzl", "py_binary") +load("@rules_python//python:defs.bzl", "py_binary", "py_library") load("@deps_pip3//:requirements.bzl", "requirement") load("//bazel:envoy_build_system.bzl", "envoy_package") load("//tools/base:envoy_python.bzl", "envoy_py_binary") @@ -7,7 +7,7 @@ licenses(["notice"]) # Apache 2 envoy_package() -py_binary( +py_library( name = "exports", srcs = ["exports.py"], data = [ @@ -17,15 +17,10 @@ py_binary( ], ) -py_binary( - name = "generate_external_dep_rst", - srcs = [ - "generate_external_dep_rst.py", - "utils.py", - ], - data = [ - ":exports", - ], +py_library( + name = "utils", + srcs = ["utils.py"], + deps = [":exports"], ) py_binary( diff --git a/tools/dependency/release_dates.py b/tools/dependency/release_dates.py index 25071f9320df7..10733549ae779 100644 --- a/tools/dependency/release_dates.py +++ b/tools/dependency/release_dates.py @@ -19,9 +19,12 @@ import exports import utils +from colorama import Fore, Style +from packaging import version -# Thrown on errors related to release date. -class ReleaseDateError(Exception): + +# Thrown on errors related to release date or version. +class ReleaseDateVersionError(Exception): pass @@ -29,7 +32,9 @@ class ReleaseDateError(Exception): def format_utc_date(date): # We only handle naive datetime objects right now, which is what PyGithub # appears to be handing us. - assert (date.tzinfo is None) + if date.tzinfo is not None: + raise ReleaseDateVersionError( + "Expected UTC date without timezone information. Received timezone information") return date.date().isoformat() @@ -38,35 +43,66 @@ def format_utc_date(date): def verify_and_print_latest_release(dep, repo, metadata_version, release_date): try: latest_release = repo.get_latest_release() - if latest_release.created_at > release_date and latest_release.tag_name != metadata_version: - print( - f'*WARNING* {dep} has a newer release than {metadata_version}@<{release_date}>: ' - f'{latest_release.tag_name}@<{latest_release.created_at}>') - except github.UnknownObjectException: - pass + except github.GithubException as err: + # Repositories can not have releases or if they have releases may not publish a latest releases. Return + print(f'GithubException {repo.name}: {err.data} {err.status} while getting latest release.') + return + if latest_release.created_at > release_date and latest_release.tag_name != metadata_version: + print( + f'{Fore.YELLOW}*WARNING* {dep} has a newer release than {metadata_version}@<{release_date}>: ' + f'{latest_release.tag_name}@<{latest_release.created_at}>{Style.RESET_ALL}') -# Print GitHub release date, throw ReleaseDateError on mismatch with metadata release date. +# Print GitHub release date, throw ReleaseDateVersionError on mismatch with metadata release date. def verify_and_print_release_date(dep, github_release_date, metadata_release_date): mismatch = '' iso_release_date = format_utc_date(github_release_date) - print(f'{dep} has a GitHub release date {iso_release_date}') + print(f'{Fore.GREEN}{dep} has a GitHub release date {iso_release_date}{Style.RESET_ALL}') if iso_release_date != metadata_release_date: - raise ReleaseDateError(f'Mismatch with metadata release date of {metadata_release_date}') + raise ReleaseDateVersionError( + f'Mismatch with metadata release date of {metadata_release_date}') -# Extract release date from GitHub API. -def get_release_date(repo, metadata_version, github_release): - if github_release.tagged: +# Extract release date from GitHub API for tagged releases. +def get_tagged_release_date(repo, metadata_version, github_release): + + try: + latest = repo.get_latest_release() + except github.GithubException as err: + # Repositories can not have releases or if they have releases may not publish a latest releases. If this is the case we keep going + latest = '' + print(f'GithubException {repo.name}: {err.data} {err.status} while getting latest release.') + + if latest and github_release.version <= latest.tag_name: + release = repo.get_release(github_release.version) + return release.published_at + else: tags = repo.get_tags() - for tag in tags: + current_metadata_tag_commit_date = '' + for tag in tags.reversed: if tag.name == github_release.version: - return tag.commit.commit.committer.date - return None - else: - assert (metadata_version == github_release.version) - commit = repo.get_commit(github_release.version) - return commit.commit.committer.date + current_metadata_tag_commit_date = tag.commit.commit.committer.date + if not version.parse(tag.name).is_prerelease and version.parse( + tag.name) > version.parse(github_release.version): + print( + f'{Fore.YELLOW}*WARNING* {repo.name} has a newer release than {github_release.version}@<{current_metadata_tag_commit_date}>: ' + f'{tag.name}@<{tag.commit.commit.committer.date}>{Style.RESET_ALL}') + return current_metadata_tag_commit_date + + +# Extract release date from GitHub API for untagged releases. +def get_untagged_release_date(repo, metadata_version, github_release): + if metadata_version != github_release.version: + raise ReleaseDateVersionError( + f'Mismatch with metadata version {metadata_version} and github release version {github_release.version}' + ) + commit = repo.get_commit(github_release.version) + commits = repo.get_commits(since=commit.commit.committer.date) + if commits.totalCount > 1: + print( + f'{Fore.YELLOW}*WARNING* {repo.name} has {str(commits.totalCount - 1)} commits since {github_release.version}@<{commit.commit.committer.date}>{Style.RESET_ALL}' + ) + return commit.commit.committer.date # Verify release dates in metadata against GitHub API. @@ -75,19 +111,23 @@ def verify_and_print_release_dates(repository_locations, github_instance): release_date = None # Obtain release information from GitHub API. github_release = utils.get_github_release_from_urls(metadata['urls']) + print('github_release: ', github_release) if not github_release: print(f'{dep} is not a GitHub repository') continue repo = github_instance.get_repo(f'{github_release.organization}/{github_release.project}') - release_date = get_release_date(repo, metadata['version'], github_release) + if github_release.tagged: + release_date = get_tagged_release_date(repo, metadata['version'], github_release) + else: + release_date = get_untagged_release_date(repo, metadata['version'], github_release) if release_date: # Check whether there is a more recent version and warn if necessary. verify_and_print_latest_release(dep, repo, github_release.version, release_date) # Verify that the release date in metadata and GitHub correspond, - # otherwise throw ReleaseDateError. + # otherwise throw ReleaseDateVersionError. verify_and_print_release_date(dep, release_date, metadata['release_date']) else: - raise ReleaseDateError( + raise ReleaseDateVersionError( f'{dep} is a GitHub repository with no no inferrable release date') @@ -105,8 +145,8 @@ def verify_and_print_release_dates(repository_locations, github_instance): try: verify_and_print_release_dates( spec_loader(path_module.REPOSITORY_LOCATIONS_SPEC), github.Github(access_token)) - except ReleaseDateError as e: + except ReleaseDateVersionError as e: print( - f'An error occurred while processing {path}, please verify the correctness of the ' - f'metadata: {e}') + f'{Fore.RED}An error occurred while processing {path}, please verify the correctness of the ' + f'metadata: {e}{Style.RESET_ALL}') sys.exit(1) diff --git a/tools/dependency/release_dates.sh b/tools/dependency/release_dates.sh index 5e32abdedf6b4..de12f53e4512b 100755 --- a/tools/dependency/release_dates.sh +++ b/tools/dependency/release_dates.sh @@ -7,4 +7,4 @@ set -e # TODO(phlax): move this job to bazel and remove this export API_PATH=api/ -python_venv release_dates "$1" +PYTHONPATH=. python_venv release_dates "$1" diff --git a/tools/dependency/requirements.txt b/tools/dependency/requirements.txt index 748e6895926de..e7e6d5c74ae05 100644 --- a/tools/dependency/requirements.txt +++ b/tools/dependency/requirements.txt @@ -48,13 +48,19 @@ cffi==1.14.5 \ --hash=sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406 \ --hash=sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d \ --hash=sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c - # via pynacl + # via + # -r tools/dependency/requirements.txt + # pynacl chardet==4.0.0 \ --hash=sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa \ --hash=sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5 # via # -r tools/dependency/requirements.txt # requests +colorama==0.4.4 \ + --hash=sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b \ + --hash=sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2 + # via -r tools/dependency/requirements.txt deprecated==1.2.12 \ --hash=sha256:08452d69b6b5bc66e8330adde0a4f8642e969b9e1702904d137eeb29c8ffc771 \ --hash=sha256:6d2de2de7931a968874481ef30208fd4e08da39177d61d3d4ebdf4366e7dbca1 @@ -67,10 +73,16 @@ idna==2.10 \ # via # -r tools/dependency/requirements.txt # requests +packaging==20.9 \ + --hash=sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5 \ + --hash=sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a + # via -r tools/dependency/requirements.txt pycparser==2.20 \ --hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 \ --hash=sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 - # via cffi + # via + # -r tools/dependency/requirements.txt + # cffi pygithub==1.55 \ --hash=sha256:1bbfff9372047ff3f21d5cd8e07720f3dbfdaf6462fcaed9d815f528f1ba7283 \ --hash=sha256:2caf0054ea079b71e539741ae56c5a95e073b81fa472ce222e81667381b9601b @@ -78,7 +90,9 @@ pygithub==1.55 \ pyjwt==2.1.0 \ --hash=sha256:934d73fbba91b0483d3857d1aff50e96b2a892384ee2c17417ed3203f173fca1 \ --hash=sha256:fba44e7898bbca160a2b2b501f492824fc8382485d3a6f11ba5d0c1937ce6130 - # via pygithub + # via + # -r tools/dependency/requirements.txt + # pygithub pynacl==1.4.0 \ --hash=sha256:06cbb4d9b2c4bd3c8dc0d267416aaed79906e7b33f114ddbf0911969794b1cc4 \ --hash=sha256:11335f09060af52c97137d4ac54285bcb7df0cef29014a1a4efe64ac065434c4 \ @@ -98,7 +112,15 @@ pynacl==1.4.0 \ --hash=sha256:d452a6746f0a7e11121e64625109bc4468fc3100452817001dbe018bb8b08514 \ --hash=sha256:ea6841bc3a76fa4942ce00f3bda7d436fda21e2d91602b9e21b7ca9ecab8f3ff \ --hash=sha256:f8851ab9041756003119368c1e6cd0b9c631f46d686b3904b18c0139f4419f80 - # via pygithub + # via + # -r tools/dependency/requirements.txt + # pygithub +pyparsing==2.4.7 \ + --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \ + --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b + # via + # -r tools/dependency/requirements.txt + # packaging pyyaml==5.4.1 \ --hash=sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf \ --hash=sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696 \ diff --git a/tools/dependency/utils.py b/tools/dependency/utils.py index 7332f6072df11..e47107fe14635 100644 --- a/tools/dependency/utils.py +++ b/tools/dependency/utils.py @@ -2,7 +2,7 @@ from collections import namedtuple -from exports import ( +from tools.dependency.exports import ( api_repository_locations, envoy_repository_locations, repository_locations_utils) diff --git a/tools/docs/BUILD b/tools/docs/BUILD new file mode 100644 index 0000000000000..aa82e2878b2f9 --- /dev/null +++ b/tools/docs/BUILD @@ -0,0 +1,51 @@ +load("@rules_python//python:defs.bzl", "py_binary") +load("//bazel:envoy_build_system.bzl", "envoy_package") +load("@docs_pip3//:requirements.bzl", "requirement") + +licenses(["notice"]) # Apache 2 + +envoy_package() + +py_binary( + name = "generate_extensions_security_rst", + srcs = ["generate_extensions_security_rst.py"], + data = ["//source/extensions:extensions_metadata.yaml"], + deps = [ + requirement("pyyaml"), + ], +) + +genrule( + name = "extensions_security_rst", + srcs = ["//source/extensions:extensions_metadata.yaml"], + outs = ["extensions_security_rst.tar"], + cmd = ( + "$(location generate_extensions_security_rst) $(location //source/extensions:extensions_metadata.yaml) $@" + ), + tools = [":generate_extensions_security_rst"], +) + +py_binary( + name = "generate_external_deps_rst", + srcs = [ + "generate_external_deps_rst.py", + ], + deps = [ + "//tools/dependency:exports", + "//tools/dependency:utils", + ], +) + +genrule( + name = "external_deps_rst", + srcs = [ + "//bazel:repository_locations.bzl", + "@envoy_api_canonical//bazel:repository_locations.bzl", + "@envoy_api_canonical//bazel:repository_locations_utils.bzl", + ], + outs = ["external_deps_rst.tar"], + cmd = ( + "$(location generate_external_deps_rst) $@" + ), + tools = [":generate_external_deps_rst"], +) diff --git a/tools/extensions/generate_extension_rst.py b/tools/docs/generate_extensions_security_rst.py similarity index 78% rename from tools/extensions/generate_extension_rst.py rename to tools/docs/generate_extensions_security_rst.py index 62e4b6250d90d..4c3f649b18a8b 100644 --- a/tools/extensions/generate_extension_rst.py +++ b/tools/docs/generate_extensions_security_rst.py @@ -5,6 +5,8 @@ from collections import defaultdict import os import pathlib +import sys +import tarfile import yaml @@ -19,15 +21,13 @@ def format_item(extension, metadata): return item -if __name__ == '__main__': - try: - generated_rst_dir = os.environ["GENERATED_RST_DIR"] - except KeyError: - raise SystemExit( - "Path to an output directory must be specified with GENERATED_RST_DIR env var") +def main(): + metadata_filepath = sys.argv[1] + output_filename = sys.argv[2] + generated_rst_dir = os.path.dirname(output_filename) security_rst_root = os.path.join(generated_rst_dir, "intro/arch_overview/security") - with open("source/extensions/extensions_metadata.yaml") as f: + with open(metadata_filepath) as f: extension_db = yaml.safe_load(f.read()) pathlib.Path(security_rst_root).mkdir(parents=True, exist_ok=True) @@ -43,3 +43,10 @@ def format_item(extension, metadata): for extension in sorted(extensions) if extension_db[extension].get('status') != 'wip') output_path.write_text(content) + + with tarfile.open(output_filename, "w") as tar: + tar.add(generated_rst_dir, arcname=".") + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/tools/dependency/generate_external_dep_rst.py b/tools/docs/generate_external_deps_rst.py similarity index 92% rename from tools/dependency/generate_external_dep_rst.py rename to tools/docs/generate_external_deps_rst.py index 48e7c04912607..f1dbaa178e16f 100755 --- a/tools/dependency/generate_external_dep_rst.py +++ b/tools/docs/generate_external_deps_rst.py @@ -6,6 +6,7 @@ import os import pathlib import sys +import tarfile import urllib.parse from tools.dependency import utils as dep_utils @@ -67,13 +68,13 @@ def get_version_url(metadata): return f'{github_repo}/tree/{github_release.version}' -if __name__ == '__main__': - try: - generated_rst_dir = os.getenv("GENERATED_RST_DIR") or sys.argv[1] - except IndexError: - raise SystemExit( - "Output dir path must be either specified as arg or with GENERATED_RST_DIR env var") +def csv_row(dep): + return [dep.name, dep.version, dep.release_date, dep.cpe] + +def main(): + output_filename = sys.argv[1] + generated_rst_dir = os.path.dirname(output_filename) security_rst_root = os.path.join(generated_rst_dir, "intro/arch_overview/security") pathlib.Path(security_rst_root).mkdir(parents=True, exist_ok=True) @@ -97,9 +98,6 @@ def get_version_url(metadata): for ext in v.get('extensions', ['core']): use_categories[category][ext].append(dep) - def csv_row(dep): - return [dep.name, dep.version, dep.release_date, dep.cpe] - # Generate per-use category RST with CSV tables. for category, exts in use_categories.items(): content = '' @@ -110,3 +108,10 @@ def csv_row(dep): content += csv_table(['Name', 'Version', 'Release date', 'CPE'], [2, 1, 1, 2], [csv_row(dep) for dep in sorted(deps, key=lambda d: d.sort_name)]) output_path.write_text(content) + + with tarfile.open(output_filename, "w") as tar: + tar.add(generated_rst_dir, arcname=".") + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/tools/docs/requirements.txt b/tools/docs/requirements.txt new file mode 100644 index 0000000000000..22110da4d2ad5 --- /dev/null +++ b/tools/docs/requirements.txt @@ -0,0 +1,37 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile --generate-hashes tools/docs/requirements.txt +# +pyyaml==5.4.1 \ + --hash=sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf \ + --hash=sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696 \ + --hash=sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393 \ + --hash=sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77 \ + --hash=sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922 \ + --hash=sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5 \ + --hash=sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8 \ + --hash=sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10 \ + --hash=sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc \ + --hash=sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018 \ + --hash=sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e \ + --hash=sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253 \ + --hash=sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347 \ + --hash=sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183 \ + --hash=sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541 \ + --hash=sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb \ + --hash=sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185 \ + --hash=sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc \ + --hash=sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db \ + --hash=sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa \ + --hash=sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46 \ + --hash=sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122 \ + --hash=sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b \ + --hash=sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63 \ + --hash=sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df \ + --hash=sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc \ + --hash=sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247 \ + --hash=sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6 \ + --hash=sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0 + # via -r tools/docs/requirements.txt diff --git a/tools/envoy_headersplit/code_corpus/fail_mocks.cc b/tools/envoy_headersplit/code_corpus/fail_mocks.cc index 17fca78fae7f5..7936ece0f66de 100644 --- a/tools/envoy_headersplit/code_corpus/fail_mocks.cc +++ b/tools/envoy_headersplit/code_corpus/fail_mocks.cc @@ -7,7 +7,7 @@ #include "envoy/admin/v3/server_info.pb.h" #include "envoy/config/core/v3/base.pb.h" -#include "common/singleton/manager_impl.h" +#include "source/common/singleton/manager_impl.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/tools/envoy_headersplit/code_corpus/fake_source_code.cc b/tools/envoy_headersplit/code_corpus/fake_source_code.cc index ecc63cbca718a..cd8aa71659bae 100644 --- a/tools/envoy_headersplit/code_corpus/fake_source_code.cc +++ b/tools/envoy_headersplit/code_corpus/fake_source_code.cc @@ -7,11 +7,11 @@ #include "envoy/config/core/v3/base.pb.h" #include "envoy/config/route/v3/route_components.pb.h" -#include "common/buffer/buffer_impl.h" -#include "common/http/async_client_impl.h" -#include "common/http/context_impl.h" -#include "common/http/headers.h" -#include "common/http/utility.h" +#include "source/common/buffer/buffer_impl.h" +#include "source/common/http/async_client_impl.h" +#include "source/common/http/context_impl.h" +#include "source/common/http/headers.h" +#include "source/common/http/utility.h" #include "test/common/http/common.h" #include "test/mocks/buffer/mocks.h" diff --git a/tools/extensions/BUILD b/tools/extensions/BUILD index 4054af1a4d2cb..d8237529d067c 100644 --- a/tools/extensions/BUILD +++ b/tools/extensions/BUILD @@ -16,9 +16,3 @@ py_binary( "//test/extensions/filters/network/common/fuzz:uber_per_readfilter.cc", ] + envoy_all_extensions(), ) - -py_binary( - name = "generate_extension_rst", - srcs = ["generate_extension_rst.py"], - data = ["//source/extensions:extensions_metadata.yaml"], -) diff --git a/tools/testdata/check_format/header_order.cc b/tools/testdata/check_format/header_order.cc index d387bb3415d53..b0aa98c3cd1a0 100644 --- a/tools/testdata/check_format/header_order.cc +++ b/tools/testdata/check_format/header_order.cc @@ -1,19 +1,19 @@ #include "absl/types/optional.h" -#include "common/api/api_impl.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/utility.h" -#include "common/version/version.h" -#include "common/config/resources.h" -#include "common/config/utility.h" -#include "common/local_info/local_info_impl.h" -#include "common/memory/stats.h" -#include "common/network/address_impl.h" -#include "common/protobuf/utility.h" -#include "common/router/rds_impl.h" -#include "common/runtime/runtime_impl.h" -#include "common/singleton/manager_impl.h" -#include "common/stats/thread_local_store.h" -#include "common/upstream/cluster_manager_impl.h" +#include "source/common/api/api_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/utility.h" +#include "source/common/version/version.h" +#include "source/common/config/resources.h" +#include "source/common/config/utility.h" +#include "source/common/local_info/local_info_impl.h" +#include "source/common/memory/stats.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/rds_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/stats/thread_local_store.h" +#include "source/common/upstream/cluster_manager_impl.h" #include #include "envoy/admin/v2alpha/config_dump.pb.h" #include "envoy/config/bootstrap/v2/bootstrap.pb.h" @@ -25,10 +25,10 @@ #include "envoy/server/options.h" #include "envoy/upstream/cluster_manager.h" #include -#include "server/configuration_impl.h" -#include "server/connection_handler_impl.h" -#include "server/guarddog_impl.h" -#include "server/listener_hooks.h" +#include "source/server/configuration_impl.h" +#include "source/server/connection_handler_impl.h" +#include "source/server/guarddog_impl.h" +#include "source/server/listener_hooks.h" #include #include #include diff --git a/tools/testdata/check_format/header_order.cc.gold b/tools/testdata/check_format/header_order.cc.gold index 5f6d6433a91b2..acd9fd1a98611 100644 --- a/tools/testdata/check_format/header_order.cc.gold +++ b/tools/testdata/check_format/header_order.cc.gold @@ -15,26 +15,25 @@ #include "envoy/server/options.h" #include "envoy/upstream/cluster_manager.h" -#include "common/api/api_impl.h" -#include "common/api/os_sys_calls_impl.h" -#include "common/common/utility.h" -#include "common/config/resources.h" -#include "common/config/utility.h" -#include "common/local_info/local_info_impl.h" -#include "common/memory/stats.h" -#include "common/network/address_impl.h" -#include "common/protobuf/utility.h" -#include "common/router/rds_impl.h" -#include "common/runtime/runtime_impl.h" -#include "common/singleton/manager_impl.h" -#include "common/stats/thread_local_store.h" -#include "common/upstream/cluster_manager_impl.h" -#include "common/version/version.h" - -#include "server/configuration_impl.h" -#include "server/connection_handler_impl.h" -#include "server/guarddog_impl.h" -#include "server/listener_hooks.h" +#include "source/common/api/api_impl.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/common/utility.h" +#include "source/common/config/resources.h" +#include "source/common/config/utility.h" +#include "source/common/local_info/local_info_impl.h" +#include "source/common/memory/stats.h" +#include "source/common/network/address_impl.h" +#include "source/common/protobuf/utility.h" +#include "source/common/router/rds_impl.h" +#include "source/common/runtime/runtime_impl.h" +#include "source/common/singleton/manager_impl.h" +#include "source/common/stats/thread_local_store.h" +#include "source/common/upstream/cluster_manager_impl.h" +#include "source/common/version/version.h" +#include "source/server/configuration_impl.h" +#include "source/server/connection_handler_impl.h" +#include "source/server/guarddog_impl.h" +#include "source/server/listener_hooks.h" #include "absl/types/optional.h" diff --git a/tools/testing/requirements.txt b/tools/testing/requirements.txt index 77e56959bd614..6168ab3ee6593 100644 --- a/tools/testing/requirements.txt +++ b/tools/testing/requirements.txt @@ -94,9 +94,9 @@ pyparsing==2.4.7 \ # via # -r tools/testing/requirements.txt # packaging -pytest-cov==2.12.0 \ - --hash=sha256:95d4933dcbbacfa377bb60b29801daa30d90c33981ab2a79e9ab4452c165066e \ - --hash=sha256:8535764137fecce504a49c2b742288e3d34bc09eed298ad65963616cc98fd45e +pytest-cov==2.12.1 \ + --hash=sha256:261bb9e47e65bd099c89c3edf92972865210c36813f80ede5277dceb77a4a62a \ + --hash=sha256:261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7 # via -r tools/testing/requirements.txt pytest==6.2.4 \ --hash=sha256:91ef2131a9bd6be8f76f1f08eac5c5317221d6ad1e143ae03894b862e8976890 \ diff --git a/tools/type_whisperer/api_type_db.cc b/tools/type_whisperer/api_type_db.cc index 4d84bec799bb1..198a3ee4a477c 100644 --- a/tools/type_whisperer/api_type_db.cc +++ b/tools/type_whisperer/api_type_db.cc @@ -1,6 +1,6 @@ #include "tools/type_whisperer/api_type_db.h" -#include "common/protobuf/protobuf.h" +#include "source/common/protobuf/protobuf.h" #include "tools/type_whisperer/api_type_db.pb.h" #include "udpa/annotations/migrate.pb.h"