Skip to content

Commit

Permalink
chore: remove integrations (#898)
Browse files Browse the repository at this point in the history
* chore: remove integration deployments

* chore: pnpm i

* chore: rm integrations from dockerfile

* chore: remove integration code and tables (#899)

* remove integration code and tables

* fix: add missing export

* chore: remove legacy integration reference

* chore: remove references to sdk package

* Tfk/remove integrations code (#901)

* fix: remove integration reference from dockerfile

* fix: generate more up to date types

* fix: remove integration files from db

* fix: remove integration instances from test file

* fix: remove integration fetching code

* fix: remove ref to integrations in comment for tokens

* fix: remove ref to integration in authentication readme

* fix: remove ref to integrations in comment on api contracts

* fix: remove integration exports from db

* fix: remove integration table types from db package

* fix: remove unecessary swagger file

* chore: remove integrations ref from dev script

---------

Co-authored-by: Thomas F. K. Jorna <[email protected]>

---------

Co-authored-by: Thomas F. K. Jorna <[email protected]>

* chore: remove intg urls from blake

---------

Co-authored-by: Thomas F. K. Jorna <[email protected]>
  • Loading branch information
3mcd and tefkah authored Jan 15, 2025
1 parent 4ab09a8 commit 5e73a85
Show file tree
Hide file tree
Showing 167 changed files with 401 additions and 9,745 deletions.
24 changes: 0 additions & 24 deletions .github/workflows/awsdeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,27 +67,3 @@ jobs:
secrets:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

deploy-intg-submissions:
uses: ./.github/workflows/deploy-template.yml
needs: deploy-core
with:
service: integration-submissions
environment: ${{ inputs.environment }}
proper-name: ${{ inputs.proper-name }}
image-tag-override: ${{ inputs.image-tag-override }}
secrets:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

deploy-intg-evaluations:
uses: ./.github/workflows/deploy-template.yml
needs: deploy-core
with:
service: integration-evaluations
environment: ${{ inputs.environment }}
proper-name: ${{ inputs.proper-name }}
image-tag-override: ${{ inputs.image-tag-override }}
secrets:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
20 changes: 0 additions & 20 deletions .github/workflows/ecrbuild-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,6 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

build-intg-submissions:
uses: ./.github/workflows/ecrbuild-template.yml
# needs:
# - build-base
with:
package: integration-submissions
secrets:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

build-jobs:
uses: ./.github/workflows/ecrbuild-template.yml
# needs:
Expand All @@ -63,13 +53,3 @@ jobs:
secrets:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

build-intg-evaluations:
uses: ./.github/workflows/ecrbuild-template.yml
# needs:
# - build-base
with:
package: integration-evaluations
secrets:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
28 changes: 1 addition & 27 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ CMD pnpm start
# where the necessary files are copied from the build stage.
# this is separated by package to make it slightly more clear what happens
# and because you cannot conditionally copy from a different folder
# based on the argument (because e.g. `integration-submissions` does not match `integrations/submissions`, so we can't just use PACKAGE as the arg)
# we do the condiiton instead by doing a conditional $FROM
# based on the argument
FROM base as prod-setup
ARG PORT

Expand Down Expand Up @@ -133,28 +132,3 @@ COPY --from=withpackage --chown=node:node /usr/src/app/core/public ./core/public
COPY --from=withpackage --chown=node:node /usr/src/app/core/.env.docker ./core/.env

CMD node core/server.js

### Integration Submissions

FROM prod-setup AS next-app-integration-submissions
WORKDIR /usr/src/app
COPY --from=withpackage --chown=node:node /usr/src/app/integrations/submissions/.next/standalone .
COPY --from=withpackage --chown=node:node /usr/src/app/integrations/submissions/.next/static ./integrations/submissions/.next/static
COPY --from=withpackage --chown=node:node /usr/src/app/integrations/submissions/public ./integrations/submissions/public
# needed to set the database url correctly based on PGHOST variables
COPY --from=withpackage --chown=node:node /usr/src/app/core/.env.docker ./integrations/submissions/.env

CMD node integrations/submissions/server.js

### Integration Evaluations

FROM prod-setup AS next-app-integration-evaluations
WORKDIR /usr/src/app
COPY --from=withpackage --chown=node:node /usr/src/app/integrations/evaluations/.next/standalone ./
COPY --from=withpackage --chown=node:node /usr/src/app/integrations/evaluations/.next/static ./integrations/evaluations/.next/static
COPY --from=withpackage --chown=node:node /usr/src/app/integrations/evaluations/public ./integrations/evaluations/public
# needed to set the database url correctly based on PGHOST variables
COPY --from=withpackage --chown=node:node /usr/src/app/core/.env.docker ./integrations/evaluations/.env

CMD node integrations/evaluations/server.js

2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,13 @@ This repo is built as a monorepo that holds first-party components of PubPub. Th
root
├── core/
├── infrastructure/
├── integrations/ (deprecated)
├── jobs/
├── packages/
└── ...
```

- `core` holds the primary web application.
- `infrastructure` holds the deployment infrastructure for the centrally hosted version of PubPub Platform run by the Knowledge Futures team.
- `integrations` (deprecated) holds the integrations developed by the PubPub team. This will be removed in the near future.
- `jobs` holds the job queueing and scheduling service used by `core`.
- `packages` holds libraries and npm packages that are shared by `core`, `jobs`, and `infrastructure`.

Expand Down
77 changes: 0 additions & 77 deletions core/app/api/v0/integrations/[...ts-rest]/_requests.http

This file was deleted.

174 changes: 0 additions & 174 deletions core/app/api/v0/integrations/[...ts-rest]/route.ts

This file was deleted.

Loading

0 comments on commit 5e73a85

Please sign in to comment.