Adds google_apigee_developer_app resource and enhance google_apigee_api_product scopes to be order-insensitive (#15336) (#10851)

[upstream:b6c16709ec801b552d56cf69ede46fe304d27d55]

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

Author: modular-magician

.changelog/15336.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+`google_apigee_developer_app`
+```
+
+```release-note: enhancement
+apigee: updated the `scopes` argument in `google_apigee_api_product` resource to be order-insensitive.
+```

google-beta/provider/provider_mmv1_resources.go

@@ -616,9 +616,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
 }
 
 // Resources
-// Generated resources: 715
+// Generated resources: 716
 // Generated IAM resources: 348
-// Total generated resources: 1063
+// Total generated resources: 1064
 var generatedResources = map[string]*schema.Resource{
 	"google_folder_access_approval_settings":                                     accessapproval.ResourceAccessApprovalFolderSettings(),
 	"google_organization_access_approval_settings":                               accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -667,6 +667,7 @@ var generatedResources = map[string]*schema.Resource{
 	"google_apigee_app_group":                                                    apigee.ResourceApigeeAppGroup(),
 	"google_apigee_control_plane_access":                                         apigee.ResourceApigeeControlPlaneAccess(),
 	"google_apigee_developer":                                                    apigee.ResourceApigeeDeveloper(),
+	"google_apigee_developer_app":                                                apigee.ResourceApigeeDeveloperApp(),
 	"google_apigee_dns_zone":                                                     apigee.ResourceApigeeDnsZone(),
 	"google_apigee_endpoint_attachment":                                          apigee.ResourceApigeeEndpointAttachment(),
 	"google_apigee_env_keystore":                                                 apigee.ResourceApigeeEnvKeystore(),

google-beta/services/apigee/resource_apigee_api_product.go

@@ -24,6 +24,8 @@ import (
 	"log"
 	"net/http"
 	"reflect"
+	"slices"
+	"sort"
 	"strings"
 	"time"
 
@@ -1051,7 +1053,30 @@ func flattenApigeeApiProductProxies(v interface{}, d *schema.ResourceData, confi
 }
 
 func flattenApigeeApiProductScopes(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	return v
+	rawConfigValue := d.Get("scopes")
+	// Convert config value to []string
+	configValue, err := tpgresource.InterfaceSliceToStringSlice(rawConfigValue)
+	if err != nil {
+		log.Printf("[ERROR] Failed to convert config value: %s", err)
+		return v
+	}
+	sortedConfigValue := append([]string{}, configValue...)
+	sort.Strings(sortedConfigValue)
+
+	// Convert v to []string
+	apiValue, err := tpgresource.InterfaceSliceToStringSlice(v)
+	if err != nil {
+		log.Printf("[ERROR] Failed to convert API value: %s", err)
+		return v
+	}
+	sortedApiValue := append([]string{}, apiValue...)
+	sort.Strings(sortedApiValue)
+
+	if slices.Equal(sortedApiValue, sortedConfigValue) {
+		return configValue
+	}
+
+	return apiValue
 }
 
 func flattenApigeeApiProductQuota(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {