feat(cloud-keystore): Adds cloud keystore data source to provider map

Adds logs to cloud keystore data source
Venafi · May 16, 2024 · 5cc82ed · 5cc82ed
1 parent 07913f8
commit 5cc82ed
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/venafi/data_source_cloudkeystore.go b/venafi/data_source_cloudkeystore.go
@@ -4,14 +4,16 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/Venafi/vcert/v5/pkg/endpoint"
-	"github.com/Venafi/vcert/v5/pkg/venafi/cloud"
+	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	"github.com/Venafi/vcert/v5/pkg/endpoint"
+	"github.com/Venafi/vcert/v5/pkg/venafi/cloud"
 )
 
 const (
-	cloudKeystoreProviderID             = "provider_id"
+	cloudKeystoreProviderID             = "cloud_provider_id"
 	cloudKeystoreName                   = "name"
 	cloudKeystoreType                   = "type"
 	cloudKeystoreMachineIdentitiesCount = "machine_identities_count"
@@ -59,16 +61,22 @@ func dataSourceCloudKeystoreRead(ctx context.Context, d *schema.ResourceData, me
 
 	providerID := d.Get(cloudKeystoreProviderID).(string)
 	keystoreName := d.Get(cloudKeystoreName).(string)
-
+	tflog.Info(ctx, "reading cloud keystore", map[string]interface{}{
+		cloudKeystoreProviderID: providerID,
+		cloudKeystoreName:       keystoreName,
+	})
 	keystore, err := connector.(*cloud.Connector).GetCloudKeystoreByName(providerID, keystoreName)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
 	d.SetId(keystore.ID)
-
 	err = d.Set(cloudKeystoreType, keystore.Type)
 	err = d.Set(cloudKeystoreMachineIdentitiesCount, keystore.MachineIdentitiesCount)
 
+	tflog.Info(ctx, "cloud keystore found", map[string]interface{}{
+		cloudKeystoreProviderID: providerID,
+		cloudKeystoreName:       keystoreName,
+	})
 	return nil
 }
diff --git a/venafi/data_source_cloudprovider.go b/venafi/data_source_cloudprovider.go
@@ -65,27 +65,13 @@ func dataSourceCloudProviderRead(ctx context.Context, d *schema.ResourceData, me
 	}
 
 	cpName := d.Get(cloudProviderName)
-	if cpName == nil {
-		return buildStandardDiagError("cloud provider name not provided")
-	}
-
 	tflog.Info(ctx, "reading cloud provider", map[string]interface{}{"name": cpName})
 	cpObject, err := connector.(*cloud.Connector).GetCloudProviderByName(cpName.(string))
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	tflog.Debug(ctx, "cloud provider details", map[string]interface{}{
-		"id":              cpObject.ID,
-		"name":            cpObject.Name,
-		"type":            cpObject.Type,
-		"status":          cpObject.Status,
-		"status_details":  cpObject.StatusDetails,
-		"keystores_count": cpObject.KeystoresCount,
-	})
-
 	d.SetId(cpObject.ID)
-
 	err = d.Set(cloudProviderType, cpObject.Type)
 	if err != nil {
 		return diag.FromErr(err)

diff --git a/venafi/provider.go b/venafi/provider.go
@@ -65,6 +65,9 @@ const (
 	providerTrustBundle    = "trust_bundle"
 	providerClientID       = "client_id"
 	providerSkipRetirement = "skip_retirement"
+
+	dataSourceCloudProvider = "venafi_cloud_provider"
+	dataSourceCloudKeystore = "venafi_cloud_keystore"
 )
 
 var (
@@ -183,7 +186,8 @@ Example:
 			"venafi_ssh_config":      resourceVenafiSshConfig(),
 		},
 		DataSourcesMap: map[string]*schema.Resource{
-			"venafi_cloud_provider": DataSourceCloudProvider(),
+			dataSourceCloudProvider: DataSourceCloudProvider(),
+			dataSourceCloudKeystore: DataSourceCloudKeystore(),
 		},
 		ConfigureContextFunc: providerConfigure,
 	}