Skip to content

Commit

Permalink
fixed camelcasing and removed aliases
Browse files Browse the repository at this point in the history
  • Loading branch information
roncodingenthusiast committed Sep 12, 2023
1 parent 98f9b78 commit 3f0338b
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions control-plane/api/v1alpha1/jwtprovider_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ type RemoteJWKS struct {
RetryPolicy *JWKSRetryPolicy `json:"retryPolicy,omitempty"`

// JWKSCluster defines how the specified Remote JWKS URI is to be fetched.
JWKSCluster *JWKSCluster `json:",omitempty" alias:"jwks_cluster"`
JWKSCluster *JWKSCluster `json:"jwksCluster,omitempty"`
}

func (r *RemoteJWKS) toConsul() *capi.RemoteJWKS {
Expand Down Expand Up @@ -450,18 +450,18 @@ type JWKSCluster struct {
//
// This defaults to STRICT_DNS.
// Other options include STATIC, LOGICAL_DNS, EDS or ORIGINAL_DST.
DiscoveryType ClusterDiscoveryType `json:",omitempty" alias:"discovery_type"`
DiscoveryType ClusterDiscoveryType `json:"discoveryType,omitempty"`

// TLSCertificates refers to the data containing certificate authority certificates to use
// in verifying a presented peer certificate.
// If not specified and a peer certificate is presented it will not be verified.
//
// Must be either CaCertificateProviderInstance or TrustedCA.
TLSCertificates *JWKSTLSCertificate `json:",omitempty" alias:"tls_certificates"`
TLSCertificates *JWKSTLSCertificate `json:"tlsCertificates,omitempty"`

// The timeout for new network connections to hosts in the cluster.
// If not set, a default value of 5s will be used.
ConnectTimeout time.Duration `json:",omitempty" alias:"connect_timeout"`
ConnectTimeout time.Duration `json:"connectTimeout,omitempty"`
}

func (c *JWKSCluster) toConsul() *capi.JWKSCluster {
Expand Down Expand Up @@ -512,13 +512,13 @@ func (d ClusterDiscoveryType) toConsul() capi.ClusterDiscoveryType {
// Must be either CaCertificateProviderInstance or TrustedCA.
type JWKSTLSCertificate struct {
// CaCertificateProviderInstance Certificate provider instance for fetching TLS certificates.
CaCertificateProviderInstance *JWKSTLSCertProviderInstance `json:",omitempty" alias:"ca_certificate_provider_instance"`
CaCertificateProviderInstance *JWKSTLSCertProviderInstance `json:"caCertificateProviderInstance,omitempty"`

// TrustedCA defines TLS certificate data containing certificate authority certificates
// to use in verifying a presented peer certificate.
//
// Exactly one of Filename, EnvironmentVariable, InlineString or InlineBytes must be specified.
TrustedCA *JWKSTLSCertTrustedCA `json:",omitempty" alias:"trusted_ca"`
TrustedCA *JWKSTLSCertTrustedCA `json:"trustedCA,omitempty"`
}

func (c *JWKSTLSCertificate) toConsul() *capi.JWKSTLSCertificate {
Expand Down Expand Up @@ -555,14 +555,14 @@ type JWKSTLSCertProviderInstance struct {
// InstanceName refers to the certificate provider instance name
//
// The default value is "default".
InstanceName string `json:",omitempty" alias:"instance_name"`
InstanceName string `json:"instanceName,omitempty"`

// CertificateName is used to specify certificate instances or types. For example, "ROOTCA" to specify
// a root-certificate (validation context) or "example.com" to specify a certificate for a
// particular domain.
//
// The default value is the empty string.
CertificateName string `json:",omitempty" alias:"certificate_name"`
CertificateName string `json:"certificateName,omitempty"`
}

func (c *JWKSTLSCertProviderInstance) toConsul() *capi.JWKSTLSCertProviderInstance {
Expand All @@ -581,10 +581,10 @@ func (c *JWKSTLSCertProviderInstance) toConsul() *capi.JWKSTLSCertProviderInstan
//
// Exactly one of Filename, EnvironmentVariable, InlineString or InlineBytes must be specified.
type JWKSTLSCertTrustedCA struct {
Filename string `json:",omitempty" alias:"filename"`
EnvironmentVariable string `json:",omitempty" alias:"environment_variable"`
InlineString string `json:",omitempty" alias:"inline_string"`
InlineBytes []byte `json:",omitempty" alias:"inline_bytes"`
Filename string `json:"filename,omitempty"`
EnvironmentVariable string `json:"environmentVariable,omitempty"`
InlineString string `json:"inlineString,omitempty"`
InlineBytes []byte `json:"inlineBytes,omitempty"`
}

func (c *JWKSTLSCertTrustedCA) toConsul() *capi.JWKSTLSCertTrustedCA {
Expand Down

0 comments on commit 3f0338b

Please sign in to comment.