Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace resty multiparts form upload for artifactory_artifact resource #1164

Merged
merged 3 commits into from
Jan 7, 2025
Merged

Replace resty multiparts form upload for artifactory_artifact resource #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1da7aa8
Replace resty multiparts form upload
alexhung Jan 6, 2025
4e0d7f6
Update CHANGELOG
alexhung Jan 6, 2025
e9ea017
Merge branch 'master' into GH-1083-fix-artifact-file-content-request
alexhung Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ IMPROVEMENTS:

* resource/artifactory_\*\_custom_webhook: Add attribute `method` to support setting HTTP method. PR: [#1160](https://github.com/jfrog/terraform-provider-artifactory/pull/1160) and [#1163](https://github.com/jfrog/terraform-provider-artifactory/pull/1163)

BUG FIXES:

* resource/artifactory_artifact: Fix artifact upload incorrectly (using multipart form vs raw binary data). Issue: [#1083](https://github.com/jfrog/terraform-provider-artifactory/issues/1083) PR: [#1164](https://github.com/jfrog/terraform-provider-artifactory/pull/1164)

## 12.7.1 (December 18, 2024). Tested on Artifactory 7.98.11 with Terraform 1.10.2 and OpenTofu 1.8.7

BUG FIXES:
Expand Down
22 changes: 20 additions & 2 deletions pkg/artifactory/resource/artifact/resource_artifactory_artifact.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,18 @@ func (r *ArtifactResource) Create(ctx context.Context, req resource.CreateReques
defer os.Remove(localFilePath)
}

// open the file as stream
f, err := os.Open(localFilePath)
if err != nil {
utilfw.UnableToCreateResourceError(resp, err.Error())
return
}
defer f.Close()

response, err := r.ProviderData.Client.R().
SetRawPathParam("repo_target_path", repo_target_path).
SetFile(plan.Path.ValueString(), localFilePath).
SetHeader("Content-Type", "application/octet-stream").
SetBody(f).
SetResult(&result).
Put("/artifactory/{repo_target_path}")

Expand Down Expand Up @@ -331,9 +340,18 @@ func (r *ArtifactResource) Update(ctx context.Context, req resource.UpdateReques
defer os.Remove(localFilePath)
}

// open the file as stream
f, err := os.Open(localFilePath)
if err != nil {
utilfw.UnableToUpdateResourceError(resp, err.Error())
return
}
defer f.Close()

response, err := r.ProviderData.Client.R().
SetRawPathParam("repo_target_path", repo_target_path).
SetFile(plan.Path.ValueString(), localFilePath).
SetHeader("Content-Type", "application/octet-stream").
SetBody(f).
SetResult(&result).
Put("/artifactory/{repo_target_path}")

Expand Down
58 changes: 56 additions & 2 deletions pkg/artifactory/resource/artifact/resource_artifactory_artifact_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ func TestAccArtifact_filepath(t *testing.T) {
}
config := util.ExecuteTemplate(name, temp, testData)

updatedTestData := map[string]string{
"name": name,
"repoName": repoName,
"path": "/foo/bar/multi1-3.7-20220310.233748-1.jar",
"filePath": "../../../../samples/multi1-3.7-20220310.233859-2.jar",
}
updatedConfig := util.ExecuteTemplate(name, temp, updatedTestData)

resource.Test(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
Expand All @@ -56,7 +64,23 @@ func TestAccArtifact_filepath(t *testing.T) {
resource.TestCheckResourceAttrSet(fqrn, "created_by"),
resource.TestCheckResourceAttrSet(fqrn, "download_uri"),
resource.TestCheckResourceAttrSet(fqrn, "mime_type"),
resource.TestCheckResourceAttrSet(fqrn, "size"),
resource.TestCheckResourceAttr(fqrn, "size", "1034"),
resource.TestCheckResourceAttrSet(fqrn, "uri"),
),
},
{
Config: updatedConfig,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(fqrn, "repository", repoName),
resource.TestCheckResourceAttr(fqrn, "path", updatedTestData["path"]),
resource.TestCheckResourceAttrSet(fqrn, "checksum_md5"),
resource.TestCheckResourceAttrSet(fqrn, "checksum_sha1"),
resource.TestCheckResourceAttrSet(fqrn, "checksum_sha256"),
resource.TestCheckResourceAttrSet(fqrn, "created"),
resource.TestCheckResourceAttrSet(fqrn, "created_by"),
resource.TestCheckResourceAttrSet(fqrn, "download_uri"),
resource.TestCheckResourceAttrSet(fqrn, "mime_type"),
resource.TestCheckResourceAttr(fqrn, "size", "1034"),
resource.TestCheckResourceAttrSet(fqrn, "uri"),
),
},
Expand Down Expand Up @@ -93,6 +117,20 @@ func TestAccArtifact_content_base64(t *testing.T) {
}
config := util.ExecuteTemplate(name, temp, testData)

updatedData, err := os.ReadFile("../../../../samples/multi1-3.7-20220310.233859-2.jar")
if err != nil {
t.Fatalf("failed to read file. %v", err)
return
}

updatedTestData := map[string]string{
"name": name,
"repoName": repoName,
"path": "/foo/bar/multi1-3.7-20220310.233748-1.jar",
"content": base64.StdEncoding.EncodeToString(updatedData),
}
updatedConfig := util.ExecuteTemplate(name, temp, updatedTestData)

resource.Test(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
ProtoV6ProviderFactories: acctest.ProtoV6MuxProviderFactories,
Expand All @@ -110,7 +148,23 @@ func TestAccArtifact_content_base64(t *testing.T) {
resource.TestCheckResourceAttrSet(fqrn, "created_by"),
resource.TestCheckResourceAttrSet(fqrn, "download_uri"),
resource.TestCheckResourceAttrSet(fqrn, "mime_type"),
resource.TestCheckResourceAttrSet(fqrn, "size"),
resource.TestCheckResourceAttr(fqrn, "size", "1034"),
resource.TestCheckResourceAttrSet(fqrn, "uri"),
),
},
{
Config: updatedConfig,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(fqrn, "repository", repoName),
resource.TestCheckResourceAttr(fqrn, "path", updatedTestData["path"]),
resource.TestCheckResourceAttrSet(fqrn, "checksum_md5"),
resource.TestCheckResourceAttrSet(fqrn, "checksum_sha1"),
resource.TestCheckResourceAttrSet(fqrn, "checksum_sha256"),
resource.TestCheckResourceAttrSet(fqrn, "created"),
resource.TestCheckResourceAttrSet(fqrn, "created_by"),
resource.TestCheckResourceAttrSet(fqrn, "download_uri"),
resource.TestCheckResourceAttrSet(fqrn, "mime_type"),
resource.TestCheckResourceAttr(fqrn, "size", "1034"),
resource.TestCheckResourceAttrSet(fqrn, "uri"),
),
},
Expand Down
Loading