refactor(libstore): preResolveS3Credentials -> preResolveAwsCredentials

Author: lovesegfault

src/libstore/aws-creds.cc

@@ -223,7 +223,7 @@ void clearAwsCredentialsCache()
     credentialProviderCache.clear();
 }
 
-std::optional<AwsCredentials> preResolveS3Credentials(const std::string & url)
+std::optional<AwsCredentials> preResolveAwsCredentials(const std::string & url)
 {
     try {
         auto parsedUrl = parseURL(url);
@@ -237,10 +237,10 @@ std::optional<AwsCredentials> preResolveS3Credentials(const std::string & url)
         // Get credentials (automatically cached)
         return getAwsCredentials(profile);
     } catch (const AwsAuthError & e) {
-        debug("Failed to pre-resolve S3 credentials: %s", e.what());
+        debug("Failed to pre-resolve AWS credentials: %s", e.what());
         return std::nullopt;
     } catch (const std::exception & e) {
-        debug("Error pre-resolving S3 credentials: %s", e.what());
+        debug("Error pre-resolving AWS credentials: %s", e.what());
         return std::nullopt;
     }
 }

src/libstore/include/nix/store/aws-creds.hh

@@ -68,7 +68,7 @@ void clearAwsCredentialsCache();
  * Returns credentials if URL is S3 and credentials are available.
  * Returns nullopt if URL is not S3 or credentials cannot be resolved.
  */
-std::optional<AwsCredentials> preResolveS3Credentials(const std::string & url);
+std::optional<AwsCredentials> preResolveAwsCredentials(const std::string & url);
 
 } // namespace nix
 

src/libstore/unix/build/derivation-builder.cc

@@ -212,7 +212,7 @@ class DerivationBuilderImpl : public DerivationBuilder, public DerivationBuilder
                         auto s3Url = ParsedS3URL::parse(parsedUrl);
 
                         // Get credentials from the parent process's cached provider
-                        auto creds = preResolveS3Credentials(url->second);
+                        auto creds = nix::preResolveAwsCredentials(url->second);
 
                         if (creds) {
                             preResolvedAwsCredentials = AwsCredentialsForBuilder{