djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove untested comments

Browse Source
This commit is contained in:
Joshua Casey 2023-07-19 15:50:12 -05:00
parent c142c52258
commit 39912060f7
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
internal/controller/impersonatorconfig/impersonator_config.go
View File

@ -256,7 +256,6 @@ func (c *impersonatorConfigController) doSync(syncCtx controllerlib.Context, cre
} }
} else { } else {
if err = c.ensureImpersonatorIsStopped(true); err != nil { if err = c.ensureImpersonatorIsStopped(true); err != nil {
// untested
return nil, err return nil, err
} }
} }
@ -328,7 +327,6 @@ func (c *impersonatorConfigController) ensureCAAndTLSSecrets(ctx context.Context
return impersonationCA.Bundle(), nil return impersonationCA.Bundle(), nil
} }
// untested
return nil, nil return nil, nil
} }
@ -382,7 +380,6 @@ func (c *impersonatorConfigController) serviceExists(serviceName string) (bool,
return false, nil, nil return false, nil, nil
} }
if err != nil { if err != nil {
// untested
return false, nil, err return false, nil, err
} }
return true, service, nil return true, service, nil
@ -395,7 +392,6 @@ func (c *impersonatorConfigController) tlsSecretExists() (bool, *v1.Secret, erro
return false, nil, nil return false, nil, nil
} }
if err != nil { if err != nil {
// untested
return false, nil, err return false, nil, err
} }
return true, secret, nil return true, secret, nil
@ -502,7 +498,6 @@ func (c *impersonatorConfigController) ensureLoadBalancerIsStarted(ctx context.C
func (c *impersonatorConfigController) ensureLoadBalancerIsStopped(ctx context.Context) error { func (c *impersonatorConfigController) ensureLoadBalancerIsStopped(ctx context.Context) error {
running, service, err := c.serviceExists(c.generatedLoadBalancerServiceName) running, service, err := c.serviceExists(c.generatedLoadBalancerServiceName)
if err != nil { if err != nil {
// untested
return err return err
} }
if !running { if !running {
@ -548,7 +543,6 @@ func (c *impersonatorConfigController) ensureClusterIPServiceIsStarted(ctx conte
func (c *impersonatorConfigController) ensureClusterIPServiceIsStopped(ctx context.Context) error { func (c *impersonatorConfigController) ensureClusterIPServiceIsStopped(ctx context.Context) error {
running, service, err := c.serviceExists(c.generatedClusterIPServiceName) running, service, err := c.serviceExists(c.generatedClusterIPServiceName)
if err != nil { if err != nil {
// untested
return err return err
} }
if !running { if !running {
@ -584,7 +578,6 @@ func (c *impersonatorConfigController) createOrUpdateService(ctx context.Context
sort.Strings(desiredAnnotationKeys) sort.Strings(desiredAnnotationKeys)
keysJSONArray, err := json.Marshal(desiredAnnotationKeys) keysJSONArray, err := json.Marshal(desiredAnnotationKeys)
if err != nil { if err != nil {
// untested
return err // This shouldn't really happen. We should always be able to marshal an array of strings. return err // This shouldn't really happen. We should always be able to marshal an array of strings.
} }
// Save the desired annotations to a bookkeeping annotation. // Save the desired annotations to a bookkeeping annotation.
@ -599,7 +592,6 @@ func (c *impersonatorConfigController) createOrUpdateService(ctx context.Context
return err return err
} }
if err != nil { if err != nil {
// untested
return err return err
} }
@ -663,7 +655,6 @@ func (c *impersonatorConfigController) ensureTLSSecret(ctx context.Context, name
secretFromInformer, err := c.secretsInformer.Lister().Secrets(c.namespace).Get(c.tlsSecretName) secretFromInformer, err := c.secretsInformer.Lister().Secrets(c.namespace).Get(c.tlsSecretName)
notFound := k8serrors.IsNotFound(err) notFound := k8serrors.IsNotFound(err)
if !notFound && err != nil { if !notFound && err != nil {
// untested
return err return err
} }
@ -736,7 +727,6 @@ func (c *impersonatorConfigController) deleteTLSSecretWhenCertificateDoesNotMatc
// We currently have a secret, but we are waiting for a load balancer to be assigned an ingress, so // We currently have a secret, but we are waiting for a load balancer to be assigned an ingress, so
// our current secret must be old/unwanted. // our current secret must be old/unwanted.
if err = c.ensureTLSSecretIsRemoved(ctx); err != nil { if err = c.ensureTLSSecretIsRemoved(ctx); err != nil {
// untested
return false, err return false, err
} }
return true, nil return true, nil
@ -782,7 +772,6 @@ func (c *impersonatorConfigController) ensureTLSSecretIsCreatedAndLoaded(ctx con
if secret != nil { if secret != nil {
err := c.loadTLSCertFromSecret(secret) err := c.loadTLSCertFromSecret(secret)
if err != nil { if err != nil {
// untested
return err return err
} }
return nil return nil
@ -799,7 +788,6 @@ func (c *impersonatorConfigController) ensureTLSSecretIsCreatedAndLoaded(ctx con
err = c.loadTLSCertFromSecret(newTLSSecret) err = c.loadTLSCertFromSecret(newTLSSecret)
if err != nil { if err != nil {
// untested
return err return err
} }
@ -809,7 +797,6 @@ func (c *impersonatorConfigController) ensureTLSSecretIsCreatedAndLoaded(ctx con
func (c *impersonatorConfigController) ensureCASecretIsCreated(ctx context.Context) (*certauthority.CA, error) { func (c *impersonatorConfigController) ensureCASecretIsCreated(ctx context.Context) (*certauthority.CA, error) {
caSecret, err := c.secretsInformer.Lister().Secrets(c.namespace).Get(c.caSecretName) caSecret, err := c.secretsInformer.Lister().Secrets(c.namespace).Get(c.caSecretName)
if err != nil && !k8serrors.IsNotFound(err) { if err != nil && !k8serrors.IsNotFound(err) {
// untested
return nil, err return nil, err
} }
@ -831,13 +818,11 @@ func (c *impersonatorConfigController) ensureCASecretIsCreated(ctx context.Conte
func (c *impersonatorConfigController) createCASecret(ctx context.Context) (*certauthority.CA, error) { func (c *impersonatorConfigController) createCASecret(ctx context.Context) (*certauthority.CA, error) {
impersonationCA, err := certauthority.New(caCommonName, approximatelyOneHundredYears) impersonationCA, err := certauthority.New(caCommonName, approximatelyOneHundredYears)
if err != nil { if err != nil {
// untested
return nil, fmt.Errorf("could not create impersonation CA: %w", err) return nil, fmt.Errorf("could not create impersonation CA: %w", err)
} }
caPrivateKeyPEM, err := impersonationCA.PrivateKeyToPEM() caPrivateKeyPEM, err := impersonationCA.PrivateKeyToPEM()
if err != nil { if err != nil {
// untested
return nil, err return nil, err
} }
@ -891,7 +876,6 @@ func (c *impersonatorConfigController) findTLSCertificateNameFromLoadBalancer()
return &certNameInfo{ready: false}, nil return &certNameInfo{ready: false}, nil
} }
if err != nil { if err != nil {
// untested
return nil, err return nil, err
} }
ingresses := lb.Status.LoadBalancer.Ingress ingresses := lb.Status.LoadBalancer.Ingress
@ -926,7 +910,6 @@ func (c *impersonatorConfigController) findTLSCertificateNameFromClusterIPServic
return &certNameInfo{ready: false}, nil return &certNameInfo{ready: false}, nil
} }
if err != nil { if err != nil {
// untested
return nil, err return nil, err
} }
ip := clusterIP.Spec.ClusterIP ip := clusterIP.Spec.ClusterIP
@ -943,7 +926,6 @@ func (c *impersonatorConfigController) findTLSCertificateNameFromClusterIPServic
} }
return &certNameInfo{ready: true, selectedIPs: parsedIPs, clientEndpoint: ip}, nil return &certNameInfo{ready: true, selectedIPs: parsedIPs, clientEndpoint: ip}, nil
} }
// untested
return &certNameInfo{ready: false}, nil return &certNameInfo{ready: false}, nil
} }
@ -955,13 +937,11 @@ func (c *impersonatorConfigController) createNewTLSSecret(ctx context.Context, c
impersonationCert, err := ca.IssueServerCert(hostnames, ips, approximatelyOneHundredYears) impersonationCert, err := ca.IssueServerCert(hostnames, ips, approximatelyOneHundredYears)
if err != nil { if err != nil {
// untested
return nil, fmt.Errorf("could not create impersonation cert: %w", err) return nil, fmt.Errorf("could not create impersonation cert: %w", err)
} }
certPEM, keyPEM, err := certauthority.ToPEM(impersonationCert) certPEM, keyPEM, err := certauthority.ToPEM(impersonationCert)
if err != nil { if err != nil {
// untested
return nil, err return nil, err
} }
@ -991,7 +971,6 @@ func (c *impersonatorConfigController) loadTLSCertFromSecret(tlsSecret *v1.Secre
keyPEM := tlsSecret.Data[v1.TLSPrivateKeyKey] keyPEM := tlsSecret.Data[v1.TLSPrivateKeyKey]
if err := c.tlsServingCertDynamicCertProvider.SetCertKeyContent(certPEM, keyPEM); err != nil { if err := c.tlsServingCertDynamicCertProvider.SetCertKeyContent(certPEM, keyPEM); err != nil {
// untested
return fmt.Errorf("could not parse TLS cert PEM data from Secret: %w", err) return fmt.Errorf("could not parse TLS cert PEM data from Secret: %w", err)
} }
@ -1006,7 +985,6 @@ func (c *impersonatorConfigController) loadTLSCertFromSecret(tlsSecret *v1.Secre
func (c *impersonatorConfigController) ensureTLSSecretIsRemoved(ctx context.Context) error { func (c *impersonatorConfigController) ensureTLSSecretIsRemoved(ctx context.Context) error {
tlsSecretExists, secret, err := c.tlsSecretExists() tlsSecretExists, secret, err := c.tlsSecretExists()
if err != nil { if err != nil {
// untested
return err return err
} }
if !tlsSecretExists { if !tlsSecretExists {