Skip to content

Commit 0ab3e53

Browse files
- Bucket locations working for real.
1 parent c94ceef commit 0ab3e53

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

test/python/stackql_test_tooling/flask/aws/app.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,14 @@ def _extract_request_region(request: Request) -> str:
216216
def handle_root_requests():
217217
return generic_handler(request)
218218

219+
@app.route('/stackql-trial-bucket-01', methods=["GET"])
220+
def handle_object_list_requests():
221+
return generic_handler(request)
222+
223+
@app.route('/stackql-trial-bucket-02', methods=["GET"])
224+
def handle_object_list2_requests():
225+
return generic_handler(request)
226+
219227
@app.route('/2013-04-01/hostedzone/<rrset_id>/rrset/', methods=['POST', 'GET'])
220228
def handle_rrset_requests(rrset_id: str):
221229
return generic_handler(request)

test/python/stackql_test_tooling/flask/aws/root_path_cfg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
},
251251
"GET:/:10": {
252252
"method": "GET",
253-
"path": "/",
253+
"path": "/stackql-trial-bucket-01",
254254
"queryStringParameters": {
255255
"max-keys": [ "1000" ]
256256
},
@@ -286,7 +286,7 @@
286286
},
287287
"GET:/:12": {
288288
"method": "GET",
289-
"path": "/",
289+
"path": "/stackql-trial-bucket-01",
290290
"queryStringParameters": {
291291
"location": [ "" ]
292292
},

test/python/stackql_test_tooling/stackql_context.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -678,10 +678,10 @@ def generate_password() -> str:
678678
SELECT_AZURE_COMPUTE_VIRTUAL_MACHINES_JSON_EXPECTED = get_json_from_local_file(os.path.join('test', 'assets', 'expected', 'azure', 'compute', 'vm-list.json'))
679679
SELECT_AZURE_COMPUTE_BILLING_ACCOUNTS_JSON_EXPECTED = get_json_from_local_file(os.path.join('test', 'assets', 'expected', 'azure', 'billing', 'billing-account-list.json'))
680680

681-
SELECT_AWS_S3_BUCKET_LOCATIONS = "select LocationConstraint from aws.s3.bucket_locations where region = 'ap-southeast-1' and bucket = 'stackql-trial-bucket-01';"
681+
SELECT_AWS_S3_BUCKET_LOCATIONS = "select LocationConstraint from aws.s3.bucket_locations where region = 'ap-southeast-1' and Bucket = 'stackql-trial-bucket-01';"
682682
SELECT_AWS_S3_BUCKETS = "select Name, CreationDate from aws.s3.buckets where region = 'ap-southeast-1' order by Name ASC;"
683-
SELECT_AWS_S3_OBJECTS = "select \"Key\", Size, StorageClass from aws.s3.objects where region = 'ap-southeast-1' and bucket = 'stackql-trial-bucket-01' order by \"Key\" ASC;"
684-
SELECT_AWS_S3_OBJECTS_NULL = "select \"Key\", Size, StorageClass from aws.s3.objects where region = 'ap-southeast-2' and bucket = 'stackql-trial-bucket-02' order by \"Key\" ASC;"
683+
SELECT_AWS_S3_OBJECTS = "select \"Key\", Size, StorageClass from aws.s3.objects where region = 'ap-southeast-1' and Bucket = 'stackql-trial-bucket-01' order by \"Key\" ASC;"
684+
SELECT_AWS_S3_OBJECTS_NULL = "select \"Key\", Size, StorageClass from aws.s3.objects where region = 'ap-southeast-2' and Bucket = 'stackql-trial-bucket-02' order by \"Key\" ASC;"
685685
SELECT_AWS_EC2_VPN_GATEWAYS_NULL = "select vpnGatewayId, amazonSideAsn from aws.ec2.vpn_gateways where region = 'ap-southeast-1' order by vpnGatewayId ASC;"
686686
SELECT_AWS_VOLUMES = "select volumeId, encrypted, size from aws.ec2.volumes where region = 'ap-southeast-1' order by volumeId asc;"
687687
SELECT_AWS_IAM_USERS_ASC = "select UserName, Arn from aws.iam.users WHERE region = 'us-east-1' order by UserName ASC;"

test/registry/src/aws/v0.1.0/services/s3.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4833,6 +4833,12 @@ paths:
48334833
required: true
48344834
schema:
48354835
$ref: '#/components/schemas/BucketName'
4836+
- name: x-amz-content-sha256
4837+
in: header
4838+
required: false
4839+
schema:
4840+
type: string
4841+
default: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
48364842
- name: x-amz-expected-bucket-owner
48374843
in: header
48384844
required: false
@@ -6515,10 +6521,9 @@ paths:
65156521
parameters:
65166522
- name: region
65176523
in: query
6518-
# required: true
6524+
required: true
65196525
schema:
65206526
type: string
6521-
default: us-east-1
65226527
- name: x-amz-content-sha256
65236528
in: header
65246529
required: false

0 commit comments

Comments
 (0)