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

Jump to bottom

fix: use suppressQuoting to fix stage file_format permadiff #2885

Merged
merged 2 commits into from
Jun 27, 2024
Merged

fix: use suppressQuoting to fix stage file_format permadiff #2885

merged 2 commits into from
Jun 27, 2024

Conversation

guillaumelecerf
Copy link
Contributor

@guillaumelecerf guillaumelecerf commented Jun 21, 2024 •
edited
Loading

We are getting permadiff on stage file_format parameter when it contains quotes, as it used to be the case with copy_options (see #2679)

To fix it, re-using the same DiffSuppressFunc seems to do the trick.

Test Plan

  • acceptance tests
  • locally built tested

@guillaumelecerf guillaumelecerf changed the title Fix file format permadiff Fix stage file_format permadiff Jun 21, 2024
@guillaumelecerf guillaumelecerf mentioned this pull request Jun 21, 2024
Open
@guillaumelecerf guillaumelecerf force-pushed the fix-file-format-permadiff branch 3 times, most recently from 6ec9f8b to c6f7618 Compare June 24, 2024 08:17
@guillaumelecerf guillaumelecerf force-pushed the fix-file-format-permadiff branch from c6f7618 to b4a521a Compare June 25, 2024 07:59
@sfc-gh-jcieslak
Copy link
Collaborator

/ok-to-test sha=b4a521aa5c403971bd1da08c77d1011142c9c09e

@guillaumelecerf guillaumelecerf changed the title Fix stage file_format permadiff fix: use suppressQuoting to fix stage file_format permadiff Jun 26, 2024
@guillaumelecerf guillaumelecerf force-pushed the fix-file-format-permadiff branch from b4a521a to ff222b7 Compare June 26, 2024 09:45
@guillaumelecerf
Copy link
Contributor Author

@sfc-gh-jcieslak: thanks for the approval, I just fixed the PR title and rebased my branch on main.

@github-actions GitHub Actions
Copy link

Integration tests failure for b4a521aa5c403971bd1da08c77d1011142c9c09e

@guillaumelecerf
Copy link
Contributor Author

guillaumelecerf commented Jun 26, 2024 •
edited
Loading

IIUC, the integration test I'm adding is passing:

=== RUN   TestAcc_Stage_CreateAndAlter
    stage_acceptance_test.go:92: running check destroy for resource snowflake_stage
    check_destroy.go:28: found resource snowflake_stage in state
    check_destroy.go:41: resource snowflake_stage ("PZGAERAT_B4A521AA5C403971BD1DA08C77D1011142C9C09E"."OHXKXDAT_B4A521AA5C403971BD1DA08C77D1011142C9C09E"."BWHCDMAT_B4A521AA5C403971BD1DA08C77D1011142C9C09E") was dropped successfully in Snowflake
--- PASS: TestAcc_Stage_CreateAndAlter (12.51s)

@sfc-gh-jcieslak
Copy link
Collaborator

No problem, I'll ask the team to also take a look at it. The tests passed on CI (except the ones we have to fix, that's why it printed Integration tests failure for b4a521aa5c403971bd1da08c77d1011142c9c09e).

Thank you for your contribution :)

@sfc-gh-jcieslak
Copy link
Collaborator

/ok-to-test sha=ff222b7de59344137b453f2fdc97be5309277a23

@github-actions GitHub Actions
Copy link

Integration tests failure for ff222b7de59344137b453f2fdc97be5309277a23

@sfc-gh-asawicki sfc-gh-asawicki merged commit fd70f6e into Snowflake-Labs:main Jun 27, 2024
8 of 9 checks passed
@sfc-gh-asawicki
Copy link
Collaborator

Merged, Thanks for your contribution @guillaumelecerf!

@snowflake-release-please snowflake-release-please bot mentioned this pull request Jun 27, 2024
Merged
@guillaumelecerf guillaumelecerf deleted the fix-file-format-permadiff branch June 27, 2024 13:41
sfc-gh-jcieslak pushed a commit that referenced this pull request Jul 10, 2024
@snowflake-release-please
chore(main): release 0.93.0 (#2866)
ad74736 
🤖 I have created a release *beep* *boop*
---


##
[0.93.0](v0.92.0...v0.93.0)
(2024-07-10)


### 🎉 **What's new:**

* Add OAUTH integration for custom clients
([#2908](#2908))
([d9b557f](d9b557f))
* Add oauth integration for partner applications
([#2912](#2912))
([91788e5](91788e5))
* Add support for cortex search service
([#2860](#2860))
([43aa89f](43aa89f))
* API Authentication integration v1 readiness
([#2898](#2898))
([91931da](91931da))
* External Oauth integration v1 readiness
([#2907](#2907))
([ed237c3](ed237c3))
* Generate show outputs with mappers
([#2886](#2886))
([1cada88](1cada88))
* Introduce security integrations datasource
([#2892](#2892))
([7f6c657](7f6c657))
* SAML2 integration v1 readiness
([#2868](#2868))
([d0c136d](d0c136d))
* SCIM integration v1 readiness
([#2846](#2846))
([269df6b](269df6b))
* Security integrations datasource v1 readiness
([#2913](#2913))
([d10474a](d10474a))
* standard database v1 readiness
([#2842](#2842))
([3c11953](3c11953))
* Warehouse redesign final touches
([#2900](#2900))
([0eab636](0eab636))
* Warehouse redesign part1
([#2864](#2864))
([6664457](6664457))
* Warehouse redesign part2
([#2887](#2887))
([1aaf417](1aaf417))
* Warehouse redesign part3
([#2890](#2890))
([873a1ed](873a1ed))
* Warehouse redesign part4
([#2893](#2893))
([d525fd9](d525fd9))


### 🔧 **Misc**

* Add documentation on unset and defaults
([#2882](#2882))
([85a7836](85a7836))
* apply minor database changes
([#2872](#2872))
([6ccac59](6ccac59))
* Apply new resource conventions to scim integration
([#2891](#2891))
([e11e608](e11e608))
* Improve generator template organization
([#2820](#2820))
([5035e2f](5035e2f))
* Nuke stale objects
([#2869](#2869))
([9c4a117](9c4a117))
* Show a possible solution for
[#2877](https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/2877)
([#2878](#2878))
([6fb437b](6fb437b))
* Validations cleanup and old grants removal
([#2884](#2884))
([05b7eee](05b7eee))


### 🐛 **Bug fixes:**

* Add disclaimers and fix tests
([#2905](#2905))
([1deaedc](1deaedc))
* Fix cortex search service
([#2904](#2904))
([763d06c](763d06c))
* use suppressQuoting to fix stage file_format permadiff
([#2885](#2885))
([fd70f6e](fd70f6e))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: snowflake-release-please[bot] <105954990+snowflake-release-please[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sfc-gh-jmichalak sfc-gh-jmichalak sfc-gh-jmichalak approved these changes

@sfc-gh-asawicki sfc-gh-asawicki sfc-gh-asawicki approved these changes

@sfc-gh-jcieslak sfc-gh-jcieslak sfc-gh-jcieslak approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@guillaumelecerf @sfc-gh-jcieslak @sfc-gh-asawicki @sfc-gh-jmichalak