Codebase cleanup & optimization (#1493)

Remove old v1 types that are no longer used and move fetcher structs to fetcher directory.
This commit is contained in:
Ta-Ching Chen
2020-01-16 16:47:32 +08:00
committed by GitHub
parent 574fb55fcf
commit bb3e6d6907
37 changed files with 305 additions and 498 deletions
+1 -2
View File
@@ -40,7 +40,6 @@ import (
"github.com/fission/fission/pkg/fission-cli/console"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
"github.com/fission/fission/pkg/fission-cli/util"
"github.com/fission/fission/pkg/types"
"github.com/fission/fission/pkg/utils"
)
@@ -474,7 +473,7 @@ func localArchiveFromSpec(specDir string, aus *spectypes.ArchiveUploadSpec) (*fv
}
// figure out if we're making a literal or a URL-based archive
if size < types.ArchiveLiteralSizeLimit {
if size < fv1.ArchiveLiteralSizeLimit {
contents, err := pkgutil.GetContents(archiveFileName)
if err != nil {
return nil, err
+5 -6
View File
@@ -27,7 +27,6 @@ import (
fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
"github.com/fission/fission/pkg/controller/client"
"github.com/fission/fission/pkg/fission-cli/cmd/package/util"
"github.com/fission/fission/pkg/types"
)
type (
@@ -83,11 +82,11 @@ func (w *packageBuildWatcher) watch(ctx context.Context) {
if !ok {
continue
}
if pkg.Status.BuildStatus == types.BuildStatusNone {
if pkg.Status.BuildStatus == fv1.BuildStatusNone {
continue
}
if pkg.Status.BuildStatus == types.BuildStatusPending ||
pkg.Status.BuildStatus == types.BuildStatusRunning {
if pkg.Status.BuildStatus == fv1.BuildStatusPending ||
pkg.Status.BuildStatus == fv1.BuildStatusRunning {
keepWaiting = true
}
buildpkgs = append(buildpkgs, pkg)
@@ -99,8 +98,8 @@ func (w *packageBuildWatcher) watch(ctx context.Context) {
if _, printed := w.finished[k]; printed {
continue
}
if pkg.Status.BuildStatus == types.BuildStatusFailed ||
pkg.Status.BuildStatus == types.BuildStatusSucceeded {
if pkg.Status.BuildStatus == fv1.BuildStatusFailed ||
pkg.Status.BuildStatus == fv1.BuildStatusSucceeded {
w.finished[k] = true
fmt.Printf("------\n")
util.PrintPackageSummary(os.Stdout, &pkg)