Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ansible - Regional SSL Certs + Health Check #3210

Merged
merged 6 commits into from
Mar 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions products/compute/ansible.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ datasources: !ruby/object:Overrides::ResourceOverrides
exclude: true
RegionDiskType: !ruby/object:Overrides::Ansible::ResourceOverride
exclude: true
RegionHealthCheck: !ruby/object:Overrides::Ansible::ResourceOverride
exclude: true
RegionInstanceGroupManager: !ruby/object:Overrides::Ansible::ResourceOverride
exclude: true
RegionSslCertificate: !ruby/object:Overrides::Ansible::ResourceOverride
Expand Down Expand Up @@ -333,8 +331,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
exclude: true
RegionDiskType: !ruby/object:Overrides::Ansible::ResourceOverride
exclude: true
RegionHealthCheck: !ruby/object:Overrides::Ansible::ResourceOverride
exclude: true
RegionInstanceGroupManager: !ruby/object:Overrides::Ansible::ResourceOverride
exclude: true
RegionSslCertificate: !ruby/object:Overrides::Ansible::ResourceOverride
Expand Down
110 changes: 110 additions & 0 deletions products/compute/ansible_version_added.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
:version_added: '2.10'
:RegionDisk:
:version_added: '2.8'
:RegionHealthCheck:
:version_added: '2.10'
:Route:
:version_added: '2.7'
:Router:
Expand All @@ -58,6 +60,8 @@
:version_added: '2.9'
:SslCertificate:
:version_added: '2.7'
:RegionSslCertificate:
:version_added: '2.10'
:Reservation:
:version_added: '2.10'
:SslPolicy:
Expand Down Expand Up @@ -1017,6 +1021,100 @@
:version_added: '2.8'
:kmsKeyName:
:version_added: '2.8'
:RegionHealthCheck:
:version_added: '2.10'
:checkIntervalSec:
:version_added: '2.10'
:description:
:version_added: '2.10'
:healthyThreshold:
:version_added: '2.10'
:name:
:version_added: '2.10'
:unhealthyThreshold:
:version_added: '2.10'
:timeoutSec:
:version_added: '2.10'
:type:
:version_added: '2.10'
:httpHealthCheck:
:version_added: '2.10'
:host:
:version_added: '2.10'
:requestPath:
:version_added: '2.10'
:response:
:version_added: '2.10'
:port:
:version_added: '2.10'
:portName:
:version_added: '2.10'
:proxyHeader:
:version_added: '2.10'
:portSpecification:
:version_added: '2.10'
:httpsHealthCheck:
:version_added: '2.10'
:host:
:version_added: '2.10'
:requestPath:
:version_added: '2.10'
:response:
:version_added: '2.10'
:port:
:version_added: '2.10'
:portName:
:version_added: '2.10'
:proxyHeader:
:version_added: '2.10'
:portSpecification:
:version_added: '2.10'
:tcpHealthCheck:
:version_added: '2.10'
:request:
:version_added: '2.10'
:response:
:version_added: '2.10'
:port:
:version_added: '2.10'
:portName:
:version_added: '2.10'
:proxyHeader:
:version_added: '2.10'
:portSpecification:
:version_added: '2.10'
:sslHealthCheck:
:version_added: '2.10'
:request:
:version_added: '2.10'
:response:
:version_added: '2.10'
:port:
:version_added: '2.10'
:portName:
:version_added: '2.10'
:proxyHeader:
:version_added: '2.10'
:portSpecification:
:version_added: '2.10'
:http2HealthCheck:
:version_added: '2.10'
:host:
:version_added: '2.10'
:requestPath:
:version_added: '2.10'
:response:
:version_added: '2.10'
:port:
:version_added: '2.10'
:portName:
:version_added: '2.10'
:proxyHeader:
:version_added: '2.10'
:portSpecification:
:version_added: '2.10'
:region:
:version_added: '2.10'
:Route:
:version_added: '2.6'
:destRange:
Expand Down Expand Up @@ -1099,6 +1197,18 @@
:version_added: '2.6'
:privateKey:
:version_added: '2.6'
:RegionSslCertificate:
:version_added: '2.10'
:certificate:
:version_added: '2.10'
:description:
:version_added: '2.10'
:name:
:version_added: '2.10'
:privateKey:
:version_added: '2.10'
:region:
:version_added: '2.10'
:Reservation:
:version_added: '2.10'
:description:
Expand Down
1 change: 0 additions & 1 deletion products/compute/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11660,7 +11660,6 @@ objects:
output: true
- !ruby/object:Api::Resource
name: 'RegionSslCertificate'
min_version: beta
kind: 'compute#sslCertificate'
base_url: projects/{{project}}/regions/{{region}}/sslCertificates
collection_url_key: 'items'
Expand Down
29 changes: 29 additions & 0 deletions products/compute/examples/ansible/region_health_check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright 2020 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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.
--- !ruby/object:Provider::Ansible::Example
task: !ruby/object:Provider::Ansible::Task
name: gcp_compute_region_health_check
code:
name: <%= ctx[:name] %>
type: TCP
tcp_health_check:
port_name: service-health
request: ping
response: pong
healthy_threshold: 10
timeout_sec: 2
unhealthy_threshold: 5
region: 'us-central1'
project: <%= ctx[:project] %>
auth_kind: <%= ctx[:auth_kind] %>
service_account_file: <%= ctx[:service_account_file] %>
1 change: 1 addition & 0 deletions products/compute/examples/ansible/ssl_certificate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ task: !ruby/object:Provider::Ansible::Task
name: gcp_compute_ssl_certificate
code:
name: <%= ctx[:name] %>
region: 'us-central1'
description: A certificate for testing. Do not use this certificate in production
certificate: |
-----BEGIN CERTIFICATE-----
Expand Down
1 change: 1 addition & 0 deletions products/compute/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1803,6 +1803,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
primary_resource_id: "default"
- !ruby/object:Provider::Terraform::Examples
name: "region_ssl_certificate_target_https_proxies"
min_version: "beta"
primary_resource_id: "default"
vars:
region_target_https_proxy_name: "test-proxy"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resource "google_compute_region_ssl_certificate" "default" {
provider = google-beta
region = "us-central1"
name_prefix = "my-certificate-"
description = "a description"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# You may also want to control name generation explicitly:
resource "google_compute_region_ssl_certificate" "default" {
provider = google-beta
region = "us-central1"

# The name will contain 8 random hex digits,
Expand Down