diff --git a/autogen/versions.tf.tmpl b/autogen/versions.tf.tmpl index bc27bf44..19136c59 100644 --- a/autogen/versions.tf.tmpl +++ b/autogen/versions.tf.tmpl @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.48, < 5.0" + version = ">= 4.48, < 6" } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.48, < 5.0" + version = ">= 4.48, < 6" } } provider_meta "google" { diff --git a/examples/compute_instance/disk_snapshot/versions.tf b/examples/compute_instance/disk_snapshot/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/compute_instance/disk_snapshot/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/compute_instance/multiple_interfaces/versions.tf b/examples/compute_instance/multiple_interfaces/versions.tf deleted file mode 100644 index 005a3b71..00000000 --- a/examples/compute_instance/multiple_interfaces/versions.tf +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - null = { - source = "hashicorp/null" - version = ">= 2.1.0" - } - } -} diff --git a/examples/compute_instance/next_hop/versions.tf b/examples/compute_instance/next_hop/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/compute_instance/next_hop/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/compute_instance/simple/versions.tf b/examples/compute_instance/simple/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/compute_instance/simple/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/compute_instance/tags/versions.tf b/examples/compute_instance/tags/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/compute_instance/tags/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/instance_template/additional_disks/versions.tf b/examples/instance_template/additional_disks/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/instance_template/additional_disks/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/instance_template/alias_ip_range/versions.tf b/examples/instance_template/alias_ip_range/versions.tf deleted file mode 100644 index d3d87e5a..00000000 --- a/examples/instance_template/alias_ip_range/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2021 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/instance_template/encrypted_disks/versions.tf b/examples/instance_template/encrypted_disks/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/instance_template/encrypted_disks/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/instance_template/simple/versions.tf b/examples/instance_template/simple/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/instance_template/simple/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/mig/autoscaler/versions.tf b/examples/mig/autoscaler/versions.tf deleted file mode 100644 index 396bd738..00000000 --- a/examples/mig/autoscaler/versions.tf +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - google-beta = { - source = "hashicorp/google-beta" - version = "~> 4.0" - } - } -} diff --git a/examples/mig/full/versions.tf b/examples/mig/full/versions.tf deleted file mode 100644 index 396bd738..00000000 --- a/examples/mig/full/versions.tf +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - google-beta = { - source = "hashicorp/google-beta" - version = "~> 4.0" - } - } -} diff --git a/examples/mig/healthcheck/versions.tf b/examples/mig/healthcheck/versions.tf deleted file mode 100644 index 32e6123d..00000000 --- a/examples/mig/healthcheck/versions.tf +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - google-beta = { - source = "hashicorp/google-beta" - version = "~> 4.0" - } - random = { - source = "hashicorp/random" - version = "~> 3.4" - } - } -} diff --git a/examples/mig/simple/versions.tf b/examples/mig/simple/versions.tf deleted file mode 100644 index 396bd738..00000000 --- a/examples/mig/simple/versions.tf +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - google-beta = { - source = "hashicorp/google-beta" - version = "~> 4.0" - } - } -} diff --git a/examples/mig_stateful/versions.tf b/examples/mig_stateful/versions.tf deleted file mode 100644 index 396bd738..00000000 --- a/examples/mig_stateful/versions.tf +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - google-beta = { - source = "hashicorp/google-beta" - version = "~> 4.0" - } - } -} diff --git a/examples/mig_with_percent/simple/versions.tf b/examples/mig_with_percent/simple/versions.tf deleted file mode 100644 index 396bd738..00000000 --- a/examples/mig_with_percent/simple/versions.tf +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - google-beta = { - source = "hashicorp/google-beta" - version = "~> 4.0" - } - } -} diff --git a/examples/preemptible_and_regular_instance_templates/simple/versions.tf b/examples/preemptible_and_regular_instance_templates/simple/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/preemptible_and_regular_instance_templates/simple/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/umig/full/versions.tf b/examples/umig/full/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/umig/full/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/umig/named_ports/versions.tf b/examples/umig/named_ports/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/umig/named_ports/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/umig/simple/versions.tf b/examples/umig/simple/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/umig/simple/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/examples/umig/static_ips/versions.tf b/examples/umig/static_ips/versions.tf deleted file mode 100644 index a445fc5d..00000000 --- a/examples/umig/static_ips/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright 2018 Google LLC - * - * 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. - */ - -terraform { - required_version = ">= 0.13" - required_providers { - google = { - source = "hashicorp/google" - version = "~> 4.0" - } - } -} diff --git a/modules/compute_disk_snapshot/versions.tf b/modules/compute_disk_snapshot/versions.tf index 259facfc..4c1c459c 100644 --- a/modules/compute_disk_snapshot/versions.tf +++ b/modules/compute_disk_snapshot/versions.tf @@ -19,7 +19,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.71, < 5.0" + version = ">= 3.71, < 6" } null = { source = "hashicorp/null" diff --git a/modules/compute_instance/versions.tf b/modules/compute_instance/versions.tf index 93597ca2..36835066 100644 --- a/modules/compute_instance/versions.tf +++ b/modules/compute_instance/versions.tf @@ -19,7 +19,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.88, < 5.0" + version = ">= 3.88, < 6" } } provider_meta "google" { diff --git a/modules/instance_template/versions.tf b/modules/instance_template/versions.tf index 9ee0e5da..aaa83cb3 100644 --- a/modules/instance_template/versions.tf +++ b/modules/instance_template/versions.tf @@ -19,7 +19,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.67, < 5.0" + version = ">= 4.67, < 6" } } provider_meta "google" { diff --git a/modules/mig/versions.tf b/modules/mig/versions.tf index a2e6e603..588fcc4b 100644 --- a/modules/mig/versions.tf +++ b/modules/mig/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.48, < 5.0" + version = ">= 4.48, < 6" } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.48, < 5.0" + version = ">= 4.48, < 6" } } provider_meta "google" { diff --git a/modules/mig_with_percent/versions.tf b/modules/mig_with_percent/versions.tf index ab140cbc..a11fc8b8 100644 --- a/modules/mig_with_percent/versions.tf +++ b/modules/mig_with_percent/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.48, < 5.0" + version = ">= 4.48, < 6" } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.48, < 5.0" + version = ">= 4.48, < 6" } } provider_meta "google" { diff --git a/modules/preemptible_and_regular_instance_templates/versions.tf b/modules/preemptible_and_regular_instance_templates/versions.tf index 78399f39..9c0e6545 100644 --- a/modules/preemptible_and_regular_instance_templates/versions.tf +++ b/modules/preemptible_and_regular_instance_templates/versions.tf @@ -17,8 +17,8 @@ terraform { required_version = ">=0.13.0" required_providers { - google = ">= 3.88, < 5.0" - google-beta = ">= 3.88, < 5.0" + google = ">= 3.88, < 6" + google-beta = ">= 3.88, < 6" } provider_meta "google" { module_name = "blueprints/terraform/terraform-google-vm:preemptible_and_regular_instance_templates/v10.1.0" diff --git a/modules/umig/versions.tf b/modules/umig/versions.tf index e14c01e8..f1efa912 100644 --- a/modules/umig/versions.tf +++ b/modules/umig/versions.tf @@ -19,7 +19,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.88, < 5.0" + version = ">= 3.88, < 6" } } provider_meta "google" { diff --git a/test/setup/versions.tf b/test/setup/versions.tf index a624c9a5..86a62f1e 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.71, < 5.0" + version = ">= 3.71, < 6" } google-beta = { source = "hashicorp/google-beta" - version = ">= 3.71, < 5.0" + version = ">= 3.71, < 6" } null = { source = "hashicorp/null"