Skip to content

Commit b9fa75f

Browse files
sanchezlsanchezl
committed
proof: update references
1 parent be142eb commit b9fa75f

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

‎pkg/controller/container-runtime-config/container_runtime_config_controller_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,10 @@ func newClusterImagePolicyWithPublicKey(name string, scopes []string, keyData []
220220
ObjectMeta: metav1.ObjectMeta{Name: name, UID: types.UID(utilrand.String(5)), Generation: 1},
221221
Spec: apicfgv1.ClusterImagePolicySpec{
222222
Scopes: imgScopes,
223-
Policy: apicfgv1.Policy{
223+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
224224
RootOfTrust: apicfgv1.PolicyRootOfTrust{
225225
PolicyType: apicfgv1.PublicKeyRootOfTrust,
226-
PublicKey: &apicfgv1.PublicKey{
226+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
227227
KeyData: keyData,
228228
},
229229
},
@@ -242,10 +242,10 @@ func newImagePolicyWithPublicKey(name, namespace string, scopes []string, keyDat
242242
ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace, UID: types.UID(utilrand.String(5)), Generation: 1},
243243
Spec: apicfgv1.ImagePolicySpec{
244244
Scopes: imgScopes,
245-
Policy: apicfgv1.Policy{
245+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
246246
RootOfTrust: apicfgv1.PolicyRootOfTrust{
247247
PolicyType: apicfgv1.PublicKeyRootOfTrust,
248-
PublicKey: &apicfgv1.PublicKey{
248+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
249249
KeyData: keyData,
250250
},
251251
},

‎pkg/controller/container-runtime-config/helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ func ownerReferenceImageConfig(imageConfig *apicfgv1.Image) metav1.OwnerReferenc
852852
}
853853
}
854854

855-
func policyItemFromSpec(policy apicfgv1.Policy) (signature.PolicyRequirement, error) {
855+
func policyItemFromSpec(policy apicfgv1.ImageSigstoreVerificationPolicy) (signature.PolicyRequirement, error) {
856856
var (
857857
sigstorePolicyRequirement signature.PolicyRequirement
858858
signedIdentity signature.PolicyReferenceMatch

‎pkg/controller/container-runtime-config/helpers_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -479,10 +479,10 @@ func clusterImagePolicyTestCRs() map[string]apicfgv1.ClusterImagePolicy {
479479
},
480480
Spec: apicfgv1.ClusterImagePolicySpec{
481481
Scopes: []apicfgv1.ImageScope{"test0.com"},
482-
Policy: apicfgv1.Policy{
482+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
483483
RootOfTrust: apicfgv1.PolicyRootOfTrust{
484484
PolicyType: apicfgv1.FulcioCAWithRekorRootOfTrust,
485-
FulcioCAWithRekor: &apicfgv1.FulcioCAWithRekor{
485+
FulcioCAWithRekor: &apicfgv1.ImagePolicyFulcioCAWithRekorRootOfTrust{
486486
FulcioCAData: testFulcioData,
487487
RekorKeyData: testRekorKeyData,
488488
FulcioSubject: apicfgv1.PolicyFulcioSubject{
@@ -507,10 +507,10 @@ func clusterImagePolicyTestCRs() map[string]apicfgv1.ClusterImagePolicy {
507507
},
508508
Spec: apicfgv1.ClusterImagePolicySpec{
509509
Scopes: []apicfgv1.ImageScope{"test0.com", "test1.com"},
510-
Policy: apicfgv1.Policy{
510+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
511511
RootOfTrust: apicfgv1.PolicyRootOfTrust{
512512
PolicyType: apicfgv1.PublicKeyRootOfTrust,
513-
PublicKey: &apicfgv1.PublicKey{
513+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
514514
KeyData: testKeyData,
515515
RekorKeyData: testRekorKeyData,
516516
},
@@ -531,10 +531,10 @@ func clusterImagePolicyTestCRs() map[string]apicfgv1.ClusterImagePolicy {
531531
},
532532
Spec: apicfgv1.ClusterImagePolicySpec{
533533
Scopes: []apicfgv1.ImageScope{"a.com/a1/a2", "a.com/a1/a2@sha256:0000000000000000000000000000000000000000000000000000000000000000", "*.example.com", "policy.scope", "foo.example.com/ns/repo"},
534-
Policy: apicfgv1.Policy{
534+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
535535
RootOfTrust: apicfgv1.PolicyRootOfTrust{
536536
PolicyType: apicfgv1.PublicKeyRootOfTrust,
537-
PublicKey: &apicfgv1.PublicKey{
537+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
538538
KeyData: testKeyData,
539539
RekorKeyData: testRekorKeyData,
540540
},
@@ -548,10 +548,10 @@ func clusterImagePolicyTestCRs() map[string]apicfgv1.ClusterImagePolicy {
548548
},
549549
Spec: apicfgv1.ClusterImagePolicySpec{
550550
Scopes: []apicfgv1.ImageScope{"test3.com/ns/repo"},
551-
Policy: apicfgv1.Policy{
551+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
552552
RootOfTrust: apicfgv1.PolicyRootOfTrust{
553553
PolicyType: apicfgv1.PKIRootOfTrust,
554-
PKI: &apicfgv1.PKI{
554+
PKI: &apicfgv1.ImagePolicyPKIRootOfTrust{
555555
CertificateAuthorityRootsData: testCertsData,
556556
CertificateAuthorityIntermediatesData: testCertsData,
557557
PKICertificateSubject: apicfgv1.PKICertificateSubject{
@@ -579,10 +579,10 @@ func imagePolicyTestCRs() map[string]apicfgv1.ImagePolicy {
579579
},
580580
Spec: apicfgv1.ImagePolicySpec{
581581
Scopes: []apicfgv1.ImageScope{"test0.com", "test2.com"},
582-
Policy: apicfgv1.Policy{
582+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
583583
RootOfTrust: apicfgv1.PolicyRootOfTrust{
584584
PolicyType: apicfgv1.PublicKeyRootOfTrust,
585-
PublicKey: &apicfgv1.PublicKey{
585+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
586586
KeyData: testKeyData,
587587
},
588588
},
@@ -596,10 +596,10 @@ func imagePolicyTestCRs() map[string]apicfgv1.ImagePolicy {
596596
},
597597
Spec: apicfgv1.ImagePolicySpec{
598598
Scopes: []apicfgv1.ImageScope{"a.com/a1/a2", "a.com/a1/a2@sha256:0000000000000000000000000000000000000000000000000000000000000000", "*.example.com", "policy.scope", "foo.example.com/ns/repo"},
599-
Policy: apicfgv1.Policy{
599+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
600600
RootOfTrust: apicfgv1.PolicyRootOfTrust{
601601
PolicyType: apicfgv1.PublicKeyRootOfTrust,
602-
PublicKey: &apicfgv1.PublicKey{
602+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
603603
KeyData: testKeyData,
604604
},
605605
},
@@ -613,10 +613,10 @@ func imagePolicyTestCRs() map[string]apicfgv1.ImagePolicy {
613613
},
614614
Spec: apicfgv1.ImagePolicySpec{
615615
Scopes: []apicfgv1.ImageScope{"test2.com"},
616-
Policy: apicfgv1.Policy{
616+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
617617
RootOfTrust: apicfgv1.PolicyRootOfTrust{
618618
PolicyType: apicfgv1.PublicKeyRootOfTrust,
619-
PublicKey: &apicfgv1.PublicKey{
619+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
620620
KeyData: testKeyData,
621621
},
622622
},
@@ -630,10 +630,10 @@ func imagePolicyTestCRs() map[string]apicfgv1.ImagePolicy {
630630
},
631631
Spec: apicfgv1.ImagePolicySpec{
632632
Scopes: []apicfgv1.ImageScope{"test3.com"},
633-
Policy: apicfgv1.Policy{
633+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
634634
RootOfTrust: apicfgv1.PolicyRootOfTrust{
635635
PolicyType: apicfgv1.PublicKeyRootOfTrust,
636-
PublicKey: &apicfgv1.PublicKey{
636+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
637637
KeyData: testKeyData,
638638
},
639639
},
@@ -647,10 +647,10 @@ func imagePolicyTestCRs() map[string]apicfgv1.ImagePolicy {
647647
},
648648
Spec: apicfgv1.ImagePolicySpec{
649649
Scopes: []apicfgv1.ImageScope{"test4.com/ns-policy/repo"},
650-
Policy: apicfgv1.Policy{
650+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
651651
RootOfTrust: apicfgv1.PolicyRootOfTrust{
652652
PolicyType: apicfgv1.PKIRootOfTrust,
653-
PKI: &apicfgv1.PKI{
653+
PKI: &apicfgv1.ImagePolicyPKIRootOfTrust{
654654
CertificateAuthorityRootsData: testCertsData,
655655
CertificateAuthorityIntermediatesData: testCertsData,
656656
PKICertificateSubject: apicfgv1.PKICertificateSubject{

0 commit comments

Comments
 (0)