Skip to content

Commit d2ca1a1

Browse files
committed
Update
1 parent 0a3ac12 commit d2ca1a1

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

tools/cli/internal/openapi/oasdiff_result.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,21 @@ type OasDiffResult struct {
2727
Config *diff.Config
2828
}
2929

30+
// GetSimpleDiff returns the diff between two OpenAPI specs.
31+
func (o OasDiff) GetSimpleDiff(base, revision *load.SpecInfo) (*OasDiffResult, error) {
32+
diffReport, operationsSources, err := diff.GetWithOperationsSourcesMap(o.config, base, revision)
33+
if err != nil {
34+
return nil, err
35+
}
36+
37+
return &OasDiffResult{
38+
Report: diffReport,
39+
SourceMap: operationsSources,
40+
SpecInfoPair: load.NewSpecInfoPair(base, revision),
41+
Config: o.config,
42+
}, nil
43+
}
44+
3045
// GetFlattenedDiff returns the diff between two OpenAPI specs after flattening them.
3146
func (o OasDiff) GetFlattenedDiff(base, revision *load.SpecInfo) (*OasDiffResult, error) {
3247
flattenBaseSpec, err := allof.MergeSpec(base.Spec)
@@ -60,5 +75,6 @@ func (o OasDiff) GetFlattenedDiff(base, revision *load.SpecInfo) (*OasDiffResult
6075
Report: diffReport,
6176
SourceMap: operationsSources,
6277
SpecInfoPair: load.NewSpecInfoPair(baseSpecInfo, revisionSpecInfo),
78+
Config: o.config,
6379
}, nil
6480
}

tools/cli/internal/openapi/openapi.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,12 @@ func (o *OasDiff) MergeOpenAPISpecs(paths []string) (*Spec, error) {
5050
return nil, err
5151
}
5252

53-
oasdiffReport, err := diff.Get(o.config, o.base.Spec, spec.Spec)
53+
o.result, err = o.GetSimpleDiff(o.base, o.external)
5454
if err != nil {
5555
log.Fatalf("error in calculating the diff of the specs: %s", err)
5656
return nil, err
5757
}
5858

59-
o.result = &OasDiffResult{
60-
Report: oasdiffReport,
61-
}
6259
o.external = spec
6360
o.base, err = o.mergeSpecIntoBase()
6461
if err != nil {

0 commit comments

Comments
 (0)