Skip to content

Commit

Permalink
fix regexp for valid instance names
Browse files Browse the repository at this point in the history
  • Loading branch information
pgalbavy-itrs committed Jul 11, 2024
1 parent 713cfdf commit 6bc7a62
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
14 changes: 10 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Change Log

## Version v1.15.2
## Version v1.15.3

> [!NOTE]
> **Released 2024-07-11**
>
> Please report issues via [github](https://github.com/ITRS-Group/cordial/issues) or the [ITRS Community Forum](https://community.itrsgroup.com/).
### v1.15.2 Fixes
### v1.15.3 Fixes

* `tools/geneos`

Expand All @@ -19,7 +19,7 @@
* Keep `gateways_all` table, not as a potential temporary one. Fixes sources report when sources go stale amongst other things
* Fix logic in `sources` report to evaluate and update status correctly when `valid` changes

### v1.15.2 Changes
### v1.15.3 Changes

* `gdna`

Expand All @@ -28,6 +28,12 @@

---

## v1.15.2

Replaced by v1.15.3 to fix a one character typo in a regexp.

---

### v1.15.1 Fixes

* Fix handling of new Netprobe release archive names in 6.9.0
Expand All @@ -46,7 +52,7 @@
* `gdna`

* Update to Geneos 6.9.0 and use the `minimal` Netprobe to reduce image size
* Add a `gdna stop` command, to stop background GDNA processes. An initially empty `gdna restart` command has been added for later completion.
* Add a `gdna stop` comma\nd, to stop background GDNA processes. An initially empty `gdna restart` command has been added for later completion.

* General

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> [!NOTE]
>
> This is **Version v1.15.2** - Released 2024-07-11 - See [`CHANGELOG.md`](CHANGELOG.md) for more details.
> This is **Version v1.15.3** - Released 2024-07-11 - See [`CHANGELOG.md`](CHANGELOG.md) for more details.
> 🎁 Introducing GDNA 🎈
>
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.15.2
v1.15.3
2 changes: 1 addition & 1 deletion tools/geneos/internal/instance/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func ReservedName(name string) (ok bool) {
// # In addition to static names we also allow glob-style characters through
//
// look for "[flavour:]name[@host]" - only name can contain glob chars
var validNameRE = regexp.MustCompile(`^(\w+:)?([\w\-\ \_\*\?\[\]\^\]]+)?(@[\w\.]*)?$`)
var validNameRE = regexp.MustCompile(`^(\w+:)?([\w\.\-\ \_\*\?\[\]\^\]]+)?(@[\w\.]*)?$`)

// ValidName returns true if name is considered a valid instance
// name. It is not checked against the list of reserved names.
Expand Down

0 comments on commit 6bc7a62

Please sign in to comment.