Skip to content
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

Jump to bottom

[SNOW-892549] Remove references to sfcdev1 #885

Merged
merged 2 commits into from
Aug 18, 2023
Merged

[SNOW-892549] Remove references to sfcdev1 #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa237b6
[SNOW-892549] Remove references to sfcdev1
sfc-gh-skumbham Aug 16, 2023
5014635
Merge branch 'master' into skumbham-SNOW-892549
sfc-gh-skumbham Aug 18, 2023
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
10 changes: 5 additions & 5 deletions azure_storage_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
func TestExtractContainerNameAndPath(t *testing.T) {
azureUtil := new(snowflakeAzureClient)
testcases := []tcBucketPath{
{"sfc-dev1-regression/test_sub_dir/", "sfc-dev1-regression", "test_sub_dir/"},
{"sfc-dev1-regression/dir/test_stg/test_sub_dir/", "sfc-dev1-regression", "dir/test_stg/test_sub_dir/"},
{"sfc-dev1-regression/", "sfc-dev1-regression", ""},
{"sfc-dev1-regression//", "sfc-dev1-regression", "/"},
{"sfc-dev1-regression///", "sfc-dev1-regression", "//"},
{"sfc-eng-regression/test_sub_dir/", "sfc-eng-regression", "test_sub_dir/"},
{"sfc-eng-regression/dir/test_stg/test_sub_dir/", "sfc-eng-regression", "dir/test_stg/test_sub_dir/"},
{"sfc-eng-regression/", "sfc-eng-regression", ""},
{"sfc-eng-regression//", "sfc-eng-regression", "/"},
{"sfc-eng-regression///", "sfc-eng-regression", "//"},
}
for _, test := range testcases {
t.Run(test.in, func(t *testing.T) {
Expand Down
20 changes: 10 additions & 10 deletions gcs_storage_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ type tcFileURL struct {
func TestExtractBucketAndPath(t *testing.T) {
gcsUtil := new(snowflakeGcsClient)
testcases := []tcBucketPath{
{"sfc-dev1-regression/test_sub_dir/", "sfc-dev1-regression", "test_sub_dir/"},
{"sfc-dev1-regression/dir/test_stg/test_sub_dir/", "sfc-dev1-regression", "dir/test_stg/test_sub_dir/"},
{"sfc-dev1-regression/", "sfc-dev1-regression", ""},
{"sfc-dev1-regression//", "sfc-dev1-regression", "/"},
{"sfc-dev1-regression///", "sfc-dev1-regression", "//"},
{"sfc-eng-regression/test_sub_dir/", "sfc-eng-regression", "test_sub_dir/"},
{"sfc-eng-regression/dir/test_stg/test_sub_dir/", "sfc-eng-regression", "dir/test_stg/test_sub_dir/"},
{"sfc-eng-regression/", "sfc-eng-regression", ""},
{"sfc-eng-regression//", "sfc-eng-regression", "/"},
{"sfc-eng-regression///", "sfc-eng-regression", "//"},
}
for _, test := range testcases {
t.Run(test.in, func(t *testing.T) {
Expand Down Expand Up @@ -97,11 +97,11 @@ func TestIsTokenExpiredWith404(t *testing.T) {
func TestGenerateFileURL(t *testing.T) {
gcsUtil := new(snowflakeGcsClient)
testcases := []tcFileURL{
{"sfc-dev1-regression/test_sub_dir/", "file1", "sfc-dev1-regression", "test_sub_dir/file1"},
{"sfc-dev1-regression/dir/test_stg/test_sub_dir/", "file2", "sfc-dev1-regression", "dir/test_stg/test_sub_dir/file2"},
{"sfc-dev1-regression/", "file3", "sfc-dev1-regression", "file3"},
{"sfc-dev1-regression//", "file4", "sfc-dev1-regression", "/file4"},
{"sfc-dev1-regression///", "file5", "sfc-dev1-regression", "//file5"},
{"sfc-eng-regression/test_sub_dir/", "file1", "sfc-eng-regression", "test_sub_dir/file1"},
{"sfc-eng-regression/dir/test_stg/test_sub_dir/", "file2", "sfc-eng-regression", "dir/test_stg/test_sub_dir/file2"},
{"sfc-eng-regression/", "file3", "sfc-eng-regression", "file3"},
{"sfc-eng-regression//", "file4", "sfc-eng-regression", "/file4"},
{"sfc-eng-regression///", "file5", "sfc-eng-regression", "//file5"},
}
for _, test := range testcases {
t.Run(test.location, func(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions ocsp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func TestOCSP(t *testing.T) {
targetURL := []string{
"https://sfctest0.snowflakecomputing.com/",
"https://s3-us-west-2.amazonaws.com/sfc-snowsql-updates/?prefix=1.1/windows_x86_64",
"https://sfcdev1.blob.core.windows.net/",
"https://sfcdev2.blob.core.windows.net/",
}

transports := []*http.Transport{
Expand Down Expand Up @@ -128,7 +128,7 @@ func TestUnitEncodeCertIDGood(t *testing.T) {
targetURLs := []string{
"faketestaccount.snowflakecomputing.com:443",
"s3-us-west-2.amazonaws.com:443",
"sfcdev1.blob.core.windows.net:443",
"sfcdev2.blob.core.windows.net:443",
}
for _, tt := range targetURLs {
t.Run(tt, func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion put_get_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func getAWSCredentials() (string, string, string, error) {
if err != nil {
return keyID, secretKey, "", err
}
bucket = fmt.Sprintf("sfc-dev1-regression/%v/reg", user.Username)
bucket = fmt.Sprintf("sfc-eng-regression/%v/reg", user.Username)
}
return keyID, secretKey, bucket, nil
}
Expand Down
2 changes: 1 addition & 1 deletion put_get_user_stage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func putGetUserStage(t *testing.T, tmpDir string, numberOfFiles int, numberOfLin
dbt.mustExec(fmt.Sprintf(sqlText, dbname))
userBucket := os.Getenv("SF_AWS_USER_BUCKET")
if userBucket == "" {
userBucket = fmt.Sprintf("sfc-dev1-regression/%v/reg", username)
userBucket = fmt.Sprintf("sfc-eng-regression/%v/reg", username)
}
sqlText = `create or replace stage %v url='s3://%v}/%v-%v-%v'
credentials = (AWS_KEY_ID='%v' AWS_SECRET_KEY='%v')`
Expand Down
4 changes: 2 additions & 2 deletions put_get_with_aws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func TestLoadS3(t *testing.T) {
dbt.mustQueryAssertCount("ls @%tweets", 0)

rows := dbt.mustQuery(fmt.Sprintf(`copy into tweets from
s3://sfc-dev1-data/twitter/O1k/tweets/ credentials=(AWS_KEY_ID='%v'
s3://sfc-eng-data/twitter/O1k/tweets/ credentials=(AWS_KEY_ID='%v'
AWS_SECRET_KEY='%v') file_format=(skip_header=1 null_if=('')
field_optionally_enclosed_by='\"')`,
data.awsAccessKeyID, data.awsSecretAccessKey))
Expand All @@ -80,7 +80,7 @@ func TestLoadS3(t *testing.T) {
if cnt != 1 {
t.Fatal("copy into tweets did not set row count to 1")
}
if s0 != "s3://sfc-dev1-data/twitter/O1k/tweets/1.csv.gz" {
if s0 != "s3://sfc-eng-data/twitter/O1k/tweets/1.csv.gz" {
t.Fatalf("got %v as file", s0)
}
})
Expand Down
10 changes: 5 additions & 5 deletions s3_storage_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ type tcBucketPath struct {
func TestExtractBucketNameAndPath(t *testing.T) {
s3util := new(snowflakeS3Client)
testcases := []tcBucketPath{
{"sfc-dev1-regression/test_sub_dir/", "sfc-dev1-regression", "test_sub_dir/"},
{"sfc-dev1-regression/dir/test_stg/test_sub_dir/", "sfc-dev1-regression", "dir/test_stg/test_sub_dir/"},
{"sfc-dev1-regression/", "sfc-dev1-regression", ""},
{"sfc-dev1-regression//", "sfc-dev1-regression", "/"},
{"sfc-dev1-regression///", "sfc-dev1-regression", "//"},
{"sfc-eng-regression/test_sub_dir/", "sfc-eng-regression", "test_sub_dir/"},
{"sfc-eng-regression/dir/test_stg/test_sub_dir/", "sfc-eng-regression", "dir/test_stg/test_sub_dir/"},
{"sfc-eng-regression/", "sfc-eng-regression", ""},
{"sfc-eng-regression//", "sfc-eng-regression", "/"},
{"sfc-eng-regression///", "sfc-eng-regression", "//"},
}
for _, test := range testcases {
t.Run(test.in, func(t *testing.T) {
Expand Down
Loading