Skip to content

Commit bebd53b

Browse files
committed
Revert "refactor: remove AWS dynamo integration (apache#407)"
This reverts commit 034733f.
1 parent ebfd02f commit bebd53b

File tree

8 files changed

+690
-6
lines changed

8 files changed

+690
-6
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# under the License.
1717

1818
---
19+
1920
name: CI
2021

2122
concurrency:
@@ -99,8 +100,8 @@ jobs:
99100
AWS_SECRET_ACCESS_KEY: test
100101
AWS_ENDPOINT: http://localhost:4566
101102
AWS_ALLOW_HTTP: true
102-
AWS_COPY_IF_NOT_EXISTS: multipart
103-
AWS_CONDITIONAL_PUT: etag
103+
AWS_COPY_IF_NOT_EXISTS: dynamo:test-table:2000
104+
AWS_CONDITIONAL_PUT: dynamo:test-table:2000
104105
AWS_SERVER_SIDE_ENCRYPTION: aws:kms
105106
HTTP_URL: "http://localhost:8080"
106107
GOOGLE_BUCKET: test-bucket
@@ -131,6 +132,7 @@ jobs:
131132
aws --endpoint-url=http://localhost:4566 s3 mb s3://test-bucket-for-spawn
132133
aws --endpoint-url=http://localhost:4566 s3 mb s3://test-bucket-for-checksum
133134
aws --endpoint-url=http://localhost:4566 s3api create-bucket --bucket test-object-lock --object-lock-enabled-for-bucket
135+
aws --endpoint-url=http://localhost:4566 dynamodb create-table --table-name test-table --key-schema AttributeName=path,KeyType=HASH AttributeName=etag,KeyType=RANGE --attribute-definitions AttributeName=path,AttributeType=S AttributeName=etag,AttributeType=S --provisioned-throughput ReadCapacityUnits=5,WriteCapacityUnits=5
134136
135137
KMS_KEY=$(aws --endpoint-url=http://localhost:4566 kms create-key --description "test key")
136138
echo "AWS_SSE_KMS_KEY_ID=$(echo $KMS_KEY | jq -r .KeyMetadata.KeyId)" >> $GITHUB_ENV

src/aws/builder.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,6 +1149,7 @@ impl AmazonS3Builder {
11491149

11501150
let config = S3Config {
11511151
region,
1152+
endpoint: self.endpoint,
11521153
bucket,
11531154
bucket_endpoint,
11541155
credentials,

src/aws/client.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ impl From<DeleteError> for Error {
193193
#[derive(Debug)]
194194
pub(crate) struct S3Config {
195195
pub region: String,
196+
pub endpoint: Option<String>,
196197
pub bucket: String,
197198
pub bucket_endpoint: String,
198199
pub credentials: AwsCredentialProvider,

0 commit comments

Comments
 (0)