Fix api client references

Author: trotttrotttrott

grafana/resource_folder_permission.go

@@ -70,10 +70,10 @@ func UpdateFolderPermissions(d *schema.ResourceData, meta interface{}) error {
 			permissionItem.Role = permission["role"].(string)
 		}
 		if permission["team_id"].(int) != -1 {
-			permissionItem.TeamId = int64(permission["team_id"].(int))
+			permissionItem.TeamID = int64(permission["team_id"].(int))
 		}
 		if permission["user_id"].(int) != -1 {
-			permissionItem.UserId = int64(permission["user_id"].(int))
+			permissionItem.UserID = int64(permission["user_id"].(int))
 		}
 		permissionItem.Permission = mapPermissionStringToInt64(permission["permission"].(string))
 		permissionList.Items = append(permissionList.Items, &permissionItem)
@@ -110,11 +110,11 @@ func ReadFolderPermissions(d *schema.ResourceData, meta interface{}) error {
 	permissionItems := make([]interface{}, len(folderPermissions))
 	count := 0
 	for _, permission := range folderPermissions {
-		if permission.FolderUid != "" {
+		if permission.FolderUID != "" {
 			permissionItem := make(map[string]interface{})
 			permissionItem["role"] = permission.Role
-			permissionItem["team_id"] = permission.TeamId
-			permissionItem["user_id"] = permission.UserId
+			permissionItem["team_id"] = permission.TeamID
+			permissionItem["user_id"] = permission.UserID
 			permissionItem["permission"] = mapPermissionInt64ToString(permission.Permission)
 
 			permissionItems[count] = permission

grafana/resource_folder_permission_test.go

@@ -86,7 +86,7 @@ func testAccFolderPermissionsRemoval(permissions *gapi.FolderPermission) resourc
 	return func(s *terraform.State) error {
 		//since the permissions aren't deleted, let's just check if we have empty permissions
 		client := testAccProvider.Meta().(*gapi.Client)
-		newPermissions, err := client.FolderPermissions(permissions.FolderUid)
+		newPermissions, err := client.FolderPermissions(permissions.FolderUID)
 		if err != nil {
 			return fmt.Errorf(err.Error())
 		}
@@ -105,14 +105,14 @@ resource "grafana_folder" "testFolder" {
 resource "grafana_team" "testTeam" {
   name = "terraform-test-team-permissions"
 }
-  
+
 resource "grafana_user" "testAdminUser" {
   email    = "terraform-test-permissions@localhost"
   name     = "Terraform Test Permissions"
   login    = "ttp"
   password = "zyx987"
 }
-  
+
 resource "grafana_folder_permission" "testPermission" {
   folder_uid = grafana_folder.testFolder.uid
   permissions {
@@ -141,7 +141,7 @@ resource "grafana_folder" "testFolder" {
 resource "grafana_team" "testTeam" {
   name = "terraform-test-team-permissions"
 }
-  
+
 resource "grafana_user" "testAdminUser" {
   email    = "terraform-test-permissions@localhost"
   name     = "Terraform Test Permissions"