Skip to content

Commit ff21dd1

Browse files
henrywoohenrywoo
authored
Merge pull request #60 from henrywoo/henry.wu/bucket-name-replacement-20240303
Add the bucket back with another name
2 parents 745ff79 + a2ed502 commit ff21dd1

File tree

3 files changed

+27
-48
lines changed

3 files changed

+27
-48
lines changed

‎go/config_test.go‎

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ import (
2828
)
2929

3030
func TestAthenaConfig(t *testing.T) {
31-
// The Amazon S3 bucket query-results-henry-wu-us-east-2 has been compromised, and should not be used.
32-
// var s3bucket string = "s3://query-results-henry-wu-us-east-2/"
31+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/"
3332

3433
wgTags := NewWGTags()
3534
wgTags.AddTag("Uber User", "henry.wu@uber.com")
@@ -46,13 +45,8 @@ func TestAthenaConfig(t *testing.T) {
4645
err = testConf.SetWorkGroup(wg)
4746
assert.Nil(t, err)
4847
assert.Equal(t, testConf.GetUser(), "henry.wu@uber.com")
49-
50-
// The Amazon S3 bucket query-results-henry-wu-us-east-2 has been compromised, and should not be used.
51-
// assert.Equal(t, testConf.GetOutputBucket(), "s3://query-results-henry-wu-us-east-2/")
52-
53-
// The Amazon S3 bucket query-results-henry-wu-us-east-2 has been compromised, and should not be used.
54-
// expected := "s3://henry.wu%40uber.com:@query-results-henry-wu-us-east-2?WGRemoteCreation=true&db=default&missingAsEmptyString=true&region=us-east-1&tag=%7CUber+User%60henry.wu%40uber.com%7CUber+Asset%60abc.efg&workgroupConfig=%7B%0A++BytesScannedCutoffPerQuery%3A+1073741824%2C%0A++EnforceWorkGroupConfiguration%3A+true%2C%0A++PublishCloudWatchMetricsEnabled%3A+true%2C%0A++RequesterPaysEnabled%3A+false%0A%7D&workgroupName=henry_wu"
55-
48+
assert.Equal(t, testConf.GetOutputBucket(), "s3://fake-query-results-arbitrary-bucket/")
49+
expected := "s3://henry.wu%40uber.com:@fake-query-results-arbitrary-bucket?WGRemoteCreation=true&db=default&missingAsEmptyString=true&region=us-east-1&tag=%7CUber+User%60henry.wu%40uber.com%7CUber+Asset%60abc.efg&workgroupConfig=%7B%0A++BytesScannedCutoffPerQuery%3A+1073741824%2C%0A++EnforceWorkGroupConfiguration%3A+true%2C%0A++PublishCloudWatchMetricsEnabled%3A+true%2C%0A++RequesterPaysEnabled%3A+false%0A%7D&workgroupName=henry_wu"
5650
actual := testConf.Stringify()
5751
assert.Equal(t, actual, expected)
5852
w := testConf.GetWorkgroup()
@@ -64,32 +58,24 @@ func TestAthenaConfig(t *testing.T) {
6458
}
6559

6660
func TestGetOutputBucket(t *testing.T) {
67-
// The Amazon S3 bucket query-results-henry-wu-us-east-2 has been compromised, and should not be used.
68-
// var s3bucket string = "s3://query-results-henry-wu-us-east-2/local/"
69-
61+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/local/"
7062
testConf := NewNoOpsConfig()
7163
err := testConf.SetOutputBucket(s3bucket)
7264
conf, _ := NewConfig(testConf.Stringify())
7365
assert.Nil(t, err)
74-
75-
// The Amazon S3 bucket query-results-henry-wu-us-east-2 has been compromised, and should not be used.
76-
// assert.Equal(t, testConf.GetOutputBucket(), "s3://query-results-henry-wu-us-east-2/local/")
77-
// assert.Equal(t, conf.GetOutputBucket(), "s3://query-results-henry-wu-us-east-2/local/")
66+
assert.Equal(t, testConf.GetOutputBucket(), "s3://fake-query-results-arbitrary-bucket/local/")
67+
assert.Equal(t, conf.GetOutputBucket(), "s3://fake-query-results-arbitrary-bucket/local/")
7868
}
7969

8070
func TestAthenaConfigWrongS3Bucket(t *testing.T) {
81-
// The Amazon S3 bucket query-results-henry-wu-us-east-2 has been compromised, and should not be used.
82-
// var s3bucket string = "file:///query-results-henry-wu-us-east-2/"
83-
71+
var s3bucket string = "file:///fake-query-results-arbitrary-bucket/"
8472
testConf := NewNoOpsConfig()
8573
err := testConf.SetOutputBucket(s3bucket)
8674
assert.NotNil(t, err)
8775
}
8876

8977
func TestConfig_SetOutputBucket(t *testing.T) {
90-
// The Amazon S3 bucket query-results-henry-wu-us-east-2 has been compromised, and should not be used.
91-
// var s3bucket string = "s3://query-results-henry-wu-us-east-2"
92-
78+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket"
9379
testConf := NewNoOpsConfig()
9480
err := testConf.SetOutputBucket(s3bucket)
9581
assert.Nil(t, err)
@@ -112,8 +98,7 @@ func TestAthenaConfigWrongWG(t *testing.T) {
11298
}
11399

114100
func TestAthenaConfigSafeString(t *testing.T) {
115-
// The Amazon S3 bucket query-results-henry-wu-us-east-2 has been compromised, and should not be used.
116-
// var s3bucket string = "s3://query-results-henry-wu-us-east-2/"
101+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/"
117102

118103
wg := NewDefaultWG("henry_wu", nil, nil)
119104
testConf := NewNoOpsConfig()
@@ -131,12 +116,9 @@ func TestAthenaConfigSafeString(t *testing.T) {
131116
assert.Nil(t, err)
132117
testConf.SetSessionToken("thisisaToken")
133118
assert.Equal(t, testConf.GetUser(), "henry.wu@uber.com")
134-
135-
// The Amazon S3 bucket query-results-henry-wu-us-east-2 has been compromised, and should not be used.
136-
// assert.Equal(t, testConf.GetOutputBucket(), "s3://query-results-henry-wu-us-east-2/")
137-
138-
expectedRawString := "s3://henry.wu%40uber.com:@query-results-henry-wu-us-east-2?WGRemoteCreation=true&accessID=thisisanID&db=default&missingAsEmptyString=true&region=us-east-1&secretAccessKey=thisisaKey&sessionToken=thisisaToken&tag=&workgroupConfig=%7B%0A++BytesScannedCutoffPerQuery%3A+1073741824%2C%0A++EnforceWorkGroupConfiguration%3A+true%2C%0A++PublishCloudWatchMetricsEnabled%3A+true%2C%0A++RequesterPaysEnabled%3A+false%0A%7D&workgroupName=henry_wu"
139-
expectedSafeString := "s3://henry.wu%40uber.com:@query-results-henry-wu-us-east-2?WGRemoteCreation=true&accessID=*&db=default&missingAsEmptyString=true&region=us-east-1&secretAccessKey=*&sessionToken=*&tag=&workgroupConfig=%7B%0A++BytesScannedCutoffPerQuery%3A+1073741824%2C%0A++EnforceWorkGroupConfiguration%3A+true%2C%0A++PublishCloudWatchMetricsEnabled%3A+true%2C%0A++RequesterPaysEnabled%3A+false%0A%7D&workgroupName=henry_wu"
119+
assert.Equal(t, testConf.GetOutputBucket(), "s3://fake-query-results-arbitrary-bucket/")
120+
expectedRawString := "s3://henry.wu%40uber.com:@fake-query-results-arbitrary-bucket?WGRemoteCreation=true&accessID=thisisanID&db=default&missingAsEmptyString=true&region=us-east-1&secretAccessKey=thisisaKey&sessionToken=thisisaToken&tag=&workgroupConfig=%7B%0A++BytesScannedCutoffPerQuery%3A+1073741824%2C%0A++EnforceWorkGroupConfiguration%3A+true%2C%0A++PublishCloudWatchMetricsEnabled%3A+true%2C%0A++RequesterPaysEnabled%3A+false%0A%7D&workgroupName=henry_wu"
121+
expectedSafeString := "s3://henry.wu%40uber.com:@fake-query-results-arbitrary-bucket?WGRemoteCreation=true&accessID=*&db=default&missingAsEmptyString=true&region=us-east-1&secretAccessKey=*&sessionToken=*&tag=&workgroupConfig=%7B%0A++BytesScannedCutoffPerQuery%3A+1073741824%2C%0A++EnforceWorkGroupConfiguration%3A+true%2C%0A++PublishCloudWatchMetricsEnabled%3A+true%2C%0A++RequesterPaysEnabled%3A+false%0A%7D&workgroupName=henry_wu"
140122
actualRaw := testConf.Stringify()
141123
actualSafe := testConf.SafeStringify()
142124
assert.Equal(t, expectedRawString, actualRaw)
@@ -314,7 +296,7 @@ func TestConfig_SetAWSProfile(t *testing.T) {
314296
}
315297

316298
func TestConfig_SetServiceLimitOverride(t *testing.T) {
317-
var s3bucket string = "s3://query-results-henry-wu-us-east-2/"
299+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/"
318300

319301
testConf := NewNoOpsConfig()
320302
_ = testConf.SetOutputBucket(s3bucket)
@@ -325,7 +307,7 @@ func TestConfig_SetServiceLimitOverride(t *testing.T) {
325307
testServiceLimitOverride := testConf.GetServiceLimitOverride()
326308
assert.Equal(t, ddlQueryTimeout, testServiceLimitOverride.GetDDLQueryTimeout())
327309

328-
expected := "s3://query-results-henry-wu-us-east-2?DDLQueryTimeout=60000&DMLQueryTimeout=0&WGRemoteCreation=true&db=default&missingAsEmptyString=true&region=us-east-1"
310+
expected := "s3://fake-query-results-arbitrary-bucket?DDLQueryTimeout=60000&DMLQueryTimeout=0&WGRemoteCreation=true&db=default&missingAsEmptyString=true&region=us-east-1"
329311
assert.Equal(t, expected, testConf.Stringify())
330312

331313
dmlQueryTimeout := 60 * 60 // 60 minutes
@@ -335,7 +317,7 @@ func TestConfig_SetServiceLimitOverride(t *testing.T) {
335317
assert.Equal(t, ddlQueryTimeout, testServiceLimitOverride.GetDDLQueryTimeout())
336318
assert.Equal(t, dmlQueryTimeout, testServiceLimitOverride.GetDMLQueryTimeout())
337319

338-
expected = "s3://query-results-henry-wu-us-east-2?DDLQueryTimeout=60000&DMLQueryTimeout=3600&WGRemoteCreation=true&db=default&missingAsEmptyString=true&region=us-east-1"
320+
expected = "s3://fake-query-results-arbitrary-bucket?DDLQueryTimeout=60000&DMLQueryTimeout=3600&WGRemoteCreation=true&db=default&missingAsEmptyString=true&region=us-east-1"
339321
assert.Equal(t, expected, testConf.Stringify())
340322
}
341323

‎go/connection_test.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,7 @@ func TestConnection_QueryContext3(t *testing.T) {
344344
athenaAPI: newMockAthenaClient(),
345345
connector: NoopsSQLConnector(),
346346
}
347-
// The Amazon S3 bucket query-results-henry-wu-us-east-2 has been compromised, and should not be used.
348-
// var s3bucket string = "s3://query-results-henry-wu-us-east-2/"
347+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/"
349348

350349
wgTags := NewWGTags()
351350
wgTags.AddTag("Uber User", "henry.wu")
@@ -375,7 +374,7 @@ func TestConnection_QueryContext4(t *testing.T) {
375374
athenaAPI: nm,
376375
connector: NoopsSQLConnector(),
377376
}
378-
var s3bucket string = "s3://query-results-henry-wu-us-east-2/"
377+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/"
379378

380379
wgTags := NewWGTags()
381380
wgTags.AddTag("Uber User", "henry.wu")
@@ -408,7 +407,7 @@ func TestConnection_QueryContext5(t *testing.T) {
408407
athenaAPI: nm,
409408
connector: NoopsSQLConnector(),
410409
}
411-
var s3bucket string = "s3://query-results-henry-wu-us-east-2/"
410+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/"
412411

413412
wgTags := NewWGTags()
414413
wgTags.AddTag("Uber User", "henry.wu")
@@ -435,7 +434,7 @@ func TestConnection_QueryContext6(t *testing.T) {
435434
athenaAPI: nm,
436435
connector: NoopsSQLConnector(),
437436
}
438-
var s3bucket string = "s3://query-results-henry-wu-us-east-2/"
437+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/"
439438

440439
wgTags := NewWGTags()
441440
wgTags.AddTag("Uber User", "henry.wu")
@@ -576,7 +575,7 @@ func createConnectionFixture() *Connection {
576575
athenaAPI: nm,
577576
connector: NoopsSQLConnector(),
578577
}
579-
var s3bucket string = "s3://query-results-henry-wu-us-east-2/"
578+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/"
580579
wgTags := NewWGTags()
581580
wgTags.AddTag("Uber Author", "henry.wu")
582581
wgTags.AddTag("Uber Role", "Engineer")
@@ -600,7 +599,7 @@ func TestMoneyWise(t *testing.T) {
600599
athenaAPI: newMockAthenaClient(),
601600
connector: NoopsSQLConnector(),
602601
}
603-
var s3bucket string = "s3://query-results-henry-wu-us-east-2/"
602+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/"
604603

605604
wgTags := NewWGTags()
606605
wgTags.AddTag("Uber User", "henry.wu")
@@ -648,7 +647,7 @@ func TestConnection_CachedQuery(t *testing.T) {
648647
athenaAPI: newMockAthenaClient(),
649648
connector: NoopsSQLConnector(),
650649
}
651-
var s3bucket string = "s3://query-results-henry-wu-us-east-2/"
650+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/"
652651
testConf := NewNoOpsConfig()
653652
err := testConf.SetOutputBucket(s3bucket)
654653
assert.Nil(t, err)
@@ -670,7 +669,7 @@ func Test_PseudoCommand(t *testing.T) {
670669
athenaAPI: newMockAthenaClient(),
671670
connector: NoopsSQLConnector(),
672671
}
673-
var s3bucket string = "s3://query-results-henry-wu-us-east-2/"
672+
var s3bucket string = "s3://fake-query-results-arbitrary-bucket/"
674673

675674
wgTags := NewWGTags()
676675
wgTags.AddTag("Uber User", "henry.wu")

‎go/driver_test.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ import (
2828
)
2929

3030
func TestDriver(t *testing.T) {
31-
// The Amazon S3 bucket query-results-henry-wu-us-east-2 has been compromised, and should not be used.
32-
// dsn := "s3://henry.wu%40uber.com:@query-results-henry-wu-us-east-2?db=default&" +
33-
// "region=us-east-1&workgroup_config=%7B%0A++BytesScannedCutoffPerQuery%3A+1073741824%2C%0A++Enfo" +
34-
// "rceWorkGroupConfiguration%3A+true%2C%0A++PublishCloudWatchMetricsEnabled%3A+true%2C%0A++Reques" +
35-
// "terPaysEnabled%3A+false%0A%7D&workgroupName=henry_wu"
36-
31+
dsn := "s3://henry.wu%40uber.com:@fake-query-results-arbitrary-bucket?db=default&" +
32+
"region=us-east-1&workgroup_config=%7B%0A++BytesScannedCutoffPerQuery%3A+1073741824%2C%0A++Enfo" +
33+
"rceWorkGroupConfiguration%3A+true%2C%0A++PublishCloudWatchMetricsEnabled%3A+true%2C%0A++Reques" +
34+
"terPaysEnabled%3A+false%0A%7D&workgroupName=henry_wu"
3735
pDB, err := sql.Open(DriverName, dsn)
3836
assert.Nil(t, err)
3937
assert.NotNil(t, pDB)

0 commit comments

Comments
 (0)