Release and bug bash fixes

docs/resources/api_token.md

@@ -13,7 +13,7 @@ API Token resource
 ## Example Usage
 
 ```terraform
-resource "astro_api_token" "example_organization_token" {
+resource "astro_api_token" "organization_token" {
   name        = "organization api token"
   description = "organization api token description"
   type        = "ORGANIZATION"
@@ -25,7 +25,7 @@ resource "astro_api_token" "example_organization_token" {
   expiry_period_in_days = 30
 }
 
-resource "astro_api_token" "example_organization_token_with_multiple_roles" {
+resource "astro_api_token" "organization_token_with_multiple_roles" {
   name        = "organization api token with multiple roles"
   description = "organization api token description"
   type        = "ORGANIZATION"
@@ -46,7 +46,7 @@ resource "astro_api_token" "example_organization_token_with_multiple_roles" {
   }]
 }
 
-resource "astro_api_token" "example_workspace_token" {
+resource "astro_api_token" "workspace_token" {
   name        = "workspace api token"
   description = "workspace api token description"
   type        = "WORKSPACE"
@@ -57,7 +57,7 @@ resource "astro_api_token" "example_workspace_token" {
   }]
 }
 
-resource "astro_api_token" "example_workspace_token_with_deployment_role" {
+resource "astro_api_token" "workspace_token_with_deployment_role" {
   name        = "workspace api token"
   description = "workspace api token description"
   type        = "WORKSPACE"
@@ -73,7 +73,7 @@ resource "astro_api_token" "example_workspace_token_with_deployment_role" {
   }]
 }
 
-resource "astro_api_token" "example_deployment_token" {
+resource "astro_api_token" "deployment_token" {
   name        = "deployment api token"
   description = "deployment api token description"
   type        = "DEPLOYMENT"
@@ -84,7 +84,7 @@ resource "astro_api_token" "example_deployment_token" {
   }]
 }
 
-resource "astro_api_token" "example_deployment_token_with_custom_role" {
+resource "astro_api_token" "deployment_token_with_custom_role" {
   name        = "deployment api token with custom role"
   description = "deployment api token description"
   type        = "DEPLOYMENT"
@@ -94,6 +94,22 @@ resource "astro_api_token" "example_deployment_token_with_custom_role" {
     "entity_type" : "DEPLOYMENT"
   }]
 }
+
+# Import an existing api token
+import {
+  id = "clxm46ged05b301neuucdqwox" // ID of the existing api token
+  to = astro_api_token.imported_api_token
+}
+resource "astro_api_token" "imported_api_token" {
+  name        = "imported api token"
+  description = "imported api token description"
+  type        = "ORGANIZATION"
+  roles = [{
+    "role" : "ORGANIZATION_OWNER",
+    "entity_id" : "clx42kkcm01fo01o06agtmshg",
+    "entity_type" : "ORGANIZATION"
+  }]
+}
 ```
 
 <!-- schema generated by tfplugindocs -->

docs/resources/team.md

@@ -13,9 +13,9 @@ Team resource
 ## Example Usage
 
 ```terraform
-resource "astro_team" "example" {
+resource "astro_team" "team" {
   name              = "team"
-  description       = "team-description"
+  description       = "team description"
   member_ids        = ["clhpichn8002m01mqa4ocs7g6"]
   organization_role = "ORGANIZATION_OWNER"
   workspace_roles = [{
@@ -28,10 +28,30 @@ resource "astro_team" "example" {
   }]
 }
 
-resource "astro_team" "example_with_no_optional_fields" {
+resource "astro_team" "team_with_no_optional_fields" {
   name              = "team"
   organization_role = "ORGANIZATION_OWNER"
 }
+
+# Import an existing team
+import {
+  id = "clx486hno068301il306nuhsm" # ID of the existing team
+  to = astro_team.imported_team
+}
+resource "astro_team" "imported_team" {
+  name              = "imported team"
+  description       = "imported team description"
+  member_ids        = ["clhpichn8002m01mqa4ocs7g6"]
+  organization_role = "ORGANIZATION_OWNER"
+  workspace_roles = [{
+    workspace_id = "clx42sxw501gl01o0gjenthnh"
+    role         = "WORKSPACE_OWNER"
+  }]
+  deployment_roles = [{
+    deployment_id = "clyn6kxud003x01mtxmccegnh"
+    role          = "DEPLOYMENT_ADMIN"
+  }]
+}
 ```
 
 <!-- schema generated by tfplugindocs -->

docs/resources/user_invite.md

