Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support timeout option #6

Merged
merged 1 commit into from
Feb 22, 2024
Merged

Support timeout option #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cmd/deploy/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"os/exec"
"strings"
"time"

"github.com/hashicorp/go-tfe"
"github.com/jessevdk/go-flags"
Expand Down Expand Up @@ -41,7 +42,7 @@ func main() {
return
}

deployer, err := getDeployer(opts.TFToken, opts.Organization, opts.Workspace, log)
deployer, err := getDeployer(opts.TFToken, opts.Organization, opts.Workspace, log, opts.Timeout)
if err != nil {
log.Fatal("Could not create deployer", zap.Error(err))
}
Expand All @@ -52,7 +53,7 @@ func main() {
}
}

func getDeployer(token, organization, workspace string, log *zap.Logger) (*deployer.Deployer, error) {
func getDeployer(token, organization, workspace string, log *zap.Logger, timeout time.Duration) (*deployer.Deployer, error) {
tfc, err := tfe.NewClient(&tfe.Config{
Token: token,
})
Expand All @@ -64,6 +65,7 @@ func getDeployer(token, organization, workspace string, log *zap.Logger) (*deplo
return deployer.NewDeployer(context.Background(), log, tfc, &deployer.Config{
Organization: organization,
Workspace: workspace,
WaitTimeout: timeout,
})
}

Expand Down
19 changes: 11 additions & 8 deletions pkg/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package options

import "time"

type Options struct {
TFToken string `short:"t" long:"terraform-token" env:"TERRAFORM_TOKEN" description:"Terraform API token"`
Workspace string `short:"w" long:"workspace" env:"TERRAFORM_WORKSPACE" description:"Terraform Workspace"`
Organization string `short:"o" long:"org" env:"TERRAFORM_ORGANIZATION" description:"Terraform Organization"`
VariableName string `short:"n" long:"variable-name" env:"TERRAFORM_VARIABLE_NAME" description:"Terraform Variable Name"`
VariableValue string `short:"v" long:"variable-value" env:"TERRAFORM_VARIABLE_VALUE" description:"Value to set for the Terraform Variable named in VariableName"`
RunTitle string `long:"run-title" env:"TERRAFORM_RUN_TITLE" description:"Title for the Terraform Run. Defaults to latest commit message if unset."`
DryRun bool `long:"dry-run" description:"Do not actually run the Terraform Run. Useful for testing."`
VariableValueRequiredPrefix string `long:"variable-value-required-prefix" env:"VARIABLE_VALUE_REQUIRED_PREFIX" description:"If set, the VariableValue must start with this prefix"`
TFToken string `short:"t" long:"terraform-token" env:"TERRAFORM_TOKEN" description:"Terraform API token"`
Workspace string `short:"w" long:"workspace" env:"TERRAFORM_WORKSPACE" description:"Terraform Workspace"`
Organization string `short:"o" long:"org" env:"TERRAFORM_ORGANIZATION" description:"Terraform Organization"`
VariableName string `short:"n" long:"variable-name" env:"TERRAFORM_VARIABLE_NAME" description:"Terraform Variable Name"`
VariableValue string `short:"v" long:"variable-value" env:"TERRAFORM_VARIABLE_VALUE" description:"Value to set for the Terraform Variable named in VariableName"`
RunTitle string `long:"run-title" env:"TERRAFORM_RUN_TITLE" description:"Title for the Terraform Run. Defaults to latest commit message if unset."`
DryRun bool `long:"dry-run" description:"Do not actually run the Terraform Run. Useful for testing."`
VariableValueRequiredPrefix string `long:"variable-value-required-prefix" env:"VARIABLE_VALUE_REQUIRED_PREFIX" description:"If set, the VariableValue must start with this prefix"`
Timeout time.Duration `long:"timeout" description:"Run timeout"`
}
Loading