arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename hyperclair to clairctl in config and test

Browse Source
This commit is contained in:
jgsqware 2016-05-17 18:31:53 +02:00
parent afd0d46d04
commit edd36db8dc
10 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/clairctl/README.md
View File

@ -36,7 +36,7 @@ Available Commands:
version Get Versions of clairctl and underlying services
Flags:
--config string config file (default is ./.hyperclair.yml)
--config string config file (default is ./.clairctl.yml)
--log-level string log level [Panic,Fatal,Error,Warn,Info,Debug]
Use "clairctl [command] --help" for more information about a command.

0
cmd/clairctl/hyperclair.yml.default → cmd/clairctl/clairctl.yml.default
View File

4
cmd/clairctl/cmd/login.go
View File

@ -36,7 +36,7 @@ var loginCmd = &cobra.Command{
var users userMapping
if err := readConfigFile(&users, config.HyperclairConfig()); err != nil {
if err := readConfigFile(&users, config.ClairctlConfig()); err != nil {
fmt.Println(errInternalError)
logrus.Fatalf("reading clairctl file: %v", err)
}
@ -55,7 +55,7 @@ var loginCmd = &cobra.Command{
users[reg] = usr
if err := writeConfigFile(users, config.HyperclairConfig()); err != nil {
if err := writeConfigFile(users, config.ClairctlConfig()); err != nil {
fmt.Println(errInternalError)
logrus.Fatalf("indenting login: %v", err)
}

6
cmd/clairctl/cmd/logout.go
View File

@ -26,17 +26,17 @@ var logoutCmd = &cobra.Command{
reg = args[0]
}
if _, err := os.Stat(config.HyperclairConfig()); err == nil {
if _, err := os.Stat(config.ClairctlConfig()); err == nil {
var users userMapping
if err := readConfigFile(&users, config.HyperclairConfig()); err != nil {
if err := readConfigFile(&users, config.ClairctlConfig()); err != nil {
fmt.Println(errInternalError)
logrus.Fatalf("reading clairctl file: %v", err)
}
if _, present := users[reg]; present {
delete(users, reg)
if err := writeConfigFile(users, config.HyperclairConfig()); err != nil {
if err := writeConfigFile(users, config.ClairctlConfig()); err != nil {
fmt.Println(errInternalError)
logrus.Fatalf("indenting login: %v", err)
}

2
cmd/clairctl/cmd/root.go
View File

@ -50,7 +50,7 @@ func Execute() {
func init() {
cobra.OnInitialize(initConfig)
RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.hyperclair.yml)")
RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.clairctl.yml)")
RootCmd.PersistentFlags().StringVar(&logLevel, "log-level", "", "log level [Panic,Fatal,Error,Warn,Info,Debug]")
}

82
cmd/clairctl/config/config.go
View File

@ -23,25 +23,25 @@ import (
var ErrLoginNotFound = errors.New("user is not log in")
type r struct {
type reportConfig struct {
Path, Format string
}
type c struct {
type clairConfig struct {
URI, Priority string
Port, HealthPort int
Report r
Report reportConfig
}
type a struct {
type authConfig struct {
InsecureSkipVerify bool
}
type h struct {
type clairctlConfig struct {
IP, TempFolder string
Port int
}
type config struct {
Clair c
Auth a
Hyperclair h
Clair clairConfig
Auth authConfig
Clairctl clairctlConfig
}
// Init reads in config file and ENV variables if set.
@ -57,9 +57,9 @@ func Init(cfgFile string, logLevel string) {
}
logrus.SetLevel(lvl)
viper.SetEnvPrefix("hyperclair")
viper.SetConfigName("hyperclair") // name of config file (without extension)
viper.AddConfigPath("$HOME/.hyperclair") // adding home directory as first search path
viper.SetEnvPrefix("clairctl")
viper.SetConfigName("clairctl") // name of config file (without extension)
viper.AddConfigPath("$HOME/.clairctl") // adding home directory as first search path
viper.AddConfigPath(".") // adding home directory as first search path
viper.AutomaticEnv() // read in environment variables that match
if cfgFile != "" {
@ -93,37 +93,37 @@ func Init(cfgFile string, logLevel string) {
if viper.Get("auth.insecureSkipVerify") == nil {
viper.Set("auth.insecureSkipVerify", "true")
}
if viper.Get("hyperclair.ip") == nil {
viper.Set("hyperclair.ip", "")
if viper.Get("clairctl.ip") == nil {
viper.Set("clairctl.ip", "")
}
if viper.Get("hyperclair.port") == nil {
viper.Set("hyperclair.port", 0)
if viper.Get("clairctl.port") == nil {
viper.Set("clairctl.port", 0)
}
if viper.Get("hyperclair.tempFolder") == nil {
viper.Set("hyperclair.tempFolder", "/tmp/hyperclair")
if viper.Get("clairctl.tempFolder") == nil {
viper.Set("clairctl.tempFolder", "/tmp/clairctl")
}
clair.Config()
}
func values() config {
return config{
Clair: c{
Clair: clairConfig{
URI: viper.GetString("clair.uri"),
Port: viper.GetInt("clair.port"),
HealthPort: viper.GetInt("clair.healthPort"),
Priority: viper.GetString("clair.priority"),
Report: r{
Report: reportConfig{
Path: viper.GetString("clair.report.path"),
Format: viper.GetString("clair.report.format"),
},
},
Auth: a{
Auth: authConfig{
InsecureSkipVerify: viper.GetBool("auth.insecureSkipVerify"),
},
Hyperclair: h{
IP: viper.GetString("hyperclair.ip"),
Port: viper.GetInt("hyperclair.port"),
TempFolder: viper.GetString("hyperclair.tempFolder"),
Clairctl: clairctlConfig{
IP: viper.GetString("clairctl.ip"),
Port: viper.GetInt("clairctl.port"),
TempFolder: viper.GetString("clairctl.tempFolder"),
},
}
}
@ -139,12 +139,12 @@ func Print() {
fmt.Printf("%v", string(cfgBytes))
}
func HyperclairHome() string {
func ClairctlHome() string {
usr, err := user.Current()
if err != nil {
panic(err)
}
p := usr.HomeDir + "/.hyperclair"
p := usr.HomeDir + "/.clairctl"
if _, err := os.Stat(p); os.IsNotExist(err) {
os.Mkdir(p, 0700)
@ -159,31 +159,31 @@ type Login struct {
type loginMapping map[string]Login
func HyperclairConfig() string {
return HyperclairHome() + "/config.json"
func ClairctlConfig() string {
return ClairctlHome() + "/config.json"
}
func AddLogin(registry string, login Login) error {
var logins loginMapping
if err := readConfigFile(&logins, HyperclairConfig()); err != nil {
return fmt.Errorf("reading hyperclair file: %v", err)
if err := readConfigFile(&logins, ClairctlConfig()); err != nil {
return fmt.Errorf("reading clairctl file: %v", err)
}
logins[registry] = login
if err := writeConfigFile(logins, HyperclairConfig()); err != nil {
if err := writeConfigFile(logins, ClairctlConfig()); err != nil {
return fmt.Errorf("indenting login: %v", err)
}
return nil
}
func GetLogin(registry string) (Login, error) {
if _, err := os.Stat(HyperclairConfig()); err == nil {
if _, err := os.Stat(ClairctlConfig()); err == nil {
var logins loginMapping
if err := readConfigFile(&logins, HyperclairConfig()); err != nil {
return Login{}, fmt.Errorf("reading hyperclair file: %v", err)
if err := readConfigFile(&logins, ClairctlConfig()); err != nil {
return Login{}, fmt.Errorf("reading clairctl file: %v", err)
}
if login, present := logins[registry]; present {
@ -199,17 +199,17 @@ func GetLogin(registry string) (Login, error) {
}
func RemoveLogin(registry string) (bool, error) {
if _, err := os.Stat(HyperclairConfig()); err == nil {
if _, err := os.Stat(ClairctlConfig()); err == nil {
var logins loginMapping
if err := readConfigFile(&logins, HyperclairConfig()); err != nil {
return false, fmt.Errorf("reading hyperclair file: %v", err)
if err := readConfigFile(&logins, ClairctlConfig()); err != nil {
return false, fmt.Errorf("reading clairctl file: %v", err)
}
if _, present := logins[registry]; present {
delete(logins, registry)
if err := writeConfigFile(logins, HyperclairConfig()); err != nil {
if err := writeConfigFile(logins, ClairctlConfig()); err != nil {
return false, fmt.Errorf("indenting login: %v", err)
}
@ -247,10 +247,10 @@ func writeConfigFile(logins loginMapping, file string) error {
return nil
}
//LocalServerIP return the local hyperclair server IP
//LocalServerIP return the local clairctl server IP
func LocalServerIP() (string, error) {
localPort := viper.GetString("hyperclair.port")
localIP := viper.GetString("hyperclair.ip")
localPort := viper.GetString("clairctl.port")
localIP := viper.GetString("clairctl.ip")
if localIP == "" {
logrus.Infoln("retrieving docker0 interface as local IP")
var err error

16
cmd/clairctl/config/config_test.go
View File

@ -5,8 +5,8 @@ import (
"os"
"testing"
"github.com/spf13/viper"
"github.com/coreos/clair/cmd/clairctl/test"
"github.com/spf13/viper"
"gopkg.in/yaml.v2"
)
@ -22,9 +22,9 @@ clair:
format: html
auth:
insecureskipverify: true
hyperclair:
clairctl:
ip: ""
tempfolder: /tmp/hyperclair
tempfolder: /tmp/clairctl
port: 0
`
@ -39,9 +39,9 @@ clair:
format: json
auth:
insecureskipverify: false
hyperclair:
clairctl:
ip: "localhost"
tempfolder: /tmp/hyperclair/test
tempfolder: /tmp/clairctl/test
port: 64157
`
@ -63,7 +63,7 @@ func TestInitDefault(t *testing.T) {
}
func TestInitCustomLocal(t *testing.T) {
tmpfile := test.CreateConfigFile(customValues, "hyperclair.yml", ".")
tmpfile := test.CreateConfigFile(customValues, "clairctl.yml", ".")
defer os.Remove(tmpfile) // clean up
fmt.Println(tmpfile)
Init("", "INFO")
@ -83,7 +83,7 @@ func TestInitCustomLocal(t *testing.T) {
}
func TestInitCustomHome(t *testing.T) {
tmpfile := test.CreateConfigFile(customValues, "hyperclair.yml", HyperclairHome())
tmpfile := test.CreateConfigFile(customValues, "clairctl.yml", ClairctlHome())
defer os.Remove(tmpfile) // clean up
fmt.Println(tmpfile)
Init("", "INFO")
@ -103,7 +103,7 @@ func TestInitCustomHome(t *testing.T) {
}
func TestInitCustom(t *testing.T) {
tmpfile := test.CreateConfigFile(customValues, "hyperclair.yml", "/tmp")
tmpfile := test.CreateConfigFile(customValues, "clairctl.yml", "/tmp")
defer os.Remove(tmpfile) // clean up
fmt.Println(tmpfile)
Init(tmpfile, "INFO")

2
cmd/clairctl/docker/image.go
View File

@ -33,7 +33,7 @@ const hubURI = "https://" + DockerHub + "/v2"
var IsLocal = false
func TmpLocal() string {
return viper.GetString("hyperclair.tempFolder")
return viper.GetString("clairctl.tempFolder")
}
// Parse is used to parse a docker image command

4
cmd/clairctl/server/server.go
View File

@ -41,10 +41,10 @@ func tcpListener(sURL string) (listener net.Listener) {
logrus.Fatalf("cannot instanciate listener: %v", err)
}
if viper.GetInt("hyperclair.port") == 0 {
if viper.GetInt("clairctl.port") == 0 {
port := strings.Split(listener.Addr().String(), ":")[1]
logrus.Debugf("Update local server port from %q to %q", "0", port)
viper.Set("hyperclair.port", port)
viper.Set("clairctl.port", port)
}
return

2
cmd/clairctl/test/test.go
View File

@ -9,7 +9,7 @@ import (
func CreateTmpConfigFile(content string) string {
c := []byte(content)
tmpfile, err := ioutil.TempFile("", "test-hyperclair")
tmpfile, err := ioutil.TempFile("", "test-clairctl")
if err != nil {
log.Fatal(err)
}