Merge pull request #1154 from erhancagirici/apimanager-subscription-external-name-fix

fix: add displayName parameter to Subscription.apimanager

Author: ulucinar

apis/cluster/apimanagement/v1beta1/zz_generated.deepcopy.go

@@ -24,6 +24,6 @@ func Configure(p *config.Provider) {
 	})
 
 	p.AddResourceConfigurator("azurerm_redis_cache", func(r *config.Resource) {
-		config.MarkAsRequired(r.TerraformResource, "redis_version")
+		r.MarkAsRequired("redis_version")
 	})
 }

apis/cluster/apimanagement/v1beta1/zz_subscription_types.go

@@ -118,7 +118,7 @@ var TerraformPluginSDKExternalNameConfigs = map[string]config.ExternalName{
 	"azurerm_api_management_redis_cache": config.TemplatedStringAsIdentifier("name", "{{ .parameters.api_management_id }}/caches/{{ .external_name }}"),
 	// API Management Subscriptions can be imported using the resource id
 	// /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/example-resources/providers/Microsoft.ApiManagement/service/example-apim/subscriptions/subscription-name
-	"azurerm_api_management_subscription": config.TemplatedStringAsIdentifier("display_name", "/subscriptions/{{ .setup.configuration.subscription_id }}/resourceGroups/{{ .parameters.resource_group_name }}/providers/Microsoft.ApiManagement/service/{{ .parameters.api_management_name }}/subscriptions/{{ .external_name }}"),
+	"azurerm_api_management_subscription": apiManagementSubscription(),
 	// API Management Tags can be imported using the resource id
 	// /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Microsoft.ApiManagement/service/service1/tags/tag1
 	"azurerm_api_management_tag": config.TemplatedStringAsIdentifier("name", "{{ .parameters.api_management_id }}/tags/{{ .external_name }}"),
@@ -2396,6 +2396,32 @@ func policyDefinitionExternalName(resourceType string) config.ExternalName {
 	}
 }
 
+func apiManagementSubscription() config.ExternalName {
+	e := config.TemplatedStringAsIdentifier("", "/subscriptions/{{ .setup.configuration.subscription_id }}/resourceGroups/{{ .parameters.resource_group_name }}/providers/Microsoft.ApiManagement/service/{{ .parameters.api_management_name }}/subscriptions/{{ .external_name }}")
+	templatedGetIDFn := e.GetIDFn
+	e.SetIdentifierArgumentFn = func(base map[string]any, externalName string) {
+		if len(externalName) == 0 {
+			return
+		}
+		if subId, ok := base["subscription_id"].(string); !ok || subId == "" {
+			base["subscription_id"] = externalName
+		}
+		// backward-compatible behavior for existing resources with
+		// no spec.forProvider.displayName set.
+		if displayName, ok := base["display_name"].(string); !ok || displayName == "" {
+			base["display_name"] = externalName
+		}
+	}
+	e.GetIDFn = func(ctx context.Context, externalName string, parameters map[string]any, terraformProviderConfig map[string]any) (string, error) {
+		if externalName == "" {
+			return "", nil
+		}
+		return templatedGetIDFn(ctx, externalName, parameters, terraformProviderConfig)
+	}
+	e.DisableNameInitializer = true
+	return e
+}
+
 // ResourceConfigurator applies all external name configs
 // listed in the table TerraformPluginSDKExternalNameConfigs and
 // CLIReconciledExternalNameConfigs and sets the version

apis/namespaced/apimanagement/v1beta1/zz_generated.deepcopy.go

@@ -24,6 +24,6 @@ func Configure(p *config.Provider) {
 	})
 
 	p.AddResourceConfigurator("azurerm_redis_cache", func(r *config.Resource) {
-		config.MarkAsRequired(r.TerraformResource, "redis_version")
+		r.MarkAsRequired("redis_version")
 	})
 }

apis/namespaced/apimanagement/v1beta1/zz_subscription_types.go

@@ -15,6 +15,7 @@ spec:
     apiManagementNameSelector:
       matchLabels:
         testing.upbound.io/example-name: azurerm_api_management
+    displayName: Parser API
     productIdSelector:
       matchLabels:
         testing.upbound.io/example-name: azurerm_api_management_product

config/cluster/cache/config.go

@@ -16,6 +16,7 @@ spec:
     apiManagementNameSelector:
       matchLabels:
         testing.upbound.io/example-name: azurerm_api_management
+    displayName: Parser API
     productIdSelector:
       matchLabels:
         testing.upbound.io/example-name: azurerm_api_management_product

config/externalname.go

@@ -12,6 +12,7 @@ metadata:
   name: example
 spec:
   forProvider:
+    displayName: "Example apim Subscription"
     apiManagementNameSelector:
       matchLabels:
         testing.upbound.io/example-name: example
@@ -75,11 +76,11 @@ metadata:
     meta.upbound.io/example-id: apimanagement/v1beta1/subscription
   labels:
     testing.upbound.io/example-name: example
-  name: uptest-management-example
+  name: uptest-apim-management-example
 spec:
   forProvider:
     location: West Europe
-    publisherEmail: company@terraform.io
+    publisherEmail: company@crossplane.io
     publisherName: My Company
     resourceGroupNameSelector:
       matchLabels:
@@ -93,7 +94,7 @@ metadata:
     meta.upbound.io/example-id: apimanagement/v1beta1/subscription
   labels:
     testing.upbound.io/example-name: example
-  name: uptest-resourcegroup-example
+  name: uptest-apim-subscription-example-rg
 spec:
   forProvider:
     location: West Europe