update to go-tfe 0.3.23
this fixes the attr types Signed-off-by: Paul Thrasher <pthrasher@hashicorp.com>
This commit is contained in:
parent
39817ac476
commit
bc2d888b7b
|
@ -275,8 +275,8 @@ func (b *Remote) costEstimate(stopCtx, cancelCtx context.Context, op *backend.Op
|
||||||
deltaRepr := strings.Replace(ce.DeltaMonthlyCost, "-", "", 1)
|
deltaRepr := strings.Replace(ce.DeltaMonthlyCost, "-", "", 1)
|
||||||
|
|
||||||
if b.CLI != nil {
|
if b.CLI != nil {
|
||||||
b.CLI.Output(b.Colorize().Color(fmt.Sprintf("Resources: %s of %s estimated", ce.MatchedResourcesCount, ce.ResourcesCount)))
|
b.CLI.Output(b.Colorize().Color(fmt.Sprintf("Resources: %d of %d estimated", ce.MatchedResourcesCount, ce.ResourcesCount)))
|
||||||
b.CLI.Output(b.Colorize().Color(fmt.Sprintf("\t$%s/mo %s$%s", ce.ProposedMonthlyCost, sign, deltaRepr)))
|
b.CLI.Output(b.Colorize().Color(fmt.Sprintf(" $%s/mo %s$%s", ce.ProposedMonthlyCost, sign, deltaRepr)))
|
||||||
|
|
||||||
if len(r.PolicyChecks) == 0 && r.HasChanges && op.Type == backend.OperationTypeApply {
|
if len(r.PolicyChecks) == 0 && r.HasChanges && op.Type == backend.OperationTypeApply {
|
||||||
b.CLI.Output("\n------------------------------------------------------------------------")
|
b.CLI.Output("\n------------------------------------------------------------------------")
|
||||||
|
@ -297,7 +297,7 @@ func (b *Remote) costEstimate(stopCtx, cancelCtx context.Context, op *backend.Op
|
||||||
elapsed = fmt.Sprintf(
|
elapsed = fmt.Sprintf(
|
||||||
" (%s elapsed)", current.Sub(started).Truncate(30*time.Second))
|
" (%s elapsed)", current.Sub(started).Truncate(30*time.Second))
|
||||||
}
|
}
|
||||||
b.CLI.Output(b.Colorize().Color("Waiting for cost estimation to complete..." + elapsed))
|
b.CLI.Output(b.Colorize().Color("Waiting for cost estimation to complete..." + elapsed + "\n"))
|
||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
case tfe.CostEstimateErrored:
|
case tfe.CostEstimateErrored:
|
||||||
|
|
|
@ -316,6 +316,14 @@ to capture the filesystem context the remote workspace expects:
|
||||||
return r, nil
|
return r, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Show any cost estimation output.
|
||||||
|
if r.CostEstimate != nil {
|
||||||
|
err = b.costEstimate(stopCtx, cancelCtx, op, r)
|
||||||
|
if err != nil {
|
||||||
|
return r, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Check any configured sentinel policies.
|
// Check any configured sentinel policies.
|
||||||
if len(r.PolicyChecks) > 0 {
|
if len(r.PolicyChecks) > 0 {
|
||||||
err = b.checkPolicy(stopCtx, cancelCtx, op, r)
|
err = b.checkPolicy(stopCtx, cancelCtx, op, r)
|
||||||
|
|
2
go.mod
2
go.mod
|
@ -63,7 +63,7 @@ require (
|
||||||
github.com/hashicorp/go-retryablehttp v0.5.2
|
github.com/hashicorp/go-retryablehttp v0.5.2
|
||||||
github.com/hashicorp/go-rootcerts v1.0.0
|
github.com/hashicorp/go-rootcerts v1.0.0
|
||||||
github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86 // indirect
|
github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86 // indirect
|
||||||
github.com/hashicorp/go-tfe v0.3.22
|
github.com/hashicorp/go-tfe v0.3.23
|
||||||
github.com/hashicorp/go-uuid v1.0.1
|
github.com/hashicorp/go-uuid v1.0.1
|
||||||
github.com/hashicorp/go-version v1.1.0
|
github.com/hashicorp/go-version v1.1.0
|
||||||
github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f
|
github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f
|
||||||
|
|
2
go.sum
2
go.sum
|
@ -202,6 +202,8 @@ github.com/hashicorp/go-tfe v0.3.21 h1:JVB+DqX4zevWmaVHGsJfElyScf1ZjbF6EUDLPzU96
|
||||||
github.com/hashicorp/go-tfe v0.3.21/go.mod h1:SuPHR+OcxvzBZNye7nGPfwZTEyd3rWPfLVbCgyZPezM=
|
github.com/hashicorp/go-tfe v0.3.21/go.mod h1:SuPHR+OcxvzBZNye7nGPfwZTEyd3rWPfLVbCgyZPezM=
|
||||||
github.com/hashicorp/go-tfe v0.3.22 h1:Wodv4Y3kiC6bTPHQzhrn026V3HLhfwhc1rVlLY8suKs=
|
github.com/hashicorp/go-tfe v0.3.22 h1:Wodv4Y3kiC6bTPHQzhrn026V3HLhfwhc1rVlLY8suKs=
|
||||||
github.com/hashicorp/go-tfe v0.3.22/go.mod h1:SuPHR+OcxvzBZNye7nGPfwZTEyd3rWPfLVbCgyZPezM=
|
github.com/hashicorp/go-tfe v0.3.22/go.mod h1:SuPHR+OcxvzBZNye7nGPfwZTEyd3rWPfLVbCgyZPezM=
|
||||||
|
github.com/hashicorp/go-tfe v0.3.23 h1:kd9hlFQvGubNF/CpF7T5AP/xU8uLUq8ANbI5xRDVSms=
|
||||||
|
github.com/hashicorp/go-tfe v0.3.23/go.mod h1:SuPHR+OcxvzBZNye7nGPfwZTEyd3rWPfLVbCgyZPezM=
|
||||||
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
|
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
|
||||||
github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
|
github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
|
||||||
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
|
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
|
||||||
|
|
|
@ -47,13 +47,13 @@ type CostEstimate struct {
|
||||||
ID string `jsonapi:"primary,cost-estimates"`
|
ID string `jsonapi:"primary,cost-estimates"`
|
||||||
DeltaMonthlyCost string `jsonapi:"attr,delta-monthly-cost"`
|
DeltaMonthlyCost string `jsonapi:"attr,delta-monthly-cost"`
|
||||||
ErrorMessage string `jsonapi:"attr,error-message"`
|
ErrorMessage string `jsonapi:"attr,error-message"`
|
||||||
MatchedResourcesCount string `jsonapi:"attr,matched-resources-count"`
|
MatchedResourcesCount int `jsonapi:"attr,matched-resources-count"`
|
||||||
PriorMonthlyCost string `jsonapi:"attr,prior-monthly-cost"`
|
PriorMonthlyCost string `jsonapi:"attr,prior-monthly-cost"`
|
||||||
ProposedMonthlyCost string `jsonapi:"attr,proposed-monthly-cost"`
|
ProposedMonthlyCost string `jsonapi:"attr,proposed-monthly-cost"`
|
||||||
ResourcesCount string `jsonapi:"attr,resources-count"`
|
ResourcesCount int `jsonapi:"attr,resources-count"`
|
||||||
Status CostEstimateStatus `jsonapi:"attr,status"`
|
Status CostEstimateStatus `jsonapi:"attr,status"`
|
||||||
StatusTimestamps *CostEstimateStatusTimestamps `jsonapi:"attr,status-timestamps"`
|
StatusTimestamps *CostEstimateStatusTimestamps `jsonapi:"attr,status-timestamps"`
|
||||||
UnmatchedResourcesCount string `jsonapi:"attr,unmatched-resources-count"`
|
UnmatchedResourcesCount int `jsonapi:"attr,unmatched-resources-count"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// CostEstimateStatusTimestamps holds the timestamps for individual costEstimate statuses.
|
// CostEstimateStatusTimestamps holds the timestamps for individual costEstimate statuses.
|
||||||
|
|
|
@ -315,7 +315,7 @@ github.com/hashicorp/go-rootcerts
|
||||||
github.com/hashicorp/go-safetemp
|
github.com/hashicorp/go-safetemp
|
||||||
# github.com/hashicorp/go-slug v0.3.0
|
# github.com/hashicorp/go-slug v0.3.0
|
||||||
github.com/hashicorp/go-slug
|
github.com/hashicorp/go-slug
|
||||||
# github.com/hashicorp/go-tfe v0.3.22
|
# github.com/hashicorp/go-tfe v0.3.23
|
||||||
github.com/hashicorp/go-tfe
|
github.com/hashicorp/go-tfe
|
||||||
# github.com/hashicorp/go-uuid v1.0.1
|
# github.com/hashicorp/go-uuid v1.0.1
|
||||||
github.com/hashicorp/go-uuid
|
github.com/hashicorp/go-uuid
|
||||||
|
|
Loading…
Reference in New Issue