PR fixes

Signed-off-by: GilTS <gil@terasky.com>

Author: GilTeraSky

internal/resources/custompolicytemplate/resource_custom_policy_template.go

@@ -36,7 +36,7 @@ func resourceCustomPolicyTemplateCreate(ctx context.Context, data *schema.Resour
 	model, err := tfModelConverter.ConvertTFSchemaToAPIModel(data, []string{})
 
 	if err != nil {
-		return diag.FromErr(errors.Wrapf(err, "Couldn't create IAM policy template."))
+		return diag.FromErr(errors.Wrapf(err, "Couldn't create custom policy template."))
 	}
 
 	request := &custompolicytemplatemodels.VmwareTanzuManageV1alpha1PolicyTemplateData{
@@ -46,7 +46,7 @@ func resourceCustomPolicyTemplateCreate(ctx context.Context, data *schema.Resour
 	_, err = config.TMCConnection.CustomPolicyTemplateResourceService.CustomPolicyTemplateResourceServiceCreate(request)
 
 	if err != nil {
-		return diag.FromErr(errors.Wrapf(err, "Couldn't create IAM policy template.\nName: %s", model.FullName.Name))
+		return diag.FromErr(errors.Wrapf(err, "Couldn't create custom policy template.\nName: %s", model.FullName.Name))
 	}
 
 	return resourceCustomPolicyTemplateRead(helper.GetContextWithCaller(ctx, helper.CreateState), data, m)
@@ -86,8 +86,8 @@ func resourceCustomPolicyTemplateRead(ctx context.Context, data *schema.Resource
 		return diag.FromErr(errors.Wrapf(err, "Couldn't read custom policy template."))
 	}
 
-	customIAMRoleFn := model.FullName
-	resp, err = config.TMCConnection.CustomPolicyTemplateResourceService.CustomPolicyTemplateResourceServiceGet(customIAMRoleFn)
+	customPolicyFn := model.FullName
+	resp, err = config.TMCConnection.CustomPolicyTemplateResourceService.CustomPolicyTemplateResourceServiceGet(customPolicyFn)
 
 	if err != nil {
 		if clienterrors.IsNotFoundError(err) {
@@ -104,15 +104,15 @@ func resourceCustomPolicyTemplateRead(ctx context.Context, data *schema.Resource
 			}
 		}
 
-		return diag.FromErr(errors.Wrapf(err, "Couldn't read custom policy template.\nName: %s", customIAMRoleFn.Name))
+		return diag.FromErr(errors.Wrapf(err, "Couldn't read custom policy template.\nName: %s", customPolicyFn.Name))
 	} else if resp != nil {
 		err = tfModelConverter.FillTFSchema(resp.Template, data)
 
 		if err != nil {
-			return diag.FromErr(errors.Wrapf(err, "Couldn't read custom policy template.\nName: %s", customIAMRoleFn.Name))
+			return diag.FromErr(errors.Wrapf(err, "Couldn't read custom policy template.\nName: %s", customPolicyFn.Name))
 		}
 
-		data.SetId(customIAMRoleFn.Name)
+		data.SetId(customPolicyFn.Name)
 	}
 
 	return diags
@@ -126,11 +126,11 @@ func resourceCustomPolicyTemplateDelete(ctx context.Context, data *schema.Resour
 		return diag.FromErr(errors.Wrapf(err, "Couldn't delete custom policy template."))
 	}
 
-	customIAMRoleFn := model.FullName
-	err = config.TMCConnection.CustomPolicyTemplateResourceService.CustomPolicyTemplateResourceServiceDelete(customIAMRoleFn)
+	customPolicyFn := model.FullName
+	err = config.TMCConnection.CustomPolicyTemplateResourceService.CustomPolicyTemplateResourceServiceDelete(customPolicyFn)
 
 	if err != nil {
-		return diag.FromErr(errors.Wrapf(err, "Couldn't delete custom policy template.\nName: %s", customIAMRoleFn.Name))
+		return diag.FromErr(errors.Wrapf(err, "Couldn't delete custom policy template.\nName: %s", customPolicyFn.Name))
 	}
 
 	return resourceCustomPolicyTemplateRead(helper.GetContextWithCaller(ctx, helper.DeleteState), data, m)
@@ -141,23 +141,23 @@ func resourceCustomPolicyTemplateImporter(_ context.Context, data *schema.Resour
 	customPolicyTemplateName := data.Id()
 
 	if customPolicyTemplateName == "" {
-		return nil, errors.New("Cluster ID must be set to the custom IAM role name.")
+		return nil, errors.New("Cluster ID must be set to the custom policy template name.")
 	}
 
-	customIAMRoleFn := &custompolicytemplatemodels.VmwareTanzuManageV1alpha1PolicyTemplateFullName{
+	customPolicyFn := &custompolicytemplatemodels.VmwareTanzuManageV1alpha1PolicyTemplateFullName{
 		Name: customPolicyTemplateName,
 	}
 
-	resp, err := config.TMCConnection.CustomPolicyTemplateResourceService.CustomPolicyTemplateResourceServiceGet(customIAMRoleFn)
+	resp, err := config.TMCConnection.CustomPolicyTemplateResourceService.CustomPolicyTemplateResourceServiceGet(customPolicyFn)
 
 	if err != nil || resp.Template == nil {
-		return nil, errors.Wrapf(err, "Couldn't read custom policy template.\nName: %s", customIAMRoleFn.Name)
+		return nil, errors.Wrapf(err, "Couldn't read custom policy template.\nName: %s", customPolicyFn.Name)
 	}
 
 	err = tfModelConverter.FillTFSchema(resp.Template, data)
 
 	if err != nil {
-		return nil, errors.Wrapf(err, "Couldn't read custom policy template.\nName: %s", customIAMRoleFn.Name)
+		return nil, errors.Wrapf(err, "Couldn't read custom policy template.\nName: %s", customPolicyFn.Name)
 	}
 
 	return []*schema.ResourceData{data}, err

internal/resources/custompolicytemplate/tests/custom_policy_template_test.go

@@ -6,7 +6,7 @@ Copyright © 2023 VMware, Inc. All Rights Reserved.
 SPDX-License-Identifier: MPL-2.0
 */
 
-package custompolicytemplatetests
+package custompolicytemplate
 
 import (
 	"fmt"

internal/resources/custompolicytemplate/tests/helper_test.go

@@ -6,7 +6,7 @@ Copyright © 2023 VMware, Inc. All Rights Reserved.
 SPDX-License-Identifier: MPL-2.0
 */
 
-package custompolicytemplatetests
+package custompolicytemplate
 
 import (
 	"testing"

internal/resources/custompolicytemplate/tests/resource_tf_configs.go

@@ -3,7 +3,7 @@ Copyright © 2023 VMware, Inc. All Rights Reserved.
 SPDX-License-Identifier: MPL-2.0
 */
 
-package custompolicytemplatetests
+package custompolicytemplate
 
 import (
 	"fmt"