Skip to content

Commit 567d60e

Browse files
committed
Reapply "refactor: remove AWS dynamo integration (#407)"
This reverts commit bebd53b.
1 parent cac4bac commit 567d60e

File tree

8 files changed

+6
-690
lines changed

8 files changed

+6
-690
lines changed

.github/workflows/ci.yml

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

1818
---
19-
2019
name: CI
2120

2221
concurrency:
@@ -100,8 +99,8 @@ jobs:
10099
AWS_SECRET_ACCESS_KEY: test
101100
AWS_ENDPOINT: http://localhost:4566
102101
AWS_ALLOW_HTTP: true
103-
AWS_COPY_IF_NOT_EXISTS: dynamo:test-table:2000
104-
AWS_CONDITIONAL_PUT: dynamo:test-table:2000
102+
AWS_COPY_IF_NOT_EXISTS: multipart
103+
AWS_CONDITIONAL_PUT: etag
105104
AWS_SERVER_SIDE_ENCRYPTION: aws:kms
106105
HTTP_URL: "http://localhost:8080"
107106
GOOGLE_BUCKET: test-bucket
@@ -132,7 +131,6 @@ jobs:
132131
aws --endpoint-url=http://localhost:4566 s3 mb s3://test-bucket-for-spawn
133132
aws --endpoint-url=http://localhost:4566 s3 mb s3://test-bucket-for-checksum
134133
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
136134
137135
KMS_KEY=$(aws --endpoint-url=http://localhost:4566 kms create-key --description "test key")
138136
echo "AWS_SSE_KMS_KEY_ID=$(echo $KMS_KEY | jq -r .KeyMetadata.KeyId)" >> $GITHUB_ENV

src/aws/builder.rs

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

11501150
let config = S3Config {
11511151
region,
1152-
endpoint: self.endpoint,
11531152
bucket,
11541153
bucket_endpoint,
11551154
credentials,

src/aws/client.rs

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

0 commit comments

Comments
 (0)