Skip to content

Commit

Permalink
Merge pull request #2135 from layer5io/leecalcote/fix-smp-promptui
Browse files Browse the repository at this point in the history 
Broken SMP reference; broken prompt-ui references
  • Loading branch information
@leecalcote
leecalcote committed Dec 23, 2020
2 parents d469d92 + 8aadc95 commit c4f3baa
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 34 deletions.
5 changes: 0 additions & 5 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ github.com/capnm/sysinfo v0.0.0-20130621111458-5909a53897f3/go.mod h1:M5XHQLu90v
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
Expand Down Expand Up @@ -309,10 +307,8 @@ github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0Q
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
Expand Down Expand Up @@ -798,7 +794,6 @@ k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4=
k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 h1:Gi+/O1saihwDqnlmC8Vhv1M5Sp4+rbOmK9TbsLn8ZEA=
k8s.io/utils v0.0.0-20191010214722-8d271d903fe4/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
Expand Down
2 changes: 1 addition & 1 deletion handlers/load_test_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/gofrs/uuid"
"github.com/layer5io/meshery/helpers"
"github.com/layer5io/meshery/models"
SMP "github.com/layer5io/service-mesh-performance/tree/v0.3.1/spec"
SMP "github.com/layer5io/service-mesh-performance/spec"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"google.golang.org/protobuf/encoding/protojson"
Expand Down
2 changes: 1 addition & 1 deletion handlers/load_test_meshes_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

"github.com/layer5io/meshery/models"
SMP "github.com/layer5io/service-mesh-performance/tree/v0.3.1/spec"
SMP "github.com/layer5io/service-mesh-performance/spec"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion handlers/load_test_preferences_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"google.golang.org/protobuf/encoding/protojson"

"github.com/layer5io/meshery/models"
SMP "github.com/layer5io/service-mesh-performance/tree/v0.3.1/spec"
SMP "github.com/layer5io/service-mesh-performance/spec"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
Expand Down
21 changes: 0 additions & 21 deletions handlers/server_spec_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import (
"encoding/json"
"fmt"
"net/http"
"strings"

"github.com/layer5io/meshery/mesheryctl/pkg/utils"

"github.com/pkg/errors"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -69,24 +66,6 @@ func CheckLatestVersion(serverVersion string) (*latest.CheckResponse, error) {
// If user is running an outdated release, let them know.
if res.Outdated {
logrus.Info("\n ", serverVersion, " is not the latest Meshery release. Update to v", res.Current, ". Run `mesheryctl system update`")
promptLabel := fmt.Sprintf("Would you like to upgrade to v%s now [y/n]?", res.Current)

prompt := promptui.Select{
Label: promptLabel,
Items: []string{"y", "n"},
}
_, result, err := prompt.Run()
if err != nil {
logrus.Error("Prompt failed %w\n", err)
}
result = strings.TrimSpace(result)
result = strings.ToLower(result)
if result != "n" && result != "no" {
err = utils.UpdateMesheryContainers()
if err != nil {
logrus.Error("Unable to update meshery: %w", err)
}
}
}

// If user is running the latest release, let them know.
Expand Down
2 changes: 1 addition & 1 deletion models/bitcask_test_profiles_persister.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path"

"github.com/gofrs/uuid"
SMP "github.com/layer5io/service-mesh-performance/tree/v0.3.1/spec"
SMP "github.com/layer5io/service-mesh-performance/spec"
"github.com/pkg/errors"
"github.com/prologic/bitcask"
"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion models/default_local_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strconv"

"github.com/gofrs/uuid"
SMP "github.com/layer5io/service-mesh-performance/tree/v0.3.1/spec"
SMP "github.com/layer5io/service-mesh-performance/spec"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion models/meshery_remote_provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"time"

"github.com/gofrs/uuid"
SMP "github.com/layer5io/service-mesh-performance/tree/v0.3.1/spec"
SMP "github.com/layer5io/service-mesh-performance/spec"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion models/providers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"

"github.com/gofrs/uuid"
SMP "github.com/layer5io/service-mesh-performance/tree/v0.3.1/spec"
SMP "github.com/layer5io/service-mesh-performance/spec"
)

// ProviderType - for representing provider types
Expand Down
2 changes: 1 addition & 1 deletion models/validators.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/url"
"time"

SMP "github.com/layer5io/service-mesh-performance/tree/v0.3.1/spec"
SMP "github.com/layer5io/service-mesh-performance/spec"
"github.com/pkg/errors"
)

Expand Down

0 comments on commit c4f3baa

Please sign in to comment.