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/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.
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.