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

Moves venafi addon into the framework addons package

Browse Source 
Signed-off-by: joshvanl <vleeuwenjoshua@gmail.com>
This commit is contained in:
joshvanl 2021-06-16 14:18:56 +01:00
parent 65cec6c212
commit ff2dfd7b64
14 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/framework/addon/BUILD.bazel
View File

@ -28,6 +28,7 @@ filegroup(
"//test/e2e/framework/addon/base:all-srcs",
"//test/e2e/framework/addon/chart:all-srcs",
"//test/e2e/framework/addon/vault:all-srcs",
"//test/e2e/framework/addon/venafi:all-srcs",
],
tags = ["automanaged"],
visibility = ["//visibility:public"],

2
test/e2e/suite/issuers/venafi/addon/BUILD.bazel → test/e2e/framework/addon/venafi/BUILD.bazel
View File

@ -7,7 +7,7 @@ go_library(
"doc.go",
"tpp.go",
],
importpath = "github.com/jetstack/cert-manager/test/e2e/suite/issuers/venafi/addon",
importpath = "github.com/jetstack/cert-manager/test/e2e/framework/addon/venafi",
tags = ["manual"],
visibility = ["//visibility:public"],
deps = [

2
test/e2e/suite/issuers/venafi/addon/cloud.go → test/e2e/framework/addon/venafi/cloud.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package addon
package venafi
import (
"context"

4
test/e2e/suite/issuers/venafi/addon/doc.go → test/e2e/framework/addon/venafi/doc.go
View File

@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// Package addon implements an addon for the Venafi platform.
// Package venafi implements an addon for the Venafi platform.
// It provides a means for e2e tests to consume credentials for Venafi TPP.
package addon
package venafi

2
test/e2e/suite/issuers/venafi/addon/tpp.go → test/e2e/framework/addon/venafi/tpp.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package addon
package venafi
import (
"context"

9
test/e2e/framework/helper/validation/validation.go
View File

@ -49,7 +49,6 @@ func DefaultCertificateSigningRequestSet() []certificatesigningrequests.Validati
certificatesigningrequests.ExpectCertificateURIsToMatch,
certificatesigningrequests.ExpectCertificateIPsToMatch,
certificatesigningrequests.ExpectValidCommonName,
certificatesigningrequests.ExpectValidDuration,
certificatesigningrequests.ExpectKeyUsageUsageDigitalSignature,
certificatesigningrequests.ExpectEmailsToMatch,
certificatesigningrequests.ExpectIsCA,
@ -92,5 +91,11 @@ func CertificateSetForUnsupportedFeatureSet(fs featureset.FeatureSet) []certific
}
func CertificateSigningRequestSetForUnsupportedFeatureSet(fs featureset.FeatureSet) []certificatesigningrequests.ValidationFunc {
return DefaultCertificateSigningRequestSet()
validations := DefaultCertificateSigningRequestSet()
if !fs.Contains(featureset.DurationFeature) {
validations = append(validations, certificatesigningrequests.ExpectValidDuration)
}
return validations
}

2
test/e2e/suite/conformance/certificates/venafi/BUILD.bazel
View File

@ -9,10 +9,10 @@ go_library(
"//pkg/apis/certmanager/v1:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/addon/venafi:go_default_library",
"//test/e2e/framework/helper/featureset:go_default_library",
"//test/e2e/framework/util/errors:go_default_library",
"//test/e2e/suite/conformance/certificates:go_default_library",
"//test/e2e/suite/issuers/venafi/addon:go_default_library",
"@com_github_onsi_ginkgo//:go_default_library",
"@com_github_onsi_gomega//:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",

2
test/e2e/suite/conformance/certificates/venafi/venafi.go
View File

@ -26,10 +26,10 @@ import (
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
"github.com/jetstack/cert-manager/test/e2e/framework"
vaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/venafi"
"github.com/jetstack/cert-manager/test/e2e/framework/helper/featureset"
"github.com/jetstack/cert-manager/test/e2e/framework/util/errors"
"github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates"
vaddon "github.com/jetstack/cert-manager/test/e2e/suite/issuers/venafi/addon"
)
var _ = framework.ConformanceDescribe("Certificates", func() {

2
test/e2e/suite/conformance/certificates/venaficloud/BUILD.bazel
View File

@ -9,10 +9,10 @@ go_library(
"//pkg/apis/certmanager/v1:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/addon/venafi:go_default_library",
"//test/e2e/framework/helper/featureset:go_default_library",
"//test/e2e/framework/util/errors:go_default_library",
"//test/e2e/suite/conformance/certificates:go_default_library",
"//test/e2e/suite/issuers/venafi/addon:go_default_library",
"@com_github_onsi_ginkgo//:go_default_library",
"@com_github_onsi_gomega//:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",

2
test/e2e/suite/conformance/certificates/venaficloud/cloud.go
View File

@ -26,10 +26,10 @@ import (
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
"github.com/jetstack/cert-manager/test/e2e/framework"
vaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/venafi"
"github.com/jetstack/cert-manager/test/e2e/framework/helper/featureset"
"github.com/jetstack/cert-manager/test/e2e/framework/util/errors"
"github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates"
vaddon "github.com/jetstack/cert-manager/test/e2e/suite/issuers/venafi/addon"
)
var _ = framework.ConformanceDescribe("[Feature:Issuers:Venafi:Cloud] Certificates", func() {

1
test/e2e/suite/issuers/venafi/BUILD.bazel
View File

@ -19,7 +19,6 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//test/e2e/suite/issuers/venafi/addon:all-srcs",
"//test/e2e/suite/issuers/venafi/tpp:all-srcs",
],
tags = ["automanaged"],

2
test/e2e/suite/issuers/venafi/tpp/BUILD.bazel
View File

@ -15,7 +15,7 @@ go_library(
"//pkg/apis/meta/v1:go_default_library",
"//pkg/util:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/suite/issuers/venafi/addon:go_default_library",
"//test/e2e/framework/addon/venafi:go_default_library",
"//test/e2e/util:go_default_library",
"@com_github_onsi_ginkgo//:go_default_library",
"@com_github_onsi_gomega//:go_default_library",

2
test/e2e/suite/issuers/venafi/tpp/certificate.go
View File

@ -28,7 +28,7 @@ import (
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
cmutil "github.com/jetstack/cert-manager/pkg/util"
"github.com/jetstack/cert-manager/test/e2e/framework"
vaddon "github.com/jetstack/cert-manager/test/e2e/suite/issuers/venafi/addon"
vaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/venafi"
"github.com/jetstack/cert-manager/test/e2e/util"
)

2
test/e2e/suite/issuers/venafi/tpp/certificaterequest.go
View File

@ -29,7 +29,7 @@ import (
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
cmutil "github.com/jetstack/cert-manager/pkg/util"
"github.com/jetstack/cert-manager/test/e2e/framework"
vaddon "github.com/jetstack/cert-manager/test/e2e/suite/issuers/venafi/addon"
vaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/venafi"
"github.com/jetstack/cert-manager/test/e2e/util"
)