From 081d46a9a16803631173e2d63c359c7a6dbd893a Mon Sep 17 00:00:00 2001 From: Melissa Iori Date: Wed, 17 Sep 2025 06:41:22 -0400 Subject: [PATCH 1/2] Starting to remove Wasabi references --- views/files/_request_restore.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/files/_request_restore.html b/views/files/_request_restore.html index 2efe0c24..59a70885 100644 --- a/views/files/_request_restore.html +++ b/views/files/_request_restore.html @@ -12,7 +12,7 @@

Restore File

This file will be restored to your institution's receiving bucket and you'll receive an email at {{ .CurrentUser.Email }} when it's ready.

-

Restoration times vary. Large files take longer than smaller files. Items restored from Glacier and Glacier Deep Archive take longer than items restored from S3 and Wasabi.

+

Restoration times vary. Large files take longer than smaller files. Items restored from Glacier and Glacier Deep Archive take longer than items restored from S3.

From fe4fdd29f2d02625058f7b08854675f7bd875164 Mon Sep 17 00:00:00 2001 From: Melissa Iori Date: Wed, 3 Dec 2025 12:26:11 -0500 Subject: [PATCH 2/2] Removed almost all references to Wasabi in Registry except for tests and fixture data --- .env.dev | 1 - .env.docker | 1 - .env.integration | 1 - .env.test | 1 - .env.travis | 1 - Dockerfile.multi | 1 - cfn/cfn-registry-cluster.tmpl | 2 -- cfn/cfn-registry-cluster.yml | 2 -- common/config.go | 4 ---- common/config_test.go | 1 - constants/constants.go | 6 ------ docs/sample_pages/Dashboard.html | 3 +-- docs/sample_pages/WorkItems.html | 6 ------ forms/file_filter_form_test.go | 2 +- forms/lists.go | 3 --- member_api_v3.yml | 14 +++++++------- notes.md | 3 +-- views/objects/_request_restore.html | 2 +- web/webui/reports_controller_test.go | 3 --- 19 files changed, 11 insertions(+), 46 deletions(-) diff --git a/.env.dev b/.env.dev index 3f0bf936..48311f6c 100644 --- a/.env.dev +++ b/.env.dev @@ -146,7 +146,6 @@ REDIS_URL="localhost:6379" # RETENTION_MINIMUM_GLACIER=90 RETENTION_MINIMUM_GLACIER_DEEP=180 -RETENTION_MINIMUM_WASABI=90 RETENTION_MINIMUM_STANDARD=0 # diff --git a/.env.docker b/.env.docker index 12deb36c..3fbef952 100644 --- a/.env.docker +++ b/.env.docker @@ -50,7 +50,6 @@ # REDIS_URL # RETENTION_MINIMUM_GLACIER # RETENTION_MINIMUM_GLACIER_DEEP -# RETENTION_MINIMUM_WASABI # RETENTION_MINIMUM_STANDARD # SESSION_COOKIE_NAME # SESSION_MAX_AGE diff --git a/.env.integration b/.env.integration index f6b9a628..0ab2d84c 100644 --- a/.env.integration +++ b/.env.integration @@ -147,7 +147,6 @@ REDIS_URL="localhost:6379" # RETENTION_MINIMUM_GLACIER=90 RETENTION_MINIMUM_GLACIER_DEEP=180 -RETENTION_MINIMUM_WASABI=90 RETENTION_MINIMUM_STANDARD=0 diff --git a/.env.test b/.env.test index 982eea56..2c3ba1fc 100644 --- a/.env.test +++ b/.env.test @@ -148,7 +148,6 @@ REDIS_URL="localhost:6379" # RETENTION_MINIMUM_GLACIER=90 RETENTION_MINIMUM_GLACIER_DEEP=180 -RETENTION_MINIMUM_WASABI=90 RETENTION_MINIMUM_STANDARD=0 diff --git a/.env.travis b/.env.travis index 0dd7013f..a4451269 100644 --- a/.env.travis +++ b/.env.travis @@ -147,7 +147,6 @@ REDIS_URL="localhost:6379" # RETENTION_MINIMUM_GLACIER=90 RETENTION_MINIMUM_GLACIER_DEEP=180 -RETENTION_MINIMUM_WASABI=90 RETENTION_MINIMUM_STANDARD=0 # diff --git a/Dockerfile.multi b/Dockerfile.multi index ac2f2a40..4b281f45 100644 --- a/Dockerfile.multi +++ b/Dockerfile.multi @@ -93,7 +93,6 @@ ENV AWS_SNS_PWD=password #Storage retention periods. ENV RETENTION_MINIMUM_GLACIER=0 ENV RETENTION_MINIMUM_GLACIER_DEEP=0 -ENV RETENTION_MINIMUM_WASABI=0 ENV RETENTION_MINIMUM_STANDARD=0 # Making a note for a new dockerfile test. EXPOSE 8080 diff --git a/cfn/cfn-registry-cluster.tmpl b/cfn/cfn-registry-cluster.tmpl index 3b7d0d96..d8a4fb5b 100644 --- a/cfn/cfn-registry-cluster.tmpl +++ b/cfn/cfn-registry-cluster.tmpl @@ -292,8 +292,6 @@ Resources: ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER' - Name: RETENTION_MINIMUM_GLACIER_DEEP ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER_DEEP' - - Name: RETENTION_MINIMUM_WASABI - ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_WASABI' - Name: RETENTION_MINIMUM_STANDARD ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_STANDARD' - Name: AWS_SNS_USER diff --git a/cfn/cfn-registry-cluster.yml b/cfn/cfn-registry-cluster.yml index 8c6e5eba..857e4b81 100644 --- a/cfn/cfn-registry-cluster.yml +++ b/cfn/cfn-registry-cluster.yml @@ -292,8 +292,6 @@ Resources: ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER' - Name: RETENTION_MINIMUM_GLACIER_DEEP ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER_DEEP' - - Name: RETENTION_MINIMUM_WASABI - ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_WASABI' - Name: RETENTION_MINIMUM_STANDARD ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_STANDARD' - Name: AWS_SNS_USER diff --git a/common/config.go b/common/config.go index ccdbb71c..7a91510d 100644 --- a/common/config.go +++ b/common/config.go @@ -108,7 +108,6 @@ type RedisConfig struct { type RetentionMinimum struct { Glacier int GlacierDeep int - Wasabi int Standard int } @@ -122,8 +121,6 @@ func (rm *RetentionMinimum) For(storageOption string) int { days = rm.GlacierDeep case constants.StorageOptionGlacierOH, constants.StorageOptionGlacierOR, constants.StorageOptionGlacierVA: days = rm.Glacier - case constants.StorageOptionWasabiOR, constants.StorageOptionWasabiVA: - days = rm.Wasabi case constants.StorageOptionStandard: days = rm.Standard default: @@ -301,7 +298,6 @@ func loadConfig() *Config { RetentionMinimum: &RetentionMinimum{ Glacier: v.GetInt("RETENTION_MINIMUM_GLACIER"), GlacierDeep: v.GetInt("RETENTION_MINIMUM_GLACIER_DEEP"), - Wasabi: v.GetInt("RETENTION_MINIMUM_WASABI"), Standard: v.GetInt("RETENTION_MINIMUM_STANDARD"), }, } diff --git a/common/config_test.go b/common/config_test.go index 150b8191..8aa0bd4a 100644 --- a/common/config_test.go +++ b/common/config_test.go @@ -202,7 +202,6 @@ var expectedConfigJson = `{ "RetentionMinimum": { "Glacier": 90, "GlacierDeep": 180, - "Wasabi": 90, "Standard": 0 }, "BatchDeletionKey": "****key", diff --git a/constants/constants.go b/constants/constants.go index 3f31cfb3..4287373d 100644 --- a/constants/constants.go +++ b/constants/constants.go @@ -118,9 +118,6 @@ const ( StorageOptionGlacierOR = "Glacier-OR" StorageOptionGlacierVA = "Glacier-VA" StorageOptionStandard = "Standard" - StorageOptionWasabiOR = "Wasabi-OR" - StorageOptionWasabiTX = "Wasabi-TX" - StorageOptionWasabiVA = "Wasabi-VA" SystemUser = "system@aptrust.org" TopicDelete = "delete_item" TopicE2EDelete = "e2e_deletion_post_test" @@ -276,9 +273,6 @@ var StorageOptions = []string{ StorageOptionGlacierOR, StorageOptionGlacierVA, StorageOptionStandard, - StorageOptionWasabiOR, - StorageOptionWasabiTX, - StorageOptionWasabiVA, } var UserActions = []string{ diff --git a/docs/sample_pages/Dashboard.html b/docs/sample_pages/Dashboard.html index 02eb4566..5bba3221 100644 --- a/docs/sample_pages/Dashboard.html +++ b/docs/sample_pages/Dashboard.html @@ -297,8 +297,7 @@

Deposits by Storage Option

var data = { labels: [ 'Standard', - 'Glacier-VA', - 'Wasabi-OR' + 'Glacier-VA' ], datasets: [{ label: '', diff --git a/docs/sample_pages/WorkItems.html b/docs/sample_pages/WorkItems.html index dccb21cc..d2c0a729 100644 --- a/docs/sample_pages/WorkItems.html +++ b/docs/sample_pages/WorkItems.html @@ -353,12 +353,6 @@ - - - - - - diff --git a/forms/file_filter_form_test.go b/forms/file_filter_form_test.go index 01da780c..70e555d1 100644 --- a/forms/file_filter_form_test.go +++ b/forms/file_filter_form_test.go @@ -22,7 +22,7 @@ func getFileFilters() *pgmodels.FilterCollection { fc.Add("state", []string{constants.StateActive}) fc.Add("size__gteq", []string{"100"}) fc.Add("size__lteq", []string{"500"}) - fc.Add("storage_option", []string{constants.StorageOptionGlacierDeepOR, constants.StorageOptionWasabiVA}) + fc.Add("storage_option", []string{constants.StorageOptionGlacierDeepOR}) return fc } diff --git a/forms/lists.go b/forms/lists.go index 428fe180..f45a7e81 100644 --- a/forms/lists.go +++ b/forms/lists.go @@ -73,9 +73,6 @@ var StorageOptionList = []*ListOption{ {constants.StorageOptionGlacierOR, "Glacier - Oregon", false}, {constants.StorageOptionGlacierVA, "Glacier - Virginia", false}, {constants.StorageOptionStandard, "Standard", false}, - {constants.StorageOptionWasabiOR, "Wasabi - Oregon", false}, - {constants.StorageOptionWasabiTX, "Wasabi - Texas", false}, - {constants.StorageOptionWasabiVA, "Wasabi - Virginia", false}, } var TwoFactorMethodList = []*ListOption{ diff --git a/member_api_v3.yml b/member_api_v3.yml index 4664f289..0b2ade0f 100644 --- a/member_api_v3.yml +++ b/member_api_v3.yml @@ -333,7 +333,7 @@ components: storage_option: type: string description: Indicates where the file is stored. - enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard", "Wasabi-OR", "Wasabi-TX", "Wasabi-VA"] + enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard"] uuid: type: string format: uuid @@ -409,7 +409,7 @@ components: storage_option: type: string description: Indicates where the file is stored. - enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard", "Wasabi-OR", "Wasabi-TX", "Wasabi-VA"] + enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard"] uuid: type: string format: uuid @@ -505,7 +505,7 @@ components: storage_option: type: string description: Indicates where the object's files are stored. - enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard", "Wasabi-OR", "Wasabi-TX", "Wasabi-VA"] + enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard"] bagit_profile_identifier: type: string description: The identifier of the BagIt profile used to create this bag. This can be either the APTrust profile URL or the BTR profile URL. Bags will be restored using the same profile under which they were submitted. @@ -923,7 +923,7 @@ components: storage_option: type: string description: Indicates where the object's files are stored. - enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard", "Wasabi-OR", "Wasabi-TX", "Wasabi-VA"] + enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard"] updated_at: type: string format: date-time @@ -1390,7 +1390,7 @@ paths: required: false schema: type: string - enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard", "Wasabi-OR", "Wasabi-TX", "Wasabi-VA"] + enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard"] - name: updated_at__gteq in: query description: Return files updated on or after the given timestamp. @@ -1625,7 +1625,7 @@ paths: required: false schema: type: string - enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard", "Wasabi-OR", "Wasabi-TX", "Wasabi-VA"] + enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard"] - name: updated_at__gteq in: query description: Return objects updated on or after the given timestamp. @@ -2098,7 +2098,7 @@ paths: required: false schema: type: string - enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard", "Wasabi-OR", "Wasabi-TX", "Wasabi-VA"] + enum: ["Glacier-Deep-OH", "Glacier-Deep-OR", "Glacier-Deep-VA", "Glacier-OH", "Glacier-OR", "Glacier-VA", "Standard"] - name: user in: query description: Return work items initiated by the specified user. diff --git a/notes.md b/notes.md index 20d34ab4..8b621193 100644 --- a/notes.md +++ b/notes.md @@ -341,7 +341,6 @@ The term "items" below refers to Intellectual Objects, Generic Files, Checksums, * ingest and restoration services * interim processing data in redis * AWS (IAM, S3 and Glacier) - * Wasabi # Two Factor Authentication @@ -371,7 +370,7 @@ Depositors and APTrust should be able to get reports on demand describing: * byte count * by institution * totals for member + subaccounts -* deposits by storage type (standard, glacier, glacier-deep, wasabi - this report can be use to calculate billing) +* deposits by storage type (standard, glacier, glacier-deep - this report can be use to calculate billing) * deposits by region and technology * show deleted objects/files/bytes and (ideally) when those items were deleted, and by whom * cost breakdown diff --git a/views/objects/_request_restore.html b/views/objects/_request_restore.html index 43ffd733..7dd2978c 100644 --- a/views/objects/_request_restore.html +++ b/views/objects/_request_restore.html @@ -12,7 +12,7 @@

Restore Object

This object will be restored to your institution's receiving bucket and you'll receive an email at {{ .CurrentUser.Email }} when it's ready.

-

Restoration times vary. Large objects take longer than smaller objects. Items restored from Glacier and Glacier Deep Archive take longer than items restored in S3 and Wasabi.

+

Restoration times vary. Large objects take longer than smaller objects. Items restored from Glacier and Glacier Deep Archive take longer than items restored in S3.

diff --git a/web/webui/reports_controller_test.go b/web/webui/reports_controller_test.go index 1242ef4a..1a4ffe98 100644 --- a/web/webui/reports_controller_test.go +++ b/web/webui/reports_controller_test.go @@ -55,12 +55,9 @@ func TestDepositReportShow(t *testing.T) { "Institution Two", "Test Institution (for integration tests)", "Standard", - "Wasabi-OR", - "Wasabi-VA", "Glacier-OR", "Glacier-Deep-OH", "Glacier-Deep-VA", - "Wasabi-OR", "Total", }