Skip to content

Commit 43b3e32

Browse files
authored
SNOW-874975: Migrate out of sfc-dev1 (#1666)
* SNOW-874975: Migrate out of sfc-dev1 * move sfc-dev1-regression to sfc-eng-regression
1 parent 511154b commit 43b3e32

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

test/integ/test_load_unload.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def __init__(self):
7373
self.database_name = database_name
7474
self.connection = connection
7575
self.user_bucket = os.getenv(
76-
"SF_AWS_USER_BUCKET", f"sfc-dev1-regression/{getuser()}/reg"
76+
"SF_AWS_USER_BUCKET", f"sfc-eng-regression/{getuser()}/reg"
7777
)
7878

7979
ret = TestData()
@@ -157,7 +157,7 @@ def test_load_s3(test_data):
157157
)
158158
cur.execute(
159159
"""
160-
copy into tweets from s3://sfc-dev1-data/twitter/O1k/tweets/
160+
copy into tweets from s3://sfc-eng-data/twitter/O1k/tweets/
161161
credentials=(AWS_KEY_ID={aws_access_key_id}
162162
AWS_SECRET_KEY={aws_secret_access_key})
163163
file_format=(skip_header=1 null_if=('') field_optionally_enclosed_by='"')
@@ -169,7 +169,7 @@ def test_load_s3(test_data):
169169
assert cur.rowcount == 1, "copy into tweets did not set rowcount to 1"
170170
results = cur.fetchall()
171171
assert (
172-
results[0][0] == "s3://sfc-dev1-data/twitter/O1k/tweets/1.csv.gz"
172+
results[0][0] == "s3://sfc-eng-data/twitter/O1k/tweets/1.csv.gz"
173173
), "ls @%tweets failed"
174174
cur.execute("drop table tweets")
175175

@@ -189,7 +189,7 @@ def test_put_local_file(test_data):
189189
c4 STRING, c5 STRING, c6 STRING, c7 STRING, c8 STRING, c9 STRING)
190190
stage_file_format = (field_delimiter = '|' error_on_column_count_mismatch=false)
191191
stage_copy_options = (purge=false)
192-
stage_location = (url = 's3://sfc-dev1-regression/jenkins/{stage_name}'
192+
stage_location = (url = 's3://sfc-eng-regression/jenkins/{stage_name}'
193193
credentials = (
194194
AWS_KEY_ID={aws_access_key_id}
195195
AWS_SECRET_KEY={aws_secret_access_key}))

test/integ/test_put_get.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def fin():
8383
warehouse_name=warehouse_name,
8484
database_name=database_name,
8585
user_bucket=os.getenv(
86-
"SF_AWS_USER_BUCKET", f"sfc-dev1-regression/{getuser()}/reg"
86+
"SF_AWS_USER_BUCKET", f"sfc-eng-regression/{getuser()}/reg"
8787
),
8888
connection=connection,
8989
)
@@ -165,7 +165,7 @@ def test_load_s3(test_data):
165165
)
166166
cur.execute(
167167
f"""
168-
copy into tweets from s3://sfc-dev1-data/twitter/O1k/tweets/
168+
copy into tweets from s3://sfc-eng-data/twitter/O1k/tweets/
169169
credentials=(
170170
AWS_KEY_ID={test_data.AWS_ACCESS_KEY_ID}
171171
AWS_SECRET_KEY={test_data.AWS_SECRET_ACCESS_KEY})
@@ -177,7 +177,7 @@ def test_load_s3(test_data):
177177
)
178178
assert cur.rowcount == 1, "copy into tweets did not set rowcount to 1"
179179
results = cur.fetchall()
180-
assert results[0][0] == ("s3://sfc-dev1-data/twitter/O1k/tweets/1.csv.gz")
180+
assert results[0][0] == ("s3://sfc-eng-data/twitter/O1k/tweets/1.csv.gz")
181181
cur.execute("drop table tweets")
182182

183183

test/integ/test_put_get_user_stage.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def _put_get_user_stage(
231231
"""
232232
)
233233
user_bucket = os.getenv(
234-
"SF_AWS_USER_BUCKET", f"sfc-dev1-regression/{getuser()}/reg"
234+
"SF_AWS_USER_BUCKET", f"sfc-eng-regression/{getuser()}/reg"
235235
)
236236
cnx.cursor().execute(
237237
f"""
@@ -321,7 +321,7 @@ def test_put_get_duplicated_data_user_stage(
321321
"""
322322
)
323323
user_bucket = os.getenv(
324-
"SF_AWS_USER_BUCKET", f"sfc-dev1-regression/{getuser()}/reg"
324+
"SF_AWS_USER_BUCKET", f"sfc-eng-regression/{getuser()}/reg"
325325
)
326326
cnx.cursor().execute(
327327
f"""
@@ -420,7 +420,7 @@ def test_get_data_user_stage(
420420
pytest.skip("This test requires to change the internal parameter")
421421

422422
default_s3bucket = os.getenv(
423-
"SF_AWS_USER_BUCKET", f"sfc-dev1-regression/{getuser()}/reg"
423+
"SF_AWS_USER_BUCKET", f"sfc-eng-regression/{getuser()}/reg"
424424
)
425425
test_data = [
426426
{

test/unit/test_ocsp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def overwrite_ocsp_cache(tmpdir):
5151
"sqs.us-west-2.amazonaws.com",
5252
"sfcsupport.us-east-1.snowflakecomputing.com",
5353
"sfcsupport.eu-central-1.snowflakecomputing.com",
54-
"sfc-dev1-regression.s3.amazonaws.com",
54+
"sfc-eng-regression.s3.amazonaws.com",
5555
"sfctest0.snowflakecomputing.com",
5656
"sfc-ds2-customer-stage.s3.amazonaws.com",
5757
"snowflake.okta.com",

test/unit/test_s3_util.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@
5757
@pytest.mark.parametrize(
5858
"input, bucket_name, s3path",
5959
[
60-
("sfc-dev1-regression/test_sub_dir/", "sfc-dev1-regression", "test_sub_dir/"),
60+
("sfc-eng-regression/test_sub_dir/", "sfc-eng-regression", "test_sub_dir/"),
6161
(
62-
"sfc-dev1-regression/stakeda/test_stg/test_sub_dir/",
63-
"sfc-dev1-regression",
62+
"sfc-eng-regression/stakeda/test_stg/test_sub_dir/",
63+
"sfc-eng-regression",
6464
"stakeda/test_stg/test_sub_dir/",
6565
),
66-
("sfc-dev1-regression/", "sfc-dev1-regression", ""),
67-
("sfc-dev1-regression//", "sfc-dev1-regression", "/"),
68-
("sfc-dev1-regression///", "sfc-dev1-regression", "//"),
66+
("sfc-eng-regression/", "sfc-eng-regression", ""),
67+
("sfc-eng-regression//", "sfc-eng-regression", "/"),
68+
("sfc-eng-regression///", "sfc-eng-regression", "//"),
6969
],
7070
)
7171
def test_extract_bucket_name_and_path(input, bucket_name, s3path):

0 commit comments

Comments
 (0)