-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fixes #76 (absolute path left behind in resolved circular $ref) * Fixes #74 (isCircular no more checks on basePath!="") * Contributes #75 (hang is solved, but the (always correct) expanded result may differ from one run to another) * Contributes go-swagger/go-swagger#957 (hang on circular spec)
- Loading branch information
Showing
7 changed files
with
4,364 additions
and
54 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // Copyright 2015 go-swagger maintainers | ||
| // | ||
| // 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 | ||
| // | ||
| // http://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 spec | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
| "os" | ||
| "path/filepath" | ||
| "runtime" | ||
| ) | ||
|
|
||
| var ( | ||
| // Debug is true when the SWAGGER_DEBUG env var is not empty. | ||
| // It enables a more verbose logging of validators. | ||
| Debug = os.Getenv("SWAGGER_DEBUG") != "" | ||
| // validateLogger is a debug logger for this package | ||
| specLogger *log.Logger | ||
| ) | ||
|
|
||
| func init() { | ||
| debugOptions() | ||
| } | ||
|
|
||
| func debugOptions() { | ||
| specLogger = log.New(os.Stdout, "spec:", log.LstdFlags) | ||
| } | ||
|
|
||
| func debugLog(msg string, args ...interface{}) { | ||
| // A private, trivial trace logger, based on go-openapi/spec/expander.go:debugLog() | ||
| if Debug { | ||
| _, file1, pos1, _ := runtime.Caller(1) | ||
| specLogger.Printf("%s:%d: %s", filepath.Base(file1), pos1, fmt.Sprintf(msg, args...)) | ||
| } | ||
| } |
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,59 @@ | ||
| // Copyright 2015 go-swagger maintainers | ||
| // | ||
| // 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 | ||
| // | ||
| // http://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 spec | ||
|
|
||
| import ( | ||
| "io/ioutil" | ||
| "os" | ||
| "sync" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| var ( | ||
| logMutex = &sync.Mutex{} | ||
| ) | ||
|
|
||
| func TestDebug(t *testing.T) { | ||
| tmpFile, _ := ioutil.TempFile("", "debug-test") | ||
| tmpName := tmpFile.Name() | ||
| defer func() { | ||
| Debug = false | ||
| // mutex for -race | ||
| logMutex.Unlock() | ||
| _ = os.Remove(tmpName) | ||
| }() | ||
|
|
||
| // mutex for -race | ||
| logMutex.Lock() | ||
| Debug = true | ||
| debugOptions() | ||
| defer func() { | ||
| specLogger.SetOutput(os.Stdout) | ||
| }() | ||
|
|
||
| specLogger.SetOutput(tmpFile) | ||
|
|
||
| debugLog("A debug") | ||
| Debug = false | ||
| _ = tmpFile.Close() | ||
|
|
||
| flushed, _ := os.Open(tmpName) | ||
| buf := make([]byte, 500) | ||
| _, _ = flushed.Read(buf) | ||
| specLogger.SetOutput(os.Stdout) | ||
| assert.Contains(t, string(buf), "A debug") | ||
| } |
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.