fix api definition (optional mode)

This commit is contained in:
kkb0318
2024-06-16 14:43:41 +09:00
parent 074738f29c
commit 25ae093bc4
9 changed files with 34 additions and 23 deletions
@@ -53,7 +53,7 @@ var _ = Describe("IRSASetup Controller", func() {
},
Spec: irsav1alpha1.IRSASetupSpec{
Cleanup: true,
Mode: "selfhosted",
// Mode: "selfhosted",
Discovery: irsav1alpha1.Discovery{
S3: irsav1alpha1.S3Discovery{
Region: "ap-northeast-1",
@@ -134,7 +134,7 @@ var _ = Describe("IRSASetup Controller", func() {
},
Spec: irsav1alpha1.IRSASetupSpec{
Cleanup: true,
Mode: "selfhoted",
// Mode: "selfhoted",
Discovery: irsav1alpha1.Discovery{
S3: irsav1alpha1.S3Discovery{
Region: "ap-northeast-1",
@@ -219,7 +219,7 @@ var _ = Describe("IRSASetup Controller", func() {
},
Spec: irsav1alpha1.IRSASetupSpec{
Cleanup: false,
Mode: "selfhoted",
// Mode: "selfhoted",
Discovery: irsav1alpha1.Discovery{
S3: irsav1alpha1.S3Discovery{
Region: "ap-northeast-1",
@@ -19,21 +19,25 @@ func TestCreateTlsCredentials(t *testing.T) {
}
certBlock, _ := pem.Decode(creds.certificate)
var cert *x509.Certificate
if certBlock == nil {
t.Fatal("Failed to decode PEM block containing the certificate")
} else {
cert, err = x509.ParseCertificate(certBlock.Bytes)
if err != nil {
t.Fatalf("Failed to parse certificate: %v", err)
}
}
cert, err := x509.ParseCertificate(certBlock.Bytes)
if err != nil {
t.Fatalf("Failed to parse certificate: %v", err)
}
var key *rsa.PrivateKey
keyBlock, _ := pem.Decode(creds.privateKey)
if keyBlock == nil {
t.Fatal("Failed to decode PEM block containing the private key")
}
key, err := x509.ParsePKCS1PrivateKey(keyBlock.Bytes)
if err != nil {
t.Fatalf("Failed to parse private key: %v", err)
} else {
key, err = x509.ParsePKCS1PrivateKey(keyBlock.Bytes)
if err != nil {
t.Fatalf("Failed to parse private key: %v", err)
}
}
// Verify public keys are equivalent