Cleanup

.env

@@ -58,7 +58,6 @@ CONFIGS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION=0.35.15.001
 ### AIRBYTE SERVICES ###
 TEMPORAL_HOST=airbyte-temporal:7233
 INTERNAL_API_HOST=airbyte-server:8001
-INTERNAL_MICRONAUT_API_HOST=airbyte-server:8080
 CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:80
 WEBAPP_URL=http://localhost:8000/
 # Although not present as an env var, required for webapp configuration.

airbyte-api/src/main/java/io/airbyte/api/client/AirbyteApiClient.java

@@ -60,21 +60,21 @@ public class AirbyteApiClient {
   private final AttemptApi attemptApi;
   private final StateApi stateApi;
 
-  public AirbyteApiClient(final ApiClient apiClient, final ApiClient micronautApiClient) {
-    connectionApi = new ConnectionApi(micronautApiClient);
-    destinationDefinitionApi = new DestinationDefinitionApi(micronautApiClient);
-    destinationApi = new DestinationApi(micronautApiClient);
-    destinationSpecificationApi = new DestinationDefinitionSpecificationApi(micronautApiClient);
-    jobsApi = new JobsApi(micronautApiClient);
-    logsApi = new PatchedLogsApi(micronautApiClient);
-    operationApi = new OperationApi(micronautApiClient);
-    sourceDefinitionApi = new SourceDefinitionApi(micronautApiClient);
-    sourceApi = new SourceApi(micronautApiClient);
-    sourceDefinitionSpecificationApi = new SourceDefinitionSpecificationApi(micronautApiClient);
-    workspaceApi = new WorkspaceApi(micronautApiClient);
-    healthApi = new HealthApi(micronautApiClient);
-    attemptApi = new AttemptApi(micronautApiClient);
-    stateApi = new StateApi(micronautApiClient);
+  public AirbyteApiClient(final ApiClient apiClient) {
+    connectionApi = new ConnectionApi(apiClient);
+    destinationDefinitionApi = new DestinationDefinitionApi(apiClient);
+    destinationApi = new DestinationApi(apiClient);
+    destinationSpecificationApi = new DestinationDefinitionSpecificationApi(apiClient);
+    jobsApi = new JobsApi(apiClient);
+    logsApi = new PatchedLogsApi(apiClient);
+    operationApi = new OperationApi(apiClient);
+    sourceDefinitionApi = new SourceDefinitionApi(apiClient);
+    sourceApi = new SourceApi(apiClient);
+    sourceDefinitionSpecificationApi = new SourceDefinitionSpecificationApi(apiClient);
+    workspaceApi = new WorkspaceApi(apiClient);
+    healthApi = new HealthApi(apiClient);
+    attemptApi = new AttemptApi(apiClient);
+    stateApi = new StateApi(apiClient);
   }
 
   public ConnectionApi getConnectionApi() {

airbyte-proxy/nginx-auth.conf.template

@@ -25,40 +25,6 @@ http {
         auth_basic off;
       }
     }
-
-    location ~ ^/api/v1/(health|openapi) {
-      proxy_set_header Host $host;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      auth_basic "Welcome to Airbyte";
-      auth_basic_user_file /etc/nginx/.htpasswd;
-
-      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
-
-      error_page 401 /etc/nginx/401.html;
-      location ~ (401.html)$ {
-        alias /etc/nginx/$1;
-        auth_basic off;
-      }
-    }
-
-    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_definition_specifications|destination_oauths|jobs|logs|notifications|operations|scheduler|source_oauths|sources|source_definitions|source_definition_specifications|state|web_backend|workspaces)/.* {
-      proxy_set_header Host $host;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      auth_basic "Welcome to Airbyte";
-      auth_basic_user_file /etc/nginx/.htpasswd;
-
-      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
-
-      error_page 401 /etc/nginx/401.html;
-      location ~ (401.html)$ {
-        alias /etc/nginx/$1;
-        auth_basic off;
-      }
-    }
   }
 
   server {
@@ -85,40 +51,6 @@ http {
         auth_basic off;
       }
     }
-
-    location ~ ^/api/v1/(health|openapi) {
-      proxy_set_header Host $host;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      auth_basic "Welcome to Airbyte";
-      auth_basic_user_file /etc/nginx/.htpasswd;
-
-      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
-
-      error_page 401 /etc/nginx/401.html;
-      location ~ (401.html)$ {
-        alias /etc/nginx/$1;
-        auth_basic off;
-      }
-    }
-
-    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_definition_specifications|destination_oauths|jobs|logs|notifications|operations|scheduler|source_oauths|sources|source_definitions|source_definition_specifications|state|web_backend|workspaces)/.* {
-      proxy_set_header Host $host;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      auth_basic "Welcome to Airbyte";
-      auth_basic_user_file /etc/nginx/.htpasswd;
-
-      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
-
-      error_page 401 /etc/nginx/401.html;
-      location ~ (401.html)$ {
-        alias /etc/nginx/$1;
-        auth_basic off;
-      }
-    }
   }
 
   server {

airbyte-proxy/nginx-no-auth.conf.template

@@ -16,22 +16,6 @@ http {
       proxy_read_timeout          ${BASIC_AUTH_PROXY_TIMEOUT};
       send_timeout                ${BASIC_AUTH_PROXY_TIMEOUT};
     }
-
-    location ~ ^/api/v1/(health|openapi) {
-      proxy_set_header Host $host;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
-    }
-
-    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_definition_specifications|destination_oauths|jobs|logs|notifications|operations|scheduler|source_oauths|sources|source_definitions|source_definition_specifications|state|web_backend|workspaces)/.* {
-      proxy_set_header Host $host;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
-    }
   }
 
   server {
@@ -49,22 +33,6 @@ http {
       proxy_read_timeout          ${BASIC_AUTH_PROXY_TIMEOUT};
       send_timeout                ${BASIC_AUTH_PROXY_TIMEOUT};
     }
-
-    location ~ ^/api/v1/(health|openapi) {
-      proxy_set_header Host $host;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
-    }
-
-    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_definition_specifications|destination_oauths|jobs|logs|notifications|operations|scheduler|source_oauths|sources|source_definitions|source_definition_specifications|state|web_backend|workspaces)/.* {
-      proxy_set_header Host $host;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      proxy_pass "${PROXY_PASS_MICRONAUT_API}";
-    }
   }
 
   server {