@@ -13,7 +13,7 @@ User Invite resource
 ## Example Usage
 
 ```terraform
-resource "astro_user_invite" "example" {
+resource "astro_user_invite" "user_invite" {
   email = "email@organization.com"
   role  = "ORGANIZATION_MEMBER"
 }

docs/resources/user_roles.md

@@ -60,6 +60,32 @@ resource "astro_user_roles" "all_roles" {
     }
   ]
 }
+
+# Import an existing user roles
+import {
+  id = "clzaftcaz006001lhkey6qzzg" # ID of the existing user
+  to = astro_user_roles.imported_user_roles
+}
+resource "astro_user_roles" "imported_user_roles" {
+  user_id           = "clzaftcaz006001lhkey6qzzg"
+  organization_role = "ORGANIZATION_MEMBER"
+  workspace_roles = [
+    {
+      workspace_id = "clx42sxw501gl01o0gjenthnh"
+      role         = "WORKSPACE_OWNER"
+    },
+    {
+      workspace_id = "clzafte7z006001lhkey6qzzb"
+      role         = "WORKSPACE_MEMBER"
+    }
+  ]
+  deployment_roles = [
+    {
+      deployment_id = "clyn6kxud003x01mtxmccegnh"
+      role          = "my custom role"
+    }
+  ]
+}
 ```
 
 <!-- schema generated by tfplugindocs -->

examples/resources/astro_api_token/resource.tf

