Skip to content

Fix buggy IAM import tests previously excluded using skip_import_test #7240

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.

Sign up for GitHub

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

Merged
SarahFrench merged 7 commits into from
Mar 15, 2023
Merged

Fix buggy IAM import tests previously excluded using skip_import_test #7240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
513c40b
Add ability to skip import steps in IAM resource tests
SarahFrench Feb 7, 2023
72ea0db
Fix ApiGateway IAM import tests
SarahFrench Feb 7, 2023
f820396
Fix Compute MachineImage IAM import tests
SarahFrench Feb 7, 2023
9690f95
Fix DataprocMetastore Federation IAM import tests
SarahFrench Feb 7, 2023
d12dc09
Remove `skip_import_test` from ApiConfig and Gateway resources
SarahFrench Feb 20, 2023
a1240be
Re-add import step skipping in IAM acc tests
SarahFrench Feb 20, 2023
ff81dc2
Update mmv1/products/apigateway/terraform.yaml
SarahFrench Mar 15, 2023
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
37 changes: 24 additions & 13 deletions mmv1/products/apigateway/terraform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
Api: !ruby/object:Overrides::Terraform::ResourceOverride
autogen_async: true
iam_policy: !ruby/object:Api::Resource::IamPolicy
skip_import_test: true
allowed_iam_role: 'roles/apigateway.viewer'
method_name_separator: ':'
parent_resource_attribute: 'api'
Expand All @@ -27,15 +26,17 @@ overrides: !ruby/object:Overrides::ResourceOverrides
min_version: beta
name: "apigateway_api_basic"
primary_resource_id: "api"
primary_resource_name: "fmt.Sprintf(\"tf-test-my-api%s\", context[\"random_suffix\"])"
vars:
name: "api"
api_id: "my-api"

@SarahFrench SarahFrench Feb 27, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explanation: I updated the name of the vars because in tests where 3 names were being passed in it was easier to understand if they all had consistent names that matched the argument they were used for. For consistency I did this across all tests.

I updated the value to include a hyphen, as presence of the hyphen is needed to cause the generated test code to include tf-test- at the start of the value and the random suffix (from context) at the end.

