updates

cdklabs · Sep 9, 2024 · e4d18db · e4d18db
1 parent 555f27d
commit e4d18db
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 27 deletions.
diff --git a/packages/@aws-cdk/service-spec-importers/src/types/registry-schema/JsonSchema.ts b/packages/@aws-cdk/service-spec-importers/src/types/registry-schema/JsonSchema.ts
@@ -86,30 +86,6 @@ export namespace jsonschema {
 
   /**
    * Determines whether or not the provided schema represents an `anyOf` type operator.
-   *
-   * Examples:
-   *
-   * const schema = {
-   *   "anyOf": [
-   *     { schema 1 },
-   *     { schema 2 },
-   *     { schema 3 }
-   *   ]
-   * };
-   * jsonschema.isAnyOf(schema) -> true
-   *
-   * const schema = {
-   *   "type": "string",
-   *   "anyOf": [
-   *     { schema 1 },
-   *     { schema 2 },
-   *     { schema 3 }
-   *   ]
-   * };
-   * jsonschema.isAnyOf(schema) -> false
-   *
-   *
-   * @returns true if the schema represents an `anyOf` type operator. Otherwise, false.
    */
   export function isAnyOf(x: Schema): x is AnyOf<any> {
     return !isAnyType(x) && 'anyOf' in x;

diff --git a/packages/@aws-cdk/service-spec-importers/test/property-conversion.test.ts b/packages/@aws-cdk/service-spec-importers/test/property-conversion.test.ts
@@ -338,7 +338,7 @@ test('oneOf with only a reference', () => {
   const requiredProps = Object.entries(resource.properties)
     .filter(([_, value]) => value.required)
     .map(([name, _]) => name);
-  //expect(Object.keys(resource.properties)).toContain('OneOfRef');
+  expect(Object.keys(resource.properties)).toContain('OneOfRef');
   expect(requiredProps.length).toBe(0);
 });
 
@@ -392,7 +392,6 @@ test('oneOf with only a type definition', () => {
   const requiredProps = Object.entries(resource.properties)
     .filter(([_, value]) => value.required)
     .map(([name, _]) => name);
-  //report.write('foobar');
   expect(Object.keys(resource.properties)).toContain('FooOrBar');
   expect(requiredProps.length).toBe(0);
 });

diff --git a/projenrc/aws-cdk-integration-test.ts b/projenrc/aws-cdk-integration-test.ts
@@ -64,7 +64,7 @@ export class AwsCdkIntegrationTest extends pj.Component {
         ...buildAwsCdkLib(awsCdkRepo, awsCdkPath),
         // Temporarily disabled, as it regularly prevents legitimate spec imports with intentional breaking changes.
         // Instead, we need to add more purposeful validations like type renames.
-        ...runJsiiDiff(candidateSpec, diffIgnoreFile),
+        //...runJsiiDiff(candidateSpec, diffIgnoreFile),
       ],
     });
     void runJsiiDiff, candidateSpec, diffIgnoreFile;