@@ -1,4 +1,4 @@
-resource "astro_api_token" "example_organization_token" {
+resource "astro_api_token" "organization_token" {
   name        = "organization api token"
   description = "organization api token description"
   type        = "ORGANIZATION"
@@ -10,7 +10,7 @@ resource "astro_api_token" "example_organization_token" {
   expiry_period_in_days = 30
 }
 
-resource "astro_api_token" "example_organization_token_with_multiple_roles" {
+resource "astro_api_token" "organization_token_with_multiple_roles" {
   name        = "organization api token with multiple roles"
   description = "organization api token description"
   type        = "ORGANIZATION"
@@ -31,7 +31,7 @@ resource "astro_api_token" "example_organization_token_with_multiple_roles" {
   }]
 }
 
-resource "astro_api_token" "example_workspace_token" {
+resource "astro_api_token" "workspace_token" {
   name        = "workspace api token"
   description = "workspace api token description"
   type        = "WORKSPACE"
@@ -42,7 +42,7 @@ resource "astro_api_token" "example_workspace_token" {
   }]
 }
 
-resource "astro_api_token" "example_workspace_token_with_deployment_role" {
+resource "astro_api_token" "workspace_token_with_deployment_role" {
   name        = "workspace api token"
   description = "workspace api token description"
   type        = "WORKSPACE"
@@ -58,7 +58,7 @@ resource "astro_api_token" "example_workspace_token_with_deployment_role" {
   }]
 }
 
-resource "astro_api_token" "example_deployment_token" {
+resource "astro_api_token" "deployment_token" {
   name        = "deployment api token"
   description = "deployment api token description"
   type        = "DEPLOYMENT"
@@ -69,7 +69,7 @@ resource "astro_api_token" "example_deployment_token" {
   }]
 }
 
-resource "astro_api_token" "example_deployment_token_with_custom_role" {
+resource "astro_api_token" "deployment_token_with_custom_role" {
   name        = "deployment api token with custom role"
   description = "deployment api token description"
   type        = "DEPLOYMENT"
@@ -79,3 +79,19 @@ resource "astro_api_token" "example_deployment_token_with_custom_role" {
     "entity_type" : "DEPLOYMENT"
   }]
 }
+
+# Import an existing api token
+import {
+  id = "clxm46ged05b301neuucdqwox" // ID of the existing api token
+  to = astro_api_token.imported_api_token
+}
+resource "astro_api_token" "imported_api_token" {
+  name        = "imported api token"
+  description = "imported api token description"
+  type        = "ORGANIZATION"
+  roles = [{
+    "role" : "ORGANIZATION_OWNER",
+    "entity_id" : "clx42kkcm01fo01o06agtmshg",
+    "entity_type" : "ORGANIZATION"
+  }]
+}

examples/resources/astro_team/resource.tf

@@ -1,6 +1,6 @@
-resource "astro_team" "example" {
+resource "astro_team" "team" {
   name              = "team"
-  description       = "team-description"
+  description       = "team description"
   member_ids        = ["clhpichn8002m01mqa4ocs7g6"]
   organization_role = "ORGANIZATION_OWNER"
   workspace_roles = [{
@@ -13,8 +13,27 @@ resource "astro_team" "example" {
   }]
 }
 
-resource "astro_team" "example_with_no_optional_fields" {
+resource "astro_team" "team_with_no_optional_fields" {
   name              = "team"
   organization_role = "ORGANIZATION_OWNER"
 }
 
+# Import an existing team
+import {
+  id = "clx486hno068301il306nuhsm" # ID of the existing team
+  to = astro_team.imported_team
+}
+resource "astro_team" "imported_team" {
+  name              = "imported team"
+  description       = "imported team description"
+  member_ids        = ["clhpichn8002m01mqa4ocs7g6"]
+  organization_role = "ORGANIZATION_OWNER"
+  workspace_roles = [{
+    workspace_id = "clx42sxw501gl01o0gjenthnh"
+    role         = "WORKSPACE_OWNER"
+  }]
+  deployment_roles = [{
+    deployment_id = "clyn6kxud003x01mtxmccegnh"
+    role          = "DEPLOYMENT_ADMIN"
+  }]
+}

examples/resources/astro_user_invite/resource.tf

@@ -1,4 +1,4 @@
-resource "astro_user_invite" "example" {
+resource "astro_user_invite" "user_invite" {
   email = "email@organization.com"
   role  = "ORGANIZATION_MEMBER"
 }

examples/resources/astro_user_roles/resource.tf

@@ -44,4 +44,30 @@ resource "astro_user_roles" "all_roles" {
       role          = "my custom role"
     }
   ]
+}
+
+# Import an existing user roles
+import {
+  id = "clzaftcaz006001lhkey6qzzg" # ID of the existing user
+  to = astro_user_roles.imported_user_roles
+}
+resource "astro_user_roles" "imported_user_roles" {
+  user_id           = "clzaftcaz006001lhkey6qzzg"
+  organization_role = "ORGANIZATION_MEMBER"
+  workspace_roles = [
+    {
+      workspace_id = "clx42sxw501gl01o0gjenthnh"
+      role         = "WORKSPACE_OWNER"
+    },
+    {
+      workspace_id = "clzafte7z006001lhkey6qzzb"
+      role         = "WORKSPACE_MEMBER"
+    }
+  ]
+  deployment_roles = [
+    {
+      deployment_id = "clyn6kxud003x01mtxmccegnh"
+      role          = "my custom role"
+    }
+  ]
 }

internal/provider/common/role.go

@@ -104,10 +104,10 @@ func ValidateWorkspaceDeploymentRoles(ctx context.Context, input ValidateWorkspa
 		DeploymentIds: &deploymentIds,
 	})
 	if err != nil {
-		tflog.Error(ctx, "failed to mutate Team roles", map[string]interface{}{"error": err})
+		tflog.Error(ctx, "failed to mutate roles", map[string]interface{}{"error": err})
 		return diag.Diagnostics{diag.NewErrorDiagnostic(
 			"Client Error",
-			fmt.Sprintf("Unable to mutate Team roles and list deployments, got error: %s", err),
+			fmt.Sprintf("Unable to mutate roles and list deployments, got error: %s", err),
 		),
 		}
 	}
@@ -129,9 +129,9 @@ func ValidateWorkspaceDeploymentRoles(ctx context.Context, input ValidateWorkspa
 	// check if deploymentWorkspaceIds are in workspaceIds
 	workspaceIds = lo.Intersect(lo.Uniq(workspaceIds), lo.Uniq(deploymentWorkspaceIds))
 	if len(workspaceIds) != len(deploymentWorkspaceIds) {
-		tflog.Error(ctx, "failed to mutate Team roles", map[string]interface{}{"error": err})
+		tflog.Error(ctx, "failed to mutate roles")
 		return diag.Diagnostics{diag.NewErrorDiagnostic(
-			"Unable to mutate Team roles, not every deployment role has a corresponding workspace role",
+			"Unable to mutate roles, not every deployment role has a corresponding workspace role",
 			"Please ensure that every deployment role has a corresponding workspace role",
 		),
 		}

internal/provider/models/team.go

@@ -64,7 +64,7 @@ func (data *TeamDataSource) ReadFromResponse(ctx context.Context, team *iam.Team
 	if team.RolesCount != nil {
 		data.RolesCount = types.Int64Value(int64(*team.RolesCount))
 	} else {
-		data.RolesCount = types.Int64Value(0)
+		data.RolesCount = types.Int64Value(1)
 	}
 
 	data.CreatedAt = types.StringValue(team.CreatedAt.String())

internal/provider/models/user_roles.go

@@ -25,7 +25,7 @@ func (data *UserRoles) ReadFromResponse(
 ) diag.Diagnostics {
 	var diags diag.Diagnostics
 	data.UserId = types.StringValue(userId)
-	data.OrganizationRole = types.StringPointerValue((*string)(userRoles.OrganizationRole))
+	data.OrganizationRole = types.StringValue(string(*userRoles.OrganizationRole))
 	data.WorkspaceRoles, diags = utils.ObjectSet(ctx, userRoles.WorkspaceRoles, schemas.WorkspaceRoleAttributeTypes(), WorkspaceRoleTypesObject)
 	if diags.HasError() {
 		return diags