From 234470fd29f9270bcb4a261f9ca17f7dfb22b931 Mon Sep 17 00:00:00 2001 From: Douglas Parsons Date: Fri, 19 Aug 2022 16:56:08 +0100 Subject: [PATCH 1/2] Add a test for windows line ending in deployment --- vercel/example/windows_line_ending.png | Bin 0 -> 20349 bytes vercel/resource_deployment.go | 1 + vercel/resource_deployment_test.go | 10 +++++++++- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 vercel/example/windows_line_ending.png diff --git a/vercel/example/windows_line_ending.png b/vercel/example/windows_line_ending.png new file mode 100644 index 0000000000000000000000000000000000000000..943a2eb825258f66f32f825e8cfd4d9383bfde53 GIT binary patch literal 20349 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 literal 0 HcmV?d00001 diff --git a/vercel/resource_deployment.go b/vercel/resource_deployment.go index c01b6d77..6c1f44af 100644 --- a/vercel/resource_deployment.go +++ b/vercel/resource_deployment.go @@ -274,6 +274,7 @@ func (r resourceDeployment) Create(ctx context.Context, req resource.CreateReque ) return } + content = removeCRLF(content) err = r.p.client.CreateFile(ctx, client.CreateFileRequest{ Filename: normaliseFilename(f.File, plan.PathPrefix), diff --git a/vercel/resource_deployment_test.go b/vercel/resource_deployment_test.go index b639aa6b..2c3a8666 100644 --- a/vercel/resource_deployment_test.go +++ b/vercel/resource_deployment_test.go @@ -276,12 +276,20 @@ data "vercel_file" "index" { path = "example/index.html" } +data "vercel_file" "windows_line_ending" { + path = "example/windows_line_ending.png" +} + resource "vercel_deployment" "test" { %[2]s %[3]s project_id = vercel_project.test.id - files = data.vercel_file.index.file + files = merge( + data.vercel_file.index.file, + data.vercel_file.windows_line_ending.file, + ) + production = true } `, projectSuffix, teamID, deploymentExtras) From 6a574c24acbb8498f7ba879869a0e9770181c199 Mon Sep 17 00:00:00 2001 From: Douglas Parsons Date: Mon, 22 Aug 2022 09:02:20 +0100 Subject: [PATCH 2/2] Remove problematic gitlab test --- vercel/provider_test.go | 4 ---- vercel/resource_deployment_test.go | 26 ++++++-------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/vercel/provider_test.go b/vercel/provider_test.go index 7f800e31..c5c98b00 100644 --- a/vercel/provider_test.go +++ b/vercel/provider_test.go @@ -47,10 +47,6 @@ func testGithubRepo() string { return os.Getenv("VERCEL_TERRAFORM_TESTING_GITHUB_REPO") } -func testGitlabRepo() string { - return os.Getenv("VERCEL_TERRAFORM_TESTING_GITLAB_REPO") -} - func testBitbucketRepo() string { return os.Getenv("VERCEL_TERRAFORM_TESTING_BITBUCKET_REPO") } diff --git a/vercel/resource_deployment_test.go b/vercel/resource_deployment_test.go index 2c3a8666..add4e781 100644 --- a/vercel/resource_deployment_test.go +++ b/vercel/resource_deployment_test.go @@ -234,7 +234,6 @@ func TestAcc_DeploymentWithGitSource(t *testing.T) { Config: testAccDeployFromGitSource(projectSuffix, teamIDConfig()), Check: resource.ComposeAggregateTestCheckFunc( testAccDeploymentExists("vercel_deployment.bitbucket", testTeam()), - testAccDeploymentExists("vercel_deployment.gitlab", testTeam()), testAccDeploymentExists("vercel_deployment.github", testTeam()), ), }, @@ -344,38 +343,25 @@ resource "vercel_project" "github" { type = "github" repo = "%[2]s" } - %[5]s -} -resource "vercel_project" "gitlab" { - name = "test-acc-deployment-%[1]s-gitlab" - git_repository = { - type = "gitlab" - repo = "%[3]s" - } - %[5]s + %[4]s } resource "vercel_project" "bitbucket" { name = "test-acc-deployment-%[1]s-bitbucket" git_repository = { type = "bitbucket" - repo = "%[4]s" + repo = "%[3]s" } - %[5]s + %[4]s } resource "vercel_deployment" "github" { project_id = vercel_project.github.id ref = "main" - %[5]s -} -resource "vercel_deployment" "gitlab" { - project_id = vercel_project.gitlab.id - ref = "main" - %[5]s + %[4]s } resource "vercel_deployment" "bitbucket" { project_id = vercel_project.bitbucket.id ref = "main" - %[5]s + %[4]s } -`, projectSuffix, testGithubRepo(), testGitlabRepo(), testBitbucketRepo(), teamID) +`, projectSuffix, testGithubRepo(), testBitbucketRepo(), teamID) }