From 8567282e2167f8613567213a0c52e3ad8b4e566c Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Mon, 27 Jan 2020 15:08:01 -0800 Subject: [PATCH] The beta API is deprecated - move to ga only. (#3027) --- products/binaryauthorization/api.yaml | 5 +--- products/binaryauthorization/terraform.yaml | 3 --- .../binauth_attestor_note_field_name.go.erb | 22 ------------------ .../binauth_attestor_note_field_name.go.erb | 23 ------------------- 4 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 templates/terraform/decoders/binauth_attestor_note_field_name.go.erb delete mode 100644 templates/terraform/encoders/binauth_attestor_note_field_name.go.erb diff --git a/products/binaryauthorization/api.yaml b/products/binaryauthorization/api.yaml index f36d3ec143c3..8ab9b2393729 100644 --- a/products/binaryauthorization/api.yaml +++ b/products/binaryauthorization/api.yaml @@ -18,9 +18,6 @@ versions: - !ruby/object:Api::Product::Version name: ga base_url: https://binaryauthorization.googleapis.com/v1/ - - !ruby/object:Api::Product::Version - name: beta - base_url: https://binaryauthorization.googleapis.com/v1beta1/ scopes: - https://www.googleapis.com/auth/cloud-platform objects: @@ -53,7 +50,7 @@ objects: displayed in chooser dialogs. - !ruby/object:Api::Type::NestedObject name: attestationAuthorityNote - api_name: userOwnedDrydockNote + api_name: userOwnedGrafeasNote description: | A Container Analysis ATTESTATION_AUTHORITY Note, created by the user. required: true diff --git a/products/binaryauthorization/terraform.yaml b/products/binaryauthorization/terraform.yaml index f2f06bdeabd0..347b847ef634 100644 --- a/products/binaryauthorization/terraform.yaml +++ b/products/binaryauthorization/terraform.yaml @@ -32,9 +32,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides note_name: "test-attestor-note" key_name: "test-attestor-key" keyring_name: "test-attestor-key-ring" - custom_code: !ruby/object:Provider::Terraform::CustomCode - encoder: templates/terraform/encoders/binauth_attestor_note_field_name.go.erb - decoder: templates/terraform/decoders/binauth_attestor_note_field_name.go.erb properties: name: !ruby/object:Overrides::Terraform::PropertyOverride custom_flatten: 'templates/terraform/custom_flatten/name_from_self_link.erb' diff --git a/templates/terraform/decoders/binauth_attestor_note_field_name.go.erb b/templates/terraform/decoders/binauth_attestor_note_field_name.go.erb deleted file mode 100644 index 4905109ef79b..000000000000 --- a/templates/terraform/decoders/binauth_attestor_note_field_name.go.erb +++ /dev/null @@ -1,22 +0,0 @@ -<%# 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. --%> -<% if version == 'ga' -%> -res["userOwnedDrydockNote"] = res["userOwnedGrafeasNote"] -delete(res, "userOwnedGrafeasNote") -<% else -%> -// decoder logic only in GA provider -<% end -%> - -return res, nil diff --git a/templates/terraform/encoders/binauth_attestor_note_field_name.go.erb b/templates/terraform/encoders/binauth_attestor_note_field_name.go.erb deleted file mode 100644 index 4a8b5f24c1f2..000000000000 --- a/templates/terraform/encoders/binauth_attestor_note_field_name.go.erb +++ /dev/null @@ -1,23 +0,0 @@ -<%# 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. --%> -<% if version == 'ga' -%> -// Field was renamed in GA API -obj["userOwnedGrafeasNote"] = obj["userOwnedDrydockNote"] -delete(obj, "userOwnedDrydockNote") -<% else -%> -// encoder logic only in GA provider -<% end -%> - -return obj, nil