extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-01-03 20:49:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

need to assert environment metadata when modifying the environment (#369)

Browse Source
This commit is contained in:
Michael Quigley 2023-07-14 09:57:40 -04:00
parent 1c8ab67bf1
commit 48cfaada20
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
environment/env_v0_3/api.go
View File

@ -27,6 +27,9 @@ func (r *Root) Config() *env_core.Config {
} }
func (r *Root) SetConfig(cfg *env_core.Config) error { func (r *Root) SetConfig(cfg *env_core.Config) error {
if err := assertMetadata(); err != nil {
return err
}
if err := saveConfig(cfg); err != nil { if err := saveConfig(cfg); err != nil {
return err return err
} }
@ -87,6 +90,9 @@ func (r *Root) Environment() *env_core.Environment {
} }
func (r *Root) SetEnvironment(env *env_core.Environment) error { func (r *Root) SetEnvironment(env *env_core.Environment) error {
if err := assertMetadata(); err != nil {
return err
}
if err := saveEnvironment(env); err != nil { if err := saveEnvironment(env); err != nil {
return err return err
} }
@ -115,6 +121,9 @@ func (r *Root) ZitiIdentityFile(name string) (string, error) {
} }
func (r *Root) SaveZitiIdentity(name, data string) error { func (r *Root) SaveZitiIdentity(name, data string) error {
if err := assertMetadata(); err != nil {
return err
}
zif, err := r.ZitiIdentityFile(name) zif, err := r.ZitiIdentityFile(name)
if err != nil { if err != nil {
return err return err

13
environment/env_v0_3/root.go
View File

@ -65,6 +65,19 @@ func rootExists() (bool, error) {
return true, err return true, err
} }
func assertMetadata() error {
exists, err := rootExists()
if err != nil {
return err
}
if !exists {
if err := writeMetadata(); err != nil {
return err
}
}
return nil
}
func loadMetadata() (*env_core.Metadata, error) { func loadMetadata() (*env_core.Metadata, error) {
mf, err := metadataFile() mf, err := metadataFile()
if err != nil { if err != nil {