Skip to content

Commit

Permalink
Merge branch 'main' into add-retries
Browse files Browse the repository at this point in the history
  • Loading branch information
@nickfloyd
nickfloyd authored Oct 16, 2023
2 parents fff38a1 + 4a5ab5f commit 4f27468
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 12 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ require (
go.opencensus.io v0.24.0 // indirect
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.16.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
Expand Down
3 changes: 2 additions & 1 deletion go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1866,8 +1866,9 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down
66 changes: 64 additions & 2 deletions vendor/golang.org/x/net/http2/server.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ golang.org/x/mod/internal/lazyregexp
golang.org/x/mod/modfile
golang.org/x/mod/module
golang.org/x/mod/semver
# golang.org/x/net v0.16.0
# golang.org/x/net v0.17.0
## explicit; go 1.17
golang.org/x/net/context
golang.org/x/net/context/ctxhttp
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/actions_organization_permissions.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ The `enabled_repositories_config` block supports the following:

## Import

This resource can be imported using the ID of the GitHub organization:
This resource can be imported using the name of the GitHub organization:

```
$ terraform import github_actions_organization_permissions.test <github_organization_name>
$ terraform import github_actions_organization_permissions.test github_organization_name
```
2 changes: 1 addition & 1 deletion website/docs/r/actions_repository_access_level.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ The following arguments are supported:
This resource can be imported using the name of the GitHub repository:

```
$ terraform import github_actions_repository_access_level.test <github_repository_name>
$ terraform import github_actions_repository_access_level.test my-repository
```
4 changes: 2 additions & 2 deletions website/docs/r/codespaces_secret.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ The following arguments are supported:
This resource can be imported using an ID made up of the `repository` and `secret_name`:

```
$ terraform import github_codespaces_secret.example_secret <repository>/<secret_name>
$ terraform import github_codespaces_secret.example_secret example_repository/example_secret_name
```

NOTE: the implementation is limited in that it won't fetch the value of the
`plaintext_value` or `encrypted_value` fields when importing. You may need to ignore changes for these as a workaround.
`plaintext_value` or `encrypted_value` fields when importing. You may need to ignore changes for these as a workaround.
4 changes: 2 additions & 2 deletions website/docs/r/dependabot_secret.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ The following arguments are supported:
This resource can be imported using an ID made up of the `repository` and `secret_name`:

```
$ terraform import github_dependabot_secret.example_secret <repository>/<secret_name>
$ terraform import github_dependabot_secret.example_secret example_repository/example_secret
```

NOTE: the implementation is limited in that it won't fetch the value of the
`plaintext_value` or `encrypted_value` fields when importing. You may need to ignore changes for these as a workaround.
`plaintext_value` or `encrypted_value` fields when importing. You may need to ignore changes for these as a workaround.

0 comments on commit 4f27468

Please sign in to comment.