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

Add token field to cloud backend

Browse Source
This commit is contained in:
Sebastian Rivera 2023-02-10 16:58:14 -05:00
parent d7d8a2262c
commit 71dac9bf5e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/cloud/backend.go
View File

@ -66,6 +66,9 @@ type Cloud struct {
// hostname of Terraform Cloud or Terraform Enterprise
hostname string
// token for Terraform Cloud or Terraform Enterprise
token string
// organization is the organization that contains the target workspaces.
organization string
@ -250,7 +253,7 @@ func (b *Cloud) Configure(obj cty.Value) tfdiags.Diagnostics {
// Get the token from the CLI Config File in the credentials section
// if no token was not set in the configuration
if token == "" {
token, err = b.token()
token, err = b.cliConfigToken()
if err != nil {
diags = diags.Append(tfdiags.AttributeValue(
tfdiags.Error,
@ -280,6 +283,7 @@ func (b *Cloud) Configure(obj cty.Value) tfdiags.Diagnostics {
return diags
}
b.token = token
b.configureGenericHostname()
if b.client == nil {
@ -458,10 +462,10 @@ func (b *Cloud) discover() (*url.URL, error) {
return service, err
}
// token returns the token for this host as configured in the credentials
// cliConfigToken returns the token for this host as configured in the credentials
// section of the CLI Config File. If no token was configured, an empty
// string will be returned instead.
func (b *Cloud) token() (string, error) {
func (b *Cloud) cliConfigToken() (string, error) {
hostname, err := svchost.ForComparison(b.hostname)
if err != nil {
return "", err

6
internal/cloud/backend_plan.go
View File

@ -432,12 +432,8 @@ func (b *Cloud) renderPlanLogs(ctx context.Context, op *backend.Operation, run *
// enabled. The plan output will have already been rendered when the logs
// were read if this wasn't the case.
if run.Workspace.StructuredRunOutputEnabled && b.renderer != nil {
token, err := b.token()
if err != nil {
return err
}
// Fetch the redacted plan.
redacted, err := readRedactedPlan(ctx, b.client.BaseURL(), token, run.Plan.ID)
redacted, err := readRedactedPlan(ctx, b.client.BaseURL(), b.token, run.Plan.ID)
if err != nil {
return err
}