Skip to content

Commit 2656fcf

Browse files
authored
Merge branch 'master' into ground-up
2 parents 6f2f011 + 355fbf1 commit 2656fcf

File tree

28 files changed

+342
-146
lines changed

28 files changed

+342
-146
lines changed

.ci/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ These tools manage the downstream repositories of [magic-modules](https://github
66
Currently, they manage:
77

88
* terraform
9-
* puppet/compute
10-
* puppet/sql
9+
* puppet
10+
* chef
11+
* ansible
1112

1213
# CI For Downstream Developers
1314
If you're interested in developing the repositories that MagicModules manages, here are the things you'll want to know.

.ci/magic-modules/generate-terraform.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ bundle install
2929
# Build all terraform products
3030
bundle exec compiler -a -e terraform -o "${GOPATH}/src/github.com/terraform-providers/terraform-provider-google/"
3131

32-
# Resources that were already using beta APIs before they started being autogenerated
33-
bundle exec compiler -v beta -p products/compute -t Address,Firewall,ForwardingRule,GlobalAddress,RegionDisk,Subnetwork,VpnTunnel -e terraform -o "${GOPATH}/src/github.com/terraform-providers/terraform-provider-google/"
34-
3532
# This command can crash - if that happens, the script should not fail.
3633
set +e
3734
TERRAFORM_COMMIT_MSG="$(python .ci/magic-modules/extract_from_pr_description.py --tag terraform < .git/body)"

api/type.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ def check_default_value_property
8383
clazz = ::Integer
8484
when Api::Type::Enum
8585
clazz = ::Symbol
86+
when Api::Type::Boolean
87+
clazz = :boolean
8688
else
8789
raise "Update 'check_default_value_property' method to support " \
8890
"default value for type #{self.class}"

build/chef/_bundle

Submodule _bundle updated 1 file

build/chef/compute

Submodule compute updated 26 files

build/puppet/_bundle

Submodule _bundle updated 1 file

build/puppet/compute

Submodule compute updated 33 files

build/terraform

google/golang_utils.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ def go_literal(value)
3333
value.to_s
3434
elsif value.is_a?(Array) && value.all? { |v| v.is_a?(String) || v.is_a?(Symbol) }
3535
"[]string{#{value.map(&method(:go_literal)).join(', ')}}"
36+
elsif value.is_a?(TrueClass) || value.is_a?(FalseClass)
37+
value.to_s
3638
else
3739
raise "Unsupported go literal #{value}"
3840
end

0 commit comments

Comments
 (0)