Skip to content

SNOW-2158841: Use endpoint over region #1204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 29, 2025
Merged

SNOW-2158841: Use endpoint over region #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b76cacd
Use endpoint over region
sfc-gh-ext-simba-lf Jul 18, 2025
e942997
Add region to test
sfc-gh-ext-simba-lf Jul 18, 2025
e8b7805
Add tests
sfc-gh-ext-simba-lf Jul 18, 2025
b52fb6c
Add null check for service url
sfc-gh-ext-simba-lf Jul 18, 2025
5c8e871
Merge branch 'master' into SNOW-2158841-Fix-Endpoint-FIPS
sfc-gh-ext-simba-hx Jul 23, 2025
56eb876
Merge branch 'master' into SNOW-2158841-Fix-Endpoint-FIPS
sfc-gh-knozderko Jul 24, 2025
e0de4cb
Merge branch 'master' into SNOW-2158841-Fix-Endpoint-FIPS
sfc-gh-ext-simba-lf Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions Snowflake.Data.Tests/UnitTests/SFS3ClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,39 @@ public void TestAppendHttpsToEndpointWithBrackets()
Assert.That(amazonS3Client.ServiceURL, Is.EqualTo(expectedEndpoint));
}

[Test]
public void TestServiceUrlIsSetWhenEndpointAndRegionAreProvided()
{
// Arrange
var amazonS3Client = new AmazonS3Config();
var endpoint = "endpointWithNoHttps.com";
var expectedEndpoint = "https://endpointWithNoHttps.com";
var mockRegion = "fakeRegion";

// ACT
SFS3Client.SetCommonClientConfig(amazonS3Client, mockRegion, endpoint, 1, 0);

// Assert
Assert.That(amazonS3Client.ServiceURL, Is.EqualTo(expectedEndpoint));
Assert.IsNull(amazonS3Client.RegionEndpoint);
}

[Test]
public void TestRegionEndpointIsSetWhenOnlyRegionIsProvided()
{
// Arrange
var amazonS3Client = new AmazonS3Config();
var expectedRegionEndpoint = RegionEndpoint.USEast2;
var region = expectedRegionEndpoint.SystemName;

// ACT
SFS3Client.SetCommonClientConfig(amazonS3Client, region, string.Empty, 1, 0);

// Assert
Assert.That(amazonS3Client.RegionEndpoint, Is.EqualTo(expectedRegionEndpoint));
Assert.IsNull(amazonS3Client.ServiceURL);
}

[Test]
[TestCase(MockS3Client.AwsStatusOk, ResultStatus.UPLOADED)]
[TestCase(SFS3Client.EXPIRED_TOKEN, ResultStatus.RENEW_TOKEN)]
Expand Down
6 changes: 2 additions & 4 deletions Snowflake.Data/Core/FileTransfer/StorageClient/SFS3Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,12 +335,10 @@ internal static void SetCommonClientConfig(

clientConfig.ServiceURL = endpoint;
}

// The region information used to determine the endpoint for the service.
// RegionEndpoint and ServiceURL are mutually exclusive properties.
// If both stageInfo.endPoint and stageInfo.region have a value, stageInfo.region takes
// precedence and ServiceUrl will be reset to null.
if ((null != region) && (0 != region.Length))
// If both stageInfo.endPoint and stageInfo.region have a value, the endPoint takes precedence
else if ((null != region) && (0 != region.Length))
{
RegionEndpoint regionEndpoint = RegionEndpoint.GetBySystemName(region);
clientConfig.RegionEndpoint = regionEndpoint;
Expand Down