remove ignoredPorjectServices in google_project_service (#14234) (#10174)

[upstream:91128f4d9e3ec195184be4ea5b2d74c15e3d7bd8]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/14234.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resourcemanager: allowed `dataproc-control.googleapis.com` and `stackdriverprovisioning.googleapis.com` services in `google_project_service` resource 
+```

google-beta/services/resourcemanager/resource_google_project.go

@@ -826,16 +826,13 @@ func ListCurrentlyEnabledServices(project, billingProject, userAgent string, con
 						// services are returned as "projects/{{project}}/services/{{name}}"
 						name := tpgresource.GetResourceNameFromSelfLink(v.Name)
 
-						// if name not in ignoredProjectServicesSet
-						if _, ok := ignoredProjectServicesSet[name]; !ok {
-							apiServices[name] = struct{}{}
-
-							// if a service has been renamed, set both. We'll deal
-							// with setting the right values later.
-							if v, ok := renamedServicesByOldAndNewServiceNames[name]; ok {
-								log.Printf("[DEBUG] Adding service alias for %s to enabled services: %s", name, v)
-								apiServices[v] = struct{}{}
-							}
+						apiServices[name] = struct{}{}
+
+						// if a service has been renamed, set both. We'll deal
+						// with setting the right values later.
+						if v, ok := renamedServicesByOldAndNewServiceNames[name]; ok {
+							log.Printf("[DEBUG] Adding service alias for %s to enabled services: %s", name, v)
+							apiServices[v] = struct{}{}
 						}
 					}
 					return nil

google-beta/services/resourcemanager/resource_google_project_service.go

@@ -35,11 +35,6 @@ import (
 	"google.golang.org/api/serviceusage/v1"
 )
 
-// These services can only be enabled as a side-effect of enabling other services,
-// so don't bother storing them in the config or using them for diffing.
-var ignoredProjectServices = []string{"dataproc-control.googleapis.com", "source.googleapis.com", "stackdriverprovisioning.googleapis.com"}
-var ignoredProjectServicesSet = tpgresource.GolangSetFromStringSlice(ignoredProjectServices)
-
 // Services that can't be user-specified but are otherwise valid. Renamed
 // services should be added to this set during major releases.
 var bannedProjectServices = []string{"bigquery-json.googleapis.com"}
@@ -79,7 +74,7 @@ var renamedServicesByOldAndNewServiceNames = tpgresource.MergeStringMaps(Renamed
 const maxServiceUsageBatchSize = 20
 
 func validateProjectServiceService(val interface{}, key string) (warns []string, errs []error) {
-	bannedServicesFunc := verify.StringNotInSlice(append(ignoredProjectServices, bannedProjectServices...), false)
+	bannedServicesFunc := verify.StringNotInSlice(bannedProjectServices, false)
 	warns, errs = bannedServicesFunc(val, key)
 	if len(errs) > 0 {
 		return

google-beta/services/resourcemanager/resource_google_project_service_internal_test.go

@@ -25,10 +25,6 @@ func TestProjectServiceServiceValidateFunc(t *testing.T) {
 		val                   interface{}
 		ExpectValidationError bool
 	}{
-		"ignoredProjectService": {
-			val:                   "dataproc-control.googleapis.com",
-			ExpectValidationError: true,
-		},
 		"bannedProjectService": {
 			val:                   "bigquery-json.googleapis.com",
 			ExpectValidationError: true,