From 58e1a8c1371a518241661cec19689e638e12687b Mon Sep 17 00:00:00 2001 From: Sunil Narasimhamurthy Date: Sun, 5 Nov 2023 03:45:29 +0000 Subject: [PATCH 1/3] deps: update the deprecation status of libcurl Signed-off-by: Sunil Narasimhamurthy --- bazel/repositories.bzl | 2 +- bazel/repository_locations.bzl | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 9f7ab5854d4e2..8893e77ccd50e 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -1002,7 +1002,7 @@ def _io_opencensus_cpp(): ) def _com_github_curl(): - # Used by OpenCensus Zipkin exporter. + # The usage by AWS extensions common utilities is deprecated and will be removed soon after the deprecation period. external_http_archive( name = "com_github_curl", build_file_content = BUILD_ALL_CONTENT + """ diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 640c83a9c6963..16cf24a94abf5 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1068,7 +1068,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( license = "Apache-2.0", license_url = "https://github.com/census-instrumentation/opencensus-cpp/blob/{version}/LICENSE", ), - # This should be removed, see https://github.com/envoyproxy/envoy/issues/11816. + # This is under deprecation and will be removed soon, see https://github.com/envoyproxy/envoy/issues/11816. com_github_curl = dict( project_name = "curl", project_desc = "Library for transferring data with URLs", @@ -1082,7 +1082,6 @@ REPOSITORY_LOCATIONS_SPEC = dict( "envoy.filters.http.aws_lambda", "envoy.filters.http.aws_request_signing", "envoy.grpc_credentials.aws_iam", - "envoy.tracers.opencensus", ], release_date = "2023-10-11", cpe = "cpe:2.3:a:haxx:libcurl:*", From ed77b02398af35307e56f8e51a377b5d55f5c1ca Mon Sep 17 00:00:00 2001 From: Sunil Narasimhamurthy Date: Sun, 5 Nov 2023 19:07:18 +0000 Subject: [PATCH 2/3] add the timeline for deprecation Signed-off-by: Sunil Narasimhamurthy --- bazel/repositories.bzl | 4 +++- bazel/repository_locations.bzl | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 8893e77ccd50e..cd9c3250b8963 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -1002,7 +1002,9 @@ def _io_opencensus_cpp(): ) def _com_github_curl(): - # The usage by AWS extensions common utilities is deprecated and will be removed soon after the deprecation period. + # The usage by AWS extensions common utilities is deprecated and will be removed by Q3 2024 after + # the deprecation period of 2 releases. Please DO NOT USE curl dependency for any new extensions. + # See https://github.com/envoyproxy/envoy/issues/11816 & https://github.com/envoyproxy/envoy/pull/30731. external_http_archive( name = "com_github_curl", build_file_content = BUILD_ALL_CONTENT + """ diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 16cf24a94abf5..93635b523a57f 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -1068,7 +1068,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( license = "Apache-2.0", license_url = "https://github.com/census-instrumentation/opencensus-cpp/blob/{version}/LICENSE", ), - # This is under deprecation and will be removed soon, see https://github.com/envoyproxy/envoy/issues/11816. + # Curl usage is under deprecation and will be removed by Q3 2024 before v1.31 release in July-2024. + # See https://github.com/envoyproxy/envoy/issues/11816 & https://github.com/envoyproxy/envoy/pull/30731. com_github_curl = dict( project_name = "curl", project_desc = "Library for transferring data with URLs", From 4ffaae31cec1e7ba56000ae3ff9c3cb5756c039b Mon Sep 17 00:00:00 2001 From: Sunil Narasimhamurthy Date: Sun, 5 Nov 2023 19:10:08 +0000 Subject: [PATCH 3/3] existing Signed-off-by: Sunil Narasimhamurthy --- bazel/repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index cd9c3250b8963..a28ce2e347adf 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -1003,7 +1003,7 @@ def _io_opencensus_cpp(): def _com_github_curl(): # The usage by AWS extensions common utilities is deprecated and will be removed by Q3 2024 after - # the deprecation period of 2 releases. Please DO NOT USE curl dependency for any new extensions. + # the deprecation period of 2 releases. Please DO NOT USE curl dependency for any new or existing extensions. # See https://github.com/envoyproxy/envoy/issues/11816 & https://github.com/envoyproxy/envoy/pull/30731. external_http_archive( name = "com_github_curl",