Merge pull request #912 from stuartwdouglas/store-verification-results

Store verification results
redhat-appstudio · Nov 9, 2023 · de5ce77 · de5ce77
2 parents fd24877 + 071c1a2
commit de5ce77
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 6 deletions.
diff --git a/deploy/crds/base/jvmbuildservice.io_dependencybuilds.yaml b/deploy/crds/base/jvmbuildservice.io_dependencybuilds.yaml
@@ -105,6 +105,8 @@ spec:
                                 result:
                                   type: string
                               type: object
+                            verificationFailures:
+                              type: string
                             verified:
                               description: If the resulting image was verified
                               type: boolean

diff --git a/...omponents/resource-model/src/main/resources/crds/jvmbuildservice.io_dependencybuilds.yaml b/...omponents/resource-model/src/main/resources/crds/jvmbuildservice.io_dependencybuilds.yaml
@@ -105,6 +105,8 @@ spec:
                                 result:
                                   type: string
                               type: object
+                            verificationFailures:
+                              type: string
                             verified:
                               description: If the resulting image was verified
                               type: boolean

diff --git a/pkg/apis/jvmbuildservice/v1alpha1/dependencybuild_types.go b/pkg/apis/jvmbuildservice/v1alpha1/dependencybuild_types.go
@@ -97,7 +97,8 @@ type BuildPipelineRunResults struct {
 	Image       string `json:"image,omitempty"`
 	ImageDigest string `json:"imageDigest"`
 	//If the resulting image was verified
-	Verified bool `json:"verified,omitempty"`
+	Verified            bool   `json:"verified,omitempty"`
+	VerificationResults string `json:"verificationFailures,omitempty"`
 	// The produced GAVs
 	Gavs []string `json:"gavs,omitempty"`
 	// The hermetic build image produced by the build

diff --git a/pkg/apis/jvmbuildservice/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/jvmbuildservice/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/reconciler/dependencybuild/dependencybuild.go b/pkg/reconciler/dependencybuild/dependencybuild.go
@@ -674,6 +674,7 @@ func (r *ReconcileDependencyBuild) handleBuildPipelineRunReceived(ctx context.Co
 			var image string
 			var digest string
 			var passedVerification bool
+			var verificationResults string
 			var gavs []string
 			var hermeticBuildImage string
 			for _, i := range pr.Status.Results {
@@ -695,14 +696,17 @@ func (r *ReconcileDependencyBuild) handleBuildPipelineRunReceived(ctx context.Co
 				} else if i.Name == artifactbuild.PipelineResultGavs {
 					deployed := strings.Split(i.Value.StringVal, ",")
 					db.Status.DeployedArtifacts = deployed
+				} else if i.Name == artifactbuild.PipelineResultVerificationResult {
+					verificationResults = i.Value.StringVal
 				}
 			}
 			run.Results = &v1alpha1.BuildPipelineRunResults{
-				Image:              image,
-				ImageDigest:        digest,
-				Verified:           passedVerification,
-				Gavs:               gavs,
-				HermeticBuildImage: hermeticBuildImage,
+				Image:               image,
+				ImageDigest:         digest,
+				Verified:            passedVerification,
+				VerificationResults: verificationResults,
+				Gavs:                gavs,
+				HermeticBuildImage:  hermeticBuildImage,
 			}
 
 			for _, i := range pr.Status.Results {