Files
golib/config/components/aws/config.go
Nicolas JUHEL ae0a6b62c9 Package HTTP Client:
- Add DNS Mapper to force destination for a fqdn source
- Allow wildcard and multi wildcard for fqdn source
- DNS Mapper create Transport, Dialer & http client
- DNS Mapper allow a config input to customize timeout, limit and TLS config
- DNS Mapper use a gloabl transport connection poller
- DNS Mapper implement DialContext & Dial method for transport
- DNS Mapper use cache to accelerate process
- DNS Mapper cache is only dnsmapper, not DNS cache
- Replace old helper for http client with DNSMapper
- Add default DNSMapper into the main lib of http client
- Allow to overide the default DNS Mapper with a new one
- Add ticker to force clean idle connection every given duration
- "Compatible" with old config, as the default config will be used instead of old client build
- Clean code and fix minor bugs
- Add config component to allow use a global config
- Config Component httpcli can overide default httpcli dns mapper when updated

Package Certificates
- Add function type to impose function that return a slice of rootCA string
- update config/component/tls by replacing mutex with atomic
- optimize some code

Package Config
- expand errors code index to add component httpcli

Package Config/component:
- database: add new validation, that config key existing into viper
- head: add new validation, that config key existing into viper
- http: add new validation, that config key existing into viper
- ldap: add new validation, that config key existing into viper
- log: add new validation, that config key existing into viper
- mail: add new validation, that config key existing into viper
- smtp: add new validation, that config key existing into viper

Package AWS:
- update package following update of httpcli
- use interface for http cli that implement the Do function
- update following the config/component/aws
- rework config/component/aws to use atomic instead of mutex
- update test unit following change

Package Request:
- update following http client update
- use interface of HTTP Client that implement DO function, instead of http client struct pointer
- update config & code following
- apply same modification into config/component/request
- update config/component/request by replacing mutex to atomic

Package Server
- add function Uptime to model to expose the duration since last start

Package Semaphore
- apply change name of constant following bump of lib associated

Package Crypt
- fix bug into reader to remove suffix of EOF if prevent

Package Errors:
- expand index module to add DNS Mapper client

Package HTTP Server:
- update monitor to apply changes

Package Socket:
- add additional check if reading error: if buffer has data, send it to handler before break run

Other:
- bump dependencies
2024-02-16 15:42:13 +01:00

241 lines
6.1 KiB
Go

