Remove Amazon AWS S3 code

rnc · rnc · commit 2901e230c421 · 2024-10-21T15:53:09.000+01:00
diff --git a/java-components/cache/src/main/java/com/redhat/hacbs/artifactcache/services/RemoteRepositoryManager.java b/java-components/cache/src/main/java/com/redhat/hacbs/artifactcache/services/RemoteRepositoryManager.java
@@ -30,10 +30,8 @@ public class RemoteRepositoryManager {
     private static final String STORE = "store.";
     private static final String URL = ".url";
     private static final String TYPE = ".type";
-    private static final String BUCKET = ".bucket";
     private static final String REGISTRY = ".registry";
     private static final String OWNER = ".owner";
-    private static final String PREFIXES = ".prefixes";
 
     private static final String TOKEN = ".token";
     private static final String PREPEND_TAG = ".prepend-tag";
diff --git a/java-components/management-console/src/main/java/com/redhat/hacbs/management/importer/DependencyBuildImporter.java b/java-components/management-console/src/main/java/com/redhat/hacbs/management/importer/DependencyBuildImporter.java
@@ -29,9 +29,6 @@
 @ApplicationScoped
 public class DependencyBuildImporter {
 
-    @ConfigProperty(name = "bucket.name")
-    String s3Bucket;
-
     @ConfigProperty(name = "MAVEN_REPOSITORY")
     Optional<String> mavenRepo;
 
@@ -72,10 +69,6 @@ public void doImport(DependencyBuild dependencyBuild) {
             storedBuild = new StoredDependencyBuild();
             storedBuild.buildIdentifier = identifier;
         }
-        if (s3Bucket != null) {
-            storedBuild.buildYamlUrl = "s3://" + s3Bucket + "/builds/" + dependencyBuild.getMetadata().getName() + "/"
-                    + dependencyBuild.getMetadata().getUid() + ".yaml";
-        }
         storedBuild.succeeded = !failed;
         storedBuild.contaminated = contaminated;
         storedBuild.version = spec.getVersion();
@@ -84,15 +77,6 @@ public void doImport(DependencyBuild dependencyBuild) {
             storedBuild.buildAttempts = new ArrayList<>();
         }
 
-        if (s3Bucket != null) {
-            //todo we just assume the logs are present
-            storedBuild.buildDiscoveryUrl = "s3://" + s3Bucket + "/build-logs/" + dependencyBuild.getMetadata().getName() + "/"
-                    + dependencyBuild.getMetadata().getUid()
-                    + "/build-discovery.log";
-            storedBuild.deployLogsUrl = "s3://" + s3Bucket + "/build-logs/" + dependencyBuild.getMetadata().getName() + "/"
-                    + dependencyBuild.getMetadata().getUid()
-                    + "/deploy.log";
-        }
         if (dependencyBuild.getStatus().getBuildAttempts() != null) {
             for (var i : dependencyBuild.getStatus().getBuildAttempts()) {
                 BuildAttempt attempt = null;
@@ -147,15 +131,6 @@ public void doImport(DependencyBuild dependencyBuild) {
                     Log.infof("Set maven repo to %s", finalAttempt.mavenRepository);
                 }
 
-                if (s3Bucket != null) {
-                    //todo we just assume the logs are present
-                    attempt.buildLogsUrl = "s3://" + s3Bucket + "/build-logs/" + dependencyBuild.getMetadata().getName() + "/"
-                            + dependencyBuild.getMetadata().getUid()
-                            + "/" + i.getBuild().getPipelineName() + ".log";
-                    attempt.buildPipelineUrl = "s3://" + s3Bucket + "/build-pipelines/"
-                            + dependencyBuild.getMetadata().getName()
-                            + "/" + dependencyBuild.getMetadata().getUid() + "/" + i.getBuild().getPipelineName() + ".yaml";
-                }
                 attempt.diagnosticDockerFile = i.getBuild().getDiagnosticDockerFile();
                 if (i.getBuild().getStartTime() != null) {
                     attempt.startTime = Instant.ofEpochSecond(i.getBuild().getStartTime());
diff --git a/java-components/management-console/src/main/java/com/redhat/hacbs/management/model/BuildAttempt.java b/java-components/management-console/src/main/java/com/redhat/hacbs/management/model/BuildAttempt.java
@@ -51,7 +51,6 @@ public class BuildAttempt extends PanacheEntity {
     @Column(length = -1)
     public String allowedDifferences;
 
-    public String buildLogsUrl;
     public String buildPipelineUrl;
 
     public String mavenRepository;
diff --git a/java-components/management-console/src/main/java/com/redhat/hacbs/management/model/StoredDependencyBuild.java b/java-components/management-console/src/main/java/com/redhat/hacbs/management/model/StoredDependencyBuild.java
@@ -34,16 +34,10 @@ public class StoredDependencyBuild extends PanacheEntity {
 
     public String version;
 
-    public String buildYamlUrl;
-
     public boolean succeeded;
 
     public boolean contaminated;
 
-    public String buildDiscoveryUrl;
-
-    public String deployLogsUrl;
-
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "dependencyBuild")
     @OrderBy("startTime desc")
     public List<BuildAttempt> buildAttempts;
diff --git a/java-components/management-console/src/main/java/com/redhat/hacbs/management/resources/AdminResource.java b/java-components/management-console/src/main/java/com/redhat/hacbs/management/resources/AdminResource.java
@@ -11,7 +11,6 @@
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 
-import com.redhat.hacbs.management.importer.S3Importer;
 import com.redhat.hacbs.management.model.AdditionalDownload;
 import com.redhat.hacbs.management.model.BuildAttempt;
 import com.redhat.hacbs.management.model.BuildQueue;
@@ -39,9 +38,6 @@ public class AdminResource {
     @Inject
     KubernetesClient kubernetesClient;
 
-    @Inject
-    S3Importer s3Importer;
-
     @POST
     @Path("rebuild-all")
     public void rebuildAll() {
@@ -76,12 +72,6 @@ public void clearBuildQueue() {
         BuildQueue.deleteAll();
     }
 
-    @POST
-    @Path("import-froms3")
-    public void s3Import() {
-        s3Importer.doImport();
-    }
-
     @POST
     @Path("clean-out-database")
     public void cleanOutDatabase() {
diff --git a/java-components/management-console/src/main/java/com/redhat/hacbs/management/resources/BuildAttemptResource.java b/java-components/management-console/src/main/java/com/redhat/hacbs/management/resources/BuildAttemptResource.java
@@ -23,6 +23,6 @@ public Response logs(@PathParam("name") String name) {
         if (attempt == null) {
             throw new NotFoundException();
         }
-        return extractLog(Type.BUILD, attempt.buildLogsUrl, attempt.dependencyBuild.buildIdentifier.dependencyBuildName);
+        return extractLog(Type.BUILD, attempt.dependencyBuild.buildIdentifier.dependencyBuildName);
     }
 }
diff --git a/java-components/management-console/src/main/java/com/redhat/hacbs/management/resources/BuildHistoryResource.java b/java-components/management-console/src/main/java/com/redhat/hacbs/management/resources/BuildHistoryResource.java
@@ -164,7 +164,7 @@ public Response logs(@PathParam("name") String name) {
         if (attempt == null) {
             throw new NotFoundException();
         }
-        return extractLog(Type.DISCOVERY, attempt.buildDiscoveryUrl, attempt.buildIdentifier.dependencyBuildName);
+        return extractLog(Type.DISCOVERY, attempt.buildIdentifier.dependencyBuildName);
     }
 
     @GET
@@ -174,7 +174,7 @@ public Response deploylogs(@PathParam("name") String name) {
         if (attempt == null) {
             throw new NotFoundException();
         }
-        return extractLog(Type.DEPLOY, attempt.deployLogsUrl, attempt.buildIdentifier.dependencyBuildName);
+        return extractLog(Type.DEPLOY, attempt.buildIdentifier.dependencyBuildName);
     }
 
     private StoredDependencyBuild getDependencyBuild(String name) {
diff --git a/java-components/management-console/src/main/java/com/redhat/hacbs/management/resources/BuildLogs.java b/java-components/management-console/src/main/java/com/redhat/hacbs/management/resources/BuildLogs.java
@@ -1,20 +1,22 @@
 package com.redhat.hacbs.management.resources;
 
+import java.util.LinkedHashSet;
+import java.util.Map;
+
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
 import com.redhat.hacbs.common.tools.completer.BuildCompleter;
 import com.redhat.hacbs.common.tools.logging.LogExtractor;
 import com.redhat.hacbs.resources.model.v1alpha1.DependencyBuild;
+
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.openshift.api.model.Route;
 import io.fabric8.openshift.api.model.RouteSpec;
 import io.fabric8.openshift.client.OpenShiftClient;
 import io.fabric8.tekton.pipeline.v1beta1.PipelineRun;
 import io.quarkus.arc.Arc;
 import io.quarkus.logging.Log;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-
-import java.util.LinkedHashSet;
-import java.util.Map;
 
 public class BuildLogs {
 
@@ -28,32 +30,7 @@ protected enum Type {
 
     private static final String PROD_PATH = "/api/k8s/plugins/tekton-results/workspaces/";
 
-//    @ConfigProperty(name = "jbs.s3.sync.enabled", defaultValue = "true")
-    boolean s3 = false;
-
-    protected Response extractLog(Type logType, String s3LogUri, String id) {
-        if (s3) {
-//            URI uri = URI.create(s3LogUri);
-//            try {
-//                InputStream stream = s3Client.getObject(b -> {
-//                    String path = uri.getPath().substring(1);
-//                    String bucket = uri.getHost();
-//                    Log.infof("requesting logs %s from bucket %s", path, bucket);
-//                    b.bucket(bucket).key(path);
-//                });
-//
-//                return Response.ok(stream, MediaType.TEXT_PLAIN_TYPE).build();
-//            } catch (SdkClientException e) {
-//                Log.error("Unable to retrieve logs via AWS S3 ; falling back to Tekton-Results retrieval", e);
-//
-//                return alternateLogging(logType, id);
-//            }
-        } else {
-            return alternateLogging(logType, id);
-        }
-    }
-
-    protected Response alternateLogging(Type logType, String id) {
+    protected Response extractLog(Type logType, String id) {
         var client = Arc.container().instance(OpenShiftClient.class).get();
         DependencyBuild theBuild;
         Map<String, DependencyBuild> names = BuildCompleter.createNames();
diff --git a/java-components/management-console/src/main/resources/application.properties b/java-components/management-console/src/main/resources/application.properties
@@ -10,7 +10,6 @@ quarkus.jib.user=0
 
 # Dev Config
 %dev.quarkus.kubernetes-client.trust-certs=true
-bucket.name=jvm-build-service-data
 concurrent-builds=10
 %test.concurrent-builds=8
 %test.quarkus.kubernetes-client.trust-certs=true
diff --git a/java-components/management-console/src/main/webui/src/app/ControlPanel/ControlPanel.tsx b/java-components/management-console/src/main/webui/src/app/ControlPanel/ControlPanel.tsx
@@ -34,12 +34,7 @@ const ControlPanel: React.FunctionComponent = () => {
           </Button>
         </ActionListItem>
         <ActionListItem>
-          <Button variant="warning" id="s3-import" onClick={AdminResourceService.postApiAdminImportFroms3}>
-            S3 Import
-          </Button>
-        </ActionListItem>
-        <ActionListItem>
-          <Button variant="warning" id="s3-import" onClick={AdminResourceService.postApiAdminClearBuildQueue}>
+          <Button variant="warning" id="clear-queue" onClick={AdminResourceService.postApiAdminClearBuildQueue}>
             Clear Build Queue
           </Button>
         </ActionListItem>
diff --git a/java-components/management-console/src/main/webui/src/services/openapi/services/AdminResourceService.ts b/java-components/management-console/src/main/webui/src/services/openapi/services/AdminResourceService.ts
@@ -26,16 +26,6 @@ export class AdminResourceService {
             url: '/api/admin/clear-build-queue',
         });
     }
-    /**
-     * @returns any Created
-     * @throws ApiError
-     */
-    public static postApiAdminImportFroms3(): CancelablePromise<any> {
-        return __request(OpenAPI, {
-            method: 'POST',
-            url: '/api/admin/import-froms3',
-        });
-    }
     /**
      * @returns any Created
      * @throws ApiError

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ public Response logs(@PathParam("name") String name) {`
`23`	`23`	`if (attempt == null) {`
`24`	`24`	`throw new NotFoundException();`
`25`	`25`	`}`
`26`		`- return extractLog(Type.BUILD, attempt.buildLogsUrl, attempt.dependencyBuild.buildIdentifier.dependencyBuildName);`
	`26`	`+ return extractLog(Type.BUILD, attempt.dependencyBuild.buildIdentifier.dependencyBuildName);`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public Response logs(@PathParam("name") String name) {`
`164`	`164`	`if (attempt == null) {`
`165`	`165`	`throw new NotFoundException();`
`166`	`166`	`}`
`167`		`- return extractLog(Type.DISCOVERY, attempt.buildDiscoveryUrl, attempt.buildIdentifier.dependencyBuildName);`
	`167`	`+ return extractLog(Type.DISCOVERY, attempt.buildIdentifier.dependencyBuildName);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`@GET`
`@@ -174,7 +174,7 @@ public Response deploylogs(@PathParam("name") String name) {`
`174`	`174`	`if (attempt == null) {`
`175`	`175`	`throw new NotFoundException();`
`176`	`176`	`}`
`177`		`- return extractLog(Type.DEPLOY, attempt.deployLogsUrl, attempt.buildIdentifier.dependencyBuildName);`
	`177`	`+ return extractLog(Type.DEPLOY, attempt.buildIdentifier.dependencyBuildName);`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`private StoredDependencyBuild getDependencyBuild(String name) {`