fluxcd
/
cli-utils
mirror of https://github.com/fluxcd/cli-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update wiring for resource configuration

This commit is contained in:
jingfangliu 2019-08-15 16:10:26 -07:00
parent 60963653f6
commit 46894c73ba
9 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.travis.yaml
View File

@ -1,36 +0,0 @@
os:
- linux
- osx
addons:
apt:
packages:
- tree
homebrew:
packages:
- tree
update: true
# Only clone the most recent commit.
git:
depth: 1
language: go
go:
- "1.12"
go_import_path: sigs.k8s.io/cli-utils
before_install:
- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.17.1
# Skip the install process; let pre-commit.sh do it.
install: true
script:
- ./scripts/check-everything.sh
# TBD. Suppressing for now.
notifications:
email: false

4
.travis.yml
View File

@ -15,7 +15,7 @@ git:
go_import_path: sigs.k8s.io/cli-utils
install:
before_install:
- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.17.1
script:
@ -23,4 +23,4 @@ script:
# TBD. Suppressing for now.
notifications:
email: false
email: false

9
internal/pkg/wirecli/wireapply/wire_gen.go
View File

@ -9,6 +9,7 @@ import (
"io"
"sigs.k8s.io/cli-utils/internal/pkg/apply"
"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
"sigs.k8s.io/cli-utils/internal/pkg/resourceconfig"
"sigs.k8s.io/cli-utils/internal/pkg/util"
"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
@ -43,7 +44,9 @@ func InitializeApply(resourceConfigPath clik8s.ResourceConfigPath, writer io.Wri
fileSystem := wireconfig.NewFileSystem()
transformerFactory := wireconfig.NewTransformerFactory()
kustomizeProvider := wireconfig.NewKustomizeProvider(factory, fileSystem, transformerFactory, pluginConfig)
resourceConfigs, err := wireconfig.NewResourceConfig(resourceConfigPath, kustomizeProvider)
rawConfigFileProvider := &resourceconfig.RawConfigFileProvider{}
configProvider := wireconfig.NewConfigProvider(resourceConfigPath, kustomizeProvider, rawConfigFileProvider)
resourceConfigs, err := wireconfig.NewResourceConfig(resourceConfigPath, configProvider)
if err != nil {
return nil, err
}
@ -85,7 +88,9 @@ func DoApply(resourceConfigPath clik8s.ResourceConfigPath, writer io.Writer, arg
fileSystem := wireconfig.NewFileSystem()
transformerFactory := wireconfig.NewTransformerFactory()
kustomizeProvider := wireconfig.NewKustomizeProvider(factory, fileSystem, transformerFactory, pluginConfig)
resourceConfigs, err := wireconfig.NewResourceConfig(resourceConfigPath, kustomizeProvider)
rawConfigFileProvider := &resourceconfig.RawConfigFileProvider{}
configProvider := wireconfig.NewConfigProvider(resourceConfigPath, kustomizeProvider, rawConfigFileProvider)
resourceConfigs, err := wireconfig.NewResourceConfig(resourceConfigPath, configProvider)
if err != nil {
return apply.Result{}, err
}

40
internal/pkg/wirecli/wireconfig/wireconfig.go
View File

@ -33,22 +33,37 @@ import (
// ConfigProviderSet defines dependencies for initializing ConfigProvider
var ConfigProviderSet = wire.NewSet(
NewPluginConfig,
NewResMapFactory,
NewTransformerFactory,
NewFileSystem,
NewKustomizeProvider,
wire.Bind(new(resourceconfig.ConfigProvider), new(*resourceconfig.KustomizeProvider)),
KustomizeConfigProvider,
RawYAMLConfigProvider,
NewConfigProvider,
NewResourceConfig,
NewResourcePruneConfig,
)
var KustomizeConfigProviderSet = wire.NewSet(
KustomizeConfigProvider,
wire.Bind(new(resourceconfig.ConfigProvider),
new(*resourceconfig.KustomizeProvider)),
)
// RawConfigProviderSet defines dependencies for initializing a RawConfigFileProvider
var RawConfigProviderSet = wire.NewSet(
wire.Struct(new(resourceconfig.RawConfigFileProvider), "*"),
wire.Bind(new(resourceconfig.ConfigProvider), new(*resourceconfig.RawConfigFileProvider)),
)
var KustomizeConfigProvider = wire.NewSet(
NewPluginConfig,
NewResMapFactory,
NewTransformerFactory,
NewFileSystem,
NewKustomizeProvider,
)
var RawYAMLConfigProvider = wire.NewSet(
wire.Struct(new(resourceconfig.RawConfigFileProvider), "*"),
)
// NewPluginConfig returns a new PluginConfig
func NewPluginConfig() *types.PluginConfig {
pc := plugins.DefaultPluginConfig()
@ -106,3 +121,16 @@ func NewResourcePruneConfig(rcp clik8s.ResourceConfigPath,
return nil, nil
}
func NewConfigProvider(rcp clik8s.ResourceConfigPath,
kcf *resourceconfig.KustomizeProvider, rcf *resourceconfig.RawConfigFileProvider) resourceconfig.ConfigProvider {
p := string(rcp)
if kcf.IsSupported(p) {
return kcf
}
if rcf.IsSupported(p) {
return rcf
}
return nil
}

5
internal/pkg/wirecli/wiredelete/wire_gen.go
View File

@ -9,6 +9,7 @@ import (
"io"
"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
delete2 "sigs.k8s.io/cli-utils/internal/pkg/delete"
"sigs.k8s.io/cli-utils/internal/pkg/resourceconfig"
"sigs.k8s.io/cli-utils/internal/pkg/util"
"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
@ -43,7 +44,9 @@ func DoDelete(resourceConfigPath clik8s.ResourceConfigPath, writer io.Writer, ar
fileSystem := wireconfig.NewFileSystem()
transformerFactory := wireconfig.NewTransformerFactory()
kustomizeProvider := wireconfig.NewKustomizeProvider(factory, fileSystem, transformerFactory, pluginConfig)
resourceConfigs, err := wireconfig.NewResourceConfig(resourceConfigPath, kustomizeProvider)
rawConfigFileProvider := &resourceconfig.RawConfigFileProvider{}
configProvider := wireconfig.NewConfigProvider(resourceConfigPath, kustomizeProvider, rawConfigFileProvider)
resourceConfigs, err := wireconfig.NewResourceConfig(resourceConfigPath, configProvider)
if err != nil {
return delete2.Result{}, err
}

5
internal/pkg/wirecli/wireprune/wire_gen.go
View File

@ -9,6 +9,7 @@ import (
"io"
"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
"sigs.k8s.io/cli-utils/internal/pkg/prune"
"sigs.k8s.io/cli-utils/internal/pkg/resourceconfig"
"sigs.k8s.io/cli-utils/internal/pkg/util"
"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wiregit"
@ -43,7 +44,9 @@ func DoPrune(resourceConfigPath clik8s.ResourceConfigPath, writer io.Writer, arg
fileSystem := wireconfig.NewFileSystem()
transformerFactory := wireconfig.NewTransformerFactory()
kustomizeProvider := wireconfig.NewKustomizeProvider(factory, fileSystem, transformerFactory, pluginConfig)
resourcePruneConfigs, err := wireconfig.NewResourcePruneConfig(resourceConfigPath, kustomizeProvider)
rawConfigFileProvider := &resourceconfig.RawConfigFileProvider{}
configProvider := wireconfig.NewConfigProvider(resourceConfigPath, kustomizeProvider, rawConfigFileProvider)
resourcePruneConfigs, err := wireconfig.NewResourcePruneConfig(resourceConfigPath, configProvider)
if err != nil {
return prune.Result{}, err
}

9
internal/pkg/wirecli/wirestatus/wire_gen.go
View File

@ -8,6 +8,7 @@ package wirestatus
import (
"io"
"sigs.k8s.io/cli-utils/internal/pkg/clik8s"
"sigs.k8s.io/cli-utils/internal/pkg/resourceconfig"
"sigs.k8s.io/cli-utils/internal/pkg/status"
"sigs.k8s.io/cli-utils/internal/pkg/util"
"sigs.k8s.io/cli-utils/internal/pkg/wirecli/wireconfig"
@ -43,7 +44,9 @@ func InitializeStatus(resourceConfigPath clik8s.ResourceConfigPath, writer io.Wr
fileSystem := wireconfig.NewFileSystem()
transformerFactory := wireconfig.NewTransformerFactory()
kustomizeProvider := wireconfig.NewKustomizeProvider(factory, fileSystem, transformerFactory, pluginConfig)
resourceConfigs, err := wireconfig.NewResourceConfig(resourceConfigPath, kustomizeProvider)
rawConfigFileProvider := &resourceconfig.RawConfigFileProvider{}
configProvider := wireconfig.NewConfigProvider(resourceConfigPath, kustomizeProvider, rawConfigFileProvider)
resourceConfigs, err := wireconfig.NewResourceConfig(resourceConfigPath, configProvider)
if err != nil {
return nil, err
}
@ -85,7 +88,9 @@ func DoStatus(resourceConfigPath clik8s.ResourceConfigPath, writer io.Writer, ar
fileSystem := wireconfig.NewFileSystem()
transformerFactory := wireconfig.NewTransformerFactory()
kustomizeProvider := wireconfig.NewKustomizeProvider(factory, fileSystem, transformerFactory, pluginConfig)
resourceConfigs, err := wireconfig.NewResourceConfig(resourceConfigPath, kustomizeProvider)
rawConfigFileProvider := &resourceconfig.RawConfigFileProvider{}
configProvider := wireconfig.NewConfigProvider(resourceConfigPath, kustomizeProvider, rawConfigFileProvider)
resourceConfigs, err := wireconfig.NewResourceConfig(resourceConfigPath, configProvider)
if err != nil {
return status.Result{}, err
}

2
internal/pkg/wirecli/wiretest/wire.go
View File

@ -64,7 +64,7 @@ func InitializePrune(clik8s.ResourcePruneConfigs, *object.Commit, io.Writer) (*p
}
func InitializConfigProvider() resourceconfig.ConfigProvider {
panic(wire.Build(wireconfig.ConfigProviderSet))
panic(wire.Build(wireconfig.KustomizeConfigProviderSet))
}
func InitializeRawConfigProvider() resourceconfig.ConfigProvider {

2
scripts/test-all.sh
View File

@ -22,5 +22,5 @@ setup_envs
header_text "running go test"
go test ./... -parallel 4
go test ./...