grantTypes enum array. Updated jenkins script to use swagger-cli and speccy (a0317469) · Commits · MEC - Multi-access Edge Computing / MEC Application Support API and MEC Service Management API

.jenkins.sh

+10 −9

Original line number	Original line	Diff line number	Diff line
	#!/bin/bash		#!/bin/bash

	specfiles=$(ls \| egrep -i "^Mp1.(json\|yaml)")		specfiles=$(ls \| egrep "^[^.]*.(json\|yaml)")

	fres=0		fres=0
	for i in $specfiles ; do		for i in $specfiles ; do
	echo "-- Validating OpenAPI file $i..."		echo "-- Validating and linting OpenAPI file $i..."
	swagger-tools validate $i		swagger-cli validate "$i"
	res=$?		res=$?
	fres=$(($fres\|\|$res))		speccy lint "$i"
	echo -e "-- Validator returned $res.\n"		res2=$?
			fres=$(($fres\|\|$res\|\|$res2))
			echo "--- Validator returned $res, linter returned $res2."
	done		done

	echo "-- Final validator returns $fres."		echo "-- Final validation returns $fres."

	exit $fres		exit $fres
			No newline at end of file

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -890,7 +890,7 @@
	"description": "Time to live value",		"description": "Time to live value",
	"type": "integer",		"type": "integer",
	"format": "uint32",		"format": "uint32",
	"example": 300		"example": "?"
	},		},
	"DnsRule": {		"DnsRule": {
	"description": "This type represents the general information of a DNS rule.",		"description": "This type represents the general information of a DNS rule.",
	@@ -1144,7 +1144,13 @@
	],		],
	"properties": {		"properties": {
	"grantTypes": {		"grantTypes": {
			"description": "List of supported OAuth 2.0 grant types.",
			"type": "array",
			"minItems": 1,
			"maxItems": 4,
			"items": {
	"$ref": "#/components/schemas/SecurityInfo.OAuth2Info.GrantTypes"		"$ref": "#/components/schemas/SecurityInfo.OAuth2Info.GrantTypes"
			}
	},		},
	"tokenEndpoint": {		"tokenEndpoint": {
	"$ref": "#/components/schemas/SecurityInfo.OAuth2Info.TokenEndpoint"		"$ref": "#/components/schemas/SecurityInfo.OAuth2Info.TokenEndpoint"

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -835,6 +835,12 @@ components:
	- tokenEndpoint		- tokenEndpoint
	properties:		properties:
	grantTypes:		grantTypes:
			description: >-
			List of supported OAuth 2.0 grant types.
			type: array
			minItems: 1
			maxItems: 4
			items:
	$ref: '#/components/schemas/SecurityInfo.OAuth2Info.GrantTypes'		$ref: '#/components/schemas/SecurityInfo.OAuth2Info.GrantTypes'
	tokenEndpoint:		tokenEndpoint:
	$ref: '#/components/schemas/SecurityInfo.OAuth2Info.TokenEndpoint'		$ref: '#/components/schemas/SecurityInfo.OAuth2Info.TokenEndpoint'