-
Notifications
You must be signed in to change notification settings - Fork 172
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
2515 Adding import and export (#2571)
* 2515 Added import and export * 2515 fixed lint issues * 2515 fixed earlier commit * 2515 Fixed verbose flag. Added output when importing. * 2515 Fixed lint issues. * 2515 Fixed formatting * 2515 Fixed input reference. Fixed error handling for missing identities. * Refactor internal util usage and improve error handling. * Removed cache in favor of maps * Changed to using gabs to process json data * Removed all plural entity names from command * Renamed files/packages/classes to match command * Refactored checks into functions and added tests. * Fixed conflict in go.sum * Fixed conflict in go.sum * Fixed lint issue and general cleanup. * Fixed test.
- Loading branch information
Showing
42 changed files
with
4,629 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| Copyright NetFoundry Inc. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| https://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package ascode | ||
|
|
||
| import ( | ||
| "errors" | ||
| "github.com/michaelquigley/pfxlog" | ||
| "reflect" | ||
| ) | ||
|
|
||
| type CacheGetter func(id string) (interface{}, error) | ||
|
|
||
| var log = pfxlog.Logger() | ||
|
|
||
| func GetItemFromCache(c map[string]interface{}, key string, fn CacheGetter) (interface{}, error) { | ||
| if key == "" { | ||
| return nil, errors.New("key is null, can't resolve from cache or get it from source") | ||
| } | ||
| detail, found := c[key] | ||
| if !found { | ||
| log.WithFields(map[string]interface{}{"key": key}).Debug("Item not in cache, getting from source") | ||
| var err error | ||
| detail, err = fn(key) | ||
| if err != nil { | ||
| log.WithFields(map[string]interface{}{"key": key}).WithError(err).Debug("Error reading from source, returning error") | ||
| return nil, errors.Join(errors.New("error reading: "+key), err) | ||
| } | ||
| if detail != nil && !reflect.ValueOf(detail).IsNil() { | ||
| log.WithFields(map[string]interface{}{"key": key, "item": detail}).Debug("Item read from source, caching") | ||
| c[key] = detail | ||
| } | ||
| return detail, nil | ||
| } | ||
| log.WithFields(map[string]interface{}{"key": key}).Debug("Item found in cache") | ||
| return detail, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package internal | ||
|
|
||
| import "fmt" | ||
| import "io" | ||
|
|
||
| /* | ||
| Extends the standard FPrintF with overwriting the current line because it has the `\u001B[2K` | ||
| */ | ||
| func FPrintfReusingLine(writer io.Writer, format string, a ...any) (n int, err error) { | ||
| return fmt.Fprintf(writer, "\u001B[2K"+format+"\r", a...) | ||
| } | ||
| func FPrintflnReusingLine(writer io.Writer, format string, a ...any) (n int, err error) { | ||
| return FPrintfReusingLine(writer, format+"\n", a...) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.