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

fix: Make allowed_actions_config optional #2114

Merged

Conversation

Danielku15
Copy link
Contributor

Resolves #2105


Before the change?

  • For the two resources resource_github_actions_repository_permissions and resource_github_actions_organization_permissions the allowed_actions_config values were considered mandatory if allowed_actions was set to selected

After the change?

  • For the two resources resource_github_actions_repository_permissions and resource_github_actions_organization_permissions the allowed_actions_config values are optional in all scenarios.
  • On a read operation of these resources, when allowed_actions_config is not set on the declared resource, it will not be loaded from the API and the respective properties will not be filled and available for further usage. The behavior is aligned with the other allowed_actions values.

Pull request checklist

  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been reviewed and added / updated if needed (for bug fixes / features)

Does this introduce a breaking change?

Please see our docs on breaking changes to help!

  • Yes
  • No

@@ -166,6 +166,49 @@ func TestAccGithubActionsOrganizationPermissions(t *testing.T) {
})
Copy link
Member

Choose a reason for hiding this comment

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

The tests in this file are passing on the main branch but failing for me on this branch like so:

--- FAIL: TestAccGithubActionsOrganizationPermissions (51.85s)
    --- PASS: TestAccGithubActionsOrganizationPermissions/test_setting_of_basic_actions_organization_permissions (3.42s)
        --- PASS: TestAccGithubActionsOrganizationPermissions/test_setting_of_basic_actions_organization_permissions/with_an_organization_account (3.42s)
    --- FAIL: TestAccGithubActionsOrganizationPermissions/imports_entire_set_of_github_action_organization_permissions_without_error (16.76s)
        --- FAIL: TestAccGithubActionsOrganizationPermissions/imports_entire_set_of_github_action_organization_permissions_without_error/with_an_organization_account (16.76s)
    --- PASS: TestAccGithubActionsOrganizationPermissions/test_setting_of_organization_allowed_actions (4.79s)
        --- PASS: TestAccGithubActionsOrganizationPermissions/test_setting_of_organization_allowed_actions/with_an_organization_account (4.79s)
    --- PASS: TestAccGithubActionsOrganizationPermissions/test_not_setting_of_organization_allowed_actions_without_error (3.05s)
        --- PASS: TestAccGithubActionsOrganizationPermissions/test_not_setting_of_organization_allowed_actions_without_error/with_an_organization_account (3.05s)
    --- PASS: TestAccGithubActionsOrganizationPermissions/test_setting_of_organization_enabled_repositories (23.82s)
        --- PASS: TestAccGithubActionsOrganizationPermissions/test_setting_of_organization_enabled_repositories/with_an_organization_account (23.82s)
FAIL

Can you reproduce this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@kfcampbell Yes, I can reproduce the problem. Seems I had some env-vars wrongly set in my setup. Will prepare a fix.

@Danielku15
Copy link
Contributor Author

@kfcampbell Problem should be fixed now. I adapted two things:

  • Instead of the API information I now rather look at the state/input whether the actions config should be loaded.
  • In import/initial read scenarios there might be no info in the state. There I load now the information.

Its a bit tricky to handle as it seems there is no good way to get the values as defined in code (desired state).

Copy link
Member

@kfcampbell kfcampbell left a comment

Choose a reason for hiding this comment

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

Tests look good to me now, thank you for updating!

