IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix typos (#1954)

Browse Source 
Signed-off-by: Viktor Szépe <viktor@szepe.net>
This commit is contained in:
Viktor Szépe 2024-09-17 12:04:30 +02:00 committed by GitHub
parent c068a70a9f
commit bb63574f09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/scripts/backport/README.md vendored
View File

@ -8,7 +8,7 @@ This feature automates the process of creating pull requests for backporting mer
1. **Label Your Pull Request**: To initiate a backport, simply add a label to your pull request in the format `backport <target_branch>`, where `<target_branch>` is the branch you want to backport changes to (eg. `backport v1.x`). The backport labels can be added to both open and closed pull requests. 1. **Label Your Pull Request**: To initiate a backport, simply add a label to your pull request in the format `backport <target_branch>`, where `<target_branch>` is the branch you want to backport changes to (eg. `backport v1.x`). The backport labels can be added to both open and closed pull requests.
2. **Automatic Backport Pull Request Creation**: After the pull request is merged and closed, or if the backport label is added to an already closed pull request, backport Github Action will execute the `.github/scripts/backport/main.sh` script, which will automatically create a new pull request with the changes backported to the specified `<target_branch>`. A comment linking to the new Backport Pull Request will be added to the original pull request for easy navigation. 2. **Automatic Backport Pull Request Creation**: After the pull request is merged and closed, or if the backport label is added to an already closed pull request, backport GitHub Action will execute the `.github/scripts/backport/main.sh` script, which will automatically create a new pull request with the changes backported to the specified `<target_branch>`. A comment linking to the new Backport Pull Request will be added to the original pull request for easy navigation.
### Handling Merge Conflicts ### Handling Merge Conflicts

12
TSC_SUMMARY.md
View File

@ -76,7 +76,7 @@ Christian: will write up a "case study" ([examples](https://buildkite.com/case-s
##### Decision: ##### Decision:
**Christian will prepare RFC for Stage 1 and send to TSC + Community via Github PR** **Christian will prepare RFC for Stage 1 and send to TSC + Community via GitHub PR**
## 2024-08-13 ## 2024-08-13
@ -95,7 +95,7 @@ Christian: will write up a "case study" ([examples](https://buildkite.com/case-s
- Christian: Where do we publish our governance documents? - Christian: Where do we publish our governance documents?
- Christian: Do we need to amend our governance documents before publishing them? - Christian: Do we need to amend our governance documents before publishing them?
- Have we defined how we manage TSC memebership? - Have we defined how we manage TSC membership?
- Igor: Usually in a github repo w/ amendments and meeting notes - Igor: Usually in a github repo w/ amendments and meeting notes
- Also look at other CNCF projects - Also look at other CNCF projects
- LF to review before publishing - LF to review before publishing
@ -325,8 +325,8 @@ At this point we need a decision from the TSC on which paths we should be invest
##### Recommendation ##### Recommendation
- Preferable one officially supported backend with all neccessary functionality, for example, http backend. - Preferable one officially supported backend with all necessary functionality, for example, http backend.
- Continoue discussion in the core team and TSC. - Continue discussion in the core team and TSC.
## 2024-07-10 ## 2024-07-10
@ -602,7 +602,7 @@ TSC:
1. Migration from TF has to be supported, first-class, easy for enterprise 1. Migration from TF has to be supported, first-class, easy for enterprise
2. Tofu needs to provide motivation (i.e. stability, innovation, community) in addition to an on-ramp 2. Tofu needs to provide motivation (i.e. stability, innovation, community) in addition to an on-ramp
3. A strongly opinionated/narrow vision, e.g. “we want to build for XYZ” is possibily limiting our audience for now 3. A strongly opinionated/narrow vision, e.g. “we want to build for XYZ” is possibly limiting our audience for now
- Igor: The vision for the next year is to focus on adoption. We’ll refine for a week, if nothing else comes up, we’ll adopt this. - Igor: The vision for the next year is to focus on adoption. We’ll refine for a week, if nothing else comes up, we’ll adopt this.
@ -871,7 +871,7 @@ https://github.com/opentofu/opentofu/issues/1328
- Do we follow semver? - Do we follow semver?
- Consider in said strategy that there may be some perception that the release cadence of OTF is lower than that of HTF (despite OTF having more content in each) - should we have more frequent releases? - Consider in said strategy that there may be some perception that the release cadence of OTF is lower than that of HTF (despite OTF having more content in each) - should we have more frequent releases?
- Continue with current versioning schema for now (next version is 1.8) - Continue with current versioning schema for now (next version is 1.8)
- Open up an issue for the community to discuss wether we should change that versioning - Open up an issue for the community to discuss whether we should change that versioning
- Open up an issue to track and come up with suggestion how the current or future versioning scheme will support provider constraints as support for new provider/module features are added on different version of OTF vs HTF - Open up an issue to track and come up with suggestion how the current or future versioning scheme will support provider constraints as support for new provider/module features are added on different version of OTF vs HTF
### Backends as Plugins ### Backends as Plugins

2
WEEKLY_UPDATES.md
View File

@ -139,7 +139,7 @@ Hello there! We've had a fairly quiet couple days after KubeCon last week, but
- Current Status: - Current Status:
- Large numbers are no longer truncated in plans [#1382](https://github.com/opentofu/opentofu/pull/1382) - Large numbers are no longer truncated in plans [#1382](https://github.com/opentofu/opentofu/pull/1382)
- Debugging crashes is now much easer with enhanced stack traces [#1425](https://github.com/opentofu/opentofu/pull/1425) - Debugging crashes is now much easier with enhanced stack traces [#1425](https://github.com/opentofu/opentofu/pull/1425)
- State Encryption - State Encryption
- Integration testing with TACOS identified some issues that have been fixed with remote and cloud backends [#1431](https://github.com/opentofu/opentofu/pull/1431) - Integration testing with TACOS identified some issues that have been fixed with remote and cloud backends [#1431](https://github.com/opentofu/opentofu/pull/1431)
- Dumping state during a crash is more resilient [#1421](https://github.com/opentofu/opentofu/pull/1421) - Dumping state during a crash is more resilient [#1421](https://github.com/opentofu/opentofu/pull/1421)

2
internal/command/testdata/statelocker.go vendored
View File

@ -1,5 +1,5 @@
// statelocker use used for testing command with a locked state. // statelocker use used for testing command with a locked state.
// This will lock the state file at a given path, then wait for a sigal. On // This will lock the state file at a given path, then wait for a signal. On
// SIGINT and SIGTERM the state will be Unlocked before exit. // SIGINT and SIGTERM the state will be Unlocked before exit.
package main package main

2
internal/configs/configschema/coerce_value_test.go
View File

@ -612,7 +612,7 @@ func TestCoerceValue(t *testing.T) {
if gotErrObj == nil { if gotErrObj == nil {
if test.WantErr != "" { if test.WantErr != "" {
t.Fatalf("coersion succeeded; want error: %q", test.WantErr) t.Fatalf("coercion succeeded; want error: %q", test.WantErr)
} }
} else { } else {
gotErr := tfdiags.FormatError(gotErrObj) gotErr := tfdiags.FormatError(gotErrObj)

2
internal/ipaddr/ip_test.go
View File

@ -103,7 +103,7 @@ var parseCIDRTests = []struct {
{"0.0.0.-3/32", nil, nil, &ParseError{Type: "CIDR address", Text: "0.0.0.-3/32"}}, {"0.0.0.-3/32", nil, nil, &ParseError{Type: "CIDR address", Text: "0.0.0.-3/32"}},
{"0.0.0.0/-0", nil, nil, &ParseError{Type: "CIDR address", Text: "0.0.0.0/-0"}}, {"0.0.0.0/-0", nil, nil, &ParseError{Type: "CIDR address", Text: "0.0.0.0/-0"}},
// //
// NOTE: Theis correct failure was added for go-1.17, but is a // NOTE: This correct failure was added for go-1.17, but is a
// backwards-incompatible change for OpenTofu users, who might have // backwards-incompatible change for OpenTofu users, who might have
// already written modules using leading zeroes. // already written modules using leading zeroes.
// //

2
internal/legacy/tofu/diff.go
View File

@ -541,7 +541,7 @@ func (d *InstanceDiff) applyBlockDiff(path []string, attrs map[string]string, sc
// check each set candidate to see if it was removed. // check each set candidate to see if it was removed.
// we need to do this, because when entire sets are removed, they may // we need to do this, because when entire sets are removed, they may
// have the wrong key, and ony show diffs going to "" // have the wrong key, and only show diffs going to ""
if block.Nesting == configschema.NestingSet { if block.Nesting == configschema.NestingSet {
for k := range candidateKeys { for k := range candidateKeys {
indexPrefix := strings.Join(append(path, n, k), ".") + "." indexPrefix := strings.Join(append(path, n, k), ".") + "."

4
internal/legacy/tofu/resource_address.go
View File

@ -307,7 +307,7 @@ func NewLegacyResourceAddress(addr addrs.AbsResource) *ResourceAddress {
for i, step := range addr.Module { for i, step := range addr.Module {
if step.InstanceKey != addrs.NoKey { if step.InstanceKey != addrs.NoKey {
// At the time of writing this can't happen because we don't // At the time of writing this can't happen because we don't
// ket generate keyed module instances. This legacy codepath must // yet generate keyed module instances. This legacy codepath must
// be removed before we can support "count" and "for_each" for // be removed before we can support "count" and "for_each" for
// modules. // modules.
panic(fmt.Errorf("cannot shim module instance step with key %#v to legacy ResourceAddress.Path", step.InstanceKey)) panic(fmt.Errorf("cannot shim module instance step with key %#v to legacy ResourceAddress.Path", step.InstanceKey))
@ -345,7 +345,7 @@ func NewLegacyResourceInstanceAddress(addr addrs.AbsResourceInstance) *ResourceA
for i, step := range addr.Module { for i, step := range addr.Module {
if step.InstanceKey != addrs.NoKey { if step.InstanceKey != addrs.NoKey {
// At the time of writing this can't happen because we don't // At the time of writing this can't happen because we don't
// ket generate keyed module instances. This legacy codepath must // yet generate keyed module instances. This legacy codepath must
// be removed before we can support "count" and "for_each" for // be removed before we can support "count" and "for_each" for
// modules. // modules.
panic(fmt.Errorf("cannot shim module instance step with key %#v to legacy ResourceAddress.Path", step.InstanceKey)) panic(fmt.Errorf("cannot shim module instance step with key %#v to legacy ResourceAddress.Path", step.InstanceKey))

2
internal/states/remote/testing.go
View File

@ -51,7 +51,7 @@ func TestClient(t *testing.T, c Client) {
} }
// Test the lock implementation for a remote.Client. // Test the lock implementation for a remote.Client.
// This test requires 2 client instances, in oder to have multiple remote // This test requires 2 client instances, in order to have multiple remote
// clients since some implementations may tie the client to the lock, or may // clients since some implementations may tie the client to the lock, or may
// have reentrant locks. // have reentrant locks.
func TestRemoteLocks(t *testing.T, a, b Client) { func TestRemoteLocks(t *testing.T, a, b Client) {