fix: find correct permission by joshua-hancox · Pull Request #1230 · integrations/terraform-provider-github

joshua-hancox · 2022-07-22T11:04:32Z

attempt to fix: #1192 (closed)

Closes: #1183

This will allow to retrieve only the protected branches instead of the first 30. Co-authored-by: Keegan Campbell <me@kfcampbell.com>

This reverts commit ce4c046.

SharpEdgeMarshall · 2022-07-29T07:55:51Z

With this PR you are removing the support for custom role permissions, am I right?
We were waiting for the support of custom roles and then the PR was reverted, there's a way to make it work and keep the retrocompatibility?

* Switch to Go1.19 * Fix linting locally * Update linter version

* Initial commit of EMU data source * Set groups in state * Some renames * Correct google/go-github client version to v45 in new data source * Rename data source file to something more appropriate * Set a sensible ID * Add documentation for new data source * Fix website formatting

Co-authored-by: Keegan Campbell <me@kfcampbell.com>

* Add membership_type to data.github_team * Improve doc * Add extra integration test check Co-authored-by: Keegan Campbell <me@kfcampbell.com>

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de> Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>

* feat(github_ip_ranges): support for web and api CIDR blocks from meta API. * fix: Api --> API as per sdk changes. Re-adding accidentally removed Pages. Co-authored-by: Keegan Campbell <me@kfcampbell.com>

Co-authored-by: Keegan Campbell <me@kfcampbell.com>

* Update to latest version of github.com/golangci/golangci-lint * Grab latest version of gopkg.in/square/go-jose.v2 * Update away from vulnerable version of github.com/hashicorp/go-getter * Use compatible version of afero without chown method

