diff --git a/mmv1/products/firebaseappcheck/DeviceCheckConfig.yaml b/mmv1/products/firebaseappcheck/DeviceCheckConfig.yaml index 8c906432efb2..789c46b4a5f0 100644 --- a/mmv1/products/firebaseappcheck/DeviceCheckConfig.yaml +++ b/mmv1/products/firebaseappcheck/DeviceCheckConfig.yaml @@ -35,22 +35,6 @@ import_format: "{{app_id}}", ] examples: - - !ruby/object:Provider::Terraform::Examples - name: "firebase_app_check_device_check_config_minimal" - # Need the time_sleep resource - pull_external: true - primary_resource_id: "default" - vars: - bundle_id: "bundle.id.devicecheck" - key_id: "Key ID" - private_key_path: "path/to/private-key.p8" - team_id: "9987654321" - test_vars_overrides: - # Don't add random suffix - private_key_path: '"test-fixtures/private-key.p8"' - team_id: '"9987654321"' - test_env_vars: - project_id: :PROJECT_NAME - !ruby/object:Provider::Terraform::Examples name: "firebase_app_check_device_check_config_full" # Need the time_sleep resource @@ -84,7 +68,6 @@ properties: description: | The relative resource name of the DeviceCheck configuration object output: true - pattern: projects/{{project}}/apps/{{app_id}}/deviceCheckConfig - !ruby/object:Api::Type::String name: tokenTtl description: | diff --git a/mmv1/templates/terraform/examples/firebase_app_check_device_check_config_minimal.tf.erb b/mmv1/templates/terraform/examples/firebase_app_check_device_check_config_minimal.tf.erb deleted file mode 100644 index 8df68adb3edd..000000000000 --- a/mmv1/templates/terraform/examples/firebase_app_check_device_check_config_minimal.tf.erb +++ /dev/null @@ -1,29 +0,0 @@ -resource "google_firebase_apple_app" "default" { - project = "<%= ctx[:test_env_vars]['project_id'] %>" - display_name = "Apple app" - bundle_id = "<%= ctx[:vars]['bundle_id'] %>" - team_id = "<%= ctx[:vars]['team_id'] %>" -} - -# It takes a while for App Check to recognize the new app -# If your app already exists, you don't have to wait 30 seconds. -resource "time_sleep" "wait_30s" { - depends_on = [google_firebase_apple_app.default] - create_duration = "30s" -} - -resource "google_firebase_app_check_device_check_config" "default" { - project = "<%= ctx[:test_env_vars]['project_id'] %>" - app_id = google_firebase_apple_app.default.app_id - key_id = "<%= ctx[:vars]['key_id'] %>" - private_key = file("<%= ctx[:vars]['private_key_path'] %>") - - depends_on = [time_sleep.wait_30s] - - lifecycle { - precondition { - condition = google_firebase_apple_app.default.team_id != "" - error_message = "Provide a Team ID on the Apple App to use App Check" - } - } -} diff --git a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go index 0227051bb49b..2f9d5df800aa 100644 --- a/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go +++ b/mmv1/third_party/terraform/services/firebaseappcheck/resource_firebase_app_check_device_check_config_test.go @@ -16,7 +16,7 @@ func TestAccFirebaseAppCheckDeviceCheckConfig_firebaseAppCheckDeviceCheckConfigU "project_id": envvar.GetTestProjectFromEnv(), "team_id": "9987654321", "private_key_path": "test-fixtures/private-key.p8", - "token_ttl": "3600s", + "token_ttl": "3900s", "random_suffix": acctest.RandString(t, 10), } @@ -38,7 +38,7 @@ func TestAccFirebaseAppCheckDeviceCheckConfig_firebaseAppCheckDeviceCheckConfigU }, Steps: []resource.TestStep{ { - Config: testAccFirebaseAppCheckDeviceCheckConfig_firebaseAppCheckDeviceCheckConfigMinimalExample(context), + Config: testAccFirebaseAppCheckDeviceCheckConfig_firebaseAppCheckDeviceCheckConfigFullExample(context), }, { ResourceName: "google_firebase_app_check_device_check_config.default", @@ -55,15 +55,6 @@ func TestAccFirebaseAppCheckDeviceCheckConfig_firebaseAppCheckDeviceCheckConfigU ImportStateVerify: true, ImportStateVerifyIgnore: []string{"private_key", "app_id"}, }, - { - Config: testAccFirebaseAppCheckDeviceCheckConfig_firebaseAppCheckDeviceCheckConfigMinimalExample(contextUpdated), - }, - { - ResourceName: "google_firebase_app_check_device_check_config.default", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"private_key", "app_id"}, - }, }, }) }