- !ruby/object:Provider::Terraform::Examples
skip_docs: true
min_version: beta
name: "apigateway_api_full"
primary_resource_id: "api"
primary_resource_name: "fmt.Sprintf(\"tf-test-my-api%s\", context[\"random_suffix\"])"
vars:
name: "api"
api_id: "my-api"
properties:
displayName: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
Expand All @@ -60,33 +61,38 @@ overrides: !ruby/object:Overrides::ResourceOverrides
min_version: beta
name: "apigateway_api_config_basic"
primary_resource_id: "api_cfg"
primary_resource_name: "fmt.Sprintf(\"tf-test-my-api%s\", context[\"random_suffix\"]), fmt.Sprintf(\"tf-test-my-config%s\", context[\"random_suffix\"])" # Need to pass 2 ids into a Sprintf - parent resource id also needed to identify primary resource
vars:
name: "api-cfg"
config: "cfg"
api_id: "my-api"
config_id: "my-config"
- !ruby/object:Provider::Terraform::Examples
skip_docs: true
min_version: beta
name: "apigateway_api_config_full"
primary_resource_id: "api_cfg"
primary_resource_name: "fmt.Sprintf(\"tf-test-my-api%s\", context[\"random_suffix\"])"
vars:
name: "api-cfg"
api_id: "my-api"
config_id: "my-config"
- !ruby/object:Provider::Terraform::Examples
min_version: beta
name: "apigateway_api_config_grpc"
primary_resource_id: "api_cfg"
primary_resource_name: "fmt.Sprintf(\"tf-test-my-api%s\", context[\"random_suffix\"])"
vars:
name: "api-cfg"
config: "cfg"
api_id: "my-api"
config_id: "my-config"
ignore_read_extra:
- "grpc_services.0.file_descriptor_set"
- !ruby/object:Provider::Terraform::Examples
skip_docs: true
min_version: beta
name: "apigateway_api_config_grpc_full"
primary_resource_id: "api_cfg"
primary_resource_name: "fmt.Sprintf(\"tf-test-my-config%s\", context[\"random_suffix\"])"
vars:
name: "api-cfg"
config: "cfg"
api_id: "my-api"
config_id: "my-config"
properties:
openapiDocuments.document.contents: !ruby/object:Overrides::Terraform::PropertyOverride
validation: !ruby/object:Provider::Terraform::Validation
Expand Down Expand Up @@ -124,16 +130,21 @@ overrides: !ruby/object:Overrides::ResourceOverrides
min_version: beta
name: "apigateway_gateway_basic"
primary_resource_id: "api_gw"
primary_resource_name: "fmt.Sprintf(\"tf-test-my-gateway%s\", context[\"random_suffix\"])"
vars:
name: "api-gw"
config: "config"
api_id: "my-api"
config_id: "my-config"
gateway_id: "my-gateway"
- !ruby/object:Provider::Terraform::Examples
skip_docs: true
min_version: beta
name: "apigateway_gateway_full"
primary_resource_id: "api_gw"
primary_resource_name: "fmt.Sprintf(\"tf-test-my-gateway%s\", context[\"random_suffix\"])"
vars:
name: "api-gw"
api_id: "my-api"
config_id: "my-config"
gateway_id: "my-gateway"
properties:
apiConfig: !ruby/object:Overrides::Terraform::PropertyOverride
diff_suppress_func: compareResourceNames
Expand Down
11 changes: 6 additions & 5 deletions mmv1/products/compute/terraform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,23 +1499,24 @@ overrides: !ruby/object:Overrides::ResourceOverrides
machineImageEncryptionKey.kmsKeyName: !ruby/object:Overrides::Terraform::PropertyOverride
diff_suppress_func: compareCryptoKeyVersions
iam_policy: !ruby/object:Api::Resource::IamPolicy
skip_import_test: true
allowed_iam_role: 'roles/compute.admin'
parent_resource_attribute: 'machine_image'
iam_conditions_request_type: :QUERY_PARAM
examples:
- !ruby/object:Provider::Terraform::Examples
name: "machine_image_basic"
primary_resource_id: "image"
primary_resource_name: "fmt.Sprintf(\"tf-test-my-image%s\", context[\"random_suffix\"])"
vars:
vm_name: "vm"
image_name: "image"
vm_name: "my-vm"
image_name: "my-image"
- !ruby/object:Provider::Terraform::Examples
name: "compute_machine_image_kms"
primary_resource_id: "image"
primary_resource_name: "fmt.Sprintf(\"tf-test-my-image%s\", context[\"random_suffix\"])"
vars:
vm_name: "vm"
image_name: "image"
vm_name: "my-vm"
image_name: "my-image"
key_name: "key"
keyring_name: "keyring"

Expand Down
8 changes: 5 additions & 3 deletions mmv1/products/metastore/terraform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,14 @@ overrides: !ruby/object:Overrides::ResourceOverrides
min_version: beta
primary_resource_name: 'fmt.Sprintf("tf-test-metastore-fed%s", context["random_suffix"])'
vars:
metastore_federation_name: "fed-1"
federation_id: "metastore-fed"
service_id: "metastore-service"
- !ruby/object:Provider::Terraform::Examples
name: "dataproc_metastore_federation_bigquery"
skip_test: true # https://github.com/hashicorp/terraform-provider-google/issues/13710
primary_resource_id: "default"
min_version: beta
primary_resource_name: 'fmt.Sprintf("tf-test-metastore-fed-bq%s", context["random_suffix"])'
primary_resource_name: 'fmt.Sprintf("tf-test-metastore-fed%s", context["random_suffix"])'
vars:
metastore_federation_name: "fed-2"
federation_id: "metastore-fed"
service_id: "metastore-service"
2 changes: 1 addition & 1 deletion mmv1/templates/terraform/examples/apigateway_api_basic.tf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api_id = "<%= ctx[:vars]["name"] %>"
api_id = "<%= ctx[:vars]['api_id'] %>"
}
4 changes: 2 additions & 2 deletions mmv1/templates/terraform/examples/apigateway_api_config_basic.tf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api_id = "<%= ctx[:vars]["name"] %>"
api_id = "<%= ctx[:vars]['api_id'] %>"
}

resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
api_config_id = "<%= ctx[:vars]["config"] %>"
api_config_id = "<%= ctx[:vars]['config_id'] %>"

openapi_documents {
document {
Expand Down
4 changes: 2 additions & 2 deletions mmv1/templates/terraform/examples/apigateway_api_config_full.tf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api_id = "<%= ctx[:vars]["name"] %>"
api_id = "<%= ctx[:vars]['api_id'] %>"
}

resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
api_config_id = "<%= ctx[:vars]["name"] %>"
api_config_id = "<%= ctx[:vars]['config_id'] %>"
display_name = "MM Dev API Config"
labels = {
environment = "dev"
Expand Down
4 changes: 2 additions & 2 deletions mmv1/templates/terraform/examples/apigateway_api_config_grpc.tf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api_id = "<%= ctx[:vars]["name"] %>"
api_id = "<%= ctx[:vars]['api_id'] %>"
}

resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
api_config_id = "<%= ctx[:vars]["config"] %>"
api_config_id = "<%= ctx[:vars]['config_id'] %>"

grpc_services {
file_descriptor_set {
Expand Down
4 changes: 2 additions & 2 deletions mmv1/templates/terraform/examples/apigateway_api_config_grpc_full.tf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api_id = "<%= ctx[:vars]["name"] %>"
api_id = "<%= ctx[:vars]['api_id'] %>"
}

resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
api_config_id = "<%= ctx[:vars]["config"] %>"
api_config_id = "<%= ctx[:vars]['config_id'] %>"

grpc_services {
file_descriptor_set {
Expand Down
2 changes: 1 addition & 1 deletion mmv1/templates/terraform/examples/apigateway_api_full.tf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api_id = "<%= ctx[:vars]["name"] %>"
api_id = "<%= ctx[:vars]['api_id'] %>"
display_name = "MM Dev API"
labels = {
environment = "dev"
Expand Down
6 changes: 3 additions & 3 deletions mmv1/templates/terraform/examples/apigateway_gateway_basic.tf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api_id = "<%= ctx[:vars]["name"] %>"
api_id = "<%= ctx[:vars]['api_id'] %>"
}

resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
api_config_id = "<%= ctx[:vars]["config"] %>"
api_config_id = "<%= ctx[:vars]['config_id'] %>"

openapi_documents {
document {
Expand All @@ -22,5 +22,5 @@ resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
resource "google_api_gateway_gateway" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api_config = google_api_gateway_api_config.<%= ctx[:primary_resource_id] %>.id
gateway_id = "<%= ctx[:vars]["name"] %>"
gateway_id = "<%= ctx[:vars]['gateway_id'] %>"
}
6 changes: 3 additions & 3 deletions mmv1/templates/terraform/examples/apigateway_gateway_full.tf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
resource "google_api_gateway_api" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api_id = "<%= ctx[:vars]["name"] %>"
api_id = "<%= ctx[:vars]['api_id'] %>"
}

resource "google_api_gateway_api_config" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
api = google_api_gateway_api.<%= ctx[:primary_resource_id] %>.api_id
api_config_id = "<%= ctx[:vars]["name"] %>"
api_config_id = "<%= ctx[:vars]['config_id'] %>"

openapi_documents {
document {
Expand All @@ -20,7 +20,7 @@ resource "google_api_gateway_gateway" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
region = "us-central1"
api_config = google_api_gateway_api_config.<%= ctx[:primary_resource_id] %>.id
gateway_id = "<%= ctx[:vars]["name"] %>"
gateway_id = "<%= ctx[:vars]['gateway_id'] %>"
display_name = "MM Dev API Gateway"
labels = {
environment = "dev"
Expand Down