From f621dbe346843b1a6da172256ebdb1a01ed0f752 Mon Sep 17 00:00:00 2001 From: Joshua Duffney Date: Tue, 29 Oct 2024 16:05:49 -0500 Subject: [PATCH] chore: use bool for enabled Signed-off-by: Joshua Duffney --- .../azurekeyvault/provider.go | 16 ++++++++-------- .../azurekeyvault/provider_test.go | 6 +++--- .../azurekeyvault/types/types.go | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/keymanagementprovider/azurekeyvault/provider.go b/pkg/keymanagementprovider/azurekeyvault/provider.go index a4f0ac38b..7e04e9c6f 100644 --- a/pkg/keymanagementprovider/azurekeyvault/provider.go +++ b/pkg/keymanagementprovider/azurekeyvault/provider.go @@ -181,7 +181,7 @@ func (s *akvKMProvider) GetCertificates(ctx context.Context) (map[keymanagementp startTime := time.Now() lastRefreshed := startTime.Format(time.RFC3339) - certProperty := getStatusProperty(keyVaultCert.Name, keyVaultCert.Version, strconv.FormatBool(isEnabled), lastRefreshed) + certProperty := getStatusProperty(keyVaultCert.Name, keyVaultCert.Version, lastRefreshed, isEnabled) certsStatus = append(certsStatus, certProperty) mapKey := keymanagementprovider.KMPMapKey{Name: keyVaultCert.Name, Version: keyVaultCert.Version, Enabled: isEnabled} keymanagementprovider.DeleteCertificateFromMap(s.resource, mapKey) @@ -194,7 +194,7 @@ func (s *akvKMProvider) GetCertificates(ctx context.Context) (map[keymanagementp return nil, nil, fmt.Errorf("failed to get secret objectName:%s, objectVersion:%s, error: %w", keyVaultCert.Name, keyVaultCert.Version, err) } - certResult, certProperty, err := getCertsFromSecretBundle(ctx, secretBundle, keyVaultCert.Name, strconv.FormatBool(isEnabled)) + certResult, certProperty, err := getCertsFromSecretBundle(ctx, secretBundle, keyVaultCert.Name, isEnabled) if err != nil { return nil, nil, fmt.Errorf("failed to get certificates from secret bundle:%w", err) } @@ -229,7 +229,7 @@ func (s *akvKMProvider) GetKeys(ctx context.Context) (map[keymanagementprovider. if !isEnabled { startTime := time.Now() lastRefreshed := startTime.Format(time.RFC3339) - properties := getStatusProperty(keyVaultKey.Name, keyVaultKey.Version, strconv.FormatBool(isEnabled), lastRefreshed) + properties := getStatusProperty(keyVaultKey.Name, keyVaultKey.Version, lastRefreshed, isEnabled) keysStatus = append(keysStatus, properties) mapKey := keymanagementprovider.KMPMapKey{Name: keyVaultKey.Name, Version: keyVaultKey.Version, Enabled: isEnabled} keymanagementprovider.DeleteKeyFromMap(s.resource, mapKey) @@ -242,7 +242,7 @@ func (s *akvKMProvider) GetKeys(ctx context.Context) (map[keymanagementprovider. } keysMap[keymanagementprovider.KMPMapKey{Name: keyVaultKey.Name, Version: keyVaultKey.Version, Enabled: isEnabled}] = publicKey metrics.ReportAKVCertificateDuration(ctx, time.Since(startTime).Milliseconds(), keyVaultKey.Name) - properties := getStatusProperty(keyVaultKey.Name, keyVaultKey.Version, strconv.FormatBool(isEnabled), time.Now().Format(time.RFC3339)) + properties := getStatusProperty(keyVaultKey.Name, keyVaultKey.Version, time.Now().Format(time.RFC3339), isEnabled) keysStatus = append(keysStatus, properties) } @@ -261,11 +261,11 @@ func getStatusMap(statusMap []map[string]string, contentType string) keymanageme } // return a status object that consist of the cert/key name, version, enabled and last refreshed time -func getStatusProperty(name, version, enabled, lastRefreshed string) map[string]string { +func getStatusProperty(name, version, lastRefreshed string, enabled bool) map[string]string { properties := map[string]string{} properties[types.StatusName] = name properties[types.StatusVersion] = version - properties[types.StatusEnabled] = enabled + properties[types.StatusEnabled] = strconv.FormatBool(enabled) properties[types.StatusLastRefreshed] = lastRefreshed return properties } @@ -300,7 +300,7 @@ func initializeKvClient(ctx context.Context, keyVaultEndpoint, tenantID, clientI // Parse the secret bundle and return an array of certificates // In a certificate chain scenario, all certificates from root to leaf will be returned -func getCertsFromSecretBundle(ctx context.Context, secretBundle kv.SecretBundle, certName, enabled string) ([]*x509.Certificate, []map[string]string, error) { +func getCertsFromSecretBundle(ctx context.Context, secretBundle kv.SecretBundle, certName string, enabled bool) ([]*x509.Certificate, []map[string]string, error) { if secretBundle.ContentType == nil || secretBundle.Value == nil || secretBundle.ID == nil { return nil, nil, re.ErrorCodeCertInvalid.NewError(re.KeyManagementProvider, ProviderName, re.EmptyLink, nil, "found invalid secret bundle for certificate %s, contentType, value, and id must not be nil", re.HideStackTrace) } @@ -353,7 +353,7 @@ func getCertsFromSecretBundle(ctx context.Context, secretBundle kv.SecretBundle, } for _, cert := range decodedCerts { results = append(results, cert) - certProperty := getStatusProperty(certName, version, enabled, lastRefreshed) + certProperty := getStatusProperty(certName, version, lastRefreshed, enabled) certsStatus = append(certsStatus, certProperty) } default: diff --git a/pkg/keymanagementprovider/azurekeyvault/provider_test.go b/pkg/keymanagementprovider/azurekeyvault/provider_test.go index a812d21b0..c9af375a7 100644 --- a/pkg/keymanagementprovider/azurekeyvault/provider_test.go +++ b/pkg/keymanagementprovider/azurekeyvault/provider_test.go @@ -475,9 +475,9 @@ func TestGetStatusProperty(t *testing.T) { timeNow := time.Now().String() certName := "certName" certVersion := "versionABC" - isEnabled := "true" + isEnabled := true - status := getStatusProperty(certName, certVersion, isEnabled, timeNow) + status := getStatusProperty(certName, certVersion, timeNow, isEnabled) assert.Equal(t, certName, status[types.StatusName]) assert.Equal(t, timeNow, status[types.StatusLastRefreshed]) assert.Equal(t, certVersion, status[types.StatusVersion]) @@ -537,7 +537,7 @@ func TestGetCertsFromSecretBundle(t *testing.T) { ContentType: &cases[i].contentType, } - certs, status, err := getCertsFromSecretBundle(context.Background(), testdata, "certName", "true") + certs, status, err := getCertsFromSecretBundle(context.Background(), testdata, "certName", true) if tc.expectedErr { assert.NotNil(t, err) assert.Nil(t, certs) diff --git a/pkg/keymanagementprovider/azurekeyvault/types/types.go b/pkg/keymanagementprovider/azurekeyvault/types/types.go index e51650dab..a657bc358 100644 --- a/pkg/keymanagementprovider/azurekeyvault/types/types.go +++ b/pkg/keymanagementprovider/azurekeyvault/types/types.go @@ -26,7 +26,7 @@ const ( // Certificate version string for the certificate status property StatusVersion = "Version" // Enabled string for the certificate status property - StatusEnabled = "Enabled" + StatusEnabled = "true" // Last refreshed string for the certificate status property StatusLastRefreshed = "LastRefreshed" )