Merge pull request #4487 from sul-dlss/cocina-etd-fileset-change

update openapi.yml and gems: remove vestigial ETD specific FileSet types

Gemfile

@@ -6,7 +6,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gem 'rails', '~> 7.0'
 
 # DLSS/domain-specific dependencies
-gem 'cocina-models', '~> 0.89.0'
+gem 'cocina-models', '~> 0.90.0'
 gem 'datacite', '~> 0.3.0'
 gem 'dor-workflow-client', '~> 5.0'
 gem 'druid-tools', '~> 2.2'

Gemfile.lock

@@ -103,7 +103,7 @@ GEM
       capistrano-bundler (>= 1.1, < 3)
     capistrano-shared_configs (0.2.2)
     chronic (0.10.2)
-    cocina-models (0.89.1)
+    cocina-models (0.90.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -490,7 +490,7 @@ DEPENDENCIES
   capistrano-passenger
   capistrano-rails
   capistrano-shared_configs
-  cocina-models (~> 0.89.0)
+  cocina-models (~> 0.90.0)
   committee (~> 4.4)
   config
   datacite (~> 0.3.0)

openapi.yml

@@ -2306,14 +2306,10 @@ components:
             - 'https://cocina.sul.stanford.edu/models/resources/document'
             - 'https://cocina.sul.stanford.edu/models/resources/file'
             - 'https://cocina.sul.stanford.edu/models/resources/image'
-            - 'https://cocina.sul.stanford.edu/models/resources/main-augmented'
-            - 'https://cocina.sul.stanford.edu/models/resources/main-original'
             - 'https://cocina.sul.stanford.edu/models/resources/media'
             - 'https://cocina.sul.stanford.edu/models/resources/object'
             - 'https://cocina.sul.stanford.edu/models/resources/page'
-            - 'https://cocina.sul.stanford.edu/models/resources/permissions'
             - 'https://cocina.sul.stanford.edu/models/resources/preview'
-            - 'https://cocina.sul.stanford.edu/models/resources/supplement'
             - 'https://cocina.sul.stanford.edu/models/resources/3d'
             - 'https://cocina.sul.stanford.edu/models/resources/thumb'
             - 'https://cocina.sul.stanford.edu/models/resources/video'
@@ -2991,14 +2987,10 @@ components:
             - 'https://cocina.sul.stanford.edu/models/resources/document'
             - 'https://cocina.sul.stanford.edu/models/resources/file'
             - 'https://cocina.sul.stanford.edu/models/resources/image'
-            - 'https://cocina.sul.stanford.edu/models/resources/main-augmented'
-            - 'https://cocina.sul.stanford.edu/models/resources/main-original'
             - 'https://cocina.sul.stanford.edu/models/resources/media'
             - 'https://cocina.sul.stanford.edu/models/resources/object'
             - 'https://cocina.sul.stanford.edu/models/resources/page'
-            - 'https://cocina.sul.stanford.edu/models/resources/permissions'
             - 'https://cocina.sul.stanford.edu/models/resources/preview'
-            - 'https://cocina.sul.stanford.edu/models/resources/supplement'
             - 'https://cocina.sul.stanford.edu/models/resources/3d'
             - 'https://cocina.sul.stanford.edu/models/resources/thumb'
             - 'https://cocina.sul.stanford.edu/models/resources/video'

spec/services/migrators/etd_fileset_vocab_spec.rb

@@ -74,7 +74,7 @@
   let(:permissions_file_name) { 'permissions.txt' }
   let(:permissions_fileset) do
     {
-      type: Cocina::Models::FileSetType.permissions,
+      type: 'https://cocina.sul.stanford.edu/models/resources/permissions',
       externalIdentifier: "https://cocina.sul.stanford.edu/fileSet/#{matching_druid}-permissions",
       label: 'Body of Dissertation',
       version: 1,
@@ -105,7 +105,7 @@
   let(:supplement_file_name) { 'supplement.txt' }
   let(:supplement_fileset) do
     {
-      type: Cocina::Models::FileSetType.supplement,
+      type: 'https://cocina.sul.stanford.edu/models/resources/supplement',
       externalIdentifier: "https://cocina.sul.stanford.edu/fileSet/#{matching_druid}-supplement",
       label: 'Body of Dissertation',
       version: 1,