weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

copy the unsupportedFeatures from the Certificate conformance tests to the CertificateSigningRequest conformance tests

Browse Source 
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
This commit is contained in:
Tim Ramlot 2024-06-18 10:48:07 +02:00
parent 05495d0e4c
commit fa6f654598
No known key found for this signature in database
GPG Key ID: 47428728E0C2878D
3 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/suite/conformance/certificatesigningrequests/acme/acme.go
View File

@ -53,6 +53,10 @@ func runACMEIssuerTests(eab *cmacme.ACMEExternalAccountBinding) {
featureset.CommonNameFeature,
featureset.KeyUsagesFeature,
featureset.EmailSANsFeature,
featureset.SaveCAToSecret,
featureset.IssueCAFeature,
featureset.LiteralSubjectFeature,
featureset.OtherNamesFeature,
)
// unsupportedDNS01Features is a list of features that are not supported by the ACME
@ -64,6 +68,10 @@ func runACMEIssuerTests(eab *cmacme.ACMEExternalAccountBinding) {
featureset.CommonNameFeature,
featureset.KeyUsagesFeature,
featureset.EmailSANsFeature,
featureset.SaveCAToSecret,
featureset.IssueCAFeature,
featureset.LiteralSubjectFeature,
featureset.OtherNamesFeature,
)
http01 := &acme{

50
test/e2e/suite/conformance/certificatesigningrequests/vault/approle.go
View File

@ -53,56 +53,50 @@ type secrets struct {
}
var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() {
var unsupportedFeatures = featureset.NewFeatureSet(
featureset.KeyUsagesFeature,
featureset.Ed25519FeatureSet,
featureset.IssueCAFeature,
)
issuer := &approle{
testWithRootCA: true,
}
(&certificatesigningrequests.Suite{
Name: "Vault AppRole Issuer With Root CA",
CreateIssuerFunc: issuer.createIssuer,
DeleteIssuerFunc: issuer.delete,
UnsupportedFeatures: featureset.NewFeatureSet(
featureset.KeyUsagesFeature,
featureset.Ed25519FeatureSet,
),
Name: "Vault AppRole Issuer With Root CA",
CreateIssuerFunc: issuer.createIssuer,
DeleteIssuerFunc: issuer.delete,
UnsupportedFeatures: unsupportedFeatures,
}).Define()
issuerNoRoot := &approle{
testWithRootCA: false,
}
(&certificatesigningrequests.Suite{
Name: "Vault AppRole Issuer Without Root CA",
CreateIssuerFunc: issuerNoRoot.createIssuer,
DeleteIssuerFunc: issuerNoRoot.delete,
UnsupportedFeatures: featureset.NewFeatureSet(
featureset.KeyUsagesFeature,
featureset.Ed25519FeatureSet,
),
Name: "Vault AppRole Issuer Without Root CA",
CreateIssuerFunc: issuerNoRoot.createIssuer,
DeleteIssuerFunc: issuerNoRoot.delete,
UnsupportedFeatures: unsupportedFeatures,
}).Define()
clusterIssuer := &approle{
testWithRootCA: true,
}
(&certificatesigningrequests.Suite{
Name: "Vault AppRole ClusterIssuer With Root CA",
CreateIssuerFunc: clusterIssuer.createClusterIssuer,
DeleteIssuerFunc: clusterIssuer.delete,
UnsupportedFeatures: featureset.NewFeatureSet(
featureset.KeyUsagesFeature,
featureset.Ed25519FeatureSet,
),
Name: "Vault AppRole ClusterIssuer With Root CA",
CreateIssuerFunc: clusterIssuer.createClusterIssuer,
DeleteIssuerFunc: clusterIssuer.delete,
UnsupportedFeatures: unsupportedFeatures,
}).Define()
clusterIssuerNoRoot := &approle{
testWithRootCA: false,
}
(&certificatesigningrequests.Suite{
Name: "Vault AppRole ClusterIssuer Without Root CA",
CreateIssuerFunc: clusterIssuerNoRoot.createClusterIssuer,
DeleteIssuerFunc: clusterIssuerNoRoot.delete,
UnsupportedFeatures: featureset.NewFeatureSet(
featureset.KeyUsagesFeature,
featureset.Ed25519FeatureSet,
),
Name: "Vault AppRole ClusterIssuer Without Root CA",
CreateIssuerFunc: clusterIssuerNoRoot.createClusterIssuer,
DeleteIssuerFunc: clusterIssuerNoRoot.delete,
UnsupportedFeatures: unsupportedFeatures,
}).Define()
})

28
test/e2e/suite/conformance/certificatesigningrequests/vault/kubernetes.go
View File

@ -38,30 +38,30 @@ import (
)
var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() {
var unsupportedFeatures = featureset.NewFeatureSet(
featureset.KeyUsagesFeature,
featureset.Ed25519FeatureSet,
featureset.IssueCAFeature,
)
issuer := &kubernetes{
testWithRootCA: true,
}
(&certificatesigningrequests.Suite{
Name: "Vault Kubernetes Auth Issuer With Root CA",
CreateIssuerFunc: issuer.createIssuer,
DeleteIssuerFunc: issuer.delete,
UnsupportedFeatures: featureset.NewFeatureSet(
featureset.KeyUsagesFeature,
featureset.Ed25519FeatureSet,
),
Name: "Vault Kubernetes Auth Issuer With Root CA",
CreateIssuerFunc: issuer.createIssuer,
DeleteIssuerFunc: issuer.delete,
UnsupportedFeatures: unsupportedFeatures,
}).Define()
clusterIssuer := &kubernetes{
testWithRootCA: true,
}
(&certificatesigningrequests.Suite{
Name: "Vault Kubernetes Auth ClusterIssuer With Root CA",
CreateIssuerFunc: clusterIssuer.createClusterIssuer,
DeleteIssuerFunc: clusterIssuer.delete,
UnsupportedFeatures: featureset.NewFeatureSet(
featureset.KeyUsagesFeature,
featureset.Ed25519FeatureSet,
),
Name: "Vault Kubernetes Auth ClusterIssuer With Root CA",
CreateIssuerFunc: clusterIssuer.createClusterIssuer,
DeleteIssuerFunc: clusterIssuer.delete,
UnsupportedFeatures: unsupportedFeatures,
}).Define()
})