Disable Wasabi in Registry

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

.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

.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
 
 

.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
 
 

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

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

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

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

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"),
 		},
 	}

common/config_test.go

@@ -202,7 +202,6 @@ var expectedConfigJson = `{
   "RetentionMinimum": {
     "Glacier": 90,
     "GlacierDeep": 180,
-    "Wasabi": 90,
     "Standard": 0
   },
   "BatchDeletionKey": "****key",

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{

docs/sample_pages/Dashboard.html

@@ -297,8 +297,7 @@ <h2>Deposits by Storage Option</h2>
  var data = {
      labels: [
          'Standard',
-         'Glacier-VA',
-         'Wasabi-OR'
+         'Glacier-VA'
      ],
      datasets: [{
          label: '',

docs/sample_pages/WorkItems.html

@@ -353,12 +353,6 @@
 
                 <option value="Standard">Standard</option>
 
-                <option value="Wasabi-OR">Wasabi - Oregon</option>
-
-                <option value="Wasabi-TX">Wasabi - Texas</option>
-
-                <option value="Wasabi-VA">Wasabi - Virginia</option>
-
               </select>
             </label>
 

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
 }
 

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{

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.

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

views/files/_request_restore.html

@@ -12,7 +12,7 @@ <h2>Restore File</h2>
   <div class="modal-content">
     <p class="mb-3">This file will be restored to your institution's receiving bucket and you'll receive an email at {{ .CurrentUser.Email }} when it's ready.</p>
 
-    <p class="mb-5">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.</p>
+    <p class="mb-5">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.</p>
 
     <div class="is-flex">
         <button class="button modal-exit mr-5">Cancel</button>

views/objects/_request_restore.html

@@ -12,7 +12,7 @@ <h2>Restore Object</h2>
   <div class="modal-content">
     <p class="mb-3">This object will be restored to your institution's receiving bucket and you'll receive an email at {{ .CurrentUser.Email }} when it's ready.</p>
 
-    <p class="mb-5">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.</p>
+    <p class="mb-5">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.</p>
 
     <div class="is-flex">
         <button class="button modal-exit mr-5">Cancel</button>

web/webui/reports_controller_test.go

@@ -55,12 +55,9 @@ func TestDepositReportShow(t *testing.T) {
 		"Institution Two</td>",
 		"Test Institution (for integration tests)</td>",
 		"Standard</td>",
-		"Wasabi-OR</td>",
-		"Wasabi-VA</td>",
 		"Glacier-OR</td>",
 		"Glacier-Deep-OH</td>",
 		"Glacier-Deep-VA</td>",
-		"Wasabi-OR</td>",
 		"Total</td>",
 	}