From 5dd5865893444bb799ffce68f58ca55af55fca0e Mon Sep 17 00:00:00 2001 From: justinsb Date: Tue, 3 Jan 2023 15:10:09 -0500 Subject: [PATCH] Update expected output --- tests/integration/update_cluster/ha_gce/kubernetes.tf | 5 +++++ .../lifecycle_phases/network-kubernetes.tf | 10 ++-------- .../update_cluster/many-addons-gce/kubernetes.tf | 5 +++++ .../update_cluster/minimal_gce/kubernetes.tf | 5 +++++ .../update_cluster/minimal_gce_dns-none/kubernetes.tf | 5 +++++ .../update_cluster/minimal_gce_ilb/kubernetes.tf | 5 +++++ .../minimal_gce_ilb_longclustername/kubernetes.tf | 5 +++++ .../minimal_gce_longclustername/kubernetes.tf | 5 +++++ .../update_cluster/minimal_gce_private/kubernetes.tf | 5 +++++ .../update_cluster/minimal_hetzner/kubernetes.tf | 5 +++++ 10 files changed, 47 insertions(+), 8 deletions(-) diff --git a/tests/integration/update_cluster/ha_gce/kubernetes.tf b/tests/integration/update_cluster/ha_gce/kubernetes.tf index 21553b72ac..1f36339b00 100644 --- a/tests/integration/update_cluster/ha_gce/kubernetes.tf +++ b/tests/integration/update_cluster/ha_gce/kubernetes.tf @@ -793,6 +793,11 @@ resource "google_service_account" "node" { terraform { required_version = ">= 0.15.0" required_providers { + aws = { + "configuration_aliases" = [aws.files] + "source" = "hashicorp/aws" + "version" = ">= 4.0.0" + } google = { "source" = "hashicorp/google" "version" = ">= 2.19.0" diff --git a/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf b/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf index a4d8d0458d..a39019d22b 100644 --- a/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf +++ b/tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf @@ -55,11 +55,6 @@ provider "aws" { region = "us-test-1" } -provider "aws" { - alias = "files" - region = "us-test-1" -} - resource "aws_eip" "us-test-1a-lifecyclephases-example-com" { tags = { "KubernetesCluster" = "lifecyclephases.example.com" @@ -200,9 +195,8 @@ terraform { required_version = ">= 0.15.0" required_providers { aws = { - "configuration_aliases" = [aws.files] - "source" = "hashicorp/aws" - "version" = ">= 4.0.0" + "source" = "hashicorp/aws" + "version" = ">= 4.0.0" } } } diff --git a/tests/integration/update_cluster/many-addons-gce/kubernetes.tf b/tests/integration/update_cluster/many-addons-gce/kubernetes.tf index 32cc77413c..59e9da9ce5 100644 --- a/tests/integration/update_cluster/many-addons-gce/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons-gce/kubernetes.tf @@ -585,6 +585,11 @@ resource "google_service_account" "node" { terraform { required_version = ">= 0.15.0" required_providers { + aws = { + "configuration_aliases" = [aws.files] + "source" = "hashicorp/aws" + "version" = ">= 4.0.0" + } google = { "source" = "hashicorp/google" "version" = ">= 2.19.0" diff --git a/tests/integration/update_cluster/minimal_gce/kubernetes.tf b/tests/integration/update_cluster/minimal_gce/kubernetes.tf index ef610242d6..23a3604e3c 100644 --- a/tests/integration/update_cluster/minimal_gce/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce/kubernetes.tf @@ -561,6 +561,11 @@ resource "google_service_account" "node" { terraform { required_version = ">= 0.15.0" required_providers { + aws = { + "configuration_aliases" = [aws.files] + "source" = "hashicorp/aws" + "version" = ">= 4.0.0" + } google = { "source" = "hashicorp/google" "version" = ">= 2.19.0" diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf index 966b84fbc9..b71a4b240f 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf @@ -579,6 +579,11 @@ resource "google_service_account" "node" { terraform { required_version = ">= 0.15.0" required_providers { + aws = { + "configuration_aliases" = [aws.files] + "source" = "hashicorp/aws" + "version" = ">= 4.0.0" + } google = { "source" = "hashicorp/google" "version" = ">= 2.19.0" diff --git a/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf index 017f9f5c43..2ea831bab9 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf @@ -577,6 +577,11 @@ resource "google_service_account" "node" { terraform { required_version = ">= 0.15.0" required_providers { + aws = { + "configuration_aliases" = [aws.files] + "source" = "hashicorp/aws" + "version" = ">= 4.0.0" + } google = { "source" = "hashicorp/google" "version" = ">= 2.19.0" diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf index 20f577692d..c930b276f7 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf @@ -577,6 +577,11 @@ resource "google_service_account" "node" { terraform { required_version = ">= 0.15.0" required_providers { + aws = { + "configuration_aliases" = [aws.files] + "source" = "hashicorp/aws" + "version" = ">= 4.0.0" + } google = { "source" = "hashicorp/google" "version" = ">= 2.19.0" diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf index 178c4e3d24..3a7319e020 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf @@ -561,6 +561,11 @@ resource "google_service_account" "node" { terraform { required_version = ">= 0.15.0" required_providers { + aws = { + "configuration_aliases" = [aws.files] + "source" = "hashicorp/aws" + "version" = ">= 4.0.0" + } google = { "source" = "hashicorp/google" "version" = ">= 2.19.0" diff --git a/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf index 3dc8299d52..f0bbf5be74 100644 --- a/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf @@ -574,6 +574,11 @@ resource "google_service_account" "node" { terraform { required_version = ">= 0.15.0" required_providers { + aws = { + "configuration_aliases" = [aws.files] + "source" = "hashicorp/aws" + "version" = ">= 4.0.0" + } google = { "source" = "hashicorp/google" "version" = ">= 2.19.0" diff --git a/tests/integration/update_cluster/minimal_hetzner/kubernetes.tf b/tests/integration/update_cluster/minimal_hetzner/kubernetes.tf index 6b5403a954..6982eeb84e 100644 --- a/tests/integration/update_cluster/minimal_hetzner/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_hetzner/kubernetes.tf @@ -308,6 +308,11 @@ resource "hcloud_volume" "etcd-1-etcd-main-minimal-example-com" { terraform { required_version = ">= 0.15.0" required_providers { + aws = { + "configuration_aliases" = [aws.files] + "source" = "hashicorp/aws" + "version" = ">= 4.0.0" + } hcloud = { "source" = "hetznercloud/hcloud" "version" = ">= 1.35.1"