feat: Direct controller for ComputeForwardingRule

apis/compute/v1beta1/computeforwardingrule_types.go

@@ -18,7 +18,7 @@ package v1beta1
 
 import (
 	refs "github.com/GoogleCloudPlatform/k8s-config-connector/apis/refs/v1beta1"
-	"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/clients/generated/apis/k8s/v1alpha1"
+	commonv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/apis/common/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
@@ -365,9 +365,7 @@ type ComputeForwardingRuleSpec struct {
 
 // +kcc:proto=google.cloud.compute.v1.ForwardingRule
 type ComputeForwardingRuleStatus struct {
-	/* Conditions represent the latest available observations of the
-	   ComputeForwardingRule's current state. */
-	Conditions []v1alpha1.Condition `json:"conditions,omitempty"`
+	commonv1alpha1.CommonStatus `json:",inline"`
 	/* [Output Only] The URL for the corresponding base Forwarding Rule. By base Forwarding Rule, we mean the Forwarding Rule that has the same IP address, protocol, and port settings with the current Forwarding Rule, but without sourceIPRanges specified. Always empty if the current Forwarding Rule does not have sourceIPRanges specified. */
 	// +optional
 	BaseForwardingRule *string `json:"baseForwardingRule,omitempty"`
@@ -381,10 +379,6 @@ type ComputeForwardingRuleStatus struct {
 	// +optional
 	LabelFingerprint *string `json:"labelFingerprint,omitempty"`
 
-	/* ObservedGeneration is the generation of the resource that was most recently observed by the Config Connector controller. If this is equal to metadata.generation, then that means that the current reported status reflects the most recent desired state of the resource. */
-	// +optional
-	ObservedGeneration *int64 `json:"observedGeneration,omitempty"`
-
 	/* The PSC connection id of the PSC Forwarding Rule. */
 	// +optional
 	PscConnectionId *string `json:"pscConnectionId,omitempty"`

config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_cloudbuildworkerpools.cloudbuild.cnrm.cloud.google.com.yaml

@@ -384,7 +384,7 @@ spec:
                   type: object
                 type: array
               externalRef:
-                description: A unique specifier for the CloudBuild workerpool resource
+                description: A unique Config Connector specifier for the resource
                   in GCP.
                 type: string
               observedGeneration:

hack/compare-mock

@@ -16,6 +16,6 @@ E2E_GCP_TARGET=mock \
 GOLDEN_REQUEST_CHECKS=1 \
 GOLDEN_OBJECT_CHECKS=1 \
 WRITE_GOLDEN_OUTPUT=1 \
-KCC_USE_DIRECT_RECONCILERS="SQLInstance" \
+KCC_USE_DIRECT_RECONCILERS="SQLInstance,ComputeForwardingRule" \
 RUN_E2E=1 \
  go test ./tests/e2e -timeout 3600s -v -run $RUN_TESTS

pkg/apis/common/v1alpha1/types.go

@@ -40,7 +40,7 @@ type CommonStatus struct {
 	// +optional
 	ObservedGeneration *int64 `json:"observedGeneration,omitempty"`
 
-	/* A unique specifier for the CloudBuild workerpool resource in GCP.*/
+	/* A unique Config Connector specifier for the resource in GCP.*/
 	// +optional
 	ExternalRef *string `json:"externalRef,omitempty"`
 }

pkg/controller/direct/compute/client.go

@@ -0,0 +1,101 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	api "cloud.google.com/go/compute/apiv1"
+	"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/config"
+	"google.golang.org/api/option"
+)
+
+type gcpClient struct {
+	config config.ControllerConfig
+}
+
+func newGCPClient(ctx context.Context, config *config.ControllerConfig) (*gcpClient, error) {
+	gcpClient := &gcpClient{
+		config: *config,
+	}
+	return gcpClient, nil
+}
+
+func (m *gcpClient) options() ([]option.ClientOption, error) {
+	var opts []option.ClientOption
+	if m.config.UserAgent != "" {
+		opts = append(opts, option.WithUserAgent(m.config.UserAgent))
+	}
+	if m.config.HTTPClient != nil {
+		// TODO: Set UserAgent in this scenario (error is: WithHTTPClient is incompatible with gRPC dial options)
+
+		httpClient := &http.Client{}
+		*httpClient = *m.config.HTTPClient
+		httpClient.Transport = &optionsRoundTripper{
+			config: m.config,
+			inner:  m.config.HTTPClient.Transport,
+		}
+		opts = append(opts, option.WithHTTPClient(httpClient))
+	}
+	if m.config.UserProjectOverride && m.config.BillingProject != "" {
+		opts = append(opts, option.WithQuotaProject(m.config.BillingProject))
+	}
+
+	// TODO: support endpoints?
+	// if m.config.Endpoint != "" {
+	// 	opts = append(opts, option.WithEndpoint(m.config.Endpoint))
+	// }
+
+	return opts, nil
+}
+
+type optionsRoundTripper struct {
+	config config.ControllerConfig
+	inner  http.RoundTripper
+}
+
+func (m *optionsRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	if m.config.UserAgent != "" {
+		req.Header.Set("User-Agent", m.config.UserAgent)
+		req.Header.Del("x-goog-request-params")
+	}
+	return m.inner.RoundTrip(req)
+}
+
+func (m *gcpClient) globalForwardingRuleClient(ctx context.Context) (*api.GlobalForwardingRulesClient, error) {
+	opts, err := m.options()
+	if err != nil {
+		return nil, err
+	}
+	client, err := api.NewGlobalForwardingRulesRESTClient(ctx, opts...)
+	if err != nil {
+		return nil, fmt.Errorf("building global ComputeForwardingRule client: %w", err)
+	}
+	return client, err
+}
+
+func (m *gcpClient) forwardingRuleClient(ctx context.Context) (*api.ForwardingRulesClient, error) {
+	opts, err := m.options()
+	if err != nil {
+		return nil, err
+	}
+	client, err := api.NewForwardingRulesRESTClient(ctx, opts...)
+	if err != nil {
+		return nil, fmt.Errorf("building ComputeForwardingRule client: %w", err)
+	}
+	return client, err
+}