Merge pull request #1706 from stuartwdouglas/auto-validation

Automatically create validation rules

Author: stuartwdouglas

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/verifier/VerifyBuiltArtifactsCommand.java

@@ -242,12 +242,12 @@ private List<String> getExcludes() throws IOException {
         }
 
         for (var exclude : excludes) {
-            if (!exclude.matches("^[+-^]:.*$")) {
-                Log.errorf("Invalid exclude %s", exclude);
-                return null;
+            if (exclude.matches("^[+-^]:.*$")) {
+                newExcludes.add(exclude.replaceAll("^([+-^])", "^\\\\$1"));
+            } else {
+                newExcludes.add(exclude);
             }
 
-            newExcludes.add(exclude.replaceAll("^([+-^])", "^\\\\$1"));
         }
 
         return newExcludes;

java-components/cache/src/main/java/com/redhat/hacbs/artifactcache/artifactwatch/ScmLookup.java

@@ -71,6 +71,7 @@ public void onAdd(ArtifactBuild newObj) {
                     if (newObj.getStatus() == null || newObj.getStatus().getState() == null
                             || Objects.equals(newObj.getStatus().getState(), "")
                             || Objects.equals(newObj.getStatus().getState(), ModelConstants.ARTIFACT_BUILD_NEW)) {
+                        Log.infof("updating SCM info for %s", newObj.getMetadata().getName());
                         try {
                             if (newObj.getStatus() == null) {
                                 newObj.setStatus(new ArtifactBuildStatus());
@@ -83,9 +84,6 @@ public void onAdd(ArtifactBuild newObj) {
                                     //if this is a forced rebuild we always update the SCM info
                                     //there is a good chance there may be a new recipe
                                     recipeManager.forceUpdate();
-                                    // Not updating rebuild annotation as that will be handled in artifactbuild.go Reconcile
-                                    // operator loop.
-                                    return; //the update should trigger the watch again
                                 }
                                 Scm scm = new Scm();
 

java-components/management-console/src/main/java/com/redhat/hacbs/management/resources/AdminResource.java

@@ -1,7 +1,9 @@
 package com.redhat.hacbs.management.resources;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.UnaryOperator;
 
 import jakarta.inject.Inject;
@@ -55,16 +57,28 @@ public void rebuildAll() {
     @POST
     @Path("rebuild-failed")
     public void rebuildFailed() {
+        Set<String> seen = new HashSet<>();
         for (StoredArtifactBuild sb : StoredArtifactBuild.<StoredArtifactBuild> list("state",
                 ModelConstants.ARTIFACT_BUILD_MISSING)) {
             BuildQueue.rebuild(sb.mavenArtifact, false, Map.of());
         }
         for (StoredArtifactBuild sb : StoredArtifactBuild.<StoredArtifactBuild> list("state",
                 ModelConstants.ARTIFACT_BUILD_FAILED)) {
-            BuildQueue.rebuild(sb.mavenArtifact, false, Map.of());
+            if (sb.buildIdentifier == null || sb.buildIdentifier.dependencyBuildName == null) {
+                BuildQueue.rebuild(sb.mavenArtifact, false, Map.of());
+            } else if (!seen.contains(sb.buildIdentifier.dependencyBuildName)) {
+                BuildQueue.rebuild(sb.mavenArtifact, false, Map.of());
+                seen.add(sb.buildIdentifier.dependencyBuildName);
+            }
         }
     }
 
+    @POST
+    @Path("clear-build-queue")
+    public void clearBuildQueue() {
+        BuildQueue.deleteAll();
+    }
+
     @POST
     @Path("import-froms3")
     public void s3Import() {

java-components/management-console/src/main/java/com/redhat/hacbs/management/resources/BuildInfoEditResource.java

@@ -1,7 +1,10 @@
 package com.redhat.hacbs.management.resources;
 
+import java.util.ArrayList;
 import java.util.Optional;
+import java.util.regex.Pattern;
 
+import jakarta.transaction.Transactional;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.POST;
@@ -13,6 +16,8 @@
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
 import com.redhat.hacbs.common.tools.repo.BuildInfoService;
+import com.redhat.hacbs.management.dto.BuildAttemptDTO;
+import com.redhat.hacbs.management.model.BuildAttempt;
 import com.redhat.hacbs.recipes.build.BuildRecipeInfo;
 
 @Path("/build-info/edit")
@@ -37,6 +42,38 @@ public EditResult modify(BuildInfoService.BuildEditInfo command) {
         return ret;
     }
 
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @Transactional
+    @Path("approve-validation")
+    public EditResult modify(BuildAttemptDTO buildAttemptDTO) {
+        BuildAttempt ba = BuildAttempt.findById(buildAttemptDTO.id());
+        String url = ba.dependencyBuild.buildIdentifier.repository.url;
+        BuildInfoService.BuildEditInfo info;
+        Optional<BuildInfoService.BuildEditInfo> scmInfo = BuildInfoService.getBuildInfo(url);
+        if (scmInfo.isPresent()) {
+            info = scmInfo.get();
+        } else {
+            info = new BuildInfoService.BuildEditInfo(new BuildRecipeInfo(), url, false);
+        }
+        if (info.buildInfo().getAllowedDifferences() == null) {
+            info.buildInfo().setAllowedDifferences(new ArrayList<>());
+        }
+        for (var i : buildAttemptDTO.upstreamDifferences().entrySet()) {
+            for (var dif : i.getValue()) {
+                var val = Pattern.quote(dif);
+                if (!info.buildInfo().getAllowedDifferences().contains(val)) {
+                    info.buildInfo().getAllowedDifferences().add(val);
+                }
+            }
+        }
+        var prUrul = BuildInfoService.writeBuildInfo(info);
+        EditResult ret = new EditResult();
+        ret.prUrl = prUrul;
+        return ret;
+    }
+
     public static class EditResult {
         @Schema(required = true)
         public String prUrl;

java-components/management-console/src/main/resources/application.properties

@@ -12,7 +12,7 @@ quarkus.jib.user=0
 # Dev Config
 %dev.quarkus.kubernetes-client.trust-certs=true
 bucket.name=jvm-build-service-data
-concurrent-builds=20
+concurrent-builds=10
 %test.concurrent-builds=8
 %test.quarkus.kubernetes-client.trust-certs=true
 

java-components/management-console/src/main/webui/src/app/BuildView/BuildView.tsx

@@ -5,7 +5,7 @@ import {
   ArtifactListDTO,
   BuildAttemptDTO,
   BuildDTO,
-  BuildHistoryResourceService,
+  BuildHistoryResourceService, BuildInfoEditResourceService,
   BuildQueueResourceService
 } from "../../services/openapi";
 import {Link, RouteComponentProps} from "react-router-dom";
@@ -44,7 +44,8 @@ import {
   MinusIcon,
   PlusIcon,
   QuestionIcon,
-  WarningTriangleIcon
+  WarningTriangleIcon,
+  GithubIcon
 } from "@patternfly/react-icons";
 import {Table, Tbody, Td, Th, Thead, Tr} from "@patternfly/react-table";
 import {DependencySet, StoredArtifactView} from "../../components";
@@ -293,6 +294,7 @@ type BuildAttemptType = {
 const BuildAttempt: React.FunctionComponent<BuildAttemptType> = (data: BuildAttemptType) => {
 
   const [activeTabKey, setActiveTabKey] = React.useState<string | number>(0);
+  const [prUrl, setPrUrl] = useState('');
   const handleTabClick = (
     event: React.MouseEvent<any> | React.KeyboardEvent | MouseEvent,
     tabIndex: string | number
@@ -311,7 +313,14 @@ const BuildAttempt: React.FunctionComponent<BuildAttemptType> = (data: BuildAtte
       Build Failed
     </Label>
   }
+  const saveVerificationInfo = () => {
 
+    BuildInfoEditResourceService.postApiBuildInfoEditApproveValidation(data.attempt)
+      .then((ret) => {
+        console.log(ret.prUrl)
+        setPrUrl(ret.prUrl)
+      })
+  }
   return (<Tabs activeKey={activeTabKey}
                 onSelect={handleTabClick}
                 isBox
@@ -346,6 +355,17 @@ const BuildAttempt: React.FunctionComponent<BuildAttemptType> = (data: BuildAtte
         <CardHeader>Verification Failures</CardHeader>
         <CardBody>
           <DescriptionList>
+            <DescriptionListGroup>
+                <DescriptionListTerm>Fix Errors</DescriptionListTerm>
+                <DescriptionListDescription>
+                    <Button key="create" variant="primary" form="modal-with-form-form" onClick={saveVerificationInfo} disabled={prUrl.length > 0}>
+                      Approve Validation Differences
+                    </Button>
+                  {prUrl.length == 0 ? <></> :
+                    <a href={prUrl} target={'_blank'}><GithubIcon></GithubIcon>{prUrl}</a>
+                  }
+                </DescriptionListDescription>
+              </DescriptionListGroup>
             {Object.entries(selectBuildAttempt.upstreamDifferences).map(([key, value]) => {
               return <DescriptionListGroup key={key}>
                 <DescriptionListTerm>{key}</DescriptionListTerm>

java-components/management-console/src/main/webui/src/app/ControlPanel/ControlPanel.tsx

@@ -19,25 +19,30 @@ const ControlPanel: React.FunctionComponent = () => {
     <CardBody>
       <ActionList>
         <ActionListItem>
-          <Button variant="danger" id="rebuild-all" onClick={() => AdminResourceService.postApiAdminRebuildAll()}>
+          <Button variant="danger" id="rebuild-all" onClick={AdminResourceService.postApiAdminRebuildAll}>
             Rebuild All
           </Button>
         </ActionListItem>
         <ActionListItem>
-          <Button variant="warning" id="rebuild-failed" onClick={() => AdminResourceService.postApiAdminRebuildFailed()}>
+          <Button variant="warning" id="rebuild-failed" onClick={AdminResourceService.postApiAdminRebuildFailed}>
             Rebuild Failed
           </Button>
         </ActionListItem>
         <ActionListItem>
-          <Button variant="danger" id="rebuild-failed" onClick={() => AdminResourceService.postApiAdminCleanOutDatabase()}>
+          <Button variant="danger" id="rebuild-failed" onClick={AdminResourceService.postApiAdminCleanOutDatabase}>
             Delete All Data
           </Button>
         </ActionListItem>
         <ActionListItem>
-          <Button variant="warning" id="s3-import" onClick={() => AdminResourceService.postApiAdminImportFroms3()}>
+          <Button variant="warning" id="s3-import" onClick={AdminResourceService.postApiAdminImportFroms3}>
             S3 Import
           </Button>
         </ActionListItem>
+        <ActionListItem>
+          <Button variant="warning" id="s3-import" onClick={AdminResourceService.postApiAdminClearBuildQueue}>
+            Clear Build Queue
+          </Button>
+        </ActionListItem>
       </ActionList>
     </CardBody>
   </Card>

java-components/management-console/src/main/webui/src/components/BuildEdit/BuildEdit.tsx

@@ -181,6 +181,37 @@ export const BuildEdit: React.FunctionComponent<BuildEditModalData> = (data) =>
                 })}
               />
             </FormGroup>)}
+
+          <FormGroup label="Allowed Differences to Upstream">
+            <Button variant="control" onClick={() => {
+              stateChange((s, v) => {
+                if (s.buildInfo.allowedDifferences) {
+                  s.buildInfo.allowedDifferences.push("")
+                } else {
+                  s.buildInfo.allowedDifferences = [""]
+                }
+              })(info.buildInfo, null)
+            }}>Add Allowed Difference</Button>
+
+          </FormGroup>
+          {info.buildInfo.allowedDifferences?.map((s, index) =>
+            <FormGroup
+              label="Difference"
+              labelIcon={
+                <Popover bodyContent={<div>A regex that matches a validation failure to ignore</div>}><HelpIcon/></Popover>
+              }
+              fieldId="artifact-edit-upstream-diff">
+              <TextInput
+                id="artifact-edit-upstream-diff"
+                name="artifact-edit-upstream-diff"
+                value={s}
+                onChange={stateChange((s, v) => {
+                  if (s.buildInfo.allowedDifferences) {
+                    s.buildInfo.allowedDifferences[index] = v
+                  }
+                })}
+              />
+            </FormGroup>)}
 <FormGroup>
   <Button key="create" variant="primary" form="modal-with-form-form" onClick={save} disabled={prUrl.length > 0}>
     Confirm

java-components/management-console/src/main/webui/src/services/openapi/services/AdminResourceService.ts

@@ -16,6 +16,16 @@ export class AdminResourceService {
             url: '/api/admin/clean-out-database',
         });
     }
+    /**
+     * @returns any Created
+     * @throws ApiError
+     */
+    public static postApiAdminClearBuildQueue(): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/api/admin/clear-build-queue',
+        });
+    }
     /**
      * @returns any Created
      * @throws ApiError

java-components/management-console/src/main/webui/src/services/openapi/services/BuildInfoEditResourceService.ts

@@ -2,6 +2,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+import type { BuildAttemptDTO } from '../models/BuildAttemptDTO';
 import type { BuildEditInfo } from '../models/BuildEditInfo';
 import type { EditResult1 } from '../models/EditResult1';
 import type { CancelablePromise } from '../core/CancelablePromise';
@@ -39,4 +40,19 @@ export class BuildInfoEditResourceService {
             mediaType: 'application/json',
         });
     }
+    /**
+     * @param requestBody
+     * @returns EditResult1 OK
+     * @throws ApiError
+     */
+    public static postApiBuildInfoEditApproveValidation(
+        requestBody?: BuildAttemptDTO,
+    ): CancelablePromise<EditResult1> {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/api/build-info/edit/approve-validation',
+            body: requestBody,
+            mediaType: 'application/json',
+        });
+    }
 }