Project Iam Member List support

mmv1/provider/terraform.go

@@ -369,7 +369,6 @@ func (t *Terraform) GenerateIamPolicyLegacy(object api.Resource, templateData Te
 		targetFolder := t.makeFolder(outputFolder, t.FolderName(), "services", t.Product.ApiName)
 		targetFilePath := path.Join(targetFolder, fmt.Sprintf("iam_%s.go", t.ResourceGoFilename(object)))
 		templateData.GenerateIamPolicyFile(targetFilePath, object)
-
 		// Only generate test if testable examples exist.
 		examples := google.Reject(object.Examples, func(e *resource.Examples) bool {
 			return e.ExcludeTest
@@ -401,7 +400,6 @@ func (t *Terraform) GenerateIamPolicy(object api.Resource, templateData Template
 		targetFolder := t.makeFolder(outputFolder, t.FolderName(), "services", t.Product.ApiName)
 		targetFilePath := path.Join(targetFolder, fmt.Sprintf("iam_%s.go", t.ResourceGoFilename(object)))
 		templateData.GenerateIamPolicyFile(targetFilePath, object)
-
 		// Only generate test if testable example configs exist.
 		samples := google.Reject(object.Samples, func(s *resource.Sample) bool {
 			return s.ExcludeTest
@@ -955,19 +953,25 @@ func (t *Terraform) generateResourcesForVersion(products []*api.Product) {
 			}
 
 			var iamClassName string
+			var iamMemberListImport string
+			var iamMemberListFunc string
 			iamPolicy := object.IamPolicy
 			if iamPolicy != nil && !iamPolicy.Exclude {
 				t.IAMResourceCount += 3
 
 				if slices.Index(product.ORDER, iamPolicy.MinVersion) <= slices.Index(product.ORDER, t.TargetVersionName) {
 					iamClassName = fmt.Sprintf("%s.%s", service, object.ResourceName())
+					iamMemberListImport = service
+					iamMemberListFunc = fmt.Sprintf("New%sIamMemberListResource", object.ResourceName())
 				}
 			}
 
 			t.ResourcesForVersion = append(t.ResourcesForVersion, map[string]string{
-				"TerraformName": object.TerraformName(),
-				"ResourceName":  resourceName,
-				"IamClassName":  iamClassName,
+				"TerraformName":       object.TerraformName(),
+				"ResourceName":        resourceName,
+				"IamClassName":        iamClassName,
+				"IamMemberListImport": iamMemberListImport,
+				"IamMemberListFunc":   iamMemberListFunc,
 			})
 		}
 	}

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

@@ -89,7 +89,7 @@ func TestAcc{{ $.ResourceName }}IamMemberGenerated(t *testing.T) {
 	acctest.VcrTest(t, resource.TestCase{
 {{- if not $.IamPolicy.ExcludeImportTest }}
 		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
-			tfversion.RequireAbove(tfversion.Version1_12_0), // resource identity min version
+			tfversion.SkipBelow(tfversion.Version1_12_0), // resource identity min version
 		},
 {{-  end }}
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
@@ -117,6 +117,47 @@ func TestAcc{{ $.ResourceName }}IamMemberGenerated(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+<<<<<<< HEAD
+			{
+				ResourceName:    "{{ $.IamTerraformName }}_member.foo",
+				ImportState:     true,
+				ImportStateKind: resource.ImportBlockWithResourceIdentity,
+			},
+{{-  end }}
+		},
+	})
+}
+
+{{- if not $.IamPolicy.ExcludeImportTest }}
+// TestAcc{{ $.ResourceName }}IamMemberIdentityImportGenerated imports {{ $.IamTerraformName }}_member using
+// Terraform resource identity (import block). Requires Terraform 1.12+.
+func TestAcc{{ $.ResourceName }}IamMemberIdentityImportGenerated(t *testing.T) {
+	t.Parallel()
+{{ template "IamTestSetup" $ }}
+
+	acctest.VcrTest(t, resource.TestCase{
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.SkipBelow(tfversion.Version1_12_0),
+		},
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+{{- if eq $.MinVersionObj.Name "beta" }}
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+{{-  else }}
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+{{-  end }}
+{{- if $example.ExternalProviders }}
+		ExternalProviders: map[string]resource.ExternalProvider{
+		{{- range $provider := $example.ExternalProviders }}
+			"{{$provider}}": {},
+		{{- end }}
+		},
+{{-  end }}
+		Steps: []resource.TestStep{
+			{
+				Config: testAcc{{ $.ResourceName }}IamMember_basicGenerated(context),
+			},
+=======
+>>>>>>> e126969d1 (add resourceIdentityImport step in first TestAcc instead of adding a new TestAcc)
 			{
 				ResourceName:    "{{ $.IamTerraformName }}_member.foo",
 				ImportState:     true,

mmv1/templates/terraform/iam_policy.go.tmpl

@@ -366,4 +366,4 @@ func (u *{{ $.ResourceName }}IamUpdater) GetMutexKey() string {
 
 func (u *{{ $.ResourceName }}IamUpdater) DescribeResource() string {
 	return fmt.Sprintf("{{ lower $.ProductMetadata.Name }} {{ lower $.Name }} %q", u.GetResourceId())
-}
+}

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

@@ -92,7 +92,7 @@ func TestAcc{{ $.ResourceName }}IamMemberGenerated(t *testing.T) {
 	acctest.VcrTest(t, resource.TestCase{
 {{- if not $.IamPolicy.ExcludeImportTest }}
 		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
-			tfversion.RequireAbove(tfversion.Version1_12_0), // resource identity min version
+			tfversion.SkipBelow(tfversion.Version1_12_0), // resource identity min version
 		},
 {{-  end }}
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },

mmv1/third_party/terraform/fwprovider/framework_provider.go.tmpl

@@ -20,8 +20,11 @@ import (
 
     "github.com/hashicorp/terraform-provider-google/google/fwvalidators"
     "github.com/hashicorp/terraform-provider-google/google/functions"
+    sdkprovider "github.com/hashicorp/terraform-provider-google/google/provider"
     "github.com/hashicorp/terraform-provider-google/google/fwmodels"
-    "github.com/hashicorp/terraform-provider-google/google/registry"
+    "github.com/hashicorp/terraform-provider-google/google/services/resourcemanager"
+    "github.com/hashicorp/terraform-provider-google/google/services/apigee"
+    "github.com/hashicorp/terraform-provider-google/google/services/secretmanager"
     "github.com/hashicorp/terraform-provider-google/version"
 
     transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
@@ -295,6 +298,19 @@ func (p *FrameworkProvider) Configure(ctx context.Context, req provider.Configur
 	// ephemeral resources, and list resources implemented using the plugin-framework. Their Configure functions receive this data via ConfigureRequest.ProviderData
 	// (list resources use ConfigureResponse.ListResourceData — see terraform-plugin-framework list.ConfigureRequest).
 	meta := p.Primary.Meta().(*transport_tpg.Config)
+	// This is how we make provider configuration info (configured clients, default project, etc) available to resources and data sources
+	// implemented using the plugin-framework. The resources' Configure functions receive this data in the ConfigureRequest argument.
+	primaryMeta := p.Primary.Meta()
+	if primaryMeta == nil {
+		resp.Diagnostics.AddError("Provider not configured", "SDK provider metadata is nil. Ensure the provider block is configured before using framework resources.")
+		return
+	}
+	meta, ok := primaryMeta.(*transport_tpg.Config)
+	if !ok {
+		resp.Diagnostics.AddError("Provider configuration error", "SDK provider metadata had unexpected type and could not be propagated to framework resources.")
+		return
+	}
+	meta := p.Primary.Meta().(*transport_tpg.Config)
 	resp.DataSourceData = meta
 	resp.ResourceData = meta
 	resp.EphemeralResourceData = meta
@@ -330,7 +346,10 @@ func (p *FrameworkProvider) EphemeralResources(_ context.Context) []func() ephem
 }
 
 func (p *FrameworkProvider) ListResources(_ context.Context) []func() list.ListResource {
-    return registry.FrameworkListResourceFuncs()
+    listResources := registry.FrameworkListResourceFuncs()
+    listResources = append(listResources, sdkprovider.IamMemberListResources()...)
+
+    return listResources
 }
 
 func (p *FrameworkProvider) GenerateResourceConfig(context.Context, any) (any, error) {

mmv1/third_party/terraform/go.mod

@@ -3,32 +3,33 @@ module github.com/hashicorp/terraform-provider-google
 go 1.26.0
 
 require (
-	cloud.google.com/go/auth v0.20.0
+	bitbucket.org/creachadair/stringset v0.0.8
+	cloud.google.com/go/auth v0.18.2
 	cloud.google.com/go/auth/oauth2adapt v0.2.8
 	cloud.google.com/go/bigquery v1.74.0
 	cloud.google.com/go/bigtable v1.46.0
 	github.com/apparentlymart/go-cidr v1.1.0
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/dnaeon/go-vcr v1.0.1
-	github.com/gammazero/workerpool v1.1.3
+	github.com/gammazero/workerpool v0.0.0-20181230203049-86a96b5d5d92
 	github.com/golang/glog v1.2.5
 	github.com/google/go-cmp v0.7.0
 	github.com/google/go-cpy v0.0.0-20211218193943-a9c933c06932
-	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
-	github.com/hashicorp/errwrap v1.1.0
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
+	github.com/hashicorp/errwrap v1.0.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-cty v1.5.0
 	github.com/hashicorp/go-version v1.9.0
 	github.com/hashicorp/terraform-json v0.27.2
 	github.com/hashicorp/terraform-plugin-framework v1.19.0
 	github.com/hashicorp/terraform-plugin-framework-timeouts v0.5.0
-	github.com/hashicorp/terraform-plugin-framework-validators v0.19.0
-	github.com/hashicorp/terraform-plugin-go v0.31.0
-	github.com/hashicorp/terraform-plugin-log v0.10.0
-	github.com/hashicorp/terraform-plugin-mux v0.23.1
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.40.1
-	github.com/hashicorp/terraform-plugin-testing v1.15.0
+	github.com/hashicorp/terraform-plugin-framework-validators v0.9.0
+	github.com/hashicorp/terraform-plugin-go v0.29.0
+	github.com/hashicorp/terraform-plugin-log v0.9.0
+	github.com/hashicorp/terraform-plugin-mux v0.20.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1
+	github.com/hashicorp/terraform-plugin-testing v1.14.1
 	github.com/kylelemons/godebug v1.1.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/hashstructure v1.1.0
@@ -81,12 +82,12 @@ require (
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-plugin v1.7.0 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/hc-install v0.9.4 // indirect
+	github.com/hashicorp/hc-install v0.9.2 // indirect
 	github.com/hashicorp/hcl/v2 v2.24.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-exec v0.25.1 // indirect
+	github.com/hashicorp/terraform-exec v0.24.0 // indirect
 	github.com/hashicorp/terraform-registry-address v0.4.0 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/yamux v0.1.2 // indirect