Merge pull request #69 from XXXLutz/feat/ForwardingRule_Use-selflink-…

…instead-of-resource-id ForwardingRule - Use selflink for ip_address, network, subnetwork and target selector
crossplane-contrib · Dec 13, 2022 · 090f084 · 090f084
2 parents c64b96b + e7adb34
commit 090f084
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 32 deletions.
diff --git a/apis/compute/v1beta1/zz_forwardingrule_types.go b/apis/compute/v1beta1/zz_forwardingrule_types.go
diff --git a/apis/compute/v1beta1/zz_generated.resolvers.go b/apis/compute/v1beta1/zz_generated.resolvers.go
diff --git a/config/compute/config.go b/config/compute/config.go
@@ -261,6 +261,22 @@ func Configure(p *config.Provider) { //nolint: gocyclo
 			Type:      "RegionBackendService",
 			Extractor: common.PathSelfLinkExtractor,
 		}
+		r.References["ip_address"] = config.Reference{
+			Type:      "Address",
+			Extractor: common.PathSelfLinkExtractor,
+		}
+		r.References["network"] = config.Reference{
+			Type:      "Network",
+			Extractor: common.PathSelfLinkExtractor,
+		}
+		r.References["subnetwork"] = config.Reference{
+			Type:      "Subnetwork",
+			Extractor: common.PathSelfLinkExtractor,
+		}
+		r.References["target"] = config.Reference{
+			Type:      "RegionTargetHTTPProxy",
+			Extractor: common.PathSelfLinkExtractor,
+		}
 		config.MarkAsRequired(r.TerraformResource, "region")
 	})
 

diff --git a/package/crds/compute.gcp.upbound.io_forwardingrules.yaml b/package/crds/compute.gcp.upbound.io_forwardingrules.yaml
@@ -176,7 +176,7 @@ spec:
                       APIs, IP address must be provided.
                     type: string
                   ipAddressRef:
-                    description: Reference to a Address in compute to populate ipAddress.
+                    description: Reference to a Address to populate ipAddress.
                     properties:
                       name:
                         description: Name of the referenced object.
@@ -210,7 +210,7 @@ spec:
                     - name
                     type: object
                   ipAddressSelector:
-                    description: Selector for a Address in compute to populate ipAddress.
+                    description: Selector for a Address to populate ipAddress.
                     properties:
                       matchControllerRef:
                         description: MatchControllerRef ensures an object with the
@@ -289,7 +289,7 @@ spec:
                       balancing.
                     type: string
                   networkRef:
-                    description: Reference to a Network in compute to populate network.
+                    description: Reference to a Network to populate network.
                     properties:
                       name:
                         description: Name of the referenced object.
@@ -323,7 +323,7 @@ spec:
                     - name
                     type: object
                   networkSelector:
-                    description: Selector for a Network in compute to populate network.
+                    description: Selector for a Network to populate network.
                     properties:
                       matchControllerRef:
                         description: MatchControllerRef ensures an object with the
@@ -432,8 +432,7 @@ spec:
                       subnet mode, a subnetwork must be specified.
                     type: string
                   subnetworkRef:
-                    description: Reference to a Subnetwork in compute to populate
-                      subnetwork.
+                    description: Reference to a Subnetwork to populate subnetwork.
                     properties:
                       name:
                         description: Name of the referenced object.
@@ -467,8 +466,7 @@ spec:
                     - name
                     type: object
                   subnetworkSelector:
-                    description: Selector for a Subnetwork in compute to populate
-                      subnetwork.
+                    description: Selector for a Subnetwork to populate subnetwork.
                     properties:
                       matchControllerRef:
                         description: MatchControllerRef ensures an object with the
@@ -513,8 +511,8 @@ spec:
                       the target object.
                     type: string
                   targetRef:
-                    description: Reference to a RegionTargetHTTPProxy in compute to
-                      populate target.
+                    description: Reference to a RegionTargetHTTPProxy to populate
+                      target.
                     properties:
                       name:
                         description: Name of the referenced object.
@@ -548,8 +546,8 @@ spec:
                     - name
                     type: object
                   targetSelector:
-                    description: Selector for a RegionTargetHTTPProxy in compute to
-                      populate target.
+                    description: Selector for a RegionTargetHTTPProxy to populate
+                      target.
                     properties:
                       matchControllerRef:
                         description: MatchControllerRef ensures an object with the