chore: remove integration deployments

pubpub · Jan 14, 2025 · a1c5175 · a1c5175
1 parent b114bd2
commit a1c5175
Show file tree

Hide file tree

Showing 17 changed files with 0 additions and 378 deletions.
diff --git a/.github/workflows/awsdeploy.yml b/.github/workflows/awsdeploy.yml
@@ -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 }}
diff --git a/.github/workflows/ecrbuild-all.yml b/.github/workflows/ecrbuild-all.yml
@@ -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:
@@ -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 }}
diff --git a/Dockerfile b/Dockerfile
@@ -157,4 +157,3 @@ COPY --from=withpackage --chown=node:node /usr/src/app/integrations/evaluations/
 COPY --from=withpackage --chown=node:node /usr/src/app/core/.env.docker ./integrations/evaluations/.env
 
 CMD node integrations/evaluations/server.js
-
diff --git a/core/app/api/v0/integrations/[...ts-rest]/_requests.http b/core/app/api/v0/integrations/[...ts-rest]/_requests.http
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -61,76 +61,6 @@ services:
     # jobs-nginx:
     # No Nginx for jobs, because it does not take requests
 
-    integration-evaluations:
-        build:
-            context: .
-            args:
-                - PACKAGE=integration-evaluations
-        container_name: integration-evaluations
-        env_file: ./.env.docker-compose
-        environment:
-            - SENTRY_AUTH_TOKEN=omitted
-
-            - OTEL_SERVICE_NAME=integration-evaluations.integration-evaluations
-            - PUBPUB_URL=http://localhost:8080
-        depends_on:
-            - core
-        networks:
-            - app-network
-        ports:
-            - "30001:3000"
-
-    integration-evaluations-nginx:
-        build: ./infrastructure/nginx
-        container_name: integration-evaluations-nginx
-        environment:
-            - NGINX_LISTEN_PORT=8080
-            - NGINX_PREFIX=/
-            - NGINX_UPSTREAM_HOST=integration-evaluations
-            - NGINX_UPSTREAM_PORT=3000
-            - OTEL_SERVICE_NAME=integration-evaluations.nginx
-        depends_on:
-            - integration-evaluations
-        networks:
-            - app-network
-        ports:
-            - "3001:8080"
-
-    integration-submissions:
-        build:
-            context: .
-            args:
-                - PACKAGE=integration-submissions
-        container_name: integration-submissions
-        env_file: ./.env.docker-compose
-        environment:
-            - SENTRY_AUTH_TOKEN=omitted
-
-            - OTEL_SERVICE_NAME=integration-submissions.integration-submissions
-            - PUBPUB_URL=http://localhost:8080
-        depends_on:
-            - core
-        networks:
-            - app-network
-        ports:
-            - "30002:3000"
-
-    integration-submissions-nginx:
-        build: ./infrastructure/nginx
-        container_name: integration-submissions-nginx
-        environment:
-            - NGINX_LISTEN_PORT=8080
-            - NGINX_PREFIX=/
-            - NGINX_UPSTREAM_HOST=integration-submissions
-            - NGINX_UPSTREAM_PORT=3000
-            - OTEL_SERVICE_NAME=integration-submissions.nginx
-        depends_on:
-            - integration-submissions
-        networks:
-            - app-network
-        ports:
-            - "3002:8080"
-
     db:
         extends:
             file: docker-compose.base.yml

