Fix Ansible spurious diffs (#2685)

Merged PR #2685.
GoogleCloudPlatform · Nov 14, 2019 · 9eaaa89 · 9eaaa89
1 parent 589b20c
commit 9eaaa89
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/provider/ansible/documentation.rb b/provider/ansible/documentation.rb
@@ -23,6 +23,8 @@ module Ansible
     module Documentation
       # Builds out the DOCUMENTATION for a property.
       # This will eventually be converted to YAML
+      #
+      # TODO(alexstephen): Ansible docs don't like defaults of 0, because 0 == null
       def documentation_for_property(prop)
         required = prop.required && !prop.default_value ? true : false
         {
@@ -39,7 +41,7 @@ def documentation_for_property(prop)
             'default' => (
               if prop.default_value&.is_a?(::Hash)
                 prop.default_value
-              else
+              elsif prop.default_value.to_s != '0'
                 prop.default_value&.to_s
               end),
             'type' => python_type(prop),

diff --git a/provider/ansible/gcp_utils.py b/provider/ansible/gcp_utils.py
@@ -1,6 +1,10 @@
 # Copyright (c), Google Inc, 2017
 # Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
 
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
 try:
     import requests
     HAS_REQUESTS = True