/*
* MIT License
*
* Copyright (c) 2022 Nicolas JUHEL
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
*
*/
package aws
import (
"fmt"
libaws "github.com/nabbar/golib/aws"
cfgstd "github.com/nabbar/golib/aws/configAws"
cfgcus "github.com/nabbar/golib/aws/configCustom"
libreq "github.com/nabbar/golib/request"
libvpr "github.com/nabbar/golib/viper"
spfcbr "github.com/spf13/cobra"
spfvpr "github.com/spf13/viper"
)
type _configFlag struct {
accessKey *string
secretKey *string
bucket *string
region *string
endpoint *string
}
func (c *_configFlag) updCustom(cfg *cfgcus.Model) {
if c.accessKey != nil {
cfg.AccessKey = *c.accessKey
}
if c.secretKey != nil {
cfg.SecretKey = *c.secretKey
}
if c.bucket != nil {
cfg.Bucket = *c.bucket
}
if c.region != nil {
cfg.Region = *c.region
}
if c.endpoint != nil {
cfg.Endpoint = *c.endpoint
}
}
func (c *_configFlag) updStandard(cfg *cfgstd.Model) {
if c.accessKey != nil {
cfg.AccessKey = *c.accessKey
}
if c.secretKey != nil {
cfg.SecretKey = *c.secretKey
}
if c.bucket != nil {
cfg.Bucket = *c.bucket
}
if c.region != nil {
cfg.Region = *c.region
}
}
func (o *componentAws) RegisterFlag(Command *spfcbr.Command) error {
var (
key = o._getKey()
vpr *spfvpr.Viper
)
if vpr = o._getSPFViper(); vpr == nil {
return ErrorComponentNotInitialized.Error(nil)
} else if key = o._getKey(); len(key) < 1 {
return ErrorComponentNotInitialized.Error(nil)
}
_ = Command.PersistentFlags().String(key+".access-key", "", "AWS Access Key")
_ = Command.PersistentFlags().String(key+".secret-key", "", "AWS Secret Key")
_ = Command.PersistentFlags().String(key+".bucket", "", "Bucket to use")
_ = Command.PersistentFlags().String(key+".region", "", "Region for bucket")
_ = Command.PersistentFlags().String(key+".endpoint", "", "Endpoint if necessary for the region")
if err := vpr.BindPFlag(key+".access-key", Command.PersistentFlags().Lookup(key+".access-key")); err != nil {
return err
} else if err = vpr.BindPFlag(key+".secret-key", Command.PersistentFlags().Lookup(key+".secret-key")); err != nil {
return err
} else if err = vpr.BindPFlag(key+".bucket", Command.PersistentFlags().Lookup(key+".bucket")); err != nil {
return err
} else if err = vpr.BindPFlag(key+".region", Command.PersistentFlags().Lookup(key+".region")); err != nil {
return err
} else if err = vpr.BindPFlag(key+".endpoint", Command.PersistentFlags().Lookup(key+".endpoint")); err != nil {
return err
}
return nil
}
func (o *componentAws) _getConfig() (libaws.Config, *libreq.OptionsHealth, error) {
var (
key string
cfg libaws.Config
flg = o._getFlagUpdate()
mon *libreq.OptionsHealth
vpr libvpr.Viper
err error
)
if vpr = o._getViper(); vpr == nil {
return nil, nil, ErrorComponentNotInitialized.Error(nil)
} else if key = o._getKey(); len(key) < 1 {
return nil, nil, ErrorComponentNotInitialized.Error(nil)
} else if !vpr.Viper().IsSet(key) {
return nil, nil, ErrorParamInvalid.Error(fmt.Errorf("missing config key '%s'", key))
}
switch o.d {
case ConfigCustomStatus:
cnf := cfgcus.ModelStatus{}
if err = vpr.UnmarshalKey(key, &cnf); err != nil {
return nil, nil, ErrorParamInvalid.Error(err)
} else {
flg.updCustom(&cnf.Config)
}
if cfg, err = o.d.NewFromModel(cnf); err != nil {
return nil, nil, err
} else {
mon = &cnf.Monitor
}
case ConfigCustom:
cnf := cfgcus.Model{}
if err = vpr.UnmarshalKey(key, &cnf); err != nil {
return nil, nil, ErrorParamInvalid.Error(err)
} else {
flg.updCustom(&cnf)
}
if cfg, err = o.d.NewFromModel(cnf); err != nil {
return nil, nil, err
} else {
mon = nil
}
case ConfigStandardStatus:
cnf := cfgstd.ModelStatus{}
if err = vpr.UnmarshalKey(key, &cnf); err != nil {
return nil, nil, ErrorParamInvalid.Error(err)
} else {
flg.updStandard(&cnf.Config)
}
if cfg, err = o.d.NewFromModel(cnf); err != nil {
return nil, nil, err
} else {
mon = &cnf.Monitor
}
case ConfigStandard:
cnf := cfgstd.Model{}
if err = vpr.UnmarshalKey(key, &cnf); err != nil {
return nil, nil, ErrorParamInvalid.Error(err)
} else {
flg.updStandard(&cnf)
}
if cfg, err = o.d.NewFromModel(cnf); err != nil {
return nil, nil, err
} else {
mon = nil
}
}
if err = cfg.Validate(); err != nil {
return nil, nil, ErrorConfigInvalid.Error(err)
}
if mon != nil {
if err = mon.Validate(); err != nil {
return nil, nil, ErrorConfigInvalid.Error(err)
}
}
return cfg, mon, nil
}
func (o *componentAws) _getFlagUpdate() *_configFlag {
var (
cfg = &_configFlag{
accessKey: nil,
secretKey: nil,
bucket: nil,
region: nil,
endpoint: nil,
}
vpr *spfvpr.Viper
key string
)
if vpr = o._getSPFViper(); vpr == nil {
return nil
} else if key = o._getKey(); len(key) < 1 {
return nil
}
if s := vpr.GetString(key + ".access-key"); s != "" {
cfg.accessKey = &s
}
if s := vpr.GetString(key + ".secret-key"); s != "" {
cfg.secretKey = &s
}
if s := vpr.GetString(key + ".bucket"); s != "" {
cfg.bucket = &s
}
if s := vpr.GetString(key + ".region"); s != "" {
cfg.region = &s
}
if s := vpr.GetString(key + ".endpoint"); s != "" {
cfg.endpoint = &s
}
return cfg
}