Use MetaDigestKey from event API

hiddeco · hiddeco · commit 9283894bbef5 · 2023-02-14T12:48:36.000+01:00
Signed-off-by: Hidde Beydals &lt;hello@hidde.co&gt;
diff --git a/controllers/bucket_controller.go b/controllers/bucket_controller.go
@@ -331,7 +331,7 @@ func (r *BucketReconciler) notify(ctx context.Context, oldObj, newObj *sourcev1.
 			fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
 		}
 		if newObj.Status.Artifact.Digest != "" {
-			annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
+			annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
 		}
 
 		var oldChecksum string
diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go
@@ -328,7 +328,7 @@ func (r *GitRepositoryReconciler) notify(ctx context.Context, oldObj, newObj *so
 			fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
 		}
 		if newObj.Status.Artifact.Digest != "" {
-			annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
+			annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
 		}
 
 		var oldChecksum string
diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go
@@ -334,7 +334,7 @@ func (r *HelmChartReconciler) notify(ctx context.Context, oldObj, newObj *source
 			fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
 		}
 		if newObj.Status.Artifact.Digest != "" {
-			annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
+			annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
 		}
 
 		var oldChecksum string
diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go
@@ -294,7 +294,7 @@ func (r *HelmRepositoryReconciler) notify(ctx context.Context, oldObj, newObj *s
 			fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
 		}
 		if newObj.Status.Artifact.Digest != "" {
-			annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
+			annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
 		}
 
 		humanReadableSize := "unknown size"
diff --git a/controllers/ocirepository_controller.go b/controllers/ocirepository_controller.go
@@ -1141,7 +1141,7 @@ func (r *OCIRepositoryReconciler) notify(ctx context.Context, oldObj, newObj *so
 			fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
 		}
 		if newObj.Status.Artifact.Digest != "" {
-			annotations[sourcev1.GroupVersion.Group+"/revision"] = newObj.Status.Artifact.Digest
+			annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
 		}
 
 		var oldChecksum string
diff --git a/go.mod b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/docker/cli v20.10.23+incompatible
 	github.com/docker/go-units v0.5.0
 	github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4
-	github.com/fluxcd/pkg/apis/event v0.3.0
+	github.com/fluxcd/pkg/apis/event v0.4.0
 	github.com/fluxcd/pkg/apis/meta v0.19.0
 	github.com/fluxcd/pkg/git v0.9.0
 	github.com/fluxcd/pkg/git/gogit v0.6.0
diff --git a/go.sum b/go.sum
@@ -524,8 +524,8 @@ github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4 h1:Gm5sGGk+/Wq6Rh
 github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4/go.mod h1:raWgfUV7lDQVXp4QXUaeNNJkRVKz97UQuF+0kdY7Vmo=
 github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q=
 github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
-github.com/fluxcd/pkg/apis/event v0.3.0 h1:B+IXmfSniUGfoczheNAH0YULgS+ejxMl58RyWlvLa1c=
-github.com/fluxcd/pkg/apis/event v0.3.0/go.mod h1:xYOOlf+9gCBSYcs93N2XAbJvSVwuVBDBUzqhR+cAo7M=
+github.com/fluxcd/pkg/apis/event v0.4.0 h1:UPCC269KjgKgkmtiCiBq/DNue/EpXy8Tq1zFx7oRXZM=
+github.com/fluxcd/pkg/apis/event v0.4.0/go.mod h1:xYOOlf+9gCBSYcs93N2XAbJvSVwuVBDBUzqhR+cAo7M=
 github.com/fluxcd/pkg/apis/meta v0.19.0 h1:CX75e/eaRWZDTzNdMSWomY1InlssLKcS8GQDSg/aopI=
 github.com/fluxcd/pkg/apis/meta v0.19.0/go.mod h1:7b6prDPsViyAzoY7eRfSPS0/MbXpGGsOMvRq2QrTKa4=
 github.com/fluxcd/pkg/git v0.9.0 h1:e/RBMBe9rGUEi+B4DQpVPmDmAyHGj/fztqxTUeUxnsM=

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ func (r BucketReconciler) notify(ctx context.Context, oldObj, newObj sourcev1.`
`331`	`331`	`fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,`
`332`	`332`	`}`
`333`	`333`	`if newObj.Status.Artifact.Digest != "" {`
`334`		`- annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest`
	`334`	`+ annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`var oldChecksum string`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ func (r GitRepositoryReconciler) notify(ctx context.Context, oldObj, newObj so`
`328`	`328`	`fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,`
`329`	`329`	`}`
`330`	`330`	`if newObj.Status.Artifact.Digest != "" {`
`331`		`- annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest`
	`331`	`+ annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`var oldChecksum string`
Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ func (r HelmChartReconciler) notify(ctx context.Context, oldObj, newObj source`
`334`	`334`	`fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,`
`335`	`335`	`}`
`336`	`336`	`if newObj.Status.Artifact.Digest != "" {`
`337`		`- annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest`
	`337`	`+ annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`var oldChecksum string`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ func (r HelmRepositoryReconciler) notify(ctx context.Context, oldObj, newObj s`
`294`	`294`	`fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,`
`295`	`295`	`}`
`296`	`296`	`if newObj.Status.Artifact.Digest != "" {`
`297`		`- annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest`
	`297`	`+ annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`humanReadableSize := "unknown size"`
Original file line number	Diff line number	Diff line change
`@@ -1141,7 +1141,7 @@ func (r OCIRepositoryReconciler) notify(ctx context.Context, oldObj, newObj so`
`1141`	`1141`	`fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,`
`1142`	`1142`	`}`
`1143`	`1143`	`if newObj.Status.Artifact.Digest != "" {`
`1144`		`- annotations[sourcev1.GroupVersion.Group+"/revision"] = newObj.Status.Artifact.Digest`
	`1144`	`+ annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest`
`1145`	`1145`	`}`
`1146`	`1146`
`1147`	`1147`	`var oldChecksum string`