Merge pull request #2884 from nulib/deploy/staging

Deploy v5.1.2 to production

.github/workflows/build.yml

@@ -121,10 +121,6 @@ jobs:
           --health-retries 5
         ports:
           - 5434:5432
-      goaws:
-        image: nulib/goaws
-        ports:
-          - 4102:4100
       ldap:
         image: nulib/ldap-alpine
         ports:
@@ -136,25 +132,30 @@ jobs:
           ELASTICSEARCH_HEAP_SIZE: "256m"
         ports:
           - 9202:9200
-      minio:
-        image: bitnami/minio
+      localstack:
+        image: localstack/localstack
         env:
-          MINIO_ROOT_USER: minio
-          MINIO_ROOT_PASSWORD: minio123
-          MINIO_ACCESS_KEY: minio
-          MINIO_SECRET_KEY: minio123
-          MINIO_NOTIFY_WEBHOOK_ENABLE_checksum: on
-          MINIO_NOTIFY_WEBHOOK_ENDPOINT_checksum: http://minio-checksum:8000/fixity
+          DNS_ADDRESS: 127.0.0.1
+          EDGE_PORT: 4568
+          EDGE_PORT_HTTP: 4568
+          LAMBDA_EXECUTOR: local
+          LOCALSTACK_API_KEY: ${{ secrets.LOCALSTACK_API_KEY }}
         ports:
-          - 9002:9000
-      minio-checksum:
-        image: nulib/minio-checksum
-        env:
-          AWS_ACCESS_KEY_ID: minio
-          AWS_SECRET_ACCESS_KEY: minio123
-          AWS_S3_ENDPOINT: http://minio:9000/
+          - 4568:4568
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
+        with:
+          repository: 'nulib/devstack'
+          ref: main
+          path: '.devstack'
+      - uses: hashicorp/setup-terraform@v1
+      - name: Provision Localstack resources
+        run: .devstack/bin/devstack -t provision meadow
+        env:
+          AWS_DEFAULT_REGION: us-east-1
+          AWS_ACCESS_KEY_ID: fake
+          AWS_SECRET_ACCESS_KEY: fake
       - uses: actions/setup-node@v2
         with:
           node-version: "14"

.gitignore

@@ -69,4 +69,6 @@ yarn.lock
 /assets/yarn-error.log
 
 .DS_Store
-**/*/.DS_Store
+**/*/.DS_Store
+localstack/.terraform
+localstack/terraform.tfstate.d

Localstack S3.duck

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Protocol</key>
+	<string>s3</string>
+	<key>Provider</key>
+	<string>s3-https</string>
+	<key>Nickname</key>
+	<string>Localstack S3</string>
+	<key>UUID</key>
+	<string>f7fedad5-d8cd-4165-a617-b1c3bc3edf8d</string>
+	<key>Hostname</key>
+	<string>localhost.localstack.cloud</string>
+	<key>Port</key>
+	<string>4566</string>
+	<key>Username</key>
+	<string>fake</string>
+	<key>Access Timestamp</key>
+	<string>1643041454095</string>
+	<key>Labels</key>
+	<array>
+	</array>
+</dict>
+</plist>

README.md

@@ -78,15 +78,12 @@ The task `mix meadow.ldap.setup [seed_file ...]` will seed the LDAP database usi
 - Start test devstack: `devstack -t up meadow`
 - run `mix test`
 
-### Amazon s3/Minio
+### Accessing S3 Buckets in Development
 
-See your local "s3" buckets.
+[Localstack](https://localstack.cloud), which we use to emulate Amazon S3 (and other services) in the development environment, does not have a full-featured S3 web UI, so it's necessary to use a utility like the [LocalStack AWS Command Line Interface](https://github.com/localstack/awscli-local) or [Cyberduck](https://cyberduck.io). There is a [Cyberduck Shortcut](Localstack%20S3.duck) in the root of this repository that will configure the app the connect to the S3 dev instance.
 
-- Dev: `https://devbox.library.northwestern.edu:9001/`
-- Test: `https://devbox.library.northwestern.edu:9002/`
+*Note*: You may receive “incomplete transfer” warnings when uploading files through Cyberduck. This appears to be a bug in Cyberduck, and can be safely ignored. If you click the refresh icon in the main window after upload, you should see the uploaded files.
 
-**Login**: minio
-**Password**: minio123
 
 ### GraphQL API
 

assets/js/components/Work/work.gql.js

@@ -461,7 +461,7 @@ export const UPDATE_WORK = gql`
 export const INGEST_FILE_SET = gql`
   mutation IngestFileSet(
     $accession_number: String!
-    $role: FileSetRole!
+    $role: CodedTermInput!
     $coreMetadata: FileSetCoreMetadataInput!
     $workId: ID!
   ) {

assets/js/components/Work/work.gql.mock.js

@@ -30,7 +30,7 @@ export const mockWork = {
     visibility: mockVisibility,
   },
   collection: {
-    id: "1287312378238293126321308",
+    id: "7a6c7b35-41a6-465a-9be2-0587c6b39ae0",
     title: "Collection 1232432 Name",
   },
   descriptiveMetadata: {