Migrate Code Generation to Python3

Author: KarstenSchnitter

cf-java-logging-support-core/beats/scripts/generate_fields_docs.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import yaml
 import sys
@@ -75,19 +75,19 @@ def fields_to_asciidoc(input, output, beat):
 
     # fields file is empty
     if docs is None:
-        print "fields.yml file is empty. fields.asciidoc cannot be generated."
+        print("fields.yml file is empty. fields.asciidoc cannot be generated.")
         return
 
     # If no sections are defined, docs can't be generated
     if "sections" not in docs.keys():
-        print "Sections is not defined in fields.yml. fields.asciidoc cannot be generated."
+        print("Sections is not defined in fields.yml. fields.asciidoc cannot be generated.")
         return
 
     sections = docs["sections"]
 
     # Check if sections is define
     if sections is None:
-        print "No sections are defined in fields.yml. fields.asciidoc cannot be generated."
+        print("No sections are defined in fields.yml. fields.asciidoc cannot be generated.")
         return
 
     for doc, _ in sections:
@@ -116,7 +116,7 @@ def fields_to_asciidoc(input, output, beat):
 if __name__ == "__main__":
 
     if len(sys.argv) != 3:
-        print "Usage: %s beatpath beatname" % sys.argv[0]
+        print("Usage: %s beatpath beatname" % sys.argv[0])
         sys.exit(1)
 
     beat_path = sys.argv[1]

cf-java-logging-support-core/beats/scripts/generate_template.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 This script generates the ES template file ({beat}.template.json) from
@@ -26,7 +26,7 @@ def fields_to_es_template(input, output, index):
 
     # No fields defined, can't generate template
     if docs is None:
-        print "fields.yml is empty. Cannot generate template."
+        print("fields.yml is empty. Cannot generate template.")
         return
 
     # Remove sections as only needed for docs
@@ -35,7 +35,7 @@ def fields_to_es_template(input, output, index):
 
     # Each template needs defaults
     if "defaults" not in docs.keys():
-        print "No defaults are defined. Each template needs at least defaults defined."
+        print("No defaults are defined. Each template needs at least defaults defined.")
         return
 
     defaults = docs["defaults"]
@@ -202,7 +202,7 @@ def fill_field_properties(field, defaults):
 if __name__ == "__main__":
 
     if len(sys.argv) != 3:
-        print "Usage: %s beatpath beatname" % sys.argv[0]
+        print("Usage: %s beatpath beatname" % sys.argv[0])
         sys.exit(1)
 
     beat_path = sys.argv[1]

cf-java-logging-support-core/pom.xml

@@ -69,7 +69,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>python</executable>
+                                    <executable>python3</executable>
                                     <arguments>
                                         <argument>${basedir}/beats/scripts/generate_fields_docs.py</argument>
                                         <argument>${basedir}/beats/request-metrics</argument>
@@ -84,7 +84,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>python</executable>
+                                    <executable>python3</executable>
                                     <arguments>
                                         <argument>${basedir}/beats/scripts/generate_template.py</argument>
                                         <argument>${basedir}/beats/request-metrics</argument>
@@ -99,7 +99,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>python</executable>
+                                    <executable>python3</executable>
                                     <arguments>
                                         <argument>${basedir}/beats/scripts/generate_fields_docs.py</argument>
                                         <argument>${basedir}/beats/app-logs</argument>
@@ -114,7 +114,7 @@
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <executable>python</executable>
+                                    <executable>python3</executable>
                                     <arguments>
                                         <argument>${basedir}/beats/scripts/generate_template.py</argument>
                                         <argument>${basedir}/beats/app-logs</argument>