Skip to content

Commit

Permalink
rename: Rename TFC to HCP Terraform (#343)
Browse files Browse the repository at this point in the history
Co-authored-by: Ansgar Mertens <ansgar@hashicorp.com>
  • Loading branch information
jpogran and ansgarm committed Apr 15, 2024
1 parent 72025f5 commit bc8eee8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion earlydecoder/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func decodeCloudBlock(block *hcl.Block) (*backend.Cloud, hcl.Diagnostics) {

// https://developer.hashicorp.com/terraform/language/settings/terraform-cloud#usage-example
// Required for Terraform Enterprise
// Defaults to app.terraform.io for Terraform Cloud
// Defaults to app.terraform.io for HCP Terraform
if attr, ok := attrs["hostname"]; ok {
val, vDiags := attr.Expr.Value(nil)
if val.IsWhollyKnown() && val.Type() == cty.String {
Expand Down
10 changes: 5 additions & 5 deletions internal/schema/1.1/terraform.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import (

func patchTerraformBlockSchema(bs *schema.BlockSchema) *schema.BlockSchema {
bs.Body.Blocks["cloud"] = &schema.BlockSchema{
Description: lang.PlainText("Terraform Cloud configuration"),
Description: lang.PlainText("HCP Terraform configuration"),
MaxItems: 1,
Body: &schema.BodySchema{
Attributes: map[string]*schema.AttributeSchema{
"hostname": {
Constraint: schema.LiteralType{Type: cty.String},
IsOptional: true,
Description: lang.Markdown("The Terraform Enterprise hostname to connect to. " +
"This optional argument defaults to `app.terraform.io` for use with Terraform Cloud."),
"This optional argument defaults to `app.terraform.io` for use with HCP Terraform."),
},
"organization": {
Constraint: schema.LiteralType{Type: cty.String},
Expand All @@ -29,7 +29,7 @@ func patchTerraformBlockSchema(bs *schema.BlockSchema) *schema.BlockSchema {
"token": {
Constraint: schema.LiteralType{Type: cty.String},
IsOptional: true,
Description: lang.Markdown("The token used to authenticate with Terraform Cloud/Enterprise. " +
Description: lang.Markdown("The token used to authenticate with HCP Terraform/Terraform Enterprise. " +
"Typically this argument should not be set, and `terraform login` used instead; " +
"your credentials will then be fetched from your CLI configuration file " +
"or configured credential helper."),
Expand All @@ -44,7 +44,7 @@ func patchTerraformBlockSchema(bs *schema.BlockSchema) *schema.BlockSchema {
"name": {
Constraint: schema.LiteralType{Type: cty.String},
IsOptional: true,
Description: lang.Markdown("The name of a single Terraform Cloud workspace " +
Description: lang.Markdown("The name of a single HCP Terraform workspace " +
"to be used with this configuration. When configured only the specified workspace " +
"can be used. This option conflicts with `tags`."),
},
Expand All @@ -53,7 +53,7 @@ func patchTerraformBlockSchema(bs *schema.BlockSchema) *schema.BlockSchema {
Elem: schema.LiteralType{Type: cty.String},
},
IsOptional: true,
Description: lang.Markdown("A set of tags used to select remote Terraform Cloud workspaces" +
Description: lang.Markdown("A set of tags used to select remote HCP Terraform workspaces" +
" to be used for this single configuration. New workspaces will automatically be tagged " +
"with these tag values. Generally, this is the primary and recommended strategy to use. " +
"This option conflicts with `name`."),
Expand Down
6 changes: 3 additions & 3 deletions internal/schema/1.6/terraform.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ func patchTerraformBlockSchema(bs *schema.BlockSchema) *schema.BlockSchema {
"name": {
Constraint: schema.LiteralType{Type: cty.String},
IsOptional: true,
Description: lang.Markdown("The name of a single Terraform Cloud workspace " +
Description: lang.Markdown("The name of a single HCP Terraform workspace " +
"to be used with this configuration. When configured only the specified workspace " +
"can be used. This option conflicts with `tags`."),
},
"project": {
Constraint: schema.LiteralType{Type: cty.String},
IsOptional: true,
Description: lang.PlainText("The name of a Terraform Cloud project. Workspaces that need creating will be created within this project."),
Description: lang.PlainText("The name of a HCP Terraform project. Workspaces that need creating will be created within this project."),
},
"tags": {
Constraint: schema.Set{
Elem: schema.LiteralType{Type: cty.String},
},
IsOptional: true,
Description: lang.Markdown("A set of tags used to select remote Terraform Cloud workspaces" +
Description: lang.Markdown("A set of tags used to select remote HCP Terraform workspaces" +
" to be used for this single configuration. New workspaces will automatically be tagged " +
"with these tag values. Generally, this is the primary and recommended strategy to use. " +
"This option conflicts with `name`."),
Expand Down
2 changes: 1 addition & 1 deletion internal/schema/backends/remote.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
func remoteBackend(v *version.Version) *schema.BodySchema {
docsUrl := "https://www.terraform.io/docs/language/settings/backends/remote.html"
return &schema.BodySchema{
Description: lang.Markdown("Remote backend to store state and run operations in Terraform Cloud."),
Description: lang.Markdown("Remote backend to store state and run operations in HCP Terraform."),
HoverURL: docsUrl,
DocsLink: &schema.DocsLink{
URL: docsUrl,
Expand Down

0 comments on commit bc8eee8

Please sign in to comment.