Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

uplink(chore): Bump versions of storj-up services #56

Closed
wants to merge 1 commit into from
Closed

uplink(chore): Bump versions of storj-up services #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ integration-tests-env-down:
# than localhost and then it doesn't resolve.
# See: https://github.com/storj/up/issues/45#issuecomment-1288808260
@docker compose exec -T satellite-api storj-up credentials --s3 -e \
-a http://authservice:8888 -s satellite-api \
-a http://authservice:8888 -s satellite-api:7777 \
| grep -E 'AWS|STORJ_GATEWAY' >> .tmp/env

.tmp/up/storj-up: .tmp/up
Expand Down
18 changes: 9 additions & 9 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
STORJ_METRICS_APP_SUFFIX: sim
STORJ_ROLE: authservice
STORJ_WAIT_FOR_SATELLITE: "true"
image: img.dev.storj.io/storjup/edge:1.39.0
image: img.dev.storj.io/storjup/edge:1.50.0
networks:
default: null
ports:
Expand Down Expand Up @@ -60,7 +60,7 @@ services:
STORJ_METRICS_APP_SUFFIX: sim
STORJ_SERVER_ADDRESS: 0.0.0.0:9999
STORJ_WAIT_FOR_SATELLITE: "true"
image: img.dev.storj.io/storjup/edge:1.39.0
image: img.dev.storj.io/storjup/edge:1.50.0
networks:
default: null
ports:
Expand All @@ -82,7 +82,7 @@ services:
STORJ_DEBUG_ADDR: 0.0.0.0:11111
STORJ_PUBLIC_URL: http://linksharing:9090,http://localhost:9090
STORJ_WAIT_FOR_SATELLITE: "true"
image: img.dev.storj.io/storjup/edge:1.39.0
image: img.dev.storj.io/storjup/edge:1.50.0
networks:
default: null
ports:
Expand Down Expand Up @@ -123,7 +123,7 @@ services:
STORJ_PAYMENTS_STORJSCAN_ENDPOINT: http://storjscan:12000
STORJ_ROLE: satellite-admin
STORJ_WAIT_FOR_SATELLITE: "true"
image: img.dev.storj.io/storjup/storj:1.65.1
image: img.dev.storj.io/storjup/storj:1.74.1
networks:
default: null
ports:
Expand Down Expand Up @@ -173,7 +173,7 @@ services:
STORJ_SERVER_REVOCATION_DBURL: redis://redis:6379?db=1
STORJ_SERVER_USE_PEER_CA_WHITELIST: "false"
STORJ_WAIT_FOR_DB: "true"
image: img.dev.storj.io/storjup/storj:1.65.1
image: img.dev.storj.io/storjup/storj:1.74.1
networks:
default: null
ports:
Expand Down Expand Up @@ -213,7 +213,7 @@ services:
STORJ_PAYMENTS_STORJSCAN_ENDPOINT: http://storjscan:12000
STORJ_ROLE: satellite-core
STORJ_WAIT_FOR_SATELLITE: "true"
image: img.dev.storj.io/storjup/storj:1.65.1
image: img.dev.storj.io/storjup/storj:1.74.1
networks:
default: null
storagenode:
Expand Down Expand Up @@ -242,7 +242,7 @@ services:
STORJ_STORAGE_ALLOCATED_DISK_SPACE: 1G
STORJ_VERSION_SERVER_ADDRESS: http://versioncontrol:8080/
STORJ_WAIT_FOR_SATELLITE: "true"
image: img.dev.storj.io/storjup/storj:1.65.1
image: img.dev.storj.io/storjup/storj:1.74.1
networks:
default: null
uplink:
Expand All @@ -251,7 +251,7 @@ services:
- infinity
environment:
STORJ_ROLE: uplink
image: img.dev.storj.io/storjup/storj:1.65.1
image: img.dev.storj.io/storjup/storj:1.74.1
networks:
default: null
versioncontrol:
Expand All @@ -272,7 +272,7 @@ services:
STORJ_DEFAULTS: dev
STORJ_LOG_LEVEL: debug
STORJ_METRICS_APP_SUFFIX: sim
image: img.dev.storj.io/storjup/storj:1.65.1
image: img.dev.storj.io/storjup/storj:1.74.1
networks:
default: null
ports:
Expand Down
12 changes: 5 additions & 7 deletions uplink/tests/uploads_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,7 @@ fn integration_upload_multipart_commit() {
.next()
.expect("an item in the uploads list")
.expect("a pending upload");
// TODO(https://github.com/storj-thirdparty/uplink-rust/issues/50) uncomment the following
// assertion.
// assert_eq!(upload_info.upload_id, item.upload_id, "pending upload key");
assert_eq!(upload_info.upload_id, item.upload_id, "pending upload key");
assert_eq!(object_multipart_key, item.key, "pending upload key");
assert!(!item.is_prefix, "pending upload is prefix");
assert!(it.next().is_none(), "only one pending upload in the list");
Expand All @@ -144,7 +142,7 @@ fn integration_upload_multipart_commit() {
)
.expect("upload part 1");
part.write_all(&data[data.len() / 2..])
.expect("write data mutipart 1");
.expect("write data multipart 1");
part.commit().expect("commit multipart 1");

// List parts of the multipart pending upload.
Expand Down Expand Up @@ -180,7 +178,7 @@ fn integration_upload_multipart_commit() {
)
.expect("upload part 0");
part.write_all(&data[..data.len() / 2])
.expect("write data mutipart 0");
.expect("write data multipart 0");

let etag = "this-is-its-etag";
part.set_etag(etag.as_bytes())
Expand Down Expand Up @@ -303,7 +301,7 @@ fn integration_upload_multipart_abort_and_list_parts_cursor() {
)
.expect("upload part 0");
part.write_all(&data[..data.len() / 2])
.expect("write data mutipart 0");
.expect("write data multipart 0");

let etag = "this-is-its-etag";
part.set_etag(etag.as_bytes())
Expand All @@ -319,7 +317,7 @@ fn integration_upload_multipart_abort_and_list_parts_cursor() {
)
.expect("upload part 1");
part.write_all(&data[data.len() / 2..])
.expect("write data mutipart 1");
.expect("write data multipart 1");
part.commit().expect("commit multipart 1");

// List parts of the multipart pending upload using cursor, so only one of the parts should be
Expand Down