fix all the things

GoogleCloudPlatform · Sep 12, 2018 · 4b1818d · 4b1818d
1 parent 5995499
commit 4b1818d
Show file tree

Hide file tree

Showing 361 changed files with 724 additions and 721 deletions.
diff --git a/TEMPLATE_SDK.md b/TEMPLATE_SDK.md
@@ -761,12 +761,12 @@ line #1 by compiling the license template:
 To ensure no doubts exist on the readers' minds, we recommend that you mark the
 copyright notice on the template with a ERB block:
 
-    <% if false # the license inside this if block assertains to this file -%>
+    <%# The license inside this block applies to this file
     # Copyright 2017 Google Inc.
     ...
     ...
     ...
-    <% end # copyright -%>
+    -%>
 
 ### Determining the generated artifact "effective year"
 

diff --git a/products/_bundle/templates/chef/README.md.erb b/products/_bundle/templates/chef/README.md.erb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file.
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% autogen_exception -%>
 
 Google Cloud Platform for Chef

diff --git a/products/_bundle/templates/puppet/README.md.erb b/products/_bundle/templates/puppet/README.md.erb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file.
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% autogen_exception -%>
 
 Google Cloud Platform for Puppet

diff --git a/products/bigquery/examples/puppet/dataset.pp b/products/bigquery/examples/puppet/dataset.pp
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == "README.md" -%>
 <%= compile 'templates/license.erb' -%>
 

diff --git a/products/bigquery/examples/puppet/delete_dataset.pp b/products/bigquery/examples/puppet/delete_dataset.pp
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == "README.md" -%>
 <%= compile 'templates/license.erb' -%>
 

diff --git a/products/bigquery/examples/puppet/table.pp b/products/bigquery/examples/puppet/table.pp
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == "README.md" -%>
 <%= compile 'templates/license.erb' -%>
 

diff --git a/products/compute/examples/chef/address.rb b/products/compute/examples/chef/address.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/backend_bucket.rb b/products/compute/examples/chef/backend_bucket.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/backend_service.rb b/products/compute/examples/chef/backend_service.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_address.rb b/products/compute/examples/chef/delete_address.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_backend_bucket.rb b/products/compute/examples/chef/delete_backend_bucket.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_backend_service.rb b/products/compute/examples/chef/delete_backend_service.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_disk.rb b/products/compute/examples/chef/delete_disk.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_firewall.rb b/products/compute/examples/chef/delete_firewall.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_forwarding_rule.rb b/products/compute/examples/chef/delete_forwarding_rule.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_global_address.rb b/products/compute/examples/chef/delete_global_address.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_global_forwarding_rule.rb b/products/compute/examples/chef/delete_global_forwarding_rule.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_health_check.rb b/products/compute/examples/chef/delete_health_check.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_http_health_check.rb b/products/compute/examples/chef/delete_http_health_check.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_https_health_check.rb b/products/compute/examples/chef/delete_https_health_check.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_image.rb b/products/compute/examples/chef/delete_image.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_instance.rb b/products/compute/examples/chef/delete_instance.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% if name != 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_instance_group.rb b/products/compute/examples/chef/delete_instance_group.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_instance_group_manager.rb b/products/compute/examples/chef/delete_instance_group_manager.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_instance_template.rb b/products/compute/examples/chef/delete_instance_template.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>

diff --git a/products/compute/examples/chef/delete_network.rb b/products/compute/examples/chef/delete_network.rb
@@ -1,4 +1,4 @@
-<% if false # the license inside this if block assertains to this file -%>
+<%# The license inside this block applies to this file
 # Copyright 2017 Google Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-<% end -%>
+-%>
 <% unless name == 'README.md' -%>
 
 <%= compile 'templates/license.erb' -%>