diff --git a/infrastructure/terraform/environments/stevie/main.tf b/infrastructure/terraform/environments/stevie/main.tf
@@ -43,8 +43,6 @@ locals {
   route53_zone_id = "Z00255803PJ09HVWNKPVY"
   ecr_repository_urls = {
     core             = "246372085946.dkr.ecr.us-east-1.amazonaws.com/pubpub-v7-core"
-    intg_evaluations = "246372085946.dkr.ecr.us-east-1.amazonaws.com/pubpub-v7-integration-evaluations"
-    intg_submissions = "246372085946.dkr.ecr.us-east-1.amazonaws.com/pubpub-v7-integration-submissions"
     jobs             = "246372085946.dkr.ecr.us-east-1.amazonaws.com/pubpub-v7-jobs"
     nginx            = "246372085946.dkr.ecr.us-east-1.amazonaws.com/nginx"
     root             = "246372085946.dkr.ecr.us-east-1.amazonaws.com/pubpub-v7"

diff --git a/infrastructure/terraform/modules/deployment/main.tf b/infrastructure/terraform/modules/deployment/main.tf
@@ -145,74 +145,6 @@ module "service_flock" {
   }
 }
 
-module "service_intg_submissions" {
-  source = "../container-generic"
-
-  service_name = "integration-submissions"
-  cluster_info = module.cluster.cluster_info
-
-  repository_url = var.ecr_repository_urls.intg_submissions
-  nginx_image    = "${var.ecr_repository_urls.nginx}:latest"
-
-  listener = {
-    service_name = "submissions"
-    public       = true
-    path_prefix  = "/intg/submissions/"
-    # lower number means this will be evaluated BEFORE the catch-all to core.
-    rule_priority = 80
-    from_port     = 3000
-    to_port       = 3000
-    protocol      = "tcp"
-  }
-
-  configuration = {
-    environment = [
-      { name = "PUBPUB_URL", value = local.PUBPUB_URL },
-      { name = "HOSTNAME", value = var.HOSTNAME },
-    ]
-
-    secrets = [
-      { name = "SENTRY_AUTH_TOKEN", valueFrom = module.core_dependency_services.secrets.sentry_auth_token },
-      { name = "API_KEY", valueFrom = module.core_dependency_services.secrets.api_key },
-      { name = "HONEYCOMB_API_KEY", valueFrom = module.core_dependency_services.secrets.honeycomb_api_key },
-    ]
-  }
-}
-
-module "service_intg_evaluations" {
-  source = "../container-generic"
-
-  service_name = "integration-evaluations"
-  cluster_info = module.cluster.cluster_info
-
-  repository_url = var.ecr_repository_urls.intg_evaluations
-  nginx_image    = "${var.ecr_repository_urls.nginx}:latest"
-
-  listener = {
-    service_name = "evaluations"
-    public       = true
-    path_prefix  = "/intg/evaluations/"
-    # these may not be equal, so just set it adjacent to non-conflicting rule for submissions
-    rule_priority = 81
-    from_port     = 3000
-    to_port       = 3000
-    protocol      = "tcp"
-  }
-
-  configuration = {
-    environment = [
-      { name = "PUBPUB_URL", value = local.PUBPUB_URL },
-      { name = "HOSTNAME", value = var.HOSTNAME },
-    ]
-
-    secrets = [
-      { name = "SENTRY_AUTH_TOKEN", valueFrom = module.core_dependency_services.secrets.sentry_auth_token },
-      { name = "API_KEY", valueFrom = module.core_dependency_services.secrets.api_key },
-      { name = "HONEYCOMB_API_KEY", valueFrom = module.core_dependency_services.secrets.honeycomb_api_key },
-    ]
-  }
-}
-
 module "service_bastion" {
   source = "../container-generic"
 

diff --git a/infrastructure/terraform/modules/deployment/variables.tf b/infrastructure/terraform/modules/deployment/variables.tf
@@ -28,8 +28,6 @@ variable "ecr_repository_urls" {
   description = "URLs for ECR repositories created at a global level"
   type = object({
     core             = string
-    intg_evaluations = string
-    intg_submissions = string
     jobs             = string
     nginx            = string
     root             = string

diff --git a/infrastructure/terraform/modules/ecr-repositories/main.tf b/infrastructure/terraform/modules/ecr-repositories/main.tf
@@ -30,24 +30,6 @@ resource "aws_ecr_repository" "pubpub_v7_core" {
   }
 }
 
-resource "aws_ecr_repository" "pubpub_v7_intg_submissions" {
-  name                 = "pubpub-v7-integration-submissions"
-  image_tag_mutability = "MUTABLE"
-
-  image_scanning_configuration {
-    scan_on_push = false # can set this to true if we want
-  }
-}
-
-resource "aws_ecr_repository" "pubpub_v7_intg_evaluations" {
-  name                 = "pubpub-v7-integration-evaluations"
-  image_tag_mutability = "MUTABLE"
-
-  image_scanning_configuration {
-    scan_on_push = false # can set this to true if we want
-  }
-}
-
 resource "aws_ecr_repository" "pubpub_v7_jobs" {
   name                 = "pubpub-v7-jobs"
   image_tag_mutability = "MUTABLE"

diff --git a/infrastructure/terraform/modules/ecr-repositories/outputs.tf b/infrastructure/terraform/modules/ecr-repositories/outputs.tf
@@ -1,8 +1,6 @@
 output "ecr_repository_urls" {
   value = {
     core             = aws_ecr_repository.pubpub_v7_core.repository_url
-    intg_evaluations = aws_ecr_repository.pubpub_v7_intg_evaluations.repository_url
-    intg_submissions = aws_ecr_repository.pubpub_v7_intg_submissions.repository_url
     jobs             = aws_ecr_repository.pubpub_v7_jobs.repository_url
     nginx            = aws_ecr_repository.nginx.repository_url
     root             = aws_ecr_repository.pubpub_v7.repository_url

diff --git a/integrations/evaluations-proxy/Dockerfile b/integrations/evaluations-proxy/Dockerfile
diff --git a/integrations/evaluations-proxy/nginx.conf b/integrations/evaluations-proxy/nginx.conf
diff --git a/integrations/evaluations-proxy/package.json b/integrations/evaluations-proxy/package.json
diff --git a/integrations/submissions-proxy/Dockerfile b/integrations/submissions-proxy/Dockerfile
Original file line number	Diff line number	Diff line change
Expand Up		@@ -157,4 +157,3 @@ COPY --from=withpackage --chown=node:node /usr/src/app/integrations/evaluations/
		COPY --from=withpackage --chown=node:node /usr/src/app/core/.env.docker ./integrations/evaluations/.env

		CMD node integrations/evaluations/server.js