Move warnings to the more appropriate location.

GoogleCloudPlatform · Mar 1, 2019 · 1d5fa2d · 1d5fa2d
1 parent a4afa0a
commit 1d5fa2d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/products/compute/api.yaml b/products/compute/api.yaml
@@ -3457,8 +3457,6 @@ objects:
       An SslCertificate resource, used for HTTPS load balancing. This resource
       provides a mechanism to upload an SSL key and certificate to
       the load balancer to serve secure connections from the user.
-      For a certificate managed by Google, see the ManagedSslCertificate
-      resource.
 <%= indent(compile_file({}, 'templates/global_async.yaml.erb'), 4) %>
     properties:
       - !ruby/object:Api::Type::String
@@ -3489,8 +3487,6 @@ objects:
           first character must be a lowercase letter, and all following
           characters must be a dash, lowercase letter, or digit, except the last
           character, which cannot be a dash.
-
-          These are in the same namespace as the managed SSL certificates.
       - !ruby/object:Api::Type::String
         name: 'privateKey'
         description: 'The write-only private key in PEM format.'
@@ -3515,8 +3511,7 @@ objects:
     description: |
       An SslCertificate resource, used for HTTPS load balancing.  This resource
       represents a certificate for which the certificate secrets are created and
-      managed by Google.  For a resource where you provide the key, see the
-      SSL Certificate resource.
+      managed by Google.
 <%= indent(compile_file({timeouts: {
                         insert_sec: 6 * 60,
                         update_sec: 6 * 60,
@@ -3545,8 +3540,6 @@ objects:
           first character must be a lowercase letter, and all following
           characters must be a dash, lowercase letter, or digit, except the last
           character, which cannot be a dash.
-
-          These are in the same namespace as the unmanaged SSL certificates.
       - !ruby/object:Api::Type::NestedObject
         name: 'managed'
         description: |

diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml
@@ -756,10 +756,19 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           dns_zone_name: "dnszone"
           forwarding_rule_name: "forwarding-rule"
           http_health_check_name: "http-health-check"
+    description: |
+      {{description}}
+      For a resource where you provide the key, see the
+      SSL Certificate resource.
     properties:
       id: !ruby/object:Overrides::Terraform::PropertyOverride
         name: 'certificate_id'
         default_from_api: true
+      name: !ruby/object:Overrides::Terraform::PropertyOverride
+        description: |
+          {{description}}
+
+          These are in the same namespace as the managed SSL certificates.
   SslCertificate: !ruby/object:Overrides::Terraform::ResourceOverride
     docs: !ruby/object:Provider::Terraform::Docs
       optional_properties: |
@@ -795,6 +804,10 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         custom_expand: 'templates/terraform/custom_expand/name_or_name_prefix.go.erb'
         validation: !ruby/object:Provider::Terraform::Validation
           function: 'validateGCPName'
+        description: |
+          {{description}}
+
+          These are in the same namespace as the managed SSL certificates.
       id: !ruby/object:Overrides::Terraform::PropertyOverride
         name: 'certificate_id'
       certificate: !ruby/object:Overrides::Terraform::PropertyOverride