refactor: update apiClient

Update `apiClient` to be more concise, where applicable. This is preferred in Go for its brevity and clarity. Signed-off-by: Ryan Johnson <[email protected]>
vmware · Aug 21, 2024 · e9b8988 · e9b8988
1 parent ccb8324
commit e9b8988
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 27 deletions.
diff --git a/internal/provider/data_source_cluster.go b/internal/provider/data_source_cluster.go
@@ -77,8 +77,7 @@ func DataSourceCluster() *schema.Resource {
 }
 
 func dataSourceClusterRead(ctx context.Context, data *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	vcfClient := meta.(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := meta.(*api_client.SddcManagerClient).ApiClient
 	clusterId := data.Get("cluster_id").(string)
 	_, err := cluster.ImportCluster(ctx, data, apiClient, clusterId)
 	if err != nil {

diff --git a/internal/provider/data_source_domain.go b/internal/provider/data_source_domain.go
@@ -84,8 +84,7 @@ func DataSourceDomain() *schema.Resource {
 }
 
 func dataSourceDomainRead(ctx context.Context, data *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	vcfClient := meta.(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := meta.(*api_client.SddcManagerClient).ApiClient
 	domainId := data.Get("domain_id").(string)
 
 	_, err := domain.ImportDomain(ctx, data, apiClient, domainId, true)

diff --git a/internal/provider/resource_ceip_test.go b/internal/provider/resource_ceip_test.go
@@ -37,8 +37,7 @@ func testAccVcfCeip() string {
 }
 
 func testVerifyVcfCeip(enabledState string) error {
-	vcfClient := testAccProvider.Meta().(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := testAccProvider.Meta().(*api_client.SddcManagerClient).ApiClient
 
 	ceipResult, err := apiClient.CEIP.GetCEIPStatus(nil)
 	if err != nil {

diff --git a/internal/provider/resource_certificate.go b/internal/provider/resource_certificate.go
@@ -110,8 +110,7 @@ func resourceResourceCertificateCreate(ctx context.Context, data *schema.Resourc
 }
 
 func resourceResourceCertificateRead(ctx context.Context, data *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	vcfClient := meta.(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := meta.(*api_client.SddcManagerClient).ApiClient
 
 	csrID := data.Get("csr_id").(string)
 	csrIdComponents := strings.Split(csrID, ":")

diff --git a/internal/provider/resource_certificate_authority_test.go b/internal/provider/resource_certificate_authority_test.go
@@ -88,8 +88,7 @@ func testAccVcfCertificateAuthorityOpenSsl() string {
 }
 
 func testVerifyVcfCertificateAuthority(caType string) error {
-	vcfClient := testAccProvider.Meta().(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := testAccProvider.Meta().(*api_client.SddcManagerClient).ApiClient
 
 	getCertificateAuthorityParams := &certificates.GetCertificateAuthorityByIDParams{
 		ID:      caType,

diff --git a/internal/provider/resource_cluster.go b/internal/provider/resource_cluster.go
@@ -55,8 +55,7 @@ func ResourceCluster() *schema.Resource {
 		DeleteContext: resourceClusterDelete,
 		Importer: &schema.ResourceImporter{
 			StateContext: func(ctx context.Context, data *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
-				vcfClient := meta.(*api_client.SddcManagerClient)
-				apiClient := vcfClient.ApiClient
+				apiClient := meta.(*api_client.SddcManagerClient).ApiClient
 				clusterId := data.Id()
 				return cluster.ImportCluster(ctx, data, apiClient, clusterId)
 			},
@@ -262,8 +261,7 @@ func resourceClusterCreate(ctx context.Context, data *schema.ResourceData, meta
 }
 
 func resourceClusterRead(ctx context.Context, data *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	vcfClient := meta.(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := meta.(*api_client.SddcManagerClient).ApiClient
 
 	getClusterParams := clusters.NewGetClusterParamsWithContext(ctx).
 		WithTimeout(constants.DefaultVcfApiCallTimeout)

diff --git a/internal/provider/resource_cluster_test.go b/internal/provider/resource_cluster_test.go
@@ -526,8 +526,7 @@ func getStretchConfig() string {
 }
 
 func testCheckVcfClusterDestroy(state *terraform.State) error {
-	vcfClient := testAccProvider.Meta().(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := testAccProvider.Meta().(*api_client.SddcManagerClient).ApiClient
 
 	for _, rs := range state.RootModule().Resources {
 		if rs.Type != "vcf_cluster" {

diff --git a/internal/provider/resource_domain_test.go b/internal/provider/resource_domain_test.go
@@ -496,8 +496,7 @@ func testGenerateCommissionHostConfigs(numberOfCommissionedHosts int, commission
 }
 
 func testCheckVcfDomainDestroy(state *terraform.State) error {
-	vcfClient := testAccProvider.Meta().(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := testAccProvider.Meta().(*api_client.SddcManagerClient).ApiClient
 
 	for _, rs := range state.RootModule().Resources {
 		if rs.Type != "vcf_domain" {

diff --git a/internal/provider/resource_external_certificate.go b/internal/provider/resource_external_certificate.go
@@ -140,8 +140,7 @@ func resourceResourceExternalCertificateCreate(ctx context.Context, data *schema
 }
 
 func resourceResourceExternalCertificateRead(ctx context.Context, data *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	vcfClient := meta.(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := meta.(*api_client.SddcManagerClient).ApiClient
 
 	csrID := data.Get("csr_id").(string)
 	csrIdComponents := strings.Split(csrID, ":")

diff --git a/internal/provider/resource_host.go b/internal/provider/resource_host.go
@@ -88,6 +88,7 @@ func ResourceHost() *schema.Resource {
 func resourceHostCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	vcfClient := meta.(*api_client.SddcManagerClient)
 	apiClient := vcfClient.ApiClient
+
 	params := hosts.NewCommissionHostsParamsWithTimeout(constants.DefaultVcfApiCallTimeout)
 	commissionSpec := models.HostCommissionSpec{}
 
@@ -158,8 +159,7 @@ func resourceHostCreate(ctx context.Context, d *schema.ResourceData, meta interf
 }
 
 func resourceHostRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
-	vcfClient := meta.(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := meta.(*api_client.SddcManagerClient).ApiClient
 
 	hostId := d.Id()
 
@@ -209,8 +209,8 @@ func resourceHostUpdate(ctx context.Context, d *schema.ResourceData, meta interf
 }
 
 func resourceHostDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	apiClient := meta.(*api_client.SddcManagerClient).ApiClient
 	vcfClient := meta.(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
 
 	params := hosts.NewDecommissionHostsParamsWithTimeout(constants.DefaultVcfApiCallTimeout)
 	decommissionSpec := models.HostDecommissionSpec{}

diff --git a/internal/provider/resource_host_test.go b/internal/provider/resource_host_test.go
@@ -140,8 +140,7 @@ func testAccVcfHostConfigNetworkPoolName(hostFqdn, hostSshPassword string) strin
 }
 
 func testCheckVcfHostDestroy(_ *terraform.State) error {
-	vcfClient := testAccProvider.Meta().(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := testAccProvider.Meta().(*api_client.SddcManagerClient).ApiClient
 
 	hosts, err := apiClient.Hosts.GetHosts(nil)
 	if err != nil {

diff --git a/internal/provider/resource_user_test.go b/internal/provider/resource_user_test.go
@@ -59,8 +59,7 @@ func testAccVcfUserConfig() string {
 }
 
 func testCheckVcfUserDestroy(_ *terraform.State) error {
-	vcfClient := testAccProvider.Meta().(*api_client.SddcManagerClient)
-	apiClient := vcfClient.ApiClient
+	apiClient := testAccProvider.Meta().(*api_client.SddcManagerClient).ApiClient
 
 	ok, err := apiClient.Users.GetUsers(nil)
 	if err != nil {