summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordekstroza <dejan.kitic@ericsson.com>2018-05-18 14:42:24 +0100
committerMichael Lando <ml636r@att.com>2018-08-26 22:58:49 +0000
commit37843cb3c1765bd5263e3c02f5b14ffa53041e1d (patch)
tree0fcd4f0504c6720924bbf2a0bdc92fed0fee1719
parent1b700c8606f319cbda416a8abb70ea16dceb7a29 (diff)
json/yaml validation for models
Introduced yaml-json-validator-maven-plugin a. Runs in validate phase b. For now only validate /import/tosca subfolders c. Validates both yml and json files Change-Id: I53513321c4378485dd821c251de5555050313911 Issue-ID: SDC-1343 Signed-off-by: dekstroza <dejan.kitic@ericsson.com>
-rw-r--r--asdctool/pom.xml29
-rw-r--r--asdctool/src/test/resources/graphError.json2
-rw-r--r--catalog-be/pom.xml61
-rw-r--r--catalog-be/src/test/resources/config/mysql-type.yml2
-rw-r--r--catalog-dao/pom.xml29
-rw-r--r--catalog-fe/pom.xml29
-rw-r--r--catalog-model/pom.xml29
-rw-r--r--catalog-ui/pom.xml29
-rw-r--r--common-app-api/pom.xml29
-rw-r--r--common-be/pom.xml33
-rw-r--r--pom.xml5
-rw-r--r--sdc-os-chef/pom.xml27
-rw-r--r--security-utils/pom.xml29
-rw-r--r--test-apis-ci/pom.xml37
-rw-r--r--test-apis-ci/src/test/resources/config.json16
-rw-r--r--ui-ci/pom.xml29
-rw-r--r--utils/webseal-simulator/pom.xml31
17 files changed, 414 insertions, 32 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 9a6ef22d82..010edceea9 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -663,6 +663,35 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
diff --git a/asdctool/src/test/resources/graphError.json b/asdctool/src/test/resources/graphError.json
index b7ccf92ee6..a5a51d6693 100644
--- a/asdctool/src/test/resources/graphError.json
+++ b/asdctool/src/test/resources/graphError.json
@@ -1 +1 @@
-(("ERRRRORROROR{{{\"container\":zxcvfxcvxcvxc{\"accessContcxvxcvrolPolicyIDs\":[\"/in-cse/acp-7cxvxcvxcvx1663881\"],\"creationTime\":\"20170630T111742\",\"currentByteSize\":0,\"currentNrOfInstances\":0,\"expirationTime\":\"20180630T111742\",\"lastModifiedTime\":\"20170630T111742\",\"latest\":\"/in-cse/in-name/cnt_900407520/la\",\"maxByteSize\":10000,\"maxInstanceAge\":0,\"maxNrOfInstances\":10,\"oldest\":\"/in-cse/in-name/cnt_900407520/ol\",\"parentID\":\"/in-cse\",\"resourceID\":\"/in-cse/cnt-900407520\",\"resourceName\":((\"cnt_900407520\",\"resourceTypeR\"RXCFV:\"int3\",\"stateTag\":0}}" \ No newline at end of file
+"ERRRRORROROR{{{\"container\":zxcvfxcvxcvxc{\"accessContcxvxcvrolPolicyIDs\":[\"/in-cse/acp-7cxvxcvxcvx1663881\"],\"creationTime\":\"20170630T111742\",\"currentByteSize\":0,\"currentNrOfInstances\":0,\"expirationTime\":\"20180630T111742\",\"lastModifiedTime\":\"20170630T111742\",\"latest\":\"/in-cse/in-name/cnt_900407520/la\",\"maxByteSize\":10000,\"maxInstanceAge\":0,\"maxNrOfInstances\":10,\"oldest\":\"/in-cse/in-name/cnt_900407520/ol\",\"parentID\":\"/in-cse\",\"resourceID\":\"/in-cse/cnt-900407520\",\"resourceName\":((\"cnt_900407520\",\"resourceTypeR\"RXCFV:\"int3\",\"stateTag\":0}}" \ No newline at end of file
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 068eecf53b..f0113df130 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>catalog-be</artifactId>
@@ -145,7 +145,6 @@
<version>${jersey-bom.version}</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
@@ -498,9 +497,6 @@
</exclusion>
</exclusions>
</dependency>
-
-
-
<dependency>
<groupId>com.att.aft</groupId>
<artifactId>dme2</artifactId>
@@ -529,12 +525,10 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey-bom.version}</version>
-
</dependency>
<dependency>
@@ -594,13 +588,13 @@
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <version>${jmockit.version}</version>
- <scope>test</scope>
- </dependency>
+
+ <dependency>
+ <groupId>org.jmockit</groupId>
+ <artifactId>jmockit</artifactId>
+ <version>${jmockit.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.google.code.bean-matchers</groupId>
@@ -608,9 +602,8 @@
<version>0.11</version>
<scope>test</scope>
</dependency>
-
</dependencies>
-
+
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
@@ -644,6 +637,35 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-maven-plugin</artifactId>
<version>${jcabi.maven.plugin.version}</version>
@@ -655,7 +677,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -742,8 +763,6 @@
</execution>
</executions>
</plugin>
-
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -1003,7 +1022,5 @@
</plugins>
</build>
</profile>
-
-
</profiles>
-</project>
+</project> \ No newline at end of file
diff --git a/catalog-be/src/test/resources/config/mysql-type.yml b/catalog-be/src/test/resources/config/mysql-type.yml
index f1985a0bdc..c275537094 100644
--- a/catalog-be/src/test/resources/config/mysql-type.yml
+++ b/catalog-be/src/test/resources/config/mysql-type.yml
@@ -40,7 +40,7 @@ node_types:
db_password:
type: string
default: pass
- description: The password associated with the user account provided in the ‘db_user’ property.
+ description: The password associated with the user account provided in the db_user property.
bind_address:
type: boolean
default: true
diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index 596278e4b4..ccb8085cd0 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -301,6 +301,35 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 66f718a111..3322185eab 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -371,6 +371,35 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index e1193980b3..0a6c7cc75d 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -256,6 +256,35 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project> \ No newline at end of file
diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml
index 14b3267209..d9c842e11a 100644
--- a/catalog-ui/pom.xml
+++ b/catalog-ui/pom.xml
@@ -123,6 +123,35 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index 7a8077ec7d..5a0824b3b8 100644
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -207,6 +207,35 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project> \ No newline at end of file
diff --git a/common-be/pom.xml b/common-be/pom.xml
index 1b0dcd05b3..1f5580016b 100644
--- a/common-be/pom.xml
+++ b/common-be/pom.xml
@@ -62,5 +62,38 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/pom.xml b/pom.xml
index 38c63ec1bc..1fc2789839 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,6 +275,11 @@
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
</plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ </plugin>
</plugins>
</pluginManagement>
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index a5d69f1697..6dc554451a 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -79,6 +79,33 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/security-utils/pom.xml b/security-utils/pom.xml
index c0361ed867..a0df7039f7 100644
--- a/security-utils/pom.xml
+++ b/security-utils/pom.xml
@@ -61,6 +61,35 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index ac3cdd731d..14d6611fc0 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -437,6 +437,43 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ <excludes>
+ <exclude>src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure*.y*ml</exclude>
+ <exclude>src/test/resources/CI/tests/importToscaResourceByCreateUrl/noContent*.y*ml</exclude>
+ <exclude>src/test/resources/CI/tests/HeatDeploymentArtifacts/invalid*.y*ml</exclude>
+ </excludes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ <excludes>
+ <exclude>src/test/resources/CI/tests/HeatDeploymentArtifacts/invalid*.json</exclude>
+ </excludes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
diff --git a/test-apis-ci/src/test/resources/config.json b/test-apis-ci/src/test/resources/config.json
index 71c9d35e59..86905518b6 100644
--- a/test-apis-ci/src/test/resources/config.json
+++ b/test-apis-ci/src/test/resources/config.json
@@ -1,12 +1,12 @@
{
-catalogBeHost: behost,
-catalogFeHost: fehost,
-esHost: eshost,
-catalogFePort: 8080,
-catalogBePort: 8080,
-esPort: 9200,
-resourceConfigDir: "src/test/resources/CI/tests",
-componentsConfigDir: "src/test/resources/CI/components"
+"catalogBeHost": "behost",
+"catalogFeHost": "fehost",
+"esHost": "eshost",
+"catalogFePort": 8080,
+"catalogBePort": 8080,
+"esPort": 9200,
+"resourceConfigDir": "src/test/resources/CI/tests",
+"componentsConfigDir": "src/test/resources/CI/components"
} \ No newline at end of file
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index 3295b3bcea..6745cc9390 100644
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -313,6 +313,35 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index dbdd1d9581..b9f541bd5f 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -87,6 +87,37 @@
</dependencies>
<build>
<finalName>WSSimulator-${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>com.github.sylvainlaurent.maven</groupId>
+ <artifactId>yaml-json-validator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <validationSets>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.y*ml</include>
+ <include>src/test/resources/**/*.y*ml</include>
+ </includes>
+ </validationSet>
+ <validationSet>
+ <includes>
+ <include>src/main/resources/**/*.json</include>
+ <include>src/test/resources/**/*.json</include>
+ </includes>
+ </validationSet>
+ </validationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<repositories>