Add support for Context Aware Access UserAccessBinding resource

.changelog/4368.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+accesscontextmanager: Added support for `google_access_context_manager_gcp_user_access_binding`
+```

google-beta/access_context_manager_operation.go

@@ -37,8 +37,11 @@ func (w *AccessContextManagerOperationWaiter) QueryOp() (interface{}, error) {
 
 func createAccessContextManagerWaiter(config *Config, op map[string]interface{}, activity, userAgent string) (*AccessContextManagerOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &AccessContextManagerOperationWaiter{
 		Config:    config,

google-beta/active_directory_operation.go

@@ -38,8 +38,11 @@ func (w *ActiveDirectoryOperationWaiter) QueryOp() (interface{}, error) {
 
 func createActiveDirectoryWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*ActiveDirectoryOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &ActiveDirectoryOperationWaiter{
 		Config:    config,

google-beta/api_gateway_operation.go

@@ -38,8 +38,11 @@ func (w *ApiGatewayOperationWaiter) QueryOp() (interface{}, error) {
 
 func createApiGatewayWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*ApiGatewayOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &ApiGatewayOperationWaiter{
 		Config:    config,

google-beta/artifact_registry_operation.go

@@ -38,8 +38,11 @@ func (w *ArtifactRegistryOperationWaiter) QueryOp() (interface{}, error) {
 
 func createArtifactRegistryWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*ArtifactRegistryOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &ArtifactRegistryOperationWaiter{
 		Config:    config,

google-beta/data_fusion_operation.go

@@ -38,8 +38,11 @@ func (w *DataFusionOperationWaiter) QueryOp() (interface{}, error) {
 
 func createDataFusionWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*DataFusionOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &DataFusionOperationWaiter{
 		Config:    config,

google-beta/datastore_operation.go

@@ -38,8 +38,11 @@ func (w *DatastoreOperationWaiter) QueryOp() (interface{}, error) {
 
 func createDatastoreWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*DatastoreOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &DatastoreOperationWaiter{
 		Config:    config,

google-beta/filestore_operation.go

@@ -38,8 +38,11 @@ func (w *FilestoreOperationWaiter) QueryOp() (interface{}, error) {
 
 func createFilestoreWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*FilestoreOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &FilestoreOperationWaiter{
 		Config:    config,

google-beta/firebase_operation.go

@@ -38,8 +38,11 @@ func (w *FirebaseOperationWaiter) QueryOp() (interface{}, error) {
 
 func createFirebaseWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*FirebaseOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &FirebaseOperationWaiter{
 		Config:    config,

google-beta/firestore_operation.go

@@ -38,8 +38,11 @@ func (w *FirestoreOperationWaiter) QueryOp() (interface{}, error) {
 
 func createFirestoreWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*FirestoreOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &FirestoreOperationWaiter{
 		Config:    config,

google-beta/game_services_operation.go

@@ -38,8 +38,11 @@ func (w *GameServicesOperationWaiter) QueryOp() (interface{}, error) {
 
 func createGameServicesWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*GameServicesOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &GameServicesOperationWaiter{
 		Config:    config,

google-beta/iam_beta_operation.go

@@ -37,8 +37,11 @@ func (w *IAMBetaOperationWaiter) QueryOp() (interface{}, error) {
 
 func createIAMBetaWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*IAMBetaOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &IAMBetaOperationWaiter{
 		Config:    config,

google-beta/memcache_operation.go

@@ -38,8 +38,11 @@ func (w *MemcacheOperationWaiter) QueryOp() (interface{}, error) {
 
 func createMemcacheWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*MemcacheOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &MemcacheOperationWaiter{
 		Config:    config,

google-beta/ml_engine_operation.go

@@ -38,8 +38,11 @@ func (w *MLEngineOperationWaiter) QueryOp() (interface{}, error) {
 
 func createMLEngineWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*MLEngineOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &MLEngineOperationWaiter{
 		Config:    config,

google-beta/network_management_operation.go

@@ -38,8 +38,11 @@ func (w *NetworkManagementOperationWaiter) QueryOp() (interface{}, error) {
 
 func createNetworkManagementWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*NetworkManagementOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &NetworkManagementOperationWaiter{
 		Config:    config,

google-beta/notebooks_operation.go

@@ -38,8 +38,11 @@ func (w *NotebooksOperationWaiter) QueryOp() (interface{}, error) {
 
 func createNotebooksWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*NotebooksOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &NotebooksOperationWaiter{
 		Config:    config,

google-beta/provider.go

@@ -781,9 +781,9 @@ func Provider() *schema.Provider {
 	return provider
 }
 
-// Generated resources: 204
+// Generated resources: 205
 // Generated IAM resources: 105
-// Total generated resources: 309
+// Total generated resources: 310
 func ResourceMap() map[string]*schema.Resource {
 	resourceMap, _ := ResourceMapWithErrors()
 	return resourceMap
@@ -802,6 +802,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_access_context_manager_service_perimeter":              resourceAccessContextManagerServicePerimeter(),
 			"google_access_context_manager_service_perimeters":             resourceAccessContextManagerServicePerimeters(),
 			"google_access_context_manager_service_perimeter_resource":     resourceAccessContextManagerServicePerimeterResource(),
+			"google_access_context_manager_gcp_user_access_binding":        resourceAccessContextManagerGcpUserAccessBinding(),
 			"google_active_directory_domain":                               resourceActiveDirectoryDomain(),
 			"google_active_directory_domain_trust":                         resourceActiveDirectoryDomainTrust(),
 			"google_api_gateway_api":                                       resourceApiGatewayApi(),

google-beta/redis_operation.go

@@ -38,8 +38,11 @@ func (w *RedisOperationWaiter) QueryOp() (interface{}, error) {
 
 func createRedisWaiter(config *Config, op map[string]interface{}, project, activity, userAgent string) (*RedisOperationWaiter, error) {
 	if val, ok := op["name"]; !ok || val == "" {
-		// This was a synchronous call - there is no operation to wait for.
-		return nil, nil
+		// An operation could also be indicated with a "metadata" field.
+		if _, ok := op["metadata"]; !ok {
+			// This was a synchronous call - there is no operation to wait for.
+			return nil, nil
+		}
 	}
 	w := &RedisOperationWaiter{
 		Config:    config,

google-beta/resource_access_approval_folder_settings_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 // Since access approval settings are heirarchical, and only one can exist per folder/project/org,
-// and all refer to the same organization, they need to be ran serially
+// and all refer to the same organization, they need to be run serially
 // See AccessApprovalOrganizationSettings for the test runner.
 func testAccAccessApprovalFolderSettings(t *testing.T) {
 	context := map[string]interface{}{

google-beta/resource_access_approval_organization_settings_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 // Since access approval settings are heirarchical, and only one can exist per folder/project/org,
-// and all refer to the same organization, they need to be ran serially
+// and all refer to the same organization, they need to be run serially
 func TestAccAccessApprovalSettings(t *testing.T) {
 	testCases := map[string]func(t *testing.T){
 		"folder":       testAccAccessApprovalFolderSettings,

google-beta/resource_access_approval_project_settings_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 // Since access approval settings are heirarchical, and only one can exist per folder/project/org,
-// and all refer to the same organization, they need to be ran serially.
+// and all refer to the same organization, they need to be run serially.
 // See AccessApprovalOrganizationSettings for the test runner.
 func testAccAccessApprovalProjectSettings(t *testing.T) {
 	context := map[string]interface{}{

google-beta/resource_access_context_manager_access_level_condition_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 // Since each test here is acting on the same organization and only one AccessPolicy
-// can exist, they need to be ran serially. See AccessPolicy for the test runner.
+// can exist, they need to be run serially. See AccessPolicy for the test runner.
 
 func testAccAccessContextManagerAccessLevelCondition_basicTest(t *testing.T) {
 	org := getTestOrgFromEnv(t)

google-beta/resource_access_context_manager_access_level_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 // Since each test here is acting on the same organization and only one AccessPolicy
-// can exist, they need to be ran serially. See AccessPolicy for the test runner.
+// can exist, they need to be run serially. See AccessPolicy for the test runner.
 
 func testAccAccessContextManagerAccessLevel_basicTest(t *testing.T) {
 	org := getTestOrgFromEnv(t)

google-beta/resource_access_context_manager_access_levels_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 // Since each test here is acting on the same organization and only one AccessPolicy
-// can exist, they need to be ran serially. See AccessPolicy for the test runner.
+// can exist, they need to be run serially. See AccessPolicy for the test runner.
 
 func testAccAccessContextManagerAccessLevels_basicTest(t *testing.T) {
 	org := getTestOrgFromEnv(t)

google-beta/resource_access_context_manager_access_policy_test.go

@@ -74,7 +74,7 @@ func testSweepAccessContextManagerPolicies(region string) error {
 }
 
 // Since each test here is acting on the same organization and only one AccessPolicy
-// can exist, they need to be ran serially
+// can exist, they need to be run serially
 func TestAccAccessContextManager(t *testing.T) {
 	testCases := map[string]func(t *testing.T){
 		"access_policy":              testAccAccessContextManagerAccessPolicy_basicTest,
@@ -87,6 +87,7 @@ func TestAccAccessContextManager(t *testing.T) {
 		"access_levels":              testAccAccessContextManagerAccessLevels_basicTest,
 		"access_level_condition":     testAccAccessContextManagerAccessLevelCondition_basicTest,
 		"service_perimeters":         testAccAccessContextManagerServicePerimeters_basicTest,
+		"gcp_user_access_binding":    testAccAccessContextManagerGcpUserAccessBinding_basicTest,
 	}
 
 	for name, tc := range testCases {