Skip to content

Revert "Validate Ksonnet apps through component dir presence (#708)" #730

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

Merged
alexmt merged 1 commit into from
Oct 29, 2018
Merged

Revert "Validate Ksonnet apps through component dir presence (#708)" #730

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
21 changes: 10 additions & 11 deletions reposerver/repository/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"path"
"regexp"
"strings"
"time"
Expand Down Expand Up @@ -118,7 +118,7 @@ func (s *Service) GetFile(ctx context.Context, q *GetFileRequest) (*GetFileRespo
if err != nil {
return nil, err
}
data, err := ioutil.ReadFile(filepath.Join(gitClient.Root(), q.Path))
data, err := ioutil.ReadFile(path.Join(gitClient.Root(), q.Path))
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -160,7 +160,7 @@ func (s *Service) GenerateManifest(c context.Context, q *ManifestRequest) (*Mani
if err != nil {
return nil, err
}
appPath := filepath.Join(gitClient.Root(), q.Path)
appPath := path.Join(gitClient.Root(), q.Path)

genRes, err := generateManifests(appPath, q)
if err != nil {
Expand Down Expand Up @@ -262,18 +262,18 @@ func generateManifests(appPath string, q *ManifestRequest) (*ManifestResponse, e

// tempRepoPath returns a formulated temporary directory location to clone a repository
func tempRepoPath(repo string) string {
return filepath.Join(os.TempDir(), strings.Replace(repo, "/", "_", -1))
return path.Join(os.TempDir(), strings.Replace(repo, "/", "_", -1))
}

// IdentifyAppSourceTypeByAppDir examines a directory and determines its application source type
func IdentifyAppSourceTypeByAppDir(appDirPath string) AppSourceType {
if pathExists(appDirPath, "app.yaml") {
if pathExists(path.Join(appDirPath, "app.yaml")) {
return AppSourceKsonnet
}
if pathExists(appDirPath, "Chart.yaml") {
if pathExists(path.Join(appDirPath, "Chart.yaml")) {
return AppSourceHelm
}
if pathExists(appDirPath, "kustomization.yaml") {
if pathExists(path.Join(appDirPath, "kustomization.yaml")) {
return AppSourceKustomize
}
return AppSourceDirectory
Expand Down Expand Up @@ -367,7 +367,7 @@ func findManifests(appPath string) ([]*unstructured.Unstructured, error) {
if f.IsDir() || !manifestFile.MatchString(f.Name()) {
continue
}
out, err := ioutil.ReadFile(filepath.Join(appPath, f.Name()))
out, err := ioutil.ReadFile(path.Join(appPath, f.Name()))
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -419,9 +419,8 @@ func findManifests(appPath string) ([]*unstructured.Unstructured, error) {
return objs, nil
}

// pathExists reports whether the file or directory at the named concatenation of paths exists.
func pathExists(ss ...string) bool {
name := filepath.Join(ss...)
// pathExists reports whether the named file or directory exists.
func pathExists(name string) bool {
if _, err := os.Stat(name); err != nil {
if os.IsNotExist(err) {
return false
Expand Down
18 changes: 3 additions & 15 deletions server/repository/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ func (s *Server) ListApps(ctx context.Context, q *RepoAppsQuery) (*RepoAppsRespo
if err != nil {
return nil, err
}
componentRes, err := repoClient.ListDir(ctx, &repository.ListDirRequest{Repo: repo, Revision: revision, Path: "components"})
if err != nil {
return nil, err
}

helmRes, err := repoClient.ListDir(ctx, &repository.ListDirRequest{Repo: repo, Revision: revision, Path: "*Chart.yaml"})
if err != nil {
Expand All @@ -102,18 +98,10 @@ func (s *Server) ListApps(ctx context.Context, q *RepoAppsQuery) (*RepoAppsRespo
return nil, err
}

componentDirs := make(map[string]interface{})
for _, i := range componentRes.Items {
d := filepath.Dir(i)
componentDirs[d] = struct{}{}
}

items := make([]*AppInfo, 0)
for _, i := range ksonnetRes.Items {
d := filepath.Dir(i)
if _, ok := componentDirs[d]; ok {
items = append(items, &AppInfo{Type: string(repository.AppSourceKsonnet), Path: i})
}

for i := range ksonnetRes.Items {
items = append(items, &AppInfo{Type: string(repository.AppSourceKsonnet), Path: ksonnetRes.Items[i]})
}

for i := range helmRes.Items {
Expand Down