Merged in feature/ecr (pull request #161)

Feature/ecr

* nosave

* repo

* awscli

* unzip

* ignore

* moreram

* 14k

* ref

* deployment

* 12k

* uselocal

* go

* dockercomd

* reorder

* iamgename

* installs

* tart

* cli

* clideps

* y

* dockerce

* nodock

* multi

* rmecr

* dev
This commit is contained in:
Michael McGuinness
2025-06-03 13:52:10 +00:00
parent ae4b456399
commit 7ce7c9df4d
73 changed files with 295 additions and 326 deletions
+17 -17
View File
@@ -14,28 +14,28 @@ type Client struct {
CanSync bool
}
func (c *Client) NormalizeCanSyncUpdate(n **bool) {
if n == nil || *n == nil {
func (c *Client) NormalizeCanSyncUpdate(canSync **bool) {
if canSync == nil || *canSync == nil {
return
}
if c.CanSync == **n {
*n = nil
if c.CanSync == **canSync {
*canSync = nil
}
}
func (c *Client) NormalizeNameUpdate(n **string) error {
if n == nil || *n == nil {
func (c *Client) NormalizeNameUpdate(name **string) error {
if name == nil || *name == nil {
return nil
}
err := normalizeName(*n)
err := normalizeName(*name)
if err != nil {
return err
}
if c.Name == **n {
*n = nil
if c.Name == **name {
*name = nil
}
return nil
@@ -46,18 +46,18 @@ func normalizeName(name *string) error {
return nil
}
uname := strings.TrimSpace(*name)
spacere := regexp.MustCompile(`\s+`)
uname = spacere.ReplaceAllString(uname, " ")
normalizedName := strings.TrimSpace(*name)
spaceRegex := regexp.MustCompile(`\s+`)
normalizedName = spaceRegex.ReplaceAllString(normalizedName, " ")
reg := `^[a-zA-Z0-9\_\- \(\)\.\,]+$`
validNameRegex := `^[a-zA-Z0-9\_\- \(\)\.\,]+$`
alphanumeric := regexp.MustCompile(reg)
if !alphanumeric.MatchString(uname) {
return fmt.Errorf(`"%s" must have regex: %s`, uname, reg)
alphanumeric := regexp.MustCompile(validNameRegex)
if !alphanumeric.MatchString(normalizedName) {
return fmt.Errorf(`"%s" must have regex: %s`, normalizedName, validNameRegex)
}
*name = uname
*name = normalizedName
return nil
}