From 1c14e3231c111c671d8b1cfa3a74a1e4a06e09a8 Mon Sep 17 00:00:00 2001 From: alexz Date: Tue, 26 Jul 2016 15:12:57 +0300 Subject: [PATCH] Yaml syntax cleanup * remove 'error' like: - no new line character at the end of file - trailing spaces Change-Id: I981f5353a5bd5bfb1546946b240a85905272887e --- BIND/package/Classes/Bind.yaml | 3 ++- Cassandra/package/Classes/CassandraNode.yaml | 3 ++- Clearwater/package/Classes/Clearwater.yaml | 3 ++- Clearwater/package/Classes/components/Sprout.yaml | 3 ++- .../DockerApp/package/Classes/DockerApp.yaml | 3 ++- Docker/Applications/HTTPdServer/package/manifest.yaml | 6 ++++-- Docker/Applications/InfluxDB/package/manifest.yaml | 2 +- Docker/Applications/MariaDB/package/UI/ui.yaml | 1 - Docker/Applications/Nginx/package/manifest.yaml | 7 +++++-- Docker/Applications/Tomcat/package/manifest.yaml | 9 +++++++-- .../package/Classes/DockerHelpers.yaml | 6 +++--- .../package/Classes/DockerVolume.yaml | 3 ++- .../package/Classes/DockerStandaloneHost.yaml | 7 +++---- .../KubernetesEntitiesLibrary/package/Classes/Pod.yaml | 1 - .../package/Classes/ReplicationController.yaml | 2 -- .../package/Classes/Service.yaml | 2 -- PivotalOperationsManager/package/Classes/OpsManager.yaml | 3 ++- RefStackClient/package/UI/ui.yaml | 3 ++- Windows/ActiveDirectory/package/UI/ui.yaml | 4 ++-- WordPress/package/UI/ui.yaml | 3 +-- ZabbixAgent/package/Classes/ZabbixAgent.yaml | 2 +- ZabbixAgent/package/UI/ui.yaml | 2 -- 22 files changed, 43 insertions(+), 35 deletions(-) diff --git a/BIND/package/Classes/Bind.yaml b/BIND/package/Classes/Bind.yaml index 583fb641..6f8cbe65 100644 --- a/BIND/package/Classes/Bind.yaml +++ b/BIND/package/Classes/Bind.yaml @@ -100,4 +100,5 @@ Methods: - message: Contract: $.string().notNull() Body: - - $.environment.reporter.report($this, $message) \ No newline at end of file + - $.environment.reporter.report($this, $message) + diff --git a/Cassandra/package/Classes/CassandraNode.yaml b/Cassandra/package/Classes/CassandraNode.yaml index cbc27a44..bed7800a 100644 --- a/Cassandra/package/Classes/CassandraNode.yaml +++ b/Cassandra/package/Classes/CassandraNode.yaml @@ -115,4 +115,5 @@ Methods: - $msg: format('Restarting Cassandra node "{0}"', $.instance.name) - $._environment.reporter.report($this, $msg) - $command: format('sleep {0}; sudo service cassandra restart', $delay) - - conf:Linux.runCommand($.instance.agent, $command) \ No newline at end of file + - conf:Linux.runCommand($.instance.agent, $command) + diff --git a/Clearwater/package/Classes/Clearwater.yaml b/Clearwater/package/Classes/Clearwater.yaml index 03f8f134..9504b4d1 100644 --- a/Clearwater/package/Classes/Clearwater.yaml +++ b/Clearwater/package/Classes/Clearwater.yaml @@ -107,4 +107,5 @@ Methods: - message: Contract: $.string().notNull() Body: - - $._environment.reporter.report($this, $message) \ No newline at end of file + - $._environment.reporter.report($this, $message) + diff --git a/Clearwater/package/Classes/components/Sprout.yaml b/Clearwater/package/Classes/components/Sprout.yaml index aa391255..b8952d64 100644 --- a/Clearwater/package/Classes/components/Sprout.yaml +++ b/Clearwater/package/Classes/components/Sprout.yaml @@ -50,4 +50,5 @@ Methods: getDeployScriptName: Body: - - Return: "deploySprout.sh" \ No newline at end of file + - Return: "deploySprout.sh" + diff --git a/Docker/Applications/DockerApp/package/Classes/DockerApp.yaml b/Docker/Applications/DockerApp/package/Classes/DockerApp.yaml index c174738b..72ef5420 100644 --- a/Docker/Applications/DockerApp/package/Classes/DockerApp.yaml +++ b/Docker/Applications/DockerApp/package/Classes/DockerApp.yaml @@ -85,4 +85,5 @@ Methods: Continue: - $key: $pair[0].trim() - $result[$key]: $pair[1].trim() - - Return: $result \ No newline at end of file + - Return: $result + diff --git a/Docker/Applications/HTTPdServer/package/manifest.yaml b/Docker/Applications/HTTPdServer/package/manifest.yaml index 9298b2cd..002fc559 100644 --- a/Docker/Applications/HTTPdServer/package/manifest.yaml +++ b/Docker/Applications/HTTPdServer/package/manifest.yaml @@ -14,8 +14,10 @@ Format: 1.3 Type: Application FullName: com.example.docker.DockerHTTPd Name: Docker HTTPd -Description: | - The Apache HTTP Server, colloquially called Apache, is a Web server application notable for playing a key role in the initial growth of the World Wide Web. +Description: >- + The Apache HTTP Server, colloquially called Apache, is a Web server + application notable for playing a key role in the initial growth + of the World Wide Web. Author: 'Mirantis, Inc' Tags: [docker, application, httpd] Classes: diff --git a/Docker/Applications/InfluxDB/package/manifest.yaml b/Docker/Applications/InfluxDB/package/manifest.yaml index f8dc232c..f9206c70 100644 --- a/Docker/Applications/InfluxDB/package/manifest.yaml +++ b/Docker/Applications/InfluxDB/package/manifest.yaml @@ -15,7 +15,7 @@ Type: Application FullName: com.example.docker.DockerInfluxDB Name: Docker InfluxDB Description: | - InfluxDB is a time series, events, and metrics database. It’s written in Go and has no external dependencies. That means once you install it there’s nothing else to manage (like Redis, HBase, or whatever). + InfluxDB is a time series, events, and metrics database. It’s written in Go and has no external dependencies. That means once you install it there’s nothing else to manage (like Redis, HBase, or whatever). Author: 'Mirantis, Inc' Tags: [docker, application, InfluxDB] Classes: diff --git a/Docker/Applications/MariaDB/package/UI/ui.yaml b/Docker/Applications/MariaDB/package/UI/ui.yaml index cc152381..d31dfec7 100644 --- a/Docker/Applications/MariaDB/package/UI/ui.yaml +++ b/Docker/Applications/MariaDB/package/UI/ui.yaml @@ -19,7 +19,6 @@ Application: host: $.appConfiguration.host publish: $.appConfiguration.publish password: $.appConfiguration.password - Forms: - appConfiguration: diff --git a/Docker/Applications/Nginx/package/manifest.yaml b/Docker/Applications/Nginx/package/manifest.yaml index 56b64665..60a63b4e 100644 --- a/Docker/Applications/Nginx/package/manifest.yaml +++ b/Docker/Applications/Nginx/package/manifest.yaml @@ -14,8 +14,11 @@ Format: 1.3 Type: Application FullName: com.example.docker.DockerNginx Name: Docker Nginx -Description: | - Nginx (pronounced “engine-x”) is an open source reverse proxy server for HTTP, HTTPS, SMTP, POP3, and IMAP protocols, as well as a load balancer, HTTP cache, and a web server (origin server). +Description: >- + Nginx (pronounced "engine-x") is an open source reverse + proxy server for HTTP, HTTPS, SMTP, POP3, and IMAP + protocols, as well as a load balancer, HTTP cache, + and a web server (origin server). Author: 'Mirantis, Inc' Tags: [docker, application, Nginx] Classes: diff --git a/Docker/Applications/Tomcat/package/manifest.yaml b/Docker/Applications/Tomcat/package/manifest.yaml index 2c6effdd..1e340b06 100644 --- a/Docker/Applications/Tomcat/package/manifest.yaml +++ b/Docker/Applications/Tomcat/package/manifest.yaml @@ -14,8 +14,12 @@ Format: 1.3 Type: Application FullName: com.example.docker.DockerTomcat Name: Docker Tomcat -Description: | - Apache Tomcat (or simply Tomcat) is an open source web server and servlet container developed by the Apache Software Foundation (ASF). Tomcat implements the Java Servlet and the JavaServer Pages (JSP) specifications from Oracle, and provides a “pure Java” HTTP web server environment for Java code to run in. +Description: >- + Apache Tomcat (or simply Tomcat) is an open source web server and servlet + container developed by the Apache Software Foundation (ASF). + Tomcat implements the Java Servlet and the JavaServer Pages (JSP) + specifications from Oracle, and provides a "pure Java" HTTP web server + environment for Java code to run in. Author: 'Mirantis, Inc' Tags: [docker, application, Tomcat] Classes: @@ -24,3 +28,4 @@ Require: com.mirantis.docker.DockerStandaloneHost: com.mirantis.docker.kubernetes.KubernetesPod: com.mirantis.docker.Interfaces: + diff --git a/Docker/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml b/Docker/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml index c8649595..eb68d6e4 100644 --- a/Docker/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml +++ b/Docker/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml @@ -18,7 +18,7 @@ Name: DockerHelpers Methods: labels2Map: Arguments: - labelsString: + labelsString: Contract: $.string().notNull() Body: - $result: {} @@ -35,8 +35,8 @@ Methods: map2labels: Arguments: - labelsMap: - Contract: + labelsMap: + Contract: $.string().notNull(): $.string().notNull() Body: - Return: $labelsMap.select(list($, $labelsMap.get($)).join('=')).join(';') diff --git a/Docker/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml b/Docker/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml index bf1c0536..ea71663f 100644 --- a/Docker/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml +++ b/Docker/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml @@ -21,7 +21,7 @@ Properties: Methods: getType: - + getParameters: getRepresentation: @@ -29,3 +29,4 @@ Methods: Return: type: $.getType() parameters: $.getParameters() + diff --git a/Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml b/Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml index 0e97ab39..4bf40dda 100644 --- a/Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml +++ b/Docker/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml @@ -18,10 +18,10 @@ Namespaces: Name: DockerStandaloneHost -Extends: +Extends: - DockerContainerHost -Properties: +Properties: name: Contract: $.string().notNull() @@ -59,8 +59,7 @@ Properties: Methods: .init: Body: - - $._environment: $.find(std:Environment).require() - + - $._environment: $.find(std:Environment).require() deploy: Body: diff --git a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml index fba931cc..4a09cbef 100644 --- a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml +++ b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml @@ -38,7 +38,6 @@ Methods: - $.deployPod() - $.setAttr(deployed, true) - deployPod: Body: - $resources: new(sys:Resources) diff --git a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml index 96aa1a31..bda2d29f 100644 --- a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml +++ b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml @@ -38,11 +38,9 @@ Methods: - $.deployReplicationController() - $.setAttr(deployed, true) - deployReplicationController: Body: - $resources: new(sys:Resources) - - $template: $resources.yaml('UpdateReplicationController.template').bind(dict( controllerDefinition => $.replicationControllerDefinition, isNew => true diff --git a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml index 9187360b..7692e7cd 100644 --- a/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml +++ b/Docker/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml @@ -38,11 +38,9 @@ Methods: - $.deployService() - $.setAttr(deployed, true) - deployService: Body: - $resources: new(sys:Resources) - - $template: $resources.yaml('UpdateService.template').bind(dict( serviceDefinition => $.serviceDefinition, isNew => true diff --git a/PivotalOperationsManager/package/Classes/OpsManager.yaml b/PivotalOperationsManager/package/Classes/OpsManager.yaml index f9127d52..e8c2dce8 100644 --- a/PivotalOperationsManager/package/Classes/OpsManager.yaml +++ b/PivotalOperationsManager/package/Classes/OpsManager.yaml @@ -183,4 +183,5 @@ Methods: properties: name: $._securityGroupName - $._environment.stack.updateTemplate($template) - - $._environment.stack.push() \ No newline at end of file + - $._environment.stack.push() + diff --git a/RefStackClient/package/UI/ui.yaml b/RefStackClient/package/UI/ui.yaml index 23509af3..dd9c300e 100644 --- a/RefStackClient/package/UI/ui.yaml +++ b/RefStackClient/package/UI/ui.yaml @@ -85,4 +85,5 @@ Forms: helpText: Just letters, numbers, underscores and hyphens are allowed. description: >- Specify a string, that will be used in instance hostname. - Just A-Z, a-z, 0-9, dash and underline are allowed. \ No newline at end of file + Just A-Z, a-z, 0-9, dash and underline are allowed. + diff --git a/Windows/ActiveDirectory/package/UI/ui.yaml b/Windows/ActiveDirectory/package/UI/ui.yaml index 4221f2c7..41b573a7 100644 --- a/Windows/ActiveDirectory/package/UI/ui.yaml +++ b/Windows/ActiveDirectory/package/UI/ui.yaml @@ -144,7 +144,6 @@ Forms: description: >- Select to true to assign floating IP automatically to Primary DC initial: false - required: false - name: unitNamingPattern type: string @@ -202,4 +201,5 @@ Forms: type: azone label: Availability zone description: Select availability zone where service would be installed. - required: false \ No newline at end of file + required: false + diff --git a/WordPress/package/UI/ui.yaml b/WordPress/package/UI/ui.yaml index 94c659dd..b3f8c604 100644 --- a/WordPress/package/UI/ui.yaml +++ b/WordPress/package/UI/ui.yaml @@ -21,7 +21,6 @@ Application: dbName: $.dbConfiguration.database dbUser: $.dbConfiguration.username dbPassword: $.dbConfiguration.password - Forms: - appConfiguration: @@ -59,7 +58,7 @@ Forms: - name: database type: string label: Database name - initial: wordpress + initial: wordpress description: >- Please, provide database name that is going to be created - name: username diff --git a/ZabbixAgent/package/Classes/ZabbixAgent.yaml b/ZabbixAgent/package/Classes/ZabbixAgent.yaml index 7e59fd3a..bbd01100 100644 --- a/ZabbixAgent/package/Classes/ZabbixAgent.yaml +++ b/ZabbixAgent/package/Classes/ZabbixAgent.yaml @@ -47,7 +47,7 @@ Methods: - $.server.deploy() - $resources: new(sys:Resources) - $securityGroupIngress: - - ToPort: 10050 + - ToPort: 10050 FromPort: 10050 IpProtocol: tcp External: true diff --git a/ZabbixAgent/package/UI/ui.yaml b/ZabbixAgent/package/UI/ui.yaml index 44fd3eaa..eb3f2ba1 100644 --- a/ZabbixAgent/package/UI/ui.yaml +++ b/ZabbixAgent/package/UI/ui.yaml @@ -18,7 +18,6 @@ Application: hostname: $.appConfiguration.hostname server: $.appConfiguration.server probe: $.appConfiguration.probeMethod - Forms: - appConfiguration: @@ -37,7 +36,6 @@ Forms: description: >- Unique, case sensitive hostname. Required for active checks and must match hostname as configured on the server. - - name: server type: com.example.ZabbixServer label: Zabbix Server