From 0dd116a09f2b432f57c3dc70ab3d817f39efd189 Mon Sep 17 00:00:00 2001 From: Ivan Fraixedes Date: Wed, 12 Apr 2023 16:44:33 +0200 Subject: [PATCH] uplink(chore): Bump versions of storj-up services Bump the versions of the storj-up satellite and edge to match the last published tag version. Uncomment an end-to-end test assertion that was commented because the previous satellite version had a bug and it made the test not pass. Instruction in one of the Makefile recipes had to be adjusted to work with the new images. Also, fix a few typos in test assertion messages. --- Makefile | 2 +- docker-compose.yaml | 18 +++++++++--------- uplink/tests/uploads_test.rs | 12 +++++------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index e24feb0..feb7232 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/docker-compose.yaml b/docker-compose.yaml index f0c787b..086a7c5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/uplink/tests/uploads_test.rs b/uplink/tests/uploads_test.rs index 3cdad6e..943d484 100644 --- a/uplink/tests/uploads_test.rs +++ b/uplink/tests/uploads_test.rs @@ -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"); @@ -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. @@ -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()) @@ -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()) @@ -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