* Refactor out branches attribute from resource_github_repository and data_source_github_repository to data_source_github_repository_branches * Add link to docs * Update github/data_source_github_repository_branches.go Co-authored-by: mareksapota-lyft <msapota@lyft.com> * Add only_protected_branches in data source github_repository (#1162) This will allow to retrieve only the protected branches instead of the first 30. Co-authored-by: Keegan Campbell <me@kfcampbell.com> * Remove mistakenly committed binary (#1223) * Revert PR #1162 (#1224) * marek's suggestion + use v47 Co-authored-by: mareksapota-lyft <msapota@lyft.com> Co-authored-by: Bertrand Paquet <bertrand.paquet@gmail.com> Co-authored-by: Keegan Campbell <me@kfcampbell.com>

* [Feature] New datasource github_repository_teams List the teams which have access to a repository * Update sdk version * Add .erb file Co-authored-by: Keegan Campbell <me@kfcampbell.com>

SharpEdgeMarshall · 2022-09-07T10:45:24Z

@joshua-hancox @kfcampbell any news? this is blocking us from adopting this provider

Luis-3M · 2022-09-12T14:06:03Z

We're also interested in having this fix available - quiet confusing to see TF plans that always report changes when using custom roles.

* Initial commit of README cleanup * Wording change, link fix

kfcampbell · 2022-11-01T20:58:57Z

github/resource_github_repository_collaborator.go

+				Optional:     true,
+				ForceNew:     true,
+				Default:      "push",
+				ValidateFunc: validateValueFunc([]string{"pull", "triage", "push", "maintain", "admin"}),


The addition of this ValidateFunc means that custom roles can no longer be used, correct?

nickfloyd · 2022-11-01T21:51:45Z

Hey @joshua-hancox I'd be glad to resolve those merge conflicts for you to move this along if you'd like. I'll need push or maintainer access to joshua-hancox:main, though so that we can get your fork synced with this repo. Let us know if you'd like us to handle that or if you'd be up for doing it!

joshua-hancox · 2022-11-02T10:04:15Z

@kfcampbell I don't believe that was part of my change here, sorry it's been ages since I looked at this.

@nickfloyd I doubt I have any time to look at this any time soon, I have added you as collaborator please feel free to carry on.

SharpEdgeMarshall · 2022-11-02T10:09:39Z

From my understanding this PR #1192 was good but didn't consider backwards compatibility.
May I propose to release a new major with those changes or add some kind of mapping to preserve old naming compatibility?
Sooner or later I think this provider should move to the new API version

…vite (#1290)

* Add release assets * Add assets to release documentation * Fix typo in documentation Co-authored-by: Keegan Campbell <me@kfcampbell.com>

* Include All Branches in template repositories When creating a repository from a template, you can pass in a boolean to include all the branches in the template repo. This is documented here: https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template In addition, the provider already supports that here: https://github.com/google/go-github/blob/3e8a7f0fbe0e4402f9ad5a80e0ab0a050786e0f8/github/repos.go#L441 Adding a variable under the template structure and then pass it in to the provider function works. Added tests to make sure it works. All tests are passing * Remove failing test. Nothing to see here, folks * Add clarifying doc note Co-authored-by: KensoDev <avi@kensodev.com>

* Fix assets_url typo * Add deprecation message * Follow instructions more closely Co-authored-by: Keegan Campbell <me@kfcampbell.com>

kfcampbell

I'll get this merged and released in the near future.

kfcampbell

Ahh oops I should've looked at the checks before approving 🤦

@joshua-hancox do you have any interest in fixing up the merge conflicts? If not, I can take a look at it at some point.

* new resource: github_actions_repository_permissions This commit adds the following new resources for modifying Actions permissions for a given repository: * `github_actions_repository_permissions` Resource is heavily modelled on the `github_actions_organization_permissions` resource. * Fixup the failing tests. * Only specify `AllowedActions` if actions are enabled on repo * Ensure that the `repository` param gets set when importing. * Fix the logic when deleting the repository permissions. * Fixup merge Co-authored-by: Keegan Campbell <me@kfcampbell.com>

joshua-hancox · 2022-11-10T11:44:46Z

Sorry @kfcampbell I don't think I will get time to look at this any time soon, if you'd like to please feel free to carry on, or I think @nickfloyd also planned to take a look at it.

kfcampbell · 2022-11-10T21:40:18Z

Sounds good! I've added the "Status: Up for grabs" label so the community can jump on the submission if anybody can get to it sooner rather than later.

This will allow to retrieve only the protected branches instead of the first 30. Co-authored-by: Keegan Campbell <me@kfcampbell.com>

This reverts commit ce4c046.

…vider-github into custom-roles

kfcampbell

I don't feel comfortable merging this PR given the diff/changes here. The commit history includes commits that I've force-pushed away, and I'm scared of reintroducing this incident merging this PR as-is.

I'm going to close this for the time being, and would be very receptive to reviewing PRs that cherry-pick relevant commits or reimplement the functionality.

kfcampbell · 2022-11-15T21:48:51Z

Oops, I accidentally "closed with comment" with a single g in the comment field. Now the body of this comment can't be blank.

bpaquet and others added 6 commits July 15, 2022 14:55

Add only_protected_branches in data source github_repository (#1162)

1bd34d6

This will allow to retrieve only the protected branches instead of the first 30. Co-authored-by: Keegan Campbell <me@kfcampbell.com>

Remove mistakenly committed binary (#1223)

5f1a989

Revert PR #1162 (#1224)

ce4c046

Revert "Revert PR #1162 (#1224)"

420a34d

This reverts commit ce4c046.

find correct permission

f419d7a

fix: remove dead code

82cd6da

joshua-hancox mentioned this pull request Jul 22, 2022

resource_github_team_repository cannot handle custom role after creation #1183

Closed

kfcampbell force-pushed the main branch from ce4c046 to 754d73f Compare July 27, 2022 23:48

kfcampbell added 3 commits July 27, 2022 17:04

Replaying the changes in #1162 without the binary (#1234)

10af5f2

Revert 754d73f (#1235)

d544bbc

Add default binary name to .gitignore (#1237)

942e965

kfcampbell and others added 13 commits August 10, 2022 16:31

Add note deprecating changelog (#1254)

b732b01

Switch to Go1.19 in CI check (#1256)

86e4b44

* Switch to Go1.19 * Fix linting locally * Update linter version

Support github_team_members role edits (#1216)

2c15b55

Co-authored-by: Keegan Campbell <me@kfcampbell.com>

Add membership_type to data.github_team (#1242)

772c71b

* Add membership_type to data.github_team * Improve doc * Add extra integration test check Co-authored-by: Keegan Campbell <me@kfcampbell.com>

Bump go-github to v46.0.0 (#1258)

b60a8af

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de> Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>

feat(github_ip_ranges): support for Web and API IP Ranges (#1220)

c753688

* feat(github_ip_ranges): support for web and api CIDR blocks from meta API. * fix: Api --> API as per sdk changes. Re-adding accidentally removed Pages. Co-authored-by: Keegan Campbell <me@kfcampbell.com>

Bump go-github to v47 (#1269)

cb52c61

Add support for default merge commit params (#1263)

cbb3d7e

Co-authored-by: Keegan Campbell <me@kfcampbell.com>

Bump to v1.17.2 (#1272)

1f14bb2

Bump non-Terraform dependencies. (#1274)

6119318

* Update to latest version of github.com/golangci/golangci-lint * Grab latest version of gopkg.in/square/go-jose.v2 * Update away from vulnerable version of github.com/hashicorp/go-getter * Use compatible version of afero without chown method

[Feature] New datasource github_repository_teams (#1244)

91e9a78

* [Feature] New datasource github_repository_teams List the teams which have access to a repository * Update sdk version * Add .erb file Co-authored-by: Keegan Campbell <me@kfcampbell.com>

kfcampbell added 3 commits September 13, 2022 16:35

Small README cleanup (#1282)

0b103e6

* Initial commit of README cleanup * Wording change, link fix

Small issue docs fix (#1285)

6fb72e3

Initial commit of bumping version number to v5 (#1288)

0ba3d4b

nickfloyd added the Priority: High label Nov 1, 2022

kfcampbell reviewed Nov 1, 2022

View reviewed changes

Merge branch 'main' into custom-roles

76bcc17

kfcampbell and others added 6 commits November 4, 2022 14:11

Initial commit of standardized templates

6bbcfdd

[maint] Add standardized issue templates

690a093

feat: closes #862 by adding a state attribute for the state of the in…

bbc334c

…vite (#1290)

Add release assets (#1195)

ffd6f0a

* Add release assets * Add assets to release documentation * Fix typo in documentation Co-authored-by: Keegan Campbell <me@kfcampbell.com>

Fix asserts_url typo (#1194)

baafae0

* Fix assets_url typo * Add deprecation message * Follow instructions more closely Co-authored-by: Keegan Campbell <me@kfcampbell.com>

kfcampbell approved these changes Nov 9, 2022

View reviewed changes

kfcampbell suggested changes Nov 9, 2022

View reviewed changes

kfcampbell added the Status: Up for grabs Issues that are ready to be worked on by anyone label Nov 10, 2022

nickfloyd and others added 7 commits November 14, 2022 14:27

feat: add pull_request_template.md PR template (#1354)

c2d19be

Add only_protected_branches in data source github_repository (#1162)

0602774

This will allow to retrieve only the protected branches instead of the first 30. Co-authored-by: Keegan Campbell <me@kfcampbell.com>

Remove mistakenly committed binary (#1223)

5cd82f6

find correct permission

3c93cdb

fix: remove dead code

10c5bc9

Revert "Revert PR #1162 (#1224)"

d212ebf

This reverts commit ce4c046.

Merge branch 'custom-roles' of github.com:joshua-hancox/terraform-pro…

ac9e797

…vider-github into custom-roles

nickfloyd requested a review from kfcampbell November 15, 2022 20:06

kfcampbell suggested changes Nov 15, 2022

View reviewed changes

kfcampbell closed this Nov 15, 2022

SharpEdgeMarshall mentioned this pull request Nov 17, 2022

Add support to custom roles #1369

Merged

5 tasks

Conversation

joshua-hancox commented Jul 22, 2022 • edited by nickfloyd Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SharpEdgeMarshall commented Jul 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SharpEdgeMarshall commented Sep 7, 2022

Uh oh!

Luis-3M commented Sep 12, 2022

Uh oh!

kfcampbell Nov 1, 2022

Choose a reason for hiding this comment

Uh oh!

nickfloyd commented Nov 1, 2022

Uh oh!

joshua-hancox commented Nov 2, 2022

Uh oh!

SharpEdgeMarshall commented Nov 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kfcampbell left a comment

Choose a reason for hiding this comment

Uh oh!

kfcampbell left a comment

Choose a reason for hiding this comment

Uh oh!

joshua-hancox commented Nov 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kfcampbell commented Nov 10, 2022

Uh oh!

kfcampbell left a comment

Choose a reason for hiding this comment

Uh oh!

kfcampbell commented Nov 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

joshua-hancox commented Jul 22, 2022 •

edited by nickfloyd

Loading

SharpEdgeMarshall commented Jul 29, 2022 •

edited

Loading

SharpEdgeMarshall commented Nov 2, 2022 •

edited

Loading

joshua-hancox commented Nov 10, 2022 •

edited

Loading

kfcampbell commented Nov 15, 2022 •

edited

Loading