@kfcampbell kfcampbell merged commit 97d5113 into integrations:main Mar 4, 2024
3 checks passed
kireque pushed a commit to kireque/home-ops that referenced this pull request Mar 7, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github](https://registry.terraform.io/providers/integrations/github)
([source](https://togithub.com/integrations/terraform-provider-github))
| required_provider | patch | `6.0.0` -> `6.0.1` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>integrations/terraform-provider-github (github)</summary>

###
[`v6.0.1`](https://togithub.com/integrations/terraform-provider-github/releases/tag/v6.0.1)

[Compare
Source](https://togithub.com/integrations/terraform-provider-github/compare/v6.0.0...v6.0.1)

#### What's Changed

- build(deps): bump github.com/golangci/golangci-lint from 1.56.1 to
1.56.2 by [@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2159
- build(deps): bump github.com/hashicorp/terraform-plugin-sdk/v2 from
2.31.0 to 2.32.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2160
- build(deps): bump github.com/hashicorp/terraform-plugin-sdk/v2 from
2.32.0 to 2.33.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2168
- Fix github_external_groups page title by
[@&#8203;tomasmota](https://togithub.com/tomasmota) in
[integrations/terraform-provider-github#2170
- docs: Update example usage to use version 6.0 by
[@&#8203;rnestler](https://togithub.com/rnestler) in
[integrations/terraform-provider-github#2169
- fix: Make allowed_actions_config optional by
[@&#8203;Danielku15](https://togithub.com/Danielku15) in
[integrations/terraform-provider-github#2114
- GitHub org ignore archived repos by
[@&#8203;felixlut](https://togithub.com/felixlut) in
[integrations/terraform-provider-github#1833
- build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2177
- build(deps): bump golang.org/x/crypto from 0.19.0 to 0.21.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2180
- build(deps): bump actions/add-to-project from 0.5.0 to 0.6.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2175

#### New Contributors

- [@&#8203;tomasmota](https://togithub.com/tomasmota) made their first
contribution in
[integrations/terraform-provider-github#2170
- [@&#8203;rnestler](https://togithub.com/rnestler) made their first
contribution in
[integrations/terraform-provider-github#2169
- [@&#8203;Danielku15](https://togithub.com/Danielku15) made their first
contribution in
[integrations/terraform-provider-github#2114

**Full Changelog**:
integrations/terraform-provider-github@v6.0.0...v6.1.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjcuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIyNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: kireque-bot[bot] <143391978+kireque-bot[bot]@users.noreply.github.com>
antnsn added a commit to CMCS-Norway/github-governance that referenced this pull request Mar 14, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github](https://registry.terraform.io/providers/integrations/github)
([source](https://togithub.com/integrations/terraform-provider-github))
| required_provider | minor | `6.0.0-beta` -> `6.1.0` |

---

### Release Notes

<details>
<summary>integrations/terraform-provider-github (github)</summary>

###
[`v6.1.0`](https://togithub.com/integrations/terraform-provider-github/releases/tag/v6.1.0)

[Compare
Source](https://togithub.com/integrations/terraform-provider-github/compare/v6.0.1...v6.1.0)

<!-- Release notes generated using configuration in .github/release.yml
at main -->

##### What's Changed

- fix: validation rule for `results_per_page` of `github_repositories`
data source by [@&#8203;dschniepp](https://togithub.com/dschniepp) in
[integrations/terraform-provider-github#2185
- fix: Prevent loading of allowed actions if not configured by
[@&#8203;Danielku15](https://togithub.com/Danielku15) in
[integrations/terraform-provider-github#2186
- fix(data_source_github_rest_api): only allow for 404 on err by
[@&#8203;riezebosch](https://togithub.com/riezebosch) in
[integrations/terraform-provider-github#2154
- fix: error if autolink reference not found by
[@&#8203;bradam12](https://togithub.com/bradam12) in
[integrations/terraform-provider-github#2164
- feat: Add `github_actions_enterprise_permissions` by
[@&#8203;ErikElkins](https://togithub.com/ErikElkins) in
[integrations/terraform-provider-github#2155
- docs: configure release notes categories based on labels by
[@&#8203;laughedelic](https://togithub.com/laughedelic) in
[integrations/terraform-provider-github#2184

##### New Contributors

- [@&#8203;dschniepp](https://togithub.com/dschniepp) made their first
contribution in
[integrations/terraform-provider-github#2185
- [@&#8203;riezebosch](https://togithub.com/riezebosch) made their first
contribution in
[integrations/terraform-provider-github#2154
- [@&#8203;bradam12](https://togithub.com/bradam12) made their first
contribution in
[integrations/terraform-provider-github#2164
- [@&#8203;ErikElkins](https://togithub.com/ErikElkins) made their first
contribution in
[integrations/terraform-provider-github#2155
- [@&#8203;laughedelic](https://togithub.com/laughedelic) made their
first contribution in
[integrations/terraform-provider-github#2184

**Full Changelog**:
integrations/terraform-provider-github@v6.0.1...v6.1.0

###
[`v6.0.1`](https://togithub.com/integrations/terraform-provider-github/releases/tag/v6.0.1)

[Compare
Source](https://togithub.com/integrations/terraform-provider-github/compare/v6.0.0...v6.0.1)

#### What's Changed

- build(deps): bump github.com/golangci/golangci-lint from 1.56.1 to
1.56.2 by [@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2159
- build(deps): bump github.com/hashicorp/terraform-plugin-sdk/v2 from
2.31.0 to 2.32.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2160
- build(deps): bump github.com/hashicorp/terraform-plugin-sdk/v2 from
2.32.0 to 2.33.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2168
- Fix github_external_groups page title by
[@&#8203;tomasmota](https://togithub.com/tomasmota) in
[integrations/terraform-provider-github#2170
- docs: Update example usage to use version 6.0 by
[@&#8203;rnestler](https://togithub.com/rnestler) in
[integrations/terraform-provider-github#2169
- fix: Make allowed_actions_config optional by
[@&#8203;Danielku15](https://togithub.com/Danielku15) in
[integrations/terraform-provider-github#2114
- GitHub org ignore archived repos by
[@&#8203;felixlut](https://togithub.com/felixlut) in
[integrations/terraform-provider-github#1833
- build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2177
- build(deps): bump golang.org/x/crypto from 0.19.0 to 0.21.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2180
- build(deps): bump actions/add-to-project from 0.5.0 to 0.6.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2175

#### New Contributors

- [@&#8203;tomasmota](https://togithub.com/tomasmota) made their first
contribution in
[integrations/terraform-provider-github#2170
- [@&#8203;rnestler](https://togithub.com/rnestler) made their first
contribution in
[integrations/terraform-provider-github#2169
- [@&#8203;Danielku15](https://togithub.com/Danielku15) made their first
contribution in
[integrations/terraform-provider-github#2114

**Full Changelog**:
integrations/terraform-provider-github@v6.0.0...v6.1.0

###
[`v6.0.0`](https://togithub.com/integrations/terraform-provider-github/releases/tag/v6.0.0)

[Compare
Source](https://togithub.com/integrations/terraform-provider-github/compare/v6.0.0-rc2...v6.0.0)

#### v6.0.0

Includes the following changes:

-
[#&#8203;1704](https://togithub.com/integrations/terraform-provider-github/issues/1704)
-
[#&#8203;2045](https://togithub.com/integrations/terraform-provider-github/issues/2045)
-
[#&#8203;1780](https://togithub.com/integrations/terraform-provider-github/issues/1780)
-
[#&#8203;1918](https://togithub.com/integrations/terraform-provider-github/issues/1918)
-
[#&#8203;2133](https://togithub.com/integrations/terraform-provider-github/issues/2133)

As we've upgraded Terraform SDK versions and are checking more errors,
you may see slightly different logging and error messages. Please use
the project's issues to report anything unexpected or buggy!

**Full Changelog**:
integrations/terraform-provider-github@v5.45.0...v6.0.0

###
[`v6.0.0-rc2`](https://togithub.com/integrations/terraform-provider-github/releases/tag/v6.0.0-rc2)

[Compare
Source](https://togithub.com/integrations/terraform-provider-github/compare/v6.0.0-rc1...v6.0.0-rc2)

#### What's Changed

- fix(resource_github_release): Handle missing release in read by
[@&#8203;arunsathiya](https://togithub.com/arunsathiya) in
[integrations/terraform-provider-github#2115
- docs: update commit_message arg desc for repository_file resource by
[@&#8203;manjinder-mckc](https://togithub.com/manjinder-mckc) in
[integrations/terraform-provider-github#2125
- Set group_id correctly in EMU mapping resource by
[@&#8203;kfcampbell](https://togithub.com/kfcampbell) in
[integrations/terraform-provider-github#2133

#### New Contributors

- [@&#8203;arunsathiya](https://togithub.com/arunsathiya) made their
first contribution in
[integrations/terraform-provider-github#2115

**Full Changelog**:
integrations/terraform-provider-github@v6.0.0-rc1...v6.0.0-rc2

###
[`v6.0.0-rc1`](https://togithub.com/integrations/terraform-provider-github/releases/tag/v6.0.0-rc1)

[Compare
Source](https://togithub.com/integrations/terraform-provider-github/compare/v6.0.0-beta...v6.0.0-rc1)

#### What's Changed

- fix: github_rest_api data source always returns header and body as
null by [@&#8203;srgustafson8](https://togithub.com/srgustafson8) in
[integrations/terraform-provider-github#2110
- build(deps): bump peter-evans/create-or-update-comment from 3 to 4 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2121
- build(deps): bump github.com/google/uuid from 1.5.0 to 1.6.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[integrations/terraform-provider-github#2120
- Add support for packages IP ranges in github_ip_ranges by
[@&#8203;Nmishin](https://togithub.com/Nmishin) in
[integrations/terraform-provider-github#1958
- Fix restrict pushes on github_branch_protection. Fix branch protection
tests by [@&#8203;georgekaz](https://togithub.com/georgekaz) in
[integrations/terraform-provider-github#2045

#### New Contributors

- [@&#8203;georgekaz](https://togithub.com/georgekaz) made their first
contribution in
[integrations/terraform-provider-github#2045

**Full Changelog**:
integrations/terraform-provider-github@v6.0.0-beta...v6.0.0-rc1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/CMCS-Norway/github-governance).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yNDUuMCIsInVwZGF0ZWRJblZlciI6IjM3LjI0NS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants