Skip to content

Commit 72f92ac

Browse files
Fix test
Signed-off-by: Ilya Dmitrichenko <[email protected]>
1 parent df1734a commit 72f92ac

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

internal/controller/ocirepository_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ func (r *OCIRepositoryReconciler) reconcileSource(ctx context.Context, sp *patch
408408
// Mark observations about the revision on the object
409409
defer func() {
410410
if !obj.GetArtifact().HasRevision(revision) {
411-
message := fmt.Sprintf("new revision '%s' for '%s'", revision, ref)
411+
message := fmt.Sprintf("new revision '%s' for '%s'", revision, obj.Spec.URL)
412412
if obj.GetArtifact() != nil {
413413
conditions.MarkTrue(obj, sourcev1.ArtifactOutdatedCondition, "NewRevision", message)
414414
}

internal/controller/ocirepository_controller_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -1575,12 +1575,11 @@ func TestOCIRepository_reconcileSource_verifyOCISourceSignature_keyless(t *testi
15751575
Reference: tt.reference,
15761576
},
15771577
}
1578-
url := strings.TrimPrefix(obj.Spec.URL, "oci://") + ":" + tt.reference.Tag
15791578

15801579
assertConditions := tt.assertConditions
15811580
for k := range assertConditions {
15821581
assertConditions[k].Message = strings.ReplaceAll(assertConditions[k].Message, "<revision>", tt.revision)
1583-
assertConditions[k].Message = strings.ReplaceAll(assertConditions[k].Message, "<url>", url)
1582+
assertConditions[k].Message = strings.ReplaceAll(assertConditions[k].Message, "<url>", obj.Spec.URL)
15841583
assertConditions[k].Message = strings.ReplaceAll(assertConditions[k].Message, "<provider>", "cosign")
15851584
}
15861585

@@ -1599,7 +1598,7 @@ func TestOCIRepository_reconcileSource_verifyOCISourceSignature_keyless(t *testi
15991598
got, err := r.reconcileSource(ctx, sp, obj, artifact, t.TempDir())
16001599
if tt.wantErr {
16011600
g.Expect(err).To(HaveOccurred())
1602-
tt.wantErrMsg = strings.ReplaceAll(tt.wantErrMsg, "<url>", url)
1601+
tt.wantErrMsg = strings.ReplaceAll(tt.wantErrMsg, "<url>", obj.Spec.URL)
16031602
g.Expect(err.Error()).To(ContainSubstring(tt.wantErrMsg))
16041603
} else {
16051604
g.Expect(err).ToNot(HaveOccurred())

0 commit comments

Comments
 (0)