diff --git a/vercel/example/windows_line_ending.png b/vercel/example/windows_line_ending.png new file mode 100644 index 00000000..943a2eb8 Binary files /dev/null and b/vercel/example/windows_line_ending.png differ 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.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..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()), ), }, @@ -276,12 +275,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) @@ -336,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) }