let's try it

Author: rambleraptor

mmv1/api/resource.go

@@ -1722,6 +1722,13 @@ func (r Resource) FirstTestConfig() TestConfig {
 	return TestConfig{}
 }
 
+func (r Resource) NeedsEnvVar() bool {
+	if r.ProductMetadata != nil && r.ProductMetadata.Name == "BiglakeIceberg" && (r.Name == "IcebergNamespace" || r.Name == "IcebergCatalog") {
+		return false
+	}
+	return true
+}
+
 func (r Resource) ExamplePrimaryResourceId() string {
 	examples := google.Reject(r.Examples, func(e *resource.Examples) bool {
 		return e.ExcludeTest

mmv1/templates/terraform/examples/base_configs/test_file.go.tmpl

@@ -29,7 +29,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
 	"{{ $.ImportPath }}/acctest"
+{{- if $.Res.NeedsEnvVar }}
 	"{{ $.ImportPath  }}/envvar"
+{{- end }}
 	"{{ $.ImportPath  }}/tpgresource"
 	transport_tpg "{{ $.ImportPath  }}/transport"
 
@@ -44,7 +46,9 @@ var (
     _ = time.Now
 	_ = resource.TestMain
 	_ = terraform.NewState
+{{- if $.Res.NeedsEnvVar }}
     _ = envvar.TestEnvVar
+{{- end }}
     _ = tpgresource.SetLabels
     _ = transport_tpg.Config{}
     _ = googleapi.Error{}

mmv1/templates/terraform/samples/base_configs/test_file.go.tmpl

@@ -33,7 +33,9 @@ import (
 {{- end }}
 
 	"{{ $.ImportPath }}/acctest"
+{{- if $.Res.NeedsEnvVar }}
 	"{{ $.ImportPath  }}/envvar"
+{{- end }}
 	"{{ $.ImportPath  }}/tpgresource"
 	transport_tpg "{{ $.ImportPath  }}/transport"
 )

mmv1/third_party/terraform/acctest/resource_inventory_test.go

@@ -267,17 +267,13 @@ func TestValidateResourceMetadata(t *testing.T) {
 			if r.ApiServiceName == "" {
 				t.Errorf("%s: `api_service_name` is required and not set", r.Resource)
 			}
-			// Allowlist google_biglake_iceberg_catalog as a pre-existing case. I believe
+			ignoredResources := []string{"google_biglake_iceberg_catalog", "google_biglake_iceberg_namespace"}
+			// Allowlist google_biglake_iceberg_catalog and google_biglake_iceberg_namespace as a pre-existing case. I believe
 			// that's a mistake which should be corrected at some point in the future.
-			if r.ApiVersion == "" && resourceName != "google_biglake_iceberg_catalog" {
+			if r.ApiVersion == "" && !slices.Contains(ignoredResources, resourceName) {
 				t.Errorf("%s: `api_version` is required and not set", r.Resource)
 			}
 
-			// Allowlist google_biglake_iceberg_namespace as a pre-existing case. I believe
-			// that's a mistake which should be corrected at some point in the future.
-			if r.ApiVersion == "" && resourceName != "google_biglake_iceberg_namespace" {
-				t.Errorf("%s: `api_version` is required and not set", r.Resource)
-			}
 			if r.ApiResourceTypeKind == "" {
 				t.Errorf("%s: `api_resource_type_kind` is required and not set", r.Resource)
 			}