From 4fc3170bcaea4c2f74021b009c804d23773c1e99 Mon Sep 17 00:00:00 2001 From: Douglas Parsons Date: Tue, 24 May 2022 17:29:20 +0100 Subject: [PATCH] Improve error messaging for mismatching team_id/project_id Affects resource_deployment and resource_project_domain --- vercel/resource_deployment.go | 10 ++++++++++ vercel/resource_project_domain.go | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/vercel/resource_deployment.go b/vercel/resource_deployment.go index fbd71d86..14ae507d 100644 --- a/vercel/resource_deployment.go +++ b/vercel/resource_deployment.go @@ -236,6 +236,16 @@ func (r resourceDeployment) Create(ctx context.Context, req tfsdk.CreateResource Ref: plan.Ref.Value, } + _, err = r.p.client.GetProject(ctx, plan.ProjectID.Value, plan.TeamID.Value) + var apiErr client.APIError + if err != nil && errors.As(err, &apiErr) && apiErr.StatusCode == 404 { + resp.Diagnostics.AddError( + "Error creating deployment", + "Could not find project, please make sure both the project_id and team_id match the project and team you wish to deploy to.", + ) + return + } + out, err := r.p.client.CreateDeployment(ctx, cdr, plan.TeamID.Value) var mfErr client.MissingFilesError if errors.As(err, &mfErr) { diff --git a/vercel/resource_project_domain.go b/vercel/resource_project_domain.go index 958e9ade..525c1efc 100644 --- a/vercel/resource_project_domain.go +++ b/vercel/resource_project_domain.go @@ -98,6 +98,16 @@ func (r resourceProjectDomain) Create(ctx context.Context, req tfsdk.CreateResou return } + _, err := r.p.client.GetProject(ctx, plan.ProjectID.Value, plan.TeamID.Value) + var apiErr client.APIError + if err != nil && errors.As(err, &apiErr) && apiErr.StatusCode == 404 { + resp.Diagnostics.AddError( + "Error creating project domain", + "Could not find project, please make sure both the project_id and team_id match the project and team you wish to deploy to.", + ) + return + } + out, err := r.p.client.CreateProjectDomain(ctx, plan.ProjectID.Value, plan.TeamID.Value, plan.toCreateRequest()) if err != nil { resp.Diagnostics.AddError(