Do not change squash_merge/merge_commit if it is not allowed in conf #1834
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aheritier
approved these changes
Aug 11, 2023
abusi
approved these changes
Aug 11, 2023
|
🚀 |
kfcampbell
approved these changes
Aug 11, 2023
o-sama
pushed a commit
to o-sama/terraform-provider-github
that referenced
this pull request
Aug 19, 2023
…ntegrations#1834) Co-authored-by: Keegan Campbell <[email protected]>
o-sama
added a commit
to o-sama/terraform-provider-github
that referenced
this pull request
Aug 19, 2023
Add docs, update tests, small changes to rulesets octoherd: delete pull_request_template.md feat: add pull_request_template.md PR template feat: add data source to get organization members' SAML/SCIM linked identities (integrations#1778) * add `github_organization_external_identities` which returns a list of github organization members and their SAML linked identity * add docs * add more fields to external_identities * docs --------- Co-authored-by: Keegan Campbell <[email protected]> fix: Github Environments Policy feature causing the provider to produce inconsistent result (integrations#1799) * Add deployment policy resource - Add the initial code to manage the resource - Add sample configuration used to test it TODO - Documentation - Tests * Add schema description * Fix creation of resource ID * Add tests * Add documentation * Add terraform import support * Undo example add * Fix formatting * PR feedback * fix: environment branch policy failing to find the created resource The `Read` operation of the Environments Branch Policy resource was failing to find the newly created Branch policies, due to wrongly encoded environment name. Which cause the provider to be inconsistent. This fix uses `url.PathEscape` instead of `url.QueryEscape` since we are using path parameters with the Github API in that case. Additionally 2 operations - `Read` and `Delete` don't need to use it as they receive the environment name already parsed and attempting to encode it again breaks the name. * Fix incorrect merge --------- Co-authored-by: Massimiliano Donini <[email protected]> Co-authored-by: Keegan Campbell <[email protected]> Enforce valid chars in repo name (integrations#1806) * Enforce valid chars in repo name Signed-off-by: Benoit Donneaux <[email protected]> * Add dash to validate repo name Signed-off-by: Benoit Donneaux <[email protected]> * Better name validation message Signed-off-by: Benoit Donneaux <[email protected]> * Test repo name max length Signed-off-by: Benoit Donneaux <[email protected]> * Test space in repo name Signed-off-by: Benoit Donneaux <[email protected]> --------- Signed-off-by: Benoit Donneaux <[email protected]> Co-authored-by: Keegan Campbell <[email protected]> Use graphql rather than rest API for Github team membership (integrations#1786) This change should provide better diffing for team membership for teams with child teams. Currently, child team members are included in the parent team's members list and so diffs are incorrect. See [Issue 1193](integrations#1193). feat: add immediate-response.yml auto responder workflow build(deps): bump peter-evans/create-or-update-comment Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 6534843181fc2aeb7f9f1cd3cd4a7b956cada2db to 716151b9579b05352dbf244d48e968d211889bbc. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](peter-evans/create-or-update-comment@6534843...716151b) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Add Codespaces Organization Secret Repositories Resource. Add depends_on to prevent branch policy being created before the corresponding environment (which results in an error), add more detail about the error thrown if deployment_branch_policy.custom_branch_policies is not set to true, tf fmt example build(deps): bump peter-evans/create-or-update-comment (integrations#1830) Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 716151b9579b05352dbf244d48e968d211889bbc to 38217c6b94b54c0dbbe75be237257364e2dd2e62. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](peter-evans/create-or-update-comment@716151b...38217c6) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> build(deps): bump golang.org/x/crypto from 0.11.0 to 0.12.0 (integrations#1829) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.11.0 to 0.12.0. - [Commits](golang/crypto@v0.11.0...v0.12.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Keegan Campbell <[email protected]> build(deps): bump golang.org/x/oauth2 from 0.10.0 to 0.11.0 (integrations#1828) Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.10.0 to 0.11.0. - [Commits](golang/oauth2@v0.10.0...v0.11.0) --- updated-dependencies: - dependency-name: golang.org/x/oauth2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> fix: `github_repository_collaborators` - mark `invitation_ids` as changed when new user invited (integrations#1825) * fix: mark invitation_ids as changed if new user is invited * fix: documentation --------- Co-authored-by: Keegan Campbell <[email protected]> feat: expose SAML external identity exposed for GitHub user (integrations#1796) * create github_user_external_identity datasource * add scim information and error handling for bad username org combo * cleanup commentzs * add docs for external identity * move external identity to its own struct * add variable to make referencing external identity easier * add test * add documentation * remove old docs * add docs reference in github.erb --------- Co-authored-by: Keegan Campbell <[email protected]> Do not change squash_merge/merge_commit if it is not allowed in conf (integrations#1834) Co-authored-by: Keegan Campbell <[email protected]> build(deps): bump peter-evans/create-or-update-comment Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 38217c6b94b54c0dbbe75be237257364e2dd2e62 to 5f22cb87da9514ab329de42e5462372dc19928a5. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](peter-evans/create-or-update-comment@38217c6...5f22cb8) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> add primary_language to repository datasource add primary_language to repository resource add test to repository datasource add docs for primary_language change add test for resource update name of testcase run linting update comment Update to go-github v54
1 task
avidspartan1
pushed a commit
to avidspartan1/terraform-provider-github
that referenced
this pull request
Feb 5, 2024
…ntegrations#1834) Co-authored-by: Keegan Campbell <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello ✋ ,
Resolves #1730, #1541
Before the change?
When
allow_merge_commitis set tofalsewe send these attributes to the SDK (even if we haven't setted them)merge_commit_titlemerge_commit_messageWhen
allow_squash_mergeis set tofalsewe send these attributes to the SDK (even if we haven't setted them)squash_merge_commit_titlesquash_merge_commit_messageAfter the change?
allow_merge_commitis set tofalsewe don't send these attributes to the SDKallow_squash_mergeis set tofalsewe don't send these attributes to the SDKPull request checklist
Does this introduce a breaking change?
Please see our docs on breaking changes to help!