Move apigatewayv2/v1beta1.IntegrationIDPrefixed to common/apis.Integr…

…ationIDPrefixed to prevent circular imports. - Move lambda/v1beta1.LambdaFunctionInvokeARN to apis/lambda.FunctionInvokeARN to prevent circlular imports. Signed-off-by: Alper Rifat Ulucinar <[email protected]>
crossplane-contrib · Jan 17, 2024 · d323e8c · d323e8c
1 parent 354d8d3
commit d323e8c
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 34 deletions.
diff --git a/apis/apigatewayv2/v1beta1/zz_authorizer_types.go b/apis/apigatewayv2/v1beta1/zz_authorizer_types.go
diff --git a/apis/apigatewayv2/v1beta1/zz_generated.resolvers.go b/apis/apigatewayv2/v1beta1/zz_generated.resolvers.go
diff --git a/apis/apigatewayv2/v1beta1/zz_route_types.go b/apis/apigatewayv2/v1beta1/zz_route_types.go
diff --git a/config/apigatewayv2/config.go b/config/apigatewayv2/config.go
@@ -29,8 +29,8 @@ func Configure(p *config.Provider) {
 			Type: "API",
 		}
 		r.References["authorizer_uri"] = config.Reference{
-			Type:      "github.com/upbound/provider-aws/apis/lambda/v1beta1.Function",
-			Extractor: "github.com/upbound/provider-aws/apis/lambda/v1beta1.LambdaFunctionInvokeARN()",
+			TerraformName: "aws_lambda_function",
+			Extractor:     "github.com/upbound/provider-aws/config/common/apis/lambda.FunctionInvokeARN()",
 		}
 	})
 	p.AddResourceConfigurator("aws_apigatewayv2_domain_name", func(r *config.Resource) {
@@ -74,8 +74,8 @@ func Configure(p *config.Provider) {
 			Type: "API",
 		}
 		r.References["target"] = config.Reference{
-			Type:      "Integration",
-			Extractor: "github.com/upbound/provider-aws/apis/apigatewayv2/v1beta1.IntegrationIDPrefixed()",
+			TerraformName: "aws_apigatewayv2_integration",
+			Extractor:     "github.com/upbound/provider-aws/config/common/apis.IntegrationIDPrefixed()",
 		}
 		r.References["authorizer_id"] = config.Reference{
 			Type: "Authorizer",

diff --git a/apis/apigatewayv2/v1beta1/extractor.go → config/common/apis/extractor.go b/apis/apigatewayv2/v1beta1/extractor.go → config/common/apis/extractor.go
@@ -1,8 +1,8 @@
 /*
-Copyright 2021 Upbound Inc.
+Copyright 2022 Upbound Inc.
 */
 
-package v1beta1
+package apis
 
 import (
 	"github.com/crossplane/crossplane-runtime/pkg/meta"
@@ -17,14 +17,10 @@ import (
 func IntegrationIDPrefixed() reference.ExtractValueFn {
 	return func(mg xpresource.Managed) string {
 		return func(mg metav1.Object) string {
-			integration, ok := mg.(*Integration)
-			if !ok {
+			if meta.GetExternalName(mg) == "" {
 				return ""
 			}
-			if meta.GetExternalName(integration) == "" {
-				return ""
-			}
-			return "integrations/" + meta.GetExternalName(integration)
+			return "integrations/" + meta.GetExternalName(mg)
 		}(mg)
 	}
 }
diff --git a/apis/lambda/v1beta1/extractor.go → config/common/apis/lambda/extractor.go b/apis/lambda/v1beta1/extractor.go → config/common/apis/lambda/extractor.go
@@ -2,19 +2,21 @@
 Copyright 2022 Upbound Inc.
 */
 
-package v1beta1
+package lambda
 
 import (
 	"github.com/crossplane/crossplane-runtime/pkg/reference"
 	xpresource "github.com/crossplane/crossplane-runtime/pkg/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/upbound/provider-aws/apis/lambda/v1beta1"
 )
 
-// LambdaFunctionInvokeARN returns the invoke ARN value of the lambda function.
-func LambdaFunctionInvokeARN() reference.ExtractValueFn {
+// FunctionInvokeARN returns the invoke ARN value of the lambda function.
+func FunctionInvokeARN() reference.ExtractValueFn {
 	return func(mg xpresource.Managed) string {
 		return func(mg metav1.Object) string {
-			f, ok := mg.(*Function)
+			f, ok := mg.(*v1beta1.Function)
 			if !ok {
 				return ""
 			}

diff --git a/package/crds/apigatewayv2.aws.upbound.io_routes.yaml b/package/crds/apigatewayv2.aws.upbound.io_routes.yaml
@@ -288,7 +288,8 @@ spec:
                       resource.
                     type: string
                   targetRef:
-                    description: Reference to a Integration to populate target.
+                    description: Reference to a Integration in apigatewayv2 to populate
+                      target.
                     properties:
                       name:
                         description: Name of the referenced object.
@@ -322,7 +323,8 @@ spec:
                     - name
                     type: object
                   targetSelector:
-                    description: Selector for a Integration to populate target.
+                    description: Selector for a Integration in apigatewayv2 to populate
+                      target.
                     properties:
                       matchControllerRef:
                         description: MatchControllerRef ensures an object with the
@@ -592,7 +594,8 @@ spec:
                       resource.
                     type: string
                   targetRef:
-                    description: Reference to a Integration to populate target.
+                    description: Reference to a Integration in apigatewayv2 to populate
+                      target.
                     properties:
                       name:
                         description: Name of the referenced object.
@@ -626,7 +629,8 @@ spec:
                     - name
                     type: object
                   targetSelector:
-                    description: Selector for a Integration to populate target.
+                    description: Selector for a Integration in apigatewayv2 to populate
+                      target.
                     properties:
                       matchControllerRef:
                         description: MatchControllerRef ensures an object with the