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

Remove internal fields from monitoring uptime check #1974

Merged
merged 2 commits into from
Jun 25, 2019
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
2 changes: 1 addition & 1 deletion build/terraform
2 changes: 1 addition & 1 deletion build/terraform-beta
2 changes: 1 addition & 1 deletion build/terraform-mapper
35 changes: 0 additions & 35 deletions products/monitoring/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -941,41 +941,6 @@ objects:
message is returned. Not specifying this field will result in uptime checks
running from all regions.
item_type: Api::Type::String
- !ruby/object:Api::Type::Boolean
name: isInternal
description: If this is true, then checks are made only from the 'internal_checkers'.
If it is false, then checks are made only from the 'selected_regions'. It is
an error to provide 'selected_regions' when is_internal is true, or to provide
'internal_checkers' when is_internal is false.
- !ruby/object:Api::Type::Array
name: internalCheckers
description: The internal checkers that this check will egress from. If is_internal
is true and this list is empty, the check will egress from all the InternalCheckers
configured for the project that owns this CheckConfig.
item_type: !ruby/object:Api::Type::NestedObject
properties:
- !ruby/object:Api::Type::String
name: gcpZone
description: The GCP zone the uptime check should egress from. Only respected
for internal uptime checks, where internal_network is specified.
- !ruby/object:Api::Type::String
name: peerProjectId
description: The GCP project_id where the internal checker lives. Not necessary
the same as the workspace project.
- !ruby/object:Api::Type::String
name: name
description: A unique resource name for this InternalChecker. The format is projects/[PROJECT_ID]/internalCheckers/[INTERNAL_CHECKER_ID].
PROJECT_ID is the stackdriver workspace project for the uptime check config associated
with the internal checker.
- !ruby/object:Api::Type::String
name: network
description: 'The GCP VPC network (https://cloud.google.com/vpc/docs/vpc)
where the internal resource lives (ex: "default").'
- !ruby/object:Api::Type::String
name: displayName
description: The checker's human-readable name. The display name should be
unique within a Stackdriver Workspace in order to make it easier to identify;
however, uniqueness is not enforced.
- !ruby/object:Api::Type::NestedObject
name: httpCheck
description: Contains information needed to make an HTTP or HTTPS check.
Expand Down
1 change: 1 addition & 0 deletions products/monitoring/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
group_display_name: "uptime-check-group"
custom_code: !ruby/object:Provider::Terraform::CustomCode
custom_import: templates/terraform/custom_import/self_link_as_name.erb
extra_schema_entry: 'templates/terraform/extra_schema_entry/monitoring_uptime_check_config_internal.go.erb'
post_create: templates/terraform/post_create/set_computed_name.erb
properties:
id: !ruby/object:Overrides::Terraform::PropertyOverride
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<%# The license inside this block applies to this file.
# Copyright 2019 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.
-%>
"is_internal": {
Type: schema.TypeBool,
Optional: true,
Computed: true,
Deprecated: "This field never worked, and will be removed in 3.0.0.",
},
"internal_checkers": {
Type: schema.TypeList,
Optional: true,
Computed: true,
Deprecated: "This field never worked, and will be removed in 3.0.0.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"display_name": {
Type: schema.TypeString,
Optional: true,
Deprecated: "This field never worked, and will be removed in 3.0.0.",
rileykarson marked this conversation as resolved.
Show resolved Hide resolved
},
"gcp_zone": {
Type: schema.TypeString,
Optional: true,
Deprecated: "This field never worked, and will be removed in 3.0.0.",
},
"name": {
Type: schema.TypeString,
Optional: true,
Deprecated: "This field never worked, and will be removed in 3.0.0.",
},
"network": {
Type: schema.TypeString,
Optional: true,
Deprecated: "This field never worked, and will be removed in 3.0.0.",
},
"peer_project_id": {
Type: schema.TypeString,
Optional: true,
Deprecated: "This field never worked, and will be removed in 3.0.0.",
},
},
},
},