Skip to content

Commit c5a729a

Browse files
committed
Revert "fix adding enum value & command line exception (#255)"
This reverts commit 000f1f7.
1 parent 57f5594 commit c5a729a

3 files changed

Lines changed: 9 additions & 10 deletions

File tree

openapi-diff/src/modeler/AutoRest.Swagger.Tests/SwaggerModelerCompareTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ public void CommonParameterWithRef()
897897
public void XmsEnumModelAsString()
898898
{
899899
var messages = CompareSwagger("enum_as_string.json").ToArray();
900-
Assert.Equal(2,messages.Where(m => m.Id == ComparisonMessages.AddedEnumValue.Id).ToList().Count());
900+
Assert.Empty(messages.Where(m => m.Id == ComparisonMessages.AddedEnumValue.Id));
901901
}
902902

903903
[Fact]

openapi-diff/src/modeler/AutoRest.Swagger/Model/SwaggerObject.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ private void CompareEnums(ComparisonContext<ServiceDefinition> context, T prior)
187187
CompareXmsEnum(context,prior);
188188
bool relaxes = (prior.Enum != null && this.Enum == null);
189189
bool constrains = (prior.Enum == null && this.Enum != null);
190+
bool isEnumModelAsString = (this.XmsEnum != null && this.XmsEnum.ModelAsString == true);
190191
if (!relaxes && !constrains)
191192
{
192193
// It was enum and it is still enum i.e check for addition/removal
@@ -212,7 +213,9 @@ private void CompareEnums(ComparisonContext<ServiceDefinition> context, T prior)
212213
IEnumerable<string> addedEnums = this.Enum.Except(prior.Enum);
213214
if (addedEnums.Any())
214215
{
215-
context.LogBreakingChange(ComparisonMessages.AddedEnumValue, String.Join(", ", addedEnums.ToList()));
216+
if (!isEnumModelAsString) {
217+
context.LogBreakingChange(ComparisonMessages.AddedEnumValue, String.Join(", ", addedEnums.ToList()));
218+
}
216219
}
217220
}
218221
}

src/lib/validators/openApiDiff.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ const updateChangeProperties = (change: ChangeProperties, pf: ProcessedFile): Ch
8282
}
8383
}
8484

85-
function escape(filePath: string) {
86-
return `"${filePath}"`
87-
}
88-
8985
/**
9086
* @class
9187
* Open API Diff class.
@@ -158,7 +154,7 @@ export class OpenApiDiff {
158154
const result = path.join(__dirname, "..", "..", "..", "node_modules", "autorest", "dist", "app.js")
159155
if (fs.existsSync(result)) {
160156
log.silly(`Found autoRest:${result} `)
161-
return `node ${escape(result)}`
157+
return `node ${result}`
162158
}
163159
}
164160

@@ -167,7 +163,7 @@ export class OpenApiDiff {
167163
const result = path.join(__dirname, "..", "..", "..", "..", "..", "autorest", "dist", "app.js")
168164
if (fs.existsSync(result)) {
169165
log.silly(`Found autoRest:${result} `)
170-
return `node ${escape(result)}`
166+
return `node ${result}`
171167
}
172168
}
173169

@@ -176,7 +172,7 @@ export class OpenApiDiff {
176172
const result = path.resolve("node_modules/.bin/autorest")
177173
if (fs.existsSync(result)) {
178174
log.silly(`Found autoRest:${result} `)
179-
return escape(result)
175+
return result
180176
}
181177
}
182178

@@ -192,7 +188,7 @@ export class OpenApiDiff {
192188
public openApiDiffDllPath(): string {
193189
log.silly(`openApiDiffDllPath is being called`)
194190

195-
return escape(path.join(__dirname, "..", "..", "..", "dlls", "OpenApiDiff.dll"))
191+
return path.join(__dirname, "..", "..", "..", "dlls", "OpenApiDiff.dll")
196192
}
197193

198194
/**

0 commit comments

Comments
 (0)