From 65aa2ebc7b2b46383cb3440f7457e4d969cc095b Mon Sep 17 00:00:00 2001 From: Alexander Gama Espinosa Date: Tue, 1 Aug 2023 23:51:49 -0700 Subject: [PATCH] Add IsCA to CertificateRequest --- go.mod | 3 ++- go.sum | 4 ++-- services/security/certificate/certificate.go | 5 +++++ services/security/security.go | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 11fe9dc0..daa9a596 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/Azure/go-autorest/autorest v0.9.0 github.com/Azure/go-autorest/autorest/date v0.2.0 github.com/google/uuid v1.3.0 - github.com/microsoft/moc v0.11.0-alpha.13 + github.com/microsoft/moc v0.11.0-alpha.15 google.golang.org/grpc v1.54.0 k8s.io/klog v1.0.0 ) @@ -15,6 +15,7 @@ require ( require ( github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/golang-jwt/jwt/v4 v4.2.0 // indirect + github.com/golang/protobuf v1.5.3 github.com/kr/pretty v0.3.0 // indirect google.golang.org/protobuf v1.31.0 ) diff --git a/go.sum b/go.sum index 8642b7e1..51fd01c9 100644 --- a/go.sum +++ b/go.sum @@ -577,8 +577,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= -github.com/microsoft/moc v0.11.0-alpha.13 h1:BRIqVvHlSJBQzxSwgwyzyf4rIgHkNw1Q9FHmJ/37UIU= -github.com/microsoft/moc v0.11.0-alpha.13/go.mod h1:oWva5QnxchPzA+W9v5INDHjUksw/UKJPuNHnIwEpyEw= +github.com/microsoft/moc v0.11.0-alpha.15 h1:o10UoD26jWXzJBaPYrJaPZhEVFq6mj/zBPcWEK0z0SM= +github.com/microsoft/moc v0.11.0-alpha.15/go.mod h1:oWva5QnxchPzA+W9v5INDHjUksw/UKJPuNHnIwEpyEw= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= diff --git a/services/security/certificate/certificate.go b/services/security/certificate/certificate.go index d4a10506..28cd671f 100644 --- a/services/security/certificate/certificate.go +++ b/services/security/certificate/certificate.go @@ -6,6 +6,8 @@ package certificate import ( "net" + "github.com/golang/protobuf/ptypes/wrappers" + "github.com/microsoft/moc-sdk-for-go/services/security" "github.com/microsoft/moc/pkg/certs" "github.com/microsoft/moc/pkg/errors" @@ -100,5 +102,8 @@ func GetMocCSR(csr *security.CertificateRequest) (*wssdcloudsecurity.Certificate if csr.CaName != nil { request.CaName = *csr.CaName } + if csr.IsCA != nil { + request.IsCA = &wrappers.BoolValue{Value: *csr.IsCA} + } return request, string(key), nil } diff --git a/services/security/security.go b/services/security/security.go index b9420d04..01da6992 100644 --- a/services/security/security.go +++ b/services/security/security.go @@ -424,6 +424,8 @@ type CertificateRequest struct { PrivateKey *string `json:"privatekey,omitempty"` // OldCertificate Certificate contents of x509 certificate string to be renewed encoded in base64 OldCertificate *string `json:"oldcert,omitempty"` + // IsCA - If the certificate to be signed is CA + IsCA *bool `json:"isCA,omitempty"` // Attributes - The certificate attributes. Attributes *CertificateRequestAttributes `json:"attributes,omitempty"` // Tags - Application-specific metadata in the form of key-value pairs