refactor: move aws signing bits to common/ (envoyproxy#9925)

This was under filter/http/common/aws for historical reasons, so moving
it to source/extensions/common/aws where it should live.

Signed-off-by: Raul Gutierrez Segales <[email protected]>

Author: Raúl Gutiérrez Segalés

CODEOWNERS

@@ -53,7 +53,7 @@ extensions/filters/common/original_src @snowp @klarose
 /*/extensions/filters/http/cache @toddmgreer @jmarantz
 # aws_iam grpc credentials
 /*/extensions/grpc_credentials/aws_iam @lavignes @mattklein123
-/*/extensions/filters/http/common/aws @lavignes @mattklein123
+/*/extensions/common/aws @lavignes @mattklein123
 # adaptive concurrency limit extension.
 /*/extensions/filters/http/adaptive_concurrency @tonya11en @mattklein123
 # http inspector

source/extensions/filters/http/common/aws/BUILD source/extensions/common/aws/BUILD

@@ -9,7 +9,6 @@
 
 namespace Envoy {
 namespace Extensions {
-namespace HttpFilters {
 namespace Common {
 namespace Aws {
 
@@ -71,6 +70,5 @@ using CredentialsProviderSharedPtr = std::shared_ptr<CredentialsProvider>;
 
 } // namespace Aws
 } // namespace Common
-} // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/common/aws/credentials_provider.h source/extensions/common/aws/credentials_provider.h

@@ -1,4 +1,4 @@
-#include "extensions/filters/http/common/aws/credentials_provider_impl.h"
+#include "extensions/common/aws/credentials_provider_impl.h"
 
 #include "envoy/common/exception.h"
 
@@ -8,7 +8,6 @@
 
 namespace Envoy {
 namespace Extensions {
-namespace HttpFilters {
 namespace Common {
 namespace Aws {
 
@@ -221,6 +220,5 @@ DefaultCredentialsProviderChain::DefaultCredentialsProviderChain(
 
 } // namespace Aws
 } // namespace Common
-} // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/common/aws/credentials_provider_impl.cc source/extensions/common/aws/credentials_provider_impl.cc

@@ -8,13 +8,12 @@
 #include "common/common/logger.h"
 #include "common/common/thread.h"
 
-#include "extensions/filters/http/common/aws/credentials_provider.h"
+#include "extensions/common/aws/credentials_provider.h"
 
 #include "absl/strings/string_view.h"
 
 namespace Envoy {
 namespace Extensions {
-namespace HttpFilters {
 namespace Common {
 namespace Aws {
 
@@ -165,6 +164,5 @@ class DefaultCredentialsProviderChain : public CredentialsProviderChain,
 
 } // namespace Aws
 } // namespace Common
-} // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/common/aws/credentials_provider_impl.h source/extensions/common/aws/credentials_provider_impl.h

@@ -6,7 +6,6 @@
 
 namespace Envoy {
 namespace Extensions {
-namespace HttpFilters {
 namespace Common {
 namespace Aws {
 
@@ -28,6 +27,5 @@ using RegionProviderSharedPtr = std::shared_ptr<RegionProvider>;
 
 } // namespace Aws
 } // namespace Common
-} // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/common/aws/region_provider.h source/extensions/common/aws/region_provider.h

@@ -1,8 +1,7 @@
-#include "extensions/filters/http/common/aws/region_provider_impl.h"
+#include "extensions/common/aws/region_provider_impl.h"
 
 namespace Envoy {
 namespace Extensions {
-namespace HttpFilters {
 namespace Common {
 namespace Aws {
 
@@ -25,6 +24,5 @@ absl::optional<std::string> EnvironmentRegionProvider::getRegion() {
 
 } // namespace Aws
 } // namespace Common
-} // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/common/aws/region_provider_impl.cc source/extensions/common/aws/region_provider_impl.cc

@@ -2,11 +2,10 @@
 
 #include "common/common/logger.h"
 
-#include "extensions/filters/http/common/aws/region_provider.h"
+#include "extensions/common/aws/region_provider.h"
 
 namespace Envoy {
 namespace Extensions {
-namespace HttpFilters {
 namespace Common {
 namespace Aws {
 
@@ -33,6 +32,5 @@ class StaticRegionProvider : public RegionProvider {
 
 } // namespace Aws
 } // namespace Common
-} // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/common/aws/region_provider_impl.h source/extensions/common/aws/region_provider_impl.h

@@ -5,11 +5,9 @@
 
 namespace Envoy {
 namespace Extensions {
-namespace HttpFilters {
 namespace Common {
 namespace Aws {
 
-// TODO(rgs): Move this to source/extensions/common.
 class Signer {
 public:
   virtual ~Signer() = default;
@@ -34,6 +32,5 @@ using SignerPtr = std::unique_ptr<Signer>;
 
 } // namespace Aws
 } // namespace Common
-} // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/common/aws/signer.h source/extensions/common/aws/signer.h

@@ -1,4 +1,4 @@
-#include "extensions/filters/http/common/aws/signer_impl.h"
+#include "extensions/common/aws/signer_impl.h"
 
 #include "envoy/common/exception.h"
 
@@ -8,13 +8,12 @@
 #include "common/crypto/utility.h"
 #include "common/http/headers.h"
 
-#include "extensions/filters/http/common/aws/utility.h"
+#include "extensions/common/aws/utility.h"
 
 #include "absl/strings/str_join.h"
 
 namespace Envoy {
 namespace Extensions {
-namespace HttpFilters {
 namespace Common {
 namespace Aws {
 
@@ -122,6 +121,5 @@ SignerImpl::createAuthorizationHeader(absl::string_view access_key_id,
 
 } // namespace Aws
 } // namespace Common
-} // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/common/aws/signer_impl.cc source/extensions/common/aws/signer_impl.cc

@@ -4,12 +4,11 @@
 #include "common/common/utility.h"
 #include "common/singleton/const_singleton.h"
 
-#include "extensions/filters/http/common/aws/credentials_provider.h"
-#include "extensions/filters/http/common/aws/signer.h"
+#include "extensions/common/aws/credentials_provider.h"
+#include "extensions/common/aws/signer.h"
 
 namespace Envoy {
 namespace Extensions {
-namespace HttpFilters {
 namespace Common {
 namespace Aws {
 
@@ -82,6 +81,5 @@ class SignerImpl : public Signer, public Logger::Loggable<Logger::Id::http> {
 
 } // namespace Aws
 } // namespace Common
-} // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/common/aws/signer_impl.h source/extensions/common/aws/signer_impl.h

@@ -1,4 +1,4 @@
-#include "extensions/filters/http/common/aws/utility.h"
+#include "extensions/common/aws/utility.h"
 
 #include "common/common/fmt.h"
 #include "common/common/utility.h"
@@ -8,7 +8,6 @@
 
 namespace Envoy {
 namespace Extensions {
-namespace HttpFilters {
 namespace Common {
 namespace Aws {
 
@@ -141,6 +140,5 @@ absl::optional<std::string> Utility::metadataFetcher(const std::string& host,
 
 } // namespace Aws
 } // namespace Common
-} // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/common/aws/utility.cc source/extensions/common/aws/utility.cc

@@ -4,7 +4,6 @@
 
 namespace Envoy {
 namespace Extensions {
-namespace HttpFilters {
 namespace Common {
 namespace Aws {
 
@@ -59,6 +58,5 @@ class Utility {
 
 } // namespace Aws
 } // namespace Common
-} // namespace HttpFilters
 } // namespace Extensions
 } // namespace Envoy

source/extensions/filters/http/common/aws/utility.h source/extensions/common/aws/utility.h

@@ -18,9 +18,9 @@ envoy_cc_library(
     hdrs = ["aws_request_signing_filter.h"],
     deps = [
         "//include/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",
-        "//source/extensions/filters/http/common/aws:credentials_provider_impl_lib",
-        "//source/extensions/filters/http/common/aws:signer_impl_lib",
         "@envoy_api//envoy/extensions/filters/http/aws_request_signing/v3:pkg_cc_proto",
     ],
 )
@@ -34,10 +34,10 @@ envoy_cc_extension(
     deps = [
         ":aws_request_signing_filter_lib",
         "//include/envoy/registry",
+        "//source/extensions/common/aws:credentials_provider_impl_lib",
+        "//source/extensions/common/aws:signer_impl_lib",
         "//source/extensions/filters/http:well_known_names",
         "//source/extensions/filters/http/common:factory_base_lib",
-        "//source/extensions/filters/http/common/aws:credentials_provider_impl_lib",
-        "//source/extensions/filters/http/common/aws:signer_impl_lib",
         "@envoy_api//envoy/extensions/filters/http/aws_request_signing/v3:pkg_cc_proto",
     ],
 )

source/extensions/filters/http/aws_request_signing/BUILD

@@ -7,13 +7,13 @@ namespace Extensions {
 namespace HttpFilters {
 namespace AwsRequestSigningFilter {
 
-FilterConfigImpl::FilterConfigImpl(HttpFilters::Common::Aws::SignerPtr&& signer,
+FilterConfigImpl::FilterConfigImpl(Extensions::Common::Aws::SignerPtr&& signer,
                                    const std::string& stats_prefix, Stats::Scope& scope)
     : signer_(std::move(signer)), stats_(Filter::generateStats(stats_prefix, scope)) {}
 
 Filter::Filter(const std::shared_ptr<FilterConfig>& config) : config_(config) {}
 
-HttpFilters::Common::Aws::Signer& FilterConfigImpl::signer() { return *signer_; }
+Extensions::Common::Aws::Signer& FilterConfigImpl::signer() { return *signer_; }
 
 FilterStats& FilterConfigImpl::stats() { return stats_; }
 

source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.cc

@@ -5,7 +5,7 @@
 #include "envoy/stats/scope.h"
 #include "envoy/stats/stats_macros.h"
 
-#include "extensions/filters/http/common/aws/signer.h"
+#include "extensions/common/aws/signer.h"
 #include "extensions/filters/http/common/pass_through_filter.h"
 
 namespace Envoy {
@@ -39,7 +39,7 @@ class FilterConfig {
   /**
    * @return the config's signer.
    */
-  virtual HttpFilters::Common::Aws::Signer& signer() PURE;
+  virtual Extensions::Common::Aws::Signer& signer() PURE;
 
   /**
    * @return the filter stats.
@@ -54,14 +54,14 @@ using FilterConfigSharedPtr = std::shared_ptr<FilterConfig>;
  */
 class FilterConfigImpl : public FilterConfig {
 public:
-  FilterConfigImpl(HttpFilters::Common::Aws::SignerPtr&& signer, const std::string& stats_prefix,
+  FilterConfigImpl(Extensions::Common::Aws::SignerPtr&& signer, const std::string& stats_prefix,
                    Stats::Scope& scope);
 
-  HttpFilters::Common::Aws::Signer& signer() override;
+  Extensions::Common::Aws::Signer& signer() override;
   FilterStats& stats() override;
 
 private:
-  HttpFilters::Common::Aws::SignerPtr signer_;
+  Extensions::Common::Aws::SignerPtr signer_;
   FilterStats stats_;
 };
 

source/extensions/filters/http/aws_request_signing/aws_request_signing_filter.h

@@ -4,10 +4,10 @@
 #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 "extensions/filters/http/common/aws/credentials_provider_impl.h"
-#include "extensions/filters/http/common/aws/signer_impl.h"
-#include "extensions/filters/http/common/aws/utility.h"
 
 namespace Envoy {
 namespace Extensions {
@@ -19,9 +19,9 @@ Http::FilterFactoryCb AwsRequestSigningFilterFactory::createFilterFactoryFromPro
     const std::string& stats_prefix, Server::Configuration::FactoryContext& context) {
 
   auto credentials_provider =
-      std::make_shared<HttpFilters::Common::Aws::DefaultCredentialsProviderChain>(
-          context.api(), HttpFilters::Common::Aws::Utility::metadataFetcher);
-  auto signer = std::make_unique<HttpFilters::Common::Aws::SignerImpl>(
+      std::make_shared<Extensions::Common::Aws::DefaultCredentialsProviderChain>(
+          context.api(), Extensions::Common::Aws::Utility::metadataFetcher);
+  auto signer = std::make_unique<Extensions::Common::Aws::SignerImpl>(
       config.service_name(), config.region(), credentials_provider,
       context.dispatcher().timeSource());
 

source/extensions/filters/http/aws_request_signing/config.cc

@@ -25,10 +25,10 @@ envoy_cc_extension(
         "//source/common/grpc:google_grpc_creds_lib",
         "//source/common/http:message_lib",
         "//source/common/http:utility_lib",
-        "//source/extensions/filters/http/common/aws:credentials_provider_impl_lib",
-        "//source/extensions/filters/http/common/aws:region_provider_impl_lib",
-        "//source/extensions/filters/http/common/aws:signer_impl_lib",
-        "//source/extensions/filters/http/common/aws:utility_lib",
+        "//source/extensions/common/aws:credentials_provider_impl_lib",
+        "//source/extensions/common/aws:region_provider_impl_lib",
+        "//source/extensions/common/aws:signer_impl_lib",
+        "//source/extensions/common/aws:utility_lib",
         "//source/extensions/grpc_credentials:well_known_names",
         "@envoy_api//envoy/config/core/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/grpc_credential/v3:pkg_cc_proto",

source/extensions/grpc_credentials/aws_iam/BUILD

@@ -12,10 +12,10 @@
 #include "common/http/utility.h"
 #include "common/protobuf/message_validator_impl.h"
 
-#include "extensions/filters/http/common/aws/credentials_provider_impl.h"
-#include "extensions/filters/http/common/aws/region_provider_impl.h"
-#include "extensions/filters/http/common/aws/signer_impl.h"
-#include "extensions/filters/http/common/aws/utility.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"
 
 namespace Envoy {
 namespace Extensions {
@@ -45,10 +45,9 @@ std::shared_ptr<grpc::ChannelCredentials> AwsIamGrpcCredentialsFactory::getChann
         const auto& config = Envoy::MessageUtil::downcastAndValidate<
             const envoy::config::grpc_credential::v3::AwsIamConfig&>(
             *config_message, ProtobufMessage::getNullValidationVisitor());
-        auto credentials_provider =
-            std::make_shared<HttpFilters::Common::Aws::DefaultCredentialsProviderChain>(
-                api, HttpFilters::Common::Aws::Utility::metadataFetcher);
-        auto signer = std::make_unique<HttpFilters::Common::Aws::SignerImpl>(
+        auto credentials_provider = std::make_shared<Common::Aws::DefaultCredentialsProviderChain>(
+            api, Common::Aws::Utility::metadataFetcher);
+        auto signer = std::make_unique<Common::Aws::SignerImpl>(
             config.service_name(), getRegion(config), credentials_provider, api.timeSource());
         std::shared_ptr<grpc::CallCredentials> new_call_creds = grpc::MetadataCredentialsFromPlugin(
             std::make_unique<AwsIamHeaderAuthenticator>(std::move(signer)));
@@ -75,12 +74,11 @@ std::shared_ptr<grpc::ChannelCredentials> AwsIamGrpcCredentialsFactory::getChann
 
 std::string AwsIamGrpcCredentialsFactory::getRegion(
     const envoy::config::grpc_credential::v3::AwsIamConfig& config) {
-  std::unique_ptr<HttpFilters::Common::Aws::RegionProvider> region_provider;
+  std::unique_ptr<Common::Aws::RegionProvider> region_provider;
   if (!config.region().empty()) {
-    region_provider =
-        std::make_unique<HttpFilters::Common::Aws::StaticRegionProvider>(config.region());
+    region_provider = std::make_unique<Common::Aws::StaticRegionProvider>(config.region());
   } else {
-    region_provider = std::make_unique<HttpFilters::Common::Aws::EnvironmentRegionProvider>();
+    region_provider = std::make_unique<Common::Aws::EnvironmentRegionProvider>();
   }
 
   if (!region_provider->getRegion().has_value()) {