Merge branch 'main' into docs/march-sprint-lang-rewrites

Author: rkoron007

internal/backend/backendrun/operation.go

@@ -177,8 +177,8 @@ func (o *Operation) Config() (*configs.Config, tfdiags.Diagnostics) {
 // operation.
 //
 // If the given diagnostics contains errors then the operation's result
-// will be set to backend.OperationFailure. It will be set to
-// backend.OperationSuccess otherwise. It will then use o.View.Diagnostics
+// will be set to backendrun.OperationFailure. It will be set to
+// backendrun.OperationSuccess otherwise. It will then use o.View.Diagnostics
 // to show the given diagnostics before returning.
 //
 // Callers should feel free to do each of these operations separately in

internal/backend/init/init.go

@@ -128,7 +128,7 @@ func (b deprecatedBackendShim) PrepareConfig(obj cty.Value) (cty.Value, tfdiags.
 // warning during validation.
 func deprecateBackend(b backend.Backend, message string) backend.Backend {
 	// Since a Backend wrapped by deprecatedBackendShim can no longer be
-	// asserted as an Enhanced or Local backend, disallow those types here
+	// asserted as an Operations Backend or Local backend, disallow those types here
 	// entirely.  If something other than a basic backend.Backend needs to be
 	// deprecated, we can add that functionality to schema.Backend or the
 	// backend itself.

internal/backend/local/backend.go

@@ -32,7 +32,7 @@ const (
 	DefaultBackupExtension = ".backup"
 )
 
-// Local is an implementation of EnhancedBackend that performs all operations
+// Local is an implementation of backendrun.OperationsBackend that performs all operations
 // locally. This is the "default" backend and implements normal Terraform
 // behavior as it is well known.
 type Local struct {
@@ -79,9 +79,9 @@ type Local struct {
 	OpInput      bool
 	OpValidation bool
 
-	// Backend, if non-nil, will use this backend for non-enhanced behavior.
+	// Backend, if non-nil, will use this backend for non-operations behavior.
 	// This allows local behavior with remote state storage. It is a way to
-	// "upgrade" a non-enhanced backend to an enhanced backend with typical
+	// "upgrade" a non-operations backend to an operations backend with typical
 	// behavior.
 	//
 	// If this is nil, local performs normal state loading and storage.
@@ -100,7 +100,7 @@ func New() *Local {
 }
 
 // NewWithBackend returns a new local backend initialized with a
-// dedicated backend for non-enhanced behavior.
+// dedicated backend for non-operations/state-storage behavior.
 func NewWithBackend(backend backend.Backend) *Local {
 	return &Local{
 		Backend: backend,

internal/backend/remote/backend.go

@@ -43,7 +43,7 @@ const (
 	genericHostname    = "localterraform.com"
 )
 
-// Remote is an implementation of EnhancedBackend that performs all
+// Remote is an implementation of backendrun.OperationsBackend that performs all
 // operations in a remote backend.
 type Remote struct {
 	// CLI and Colorize control the CLI output. If CLI is nil then no CLI
@@ -78,7 +78,7 @@ type Remote struct {
 	// services is used for service discovery
 	services *disco.Disco
 
-	// local, if non-nil, will be used for all enhanced behavior. This
+	// local, if non-nil, will be used for all OperationsBackend behavior. This
 	// allows local behavior with the remote backend functioning as remote
 	// state storage backend.
 	local backendrun.OperationsBackend

internal/backend/remote/backend_context.go

@@ -215,7 +215,7 @@ func stubAllVariables(vv map[string]backendrun.UnparsedVariableValue, decls map[
 	return ret
 }
 
-// remoteStoredVariableValue is a backend.UnparsedVariableValue implementation
+// remoteStoredVariableValue is a backendrun.UnparsedVariableValue implementation
 // that translates from the go-tfe representation of stored variables into
 // the Terraform Core backend representation of variables.
 type remoteStoredVariableValue struct {

internal/backend/remote/testing.go

@@ -315,7 +315,7 @@ func (v *unparsedVariableValue) ParseVariableValue(mode configs.VariableParsingM
 	}, tfdiags.Diagnostics{}
 }
 
-// testVariable returns a backend.UnparsedVariableValue used for testing.
+// testVariable returns a backendrun.UnparsedVariableValue used for testing.
 func testVariables(s terraform.ValueSourceType, vs ...string) map[string]backendrun.UnparsedVariableValue {
 	vars := make(map[string]backendrun.UnparsedVariableValue, len(vs))
 	for _, v := range vs {

internal/builtin/providers/terraform/data_source_state.go

@@ -239,7 +239,7 @@ func getBackend(cfg cty.Value) (backend.Backend, cty.Value, tfdiags.Diagnostics)
 		return nil, cty.NilVal, diags
 	}
 
-	// If this is the enhanced remote backend, we want to disable the version
+	// If this is the remote OperationsBackend, we want to disable the version
 	// check, because this is a read-only operation
 	if rb, ok := b.(*remote.Remote); ok {
 		rb.IgnoreVersionConflict()

internal/cloud/backend.go

@@ -49,7 +49,7 @@ const (
 
 var ErrCloudDoesNotSupportKVTags = errors.New("your version of Terraform Enterprise does not support key-value tags. Please upgrade Terraform Enterprise to a version that supports this feature or use set type tags instead.")
 
-// Cloud is an implementation of EnhancedBackend in service of the HCP Terraform or Terraform Enterprise
+// Cloud is an implementation of backendrun.OperationsBackend in service of the HCP Terraform or Terraform Enterprise
 // integration for Terraform CLI. This backend is not intended to be surfaced at the user level and
 // is instead an implementation detail of cloud.Cloud.
 type Cloud struct {
@@ -131,7 +131,7 @@ func New(services *disco.Disco) *Cloud {
 	}
 }
 
-// ConfigSchema implements backend.Enhanced.
+// ConfigSchema implements backend.Backend (which is embedded in backendrun.OperationsBackend).
 func (b *Cloud) ConfigSchema() *configschema.Block {
 	return &configschema.Block{
 		Attributes: map[string]*configschema.Attribute{
@@ -179,9 +179,9 @@ func (b *Cloud) ConfigSchema() *configschema.Block {
 	}
 }
 
-// PrepareConfig implements backend.Backend. Per the interface contract, it
-// should catch invalid contents in the config value and populate knowable
-// default values, but must NOT consult environment variables or other knowledge
+// PrepareConfig implements backend.Backend (which is embedded in backendrun.OperationsBackend).
+// Per the interface contract, it should catch invalid contents in the config value and populate
+// knowable default values, but must NOT consult environment variables or other knowledge
 // outside the config value itself.
 func (b *Cloud) PrepareConfig(obj cty.Value) (cty.Value, tfdiags.Diagnostics) {
 	var diags tfdiags.Diagnostics
@@ -227,7 +227,7 @@ func (b *Cloud) ServiceDiscoveryAliases() ([]backendrun.HostAlias, error) {
 	}, nil
 }
 
-// Configure implements backend.Enhanced.
+// Configure implements backend.Backend (which is embedded in backendrun.OperationsBackend).
 func (b *Cloud) Configure(obj cty.Value) tfdiags.Diagnostics {
 	var diags tfdiags.Diagnostics
 	if obj.IsNull() {
@@ -614,8 +614,8 @@ func (b *Cloud) retryLogHook(attemptNum int, resp *http.Response) {
 	}
 }
 
-// Workspaces implements backend.Enhanced, returning a filtered list of workspace names according to
-// the workspace mapping strategy configured.
+// Workspaces implements backend.Backend (which is embedded in backendrun.OperationsBackend),
+// returning a filtered list of workspace names according to the workspace mapping strategy configured.
 func (b *Cloud) Workspaces() ([]string, error) {
 	// Create a slice to contain all the names.
 	var names []string
@@ -689,7 +689,7 @@ func (b *Cloud) Workspaces() ([]string, error) {
 	return names, nil
 }
 
-// DeleteWorkspace implements backend.Backend.
+// DeleteWorkspace implements backend.Backend (which is embedded in backendrun.OperationsBackend).
 func (b *Cloud) DeleteWorkspace(name string, force bool) error {
 	if name == backend.DefaultStateName {
 		return backend.ErrDefaultWorkspaceNotSupported
@@ -713,7 +713,7 @@ func (b *Cloud) DeleteWorkspace(name string, force bool) error {
 	return State.Delete(force)
 }
 
-// StateMgr implements backend.Enhanced.
+// StateMgr implements backend.Backend (which is embedded in backendrun.OperationsBackend).
 func (b *Cloud) StateMgr(name string) (statemgr.Full, error) {
 	var remoteTFVersion string
 

internal/cloud/backend_context.go

@@ -21,7 +21,7 @@ import (
 	"github.com/hashicorp/terraform/internal/tfdiags"
 )
 
-// LocalRun implements backend.Local
+// LocalRun implements backendrun.Local
 func (b *Cloud) LocalRun(op *backendrun.Operation) (*backendrun.LocalRun, statemgr.Full, tfdiags.Diagnostics) {
 	var diags tfdiags.Diagnostics
 	ret := &backendrun.LocalRun{
@@ -211,7 +211,7 @@ func stubAllVariables(vv map[string]backendrun.UnparsedVariableValue, decls map[
 	return ret
 }
 
-// remoteStoredVariableValue is a backend.UnparsedVariableValue implementation
+// remoteStoredVariableValue is a backendrun.UnparsedVariableValue implementation
 // that translates from the go-tfe representation of stored variables into
 // the Terraform Core backend representation of variables.
 type remoteStoredVariableValue struct {

internal/cloud/testing.go

@@ -617,7 +617,7 @@ func (v *unparsedVariableValue) ParseVariableValue(mode configs.VariableParsingM
 	}, tfdiags.Diagnostics{}
 }
 
-// testVariable returns a backend.UnparsedVariableValue used for testing.
+// testVariable returns a backendrun.UnparsedVariableValue used for testing.
 func testVariables(s terraform.ValueSourceType, vs ...string) map[string]backendrun.UnparsedVariableValue {
 	vars := make(map[string]backendrun.UnparsedVariableValue, len(vs))
 	for _, v := range vs {

internal/command/command.go

@@ -45,7 +45,7 @@ const DefaultBackupExtension = ".backup"
 const DefaultParallelism = 10
 
 // ErrUnsupportedLocalOp is the common error message shown for operations
-// that require a backend.Local.
+// that require a backendrun.Local.
 const ErrUnsupportedLocalOp = `The configured backend doesn't support this operation.
 
 The "backend" in Terraform defines how Terraform operates. The default

internal/command/import.go

@@ -173,7 +173,7 @@ func (c *ImportCommand) Run(args []string) int {
 		return 1
 	}
 
-	// We require a backend.Local to build a context.
+	// We require a backendrun.Local to build a context.
 	// This isn't necessarily a "local.Local" backend, which provides local
 	// operations, however that is the only current implementation. A
 	// "local.Local" backend also doesn't necessarily provide local state, as

internal/command/meta_backend.go

@@ -398,7 +398,7 @@ func (m *Meta) backendCLIOpts() (*backendrun.CLIOpts, error) {
 	}, err
 }
 
-// Operation initializes a new backend.Operation struct.
+// Operation initializes a new backendrun.Operation struct.
 //
 // This prepares the operation. After calling this, the caller is expected
 // to modify fields of the operation such as Sequence to specify what will

internal/command/meta_vars.go

@@ -26,7 +26,7 @@ const VarEnvPrefix = "TF_VAR_"
 
 // collectVariableValuesForTests inspects the various places that test
 // values can come from and constructs a map ready to be passed to the
-// backend as part of a backend.Operation.
+// backend as part of a backendrun.Operation.
 //
 // This method returns diagnostics relating to the collection of the values,
 // but the values themselves may produce additional diagnostics when finally
@@ -87,7 +87,7 @@ func (m *Meta) collectVariableValuesForTests(testsFilePath string) (map[string]b
 
 // collectVariableValues inspects the various places that root module input variable
 // values can come from and constructs a map ready to be passed to the
-// backend as part of a backend.Operation.
+// backend as part of a backendrun.Operation.
 //
 // This method returns diagnostics relating to the collection of the values,
 // but the values themselves may produce additional diagnostics when finally

internal/command/state_mv.go

@@ -19,7 +19,8 @@ import (
 	"github.com/hashicorp/terraform/internal/tfdiags"
 )
 
-// StateMvCommand is a Command implementation that shows a single resource.
+// StateMvCommand is a Command implementation that changes bindings
+// in Terraform state so that existing remote objects bind to new resource instances.
 type StateMvCommand struct {
 	StateMeta
 }

internal/command/state_pull.go

@@ -12,7 +12,8 @@ import (
 	"github.com/hashicorp/terraform/internal/states/statemgr"
 )
 
-// StatePullCommand is a Command implementation that shows a single resource.
+// StatePullCommand is a Command implementation that allows downloading
+// and outputting state information from remote state.
 type StatePullCommand struct {
 	Meta
 	StateMeta

internal/command/state_push.go

@@ -19,7 +19,8 @@ import (
 	"github.com/hashicorp/terraform/internal/tfdiags"
 )
 
-// StatePushCommand is a Command implementation that shows a single resource.
+// StatePushCommand is a Command implementation that allows
+// pushing a local state to a remote location.
 type StatePushCommand struct {
 	Meta
 	StateMeta

internal/command/state_rm.go

@@ -16,7 +16,8 @@ import (
 	"github.com/hashicorp/terraform/internal/tfdiags"
 )
 
-// StateRmCommand is a Command implementation that shows a single resource.
+// StateRmCommand is a Command implementation that removes
+// a single resource from the state.
 type StateRmCommand struct {
 	StateMeta
 }

internal/states/statemgr/persistent.go

@@ -30,7 +30,7 @@ type Persistent interface {
 
 // OutputReader is the interface for managers that fetches output values from state
 // or another source. This is a refinement of fetching the entire state and digging
-// the output values from it because enhanced backends can apply special permissions
+// the output values from it because operations backends can apply special permissions
 // to differentiate reading the state and reading the outputs within the state.
 type OutputReader interface {
 	// GetRootOutputValues fetches the root module output values from state or another source

website/docs/language/functions/issensitive.mdx

@@ -22,6 +22,6 @@ See [`sensitive`](/terraform/language/functions/sensitive), [`nonsensitive`](/te
 true
 > issensitive("hello")
 false
-> sensitive(var.my-var-with-sensitive-set-to-true)
+> issensitive(var.my-var-with-sensitive-set-to-true)
 true
 ```