Skip to content
This repository has been archived by the owner on Mar 25, 2024. It is now read-only.

Commit

Permalink
Merge pull request #19 from cloudnautique/handle_plan
Browse files Browse the repository at this point in the history 
Handle plan
  • Loading branch information
@cloudnautique
cloudnautique authored Mar 26, 2019
2 parents a4ee262 + 0232ef7 commit da73be3
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 17 deletions.
3 changes: 2 additions & 1 deletion pkg/cli/cmds/executions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var simpleExecutionTableHeader = []string{"NAME", "RUNNER NAME", "STATUS"}
func ExecutionCommand() cli.Command {
return cli.Command{
Name: "executions",
Aliases: []string{"module"},
Aliases: []string{"execution"},
Usage: "Operations on TF Operator modules",
Action: executionList,
Subcommands: []cli.Command{
Expand Down Expand Up @@ -201,6 +201,7 @@ func executionListToTableStrings(executions *v1.ExecutionList) [][]string {
values = append(values, []string{
execution.Name,
execution.Status.ExecutionRunName,
execution.Status.Conditions[len(execution.Status.Conditions)-1].Type,
})
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/cli/cmds/runs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

var simpleRunTableHeaders = []string{"RUN NAME", "APPROVED"}
var simpleRunTableHeaders = []string{"RUN NAME", "EXECUTION NAME", "APPROVAL"}

func RunCommand() cli.Command {
return cli.Command{
Expand Down Expand Up @@ -117,6 +117,7 @@ func runsListToTableStrings(runs *v1.ExecutionRunList) [][]string {

values = append(values, []string{
run.Name,
run.ObjectMeta.OwnerReferences[0].Name,
approved,
})
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var (

func main() {
app := cli.NewApp()
app.Name = "rtoc"
app.Name = "tffy"
app.Version = VERSION
app.Flags = []cli.Flag{
cli.StringFlag{
Expand Down
2 changes: 1 addition & 1 deletion types/apis/batch/v1/zz_generated_job_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/rancher/norman/controller"
"github.com/rancher/norman/objectclient"
"k8s.io/api/batch/v1"
v1 "k8s.io/api/batch/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion types/apis/batch/v1/zz_generated_job_lifecycle_adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package v1

import (
"github.com/rancher/norman/lifecycle"
"k8s.io/api/batch/v1"
v1 "k8s.io/api/batch/v1"
"k8s.io/apimachinery/pkg/runtime"
)

Expand Down
2 changes: 1 addition & 1 deletion types/apis/core/v1/zz_generated_config_map_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/rancher/norman/controller"
"github.com/rancher/norman/objectclient"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion types/apis/core/v1/zz_generated_config_map_lifecycle_adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package v1

import (
"github.com/rancher/norman/lifecycle"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
)

Expand Down
2 changes: 1 addition & 1 deletion types/apis/core/v1/zz_generated_secret_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/rancher/norman/controller"
"github.com/rancher/norman/objectclient"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion types/apis/core/v1/zz_generated_secret_lifecycle_adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package v1

import (
"github.com/rancher/norman/lifecycle"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
)

Expand Down
2 changes: 1 addition & 1 deletion types/apis/core/v1/zz_generated_service_account_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/rancher/norman/controller"
"github.com/rancher/norman/objectclient"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion types/apis/core/v1/zz_generated_service_account_lifecycle_adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package v1

import (
"github.com/rancher/norman/lifecycle"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
)

Expand Down
2 changes: 1 addition & 1 deletion types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/rancher/norman/controller"
"github.com/rancher/norman/objectclient"
"k8s.io/api/rbac/v1"
v1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion .../apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_binding_lifecycle_adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package v1

import (
"github.com/rancher/norman/lifecycle"
"k8s.io/api/rbac/v1"
v1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/runtime"
)

Expand Down
2 changes: 1 addition & 1 deletion types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/rancher/norman/controller"
"github.com/rancher/norman/objectclient"
"k8s.io/api/rbac/v1"
v1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion types/apis/rbac.authorization.k8s.io/v1/zz_generated_cluster_role_lifecycle_adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package v1

import (
"github.com/rancher/norman/lifecycle"
"k8s.io/api/rbac/v1"
v1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/runtime"
)

Expand Down
5 changes: 3 additions & 2 deletions types/apis/terraform-operator.cattle.io/v1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@ type ExecutionSpec struct {
}

type ExecutionStatus struct {
Conditions []condition.GenericCondition `json:"conditions,omitempty"`
ExecutionRunName string `json:"executionRunName,omitempty"`
Conditions []condition.GenericCondition `json:"conditions,omitempty"`
ExecutionRunName string `json:"executionRunName,omitempty"`
ExecutionPlanName string `json:"executionPlanName,omitempty"`
}

type ExecutionRun struct {
Expand Down

0 comments on commit da73be3

Please sign in to comment.