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.

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

resource/gitlab_repository_file: Support auto base64 encoding for content #972

Merged
merged 3 commits into from Mar 28, 2022

Conversation

timofurrer
Copy link
Member

@timofurrer timofurrer commented Mar 20, 2022

This change sets allows to specify not-yet base64 encoded content and the resource will automatically base64 encode it for the API.

This will make the plan match more readable and will solve the limitations described in #956

Initially I thought it's best to use a DiffSuppressFunc and always store the content as base64. However, I think it's best to store it in the same format (text vs. plan) as given in the config. This ensures that access the resource content in the config produces deterministic results.

Closes: #956

@timofurrer timofurrer added this to the v3.13.0 milestone Mar 20, 2022
@timofurrer timofurrer self-assigned this Mar 20, 2022
@timofurrer timofurrer changed the title resource/gitlab_repository_file: Support auto base64 encoding for contemt resource/gitlab_repository_file: Support auto base64 encoding for content Mar 20, 2022
@github-actions github-actions bot added the merge-conflict PR cannot be merged due to a merge conflict label Mar 21, 2022
@github-actions
Copy link

This pull request has merge conflicts. Please rebase your branch onto main.

@timofurrer timofurrer force-pushed the feature/repository-file-encoding branch from 2213453 to 5c2e9b7 Compare March 21, 2022 17:31
@github-actions github-actions bot removed the merge-conflict PR cannot be merged due to a merge conflict label Mar 21, 2022
@github-actions
Copy link

Conflicts are resolved. Thank you! 😀

@github-actions github-actions bot added the merge-conflict PR cannot be merged due to a merge conflict label Mar 22, 2022
@github-actions
Copy link

This pull request has merge conflicts. Please rebase your branch onto main.

@timofurrer timofurrer force-pushed the feature/repository-file-encoding branch from 5c2e9b7 to dc7ba1a Compare March 22, 2022 07:47
@github-actions github-actions bot removed the merge-conflict PR cannot be merged due to a merge conflict label Mar 22, 2022
@github-actions
Copy link

Conflicts are resolved. Thank you! 😀

@PatrickRice-KSC PatrickRice-KSC self-requested a review March 25, 2022 01:14
Copy link
Collaborator

@PatrickRice-KSC PatrickRice-KSC left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me @timofurrer - great work!

Copy link
Collaborator

@nagyv nagyv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving after @PatrickRice-KSC

@timofurrer timofurrer merged commit 13f1c1a into gitlabhq:main Mar 28, 2022
@github-actions
Copy link

This functionality has been released in v3.13.0 of the Terraform GitLab Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue. Thank you!

@github-actions github-actions bot locked and limited conversation to collaborators Nov 9, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
3 participants